CVS commit: pkgsrc/print/ghostscript-agpl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 30 12:37:31 UTC 2016

Modified Files:
        pkgsrc/print/ghostscript-agpl: Makefile PLIST distinfo
        pkgsrc/print/ghostscript-agpl/patches: patch-af patch-ah
Removed Files:
        pkgsrc/print/ghostscript-agpl: Makefile.common
        pkgsrc/print/ghostscript-agpl/patches: patch-al

Log Message:
Updated ghostscript-agpl to 9.20.

Remove Makefile.common that is not used by anything, despite
a comment to the contrary.

Highlights in this release include:

    The usual round of bug fixes, compatibility changes, and
    incremental improvements.

For a list of open issues, or to report problems, please visit
bugs.ghostscript.com.  Incompatible changes

    The planned device API tidy did not happen for this release,
    due to time pressures, but we still intend to undertake the
    following: We plan to somewhat tidy up the device API. We intend
    to remove deprecated device procs (methods/function pointers)
    and change the device API so every device proc takes a graphics
    state parameter (rather than the current scheme where only a
    very few procs take an imager state parameter). This should
    serve as notice to anyone maintaining a Ghostscript device
    outside the canonical source tree that you may (probably will)
    need to update your device(s) when these changes happen. Devices
    using only the non-deprecated procs should be trivial to update.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/ghostscript-agpl/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/print/ghostscript-agpl/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/ghostscript-agpl/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/ghostscript-agpl/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/ghostscript-agpl/patches/patch-af
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/ghostscript-agpl/patches/patch-ah
cvs rdiff -u -r1.4 -r0 pkgsrc/print/ghostscript-agpl/patches/patch-al

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/ghostscript-agpl/Makefile
diff -u pkgsrc/print/ghostscript-agpl/Makefile:1.20 pkgsrc/print/ghostscript-agpl/Makefile:1.21
--- pkgsrc/print/ghostscript-agpl/Makefile:1.20 Sat Jul  9 06:38:50 2016
+++ pkgsrc/print/ghostscript-agpl/Makefile      Fri Sep 30 12:37:31 2016
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.20 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2016/09/30 12:37:31 wiz Exp $
 
