Pullup ticket #6512 - requested by mlelstv

print/ghostscript-agpl: pullup and build fix

Revisions pulled up:
- print/ghostscript-agpl/Makefile.common           1.25
- print/ghostscript-agpl/PLIST                     1.20
- print/ghostscript-agpl/distinfo                  1.37
- print/ghostscript-agpl/patches/patch-configure    1.8

4 files changed, 21 insertions, 17 deletions

diff --git a/print/ghostscript-agpl/Makefile.common b/print/ghostscript-agpl/Makefile.common
index 735ac814257..e97cd798eee 100644
--- a/print/ghostscript-agpl/Makefile.common
+++ b/print/ghostscript-agpl/Makefile.common
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.common,v 1.24 2021/06/09 20:20:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.24.4.1 2021/10/13 20:47:09 tm Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.54.0
+GS_VERSION=	9.55.0
diff --git a/print/ghostscript-agpl/PLIST b/print/ghostscript-agpl/PLIST
index 30ae624c57a..7f8f8def867 100644
--- a/print/ghostscript-agpl/PLIST
+++ b/print/ghostscript-agpl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2021/06/15 12:39:31 mef Exp $
+@comment $NetBSD: PLIST,v 1.19.4.1 2021/10/13 20:47:09 tm 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.54
+lib/libgs.so.9.55
 man/de/man1/dvipdf.1
 man/de/man1/eps2eps.1
 man/de/man1/gsnd.1
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index 1a2d39d8b4f..3454724082f 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.35.4.2 2021/10/05 21:20:57 tm Exp $
+$NetBSD: distinfo,v 1.35.4.3 2021/10/13 20:47:09 tm Exp $
 
-SHA1 (ghostscript-9.54.0.tar.xz) = 23cce513d4e80504da0778e4ce6f05db73ae2bee
-RMD160 (ghostscript-9.54.0.tar.xz) = 2229023643022c1e6a22db4cce3f5004abb245cd
-SHA512 (ghostscript-9.54.0.tar.xz) = a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
-Size (ghostscript-9.54.0.tar.xz) = 56001768 bytes
+SHA1 (ghostscript-9.55.0.tar.xz) = 8bdb24d0dbb429c5bd574fa94a613206d5543ec9
+RMD160 (ghostscript-9.55.0.tar.xz) = 4e4833825b1645953afb56bbdde5fd14c6e04d6f
+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
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
 SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688
 SHA1 (patch-base_unix-dll.mak) = 73b5ee7fcbc7940ce72f44b35417d624f7ae5bca
-SHA1 (patch-configure) = 8de018c1f7978423faf0b8d2c52e590a5ee484fe
+SHA1 (patch-configure) = f3f2583ef56a01f4107fec75057b7fc1be519c39
 SHA1 (patch-devices_devs.mak) = e9937d401a278cc6d0a6d4cff78c526375bc18ca
diff --git a/print/ghostscript-agpl/patches/patch-configure b/print/ghostscript-agpl/patches/patch-configure
index caf44c4cb96..16d6ac72dfc 100644
--- a/print/ghostscript-agpl/patches/patch-configure
+++ b/print/ghostscript-agpl/patches/patch-configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.7 2020/09/29 14:29:42 ryoon Exp $
+$NetBSD: patch-configure,v 1.7.8.1 2021/10/13 20:47:09 tm Exp $
 
 Use system zlib for linking.
 Add rpath.
 Get all LDFLAGS for FreeType2.
 Use correct install_name with path on Darwin.
 
---- configure.orig	2020-09-25 12:33:30.000000000 +0000
+--- configure.orig	2021-09-27 07:44:02.000000000 +0000
 +++ configure
-@@ -4028,7 +4028,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
+@@ -4049,7 +4049,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
  CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
  CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)"
  LDFLAGSAUXTMP="\$(LDFLAGS)"
@@ -16,7 +16,7 @@ Use correct install_name with path on Darwin.
  
  # purposefully do not include "help" output for this
  # Check whether --enable-save_confaux was given.
-@@ -4660,9 +4660,7 @@ case $host in
+@@ -4681,9 +4681,7 @@ case $host in
          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!
@@ -27,7 +27,7 @@ Use correct install_name with path on Darwin.
          if test $GCC = yes; then
              CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
              CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
-@@ -7693,7 +7691,7 @@ fi
+@@ -7627,7 +7625,7 @@ fi
  fi
  
  if test x$with_libpaper != xno; then
@@ -36,7 +36,7 @@ Use correct install_name with path on Darwin.
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
-@@ -11620,10 +11618,10 @@ case $host in
+@@ -11587,11 +11585,11 @@ case $host in
      ;;
      *-darwin*)
        DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
@@ -44,14 +44,16 @@ Use correct install_name with path on Darwin.
 -      PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PCL_SONAME_MAJOR_MINOR)"
 -      XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(XPS_SONAME_MAJOR_MINOR)"
 -      PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GPDL_SONAME_MAJOR_MINOR)"
+-      PDF_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PDF_SONAME_MAJOR_MINOR)"
 +      GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)"
 +      PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)"
 +      XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)"
 +      PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GPDL_SONAME_MAJOR_MINOR)"
++      PDF_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PDF_SONAME_MAJOR_MINOR)"
        DYNAMIC_LIBS=""
        SO_LIB_EXT=".dylib"
      ;;
-@@ -11639,10 +11637,10 @@ case $host in
+@@ -11607,11 +11605,11 @@ case $host in
          #fi
          # ^^^ untested
        fi
@@ -59,10 +61,12 @@ Use correct install_name with path on Darwin.
 -      PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
 -      XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
 -      PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
+-      PDF_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
 +      GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags"
 +      PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
 +      XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
 +      PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
++      PDF_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
        DYNAMIC_LIBS=""
        SO_LIB_EXT=".so"
      ;;