From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 7 12:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 6311C159 for ; Fri, 7 Mar 2014 12:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 3EBB7681 for ; Fri, 7 Mar 2014 12:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s27C01wh047462 for ; Fri, 7 Mar 2014 12:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s27C01p2047461; Fri, 7 Mar 2014 12:00:01 GMT (envelope-from gnats) Resent-Date: Fri, 7 Mar 2014 12:00:01 GMT Resent-Message-Id: <201403071200.s27C01p2047461@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov 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 6A8CCFF8; Fri, 7 Mar 2014 11:50:55 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 255D93EA; Fri, 7 Mar 2014 11:50:55 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WLtIj-0000Ik-80; Fri, 07 Mar 2014 15:50:53 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id CA79B866; Fri, 7 Mar 2014 15:50:52 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id C646B31F46; Fri, 7 Mar 2014 15:50:52 +0400 (MSK) Message-Id: <20140307115052.C646B31F46@hades.panopticon> Date: Fri, 7 Mar 2014 15:50:52 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187348: [PATCH] graphics/xpdf: support staging Cc: cy@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 12:00:01 -0000 >Number: 187348 >Category: ports >Synopsis: [PATCH] graphics/xpdf: support staging >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: Fri Mar 07 12:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Support staging - Use new LIB_DEPENDS syntax - Use new OPTIONS features Port maintainer (cy@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- xpdf-3.03.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 340759) +++ Makefile (working copy) @@ -5,13 +5,12 @@ PORTREVISION= 4 CATEGORIES= graphics print MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ - ${MASTER_SITE_TEX_CTAN} -MASTER_SITE_SUBDIR= support/xpdf + TEX_CTAN/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 @@ -30,58 +29,30 @@ LIBPAPER_DESC= Enable libpaper TYPE1_DESC= Ghostscript type1 fonts OPTIONS_DEFAULT= TYPE1 X11 +OPTIONS_SUB= yes -NO_STAGE= yes +TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts +LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper +LIBPAPER_CONFIGURE_ON= --with-libpaper-library="${LOCALBASE}/lib" \ + --with-libpaper-includes="${LOCALBASE}/include" +LIBPAPER_CONFIGURE_OFF= --without-libpaper-library +A4_CONFIGURE_ENABLE= a4-paper +X11_CONFIGURE_WITH= x +X11_USES= motif + .include -.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" \ - --with-libpaper-includes="${LOCALBASE}/include" -.else -CONFIGURE_ARGS+=--without-libpaper-library -.endif - -.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 - 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 + ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf .endif .include Index: pkg-plist =================================================================== --- pkg-plist (revision 340759) +++ pkg-plist (working copy) @@ -13,8 +13,17 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/hello.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/xpdf/man/man5 -@dirrm share/xpdf/man/man1 -@dirrm share/xpdf/man -@dirrm share/xpdf +%%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 +@dirrm %%DATADIR%%/man/man5 +@dirrm %%DATADIR%%/man/man1 +@dirrm %%DATADIR%%/man +@dirrm %%DATADIR%% @dirrm libexec/xpdf --- xpdf-3.03.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: