From owner-svn-ports-all@FreeBSD.ORG  Fri Feb  1 23:59:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ECE8AFEB;
 Fri,  1 Feb 2013 23:59:15 +0000 (UTC) (envelope-from jgh@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 C78636C4;
 Fri,  1 Feb 2013 23:59:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11NxFb8015758;
 Fri, 1 Feb 2013 23:59:15 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11NxF8V015757;
 Fri, 1 Feb 2013 23:59:15 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201302012359.r11NxF8V015757@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 1 Feb 2013 23:59:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311407 - head/graphics/xpdf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 01 Feb 2013 23:59:16 -0000

Author: jgh
Date: Fri Feb  1 23:59:15 2013
New Revision: 311407
URL: http://svnweb.freebsd.org/changeset/ports/311407

Log:
  - adopt optionsNG
  
  PR:		174857
  Approved by:	maintainer timeout, araujo@ ( 31 days)

Modified:
  head/graphics/xpdf/Makefile

Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile	Fri Feb  1 23:42:19 2013	(r311406)
+++ head/graphics/xpdf/Makefile	Fri Feb  1 23:59:15 2013	(r311407)
@@ -23,17 +23,18 @@ CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
 		--bindir="${PREFIX}/libexec/xpdf"
 
-OPTIONS=	LIBPAPER "Enable libpaper"      off     \
-		TYPE1	"Ghostscript type1 fonts" on \
-		X11     "Enable X11 support"    on      \
+OPTIONS_DEFINE=	LIBPAPER TYPE1 X11
+LIBPAPER_DESC=	Enable libpaper
+TYPE1_DESC=	Ghostscript type1 fonts
+OPTIONS_DEFAULT=	TYPE1 X11
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_TYPE1)
+.if ${PORT_OPTIONS:MTYPE1}
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
 .endif
 
-.if defined(WITH_LIBPAPER)
+.if ${PORT_OPTIONS:MLIBPAPER}
 LIB_DEPENDS+=	paper.2:${PORTSDIR}/print/libpaper
 CONFIGURE_ARGS+=--with-libpaper-library="${LOCALBASE}/lib" \
 		--with-libpaper-includes="${LOCALBASE}/include"
@@ -54,15 +55,15 @@ MAN1=		pdffonts.1 \
 		pdftotext.1
 MAN5=		xpdfrc.5
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX+=		-nox11
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		X11="@comment "
-.else
+.if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--with-x
 USE_MOTIF=		yes
 MAN1+=			xpdf.1
 PLIST_SUB+=		X11=""
+.else
+PKGNAMESUFFIX+=		-nox11
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=		X11="@comment "
 .endif
 
 post-patch:
@@ -70,13 +71,13 @@ post-patch:
 		${WRKSRC}/xpdf/XPDFViewer.h
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ANNOUNCE CHANGES README misc/hello.pdf
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${PREFIX}/bin/xpdf
 .endif