ports/142846: [PATCH] print/cups-base: Add support for Xpdf/Poppler pdftops

[Chen-Yu Tsai]

>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 at 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: