Date: Fri, 1 Feb 2013 16:03:41 -0800 From: Jason Helfman <jgh@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r311407 - head/graphics/xpdf Message-ID: <CAMuy=%2BiqQ6HFQxC-FsHWsYh_SKew-tgQAMDNBZbguvXa5xKDJw@mail.gmail.com> In-Reply-To: <201302012359.r11NxF8V015757@svn.freebsd.org> References: <201302012359.r11NxF8V015757@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Forgot to log: Submitted by: jgh@ -myself On Fri, Feb 1, 2013 at 3:59 PM, Jason Helfman <jgh@freebsd.org> wrote: > 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 http://www.FreeBSD.org/cgi/query-pr.cgi?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 > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMuy=%2BiqQ6HFQxC-FsHWsYh_SKew-tgQAMDNBZbguvXa5xKDJw>