Date: Sun, 28 Sep 2014 22:58:52 +0000 (UTC) From: Alberto Villa <avilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369503 - in head: . comms comms/libimobiledevice comms/libimobiledevice/files comms/libusbmuxd comms/libusbmuxd/files comms/py-libimobiledevice comms/usbmuxd comms/usbmuxd/files devel/... Message-ID: <201409282258.s8SMwqon016026@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avilla Date: Sun Sep 28 22:58:51 2014 New Revision: 369503 URL: http://svnweb.freebsd.org/changeset/ports/369503 QAT: https://qat.redports.org/buildarchive/r369503/ Log: - Update libplist to 1.11. - Split libusbmuxd.so into comms/libusbmuxd and update to 1.0.9. - Update libimobiledevice to 1.1.6. - Update usbmuxd to Git snapshot (~1.0.9). - Document usbmuxd upgrade process. This marks an important refactoring effort for proper iOS 7 support. It's packed with new features, tools, speed improvements, code refactoring, crash fixes, memory leak fixes and much more. Added: head/comms/libimobiledevice/files/patch-configure (contents, props changed) head/comms/libusbmuxd/ - copied from r369151, head/comms/usbmuxd/ head/devel/libplist/files/patch-configure (contents, props changed) Deleted: head/comms/libimobiledevice/files/patch-git_62ab50f head/comms/libusbmuxd/files/ head/comms/usbmuxd/files/ head/comms/usbmuxd/pkg-plist head/devel/libplist/files/patch-src__Dictionary.cpp head/devel/py-libplist/files/ head/devel/py-libplist/pkg-plist Modified: head/UPDATING head/comms/Makefile head/comms/libimobiledevice/Makefile head/comms/libimobiledevice/distinfo head/comms/libimobiledevice/pkg-plist head/comms/libusbmuxd/Makefile head/comms/libusbmuxd/distinfo head/comms/libusbmuxd/pkg-descr head/comms/libusbmuxd/pkg-plist head/comms/py-libimobiledevice/Makefile head/comms/usbmuxd/Makefile head/comms/usbmuxd/distinfo head/devel/libplist/Makefile head/devel/libplist/distinfo head/devel/libplist/pkg-plist head/devel/py-libplist/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Sep 28 22:08:52 2014 (r369502) +++ head/UPDATING Sun Sep 28 22:58:51 2014 (r369503) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140929: + AFFECTS: users of comms/usbmuxd + AUTHOR: avilla@FreeBSD.org + + libusbmuxd.so was split from comms/usbmuxd into comms/libusbmuxd. + Remove usbmuxd before upgrading to avoid conflicts: + + # pkg delete -f usbmuxd + + If you need the daemon usbmuxd(1), you can reinstall the package + after the upgrade. + 20140928: AFFECTS: users of deskutils/calibre AUTHOR: madpilot@FreeBSD.org Modified: head/comms/Makefile ============================================================================== --- head/comms/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -82,6 +82,7 @@ SUBDIR += libmodbus SUBDIR += libticables2 SUBDIR += libticalcs2 + SUBDIR += libusbmuxd SUBDIR += linrad SUBDIR += lirc SUBDIR += locator Modified: head/comms/libimobiledevice/Makefile ============================================================================== --- head/comms/libimobiledevice/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/libimobiledevice/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= libimobiledevice -PORTVERSION= 1.1.5 -PORTREVISION?= 1 +PORTVERSION= 1.1.6 +PORTREVISION?= 0 CATEGORIES?= comms MASTER_SITES= http://www.${PORTNAME}.org/downloads/ @@ -13,19 +13,19 @@ LICENSE?= LGPL21 SLAVE_PORT?= no -USES= libtool pathfix pkgconfig tar:bzip2 +USES+= libtool pathfix pkgconfig tar:bzip2 USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= openssl_CFLAGS="-I${OPENSSLINC}" \ +CONFIGURE_ARGS+=openssl_CFLAGS="-I${OPENSSLINC}" \ openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -.if ${SLAVE_PORT} == "no" +.if ${SLAVE_PORT} == no LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist \ - libusbmuxd.so:${PORTSDIR}/comms/usbmuxd + libusbmuxd.so:${PORTSDIR}/comms/libusbmuxd USE_GNOME= glib20 CONFIGURE_ARGS+=--without-cython @@ -44,6 +44,6 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif # ${SLAVE_PORT} == "no" +.endif # ${SLAVE_PORT} == no .include <bsd.port.mk> Modified: head/comms/libimobiledevice/distinfo ============================================================================== --- head/comms/libimobiledevice/distinfo Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/libimobiledevice/distinfo Sun Sep 28 22:58:51 2014 (r369503) @@ -1,2 +1,2 @@ -SHA256 (libimobiledevice-1.1.5.tar.bz2) = d52ecd069dfc0abe8a81ed0718540df2def2f84b44e88ea783d44312b6f5f33e -SIZE (libimobiledevice-1.1.5.tar.bz2) = 577138 +SHA256 (libimobiledevice-1.1.6.tar.bz2) = 1fcd56489a27181617507b1d8aaf122f66d9860c0fe5af4c78f9e0ed129e33e0 +SIZE (libimobiledevice-1.1.6.tar.bz2) = 619429 Added: head/comms/libimobiledevice/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/libimobiledevice/files/patch-configure Sun Sep 28 22:58:51 2014 (r369503) @@ -0,0 +1,19 @@ +--- configure.orig 2014-09-24 12:07:10 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 + +@@ -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 Modified: head/comms/libimobiledevice/pkg-plist ============================================================================== --- head/comms/libimobiledevice/pkg-plist Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/libimobiledevice/pkg-plist Sun Sep 28 22:58:51 2014 (r369503) @@ -1,12 +1,14 @@ bin/idevice_id bin/idevicebackup bin/idevicebackup2 +bin/idevicecrashreport bin/idevicedate bin/idevicedebugserverproxy bin/idevicediagnostics bin/ideviceenterrecovery bin/ideviceimagemounter bin/ideviceinfo +bin/idevicename bin/idevicepair bin/ideviceprovision bin/idevicescreenshot @@ -28,6 +30,8 @@ include/libimobiledevice/notification_pr include/libimobiledevice/restore.h include/libimobiledevice/sbservices.h include/libimobiledevice/screenshotr.h +include/libimobiledevice/service.h +include/libimobiledevice/syslog_relay.h include/libimobiledevice/webinspector.h lib/libimobiledevice.a lib/libimobiledevice.so @@ -37,14 +41,15 @@ libdata/pkgconfig/libimobiledevice-1.0.p man/man1/idevice_id.1.gz man/man1/idevicebackup.1.gz man/man1/idevicebackup2.1.gz +man/man1/idevicecrashreport.1.gz man/man1/idevicedate.1.gz man/man1/idevicedebugserverproxy.1.gz man/man1/idevicediagnostics.1.gz man/man1/ideviceenterrecovery.1.gz man/man1/ideviceimagemounter.1.gz man/man1/ideviceinfo.1.gz +man/man1/idevicename.1.gz man/man1/idevicepair.1.gz man/man1/ideviceprovision.1.gz man/man1/idevicescreenshot.1.gz man/man1/idevicesyslog.1.gz -@dirrm include/libimobiledevice Modified: head/comms/libusbmuxd/Makefile ============================================================================== --- head/comms/usbmuxd/Makefile Wed Sep 24 01:48:14 2014 (r369151) +++ head/comms/libusbmuxd/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -1,50 +1,38 @@ # $FreeBSD$ -PORTNAME= usbmuxd -PORTVERSION= 1.0.8 +PORTNAME= libusbmuxd +PORTVERSION= 1.0.9 CATEGORIES= comms MASTER_SITES= http://www.libimobiledevice.org/downloads/ MAINTAINER= avilla@FreeBSD.org -COMMENT= Daemon for multiplexing connections over USB to iPhone/iPod Touch +COMMENT= Communication interface library for usbmuxd + +LICENSE= LGPL21 LGPL3 +LICENSE_COMB= dual LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist -USES= cmake pkgconfig tar:bzip2 +CONFLICTS_INSTALL=usbmuxd-1.0.[6-8] + +USES= libtool pathfix pkgconfig tar:bzip2 +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -PORTDOCS= AUTHORS README README.devel +PORTDOCS= AUTHORS README -OPTIONS_DEFINE= INOTIFY +OPTIONS_DEFINE= DOCS INOTIFY INOTIFY_DESC= Use inotify instead of polling (saves energy) -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MINOTIFY} -LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify -CMAKE_ARGS+= -DWANT_INOTIFY:BOOL=TRUE -.else -CMAKE_ARGS+= -DWANT_INOTIFY:BOOL=FALSE -.endif - -.if ${OSVERSION} <= 800107 || ${OSVERSION} >= 900000 && ${OSVERSION} <= 900002 -IGNORE= requires libusb 1.0.3 -.endif - -post-patch: - @${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/Modules/FindInotify.cmake - -pre-install: - @${REINPLACE_CMD} -e '1 s,python,env python,' \ - ${WRKSRC}/python-client/*.py +INOTIFY_LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify +# *_CONFIGURE_WITH can't be used as --with-inotify doesn't work. +INOTIFY_CONFIGURE_OFF= --without-inotify +INOTIFY_CFLAGS= -I${LOCALBASE}/include +INOTIFY_LDFLAGS= -L${LOCALBASE}/lib -linotify post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/python-client/*.py ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/comms/libusbmuxd/distinfo ============================================================================== --- head/comms/usbmuxd/distinfo Wed Sep 24 01:48:14 2014 (r369151) +++ head/comms/libusbmuxd/distinfo Sun Sep 28 22:58:51 2014 (r369503) @@ -1,2 +1,2 @@ -SHA256 (usbmuxd-1.0.8.tar.bz2) = 899d63cb7915ee844f1d3d651bee06f3dbb862cebca849f0a57f27a0fdfcba5c -SIZE (usbmuxd-1.0.8.tar.bz2) = 59347 +SHA256 (libusbmuxd-1.0.9.tar.bz2) = 2e3f708a3df30ad7832d2d2389eeb29f68f4e4488a42a20149cc99f4f9223dfc +SIZE (libusbmuxd-1.0.9.tar.bz2) = 265940 Modified: head/comms/libusbmuxd/pkg-descr ============================================================================== --- head/comms/usbmuxd/pkg-descr Wed Sep 24 01:48:14 2014 (r369151) +++ head/comms/libusbmuxd/pkg-descr Sun Sep 28 22:58:51 2014 (r369503) @@ -4,4 +4,6 @@ Touch. To users, it means you can sync y etc. over USB. To developers, it means you can connect to any listening localhost socket on the device. +This package contains the usbmuxd communication interface library. + WWW: http://marcansoft.com/blog/iphonelinux/usbmuxd Modified: head/comms/libusbmuxd/pkg-plist ============================================================================== --- head/comms/usbmuxd/pkg-plist Wed Sep 24 01:48:14 2014 (r369151) +++ head/comms/libusbmuxd/pkg-plist Sun Sep 28 22:58:51 2014 (r369503) @@ -1,11 +1,8 @@ bin/iproxy include/usbmuxd-proto.h include/usbmuxd.h +lib/libusbmuxd.a lib/libusbmuxd.so -lib/libusbmuxd.so.1.0.8 lib/libusbmuxd.so.2 +lib/libusbmuxd.so.2.1.0 libdata/pkgconfig/libusbmuxd.pc -sbin/usbmuxd -%%DATADIR%%/tcprelay.py -%%DATADIR%%/usbmux.py -@dirrm %%DATADIR%% Modified: head/comms/py-libimobiledevice/Makefile ============================================================================== --- head/comms/py-libimobiledevice/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/py-libimobiledevice/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,8 @@ BUILD_DEPENDS= cython:${PORTSDIR}/lang/c ${PYTHON_SITELIBDIR}/plist.so:${PORTSDIR}/devel/py-libplist RUN_DEPENDS= ${PYTHON_SITELIBDIR}/plist.so:${PORTSDIR}/devel/py-libplist -USE_PYTHON= yes +USES= python +CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/comms/libimobiledevice @@ -20,7 +21,8 @@ PLIST= ${.CURDIR}/pkg-plist BUILD_WRKSRC= ${WRKSRC}/cython INSTALL_WRKSRC= ${BUILD_WRKSRC} -PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.a \ +PLIST_FILES= include/imobiledevice/cython/imobiledevice.pxd \ + ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.a \ ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.so post-patch: @@ -29,4 +31,9 @@ post-patch: -e 's/$$(imobiledevice_la_DEPENDENCIES)//' \ ${BUILD_WRKSRC}/Makefile.in +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/imobiledevice/cython + ${INSTALL_DATA} ${INSTALL_WRKSRC}/imobiledevice.pxd \ + ${STAGEDIR}${PREFIX}/include/imobiledevice/cython + .include "${MASTERDIR}/Makefile" Modified: head/comms/usbmuxd/Makefile ============================================================================== --- head/comms/usbmuxd/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/usbmuxd/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -1,50 +1,42 @@ # $FreeBSD$ PORTNAME= usbmuxd -PORTVERSION= 1.0.8 +DISTVERSION= 1.0.9-alpha1 CATEGORIES= comms -MASTER_SITES= http://www.libimobiledevice.org/downloads/ MAINTAINER= avilla@FreeBSD.org COMMENT= Daemon for multiplexing connections over USB to iPhone/iPod Touch -LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual -USES= cmake pkgconfig tar:bzip2 -USE_LDCONFIG= yes +LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist \ + libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice -PORTDOCS= AUTHORS README README.devel - -OPTIONS_DEFINE= INOTIFY - -INOTIFY_DESC= Use inotify instead of polling (saves energy) - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MINOTIFY} -LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify -CMAKE_ARGS+= -DWANT_INOTIFY:BOOL=TRUE -.else -CMAKE_ARGS+= -DWANT_INOTIFY:BOOL=FALSE -.endif - -.if ${OSVERSION} <= 800107 || ${OSVERSION} >= 900000 && ${OSVERSION} <= 900002 -IGNORE= requires libusb 1.0.3 -.endif - -post-patch: - @${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/Modules/FindInotify.cmake - -pre-install: - @${REINPLACE_CMD} -e '1 s,python,env python,' \ - ${WRKSRC}/python-client/*.py +USE_GITHUB= yes +GH_ACCOUNT= libimobiledevice +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 2f6d9d5 + +USES= autoreconf libtool:build pathfix pkgconfig tar:bzip2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-systemd \ + libusb_CFLAGS="-I/usr/include" \ + libusb_LIBS="-lusb" + +PLIST_FILES= sbin/usbmuxd + +PORTDOCS= AUTHORS README + +OPTIONS_DEFINE= DOCS + +pre-configure: +# TODO: add devd(8) rule. + @${REINPLACE_CMD} -e 's,-lpthread,-pthread,g' \ + -e '/*cygwin*/ s,),|*bsd*),' \ + ${WRKSRC}/configure.ac post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/python-client/*.py ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/comms/usbmuxd/distinfo ============================================================================== --- head/comms/usbmuxd/distinfo Sun Sep 28 22:08:52 2014 (r369502) +++ head/comms/usbmuxd/distinfo Sun Sep 28 22:58:51 2014 (r369503) @@ -1,2 +1,2 @@ -SHA256 (usbmuxd-1.0.8.tar.bz2) = 899d63cb7915ee844f1d3d651bee06f3dbb862cebca849f0a57f27a0fdfcba5c -SIZE (usbmuxd-1.0.8.tar.bz2) = 59347 +SHA256 (usbmuxd-1.0.9-alpha1.tar.bz2) = f19583d56899e60cc71e31144ade77008a196333e7f343853144802742fb6c66 +SIZE (usbmuxd-1.0.9-alpha1.tar.bz2) = 55916 Modified: head/devel/libplist/Makefile ============================================================================== --- head/devel/libplist/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/devel/libplist/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= libplist -PORTVERSION= 1.10 -PORTREVISION?= 1 +PORTVERSION= 1.11 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= http://www.libimobiledevice.org/downloads/ @@ -13,13 +13,14 @@ LICENSE?= LGPL21 SLAVE_PORT?= no -USES= cmake pkgconfig tar:bzip2 +USES+= compiler libtool pathfix pkgconfig tar:bzip2 +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip -.if ${SLAVE_PORT} == "no" +.if ${SLAVE_PORT} == no USE_GNOME= libxml2 -CMAKE_ARGS= -DENABLE_CYTHON:BOOL=False \ - -DENABLE_SWIG:BOOL=False +CONFIGURE_ARGS= --without-cython MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${LOCALBASE}/lib @@ -27,20 +28,18 @@ PORTDOCS= AUTHORS NEWS README OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -post-patch: -# Required for iconv headers (included by libxml2). Do not add to -# CFLAGS as it may break updates from old versions. - @${REINPLACE_CMD} -e 's,$${LIBXML2_INCLUDE_DIR},$${LIBXML2_INCLUDE_DIR} ${LOCALBASE}/include,' \ - ${WRKSRC}/src/CMakeLists.txt - @${REINPLACE_CMD} -e 's,$${CMAKE_INSTALL_LIBDIR}/pkgconfig,libdata/pkgconfig,' \ - ${WRKSRC}/CMakeLists.txt - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif # ${SLAVE_PORT} == "no" +.endif # ${SLAVE_PORT} == no + +.include <bsd.port.pre.mk> + +pre-build: +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 45 + @${REINPLACE_CMD} -e '/__attribute__/ s,deprecated(x),deprecated(),' \ + ${WRKSRC}/include/plist/plist.h +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/devel/libplist/distinfo ============================================================================== --- head/devel/libplist/distinfo Sun Sep 28 22:08:52 2014 (r369502) +++ head/devel/libplist/distinfo Sun Sep 28 22:58:51 2014 (r369503) @@ -1,2 +1,2 @@ -SHA256 (libplist-1.10.tar.bz2) = f44c52a0f8065d41d44772a7484f93bc5e7da21a8f4a9ad3f38a36b827eeff0b -SIZE (libplist-1.10.tar.bz2) = 82519 +SHA256 (libplist-1.11.tar.bz2) = 28e1518eeea054f4eec9a1c93d9575d56193b290c53c1b753773a5e0add95235 +SIZE (libplist-1.11.tar.bz2) = 355365 Added: head/devel/libplist/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libplist/files/patch-configure Sun Sep 28 22:58:51 2014 (r369503) @@ -0,0 +1,11 @@ +--- configure.orig 2014-02-11 16:37:02 UTC ++++ configure +@@ -16625,7 +16625,7 @@ + py_version=$PYTHON_VERSION + else + py_version=`$PYTHON -c "import sys; \ +- print(sys.version[:3]")` ++ print(sys.version[:3])"` + fi + fi + Modified: head/devel/libplist/pkg-plist ============================================================================== --- head/devel/libplist/pkg-plist Sun Sep 28 22:08:52 2014 (r369502) +++ head/devel/libplist/pkg-plist Sun Sep 28 22:58:51 2014 (r369503) @@ -1,5 +1,4 @@ bin/plistutil -bin/plistutil-1.10 include/plist/Array.h include/plist/Boolean.h include/plist/Data.h @@ -14,12 +13,13 @@ 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.1 -lib/libplist++.so.1.1.10 +lib/libplist++.so.2 +lib/libplist++.so.2.0.0 +lib/libplist.a lib/libplist.so -lib/libplist.so.1 -lib/libplist.so.1.1.10 +lib/libplist.so.2 +lib/libplist.so.2.0.0 libdata/pkgconfig/libplist++.pc libdata/pkgconfig/libplist.pc -@dirrm include/plist Modified: head/devel/py-libplist/Makefile ============================================================================== --- head/devel/py-libplist/Makefile Sun Sep 28 22:08:52 2014 (r369502) +++ head/devel/py-libplist/Makefile Sun Sep 28 22:58:51 2014 (r369503) @@ -8,10 +8,10 @@ MAINTAINER= avilla@FreeBSD.org COMMENT= Python bindings for libplist LIB_DEPENDS= libplist.so:${PORTSDIR}/${MASTER_PORT} -BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ - swig2.0:${PORTSDIR}/devel/swig20 +BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython -USE_PYTHON= yes +USES= python +CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/devel/libplist # Required to reference installed libplist. @@ -19,11 +19,22 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST= ${.CURDIR}/pkg-plist -FILESDIR= ${.CURDIR}/files -post-patch: - @${CP} ${FILESDIR}/CMakeLists.txt ${WRKSRC} - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ - ${WRKSRC}/CMakeLists.txt +BUILD_WRKSRC= ${WRKSRC}/cython +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +PLIST_FILES= include/plist/cython/plist.pxd \ + ${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/plist.a \ + ${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 + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/plist/cython + ${INSTALL_DATA} ${INSTALL_WRKSRC}/plist.pxd \ + ${STAGEDIR}${PREFIX}/include/plist/cython .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409282258.s8SMwqon016026>