diff --git a/devel/arm-eabi-binutils/Makefile b/devel/arm-eabi-binutils/Makefile index bcfc7d44..5d37b3bb 100644 --- a/devel/arm-eabi-binutils/Makefile +++ b/devel/arm-eabi-binutils/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --target=${TARGET} +CONFIGURE_ARGS= --target=${TARGET} CONFIGURE_ARGS+= --with-system-zlib CONFIGURE_ARGS+= --disable-werror CONFIGURE_ARGS+= --with-gmp=${LOCALBASE} diff --git a/devel/arm-eabi-binutils/pkg-plist b/devel/arm-eabi-binutils/pkg-plist index 260bfcc0..798831cb 100644 --- a/devel/arm-eabi-binutils/pkg-plist +++ b/devel/arm-eabi-binutils/pkg-plist @@ -64,12 +64,10 @@ bin/arm-nuttx-eabi-objdump bin/arm-nuttx-eabi-ranlib bin/arm-nuttx-eabi-readelf bin/arm-nuttx-eabi-strip -lib/bfd-plugins/libdep.a man/man1/arm-eabi-addr2line.1.gz man/man1/arm-eabi-ar.1.gz man/man1/arm-eabi-as.1.gz man/man1/arm-eabi-c++filt.1.gz -man/man1/arm-eabi-dlltool.1.gz man/man1/arm-eabi-elfedit.1.gz man/man1/arm-eabi-gprof.1.gz man/man1/arm-eabi-ld.1.gz @@ -81,15 +79,7 @@ man/man1/arm-eabi-readelf.1.gz man/man1/arm-eabi-size.1.gz man/man1/arm-eabi-strings.1.gz man/man1/arm-eabi-strip.1.gz -man/man1/arm-eabi-windmc.1.gz -man/man1/arm-eabi-windres.1.gz -share/info/as.info -share/info/bfd.info -share/info/binutils.info -share/info/gprof.info -share/info/ld.info @dir arm-eabi/bin @dir arm-eabi/lib/ldscripts @dir arm-eabi/lib @dir arm-eabi -@dir lib/bfd-plugins diff --git a/devel/libyang/Makefile b/devel/libyang/Makefile index d955bd19..a834e2dc 100644 --- a/devel/libyang/Makefile +++ b/devel/libyang/Makefile @@ -1,10 +1,11 @@ # $FreeBSD: head/net/libyang/Makefile 507372 2019-07-26 20:46:53Z gerald $ PORTNAME= libyang -PORTVERSION= 1.0.240 +PORTVERSION= 2.0.194 DISTVERSIONPREFIX= v #DISTVERSIONSUFFIX= -r4 CATEGORIES= net +#PKGNAMESUFFIX= 2 MAINTAINER= olivier@FreeBSD.org COMMENT= YANG data modeling language library @@ -17,6 +18,9 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= CESNET -CMAKE_ARGS+= -DENABLE_LYD_PRIV=ON +#CMAKE_ARGS+= -DENABLE_LYD_PRIV=ON + +post-install: + ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man?/*.1 .include diff --git a/devel/libyang/distinfo b/devel/libyang/distinfo index 82aa98cc..309fe799 100644 --- a/devel/libyang/distinfo +++ b/devel/libyang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645401193 -SHA256 (CESNET-libyang-v1.0.240_GH0.tar.gz) = 8576cad398b451b1c622b0652a2030fcf83ee1d9a39e6cd93d17b0a5a43118d6 -SIZE (CESNET-libyang-v1.0.240_GH0.tar.gz) = 1667619 +TIMESTAMP = 1663937671 +SHA256 (CESNET-libyang-v2.0.194_GH0.tar.gz) = 94898ee391c238dcd29ff21092e5dcab4e17b9623e88862a55b72fc6168846f8 +SIZE (CESNET-libyang-v2.0.194_GH0.tar.gz) = 1150705 diff --git a/devel/libyang/files/_patch-x-CMakeLists.txt b/devel/libyang/files/_patch-x-CMakeLists.txt deleted file mode 100644 index 93bee938..00000000 --- a/devel/libyang/files/_patch-x-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- ./CMakeLists.txt.orig 2019-09-21 19:40:09.108196000 +0200 -+++ ./CMakeLists.txt 2019-09-21 19:41:41.130794000 +0200 -@@ -22,7 +22,7 @@ - set(LIBYANG_MAJOR_VERSION 1) - set(LIBYANG_MINOR_VERSION 0) - set(LIBYANG_MICRO_VERSION 35) --set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) -+set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}) - - # Version of the library - # Major version is changed with every backward non-compatible API/ABI change in libyang, minor version changes -@@ -30,7 +30,7 @@ - set(LIBYANG_MAJOR_SOVERSION 1) - set(LIBYANG_MINOR_SOVERSION 1) - set(LIBYANG_MICRO_SOVERSION 30) --set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) -+set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}) - set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION}) - - # set default build type if not specified by user diff --git a/devel/libyang/files/patch-x-CMakeLists.txt b/devel/libyang/files/patch-x-CMakeLists.txt index abb10b9f..26d1eed7 100644 --- a/devel/libyang/files/patch-x-CMakeLists.txt +++ b/devel/libyang/files/patch-x-CMakeLists.txt @@ -1,24 +1,17 @@ ---- ./CMakeLists.txt.orig 2021-05-31 12:11:46.000000000 +0200 -+++ ./CMakeLists.txt 2022-02-21 01:56:33.121543000 +0200 -@@ -33,9 +33,9 @@ - # Major version is changed with every backward non-compatible API/ABI change in libyang, minor version changes - # with backward compatible change and micro version is connected with any internal change of the library. - set(LIBYANG_MAJOR_SOVERSION 1) --set(LIBYANG_MINOR_SOVERSION 10) --set(LIBYANG_MICRO_SOVERSION 32) +--- ./CMakeLists.txt.orig 2022-09-23 14:54:58.761570000 +0200 ++++ ./CMakeLists.txt 2022-09-23 14:55:42.829418000 +0200 +@@ -62,12 +62,12 @@ + set(LIBYANG_MAJOR_VERSION 2) + set(LIBYANG_MINOR_VERSION 0) + set(LIBYANG_MICRO_VERSION 194) +-set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) ++set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) + # set version of the library + set(LIBYANG_MAJOR_SOVERSION 2) + set(LIBYANG_MINOR_SOVERSION 20) + set(LIBYANG_MICRO_SOVERSION 15) -set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) -+set(LIBYANG_MINOR_SOVERSION 2) -+set(LIBYANG_MICRO_SOVERSION 2) +set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}) set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION}) - set(libsrc -@@ -125,7 +125,7 @@ - option(ENABLE_LATEST_REVISIONS "Enable reusing of latest revisions of schemas" ON) - option(ENABLE_LYD_PRIV "Add a private pointer also to struct lyd_node (data node structure), just like in struct lys_node, for arbitrary user data" OFF) - option(ENABLE_FUZZ_TARGETS "Build target programs suitable for fuzzing with AFL" OFF) --set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang${LIBYANG_MAJOR_SOVERSION}" CACHE STRING "Directory with libyang plugins (extensions and user types), should include major SO version") -+set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libyang" CACHE STRING "Directory with libyang plugins (extensions and user types), should include major SO version") - - if(ENABLE_CACHE) - set(LY_ENABLED_CACHE 1) + if(WIN32) diff --git a/devel/libyang/files/patch-x-CMakeModules-UseCompat.cmake b/devel/libyang/files/patch-x-CMakeModules-UseCompat.cmake new file mode 100644 index 00000000..c9d097b4 --- /dev/null +++ b/devel/libyang/files/patch-x-CMakeModules-UseCompat.cmake @@ -0,0 +1,11 @@ +--- ./CMakeModules/UseCompat.cmake.orig 2022-05-06 08:57:14.000000000 +0200 ++++ ./CMakeModules/UseCompat.cmake 2022-09-23 14:54:58.764665000 +0200 +@@ -49,7 +49,7 @@ + + include(CheckStructHasMember) + check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF) +- check_symbol_exists(timezone time.h HAVE_TIME_H_TIMEZONE) ++# check_symbol_exists(timezone time.h HAVE_TIME_H_TIMEZONE) + + check_symbol_exists(realpath "stdlib.h" HAVE_REALPATH) + check_symbol_exists(localtime_r "time.h" HAVE_LOCALTIME_R) diff --git a/devel/libyang/pkg-plist b/devel/libyang/pkg-plist index b597a843..37d6d43d 100644 --- a/devel/libyang/pkg-plist +++ b/devel/libyang/pkg-plist @@ -1,23 +1,30 @@ bin/yanglint bin/yangre +include/libyang/config.h +include/libyang/context.h include/libyang/dict.h -include/libyang/extensions.h +include/libyang/in.h include/libyang/libyang.h +include/libyang/log.h +include/libyang/out.h +include/libyang/parser_data.h +include/libyang/parser_schema.h +include/libyang/plugins_exts_compile.h +include/libyang/plugins_exts_print.h +include/libyang/plugins_exts.h +include/libyang/plugins_types.h +include/libyang/plugins.h +include/libyang/printer_data.h +include/libyang/printer_schema.h +include/libyang/set.h include/libyang/tree_data.h +include/libyang/tree_edit.h include/libyang/tree_schema.h -include/libyang/user_types.h -include/libyang/xml.h +include/libyang/tree.h +include/libyang/version.h lib/libyang.so -lib/libyang.so.1 -lib/libyang/extensions/metadata.so -lib/libyang/extensions/nacm.so -lib/libyang/extensions/yangdata.so -lib/libyang/user_types/user_inet_types.so -lib/libyang/user_types/user_yang_types.so +lib/libyang.so.2 lib/pkgconfig/libyang.pc -man/man1/yanglint.1.gz -man/man1/yangre.1.gz +share/man/man1/yanglint.1.gz +share/man/man1/yangre.1.gz @dir include/libyang -@dir lib/libyang/extensions -@dir lib/libyang/user_types -@dir lib/libyang diff --git a/devel/libyang0/Makefile b/devel/libyang0/Makefile deleted file mode 100644 index 3fe20c22..00000000 --- a/devel/libyang0/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD: head/net/libyang/Makefile 507372 2019-07-26 20:46:53Z gerald $ - -PORTNAME= libyang -PORTVERSION= 0.16 #1.0 -DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= -r3 -CATEGORIES= net - -MAINTAINER= olivier@FreeBSD.org -COMMENT= YANG data modeling language library - -LIB_DEPENDS= libpcre.so:text/libpcre - -USES= cmake gmake compiler:c++11-lang pkgconfig -USE_LDCONFIG= yes - -USE_GITHUB= yes -GH_ACCOUNT= CESNET - -CMAKE_ARGS+= -DENABLE_LYD_PRIV=ON -#CMAKE_ARGS+= -DENABLE_STATIC=ON - -.include diff --git a/devel/libyang0/distinfo b/devel/libyang0/distinfo deleted file mode 100644 index 7d5b8061..00000000 --- a/devel/libyang0/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1569607461 -SHA256 (CESNET-libyang-v0.16-r3_GH0.tar.gz) = 4745460dedc4ba17d8bcfc39ad9ba0d1b91bbe82b55b9417a090390909ba8ca5 -SIZE (CESNET-libyang-v0.16-r3_GH0.tar.gz) = 2999818 diff --git a/devel/libyang0/files/patch-src_parser__lyb.c b/devel/libyang0/files/patch-src_parser__lyb.c deleted file mode 100644 index 83c5655d..00000000 --- a/devel/libyang0/files/patch-src_parser__lyb.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/parser_lyb.c.orig 2019-03-14 23:35:14 UTC -+++ src/parser_lyb.c -@@ -23,6 +23,8 @@ - # define le16toh(x) OSSwapLittleToHostInt16(x) - # define le32toh(x) OSSwapLittleToHostInt32(x) - # define le64toh(x) OSSwapLittleToHostInt64(x) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+# include - #else - # include - #endif diff --git a/devel/libyang0/files/patch-src_printer__lyb.c b/devel/libyang0/files/patch-src_printer__lyb.c deleted file mode 100644 index 47fa1841..00000000 --- a/devel/libyang0/files/patch-src_printer__lyb.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/printer_lyb.c.orig 2019-03-14 23:35:50 UTC -+++ src/printer_lyb.c -@@ -21,6 +21,8 @@ - #ifdef __APPLE__ - # include - # define htole64(x) OSSwapHostToLittleInt64(x) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+# include - #else - # include - #endif diff --git a/devel/libyang0/files/patch-x-CMakeLists.txt b/devel/libyang0/files/patch-x-CMakeLists.txt deleted file mode 100644 index 52c41607..00000000 --- a/devel/libyang0/files/patch-x-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- ./CMakeLists.txt.orig 2019-01-16 10:18:18.000000000 +0200 -+++ ./CMakeLists.txt 2019-09-27 20:07:41.921096000 +0200 -@@ -14,7 +14,7 @@ - set(LIBYANG_MINOR_VERSION 16) - set(LIBYANG_MICRO_VERSION 105) - set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) --set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}) -+set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}) - - # set default build type if not specified by user - if(NOT CMAKE_BUILD_TYPE) -@@ -261,7 +261,7 @@ - set_target_properties(yangobj PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") - endif(ENABLE_STATIC) - --set_target_properties(yang PROPERTIES VERSION ${LIBYANG_VERSION} SOVERSION ${LIBYANG_SOVERSION}) -+set_target_properties(yang PROPERTIES VERSION ${LIBYANG_SOVERSION} SOVERSION ${LIBYANG_SOVERSION}) - - # link math - target_link_libraries(yang m) diff --git a/devel/libyang0/pkg-descr b/devel/libyang0/pkg-descr deleted file mode 100644 index 5ecaaa54..00000000 --- a/devel/libyang0/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -libyang is a YANG data modelling language parser and toolkit written -(and providing API) in C. - -WWW: https://github.com/CESNET/libyang diff --git a/devel/libyang0/pkg-plist b/devel/libyang0/pkg-plist deleted file mode 100644 index c7e76ca3..00000000 --- a/devel/libyang0/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/yanglint -bin/yangre -include/libyang/dict.h -include/libyang/extensions.h -include/libyang/libyang.h -include/libyang/tree_data.h -include/libyang/tree_schema.h -include/libyang/user_types.h -include/libyang/xml.h -lib/libyang.so -lib/libyang.so.0 -lib/libyang/extensions/metadata.so -lib/libyang/extensions/nacm.so -lib/libyang/extensions/yangdata.so -lib/libyang/user_types/user_date_and_time.so -lib/pkgconfig/libyang.pc -man/man1/yanglint.1.gz -man/man1/yangre.1.gz -@dir include/libyang -@dir lib/libyang/extensions -@dir lib/libyang/user_types -@dir lib/libyang