Support stage

Use @sample

2 files changed, 10 insertions, 19 deletions

diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index c7408f9ad867..e9fe1dc2b9f8 100644
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		icegenerator
 DISTVERSION=		0.5.5-pre2
+PORTREVISION=		1
 CATEGORIES=		audio net
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/0.5.5-pre2
 
@@ -13,29 +14,19 @@ LIB_DEPENDS=		libshout.so:${PORTSDIR}/audio/libshout2
 
 GNU_CONFIGURE=		yes
 USES=			gmake pkgconfig
-NO_STAGE=	yes
 CONFIGURE_ARGS=		--exec-prefix=${PREFIX}
 
 OPTIONS_DEFINE=		DOCS MYSQL PGSQL
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	YES
-CONFIGURE_ARGS+=	--with-mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	YES
-CONFIGURE_ARGS+=	--with-pgsql
-.endif
+MYSQL_USE=	MYSQL=YES
+MYSQL_CONFIGURE_ON=	--with-mysql
+PGSQL_USE=	PGSQL=YES
+PGSQL_CONFIGURE_ON=	--with-pgsql
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/etc/icegenerator.conf.dist ${PREFIX}/etc
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/icegenerator.conf.dist \
+		${STAGEDIR}${PREFIX}/etc/icegenerator.conf.sample
 
 .include <bsd.port.mk>
diff --git a/audio/icegenerator/pkg-plist b/audio/icegenerator/pkg-plist
index b1e2216e430c..57647be812ac 100644
--- a/audio/icegenerator/pkg-plist
+++ b/audio/icegenerator/pkg-plist
@@ -1,4 +1,4 @@
 bin/icegenerator
-etc/icegenerator.conf.dist
+@sample etc/icegenerator.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%