Rename all files containing a : in their filename.

While there, run make makepatch on affected ports, and rename patches
accordingly.

Sponsored by:	Absolight

17 files changed, 89 insertions, 90 deletions

diff --git a/print/ghostscript8-x11/files/patch-base-Makefile.in b/print/ghostscript8-x11/files/patch-base_Makefile.in
index 589acac05131..af3eda8e1a10 100644
--- a/print/ghostscript8-x11/files/patch-base-Makefile.in
+++ b/print/ghostscript8-x11/files/patch-base_Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig	2009-12-18 16:04:10.000000000 +0900
-+++ base/Makefile.in	2015-08-21 20:58:35.641049000 +0900
-@@ -47,9 +47,9 @@
+--- base/Makefile.in.orig	2009-12-18 07:04:10 UTC
++++ base/Makefile.in
+@@ -47,9 +47,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@
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,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,
-@@ -164,12 +164,12 @@
+@@ -164,12 +164,12 @@ JPEG_NAME=jpeg
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -37,7 +37,7 @@
  TIFFSRCDIR=@LIBTIFFDIR@
  TIFFPLATFORM=unix
  TIFFCONFIG_SUFFIX=
-@@ -178,7 +178,7 @@
+@@ -178,7 +178,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
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ GCFLAGS=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -55,7 +55,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg @OPT_CFLAGS@
  CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -299,7 +299,7 @@
+@@ -299,7 +299,7 @@ LDFLAGS=@LDFLAGS@ $(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -64,7 +64,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -343,7 +343,7 @@
+@@ -343,7 +343,7 @@ XLIBS=@X_LIBS@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -73,7 +73,7 @@
  
  # programs we use
  RM=rm -f
-@@ -436,27 +436,27 @@
+@@ -436,27 +436,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) @X_DEVS@
diff --git a/print/ghostscript8-x11/files/patch-base-configure.ac b/print/ghostscript8-x11/files/patch-base_configure.ac
index cf4085dfeebb..0b7cdd808030 100644
--- a/print/ghostscript8-x11/files/patch-base-configure.ac
+++ b/print/ghostscript8-x11/files/patch-base_configure.ac
@@ -1,6 +1,6 @@
---- base/configure.ac.orig	2009-11-24 17:36:27.000000000 +0900
-+++ base/configure.ac	2015-08-21 20:57:47.140818000 +0900
-@@ -322,35 +322,6 @@
+--- base/configure.ac.orig	2009-11-24 08:36:27 UTC
++++ base/configure.ac
+@@ -322,35 +322,6 @@ fi
  
  AC_CHECK_LIB(dl, dlopen)
  
@@ -36,7 +36,7 @@
  AC_SUBST(SHARE_LIBJPEG)
  AC_SUBST(LIBJPEGDIR)
  dnl check for the internal jpeg memory header
-@@ -402,7 +373,7 @@
+@@ -402,7 +373,7 @@ if test -f libpng/pngread.c; then
  	PNGDEVS="$PNGDEVS_ALL"
  else
  	AC_MSG_RESULT([no])
@@ -45,7 +45,7 @@
  	  AC_CHECK_HEADERS(png.h, [
  		SHARE_LIBPNG=1
  		PNGDEVS="$PNGDEVS_ALL"
-@@ -434,7 +405,7 @@
+@@ -434,7 +405,7 @@ case "x$with_system_libtiff" in
  	AC_CHECK_LIB(tiff, TIFFOpen,
  		     [AC_CHECK_HEADERS(tiff.h, [HAVE_SYSTEM_LIBTIFF=1;SHARE_LIBTIFF=1])],
  		     [], [-ljpeg])
@@ -54,7 +54,7 @@
  	    AC_MSG_NOTICE([Could not find a copy of libtiff on your system.
  Disabling tiff output devices.])
  	else
-@@ -758,7 +729,7 @@
+@@ -758,7 +729,7 @@ X_CFLAGS=""
  X_DEVS=""
  X_LIBS=""
  
@@ -63,7 +63,7 @@
  	if test "$x_libraries" = "/usr/lib"; then
  		echo "Ignoring X library directory \"$x_libraries\" requested by configure."
  		x_libraries="NONE"
-@@ -1063,7 +1034,12 @@
+@@ -1063,7 +1034,12 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
  		;;
  		*BSD)
  		DYNAMIC_CFLAGS="-fPIC"
@@ -77,7 +77,7 @@
  		DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
  		DYNAMIC_LDFLAGS="-fPIC -shared"
  		DYNAMIC_LIBS=""
-@@ -1119,11 +1095,11 @@
+@@ -1119,11 +1095,11 @@ if test "x$fontpath" = "x"; then
  	fontpath="${fontpath}:$datadir/fonts/default/TrueType"
  
  	# These font directories are used by IRIX...
diff --git a/print/ghostscript8-x11/files/patch-base-devs.mak b/print/ghostscript8-x11/files/patch-base_devs.mak
index 8c7cc96f7620..f3e36e8ac530 100644
--- a/print/ghostscript8-x11/files/patch-base-devs.mak
+++ b/print/ghostscript8-x11/files/patch-base_devs.mak
@@ -1,6 +1,6 @@
---- base/devs.mak.orig	2009-11-12 00:50:28.000000000 +0900
-+++ base/devs.mak	2015-08-21 20:37:24.364436000 +0900
-@@ -421,10 +421,10 @@
+--- base/devs.mak.orig	2009-11-11 15:50:28 UTC
++++ base/devs.mak
+@@ -421,10 +421,10 @@ $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvg
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(GLOBJ)lvga256.so : $(lvga256_)
@@ -13,7 +13,7 @@
  
  ### -------------------------- The X11 device -------------------------- ###
  
-@@ -457,7 +457,7 @@
+@@ -457,7 +457,7 @@ $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $
  	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
  
  $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
@@ -22,7 +22,7 @@
  
  $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
   $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
-@@ -467,7 +467,7 @@
+@@ -467,7 +467,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)
@@ -31,7 +31,7 @@
  
  $(GLOBJ)gdevxxf.$(OBJ) : $(GLSRC)gdevxxf.c $(GDEVX) $(math__h) $(memory__h)\
   $(gsstruct_h) $(gsutil_h) $(gxxfont_h)
-@@ -527,7 +527,7 @@
+@@ -527,7 +527,7 @@ $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxa
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(GLOBJ)X11.so : $(x11alt_) $(x11_)
diff --git a/print/ghostscript8-x11/files/patch-base-errors.h b/print/ghostscript8-x11/files/patch-base_errors.h
index 89a493c96120..c8f7797f4bda 100644
--- a/print/ghostscript8-x11/files/patch-base-errors.h
+++ b/print/ghostscript8-x11/files/patch-base_errors.h
@@ -1,5 +1,5 @@
---- base/errors.h.orig	2007-06-06 07:23:38.000000000 +0900
-+++ base/errors.h	2009-03-29 03:53:40.000000000 +0900
+--- base/errors.h.orig	2007-06-05 22:23:38 UTC
++++ base/errors.h
 @@ -21,6 +21,6 @@
   */
  
diff --git a/print/ghostscript8-x11/files/patch-base-gdevl256.c b/print/ghostscript8-x11/files/patch-base_gdevl256.c
index 60be4a072b51..342a0d562b98 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevl256.c
+++ b/print/ghostscript8-x11/files/patch-base_gdevl256.c
@@ -1,6 +1,6 @@
---- base/gdevl256.c.orig	2007-09-25 22:31:24.000000000 +0900
-+++ base/gdevl256.c	2010-08-01 23:05:56.000000000 +0900
-@@ -143,9 +143,12 @@
+--- base/gdevl256.c.orig	2007-09-25 13:31:24 UTC
++++ base/gdevl256.c
+@@ -143,9 +143,12 @@ lvga256_close(gx_device * dev)
  /* for compatibility with the older display modes: */
  /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */
  gx_color_index
