- 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.

24 files changed, 188 insertions, 186 deletions

diff --git a/UPDATING b/UPDATING
index 4891f5b46a61..d1fa5a892109 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/comms/Makefile b/comms/Makefile
index 01b7968b726f..89b31f012211 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -82,6 +82,7 @@
     SUBDIR += libmodbus
     SUBDIR += libticables2
     SUBDIR += libticalcs2
+    SUBDIR += libusbmuxd
     SUBDIR += linrad
     SUBDIR += lirc
     SUBDIR += locator
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index 4efaa5b31fbd..bd13e14cc8cf 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -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>
diff --git a/comms/libimobiledevice/distinfo b/comms/libimobiledevice/distinfo
index c332c2b2d692..42d239d35424 100644
--- a/comms/libimobiledevice/distinfo
+++ b/comms/libimobiledevice/distinfo
@@ -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
diff --git a/comms/libimobiledevice/files/patch-configure b/comms/libimobiledevice/files/patch-configure
new file mode 100644
index 000000000000..eb7e68ef9304
--- /dev/null
+++ b/comms/libimobiledevice/files/patch-configure
@@ -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
diff --git a/comms/libimobiledevice/files/patch-git_62ab50f b/comms/libimobiledevice/files/patch-git_62ab50f
deleted file mode 100644
index 66e07a6a512f..000000000000
--- a/comms/libimobiledevice/files/patch-git_62ab50f
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./cython/lockdown.pxi.orig	2013-03-07 23:05:33.000000000 +0100
-+++ ./cython/lockdown.pxi	2013-10-14 02:44:26.489878883 +0200
-@@ -221,7 +221,7 @@
-             char* c_session_id = NULL
-             bint ssl_enabled
-             bytes session_id
--        err = lockdownd_start_session(self._c_client, host_id, &c_session_id, &ssl_enabled)
-+        err = lockdownd_start_session(self._c_client, host_id, &c_session_id, <int *>&ssl_enabled)
-         try:
-             self.handle_error(err)
- 
diff --git a/comms/libimobiledevice/pkg-plist b/comms/libimobiledevice/pkg-plist
index c92304e86cac..5967195ba8e3 100644
--- a/comms/libimobiledevice/pkg-plist
+++ b/comms/libimobiledevice/pkg-plist
@@ -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_proxy.h
 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.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
 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
diff --git a/comms/libusbmuxd/Makefile b/comms/libusbmuxd/Makefile
new file mode 100644
index 000000000000..245e9d957232
--- /dev/null
+++ b/comms/libusbmuxd/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PORTNAME=	libusbmuxd
+PORTVERSION=	1.0.9
+CATEGORIES=	comms
+MASTER_SITES=	http://www.libimobiledevice.org/downloads/
+
+MAINTAINER=	avilla@FreeBSD.org
+COMMENT=	Communication interface library for usbmuxd
+
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist
+
+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
+
+OPTIONS_DEFINE=	DOCS INOTIFY
+
+INOTIFY_DESC=	Use inotify instead of polling (saves energy)
+
+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}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/comms/libusbmuxd/distinfo b/comms/libusbmuxd/distinfo
new file mode 100644
index 000000000000..4573282a1b9e
--- /dev/null
+++ b/comms/libusbmuxd/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libusbmuxd-1.0.9.tar.bz2) = 2e3f708a3df30ad7832d2d2389eeb29f68f4e4488a42a20149cc99f4f9223dfc
+SIZE (libusbmuxd-1.0.9.tar.bz2) = 265940
diff --git a/comms/libusbmuxd/pkg-descr b/comms/libusbmuxd/pkg-descr
new file mode 100644
index 000000000000..ed306e53a54e
--- /dev/null
+++ b/comms/libusbmuxd/pkg-descr
@@ -0,0 +1,9 @@
+'usbmuxd' stands for "USB multiplexing daemon". This daemon is in
+charge of multiplexing connections over USB to an iPhone or iPod
+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.
+
+This package contains the usbmuxd communication interface library.
+
+WWW: http://marcansoft.com/blog/iphonelinux/usbmuxd
diff --git a/comms/usbmuxd/pkg-plist b/comms/libusbmuxd/pkg-plist
index 56e50bf024ff..d316e23afdbd 100644
--- a/comms/usbmuxd/pkg-plist
+++ b/comms/libusbmuxd/pkg-plist
@@ -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%%
diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile
index 5e83a99149ec..d79b799ce269 100644
--- a/comms/py-libimobiledevice/Makefile
+++ b/comms/py-libimobiledevice/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +12,8 @@ BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
 		${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"
diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile
index af4a3675f06f..f78c98427c31 100644
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@@ -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
+USE_GITHUB=	yes
+GH_ACCOUNT=	libimobiledevice
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	2f6d9d5
 
-OPTIONS_DEFINE=	INOTIFY
+USES=		autoreconf libtool:build 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.port.options.mk>
+PORTDOCS=	AUTHORS README
 
-.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
+OPTIONS_DEFINE=	DOCS
 
-.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
+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}
 
