14 files changed, 60 insertions, 60 deletions

diff --git a/print/ghostscript9-x11/files/patch-base-Makefile.in b/print/ghostscript9-x11/files/patch-base_Makefile.in
index 8d8299fcb21d..7cd1aa240222 100644
--- a/print/ghostscript9-x11/files/patch-base-Makefile.in
+++ b/print/ghostscript9-x11/files/patch-base_Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/Makefile.in	2015-08-21 12:42:47.554688000 +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.
-@@ -601,7 +601,6 @@
+@@ -601,7 +601,6 @@ include $(GLSRCDIR)/ldf_jb2.mak
  include $(GLSRCDIR)/lwf_jp2.mak
  include $(GLSRCDIR)/openjpeg.mak
  include $(GLSRCDIR)/icclib.mak
diff --git a/print/ghostscript9-x11/files/patch-base-configure.ac b/print/ghostscript9-x11/files/patch-base_configure.ac
index 10d21bc83a3a..f5fafb8c2784 100644
--- a/print/ghostscript9-x11/files/patch-base-configure.ac
+++ b/print/ghostscript9-x11/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:40:57.576690000 +0900
-@@ -623,35 +623,6 @@
+--- base/configure.ac.orig	2012-08-08 08:01:36 UTC
++++ base/configure.ac
+@@ -623,35 +623,6 @@ AC_SUBST(FTSRCDIR)
  AC_SUBST(FT_CFLAGS)
  AC_SUBST(FT_LIBS)
    
@@ -36,7 +36,7 @@
  AC_SUBST(SHARE_LIBJPEG)
  AC_SUBST(LIBJPEGDIR)
  dnl check for the internal jpeg memory header
-@@ -731,44 +702,6 @@
+@@ -731,44 +702,6 @@ AC_SUBST(SHARE_LIBPNG)
  AC_SUBST(LIBPNGDIR)
  #AC_SUBST(PNGDEVS)
  
@@ -81,7 +81,7 @@
  AC_SUBST(SHARELCMS)
  AC_SUBST(WHICHLCMS)
  AC_SUBST(LCMSDIR)
-@@ -1303,7 +1236,7 @@
+@@ -1303,7 +1236,7 @@ X_CFLAGS=""
  X_DEVS=""
  X_LIBS=""
  
@@ -90,7 +90,7 @@
          if test "$x_libraries" = "/usr/lib"; then
                  echo "Ignoring X library directory \"$x_libraries\" requested by configure."
                  x_libraries="NONE"
-@@ -1701,7 +1634,12 @@
+@@ -1701,7 +1634,12 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
                          DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
                          ;;
                          *BSD)
@@ -104,7 +104,7 @@
                          DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
                          X11_DEVS=""
                          OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
-@@ -1758,11 +1696,11 @@
+@@ -1758,11 +1696,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-x11/files/patch-base-devs.mak b/print/ghostscript9-x11/files/patch-base_devs.mak
index 8a606f1e9588..422476f62c01 100644
--- a/print/ghostscript9-x11/files/patch-base-devs.mak
+++ b/print/ghostscript9-x11/files/patch-base_devs.mak
@@ -1,6 +1,6 @@
---- base/devs.mak.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/devs.mak	2015-08-21 12:18:59.546901000 +0900
-@@ -434,10 +434,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 -------------------------- ###
  
-@@ -479,7 +479,7 @@
+@@ -479,7 +479,7 @@ $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxi
  # const/non-const cast required by the X headers that we can't work around.
  $(GLOBJ)gdevxres.$(OBJ) : $(GLSRC)gdevxres.c $(std_h) $(x__h)\
   $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h)
@@ -22,7 +22,7 @@
  
  # Alternate X11-based devices to help debug other drivers.
  # x11alpha pretends to have 4 bits of alpha channel.
