Changes 9.18:

A substantial revision of the build system and GhostPDL directory structure, meaning the GhostPCL and GhostXPS "products" are now built by the Ghostscript build system "proper" rather than having their own builds which called the Ghostscript build system for certain parts of the builds.

Ghostscript-only users should not be affected by this change.

For users of the PCL and XPS interpreters (collectively downloaded as "GhostPDL") there is a new, "flatter" directory structure and only one configure and one make invocation to build all the products. There are also some executable default name changes to bring the PCL and XPS binaries in line with the Ghostscript ones. All executables now end up in the "bin" directory (or build specific variant thereof, e.g. "debugbin"). The PCL executable, by default, is now "gpcl6" on Unix like systems and "gpcl6win??.exe" (where "??" is either "32" or "64"). The XPS executable remains "gxps" on Unix-like systems, but similarly becomes "gxpswin??.exe" on Windows.

Those using scripts or other automated processes will need to take steps to cope with these changes.

A new method of internally inserting devices into the device chain has been developed, named "device subclassing". This allows suitably written devices to be more easily and consistently as "filter" devices.

The first fruit of this is a new implementation of the "-dFirstPage"/"-dLastPage" feature which functions a device filter in the Ghostscript graphics library, meaning it works consistently with all input languages.

The "ghostpdl.inf" file, provided to simplify installing a Postscript printer configure to produce output to suit Ghostscript's "pdfwrite" device is now available as a digitally signed version: "ghostpdl.cat".
Plus the usual round of bug fixes, compatibility changes, and incremental improvements.

6 files changed, 32 insertions, 24 deletions

diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 793f390042e..1b4e7906575 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2015/08/12 22:27:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/10/10 11:55:18 adam Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 		http://downloads.ghostscript.com/public/
diff --git a/print/ghostscript-agpl/Makefile.common b/print/ghostscript-agpl/Makefile.common
index e5779cbbc04..9369f0322b8 100644
--- a/print/ghostscript-agpl/Makefile.common
+++ b/print/ghostscript-agpl/Makefile.common
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.common,v 1.6 2015/04/06 11:24:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2015/10/10 11:55:18 adam Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.16
+GS_VERSION=	9.18
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index d966921037d..62ca7c3c2f7 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2015/08/12 22:27:22 wiz Exp $
+$NetBSD: distinfo,v 1.8 2015/10/10 11:55:18 adam Exp $
 
-SHA1 (ghostscript-9.16.tar.bz2) = 529e2b0be754cb353880a4ac97e3efa47ef82f5c
-RMD160 (ghostscript-9.16.tar.bz2) = b90c62480377b71b791da9c8cedf7673fca00c98
-Size (ghostscript-9.16.tar.bz2) = 29163348 bytes
-SHA1 (patch-af) = 3dd65dbd9611c00d45997c86d16eada37511dca5
+SHA1 (ghostscript-9.18.tar.bz2) = 388fea50a38e422a4c6ff27c184491bf5ecb96e1
+RMD160 (ghostscript-9.18.tar.bz2) = 2a05ef570b5ebcf79501fd3ee1fb552be4e9c3fe
+Size (ghostscript-9.18.tar.bz2) = 29460941 bytes
+SHA1 (patch-af) = 5efab9b732ef24e234bc33e7212222f067a3602c
 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
 SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
-SHA1 (patch-al) = b4d06da288a608d65cdb014b0f2384406089afe3
+SHA1 (patch-al) = f0816b9fd61c6af0ebde05ccb464560b8d0a80f4
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-devices_devs.mak) = 526348d59ccb4d373ace11e46c37899b43a35c29
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = bf7e47c77e6960df473d3bf97dfa78f207a14a01
diff --git a/print/ghostscript-agpl/patches/patch-af b/print/ghostscript-agpl/patches/patch-af
index 7bf5a43a4d0..8a203eea567 100644
--- a/print/ghostscript-agpl/patches/patch-af
+++ b/print/ghostscript-agpl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2014/04/04 08:48:43 adam Exp $
+$NetBSD: patch-af,v 1.4 2015/10/10 11:55:19 adam Exp $
 
 ghostscript has hand-rolled shared lib handling in src/unix-dll.mak
 that does not do the right thing on Darwin (where shared libs are
@@ -8,7 +8,7 @@ as an extension).
 You need to manually reconfigure unix-dll.mak to make it work, so
 do it in hacks.mk.
 
