update to 8.64

Approximately 100 bugs have been fixed since the 8.63 release.
Of particular note in this release are improvements to overprint and
spot color support in documents with transparency, improvements to PDF
and PS output, proper handling of PDF-specific text rendering modes and
support for reading AES-encrypted PDF documents.
Also improved is handling of CJK text, especially in vertical writing
modes, memory footprint processing some files at high resolution and
support for using the system's default paper size on unix.
The interpreter's handling of color spaces has been moved from
PostScript code to C.
A number of the included printer drivers and cups wrappers have been
updated to support a PDF-based workflow. Also fixed are several
long-standing bugs in the pcl drivers with respect to duplex, resolution
and paper tray selection.

7 files changed, 119 insertions, 109 deletions

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index ed1b7aed251..0d37c7f9da1 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2008/12/11 09:18:20 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2009/02/12 19:51:08 drochner Exp $
 
-DISTNAME=	ghostscript-8.63
-PKGREVISION=	1
+DISTNAME=	ghostscript-8.64
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,7 +29,7 @@ CONFIGURE_ARGS+=	-with-omni=no	# otherwise pulls in libstdc++
 
 REPLACE_PERL+=		lib/fixmswrd.pl
 
-GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
+GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/${PKGVERSION}/Resource
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -43,7 +42,7 @@ REQD_DIRS+=		share/ghostscript
 SUBST_CLASSES+=		resdir
 SUBST_STAGE.resdir=	post-extract
 SUBST_MESSAGE.resdir=	Fixing resource directory path
-SUBST_FILES.resdir=	lib/gs_res.ps
+SUBST_FILES.resdir=	Resource/Init/gs_res.ps
 SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
 
 .if ${OPSYS} == "HPUX"
@@ -79,6 +78,7 @@ post-install:
 
 .include "options.mk"
 
+.include "../../print/libpaper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 # pkgsrc jasper is too new
diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST
index d57b645349f..48941c38423 100644
--- a/print/ghostscript/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/09/03 21:31:12 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/02/12 19:51:08 drochner Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -7,8 +7,8 @@ bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
-bin/gsdj
 bin/gsc
+bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
@@ -39,6 +39,7 @@ include/ghostscript/ierrors.h
 lib/libgs.so
 lib/libgs.so.8
 lib/libgs.so.${PKGVERSION}
+${PLIST.cups}libexec/cups/filter/pdftoraster
 ${PLIST.cups}libexec/cups/filter/pstopxl
 ${PLIST.cups}libexec/cups/filter/pstoraster
 man/de/man1/dvipdf.1
@@ -81,6 +82,7 @@ man/man1/ps2ps.1
 man/man1/wftopfa.1
 ${PLIST.cups}share/cups/model/pxlcolor.ppd
 ${PLIST.cups}share/cups/model/pxlmono.ppd
+${PLIST.cups}share/examples/cups/pdftoraster.convs
 ${PLIST.cups}share/examples/cups/pstoraster.convs
 share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H
 share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V
@@ -370,6 +372,73 @@ share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Bold
 share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-BoldItal
 share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Ital
 share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Roma
+share/ghostscript/${PKGVERSION}/Resource/Init/FCOfontmap-PCLPS2
+share/ghostscript/${PKGVERSION}/Resource/Init/Fontmap
+share/ghostscript/${PKGVERSION}/Resource/Init/Fontmap.GS
+share/ghostscript/${PKGVERSION}/Resource/Init/cidfmap
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_agl.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_btokn.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cet.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cff.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cidcm.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_ciddc.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cidfm.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cidfn.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cidtt.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cmap.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_cspace.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_css_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dbt_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_diskf.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_diskn.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dpnxt.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dps.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dps1.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dps2.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_dscp.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_epsf.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_fapi.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_fntem.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_fonts.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_frsd.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_icc.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_il1_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_img.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_init.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_l2img.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_lev2.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_ll3.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_mex_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_mgl_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_mro_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_pdf_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_pdfwr.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_res.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_resmp.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_setpd.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_statd.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_std_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_sym_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_trap.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_ttf.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_typ32.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_typ42.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_type1.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/gs_wan_e.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/opdfread.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_base.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_cslayer.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_draw.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_font.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_main.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_ops.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_rbld.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/pdf_sec.ps
+share/ghostscript/${PKGVERSION}/Resource/Init/xlatmap
+share/ghostscript/${PKGVERSION}/Resource/SubstCID/CNS1-WMode
+share/ghostscript/${PKGVERSION}/Resource/SubstCID/GB1-WMode
+share/ghostscript/${PKGVERSION}/Resource/SubstCID/Japan1-WMode
+share/ghostscript/${PKGVERSION}/Resource/SubstCID/Korea1-WMode
 share/ghostscript/${PKGVERSION}/doc/API.htm
 share/ghostscript/${PKGVERSION}/doc/C-style.htm
 share/ghostscript/${PKGVERSION}/doc/Changes.htm
@@ -392,8 +461,6 @@ share/ghostscript/${PKGVERSION}/doc/History5.htm
 share/ghostscript/${PKGVERSION}/doc/History6.htm
 share/ghostscript/${PKGVERSION}/doc/History7.htm
 share/ghostscript/${PKGVERSION}/doc/History8.htm
-share/ghostscript/${PKGVERSION}/doc/Htmstyle.htm
-share/ghostscript/${PKGVERSION}/doc/Humor.htm
 share/ghostscript/${PKGVERSION}/doc/Install.htm
 share/ghostscript/${PKGVERSION}/doc/Issues.htm
 share/ghostscript/${PKGVERSION}/doc/Language.htm
@@ -427,9 +494,6 @@ share/ghostscript/${PKGVERSION}/examples/snowflak.ps
 share/ghostscript/${PKGVERSION}/examples/tiger.eps
 share/ghostscript/${PKGVERSION}/examples/vasarely.ps
 share/ghostscript/${PKGVERSION}/examples/waterfal.ps
-share/ghostscript/${PKGVERSION}/lib/FCOfontmap-PCLPS2
-share/ghostscript/${PKGVERSION}/lib/Fontmap
-share/ghostscript/${PKGVERSION}/lib/Fontmap.GS
 share/ghostscript/${PKGVERSION}/lib/PDFA_def.ps
 share/ghostscript/${PKGVERSION}/lib/PDFX_def.ps
 share/ghostscript/${PKGVERSION}/lib/PM760p.upp
@@ -486,7 +550,6 @@ share/ghostscript/${PKGVERSION}/lib/cdj550.upp
 share/ghostscript/${PKGVERSION}/lib/cdj690.upp
 share/ghostscript/${PKGVERSION}/lib/cdj690ec.upp
 share/ghostscript/${PKGVERSION}/lib/cid2code.ps
-share/ghostscript/${PKGVERSION}/lib/cidfmap
 share/ghostscript/${PKGVERSION}/lib/decrypt.ps
 share/ghostscript/${PKGVERSION}/lib/dmp_init.ps
 share/ghostscript/${PKGVERSION}/lib/dmp_site.ps
@@ -498,87 +561,28 @@ share/ghostscript/${PKGVERSION}/lib/escp_24.src
 share/ghostscript/${PKGVERSION}/lib/font2c.ps
 share/ghostscript/${PKGVERSION}/lib/font2pcl.ps
 share/ghostscript/${PKGVERSION}/lib/ghostpdf.ppd
-share/ghostscript/${PKGVERSION}/lib/gs_agl.ps
-share/ghostscript/${PKGVERSION}/lib/gs_btokn.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ccfnt.ps
 share/ghostscript/${PKGVERSION}/lib/gs_ce_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cet.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cff.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cidcm.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ciddc.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cidfm.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cidfn.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cidtt.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ciecs2.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ciecs3.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cmap.ps
 share/ghostscript/${PKGVERSION}/lib/gs_cmdl.ps
-share/ghostscript/${PKGVERSION}/lib/gs_cspace.ps
-share/ghostscript/${PKGVERSION}/lib/gs_css_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dbt_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_devcs.ps
-share/ghostscript/${PKGVERSION}/lib/gs_devn.ps
-share/ghostscript/${PKGVERSION}/lib/gs_devpxl.ps
-share/ghostscript/${PKGVERSION}/lib/gs_diskf.ps
-share/ghostscript/${PKGVERSION}/lib/gs_diskn.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dpnxt.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dps.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dps1.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dps2.ps
-share/ghostscript/${PKGVERSION}/lib/gs_dscp.ps
-share/ghostscript/${PKGVERSION}/lib/gs_epsf.ps
-share/ghostscript/${PKGVERSION}/lib/gs_fapi.ps
 share/ghostscript/${PKGVERSION}/lib/gs_fform.ps
-share/ghostscript/${PKGVERSION}/lib/gs_fntem.ps
-share/ghostscript/${PKGVERSION}/lib/gs_fonts.ps
-share/ghostscript/${PKGVERSION}/lib/gs_frsd.ps
-share/ghostscript/${PKGVERSION}/lib/gs_icc.ps
-share/ghostscript/${PKGVERSION}/lib/gs_il1_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_il2_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_img.ps
-share/ghostscript/${PKGVERSION}/lib/gs_indxd.ps
-share/ghostscript/${PKGVERSION}/lib/gs_init.ps
 share/ghostscript/${PKGVERSION}/lib/gs_kanji.ps
 share/ghostscript/${PKGVERSION}/lib/gs_ksb_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_l.xbm
 share/ghostscript/${PKGVERSION}/lib/gs_l.xpm
-share/ghostscript/${PKGVERSION}/lib/gs_l2img.ps
 share/ghostscript/${PKGVERSION}/lib/gs_l_m.xbm
-share/ghostscript/${PKGVERSION}/lib/gs_lev2.ps
 share/ghostscript/${PKGVERSION}/lib/gs_lgo_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_lgx_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ll3.ps
 share/ghostscript/${PKGVERSION}/lib/gs_m.xbm
 share/ghostscript/${PKGVERSION}/lib/gs_m.xpm
 share/ghostscript/${PKGVERSION}/lib/gs_m_m.xbm
-share/ghostscript/${PKGVERSION}/lib/gs_mex_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_mgl_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_mro_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_patrn.ps
-share/ghostscript/${PKGVERSION}/lib/gs_pdf_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_pdfwr.ps
 share/ghostscript/${PKGVERSION}/lib/gs_pfile.ps
 share/ghostscript/${PKGVERSION}/lib/gs_rdlin.ps
-share/ghostscript/${PKGVERSION}/lib/gs_res.ps
-share/ghostscript/${PKGVERSION}/lib/gs_resmp.ps
-share/ghostscript/${PKGVERSION}/lib/gs_resst.ps
 share/ghostscript/${PKGVERSION}/lib/gs_s.xbm
 share/ghostscript/${PKGVERSION}/lib/gs_s.xpm
 share/ghostscript/${PKGVERSION}/lib/gs_s_m.xbm
-share/ghostscript/${PKGVERSION}/lib/gs_sepr.ps
-share/ghostscript/${PKGVERSION}/lib/gs_setpd.ps
-share/ghostscript/${PKGVERSION}/lib/gs_statd.ps
-share/ghostscript/${PKGVERSION}/lib/gs_std_e.ps
-share/ghostscript/${PKGVERSION}/lib/gs_sym_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_t.xbm
 share/ghostscript/${PKGVERSION}/lib/gs_t.xpm
 share/ghostscript/${PKGVERSION}/lib/gs_t_m.xbm
-share/ghostscript/${PKGVERSION}/lib/gs_trap.ps
-share/ghostscript/${PKGVERSION}/lib/gs_ttf.ps
-share/ghostscript/${PKGVERSION}/lib/gs_typ32.ps
-share/ghostscript/${PKGVERSION}/lib/gs_typ42.ps
-share/ghostscript/${PKGVERSION}/lib/gs_type1.ps
-share/ghostscript/${PKGVERSION}/lib/gs_wan_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_wl1_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_wl2_e.ps
 share/ghostscript/${PKGVERSION}/lib/gs_wl5_e.ps
@@ -596,18 +600,9 @@ share/ghostscript/${PKGVERSION}/lib/markpath.ps
 share/ghostscript/${PKGVERSION}/lib/mkcidfm.ps
 share/ghostscript/${PKGVERSION}/lib/necp2x.upp
 share/ghostscript/${PKGVERSION}/lib/necp2x6.upp
-share/ghostscript/${PKGVERSION}/lib/opdfread.ps
 share/ghostscript/${PKGVERSION}/lib/packfile.ps
 share/ghostscript/${PKGVERSION}/lib/pcharstr.ps
 share/ghostscript/${PKGVERSION}/lib/pdf2dsc.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_base.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_cslayer.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_draw.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_font.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_main.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_ops.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_rbld.ps
-share/ghostscript/${PKGVERSION}/lib/pdf_sec.ps
 share/ghostscript/${PKGVERSION}/lib/pdfopt.ps
 share/ghostscript/${PKGVERSION}/lib/pdfwrite.ps
 share/ghostscript/${PKGVERSION}/lib/pf2afm.ps
@@ -682,11 +677,12 @@ share/ghostscript/${PKGVERSION}/lib/viewps2a.ps
 share/ghostscript/${PKGVERSION}/lib/wftopfa.ps
 share/ghostscript/${PKGVERSION}/lib/winmaps.ps
 share/ghostscript/${PKGVERSION}/lib/wrfont.ps
-share/ghostscript/${PKGVERSION}/lib/xlatmap
 share/ghostscript/${PKGVERSION}/lib/zeroline.ps
 @dirrm share/ghostscript/${PKGVERSION}/lib
 @dirrm share/ghostscript/${PKGVERSION}/examples
 @dirrm share/ghostscript/${PKGVERSION}/doc
+@dirrm share/ghostscript/${PKGVERSION}/Resource/SubstCID
+@dirrm share/ghostscript/${PKGVERSION}/Resource/Init
 @dirrm share/ghostscript/${PKGVERSION}/Resource/Font
 @dirrm share/ghostscript/${PKGVERSION}/Resource/Encoding
 @dirrm share/ghostscript/${PKGVERSION}/Resource/Decoding
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 6d8d8d42192..1e8eb2e5b1e 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2008/11/13 17:36:54 chuck Exp $
+$NetBSD: distinfo,v 1.19 2009/02/12 19:51:08 drochner Exp $
 
-SHA1 (ghostscript-8.63.tar.bz2) = c97159d3cccb0b1b5fc409715c6321a7256717ec
-RMD160 (ghostscript-8.63.tar.bz2) = 817d5c1539d88be979c42f67a9246f690328da33
-Size (ghostscript-8.63.tar.bz2) = 15017410 bytes
-SHA1 (patch-ab) = 2477242c4c5f6b6feaaa217deb1aa37485f2fac5
+SHA1 (ghostscript-8.64.tar.bz2) = 4c2a6e04145428d35da73fbc4db9c66a75e336e0
+RMD160 (ghostscript-8.64.tar.bz2) = 565134dcfe1e823b435c3761461c5eb394bd633c
+Size (ghostscript-8.64.tar.bz2) = 16921504 bytes
+SHA1 (patch-ab) = 7a98cad37f94394f172bdac23f5dd73fb1f08006
 SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401
-SHA1 (patch-ae) = df329ac87f9ed97b76f0a7fff738050e8c35794a
-SHA1 (patch-af) = 41c4ad8c2a096485ea3fe730ef38423506308bed
+SHA1 (patch-ae) = 50335e72adebe95ab0cb5873d1c6dd00e971579a
+SHA1 (patch-af) = e4d56f13f5eb595a3929aac6c257012961f59c2b
+SHA1 (patch-ag) = dd452d29253e20bb8fa453a1e4f139a40b2ab3e3
diff --git a/print/ghostscript/patches/patch-ab b/print/ghostscript/patches/patch-ab
index 08f23adf526..ec077eeb70c 100644
--- a/print/ghostscript/patches/patch-ab
+++ b/print/ghostscript/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/12/27 18:18:22 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2009/02/12 19:51:08 drochner Exp $
 
