Drop nonfunctional cups option, following upstream.

Upstream removed cups support and created a new "cups-filter" package
instead.  Since then, building ghostscript-agpl with the cups option
has failed.  This commit removes the cups option, and should result in
zero changes to packages built without the cups option, and hence does
not PKGREVISION++.

There is still some cups configure code, which is forced off (as it
was without the option).  It's not clear if this configure code should
also be removed (by upstream), or if it's a separate bit of cups
functionality.  Addressing this issue and adding a cups-filter package
is left for future work, after the branch.

3 files changed, 5 insertions, 30 deletions

diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 9ce37a3c9d1..6b2d08765ff 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/08/22 21:07:08 adam Exp $
+# $NetBSD: Makefile,v 1.7 2013/12/27 16:42:46 gdt Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
@@ -26,6 +26,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl:run lex pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-system-libtiff
+CONFIGURE_ARGS+=	--disable-cups
 UNLIMIT_RESOURCES+=	datasize	# gsromfs1.c
 
 BUILD_TARGET=		so
diff --git a/print/ghostscript-agpl/PLIST b/print/ghostscript-agpl/PLIST
index eef4b7d1832..bb30e36945d 100644
--- a/print/ghostscript-agpl/PLIST
+++ b/print/ghostscript-agpl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/25 02:26:48 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/12/27 16:42:46 gdt Exp $
 bin/dvipdf
 bin/eps2eps
 bin/font2c
@@ -35,8 +35,6 @@ include/ghostscript/ierrors.h
 lib/libgs.so
 lib/libgs.so.9
 lib/libgs.so.${PKGVERSION}
-${PLIST.cups}libexec/cups/filter/gstopxl
-${PLIST.cups}libexec/cups/filter/gstoraster
 man/de/man1/dvipdf.1
 man/de/man1/eps2eps.1
 man/de/man1/font2c.1
@@ -75,9 +73,6 @@ man/man1/ps2pdf14.1
 man/man1/ps2pdfwr.1
 man/man1/ps2ps.1
 man/man1/wftopfa.1
-${PLIST.cups}share/cups/model/pxlcolor.ppd
-${PLIST.cups}share/cups/model/pxlmono.ppd
-${PLIST.cups}share/examples/cups/gstoraster.convs
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFSubst/DroidSansFallback.ttf
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFont/ArtifexBullet
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H
diff --git a/print/ghostscript-agpl/options.mk b/print/ghostscript-agpl/options.mk
index 0e39820e18b..6c0ba8f3fed 100644
--- a/print/ghostscript-agpl/options.mk
+++ b/print/ghostscript-agpl/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2013/08/22 21:07:08 adam Exp $
+# $NetBSD: options.mk,v 1.3 2013/12/27 16:42:46 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
-PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits
+PKG_SUPPORTED_OPTIONS=	x11 debug fontconfig disable-compile-inits
 PKG_SUGGESTED_OPTIONS=	x11 fontconfig
 
 .include "../../mk/bsd.options.mk"
@@ -19,27 +19,6 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--without-x
 .endif
 
-PLIST_VARS+=		cups
-.if !empty(PKG_OPTIONS:Mcups)
-CONFIGURE_ARGS+=	--enable-cups
-PLIST.cups=		yes
-INSTALL_TARGET+=	install-cups
-
-CUPS_CONFDIR?=	${PKG_SYSCONFBASEDIR}/cups
-CUPS_EGDIR=	${PREFIX}/share/examples/cups
-CONF_FILES+=	${CUPS_EGDIR}/gstoraster.convs ${CUPS_CONFDIR}/gstoraster.convs
-
-SUBST_CLASSES+=		cupsetc
-SUBST_STAGE.cupsetc=	post-extract
-SUBST_MESSAGE.cupsetc=	Fixing CUPS etc directory path to install as example
-SUBST_FILES.cupsetc=	cups/cups.mak
-SUBST_SED.cupsetc=	-e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
-
-.include "../../print/cups/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-cups
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .endif