- Staging support

- Use options helpers
- Merge docs installation
- Unmute install commands

2 files changed, 26 insertions, 36 deletions

diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 649f56cbfaba..acda7b077c6f 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnupod
 PORTVERSION=	0.99.8
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://www.blinkenlights.ch/gnupod-dist/stable/
@@ -21,13 +22,8 @@ BUILD_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INFO=		gnupod
-MAN1=		gnupod_addsong.pl.1 gnupod_check.pl.1 gnupod_INIT.pl.1 \
-		gnupod_otgsync.pl.1 gnupod_search.pl.1 mktunes.pl.1 \
-		tunes2pod.pl.1
-MANCOMPRESSED=	yes
 
 USES=		perl5
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -36,29 +32,16 @@ CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
 OPTIONS_DEFINE=	FLAC VORBIS DOCS
 
-.include <bsd.port.options.mk>
+FLAC_BUILD_DEPENDS=	p5-Audio-FLAC-Header>=0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
+VORBIS_BUILD_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
+			oggdec:${PORTSDIR}/audio/vorbis-tools
 
-.if ${PORT_OPTIONS:MFLAC} || exists(${SITE_PERL}/${PERL_ARCH}/Audio/FLAC/Header.pm)
-BUILD_DEPENDS+=	p5-Audio-FLAC-Header>=0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS} || exists(${SITE_PERL}/Ogg/Vorbis/Header/PurePerl.pm)
-BUILD_DEPENDS+=	p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl
-BUILD_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/gnupodrc.example ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/gnutunesdb.example ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/gnupod.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/mkspl.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/gnupod.texi ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/fdl.texi ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/version.texi ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/ipod.svg ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
+.for file in gnupodrc.example gnutunesdb.example gnupod.html mkspl.html \
+gnupod.texi fdl.texi version.texi ipod.svg
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/gnupod/pkg-plist b/audio/gnupod/pkg-plist
index 3ce5c0defdaa..0932f75978da 100644
--- a/audio/gnupod/pkg-plist
+++ b/audio/gnupod/pkg-plist
@@ -10,15 +10,22 @@ bin/gnupod_otgsync.pl
 bin/gnupod_search.pl
 bin/mktunes.pl
 bin/tunes2pod.pl
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/ArtworkDB.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FileMagic.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FooBar.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Hash58.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Mktunes.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/iTunesDB.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/QTfile.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/SysInfo.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/XMLhelper.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/ArtworkDB.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FileMagic.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/FooBar.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Hash58.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/Mktunes.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/iTunesDB.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/QTfile.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/SysInfo.pm.gz
+lib/perl5/%%PERL_VER%%/BSDPAN/GNUpod/XMLhelper.pm.gz
+man/man1/gnupod_INIT.pl.1.gz
+man/man1/gnupod_addsong.pl.1.gz
+man/man1/gnupod_check.pl.1.gz
+man/man1/gnupod_otgsync.pl.1.gz
+man/man1/gnupod_search.pl.1.gz
+man/man1/mktunes.pl.1.gz
+man/man1/tunes2pod.pl.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/fdl.texi
 %%PORTDOCS%%%%DOCSDIR%%/gnupod.html