Add missing file to PLIST.

pdftops only seems to be a link to an existing pdftops, so add
an option to use the ones from gs, poppler-utils, or xpdf.
Default to using the one from poppler-utils (adds dependency on that).

Bump PKGREVISION.

3 files changed, 33 insertions, 12 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 1a7d5afb079..f0ad415fc1c 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2009/05/14 01:19:12 christos Exp $
+# $NetBSD: Makefile,v 1.140 2009/06/03 10:20:59 wiz Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -9,7 +9,7 @@ PKGNAME=	cups-${VERS}
 BASE_VERS=	1.3.10
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
-#PKGREVISION=	2
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
 		ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 0e9f5e57900..6b8bd5eed62 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2008/10/22 21:48:16 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.26 2009/06/03 10:20:59 wiz Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -48,7 +48,7 @@ libexec/cups/filter/gziptoany
 libexec/cups/filter/hpgltops
 libexec/cups/filter/imagetops
 libexec/cups/filter/imagetoraster
-libexec/cups/filter/pdftops
+${PLIST.pdftops}libexec/cups/filter/pdftops
 libexec/cups/filter/pstops
 libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
@@ -134,6 +134,7 @@ share/cups/charmaps/iso-8859-6.txt
 share/cups/charmaps/iso-8859-7.txt
 share/cups/charmaps/iso-8859-8.txt
 share/cups/charmaps/iso-8859-9.txt
+share/cups/charmaps/jis-x0213.txt
 share/cups/charmaps/koi8-r.txt
 share/cups/charmaps/koi8-u.txt
 share/cups/charmaps/mac-roman.txt
diff --git a/print/cups/options.mk b/print/cups/options.mk
index 6842b7644e1..091faf16ba1 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -1,10 +1,28 @@
-# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2009/06/03 10:20:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
+PKG_OPTIONS_OPTIONAL_GROUPS=	pdftops
+PKG_OPTIONS_GROUP.pdftops=	gs poppler xpdf
 PKG_SUPPORTED_OPTIONS=	dnssd kerberos pam slp
-PKG_SUGGESTED_OPTIONS=	dnssd kerberos slp
+PKG_SUGGESTED_OPTIONS=	dnssd kerberos poppler slp
+
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		pdftops
+
+.if !empty(PKG_OPTIONS:Mdnssd)
+.include "../../net/mDNSResponder/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgs)
+PLIST.pdftops=	yes
+DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.include "../../mk/krb5.buildlink3.mk"
+.endif
+
 PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
@@ -17,6 +35,11 @@ CONFIGURE_ARGS+=	--disable-pam
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 .endif
 
+.if !empty(PKG_OPTIONS:Mpoppler)
+PLIST.pdftops=	yes
+DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
+.endif
+
 .if !empty(PKG_OPTIONS:Mslp)
 .include "../../net/openslp/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-slp
@@ -24,10 +47,7 @@ CONFIGURE_ARGS+=	--enable-slp
 CONFIGURE_ARGS+=	--disable-slp
 .endif
 
-.if !empty(PKG_OPTIONS:Mkerberos)
-.include "../../mk/krb5.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mdnssd)
-.include "../../net/mDNSResponder/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mxpdf)
+PLIST.pdftops=	yes
+DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
 .endif