Date: Mon, 31 Dec 2012 08:57:24 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174857: [patch] graphics/xpdf: adopt optionsNG (new options framework) Message-ID: <201212310857.qBV8vOn8072382@freefall.freebsd.org> Resent-Message-ID: <201212310900.qBV901bM072515@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174857
>Category: ports
>Synopsis: [patch] graphics/xpdf: adopt optionsNG (new options framework)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 31 09:00:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r243869M: Tue Dec 4 21:58:48 UTC 2012 root@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
adopt new options framework
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 309712)
+++ Makefile (working copy)
@@ -23,17 +23,18 @@
--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 @@
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 @@
${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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212310857.qBV8vOn8072382>