---- base/unix-dll.mak.orig	2013-08-21 14:06:40.000000000 +0000
+--- base/unix-dll.mak.orig	2015-10-05 08:21:11.000000000 +0000
 +++ base/unix-dll.mak
 @@ -64,11 +64,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$
  
@@ -27,14 +27,14 @@ do it in hacks.mk.
  #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
  #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
  
-@@ -91,11 +91,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+@@ -94,11 +94,11 @@ so-links-subtarget:	$(GS_SO)
  # Build the small Ghostscript loaders, with Gtk+ and without
- $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
+ $(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -	-L$(BINDIR) -l$(GS_SO_BASE)
 +	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE)
  
- $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
+ $(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -	-L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
 +	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS)
diff --git a/print/ghostscript-agpl/patches/patch-al b/print/ghostscript-agpl/patches/patch-al
index f452bc9860e..67eddcb4ecf 100644
--- a/print/ghostscript-agpl/patches/patch-al
+++ b/print/ghostscript-agpl/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.2 2013/08/22 21:07:08 adam Exp $
+$NetBSD: patch-al,v 1.3 2015/10/10 11:55:19 adam Exp $
 
---- base/unixlink.mak.orig	2010-02-18 12:08:31.000000000 +0000
+--- base/unixlink.mak.orig	2015-10-05 08:21:11.000000000 +0000
 +++ base/unixlink.mak
-@@ -51,7 +51,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR
- # which has limited environment space.
+@@ -58,7 +58,7 @@ $(GS_A): $(PSOBJ)gsromfs$(COMPILE_INITS)
  ldt_tr=$(PSOBJ)ldt.tr
- $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
+ 
+ $(GS_XE): $(ld_tr) $(gs_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
 -	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
 +	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) $(LDFLAGS_SO) -o $(GS_XE)
  	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s
- 	cat $(ld_tr) >>$(ldt_tr)
+ 	cat $(gsld_tr) >> $(ldt_tr)
  	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
diff --git a/print/ghostscript-agpl/patches/patch-devices_devs.mak b/print/ghostscript-agpl/patches/patch-devices_devs.mak
index 1506ed73b26..acc1e77cc99 100644
--- a/print/ghostscript-agpl/patches/patch-devices_devs.mak
+++ b/print/ghostscript-agpl/patches/patch-devices_devs.mak
@@ -1,10 +1,10 @@
-$NetBSD: patch-devices_devs.mak,v 1.3 2015/04/06 11:24:55 adam Exp $
+$NetBSD: patch-devices_devs.mak,v 1.4 2015/10/10 11:55:19 adam Exp $
 
 Don't depend on src/zlib.h.
 
---- devices/devs.mak.orig	2015-04-06 11:15:42.000000000 +0000
+--- devices/devs.mak.orig	2015-10-05 08:21:11.000000000 +0000
 +++ devices/devs.mak
-@@ -1231,7 +1231,7 @@ $(libtiff_dev) $(MAKEDIRS)
+@@ -1226,7 +1226,7 @@ $(libtiff_dev) $(MAKEDIRS)
  
  $(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \
  $(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \
@@ -13,3 +13,12 @@ Don't depend on src/zlib.h.
  $(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \
  $(gximdecode_h) $(MAKEDIRS)
  	$(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c
+@@ -1399,7 +1399,7 @@ $(DD)gprf.dev : $(DEVS_MAK) $(gprf_) $(G
+ 
+ $(DEVOBJ)gdevgprf.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\
+  $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
+- $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) $(zlib_h)\
++ $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) \
+  $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\
+  $(gdevppla_h) $(MAKEDIRS)
+ 	$(DEVCC) $(DEVO_)gdevgprf.$(OBJ) $(II)$(ZI_)$(_I) $(C_) $(DEVSRC)gdevgprf.c