Update libgpod and gtkpod to most recent verions, 0.4.0 and 0.99.8,

respectively.  Also rename a knob, commit to UPDATING will follow.

3 files changed, 37 insertions, 11 deletions

diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 3a71231e3574..6524e2721d64 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgpod
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkpod
@@ -17,10 +16,17 @@ COMMENT=	A library for direct access of iPod's contents
 
 USE_GNOME=	gtk20
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+# Disable python bindings for now, something does not work there
+CONFIGURE_ARGS=	--without-python
+
+.if !defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--with-html-dir="${TARGETDIR}/share/doc"
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -28,9 +34,10 @@ post-extract: .SILENT
 	${REINPLACE_CMD} -e \
 		's,libdir)/pkgconfig,prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} '19323,19345d' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e '25s,^,#include <sys/types.h>,' \
-		${WRKSRC}/src/db-parse-context.c
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's, docs$$,,' ${WRKSRC}/Makefile.in
+.endif
+	${REINPLACE_CMD} '19987,20009d' ${WRKSRC}/configure
 .if defined(GCCVERSION)
 .   if ${GCCVERSION} < 030000
 	${REINPLACE_CMD} -e 's,\[\],[0],' ${WRKSRC}/src/db-itunes-parser.h
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
index fecba0f4e092..224a263e40ff 100644
--- a/audio/libgpod/distinfo
+++ b/audio/libgpod/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgpod-0.3.2.tar.gz) = c9c41625347a33efd9441c4e71fdd04e
-SHA256 (libgpod-0.3.2.tar.gz) = b9bea0402371091b77ce537288dda66406a94bc200e6ea69ad20654b4a7f12f2
-SIZE (libgpod-0.3.2.tar.gz) = 461207
+MD5 (libgpod-0.4.0.tar.gz) = e427e0409b0cb2d7e76b17915b1396fa
+SHA256 (libgpod-0.4.0.tar.gz) = 50cb3dcf283f0b6c76da493cf070eb03c05c8a34f64bddb3ca19188a5d861cc4
+SIZE (libgpod-0.4.0.tar.gz) = 596066
diff --git a/audio/libgpod/pkg-plist b/audio/libgpod/pkg-plist
index 4eb4d50e581e..373e7f94dffb 100644
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@@ -1,8 +1,7 @@
 include/gpod-1.0/gpod/itdb.h
-include/gpod-1.0/gpod/ipod-device.h
 @dirrm include/gpod-1.0/gpod
 @dirrm include/gpod-1.0
-lib/libgpod.so.302
+lib/libgpod.so.400
 lib/libgpod.so
 lib/libgpod.la
 lib/libgpod.a
@@ -14,3 +13,23 @@ share/locale/he/LC_MESSAGES/libgpod.mo
 share/locale/it/LC_MESSAGES/libgpod.mo
 share/locale/ja/LC_MESSAGES/libgpod.mo
 share/locale/sv/LC_MESSAGES/libgpod.mo
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Artwork.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Device.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-File-handling-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Low-level-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Playlists.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-The-Itdb-iTunesDB-structure.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Time-handling.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod-Tracks.html
+%%PORTDOCS%%%%DOCSDIR%%/libgpod.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/libgpod.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%