- Fix COMMENT

- Display message in pre-everything instead of pre-fetch
- Switch to options helpers

1 files changed, 10 insertions, 8 deletions

diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index ee293e187625..7d857853a3ae 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio multimedia
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The real-time guitar processor
+COMMENT=	Real-time guitar processor
 
 USE_GNOME=	gtk20
 USES=		tar:bzip2 gmake pkgconfig
@@ -21,11 +21,6 @@ TXT_DOCS=	AUTHORS COPYING FAQ INSTALL NEWS README TODO ChangeLog
 HTML_DOCS=	faq.html index.html install.html readme.html
 PORTDOCS=	${TXT_DOCS} ${HTML_DOCS}
 
-OPTIONS_DEFINE=	SUID DOCS
-OPTIONS_DEFAULT=	SUID
-SUID_DESC=	Use suid to allow highest priority (priv. dropped)
-OPTIONS_SUB=	yes
-
 DESKTOP_ENTRIES="GNUitar" \
 		"Apply guitar effects in real-time" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
@@ -33,12 +28,19 @@ DESKTOP_ENTRIES="GNUitar" \
 		"" \
 		true
 
-pre-fetch:
-	@${CAT} pkg-message
+OPTIONS_DEFINE=	SUID DOCS
+OPTIONS_DEFAULT=	SUID
+SUID_DESC=	Use suid to allow highest priority (priv. dropped)
+OPTIONS_SUB=	yes
+
+pre-everything::
+	@${CAT} ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gnuitar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/gnuitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${TXT_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${HTML_DOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}