35 files changed, 163 insertions, 160 deletions

diff --git a/print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap b/print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap
index 2c6bf45839b2..96c2570f30c1 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap
+++ b/print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap
@@ -1,5 +1,5 @@
---- Resource/Init/FAPIcidfmap.orig	2006-06-01 00:29:52.000000000 +0900
-+++ Resource/Init/FAPIcidfmap	2009-05-15 03:27:31.000000000 +0900
+--- Resource/Init/FAPIcidfmap.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/FAPIcidfmap
 @@ -29,4 +29,59 @@
  %
  %  /Ryumin-Medium     << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig b/print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig
index e2ff81b58276..0f5469995dad 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig
+++ b/print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig
@@ -1,9 +1,9 @@
---- Resource/Init/FAPIconfig.orig	2010-04-13 21:50:40.000000000 +0900
-+++ Resource/Init/FAPIconfig	2011-05-17 18:25:59.000000000 +0900
+--- Resource/Init/FAPIconfig.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/FAPIconfig
 @@ -12,3 +12,7 @@
- % and CID font resource files.

- % "Embedded fonts" are fonts and CID fonts being embedded into a document.

- 

+ % and CID font resource files.
+ % "Embedded fonts" are fonts and CID fonts being embedded into a document.
+ 
 +/FontPath	()	% A default directory for FAPI-handled font files path in FAPIfontmap.
 +/CIDFontPath	()	% A default directory for FAPI-handled CID font files path in FAPIcidfmap.
 +/HookDiskFonts	[]	% FontType values for disk PS fonts to be redirected to FAPI.
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap b/print/ghostscript9-base/files/patch-Resource_Init_cidfmap
index 8ed71789f4fe..9c7c8c88e703 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap
+++ b/print/ghostscript9-base/files/patch-Resource_Init_cidfmap
@@ -1,9 +1,9 @@
---- Resource/Init/cidfmap.orig	2008-08-08 13:22:38.000000000 +0900
-+++ Resource/Init/cidfmap	2009-12-20 03:03:17.000000000 +0900
-@@ -26,3 +26,64 @@
+--- Resource/Init/cidfmap.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/cidfmap
+@@ -29,6 +29,67 @@
  %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
  %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
- %
+ %   /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ;
 +/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ;
 +/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ;
 +
@@ -65,3 +65,6 @@
 +/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ;
 +/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ;
 +/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ;
+ %
+ %   NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this
+ %         to include a default value should getenv fail.
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps
index a9996b623de8..0adb60151b62 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps
+++ b/print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps
@@ -1,6 +1,6 @@
---- Resource/Init/gs_statd.ps.orig	2011-05-24 04:43:02.000000000 +0900
-+++ Resource/Init/gs_statd.ps	2011-05-24 04:43:31.000000000 +0900
-@@ -125,6 +125,12 @@
+--- Resource/Init/gs_statd.ps.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/gs_statd.ps
+@@ -124,6 +124,12 @@ STRICT { (%END SIZES) .skipeof } if
   /ANSI_D {1585 2448 //.setpagesize exec} bind def
   /ANSI_E {2448 3168 //.setpagesize exec} bind def
   /ANSI_F {2016 2880 //.setpagesize exec} bind def
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps
index 19fc072bd4e2..0777a953908b 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps
+++ b/print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps
@@ -1,8 +1,8 @@
---- Resource/Init/gs_ttf.ps.orig	2011-05-24 04:46:01.000000000 +0900
-+++ Resource/Init/gs_ttf.ps	2011-05-24 04:46:22.000000000 +0900
-@@ -1029,10 +1029,21 @@
+--- Resource/Init/gs_ttf.ps.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/gs_ttf.ps
+@@ -1047,10 +1047,21 @@ mark
    } ifelse
- 		% Stack: ... /FontInfo mark key1 value1 ...
+                 % Stack: ... /FontInfo mark key1 value1 ...
    post //null ne {
 -    /ItalicAngle first_post_string 4 gets32 65536.0 div
 -    /isFixedPitch first_post_string 12 getu32 0 ne
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps
index c966e57fba11..281b882ae3d6 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps
+++ b/print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps
@@ -1,6 +1,6 @@
---- Resource/Init/pdf_font.ps.orig	Tue Aug 31 13:03:30 2004
-+++ Resource/Init/pdf_font.ps	Wed Sep 15 19:15:00 2004
-@@ -1114,10 +1114,12 @@
+--- Resource/Init/pdf_font.ps.orig	2012-08-08 08:01:36 UTC
++++ Resource/Init/pdf_font.ps
+@@ -1751,10 +1751,12 @@ currentdict /CMap_read_dict undef
  
  /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
    dup /BaseFont get findCIDFont exch pop
diff --git a/print/ghostscript9-base/files/patch-base-gsicc_create.c b/print/ghostscript9-base/files/patch-base-gsicc__create.c
index 82bfee6c37ef..fdf8f5e33be3 100644
--- a/print/ghostscript9-base/files/patch-base-gsicc_create.c
+++ b/print/ghostscript9-base/files/patch-base-gsicc__create.c
@@ -1,6 +1,6 @@
---- base/gsicc_create.c.orig	2011-08-05 20:12:20.000000000 +0900
-+++ base/gsicc_create.c	2011-12-06 15:23:14.000000000 +0900
-@@ -113,6 +113,7 @@
+--- base/gsicc_create.c.orig	2012-08-08 08:01:36 UTC
++++ base/gsicc_create.c
+@@ -116,6 +116,7 @@ Note: All profile data must be encoded a
  
     */
  
diff --git a/print/ghostscript9-base/files/patch-base-Makefile.in b/print/ghostscript9-base/files/patch-base_Makefile.in
index 93eddf3d998f..c7b4175e98b0 100644
--- a/print/ghostscript9-base/files/patch-base-Makefile.in
+++ b/print/ghostscript9-base/files/patch-base_Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/Makefile.in	2014-11-23 17:28:38.000000000 +0900
-@@ -49,9 +49,9 @@
+--- base/Makefile.in.orig	2012-08-08 08:01:36 UTC
++++ base/Makefile.in
+@@ -49,9 +49,9 @@ PSD=$(PSGENDIR)/
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -13,7 +13,7 @@
  INSTALL_SHARED = @INSTALL_SHARED@
  
  prefix = @prefix@
-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ JSRCDIR=@LIBJPEGDIR@
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -22,7 +22,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -210,12 +210,12 @@
+@@ -210,12 +210,12 @@ JPEG_NAME=jpeg
  # You may need to change this if the libpng version changes.
  # See png.mak for more information.
  
@@ -37,7 +37,7 @@
  TIFFSRCDIR=@LIBTIFFDIR@
  TIFFPLATFORM=unix
  TIFFCONFIG_SUFFIX=
-@@ -224,7 +224,7 @@
+@@ -224,7 +224,7 @@ LIBTIFF_NAME=tiff
  # Define the directory where the zlib sources are stored.
  # See zlib.mak for more information.
  
@@ -46,7 +46,7 @@
  ZSRCDIR=@ZLIBDIR@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
-@@ -251,7 +251,7 @@
+@@ -251,7 +251,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@
  JPX_LIB=@JPX_DECODER@
  SHARE_JPX=@SHARE_JPX@
  JPXSRCDIR=@JPXDIR@
@@ -55,7 +55,7 @@
  
  # uncomment the following three lines and one of the last two to
  # compile in the Luratech lwf_jp2 codec
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ GCFLAGS=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -64,7 +64,7 @@
  CFLAGS_DEBUG=@DBG_CFLAGS@
  CFLAGS_PROFILE=-pg @OPT_CFLAGS@
  CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ LDFLAGS=@LDFLAGS@ $(AC_LDFLAGS) $(XLDFLA
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -73,7 +73,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -426,7 +426,7 @@
+@@ -426,7 +426,7 @@ XLIBS=@X_LIBS@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -82,7 +82,7 @@
  
  # programs we use
  RM=rm -f
-@@ -518,27 +518,27 @@
+@@ -518,27 +518,27 @@ DISPLAY_DEV=$(DD)bbox.dev
  #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
  #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
  DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@
@@ -131,7 +131,7 @@
  
  
  # Shared library target to build.
-@@ -583,6 +583,7 @@
+@@ -583,6 +583,7 @@ MAKEDIRSTOP=
  # ---------------- End of platform-specific section ---------------- #
  
  INSTALL_CONTRIB=@INSTALL_CONTRIB@
diff --git a/print/ghostscript9-base/files/patch-base-configure.ac b/print/ghostscript9-base/files/patch-base_configure.ac
index 12bce9cb55b7..e48115a8ca67 100644
--- a/print/ghostscript9-base/files/patch-base-configure.ac
+++ b/print/ghostscript9-base/files/patch-base_configure.ac
@@ -1,6 +1,6 @@
---- base/configure.ac.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/configure.ac	2015-08-21 12:58:10.287279000 +0900
-@@ -1303,7 +1303,7 @@
+--- base/configure.ac.orig	2012-08-08 08:01:36 UTC
++++ base/configure.ac
+@@ -1303,7 +1303,7 @@ X_CFLAGS=""
  X_DEVS=""
  X_LIBS=""
  
@@ -9,7 +9,7 @@
          if test "$x_libraries" = "/usr/lib"; then
                  echo "Ignoring X library directory \"$x_libraries\" requested by configure."
                  x_libraries="NONE"
-@@ -1701,7 +1701,10 @@
+@@ -1701,7 +1701,10 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
                          DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
                          ;;
                          *BSD)
@@ -21,7 +21,7 @@
                          DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
                          X11_DEVS=""
                          OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
-@@ -1758,11 +1761,11 @@
+@@ -1758,11 +1761,11 @@ if test "x$fontpath" = "x"; then
          fontpath="${fontpath}:$datadir/fonts/default/TrueType"
  
          # These font directories are used by IRIX...
diff --git a/print/ghostscript9-base/files/patch-base-contrib.mak b/print/ghostscript9-base/files/patch-base_contrib.mak
index 9f9406007bb4..1355faba9ab1 100644
--- a/print/ghostscript9-base/files/patch-base-contrib.mak
+++ b/print/ghostscript9-base/files/patch-base_contrib.mak
@@ -1,6 +1,6 @@
---- base/contrib.mak.orig	2008-03-04 06:06:45.000000000 +0900
-+++ base/contrib.mak	2008-03-04 06:07:11.000000000 +0900
-@@ -858,3 +858,5 @@
+--- base/contrib.mak.orig	2012-08-08 08:01:36 UTC
++++ base/contrib.mak
+@@ -860,3 +860,5 @@ $(DD)picty180.dev : $(cdeskjet_)
  	$(SETPDEV) $(DD)picty180 $(cdeskjet_)
  
  #########################################################################
diff --git a/print/ghostscript9-base/files/patch-base-devs.mak b/print/ghostscript9-base/files/patch-base_devs.mak
index 706e86737cbe..9ecf9599fd9b 100644
--- a/print/ghostscript9-base/files/patch-base-devs.mak
+++ b/print/ghostscript9-base/files/patch-base_devs.mak
@@ -1,6 +1,6 @@
---- base/devs.mak.orig	2009-02-14 09:46:58.000000000 +0900
-+++ base/devs.mak	2009-12-20 01:39:02.000000000 +0900
-@@ -418,10 +418,10 @@
+--- base/devs.mak.orig	2012-08-08 08:01:36 UTC
++++ base/devs.mak
+@@ -434,10 +434,10 @@ $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvg
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(GLOBJ)lvga256.so : $(lvga256_)
@@ -13,7 +13,7 @@
  
  ### -------------------------- The X11 device -------------------------- ###
  
-@@ -524,7 +524,7 @@
+@@ -535,7 +535,7 @@ $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxa
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(GLOBJ)X11.so : $(x11alt_) $(x11_)
diff --git a/print/ghostscript9-base/files/patch-base-gdevl256.c b/print/ghostscript9-base/files/patch-base_gdevl256.c
index d2fcd1b42baa..5e109c1a71ef 100644
--- a/print/ghostscript9-base/files/patch-base-gdevl256.c
+++ b/print/ghostscript9-base/files/patch-base_gdevl256.c
@@ -1,6 +1,6 @@
---- base/gdevl256.c.orig	2011-07-17 19:57:32.000000000 +0900
-+++ base/gdevl256.c	2011-07-17 19:57:39.000000000 +0900
-@@ -302,12 +302,3 @@
+--- base/gdevl256.c.orig	2012-08-08 08:01:36 UTC
++++ base/gdevl256.c
+@@ -303,12 +303,3 @@ lvga256_draw_line(gx_device * dev, int x
      gl_line(x0, y0, x1, y1, color);
      return 0;
  }
diff --git a/print/ghostscript9-base/files/patch-base-gdevperm.c b/print/ghostscript9-base/files/patch-base_gdevperm.c
index 07870f314ac4..2d767054a0b1 100644
--- a/print/ghostscript9-base/files/patch-base-gdevperm.c
+++ b/print/ghostscript9-base/files/patch-base_gdevperm.c
@@ -1,6 +1,6 @@
---- base/gdevperm.c.orig	2012-02-08 17:48:48.000000000 +0900
-+++ base/gdevperm.c	2012-02-13 00:44:23.000000000 +0900
-@@ -285,7 +285,7 @@
+--- base/gdevperm.c.orig	2012-08-08 08:01:36 UTC
++++ base/gdevperm.c
+@@ -287,7 +287,7 @@ perm_get_color_mapping_procs(const gx_de
          (strncmp((const char *)name, (const char *)str, name_size) == 0))
  
  static int
@@ -9,7 +9,7 @@
                                          int name_size, int component_type)
  {
      const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev;
-@@ -332,7 +332,6 @@
+@@ -334,7 +334,6 @@ static int
  perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out)
  {
      int bpc = 8;
diff --git a/print/ghostscript9-base/files/patch-base-gdevplib.c b/print/ghostscript9-base/files/patch-base_gdevplib.c
index 11fbdf23b262..11fbdf23b262 100644
--- a/print/ghostscript9-base/files/patch-base-gdevplib.c
+++ b/print/ghostscript9-base/files/patch-base_gdevplib.c
diff --git a/print/ghostscript9-base/files/patch-base-gdevvglb.c b/print/ghostscript9-base/files/patch-base_gdevvglb.c
index 8f7d239726ff..c6b38a6c68be 100644
--- a/print/ghostscript9-base/files/patch-base-gdevvglb.c
+++ b/print/ghostscript9-base/files/patch-base_gdevvglb.c
@@ -1,6 +1,6 @@
---- base/gdevvglb.c.orig	2011-07-17 19:56:33.000000000 +0900
-+++ base/gdevvglb.c	2011-07-17 19:57:10.000000000 +0900
-@@ -367,12 +367,3 @@
+--- base/gdevvglb.c.orig	2012-08-08 08:01:36 UTC
++++ base/gdevvglb.c
+@@ -368,12 +368,3 @@ vgalib_put_params(gx_device * dev, gs_pa
      }
      return 0;
  }
diff --git a/print/ghostscript9-base/files/patch-base-gp_unix.c b/print/ghostscript9-base/files/patch-base_gp__unix.c
index 277ef51a22ab..84d1cdcb4f73 100644
--- a/print/ghostscript9-base/files/patch-base-gp_unix.c
+++ b/print/ghostscript9-base/files/patch-base_gp__unix.c
@@ -1,6 +1,6 @@
---- base/gp_unix.c.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/gp_unix.c	2015-08-20 15:15:51.166042000 +0900
-@@ -52,6 +52,7 @@
+--- base/gp_unix.c.orig	2012-08-08 08:01:36 UTC
++++ base/gp_unix.c
+@@ -52,6 +52,7 @@ extern char *getenv(const char *);
   * and applied as a patch (preferable).
   */
  #include <sys/types.h>
@@ -8,7 +8,7 @@
  #include <dirent.h>
  #include <dlfcn.h>
  #include <string.h>
-@@ -61,26 +62,25 @@
+@@ -61,26 +62,25 @@ gp_init(void)
  {
    DIR*           dir = NULL;
    struct dirent* dirent;
diff --git a/print/ghostscript9-base/files/patch-base-gs.mak b/print/ghostscript9-base/files/patch-base_gs.mak
index 50d31a63a2d2..99f9426dc787 100644
--- a/print/ghostscript9-base/files/patch-base-gs.mak
+++ b/print/ghostscript9-base/files/patch-base_gs.mak
@@ -1,6 +1,6 @@
---- base/gs.mak.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/gs.mak	2012-10-14 02:29:03.000000000 +0900
-@@ -437,7 +437,7 @@
+--- base/gs.mak.orig	2012-08-08 08:01:36 UTC
++++ base/gs.mak
+@@ -437,7 +437,7 @@ GCONFIG_EXTRAS=
  ld_tr=$(GLGENDIR)$(D)ld.tr
  $(ld_tr) : \
    $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev
diff --git a/print/ghostscript9-base/files/patch-base-gsmalloc.c b/print/ghostscript9-base/files/patch-base_gsmalloc.c
index 93bb2a449788..734cfd079a2e 100644
--- a/print/ghostscript9-base/files/patch-base-gsmalloc.c
+++ b/print/ghostscript9-base/files/patch-base_gsmalloc.c
@@ -1,6 +1,6 @@
---- base/gsmalloc.c.orig	2015-07-24 09:41:05.295969000 +0900
-+++ base/gsmalloc.c	2015-07-24 09:41:15.146305000 +0900
-@@ -178,7 +178,7 @@
+--- base/gsmalloc.c.orig	2012-08-08 08:01:36 UTC
++++ base/gsmalloc.c
+@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u
      } else {
          uint added = size + sizeof(gs_malloc_block_t);
  
diff --git a/print/ghostscript9-base/files/patch-base-gxobj.h b/print/ghostscript9-base/files/patch-base_gxobj.h
index 529efe379df2..762709c55265 100644
--- a/print/ghostscript9-base/files/patch-base-gxobj.h
+++ b/print/ghostscript9-base/files/patch-base_gxobj.h
@@ -1,6 +1,6 @@
---- base/gxobj.h.orig	Tue Mar 14 01:18:19 2006
-+++ base/gxobj.h	Fri Mar 23 14:41:44 2007
-@@ -109,11 +109,15 @@
+--- base/gxobj.h.orig	2012-08-08 08:01:36 UTC
++++ base/gxobj.h
+@@ -109,11 +109,15 @@ typedef struct obj_header_data_s {
   * required by the hardware, regardless of the value of obj_align_mod.
   * See gsmemraw.h for more information about this.
   */
diff --git a/print/ghostscript9-base/files/patch-base-openjpeg.mak b/print/ghostscript9-base/files/patch-base_openjpeg.mak
index 3d85cb70abf1..4e29b5603b64 100644
--- a/print/ghostscript9-base/files/patch-base-openjpeg.mak
+++ b/print/ghostscript9-base/files/patch-base_openjpeg.mak
@@ -1,6 +1,6 @@
---- base/openjpeg.mak.orig	2012-02-08 17:48:48.000000000 +0900
-+++ base/openjpeg.mak	2012-02-14 06:40:56.000000000 +0900
-@@ -101,7 +101,7 @@
+--- base/openjpeg.mak.orig	2012-08-08 08:01:36 UTC
++++ base/openjpeg.mak
+@@ -102,7 +102,7 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_M
  	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
  
  # define our specific compiler
diff --git a/print/ghostscript9-base/files/patch-base-unix-dll.mak b/print/ghostscript9-base/files/patch-base_unix-dll.mak
index 58a428806c59..a835e46c90a6 100644
--- a/print/ghostscript9-base/files/patch-base-unix-dll.mak
+++ b/print/ghostscript9-base/files/patch-base_unix-dll.mak
@@ -1,6 +1,6 @@
---- base/unix-dll.mak.orig	2012-08-08 02:01:36.000000000 -0600
-+++ base/unix-dll.mak	2014-04-18 12:12:34.000000000 -0600
-@@ -162,8 +162,8 @@
+--- base/unix-dll.mak.orig	2012-08-08 08:01:36 UTC
++++ base/unix-dll.mak
+@@ -162,8 +162,8 @@ install-so-subtarget: so-subtarget$(FOR_
  	-mkdir -p $(DESTDIR)$(bindir)
  	-mkdir -p $(DESTDIR)$(libdir)
  	-mkdir -p $(DESTDIR)$(gsincludedir)
diff --git a/print/ghostscript9-base/files/patch-base-unix-gcc.mak b/print/ghostscript9-base/files/patch-base_unix-gcc.mak
index 8aea189c6f90..6147656cc1dd 100644
--- a/print/ghostscript9-base/files/patch-base-unix-gcc.mak
+++ b/print/ghostscript9-base/files/patch-base_unix-gcc.mak
@@ -1,5 +1,5 @@
---- base/unix-gcc.mak.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/unix-gcc.mak	2012-10-14 02:32:51.000000000 +0900
+--- base/unix-gcc.mak.orig	2012-08-08 08:01:36 UTC
++++ base/unix-gcc.mak
 @@ -22,16 +22,17 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -27,7 +27,7 @@
  
  # Do not edit the next group of lines.
  
-@@ -50,11 +51,10 @@
+@@ -50,11 +51,10 @@ PSD=$(PSGENDIR)/
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -42,7 +42,7 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ GENOPT=
  #               This uses the more secure temporary file creation call
  #               Enable this if it is available on your platform.
  
@@ -51,7 +51,7 @@
  
  # Define the name of the executable file.
  
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ JSRCDIR=jpeg
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -60,7 +60,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -153,13 +153,13 @@
+@@ -153,13 +153,13 @@ PNGSRCDIR=libpng
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -76,7 +76,7 @@
  TIFFSRCDIR=tiff
  TIFFPLATFORM=unix
  TIFFCONFIG_SUFFIX=.unix
-@@ -174,15 +174,23 @@
+@@ -174,15 +174,23 @@ ZSRCDIR=zlib
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -102,7 +102,7 @@
  # Define the directory where the icclib source are stored.
  # See icclib.mak for more information
  ICCSRCDIR=icclib
-@@ -223,7 +231,7 @@
+@@ -223,7 +231,7 @@ RANLIB=ranlib
  
  # Define the name of the C compiler.
  
@@ -111,7 +111,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -240,7 +248,7 @@
+@@ -240,7 +248,7 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -120,7 +120,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg -O2
  CFLAGS_SO=-fPIC
-@@ -256,7 +264,8 @@
+@@ -256,7 +264,8 @@ CFLAGS_SO=-fPIC
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
@@ -130,7 +130,7 @@
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -267,7 +276,7 @@
+@@ -267,7 +276,7 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(X
  #	-R /usr/local/xxx/lib:/usr/local/lib
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
@@ -139,7 +139,7 @@
  
  LDFLAGS=$(XLDFLAGS)
  
-@@ -278,7 +287,7 @@
+@@ -278,7 +287,7 @@ LDFLAGS=$(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -148,7 +148,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -300,7 +309,7 @@
+@@ -300,7 +309,7 @@ STDLIBS=-lm
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -157,7 +157,7 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -315,29 +324,29 @@
+@@ -315,29 +324,29 @@ XINCLUDE=-I/usr/X11R6/include
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
@@ -192,7 +192,7 @@
  #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
  # The following is strictly for testing.
  FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
-@@ -476,6 +485,9 @@
+@@ -476,6 +485,9 @@ include $(GLSRCDIR)/zlib.mak
  include $(GLSRCDIR)/png.mak
  include $(GLSRCDIR)/tiff.mak
  include $(GLSRCDIR)/jbig2.mak
@@ -202,7 +202,7 @@
  include $(GLSRCDIR)/icclib.mak
  include $(GLSRCDIR)/lcms.mak
  include $(GLSRCDIR)/ijs.mak
-@@ -486,6 +498,7 @@
+@@ -486,6 +498,7 @@ include $(GLSRCDIR)/unixlink.mak
  include $(GLSRCDIR)/unix-dll.mak
  include $(GLSRCDIR)/unix-end.mak
  include $(GLSRCDIR)/unixinst.mak
diff --git a/print/ghostscript9-base/files/patch-base-unixinst.mak b/print/ghostscript9-base/files/patch-base_unixinst.mak
index 51d6baa31dad..75d285cb2c60 100644
--- a/print/ghostscript9-base/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-base/files/patch-base_unixinst.mak
@@ -1,6 +1,6 @@
---- base/unixinst.mak.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/unixinst.mak	2014-11-23 17:29:15.000000000 +0900
-@@ -45,7 +45,7 @@
+--- base/unixinst.mak.orig	2012-08-08 08:01:36 UTC
++++ base/unixinst.mak
+@@ -45,7 +45,7 @@ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf1
  wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
  	do if ( test -f $(PSLIBDIR)/$$f ); then \
  	  (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \
@@ -9,7 +9,7 @@
  	fi;\
  	done'
  
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ install-doc: $(PSDOCDIR)/News.htm
  	done'
  
  # install the man pages for each locale
diff --git a/print/ghostscript9-base/files/patch-contrib-contrib.mak b/print/ghostscript9-base/files/patch-contrib_contrib.mak
index 5c00766b680a..45a0610841ff 100644
--- a/print/ghostscript9-base/files/patch-contrib-contrib.mak
+++ b/print/ghostscript9-base/files/patch-contrib_contrib.mak
@@ -1,6 +1,6 @@
---- contrib/contrib.mak.orig	2012-04-08 01:05:18.000000000 +0900
-+++ contrib/contrib.mak	2012-04-08 01:05:44.000000000 +0900
-@@ -943,7 +943,7 @@
+--- contrib/contrib.mak.orig	2012-08-08 08:01:36 UTC
++++ contrib/contrib.mak
+@@ -943,7 +943,7 @@ $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev
  $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
  	$(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c
  
diff --git a/print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps b/print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps
index db09592c5704..2a82c315308d 100644
--- a/print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps
+++ b/print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps
@@ -1,5 +1,5 @@
---- contrib/japanese/dmp_site.ps.orig	2012-08-08 17:01:36.000000000 +0900
-+++ contrib/japanese/dmp_site.ps	2015-08-20 15:32:53.920571000 +0900
+--- contrib/japanese/dmp_site.ps.orig	2012-08-08 08:01:36 UTC
++++ contrib/japanese/dmp_site.ps
 @@ -1,7 +1,7 @@
  %!
  BeginConfig
diff --git a/print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c b/print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c
index 2f85bc67e060..282bb5c847eb 100644
--- a/print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c
+++ b/print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c
@@ -1,5 +1,5 @@
---- contrib/japanese/gdevdmpr.c.orig	2011-08-05 20:12:20.000000000 +0900
-+++ contrib/japanese/gdevdmpr.c	2011-12-06 15:36:10.000000000 +0900
+--- contrib/japanese/gdevdmpr.c.orig	2012-08-08 08:01:36 UTC
++++ contrib/japanese/gdevdmpr.c
 @@ -32,7 +32,7 @@
  
  #include "gdevprn.h"
@@ -18,7 +18,7 @@
  #define LOCAL_DEBUG 0
  
  #define DEVICE_NAME "dmprt"
-@@ -402,8 +400,6 @@
+@@ -402,8 +400,6 @@ gdev_dmprt_put_params(gx_device *pdev, g
    if (pddev->dmprt.max_height>0 && pddev->dmprt.max_height<pddev->height)
      pddev->height = pddev->dmprt.max_height;
  
@@ -27,7 +27,7 @@
    return code;
  }
  
-@@ -422,8 +418,6 @@
+@@ -422,8 +418,6 @@ gdev_dmprt_put_dmprt_params(gx_device *p
    if (code < 0) return code;
    if (code == 0) pddev->dmprt.debug_f = vbool;
  
@@ -36,7 +36,7 @@
    code = param_read_bool(plist, "Verbose", &vbool);
    if (code < 0) return code;
    pddev->dmprt.verbose_f = vbool;
-@@ -846,13 +840,12 @@
+@@ -846,13 +840,12 @@ gdev_dmprt_dviprt_lib_fopen(const char *
    char *env;
  
    strcpy(fname,fnamebase);
diff --git a/print/ghostscript9-base/files/patch-lips:gdevlips.c b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c
index 0917be89e49a..760cdfd5cd07 100644
--- a/print/ghostscript9-base/files/patch-lips:gdevlips.c
+++ b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c
@@ -1,6 +1,6 @@
---- contrib/lips4/gdevlips.c.orig	2011-08-05 20:12:20.000000000 +0900
-+++ contrib/lips4/gdevlips.c	2011-12-06 15:31:38.000000000 +0900
-@@ -62,7 +62,15 @@
+--- contrib/lips4/gdevlips.c.orig	2012-08-08 08:01:36 UTC
++++ contrib/lips4/gdevlips.c
+@@ -62,7 +62,15 @@ lips_media_selection(int width, int heig
          height = tmp;
      }
      for (pt = lips_paper_table; pt->num_unit < 80; pt++)
diff --git a/print/ghostscript9-base/files/patch-lips:gdevlips.h b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h
index b3520ba1ac33..68b4769ae8ff 100644
--- a/print/ghostscript9-base/files/patch-lips:gdevlips.h
+++ b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h
@@ -1,8 +1,8 @@
---- contrib/lips4/gdevlips.h.orig	Thu Nov  2 12:09:18 2000
-+++ contrib/lips4/gdevlips.h	Tue Jan 13 01:23:47 2004
-@@ -188,6 +188,14 @@
+--- contrib/lips4/gdevlips.h.orig	2012-08-08 08:01:36 UTC
++++ contrib/lips4/gdevlips.h
+@@ -191,6 +191,14 @@
      bool faceup;\
-     char mediaType[LIPS_MEDIACHAR_MAX];
+     char mediaType[LIPS_MEDIACHAR_MAX]
  
 +/* added by shige 11/06 2003 */
 +#define USE_LIPS_SIZE_ERROR
diff --git a/print/ghostscript9-base/files/patch-epag-ert.c b/print/ghostscript9-base/files/patch-epag-3.09_ert.c
index 6a6dd2540b8a..d4395ca747a5 100644
--- a/print/ghostscript9-base/files/patch-epag-ert.c
+++ b/print/ghostscript9-base/files/patch-epag-3.09_ert.c
@@ -1,5 +1,5 @@
---- epag-3.09/ert.c.orig	2000-07-08 13:33:09.000000000 +0900
-+++ epag-3.09/ert.c	2012-02-13 01:28:55.000000000 +0900
+--- epag-3.09/ert.c.orig	2000-07-08 04:33:09 UTC
++++ epag-3.09/ert.c
 @@ -1,6 +1,8 @@
  /* $Id: ert.c,v 1.3 1998/11/20 10:51:12 nari Exp $ */
  
diff --git a/print/ghostscript9-base/files/patch-epag__gdevepag.c b/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c
index 6012768b4d9c..f4d3f11e7b8c 100644
--- a/print/ghostscript9-base/files/patch-epag__gdevepag.c
+++ b/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c
@@ -1,6 +1,6 @@
---- epag/gdevepag.c.orig	Sat Jul  8 13:33:09 2000
-+++ epag/gdevepag.c	Sat Nov 24 15:25:11 2007
-@@ -102,30 +102,30 @@
+--- epag-3.09/gdevepag.c.orig	2000-07-08 04:33:09 UTC
++++ epag-3.09/gdevepag.c
+@@ -102,30 +102,30 @@ typedef struct _epagBubble{
  } EpagBubble;
  
  /* The device descriptors */
@@ -50,7 +50,7 @@
  prn_params_procs(epag_open, gdev_prn_output_page, epag_close,
  		 epag_get_params, epag_put_params);
  gx_device_printer far_data gs_epag_device =
-@@ -140,13 +140,13 @@
+@@ -140,13 +140,13 @@ prn_device(prn_epag_procs, "epag", 
  static char *epson_remote_start = "\033\001@EJL \r\n";
  
  /* Open the printer, adjusting the margins if necessary. */
@@ -66,7 +66,7 @@
  epag_close(gx_device *pdev)
  {
    gdev_prn_open_printer(pdev, 1);
-@@ -163,7 +163,7 @@
+@@ -163,7 +163,7 @@ epag_close(gx_device *pdev)
    return gdev_prn_close(pdev);
  }
  
@@ -75,7 +75,7 @@
  epag_print_page(gx_device_printer *pdev, FILE *fp)
  {
    EpagPageCont cont;
-@@ -205,7 +205,7 @@
+@@ -205,7 +205,7 @@ static char can_inits[] ={
    GS, '2', 'a', 'b', 'P',          /* イメージ描画後下へ */
  };
  
@@ -84,7 +84,7 @@
  epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies)
  {
    double xDpi,yDpi;
-@@ -260,7 +260,7 @@
+@@ -260,7 +260,7 @@ epag_printer_initialize(gx_device_printe
      fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255);
  }
  
@@ -93,7 +93,7 @@
  epag_get_params(gx_device *pdev, gs_param_list *plist)
  {
    int code;
-@@ -286,7 +286,7 @@
+@@ -286,7 +286,7 @@ epag_get_params(gx_device *pdev, gs_para
  }
  
  /* Put properties. */
@@ -102,7 +102,7 @@
  epag_put_params(gx_device *pdev, gs_param_list *plist)
  {
    param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf);
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ void epag_paper_set(gx_device_printer *p
  /*
   * epag_bubble_flush_all: 残っている bubbleを全て出力する。
   */
@@ -111,7 +111,7 @@
  {
    int i;
    
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ private void epag_bubble_flush_all(EpagP
  /*
   * epag_page_cont_init: EpagPageContの初期化、バッファ確保等
   */
@@ -120,7 +120,7 @@
  				 EpagPageCont *cont)
  {
    int bpl;
-@@ -417,15 +417,15 @@
+@@ -417,15 +417,15 @@ private void epag_page_cont_init(gx_devi
    cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
    if(cont->maxY < cont->bh) cont->maxY = cont->bh;
    
@@ -140,7 +140,7 @@
    bbtbl = (EpagBubble *)cont->bubbleBuffer;
    for(i=0;i<cont->maxBx-1;i++)
      bbtbl[i].next = &bbtbl[i+1];
-@@ -433,15 +433,15 @@
+@@ -433,15 +433,15 @@ private void epag_page_cont_init(gx_devi
    cont->freeBubbleList = &bbtbl[0];
  }
  
@@ -161,7 +161,7 @@
  epag_read_image(EpagPageCont *cont)
  {
    int bh = cont->bh;
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ epag_read_image(EpagPageCont *cont)
  /*
   *    bh行分のラスターデータを処理する
   */
@@ -170,7 +170,7 @@
  epag_process_line(EpagPageCont *cont)
  {
    int bh = cont->bh;
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ epag_process_line(EpagPageCont *cont)
    else epag_rect_add(cont, 0, cont->maxBx-1);
  }
  
@@ -179,7 +179,7 @@
  epag_is_black(EpagPageCont *cont, int bx)
  {
    int bh  = cont->bh;
-@@ -520,7 +520,7 @@
+@@ -520,7 +520,7 @@ epag_is_black(EpagPageCont *cont, int bx
    return 0;
  }
  
@@ -188,7 +188,7 @@
  epag_rect_add(EpagPageCont *cont,int start,int end)
  {
    int x0 = start * cont->bw;
-@@ -544,7 +544,7 @@
+@@ -544,7 +544,7 @@ epag_rect_add(EpagPageCont *cont,int sta
    }
  }
  
@@ -197,7 +197,7 @@
  epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1)
  {
    EpagBubble *bbl;
-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ epag_bubble_gen(EpagPageCont *cont, int 
    }
  }
  
@@ -206,7 +206,7 @@
  {
    int bx,bx0,bx1;
    
-@@ -588,7 +588,7 @@
+@@ -588,7 +588,7 @@ private void epag_bubble_flush(EpagPageC
  
  /* イメージを出力 */
  
diff --git a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h b/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h
deleted file mode 100644
index a2c27a03a799..000000000000
--- a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-02-08 17:48:48.000000000 +0900
-+++ openjpeg/libopenjpeg/opj_malloc.h	2012-02-13 11:12:27.000000000 +0900
-@@ -83,6 +83,8 @@
- #else /* Not _WIN32 */
- 	#if defined(__sun)
- 		#define HAVE_MEMALIGN
-+	#elif defined(__FreeBSD__)
-+		#undef HAVE_MEMALIGN
- 	/* Linux x86_64 and OSX always align allocations to 16 bytes */
- 	#elif !defined(__amd64__) && !defined(__APPLE__)	
- 		#define HAVE_MEMALIGN
diff --git a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h
index 67591744852e..564ec616500c 100644
--- a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h
+++ b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h
@@ -1,6 +1,6 @@
---- openjpeg/libopenjpeg/opj_includes.h.orig	2012-02-13 08:48:33.000000000 +0900
-+++ openjpeg/libopenjpeg/opj_includes.h	2012-02-13 08:50:41.000000000 +0900
-@@ -77,7 +77,7 @@
+--- openjpeg/libopenjpeg/opj_includes.h.orig	2012-08-08 08:01:36 UTC
++++ openjpeg/libopenjpeg/opj_includes.h
+@@ -77,7 +77,7 @@ Most compilers implement their own versi
  #endif /* INLINE */
  
  /* Are restricted pointers available? (C99) */
diff --git a/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h
new file mode 100644
index 000000000000..43bd90e9c150
--- /dev/null
+++ b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h
@@ -0,0 +1,11 @@
+--- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-08-08 08:01:36 UTC
++++ openjpeg/libopenjpeg/opj_malloc.h
+@@ -83,6 +83,8 @@ Allocate memory aligned to a 16 byte bou
+ #else /* Not _WIN32 */
+ 	#if defined(__sun)
+ 		#define HAVE_MEMALIGN
++	#elif defined(__FreeBSD__)
++		#undef HAVE_MEMALIGN
+ 	/* Linux x86_64 and OSX always align allocations to 16 bytes */
+ 	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)
+ 		#define HAVE_MEMALIGN
diff --git a/print/ghostscript9-base/files/patch-psi-zicc.c b/print/ghostscript9-base/files/patch-psi-zicc.c
deleted file mode 100644
index 98c4eed85c37..000000000000
--- a/print/ghostscript9-base/files/patch-psi-zicc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- psi/zicc.c
-+++ psi/zicc.c	2008-02-05 16:11:59.000000000 +0000
-@@ -77,6 +77,9 @@ zseticcspace(i_ctx_t * i_ctx_p)
-     dict_find_string(op, "N", &pnval);
-     ncomps = pnval->value.intval;
- 
-+    if (2*ncomps > sizeof(range_buff)/sizeof(float))
-+	return_error(e_rangecheck);
-+
-     /* verify the DataSource entry */
-     if (dict_find_string(op, "DataSource", &pstrmval) <= 0)
-         return_error(e_undefined);
diff --git a/print/ghostscript9-base/files/patch-psi_zicc.c b/print/ghostscript9-base/files/patch-psi_zicc.c
new file mode 100644
index 000000000000..3ed10a7611f8
--- /dev/null
+++ b/print/ghostscript9-base/files/patch-psi_zicc.c
@@ -0,0 +1,12 @@
+--- psi/zicc.c.orig	2012-08-08 08:01:36 UTC
++++ psi/zicc.c
+@@ -61,6 +61,9 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps
+ 
+     palt_cs = gs_currentcolorspace(igs);
+ 
++    if (2*ncomps > sizeof(range_buff)/sizeof(float))
++	return_error(e_rangecheck);
++
+     /* verify the DataSource entry */
+     if (dict_find_string(ICCdict, "DataSource", &pstrmval) <= 0)
+         return_error(e_undefined);