ports/175840: [update]: deskutils/znotes up to optionsng

[Veniamin Gvozdikov]

>Number:         175840
>Category:       ports
>Synopsis:       [update]: deskutils/znotes up to optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 04 18:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Veniamin Gvozdikov
>Release:        FreeBSD 8.3-RELEASE-p5
>Organization:
>Environment:
FreeBSD ololo 8.3-RELEASE-p5 FreeBSD 8.3-RELEASE-p5 #0: Thu Dec  6 16:25:28 MSK 2012     root at ololo:/usr/obj/usr/src/sys/OLOLO  amd64
>Description:
Update to optionsng
>How-To-Repeat:

>Fix:
diff -ruN znotes.orig/Makefile znotes/Makefile
--- znotes.orig/Makefile	2013-02-04 22:23:20.716243747 +0400
+++ znotes/Makefile	2013-02-04 17:13:42.692303834 +0400
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	znotes
-# Date created:		2009-11-12
-# Whom:			Gvozdikov Veniamin <g.veniamin at googlemail.com>
-#
-# $FreeBSD: ports/deskutils/znotes/Makefile,v 1.13 2013/01/23 15:05:32 svnexp Exp $
-#
+# Created by: Gvozdikov Veniamin <g.veniamin at googlemail.com>
+# $FreeBSD$
 
 PORTNAME=	znotes
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -23,7 +19,8 @@
 		"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
 		"Utility;TextEditor;Qt;" ${FALSE}
 
-OPTIONS=	NLS		"Build with NLS support" on
+OPTIONS_DEFINE= NLS
+NLS_DESC=	Build with NLS support
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
@@ -34,7 +31,7 @@
 	    @${REINPLACE_CMD} -i -e 's,QCoreApplication::applicationDirPath()+"/translations","${DATADIR}/translations",g' \
 		${WRKSRC}/settings.cpp
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 do-configure:
 	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
@@ -43,7 +40,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
-.if defined(WITH_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	${MKDIR} ${DATADIR}/translations
 	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${DATADIR}/translations
 PLIST_FILES+=	%%DATADIR%%/translations/${PORTNAME}_cs.qm \
@@ -59,4 +56,4 @@
 .else
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

>Release-Note:
>Audit-Trail:
>Unformatted: