Update to 9.06 from mef via pkgsrc-wip.

(Upstream) Version 9.06 (2012-08-08)

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

Highlights in this release include:

  * PDF/A-2 - pdfwrite now supports the creation of PDF/A-2 files. The 'PDFA'
    command line switch can now take a numeric parameter:
      + 0 = not PDF/A compliant
      + 1 = PDF/A-1b compliant
      + 2 = PDF/A-2b compliant

    Simply specifying "-dPDFA" continues to have the old behaviour of creating
    PDF/A-1b files. For PDF/A-2 the command line should include "-dPDFA=2".
  * pdfwrite "Server mode" - pdfwrite can now be run in "server mode" which
    allows the device to be closed without closing the interpreter. This means
    it is no longer necessary to terminate GS before starting a new PDF
    conversion. This leads on to:
  * pdfwrite now supports the "%d" format in the OutputFile switch. If this is
    set then pdfwrite will output each page of input to an individual file.
  * ps2write - recent exposure to a range of PostScript devices has thrown up
    some interesting deficiencies in those devices. ps2write now emits
    PostScript in slightly different ways in order to produce output on a wider
    variety of devices. In some cases this also results in improved print times
    but it is still important to set the resolution appropriately for the
    output device, especially if the input contains transparency.
  * Ghostscript can now use output intents defined in PDFs by using the
    "-dUsePDFX3Profile" command line option. See ICC Color Parameters for
    details.
  * tiffsep/tiffsep1: support for large numbers of separations improved. The
    previous implementation of those devices utilised a "compressed color
    encoding" to represent the tints for all the plates in one 64 bit value. As
    the number of plates increased, fewer bits were available for the tint for
    each plate, ultimately resulting in an "unencodable pixels" error. These
    revisions remove the reliance on the compressed color encoding, thus
    ensuring that we have a consistent color bit depth, regardless of the
    number of plates, and ensuring the "unencodable pixels" error will never
    occur.

    Also as a result of these changes, there are substantial performance
    improvements in jobs with separations and transparency.
  * tiffsep, psdcmyk and psdrgb now support the "downscaler" functionality.
    This brings the "tiffscaled" style functionality to the DeviceN output
    devices, so jobs can be rendered internally in contone and at a high
    resolution, and the output optionally downsampled by a level specified by
    "-dDownScaleFactor=n", and also optionally error diffused to 1bpp output.
  * Third party libraries: libtiff, libpng, libjpeg , Freetype and zlib have
    all be updated.
  * clist storage, for rendering pages in bands, is now a run-time option:
    -sBandListStorage={file|memory}.
  * Plus the usual round of bug fixes, compatibility changes, and incremental
    improvements.

20 files changed, 108 insertions, 86 deletions

diff --git a/print/ghostscript-gpl/DESCR b/print/ghostscript-gpl/DESCR
index 4571ed6852c..0886fa7baa9 100644
--- a/print/ghostscript-gpl/DESCR
+++ b/print/ghostscript-gpl/DESCR
@@ -4,4 +4,4 @@ and some displays.
 
 Support for Cups is enabled by the "cups" option (off by default).
 
-This package contains Ghostscript 9.05, released under the GPL.
+This package contains Ghostscript 9.06, released under the GPL.
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 000fd41677c..05965a12bdc 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2014/04/26 13:51:40 wiz Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
-PKGREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/
@@ -12,9 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ghostscript.sourceforge.net/
 COMMENT=	Postscript interpreter
 
-# iconfig.c compiled before gconfig.h is created
-MAKE_JOBS_SAFE=no
-
 # Plus adobe verbatim for Resources/CMap.
 LICENSE=	gnu-gpl-v3
 
@@ -23,10 +19,12 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=		ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
 CONFLICTS+=		ghostscript-afpl-[0-9]*
