Update libgpod and gtkpod to most recent versions, 0.5.2 and 0.99.10,

respectively.

Based on PR:	ports/114563, ports/114564
Submitted by:	Herbert J. Skuhra

6 files changed, 44 insertions, 44 deletions

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 3957e42f5a5e..8d62a8c72151 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.99.8
-PORTREVISION=	3
+PORTVERSION=	0.99.10
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +15,15 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GUI for Apple iPods using GTK2
 
 LIB_DEPENDS=	id3tag.0:${PORTSDIR}/audio/libid3tag \
-		gpod.1:${PORTSDIR}/audio/libgpod
+		gpod.2:${PORTSDIR}/audio/libgpod
 RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain \
 		iconv:${PORTSDIR}/converters/libiconv
 
-USE_X_PREFIX=	yes
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 
 OPTIONS=	MPEG4IP	"Enable AAC and H.264 support with MPEG4IP" off
 
@@ -46,20 +44,13 @@ pre-configure: .SILENT
 # install locale correctly (share dir instead of lib dir)
 	${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|(libdir)/locale|(datadir)/locale|' \
-		${WRKSRC}/po/Makefile.in.in
-# work-around a segfault when attempting to delete track from iPod
-	${REINPLACE_CMD} '83,85d' ${WRKSRC}/src/confirmation.c
-# catch up with recent libgpod update to version 0.4.2
-	${REINPLACE_CMD} -e 's|unk208|mediatype|g' ${WRKSRC}/src/file.c \
-		${WRKSRC}/src/file_itunesdb.c
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/TODOandBUGS.txt ${DOCSDIR}
+.for f in ChangeLog README TODOandBUGS.txt TROUBLESHOOTING
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 8ef23619a1e3..35b562b5c792 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkpod-0.99.8.tar.gz) = f04b67605204d9076d30d83b72b78463
-SHA256 (gtkpod-0.99.8.tar.gz) = f74afefe31deb11dc235b1d361df6732966fe2ba3eaddfb960c69bf0d161e16d
-SIZE (gtkpod-0.99.8.tar.gz) = 1074007
+MD5 (gtkpod-0.99.10.tar.gz) = cbc2d03585aaf41915e26c7c83aad412
+SHA256 (gtkpod-0.99.10.tar.gz) = cd8ec2258aa3e774ef1f743117ddc86e7d89bc3f40fc03492b7b0893f9669ece
+SIZE (gtkpod-0.99.10.tar.gz) = 1068561
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 1f3050458785..e6c3f46e32b6 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -2,23 +2,29 @@ bin/gtkpod
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODOandBUGS.txt
-%%DATADIR%%/gtkpod.glade
-%%DATADIR%%/gtkpod.gladep
-%%DATADIR%%/pixmaps/gtkpod-add-dirs.png
-%%DATADIR%%/pixmaps/gtkpod-add-files.png
-%%DATADIR%%/pixmaps/gtkpod-add-playlists.png
-%%DATADIR%%/pixmaps/gtkpod-icon-32.png
-%%DATADIR%%/pixmaps/gtkpod-icon-32x32-2.png
-%%DATADIR%%/pixmaps/gtkpod-icon-32x32.png
-%%DATADIR%%/pixmaps/gtkpod-icon-48.png
-%%DATADIR%%/pixmaps/gtkpod-icon-48x48.png
-%%DATADIR%%/pixmaps/gtkpod-icon-64x64.png
-%%DATADIR%%/pixmaps/gtkpod-logo.png
-%%DATADIR%%/pixmaps/gtkpod-new-playlist.png
-%%DATADIR%%/pixmaps/gtkpod-read.png
-%%DATADIR%%/pixmaps/gtkpod-sync.png
-%%DATADIR%%/pixmaps/gtkpod.glade
-%%DATADIR%%/pixmaps/gtkpod.gladep
+%%PORTDOCS%%%%DOCSDIR%%/TROUBLESHOOTING
+%%DATADIR%%/data/gtkpod.glade
+%%DATADIR%%/data/cdshine.png
+%%DATADIR%%/data/cdshine_main.png
+%%DATADIR%%/data/default-cover.png
+%%DATADIR%%/data/gtkpod-add-dirs.png
+%%DATADIR%%/data/gtkpod-add-files.png
+%%DATADIR%%/data/gtkpod-add-playlists.png
+%%DATADIR%%/data/gtkpod-icon-32.png
+%%DATADIR%%/data/gtkpod-icon-32-2.png
+%%DATADIR%%/data/gtkpod-icon-48.png
+%%DATADIR%%/data/gtkpod-logo.png
+%%DATADIR%%/data/gtkpod-new-playlist.png
+%%DATADIR%%/data/gtkpod-read.png
+%%DATADIR%%/data/gtkpod-sync.png
+%%DATADIR%%/scripts/convert-flac2m4a.sh
+%%DATADIR%%/scripts/convert-flac2mp3.sh
+%%DATADIR%%/scripts/convert-m4a2mp3.sh
+%%DATADIR%%/scripts/convert-mp32m4a.sh
+%%DATADIR%%/scripts/convert-ogg2m4a.sh
+%%DATADIR%%/scripts/convert-ogg2mp3.sh
+%%DATADIR%%/scripts/convert-wav2m4a.sh
+%%DATADIR%%/scripts/convert-wav2mp3.sh
 %%DATADIR%%/scripts/ldif2vcf.sh
 %%DATADIR%%/scripts/mab2vcard
 %%DATADIR%%/scripts/sync-abook.sh
@@ -34,6 +40,10 @@ bin/gtkpod
 %%DATADIR%%/scripts/sync-thunderbird-nano.sh
 %%DATADIR%%/scripts/sync-tomboy.sh
 %%DATADIR%%/scripts/sync-webcalendar.sh
+share/icons/hicolor/32x32/apps/gtkpod.png
+share/icons/hicolor/48x48/apps/gtkpod.png
+share/icons/hicolor/64x64/apps/gtkpod.png
+share/applications/gtkpod.desktop
 share/locale/de/LC_MESSAGES/gtkpod.mo
 share/locale/es/LC_MESSAGES/gtkpod.mo
 share/locale/fr/LC_MESSAGES/gtkpod.mo
@@ -42,6 +52,6 @@ share/locale/it/LC_MESSAGES/gtkpod.mo
 share/locale/ja/LC_MESSAGES/gtkpod.mo
 share/locale/sv/LC_MESSAGES/gtkpod.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%DATADIR%%/pixmaps
 %%PORTDOCS%%@dirrm %%DATADIR%%/scripts
+%%PORTDOCS%%@dirrm %%DATADIR%%/data
 %%PORTDOCS%%@dirrm %%DATADIR%%
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index dfcb042f80ef..ccc879924d67 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgpod
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.5.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkpod
@@ -34,9 +33,9 @@ post-extract: .SILENT
 		's,libdir)/pkgconfig,prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's, docs$$,,' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's, docs,,' ${WRKSRC}/Makefile.in
 .endif
 	# Stop configure script want Perl and XML::Parser
-	${REINPLACE_CMD} '19491,19513d' ${WRKSRC}/configure
+	${REINPLACE_CMD} '19568,19590d' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
index 495959811d2c..1244f51e6154 100644
--- a/audio/libgpod/distinfo
+++ b/audio/libgpod/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgpod-0.4.2.tar.gz) = c3c031dc6f1f6eff422598c84f2621bd
-SHA256 (libgpod-0.4.2.tar.gz) = d5b6c9047cd45b949b39f857527f46d2dd9faf8bcb5528b7b7666eedcdb95e5c
-SIZE (libgpod-0.4.2.tar.gz) = 768720
+MD5 (libgpod-0.5.2.tar.gz) = e4f8d2a7be9512268267bfbe712fe9be
+SHA256 (libgpod-0.5.2.tar.gz) = f2a4396dd92ad557a538ffce892020da6ed967454f1027314d270e21c56ec79b
+SIZE (libgpod-0.5.2.tar.gz) = 791704
diff --git a/audio/libgpod/pkg-plist b/audio/libgpod/pkg-plist
index 6802498af604..acd16ba8135d 100644
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@@ -1,7 +1,7 @@
 include/gpod-1.0/gpod/itdb.h
 @dirrm include/gpod-1.0/gpod
 @dirrm include/gpod-1.0
-lib/libgpod.so.1
+lib/libgpod.so.2
 lib/libgpod.so
 lib/libgpod.la
 lib/libgpod.a