CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 27 08:26:53 UTC 2022

Modified Files:
        pkgsrc/fonts/ghostscript-cidfonts-ryumin: Makefile
        pkgsrc/print/ghostscript-agpl: Makefile Makefile.common PLIST distinfo
        pkgsrc/print/ghostscript-agpl/patches: patch-base_gserrors_h
            patch-base_unix-dll.mak patch-configure
Removed Files:
        pkgsrc/print/ghostscript-agpl/patches: patch-base_gsicc__lcms2.c

Log Message:
ghostscript-agpl: updated to 9.56.1

9.56.1
New PDF Interpreter is now enabled by default: See Changes Coming to the PDF Interpreter
libgs is now threadsafe
The PSD output devices now write ICC profiles to their output files for improved color fidelity.
Ghostscript/GhostPDL can now output Apple Raster and URF format image files: via the "appleraster" or "urf" output devices (using the cups implementation of those formats).


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/print/ghostscript-agpl/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/ghostscript-agpl/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/ghostscript-agpl/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/print/ghostscript-agpl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_gsicc__lcms2.c
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/print/ghostscript-agpl/patches/patch-configure

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

Modified files:

Index: pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile
diff -u pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.37 pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.38
--- pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile:1.37      Wed Dec  8 16:04:23 2021
+++ pkgsrc/fonts/ghostscript-cidfonts-ryumin/Makefile   Fri May 27 08:26:52 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2021/12/08 16:04:23 adam Exp $
+# $NetBSD: Makefile,v 1.38 2022/05/27 08:26:52 adam Exp $
 
 DISTNAME=      ghostscript-cidfonts-ryumin-${GS_VERSION}
 DISTFILES=     # empty
-PKGREVISION=   4
 CATEGORIES=    fonts
 
 MAINTAINER=    makoto%ki.nu@localhost

Index: pkgsrc/print/ghostscript-agpl/Makefile
diff -u pkgsrc/print/ghostscript-agpl/Makefile:1.65 pkgsrc/print/ghostscript-agpl/Makefile:1.66
--- pkgsrc/print/ghostscript-agpl/Makefile:1.65 Sat Jan 22 13:51:55 2022
+++ pkgsrc/print/ghostscript-agpl/Makefile      Fri May 27 08:26:52 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2022/01/22 13:51:55 triaxx Exp $
+# $NetBSD: Makefile,v 1.66 2022/05/27 08:26:52 adam Exp $
 
 DISTNAME=      ghostscript-${GS_VERSION}
 PKGNAME=       ${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ArtifexSoftware/}
 GITHUB_PROJECT=        ghostpdl-downloads

Index: pkgsrc/print/ghostscript-agpl/Makefile.common
diff -u pkgsrc/print/ghostscript-agpl/Makefile.common:1.25 pkgsrc/print/ghostscript-agpl/Makefile.common:1.26
--- pkgsrc/print/ghostscript-agpl/Makefile.common:1.25  Wed Sep 29 19:19:23 2021
+++ pkgsrc/print/ghostscript-agpl/Makefile.common       Fri May 27 08:26:52 2022
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.common,v 1.25 2021/09/29 19:19:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2022/05/27 08:26:52 adam Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=    9.55.0
+GS_VERSION=    9.56.1

Index: pkgsrc/print/ghostscript-agpl/PLIST
diff -u pkgsrc/print/ghostscript-agpl/PLIST:1.20 pkgsrc/print/ghostscript-agpl/PLIST:1.21
--- pkgsrc/print/ghostscript-agpl/PLIST:1.20    Wed Sep 29 19:19:23 2021
+++ pkgsrc/print/ghostscript-agpl/PLIST Fri May 27 08:26:52 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2021/09/29 19:19:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2022/05/27 08:26:52 adam Exp $
 bin/dvipdf
 bin/eps2eps
 bin/gs
@@ -33,7 +33,7 @@ include/ghostscript/iapi.h
 include/ghostscript/ierrors.h
 lib/libgs.so
 lib/libgs.so.9
-lib/libgs.so.9.55
+lib/libgs.so.9.56
 man/de/man1/dvipdf.1
 man/de/man1/eps2eps.1
 man/de/man1/gsnd.1
@@ -71,7 +71,6 @@ man/man1/ps2ps.1
 share/doc/ghostscript/${PKGVERSION}/API.htm
 share/doc/ghostscript/${PKGVERSION}/C-style.htm
 share/doc/ghostscript/${PKGVERSION}/COPYING
-share/doc/ghostscript/${PKGVERSION}/Commprod.htm
 share/doc/ghostscript/${PKGVERSION}/DLL.htm
 share/doc/ghostscript/${PKGVERSION}/Deprecated.htm
 share/doc/ghostscript/${PKGVERSION}/Develop.htm
@@ -97,17 +96,14 @@ share/doc/ghostscript/${PKGVERSION}/Use.
 share/doc/ghostscript/${PKGVERSION}/VectorDevices.htm
 share/doc/ghostscript/${PKGVERSION}/WhatIsGS.htm
 share/doc/ghostscript/${PKGVERSION}/gdevds32.c
-share/doc/ghostscript/${PKGVERSION}/gs-style.css
 share/doc/ghostscript/${PKGVERSION}/images/Artifex_logo.png
 share/doc/ghostscript/${PKGVERSION}/images/favicon.png
 share/doc/ghostscript/${PKGVERSION}/images/ghostscript_logo.png
 share/doc/ghostscript/${PKGVERSION}/images/hamburger-light.png
 share/doc/ghostscript/${PKGVERSION}/images/x-light.png
 share/doc/ghostscript/${PKGVERSION}/index.html
-share/doc/ghostscript/${PKGVERSION}/index.js
 share/doc/ghostscript/${PKGVERSION}/pscet_status.txt
 share/doc/ghostscript/${PKGVERSION}/sample_downscale_device.htm
-share/doc/ghostscript/${PKGVERSION}/style.css
 share/doc/ghostscript/${PKGVERSION}/subclass.htm
 share/doc/ghostscript/${PKGVERSION}/thirdparty.htm
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFSubst/DroidSansFallback.ttf
@@ -346,8 +342,8 @@ ${PLIST.no_cidfmap}share/ghostscript/${P
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWGothic-Demi
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWGothic-DemiOblique
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/Z003-MediumItalic
-${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/IdiomSet/Pscript5Idiom
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/IdiomSet/PPI_CUtils
+${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/IdiomSet/Pscript5Idiom
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIcidfmap
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIconfig
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIfontmap

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.40 pkgsrc/print/ghostscript-agpl/distinfo:1.41
--- pkgsrc/print/ghostscript-agpl/distinfo:1.40 Sat Jan 22 13:51:55 2022
+++ pkgsrc/print/ghostscript-agpl/distinfo      Fri May 27 08:26:52 2022
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.40 2022/01/22 13:51:55 triaxx Exp $
+$NetBSD: distinfo,v 1.41 2022/05/27 08:26:52 adam Exp $
 
-BLAKE2s (ghostscript-9.55.0.tar.xz) = eabebbf89b7151c8ef41fae5aca3f3d67229f61f4bc8a06b0f574c05e63c6e84
-SHA512 (ghostscript-9.55.0.tar.xz) = 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
-Size (ghostscript-9.55.0.tar.xz) = 67417724 bytes
-SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
-SHA1 (patch-base_gsicc__lcms2.c) = 23f5f905b537c0d82d37e140ed45e352ab951d54
+BLAKE2s (ghostscript-9.56.1.tar.xz) = 5611f2f02ad45793279431fae5d62f81854de66a24dc7f125abd25689090e8a5
+SHA512 (ghostscript-9.56.1.tar.xz) = fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
+Size (ghostscript-9.56.1.tar.xz) = 62589232 bytes
+SHA1 (patch-base_gserrors_h) = 36c8fcf27fcb0bfdcc075ad96efe3e44fb727d9a
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
 SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688
-SHA1 (patch-base_unix-dll.mak) = 14627bbef4426f9fe73babefd1f860df3472ed22
-SHA1 (patch-configure) = f3f2583ef56a01f4107fec75057b7fc1be519c39
+SHA1 (patch-base_unix-dll.mak) = 8076ce689807872bf94b552daaf9547b646ca249
+SHA1 (patch-configure) = 0d018180a4d0796d6050bf65f0111a343739f010
 SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca

Index: pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h:1.1 pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h:1.2
--- pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h:1.1     Sat Mar 16 22:25:21 2013
+++ pkgsrc/print/ghostscript-agpl/patches/patch-base_gserrors_h Fri May 27 08:26:52 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-base_gserrors_h,v 1.1 2013/03/16 22:25:21 dholland Exp $
+$NetBSD: patch-base_gserrors_h,v 1.2 2022/05/27 08:26:52 adam Exp $
 
 This suppresses the noisy warning that __func__ redefined.
 
---- base/gserrors.h.orig       2013-02-14 07:58:13.000000000 +0000
+--- base/gserrors.h.orig       2022-04-04 13:48:49.000000000 +0000
 +++ base/gserrors.h
-@@ -60,6 +60,9 @@ int gs_log_error(int, const char *, int)
- #endif
+@@ -136,6 +136,9 @@ int gs_log_error(int, const char *, int)
+ #define return_error(err) return gs_note_error(err)
  
  #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
 +#  if (defined(__func__))

Index: pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.5 pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.6
--- pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak:1.5   Sat Jan 22 13:51:55 2022
+++ pkgsrc/print/ghostscript-agpl/patches/patch-base_unix-dll.mak       Fri May 27 08:26:52 2022
@@ -1,9 +1,6 @@
-$NetBSD: patch-base_unix-dll.mak,v 1.5 2022/01/22 13:51:55 triaxx Exp $
+$NetBSD: patch-base_unix-dll.mak,v 1.6 2022/05/27 08:26:52 adam Exp $
 
-* Use correct shared library naming on Darwin.
-* Add some rpaths.
-* A build issue has been discussed on pkgsrc-users@ (https://mail-index.netbsd.org/pkgsrc-users/2019/06/13/msg028790.html)
-  A fix has been provided upstream (https://bugs.ghostscript.com/show_bug.cgi?id=704844)
+Use correct shared library naming on Darwin.
 
 --- base/unix-dll.mak.orig     2021-09-27 07:44:02.000000000 +0000
 +++ base/unix-dll.mak
@@ -22,25 +19,3 @@ $NetBSD: patch-base_unix-dll.mak,v 1.5 2
  #LDFLAGS_SO=-dynamiclib -flat_namespace
  #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
  #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
-@@ -193,13 +193,16 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UN
-       $(NO_OP)
- 
- # Build the small Ghostscript loaders, with Gtk+ and without
--$(GSSOC_XE): gs-so-links-subtarget $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
-+$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
-       $(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c
--      $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
- 
--$(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
--      $(GLCC) $(SOC_CFLAGS) $(GLO_)$(SOC_LOADER).$(OBJ) $(C_) $(PSSRC)$(SOC_LOADER).c
--      $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)
-+$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
-+      $(GLCC) -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)
-+
-+$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
-+
-+$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
-+      $(GLCC) -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)
- 
- $(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS)
-       $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(PCLSOC_XE) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) -l$(PCL_SO_BASE)

Index: pkgsrc/print/ghostscript-agpl/patches/patch-configure
diff -u pkgsrc/print/ghostscript-agpl/patches/patch-configure:1.8 pkgsrc/print/ghostscript-agpl/patches/patch-configure:1.9
--- pkgsrc/print/ghostscript-agpl/patches/patch-configure:1.8   Wed Sep 29 19:19:23 2021
+++ pkgsrc/print/ghostscript-agpl/patches/patch-configure       Fri May 27 08:26:52 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.8 2021/09/29 19:19:23 adam Exp $
+$NetBSD: patch-configure,v 1.9 2022/05/27 08:26:52 adam Exp $
 
 Use system zlib for linking.
 Add rpath.
 Get all LDFLAGS for FreeType2.
 Use correct install_name with path on Darwin.
 
---- configure.orig     2021-09-27 07:44:02.000000000 +0000
+--- configure.orig     2022-04-04 13:48:49.000000000 +0000
 +++ configure
-@@ -4049,7 +4049,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
+@@ -4036,7 +4036,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
  CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
  CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)"
  LDFLAGSAUXTMP="\$(LDFLAGS)"
@@ -16,18 +16,19 @@ Use correct install_name with path on Da
  
  # purposefully do not include "help" output for this
  # Check whether --enable-save_confaux was given.
-@@ -4681,9 +4681,7 @@ case $host in
+@@ -4667,10 +4667,7 @@ case $host in
+         *-sun*|*-solaris*)
          CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
          CFLAGS_LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-         # the trailing space is required!
+-        # the trailing space is required!
 -        if test $GCC = no; then
 -            SET_DT_SONAME="-h "
 -        fi
 +        SET_DT_SONAME="-h,"
-         if test $GCC = yes; then
+         if test x"$GCC" = x"yes"; then
              CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
              CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
-@@ -7627,7 +7625,7 @@ fi
+@@ -7605,7 +7602,7 @@ fi
  fi
  
  if test x$with_libpaper != xno; then
@@ -36,7 +37,7 @@ Use correct install_name with path on Da
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
-@@ -11587,11 +11585,11 @@ case $host in
+@@ -11530,11 +11527,11 @@ case $host in
      ;;
      *-darwin*)
        DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
@@ -53,7 +54,7 @@ Use correct install_name with path on Da
        DYNAMIC_LIBS=""
        SO_LIB_EXT=".dylib"
      ;;
-@@ -11607,11 +11605,11 @@ case $host in
+@@ -11550,11 +11547,11 @@ case $host in
          #fi
          # ^^^ untested
        fi