-CONFLICTS+=		ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+=		ghostscript-gnu{,-nox11,-x11}-[0-9]*
+# To avoid flag from pkglint
+CONFLICTS+=		ghostscript-esp-[0-9]*
+CONFLICTS+=		ghostscript-esp-nox11-[0-9]*
+CONFLICTS+=		ghostscript-gnu-x11-[0-9]*
+CONFLICTS+=		ghostscript-gnu-nox11-[0-9]*
 
-USE_GCC_RUNTIME=	yes
 USE_TOOLS+=		gmake perl:run lex pkg-config
 USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		yes
diff --git a/print/ghostscript-gpl/Makefile.common b/print/ghostscript-gpl/Makefile.common
index d53aa327ef6..7ca772912e7 100644
--- a/print/ghostscript-gpl/Makefile.common
+++ b/print/ghostscript-gpl/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2014/01/10 01:35:42 mef Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/04/26 13:51:40 wiz Exp $
 # used by print/ghostscript-gpl/Makefile
-# used by fonts/ghostscript-cidfonts/Makefile
-# used by fonts/ghostscript-cidfonts-ryumin/Makefile
+# used (potentially) by fonts/ghostscript-cidfonts/Makefile
+# used (potentially) by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.05
+GS_VERSION=	9.06
diff --git a/print/ghostscript-gpl/PLIST b/print/ghostscript-gpl/PLIST
index bea6c99482d..192c6da9128 100644
--- a/print/ghostscript-gpl/PLIST
+++ b/print/ghostscript-gpl/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/03/16 21:32:00 dholland Exp $
-bin/dumphint
+@comment $NetBSD: PLIST,v 1.2 2014/04/26 13:51:40 wiz Exp $
 bin/dvipdf
 bin/eps2eps
 bin/font2c
@@ -371,7 +370,9 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/GB1-WMode
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Japan1-WMode
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Korea1-WMode
 share/ghostscript/${PKGVERSION}/doc/API.htm
+share/ghostscript/${PKGVERSION}/doc/AUTHORS
 share/ghostscript/${PKGVERSION}/doc/C-style.htm
+share/ghostscript/${PKGVERSION}/doc/COPYING
 share/ghostscript/${PKGVERSION}/doc/Changes.htm
 share/ghostscript/${PKGVERSION}/doc/Commprod.htm
 share/ghostscript/${PKGVERSION}/doc/DLL.htm
@@ -383,6 +384,8 @@ share/ghostscript/${PKGVERSION}/doc/Develop.htm
 share/ghostscript/${PKGVERSION}/doc/Devices.htm
 share/ghostscript/${PKGVERSION}/doc/Drivers.htm
 share/ghostscript/${PKGVERSION}/doc/Fonts.htm
+share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.pdf
+share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.tex
 share/ghostscript/${PKGVERSION}/doc/Helpers.htm
 share/ghostscript/${PKGVERSION}/doc/Hershey.htm
 share/ghostscript/${PKGVERSION}/doc/History1.htm
@@ -404,15 +407,21 @@ share/ghostscript/${PKGVERSION}/doc/Projects.htm
 share/ghostscript/${PKGVERSION}/doc/Ps-style.htm
 share/ghostscript/${PKGVERSION}/doc/Ps2epsi.htm
 share/ghostscript/${PKGVERSION}/doc/Ps2pdf.htm
+share/ghostscript/${PKGVERSION}/doc/Ps2ps2.htm
 share/ghostscript/${PKGVERSION}/doc/Psfiles.htm
 share/ghostscript/${PKGVERSION}/doc/Readme.htm
 share/ghostscript/${PKGVERSION}/doc/Release.htm
 share/ghostscript/${PKGVERSION}/doc/Source.htm
 share/ghostscript/${PKGVERSION}/doc/Unix-lpr.htm
 share/ghostscript/${PKGVERSION}/doc/Use.htm
+share/ghostscript/${PKGVERSION}/doc/WhatIsGS.htm
 share/ghostscript/${PKGVERSION}/doc/Xfonts.htm
+share/ghostscript/${PKGVERSION}/doc/gs-vms.hlp
 share/ghostscript/${PKGVERSION}/doc/gs.css
+share/ghostscript/${PKGVERSION}/doc/gsdoc.el
 share/ghostscript/${PKGVERSION}/doc/index.html
+share/ghostscript/${PKGVERSION}/doc/pscet_status.txt
+share/ghostscript/${PKGVERSION}/doc/thirdparty.htm
 share/ghostscript/${PKGVERSION}/examples/alphabet.ps
 share/ghostscript/${PKGVERSION}/examples/annots.pdf
 share/ghostscript/${PKGVERSION}/examples/chess.ps
@@ -435,7 +444,10 @@ share/ghostscript/${PKGVERSION}/examples/golfer.eps
 share/ghostscript/${PKGVERSION}/examples/grayalph.ps
 share/ghostscript/${PKGVERSION}/examples/ridt91.eps
 share/ghostscript/${PKGVERSION}/examples/snowflak.ps
+share/ghostscript/${PKGVERSION}/examples/text_graph_image_cmyk_rgb.pdf
+share/ghostscript/${PKGVERSION}/examples/text_graphic_image.pdf
 share/ghostscript/${PKGVERSION}/examples/tiger.eps
+share/ghostscript/${PKGVERSION}/examples/transparency_example.ps
 share/ghostscript/${PKGVERSION}/examples/vasarely.ps
 share/ghostscript/${PKGVERSION}/examples/waterfal.ps
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_cmyk.icc
@@ -509,7 +521,6 @@ share/ghostscript/${PKGVERSION}/lib/dmp_site.ps
 share/ghostscript/${PKGVERSION}/lib/dnj750c.upp
 share/ghostscript/${PKGVERSION}/lib/dnj750m.upp
 share/ghostscript/${PKGVERSION}/lib/docie.ps
-share/ghostscript/${PKGVERSION}/lib/dumphint.ps
 share/ghostscript/${PKGVERSION}/lib/escp_24.src
 share/ghostscript/${PKGVERSION}/lib/font2c.ps
 share/ghostscript/${PKGVERSION}/lib/font2pcl.ps
diff --git a/print/ghostscript-gpl/buildlink3.mk b/print/ghostscript-gpl/buildlink3.mk
index 4c7ecc0c197..27e9f4dc5c0 100644
--- a/print/ghostscript-gpl/buildlink3.mk
+++ b/print/ghostscript-gpl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:18:29 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2014/04/26 13:51:40 wiz Exp $
 
 BUILDLINK_TREE+=	ghostscript-gpl
 
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 3a28226ce48..40e74964423 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.3 2014/04/07 07:36:20 richard Exp $
+$NetBSD: distinfo,v 1.4 2014/04/26 13:51:40 wiz Exp $
 
-SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
-RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
-Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
+SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
+RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
+Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
-SHA1 (patch-af) = 79b06a2b5b73486a0b7e0a6e2b14e105579f8a1f
-SHA1 (patch-ah) = f9d9e9a7b53fc8739349e22ccc9057b64a5da377
+SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
+SHA1 (patch-ah) = bfa744e18bdebdc60d2f51fe47750782b75ffbce
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
-SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
+SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
 SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
+SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
 SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
 SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
-SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
-SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 4be081d6c4c9bc632ef8d9685fe4167ea3c51484
+SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
diff --git a/print/ghostscript-gpl/hacks.mk b/print/ghostscript-gpl/hacks.mk
index 69e520af0e0..67b8dc9bac0 100644
--- a/print/ghostscript-gpl/hacks.mk
+++ b/print/ghostscript-gpl/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2013/03/16 21:32:00 dholland Exp $
+# $NetBSD: hacks.mk,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 ### [Tue Jan  9 15:57:05 EST 2007 : tv]
 ### Interix has u_int64_t, but not uint64_t
diff --git a/print/ghostscript-gpl/options.mk b/print/ghostscript-gpl/options.mk
index 2b9d9e8d3e2..59efa6ccddd 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/04/07 07:36:20 richard Exp $
+# $NetBSD: options.mk,v 1.4 2014/04/26 13:51:40 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits utf8
@@ -15,6 +15,11 @@ CONFIGURE_ARGS+=	--with-x
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+
+. if !empty(X11_TYPE:Mnative)
+.  include "../../x11/libxcb/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+. endif
 .else
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--disable-freetype
@@ -24,7 +29,6 @@ PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=	--enable-cups
 PLIST.cups=		yes
-BUILD_TARGET+=		cups
 INSTALL_TARGET+=	install-cups
 
 CUPS_CONFDIR?=	${PKG_SYSCONFBASEDIR}/cups
diff --git a/print/ghostscript-gpl/patches/patch-CVE-2012-4405 b/print/ghostscript-gpl/patches/patch-CVE-2012-4405
index ea22152319a..033234ff50f 100644
--- a/print/ghostscript-gpl/patches/patch-CVE-2012-4405
+++ b/print/ghostscript-gpl/patches/patch-CVE-2012-4405
@@ -1,4 +1,4 @@
-$NetBSD: patch-CVE-2012-4405,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-CVE-2012-4405,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 from RedHat bug #854227
 
diff --git a/print/ghostscript-gpl/patches/patch-af b/print/ghostscript-gpl/patches/patch-af
index e0d6da205c8..58c6de89a48 100644
--- a/print/ghostscript-gpl/patches/patch-af
+++ b/print/ghostscript-gpl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2013/10/05 05:13:07 ryoon Exp $
+$NetBSD: patch-af,v 1.3 2014/04/26 13:51:40 wiz Exp $
 
 (From the log for revision 1.4 of print/ghostscript/patches/patch-af)
 date: 2008/11/13 17:36:54;  author: chuck;  state: Exp;  lines: +22 -4
@@ -14,9 +14,9 @@ XXX: this still leaves the issue of libgs.so (et al.) being hardwired
 in PLIST, instead of using libgs.dylib (et al.).   i'm not sure of
 the best way to fix that.   at least it compiles now....
 
---- base/unix-dll.mak.orig	2012-02-08 08:48:48.000000000 +0000
-+++ base/unix-dll.mak
-@@ -58,13 +58,12 @@ LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAM
+--- base/unix-dll.mak.orig	2012-08-08 17:01:36.000000000 +0900
++++ base/unix-dll.mak	2012-10-10 10:03:50.000000000 +0900
+@@ -59,13 +59,12 @@
  
  
  # MacOS X
@@ -35,17 +35,17 @@ the best way to fix that.   at least it compiles now....
  
  GS_SO=$(BINDIR)/$(GS_SONAME)
  GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
-@@ -85,11 +84,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+@@ -86,11 +85,11 @@
  # Build the small Ghostscript loaders, with Gtk+ and without
  $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -	-L$(BINDIR) -l$(GS)
-+	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) ${LDFLAGS}
++	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
  
  $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -	-L$(BINDIR) -l$(GS) $(SOC_LIBS)
-+	-L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) ${LDFLAGS}
++	-L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
  
  # ------------------------- Recursive make targets ------------------------- #
  
diff --git a/print/ghostscript-gpl/patches/patch-ah b/print/ghostscript-gpl/patches/patch-ah
index aadd003a3a4..9476425057e 100644
--- a/print/ghostscript-gpl/patches/patch-ah
+++ b/print/ghostscript-gpl/patches/patch-ah
@@ -1,23 +1,17 @@
-$NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
+$NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
 
 (1) First chunk to fix the X11_TYPE=native problem, which
     freetype2 in /usr/X11R7/ is way old, and work around to 
     use ghostscript-provided freetype2.
+    This part is not necessary for NetBSD 6.0, 6.1.
 
-(2) Second chunk existed from old days, and no idea, sorry (mef@).
+(2) Second chunk for X11_TYPE=native, will have following problem without 
+    this patch:
+    |  Shared object "libpaper.so.1" not found
 
---- configure.orig	2012-02-08 08:50:31.000000000 +0000
+--- configure.orig	2012-08-08 17:04:57.000000000 +0900
 +++ configure
-@@ -3747,7 +3747,7 @@ CONTRIBINCLUDE="include contrib/contrib.
- INSTALL_CONTRIB="install-contrib-extras"
- 
- # This is just an arbitrary file in contrib to check
--if !(test -f contrib/gdevbjc_.c); then
-+if ! (test -f contrib/gdevbjc_.c); then
-    enable_contrib=no
- fi
- 
-@@ -3775,13 +3775,13 @@ case `uname` in
+@@ -3786,13 +3786,13 @@
          ;;
          *BSD)
          if test $ac_cv_c_compiler_gnu = yes; then
@@ -33,7 +27,7 @@ $NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
              CC_DBG_FLAGS_TO_TRY="-g -O0"
          fi
          SET_DT_SONAME=""
-@@ -5290,7 +5290,7 @@ fi
+@@ -5331,7 +5331,7 @@
  fi
  
  if test x$with_libpaper != xno; then
@@ -42,12 +36,3 @@ $NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
-@@ -6426,7 +6426,7 @@ done
-                 LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
-                 LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
-                 if ( test x$with_pdftoraster != xno ); then
--                    if test "$CUPSVERSION" ">" "1.2"; then
-+                    if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
-                         CUPSPDFTORASTER="1"
-                     fi
-                 fi
diff --git a/print/ghostscript-gpl/patches/patch-ai b/print/ghostscript-gpl/patches/patch-ai
index 7e2edfd5f30..0e335ee85ce 100644
--- a/print/ghostscript-gpl/patches/patch-ai
+++ b/print/ghostscript-gpl/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen
diff --git a/print/ghostscript-gpl/patches/patch-aj b/print/ghostscript-gpl/patches/patch-aj
index f264ca04e04..a51a194950a 100644
--- a/print/ghostscript-gpl/patches/patch-aj
+++ b/print/ghostscript-gpl/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-aj,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 http://bugs.ghostscript.com/show_bug.cgi?id=690883
 
diff --git a/print/ghostscript-gpl/patches/patch-al b/print/ghostscript-gpl/patches/patch-al
index 253c984e023..26702b8255f 100644
--- a/print/ghostscript-gpl/patches/patch-al
+++ b/print/ghostscript-gpl/patches/patch-al
@@ -1,4 +1,12 @@
-$NetBSD: patch-al,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-al,v 1.2 2014/04/26 13:51:40 wiz Exp $
+
+Echogs is almost strings command and accepts some glue to output
+from its command line. The output, in this case ldt.tr, will be really
+shell script for ld command. The adding words with this patch,
+$(LDFLAGS_SO), will be included in the argument of ld command.
+
+$(LDFLAGS_SO) is defined in patch-af, for Mac OS X, Darwin.
+ -- added by mef@ --
 
 --- base/unixlink.mak.orig	2010-02-18 12:08:31.000000000 +0000
 +++ base/unixlink.mak
diff --git a/print/ghostscript-gpl/patches/patch-an b/print/ghostscript-gpl/patches/patch-an
index be397f18fc1..9a3f12c2656 100644
--- a/print/ghostscript-gpl/patches/patch-an
+++ b/print/ghostscript-gpl/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-an,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 Do some initialization of global stuff earlier, in particular before
 "@file" args get processed, fixes PR pkg/42984 from T. M. Pederson.
diff --git a/print/ghostscript-gpl/patches/patch-base_configure_ac b/print/ghostscript-gpl/patches/patch-base_configure_ac
new file mode 100644
index 00000000000..3942bcb7155
--- /dev/null
+++ b/print/ghostscript-gpl/patches/patch-base_configure_ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-base_configure_ac,v 1.1 2014/04/26 13:51:40 wiz Exp $
+
+The source for configure, see patch-ah
+
+--- base/configure.ac.orig	2012-08-08 17:01:36.000000000 +0900
++++ base/configure.ac	2013-04-08 10:51:50.000000000 +0900
+@@ -142,13 +142,13 @@
+         ;;
+         *BSD)
+         if test $ac_cv_prog_gcc = yes; then
+-            CC_OPT_FLAGS_TO_TRY="-O2"
++            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+             CC_DBG_FLAGS_TO_TRY="-g -O0"
+         fi
+         ;;
+         Darwin*)
+         if test $ac_cv_prog_gcc = yes; then
+-            CC_OPT_FLAGS_TO_TRY="-O2"
++            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+             CC_DBG_FLAGS_TO_TRY="-g -O0"
+         fi
+         SET_DT_SONAME=""
+@@ -457,7 +457,7 @@
+ fi
+ 
+ if test x$with_libpaper != xno; then
+-    LIBS="$LIBS -lpaper"
++    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
+     AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
+     CFLAGS="$CFLAGS -DUSE_LIBPAPER"
+ fi
diff --git a/print/ghostscript-gpl/patches/patch-base_gdevpng.c b/print/ghostscript-gpl/patches/patch-base_gdevpng.c
index 6dc9148809f..4ad2ed5944f 100644
--- a/print/ghostscript-gpl/patches/patch-base_gdevpng.c
+++ b/print/ghostscript-gpl/patches/patch-base_gdevpng.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-base_gdevpng.c,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-base_gdevpng.c,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 The patch was included in patches/patch-ak:
   revision 1.5
diff --git a/print/ghostscript-gpl/patches/patch-base_gserrors_h b/print/ghostscript-gpl/patches/patch-base_gserrors_h
index 9c28a432d29..a8786e6f994 100644
--- a/print/ghostscript-gpl/patches/patch-base_gserrors_h
+++ b/print/ghostscript-gpl/patches/patch-base_gserrors_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-base_gserrors_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-base_gserrors_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
 # This suppresses the noisy warning that __func__ redefined
 
 --- base/gserrors.h.orig	2012-02-08 17:48:48.000000000 +0900
diff --git a/print/ghostscript-gpl/patches/patch-configure.ac b/print/ghostscript-gpl/patches/patch-configure.ac
deleted file mode 100644
index 6d241bb9f3c..00000000000
--- a/print/ghostscript-gpl/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/03/16 21:32:01 dholland Exp $
-
-See patch-ah (configure)
-
---- base/configure.ac.orig	2011-08-05 20:12:20.000000000 +0900
-+++ base/configure.ac	2011-08-22 19:10:30.000000000 +0900
-@@ -404,7 +404,7 @@
- fi
- 
- if test x$with_libpaper != xno; then
--    LIBS="$LIBS -lpaper"
-+    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
-     AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
-     CFLAGS="$CFLAGS -DUSE_LIBPAPER"
- fi
diff --git a/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
index 4106c689b12..a03021f124e 100644
--- a/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
+++ b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
 
 To avoid following problem:
 | gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
@@ -6,14 +6,14 @@ To avoid following problem:
 | ./sobin/libgs.so: undefined reference to `memalign'
 | gmake[2]: *** [sobin/gsc] Error 1
 
---- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-04-18 22:36:57.000000000 +0900
-+++ openjpeg/libopenjpeg/opj_malloc.h	2012-04-18 22:54:13.000000000 +0900
+--- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-08-08 17:01:36.000000000 +0900
++++ openjpeg/libopenjpeg/opj_malloc.h	2012-10-08 09:17:03.000000000 +0900
 @@ -84,7 +84,7 @@
  	#if defined(__sun)
  		#define HAVE_MEMALIGN
  	/* Linux x86_64 and OSX always align allocations to 16 bytes */
--	#elif !defined(__amd64__) && !defined(__APPLE__)	
-+	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
+-	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)
++	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)  && !defined(__NetBSD__) && !defined(__DragonFly__)
  		#define HAVE_MEMALIGN
  		#include <malloc.h>			
  	#endif