From owner-svn-ports-head@FreeBSD.ORG Sat Feb 2 00:03:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E435C255 for ; Sat, 2 Feb 2013 00:03:48 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx1.freebsd.org (Postfix) with ESMTP id 6A67D6FE for ; Sat, 2 Feb 2013 00:03:48 +0000 (UTC) Received: by mail-ve0-f172.google.com with SMTP id cz11so1855421veb.31 for ; Fri, 01 Feb 2013 16:03:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:cc:content-type :x-gm-message-state; bh=Fmvat8L4hGNxHjiiJjkef/aWQ6fSf1Krshs+DhxCq3I=; b=ma2VR67QuPiX1nQF6OjVktdR+fg2aF5vJf41Q8NIy8gOKZ9H06NQPMjGzEnRtqIG50 JU5H/gbSCuOFGmDQrI9ZUqDhkSKkoMqUCmc28TqVG3nG5/1sdUBFQVDWuG9Ujp2dop7e 5HlpdrKlrg1ak6uDqmuQWRlLMhXDJLop21GITiBnger0+Gxx4WS0tXrYmFjLvPmH9ebI LtuCmJ8AGH5Vk4KL7LRY4h6D7vshHZqesdRRIGH7Dj+1sf19oHyTID9WOETt9Z+8UFMz wsv7P12iAfdlm5HY0jgCyYk+SFwtNmH2mna/rUumlrtlVLWjLVRvb5lfUFcv1+RmmOAq z0Rw== MIME-Version: 1.0 X-Received: by 10.220.226.70 with SMTP id iv6mt15086472vcb.9.1359763421398; Fri, 01 Feb 2013 16:03:41 -0800 (PST) Sender: bsd-src@helfman.org Received: by 10.58.50.135 with HTTP; Fri, 1 Feb 2013 16:03:41 -0800 (PST) In-Reply-To: <201302012359.r11NxF8V015757@svn.freebsd.org> References: <201302012359.r11NxF8V015757@svn.freebsd.org> Date: Fri, 1 Feb 2013 16:03:41 -0800 X-Google-Sender-Auth: bPLC6p2SkHHDidbi2qk_VWiI76Y Message-ID: Subject: Re: svn commit: r311407 - head/graphics/xpdf From: Jason Helfman X-Gm-Message-State: ALoCoQngNaUMEgSgn+cnLS5eZkljW8JGB1HRz7xnTNNuw9yNfhDVc+DTgM7v027Z8Am2G47NMuoV Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 00:03:49 -0000 Forgot to log: Submitted by: jgh@ -myself On Fri, Feb 1, 2013 at 3:59 PM, Jason Helfman 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 > > -.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 > > >