Wed Jul 29 10:44:32 2020 UTC ()
Enable cups option by default and pull in libcups instead of cups-base.
Bump pkg revision.


(jmcneill)
diff -r1.55 -r1.56 pkgsrc/print/ghostscript-agpl/Makefile
diff -r1.7 -r1.8 pkgsrc/print/ghostscript-agpl/options.mk
cvs diff -r1.55 -r1.56 pkgsrc/print/ghostscript-agpl/Makefile (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/Makefile 2020/05/22 10:56:34 1.55
+++ pkgsrc/print/ghostscript-agpl/Makefile 2020/07/29 10:44:32 1.56
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.55 2020/05/22 10:56:34 adam Exp $ 1# $NetBSD: Makefile,v 1.56 2020/07/29 10:44:32 jmcneill Exp $
2 2
3DISTNAME= ghostscript-${GS_VERSION} 3DISTNAME= ghostscript-${GS_VERSION}
4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/} 4PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_GITHUB:=ArtifexSoftware/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=ArtifexSoftware/}
8GITHUB_PROJECT= ghostpdl-downloads 8GITHUB_PROJECT= ghostpdl-downloads
9GITHUB_RELEASE= gs${GS_VERSION:S/.//} 9GITHUB_RELEASE= gs${GS_VERSION:S/.//}
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://ghostscript.com/ 13HOMEPAGE= https://ghostscript.com/
14COMMENT= Postscript interpreter 14COMMENT= Postscript interpreter
15 15
16# Upstream calls this "GPL Ghostscript", which is confusing; 16# Upstream calls this "GPL Ghostscript", which is confusing;
17# see https://bugs.ghostscript.com/show_bug.cgi?id=700877 17# see https://bugs.ghostscript.com/show_bug.cgi?id=700877
18# Plus adobe verbatim for Resources/CMap. 18# Plus adobe verbatim for Resources/CMap.
cvs diff -r1.7 -r1.8 pkgsrc/print/ghostscript-agpl/options.mk (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-agpl/options.mk 2020/05/23 12:16:49 1.7
+++ pkgsrc/print/ghostscript-agpl/options.mk 2020/07/29 10:44:32 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.7 2020/05/23 12:16:49 gdt Exp $ 1# $NetBSD: options.mk,v 1.8 2020/07/29 10:44:32 jmcneill 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 utf8 4PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8
5PKG_SUGGESTED_OPTIONS= x11 fontconfig 5PKG_SUGGESTED_OPTIONS= x11 cups 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
@@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --without-x @@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --without-x
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mcups) 22.if !empty(PKG_OPTIONS:Mcups)
23CONFIGURE_ARGS+= --enable-cups 23CONFIGURE_ARGS+= --enable-cups
24 24
25# # Because nothing is installed, this is not necessary. It remains in 25# # Because nothing is installed, this is not necessary. It remains in
26# # case a later version does install something. 26# # case a later version does install something.
27# SUBST_CLASSES+= cupsetc 27# SUBST_CLASSES+= cupsetc
28# SUBST_STAGE.cupsetc= post-extract 28# SUBST_STAGE.cupsetc= post-extract
29# SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example 29# SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example
30# SUBST_FILES.cupsetc= cups/cups.mak 30# SUBST_FILES.cupsetc= cups/cups.mak
31# SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' 31# SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
32 32
33.include "../../print/cups-base/buildlink3.mk" 33.include "../../print/libcups/buildlink3.mk"
34.else 34.else
35CONFIGURE_ARGS+= --disable-cups 35CONFIGURE_ARGS+= --disable-cups
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mdebug) 38.if !empty(PKG_OPTIONS:Mdebug)
39CONFIGURE_ARGS+= --enable-debug 39CONFIGURE_ARGS+= --enable-debug
40.endif 40.endif
41 41
42.if !empty(PKG_OPTIONS:Mfontconfig) 42.if !empty(PKG_OPTIONS:Mfontconfig)
43.include "../../fonts/fontconfig/buildlink3.mk" 43.include "../../fonts/fontconfig/buildlink3.mk"
44.else 44.else
45CONFIGURE_ARGS+= --disable-fontconfig 45CONFIGURE_ARGS+= --disable-fontconfig
46.endif 46.endif