diff --git a/comms/usbmuxd/distinfo b/comms/usbmuxd/distinfo
index 805952157c6d..9b4b5ae12d22 100644
--- a/comms/usbmuxd/distinfo
+++ b/comms/usbmuxd/distinfo
@@ -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
diff --git a/comms/usbmuxd/files/patch-Modules__FindInotify.cmake b/comms/usbmuxd/files/patch-Modules__FindInotify.cmake
deleted file mode 100644
index c1f4b25798ec..000000000000
--- a/comms/usbmuxd/files/patch-Modules__FindInotify.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Modules/FindInotify.cmake.orig	2012-04-18 16:08:32.799038053 +0200
-+++ ./Modules/FindInotify.cmake	2012-04-18 16:18:43.588979805 +0200
-@@ -1,11 +1,20 @@
--set(INOTIFY_H "NOTFOUND")
--find_file(INOTIFY_H
--  "sys/inotify.h"
--  PATHS ENV INCLUDE
-+find_path(INOTIFY_INCLUDE_DIR
-+  NAMES sys/inotify.h
-+  PATHS
-+    /usr/local/include
-+    /usr/include
- )
- 
--if (INOTIFY_H)
-+find_library(INOTIFY_LIBRARY
-+  NAMES inotify
-+  PATHS
-+    /usr/local/lib
-+    /usr/lib
-+    /lib
-+)
-+
-+if(INOTIFY_INCLUDE_DIR AND INOTIFY_LIBRARY)
-   set(INOTIFY_FOUND TRUE)
--else()
-+else(INOTIFY_INCLUDE_DIR AND INOTIFY_LIBRARY)
-   set(INOTIFY_FOUND FALSE)
--endif()
-+endif(INOTIFY_INCLUDE_DIR AND INOTIFY_LIBRARY)
diff --git a/comms/usbmuxd/files/patch-libusbmuxd__CMakeLists.txt b/comms/usbmuxd/files/patch-libusbmuxd__CMakeLists.txt
deleted file mode 100644
index 577b5c193eb6..000000000000
--- a/comms/usbmuxd/files/patch-libusbmuxd__CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./libusbmuxd/CMakeLists.txt.orig	2012-04-18 16:20:48.468900320 +0200
-+++ ./libusbmuxd/CMakeLists.txt	2012-04-18 16:27:25.439000508 +0200
-@@ -2,17 +2,20 @@
- find_package(Threads)
- 
- option(WANT_INOTIFY "Build with inotify support" ON)
-+
-+add_library (libusbmuxd SHARED libusbmuxd.c sock_stuff.c ${CMAKE_SOURCE_DIR}/common/utils.c)
-+find_library (PTHREAD pthread)
-+
- if (WANT_INOTIFY)
- find_package(Inotify)
- if (INOTIFY_FOUND)
-   add_definitions("-DHAVE_INOTIFY")
-+  include_directories(${INOTIFY_INCLUDE_DIR})
-+  target_link_libraries(libusbmuxd ${INOTIFY_LIBRARY})
-   message("-- libusbmuxd will be built with inotify support")
- endif()
- endif(WANT_INOTIFY)
- 
--add_library (libusbmuxd SHARED libusbmuxd.c sock_stuff.c ${CMAKE_SOURCE_DIR}/common/utils.c)
--find_library (PTHREAD pthread)
--
- if (HAVE_PLIST)
-   add_definitions("-DHAVE_PLIST")
-   message("-- libusbmuxd will be built with protocol version 1 support")
diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile
index f3990bbe5790..ae0609c4ce13 100644
--- a/devel/libplist/Makefile
+++ b/devel/libplist/Makefile
@@ -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>
diff --git a/devel/libplist/distinfo b/devel/libplist/distinfo
index 0a4b90d43530..061ee7362997 100644
--- a/devel/libplist/distinfo
+++ b/devel/libplist/distinfo
@@ -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
diff --git a/devel/libplist/files/patch-configure b/devel/libplist/files/patch-configure
new file mode 100644
index 000000000000..af91a292f882
--- /dev/null
+++ b/devel/libplist/files/patch-configure
@@ -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
+ 
diff --git a/devel/libplist/files/patch-src__Dictionary.cpp b/devel/libplist/files/patch-src__Dictionary.cpp
deleted file mode 100644
index 24814fd8f1d3..000000000000
--- a/devel/libplist/files/patch-src__Dictionary.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Dictionary.cpp.orig	2013-03-19 17:34:11.000000000 +0100
-+++ ./src/Dictionary.cpp	2013-09-06 21:56:58.185535926 +0200
-@@ -151,7 +151,7 @@
-         _map[key] = clone;
-         return _map.find(key);
-     }
--    return iterator(NULL);
-+    return iterator();
- }
- 
- void Dictionary::Remove(Node* node)
diff --git a/devel/libplist/pkg-plist b/devel/libplist/pkg-plist
index 37f69eab8a2c..9a5e9e6122ab 100644
--- a/devel/libplist/pkg-plist
+++ b/devel/libplist/pkg-plist
@@ -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
diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile
index 213a67e7090f..5265722ed85b 100644
--- a/devel/py-libplist/Makefile
+++ b/devel/py-libplist/Makefile
@@ -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"
diff --git a/devel/py-libplist/files/CMakeLists.txt b/devel/py-libplist/files/CMakeLists.txt
deleted file mode 100644
index ef4acd1df70e..000000000000
--- a/devel/py-libplist/files/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake
-    ${CMAKE_SOURCE_DIR}/cmake/modules)
-
-# Required by SWIG.
-include_directories(/usr/local/include)
-
-find_package(Cython REQUIRED)
-find_package(SWIG REQUIRED)
-find_package(PythonInterp REQUIRED)
-find_package(PythonLibs REQUIRED)
-
-add_subdirectory(cython)
-add_subdirectory(swig)
diff --git a/devel/py-libplist/pkg-plist b/devel/py-libplist/pkg-plist
deleted file mode 100644
index 94bab6f8aee3..000000000000
--- a/devel/py-libplist/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-include/plist/cython/plist.pxd
-include/plist/swig/plist.i
-%%PYTHON_SITELIBDIR%%/plist.so
-%%PYTHON_SITELIBDIR%%/plist/__init__.py
-%%PYTHON_SITELIBDIR%%/plist/_plist.so
-%%PYTHON_SITELIBDIR%%/plist/plist.py
-@dirrm %%PYTHON_SITELIBDIR%%/plist
-@dirrm include/plist/swig
-@dirrm include/plist/cython
-@dirrmtry include/plist