[Midnightbsd-cvs] mports [17840] trunk/comms: update usbmuxd libimobile

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Nov 11 20:51:35 EST 2014


Revision: 17840
          http://svnweb.midnightbsd.org/mports/?rev=17840
Author:   laffer1
Date:     2014-11-11 20:51:34 -0500 (Tue, 11 Nov 2014)
Log Message:
-----------
update usbmuxd libimobile

Modified Paths:
--------------
    trunk/comms/libimobiledevice/Makefile
    trunk/comms/libimobiledevice/distinfo
    trunk/comms/libimobiledevice/files/patch-configure
    trunk/comms/libimobiledevice/pkg-plist
    trunk/comms/usbmuxd/Makefile
    trunk/comms/usbmuxd/distinfo

Removed Paths:
-------------
    trunk/comms/usbmuxd/files/

Modified: trunk/comms/libimobiledevice/Makefile
===================================================================
--- trunk/comms/libimobiledevice/Makefile	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/libimobiledevice/Makefile	2014-11-12 01:51:34 UTC (rev 17840)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libimobiledevice
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 PORTREVISION?=	0
 CATEGORIES?=	comms
 MASTER_SITES=	http://www.${PORTNAME}.org/downloads/
@@ -13,19 +13,19 @@
 
 SLAVE_PORT?=	no
 
-USES=		pkgconfig tar:bzip2
+USES+=		libtool pathfix pkgconfig tar:bzip2
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	openssl_LIBS=-lssl
+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=	gnutls:${PORTSDIR}/security/gnutls \
-		tasn1:${PORTSDIR}/security/libtasn1 \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		plist:${PORTSDIR}/devel/libplist \
-		usbmuxd:${PORTSDIR}/comms/usbmuxd
+LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
+		libusbmuxd.so:${PORTSDIR}/comms/libusbmuxd
 
 USE_GNOME=	glib20
 CONFIGURE_ARGS+=--without-cython
@@ -34,7 +34,7 @@
 
 PORTDOCS=	AUTHORS NEWS README
 
-.include <bsd.mport.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, *@ssl_requires@,,' \
@@ -43,11 +43,9 @@
 		${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
 
-.endif # ${SLAVE_PORT} == "no"
+.endif # ${SLAVE_PORT} == no
 
 .include <bsd.port.mk>

Modified: trunk/comms/libimobiledevice/distinfo
===================================================================
--- trunk/comms/libimobiledevice/distinfo	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/libimobiledevice/distinfo	2014-11-12 01:51:34 UTC (rev 17840)
@@ -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

Modified: trunk/comms/libimobiledevice/files/patch-configure
===================================================================
--- trunk/comms/libimobiledevice/files/patch-configure	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/libimobiledevice/files/patch-configure	2014-11-12 01:51:34 UTC (rev 17840)
@@ -1,6 +1,15 @@
---- ./configure.orig	2013-03-18 10:28:26.000000000 +0100
-+++ ./configure	2013-04-30 14:56:00.356777062 +0200
-@@ -17262,6 +17262,7 @@
+--- 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

Modified: trunk/comms/libimobiledevice/pkg-plist
===================================================================
--- trunk/comms/libimobiledevice/pkg-plist	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/libimobiledevice/pkg-plist	2014-11-12 01:51:34 UTC (rev 17840)
@@ -1,6 +1,7 @@
 bin/idevice_id
 bin/idevicebackup
 bin/idevicebackup2
+bin/idevicecrashreport
 bin/idevicedate
 bin/idevicedebugserverproxy
 bin/idevicediagnostics
@@ -7,6 +8,7 @@
 bin/ideviceenterrecovery
 bin/ideviceimagemounter
 bin/ideviceinfo
+bin/idevicename
 bin/idevicepair
 bin/ideviceprovision
 bin/idevicescreenshot
@@ -28,14 +30,18 @@
 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
 lib/libimobiledevice.so.4
+lib/libimobiledevice.so.4.0.1
 libdata/pkgconfig/libimobiledevice-1.0.pc
 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
@@ -42,8 +48,8 @@
 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
- at dirrm include/libimobiledevice

Modified: trunk/comms/usbmuxd/Makefile
===================================================================
--- trunk/comms/usbmuxd/Makefile	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/usbmuxd/Makefile	2014-11-12 01:51:34 UTC (rev 17840)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	usbmuxd
-PORTVERSION=	1.0.8
+DISTVERSION=	1.0.9-alpha1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 
@@ -8,46 +8,37 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch
 
-LIB_DEPENDS=	plist:${PORTSDIR}/devel/libplist
+LICENSE=	gpl2 gpl3
+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
+USE_GITHUB=	yes
+GH_ACCOUNT=	libimobiledevice
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	2f6d9d5
 
-OPTIONS_DEFINE=	INOTIFY
+USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-systemd \
+		libusb_CFLAGS="-I/usr/include" \
+		libusb_LIBS="-lusb"
 
-INOTIFY_DESC=	Use inotify instead of polling (saves energy)
+PLIST_FILES=	sbin/usbmuxd
 
-.include <bsd.mport.options.mk>
+PORTDOCS=	AUTHORS README
 
-.if ${PORT_OPTIONS:MINOTIFY}
-LIB_DEPENDS+=	inotify:${PORTSDIR}/devel/libinotify
-CMAKE_ARGS+=	-DWANT_INOTIFY:BOOL=TRUE
-.else
-CMAKE_ARGS+=	-DWANT_INOTIFY:BOOL=FALSE
-.endif
+OPTIONS_DEFINE=	DOCS
 
-.if ${OSVERSION} <= 4016
-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
+# TODO: add devd(8) rule.
+	@${REINPLACE_CMD} \
+		-e '/*cygwin*/ s,),|*bsd*),' \
+		${WRKSRC}/configure.ac
 
-pre-install:
-	@${REINPLACE_CMD} -e '1 s,python,env python,' \
-		${WRKSRC}/python-client/*.py
-
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/python-client/*.py ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: trunk/comms/usbmuxd/distinfo
===================================================================
--- trunk/comms/usbmuxd/distinfo	2014-11-12 01:39:31 UTC (rev 17839)
+++ trunk/comms/usbmuxd/distinfo	2014-11-12 01:51:34 UTC (rev 17840)
@@ -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



More information about the Midnightbsd-cvs mailing list