-DISTNAME=      ghostscript-${GS_VERSION}
+DISTNAME=      ghostscript-9.20
 PKGNAME=       ${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=   1
 CATEGORIES=    print
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ArtifexSoftware/ghostpdl-downloads/releases/download/gs919/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://ghostscript.sourceforge.net/
+HOMEPAGE=      http://ghostscript.com/
 COMMENT=       Postscript interpreter
-
 # Plus adobe verbatim for Resources/CMap.
 LICENSE=       gnu-agpl-v3
 
-.include       "Makefile.common"
-
 DEPENDS+=              ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
-CONFLICTS+=            ghostscript-afpl-[0-9]*
-CONFLICTS+=            ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+=            ghostscript-gnu{,-nox11,-x11}-[0-9]*
-
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl:run lex pkg-config
 GNU_CONFIGURE=         yes
@@ -45,10 +36,6 @@ GS_RESOURCEDIR=              ${PREFIX}/share/ghostsc
 # MESSAGE file substitution
 MESSAGE_SUBST+=                GS_RESOURCEDIR=${GS_RESOURCEDIR}
 
-# XXX make sure the local jpeg headers are found before those pulled
-# in indirectly by cups bl3
-CPPFLAGS+=             -Ijpeg
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 

Index: pkgsrc/print/ghostscript-agpl/PLIST
diff -u pkgsrc/print/ghostscript-agpl/PLIST:1.7 pkgsrc/print/ghostscript-agpl/PLIST:1.8
--- pkgsrc/print/ghostscript-agpl/PLIST:1.7     Thu Apr  7 08:52:05 2016
+++ pkgsrc/print/ghostscript-agpl/PLIST Fri Sep 30 12:37:31 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/04/07 08:52:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/09/30 12:37:31 wiz Exp $
 bin/dvipdf
 bin/eps2eps
 bin/font2c
@@ -420,7 +420,6 @@ share/ghostscript/${PKGVERSION}/doc/psce
 share/ghostscript/${PKGVERSION}/doc/thirdparty.htm
 share/ghostscript/${PKGVERSION}/examples/alphabet.ps
 share/ghostscript/${PKGVERSION}/examples/annots.pdf
-share/ghostscript/${PKGVERSION}/examples/chess.ps
 share/ghostscript/${PKGVERSION}/examples/cjk/all_ac1.ps
 share/ghostscript/${PKGVERSION}/examples/cjk/all_ag1.ps
 share/ghostscript/${PKGVERSION}/examples/cjk/all_aj1.ps

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.12 pkgsrc/print/ghostscript-agpl/distinfo:1.13
--- pkgsrc/print/ghostscript-agpl/distinfo:1.12 Thu Apr  7 08:52:05 2016
+++ pkgsrc/print/ghostscript-agpl/distinfo      Fri Sep 30 12:37:31 2016
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.12 2016/04/07 08:52:05 adam Exp $
+$NetBSD: distinfo,v 1.13 2016/09/30 12:37:31 wiz Exp $
 
-SHA1 (ghostscript-9.19.tar.bz2) = 6ac5c1fb665b3201622e1149f04c641c506bf6c4
-RMD160 (ghostscript-9.19.tar.bz2) = c869357b20ab50d36a6d6ec656732f711e2d36ed
-SHA512 (ghostscript-9.19.tar.bz2) = d92d05c90ab4849ccca0d8aa0c583d41da3fe6089fd724a84f1fbddb3e65e116ee064ae0933b77019609332f765840146b62607e2f94dbfff90aa0597e1271ea
-Size (ghostscript-9.19.tar.bz2) = 29616270 bytes
-SHA1 (patch-af) = ad8fbc52a814905b25dbd10ff51ae8615579a7d1
-SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
+SHA1 (ghostscript-9.20.tar.gz) = ed724edec652757be25e84420f3ebd17ed70e1a5
+RMD160 (ghostscript-9.20.tar.gz) = ab84774fb80746e7b5bb23dcc94e3a5aadd62c15
+SHA512 (ghostscript-9.20.tar.gz) = 6c9d4f669a43192119cfe1a3d8070f3024fe08ebbbc1aa906781a71d9c08c87e0b3a215e01cdf33be671bdb7400bb641b5a65d45e1b15f8c5ccaaae202fa774c
+Size (ghostscript-9.20.tar.gz) = 36080631 bytes
+SHA1 (patch-af) = 70358e9271b64690e89556568a1456edf42c5ebb
+SHA1 (patch-ah) = 360c1dcf3ee100b4639fbd8f774ce8eb9b6a7add
 SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
-SHA1 (patch-al) = 8245bdac049567139570b5b2d3f7b784f82a6848
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = bf7e47c77e6960df473d3bf97dfa78f207a14a01

Index: pkgsrc/print/ghostscript-agpl/patches/patch-af
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-af:1.6 pkgsrc/print/ghostscript-agpl/patches/patch-af:1.7
--- pkgsrc/print/ghostscript-agpl/patches/patch-af:1.6  Thu Apr  7 08:52:06 2016
+++ pkgsrc/print/ghostscript-agpl/patches/patch-af      Fri Sep 30 12:37:31 2016
@@ -1,43 +1,20 @@
-$NetBSD: patch-af,v 1.6 2016/04/07 08:52:06 adam Exp $
+$NetBSD: patch-af,v 1.7 2016/09/30 12:37:31 wiz Exp $
 
-ghostscript has hand-rolled shared lib handling in src/unix-dll.mak
-that does not do the right thing on Darwin (where shared libs are
-created with different linking flags and use dylib rather than so
-as an extension).
+Add some rpaths.
 
-You need to manually reconfigure unix-dll.mak to make it work, so
-do it in hacks.mk.
-
---- base/unix-dll.mak.orig     2016-03-23 08:22:48.000000000 +0000
+--- base/unix-dll.mak.orig     2016-09-26 10:41:28.000000000 +0000
 +++ base/unix-dll.mak
-@@ -66,11 +66,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$
- 
- 
- # MacOS X
--#GS_SOEXT=dylib
--#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
--#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
--#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
--#LDFLAGS_SO=-dynamiclib -flat_namespace
-+#Darwin#GS_SOEXT=dylib
-+#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-+#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
- #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
- 
-@@ -96,11 +96,11 @@ so-links-subtarget:        $(GS_SO) $(UNIX_DLL_
+@@ -171,11 +171,11 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UN
  # Build the small Ghostscript loaders, with Gtk+ and without
- $(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -      -L$(BINDIR) -l$(GS_SO_BASE)
 +      -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE)
  
- $(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
        $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -      -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
 +      -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS)
  
- # ------------------------- Recursive make targets ------------------------- #
- 
+ $(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS)
+       $(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE)

Index: pkgsrc/print/ghostscript-agpl/patches/patch-ah
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-ah:1.2 pkgsrc/print/ghostscript-agpl/patches/patch-ah:1.3
--- pkgsrc/print/ghostscript-agpl/patches/patch-ah:1.2  Thu Aug 22 21:07:08 2013
+++ pkgsrc/print/ghostscript-agpl/patches/patch-ah      Fri Sep 30 12:37:31 2016
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2013/08/22 21:07:08 adam Exp $
+$NetBSD: patch-ah,v 1.3 2016/09/30 12:37:31 wiz Exp $
+
+Add rpath.
 
 --- configure.orig     2012-08-08 17:04:57.000000000 +0900
 +++ configure