- Trim Makefile header per new style guidelines

- Drop indefinite article from the COMMENT line
- Define LICENSE (GPLv2) and convert to OptionsNG
- Reformat port description text while I am here

2 files changed, 22 insertions, 23 deletions

diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index 7a5e49f1ff57..297aaceca0b0 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gkrellmss
-# Date Created:				Tue Feb  4 13:24:50 PST 2003
-# Whom:					Lars Eggert <larse@isi.edu>
-#
+# Created by: Lars Eggert <larse@isi.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	gkrellmss
 PORTVERSION=	2.7
@@ -12,7 +8,9 @@ CATEGORIES=	audio
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellmss/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A plugin for GKrellM with a VU meter showing left/right channel audio
+COMMENT=	GKrellM plugin with a VU meter showing left/right channel audio
+
+LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
@@ -27,6 +25,10 @@ PORTDOCS=	Changelog README Themes
 PLIST_FILES=	libexec/gkrellm2/plugins/gkrellmss.so \
 		share/locale/ru/LC_MESSAGES/gkrellm-gkrellmss.mo
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|= -O2|=|g ; \
 		 s|= gcc|+=|g' ${WRKSRC}/src/Makefile
@@ -38,11 +40,9 @@ do-install:
 		${PREFIX}/libexec/gkrellm2/plugins/gkrellmss.so
 	${INSTALL_DATA} ${WRKSRC}/po/ru.mo \
 		${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellm-gkrellmss.mo
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/gkrellmss2/pkg-descr b/audio/gkrellmss2/pkg-descr
index a4cc2176bcb8..6f47fadc7320 100644
--- a/audio/gkrellmss2/pkg-descr
+++ b/audio/gkrellmss2/pkg-descr
@@ -1,17 +1,16 @@
-GKrellMSS displays a VU meter showing left and right channel audio
-levels and also has a chart that shows combined left and right
-audio channels as an oscilloscope trace.
+GKrellMSS displays a VU meter showing left and right channel audio levels
+and also has a chart that shows combined left and right audio channels as
+an oscilloscope trace.
 
-There are two buttons to the left of the VU Meter which select an
-oscope horizontal sweep speed ranging from 100 microseconds (usec)
-per division to 50 milliseconds (msec) per division. There are 5
-horizontal divisions, so a trace sweep time can range from 500 usec
-(1/2000 sec) to 250 msec (1/4 sec). The oscope trace is triggered
-by a positive zero crossing audio signal to give nice stable
-displays.
+There are two buttons to the left of the VU Meter which select an oscope
+horizontal sweep speed ranging from 100 microseconds (usec) per division
+to 50 milliseconds (msec) per division.  There are 5 horizontal divisions,
+so a trace sweep time can range from 500 usec (1/2000 sec) to 250 msec
+(1/4 sec).  The oscope trace is triggered by a positive zero crossing of
+audio signal to give nice stable displays.
 
-There is also a sensitivity level adjustment for the VU Meter and
-oscope chart. Use the mouse wheel to adjust, or left click and drag
-the sensitivity krell.
+There is also a sensitivity level adjustment for the VU Meter and oscope
+chart.  Use the mouse wheel to adjust, or left click and drag sensitivity
+krell.
 
 WWW: http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html