Support stage

Use options helpers
Strip binaries

2 files changed, 26 insertions, 57 deletions

diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index 58dadd164a05..050fff7deee5 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -15,68 +15,36 @@ LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
 
 USE_SQLITE=	yes
-NO_STAGE=	yes
 
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	AAC FLAC MP3 SHOUTCAST VORBIS JACK
 OPTIONS_DEFAULT=	AAC FLAC MP3 SHOUTCAST VORBIS
+OPTIONS_SUB=	yes
 
-MAN1=		harp.1
 PORTDOCS=	README
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-PLIST_SUB+=	AAC=""
-.else
-CONFIGURE_ARGS+=	--without-aac
-PLIST_SUB+=	AAC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
-PLIST_SUB+=	FLAC=""
-.else
-CONFIGURE_ARGS+=	--without-flac
-PLIST_SUB+=	FLAC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMP3}
-LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
-PLIST_SUB+=	MP3=""
-.else
-CONFIGURE_ARGS+=	--without-mp3
-PLIST_SUB+=	MP3="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSHOUTCAST}
-PLIST_SUB+=	STREAM=""
-.else
-CONFIGURE_ARGS+=	--without-stream
-PLIST_SUB+=	STREAM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=	VORBIS=""
-.else
-CONFIGURE_ARGS+=	--without-vorbis
-PLIST_SUB+=	VORBIS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-CONFIGURE_ARGS+=	--with-jack
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-.else
-CONFIGURE_ARGS+=	--without-jack
-.endif
+INSTALL_TARGET=	install-strip
+
+AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_CONFIGURE_WITH=	aac
+
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CONFIGURE_WITH=	flac
+
+MP3_LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MP3_CONFIGURE_WITH=	mp3
+
+SHOUTCAST_CONFIGURE_WITH=	stream
+
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ARGS=	vorbis
+
+JACK_CONFIGURE_WITH=	jack
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/harp/pkg-plist b/audio/harp/pkg-plist
index bda75770c83f..846aeabe7499 100644
--- a/audio/harp/pkg-plist
+++ b/audio/harp/pkg-plist
@@ -8,17 +8,18 @@ bin/harp
 %%MP3%%lib/libharpmp3.a
 %%MP3%%lib/libharpmp3.la
 %%MP3%%lib/libharpmp3.so
-%%STREAM%%lib/libharpstream.a
-%%STREAM%%lib/libharpstream.la
-%%STREAM%%lib/libharpstream.so
+%%SHOUTCAST%%lib/libharpstream.a
+%%SHOUTCAST%%lib/libharpstream.la
+%%SHOUTCAST%%lib/libharpstream.so
 %%VORBIS%%lib/libharpvorbis.a
 %%VORBIS%%lib/libharpvorbis.la
 %%VORBIS%%lib/libharpvorbis.so
 %%AAC%%%%DATADIR%%/libharpaac.sql
 %%FLAC%%%%DATADIR%%/libharpflac.sql
 %%MP3%%%%DATADIR%%/libharpmp3.sql
-%%STREAM%%%%DATADIR%%/libharpstream.sql
+%%SHOUTCAST%%%%DATADIR%%/libharpstream.sql
 %%VORBIS%%%%DATADIR%%/libharpvorbis.sql
+man/man1/harp.1.gz
 %%DATADIR%%/create.sql
 %%DATADIR%%/defaults.conf
 @dirrm %%DATADIR%%