Date: Thu, 21 Jan 2021 14:37:32 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562216 - in head: . audio/amarok audio/clementine-player audio/forked-daapd audio/libgpod audio/rhythmbox comms comms/libimobiledevice comms/libimobiledevice/files comms/libusbmuxd com... Message-ID: <202101211437.10LEbWYf007301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Thu Jan 21 14:37:31 2021 New Revision: 562216 URL: https://svnweb.freebsd.org/changeset/ports/562216 Log: comms/libimobiledevice: Update to 1.3.0 comms/libusbmuxd: Update to 2.0.2 comms/usbmuxd: Update to 1.1.1 devel/libplist: Update to 2.2.0 Resurrect comms/py-libimobiledevice, update to 1.3.0 Resurrect devel/py-libplist, update to 2.2.0 Take maintainership of the ports listed above. Bump PORTREVISION on consumers and adjust LIB_DEPENDS to new versioned library names. Added: head/comms/py-libimobiledevice/ - copied from r524262, head/comms/py-libimobiledevice/ head/comms/usbmuxd/files/patch-configure (contents, props changed) head/comms/usbmuxd/files/patch-src_client.c (contents, props changed) head/comms/usbmuxd/files/patch-src_usb.c (contents, props changed) head/devel/libplist/files/patch-configure.ac (contents, props changed) head/devel/py-libplist/ - copied from r528756, head/devel/py-libplist/ Deleted: head/comms/libimobiledevice/files/patch-src_idevice.c head/comms/usbmuxd/files/patch-ppoll head/devel/libplist/files/patch-configure Modified: head/MOVED head/audio/amarok/Makefile head/audio/clementine-player/Makefile head/audio/forked-daapd/Makefile head/audio/libgpod/Makefile head/audio/rhythmbox/Makefile head/comms/Makefile head/comms/libimobiledevice/Makefile head/comms/libimobiledevice/distinfo head/comms/libimobiledevice/files/patch-configure head/comms/libimobiledevice/pkg-plist head/comms/libusbmuxd/Makefile head/comms/libusbmuxd/distinfo head/comms/libusbmuxd/pkg-plist head/comms/py-libimobiledevice/Makefile head/comms/usbmuxd/Makefile head/comms/usbmuxd/distinfo head/devel/Makefile head/devel/gvfs/Makefile head/devel/kf5-solid/Makefile head/devel/libplist/Makefile head/devel/libplist/distinfo head/devel/libplist/pkg-plist head/devel/py-libplist/Makefile head/multimedia/kodi/Makefile head/sysutils/fusefs-ifuse/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Jan 21 14:33:09 2021 (r562215) +++ head/MOVED Thu Jan 21 14:37:31 2021 (r562216) @@ -13724,7 +13724,6 @@ biology/pycogent||2020-01-27|Has expired: Unmaintained biology/unanimity||2020-01-27|Has expired: Unmaintained, uses EOLed python27 cad/pythoncad||2020-01-27|Has expired: Unmaintained, uses EOLed python27 chinese/bg5pdf||2020-01-27|Has expired: Unmaintained, uses EOLed python27 -comms/py-libimobiledevice||2020-01-27|Has expired: Unmaintained, uses EOLed python27 converters/py-bcode||2020-01-27|Has expired: Unmaintained, uses EOLed python27 converters/py-iconv||2020-01-27|Has expired: Unmaintained, uses EOLed python27 databases/gadfly||2020-01-27|Has expired: Unmaintained, uses EOLed python27 @@ -14441,7 +14440,6 @@ textproc/py-ltxml||2020-03-20|Has expired: Unmaintaine x11-toolkits/flowcanvas||2020-03-20|Has expired: Unmaintained, uses EOLed python27 audio/py-vorbis||2020-03-20|Has expired: Unmaintained, uses EOLed python27 databases/py-cdb||2020-03-20|Has expired: Unmaintained, uses EOLed python27 -devel/py-libplist||2020-03-20|Has expired: Unmaintained, uses EOLed python27 devel/py-mwlib||2020-03-20|Has expired: Unmaintained, uses EOLed python27 graphics/py-soya3d||2020-03-20|Has expired: Unmaintained, uses EOLed python27 irc/py-supybot||2020-03-20|Has expired: Unmaintained, uses EOLed python27 Modified: head/audio/amarok/Makefile ============================================================================== --- head/audio/amarok/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/audio/amarok/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -4,7 +4,7 @@ PORTNAME= amarok DISTVERSIONPREFIX= v DISTVERSION= 2.9.70 PKGVERSIONSUFFIX= -g${GH_TAGNAME} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio kde MAINTAINER= kde@FreeBSD.org @@ -60,8 +60,8 @@ OPTIONS_SUB= yes IPOD_DESC= Apple iPod support IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ - libimobiledevice.so:comms/libimobiledevice \ - libplist.so:devel/libplist + libimobiledevice-1.0.so:comms/libimobiledevice \ + libplist-2.0.so:devel/libplist IPOD_USE= GNOME=gdkpixbuf2,glib20 IPOD_USES= gnome IPOD_CMAKE_BOOL= WITH_IPOD Modified: head/audio/clementine-player/Makefile ============================================================================== --- head/audio/clementine-player/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/audio/clementine-player/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,7 +3,7 @@ PORTNAME= clementine DISTVERSION= 1.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio PKGNAMESUFFIX= -player @@ -167,9 +167,9 @@ GOOGLE_DRIVE_CMAKE_ON= -DENABLE_GOOGLE_DRIVE=ON GOOGLE_DRIVE_CMAKE_OFF= -DENABLE_GOOGLE_DRIVE=OFF GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ - libplist.so:devel/libplist \ - libusbmuxd.so:comms/libusbmuxd \ - libimobiledevice.so:comms/libimobiledevice + libplist-2.0.so:devel/libplist \ + libusbmuxd-2.0.so:comms/libusbmuxd \ + libimobiledevice-1.0.so:comms/libimobiledevice GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF Modified: head/audio/forked-daapd/Makefile ============================================================================== --- head/audio/forked-daapd/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/audio/forked-daapd/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,6 +3,7 @@ PORTNAME= forked-daapd DISTVERSION= 27.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/ejurgensen/forked-daapd/releases/download/${DISTVERSION}/ @@ -23,7 +24,7 @@ LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libjson-c.so:devel/json-c \ libinotify.so:devel/libinotify \ libmxml.so:textproc/mxml \ - libplist.so:devel/libplist \ + libplist-2.0.so:devel/libplist \ libsodium.so:security/libsodium \ libunistring.so:devel/libunistring \ libwebsockets.so:net/libwebsockets Modified: head/audio/libgpod/Makefile ============================================================================== --- head/audio/libgpod/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/audio/libgpod/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,7 +3,7 @@ PORTNAME= libgpod PORTVERSION= 0.8.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -12,7 +12,7 @@ COMMENT?= Library for direct access to iPod contents LICENSE= LGPL20 -LIB_DEPENDS= libplist.so:devel/libplist \ +LIB_DEPENDS= libplist-2.0.so:devel/libplist \ libtag.so:audio/taglib \ libsgutils2.so:sysutils/sg3_utils @@ -34,7 +34,7 @@ OPTIONS_SUB= yes IMOBILE_DESC= Apple iPhone/iPod Touch support -IMOBILE_LIB_DEPENDS= libimobiledevice.so:comms/libimobiledevice +IMOBILE_LIB_DEPENDS= libimobiledevice-1.0.so:comms/libimobiledevice IMOBILE_CONFIGURE_WITH= libimobiledevice MONO_USE= GNOME=gtksharp20 @@ -48,8 +48,12 @@ PORTDOCS= ChangeLog NEWS README* COMMENT:= ${COMMENT:S,iPod,&/iPhone,} .endif +post-patch: + @${REINPLACE_CMD} -e 's|libplist >= 1\.0|libplist-2.0 >= 2.0|g' \ + ${WRKSRC}/configure + post-patch-MONO-on: - ${REINPLACE_CMD} 's/gmcs/mcs/g' ${WRKSRC}/configure ${WRKSRC}/m4/mono.m4 + @${REINPLACE_CMD} 's/gmcs/mcs/g' ${WRKSRC}/configure ${WRKSRC}/m4/mono.m4 .if ${SLAVE_PORT} == no post-install: Modified: head/audio/rhythmbox/Makefile ============================================================================== --- head/audio/rhythmbox/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/audio/rhythmbox/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,7 +3,7 @@ PORTNAME= rhythmbox PORTVERSION= 3.4.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -65,8 +65,8 @@ GRILO_RUN_DEPENDS= grilo-plugins>=0.3.2:net/grilo-plug IPOD_DESC= iPod support IPOD_CONFIGURE_WITH= ipod IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ - libplist.so:devel/libplist \ - libimobiledevice.so:comms/libimobiledevice + libplist-2.0.so:devel/libplist \ + libimobiledevice-1.0.so:comms/libimobiledevice LIRC_CONFIGURE_ENABLE= lirc LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc MTP_CONFIGURE_WITH= mtp Modified: head/comms/Makefile ============================================================================== --- head/comms/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -137,6 +137,7 @@ SUBDIR += py-adafruit-ampy SUBDIR += py-esptool SUBDIR += py-hidapi + SUBDIR += py-libimobiledevice SUBDIR += py-lirc SUBDIR += py-pyserial SUBDIR += py-qt5-sensors Modified: head/comms/libimobiledevice/Makefile ============================================================================== --- head/comms/libimobiledevice/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libimobiledevice/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -1,19 +1,20 @@ # $FreeBSD$ PORTNAME= libimobiledevice -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 PORTREVISION?= 0 CATEGORIES?= comms -MASTER_SITES= http://www.${PORTNAME}.org/downloads/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= jhale@FreeBSD.org COMMENT?= Library to communicate with Apple iOS devices -LICENSE?= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LESSER SLAVE_PORT?= no -USES+= cpe libtool pathfix pkgconfig ssl tar:bzip2 +USES+= cpe libtool localbase pathfix pkgconfig ssl tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=openssl_CFLAGS="-I${OPENSSLINC}" \ openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" @@ -23,8 +24,8 @@ INSTALL_TARGET= install-strip .if ${SLAVE_PORT} == no -LIB_DEPENDS= libplist.so:devel/libplist \ - libusbmuxd.so:comms/libusbmuxd +LIB_DEPENDS= libplist-2.0.so:devel/libplist \ + libusbmuxd-2.0.so:comms/libusbmuxd USES+= gnome USE_GNOME= glib20 @@ -32,7 +33,7 @@ CONFIGURE_ARGS+=--without-cython USE_CSTD= gnu89 USE_LDCONFIG= yes -PORTDOCS= AUTHORS NEWS README +PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS Modified: head/comms/libimobiledevice/distinfo ============================================================================== --- head/comms/libimobiledevice/distinfo Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libimobiledevice/distinfo Thu Jan 21 14:37:31 2021 (r562216) @@ -1,2 +1,3 @@ -SHA256 (libimobiledevice-1.2.0.tar.bz2) = 786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037 -SIZE (libimobiledevice-1.2.0.tar.bz2) = 631495 +TIMESTAMP = 1611089282 +SHA256 (libimobiledevice-1.3.0.tar.bz2) = 53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6 +SIZE (libimobiledevice-1.3.0.tar.bz2) = 733949 Modified: head/comms/libimobiledevice/files/patch-configure ============================================================================== --- head/comms/libimobiledevice/files/patch-configure Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libimobiledevice/files/patch-configure Thu Jan 21 14:37:31 2021 (r562216) @@ -1,19 +1,13 @@ ---- configure.orig 2014-09-24 12:07:10 UTC +Remove bash-ism from configure script + +--- configure.orig 2021-01-21 13:07:51 UTC +++ configure -@@ -17090,7 +17090,7 @@ - py_version=$PYTHON_VERSION - else - py_version=`$PYTHON -c "import sys; \ -- print(sys.version[:3]")` -+ print(sys.version[:3])"` - fi - fi +@@ -18422,7 +18422,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ -@@ -17336,6 +17336,7 @@ - $as_echo "yes" >&6; } - have_openssl=yes - fi -+have_openssl=yes - if test "x$have_openssl" = "xyes"; then - if test "x$use_openssl" != "xyes"; then - enable_openssl=no + if test "X$flag_ok" = Xyes ; then + +- CYTHON_CFLAGS+=" -Wno-cast-function-type" ++ CYTHON_CFLAGS="$CYTHON_CFLAGS -Wno-cast-function-type" + + + Modified: head/comms/libimobiledevice/pkg-plist ============================================================================== --- head/comms/libimobiledevice/pkg-plist Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libimobiledevice/pkg-plist Thu Jan 21 14:37:31 2021 (r562216) @@ -14,8 +14,10 @@ bin/idevicenotificationproxy bin/idevicepair bin/ideviceprovision bin/idevicescreenshot +bin/idevicesetlocation bin/idevicesyslog include/libimobiledevice/afc.h +include/libimobiledevice/companion_proxy.h include/libimobiledevice/debugserver.h include/libimobiledevice/diagnostics_relay.h include/libimobiledevice/file_relay.h @@ -26,10 +28,12 @@ include/libimobiledevice/libimobiledevice.h include/libimobiledevice/lockdown.h include/libimobiledevice/misagent.h include/libimobiledevice/mobile_image_mounter.h +include/libimobiledevice/mobileactivation.h include/libimobiledevice/mobilebackup.h include/libimobiledevice/mobilebackup2.h include/libimobiledevice/mobilesync.h include/libimobiledevice/notification_proxy.h +include/libimobiledevice/preboard.h include/libimobiledevice/property_list_service.h include/libimobiledevice/restore.h include/libimobiledevice/sbservices.h @@ -37,10 +41,10 @@ include/libimobiledevice/screenshotr.h include/libimobiledevice/service.h include/libimobiledevice/syslog_relay.h include/libimobiledevice/webinspector.h -lib/libimobiledevice.a -lib/libimobiledevice.so -lib/libimobiledevice.so.6 -lib/libimobiledevice.so.6.0.0 +lib/libimobiledevice-1.0.a +lib/libimobiledevice-1.0.so +lib/libimobiledevice-1.0.so.6 +lib/libimobiledevice-1.0.so.6.0.0 libdata/pkgconfig/libimobiledevice-1.0.pc man/man1/idevice_id.1.gz man/man1/idevicebackup.1.gz @@ -58,4 +62,5 @@ man/man1/idevicenotificationproxy.1.gz man/man1/idevicepair.1.gz man/man1/ideviceprovision.1.gz man/man1/idevicescreenshot.1.gz +man/man1/idevicesetlocation.1.gz man/man1/idevicesyslog.1.gz Modified: head/comms/libusbmuxd/Makefile ============================================================================== --- head/comms/libusbmuxd/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libusbmuxd/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= libusbmuxd -PORTVERSION= 1.0.10 +PORTVERSION= 2.0.2 CATEGORIES= comms -MASTER_SITES= http://www.libimobiledevice.org/downloads/ +MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Communication interface library for usbmuxd -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libplist.so:devel/libplist +LIB_DEPENDS= libplist-2.0.so:devel/libplist CONFLICTS_INSTALL=usbmuxd-1.0.[6-8] @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -PORTDOCS= AUTHORS README +PORTDOCS= AUTHORS README.md OPTIONS_DEFINE= DOCS INOTIFY Modified: head/comms/libusbmuxd/distinfo ============================================================================== --- head/comms/libusbmuxd/distinfo Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libusbmuxd/distinfo Thu Jan 21 14:37:31 2021 (r562216) @@ -1,2 +1,3 @@ -SHA256 (libusbmuxd-1.0.10.tar.bz2) = 1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2 -SIZE (libusbmuxd-1.0.10.tar.bz2) = 292649 +TIMESTAMP = 1611088906 +SHA256 (libusbmuxd-2.0.2.tar.bz2) = cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20 +SIZE (libusbmuxd-2.0.2.tar.bz2) = 340634 Modified: head/comms/libusbmuxd/pkg-plist ============================================================================== --- head/comms/libusbmuxd/pkg-plist Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/libusbmuxd/pkg-plist Thu Jan 21 14:37:31 2021 (r562216) @@ -1,8 +1,11 @@ +bin/inetcat bin/iproxy include/usbmuxd-proto.h include/usbmuxd.h -lib/libusbmuxd.a -lib/libusbmuxd.so -lib/libusbmuxd.so.4 -lib/libusbmuxd.so.4.0.0 -libdata/pkgconfig/libusbmuxd.pc +lib/libusbmuxd-2.0.a +lib/libusbmuxd-2.0.so +lib/libusbmuxd-2.0.so.6 +lib/libusbmuxd-2.0.so.6.0.0 +libdata/pkgconfig/libusbmuxd-2.0.pc +man/man1/inetcat.1.gz +man/man1/iproxy.1.gz Modified: head/comms/py-libimobiledevice/Makefile ============================================================================== --- head/comms/py-libimobiledevice/Makefile Mon Jan 27 15:11:58 2020 (r524262) +++ head/comms/py-libimobiledevice/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -4,19 +4,17 @@ PORTREVISION= 0 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for libimobiledevice -DEPRECATED= Unmaintained, uses EOLed python27 -EXPIRATION_DATE= 2020-01-27 +LIB_DEPENDS= libimobiledevice-1.0.so:${MASTER_PORT} \ + libplist-2.0.so:devel/libplist +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} -LIB_DEPENDS= libimobiledevice.so:${MASTER_PORT} -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${PY_FLAVOR} - PORTSCOUT= ignore:1 -USES= python:2.7 +USES= python:3.6+ USE_PYTHON= flavors cython BINARY_ALIAS= cython=cython-${PYTHON_VER} CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" @@ -33,7 +31,7 @@ PLIST_FILES= include/imobiledevice/cython/imobiledevic post-patch: @${REINPLACE_CMD} \ - -e 's,../src/libimobiledevice.la,-limobiledevice,' \ + -e 's,$$(top_builddir)/src/libimobiledevice-1.0.la,-limobiledevice-1.0,' \ -e 's/$$(imobiledevice_la_DEPENDENCIES)//' \ ${BUILD_WRKSRC}/Makefile.in Modified: head/comms/usbmuxd/Makefile ============================================================================== --- head/comms/usbmuxd/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/usbmuxd/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -1,35 +1,37 @@ # $FreeBSD$ PORTNAME= usbmuxd -DISTVERSION= 1.1.0 +DISTVERSION= 1.1.1 CATEGORIES= comms -MASTER_SITES= http://www.libimobiledevice.org/downloads/ +MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Daemon for multiplexing connections over USB to iPhone/iPod Touch LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 +LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 -LIB_DEPENDS= libplist.so:devel/libplist \ - libimobiledevice.so:comms/libimobiledevice +LIB_DEPENDS= libplist-2.0.so:devel/libplist \ + libimobiledevice-1.0.so:comms/libimobiledevice -USES= autoreconf cpe libtool pathfix pkgconfig tar:bzip2 +USES= autoreconf cpe libtool localbase pathfix pkgconfig tar:bzip2 CPE_VENDOR= nikias_bassen GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-systemd -PLIST_FILES= man/man1/${PORTNAME}.1.gz \ +PLIST_FILES= man/man8/${PORTNAME}.8.gz \ sbin/${PORTNAME} -PORTDOCS= AUTHORS NEWS README +PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS post-patch: # TODO: add devd(8) rule. @${REINPLACE_CMD} \ - -e '/*cygwin*/ s,),|dragonfly*|*bsd*),' \ + -e '/darwin*/ s,),|dragonfly*|*bsd*),' \ ${WRKSRC}/configure.ac post-install: Modified: head/comms/usbmuxd/distinfo ============================================================================== --- head/comms/usbmuxd/distinfo Thu Jan 21 14:33:09 2021 (r562215) +++ head/comms/usbmuxd/distinfo Thu Jan 21 14:37:31 2021 (r562216) @@ -1,2 +1,3 @@ -SHA256 (usbmuxd-1.1.0.tar.bz2) = 3e8948b4fe4250ee5c4bd41ccd1b83c09b8a6f5518a7d131a66fd38bd461b42d -SIZE (usbmuxd-1.1.0.tar.bz2) = 321897 +TIMESTAMP = 1611089774 +SHA256 (usbmuxd-1.1.1.tar.bz2) = c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e +SIZE (usbmuxd-1.1.1.tar.bz2) = 345290 Added: head/comms/usbmuxd/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/usbmuxd/files/patch-configure Thu Jan 21 14:37:31 2021 (r562216) @@ -0,0 +1,13 @@ +Remove bash-ism from configure script + +--- configure.orig 2021-01-21 13:11:33 UTC ++++ configure +@@ -16412,7 +16412,7 @@ $as_echo "#define HAVE_LIBIMOBILEDEVICE 1" >>confdefs. + + + CACHED_CFLAGS="$CFLAGS" +- CFLAGS+=" $libimobiledevice_CFLAGS" ++ CFLAGS="$CFLAGS $libimobiledevice_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enum idevice_connection_type" >&5 + $as_echo_n "checking for enum idevice_connection_type... " >&6; } + if ${ac_cv_enum_idevice_connection_type+:} false; then : Added: head/comms/usbmuxd/files/patch-src_client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/usbmuxd/files/patch-src_client.c Thu Jan 21 14:37:31 2021 (r562216) @@ -0,0 +1,13 @@ +client.c:210:18: error: use of undeclared identifier 'IPPROTO_TCP' + setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY, (void*)&yes, sizeof(int)); + +--- src/client.c.orig 2020-06-09 16:20:07 UTC ++++ src/client.c +@@ -31,6 +31,7 @@ + #include <unistd.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + #include <netinet/tcp.h> + #include <sys/un.h> + #include <arpa/inet.h> Added: head/comms/usbmuxd/files/patch-src_usb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/usbmuxd/files/patch-src_usb.c Thu Jan 21 14:37:31 2021 (r562216) @@ -0,0 +1,17 @@ +libusb_has_capability() was implemented in r361977 and is only available on: +FreeBSD >= 1104501, 1201518, 1300098 +However, libusb in all supported versions of FreeBSD supports hotplug events. + +This patch can be safely removed after 11.4 and 12.1 EOL. + +--- src/usb.c.orig 2021-01-21 10:10:40 UTC ++++ src/usb.c +@@ -815,7 +815,7 @@ int usb_init(void) + collection_init(&device_list); + + #ifdef HAVE_LIBUSB_HOTPLUG_API +- if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) { ++ if (1) { + usbmuxd_log(LL_INFO, "Registering for libusb hotplug events"); + res = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, VID_APPLE, LIBUSB_HOTPLUG_MATCH_ANY, 0, usb_hotplug_cb, NULL, &usb_hotplug_cb_handle); + if (res == LIBUSB_SUCCESS) { Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -4583,6 +4583,7 @@ SUBDIR += py-libcst SUBDIR += py-libioc SUBDIR += py-libpeas + SUBDIR += py-libplist SUBDIR += py-libtaxii SUBDIR += py-libtmux SUBDIR += py-libusb1 Modified: head/devel/gvfs/Makefile ============================================================================== --- head/devel/gvfs/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/gvfs/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,7 +3,7 @@ PORTNAME= gvfs PORTVERSION= 1.46.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -22,7 +22,7 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgudev-1.0.so:devel/libgudev \ libudisks2.so:sysutils/libudisks \ libsecret-1.so:security/libsecret - + RUN_DEPENDS= bsdisks>0:sysutils/bsdisks PORTSCOUT= limitw:1,even @@ -59,8 +59,8 @@ BLURAY_DESC= Blu-ray metadata support FUSE_USES= fuse:3 FUSE_MESON_TRUE= fuse -AFC_LIB_DEPENDS= libimobiledevice.so:comms/libimobiledevice \ - libplist.so:devel/libplist +AFC_LIB_DEPENDS= libimobiledevice-1.0.so:comms/libimobiledevice \ + libplist-2.0.so:devel/libplist AFC_MESON_TRUE= afc GOA_LIB_DEPENDS= libgoa-1.0.so:net/gnome-online-accounts @@ -88,4 +88,3 @@ NFS_LIB_DEPENDS= libnfs.so:net/libnfs NFS_MESON_TRUE= nfs .include <bsd.port.mk> - Modified: head/devel/kf5-solid/Makefile ============================================================================== --- head/devel/kf5-solid/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/kf5-solid/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -2,6 +2,7 @@ PORTNAME= solid DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -18,8 +19,8 @@ USE_QT= concurrent core dbus declarative gui linguist OPTIONS_DEFINE= IMOBILE IMOBILE_DESC= Apple iPhone/iPod Touch support -IMOBILE_LIB_DEPENDS= libimobiledevice.so:comms/libimobiledevice \ - libplist.so:devel/libplist +IMOBILE_LIB_DEPENDS= libimobiledevice-1.0.so:comms/libimobiledevice \ + libplist-2.0.so:devel/libplist IMOBILE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_IMobileDevice \ CMAKE_DISABLE_FIND_PACKAGE_PList Modified: head/devel/libplist/Makefile ============================================================================== --- head/devel/libplist/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/libplist/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= libplist -PORTVERSION= 1.12 +PORTVERSION= 2.2.0 PORTREVISION?= 0 -CATEGORIES?= devel -MASTER_SITES= http://www.libimobiledevice.org/downloads/ +CATEGORIES= devel +MASTER_SITES= https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/ -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= jhale@FreeBSD.org COMMENT?= Library to handle Apple Property List format -LICENSE?= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -SLAVE_PORT?= no - -USES+= compiler gnome libtool pathfix pkgconfig tar:bzip2 +USES+= autoreconf compiler gnome libtool pathfix pkgconfig tar:bzip2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +SLAVE_PORT?= no + .if ${SLAVE_PORT} == no USE_GNOME= libxml2 CONFIGURE_ARGS= --without-cython USE_LDCONFIG= ${LOCALBASE}/lib -PORTDOCS= AUTHORS NEWS README +PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS Modified: head/devel/libplist/distinfo ============================================================================== --- head/devel/libplist/distinfo Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/libplist/distinfo Thu Jan 21 14:37:31 2021 (r562216) @@ -1,2 +1,3 @@ -SHA256 (libplist-1.12.tar.bz2) = 0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be -SIZE (libplist-1.12.tar.bz2) = 384321 +TIMESTAMP = 1611087644 +SHA256 (libplist-2.2.0.tar.bz2) = 4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a +SIZE (libplist-2.2.0.tar.bz2) = 451801 Added: head/devel/libplist/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libplist/files/patch-configure.ac Thu Jan 21 14:37:31 2021 (r562216) @@ -0,0 +1,106 @@ +Remove bash-isms from configure script + +--- configure.ac.orig 2020-06-15 12:45:49 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], + + 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 + + AC_SUBST(GLOBAL_CFLAGS) +@@ -201,23 +201,23 @@ fi + + 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 + 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 + 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 + +- 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 + Modified: head/devel/libplist/pkg-plist ============================================================================== --- head/devel/libplist/pkg-plist Thu Jan 21 14:33:09 2021 (r562215) +++ head/devel/libplist/pkg-plist Thu Jan 21 14:37:31 2021 (r562216) @@ -13,13 +13,14 @@ include/plist/Structure.h include/plist/Uid.h include/plist/plist++.h include/plist/plist.h -lib/libplist++.a -lib/libplist++.so -lib/libplist++.so.3 -lib/libplist++.so.3.0.0 -lib/libplist.a -lib/libplist.so -lib/libplist.so.3 -lib/libplist.so.3.0.0 -libdata/pkgconfig/libplist++.pc -libdata/pkgconfig/libplist.pc +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.a +lib/libplist-2.0.so +lib/libplist-2.0.so.3 +lib/libplist-2.0.so.3.3.0 +libdata/pkgconfig/libplist++-2.0.pc +libdata/pkgconfig/libplist-2.0.pc +man/man1/plistutil.1.gz Modified: head/devel/py-libplist/Makefile ============================================================================== --- head/devel/py-libplist/Makefile Fri Mar 20 02:30:24 2020 (r528756) +++ head/devel/py-libplist/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -4,17 +4,14 @@ PORTREVISION= 0 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for libplist -DEPRECATED= Unmaintained, uses EOLed python27 -EXPIRATION_DATE= 2020-03-19 +LIB_DEPENDS= libplist-2.0.so:${MASTER_PORT} -LIB_DEPENDS= libplist.so:${MASTER_PORT} - PORTSCOUT= ignore:1 -USES= python:2.7 +USES= python:3.6+ USE_PYTHON= flavors cython BINARY_ALIAS= cython=cython-${PYTHON_VER} CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" @@ -34,9 +31,8 @@ PLIST_FILES= include/plist/cython/plist.pxd \ ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/plist.so pre-configure: - @${REINPLACE_CMD} -e 's,../src/libplist.la,-lplist,' \ - -e 's,$$(plist_la_DEPENDENCIES),,' \ - ${BUILD_WRKSRC}/Makefile.in + @${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 Modified: head/multimedia/kodi/Makefile ============================================================================== --- head/multimedia/kodi/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/multimedia/kodi/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -2,6 +2,7 @@ PORTNAME= kodi DISTVERSION= 19.0RC1 +PORTREVISION= 1 CATEGORIES= multimedia java MAINTAINER= yzrh@noema.org @@ -122,7 +123,7 @@ SSE4_2_DESC= Use SSE4.2 optimized routines AVX_DESC= Use AVX optimized routines AVX2_DESC= Use AVX2 optimized routines -AIRPLAY_LIB_DEPENDS= libplist.so:devel/libplist \ +AIRPLAY_LIB_DEPENDS= libplist-2.0.so:devel/libplist \ libshairplay.so:audio/shairplay AIRPLAY_CMAKE_BOOL= ENABLE_PLIST \ ENABLE_AIRTUNES Modified: head/sysutils/fusefs-ifuse/Makefile ============================================================================== --- head/sysutils/fusefs-ifuse/Makefile Thu Jan 21 14:33:09 2021 (r562215) +++ head/sysutils/fusefs-ifuse/Makefile Thu Jan 21 14:37:31 2021 (r562216) @@ -3,7 +3,7 @@ PORTNAME= ifuse PORTVERSION= 1.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.libimobiledevice.org/downloads/ PKGNAMEPREFIX= fusefs- @@ -13,8 +13,8 @@ COMMENT= FUSE-based filesystem for mounting iOS device LICENSE= LGPL21 -LIB_DEPENDS= libplist.so:devel/libplist \ - libimobiledevice.so:comms/libimobiledevice +LIB_DEPENDS= libplist-2.0.so:devel/libplist \ + libimobiledevice-1.0.so:comms/libimobiledevice RUN_DEPENDS= usbmuxd:comms/usbmuxd USE_GNOME= glib20 @@ -24,5 +24,8 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/${PORTNAME} man/man1/ifuse.1.gz + +post-patch: + @${REINPLACE_CMD} -e 's|\"libplist|"libplist-2.0|g' ${WRKSRC}/configure .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101211437.10LEbWYf007301>