Feature safe: yes

- OptionsNG, added license, changed comment, NLS.
- Pass maintainership to submitter.

PR:		ports/174082
Submitted by:	nemysis <nemysis@gmx.ch>

3 files changed, 34 insertions, 25 deletions

diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index 223a0d038576..8d237630aea5 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -8,18 +8,30 @@
 
 PORTNAME=	gonvert
 PORTVERSION=	0.2.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python gnome
 MASTER_SITES=	http://www.unihedron.com/projects/gonvert/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A conversion utility that allows conversion between many units
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Conversion utility that allows conversion between many units
+
+LICENSE=	GPLv2
 
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 NO_BUILD=	yes
 
+PORTDOCS=	CHANGELOG FAQ README THANKS TODO
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!/usr/bin/env python|g ; \
 		 s|/usr/share|${PREFIX}/share|g ; \
@@ -35,14 +47,16 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${DATADIR}/pixmaps
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	${LN} -sf ${DATADIR}/pixmaps/gonvert.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${PREFIX}/share/locale/pl/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/i18n/pl_messages.gmo \
 		${PREFIX}/share/locale/pl/LC_MESSAGES/gonvert.mo
-.if !defined(NOPORTDOCS)
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG FAQ README THANKS TODO
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/gonvert/pkg-descr b/misc/gonvert/pkg-descr
index 3765d123bfe2..ac5fa0099f79 100644
--- a/misc/gonvert/pkg-descr
+++ b/misc/gonvert/pkg-descr
@@ -1,15 +1,16 @@
 gonvert is a conversion utility that allows conversion between many units
-like CGS, Ancient, Imperial with many categories like length, mass,
-numbers, etc. All units converted values shown at once as you type. Easy
-to add/change your own units.
+like CGS, Ancient, Imperial with many categories like length, mass, numbers,
+etc. All units converted values shown at once as you type. Easy to add/change
+your own units.
 
 Features:
 
-   - 38 categories, 698 units.
-   - All units converted values shown at once as you type. 
-   - Descriptions for many units. 
-   - Sort Units or values. 
-   - Fully OPEN source so that you can add your own custom calculations
-     and descriptions. 
+    - 51 categories, 981 units. See the entire list here.
+    - All units converted values shown at once as you type.
+    - Descriptions for many units.
+    - Sort by Unit Name, Value, or Unit symbol.
+    - Find Units.
+    - Fully OPEN source so that you can add your own custom calculations
+      and descriptions.
 
 WWW: http://www.unihedron.com/projects/gonvert/
diff --git a/misc/gonvert/pkg-plist b/misc/gonvert/pkg-plist
index 6e1452dc5bcb..3f062290c620 100644
--- a/misc/gonvert/pkg-plist
+++ b/misc/gonvert/pkg-plist
@@ -1,16 +1,10 @@
 bin/gonvert
 share/applications/gonvert.desktop
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/gonvert.glade
-%%DATADIR%%/pixmaps/gonvert.png
 %%DATADIR%%/pixmaps/gonvert-icon_alternative.png
-share/locale/pl/LC_MESSAGES/gonvert.mo
+%%DATADIR%%/pixmaps/gonvert.png
+%%NLS%%share/locale/pl/LC_MESSAGES/gonvert.mo
 share/pixmaps/gonvert.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications