From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 15 02:20:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE31E1065670 for ; Fri, 15 Jan 2010 02:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 884228FC16 for ; Fri, 15 Jan 2010 02:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0F2K1L8092313 for ; Fri, 15 Jan 2010 02:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0F2K1iC092312; Fri, 15 Jan 2010 02:20:01 GMT (envelope-from gnats) Resent-Date: Fri, 15 Jan 2010 02:20:01 GMT Resent-Message-Id: <201001150220.o0F2K1iC092312@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, Chen-Yu Tsai Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BB351065692 for ; Fri, 15 Jan 2010 02:12:28 +0000 (UTC) (envelope-from wens@snoopy.csie.ntu.edu.tw) Received: from snoopy.csie.ntu.edu.tw (snoopy.csie.ntu.edu.tw [140.112.30.31]) by mx1.freebsd.org (Postfix) with ESMTP id AC0E78FC12 for ; Fri, 15 Jan 2010 02:12:27 +0000 (UTC) Received: from snoopy.csie.ntu.edu.tw (localhost [127.0.0.1]) by snoopy.csie.ntu.edu.tw (8.14.3/8.14.3) with ESMTP id o0F20Mq8020337 for ; Fri, 15 Jan 2010 10:00:22 +0800 (CST) (envelope-from wens@snoopy.csie.ntu.edu.tw) Received: (from wens@localhost) by snoopy.csie.ntu.edu.tw (8.14.3/8.14.3/Submit) id o0F20MuE020336; Fri, 15 Jan 2010 10:00:22 +0800 (CST) (envelope-from wens) Message-Id: <201001150200.o0F20MuE020336@snoopy.csie.ntu.edu.tw> Date: Fri, 15 Jan 2010 10:00:22 +0800 (CST) From: Chen-Yu Tsai To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/142846: [PATCH] print/cups-base: Add support for Xpdf/Poppler pdftops X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chen-Yu Tsai List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2010 02:20:01 -0000 >Number: 142846 >Category: ports >Synopsis: [PATCH] print/cups-base: Add support for Xpdf/Poppler pdftops >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 Jan 15 02:20:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Chen-Yu Tsai >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD snoopy.csie.ntu.edu.tw 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 12 14:09:49 CST 2010 root@snoopy.csie.ntu.edu.tw:/usr/obj/usr/src/sys/PRINTER amd64 >Description: The pdftops filter in CUPS can support Ghostscript and Xpdf/Poppler pdftops, but the port can only be configured to use Ghostscript. >How-To-Repeat: >Fix: The attached patch adds an option for using Xpdf/Poppler. Note that Ghostscript and Xpdf cannot be used at the same time. --- cups-base.with_xpdf.diff begins here --- diff -ru cups-base.orig/Makefile cups-base/Makefile --- cups-base.orig/Makefile 2010-01-14 19:58:21.000000000 +0800 +++ cups-base/Makefile 2010-01-14 20:27:13.000000000 +0800 @@ -47,7 +47,8 @@ LDAP "Build with LDAP support" off \ DBUS "Build with DBUS support" off \ LIBUSB "Build with USB support" off \ - GHOSTSCRIPT "Build pdftps with GHOSTSCRIPT" on \ + GHOSTSCRIPT "Build pdftops with GHOSTSCRIPT" on \ + XPDF "Build pdftops with Xpdf/Poppler" off \ XDG_OPEN "Build with XDG_OPEN as browser" off CUPS_ETCDIR= ${PREFIX}/etc/cups @@ -126,10 +127,17 @@ .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_GHOSTSCRIPT) USE_GHOSTSCRIPT= yes -CONFIGURE_ARGS+= --enable-pdftops --with-pdftops=gs -PLIST_SUB+= WITH_GHOSTSCRIPT="" +CONFIGURE_ARGS+= --with-pdftops=gs +PLIST_SUB+= CUPS_PDFTOPS="" +.if defined(WITH_XPDF) +IGNORE= "Pick ghostscript or xpdf, not both" +.endif +.elsif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_XPDF) +RUN_DEPENDS+= pdftops:${PORTSDIR}/graphics/xpdf +CONFIGURE_ARGS+= --with-pdftops=pdftops +PLIST_SUB+= CUPS_PDFTOPS="" .else -PLIST_SUB+= WITH_GHOSTSCRIPT="@comment " +PLIST_SUB+= CUPS_PDFTOPS="@comment " .endif .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_PYTHON) @@ -323,7 +331,7 @@ .endif post-install: -.if defined(WITH_GHOSTSCRIPT) +.if defined(WITH_GHOSTSCRIPT) || defined(WITH_XPDF) ${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/ .endif ${INSTALL} -d ${CUPS_ETCDIR}/ diff -ru cups-base.orig/pkg-plist cups-base/pkg-plist --- cups-base.orig/pkg-plist 2010-01-14 19:58:21.000000000 +0800 +++ cups-base/pkg-plist 2010-01-14 20:27:29.000000000 +0800 @@ -89,7 +89,7 @@ libexec/cups/daemon/cups-polld libexec/cups/filter/commandtoescpx libexec/cups/filter/commandtopclx -%%WITH_GHOSTSCRIPT%%libexec/cups/filter/pdftops +%%CUPS_PDFTOPS%%libexec/cups/filter/pdftops libexec/cups/filter/rastertoescpx libexec/cups/filter/rastertopclx libexec/cups/monitor/bcp --- cups-base.with_xpdf.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: