diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile index ea966caff1ec..9eeec7850dc0 100644 --- a/devel/libplist/Makefile +++ b/devel/libplist/Makefile @@ -1,38 +1,40 @@ PORTNAME= libplist -PORTVERSION= 2.2.0 -PORTREVISION?= 3 +PORTVERSION= 2.6.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Library to handle Apple Property List format WWW= https://www.libimobiledevice.org LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -USES+= autoreconf compiler cpe gnome libtool pathfix pkgconfig tar:bzip2 +USES+= autoreconf compiler cpe libtool pathfix pkgconfig tar:bzip2 CPE_VENDOR= libimobiledevice + GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip SLAVE_PORT?= no .if ${SLAVE_PORT} == no -USE_GNOME= libxml2 +USE_LDCONFIG= yes + CONFIGURE_ARGS= --without-cython -USE_LDCONFIG= ${LOCALBASE}/lib + +TEST_TARGET= check PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif # ${SLAVE_PORT} == no .include diff --git a/devel/libplist/distinfo b/devel/libplist/distinfo index 0c4b757e958c..55bb122e43b4 100644 --- a/devel/libplist/distinfo +++ b/devel/libplist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611087644 -SHA256 (libplist-2.2.0.tar.bz2) = 4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a -SIZE (libplist-2.2.0.tar.bz2) = 451801 +TIMESTAMP = 1720417590 +SHA256 (libplist-2.6.0.tar.bz2) = 67be9ee3169366589c92dc7c22809b90f51911dd9de22520c39c9a64fb047c9c +SIZE (libplist-2.6.0.tar.bz2) = 493169 diff --git a/devel/libplist/files/patch-configure.ac b/devel/libplist/files/patch-configure.ac index 8df61d669ed3..5eadcb14d420 100644 --- a/devel/libplist/files/patch-configure.ac +++ b/devel/libplist/files/patch-configure.ac @@ -1,106 +1,108 @@ Remove bash-isms from configure script ---- configure.ac.orig 2020-06-15 12:45:49 UTC +--- configure.ac.orig 2024-02-21 00:49:54 UTC +++ configure.ac -@@ -154,7 +154,7 @@ AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredu - GLOBAL_LDFLAGS="$PTHREAD_LIBS" - - if test "x$ac_cv_fmin_builtin" != "xyes"; then -- GLOBAL_LDFLAGS+=" -lm" -+ GLOBAL_LDFLAGS="$GLOBAL_CFLAGS -lm" - fi - - AC_ARG_ENABLE(debug, -@@ -169,7 +169,7 @@ esac], +@@ -189,16 +189,16 @@ if (test "x$debug" = "xyes"); then if (test "x$debug" = "xyes"); then AC_DEFINE(DEBUG, 1, [Define if debug message output code should be built.]) - GLOBAL_CFLAGS+=" -g" + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -g" fi + if test "x$enable_static" = "xyes" -a "x$enable_shared" = "xno"; then +- GLOBAL_CFLAGS+=" -DLIBPLIST_STATIC" ++ GLOBAL_CFLAGS="$GLOBAL_CFLAGS -DLIBPLIST_STATIC" + fi + + GLOBAL_CXXFLAGS=$GLOBAL_CFLAGS + AS_COMPILER_FLAG([-fvisibility=hidden], [ +- GLOBAL_CFLAGS+=" -fvisibility=hidden" ++ GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fvisibility=hidden" + ], []) + AC_SUBST(GLOBAL_CFLAGS) -@@ -201,23 +201,23 @@ fi +@@ -237,23 +237,23 @@ if test "x$build_sanitizers" = "xyes"; then if test "x$build_sanitizers" = "xyes"; then AS_COMPILER_FLAG([-fsanitize=address], [ - SANITIZER_FLAGS+=" -fsanitize=address" + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=address" ASAN_AVAILABLE=yes ], []) if test "$ASAN_AVAILABLE" = "yes"; then AS_COMPILER_FLAG([-fsanitize=address -fsanitize-address-use-after-scope], [ - SANITIZER_FLAGS+=" -fsanitize-address-use-after-scope" + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-address-use-after-scope" ], []) - SANITIZERS+="ASAN " + SANITIZERS="$SANITIZERS ASAN" fi AS_COMPILER_FLAG([-fsanitize=undefined], [ - SANITIZER_FLAGS+=" -fsanitize=undefined" + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=undefined" UBSAN_AVAILABLE=yes ], []) if test "$UBSAN_AVAILABLE" = "yes"; then - SANITIZERS+="UBSAN " + SANITIZERS="$SANITIZERS UBSAN" fi if test -z "$SANITIZER_FLAGS"; then -@@ -230,13 +230,13 @@ if test "x$build_sanitizers" = "xyes"; then +@@ -266,13 +266,13 @@ if test "x$build_sanitizers" = "xyes"; then if test -z "$SAN_COV_FLAGS"; then SAN_COV_FLAGS="$COV_CHECK" else - SAN_COV_FLAGS+=",$COV_CHECK" + SAN_COV_FLAGS="$SAN_COV_FLAGS,$COV_CHECK" fi ], []) done if test -n "$SAN_COV_FLAGS"; then - SANITIZER_FLAGS+=" -fsanitize-coverage=$SAN_COV_FLAGS" - SANITIZERS+="+coverage " + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-coverage=$SAN_COV_FLAGS" + SANITIZERS="$SANITIZERS +coverage" else AC_MSG_WARN([No sanitizer coverage supported by compiler]) fi -@@ -244,20 +244,20 @@ if test "x$build_sanitizers" = "xyes"; then +@@ -280,20 +280,20 @@ if test "x$build_sanitizers" = "xyes"; then CFLAGS="-O1" AS_COMPILER_FLAG([-fno-omit-frame-pointer], [ - CFLAGS+=" -fno-omit-frame-pointer" + CFLAGS="$CFLAGS -fno-omit-frame-pointer" ], []) AS_COMPILER_FLAG([-gline-tables-only], [ - CFLAGS+=" -gline-tables-only" + CFLAGS="$CFLAGS -gline-tables-only" ], [ - CFLAGS+=" -g" + CFLAGS="$CFLAGS -g" ]) - EXTRA_CONF+=" Enabled sanitizers ......: $SANITIZERS + EXTRA_CONF="$EXTRA_CONF Enabled sanitizers ......:$SANITIZERS " - CFLAGS+=" $SANITIZER_FLAGS" + CFLAGS="$CFLAGS $SANITIZER_FLAGS" CXXFLAGS="$CFLAGS -std=c++11" fi -@@ -266,9 +266,9 @@ if test "x$build_fuzzers" = "xyes"; then - AC_MSG_WARN([building fuzzers requires clang/clang++ (continuing anyway)]) - fi +@@ -307,9 +307,9 @@ if test "x$build_fuzzers" = "xyes"; then + ;; + esac - CFLAGS+=" -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" - EXTRA_CONF+=" Build fuzzers ...........: yes + EXTRA_CONF="$EXTRA_CONF Build fuzzers ...........: yes " fi diff --git a/devel/libplist/pkg-plist b/devel/libplist/pkg-plist index 398986345c5f..56eedb62014f 100644 --- a/devel/libplist/pkg-plist +++ b/devel/libplist/pkg-plist @@ -1,26 +1,26 @@ bin/plistutil include/plist/Array.h include/plist/Boolean.h include/plist/Data.h include/plist/Date.h include/plist/Dictionary.h include/plist/Integer.h include/plist/Key.h include/plist/Node.h include/plist/Real.h include/plist/String.h include/plist/Structure.h include/plist/Uid.h include/plist/plist++.h include/plist/plist.h lib/libplist++-2.0.a lib/libplist++-2.0.so -lib/libplist++-2.0.so.3 -lib/libplist++-2.0.so.3.3.0 +lib/libplist++-2.0.so.4 +lib/libplist++-2.0.so.4.6.0 lib/libplist-2.0.a lib/libplist-2.0.so -lib/libplist-2.0.so.3 -lib/libplist-2.0.so.3.3.0 +lib/libplist-2.0.so.4 +lib/libplist-2.0.so.4.6.0 libdata/pkgconfig/libplist++-2.0.pc libdata/pkgconfig/libplist-2.0.pc share/man/man1/plistutil.1.gz diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile index 2c282a863a40..ad3bb9b9d1c1 100644 --- a/devel/py-libplist/Makefile +++ b/devel/py-libplist/Makefile @@ -1,41 +1,38 @@ PORTREVISION= 0 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for libplist +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython3>=3.0.0:lang/cython3@${PY_FLAVOR} LIB_DEPENDS= libplist-2.0.so:${MASTER_PORT} -PORTSCOUT= ignore:1 +USES+= localbase:ldflags python +USE_PYTHON= flavors -USES= cpe python -CPE_VENDOR= libimobiledevice -USE_PYTHON= flavors cython -BINARY_ALIAS= cython=cython-${PYTHON_VER} CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" -SLAVE_PORT= yes -MASTERDIR= ${.CURDIR:H:H}/devel/libplist -# Required to reference installed libplist. -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST= ${.CURDIR}/pkg-plist +BINARY_ALIAS= cython=cython-${PYTHON_VER} +MASTERDIR= ${.CURDIR:H:H}/devel/libplist +PORTSCOUT= ignore:1 BUILD_WRKSRC= ${WRKSRC}/cython INSTALL_WRKSRC= ${BUILD_WRKSRC} +PLIST= ${.CURDIR}/pkg-plist PLIST_FILES= include/plist/cython/plist.pxd \ - ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/plist.a \ - ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/plist.so + ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}/plist.so + +SLAVE_PORT= yes pre-configure: @${REINPLACE_CMD} -e 's|$$(top_builddir)/src/libplist-2.0.la|-lplist-2.0|' \ ${BUILD_WRKSRC}/Makefile.am post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/plist/cython ${INSTALL_DATA} ${INSTALL_WRKSRC}/plist.pxd \ ${STAGEDIR}${PREFIX}/include/plist/cython .include "${MASTERDIR}/Makefile"