---- src/unixinst.mak.orig	2006-03-13 17:18:19.000000000 +0100
-+++ src/unixinst.mak
-@@ -148,7 +148,7 @@ install-man: $(PSMANDIR)/gs.1
+--- base/unixinst.mak.orig	2007-08-14 22:48:29.000000000 +0200
++++ base/unixinst.mak
+@@ -151,7 +151,7 @@ install-man: $(PSMANDIR)/gs.1
  			  ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
  	      done ;\
  	    fi ;\
diff --git a/print/ghostscript/patches/patch-ae b/print/ghostscript/patches/patch-ae
index 32c05a88e1b..b3d4594d22f 100644
--- a/print/ghostscript/patches/patch-ae
+++ b/print/ghostscript/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2008/03/05 19:12:16 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2009/02/12 19:51:08 drochner Exp $
 
---- src/gscencs.c.orig	2008-03-05 20:02:12.000000000 +0100
-+++ src/gscencs.c
+--- base/gscencs.c.orig	2007-06-06 00:23:38.000000000 +0200
++++ base/gscencs.c
 @@ -117,7 +117,7 @@ bool
  gs_is_c_glyph_name(const byte *str, uint len)
  {
diff --git a/print/ghostscript/patches/patch-af b/print/ghostscript/patches/patch-af
index 71a3271eb6c..55e06af3835 100644
--- a/print/ghostscript/patches/patch-af
+++ b/print/ghostscript/patches/patch-af
@@ -1,18 +1,18 @@
-$NetBSD: patch-af,v 1.4 2008/11/13 17:36:54 chuck Exp $
+$NetBSD: patch-af,v 1.5 2009/02/12 19:51:08 drochner Exp $
 
---- src/unix-dll.mak.orig	2007-11-27 17:58:40.000000000 -0500
-+++ src/unix-dll.mak	2008-11-13 10:50:06.000000000 -0500
-@@ -52,12 +52,12 @@
+--- base/unix-dll.mak.orig	2008-09-13 22:22:25.000000000 +0200
++++ base/unix-dll.mak
+@@ -52,12 +52,12 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_
  LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
  
  # MacOS X
 -#GS_SOEXT=dylib
-+#Darwin#GS_SOEXT=dylib
 -#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-+#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
 -#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
 -#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
++#Darwin#GS_SOEXT=dylib
++#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
++#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
 +#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
  #LDFLAGS_SO=-dynamiclib -flat-namespace
 -#LDFLAGS_SO=-dynamiclib -install-name $(GS_SONAME_MAJOR_MINOR)
@@ -20,15 +20,15 @@ $NetBSD: patch-af,v 1.4 2008/11/13 17:36:54 chuck Exp $
  #LDFLAGS_SO=-dynamiclib
  
  GS_SO=$(BINDIR)/$(GS_SONAME)
-@@ -79,11 +79,11 @@
+@@ -79,11 +79,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
  # Build the small Ghostscript loaders, with Gtk+ and without
  
- $(GSSOC_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
--	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
-+	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
+ $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
+-	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -l$(GS)
++	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
  
- $(GSSOX_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
- 	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)$(SOC_LOADER) \
+ $(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) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
  
diff --git a/print/ghostscript/patches/patch-ag b/print/ghostscript/patches/patch-ag
new file mode 100644
index 00000000000..4f798749a20
--- /dev/null
+++ b/print/ghostscript/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2009/02/12 19:51:08 drochner Exp $
+
+--- cups/cups.mak.orig	2009-02-06 18:58:54.000000000 +0100
++++ cups/cups.mak
+@@ -49,7 +49,7 @@ pdftoraster: $(PDFTORASTER_XE)
+ pdftoraster_=cups/pdftoraster.c
+ 
+ $(PDFTORASTER_XE): $(pdftoraster_)
+-	$(GLCC) `cups-config --image --libs` -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_)
++	$(GLCC) `cups-config --ldflags --image --libs` -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_)
+ 
+ install:	install-cups
+