10 files changed, 26 insertions, 23 deletions

diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index e42339227a49..f1e0cbc90ee1 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libimobiledevice
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2.0
 PORTREVISION?=	0
 CATEGORIES?=	comms
 MASTER_SITES=	http://www.${PORTNAME}.org/downloads/
@@ -38,7 +38,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, *@ssl_requires@,,' \
-		${WRKSRC}/${PORTNAME}*.pc.in
+		${WRKSRC}/src/${PORTNAME}*.pc.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/comms/libimobiledevice/distinfo b/comms/libimobiledevice/distinfo
index 42d239d35424..a14919213528 100644
--- a/comms/libimobiledevice/distinfo
+++ b/comms/libimobiledevice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libimobiledevice-1.1.6.tar.bz2) = 1fcd56489a27181617507b1d8aaf122f66d9860c0fe5af4c78f9e0ed129e33e0
-SIZE (libimobiledevice-1.1.6.tar.bz2) = 619429
+SHA256 (libimobiledevice-1.2.0.tar.bz2) = 786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037
+SIZE (libimobiledevice-1.2.0.tar.bz2) = 631495
diff --git a/comms/libimobiledevice/pkg-plist b/comms/libimobiledevice/pkg-plist
index 5967195ba8e3..ee19f9951c70 100644
--- a/comms/libimobiledevice/pkg-plist
+++ b/comms/libimobiledevice/pkg-plist
@@ -3,17 +3,20 @@ bin/idevicebackup
 bin/idevicebackup2
 bin/idevicecrashreport
 bin/idevicedate
+bin/idevicedebug
 bin/idevicedebugserverproxy
 bin/idevicediagnostics
 bin/ideviceenterrecovery
 bin/ideviceimagemounter
 bin/ideviceinfo
 bin/idevicename
+bin/idevicenotificationproxy
 bin/idevicepair
 bin/ideviceprovision
 bin/idevicescreenshot
 bin/idevicesyslog
 include/libimobiledevice/afc.h
+include/libimobiledevice/debugserver.h
 include/libimobiledevice/diagnostics_relay.h
 include/libimobiledevice/file_relay.h
 include/libimobiledevice/heartbeat.h
@@ -27,6 +30,7 @@ include/libimobiledevice/mobilebackup.h
 include/libimobiledevice/mobilebackup2.h
 include/libimobiledevice/mobilesync.h
 include/libimobiledevice/notification_proxy.h
+include/libimobiledevice/property_list_service.h
 include/libimobiledevice/restore.h
 include/libimobiledevice/sbservices.h
 include/libimobiledevice/screenshotr.h
@@ -35,20 +39,22 @@ 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
+lib/libimobiledevice.so.6
+lib/libimobiledevice.so.6.0.0
 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/idevicedebug.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/idevicenotificationproxy.1.gz
 man/man1/idevicepair.1.gz
 man/man1/ideviceprovision.1.gz
 man/man1/idevicescreenshot.1.gz
diff --git a/comms/libusbmuxd/Makefile b/comms/libusbmuxd/Makefile
index 245e9d957232..2b974b136c3e 100644
--- a/comms/libusbmuxd/Makefile
+++ b/comms/libusbmuxd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libusbmuxd
-PORTVERSION=	1.0.9
+PORTVERSION=	1.0.10
 CATEGORIES=	comms
 MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 
diff --git a/comms/libusbmuxd/distinfo b/comms/libusbmuxd/distinfo
index 4573282a1b9e..3b75b71359e2 100644
--- a/comms/libusbmuxd/distinfo
+++ b/comms/libusbmuxd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libusbmuxd-1.0.9.tar.bz2) = 2e3f708a3df30ad7832d2d2389eeb29f68f4e4488a42a20149cc99f4f9223dfc
-SIZE (libusbmuxd-1.0.9.tar.bz2) = 265940
+SHA256 (libusbmuxd-1.0.10.tar.bz2) = 1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2
+SIZE (libusbmuxd-1.0.10.tar.bz2) = 292649
diff --git a/comms/libusbmuxd/pkg-descr b/comms/libusbmuxd/pkg-descr
index ed306e53a54e..36ce50684170 100644
--- a/comms/libusbmuxd/pkg-descr
+++ b/comms/libusbmuxd/pkg-descr
@@ -6,4 +6,4 @@ listening localhost socket on the device.
 
 This package contains the usbmuxd communication interface library.
 
-WWW: http://marcansoft.com/blog/iphonelinux/usbmuxd
+WWW: http://www.libimobiledevice.org
diff --git a/comms/libusbmuxd/pkg-plist b/comms/libusbmuxd/pkg-plist
index d316e23afdbd..a764f064d254 100644
--- a/comms/libusbmuxd/pkg-plist
+++ b/comms/libusbmuxd/pkg-plist
@@ -3,6 +3,6 @@ include/usbmuxd-proto.h
 include/usbmuxd.h
 lib/libusbmuxd.a
 lib/libusbmuxd.so
-lib/libusbmuxd.so.2
-lib/libusbmuxd.so.2.1.0
+lib/libusbmuxd.so.4
+lib/libusbmuxd.so.4.0.0
 libdata/pkgconfig/libusbmuxd.pc
diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile
index abb23834c316..ff82cbac0d07 100644
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	usbmuxd
-DISTVERSION=	1.0.9-alpha1
+DISTVERSION=	1.1.0
 CATEGORIES=	comms
+MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch
@@ -13,21 +14,17 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
 		libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	libimobiledevice
-GH_TAGNAME=	2f6d9d5
-
 USES=		autoreconf cpe libtool pathfix pkgconfig tar:bzip2
 CPE_VENDOR=	nikias_bassen
-CPE_VERSION=	${DISTVERSION:C/-.*//}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-systemd \
 		libusb_CFLAGS="-I/usr/include" \
 		libusb_LIBS="-lusb"
 
-PLIST_FILES=	sbin/usbmuxd
+PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
+		sbin/${PORTNAME}
 
-PORTDOCS=	AUTHORS README
+PORTDOCS=	AUTHORS NEWS README
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/comms/usbmuxd/distinfo b/comms/usbmuxd/distinfo
index 9485eb18e89a..9d47e58e09ab 100644
--- a/comms/usbmuxd/distinfo
+++ b/comms/usbmuxd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libimobiledevice-usbmuxd-1.0.9-alpha1-2f6d9d5_GH0.tar.bz2) = 0707baac79bf739ede6b1fc780fcc1fa74bdcebf6c70e4a89bb8dbbd058332bf
-SIZE (libimobiledevice-usbmuxd-1.0.9-alpha1-2f6d9d5_GH0.tar.bz2) = 55913
+SHA256 (usbmuxd-1.1.0.tar.bz2) = 3e8948b4fe4250ee5c4bd41ccd1b83c09b8a6f5518a7d131a66fd38bd461b42d
+SIZE (usbmuxd-1.1.0.tar.bz2) = 321897
diff --git a/comms/usbmuxd/pkg-descr b/comms/usbmuxd/pkg-descr
index f60a2d364830..47d72ea701b7 100644
--- a/comms/usbmuxd/pkg-descr
+++ b/comms/usbmuxd/pkg-descr
@@ -4,4 +4,4 @@ Touch. To users, it means you can sync your music, contacts, photos,
 etc. over USB. To developers, it means you can connect to any
 listening localhost socket on the device.
 
-WWW: http://marcansoft.com/blog/iphonelinux/usbmuxd
+WWW: http://www.libimobiledevice.org