From owner-svn-ports-head@FreeBSD.ORG  Fri Feb  8 09:15:24 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1C05E493;
 Fri,  8 Feb 2013 09:15:24 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D39A36FD;
 Fri,  8 Feb 2013 09:15:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r189FN4m027908;
 Fri, 8 Feb 2013 09:15:23 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r189FN5i027906;
 Fri, 8 Feb 2013 09:15:23 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201302080915.r189FN5i027906@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Fri, 8 Feb 2013 09:15:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311926 - in head: deskutils/znotes www/mongrel2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Feb 2013 09:15:24 -0000

Author: miwi
Date: Fri Feb  8 09:15:22 2013
New Revision: 311926
URL: http://svnweb.freebsd.org/changeset/ports/311926

Log:
  - OptionNG
  - Trim header
  
  PR:		175839 175840
  Submitted by:	maintainer

Modified:
  head/deskutils/znotes/Makefile
  head/www/mongrel2/Makefile   (contents, props changed)

Modified: head/deskutils/znotes/Makefile
==============================================================================
--- head/deskutils/znotes/Makefile	Fri Feb  8 09:10:26 2013	(r311925)
+++ head/deskutils/znotes/Makefile	Fri Feb  8 09:15:22 2013	(r311926)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	znotes
-# Date created:		2009-11-12
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	znotes
 PORTVERSION=	0.4.5
@@ -23,7 +19,7 @@ DESKTOP_ENTRIES="zNotes" "Simple notes" 
 		"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
 		"Utility;TextEditor;Qt;" ${FALSE}
 
-OPTIONS=	NLS		"Build with NLS support" on
+OPTIONS_DEFINE=		NLS
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
@@ -34,7 +30,7 @@ post-patch:
 	    @${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 +39,7 @@ do-install:
 	${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 +55,4 @@ PLIST_DIRS+=	%%DATADIR%%/translations \
 .else
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/mongrel2/Makefile
==============================================================================
--- head/www/mongrel2/Makefile	Fri Feb  8 09:10:26 2013	(r311925)
+++ head/www/mongrel2/Makefile	Fri Feb  8 09:15:22 2013	(r311926)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mongrel2
-# Date created:		2011-09-28
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	mongrel2
 PORTVERSION=	1.7.5
@@ -30,11 +26,11 @@ EXAMPLES_LIST=	bbs \
 		tornado \
 		zcov
 
-OPTIONS=	EXAMPLES "Install examplse" on
+OPTIONS_DEFINE=		EXAMPLES
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 PLIST_SUB+=	EXAMPLES=""
 .else
 PLIST_SUB+=	EXAMPLES="@comment "
@@ -51,4 +47,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>