print/ghostscript9-agpl-{base,x11}: update to 9.56.1

8 files changed, 17 insertions, 85 deletions

diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index 69943dddaf2e..f80aeca8d2d7 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ghostscript
-PORTVERSION=	9.55.0
-PORTREVISION=	1
+PORTVERSION=	9.56.1
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/
 PKGNAMESUFFIX=	9-agpl-base
@@ -61,7 +60,7 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 		--without-x
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
-PLIST_SUB=	GS_VERSION="${PORTVERSION:S/.0$//}" \
+PLIST_SUB=	GS_VERSION="${PORTVERSION:C/.[0-9]$//}" \
 		PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS CUPS IJS
diff --git a/print/ghostscript9-agpl-base/distinfo b/print/ghostscript9-agpl-base/distinfo
index 7ecba27459e1..059ca5ac3fd7 100644
--- a/print/ghostscript9-agpl-base/distinfo
+++ b/print/ghostscript9-agpl-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634973195
-SHA256 (ghostscript-9.55.0.tar.xz) = 6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
-SIZE (ghostscript-9.55.0.tar.xz) = 67417724
+TIMESTAMP = 1651717085
+SHA256 (ghostscript-9.56.1.tar.xz) = d43406805650009b42c3d5f6dc535233454533c1e27c13a77dd1d462a056b8e4
+SIZE (ghostscript-9.56.1.tar.xz) = 62589232
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps
index abc7117049f9..3d33ef6f3137 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps
+++ b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps
@@ -1,6 +1,6 @@
---- Resource/Init/gs_ttf.ps.orig	2020-03-12 12:26:37 UTC
+--- Resource/Init/gs_ttf.ps.orig	2022-04-04 13:48:49 UTC
 +++ Resource/Init/gs_ttf.ps
-@@ -1082,10 +1082,17 @@ mark
+@@ -1116,10 +1116,17 @@ mark
    } ifelse
                  % Stack: ... /FontInfo mark key1 value1 ...
    post //null ne {
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps
index 31fade204c07..57342870bd41 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps
+++ b/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps
@@ -1,6 +1,6 @@
---- Resource/Init/pdf_font.ps.orig	2020-03-12 12:26:37 UTC
+--- Resource/Init/pdf_font.ps.orig	2022-04-04 13:48:49 UTC
 +++ Resource/Init/pdf_font.ps
-@@ -2180,10 +2180,12 @@ currentdict /CMap_read_dict undef
+@@ -2231,10 +2231,12 @@ currentdict /CMap_read_dict undef
  
  /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
    dup /BaseFont get findCIDFont exch pop
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
index 4269e879be5a..847087759049 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
+++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
@@ -1,9 +1,9 @@
---- Resource/Init/cidfmap.orig	2020-03-12 12:26:37 UTC
+--- Resource/Init/cidfmap.orig	2022-04-04 13:48:49 UTC
 +++ Resource/Init/cidfmap
