Fri Dec 27 16:42:46 2013 UTC ()
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.


(gdt)
diff -r1.6 -r1.7 pkgsrc/print/ghostscript-agpl/Makefile
diff -r1.3 -r1.4 pkgsrc/print/ghostscript-agpl/PLIST
diff -r1.2 -r1.3 pkgsrc/print/ghostscript-agpl/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/print/ghostscript-agpl/Makefile (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/Makefile 2013/08/22 21:07:08 1.6
+++ pkgsrc/print/ghostscript-agpl/Makefile 2013/12/27 16:42:46 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2013/08/22 21:07:08 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2013/12/27 16:42:46 gdt Exp $
2 2
3DISTNAME= ghostscript-${GS_VERSION} 3DISTNAME= ghostscript-${GS_VERSION}
4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/} 4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/}
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
7 http://downloads.ghostscript.com/public/ 7 http://downloads.ghostscript.com/public/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ghostscript.sourceforge.net/ 11HOMEPAGE= http://ghostscript.sourceforge.net/
12COMMENT= Postscript interpreter 12COMMENT= Postscript interpreter
13 13
14# Plus adobe verbatim for Resources/CMap. 14# Plus adobe verbatim for Resources/CMap.
@@ -16,26 +16,27 @@ LICENSE= gnu-agpl-v3 @@ -16,26 +16,27 @@ LICENSE= gnu-agpl-v3
16 16
17.include "Makefile.common" 17.include "Makefile.common"
18 18
19DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts 19DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
20 20
21CONFLICTS+= ghostscript-afpl-[0-9]* 21CONFLICTS+= ghostscript-afpl-[0-9]*
22CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]* 22CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
23CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* 23CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
24 24
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26USE_TOOLS+= gmake perl:run lex pkg-config 26USE_TOOLS+= gmake perl:run lex pkg-config
27GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
28CONFIGURE_ARGS+= --with-system-libtiff 28CONFIGURE_ARGS+= --with-system-libtiff
 29CONFIGURE_ARGS+= --disable-cups