-@@ -535,7 +535,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-x11/files/patch-base-gdevl256.c b/print/ghostscript9-x11/files/patch-base_gdevl256.c
index d2fcd1b42baa..5e109c1a71ef 100644
--- a/print/ghostscript9-x11/files/patch-base-gdevl256.c
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gdevperm.c b/print/ghostscript9-x11/files/patch-base_gdevperm.c
index 07870f314ac4..2d767054a0b1 100644
--- a/print/ghostscript9-x11/files/patch-base-gdevperm.c
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gdevplib.c b/print/ghostscript9-x11/files/patch-base_gdevplib.c
index 96a096337dd3..b9212022cbeb 100644
--- a/print/ghostscript9-x11/files/patch-base-gdevplib.c
+++ b/print/ghostscript9-x11/files/patch-base_gdevplib.c
@@ -1,6 +1,6 @@
---- base/gdevplib.c.orig	2012-02-08 17:48:47.000000000 +0900
-+++ base/gdevplib.c	2012-02-13 01:23:46.000000000 +0900
-@@ -151,7 +151,11 @@
+--- base/gdevplib.c.orig	2012-08-08 08:01:36 UTC
++++ base/gdevplib.c
+@@ -153,7 +153,11 @@ void __aebi_memmove(void *dest, const vo
  
  #ifdef  TESTING_WITH_NO_BAND_DONOR
  
diff --git a/print/ghostscript9-x11/files/patch-base-gp_unix.c b/print/ghostscript9-x11/files/patch-base_gp__unix.c
index 277ef51a22ab..84d1cdcb4f73 100644
--- a/print/ghostscript9-x11/files/patch-base-gp_unix.c
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gs.mak b/print/ghostscript9-x11/files/patch-base_gs.mak
index 50d31a63a2d2..99f9426dc787 100644
--- a/print/ghostscript9-x11/files/patch-base-gs.mak
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gsicc_create.c b/print/ghostscript9-x11/files/patch-base_gsicc__create.c
index 82bfee6c37ef..fdf8f5e33be3 100644
--- a/print/ghostscript9-x11/files/patch-base-gsicc_create.c
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gsmalloc.c b/print/ghostscript9-x11/files/patch-base_gsmalloc.c
index 93bb2a449788..734cfd079a2e 100644
--- a/print/ghostscript9-x11/files/patch-base-gsmalloc.c
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-gxobj.h b/print/ghostscript9-x11/files/patch-base_gxobj.h
index 529efe379df2..762709c55265 100644
--- a/print/ghostscript9-x11/files/patch-base-gxobj.h
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-lib.mak b/print/ghostscript9-x11/files/patch-base_lib.mak
index 033be0a928e3..3c8c2a846b9f 100644
--- a/print/ghostscript9-x11/files/patch-base-lib.mak
+++ b/print/ghostscript9-x11/files/patch-base_lib.mak
@@ -1,6 +1,6 @@
---- base/lib.mak.orig	2015-08-21 12:20:36.687050000 +0900
-+++ base/lib.mak	2015-08-21 12:20:57.497755000 +0900
-@@ -990,7 +990,7 @@
+--- base/lib.mak.orig	2012-08-08 08:01:36 UTC
++++ base/lib.mak
+@@ -990,7 +990,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam
  $(GLOBJ)gsparamx.$(OBJ) : $(AK) $(GLSRC)gsparamx.c $(string__h)\
   $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
   $(gstypes_h) $(MAKEDIRS)
diff --git a/print/ghostscript9-x11/files/patch-base-unix-dll.mak b/print/ghostscript9-x11/files/patch-base_unix-dll.mak
index 58a428806c59..a835e46c90a6 100644
--- a/print/ghostscript9-x11/files/patch-base-unix-dll.mak
+++ b/print/ghostscript9-x11/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-x11/files/patch-base-unixinst.mak b/print/ghostscript9-x11/files/patch-base_unixinst.mak
index 51d6baa31dad..75d285cb2c60 100644
--- a/print/ghostscript9-x11/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-x11/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