From owner-svn-ports-all@FreeBSD.ORG Fri Mar 7 14:02:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B853DAFE; Fri, 7 Mar 2014 14:02:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A327E2A6; Fri, 7 Mar 2014 14:02:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27E2cUJ070803; Fri, 7 Mar 2014 14:02:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27E2cNt070801; Fri, 7 Mar 2014 14:02:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403071402.s27E2cNt070801@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 7 Mar 2014 14:02:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347387 - 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 14:02:38 -0000 Author: bapt Date: Fri Mar 7 14:02:37 2014 New Revision: 347387 URL: http://svnweb.freebsd.org/changeset/ports/347387 QAT: https://qat.redports.org/buildarchive/r347387/ Log: Support stage Use options helpers Modernise Modified: head/graphics/xpdf/Makefile head/graphics/xpdf/pkg-plist Modified: head/graphics/xpdf/Makefile ============================================================================== --- head/graphics/xpdf/Makefile Fri Mar 7 13:46:31 2014 (r347386) +++ head/graphics/xpdf/Makefile Fri Mar 7 14:02:37 2014 (r347387) @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= support/xpdf MAINTAINER= cy@FreeBSD.org COMMENT= Display PDF files and convert them to other formats -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 GNU_CONFIGURE= yes USES= gmake @@ -26,62 +26,35 @@ CONFIGURE_ARGS= --enable-opi \ MANPREFIX= ${PREFIX}/share/xpdf -OPTIONS_DEFINE= LIBPAPER TYPE1 X11 +OPTIONS_DEFINE= LIBPAPER TYPE1 X11 DOCS LIBPAPER_DESC= Enable libpaper TYPE1_DESC= Ghostscript type1 fonts OPTIONS_DEFAULT= TYPE1 X11 +OPTIONS_SUB= yes -NO_STAGE= yes -.include +TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts -.if ${PORT_OPTIONS:MTYPE1} -RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts -.endif - -.if ${PORT_OPTIONS:MLIBPAPER} -LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper -CONFIGURE_ARGS+=--with-libpaper-library="${LOCALBASE}/lib" \ +LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper +LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \ --with-libpaper-includes="${LOCALBASE}/include" -.else -CONFIGURE_ARGS+=--without-libpaper-library -.endif +LIBPAPER_CONFIGURE_OFF=--without-libpaper-library .if defined(A4) CONFIGURE_ARGS+= --enable-a4-paper .endif -MAN1= pdffonts.1 \ - pdfimages.1 \ - pdfinfo.1 \ - pdfdetach.1 \ - pdftoppm.1 \ - pdftops.1 \ - pdftotext.1 -MAN5= xpdfrc.5 - -.if ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+= --with-x -USES+= motif -MAN1+= xpdf.1 -PLIST_SUB+= X11="" -.else -CONFIGURE_ARGS+= --without-x -PLIST_SUB+= X11="@comment " -.endif +X11_CONFIGURE_WITH= x +X11_USES= motif post-patch: ${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \ ${WRKSRC}/xpdf/XPDFViewer.h post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ANNOUNCE CHANGES README misc/hello.pdf - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif -.if ${PORT_OPTIONS:MX11} - ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${PREFIX}/bin/xpdf -.endif + ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf .include Modified: head/graphics/xpdf/pkg-plist ============================================================================== --- head/graphics/xpdf/pkg-plist Fri Mar 7 13:46:31 2014 (r347386) +++ head/graphics/xpdf/pkg-plist Fri Mar 7 14:02:37 2014 (r347387) @@ -8,6 +8,15 @@ libexec/xpdf/pdftotext %%X11%%libexec/xpdf/xpdf %%X11%%bin/xpdf etc/xpdfrc +%%DATADIR%%/man/man1/pdfdetach.1.gz +%%DATADIR%%/man/man1/pdffonts.1.gz +%%DATADIR%%/man/man1/pdfimages.1.gz +%%DATADIR%%/man/man1/pdfinfo.1.gz +%%DATADIR%%/man/man1/pdftoppm.1.gz +%%DATADIR%%/man/man1/pdftops.1.gz +%%DATADIR%%/man/man1/pdftotext.1.gz +%%X11%%%%DATADIR%%/man/man1/xpdf.1.gz +%%DATADIR%%/man/man5/xpdfrc.5.gz %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/README