@@ -15,7 +15,7 @@
  #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
      ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
      static const byte cube_bits[32] =
-@@ -301,12 +304,3 @@
+@@ -301,12 +304,3 @@ lvga256_draw_line(gx_device * dev, int x
      gl_line(x0, y0, x1, y1, color);
      return 0;
  }
diff --git a/print/ghostscript8-x11/files/patch-base-gdevperm.c b/print/ghostscript8-x11/files/patch-base_gdevperm.c
index 94b9020eb2c5..58eb6619560d 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevperm.c
+++ b/print/ghostscript8-x11/files/patch-base_gdevperm.c
@@ -1,6 +1,6 @@
---- base/gdevperm.c.orig	Tue Sep 25 22:31:24 2007
-+++ base/gdevperm.c	Sat Nov 24 15:11:12 2007
-@@ -286,7 +286,7 @@
+--- base/gdevperm.c.orig	2007-09-25 13:31:24 UTC
++++ base/gdevperm.c
+@@ -286,7 +286,7 @@ perm_get_color_mapping_procs(const gx_de
  	(strncmp((const char *)name, (const char *)str, name_size) == 0))
  
  static int
diff --git a/print/ghostscript8-x11/files/patch-base-gdevvglb.c b/print/ghostscript8-x11/files/patch-base_gdevvglb.c
index b0f061ff3a66..a4348edbb9e1 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevvglb.c
+++ b/print/ghostscript8-x11/files/patch-base_gdevvglb.c
@@ -1,6 +1,6 @@
---- base/gdevvglb.c.orig	2007-09-25 22:31:24.000000000 +0900
-+++ base/gdevvglb.c	2010-08-01 23:08:53.000000000 +0900
-@@ -149,10 +149,13 @@
+--- base/gdevvglb.c.orig	2007-09-25 13:31:24 UTC
++++ base/gdevvglb.c
+@@ -149,10 +149,13 @@ vgalib_close(gx_device * dev)
  }
  
  static gx_color_index
@@ -17,7 +17,7 @@
  }
  
  static int
-@@ -368,12 +371,3 @@
+@@ -368,12 +371,3 @@ vgalib_put_params(gx_device * dev, gs_pa
      }
      return 0;
  }
