- Chase libimobiledevice soversion bump.

- Remove SWIG from RUN_DEPENDS.
- Sort plist.
- Cleanup.

3 files changed, 70 insertions, 69 deletions

diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index ccf297873d9d..61139e3a0fb3 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -3,83 +3,83 @@
 
 PORTNAME=	libgpod
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	avilla@FreeBSD.org
-COMMENT=	A library for direct access of iPod contents
+COMMENT=	Library for direct access to iPod contents
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	plist.1:${PORTSDIR}/devel/libplist \
-		tag.1:${PORTSDIR}/audio/taglib \
-		sgutils2.2:${PORTSDIR}/sysutils/sg3_utils
+LIB_DEPENDS=	plist:${PORTSDIR}/devel/libplist \
+		tag:${PORTSDIR}/audio/taglib \
+		sgutils2:${PORTSDIR}/sysutils/sg3_utils
 
-USE_CSTD=	gnu89
-USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_SQLITE=	3
-USE_LDCONFIG=	yes
+USES=		gettext
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-udev --without-hal \
+		--with-html-dir="${DOCSDIR:H}"
+USE_GMAKE=	yes
+USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-udev --without-hal \
-		--with-html-dir="${PREFIX}/share/doc"
-OPTIONS_DEFINE=	IMOBILE PYTHON MONO
-OPTIONS_DEFAULT=	IMOBILE
+USE_LDCONFIG=	yes
+
+OPTIONS_DEFINE=	IMOBILE MONO PYTHON
+OPTIONS_DEFAULT=IMOBILE
+
 IMOBILE_DESC=	Apple iPhone/iPod Touch support
 
 PORTDOCS=	ChangeLog NEWS README*
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-USE_GNOME+=	pygobject
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen \
-		swig:${PORTSDIR}/devel/swig13
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MMONO}
 USE_GNOME+=	gtksharp20
-CONFIGURE_ARGS+=	--with-mono
+CONFIGURE_ARGS+=--with-mono
 PLIST_SUB+=	MONO=""
 .else
-CONFIGURE_ARGS+=	--without-mono
+CONFIGURE_ARGS+=--without-mono
 PLIST_SUB+=	MONO="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
+BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20 \
+		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+USE_GNOME+=	pygobject
+USE_PYTHON=	yes
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--without-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MIMOBILE} && (${OSVERSION} > 900002 || \
-    ${OSVERSION} < 900000 && ${OSVERSION} > 800107)
+	${OSVERSION} < 900000 && ${OSVERSION} > 800107)
 COMMENT:=	${COMMENT:S,iPod,&/iPhone,}
-LIB_DEPENDS+=	imobiledevice.1:${PORTSDIR}/comms/libimobiledevice
+LIB_DEPENDS+=	imobiledevice:${PORTSDIR}/comms/libimobiledevice
 CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
 .else
-CONFIGURE_ARGS+=	--without-libimobiledevice
+CONFIGURE_ARGS+=--without-libimobiledevice
 .endif
 
 post-patch:
-# Adjust pkgconfigdir to the FreeBSD world
-	@${REINPLACE_CMD} -e \
-		's,libdir)/pkgconfig,prefix)/libdata/pkgconfig,' \
-			${WRKSRC}/Makefile.in \
-			${WRKSRC}/bindings/mono/libgpod-sharp/Makefile.in
+	@${REINPLACE_CMD} -e 's,libdir)/pkgconfig,prefix)/libdata/pkgconfig,' \
+		${WRKSRC}/Makefile.in \
+		${WRKSRC}/bindings/mono/libgpod-sharp/Makefile.in
 # Allow to build tools without HAL
-	@${REINPLACE_CMD} -e \
-		'/noinst_PROGRAMS =/s,^,@HAVE_HAL_TRUE@,' \
-			${WRKSRC}/tools/Makefile.in
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -e 's, docs,,' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/noinst_PROGRAMS =/ s,^,@HAVE_HAL_TRUE@,' \
+		${WRKSRC}/tools/Makefile.in
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's, docs,,' \
+		${WRKSRC}/Makefile.in
 .endif
 
 post-install:
diff --git a/audio/libgpod/pkg-descr b/audio/libgpod/pkg-descr
index c798cfd67945..e9ea7d301510 100644
--- a/audio/libgpod/pkg-descr
+++ b/audio/libgpod/pkg-descr
@@ -1,13 +1,14 @@
-libgpod is a shared library to access the contents of an iPod and optionally
-iPhone (via `comms/libimobiledevice' library port, enabled by default).
+libgpod is a shared library to access the contents of an iPod and
+optionally iPhone (via `comms/libimobiledevice' library port, enabled
+by default).
 
-This code was originally part of gtkpod itself.  When the parsing code was
-made self-contained with gtkpod v0.93, decision was made to put this code in
-a separate library so that other projects can benefit from it without
-duplicating code.
+This code was originally part of gtkpod itself. When the parsing code
+was made self-contained with gtkpod v0.93, decision was made to put
+this code in a separate library so that other projects can benefit
+from it without duplicating code.
 
-libgpod supports playlists, smart playlists, playcounts, ratings, podcasts,
-cover art, audio and video.  Photo support is implemented as well.  Python
-and Mono bindings are optionally available too.
+libgpod supports playlists, smart playlists, playcounts, ratings,
+podcasts, cover art, audio and video. Photo support is implemented as
+well. Python and Mono bindings are optionally available too.
 
 WWW: http://www.gtkpod.org/libgpod.html
diff --git a/audio/libgpod/pkg-plist b/audio/libgpod/pkg-plist
index 23b720efcd22..9f192f06a7db 100644
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@@ -1,19 +1,14 @@
 bin/ipod-read-sysinfo-extended
 include/gpod-1.0/gpod/itdb.h
-@dirrm include/gpod-1.0/gpod
-@dirrm include/gpod-1.0
+lib/libgpod.a
+lib/libgpod.la
+lib/libgpod.so
+lib/libgpod.so.7
 %%MONO%%lib/libgpod/libgpod-sharp-test.exe
 %%MONO%%lib/libgpod/libgpod-sharp-test.exe.mdb
 %%MONO%%lib/libgpod/libgpod-sharp.dll
 %%MONO%%lib/libgpod/libgpod-sharp.dll.config
 %%MONO%%lib/libgpod/libgpod-sharp.dll.mdb
-%%MONO%%@dirrm lib/libgpod
-lib/libgpod.so.7
-lib/libgpod.so
-lib/libgpod.la
-lib/libgpod.a
-libdata/pkgconfig/libgpod-1.0.pc
-libdata/pkgconfig/libgpod-sharp.pc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyo
@@ -28,16 +23,8 @@ libdata/pkgconfig/libgpod-sharp.pc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/gpod
-share/locale/de/LC_MESSAGES/libgpod.mo
-share/locale/es/LC_MESSAGES/libgpod.mo
-share/locale/fr/LC_MESSAGES/libgpod.mo
-share/locale/he/LC_MESSAGES/libgpod.mo
-share/locale/it/LC_MESSAGES/libgpod.mo
-share/locale/ja/LC_MESSAGES/libgpod.mo
-share/locale/ro/LC_MESSAGES/libgpod.mo
-share/locale/sv/LC_MESSAGES/libgpod.mo
-share/locale/zh_CN/LC_MESSAGES/libgpod.mo
+libdata/pkgconfig/libgpod-1.0.pc
+libdata/pkgconfig/libgpod-sharp.pc
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
@@ -61,3 +48,16 @@ share/locale/zh_CN/LC_MESSAGES/libgpod.mo
 %%PORTDOCS%%%%DOCSDIR%%/right.png
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/up.png
+share/locale/de/LC_MESSAGES/libgpod.mo
+share/locale/es/LC_MESSAGES/libgpod.mo
+share/locale/fr/LC_MESSAGES/libgpod.mo
+share/locale/he/LC_MESSAGES/libgpod.mo
+share/locale/it/LC_MESSAGES/libgpod.mo
+share/locale/ja/LC_MESSAGES/libgpod.mo
+share/locale/ro/LC_MESSAGES/libgpod.mo
+share/locale/sv/LC_MESSAGES/libgpod.mo
+share/locale/zh_CN/LC_MESSAGES/libgpod.mo
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/gpod
+%%MONO%%@dirrm lib/libgpod
+@dirrm include/gpod-1.0/gpod
+@dirrm include/gpod-1.0