From owner-svn-ports-all@FreeBSD.ORG  Sat Oct  6 22:52:51 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 22E9E106564A;
	Sat,  6 Oct 2012 22:52:51 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E52C8FC12;
	Sat,  6 Oct 2012 22:52:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q96Mqoq8058203;
	Sat, 6 Oct 2012 22:52:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q96MqoFS058201;
	Sat, 6 Oct 2012 22:52:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210062252.q96MqoFS058201@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 6 Oct 2012 22:52:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305418 - head/print/xfce4-print
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2012 22:52:51 -0000

Author: eadler
Date: Sat Oct  6 22:52:50 2012
New Revision: 305418
URL: http://svn.freebsd.org/changeset/ports/305418

Log:
  Convert to OptionsNG

Modified:
  head/print/xfce4-print/Makefile

Modified: head/print/xfce4-print/Makefile
==============================================================================
--- head/print/xfce4-print/Makefile	Sat Oct  6 22:52:18 2012	(r305417)
+++ head/print/xfce4-print/Makefile	Sat Oct  6 22:52:50 2012	(r305418)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfprint
-# Date created:		7 June 2003
-# Whom:			James Earl <jdearl@telus.net>
-#
+# Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
@@ -26,13 +22,15 @@ USE_GNOME=	glib20 gnomehack gtk20 intlto
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libutil xfconf
 
-OPTIONS=	LPR	"Use lpr as printing system"		on \
-		CUPS	"Use cups as printing system"		off \
-		LETTER	"Use letter paper format instead of A4" off
+OPTIONS_DEFINE=	LETTER
+OPTIONS_SINGLE=	PRINTMETHOD
+OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
+LETTER_DESC=	Use letter paper format instead of A4
+LPR_DESC=	Use lpr as printing system
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=--enable-cups
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
@@ -41,7 +39,7 @@ CONFIGURE_ARGS+=--disable-cups
 PLIST_SUB+=	CUPS="@comment "
 .endif
 
-.if defined(WITHOUT_LPR)
+.if ${PORT_OPTIONS:MLPR}
 CONFIGURE_ARGS+=--disable-bsdlpr
 PLIST_SUB+=	LPR="@comment "
 .else
@@ -49,11 +47,8 @@ CONFIGURE_ARGS+=--enable-bsdlpr --with-p
 PLIST_SUB+=	LPR=""
 .endif
 
-.if defined(WITHOUT_LPR) && !defined(WITH_CUPS)
-IGNORE=		define WITH_CUPS or undefine WITHOUT_LPR to install this port
-.endif
 
-.if defined(WITH_LETTER)
+.if ${PORT_OPTIONS:MLETTER}
 CONFIGURE_ARGS+=--enable-letter
 BUILD_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter