Version 9.21 (2017-03-16)

This is the fifteenth full release in the stable 9.x series.

Highlights in this release include:
* pdfwrite now preserves annotations from input PDFs (where possible).
* The GhostXPS interpreter now provides the pdfwrite device with the data it requires to emit a ToUnicode CMap: thus allowing fully searchable PDFs to be created from XPS input (in the vast majority of cases).
* Ghostscript now allows the default color space for PDF transparency blends.
* The Ghostscript/GhostPDL configure script now has much better/fuller support for cross compiling.
* The tiffscaled and tiffscaled4 devices can now use ETS (Even Tone Screening)
* The toolbin/pdf_info.ps utility can now emit the PDF XML metadata.
* Ghostscript has a new scan converter available (currently optional, but will become the default in a near future release). It can be enabled by using the command line option: '-dSCANCONVERTERTYPE=2'. This new implementation provides vastly improved performance with large and complex paths.
* The usual round of bug fixes, compatibility changes, and incremental improvements.

9 files changed, 81 insertions, 72 deletions

diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 7c48241f266..166d963b23b 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2016/10/27 11:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2017/03/31 07:26:23 adam Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ghostscript.com/
@@ -20,11 +20,12 @@ USE_TOOLS+=		gmake perl:run lex pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-system-libtiff
 CONFIGURE_ARGS+=	--disable-cups
+CONFIGURE_ENV+=		LPLIBDIR=${PREFIX}/lib
+CONFIGURE_ENV.HPUX+=	ac_cv_func_fopen64=no
 UNLIMIT_RESOURCES+=	datasize	# gsromfs1.c
 
 BUILD_TARGET=		so
 INSTALL_TARGET=		soinstall
-CONFIGURE_ARGS+=	--with-omni=no	# otherwise pulls in libstdc++
 
 REPLACE_PERL+=		toolbin/localcluster/clusterpush.pl
 REPLACE_PERL+=		toolbin/checkdeps.pl
@@ -53,8 +54,6 @@ SUBST_MESSAGE.resdir=	Fixing resource directory path
 SUBST_FILES.resdir=	Resource/Init/gs_res.ps
 SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
 
-CONFIGURE_ENV.HPUX+=	ac_cv_func_fopen64=no
-
 # On Linux-*-x86_64, there was an error message:
 # gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be
 # used when making a shared object; recompile with -fPIC
@@ -66,8 +65,6 @@ CFLAGS+=		-fPIC
 # require linking against libiconv when it should do so.
 BUILDLINK_TRANSFORM.IRIX+=	l:fontconfig:fontconfig:iconv
 
-CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
-
 .include "options.mk"
 
 post-extract:
diff --git a/print/ghostscript-agpl/Makefile.common b/print/ghostscript-agpl/Makefile.common
index 3e4ee16d492..7e8e4a936f0 100644
--- a/print/ghostscript-agpl/Makefile.common
+++ b/print/ghostscript-agpl/Makefile.common
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.common,v 1.10 2016/10/27 11:06:01 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2017/03/31 07:26:23 adam Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=    9.20
+GS_VERSION=	9.21
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index ca74a89ef66..85e3a3b869d 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.14 2016/10/09 17:15:11 adam Exp $
+$NetBSD: distinfo,v 1.15 2017/03/31 07:26:23 adam Exp $
 
-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) = 60ddeee9eaf0b87a3132a722035fe94d8bd24af8
-SHA1 (patch-ah) = ad56479bdfd22444feeb579e7e8b3fbb350c1f1a
-SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
+SHA1 (ghostscript-9.21.tar.gz) = 6f60d7fcb5eef6a8bec5abedf21c6a7008a8c0c7
+RMD160 (ghostscript-9.21.tar.gz) = c389ab9346f86ba4ff9e5b80aca0dda7acb866a5
+SHA512 (ghostscript-9.21.tar.gz) = c5ff632dc9b418ebeecaae796cecbaf9ffcb84d7a1b62c1af2e6c9082f7b9f24fe9dd9f6a57bde3640f54c3036f0b99b32aac9f8ca1f489c012369ab2b72ae92
+Size (ghostscript-9.21.tar.gz) = 38398778 bytes
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
+SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
+SHA1 (patch-base_mkromfs.c) = 96006928e0b5381e7101027372b6e6408f1c4a0b
+SHA1 (patch-base_unix-dll.mak) = 60ddeee9eaf0b87a3132a722035fe94d8bd24af8
+SHA1 (patch-configure) = 50967456938be7061ce081335a3a602726b939a8
 SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09
-SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = bf7e47c77e6960df473d3bf97dfa78f207a14a01
diff --git a/print/ghostscript-agpl/patches/patch-ah b/print/ghostscript-agpl/patches/patch-ah
deleted file mode 100644
index e401f895435..00000000000
--- a/print/ghostscript-agpl/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2016/10/09 17:15:11 adam Exp $
-
-Add rpath.
-Use correct install_name with path on Darwin.
-
---- configure.orig	2016-09-26 10:41:58.000000000 +0000
-+++ configure
-@@ -6297,7 +6297,7 @@ fi
- fi
- 
- if test x$with_libpaper != xno; then
--    LIBS="$LIBS -lpaper"
-+    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
- 
- $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
- 
-@@ -9427,9 +9427,9 @@ case `uname` in
-           SO_LIB_EXT=".so"
-         ;;
-         Darwin*)
--          GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)"
--          PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)"
--          XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_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)"
-           DYNAMIC_LIBS=""
-           SO_LIB_EXT=".dylib"
-         ;;
diff --git a/print/ghostscript-agpl/patches/patch-base_lib.mak b/print/ghostscript-agpl/patches/patch-base_lib.mak
new file mode 100644
index 00000000000..b09a147e84e
--- /dev/null
+++ b/print/ghostscript-agpl/patches/patch-base_lib.mak
@@ -0,0 +1,17 @@
+$NetBSD: patch-base_lib.mak,v 1.1 2017/03/31 07:26:23 adam Exp $
+
+Don't depend on zlib objects; instead, link against system zlib.
+
+--- base/lib.mak.orig	2017-03-31 06:55:50.000000000 +0000
++++ base/lib.mak
+@@ -3352,9 +3352,7 @@ $(GLOBJ)pdlromfs1.$(OBJ) : $(GLOBJ)pdlro
+ 
+ # Define the ZLIB modules needed by mnkromfs here to factor it out of top makefiles
+ # Also put the .h dependencies here for the same reason
+-MKROMFS_ZLIB_OBJS=$(AUX)compress.$(OBJ) $(AUX)deflate.$(OBJ) \
+-	$(AUX)zutil.$(OBJ) $(AUX)adler32.$(OBJ) $(AUX)crc32.$(OBJ) \
+-	$(AUX)trees.$(OBJ)
++MKROMFS_ZLIB_OBJS=
+ 
+ MKROMFS_COMMON_DEPS=$(stdpre_h) $(stdint__h) $(gsiorom_h) $(arch_h)\
+ 	$(gsmemret_h) $(gsmalloc_h) $(gsstype_h) $(gp_h) $(time__h)
diff --git a/print/ghostscript-agpl/patches/patch-ai b/print/ghostscript-agpl/patches/patch-base_mkromfs.c
index c956e98f548..7d0f8bf22ad 100644
--- a/print/ghostscript-agpl/patches/patch-ai
+++ b/print/ghostscript-agpl/patches/patch-base_mkromfs.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2015/08/12 22:27:23 wiz Exp $
+$NetBSD: patch-base_mkromfs.c,v 1.1 2017/03/31 07:26:23 adam Exp $
 
 chunk 1:
 fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes
@@ -8,9 +8,9 @@ chunk 2:
 Replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664
 
---- base/mkromfs.c.orig	2015-03-30 08:21:24.000000000 +0000
+--- base/mkromfs.c.orig	2017-03-16 10:12:02.000000000 +0000
 +++ base/mkromfs.c
-@@ -1987,7 +1987,7 @@ ws(const byte *str, int len)
+@@ -2014,7 +2014,7 @@ ws(const byte *str, int len)
      if (len >= LINE_SIZE)
          exit(1);
  