-@@ -37,6 +37,67 @@
- %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
- %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
- %   /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ;
+@@ -46,3 +46,64 @@
+ %
+ %  Note the use of a string to cope with the name containing a space.
+ %
 +/Ryumin-Light << /FileType /TrueType /Path (std.ja_JP/Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ;
 +/GothicBBB-Medium << /FileType /TrueType /Path (std.ja_JP/GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ;
 +
@@ -65,6 +65,3 @@
 +/STSong-Light << /FileType /TrueType /Path (std.zh_CN/STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ;
 +/MSung-Light << /FileType /TrueType /Path (std.zh_CN/MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ;
 +/MHei-Medium << /FileType /TrueType /Path (std.zh_CN/MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ;
- %
- %   NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this
- %         to include a default value should getenv fail.
diff --git a/print/ghostscript9-agpl-base/files/patch-configure b/print/ghostscript9-agpl-base/files/patch-configure
index 73d694ba2be5..9f99249c05b1 100644
--- a/print/ghostscript9-agpl-base/files/patch-configure
+++ b/print/ghostscript9-agpl-base/files/patch-configure
@@ -1,66 +1,6 @@
---- configure.orig	2021-09-27 07:44:02 UTC
+--- configure.orig	2022-04-04 13:48:49 UTC
 +++ configure
-@@ -5539,7 +5539,7 @@ if test "${enable_threadsafe+set}" = set; then :
- fi
- 
- if test x$enable_threadsafe = xyes ; then
--    CFLAGS="-DGS_THREADSAFE"
-+    CFLAGS="$CFLAGS -DGS_THREADSAFE"
- fi
- 
- 
-@@ -11352,42 +11352,42 @@ if test x$enable_threadsafe = xyes; then
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    P_DEVS0=`echo $P_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    P_DEVS0=`echo $P_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$F_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    F_DEVS0=`echo $F_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    F_DEVS0=`echo $F_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$CUPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$XPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$IJS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$PNG_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$X11_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    X11_DEVS0=`echo $X11_DEVS0 | sed "s/\b$ntsdev\b//g"`
-+    X11_DEVS0=`echo $X11_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   for ntsdev in $NTS_DEVS ; do
-     NTS_EXCLUDES="$(echo \"$JBIG2_DEVS{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
--    JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/\b$ntsdev\b//g"`
-+    JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
-   done
- 
-   NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "`
-@@ -11686,7 +11686,12 @@ if test "${enable_dynamic+set}" = set; then :
+@@ -11629,7 +11629,12 @@ if test "${enable_dynamic+set}" = set; then :
          DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
        ;;
        *bsd*)
diff --git a/print/ghostscript9-agpl-base/pkg-plist b/print/ghostscript9-agpl-base/pkg-plist
index 41a9c125e09d..bef358fd452d 100644
--- a/print/ghostscript9-agpl-base/pkg-plist
+++ b/print/ghostscript9-agpl-base/pkg-plist
@@ -85,7 +85,6 @@ share/color/icc/ghostscript/srgb.icc
 %%PORTDOCS%%%%DOCSDIR%%/API.htm
 %%PORTDOCS%%%%DOCSDIR%%/C-style.htm
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Commprod.htm
 %%PORTDOCS%%%%DOCSDIR%%/DLL.htm
 %%PORTDOCS%%%%DOCSDIR%%/Deprecated.htm
 %%PORTDOCS%%%%DOCSDIR%%/Develop.htm
@@ -111,17 +110,14 @@ share/color/icc/ghostscript/srgb.icc
 %%PORTDOCS%%%%DOCSDIR%%/VectorDevices.htm
 %%PORTDOCS%%%%DOCSDIR%%/WhatIsGS.htm
 %%PORTDOCS%%%%DOCSDIR%%/gdevds32.c
-%%PORTDOCS%%%%DOCSDIR%%/gs-style.css
 %%PORTDOCS%%%%DOCSDIR%%/images/Artifex_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/images/favicon.png
 %%PORTDOCS%%%%DOCSDIR%%/images/ghostscript_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/images/hamburger-light.png
 %%PORTDOCS%%%%DOCSDIR%%/images/x-light.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.js
 %%PORTDOCS%%%%DOCSDIR%%/pscet_status.txt
 %%PORTDOCS%%%%DOCSDIR%%/sample_downscale_device.htm
-%%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/subclass.htm
 %%PORTDOCS%%%%DOCSDIR%%/thirdparty.htm
 %%DATADIR%%/Resource/CIDFSubst/DroidSansFallback.ttf
diff --git a/print/ghostscript9-agpl-x11/Makefile b/print/ghostscript9-agpl-x11/Makefile
index aa38239f2fe2..acc64206ffc8 100644
--- a/print/ghostscript9-agpl-x11/Makefile
+++ b/print/ghostscript9-agpl-x11/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ghostscript
-PORTVERSION=	9.55.0
+PORTVERSION=	9.56.1
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/
 PKGNAMESUFFIX=	9-agpl-x11