29UNLIMIT_RESOURCES+= datasize # gsromfs1.c 30UNLIMIT_RESOURCES+= datasize # gsromfs1.c
30 31
31BUILD_TARGET= so 32BUILD_TARGET= so
32INSTALL_TARGET= soinstall 33INSTALL_TARGET= soinstall
33CONFIGURE_ARGS+= --with-omni=no # otherwise pulls in libstdc++ 34CONFIGURE_ARGS+= --with-omni=no # otherwise pulls in libstdc++
34 35
35REPLACE_PERL+= toolbin/localcluster/clusterpush.pl 36REPLACE_PERL+= toolbin/localcluster/clusterpush.pl
36REPLACE_PERL+= toolbin/checkdeps.pl 37REPLACE_PERL+= toolbin/checkdeps.pl
37REPLACE_PERL+= toolbin/pscet_status.pl 38REPLACE_PERL+= toolbin/pscet_status.pl
38REPLACE_PERL+= toolbin/performance.pl 39REPLACE_PERL+= toolbin/performance.pl
39REPLACE_PERL+= toolbin/squeeze2html.pl 40REPLACE_PERL+= toolbin/squeeze2html.pl
40REPLACE_PERL+= toolbin/bugsByEngineer.pl 41REPLACE_PERL+= toolbin/bugsByEngineer.pl
41REPLACE_PERL+= toolbin/htmldiff.pl 42REPLACE_PERL+= toolbin/htmldiff.pl
cvs diff -r1.3 -r1.4 pkgsrc/print/ghostscript-agpl/PLIST (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/PLIST 2013/12/25 02:26:48 1.3
+++ pkgsrc/print/ghostscript-agpl/PLIST 2013/12/27 16:42:46 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2013/12/25 02:26:48 mef Exp $ 1@comment $NetBSD: PLIST,v 1.4 2013/12/27 16:42:46 gdt Exp $
2bin/dvipdf 2bin/dvipdf
3bin/eps2eps 3bin/eps2eps
4bin/font2c 4bin/font2c
5bin/gs 5bin/gs
6bin/gsbj 6bin/gsbj
7bin/gsc 7bin/gsc
8bin/gsdj 8bin/gsdj
9bin/gsdj500 9bin/gsdj500
10bin/gslj 10bin/gslj
11bin/gslp 11bin/gslp
12bin/gsnd 12bin/gsnd
13bin/gsx 13bin/gsx
14bin/lprsetup.sh 14bin/lprsetup.sh
@@ -25,28 +25,26 @@ bin/ps2pdf12 @@ -25,28 +25,26 @@ bin/ps2pdf12
25bin/ps2pdf13 25bin/ps2pdf13
26bin/ps2pdf14 26bin/ps2pdf14
27bin/ps2pdfwr 27bin/ps2pdfwr
28bin/ps2ps 28bin/ps2ps
29bin/ps2ps2 29bin/ps2ps2
30bin/unix-lpr.sh 30bin/unix-lpr.sh
31bin/wftopfa 31bin/wftopfa
32include/ghostscript/gdevdsp.h 32include/ghostscript/gdevdsp.h
33include/ghostscript/iapi.h 33include/ghostscript/iapi.h
34include/ghostscript/ierrors.h 34include/ghostscript/ierrors.h
35lib/libgs.so 35lib/libgs.so
36lib/libgs.so.9 36lib/libgs.so.9
37lib/libgs.so.${PKGVERSION} 37lib/libgs.so.${PKGVERSION}
38${PLIST.cups}libexec/cups/filter/gstopxl 
39${PLIST.cups}libexec/cups/filter/gstoraster 
40man/de/man1/dvipdf.1 38man/de/man1/dvipdf.1
41man/de/man1/eps2eps.1 39man/de/man1/eps2eps.1
42man/de/man1/font2c.1 40man/de/man1/font2c.1
43man/de/man1/gsnd.1 41man/de/man1/gsnd.1
44man/de/man1/pdf2dsc.1 42man/de/man1/pdf2dsc.1
45man/de/man1/pdf2ps.1 43man/de/man1/pdf2ps.1
46man/de/man1/printafm.1 44man/de/man1/printafm.1
47man/de/man1/ps2ascii.1 45man/de/man1/ps2ascii.1
48man/de/man1/ps2pdf.1 46man/de/man1/ps2pdf.1
49man/de/man1/ps2pdf12.1 47man/de/man1/ps2pdf12.1
50man/de/man1/ps2pdf13.1 48man/de/man1/ps2pdf13.1
51man/de/man1/ps2pdf14.1 49man/de/man1/ps2pdf14.1
52man/de/man1/ps2ps.1 50man/de/man1/ps2ps.1
@@ -65,29 +63,26 @@ man/man1/pdf2dsc.1 @@ -65,29 +63,26 @@ man/man1/pdf2dsc.1
65man/man1/pdf2ps.1 63man/man1/pdf2ps.1
66man/man1/pf2afm.1 64man/man1/pf2afm.1
67man/man1/pfbtopfa.1 65man/man1/pfbtopfa.1
68man/man1/printafm.1 66man/man1/printafm.1
69man/man1/ps2ascii.1 67man/man1/ps2ascii.1
70man/man1/ps2epsi.1 68man/man1/ps2epsi.1
71man/man1/ps2pdf.1 69man/man1/ps2pdf.1
72man/man1/ps2pdf12.1 70man/man1/ps2pdf12.1
73man/man1/ps2pdf13.1 71man/man1/ps2pdf13.1
74man/man1/ps2pdf14.1 72man/man1/ps2pdf14.1
75man/man1/ps2pdfwr.1 73man/man1/ps2pdfwr.1
76man/man1/ps2ps.1 74man/man1/ps2ps.1
77man/man1/wftopfa.1 75man/man1/wftopfa.1
78${PLIST.cups}share/cups/model/pxlcolor.ppd 
79${PLIST.cups}share/cups/model/pxlmono.ppd 
80${PLIST.cups}share/examples/cups/gstoraster.convs 
81${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFSubst/DroidSansFallback.ttf 76${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFSubst/DroidSansFallback.ttf
82${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFont/ArtifexBullet 77${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFont/ArtifexBullet
83${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H 78${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H
84${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V 79${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V
85${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-H 80${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-H
86${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-RKSJ-H 81${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-RKSJ-H
87${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-RKSJ-V 82${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-RKSJ-V
88${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-V 83${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-V
89${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78ms-RKSJ-H 84${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78ms-RKSJ-H
90${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78ms-RKSJ-V 85${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78ms-RKSJ-V
91${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/83pv-RKSJ-H 86${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/83pv-RKSJ-H
92${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/90ms-RKSJ-H 87${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/90ms-RKSJ-H
93${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/90ms-RKSJ-V 88${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/90ms-RKSJ-V
cvs diff -r1.2 -r1.3 pkgsrc/print/ghostscript-agpl/options.mk (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/options.mk 2013/08/22 21:07:08 1.2
+++ pkgsrc/print/ghostscript-agpl/options.mk 2013/12/27 16:42:46 1.3
@@ -1,55 +1,34 @@ @@ -1,55 +1,34 @@
1# $NetBSD: options.mk,v 1.2 2013/08/22 21:07:08 adam Exp $ 1# $NetBSD: options.mk,v 1.3 2013/12/27 16:42:46 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript 3PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
4PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits 4PKG_SUPPORTED_OPTIONS= x11 debug fontconfig disable-compile-inits
5PKG_SUGGESTED_OPTIONS= x11 fontconfig 5PKG_SUGGESTED_OPTIONS= x11 fontconfig
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# (no_cidfmap) when --disable-compile-inits selected, 9# (no_cidfmap) when --disable-compile-inits selected,
10# cidfmap is renamed to cidfmap.dist 10# cidfmap is renamed to cidfmap.dist
11PLIST_VARS+= no_cidfmap 11PLIST_VARS+= no_cidfmap
12 12
13.if !empty(PKG_OPTIONS:Mx11) 13.if !empty(PKG_OPTIONS:Mx11)
14CONFIGURE_ARGS+= --with-x 14CONFIGURE_ARGS+= --with-x
15.include "../../x11/libX11/buildlink3.mk" 15.include "../../x11/libX11/buildlink3.mk"
16.include "../../x11/libXt/buildlink3.mk" 16.include "../../x11/libXt/buildlink3.mk"
17.include "../../x11/libXext/buildlink3.mk" 17.include "../../x11/libXext/buildlink3.mk"
18.else 18.else
19CONFIGURE_ARGS+= --without-x 19CONFIGURE_ARGS+= --without-x
20.endif 20.endif
21 21
22PLIST_VARS+= cups 
23.if !empty(PKG_OPTIONS:Mcups) 
24CONFIGURE_ARGS+= --enable-cups 
25PLIST.cups= yes 
26INSTALL_TARGET+= install-cups 
27 
28CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups 
29CUPS_EGDIR= ${PREFIX}/share/examples/cups 
30CONF_FILES+= ${CUPS_EGDIR}/gstoraster.convs ${CUPS_CONFDIR}/gstoraster.convs 
31 
32SUBST_CLASSES+= cupsetc 
33SUBST_STAGE.cupsetc= post-extract 
34SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example 
35SUBST_FILES.cupsetc= cups/cups.mak 
36SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' 
37 
38.include "../../print/cups/buildlink3.mk" 
39.else 
40CONFIGURE_ARGS+= --disable-cups 
41.endif 
42 
43.if !empty(PKG_OPTIONS:Mdebug) 22.if !empty(PKG_OPTIONS:Mdebug)
44CONFIGURE_ARGS+= --enable-debug 23CONFIGURE_ARGS+= --enable-debug
45.endif 24.endif
46 25
47.if !empty(PKG_OPTIONS:Mfontconfig) 26.if !empty(PKG_OPTIONS:Mfontconfig)
48.include "../../fonts/fontconfig/buildlink3.mk" 27.include "../../fonts/fontconfig/buildlink3.mk"
49.else 28.else
50CONFIGURE_ARGS+= --disable-fontconfig 29CONFIGURE_ARGS+= --disable-fontconfig
51.endif 30.endif
52 31
53# Please note the same if condition is in post-extract: target in Makefile 32# Please note the same if condition is in post-extract: target in Makefile
54.if !empty(PKG_OPTIONS:Mdisable-compile-inits) 33.if !empty(PKG_OPTIONS:Mdisable-compile-inits)
55CONFIGURE_ARGS+= --disable-compile-inits 34CONFIGURE_ARGS+= --disable-compile-inits