@@ -19,12 +19,12 @@ should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664
      flush_line_buf(len);
  }
  
-@@ -2329,7 +2329,7 @@ main(int argc, char *argv[])
- #endif
-     fprintf(out,"\n#include \"stdint_.h\"\n");
-     fprintf(out,"\n#include \"time_.h\"\n\n");
--    fprintf(out,"    time_t gs_romfs_buildtime = %ld;\n\n", time(NULL));
-+    fprintf(out,"    time_t gs_romfs_buildtime = %lld;\n\n", (long long)time(NULL));
+@@ -2368,7 +2368,7 @@ main(int argc, char *argv[])
+     }
+     if (!buildtime)
+         buildtime = time(NULL);
+-    fprintf(out,"    time_t gs_romfs_buildtime = %ld;\n\n", buildtime);
++    fprintf(out,"    time_t gs_romfs_buildtime = %lld;\n\n", (long long)buildtime);
  
      /* process the remaining arguments (options interspersed with paths) */
      for (; atarg < argc; atarg++) {
diff --git a/print/ghostscript-agpl/patches/patch-af b/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
index ff9715f0ec5..b0b973eb0b4 100644
--- a/print/ghostscript-agpl/patches/patch-af
+++ b/print/ghostscript-agpl/patches/patch-base_unix-dll.mak
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2016/10/09 17:15:11 adam Exp $
+$NetBSD: patch-base_unix-dll.mak,v 1.1 2017/03/31 07:26:23 adam Exp $
 
 Use correct shared library naming on Darwin.
 Add some rpaths.
diff --git a/print/ghostscript-agpl/patches/patch-configure b/print/ghostscript-agpl/patches/patch-configure
new file mode 100644
index 00000000000..e4686d11954
--- /dev/null
+++ b/print/ghostscript-agpl/patches/patch-configure
@@ -0,0 +1,39 @@
+$NetBSD: patch-configure,v 1.1 2017/03/31 07:26:23 adam Exp $
+
+Use system zlib for linking.
+Add rpath.
+Use correct install_name with path on Darwin.
+
+--- configure.orig	2017-03-16 10:12:44.000000000 +0000
++++ configure
+@@ -3742,7 +3742,7 @@ CFLAGSAUX_STANDARDTMP="\$(CFLAGS_STANDAR
+ CFLAGSAUX_DEBUGTMP="\$(CFLAGS_DEBUG)"
+ CFLAGSAUX_PROFILETMP="\$(CFLAGS_PROFILE)"
+ LDFLAGSAUXTMP="\$(LDFLAGS)"
+-AUXEXTRALIBSTMP="\$(EXTRALIBS)"
++AUXEXTRALIBSTMP="\$(EXTRALIBS) -lz"
+ 
+ 
+ # purposefully do not include "help" output for this
+@@ -6705,7 +6705,7 @@ fi
+ fi
+ 
+ if test x$with_libpaper != xno; then
+-    LIBS="$LIBS -lpaper"
++    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
+ 
+ $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
+ 
+@@ -10047,9 +10047,9 @@ else
+       SO_LIB_EXT=".so"
+     ;;
+     Darwin*)
+-      GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)"
+-      PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)"
+-      XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_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)"
+       DYNAMIC_LIBS=""
+       SO_LIB_EXT=".dylib"
+     ;;
diff --git a/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
deleted file mode 100644
index 9b74743b7ad..00000000000
--- a/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.3 2014/10/01 09:04:32 adam Exp $
-
-Work around undefined 'memalign' issue.
-
---- openjpeg/src/lib/openjp2/opj_malloc.h.orig	2014-03-26 12:53:47.000000000 +0000
-+++ openjpeg/src/lib/openjp2/opj_malloc.h
-@@ -101,7 +101,7 @@ Allocate memory aligned to a 16 byte bou
-   #elif defined(__FreeBSD__)
-     #define HAVE_POSIX_MEMALIGN
- 	/* Linux x86_64 and OSX always align allocations to 16 bytes */
--	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
-+	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
- 		#define HAVE_MEMALIGN
- 		#include <malloc.h>			
- 	#endif