Index: wip/ghostscript/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- wip/ghostscript/Makefile.common	30 Mar 2011 12:49:24 -0000	1.2
+++ wip/ghostscript/Makefile.common	22 Aug 2011 12:54:55 -0000
@@ -3,4 +3,4 @@
 # used by wip/ghostscript-cidfonts/Makefile
 # used by wip/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.01
+GS_VERSION=	9.04
Index: wip/ghostscript/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- wip/ghostscript/PLIST	30 Mar 2011 12:49:24 -0000	1.3
+++ wip/ghostscript/PLIST	22 Aug 2011 12:54:55 -0000
@@ -1,9 +1,7 @@
 @comment $NetBSD$
-bin/bdftops
 bin/dumphint
 bin/dvipdf
 bin/eps2eps
-bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
@@ -20,8 +18,8 @@
 bin/pdfopt
 bin/pf2afm
 bin/pfbtopfa
-bin/printafm
 bin/pphs
+bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
@@ -31,7 +29,6 @@
 bin/ps2pdfwr
 bin/ps2ps
 bin/ps2ps2
-bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
 include/ghostscript/gdevdsp.h
@@ -514,6 +511,7 @@
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_cmyk.icc
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_gray.icc
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_rgb.icc
+${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/gray_to_k.icc
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/lab.icc
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/ps_cmyk.icc
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/ps_gray.icc
@@ -543,7 +541,6 @@
 share/ghostscript/${PKGVERSION}/lib/acctest.ps
 share/ghostscript/${PKGVERSION}/lib/addxchar.ps
 share/ghostscript/${PKGVERSION}/lib/align.ps
-share/ghostscript/${PKGVERSION}/lib/bdftops.ps
 share/ghostscript/${PKGVERSION}/lib/bj8.rpd
 share/ghostscript/${PKGVERSION}/lib/bj8gc12f.upp
 share/ghostscript/${PKGVERSION}/lib/bj8hg12f.upp
Index: wip/ghostscript/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- wip/ghostscript/distinfo	30 Mar 2011 12:49:24 -0000	1.3
+++ wip/ghostscript/distinfo	22 Aug 2011 12:54:55 -0000
@@ -1,16 +1,15 @@
 $NetBSD: distinfo,v 1.37 2011/01/15 14:08:10 wiz Exp $
 
-SHA1 (ghostscript-9.01.tar.gz) = 8832c5317c1707edd12826212601bc2b78fd9682
-RMD160 (ghostscript-9.01.tar.gz) = 0cbdf085d589cfae2cc35cc9ebba5190d1408a76
-Size (ghostscript-9.01.tar.gz) = 28135972 bytes
+SHA1 (ghostscript-9.04.tar.gz) = 75370060d0a272e66be20152a058e4135976f2e5
+RMD160 (ghostscript-9.04.tar.gz) = 30a49c1cc12e3b449117762b3edbb121d5d2766c
+Size (ghostscript-9.04.tar.gz) = 34488256 bytes
 SHA1 (patch-ab) = 7a98cad37f94394f172bdac23f5dd73fb1f08006
-SHA1 (patch-ad) = 0672e94eb765a3bfb4a9e60e37027ef84703d25a
-SHA1 (patch-af) = 0b32e5dae4141f3b5ac6c66ec85a7e49d66235bd
-SHA1 (patch-ah) = 8a695f35e4a55c465d8c1f902621d51929a66bc6
-SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124
+SHA1 (patch-af) = 795919aae42e619e9fe827b933af78db68d71245
+SHA1 (patch-ah) = 11bd25c0df574a720169f3b0b65505112c7be8d0
+SHA1 (patch-ai) = 17a6f52cc591b20029c78efdbfe1222c80683ad6
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
-SHA1 (patch-ak) = faa53c79c1a85317195baf76d8298767b6434636
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
 SHA1 (patch-an) = 46b0a9f0f949c11a579d2aa44ce9f7a7aa2add8c
+SHA1 (patch-base_gdevpng.c) = fbdb6deafbd4766a05a219e2c39fbf6cf97f75bf
 SHA1 (patch-be) = 3bebc842f1b9d54ab5ac7df75bd77e43ca206b0f
-SHA1 (patch-bf) = 4f73a68ad1c72a191e0cca5b1e742054f6d2de94
+SHA1 (patch-bf) = 8d6c232221f76fa9fb7110b8b01ae8baf1ac15a9
Index: wip/ghostscript/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/patches/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- wip/ghostscript/patches/patch-af	30 Mar 2011 12:49:24 -0000	1.2
+++ wip/ghostscript/patches/patch-af	22 Aug 2011 12:54:55 -0000
@@ -1,7 +1,5 @@
-$NetBSD$
-
---- base/unix-dll.mak.orig	2011-01-18 19:22:12.000000000 +0900
-+++ base/unix-dll.mak	2011-03-30 16:10:24.000000000 +0900
+--- base/unix-dll.mak.orig	2011-08-05 20:12:20.000000000 +0900
++++ base/unix-dll.mak	2011-08-22 18:49:15.000000000 +0900
 @@ -58,12 +58,12 @@
  
  
@@ -20,7 +18,7 @@
  #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
  
  GS_SO=$(BINDIR)/$(GS_SONAME)
-@@ -85,15 +85,15 @@
+@@ -85,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 \
@@ -34,8 +32,3 @@
  
  # ------------------------- Recursive make targets ------------------------- #
  
--SODEFS=\
-+SODEFS=LDFLAGS_SO='$(LDFLAGS_SO)'\
-  GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
-  STDIO_IMPLEMENTATION=c\
-  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
Index: wip/ghostscript/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- wip/ghostscript/patches/patch-ah	26 Jan 2011 13:03:41 -0000	1.1
+++ wip/ghostscript/patches/patch-ah	22 Aug 2011 12:54:55 -0000
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- configure.orig	2010-09-19 18:01:05.000000000 +0900
-+++ configure	2011-01-26 19:00:10.000000000 +0900
-@@ -758,6 +758,7 @@
+--- configure.orig	2011-08-05 20:12:44.000000000 +0900
++++ configure	2011-08-22 18:54:36.000000000 +0900
+@@ -790,6 +790,7 @@
  LIBS
  CPPFLAGS
  CPP
@@ -10,9 +10,9 @@
  XMKMF'
  
  
-@@ -5111,7 +5112,7 @@
- 
+@@ -5249,7 +5250,7 @@
  fi
+ 
  if test x$with_libpaper != xno; then
 -    LIBS="$LIBS -lpaper"
 +    LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
Index: wip/ghostscript/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/patches/patch-ai,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ai
--- wip/ghostscript/patches/patch-ai	26 Jan 2011 08:24:17 -0000	1.1.1.1
+++ wip/ghostscript/patches/patch-ai	22 Aug 2011 12:54:55 -0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-ai,v 1.4 2009/02/16 16:31:30 drochner Exp $
+$NetBSD$
 
---- base/mkromfs.c.orig	2009-02-13 12:20:54.000000000 +0100
-+++ base/mkromfs.c
-@@ -467,7 +467,7 @@ main(int argc, char *argv[])
+
+--- work/ghostscript-9.04/base/mkromfs.c.orig	2011-08-05 20:12:20.000000000 +0900
++++ base/mkromfs.c	2011-08-22 19:15:32.000000000 +0900
+@@ -1033,7 +1033,7 @@
  #endif
      fprintf(out,"\n#include \"stdint_.h\"\n");
      fprintf(out,"\n#include \"time_.h\"\n\n");
@@ -10,4 +11,4 @@
 +    fprintf(out,"    time_t gs_romfs_buildtime = %lld;\n\n", (long long)time(NULL));
  
      /* process the remaining arguments (options interspersed with paths) */
-     for (; atarg < argc; atarg++) {  
+     for (; atarg < argc; atarg++) {
Index: wip/ghostscript/patches/patch-base_gdevpng.c
===================================================================
RCS file: wip/ghostscript/patches/patch-base_gdevpng.c
diff -N wip/ghostscript/patches/patch-base_gdevpng.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wip/ghostscript/patches/patch-base_gdevpng.c	22 Aug 2011 12:54:55 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+
+--- base/gdevpng.c.orig	2011-08-05 20:12:20.000000000 +0900
++++ base/gdevpng.c	2011-08-22 19:04:12.000000000 +0900
+@@ -40,8 +40,11 @@
+ /*
+  * libpng versions 1.0.3 and later allow disabling access to the stdxxx
+  * files while retaining support for FILE * I/O.
++ *
++ * This is a misunderstanding - this is a build time option for libpng,
++ * it has no effect on a user of libpng.
+  */
+-#define PNG_NO_CONSOLE_IO
++/*#define PNG_NO_CONSOLE_IO*/
+ /*
+  * Earlier libpng versions require disabling FILE * I/O altogether.
+  * This produces a compiler warning about no prototype for png_init_io.
Index: wip/ghostscript/patches/patch-bf
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ghostscript/patches/patch-bf,v
retrieving revision 1.1
diff -u -r1.1 patch-bf
--- wip/ghostscript/patches/patch-bf	26 Jan 2011 13:03:41 -0000	1.1
+++ wip/ghostscript/patches/patch-bf	22 Aug 2011 12:54:55 -0000
@@ -1,10 +1,11 @@
 $NetBSD$
 
---- base/configure.ac~	2010-08-21 17:03:46.000000000 +0900
-+++ base/configure.ac	2011-01-26 18:32:51.000000000 +0900
-@@ -335,7 +335,7 @@
-     ])
+
+--- 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"