- Update to 9.51.

- Re-add non-standard paper sizes and Asian font configurations.
- Add workaround for some old font files to gs_ttf.ps and pdf_font.ps.

11 files changed, 182 insertions, 57 deletions

diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index 4bcf83ee55ee..ec26f586ec4f 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
-PORTVERSION=	9.50
-PORTREVISION=	2
+PORTVERSION=	9.51
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
 PKGNAMESUFFIX=	9-agpl-base
@@ -11,6 +10,7 @@ MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter
 
 LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	jbig2dec>=0.17:graphics/jbig2dec
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
@@ -34,6 +34,15 @@ CONFLICTS_INSTALL= \
 CPE_VENDOR=	artifex
 DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
+EXTRACT_AFTER_ARGS= \
+	--exclude cups/libs \
+	--exclude freetype \
+	--exclude ijs \
+	--exclude jbig2dec \
+	--exclude jpeg \
+	--exclude libpng \
+	--exclude openjpeg \
+	--exclude zlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-dbus \
@@ -68,11 +77,6 @@ IJS_LIB_DEPENDS=	libijs.so:print/libijs
 JPEG2000_CONFIGURE_ENABLE=	openjpeg
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
-post-patch:
-	@${RM} -r ${WRKSRC}/cups/libs ${WRKSRC}/freetype ${WRKSRC}/ijs \
-		${WRKSRC}/jbig2dec ${WRKSRC}/jpeg ${WRKSRC}/libpng \
-		${WRKSRC}/openjpeg ${WRKSRC}/zlib
-
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs
 	${RM} ${STAGEDIR}${PREFIX}/bin/gsx
