4 files changed, 21 insertions, 46 deletions

diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 9c27884d7cad..18c43bc0e7d1 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -6,45 +6,34 @@
 #
 
 PORTNAME=	gnupod
-PORTVERSION=	0.25
+PORTVERSION=	0.26
 CATEGORIES=	audio perl5
 MASTER_SITES=	http://www.blinkenlights.ch/gnupod/
 DISTNAME=	${PORTNAME}-tools-${PORTVERSION}
 
 MAINTAINER=	david@dyn-ns.net
 
-RUN_DEPENDS=    ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String  \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Copy.pm:${PORTSDIR}/devel/p5-File-Tools
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Copy.pm:${PORTSDIR}/devel/p5-File-Tools \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Mixed.pm:${PORTSDIR}/devel/p5-Getopt-Mixed \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
 
 USE_PERL5=	yes
+HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-tools
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/gnupod_INITpod.pl ${PREFIX}/bin/gnupod_INITpod
-	${INSTALL_SCRIPT} ${WRKSRC}/gnupod_addsong.pl ${PREFIX}/bin/gnupod_addsong
-	${INSTALL_SCRIPT} ${WRKSRC}/gnupod_connect.pl ${PREFIX}/bin/gnupod_connect
-	${INSTALL_SCRIPT} ${WRKSRC}/gnupod_delete.pl ${PREFIX}/bin/gnupod_delete
-	${INSTALL_SCRIPT} ${WRKSRC}/mktunes.pl ${PREFIX}/bin/mktunes
-	${INSTALL_SCRIPT} ${WRKSRC}/tunes2pod.pl ${PREFIX}/bin/tunes2pod
-
 .ifndef(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
 	@${CHMOD} 0755 ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/doc/index-de.html ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/doc/logo.png ${PREFIX}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/doc/gnutunesdb.example ${PREFIX}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/doc/ipod.svg ${PREFIX}/share/doc/${PORTNAME}
 .endif
 
-post-install:
-	@${CAT} pkg-message
-
 .include <bsd.port.mk>
diff --git a/audio/gnupod/distinfo b/audio/gnupod/distinfo
index 75956976d38f..09e2dddab798 100644
--- a/audio/gnupod/distinfo
+++ b/audio/gnupod/distinfo
@@ -1 +1 @@
-MD5 (gnupod-tools-0.25.tar.gz) = dbcf6d0dc757cff0a36de9a22881899a
+MD5 (gnupod-tools-0.26.tar.gz) = 6a3b51ee00fc2a72f504b79d4d426901
diff --git a/audio/gnupod/pkg-message b/audio/gnupod/pkg-message
deleted file mode 100644
index f448fa6ff902..000000000000
--- a/audio/gnupod/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-===>   Please Note:
-*******************************************************************************
-
-gnuPod < 0.25 had a bad typo:
-the 'genere=' tag should be (of course) 'genre='.
-It's corrected in gnuPod 0.25, but if you used the
-'Genre' tag in older versions you'll have to do this
-(To correct your GNUtunesDB)
-
-1) Mount your iPod
-2) Run: tunes2pod -m $IPOD_MOUNTPOINT
-(Make sure to run tunes2pod from gnupod 0.25!)
-
-This will re-parse your iTunesDB and create a
-GNUtunesDB without the typo
-
-*******************************************************************************
diff --git a/audio/gnupod/pkg-plist b/audio/gnupod/pkg-plist
index 37a71eb2ca47..11bb3f124189 100644
--- a/audio/gnupod/pkg-plist
+++ b/audio/gnupod/pkg-plist
@@ -1,15 +1,18 @@
-bin/gnupod_INITpod
-bin/gnupod_addsong
-bin/gnupod_connect
-bin/gnupod_delete
-bin/mktunes
-bin/tunes2pod
-%%PORTDOCS%%share/doc/gnupod/README
+bin/gnupod_INITpod.pl
+bin/gnupod_addsong.pl
+bin/gnupod_delete.pl
+bin/gnupod_list.pl
+bin/gnupod_m3u2pl.pl
+bin/gnupod_mkm3u.pl
+bin/gnupod_renumber.pl
+bin/gnupod_search.pl
+bin/mktunes.pl
+bin/tunes2pod.pl
 %%PORTDOCS%%share/doc/gnupod/CHANGES
-%%PORTDOCS%%share/doc/gnupod/TODO
-%%PORTDOCS%%share/doc/gnupod/index-de.html
-%%PORTDOCS%%share/doc/gnupod/index.html
 %%PORTDOCS%%share/doc/gnupod/logo.png
 %%PORTDOCS%%share/doc/gnupod/gnutunesdb.example
 %%PORTDOCS%%share/doc/gnupod/ipod.svg
 %%PORTDOCS%%@dirrm share/doc/gnupod
+@unexec install-info --delete %D/info/gnupod.info %D/info/dir
+info/gnupod.info
+@exec install-info %D/info/gnupod.info %D/info/dir