diff --git a/print/ghostscript8-x11/files/patch-base-gp_unix.c b/print/ghostscript8-x11/files/patch-base_gp__unix.c
index c1dc7b830c9b..e3f92db521b6 100644
--- a/print/ghostscript8-x11/files/patch-base-gp_unix.c
+++ b/print/ghostscript8-x11/files/patch-base_gp__unix.c
@@ -1,6 +1,6 @@
---- base/gp_unix.c.orig	2015-08-21 21:07:48.028144000 +0900
-+++ base/gp_unix.c	2015-08-21 21:10:17.913478000 +0900
-@@ -50,6 +50,7 @@
+--- base/gp_unix.c.orig	2008-09-09 20:31:37 UTC
++++ base/gp_unix.c
+@@ -50,6 +50,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>
-@@ -59,26 +60,25 @@
+@@ -59,26 +60,25 @@ gp_init(void)
  {
    DIR*           dir = NULL;
    struct dirent* dirent;
diff --git a/print/ghostscript8-x11/files/patch-base-gs.mak b/print/ghostscript8-x11/files/patch-base_gs.mak
index ecb6f57e0dd7..1a7f4ab1f725 100644
--- a/print/ghostscript8-x11/files/patch-base-gs.mak
+++ b/print/ghostscript8-x11/files/patch-base_gs.mak
@@ -1,6 +1,6 @@
---- base/gs.mak.orig	2010-05-23 15:46:23.000000000 +0900
-+++ base/gs.mak	2010-05-23 15:57:37.000000000 +0900
-@@ -415,7 +415,7 @@
+--- base/gs.mak.orig	2009-11-11 17:42:22 UTC
++++ base/gs.mak
+@@ -415,7 +415,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/ghostscript8-x11/files/patch-base-gsmalloc.c b/print/ghostscript8-x11/files/patch-base_gsmalloc.c
index c4982de93012..4ae8db0c87ab 100644
--- a/print/ghostscript8-x11/files/patch-base-gsmalloc.c
+++ b/print/ghostscript8-x11/files/patch-base_gsmalloc.c
@@ -1,6 +1,6 @@
---- base/gsmalloc.c.orig	2015-07-24 09:52:39.718916000 +0900
-+++ base/gsmalloc.c	2015-07-24 09:54:31.761202000 +0900
-@@ -174,7 +174,7 @@
+--- base/gsmalloc.c.orig	2009-08-18 20:41:17 UTC
++++ base/gsmalloc.c
+@@ -174,7 +174,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u
      } else {
  	uint added = size + sizeof(gs_malloc_block_t);
  
diff --git a/print/ghostscript8-x11/files/patch-base-gxobj.h b/print/ghostscript8-x11/files/patch-base_gxobj.h
index 529efe379df2..4480528156c2 100644
--- a/print/ghostscript8-x11/files/patch-base-gxobj.h
+++ b/print/ghostscript8-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	2007-10-20 19:14:28 UTC
++++ base/gxobj.h
+@@ -107,11 +107,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/ghostscript8-x11/files/patch-base-ijs.mak b/print/ghostscript8-x11/files/patch-base_ijs.mak
index 26e407247ede..261878a9c294 100644
--- a/print/ghostscript8-x11/files/patch-base-ijs.mak
+++ b/print/ghostscript8-x11/files/patch-base_ijs.mak
@@ -1,6 +1,6 @@
---- base/ijs.mak.orig	2012-06-13 02:06:36.000000000 +0900
-+++ base/ijs.mak	2012-06-13 02:07:44.000000000 +0900
-@@ -41,7 +41,7 @@
+--- base/ijs.mak.orig	2007-06-05 22:23:38 UTC
++++ base/ijs.mak
+@@ -41,7 +41,7 @@ IJS_MAK=$(GLSRC)ijs.mak
  ijs.clean : ijs.config-clean ijs.clean-not-config-clean
  
  ### WRONG.  MUST DELETE OBJ AND GEN FILES SELECTIVELY.
@@ -9,7 +9,7 @@
  #	echo $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
  	$(EXP)$(ECHOGS_XE) $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
  	$(RM_) $(IJSOBJ)*.$(OBJ)
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ ijs_h=$(IJSSRC)ijs.h
  ijs_client_h=$(IJSSRC)$(D)ijs_client.h
  ijs_server_h=$(IJSSRC)$(D)ijs_server.h
  
diff --git a/print/ghostscript8-x11/files/patch-base-lib.mak b/print/ghostscript8-x11/files/patch-base_lib.mak
index 037390f44f0d..7018a89c1edb 100644
--- a/print/ghostscript8-x11/files/patch-base-lib.mak
+++ b/print/ghostscript8-x11/files/patch-base_lib.mak
@@ -1,6 +1,6 @@
---- base/lib.mak.orig	2009-12-30 07:18:01.000000000 +0900
-+++ base/lib.mak	2015-08-21 20:39:55.003384000 +0900
-@@ -895,7 +895,7 @@
+--- base/lib.mak.orig	2009-12-29 22:18:01 UTC
++++ base/lib.mak
+@@ -895,7 +895,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam
  $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
   $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
   $(gstypes_h)
@@ -9,7 +9,7 @@
  
  # Future replacement for gsparams.c
  $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-@@ -2684,12 +2684,12 @@
+@@ -2684,12 +2684,12 @@ $(GLD)shadelib.dev : $(LIB_MAK) $(ECHOGS
  # This is used to access compressed, compiled-in support files
  gsiorom_h=$(GLSRC)gsiorom.h
  romfs_=$(GLOBJ)gsiorom.$(OBJ)
diff --git a/print/ghostscript8-x11/files/patch-base-sjpx.c b/print/ghostscript8-x11/files/patch-base_sjpx.c
index 761f1423b700..298a5af1bb08 100644
--- a/print/ghostscript8-x11/files/patch-base-sjpx.c
+++ b/print/ghostscript8-x11/files/patch-base_sjpx.c
@@ -8,10 +8,9 @@ Description: Allows gnu-ghostscript to compile against external libjasper.
 is 1.701 which is somewhat old.  Forward-ported to 8.64 (the structure of
 the file source tree has changed) by km.
 
-diff -Naur ghostscript-8.64.orig/base/sjpx.c ghostscript-8.64/base/sjpx.c
---- base/sjpx.c	2008-08-21 00:22:49.000000000 +0100
-+++ base/sjpx.c	2009-02-10 21:59:41.000000000 +0000
-@@ -34,14 +34,6 @@
+--- base/sjpx.c.orig	2009-06-18 05:16:48 UTC
++++ base/sjpx.c
+@@ -33,14 +33,6 @@ static void s_jpxd_set_defaults(stream_s
  private_st_jpxd_state(); /* creates a gc object for our state,
  			    defined in sjpx.h */
  
@@ -26,7 +25,7 @@ diff -Naur ghostscript-8.64.orig/base/sjpx.c ghostscript-8.64/base/sjpx.c
  /* initialize the steam.
     this involves allocating the stream and image structures, and
     initializing the decoder.
-@@ -59,7 +51,6 @@
+@@ -58,7 +50,6 @@ s_jpxd_init(stream_state * ss)
      }
  
      status = jas_init();
diff --git a/print/ghostscript8-x11/files/patch-base-unix-dll.mak b/print/ghostscript8-x11/files/patch-base_unix-dll.mak
index 96876e3bfb15..55eef1884d19 100644
--- a/print/ghostscript8-x11/files/patch-base-unix-dll.mak
+++ b/print/ghostscript8-x11/files/patch-base_unix-dll.mak
@@ -1,6 +1,6 @@
---- base/unix-dll.mak.orig	2009-10-20 05:24:53.000000000 +0900
-+++ base/unix-dll.mak	2010-04-03 12:22:35.000000000 +0900
-@@ -79,12 +79,11 @@
+--- base/unix-dll.mak.orig	2009-10-19 20:24:53 UTC
++++ base/unix-dll.mak
+@@ -79,12 +79,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
  # Build the small Ghostscript loaders, with Gtk+ and without
  
  $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
diff --git a/print/ghostscript8-x11/files/patch-base-unix-gcc.mak b/print/ghostscript8-x11/files/patch-base_unix-gcc.mak
index 4277ce7ed6c3..5c2ba4321deb 100644
--- a/print/ghostscript8-x11/files/patch-base-unix-gcc.mak
+++ b/print/ghostscript8-x11/files/patch-base_unix-gcc.mak
@@ -1,5 +1,5 @@
---- base/unix-gcc.mak.orig	2008-10-03 04:33:22.000000000 +0900
-+++ base/unix-gcc.mak	2009-03-29 03:33:35.000000000 +0900
+--- base/unix-gcc.mak.orig	2009-11-11 15:50:28 UTC
++++ base/unix-gcc.mak
 @@ -21,15 +21,18 @@
  # 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.
  
-@@ -48,11 +51,10 @@
+@@ -48,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)
-@@ -107,7 +109,7 @@
+@@ -107,7 +109,7 @@ GENOPT=
  # -DHAVE_HYPOT
  #       use the system hypot() call
  
@@ -51,7 +51,7 @@
  
  # Define the name of the executable file.
  
-@@ -131,7 +133,7 @@
+@@ -131,7 +133,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,
-@@ -145,7 +147,7 @@
+@@ -145,7 +147,7 @@ PNGSRCDIR=libpng
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -68,8 +68,8 @@
 +SHARE_LIBPNG=1
  LIBPNG_NAME=png
  
- # Define the directory where the zlib sources are stored.
-@@ -157,7 +159,7 @@
+ LIBTIFF_NAME=tiff
+@@ -159,7 +161,7 @@ ZSRCDIR=zlib
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -78,7 +78,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -166,6 +168,14 @@
+@@ -168,6 +170,14 @@ SHARE_JBIG2=0
  JBIG2_LIB=jbig2dec
  JBIG2SRCDIR=jbig2dec
  
@@ -93,7 +93,7 @@
  # Define the directory where the icclib source are stored.
  # See icclib.mak for more information
  
-@@ -194,7 +204,7 @@
+@@ -196,7 +206,7 @@ RANLIB=ranlib
  
  # Define the name of the C compiler.
  
@@ -102,7 +102,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -211,10 +221,10 @@
+@@ -213,10 +223,10 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -115,7 +115,7 @@
  
  # Define the other compilation flags.  Add at most one of the following:
  #	-DBSD4_2 for 4.2bsd systems.
-@@ -227,7 +237,8 @@
+@@ -229,7 +239,8 @@ CFLAGS_SO=-fPIC -shared
  # 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.
@@ -125,7 +125,7 @@
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -238,7 +249,7 @@
+@@ -240,7 +251,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.
@@ -134,7 +134,7 @@
  
  LDFLAGS=$(XLDFLAGS)
  
-@@ -249,7 +260,7 @@
+@@ -251,7 +262,7 @@ LDFLAGS=$(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -143,7 +143,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -271,7 +282,7 @@
+@@ -273,7 +284,7 @@ STDLIBS=-lm
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -152,7 +152,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
-@@ -283,28 +294,28 @@
+@@ -285,28 +296,28 @@ XINCLUDE=-I/usr/X11R6/include
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
@@ -187,7 +187,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
-@@ -389,7 +400,7 @@
+@@ -391,7 +402,7 @@ DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet
  DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pamcmyk32.dev
  
  # Shared library target to build.
@@ -196,9 +196,9 @@
  #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
  
  # ---------------------------- End of options --------------------------- #
-@@ -429,6 +440,9 @@
- include $(GLSRCDIR)/zlib.mak
+@@ -432,6 +443,9 @@ include $(GLSRCDIR)/zlib.mak
  include $(GLSRCDIR)/libpng.mak
+ include $(GLSRCDIR)/libtiff.mak
  include $(GLSRCDIR)/jbig2.mak
 +include $(GLSRCDIR)/jasper.mak
 +include $(GLSRCDIR)/ldf_jb2.mak
@@ -206,7 +206,7 @@
  include $(GLSRCDIR)/icclib.mak
  include $(GLSRCDIR)/ijs.mak
  include $(GLSRCDIR)/devs.mak
-@@ -438,6 +452,7 @@
+@@ -441,6 +455,7 @@ include $(GLSRCDIR)/unixlink.mak
  include $(GLSRCDIR)/unix-dll.mak
  include $(GLSRCDIR)/unix-end.mak
  include $(GLSRCDIR)/unixinst.mak
diff --git a/print/ghostscript8-x11/files/patch-base-unixinst.mak b/print/ghostscript8-x11/files/patch-base_unixinst.mak
index 4f6006f3a9a8..db0680a3a156 100644
--- a/print/ghostscript8-x11/files/patch-base-unixinst.mak
+++ b/print/ghostscript8-x11/files/patch-base_unixinst.mak
@@ -1,6 +1,6 @@
---- base/unixinst.mak.orig	2009-11-19 09:09:15.000000000 +0900
-+++ base/unixinst.mak	2014-11-23 17:40:46.000000000 +0900
-@@ -44,7 +44,7 @@
+--- base/unixinst.mak.orig	2009-11-19 00:09:15 UTC
++++ base/unixinst.mak
+@@ -44,7 +44,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'
  
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ install-doc: $(PSDOCDIR)/News.htm
  	done'
  
  # install the man pages for each locale