diff --git a/print/ghostscript9-agpl-base/distinfo b/print/ghostscript9-agpl-base/distinfo
index f4474c1b7145..4432c5ae1156 100644
--- a/print/ghostscript9-agpl-base/distinfo
+++ b/print/ghostscript9-agpl-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575045403
-SHA256 (ghostscript-9.50.tar.xz) = db9bb0817b6f22974e6d5ad751975f346420c2c86a0afcfe6b4e09c47803e7d4
-SIZE (ghostscript-9.50.tar.xz) = 34613344
+TIMESTAMP = 1584155744
+SHA256 (ghostscript-9.51.tar.xz) = 7e1133f90e8adbc6c54d550419dc10ebbb7dde6348e88eac423b054c1366b771
+SIZE (ghostscript-9.51.tar.xz) = 39710916
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps
new file mode 100644
index 000000000000..6583d85e7623
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps
@@ -0,0 +1,15 @@
+--- Resource/Init/gs_statd.ps.orig	2020-03-12 12:26:37 UTC
++++ Resource/Init/gs_statd.ps
+@@ -125,6 +125,12 @@ statusdict begin
+         % Japanese postcard size, 100mm x 148mm
+  /hagaki {283 420 //.setpagesize stopped { pop pop /hagaki $error /errorname get signalerror } if } bind def
+         % U.S. ANSI/ASME Y14.1 paper sizes
++ /postcard {284 419 //.setpagesize exec} bind def
++ /dbl_postcard {419 568 //.setpagesize exec} bind def
++ /Executive {522 756 //.setpagesize exec} bind def
++ /jenv_you4 {298 666 //.setpagesize exec} bind def
++ /jenv_you2 {324 460 //.setpagesize exec} bind def
++ /jenv_kaku2 {682 942 //.setpagesize exec} bind def
+  /ANSI_A  //letter def
+  /ANSI_B  //11x17  def
+  /tabloid //11x17  def
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
new file mode 100644
index 000000000000..abc7117049f9
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps
@@ -0,0 +1,24 @@
+--- Resource/Init/gs_ttf.ps.orig	2020-03-12 12:26:37 UTC
++++ Resource/Init/gs_ttf.ps
+@@ -1082,10 +1082,17 @@ mark
+   } ifelse
+                 % Stack: ... /FontInfo mark key1 value1 ...
+   post //null ne {
+-    /ItalicAngle first_post_string 4 gets32 65536.0 div
+-    /isFixedPitch first_post_string 12 getu32 0 ne
+-    /UnderlinePosition first_post_string 8 gets16 upem div
+-    /UnderlineThickness first_post_string 10 gets16 upem div
++    post type /arraytype eq {
++      % this post table is a big table. /post should be [(...) ...]
++      % data we actually need here should be first one in array.
++      /posttable post 1 get def
++    } {
++      /posttable post def
++    } ifelse
++    /ItalicAngle posttable 4 gets32 65536.0 div
++    /isFixedPitch posttable 12 getu32 0 ne
++    /UnderlinePosition posttable 8 gets16 upem div
++    /UnderlineThickness posttable 10 gets16 upem div
+   } if
+   counttomark 0 ne { .dicttomark } { pop pop } ifelse
+   /XUID [orgXUID 42 curxuid]
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
new file mode 100644
index 000000000000..31fade204c07
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps
@@ -0,0 +1,15 @@
+--- Resource/Init/pdf_font.ps.orig	2020-03-12 12:26:37 UTC
++++ Resource/Init/pdf_font.ps
+@@ -2180,10 +2180,12 @@ currentdict /CMap_read_dict undef
+ 
+ /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
+   dup /BaseFont get findCIDFont exch pop
++  addCIDmetrics /CIDFont defineresource
+ } bind executeonly def
+ 
+ /buildCIDType2 {	% <CIDFontType2-font-resource> buildCIDType2 <font>
+   dup /BaseFont get findCIDFont exch pop
++  addCIDmetrics /CIDFont defineresource
+ } bind executeonly def
+ 
+ /processCIDToGIDMap { % <fontres> <cidfont> processCIDToGIDMap <fontres> <cidfont>
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap
new file mode 100644
index 000000000000..96c2570f30c1
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap
@@ -0,0 +1,62 @@
+--- Resource/Init/FAPIcidfmap.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/FAPIcidfmap
+@@ -29,4 +29,59 @@
+ %
+ %  /Ryumin-Medium     << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
+ %  /HeiseiKakuGo-W5   << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/Ryumin-Light		<< /Path (Ryumin-Light) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/GothicBBB-Medium	<< /Path (GothicBBB-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++
++/Ryumin-Medium		/Ryumin-Light ;
++/Ryumin-Regular		/Ryumin-Light ;
++/RyuminPro-Light	/Ryumin-Light ;
++
++/GothicBBBPro-Medium	/GothicBBB-Medium ;
++
++/KozGoPro-Bold		/GothicBBB-Medium ;
++/KozGoPro-Heavy		/GothicBBB-Medium ;
++/KozGoPro-Medium	/GothicBBB-Medium ;
++/KozGoPro-Regular	/GothicBBB-Medium ;
++
++/KozMinPro-Bold		/Ryumin-Light ;
++/KozMinPro-Light	/Ryumin-Light ;
++/KozMinPro-Medium	/Ryumin-Light ;
++/KozMinPro-Regular	/Ryumin-Light ;
++
++/HiraKakuPro-W3		/GothicBBB-Medium ;
++/HiraKakuPro-W6		/GothicBBB-Medium ;
++/HiraKakuStd-W8		/GothicBBB-Medium ;
++
++/HiraMaruPro-W4		/GothicBBB-Medium ;
+ 
++/HiraMinPro-W3		/Ryumin-Light ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++
++/FutoMinA101-Bold	/Ryumin-Light ;
++/FutoMinA101Pro-Bold	/Ryumin-Light ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++/FutoGoB101Pro-Bold	/GothicBBB-Medium ;
++
++/Jun101-Light		/Ryumin-Light ;
++/Jun101Pro-Light	/Ryumin-Light ;
++
++/MidashiGo-MB31		/GothicBBB-Medium ;
++/MidashiGoPro-MB31	/GothicBBB-Medium ;
++
++/MidashiMinPro-MA31	/Ryumin-Light ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
++
++%/STHeiti-Regular << /Path (STHeiti-Regular) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/STSong-Light << /Path (STSong-Light) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
++%/MSung-Light << /Path (MSung-Light) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/MHei-Medium << /Path (MHei-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig
new file mode 100644
index 000000000000..0f5469995dad
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig
@@ -0,0 +1,10 @@
+--- Resource/Init/FAPIconfig.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/FAPIconfig
+@@ -12,3 +12,7 @@
+ % and CID font resource files.
+ % "Embedded fonts" are fonts and CID fonts being embedded into a document.
+ 
++/FontPath	()	% A default directory for FAPI-handled font files path in FAPIfontmap.
++/CIDFontPath	()	% A default directory for FAPI-handled CID font files path in FAPIcidfmap.
++/HookDiskFonts	[]	% FontType values for disk PS fonts to be redirected to FAPI.
++/HookEmbeddedFonts	[]	% FontType values for embedded PS fonts to be redirected to FAPI.
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
index 33727e77eec9..4269e879be5a 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
+++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
@@ -1,6 +1,6 @@
---- Resource/Init/cidfmap.orig	2015-03-30 08:21:24 UTC
+--- Resource/Init/cidfmap.orig	2020-03-12 12:26:37 UTC
 +++ Resource/Init/cidfmap
-@@ -29,6 +29,67 @@
+@@ -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] >> ;
diff --git a/print/ghostscript9-agpl-base/files/patch-configure b/print/ghostscript9-agpl-base/files/patch-configure
index 2ed345869676..48cdec68e484 100644
--- a/print/ghostscript9-agpl-base/files/patch-configure
+++ b/print/ghostscript9-agpl-base/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	2018-09-03 08:51:26 UTC
+--- configure.orig	2020-03-12 12:27:23 UTC
 +++ configure
-@@ -4357,8 +4357,8 @@ else
+@@ -4523,8 +4523,8 @@ case $host in
          ;;
-         *BSD)
+         *bsd*)
          if test $ac_cv_c_compiler_gnu = yes; then
--            CC_OPT_FLAGS_TO_TRY="-O2"
+-            CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
 -            CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
 +            CC_OPT_FLAGS_TO_TRY=""
 +            CC_DBG_FLAGS_TO_TRY=""
          fi
          ;;
-         Darwin*)
-@@ -5143,7 +5143,7 @@ if test "${enable_threadsafe+set}" = set; then :
+         *-darwin*)
+@@ -5358,7 +5358,7 @@ if test "${enable_threadsafe+set}" = set; then :
  fi
  
  if test x$enable_threadsafe = xyes ; then
@@ -20,24 +20,7 @@
  fi
  
  
-@@ -5805,7 +5805,6 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -5838,7 +5837,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
- if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-   ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
- if test "x$ac_cv_header_dlfcn_h" = xyes; then :
--  GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";LIBS="-ldl $LIBS"
-+  GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";
- fi
- 
- 
-@@ -10041,42 +10040,42 @@ if test x$enable_threadsafe = xyes; then
+@@ -10682,42 +10682,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"
@@ -88,17 +71,17 @@
    done
  
    NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "`
-@@ -10251,7 +10250,12 @@ if test "${enable_dynamic+set}" = set; then :
-       DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
+@@ -10968,7 +10968,12 @@ if test "${enable_dynamic+set}" = set; then :
+         DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
        ;;
-       *BSD)
--      DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
-+      INSTALL_SHARED="install-shared"
-+      if test "x$X_DEVS" != x; then
-+              DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
-+      else
-+              DYNAMIC_DEVS=""
-+      fi
-       DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
-       X11_DEVS=""
-       OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
+       *bsd*)
+-        DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++        INSTALL_SHARED="install-shared"
++        if test "x$X_DEVS" != x; then
++                DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++        else
++                DYNAMIC_DEVS=""
++        fi
+         DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+         X11_DEVS=""
+         OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
diff --git a/print/ghostscript9-agpl-base/pkg-plist b/print/ghostscript9-agpl-base/pkg-plist
index 0eaf95e8fb53..eba6d4f8b18c 100644
--- a/print/ghostscript9-agpl-base/pkg-plist
+++ b/print/ghostscript9-agpl-base/pkg-plist
@@ -339,6 +339,7 @@ share/color/icc/ghostscript/srgb.icc
 %%DATADIR%%/lib/mkcidfm.ps
 %%DATADIR%%/lib/necp2x.upp
 %%DATADIR%%/lib/necp2x6.upp
+%%DATADIR%%/lib/pdf_info.ps
 %%DATADIR%%/lib/pdf2dsc.ps
 %%DATADIR%%/lib/pf2afm.ps
 %%DATADIR%%/lib/pfbtopfa.ps
diff --git a/print/ghostscript9-agpl-x11/Makefile b/print/ghostscript9-agpl-x11/Makefile
index a5375528eb9e..c406e4a2d79f 100644
--- a/print/ghostscript9-agpl-x11/Makefile
+++ b/print/ghostscript9-agpl-x11/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
-PORTVERSION=	9.50
+PORTVERSION=	9.51
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
 PKGNAMESUFFIX=	9-agpl-x11
@@ -10,8 +10,16 @@ MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter, X11 support
 
 LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	ghostscript9-agpl-base>=${PORTVERSION}:print/ghostscript9-agpl-base
+BUILD_DEPENDS=  jbig2dec>=0.17:graphics/jbig2dec
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libidn.so:dns/libidn \
+		libjbig2dec.so:graphics/jbig2dec \
+		libpaper.so:print/libpaper \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 RUN_DEPENDS=	ghostscript9-agpl-base>=${PORTVERSION}:print/ghostscript9-agpl-base
 
 USES=		cpe gmake iconv localbase pkgconfig tar:xz xorg
@@ -27,6 +35,14 @@ CONFLICTS_INSTALL= \
 DISTINFO_FILE=	${.CURDIR:H}/ghostscript9-agpl-base/distinfo
 PATCHDIR=	${.CURDIR:H}/ghostscript9-agpl-base/files
 CPE_VENDOR=	artifex
+EXTRACT_AFTER_ARGS= \
+	--exclude freetype \
+	--exclude ijs \
+	--exclude jbig2dec \
+	--exclude jpeg \
+	--exclude libpng \
+	--exclude openjpeg \
+	--exclude zlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-cups \
@@ -49,12 +65,7 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 ALL_TARGET=	./obj/X11.so
 INSTALL_TARGET=	install-shared
 PLIST_FILES=	lib/${PORTNAME}/${PORTVERSION}/X11.so
-
-post-patch:
-	@${RM} -r ${WRKSRC}/freetype ${WRKSRC}/ijs ${WRKSRC}/jbig2dec \
-		${WRKSRC}/jpeg ${WRKSRC}/libpng ${WRKSRC}/openjpeg \
-		${WRKSRC}/zlib
-
+	
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/X11.so