413 files changed, 1353 insertions, 1411 deletions

diff --git a/astro/xplanet/files/patch-libprojections_stdiofix b/astro/xplanet/files/patch-libprojections_stdiofix
index 9e9deffd98c6..94ecaa165930 100644
--- a/astro/xplanet/files/patch-libprojections_stdiofix
+++ b/astro/xplanet/files/patch-libprojections_stdiofix
@@ -1,5 +1,5 @@
---- src/libprojection/ProjectionBonne.cpp.orig	Wed Dec  8 14:56:51 2004
-+++ src/libprojection/ProjectionBonne.cpp	Wed Dec  8 14:57:11 2004
+--- src/libprojection/ProjectionBonne.cpp.orig	2006-03-26 05:03:20 UTC
++++ src/libprojection/ProjectionBonne.cpp
 @@ -7,6 +7,8 @@
    http://www.atnf.csiro.au/~mcalabre/WCS
   */
@@ -7,10 +7,10 @@
 +#include <stdio.h>
 +
  #include <cmath>
+ #include <cstdio>
  #include <sstream>
- #include <vector>
---- src/libprojection/ProjectionGnomonic.cpp.orig	Wed Dec  8 14:57:44 2004
-+++ src/libprojection/ProjectionGnomonic.cpp	Wed Dec  8 14:57:58 2004
+--- src/libprojection/ProjectionGnomonic.cpp.orig	2006-03-26 05:03:20 UTC
++++ src/libprojection/ProjectionGnomonic.cpp
 @@ -7,6 +7,8 @@
    http://www.atnf.csiro.au/~mcalabre/WCS
  */
@@ -18,13 +18,14 @@
 +#include <stdio.h>
 +
  #include <cmath>
+ #include <cstdio>
  #include <sstream>
- using namespace std;
---- src/libprojection/ProjectionMercator.cpp.orig	Wed Dec  8 14:58:26 2004
-+++ src/libprojection/ProjectionMercator.cpp	Wed Dec  8 14:58:46 2004
-@@ -1,3 +1,5 @@
+--- src/libprojection/ProjectionMercator.cpp.orig	2006-03-26 05:03:20 UTC
++++ src/libprojection/ProjectionMercator.cpp
+@@ -1,4 +1,6 @@
+ #include <cmath>
 +#include <stdio.h>
 +
- #include <cmath>
+ #include <cstdio>
  #include <sstream>
  using namespace std;
diff --git a/astro/xplanet/files/patch-src-libprojection-ProjectionIcosagnomonic.cpp b/astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp
index d4dcb61d798c..edcfd8d1a004 100644
--- a/astro/xplanet/files/patch-src-libprojection-ProjectionIcosagnomonic.cpp
+++ b/astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp
@@ -1,6 +1,6 @@
---- src/libprojection/ProjectionIcosagnomonic.cpp.orig	Tue Jun 14 22:10:36 2005
-+++ src/libprojection/ProjectionIcosagnomonic.cpp	Wed Jun 29 20:11:58 2005
-@@ -26,6 +26,19 @@
+--- src/libprojection/ProjectionIcosagnomonic.cpp.orig	2009-04-16 15:10:08 UTC
++++ src/libprojection/ProjectionIcosagnomonic.cpp
+@@ -26,6 +26,19 @@ using namespace std;
  #define THIGH 3
  #define RATIO (((THIGH)*sqrt(3.0)/2)/(TWIDE))
  
diff --git a/astro/xplanet/files/patch-src:readConfig.cpp b/astro/xplanet/files/patch-src_readConfig.cpp
index 809cfa3d87e5..ca890c669d49 100644
--- a/astro/xplanet/files/patch-src:readConfig.cpp
+++ b/astro/xplanet/files/patch-src_readConfig.cpp
@@ -1,6 +1,6 @@
---- src/readConfig.cpp.orig	Mon May 24 09:11:26 2004
-+++ src/readConfig.cpp	Mon May 24 09:11:45 2004
-@@ -2,6 +2,7 @@
+--- src/readConfig.cpp.orig	2012-03-03 03:20:05 UTC
++++ src/readConfig.cpp
+@@ -4,6 +4,7 @@
  #include <fstream>
  #include <sstream>
  #include <string>
diff --git a/benchmarks/unixbench/files/patch-Makefile b/benchmarks/unixbench/files/patch-Makefile
index f3afb5317e64..bb9d8cbe648d 100644
--- a/benchmarks/unixbench/files/patch-Makefile
+++ b/benchmarks/unixbench/files/patch-Makefile
@@ -1,6 +1,7 @@
---- Makefile.orig	Sun Dec 19 01:29:33 2004
-+++ Makefile	Sun Dec 19 01:32:06 2004
-@@ -30,8 +30,6 @@
+--- Makefile.orig	1999-07-28 22:05:02 UTC
++++ Makefile
+@@ -30,9 +30,7 @@
+ ##############################################################################
  ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
  SHELL = /bin/sh
 -#HZ = ????  	   #(read from environment)
diff --git a/benchmarks/unixbench/files/patch-Run b/benchmarks/unixbench/files/patch-Run
index dba938a1ed84..77dcee755c77 100644
--- a/benchmarks/unixbench/files/patch-Run
+++ b/benchmarks/unixbench/files/patch-Run
@@ -1,6 +1,6 @@
---- Run.orig	Sun Dec 19 01:34:20 2004
-+++ Run	Sun Dec 19 01:39:54 2004
-@@ -88,11 +88,11 @@
+--- Run.orig	1999-07-28 22:04:47 UTC
++++ Run
+@@ -88,11 +88,11 @@ else
  fi
  
  # check that the required files are in the proper places
@@ -17,7 +17,7 @@
  
  
  # establish full paths to directories
-@@ -114,7 +114,7 @@
+@@ -114,7 +114,7 @@ cd $SCRPDIR
  SCRPDIR=`pwd`
  cd $_WD
  
@@ -26,7 +26,7 @@
  cd $TMPDIR
  TMPDIR=`pwd`
  cd $_WD
-@@ -367,10 +367,11 @@
+@@ -367,10 +367,11 @@ do				# line argument processing
  	C)  
  		logmsg="C Compiler Throughput"
  		prog="looper ${looper-60} ${CC} cctest.c"
@@ -39,7 +39,7 @@
  		;;
  
  	arithoh)
-@@ -385,8 +386,8 @@
+@@ -385,8 +386,8 @@ do				# line argument processing
  
  	dc)  
  		logmsg="Dc: sqrt(2) to 99 decimal places"
@@ -50,7 +50,7 @@
  		stdout=/dev/null
  		cleanopt="-m $TMPTIMES"
  		;;
-@@ -508,7 +509,7 @@
+@@ -508,7 +509,7 @@ do				# line argument processing
      ########### some specific cleanup routines ##############
      case $bench in
        C)
diff --git a/benchmarks/unixbench/files/patch-pgms:cleanup.sh b/benchmarks/unixbench/files/patch-pgms_cleanup.sh
index e464baafbe85..36eeaa7a9784 100644
--- a/benchmarks/unixbench/files/patch-pgms:cleanup.sh
+++ b/benchmarks/unixbench/files/patch-pgms_cleanup.sh
@@ -1,6 +1,6 @@
---- pgms/cleanup.sh.orig	Sun Dec 19 01:42:45 2004
-+++ pgms/cleanup.sh	Sun Dec 19 01:43:00 2004
-@@ -107,8 +107,8 @@
+--- pgms/cleanup.sh.orig	1997-09-13 02:01:19 UTC
++++ pgms/cleanup.sh
+@@ -107,8 +107,8 @@ do
  	;;
      
      -r) # reason for failure
diff --git a/benchmarks/unixbench/files/patch-pgms:multi.sh b/benchmarks/unixbench/files/patch-pgms_multi.sh
index ef23e06402ce..0b344228ae96 100644
--- a/benchmarks/unixbench/files/patch-pgms:multi.sh
+++ b/benchmarks/unixbench/files/patch-pgms_multi.sh
@@ -1,5 +1,5 @@
---- pgms/multi.sh.orig	Sun Dec 19 01:44:14 2004
-+++ pgms/multi.sh	Sun Dec 19 01:44:24 2004
+--- pgms/multi.sh.orig	1995-11-28 00:19:10 UTC
++++ pgms/multi.sh
 @@ -14,6 +14,7 @@
  #
  ###############################################################################
diff --git a/benchmarks/unixbench/files/patch-pgms:tst.sh b/benchmarks/unixbench/files/patch-pgms_tst.sh
index f8bd42ec2d8e..4cd6b0073cce 100644
--- a/benchmarks/unixbench/files/patch-pgms:tst.sh
+++ b/benchmarks/unixbench/files/patch-pgms_tst.sh
@@ -1,5 +1,5 @@
---- pgms/tst.sh.orig	Sun Dec 19 01:41:24 2004
-+++ pgms/tst.sh	Sun Dec 19 01:41:49 2004
+--- pgms/tst.sh.orig	1995-11-27 17:07:03 UTC
++++ pgms/tst.sh
 @@ -14,7 +14,7 @@
  #
  ###############################################################################
diff --git a/benchmarks/unixbench/files/patch-src:dhry_1.c b/benchmarks/unixbench/files/patch-src_dhry__1.c
index 142f7a03240a..01821756b3b5 100644
--- a/benchmarks/unixbench/files/patch-src:dhry_1.c
+++ b/benchmarks/unixbench/files/patch-src_dhry__1.c
@@ -1,5 +1,5 @@
---- src/dhry_1.c.orig	Sun Dec 19 01:45:10 2004
-+++ src/dhry_1.c	Sun Dec 19 01:45:59 2004
+--- src/dhry_1.c.orig	1999-07-28 21:43:08 UTC
++++ src/dhry_1.c
 @@ -34,6 +34,7 @@
   ***************************************************************************/
  char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
@@ -8,7 +8,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -81,7 +82,7 @@
+@@ -81,7 +82,7 @@ extern  int     times ();
                  /* Measurements should last at least about 2 seconds */
  #endif
  #ifdef TIME
diff --git a/benchmarks/unixbench/files/patch-execl.c b/benchmarks/unixbench/files/patch-src_execl.c
index affb32ff6d6e..434380383c9e 100644
--- a/benchmarks/unixbench/files/patch-execl.c
+++ b/benchmarks/unixbench/files/patch-src_execl.c
@@ -1,6 +1,6 @@
---- src/execl.c.orig	Wed Jul 28 23:46:58 1999
-+++ src/execl.c	Fri Mar 23 09:20:36 2007
-@@ -88,7 +88,7 @@
+--- src/execl.c.orig	1999-07-28 21:46:58 UTC
++++ src/execl.c
+@@ -88,7 +88,7 @@ char	*argv[];
  		fprintf(stderr, "%lu loops\n", iter);
  		exit(0);
  		}
diff --git a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql90-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 3c1609fdbbc7..3c1609fdbbc7 100644
--- a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql90-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql91-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 3c1609fdbbc7..3c1609fdbbc7 100644
--- a/databases/postgresql91-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql91-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql92-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 352b1579d68d..352b1579d68d 100644
--- a/databases/postgresql92-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql92-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql93-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 6b1bba5f63b5..6b1bba5f63b5 100644
--- a/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql93-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/databases/postgresql94-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql94-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 6b1bba5f63b5..6b1bba5f63b5 100644
--- a/databases/postgresql94-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql94-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/databases/postgresql95-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql95-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index 9c21590f11fe..9c21590f11fe 100644
--- a/databases/postgresql95-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql95-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
diff --git a/devel/gindent/files/patch-doc:Makefile.in b/devel/gindent/files/patch-doc_Makefile.in
index 810e924349ae..d41657ab4f81 100644
--- a/devel/gindent/files/patch-doc:Makefile.in
+++ b/devel/gindent/files/patch-doc_Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	2008-03-11 19:54:15.000000000 +0100
-+++ doc/Makefile.in	2013-11-04 06:57:00.000000000 +0100
+--- doc/Makefile.in.orig	2008-03-11 18:54:15 UTC
++++ doc/Makefile.in
 @@ -602,10 +602,10 @@ uninstall-am: uninstall-dvi-am uninstall
  	uninstall-pdf-am uninstall-ps-am
  
diff --git a/devel/gindent/files/patch-args.c b/devel/gindent/files/patch-src_args.c
index a54f169b53c1..1770f1c7135c 100644
--- a/devel/gindent/files/patch-args.c
+++ b/devel/gindent/files/patch-src_args.c
@@ -1,5 +1,5 @@
---- src/args.c.orig	2008-03-11 19:50:42.000000000 +0100
-+++ src/args.c	2013-11-04 07:16:35.000000000 +0100
+--- src/args.c.orig	2008-03-11 18:50:42 UTC
++++ src/args.c
 @@ -163,6 +163,7 @@ static int exp_hnl  = 0;
  static int exp_i    = 0;
  static int exp_il   = 0;
diff --git a/devel/gindent/files/patch-indent.h b/devel/gindent/files/patch-src_indent.h
index ad8de6cea422..0728ab9837c7 100644
--- a/devel/gindent/files/patch-indent.h
+++ b/devel/gindent/files/patch-src_indent.h
@@ -1,5 +1,5 @@
---- src/indent.h.orig	2008-03-11 19:50:42.000000000 +0100
-+++ src/indent.h	2013-11-04 06:57:00.000000000 +0100
+--- src/indent.h.orig	2008-03-11 18:50:42 UTC
++++ src/indent.h
 @@ -135,9 +135,9 @@ typedef enum bb_code
    bb_cast
  } bb_code_ty;
diff --git a/devel/gindent/files/patch-output.c b/devel/gindent/files/patch-src_output.c
index e1537bbbfe35..850ea8f958fa 100644
--- a/devel/gindent/files/patch-output.c
+++ b/devel/gindent/files/patch-src_output.c
@@ -1,5 +1,5 @@
---- src/output.c.orig	2008-03-11 19:50:42.000000000 +0100
-+++ src/output.c	2010-06-27 16:29:17.000000000 +0200
+--- src/output.c.orig	2008-03-11 18:50:42 UTC
++++ src/output.c
 @@ -71,7 +71,7 @@
  
  RCSTAG_CC ("$Id$");
diff --git a/devel/jclassinfo/files/patch-jclass:Makefile.in b/devel/jclassinfo/files/patch-jclass_Makefile.in
index 6512a151b1e8..cb00f0fe7a61 100644
--- a/devel/jclassinfo/files/patch-jclass:Makefile.in
+++ b/devel/jclassinfo/files/patch-jclass_Makefile.in
@@ -1,6 +1,6 @@
---- jclass/Makefile.in.orig	Wed May  5 09:23:09 2004
-+++ jclass/Makefile.in	Wed May  5 09:23:17 2004
-@@ -156,7 +156,7 @@
+--- jclass/Makefile.in.orig	2004-07-10 15:20:53 UTC
++++ jclass/Makefile.in
+@@ -156,7 +156,7 @@ INCLUDES = 
  lib_LTLIBRARIES = libjclass.la
  libjclass_la_LDFLAGS = -no-undefined -version-info @JCLASS_CURRENT@:@JCLASS_RELEASE@:@JCLASS_AGE@
  
diff --git a/devel/p5-Test-Reporter/files/500503-Test::Reporter.pm b/devel/p5-Test-Reporter/files/500503-Test::Reporter.pm
deleted file mode 100644
index d883ea742ada..000000000000
--- a/devel/p5-Test-Reporter/files/500503-Test::Reporter.pm
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/Test/Reporter.pm.orig	Wed Dec 29 21:41:54 2004
-+++ lib/Test/Reporter.pm	Wed Dec 29 22:21:27 2004
-@@ -246,7 +246,8 @@
- 	my($fh, $file); unless ($fh = $_[0]) {
- 		$file = "$dir/$grade.$distribution.$Config{archname}.$Config{osvers}.${\(time)}.$$.rpt";
- 		warn $file if $self->debug();
--		open $fh, ">$file" or die __PACKAGE__, ": Can't open report file '$file': $!";
-+		open FH, ">$file" or die __PACKAGE__, ": Can't open report file '$file': $!";
-+		$fh = \*FH;
- 	}
- 	print $fh "From: $from\n";
- 	print $fh "Subject: $subject\n";
diff --git a/games/xmulti/files/patch-config.tmpl b/games/xmulti/files/patch-config.tmpl
index ad88b15ed9e5..15bad895cd4e 100644
--- a/games/xmulti/files/patch-config.tmpl
+++ b/games/xmulti/files/patch-config.tmpl
@@ -1,6 +1,6 @@
---- config.tmpl.orig	Thu Jun  4 18:59:37 1998
-+++ config.tmpl	Thu Jun  4 18:59:55 1998
-@@ -16,7 +16,7 @@
+--- config.tmpl.orig	1998-04-04 14:58:33 UTC
++++ config.tmpl
+@@ -16,7 +16,7 @@ XCOMM CC = gcc
  XCOMM CDEBUGFLAGS = -g -Wall 
  XCOMM CCOPTIONS = 
  INLINE = 
@@ -9,7 +9,7 @@
  LEX  = flex 
  
  XCOMM -----------  Making shared object options
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ XCOMM compile shared object
  XCOMM PICFLAG = -fpic -DPIC
  
  XCOMM for BSD
@@ -18,7 +18,7 @@
  
  XCOMM for Linux
  XCOMM SYS_LIBRARIES += -rdynamic -ldl
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ XCOMM for SunOS 4.1.x
  XCOMM SHAREFLAGS = 
  
  XCOMM for Other OSs (don't make modules) Ex. SunOS 5.0
diff --git a/games/xmulti/files/patch-html_frame__add.c b/games/xmulti/files/patch-html_frame__add.c
index dd80bb091b8d..cd7ad060460b 100644
--- a/games/xmulti/files/patch-html_frame__add.c
+++ b/games/xmulti/files/patch-html_frame__add.c
@@ -1,6 +1,6 @@
---- html/frame_add.c.orig	Sun Aug 22 18:00:16 2004
-+++ html/frame_add.c	Sun Aug 22 18:00:27 2004
-@@ -215,7 +215,7 @@
+--- html/frame_add.c.orig	1997-12-26 02:41:29 UTC
++++ html/frame_add.c
+@@ -215,7 +215,7 @@ frame_add_lf(Frame *f, int mode)
  	case SSTERM_LENGTH_PX:
  		bfi->next_linesep = bsi->line_height.num - linesep;
  		break;
diff --git a/games/xmulti/files/patch-html_style__term.c b/games/xmulti/files/patch-html_style__term.c
index ffd4699f0183..b95b9c7fa872 100644
--- a/games/xmulti/files/patch-html_style__term.c
+++ b/games/xmulti/files/patch-html_style__term.c
@@ -1,6 +1,6 @@
---- html/style_term.c.orig	Sun Aug 22 17:59:45 2004
-+++ html/style_term.c	Sun Aug 22 17:59:56 2004
-@@ -102,6 +102,7 @@
+--- html/style_term.c.orig	1998-04-04 14:58:33 UTC
++++ html/style_term.c
+@@ -102,6 +102,7 @@ dummy(SSTerm *t)
  	case SSTERM_HEXCOLOR:
  	case SSTERM_URL:
  	case SSTERM_RGB:
diff --git a/games/xmulti/files/patch-html_style__y.y b/games/xmulti/files/patch-html_style__y.y
index 972896e0d6e0..8403e441cd3e 100644
--- a/games/xmulti/files/patch-html_style__y.y
+++ b/games/xmulti/files/patch-html_style__y.y
@@ -1,6 +1,6 @@
---- html/style_y.y.orig	Sun Aug 22 17:59:06 2004
-+++ html/style_y.y	Sun Aug 22 17:59:22 2004
-@@ -255,7 +255,8 @@
+--- html/style_y.y.orig	1998-04-04 14:58:33 UTC
++++ html/style_y.y
+@@ -255,7 +255,8 @@ term
  	 case SSTERM_HEXCOLOR:
  	 case SSTERM_URL:
  	 case SSTERM_RGB:
diff --git a/games/xmulti/files/patch-locale:mywchar.h b/games/xmulti/files/patch-locale_mywchar.h
index 69bb2d943ceb..5865b455238e 100644
--- a/games/xmulti/files/patch-locale:mywchar.h
+++ b/games/xmulti/files/patch-locale_mywchar.h
@@ -1,5 +1,5 @@
---- locale/mywchar.h.old	Mon Dec 22 13:20:04 1997
-+++ locale/mywchar.h	Tue Oct 15 16:19:11 2002
+--- locale/mywchar.h.orig	1997-12-22 04:20:04 UTC
++++ locale/mywchar.h
 @@ -10,7 +10,9 @@
  #endif
  
diff --git a/graphics/graphopt/files/patch-pixmaps:Makefile.in b/graphics/graphopt/files/patch-pixmaps_Makefile.in
index 4ed67aa4c26e..72034c271f50 100644
--- a/graphics/graphopt/files/patch-pixmaps:Makefile.in
+++ b/graphics/graphopt/files/patch-pixmaps_Makefile.in
@@ -1,6 +1,6 @@
---- pixmaps/Makefile.in.orig	Fri Dec  5 23:02:55 2003
-+++ pixmaps/Makefile.in	Fri Dec  5 23:03:06 2003
-@@ -67,7 +67,7 @@
+--- pixmaps/Makefile.in.orig	2003-05-07 15:10:47 UTC
++++ pixmaps/Makefile.in
+@@ -67,7 +67,7 @@ PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
diff --git a/graphics/graphopt/files/patch-src:classes:psExporter.cc b/graphics/graphopt/files/patch-src:classes:psExporter.cc
deleted file mode 100644
index 2d649f2d5790..000000000000
--- a/graphics/graphopt/files/patch-src:classes:psExporter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/classes/psExporter.cc.orig	Mon Aug  9 09:31:11 2004
-+++ src/classes/psExporter.cc	Mon Aug  9 09:31:38 2004
-@@ -1,4 +1,5 @@
- #include "psExporter.h"
-+#include <cstdlib>
- 
- 
- psExporter::psExporter(char *what_file, nodes *what_nodes) {
-@@ -26,7 +27,7 @@
- 
- void psExporter::write_headers(FILE *outfile) {
-    char *line = new char[200];
--   sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
-+   sprintf(line, "%%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
-            translatexcoord((double) biggest_x) + 2 * margin,
-            translateycoord((double) biggest_y) + 2 * margin);
-    fwrite(line, strlen(line), 1, outfile);
diff --git a/graphics/graphopt/files/patch-src__classes__dotImporter.cc b/graphics/graphopt/files/patch-src_classes_dotImporter.cc
index 807beedb09cd..8c1d030e309e 100644
--- a/graphics/graphopt/files/patch-src__classes__dotImporter.cc
+++ b/graphics/graphopt/files/patch-src_classes_dotImporter.cc
@@ -1,4 +1,4 @@
---- src/classes/dotImporter.cc.orig
+--- src/classes/dotImporter.cc.orig	2003-03-20 07:37:55 UTC
 +++ src/classes/dotImporter.cc
 @@ -1,5 +1,6 @@
  #include "dotImporter.h"
diff --git a/graphics/graphopt/files/patch-src__classes__optFileReader.cc b/graphics/graphopt/files/patch-src_classes_optFileReader.cc
index 1529cb2e2656..db86a01d28e0 100644
--- a/graphics/graphopt/files/patch-src__classes__optFileReader.cc
+++ b/graphics/graphopt/files/patch-src_classes_optFileReader.cc
@@ -1,4 +1,4 @@
---- src/classes/optFileReader.cc.orig
+--- src/classes/optFileReader.cc.orig	2003-03-20 07:42:59 UTC
 +++ src/classes/optFileReader.cc
 @@ -1,5 +1,6 @@
  #include "optFileReader.h"
diff --git a/graphics/graphopt/files/patch-src_classes_psExporter.cc b/graphics/graphopt/files/patch-src_classes_psExporter.cc
index 3c776c960e4e..56bdb6a2ee65 100644
--- a/graphics/graphopt/files/patch-src_classes_psExporter.cc
+++ b/graphics/graphopt/files/patch-src_classes_psExporter.cc
@@ -1,10 +1,19 @@
---- src/classes/psExporter.cc.intermediate	2015-09-20 01:43:24 UTC
+--- src/classes/psExporter.cc.orig	2003-04-18 04:47:40 UTC
 +++ src/classes/psExporter.cc
-@@ -1,6 +1,6 @@
+@@ -1,5 +1,6 @@
  #include "psExporter.h"
- #include <cstdlib>
 -
++#include <cstdlib>
 +#include <cstring>
  
  psExporter::psExporter(char *what_file, nodes *what_nodes) {
     filename = strdup(what_file);
+@@ -26,7 +27,7 @@ void psExporter::do_export() {
+ 
+ void psExporter::write_headers(FILE *outfile) {
+    char *line = new char[200];
+-   sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
++   sprintf(line, "%%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
+            translatexcoord((double) biggest_x) + 2 * margin,
+            translateycoord((double) biggest_y) + 2 * margin);
+    fwrite(line, strlen(line), 1, outfile);
diff --git a/graphics/graphopt/files/patch-src:main.cc b/graphics/graphopt/files/patch-src_main.cc
index 1d54fd7ca8c5..e115e6bbfc1d 100644
--- a/graphics/graphopt/files/patch-src:main.cc
+++ b/graphics/graphopt/files/patch-src_main.cc
@@ -1,6 +1,6 @@
---- src/main.cc.orig	Fri Dec  5 22:57:02 2003
-+++ src/main.cc	Fri Dec  5 22:57:20 2003
-@@ -18,7 +18,7 @@
+--- src/main.cc.orig	2003-05-07 15:06:31 UTC
++++ src/main.cc
+@@ -18,7 +18,7 @@ int main (int argc, char *argv[]) {
     gtk_set_locale ();
     gtk_init (&argc, &argv);
  
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
index 7e09800ea376..63ac01547148 100644
--- a/graphics/libafterimage/files/patch-Makefile.in
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-06-19 05:34:51.000000000 +0900
-+++ Makefile.in	2008-06-26 21:27:22.000000000 +0900
-@@ -81,7 +81,7 @@
+--- Makefile.in.orig	2011-01-15 05:52:22 UTC
++++ Makefile.in
+@@ -83,7 +83,7 @@ CP		= @CP@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -9,7 +9,7 @@
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -94,16 +94,16 @@
+@@ -96,16 +96,16 @@ YACCFLAGS	= -d
  LEXFLAGS	=
  
  INSTALL		= @INSTALL@
@@ -32,7 +32,7 @@
  
  USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@ AFTER_BIN_DIR	= $(DESTDIR)@bindir@
  AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man3
  AFTER_APP_MAN_DIR	= $(DESTDIR)@mandir@/man1
  AFTER_SHAREDIR	= $(DESTDIR)@datadir@/$(LIB_DIR_NAME)
@@ -41,7 +41,7 @@
  
  # We want to build both static and dynamic libs, as some service apps may need 
  # static library as they gets run at compile time (ASDocGen for example)
-@@ -163,11 +163,10 @@
+@@ -165,11 +165,10 @@ install.static: 	mkdir
  install.script:
  
  install.dyn:	mkdir
@@ -56,7 +56,7 @@
  		$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
  		if test `uname` = "Linux"; then \
  		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
-@@ -391,11 +390,8 @@
+@@ -393,11 +392,8 @@ $(LIB_SHARED_CYG): $(LIB_OBJS) $(LIB_INC
  $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
  	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
  
@@ -70,7 +70,7 @@
  	 $(LIB_OBJS)
  
  install.man:
-@@ -421,7 +417,7 @@
+@@ -423,7 +419,7 @@ install.doc:
  			cd ../..; \
  		fi
  
diff --git a/graphics/libafterimage/files/patch-apps:Makefile.in b/graphics/libafterimage/files/patch-apps_Makefile.in
index 3e238247e571..887161e53ac9 100644
--- a/graphics/libafterimage/files/patch-apps:Makefile.in
+++ b/graphics/libafterimage/files/patch-apps_Makefile.in
@@ -1,6 +1,6 @@
---- ./apps/Makefile.in.orig	Thu Aug  2 07:09:02 2007
-+++ ./apps/Makefile.in	Sun Aug  5 21:11:50 2007
-@@ -13,14 +13,14 @@
+--- apps/Makefile.in.orig	2011-01-15 05:52:22 UTC
++++ apps/Makefile.in
+@@ -13,14 +13,14 @@ CP		= @CP@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -18,7 +18,7 @@
  
  INCS_X		= @X_CFLAGS@
  INCS_PRIVATE    = 
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
  LIBS_XEXTS	=
  LIBS_AFTERIMAGE = @AFTERIMAGE_APPS_LIBS@
diff --git a/graphics/libafterimage/files/patch-libpng15 b/graphics/libafterimage/files/patch-libpng15
index 44d5b944007c..2f748158cd9d 100644
--- a/graphics/libafterimage/files/patch-libpng15
+++ b/graphics/libafterimage/files/patch-libpng15
@@ -1,6 +1,6 @@
---- export.c
+--- export.c.orig	2011-01-15 05:52:22 UTC
 +++ export.c
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@ ASImage2png_int ( ASImage *im, void *dat
  	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
      if ( png_ptr != NULL )
      	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
@@ -9,9 +9,9 @@
  			{
  				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
  				info_ptr = NULL ;
---- import.c
+--- import.c.orig	2011-01-15 05:52:22 UTC
 +++ import.c
-@@ -1251,7 +1251,7 @@
+@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr 
  			 * the normal method of doing things with libpng).  REQUIRED unless you
  			 * set up your own error handlers in the png_create_read_struct() earlier.
  			 */
@@ -20,7 +20,7 @@
  			{
  				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
  
-@@ -1468,7 +1468,7 @@
+@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
  
  static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  {
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index 6cd549c908b1..226a02b2785a 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-pre-patch:
+post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKSRC}/pstoepsi.prefix
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKSRC}
 
diff --git a/graphics/pstoepsi/files/patch-src:ps2epsi b/graphics/pstoepsi/files/patch-pstoepsi.prefix
index c43f69991fe7..bab339ae1874 100644
--- a/graphics/pstoepsi/files/patch-src:ps2epsi
+++ b/graphics/pstoepsi/files/patch-pstoepsi.prefix
@@ -1,6 +1,6 @@
---- pstoepsi.prefix.orig	Mon Jul 22 19:41:04 2002
-+++ pstoepsi.prefix	Mon Jul 22 19:40:51 2002
-@@ -33,10 +33,10 @@
+--- pstoepsi.prefix.orig	2016-06-17 22:43:43 UTC
++++ pstoepsi.prefix
+@@ -33,10 +33,10 @@ USAGE="Usage: $0 [ -gs | -news ] [ -stri
  <file>.ps <file>.epsi"
  
  ########################## Edit these variables #####################
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index b173149d7e14..d052d09c9743 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -9,9 +9,9 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	X11 terminal emulator based on rxvt/xterm that supports Japanese
 
 EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-configure \
-		${.CURDIR}/files/extra-patch-src:command.c \
-		${.CURDIR}/files/extra-patch-src:defaultfont.h \
-		${.CURDIR}/files/extra-patch-src:feature.h
+		${.CURDIR}/files/extra-patch-src_command.c \
+		${.CURDIR}/files/extra-patch-src_defaultfont.h \
+		${.CURDIR}/files/extra-patch-src_feature.h
 
 CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 		--enable-xim --with-theme-update \
diff --git a/japanese/eterm/files/extra-patch-src:command.c b/japanese/eterm/files/extra-patch-src_command.c
index cae9a31fa935..cae9a31fa935 100644
--- a/japanese/eterm/files/extra-patch-src:command.c
+++ b/japanese/eterm/files/extra-patch-src_command.c
diff --git a/japanese/eterm/files/extra-patch-src:defaultfont.h b/japanese/eterm/files/extra-patch-src_defaultfont.h
index 5eccec35b2b1..5eccec35b2b1 100644
--- a/japanese/eterm/files/extra-patch-src:defaultfont.h
+++ b/japanese/eterm/files/extra-patch-src_defaultfont.h
diff --git a/japanese/eterm/files/extra-patch-src:feature.h b/japanese/eterm/files/extra-patch-src_feature.h
index 2db7651df7de..2db7651df7de 100644
--- a/japanese/eterm/files/extra-patch-src:feature.h
+++ b/japanese/eterm/files/extra-patch-src_feature.h
diff --git a/japanese/groff/files/patch-doc:Makefile.sub b/japanese/groff/files/patch-doc_Makefile.sub
index 164d658f5ec0..164d658f5ec0 100644
--- a/japanese/groff/files/patch-doc:Makefile.sub
+++ b/japanese/groff/files/patch-doc_Makefile.sub
diff --git a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc b/japanese/groff/files/patch-src_libs_libgroff_encoding.cc
index 4318fd07edc7..4318fd07edc7 100644
--- a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
+++ b/japanese/groff/files/patch-src_libs_libgroff_encoding.cc
diff --git a/japanese/groff/files/patch-src:preproc:grn:hgraph.cc b/japanese/groff/files/patch-src_preproc_grn_hgraph.cc
index 4905480beded..4905480beded 100644
--- a/japanese/groff/files/patch-src:preproc:grn:hgraph.cc
+++ b/japanese/groff/files/patch-src_preproc_grn_hgraph.cc
diff --git a/japanese/groff/files/patch-src:preproc:grn:main.cc b/japanese/groff/files/patch-src_preproc_grn_main.cc
index abdcf52a85f5..abdcf52a85f5 100644
--- a/japanese/groff/files/patch-src:preproc:grn:main.cc
+++ b/japanese/groff/files/patch-src_preproc_grn_main.cc
diff --git a/japanese/groff/files/patch-src:roff:nroff:nroff.sh b/japanese/groff/files/patch-src_roff_nroff_nroff.sh
index 2fcdf931ed73..2fcdf931ed73 100644
--- a/japanese/groff/files/patch-src:roff:nroff:nroff.sh
+++ b/japanese/groff/files/patch-src_roff_nroff_nroff.sh
diff --git a/japanese/groff/files/patch-tmac:troffrc b/japanese/groff/files/patch-tmac_troffrc
index 676ad775260a..676ad775260a 100644
--- a/japanese/groff/files/patch-tmac:troffrc
+++ b/japanese/groff/files/patch-tmac_troffrc
diff --git a/japanese/multiskkserv/files/patch-src:multiskkserv-ctl.c b/japanese/multiskkserv/files/patch-src_multiskkserv-ctl.c
index b1a30b6d75eb..f82244f8a6d9 100644
--- a/japanese/multiskkserv/files/patch-src:multiskkserv-ctl.c
+++ b/japanese/multiskkserv/files/patch-src_multiskkserv-ctl.c
@@ -1,6 +1,6 @@
---- src/multiskkserv-ctl.c.orig	Sun Jan 13 06:10:13 2002
-+++ src/multiskkserv-ctl.c	Fri Aug 13 19:50:45 2004
-@@ -168,7 +168,7 @@
+--- src/multiskkserv-ctl.c.orig	2002-01-12 21:10:13 UTC
++++ src/multiskkserv-ctl.c
+@@ -168,7 +168,7 @@ show_stat(char *remote, int port, int fa
    char rbuf[SKKSERV_REQUEST_SIZE];
  
    if ((sock = socket_connect(remote, &sstr, port, (char *)SKKSERV_SERVICE, family)) < 0) {
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 7d64534c1736..be487f31a508 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -29,14 +29,10 @@ LDFLAGS+=	-lm -lreadline -lncurses
 USES+=		tk
 CFLAGS+=	-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} -ltcl${TCL_SHLIB_VER} -lTix8.4.3
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_prelude.h
 .endif
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs
 
-post-patch:
-.if empty(PORT_OPTIONS:MX11)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-src::prelude.h
-.endif
-
 .include <bsd.port.mk>
diff --git a/lang/ohugs/files/extra-patch-src::prelude.h b/lang/ohugs/files/extra-patch-src_prelude.h
index 952a23b7c435..952a23b7c435 100644
--- a/lang/ohugs/files/extra-patch-src::prelude.h
+++ b/lang/ohugs/files/extra-patch-src_prelude.h
diff --git a/lang/ohugs/files/patch-Makefile b/lang/ohugs/files/patch-Makefile
index 837eb46cc88c..880075c01f5a 100644
--- a/lang/ohugs/files/patch-Makefile
+++ b/lang/ohugs/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2014-02-20 12:06:18.000000000 +0100
-+++ Makefile	2014-02-20 12:08:16.000000000 +0100
-@@ -5,14 +5,14 @@
+--- Makefile.orig	2000-09-13 22:17:47 UTC
++++ Makefile
+@@ -5,14 +5,14 @@ all:
  	cd src; make
  
  install: ohugs
diff --git a/lang/ohugs/files/patch-src_omonad.c b/lang/ohugs/files/patch-src_omonad.c
index 36f56c54050a..40f5314bc953 100644
--- a/lang/ohugs/files/patch-src_omonad.c
+++ b/lang/ohugs/files/patch-src_omonad.c
@@ -1,6 +1,6 @@
---- src/omonad.c.orig
+--- src/omonad.c.orig	2001-01-31 00:18:40 UTC
 +++ src/omonad.c
-@@ -526,7 +526,7 @@
+@@ -526,7 +526,7 @@ typedef int socklen_t;
  
  static int maxfd = -1;
  
diff --git a/lang/ohugs/files/patch-src__parser.y b/lang/ohugs/files/patch-src_parser.y
index 2a7d0ff9ced9..284ee7be27f5 100644
--- a/lang/ohugs/files/patch-src__parser.y
+++ b/lang/ohugs/files/patch-src_parser.y
@@ -1,6 +1,6 @@
---- src/parser.y.orig	Thu Nov 30 00:13:01 2000
-+++ src/parser.y	Wed Mar  5 18:53:02 2003
-@@ -564,7 +564,7 @@
+--- src/parser.y.orig	2000-11-29 23:13:01 UTC
++++ src/parser.y
+@@ -564,7 +564,7 @@ gen       : mexp FROM exp               
  handle    : HANDLE beg malts end        {$$ = gc4(rev($3));}
            ;
  ohandle   : handle                      {$$ = $1;}
diff --git a/lang/ohugs/files/patch-src__prelude.h b/lang/ohugs/files/patch-src_prelude.h
index 0e04d8541e55..fb373a1fdc1e 100644
--- a/lang/ohugs/files/patch-src__prelude.h
+++ b/lang/ohugs/files/patch-src_prelude.h
@@ -1,5 +1,5 @@
---- src/prelude.h.orig	Wed Jan 31 01:18:40 2001
-+++ src/prelude.h	Wed Mar  5 18:53:02 2003
+--- src/prelude.h.orig	2016-06-17 23:19:53 UTC
++++ src/prelude.h
 @@ -22,7 +22,7 @@
   * update the source.
   *-------------------------------------------------------------------------*/
diff --git a/lang/ohugs/files/patch-src_tkhaskell.c b/lang/ohugs/files/patch-src_tkhaskell.c
index 1b7b9e144242..3fa55da7215d 100644
--- a/lang/ohugs/files/patch-src_tkhaskell.c
+++ b/lang/ohugs/files/patch-src_tkhaskell.c
@@ -1,6 +1,6 @@
---- src/tkhaskell.c.orig	2014-02-20 12:00:29.000000000 +0100
-+++ src/tkhaskell.c	2014-02-20 12:02:44.000000000 +0100
-@@ -160,17 +160,17 @@
+--- src/tkhaskell.c.orig	2001-01-28 06:02:45 UTC
++++ src/tkhaskell.c
+@@ -160,17 +160,17 @@ static Int c_primInitTcl () { 
      Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
  
      if (Tcl_Init(interp) == TCL_ERROR) {
@@ -21,7 +21,7 @@
  	return FALSE;
      }
  #endif
-@@ -242,17 +242,17 @@
+@@ -242,17 +242,17 @@ static String executeTcl (cmd) 
  String cmd; {
     char errmsg[200];
     if (Tcl_Eval(interp,cmd) != TCL_OK) {
diff --git a/lang/ohugs/files/patch-src__type.c b/lang/ohugs/files/patch-src_type.c
index eb1323acf007..e9373f97d301 100644
--- a/lang/ohugs/files/patch-src__type.c
+++ b/lang/ohugs/files/patch-src_type.c
@@ -1,6 +1,6 @@
---- src/type.c.orig	Fri Jan 21 12:05:35 2005
-+++ src/type.c	Fri Jan 21 12:05:47 2005
-@@ -1165,7 +1165,7 @@
+--- src/type.c.orig	2000-12-06 09:23:55 UTC
++++ src/type.c
+@@ -1165,7 +1165,7 @@ Type t; {
                          break;
          case QUAL     : snd(snd(t)) = freshSig(snd(snd(t)));
                          break;
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index f3abd3b8ce09..ab2f32e65523 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -99,8 +99,8 @@ AUTOSIEVE_BROKEN=	Not buildable with autosieve patch
 
 DRAC_EXTRA_PATCHES=	${WRKSRC}/contrib/drac_auth.patch \
 			${FILESDIR}/extra-patch-configure.in \
-			${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
-			${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+			${FILESDIR}/extra-patch-cmulocal_ucdsnmp.m4 \
+			${FILESDIR}/extra-patch-cmulocal_sasl2.m4
 DRAC_USE=	AUTOTOOLS=autoconf,autoheader
 
 MANDIRS=	${CYRUS_PREFIX}/man
diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::sasl2.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4
index 53131668fcfd..53131668fcfd 100644
--- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::sasl2.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4
diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4
index 829d92d23585..829d92d23585 100644
--- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::ucdsnmp.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index fab2ebfc69e4..0677c0577fd0 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -109,7 +109,7 @@ AUTOSIEVE_PATCH_SITES=	LOCAL/mm:autosieve
 AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
 AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c
 
-DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal_sasl2.m4
 DRAC_USE=	AUTOTOOLS=autoconf,autoheader
 
 MANDIRS=	${CYRUS_PREFIX}/man
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
index 53131668fcfd..53131668fcfd 100644
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index af58e144ca88..7ef85fa3604a 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -21,7 +21,6 @@ CONFLICTS=	wanderlust-*-2.15.*
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 EMACS_W3M_PORT_NAME?=	emacs-w3m
 EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
diff --git a/mail/wanderlust/files/extra-patch-elmo:elmo-version.el b/mail/wanderlust/files/extra-patch-elmo:elmo-version.el
deleted file mode 100644
index 11c8b6effda4..000000000000
--- a/mail/wanderlust/files/extra-patch-elmo:elmo-version.el
+++ /dev/null
@@ -1,22 +0,0 @@
---- elmo/elmo-version.el.orig	Sun Nov 27 22:34:49 2005
-+++ elmo/elmo-version.el	Sun Nov 27 22:41:22 2005
-@@ -42,6 +42,19 @@
-   ;; Don't forget to check `wl-version.el' and Info.
-   (product-define "ELMO" nil '(2 14 0)))
- 
-+(defun product-version-as-string (product)
-+  "Return version number of product as a string.
-+PRODUCT is a product structure which returned by `product-define'.
-+If optional argument UPDATE is non-nil, then regenerate
-+`produce-version-string' from `product-version'."
-+  (setq product (product-find product))
-+  (or (product-version-string product)
-+      (and (product-version product)
-+           (product-set-version-string product
-+                                       (mapconcat (function int-to-string)
-+                                                  (product-version product)
-+                                                  ".")))))
-+
- ;; set version-string
- (product-version-as-string 'elmo-version)
- 
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 0011145aeaa3..7d29e28b11b0 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=--with-dummy-values
 .endif
 
 .if ! ${PORT_OPTIONS:MTKMIB}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local_Makefile.in
 PLIST_SUB+=	WITH_TKMIB="@comment "
 .else
 RUN_DEPENDS+=	p5-Tk>=0:x11-toolkits/p5-Tk
diff --git a/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in
index 546d8591ef3a..546d8591ef3a 100644
--- a/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
+++ b/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in
diff --git a/net/libunp/Makefile b/net/libunp/Makefile
index c75ad9403c9c..e1ac346c569a 100644
--- a/net/libunp/Makefile
+++ b/net/libunp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The networking library used in UNIX Network Programming Volume 1 2e
 USES=		gmake
 GNU_CONFIGURE=	yes
 
-pre-patch:
+post-extract:
 	@${CP} ${WRKSRC}/lib/wrapsock.c ${WRKSRC}/lib/wrapsock_r.c
 
 post-configure:
diff --git a/net/libunp/files/patch-Make.defines.in b/net/libunp/files/patch-Make.defines.in
index 2fdb2887a59d..73af300a0590 100644
--- a/net/libunp/files/patch-Make.defines.in
+++ b/net/libunp/files/patch-Make.defines.in
@@ -1,6 +1,6 @@
---- Make.defines.in.orig	Thu Jun 12 16:20:21 1997
-+++ Make.defines.in	Thu Sep 30 10:13:57 1999
-@@ -17,6 +17,7 @@
+--- Make.defines.in.orig	1997-06-12 20:20:21 UTC
++++ Make.defines.in
+@@ -17,6 +17,7 @@ RANLIB = @RANLIB@
  # Following is the main library, built from all the object files
  # in the lib/ and libfree/ directories.
  LIBUNP_NAME = @LIBUNP_NAME@
@@ -8,7 +8,7 @@
  
  # Following is the XTI library, built from all the object files
  # in the libxti/ directory.
-@@ -24,6 +25,7 @@
+@@ -24,6 +25,7 @@ LIBUNPXTI_NAME = @LIBUNPXTI_NAME@
  
  # Following are all the object files to create in the lib/ directory.
  LIB_OBJS = @LIB_OBJS@
diff --git a/net/libunp/files/patch-Makerfile.in b/net/libunp/files/patch-Makefile.in
index 71c936aef1e9..14202614832a 100644
--- a/net/libunp/files/patch-Makerfile.in
+++ b/net/libunp/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Apr 11 18:42:26 1997
-+++ Makefile.in	Thu Sep 30 09:51:16 1999
+--- Makefile.in.orig	1997-04-11 22:42:26 UTC
++++ Makefile.in
 @@ -1,8 +1,13 @@
  include ./Make.defines
  
diff --git a/net/libunp/files/patch-configure b/net/libunp/files/patch-configure
index 003640b52901..065a610ccc38 100644
--- a/net/libunp/files/patch-configure
+++ b/net/libunp/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jul 10 11:19:39 1997
-+++ configure	Thu Sep 30 12:29:28 1999
-@@ -1101,10 +1101,12 @@
+--- configure.orig	1997-07-10 15:19:39 UTC
++++ configure
+@@ -1101,10 +1101,12 @@ if test -f $HOME/libunp.a ; then
  	echo "$ac_t""yes" 1>&6
  	LIBUNP="$HOME/libunp.a"
  	LIBUNP_NAME=$HOME/libunp.a
@@ -13,7 +13,7 @@
  fi
  
  echo $ac_n "checking for $HOME/libunpxti.a""... $ac_c" 1>&6
-@@ -4288,7 +4290,6 @@
+@@ -4288,7 +4290,6 @@ LIB_OBJS="$LIB_OBJS udp_client.o"
  LIB_OBJS="$LIB_OBJS udp_connect.o"
  LIB_OBJS="$LIB_OBJS udp_server.o"
  LIB_OBJS="$LIB_OBJS wraplib.o"
@@ -21,7 +21,7 @@
  LIB_OBJS="$LIB_OBJS wrapstdio.o"
  if test "$ac_cv_header_pthread_h" = yes ; then
     LIB_OBJS="$LIB_OBJS wrappthread.o"
-@@ -4297,6 +4298,8 @@
+@@ -4297,6 +4298,8 @@ LIB_OBJS="$LIB_OBJS wrapunix.o"
  LIB_OBJS="$LIB_OBJS write_fd.o"
  LIB_OBJS="$LIB_OBJS writen.o"
  LIB_OBJS="$LIB_OBJS writable_timeo.o"
@@ -30,7 +30,7 @@
  
  LIBFREE_OBJS=
  
-@@ -4514,6 +4517,7 @@
+@@ -4514,6 +4517,7 @@ s%@CC@%$CC%g
  s%@RANLIB@%$RANLIB%g
  s%@CPP@%$CPP%g
  s%@LIB_OBJS@%$LIB_OBJS%g
@@ -38,7 +38,7 @@
  s%@LIBFREE_OBJS@%$LIBFREE_OBJS%g
  s%@LIBGAI_OBJS@%$LIBGAI_OBJS%g
  s%@LIBROUTE_OBJS@%$LIBROUTE_OBJS%g
-@@ -4522,6 +4526,7 @@
+@@ -4522,6 +4526,7 @@ s%@LIBS_XTI@%$LIBS_XTI%g
  s%@LIBUNP@%$LIBUNP%g
  s%@LIBUNPXTI@%$LIBUNPXTI%g
  s%@LIBUNP_NAME@%$LIBUNP_NAME%g
diff --git a/net/libunp/files/patch-icmpd_Makefile b/net/libunp/files/patch-icmpd_Makefile
index 18f3bf31563c..ae5aa7dcda40 100644
--- a/net/libunp/files/patch-icmpd_Makefile
+++ b/net/libunp/files/patch-icmpd_Makefile
@@ -1,5 +1,5 @@
---- icmpd/Makefile.orig	Tue Sep 28 11:40:21 1999
-+++ icmpd/Makefile	Tue Sep 28 11:40:24 1999
+--- icmpd/Makefile.orig	1997-07-06 18:12:00 UTC
++++ icmpd/Makefile
 @@ -1,6 +1,6 @@
  include ../Make.defines
  
diff --git a/net/libunp/files/patch-intro_Makefile b/net/libunp/files/patch-intro_Makefile
index 744bbd971c2e..ce8d0d3b1b6b 100644
--- a/net/libunp/files/patch-intro_Makefile
+++ b/net/libunp/files/patch-intro_Makefile
@@ -1,6 +1,6 @@
---- intro/Makefile.orig	Tue Sep 28 11:39:20 1999
-+++ intro/Makefile	Tue Sep 28 11:39:35 1999
-@@ -2,7 +2,6 @@
+--- intro/Makefile.orig	1997-05-08 22:37:08 UTC
++++ intro/Makefile
+@@ -2,7 +2,6 @@ include ../Make.defines
  
  PROGS =	daytimetcpcli daytimetcpcli1 daytimetcpcli2 daytimetcpcli3 \
  		daytimetcpsrv daytimetcpsrv1 daytimetcpsrv2 daytimetcpsrv3 \
diff --git a/net/libunp/files/patch-lib_Makefile b/net/libunp/files/patch-lib_Makefile
index 0b4832540669..45be887b110c 100644
--- a/net/libunp/files/patch-lib_Makefile
+++ b/net/libunp/files/patch-lib_Makefile
@@ -1,5 +1,5 @@
---- lib/Makefile.orig	Fri Apr 11 17:38:27 1997
-+++ lib/Makefile	Thu Sep 30 11:34:21 1999
+--- lib/Makefile.orig	1997-04-11 21:38:27 UTC
++++ lib/Makefile
 @@ -1,8 +1,16 @@
  include ../Make.defines
  
@@ -11,10 +11,10 @@
 +libunp.a:	${LIB_OBJS}
  		ar rv ${LIBUNP_NAME} $?
  		${RANLIB} ${LIBUNP_NAME}
-+
+ 
 +libunp_r.a:	${LIB_THREADSAFE_OBJS}
 +		ar rv ${LIBUNP_THREADSAFE_NAME} $?
 +		${RANLIB} ${LIBUNP_THREADSAFE_NAME}
- 
++
  clean:
  		rm -f ${PROGS} ${CLEANFILES}
diff --git a/net/libunp/files/patch-lib_mcast_join.c b/net/libunp/files/patch-lib_mcast__join.c
index 5ac07b948fdb..4d7c7e9c3c94 100644
--- a/net/libunp/files/patch-lib_mcast_join.c
+++ b/net/libunp/files/patch-lib_mcast__join.c
@@ -1,6 +1,6 @@
---- lib/mcast_join.c-	Tue Feb  8 15:12:14 2000
-+++ lib/mcast_join.c	Tue Feb  8 15:12:37 2000
-@@ -56,7 +56,7 @@
+--- lib/mcast_join.c.orig	1997-06-19 03:15:06 UTC
++++ lib/mcast_join.c
+@@ -56,7 +56,7 @@ doioctl:
  		else
  			mreq6.ipv6mr_interface = 0;
  
diff --git a/net/libunp/files/patch-lib_mcast_leave.c b/net/libunp/files/patch-lib_mcast__leave.c
index 61b218ab73d4..2bc3a8c8b092 100644
--- a/net/libunp/files/patch-lib_mcast_leave.c
+++ b/net/libunp/files/patch-lib_mcast__leave.c
@@ -1,6 +1,6 @@
---- lib/mcast_leave.c-	Tue Feb  8 15:10:50 2000
-+++ lib/mcast_leave.c	Tue Feb  8 15:05:53 2000
-@@ -23,7 +23,7 @@
+--- lib/mcast_leave.c.orig	1997-06-18 19:50:58 UTC
++++ lib/mcast_leave.c
+@@ -23,7 +23,7 @@ mcast_leave(int sockfd, const SA *sa, so
  			   &((struct sockaddr_in6 *) sa)->sin6_addr,
  			   sizeof(struct in6_addr));
  		mreq6.ipv6mr_interface = 0;
diff --git a/net/libunp/files/patch-lib_unp.h b/net/libunp/files/patch-lib_unp.h
index c896e52d7ced..0a93bc4dcc48 100644
--- a/net/libunp/files/patch-lib_unp.h
+++ b/net/libunp/files/patch-lib_unp.h
@@ -1,5 +1,5 @@
---- lib/unp.h.orig	Sun Sep 14 15:49:59 1997
-+++ lib/unp.h	Thu Sep 30 11:12:55 1999
+--- lib/unp.h.orig	1997-09-14 19:49:59 UTC
++++ lib/unp.h
 @@ -4,7 +4,7 @@
  #ifndef	__unp_h
  #define	__unp_h
@@ -9,7 +9,7 @@
  							/* "../config.h" is generated by configure */
  
  /* If anything changes in the following list of #includes, must change
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ typedef	void	Sigfunc(int);	/* for signal
  #define	max(a,b)	((a) > (b) ? (a) : (b))
  
  #ifndef	HAVE_ADDRINFO_STRUCT
diff --git a/net/libunp/files/patch-lib_unpifi.h b/net/libunp/files/patch-lib_unpifi.h
index d3cecdac1803..199240ef6f53 100644
--- a/net/libunp/files/patch-lib_unpifi.h
+++ b/net/libunp/files/patch-lib_unpifi.h
@@ -1,5 +1,5 @@
---- lib/unpifi.h.orig	Thu Sep 30 11:13:10 1999
-+++ lib/unpifi.h	Thu Sep 30 11:13:43 1999
+--- lib/unpifi.h.orig	1997-07-13 20:44:52 UTC
++++ lib/unpifi.h
 @@ -4,7 +4,7 @@
  #ifndef	__unp_ifi_h
  #define	__unp_ifi_h
diff --git a/net/libunp/files/patch-lib_unprtt.h b/net/libunp/files/patch-lib_unprtt.h
index 3df5be5e7189..42be3bce657c 100644
--- a/net/libunp/files/patch-lib_unprtt.h
+++ b/net/libunp/files/patch-lib_unprtt.h
@@ -1,5 +1,5 @@
---- lib/unprtt.h.orig	Thu Sep 30 11:13:16 1999
-+++ lib/unprtt.h	Thu Sep 30 11:13:37 1999
+--- lib/unprtt.h.orig	1997-09-02 17:39:54 UTC
++++ lib/unprtt.h
 @@ -1,7 +1,7 @@
  #ifndef	__unp_rtt_h
  #define	__unp_rtt_h
diff --git a/net/libunp/files/patch-lib_unpthread.h b/net/libunp/files/patch-lib_unpthread.h
index 360bae21a1bd..67cfc40f95fd 100644
--- a/net/libunp/files/patch-lib_unpthread.h
+++ b/net/libunp/files/patch-lib_unpthread.h
@@ -1,5 +1,5 @@
---- lib/unpthread.h.orig	Thu Sep 30 11:13:20 1999
-+++ lib/unpthread.h	Thu Sep 30 11:13:41 1999
+--- lib/unpthread.h.orig	1997-06-25 19:16:58 UTC
++++ lib/unpthread.h
 @@ -4,7 +4,7 @@
  #ifndef	__unp_pthread_h
  #define	__unp_pthread_h
diff --git a/net/libunp/files/patch-lib_wrappthread.c b/net/libunp/files/patch-lib_wrappthread.c
index 40b08fb3f03c..e313e52b2f5a 100644
--- a/net/libunp/files/patch-lib_wrappthread.c
+++ b/net/libunp/files/patch-lib_wrappthread.c
@@ -1,6 +1,6 @@
---- lib/wrappthread.c.orig	Thu Sep 30 11:06:22 1999
-+++ lib/wrappthread.c	Thu Sep 30 11:06:34 1999
-@@ -40,17 +40,6 @@
+--- lib/wrappthread.c.orig	1997-06-27 22:04:01 UTC
++++ lib/wrappthread.c
+@@ -40,17 +40,6 @@ Pthread_detach(pthread_t tid)
  }
  
  void
diff --git a/net/libunp/files/patch-lib_wrapsock_r.c b/net/libunp/files/patch-lib_wrapsock__r.c
index d53ced0afae2..1246b32a06ab 100644
--- a/net/libunp/files/patch-lib_wrapsock_r.c
+++ b/net/libunp/files/patch-lib_wrapsock__r.c
@@ -1,6 +1,6 @@
---- lib/wrapsock_r.c.orig	Thu Sep 30 12:04:02 1999
-+++ lib/wrapsock_r.c	Thu Sep 30 12:04:10 1999
-@@ -97,19 +97,6 @@
+--- lib/wrapsock_r.c.orig	2016-06-17 22:39:47 UTC
++++ lib/wrapsock_r.c
+@@ -97,19 +97,6 @@ Listen(int fd, int backlog)
  }
  /* end Listen */
  
diff --git a/net/libunp/files/patch-libfree:inet_ntop.c b/net/libunp/files/patch-libfree:inet_ntop.c
deleted file mode 100644
index d65c3b8b3cfa..000000000000
--- a/net/libunp/files/patch-libfree:inet_ntop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libfree/inet_ntop.c.orig	Sat Feb 21 21:25:08 2004
-+++ libfree/inet_ntop.c	Sat Feb 21 21:25:21 2004
-@@ -57,7 +57,7 @@
- 	int af;
- 	const void *src;
- 	char *dst;
--	size_t size;
-+	socklen_t size;
- {
- 	switch (af) {
- 	case AF_INET:
diff --git a/net/libunp/files/patch-libfree_Makefile b/net/libunp/files/patch-libfree_Makefile
index b02f2d5020e0..31648576e861 100644
--- a/net/libunp/files/patch-libfree_Makefile
+++ b/net/libunp/files/patch-libfree_Makefile
@@ -1,5 +1,5 @@
---- libfree/Makefile.orig	Fri Oct  3 12:52:41 1997
-+++ libfree/Makefile	Thu Sep 30 11:34:21 1999
+--- libfree/Makefile.orig	1997-10-03 16:52:41 UTC
++++ libfree/Makefile
 @@ -1,8 +1,12 @@
  include ../Make.defines
  
diff --git a/net/libunp/files/patch-libfree_inet__ntop.c b/net/libunp/files/patch-libfree_inet__ntop.c
new file mode 100644
index 000000000000..8715366f61be
--- /dev/null
+++ b/net/libunp/files/patch-libfree_inet__ntop.c
@@ -0,0 +1,11 @@
+--- libfree/inet_ntop.c.orig	1997-04-13 22:23:41 UTC
++++ libfree/inet_ntop.c
+@@ -57,7 +57,7 @@ inet_ntop(af, src, dst, size)
+ 	int af;
+ 	const void *src;
+ 	char *dst;
+-	size_t size;
++	socklen_t size;
+ {
+ 	switch (af) {
+ 	case AF_INET:
diff --git a/net/libunp/files/patch-libgai_Makefile b/net/libunp/files/patch-libgai_Makefile
index 45eb9ea9b918..44ee4c82bdb6 100644
--- a/net/libunp/files/patch-libgai_Makefile
+++ b/net/libunp/files/patch-libgai_Makefile
@@ -1,6 +1,6 @@
---- libgai/Makefile.orig	Mon Jun  2 18:03:30 1997
-+++ libgai/Makefile	Thu Sep 30 11:34:11 1999
-@@ -6,9 +6,13 @@
+--- libgai/Makefile.orig	1997-06-02 22:03:30 UTC
++++ libgai/Makefile
+@@ -6,9 +6,13 @@ include ../Make.defines
  # appear in the book (too much clutter, given the amount of conditional
  # testing for all the code in this directory).
  
diff --git a/net/libunp/files/patch-libgai_unp.h b/net/libunp/files/patch-libgai_unp.h
index 25f4146ab45b..d7bf18fd0350 100644
--- a/net/libunp/files/patch-libgai_unp.h
+++ b/net/libunp/files/patch-libgai_unp.h
@@ -1,7 +1,6 @@
 Index: libgai/unp.h
-diff -u libgai/unp.h.orig libgai/unp.h
---- libgai/unp.h.orig	Mon Sep 15 04:49:59 1997
-+++ libgai/unp.h	Thu Oct 30 00:31:12 2003
+--- libgai/unp.h.orig	1997-09-14 19:49:59 UTC
++++ libgai/unp.h
 @@ -58,6 +58,13 @@
  # include	<pthread.h>
  #endif
diff --git a/net/libunp/files/patch-libroute_Makefile b/net/libunp/files/patch-libroute_Makefile
index 6c2dd5bedf61..cca34f47fbfa 100644
--- a/net/libunp/files/patch-libroute_Makefile
+++ b/net/libunp/files/patch-libroute_Makefile
@@ -1,5 +1,5 @@
---- libroute/Makefile.orig	Thu Jun 12 16:16:47 1997
-+++ libroute/Makefile	Thu Sep 30 11:34:21 1999
+--- libroute/Makefile.orig	1997-06-12 20:16:47 UTC
++++ libroute/Makefile
 @@ -1,8 +1,12 @@
  include ../Make.defines
  
diff --git a/net/libunp/files/patch-ping_Makefile b/net/libunp/files/patch-ping_Makefile
index ab4a7319b7ff..1ea339f3847c 100644
--- a/net/libunp/files/patch-ping_Makefile
+++ b/net/libunp/files/patch-ping_Makefile
@@ -1,5 +1,5 @@
---- ping/Makefile.orig	Tue Sep 28 11:40:42 1999
-+++ ping/Makefile	Tue Sep 28 11:40:53 1999
+--- ping/Makefile.orig	1997-04-13 19:49:47 UTC
++++ ping/Makefile
 @@ -1,7 +1,7 @@
  include ../Make.defines
  
diff --git a/net/libunp/files/patch-traceroute_Makefile b/net/libunp/files/patch-traceroute_Makefile
index 9702ebe43672..7bbb9b947700 100644
--- a/net/libunp/files/patch-traceroute_Makefile
+++ b/net/libunp/files/patch-traceroute_Makefile
@@ -1,5 +1,5 @@
---- traceroute/Makefile.orig	Tue Sep 28 11:41:09 1999
-+++ traceroute/Makefile	Tue Sep 28 11:41:17 1999
+--- traceroute/Makefile.orig	1997-04-13 19:51:29 UTC
++++ traceroute/Makefile
 @@ -1,6 +1,6 @@
  include ../Make.defines
  
diff --git a/net/xprobe/files/patch-Makefile.in b/net/xprobe/files/patch-Makefile.in
index fd4774b5fc0d..330edeffa2d4 100644
--- a/net/xprobe/files/patch-Makefile.in
+++ b/net/xprobe/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in~
+--- Makefile.in.orig	2005-07-27 08:38:17 UTC
 +++ Makefile.in
-@@ -43,8 +40,8 @@ SIG=md5sum -b
+@@ -43,8 +43,8 @@ SIG=md5sum -b
  
  
  all: 
@@ -11,7 +11,7 @@
  
  
  clean:
-@@ -55,11 +52,11 @@ distclean: clean
+@@ -55,11 +55,11 @@ distclean: clean
  	cd libs-external/USI++/src; ${MAKE} distclean
  	cd src; ${MAKE} distclean
  install: src/xprobe2
diff --git a/net/xprobe/files/patch-docs:xprobe2.1 b/net/xprobe/files/patch-docs_xprobe2.1
index 68c09f0ef3b5..22f61a42963f 100644
--- a/net/xprobe/files/patch-docs:xprobe2.1
+++ b/net/xprobe/files/patch-docs_xprobe2.1
@@ -1,5 +1,5 @@
---- docs/xprobe2.1.orig	Mon Dec 20 13:17:24 2004
-+++ docs/xprobe2.1	Thu Dec 30 20:33:00 2004
+--- docs/xprobe2.1.orig	2005-07-27 08:38:16 UTC
++++ docs/xprobe2.1
 @@ -21,7 +21,7 @@
  
  .\" Generate man page: groff -man -Tascii xprobe.1 
diff --git a/net/xprobe/files/patch-libs-external-USI++-src-ip.cc b/net/xprobe/files/patch-libs-external_USI++_src_ip.cc
index 46269739ec39..09d02ea7f7f3 100644
--- a/net/xprobe/files/patch-libs-external-USI++-src-ip.cc
+++ b/net/xprobe/files/patch-libs-external_USI++_src_ip.cc
@@ -1,4 +1,4 @@
---- libs-external/USI++/src/ip.cc~
+--- libs-external/USI++/src/ip.cc.orig	2005-07-27 08:38:15 UTC
 +++ libs-external/USI++/src/ip.cc
 @@ -15,6 +15,7 @@
  #include "config.h"
diff --git a/net/xprobe/files/patch-libs-external-USI++-src-misc.cc b/net/xprobe/files/patch-libs-external_USI++_src_misc.cc
index 981ae91d522f..d66982ee3eda 100644
--- a/net/xprobe/files/patch-libs-external-USI++-src-misc.cc
+++ b/net/xprobe/files/patch-libs-external_USI++_src_misc.cc
@@ -1,4 +1,4 @@
---- libs-external/USI++/src/misc.cc~
+--- libs-external/USI++/src/misc.cc.orig	2005-07-27 08:38:15 UTC
 +++ libs-external/USI++/src/misc.cc
 @@ -1,6 +1,7 @@
  #include "usi++/usi++"
diff --git a/net/xprobe/files/patch-libs-external-USI++-src-usi++-tcp.h b/net/xprobe/files/patch-libs-external_USI++_usi++_tcp.h
index 3b50feffbc9b..53d62f58f49a 100644
--- a/net/xprobe/files/patch-libs-external-USI++-src-usi++-tcp.h
+++ b/net/xprobe/files/patch-libs-external_USI++_usi++_tcp.h
@@ -1,4 +1,4 @@
---- libs-external/USI++/usi++/tcp.h~
+--- libs-external/USI++/usi++/tcp.h.orig	2005-07-27 08:38:14 UTC
 +++ libs-external/USI++/usi++/tcp.h
 @@ -12,6 +12,8 @@
  #ifndef _TCP_H_
diff --git a/net/xprobe/files/patch-src-Makefile.in b/net/xprobe/files/patch-src_Makefile.in
index 666bdc929795..9280cde27c15 100644
--- a/net/xprobe/files/patch-src-Makefile.in
+++ b/net/xprobe/files/patch-src_Makefile.in
@@ -1,4 +1,4 @@
---- src/Makefile.in~
+--- src/Makefile.in.orig	2005-07-27 08:38:17 UTC
 +++ src/Makefile.in
 @@ -49,7 +49,6 @@ all: lib xprobe2
  
diff --git a/net/xprobe/files/patch-src_xpmodules_os_probe_smb_smbutil.h b/net/xprobe/files/patch-src_xpmodules_os__probe_smb_smbutil.h
index 9c933ca0dcd2..ad03c0a73c5a 100644
--- a/net/xprobe/files/patch-src_xpmodules_os_probe_smb_smbutil.h
+++ b/net/xprobe/files/patch-src_xpmodules_os__probe_smb_smbutil.h
@@ -1,5 +1,5 @@
---- src/xpmodules/os_probe/smb/smbutil.h.orig	Thu Aug  4 11:44:20 2005
-+++ src/xpmodules/os_probe/smb/smbutil.h	Thu Aug  4 11:44:28 2005
+--- src/xpmodules/os_probe/smb/smbutil.h.orig	2005-07-27 08:38:17 UTC
++++ src/xpmodules/os_probe/smb/smbutil.h
 @@ -39,8 +39,8 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/net/xpvm/files/patch-src:Makefile.xpvm b/net/xpvm/files/patch-src:Makefile.xpvm
deleted file mode 100644
index 02a7a8410b43..000000000000
--- a/net/xpvm/files/patch-src:Makefile.xpvm
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xpvm.orig/src/Makefile.xpvm xpvm/src/Makefile.xpvm
---- src/Makefile.xpvm	Fri Apr 10 05:11:23 1998
-+++ src/Makefile.xpvm	Thu Apr  1 13:45:15 2004
-@@ -2,4 +2,7 @@
- #
- 
-+default:
-+	cd src ; ${PVM_ROOT}/lib/aimk
-+
- install:
- 	cd src ; $(PVM_ROOT)/lib/aimk install
-
diff --git a/net/xpvm/files/patch-src:Makefile.aimk b/net/xpvm/files/patch-src_Makefile.aimk
index edf9b0d05ca1..63fd0460288e 100644
--- a/net/xpvm/files/patch-src:Makefile.aimk
+++ b/net/xpvm/files/patch-src_Makefile.aimk
@@ -1,6 +1,6 @@
---- src/Makefile.aimk.orig	1998-04-09 23:11:22.000000000 +0200
-+++ src/Makefile.aimk	2013-11-16 20:41:32.000000000 +0100
-@@ -29,7 +29,7 @@
+--- src/Makefile.aimk.orig	1998-04-09 21:11:22 UTC
++++ src/Makefile.aimk
+@@ -29,7 +29,7 @@ CC			=	cc
  #CC			=	gcc
  
  CFLAGS		=	$(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
@@ -9,7 +9,7 @@
  
  AIMK		=	$(PVM_ROOT)/lib/aimk
  
-@@ -39,36 +39,39 @@
+@@ -39,36 +39,39 @@ AIMK		=	$(PVM_ROOT)/lib/aimk
  #
  
  # Personal Installation
@@ -61,7 +61,7 @@
  # Tcl 7.6 / Tk 4.2
  #TCLLIB		=	-ltcl7.6
  #TKLIB		=	-ltk4.2
-@@ -80,14 +83,14 @@
+@@ -80,14 +83,14 @@ TKLIB		=	-ltk8.0
  #TKLIB		=	-ltk
  
  # Generic X11 System
@@ -80,7 +80,7 @@
  
  XLIB		=	-lX11 
  #XLIB		=	-lX11 -lXpm
-@@ -115,7 +118,7 @@
+@@ -115,7 +118,7 @@ TRCDIR = $(XPVM_ROOT)/tracer
  # Libraries
  #
  
@@ -89,7 +89,7 @@
  
  TRCLIBDIR	=	-L$(TRCDIR)/$(PVM_ARCH)
  
-@@ -136,7 +139,7 @@
+@@ -136,7 +139,7 @@ LIBS		=	$(LIBDIRS) $(PVMLIB) $(PVMGLIB) 
  # Include Directories
  #
  
@@ -98,7 +98,7 @@
  
  TRCINCL		=	-I$(TRCDIR)
  
-@@ -157,8 +160,8 @@
+@@ -157,8 +160,8 @@ TCLS		=	$(XPVM_ROOT)/xpvm.tcl $(XPVM_ROO
  HEADERS		=	$(SRCDIR)/Makefile.aimk $(SRCDIR)/xpvm.h \
  				$(SRCDIR)/globals.h $(SRCDIR)/const.h \
  				$(SRCDIR)/trace.h $(SRCDIR)/compat.pvmtev.h \
diff --git a/net/xpvm/files/patch-src_Makefile.xpvm b/net/xpvm/files/patch-src_Makefile.xpvm
new file mode 100644
index 000000000000..9bc8009675ed
--- /dev/null
+++ b/net/xpvm/files/patch-src_Makefile.xpvm
@@ -0,0 +1,12 @@
+--- src/Makefile.xpvm.orig	1998-04-09 21:11:23 UTC
++++ src/Makefile.xpvm
+@@ -2,6 +2,9 @@
+ # $Id: Makefile.xpvm,v 4.50 1998/04/09 21:11:23 kohl Exp $
+ #
+ 
++default:
++	cd src ; ${PVM_ROOT}/lib/aimk
++
+ install:
+ 	cd src ; $(PVM_ROOT)/lib/aimk install
+ 
diff --git a/net/xpvm/files/patch-tracer:Makefile.aimk b/net/xpvm/files/patch-tracer_Makefile.aimk
index 785f5701f0e9..40ffde65a452 100644
--- a/net/xpvm/files/patch-tracer:Makefile.aimk
+++ b/net/xpvm/files/patch-tracer_Makefile.aimk
@@ -1,7 +1,6 @@
-diff -ruN xpvm.orig/tracer/Makefile.aimk xpvm/tracer/Makefile.aimk
---- tracer/Makefile.aimk	Fri Apr 10 04:40:22 1998
-+++ tracer/Makefile.aimk	Thu Apr  1 13:39:33 2004
-@@ -47,7 +47,7 @@
+--- tracer/Makefile.aimk.orig	1998-04-09 20:40:22 UTC
++++ tracer/Makefile.aimk
+@@ -47,7 +47,7 @@ PVMLDIR		=	$(PVMDIR)/lib/$(PVM_ARCH)
  # Libraries
  #
  
@@ -10,7 +9,7 @@ diff -ruN xpvm.orig/tracer/Makefile.aimk xpvm/tracer/Makefile.aimk
  
  TRCLIBDIR	=	-L$(TRCDIR)/$(PVM_ARCH)
  
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ LIBS		=	$(LIBDIRS) -l$(TRCLIB) -l$(PVMLI
  # Include Directories
  #
  
@@ -19,7 +18,7 @@ diff -ruN xpvm.orig/tracer/Makefile.aimk xpvm/tracer/Makefile.aimk
  
  TRCINCL		=	-I$(TRCDIR)
  
-@@ -90,12 +90,12 @@
+@@ -90,12 +90,12 @@ TRCOBJS		=	trcmess.o trcfile.o trccompat
  HEADERS		=	$(SRCDIR)/tracer.h $(SRCDIR)/trcglob.h \
  				$(TRCDIR)/trcdef.h $(TRCDIR)/trctype.h \
  				$(TRCDIR)/trcproto.h \
diff --git a/print/ghostscript7-base/files/patch-alps:gdevalps.mak b/print/ghostscript7-base/files/patch-alps_gdevalps.mak
index 45144eaadcfd..45144eaadcfd 100644
--- a/print/ghostscript7-base/files/patch-alps:gdevalps.mak
+++ b/print/ghostscript7-base/files/patch-alps_gdevalps.mak
diff --git a/print/ghostscript7-base/files/patch-eplaser:gdevescv.c b/print/ghostscript7-base/files/patch-eplaser_gdevescv.c
index ee548e3019e6..ee548e3019e6 100644
--- a/print/ghostscript7-base/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript7-base/files/patch-eplaser_gdevescv.c
diff --git a/print/ghostscript7-base/files/patch-eplaser:gdevesmv.c b/print/ghostscript7-base/files/patch-eplaser_gdevesmv.c
index cc538bf87531..cc538bf87531 100644
--- a/print/ghostscript7-base/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript7-base/files/patch-eplaser_gdevesmv.c
diff --git a/print/ghostscript7-base/files/patch-gdev10v:gdev10v.mak b/print/ghostscript7-base/files/patch-gdev10v_gdev10v.mak
index 25a8317379b8..25a8317379b8 100644
--- a/print/ghostscript7-base/files/patch-gdev10v:gdev10v.mak
+++ b/print/ghostscript7-base/files/patch-gdev10v_gdev10v.mak
diff --git a/print/ghostscript7-base/files/patch-lib:gs_cidfn.ps b/print/ghostscript7-base/files/patch-lib_gs_cidfn.ps
index 98a763bf9b23..98a763bf9b23 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_cidfn.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_cidfn.ps
diff --git a/print/ghostscript7-base/files/patch-lib:gs_init.ps b/print/ghostscript7-base/files/patch-lib_gs_init.ps
index 143fa1a1d673..143fa1a1d673 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_init.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_init.ps
diff --git a/print/ghostscript7-base/files/patch-lib:gs_res.ps b/print/ghostscript7-base/files/patch-lib_gs_res.ps
index 2e5169720649..2e5169720649 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_res.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_res.ps
diff --git a/print/ghostscript7-base/files/patch-lib:gs_setpd.ps b/print/ghostscript7-base/files/patch-lib_gs_setpd.ps
index 1e9444732d86..1e9444732d86 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_setpd.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_setpd.ps
diff --git a/print/ghostscript7-base/files/patch-lib:gs_statd.ps b/print/ghostscript7-base/files/patch-lib_gs_statd.ps
index e540215a0a70..e540215a0a70 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_statd.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_statd.ps
diff --git a/print/ghostscript7-base/files/patch-lib:gs_ttf.ps b/print/ghostscript7-base/files/patch-lib_gs_ttf.ps
index 669b71760672..669b71760672 100644
--- a/print/ghostscript7-base/files/patch-lib:gs_ttf.ps
+++ b/print/ghostscript7-base/files/patch-lib_gs_ttf.ps
diff --git a/print/ghostscript7-base/files/patch-lib:pj-gs.sh.CAN-2004-0967 b/print/ghostscript7-base/files/patch-lib_pj-gs.sh.CAN-2004-0967
index 9d4a0850f191..9d4a0850f191 100644
--- a/print/ghostscript7-base/files/patch-lib:pj-gs.sh.CAN-2004-0967
+++ b/print/ghostscript7-base/files/patch-lib_pj-gs.sh.CAN-2004-0967
diff --git a/print/ghostscript7-base/files/patch-lib:ps2epsi.CAN-2004-0967 b/print/ghostscript7-base/files/patch-lib_ps2epsi.CAN-2004-0967
index 33636efcaef2..33636efcaef2 100644
--- a/print/ghostscript7-base/files/patch-lib:ps2epsi.CAN-2004-0967
+++ b/print/ghostscript7-base/files/patch-lib_ps2epsi.CAN-2004-0967
diff --git a/print/ghostscript7-base/files/patch-lib:ps2pdfwr b/print/ghostscript7-base/files/patch-lib_ps2pdfwr
index ef2b946df791..ef2b946df791 100644
--- a/print/ghostscript7-base/files/patch-lib:ps2pdfwr
+++ b/print/ghostscript7-base/files/patch-lib_ps2pdfwr
diff --git a/print/ghostscript7-base/files/patch-lib:pv.sh.CAN-2004-0967 b/print/ghostscript7-base/files/patch-lib_pv.sh.CAN-2004-0967
index a37fc43aada9..a37fc43aada9 100644
--- a/print/ghostscript7-base/files/patch-lib:pv.sh.CAN-2004-0967
+++ b/print/ghostscript7-base/files/patch-lib_pv.sh.CAN-2004-0967
diff --git a/print/ghostscript7-base/files/patch-lib:sysvlp.sh.CAN-2004-0967 b/print/ghostscript7-base/files/patch-lib_sysvlp.sh.CAN-2004-0967
index 314d5d0bbe84..314d5d0bbe84 100644
--- a/print/ghostscript7-base/files/patch-lib:sysvlp.sh.CAN-2004-0967
+++ b/print/ghostscript7-base/files/patch-lib_sysvlp.sh.CAN-2004-0967
diff --git a/print/ghostscript7-base/files/patch-lips:gdevl4r.c b/print/ghostscript7-base/files/patch-lips_gdevl4r.c
index 353ec2399a84..353ec2399a84 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevl4r.c
+++ b/print/ghostscript7-base/files/patch-lips_gdevl4r.c
diff --git a/print/ghostscript7-base/files/patch-lips:gdevl4v.c b/print/ghostscript7-base/files/patch-lips_gdevl4v.c
index 0d48309837d9..0d48309837d9 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevl4v.c
+++ b/print/ghostscript7-base/files/patch-lips_gdevl4v.c
diff --git a/print/ghostscript7-base/files/patch-lips:gdevlips.c b/print/ghostscript7-base/files/patch-lips_gdevlips.c
index 143fed14f0a1..143fed14f0a1 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevlips.c
+++ b/print/ghostscript7-base/files/patch-lips_gdevlips.c
diff --git a/print/ghostscript7-base/files/patch-lips:gdevlips.h b/print/ghostscript7-base/files/patch-lips_gdevlips.h
index eebce89cc054..eebce89cc054 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevlips.h
+++ b/print/ghostscript7-base/files/patch-lips_gdevlips.h
diff --git a/print/ghostscript7-base/files/patch-lips:gdevlips.mak b/print/ghostscript7-base/files/patch-lips_gdevlips.mak
index 11fb154eb2c2..11fb154eb2c2 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevlips.mak
+++ b/print/ghostscript7-base/files/patch-lips_gdevlips.mak
diff --git a/print/ghostscript7-base/files/patch-lips:gdevlprn.h b/print/ghostscript7-base/files/patch-lips_gdevlprn.h
index f692dbe410a2..f692dbe410a2 100644
--- a/print/ghostscript7-base/files/patch-lips:gdevlprn.h
+++ b/print/ghostscript7-base/files/patch-lips_gdevlprn.h
diff --git a/print/ghostscript7-base/files/patch-md2k:gdevmd2k.mak b/print/ghostscript7-base/files/patch-md2k_gdevmd2k.mak
index b003efb81f7f..b003efb81f7f 100644
--- a/print/ghostscript7-base/files/patch-md2k:gdevmd2k.mak
+++ b/print/ghostscript7-base/files/patch-md2k_gdevmd2k.mak
diff --git a/print/ghostscript7-base/files/patch-mjc:gdevmjc.c b/print/ghostscript7-base/files/patch-mjc_gdevmjc.c
index 99ff0bcb245f..99ff0bcb245f 100644
--- a/print/ghostscript7-base/files/patch-mjc:gdevmjc.c
+++ b/print/ghostscript7-base/files/patch-mjc_gdevmjc.c
diff --git a/print/ghostscript7-base/files/patch-mjc:gdevmjc.mak b/print/ghostscript7-base/files/patch-mjc_gdevmjc.mak
index a094ea08812f..a094ea08812f 100644
--- a/print/ghostscript7-base/files/patch-mjc:gdevmjc.mak
+++ b/print/ghostscript7-base/files/patch-mjc_gdevmjc.mak
diff --git a/print/ghostscript7-base/files/patch-src-Makefile.in b/print/ghostscript7-base/files/patch-src_Makefile.in
index fbf3f4c1df2f..fbf3f4c1df2f 100644
--- a/print/ghostscript7-base/files/patch-src-Makefile.in
+++ b/print/ghostscript7-base/files/patch-src_Makefile.in
diff --git a/print/ghostscript7-base/files/patch-src-configure.ac b/print/ghostscript7-base/files/patch-src_configure.ac
index 7cccac9b9483..7cccac9b9483 100644
--- a/print/ghostscript7-base/files/patch-src-configure.ac
+++ b/print/ghostscript7-base/files/patch-src_configure.ac
diff --git a/print/ghostscript7-base/files/patch-src-contrib.mak b/print/ghostscript7-base/files/patch-src_contrib.mak
index f1c4d1de9622..f1c4d1de9622 100644
--- a/print/ghostscript7-base/files/patch-src-contrib.mak
+++ b/print/ghostscript7-base/files/patch-src_contrib.mak
diff --git a/print/ghostscript7-base/files/patch-src-cpca_gdev.mak b/print/ghostscript7-base/files/patch-src_cpca__gdev.mak
index e423c480fa43..e423c480fa43 100644
--- a/print/ghostscript7-base/files/patch-src-cpca_gdev.mak
+++ b/print/ghostscript7-base/files/patch-src_cpca__gdev.mak
diff --git a/print/ghostscript7-base/files/patch-src-devs.mak b/print/ghostscript7-base/files/patch-src_devs.mak
index 707b393b70dd..707b393b70dd 100644
--- a/print/ghostscript7-base/files/patch-src-devs.mak
+++ b/print/ghostscript7-base/files/patch-src_devs.mak
diff --git a/print/ghostscript7-base/files/patch-src:dmp_site.ps b/print/ghostscript7-base/files/patch-src_dmp_site.ps
index 174bef13f80f..174bef13f80f 100644
--- a/print/ghostscript7-base/files/patch-src:dmp_site.ps
+++ b/print/ghostscript7-base/files/patch-src_dmp_site.ps
diff --git a/print/ghostscript7-base/files/patch-src:dviprlib.c b/print/ghostscript7-base/files/patch-src_dviprlib.c
index 67662665f273..67662665f273 100644
--- a/print/ghostscript7-base/files/patch-src:dviprlib.c
+++ b/print/ghostscript7-base/files/patch-src_dviprlib.c
diff --git a/print/ghostscript7-base/files/patch-src-gconf.c b/print/ghostscript7-base/files/patch-src_gconf.c
index 4afa18c6e024..4afa18c6e024 100644
--- a/print/ghostscript7-base/files/patch-src-gconf.c
+++ b/print/ghostscript7-base/files/patch-src_gconf.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevdmpr.c b/print/ghostscript7-base/files/patch-src_gdevdmpr.c
index 05e3bb12dc13..05e3bb12dc13 100644
--- a/print/ghostscript7-base/files/patch-src:gdevdmpr.c
+++ b/print/ghostscript7-base/files/patch-src_gdevdmpr.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevdmpr.mak b/print/ghostscript7-base/files/patch-src_gdevdmpr.mak
index 4da2b096cc4f..4da2b096cc4f 100644
--- a/print/ghostscript7-base/files/patch-src:gdevdmpr.mak
+++ b/print/ghostscript7-base/files/patch-src_gdevdmpr.mak
diff --git a/print/ghostscript7-base/files/patch-src:gdevgdi.c b/print/ghostscript7-base/files/patch-src_gdevgdi.c
index 996758e09685..996758e09685 100644
--- a/print/ghostscript7-base/files/patch-src:gdevgdi.c
+++ b/print/ghostscript7-base/files/patch-src_gdevgdi.c
diff --git a/print/ghostscript7-base/files/patch-src-gdevijs.c b/print/ghostscript7-base/files/patch-src_gdevijs.c
index fed73ce2599f..fed73ce2599f 100644
--- a/print/ghostscript7-base/files/patch-src-gdevijs.c
+++ b/print/ghostscript7-base/files/patch-src_gdevijs.c
diff --git a/print/ghostscript7-base/files/patch-src-gdevl256.c b/print/ghostscript7-base/files/patch-src_gdevl256.c
index e11d19f8c2d6..e11d19f8c2d6 100644
--- a/print/ghostscript7-base/files/patch-src-gdevl256.c
+++ b/print/ghostscript7-base/files/patch-src_gdevl256.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevlbp8.c b/print/ghostscript7-base/files/patch-src_gdevlbp8.c
index 052492c58f6a..052492c58f6a 100644
--- a/print/ghostscript7-base/files/patch-src:gdevlbp8.c
+++ b/print/ghostscript7-base/files/patch-src_gdevlbp8.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevpdff.c b/print/ghostscript7-base/files/patch-src_gdevpdff.c
index 8a292bd4cdec..8a292bd4cdec 100644
--- a/print/ghostscript7-base/files/patch-src:gdevpdff.c
+++ b/print/ghostscript7-base/files/patch-src_gdevpdff.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevpdff.h b/print/ghostscript7-base/files/patch-src_gdevpdff.h
index f64a4e02f6b8..f64a4e02f6b8 100644
--- a/print/ghostscript7-base/files/patch-src:gdevpdff.h
+++ b/print/ghostscript7-base/files/patch-src_gdevpdff.h
diff --git a/print/ghostscript7-base/files/patch-src:gdevpdfs.c b/print/ghostscript7-base/files/patch-src_gdevpdfs.c
index 0378f15c88ab..0378f15c88ab 100644
--- a/print/ghostscript7-base/files/patch-src:gdevpdfs.c
+++ b/print/ghostscript7-base/files/patch-src_gdevpdfs.c
diff --git a/print/ghostscript7-base/files/patch-src:gdevpdfw.c b/print/ghostscript7-base/files/patch-src_gdevpdfw.c
index a08b87d42724..a08b87d42724 100644
--- a/print/ghostscript7-base/files/patch-src:gdevpdfw.c
+++ b/print/ghostscript7-base/files/patch-src_gdevpdfw.c
diff --git a/print/ghostscript7-base/files/patch-src-gdevpng.c b/print/ghostscript7-base/files/patch-src_gdevpng.c
index 0bb66e2f046d..0bb66e2f046d 100644
--- a/print/ghostscript7-base/files/patch-src-gdevpng.c
+++ b/print/ghostscript7-base/files/patch-src_gdevpng.c
diff --git a/print/ghostscript7-base/files/patch-src-gdevvglb.c b/print/ghostscript7-base/files/patch-src_gdevvglb.c
index bdacbfbbfca0..bdacbfbbfca0 100644
--- a/print/ghostscript7-base/files/patch-src-gdevvglb.c
+++ b/print/ghostscript7-base/files/patch-src_gdevvglb.c
diff --git a/print/ghostscript7-base/files/patch-src-gdevxalt.c b/print/ghostscript7-base/files/patch-src_gdevxalt.c
index 4d9a88b43fb4..4d9a88b43fb4 100644
--- a/print/ghostscript7-base/files/patch-src-gdevxalt.c
+++ b/print/ghostscript7-base/files/patch-src_gdevxalt.c
diff --git a/print/ghostscript7-base/files/patch-src:genarch.c b/print/ghostscript7-base/files/patch-src_genarch.c
index a015e69e758a..a015e69e758a 100644
--- a/print/ghostscript7-base/files/patch-src:genarch.c
+++ b/print/ghostscript7-base/files/patch-src_genarch.c
diff --git a/print/ghostscript7-base/files/patch-src-gnudevs.mak b/print/ghostscript7-base/files/patch-src_gnudevs.mak
index d6e15432bf52..d6e15432bf52 100644
--- a/print/ghostscript7-base/files/patch-src-gnudevs.mak
+++ b/print/ghostscript7-base/files/patch-src_gnudevs.mak
diff --git a/print/ghostscript7-base/files/patch-src-gp_unix.c b/print/ghostscript7-base/files/patch-src_gp__unix.c
index df7874734668..df7874734668 100644
--- a/print/ghostscript7-base/files/patch-src-gp_unix.c
+++ b/print/ghostscript7-base/files/patch-src_gp__unix.c
diff --git a/print/ghostscript7-base/files/patch-src-gs.mak b/print/ghostscript7-base/files/patch-src_gs.mak
index a9ee54700595..a9ee54700595 100644
--- a/print/ghostscript7-base/files/patch-src-gs.mak
+++ b/print/ghostscript7-base/files/patch-src_gs.mak
diff --git a/print/ghostscript7-base/files/patch-src-gsalloc.c b/print/ghostscript7-base/files/patch-src_gsalloc.c
index 7c29a14eeada..7c29a14eeada 100644
--- a/print/ghostscript7-base/files/patch-src-gsalloc.c
+++ b/print/ghostscript7-base/files/patch-src_gsalloc.c
diff --git a/print/ghostscript7-base/files/patch-src-gsmalloc.c b/print/ghostscript7-base/files/patch-src_gsmalloc.c
index 9b4d97da3844..9b4d97da3844 100644
--- a/print/ghostscript7-base/files/patch-src-gsmalloc.c
+++ b/print/ghostscript7-base/files/patch-src_gsmalloc.c
diff --git a/print/ghostscript7-base/files/patch-src-gxclrast.c b/print/ghostscript7-base/files/patch-src_gxclrast.c
index 59d5053ad305..59d5053ad305 100644
--- a/print/ghostscript7-base/files/patch-src-gxclrast.c
+++ b/print/ghostscript7-base/files/patch-src_gxclrast.c
diff --git a/print/ghostscript7-base/files/patch-src-gxfixed.h b/print/ghostscript7-base/files/patch-src_gxfixed.h
index 0988ca612c9b..0988ca612c9b 100644
--- a/print/ghostscript7-base/files/patch-src-gxfixed.h
+++ b/print/ghostscript7-base/files/patch-src_gxfixed.h
diff --git a/print/ghostscript7-base/files/patch-src:gxobj.h b/print/ghostscript7-base/files/patch-src_gxobj.h
index f0df8565100c..f0df8565100c 100644
--- a/print/ghostscript7-base/files/patch-src:gxobj.h
+++ b/print/ghostscript7-base/files/patch-src_gxobj.h
diff --git a/print/ghostscript7-base/files/patch-src-ibnum.c b/print/ghostscript7-base/files/patch-src_ibnum.c
index 2df0a7d138c7..2df0a7d138c7 100644
--- a/print/ghostscript7-base/files/patch-src-ibnum.c
+++ b/print/ghostscript7-base/files/patch-src_ibnum.c
diff --git a/print/ghostscript7-base/files/patch-src-ibnum.h b/print/ghostscript7-base/files/patch-src_ibnum.h
index ffec70cac2ae..ffec70cac2ae 100644
--- a/print/ghostscript7-base/files/patch-src-ibnum.h
+++ b/print/ghostscript7-base/files/patch-src_ibnum.h
diff --git a/print/ghostscript7-base/files/patch-src-icclib.mak b/print/ghostscript7-base/files/patch-src_icclib.mak
index a60ef670dfa2..a60ef670dfa2 100644
--- a/print/ghostscript7-base/files/patch-src-icclib.mak
+++ b/print/ghostscript7-base/files/patch-src_icclib.mak
diff --git a/print/ghostscript7-base/files/patch-src-idebug.c b/print/ghostscript7-base/files/patch-src_idebug.c
index 142926b4474b..142926b4474b 100644
--- a/print/ghostscript7-base/files/patch-src-idebug.c
+++ b/print/ghostscript7-base/files/patch-src_idebug.c
diff --git a/print/ghostscript7-base/files/patch-src-idparam.c b/print/ghostscript7-base/files/patch-src_idparam.c
index 636d7c16b510..636d7c16b510 100644
--- a/print/ghostscript7-base/files/patch-src-idparam.c
+++ b/print/ghostscript7-base/files/patch-src_idparam.c
diff --git a/print/ghostscript7-base/files/patch-src-ijs.mak b/print/ghostscript7-base/files/patch-src_ijs.mak
index be8ee7807ac5..be8ee7807ac5 100644
--- a/print/ghostscript7-base/files/patch-src-ijs.mak
+++ b/print/ghostscript7-base/files/patch-src_ijs.mak
diff --git a/print/ghostscript7-base/files/patch-src-int.mak b/print/ghostscript7-base/files/patch-src_int.mak
index 9e4c5a2c7663..9e4c5a2c7663 100644
--- a/print/ghostscript7-base/files/patch-src-int.mak
+++ b/print/ghostscript7-base/files/patch-src_int.mak
diff --git a/print/ghostscript7-base/files/patch-src-iparam.c b/print/ghostscript7-base/files/patch-src_iparam.c
index b0bb91a4d3ef..b0bb91a4d3ef 100644
--- a/print/ghostscript7-base/files/patch-src-iparam.c
+++ b/print/ghostscript7-base/files/patch-src_iparam.c
diff --git a/print/ghostscript7-base/files/patch-src-iref.h b/print/ghostscript7-base/files/patch-src_iref.h
index 33313d38047b..33313d38047b 100644
--- a/print/ghostscript7-base/files/patch-src-iref.h
+++ b/print/ghostscript7-base/files/patch-src_iref.h
diff --git a/print/ghostscript7-base/files/patch-src-iscan.c b/print/ghostscript7-base/files/patch-src_iscan.c
index cd8b03f6ab56..cd8b03f6ab56 100644
--- a/print/ghostscript7-base/files/patch-src-iscan.c
+++ b/print/ghostscript7-base/files/patch-src_iscan.c
diff --git a/print/ghostscript7-base/files/patch-src-iscanbin.c b/print/ghostscript7-base/files/patch-src_iscanbin.c
index 1f39c88b7209..1f39c88b7209 100644
--- a/print/ghostscript7-base/files/patch-src-iscanbin.c
+++ b/print/ghostscript7-base/files/patch-src_iscanbin.c
diff --git a/print/ghostscript7-base/files/patch-src-iscannum.c b/print/ghostscript7-base/files/patch-src_iscannum.c
index 4a69664074a6..4a69664074a6 100644
--- a/print/ghostscript7-base/files/patch-src-iscannum.c
+++ b/print/ghostscript7-base/files/patch-src_iscannum.c
diff --git a/print/ghostscript7-base/files/patch-src-iutil.c b/print/ghostscript7-base/files/patch-src_iutil.c
index c77cb19ddd84..c77cb19ddd84 100644
--- a/print/ghostscript7-base/files/patch-src-iutil.c
+++ b/print/ghostscript7-base/files/patch-src_iutil.c
diff --git a/print/ghostscript7-base/files/patch-src-lib.mak b/print/ghostscript7-base/files/patch-src_lib.mak
index 6208eb8034a3..6208eb8034a3 100644
--- a/print/ghostscript7-base/files/patch-src-lib.mak
+++ b/print/ghostscript7-base/files/patch-src_lib.mak
diff --git a/print/ghostscript7-base/files/patch-src:smartgdi-contrib.mak b/print/ghostscript7-base/files/patch-src_smartgdi-contrib.mak
index 3b832daff662..3b832daff662 100644
--- a/print/ghostscript7-base/files/patch-src:smartgdi-contrib.mak
+++ b/print/ghostscript7-base/files/patch-src_smartgdi-contrib.mak
diff --git a/print/ghostscript7-base/files/patch-src:unix-dll.mak b/print/ghostscript7-base/files/patch-src_unix-dll.mak
index f6032f9f08ac..f6032f9f08ac 100644
--- a/print/ghostscript7-base/files/patch-src:unix-dll.mak
+++ b/print/ghostscript7-base/files/patch-src_unix-dll.mak
diff --git a/print/ghostscript7-base/files/patch-src:unix-gcc.mak b/print/ghostscript7-base/files/patch-src_unix-gcc.mak
index 41f387c4143e..41f387c4143e 100644
--- a/print/ghostscript7-base/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7-base/files/patch-src_unix-gcc.mak
diff --git a/print/ghostscript7-base/files/patch-src-unixinst.mak b/print/ghostscript7-base/files/patch-src_unixinst.mak
index 1a8041d74861..1a8041d74861 100644
--- a/print/ghostscript7-base/files/patch-src-unixinst.mak
+++ b/print/ghostscript7-base/files/patch-src_unixinst.mak
diff --git a/print/ghostscript7-base/files/patch-src-zarith.c b/print/ghostscript7-base/files/patch-src_zarith.c
index 582f61e8f144..582f61e8f144 100644
--- a/print/ghostscript7-base/files/patch-src-zarith.c
+++ b/print/ghostscript7-base/files/patch-src_zarith.c
diff --git a/print/ghostscript7-base/files/patch-src-zcontrol.c b/print/ghostscript7-base/files/patch-src_zcontrol.c
index d00a600c19ec..d00a600c19ec 100644
--- a/print/ghostscript7-base/files/patch-src-zcontrol.c
+++ b/print/ghostscript7-base/files/patch-src_zcontrol.c
diff --git a/print/ghostscript7-base/files/patch-src-zdict.c b/print/ghostscript7-base/files/patch-src_zdict.c
index 050ecc841717..050ecc841717 100644
--- a/print/ghostscript7-base/files/patch-src-zdict.c
+++ b/print/ghostscript7-base/files/patch-src_zdict.c
diff --git a/print/ghostscript7-base/files/patch-src-zdps.c b/print/ghostscript7-base/files/patch-src_zdps.c
index 414a296cd4ea..414a296cd4ea 100644
--- a/print/ghostscript7-base/files/patch-src-zdps.c
+++ b/print/ghostscript7-base/files/patch-src_zdps.c
diff --git a/print/ghostscript7-base/files/patch-src-zfunc4.c b/print/ghostscript7-base/files/patch-src_zfunc4.c
index 0d8610978652..0d8610978652 100644
--- a/print/ghostscript7-base/files/patch-src-zfunc4.c
+++ b/print/ghostscript7-base/files/patch-src_zfunc4.c
diff --git a/print/ghostscript7-base/files/patch-src-zgeneric.c b/print/ghostscript7-base/files/patch-src_zgeneric.c
index d99189a5e16a..d99189a5e16a 100644
--- a/print/ghostscript7-base/files/patch-src-zgeneric.c
+++ b/print/ghostscript7-base/files/patch-src_zgeneric.c
diff --git a/print/ghostscript7-base/files/patch-src-ziodev.c b/print/ghostscript7-base/files/patch-src_ziodev.c
index 2cd6f0add7a9..2cd6f0add7a9 100644
--- a/print/ghostscript7-base/files/patch-src-ziodev.c
+++ b/print/ghostscript7-base/files/patch-src_ziodev.c
diff --git a/print/ghostscript7-base/files/patch-src-zmath.c b/print/ghostscript7-base/files/patch-src_zmath.c
index 94576da80fdf..94576da80fdf 100644
--- a/print/ghostscript7-base/files/patch-src-zmath.c
+++ b/print/ghostscript7-base/files/patch-src_zmath.c
diff --git a/print/ghostscript7-base/files/patch-src:zmedia2.c b/print/ghostscript7-base/files/patch-src_zmedia2.c
index 9033a4388085..9033a4388085 100644
--- a/print/ghostscript7-base/files/patch-src:zmedia2.c
+++ b/print/ghostscript7-base/files/patch-src_zmedia2.c
diff --git a/print/ghostscript7-base/files/patch-src-zstack.c b/print/ghostscript7-base/files/patch-src_zstack.c
index f1359936e410..f1359936e410 100644
--- a/print/ghostscript7-base/files/patch-src-zstack.c
+++ b/print/ghostscript7-base/files/patch-src_zstack.c
diff --git a/print/ghostscript7-base/files/patch-src-ztype.c b/print/ghostscript7-base/files/patch-src_ztype.c
index 98be203c6abe..98be203c6abe 100644
--- a/print/ghostscript7-base/files/patch-src-ztype.c
+++ b/print/ghostscript7-base/files/patch-src_ztype.c
diff --git a/print/ghostscript7-x11/files/patch-src-Makefile.in b/print/ghostscript7-x11/files/patch-src_Makefile.in
index c615c95a9e2a..75486c028035 100644
--- a/print/ghostscript7-x11/files/patch-src-Makefile.in
+++ b/print/ghostscript7-x11/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2003-04-30 03:33:31.000000000 +0900
-+++ src/Makefile.in	2015-08-22 02:16:40.606012000 +0900
-@@ -50,8 +50,10 @@
+--- src/Makefile.in.orig	2003-04-29 18:33:31 UTC
++++ src/Makefile.in
+@@ -50,8 +50,10 @@ PSD=$(PSGENDIR)/
  # initialization files (gs_*.ps) and the fonts.
  
  INSTALL = $(GLSRCDIR)/instcopy -c
@@ -13,7 +13,7 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
-@@ -63,6 +65,8 @@
+@@ -63,6 +65,8 @@ man1ext = 1
  datadir = @datadir@
  gsdir = $(datadir)/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
@@ -22,7 +22,7 @@
  
  docdir=$(gsdatadir)/doc
  exdir=$(gsdatadir)/examples
-@@ -142,7 +146,7 @@
+@@ -142,7 +146,7 @@ JVERSION=6
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -31,7 +31,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -150,14 +154,14 @@
+@@ -150,14 +154,14 @@ JPEG_NAME=jpeg
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -48,7 +48,7 @@
  ZSRCDIR=@ZLIBDIR@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
-@@ -197,15 +201,15 @@
+@@ -197,15 +201,15 @@ CC=@CC@
  CCLD=$(CC)
  
  # Define the general cc flags, warnings and such.
@@ -67,7 +67,7 @@
  
  # Define the other compilation flags.  Add at most one of the following:
  #	-DBSD4_2 for 4.2bsd systems.
-@@ -218,7 +222,7 @@
+@@ -218,7 +222,7 @@ 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.
@@ -76,7 +76,7 @@
  
  # defines from autoconf; note that we don't use these at present.
  ACDEFS=@DEFS@
-@@ -232,9 +236,9 @@
+@@ -232,9 +236,9 @@ 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.
@@ -88,7 +88,7 @@
  
  # Define any extra libraries to link into the executable.
  # ISC Unix 2.2 wants -linet.
-@@ -243,7 +247,7 @@
+@@ -243,7 +247,7 @@ LDFLAGS=$(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -97,7 +97,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -252,10 +256,7 @@
+@@ -252,10 +256,7 @@ EXTRALIBS=
  # All reasonable platforms require -lm, but Rhapsody and perhaps one or
  # two others fold libm into libc and don't require any additional library.
  
@@ -109,7 +109,7 @@
  
  # Define the include switch(es) for the X11 header files.
  # This can be null if handled in some other way (e.g., the files are
-@@ -279,9 +280,10 @@
+@@ -279,9 +280,10 @@ XINCLUDE=@X_CFLAGS@
  # should be slotted into XLIBS below and X_PRE_LIBS which should go
  # before -lX11. We do not handle these and should, but they are empty
  # on most modern platforms.
@@ -122,7 +122,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -301,15 +303,19 @@
+@@ -301,15 +303,19 @@ USE_ASM=0
  # primitives for this platform.
  
  # If POSIX sync primitives are used, also change the STDLIBS to include
@@ -146,7 +146,7 @@
  # ------ Devices and features ------ #
  
  # Choose the language feature(s) to include.  See gs.mak for details.
-@@ -385,6 +391,9 @@
+@@ -385,6 +391,9 @@ DEVICE_DEVS18=
  DEVICE_DEVS19=
  DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
  
@@ -156,7 +156,7 @@
  # ---------------------------- End of options --------------------------- #
  
  # Define the name of the partial makefile that specifies options --
-@@ -407,6 +416,7 @@
+@@ -407,6 +416,7 @@ CC_LEAF_PG=$(CC_)
  # These are the specific warnings we have to turn off to compile those
  # specific few files that need this.  We may turn off others in the future.
  CC_NO_WARN=$(CC_)
diff --git a/print/ghostscript7-x11/files/patch-src-configure.ac b/print/ghostscript7-x11/files/patch-src_configure.ac
index f95ae6826b22..625d20219c70 100644
--- a/print/ghostscript7-x11/files/patch-src-configure.ac
+++ b/print/ghostscript7-x11/files/patch-src_configure.ac
@@ -1,6 +1,6 @@
---- src/configure.ac.orig	2003-04-16 22:59:56.000000000 +0900
-+++ src/configure.ac	2015-08-22 02:25:42.002266000 +0900
-@@ -8,6 +8,46 @@
+--- src/configure.ac.orig	2003-04-16 13:59:56 UTC
++++ src/configure.ac
+@@ -8,6 +8,46 @@ AC_INIT
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR(src/gs.c)
  
@@ -47,7 +47,7 @@
  dnl --------------------------------------------------  
  dnl Check for programs
  dnl --------------------------------------------------  
-@@ -94,33 +134,15 @@
+@@ -94,33 +134,15 @@ dnl Check for libraries
  dnl --------------------------------------------------
  
  AC_CHECK_LIB(m, cos)
@@ -89,7 +89,7 @@
  AC_SUBST(SHARE_LIBJPEG)
  AC_SUBST(LIBJPEGDIR)
  
-@@ -211,15 +233,68 @@
+@@ -211,15 +233,68 @@ fi
  AC_SUBST(STPLIB)
  AC_SUBST(STPDEVS)
  
@@ -163,7 +163,7 @@
  
  dnl executible name
  AC_ARG_WITH(gs, AC_HELP_STRING([--with-gs=NAME],
-@@ -236,6 +311,33 @@
+@@ -236,6 +311,33 @@ AC_ARG_ENABLE(compile-inits, AC_HELP_STR
  		fi])
  AC_SUBST(COMPILE_INITS)
  
diff --git a/print/ghostscript7-x11/files/patch-src-devs.mak b/print/ghostscript7-x11/files/patch-src_devs.mak
index 707b393b70dd..4b6aa33bbf6b 100644
--- a/print/ghostscript7-x11/files/patch-src-devs.mak
+++ b/print/ghostscript7-x11/files/patch-src_devs.mak
@@ -1,6 +1,6 @@
---- src/devs.mak.orig	2015-08-21 21:59:44.117097000 +0900
-+++ src/devs.mak	2015-08-21 22:02:19.960434000 +0900
-@@ -405,7 +405,7 @@
+--- src/devs.mak.orig	2003-03-11 11:59:10 UTC
++++ src/devs.mak
+@@ -405,7 +405,7 @@ $(DD)lvga256.dev : $(DEVS_MAK) $(lvga256
  	$(ADDMOD) $(DD)lvga256 -lib vga vgagl
  
  $(GLOBJ)gdevl256.$(OBJ) : $(GLSRC)gdevl256.c $(GDEV) $(memory__h)
@@ -9,7 +9,7 @@
  
  vgalib_=$(GLOBJ)gdevvglb.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
  $(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_)
-@@ -413,7 +413,7 @@
+@@ -413,7 +413,7 @@ $(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_)
  	$(ADDMOD) $(DD)vgalib -lib vga
  
  $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvglb.c $(GDEV) $(gdevpccm_h) $(gsparam_h)
@@ -18,7 +18,7 @@
  
  ### -------------------------- The X11 device -------------------------- ###
  
-@@ -443,24 +443,24 @@
+@@ -443,24 +443,24 @@ GDEVX=$(GDEV) $(x__h) $(gdevx_h) $(TOP_M
  $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $(GDEVX) $(math__h) $(memory__h)\
   $(gscoord_h) $(gsdevice_h) $(gsiparm2_h) $(gsmatrix_h) $(gsparam_h)\
   $(gxdevmem_h) $(gxgetbit_h) $(gxiparam_h) $(gxpath_h)
@@ -48,7 +48,7 @@
  
  # Alternate X11-based devices to help debug other drivers.
  # x11alpha pretends to have 4 bits of alpha channel.
-@@ -510,7 +510,13 @@
+@@ -510,7 +510,13 @@ $(DD)x11rg32x.dev : $(DEVS_MAK) $(DD)x11
  
  $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
   $(gsdevice_h) $(gsparam_h) $(gsstruct_h)
diff --git a/print/ghostscript7-x11/files/patch-src-gconf.c b/print/ghostscript7-x11/files/patch-src_gconf.c
index 4afa18c6e024..4939f12942ab 100644
--- a/print/ghostscript7-x11/files/patch-src-gconf.c
+++ b/print/ghostscript7-x11/files/patch-src_gconf.c
@@ -1,5 +1,5 @@
---- src/gconf.c.orig	2003-01-17 09:49:00.000000000 +0900
-+++ src/gconf.c	2015-08-22 01:52:10.741824000 +0900
+--- src/gconf.c.orig	2003-01-17 00:49:00 UTC
++++ src/gconf.c
 @@ -81,7 +81,8 @@
  /* Set up the device table. */
  #define device_(dev) (const gx_device *)&dev,
@@ -10,7 +10,7 @@
  #include "gconf.h"
  	 0
  };
-@@ -149,9 +150,29 @@
+@@ -149,9 +150,29 @@ int
  gs_lib_device_list(const gx_device * const **plist,
  		   gs_memory_struct_type_t ** pst)
  {
diff --git a/print/ghostscript7-x11/files/patch-src_gdevhl12.c b/print/ghostscript7-x11/files/patch-src_gdevhl12.c
index 2976befa7cbe..c6fde2f981cf 100644
--- a/print/ghostscript7-x11/files/patch-src_gdevhl12.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevhl12.c
@@ -1,6 +1,6 @@
---- src/gdevhl12.c.orig	Sun Aug  1 13:39:19 2004
-+++ src/gdevhl12.c	Sun Aug  1 13:40:07 2004
-@@ -640,7 +640,7 @@
+--- src/gdevhl12.c.orig	2002-09-22 23:15:05 UTC
++++ src/gdevhl12.c
+@@ -640,7 +640,7 @@ hl1250_print_page_copies(gx_device_print
  	case TRAY_MANUAL:
  	    tray_pcl = "\033&l2H";
  	    break;
diff --git a/print/ghostscript7-x11/files/patch-src-gdevijs.c b/print/ghostscript7-x11/files/patch-src_gdevijs.c
index fed73ce2599f..1affce3e86d8 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevijs.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevijs.c
@@ -1,5 +1,5 @@
---- src/gdevijs.c.orig	Fri Jan 17 09:49:00 2003
-+++ src/gdevijs.c	Thu May 26 01:00:57 2005
+--- src/gdevijs.c.orig	2003-01-17 00:49:00 UTC
++++ src/gdevijs.c
 @@ -29,15 +29,29 @@
   * which is a security risk, since any program can be run.
   * You should use -dSAFER which sets .LockSafetyParams to true 
@@ -30,7 +30,7 @@
  /* This should go into gdevprn.h, or, better yet, gdevprn should
     acquire an API for changing resolution. */
  int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
-@@ -53,6 +67,14 @@
+@@ -53,6 +67,14 @@ private dev_proc_output_page(gsijs_outpu
  private dev_proc_get_params(gsijs_get_params);
  private dev_proc_put_params(gsijs_put_params);
  
@@ -45,7 +45,7 @@
  private const gx_device_procs gsijs_procs =
  prn_color_params_procs(gsijs_open, gsijs_output_page, gsijs_close,
  		   gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
-@@ -85,6 +107,14 @@
+@@ -85,6 +107,14 @@ struct gx_device_ijs_s {
  
      IjsClientCtx *ctx;
      int ijs_version;
@@ -60,7 +60,7 @@
  };
  
  #define DEFAULT_DPI 74   /* See gsijs_set_resolution() below. */
-@@ -112,7 +142,12 @@
+@@ -112,7 +142,12 @@ gx_device_ijs gs_ijs_device =
      FALSE,	/* Tumble_set */
  
      NULL,	/* IjsClient *ctx */
@@ -74,13 +74,17 @@
  };
  
  
-@@ -128,12 +163,254 @@
+@@ -128,12 +163,254 @@ private int gsijs_read_string(gs_param_l
  
  /**************************************************************************/
  
 -/* ------ Private definitions ------ */
 +/* ---------------- Low-level graphic procedures ---------------- */
-+
+ 
+-/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
+-   require some workarounds. When more up-to-date hpijs versions
+-   become ubiquitous, all these workarounds should be removed. */
+-#define HPIJS_1_0_VERSION 29
 +static unsigned char xmask[] =
 +{
 +   0x80,    /* x=0 */
@@ -241,11 +245,7 @@
 +   int code;
 +
 +   ijsdev->k_path = 1;
- 
--/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
--   require some workarounds. When more up-to-date hpijs versions
--   become ubiquitous, all these workarounds should be removed. */
--#define HPIJS_1_0_VERSION 29
++
 +   code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath);
 +
 +   ijsdev->k_path = 0;
@@ -334,7 +334,7 @@
  
  private int
  gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
-@@ -171,34 +448,6 @@
+@@ -171,34 +448,6 @@ gsijs_parse_wxh (const char *val, int si
  }
  
  /**
@@ -369,7 +369,7 @@
   * gsijs_set_generic_params: Set generic IJS parameters.
   **/
  private int
-@@ -209,9 +458,6 @@
+@@ -209,9 +458,6 @@ gsijs_set_generic_params(gx_device_ijs *
      int i, j;
      char *value;
  
@@ -379,7 +379,7 @@
      /* Split IjsParams into separate parameters and send to ijs server */
      value = NULL;
      for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -252,68 +498,6 @@
+@@ -252,68 +498,6 @@ gsijs_set_generic_params(gx_device_ijs *
  }
  
  /**
@@ -448,7 +448,7 @@
   * gsijs_set_margin_params: Do margin negotiation with IJS server.
   **/
  private int
-@@ -324,9 +508,6 @@
+@@ -324,9 +508,6 @@ gsijs_set_margin_params(gx_device_ijs *i
      int i, j;
      char *value;
  
@@ -458,7 +458,7 @@
      /* Split IjsParams into separate parameters and send to ijs server */
      value = NULL;
      for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -493,12 +674,18 @@
+@@ -493,12 +674,18 @@ gsijs_open(gx_device *dev)
      char buf[256];
      bool use_outputfd;
      int fd = -1;
@@ -477,7 +477,7 @@
      /* Decide whether to use OutputFile or OutputFD. Note: how to
         determine this is a tricky question, so we just allow the
         user to set it.
-@@ -513,6 +700,8 @@
+@@ -513,6 +700,8 @@ gsijs_open(gx_device *dev)
      if (code < 0)
  	return code;
  
@@ -486,7 +486,7 @@
      if (use_outputfd) {
  	/* Note: dup() may not be portable to all interesting IJS
  	   platforms. In that case, this branch should be #ifdef'ed out.
-@@ -572,6 +761,9 @@
+@@ -572,6 +761,9 @@ gsijs_open(gx_device *dev)
      if (code >= 0)
  	code = gsijs_set_margin_params(ijsdev);
  
@@ -496,7 +496,7 @@
      return code;
  };
  
-@@ -631,21 +823,6 @@
+@@ -631,21 +823,6 @@ gsijs_raster_width(gx_device *pdev)
      return min(width, end);
  }
  
@@ -518,7 +518,7 @@
  /* Print a page.  Don't use normal printer gdev_prn_output_page 
   * because it opens the output file.
   */
-@@ -656,8 +833,9 @@
+@@ -656,8 +833,9 @@ gsijs_output_page(gx_device *dev, int nu
      gx_device_printer *pdev = (gx_device_printer *)dev;
      int raster = gdev_prn_raster(pdev);
      int ijs_width, ijs_height;
@@ -529,7 +529,7 @@
      unsigned char *data;
      char buf[256];
      double xres = pdev->HWResolution[0];
-@@ -673,13 +851,23 @@
+@@ -673,13 +851,23 @@ gsijs_output_page(gx_device *dev, int nu
  
      /* Determine bitmap width and height */
      ijs_height = gdev_prn_print_scan_lines(dev);
@@ -557,7 +557,7 @@
      /* Required page parameters */
      sprintf(buf, "%d", n_chan);
      gsijs_client_set_param(ijsdev, "NumChan", buf);
-@@ -688,44 +876,71 @@
+@@ -688,44 +876,71 @@ gsijs_output_page(gx_device *dev, int nu
  
      /* This needs to become more sophisticated for DeviceN. */
      strcpy(buf, (n_chan == 4) ? "DeviceCMYK" : 
@@ -649,7 +649,7 @@
      gs_free_object(pdev->memory, data, "gsijs_output_page");
  
      endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
-@@ -1029,7 +1244,6 @@
+@@ -1029,7 +1244,6 @@ gsijs_client_set_param(gx_device_ijs *ij
  	dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
      return code;
  }
diff --git a/print/ghostscript7-x11/files/patch-src-gdevl256.c b/print/ghostscript7-x11/files/patch-src_gdevl256.c
index e11d19f8c2d6..c5cbb24a93bd 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevl256.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevl256.c
@@ -1,6 +1,6 @@
---- src/gdevl256.c.orig	2015-08-22 01:40:41.895138000 +0900
-+++ src/gdevl256.c	2015-08-22 01:40:56.016022000 +0900
-@@ -307,3 +307,12 @@
+--- src/gdevl256.c.orig	2003-01-17 00:49:00 UTC
++++ src/gdevl256.c
+@@ -307,3 +307,12 @@ lvga256_draw_line(gx_device * dev, int x
      gl_line(x0, y0, x1, y1, color);
      return 0;
  }
diff --git a/print/ghostscript7-x11/files/patch-src:gdevlbp8.c b/print/ghostscript7-x11/files/patch-src_gdevlbp8.c
index 052492c58f6a..190ba3a0ad10 100644
--- a/print/ghostscript7-x11/files/patch-src:gdevlbp8.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevlbp8.c
@@ -1,5 +1,5 @@
---- src/gdevlbp8.c.orig	Wed Aug  1 09:48:23 2001
-+++ src/gdevlbp8.c	Thu Mar 14 20:56:05 2002
+--- src/gdevlbp8.c.orig	2003-01-17 00:49:00 UTC
++++ src/gdevlbp8.c
 @@ -22,6 +22,8 @@
  
  /* 
@@ -9,7 +9,7 @@
      2.2.97  Lauri Paatero
              Changed CSI command into ESC [. DCS commands may still need to be changed
              (to ESC P).
-@@ -49,7 +51,6 @@
+@@ -49,7 +51,6 @@ problems
  
  /* The device descriptors */
  private dev_proc_print_page(lbp8_print_page);
@@ -17,7 +17,7 @@
  
  const gx_device_printer far_data gs_lbp8_device =
    prn_device(prn_std_procs, "lbp8",
-@@ -58,14 +59,6 @@
+@@ -58,14 +59,6 @@ const gx_device_printer far_data gs_lbp8
  	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
  	1, lbp8_print_page);
  
@@ -32,7 +32,7 @@
  /* ------ Internal routines ------ */
  
  #define ESC 0x1b
-@@ -84,23 +77,6 @@
+@@ -84,23 +77,6 @@ static const char lbp8_init[] = {
  
  static const char *lbp8_end = NULL;
  
@@ -56,15 +56,14 @@
  /* Send the page to the printer.  */
  private int
  can_print_page(gx_device_printer *pdev, FILE *prn_stream,
-@@ -203,11 +179,4 @@
- lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
+@@ -204,10 +180,3 @@ lbp8_print_page(gx_device_printer *pdev,
  {	return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
  			      lbp8_end, sizeof(lbp8_end));
--}
+ }
 -
 -/* Print a LIPS III page. */
 -private int
 -lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
 -{	return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
 -			      lips3_end, sizeof(lips3_end));
- }
+-}
diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdff.c b/print/ghostscript7-x11/files/patch-src_gdevpdff.c
index 8a292bd4cdec..9f4c0569e929 100644
--- a/print/ghostscript7-x11/files/patch-src:gdevpdff.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevpdff.c
@@ -1,6 +1,6 @@
---- src/gdevpdff.c.org	2003-01-17 09:49:02.000000000 +0900
-+++ src/gdevpdff.c	2003-09-21 05:08:36.000000000 +0900
-@@ -276,6 +276,11 @@
+--- src/gdevpdff.c.orig	2003-01-17 00:49:01 UTC
++++ src/gdevpdff.c
+@@ -276,6 +276,11 @@ pdf_font_embed_status(gx_device_pdf *pde
      const byte *chars = font->font_name.chars;
      uint size = font->font_name.size;
  
@@ -12,7 +12,7 @@
      /*
       * The behavior of Acrobat Distiller changed between 3.0 (PDF 1.2),
       * which will never embed the base 14 fonts, and 4.0 (PDF 1.3), which
-@@ -720,19 +725,22 @@
+@@ -720,19 +725,22 @@ pdf_create_pdf_font(gx_device_pdf *pdev,
  	same &= ~FONT_SAME_METRICS;
  	break;
      case FONT_EMBED_NO:
@@ -48,7 +48,7 @@
  	}
  	code = pdf_compute_font_descriptor(pdev, &fdesc, font, NULL);
  	if (code < 0)
-@@ -888,6 +896,7 @@
+@@ -888,6 +896,7 @@ pdf_create_pdf_font(gx_device_pdf *pdev,
  	memcpy(ppf->widths_known, ftemp_widths_known,
  	       sizeof(ftemp_widths_known));
      }
@@ -56,4 +56,3 @@
      code = pdf_register_font(pdev, font, ppf);
  
      *pppf = ppf;
-
diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdff.h b/print/ghostscript7-x11/files/patch-src_gdevpdff.h
index f64a4e02f6b8..fe2a13e9e6bd 100644
--- a/print/ghostscript7-x11/files/patch-src:gdevpdff.h
+++ b/print/ghostscript7-x11/files/patch-src_gdevpdff.h
@@ -1,6 +1,6 @@
---- src/gdevpdff.h.org	2003-01-17 09:49:02.000000000 +0900
-+++ src/gdevpdff.h	2003-09-18 23:42:38.000000000 +0900
-@@ -117,6 +117,12 @@
+--- src/gdevpdff.h.orig	2003-01-17 00:49:01 UTC
++++ src/gdevpdff.h
+@@ -117,6 +117,12 @@ typedef enum {
      FONT_SUBSET_NO
  } pdf_font_do_subset_t;
  
@@ -13,7 +13,7 @@
  struct pdf_font_descriptor_s {
      pdf_resource_common(pdf_font_descriptor_t);
      pdf_font_name_t FontName;
-@@ -198,6 +204,7 @@
+@@ -198,6 +204,7 @@ struct pdf_font_s {
      gs_font *font;		/* non-0 iff font will notify us; */
  				/* should be a weak pointer */
      int index;			/* in pdf_standard_fonts, -1 if not base 14 */
@@ -21,7 +21,7 @@
      gs_matrix orig_matrix;	/* FontMatrix of unscaled font for embedding */
      bool is_MM_instance;	/* for Type 1/2 fonts, true iff the font */
  				/* is a Multiple Master instance */
-@@ -320,12 +327,6 @@
+@@ -320,12 +327,6 @@ int pdf_do_char_image(P3(gx_device_pdf *
  
  /* ---------------- Exported by gdevpdff.c ---------------- */
  
@@ -34,4 +34,3 @@
  typedef struct pdf_standard_font_s {
      const char *fname;
      gs_encoding_index_t base_encoding;
-
diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdfs.c b/print/ghostscript7-x11/files/patch-src_gdevpdfs.c
index 0378f15c88ab..9eaa4cc4368b 100644
--- a/print/ghostscript7-x11/files/patch-src:gdevpdfs.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevpdfs.c
@@ -1,6 +1,6 @@
---- src/gdevpdfs.c.org	2003-09-20 00:11:16.000000000 +0900
-+++ src/gdevpdfs.c	2003-09-25 17:44:10.000000000 +0900
-@@ -481,15 +481,21 @@
+--- src/gdevpdfs.c.orig	2003-01-17 00:49:01 UTC
++++ src/gdevpdfs.c
+@@ -481,15 +481,21 @@ scan_cmap_text(gs_text_enum_t *pte, gs_f
  
  	    if (cid < pfd->chars_count) {
  		int index = cid >> 3, mask = 0x80 >> (cid & 7);
@@ -26,7 +26,7 @@
  			if (gid >= 0) {
  			    psubf->CIDToGIDMap[cid] = gid;
  			    mark_glyphs_used(subfont, gid + gs_min_cid_glyph,
-@@ -500,7 +506,11 @@
+@@ -500,7 +506,11 @@ scan_cmap_text(gs_text_enum_t *pte, gs_f
  		if (!(psubf->widths_known[index] & mask)) {
  		    int width;
  
diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdfw.c b/print/ghostscript7-x11/files/patch-src_gdevpdfw.c
index a08b87d42724..9250f98bad59 100644
--- a/print/ghostscript7-x11/files/patch-src:gdevpdfw.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevpdfw.c
@@ -1,6 +1,6 @@
---- src/gdevpdfw.c.org	2003-01-17 09:49:02.000000000 +0900
-+++ src/gdevpdfw.c	2003-09-25 17:50:54.000000000 +0900
-@@ -348,18 +348,19 @@
+--- src/gdevpdfw.c.orig	2003-01-17 00:49:01 UTC
++++ src/gdevpdfw.c
+@@ -348,18 +348,19 @@ pdf_write_CIDFont_widths(gx_device_pdf *
      /* Use the most common width as DW. */
  
      {
@@ -25,7 +25,7 @@
  	if (dw != 0)
  	    pprintd1(s, "/DW %d\n", dw);
      }
-@@ -496,14 +497,16 @@
+@@ -496,14 +497,16 @@ pdf_write_font_resource(gx_device_pdf *p
  	if (pdf_has_subset_prefix(chars, size))
  	    chars += SUBSET_PREFIX_SIZE, size -= SUBSET_PREFIX_SIZE;
  	pdf_put_name(pdev, chars, size);
@@ -44,7 +44,7 @@
  	pprintld1(s, "/DescendantFonts[%ld 0 R]",
  		pdf_resource_id((const pdf_resource_t *)pef->DescendantFont));
  	write_Widths = 0;
-@@ -563,8 +566,10 @@
+@@ -563,8 +566,10 @@ pdf_write_font_resource(gx_device_pdf *p
  	break;
      case -1:
  	pdf_write_CIDFont_widths(pdev, pef);
@@ -57,4 +57,3 @@
  	break;
      }
      if (pef->Differences) {
-
diff --git a/print/ghostscript7-x11/files/patch-src-gdevpng.c b/print/ghostscript7-x11/files/patch-src_gdevpng.c
index 0bb66e2f046d..21e900385c2f 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevpng.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevpng.c
@@ -1,5 +1,5 @@
---- src/gdevpng.c.orig	2003-05-15 19:05:29.000000000 +0900
-+++ src/gdevpng.c	2015-02-19 01:59:24.000000000 +0900
+--- src/gdevpng.c.orig	2003-05-15 10:05:29 UTC
++++ src/gdevpng.c
 @@ -41,12 +41,6 @@
  #include "gdevpccm.h"
  #include "gscdefs.h"
@@ -13,7 +13,7 @@
  /*
   * Earlier libpng versions require disabling FILE * I/O altogether.
   * This produces a compiler warning about no prototype for png_init_io.
-@@ -258,7 +252,7 @@
+@@ -258,7 +252,7 @@ png_print_page(gx_device_printer * pdev,
  	goto done;
      }
      /* set error handling */
@@ -22,7 +22,7 @@
  	/* If we get here, we had a problem reading the file */
  	code = gs_note_error(gs_error_VMerror);
  	goto done;
-@@ -268,19 +262,12 @@
+@@ -268,19 +262,12 @@ png_print_page(gx_device_printer * pdev,
      png_init_io(png_ptr, file);
  
      /* set the file information here */
@@ -46,7 +46,7 @@
  	    png_set_invert_alpha(png_ptr);
  	    {   gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
  		png_color_16 background;
-@@ -292,51 +279,68 @@
+@@ -292,51 +279,68 @@ png_print_page(gx_device_printer * pdev,
  		png_set_bKGD(png_ptr, info_ptr, &background);
  	    }
  	    break;
@@ -139,7 +139,7 @@
      }
      /* add comment */
      strncpy(software_key, "Software", sizeof(software_key));
-@@ -346,15 +350,16 @@
+@@ -346,15 +350,16 @@ png_print_page(gx_device_printer * pdev,
      text_png.key = software_key;
      text_png.text = software_text;
      text_png.text_length = strlen(software_text);
@@ -158,7 +158,7 @@
  
      /* Write the contents of the image. */
      for (y = 0; y < height; y++) {
-@@ -365,8 +370,10 @@
+@@ -365,8 +370,10 @@ png_print_page(gx_device_printer * pdev,
      /* write the rest of the file */
      png_write_end(png_ptr, info_ptr);
  
@@ -169,7 +169,7 @@
  
    done:
      /* free the structures */
-@@ -376,6 +383,7 @@
+@@ -376,6 +383,7 @@ png_print_page(gx_device_printer * pdev,
      return code;
  }
  
@@ -177,7 +177,7 @@
  /*
   * Patch around a static reference to a never-used procedure.
   * This could be avoided if we were willing to edit pngconf.h to
-@@ -393,6 +401,7 @@
+@@ -393,6 +401,7 @@ png_push_fill_buffer(png_structp png_ptr
  {
  }
  #endif
diff --git a/print/ghostscript7-x11/files/patch-src-gdevvglb.c b/print/ghostscript7-x11/files/patch-src_gdevvglb.c
index bdacbfbbfca0..51d1a7f39c79 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevvglb.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevvglb.c
@@ -1,6 +1,6 @@
---- src/gdevvglb.c.orig	2015-08-22 01:41:20.966252000 +0900
-+++ src/gdevvglb.c	2015-08-22 01:41:35.725091000 +0900
-@@ -373,3 +373,12 @@
+--- src/gdevvglb.c.orig	2003-01-17 00:49:02 UTC
++++ src/gdevvglb.c
+@@ -373,3 +373,12 @@ vgalib_put_params(gx_device * dev, gs_pa
      }
      return 0;
  }
diff --git a/print/ghostscript7-x11/files/patch-src-gdevxalt.c b/print/ghostscript7-x11/files/patch-src_gdevxalt.c
index 4d9a88b43fb4..023fad7e2e89 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevxalt.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevxalt.c
@@ -1,5 +1,5 @@
---- src/gdevxalt.c.orig	2015-08-22 01:42:12.291619000 +0900
-+++ src/gdevxalt.c	2015-08-22 01:42:53.871222000 +0900
+--- src/gdevxalt.c.orig	2003-01-17 00:49:02 UTC
++++ src/gdevxalt.c
 @@ -30,6 +30,7 @@
  #include "gdevx.h"
  
@@ -8,7 +8,7 @@
  
  /*
   * Define a forwarding device with a cache for the first 16 colors,
-@@ -957,3 +958,20 @@
+@@ -957,3 +958,20 @@ x_rg32x_alt_map_color(gx_device * dev, g
      rgb[2] = ((color >> 11) & 0x3ff) * gx_max_color_value / 0x3ff;
      return -1;
  }
diff --git a/print/ghostscript7-x11/files/patch-src:genarch.c b/print/ghostscript7-x11/files/patch-src_genarch.c
index a015e69e758a..e7a7d84acc52 100644
--- a/print/ghostscript7-x11/files/patch-src:genarch.c
+++ b/print/ghostscript7-x11/files/patch-src_genarch.c
@@ -1,6 +1,6 @@
---- src/genarch.c.orig	Tue Jun  5 15:38:57 2001
-+++ src/genarch.c	Wed Jun 20 04:17:42 2001
-@@ -41,6 +41,7 @@
+--- src/genarch.c.orig	2003-01-17 00:49:02 UTC
++++ src/genarch.c
+@@ -40,6 +40,7 @@ section(FILE * f, const char *str)
      fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
  }
  
@@ -8,7 +8,7 @@
  private clock_t
  time_clear(char *buf, int bsize, int nreps)
  {
-@@ -51,6 +52,7 @@
+@@ -50,6 +51,7 @@ time_clear(char *buf, int bsize, int nre
  	memset(buf, 0, bsize);
      return clock() - t;
  }
@@ -16,7 +16,7 @@
  
  private void
  define(FILE *f, const char *str)
-@@ -181,6 +183,7 @@
+@@ -180,6 +182,7 @@ main(int argc, char *argv[])
      fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
  #undef PRINT_MAX
  
@@ -24,7 +24,7 @@
      section(f, "Cache sizes");
  
      /*
-@@ -241,6 +244,7 @@
+@@ -240,6 +243,7 @@ main(int argc, char *argv[])
  	}
  	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
      }
diff --git a/print/ghostscript7-x11/files/patch-src-gnudevs.mak b/print/ghostscript7-x11/files/patch-src_gnudevs.mak
index d6e15432bf52..3b9eddcaf4b8 100644
--- a/print/ghostscript7-x11/files/patch-src-gnudevs.mak
+++ b/print/ghostscript7-x11/files/patch-src_gnudevs.mak
@@ -1,6 +1,6 @@
---- src/gnudevs.mak.orig	2003-02-10 03:12:48.000000000 +0900
-+++ src/gnudevs.mak	2015-08-22 00:20:45.754922000 +0900
-@@ -66,64 +66,6 @@
+--- src/gnudevs.mak.orig	2003-02-09 18:12:48 UTC
++++ src/gnudevs.mak
+@@ -66,64 +66,6 @@ sxlcrt_=$(GLOBJ)gdevln03.$(OBJ)
  $(DD)sxlcrt.dev : $(sxlcrt_) $(DD)page.dev
  	$(SETPDEV) $(DD)sxlcrt $(sxlcrt_)
  
diff --git a/print/ghostscript7-x11/files/patch-src-gp_unix.c b/print/ghostscript7-x11/files/patch-src_gp__unix.c
index 85f56e3cc021..b346bdcce4d2 100644
--- a/print/ghostscript7-x11/files/patch-src-gp_unix.c
+++ b/print/ghostscript7-x11/files/patch-src_gp__unix.c
@@ -1,6 +1,6 @@
---- src/gp_unix.c.orig	2003-01-17 09:49:02.000000000 +0900
-+++ src/gp_unix.c	2015-08-22 01:54:32.507486000 +0900
-@@ -41,11 +41,60 @@
+--- src/gp_unix.c.orig	2003-01-17 00:49:02 UTC
++++ src/gp_unix.c
+@@ -41,11 +41,60 @@ extern char *getenv(P1(const char *));
  
  #endif
  
@@ -61,7 +61,7 @@
  
  /* Do platform-dependent cleanup. */
  void
-@@ -57,6 +106,7 @@
+@@ -57,6 +106,7 @@ gp_exit(int exit_status, int code)
  void
  gp_do_exit(int exit_status)
  {
@@ -69,7 +69,7 @@
  }
  
  /* ------ Miscellaneous ------ */
-@@ -67,7 +117,11 @@
+@@ -67,7 +117,11 @@ gp_do_exit(int exit_status)
  const char *
  gp_strerror(int errnum)
  {
diff --git a/print/ghostscript7-x11/files/patch-src-gs.mak b/print/ghostscript7-x11/files/patch-src_gs.mak
index a9ee54700595..3f5654dd8710 100644
--- a/print/ghostscript7-x11/files/patch-src-gs.mak
+++ b/print/ghostscript7-x11/files/patch-src_gs.mak
@@ -1,6 +1,6 @@
---- src/gs.mak.orig	2015-08-21 22:03:26.487964000 +0900
-+++ src/gs.mak	2015-08-21 22:04:09.624656000 +0900
-@@ -235,7 +235,7 @@
+--- src/gs.mak.orig	2003-01-28 12:02:09 UTC
++++ src/gs.mak
+@@ -235,7 +235,7 @@ GENINIT_XE=$(AUXGEN)geninit$(XEAUX)
  gconfig_h=$(GLGENDIR)$(D)gconfxx.h
  gconfigf_h=$(GLGENDIR)$(D)gconfxc.h
  
@@ -9,7 +9,7 @@
  	$(NO_OP)
  
  # the distclean and maintainer-clean targets (if any)
-@@ -248,6 +248,7 @@
+@@ -248,6 +248,7 @@ realclean : clean
  clean : mostlyclean
  	$(RM_) $(GSGEN)arch.h
  	$(RM_) $(GS_XE)
diff --git a/print/ghostscript7-x11/files/patch-src-gsalloc.c b/print/ghostscript7-x11/files/patch-src_gsalloc.c
index 7c29a14eeada..3741352e2409 100644
--- a/print/ghostscript7-x11/files/patch-src-gsalloc.c
+++ b/print/ghostscript7-x11/files/patch-src_gsalloc.c
@@ -1,6 +1,6 @@
---- src/gsalloc.c.orig	2013-04-30 11:14:17.000000000 +0900
-+++ src/gsalloc.c	2013-04-30 11:14:34.000000000 +0900
-@@ -195,7 +195,7 @@
+--- src/gsalloc.c.orig	2003-01-17 00:49:02 UTC
++++ src/gsalloc.c
+@@ -195,7 +195,7 @@ ialloc_alloc_state(gs_raw_memory_t * par
      iimem->large_size = ((chunk_size / 4) & -obj_align_mod) + 1;
      iimem->is_controlled = false;
      iimem->gc_status.vm_threshold = chunk_size * 3L;
diff --git a/print/ghostscript7-x11/files/patch-src-gsmalloc.c b/print/ghostscript7-x11/files/patch-src_gsmalloc.c
index 9b4d97da3844..687d68768d0d 100644
--- a/print/ghostscript7-x11/files/patch-src-gsmalloc.c
+++ b/print/ghostscript7-x11/files/patch-src_gsmalloc.c
@@ -1,6 +1,6 @@
---- src/gsmalloc.c.orig	2015-07-24 09:55:54.032137000 +0900
-+++ src/gsmalloc.c	2015-07-24 09:57:15.070246000 +0900
-@@ -170,7 +170,7 @@
+--- src/gsmalloc.c.orig	2003-01-17 00:49:03 UTC
++++ src/gsmalloc.c
+@@ -170,7 +170,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u
      } else {
  	uint added = size + sizeof(gs_malloc_block_t);
  
diff --git a/print/ghostscript7-x11/files/patch-src-gxclrast.c b/print/ghostscript7-x11/files/patch-src_gxclrast.c
index 59d5053ad305..8acf4ca384e5 100644
--- a/print/ghostscript7-x11/files/patch-src-gxclrast.c
+++ b/print/ghostscript7-x11/files/patch-src_gxclrast.c
@@ -1,6 +1,6 @@
---- src/gxclrast.c.orig	2013-04-30 09:13:13.000000000 +0900
-+++ src/gxclrast.c	2013-04-30 09:13:41.000000000 +0900
-@@ -87,10 +87,10 @@
+--- src/gxclrast.c.orig	2003-01-17 00:49:03 UTC
++++ src/gxclrast.c
+@@ -87,10 +87,10 @@ cmd_print_bits(const byte * data, int wi
  private long
  cmd_get_w(const byte * p, const byte ** rp)
  {
diff --git a/print/ghostscript7-x11/files/patch-src-gxfixed.h b/print/ghostscript7-x11/files/patch-src_gxfixed.h
index 0988ca612c9b..991ab095762e 100644
--- a/print/ghostscript7-x11/files/patch-src-gxfixed.h
+++ b/print/ghostscript7-x11/files/patch-src_gxfixed.h
@@ -1,5 +1,5 @@
---- src/gxfixed.h.orig	2013-04-30 11:29:39.000000000 +0900
-+++ src/gxfixed.h	2013-04-30 11:31:03.000000000 +0900
+--- src/gxfixed.h.orig	2003-01-17 00:49:03 UTC
++++ src/gxfixed.h
 @@ -27,12 +27,22 @@
   * quantities: integers lose accuracy in crucial places,
   * and floating point arithmetic is slow.
@@ -28,7 +28,7 @@
  #define fixed_0 0L
  #define fixed_epsilon 1L
  /*
-@@ -120,13 +130,8 @@
+@@ -120,13 +130,8 @@ typedef ulong ufixed;		/* only used in a
  #define fixed_truncated(x) ((x) < 0 ? fixed_ceiling(x) : fixed_floor(x))
  
  /* Define the largest and smallest integer values that fit in a fixed. */
diff --git a/print/ghostscript7-x11/files/patch-src:gxobj.h b/print/ghostscript7-x11/files/patch-src_gxobj.h
index f0df8565100c..c2ff485ac101 100644
--- a/print/ghostscript7-x11/files/patch-src:gxobj.h
+++ b/print/ghostscript7-x11/files/patch-src_gxobj.h
@@ -1,6 +1,6 @@
---- src/gxobj.h.orig	Fri Feb 22 19:45:59 2002
-+++ src/gxobj.h	Thu Dec 19 00:16:57 2002
-@@ -99,10 +99,14 @@
+--- src/gxobj.h.orig	2003-01-17 00:49:04 UTC
++++ src/gxobj.h
+@@ -101,10 +101,14 @@ typedef struct obj_header_data_s {
   * The final | is because back pointer values are divided by obj_back_scale,
   * so objects must be aligned at least 0 mod obj_back_scale.
   */
diff --git a/print/ghostscript7-x11/files/patch-src-ibnum.c b/print/ghostscript7-x11/files/patch-src_ibnum.c
index 2df0a7d138c7..a847a45a6174 100644
--- a/print/ghostscript7-x11/files/patch-src-ibnum.c
+++ b/print/ghostscript7-x11/files/patch-src_ibnum.c
@@ -1,6 +1,6 @@
---- src/ibnum.c.orig	2003-01-17 09:49:04.000000000 +0900
-+++ src/ibnum.c	2013-04-30 11:18:27.000000000 +0900
-@@ -124,11 +124,11 @@
+--- src/ibnum.c.orig	2003-01-17 00:49:04 UTC
++++ src/ibnum.c
+@@ -124,11 +124,11 @@ sdecode_number(const byte * str, int for
  	case num_int32:
  	case num_int32 + 16:
  	    if ((format & 31) == 0) {
@@ -14,7 +14,7 @@
  		    binary_scale[format & 31];
  		return t_real;
  	    }
-@@ -171,18 +171,14 @@
+@@ -171,18 +171,14 @@ sdecodeshort(const byte * p, int format)
  }
  
  /* Decode a (32-bit, signed) long. */
@@ -38,7 +38,7 @@
      return v;
  }
  
-@@ -190,7 +186,7 @@
+@@ -190,7 +186,7 @@ sdecodelong(const byte * p, int format)
  float
  sdecodefloat(const byte * p, int format)
  {
diff --git a/print/ghostscript7-x11/files/patch-src-ibnum.h b/print/ghostscript7-x11/files/patch-src_ibnum.h
index ffec70cac2ae..4f4aaa6496c0 100644
--- a/print/ghostscript7-x11/files/patch-src-ibnum.h
+++ b/print/ghostscript7-x11/files/patch-src_ibnum.h
@@ -1,6 +1,6 @@
---- src/ibnum.h.orig	2013-04-30 10:50:12.000000000 +0900
-+++ src/ibnum.h	2013-04-30 10:50:29.000000000 +0900
-@@ -60,7 +60,7 @@
+--- src/ibnum.h.orig	2003-01-17 00:49:04 UTC
++++ src/ibnum.h
+@@ -60,7 +60,7 @@ int num_array_get(P4(const ref *, int, u
  int sdecode_number(P3(const byte *, int, ref *));
  int sdecodeshort(P2(const byte *, int));
  uint sdecodeushort(P2(const byte *, int));
diff --git a/print/ghostscript7-x11/files/patch-src-icclib.mak b/print/ghostscript7-x11/files/patch-src_icclib.mak
index a60ef670dfa2..799053e840ce 100644
--- a/print/ghostscript7-x11/files/patch-src-icclib.mak
+++ b/print/ghostscript7-x11/files/patch-src_icclib.mak
@@ -1,6 +1,6 @@
---- src/icclib.mak.orig	2013-04-30 02:10:16.000000000 +0900
-+++ src/icclib.mak	2013-04-30 02:10:26.000000000 +0900
-@@ -73,7 +73,7 @@
+--- src/icclib.mak.orig	2003-01-17 00:49:04 UTC
++++ src/icclib.mak
+@@ -73,7 +73,7 @@ $(ICCGEN)icclib.dev : $(ICCLIB_MAK) $(EC
  
  icc_h=$(ICCSRC)$(D)icc.h $(ICCSRC)$(D)icc$(ICCPROFVER).h
  
diff --git a/print/ghostscript7-x11/files/patch-src-idebug.c b/print/ghostscript7-x11/files/patch-src_idebug.c
index 142926b4474b..fd571d6f3ffe 100644
--- a/print/ghostscript7-x11/files/patch-src-idebug.c
+++ b/print/ghostscript7-x11/files/patch-src_idebug.c
@@ -1,6 +1,6 @@
---- src/idebug.c.orig	2013-04-30 11:06:57.000000000 +0900
-+++ src/idebug.c	2013-04-30 11:07:09.000000000 +0900
-@@ -90,7 +90,7 @@
+--- src/idebug.c.orig	2003-01-17 00:49:04 UTC
++++ src/idebug.c
+@@ -90,7 +90,7 @@ debug_print_full_ref(const ref * pref)
  	case t_fontID:
  	    goto strct;
  	case t_integer:
diff --git a/print/ghostscript7-x11/files/patch-src-idparam.c b/print/ghostscript7-x11/files/patch-src_idparam.c
index 636d7c16b510..21035471f01e 100644
--- a/print/ghostscript7-x11/files/patch-src-idparam.c
+++ b/print/ghostscript7-x11/files/patch-src_idparam.c
@@ -1,6 +1,6 @@
---- src/idparam.c.orig	2013-04-30 10:54:55.000000000 +0900
-+++ src/idparam.c	2013-04-30 10:55:23.000000000 +0900
-@@ -61,8 +61,7 @@
+--- src/idparam.c.orig	2003-01-17 00:49:04 UTC
++++ src/idparam.c
+@@ -61,8 +61,7 @@ dict_int_null_param(const ref * pdict, c
  		    int maxval, int defaultval, int *pvalue)
  {
      ref *pdval;
@@ -10,7 +10,7 @@
  
      if (pdict == 0 || dict_find_string(pdict, kstr, &pdval) <= 0) {
  	ival = defaultval;
-@@ -349,7 +348,7 @@
+@@ -349,7 +348,7 @@ dict_uid_param(const ref * pdict, gs_uid
      } else {
  	if (!r_has_type(puniqueid, t_integer) ||
  	    puniqueid->value.intval < 0 ||
diff --git a/print/ghostscript7-x11/files/patch-src-ijs.mak b/print/ghostscript7-x11/files/patch-src_ijs.mak
index be8ee7807ac5..0f85a8ca35fe 100644
--- a/print/ghostscript7-x11/files/patch-src-ijs.mak
+++ b/print/ghostscript7-x11/files/patch-src_ijs.mak
@@ -1,6 +1,6 @@
---- src/ijs.mak.orig	2003-01-17 09:49:04.000000000 +0900
-+++ src/ijs.mak	2013-04-30 02:24:08.000000000 +0900
-@@ -66,7 +66,7 @@
+--- src/ijs.mak.orig	2003-01-17 00:49:04 UTC
++++ src/ijs.mak
+@@ -66,7 +66,7 @@ ijs_h=$(IJSSRC)ijs.h
  ijs_client_h=$(IJSSRC)$(D)ijs_client.h
  ijs_server_h=$(IJSSRC)$(D)ijs_server.h
  
@@ -9,7 +9,7 @@
  #	echo $(IJS_CCFLAGS)
  	$(EXP)$(ECHOGS_XE) $(IJS_CCFLAGS)
  	$(IJS_CC) $(IJSO_)ijs.$(OBJ) $(C_) $(IJSSRC)ijs.c
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ $(IJSOBJ)ijs_server.$(OBJ) : $(IJSSRC)ij
      $(IJSDEP) $(ijs_h) $(ijs_server_h)
  	$(IJS_CC) $(IJSO_)ijs_server.$(OBJ) $(C_) $(IJSSRC)ijs_server.c
  
diff --git a/print/ghostscript7-x11/files/patch-src-int.mak b/print/ghostscript7-x11/files/patch-src_int.mak
index 9e4c5a2c7663..01b748aeba23 100644
--- a/print/ghostscript7-x11/files/patch-src-int.mak
+++ b/print/ghostscript7-x11/files/patch-src_int.mak
@@ -1,6 +1,6 @@
---- src/int.mak.orig	2013-04-30 02:55:45.000000000 +0900
-+++ src/int.mak	2013-04-30 02:56:06.000000000 +0900
-@@ -953,10 +953,10 @@
+--- src/int.mak.orig	2003-01-17 00:49:04 UTC
++++ src/int.mak
+@@ -953,10 +953,10 @@ $(PSOBJ)iccfont.$(OBJ) : $(PSSRC)iccfont
  
  # We select either iccinit0 or iccinit1 depending on COMPILE_INITS.
  
@@ -13,7 +13,7 @@
  	$(CP_) $(PSOBJ)gs_init.$(OBJ) $(PSOBJ)iccinit1.$(OBJ)
  
  # All the gs_*.ps files should be prerequisites of gs_init.c,
-@@ -964,7 +964,7 @@
+@@ -964,7 +964,7 @@ $(PSOBJ)iccinit1.$(OBJ) : $(PSOBJ)gs_ini
  $(PSGEN)gs_init.c : $(PSLIB)$(GS_INIT) $(GENINIT_XE) $(gconfig_h)
  	$(EXP)$(GENINIT_XE) -I $(PSLIB) $(GS_INIT) $(gconfig_h) -c $(PSGEN)gs_init.c
  
diff --git a/print/ghostscript7-x11/files/patch-src-iparam.c b/print/ghostscript7-x11/files/patch-src_iparam.c
index b0bb91a4d3ef..7407e2e98968 100644
--- a/print/ghostscript7-x11/files/patch-src-iparam.c
+++ b/print/ghostscript7-x11/files/patch-src_iparam.c
@@ -1,6 +1,6 @@
---- src/iparam.c.orig	2013-04-30 11:12:36.000000000 +0900
-+++ src/iparam.c	2013-04-30 11:13:07.000000000 +0900
-@@ -67,7 +67,7 @@
+--- src/iparam.c.orig	2003-01-17 00:49:04 UTC
++++ src/iparam.c
+@@ -67,7 +67,7 @@ ref_to_key(const ref * pref, gs_param_ke
  	int len;
  	byte *buf;
  
@@ -9,7 +9,7 @@
  	len = strlen(istr);
  	/* GC will take care of freeing this: */
  	buf = gs_alloc_string(plist->memory, len, "ref_to_key");
-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ stack_param_enumerate(iparam_list * plis
  {
      int code;
      stack_param_list *const splist = (stack_param_list *) plist;
@@ -18,7 +18,7 @@
      ref *stack_element;
  
      do {
-@@ -563,12 +563,6 @@
+@@ -563,12 +563,6 @@ ref_param_read_int_array(gs_param_list *
  	    code = gs_note_error(e_typecheck);
  	    break;
  	}
diff --git a/print/ghostscript7-x11/files/patch-src-iref.h b/print/ghostscript7-x11/files/patch-src_iref.h
index 33313d38047b..a2d9d77e775d 100644
--- a/print/ghostscript7-x11/files/patch-src-iref.h
+++ b/print/ghostscript7-x11/files/patch-src_iref.h
@@ -1,6 +1,6 @@
---- src/iref.h.orig	2013-04-30 11:13:29.000000000 +0900
-+++ src/iref.h	2013-04-30 11:13:41.000000000 +0900
-@@ -441,7 +441,7 @@
+--- src/iref.h.orig	2003-01-17 00:49:04 UTC
++++ src/iref.h
+@@ -441,7 +441,7 @@ struct ref_s {
  #define r_set_ptr(rp,ptr) ((rp)->value.pstruct = (obj_header_t *)(ptr))
  
      union v {			/* name the union to keep gdb happy */
diff --git a/print/ghostscript7-x11/files/patch-src-iscan.c b/print/ghostscript7-x11/files/patch-src_iscan.c
index cd8b03f6ab56..696ab0d60de8 100644
--- a/print/ghostscript7-x11/files/patch-src-iscan.c
+++ b/print/ghostscript7-x11/files/patch-src_iscan.c
@@ -1,6 +1,6 @@
---- src/iscan.c.orig	2013-04-30 10:47:49.000000000 +0900
-+++ src/iscan.c	2013-04-30 10:48:19.000000000 +0900
-@@ -635,7 +635,7 @@
+--- src/iscan.c.orig	2003-01-17 00:49:04 UTC
++++ src/iscan.c
+@@ -635,7 +635,7 @@ scan_token(i_ctx_t *i_ctx_p, stream * s,
  		uint size = ref_stack_count_inline(&o_stack) - pstack;
  		ref arr;
  
diff --git a/print/ghostscript7-x11/files/patch-src-iscanbin.c b/print/ghostscript7-x11/files/patch-src_iscanbin.c
index 1f39c88b7209..f256e453c5b4 100644
--- a/print/ghostscript7-x11/files/patch-src-iscanbin.c
+++ b/print/ghostscript7-x11/files/patch-src_iscanbin.c
@@ -1,6 +1,6 @@
---- src/iscanbin.c.orig	2013-04-30 10:51:53.000000000 +0900
-+++ src/iscanbin.c	2013-04-30 10:53:42.000000000 +0900
-@@ -173,7 +173,7 @@
+--- src/iscanbin.c.orig	2003-01-17 00:49:04 UTC
++++ src/iscanbin.c
+@@ -173,7 +173,7 @@ scan_binary_token(i_ctx_t *i_ctx_p, stre
  		pbs->num_format = num_format;
  		if (top_size == 0) {
  		    /* Extended header (2-byte array size, 4-byte length) */
@@ -9,7 +9,7 @@
  
  		    if (rcnt < 7) {
  			s_end_inline(s, p - 1, rlimit);
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ scan_binary_token(i_ctx_t *i_ctx_p, stre
  		    if (p[1] != 0) /* reserved, must be 0 */
  			return_error(e_syntaxerror);
  		    top_size = sdecodeushort(p + 2, num_format);
@@ -18,7 +18,7 @@
  		    if ((size = lsize) != lsize)
  			return_error(e_limitcheck);
  		    hsize = 8;
-@@ -445,8 +445,7 @@
+@@ -445,8 +445,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
      for (; index < max_array_index; p += SIZEOF_BIN_SEQ_OBJ, index++) {
  	ref *op = abase + index;
  	uint osize;
@@ -28,7 +28,7 @@
  
  	s_end_inline(s, p, rlimit);	/* in case of error */
  	if (rlimit - p < SIZEOF_BIN_SEQ_OBJ) {
-@@ -464,14 +463,14 @@
+@@ -464,14 +463,14 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
  		make_null(op);
  		break;
  	    case BS_TYPE_INTEGER:
@@ -45,7 +45,7 @@
  			vreal = (float)ldexp((double)value, -osize);
  		    } else {
  			vreal = sdecodefloat(p + 5, num_format);
-@@ -480,7 +479,7 @@
+@@ -480,7 +479,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
  		    break;
  		}
  	    case BS_TYPE_BOOLEAN:
@@ -54,7 +54,7 @@
  		break;
  	    case BS_TYPE_STRING:
  		osize = sdecodeushort(p + 3, num_format);
-@@ -492,7 +491,7 @@
+@@ -492,7 +491,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
  		    make_empty_string(op, attrs);
  		    break;
  		}
@@ -63,7 +63,7 @@
  		if (value < max_array_index * SIZEOF_BIN_SEQ_OBJ ||
  		    value + osize > size
  		    )
-@@ -524,7 +523,7 @@
+@@ -524,7 +523,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
  		/* falls through */
  	    case BS_TYPE_NAME:
  		osize = sdecodeushort(p + 3, num_format);
@@ -72,7 +72,7 @@
  		switch (osize) {
  		    case 0:
  			code = array_get(user_names_p, value, op);
-@@ -546,7 +545,7 @@
+@@ -546,7 +545,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi
  		osize = sdecodeushort(p + 3, num_format);
  		atype = t_array;
  	      arr:
diff --git a/print/ghostscript7-x11/files/patch-src-iscannum.c b/print/ghostscript7-x11/files/patch-src_iscannum.c
index 4a69664074a6..592dbbece941 100644
--- a/print/ghostscript7-x11/files/patch-src-iscannum.c
+++ b/print/ghostscript7-x11/files/patch-src_iscannum.c
@@ -1,6 +1,6 @@
---- src/iscannum.c.orig	2003-01-17 09:49:04.000000000 +0900
-+++ src/iscannum.c	2013-04-30 11:17:14.000000000 +0900
-@@ -57,7 +57,6 @@
+--- src/iscannum.c.orig	2003-01-17 00:49:04 UTC
++++ src/iscannum.c
+@@ -57,7 +57,6 @@ scan_number(const byte * str, const byte
      };
  
      int ival;
@@ -8,7 +8,7 @@
      double dval;
      int exp10;
      int code = 0;
-@@ -104,8 +103,26 @@
+@@ -104,8 +103,26 @@ scan_number(const byte * str, const byte
  	GET_NEXT(c, sp, goto iret);
  	if (!IS_DIGIT(d, c))
  	    break;
@@ -37,7 +37,7 @@
      }
    ind:				/* We saw a non-digit while accumulating an integer in ival. */
      switch (c) {
-@@ -116,6 +133,8 @@
+@@ -116,6 +133,8 @@ scan_number(const byte * str, const byte
  	    *psp = sp;
  	    code = 1;
  	    break;
@@ -46,7 +46,7 @@
  	case 'e':
  	case 'E':
  	    if (sign < 0)
-@@ -125,8 +144,8 @@
+@@ -125,8 +144,8 @@ scan_number(const byte * str, const byte
  	    goto fe;
  	case '#':
  	    {
@@ -57,7 +57,7 @@
  
  		if (sign || radix < min_radix || radix > max_radix)
  		    return_error(e_syntaxerror);
-@@ -136,19 +155,19 @@
+@@ -136,19 +155,19 @@ scan_number(const byte * str, const byte
  
  		    switch (radix) {
  			case 2:
@@ -82,7 +82,7 @@
  			    break;
  			default:	/* can't happen */
  			    return_error(e_rangecheck);
-@@ -161,13 +180,13 @@
+@@ -161,13 +180,13 @@ scan_number(const byte * str, const byte
  			    code = 1;
  			    break;
  			}
@@ -99,7 +99,7 @@
  		    for (;; uval = uval * radix + d) {
  			GET_NEXT(c, sp, break);
  			d = decoder[c];
-@@ -176,8 +195,8 @@
+@@ -176,8 +195,8 @@ scan_number(const byte * str, const byte
  			    code = 1;
  			    break;
  			}
@@ -110,7 +110,7 @@
  			    )
  			    return_error(e_limitcheck);
  		    }
-@@ -190,55 +209,6 @@
+@@ -190,55 +209,6 @@ iret:
      make_int(pref, (sign < 0 ? -ival : ival));
      return code;
  
@@ -166,7 +166,7 @@
      /* Accumulate a double in dval. */
  l2d:
      exp10 = 0;
-@@ -274,8 +244,8 @@
+@@ -274,8 +244,8 @@ i2r:
      exp10 = 0;
      while (IS_DIGIT(d, c)) {
  	if (WOULD_OVERFLOW(ival, d, max_int)) {
@@ -177,7 +177,7 @@
  	}
  	ival = ival * 10 + d;
  	exp10--;
-@@ -293,23 +263,6 @@
+@@ -293,23 +263,6 @@ i2r:
      dval = ival;
      goto fe;
  
diff --git a/print/ghostscript7-x11/files/patch-src-iutil.c b/print/ghostscript7-x11/files/patch-src_iutil.c
index c77cb19ddd84..7e754463bd42 100644
--- a/print/ghostscript7-x11/files/patch-src-iutil.c
+++ b/print/ghostscript7-x11/files/patch-src_iutil.c
@@ -1,6 +1,6 @@
---- src/iutil.c.orig	2013-04-30 10:51:05.000000000 +0900
-+++ src/iutil.c	2013-04-30 10:51:20.000000000 +0900
-@@ -428,7 +428,7 @@
+--- src/iutil.c.orig	2003-01-17 00:49:04 UTC
++++ src/iutil.c
+@@ -428,7 +428,7 @@ other:
  	data = (const byte *)(op->value.boolval ? "true" : "false");
  	break;
      case t_integer:
diff --git a/print/ghostscript7-x11/files/patch-src-lib.mak b/print/ghostscript7-x11/files/patch-src_lib.mak
index 6208eb8034a3..2656c5831d92 100644
--- a/print/ghostscript7-x11/files/patch-src-lib.mak
+++ b/print/ghostscript7-x11/files/patch-src_lib.mak
@@ -1,6 +1,6 @@
---- src/lib.mak.orig	2003-01-17 09:49:05.000000000 +0900
-+++ src/lib.mak	2015-08-22 02:23:05.682462000 +0900
-@@ -35,6 +35,7 @@
+--- src/lib.mak.orig	2003-01-17 00:49:05 UTC
++++ src/lib.mak
+@@ -35,6 +35,7 @@ GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_
  GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_)
  GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_)
  GLCCLEAF=$(CC_LEAF) $(I_)$(GLI_)$(_I) $(GLF_)
@@ -8,7 +8,7 @@
  # All top-level makefiles define GLD.
  #GLD=$(GLGEN)
  
-@@ -187,22 +188,22 @@
+@@ -187,22 +188,22 @@ gsnogc_=$(GLOBJ)gsnogc.$(OBJ)
  $(GLD)gsnogc.dev : $(LIB_MAK) $(ECHOGS_XE) $(gsnogc_)
  	$(SETMOD) $(GLD)gsnogc $(gsnogc_)
  
@@ -35,7 +35,7 @@
  	$(GLCC) $(GLO_)gsbittab.$(OBJ) $(C_) $(GLSRC)gsbittab.c
  
  # gsflip is not part of the standard configuration: it's rather large,
-@@ -765,7 +766,7 @@
+@@ -765,7 +766,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)
diff --git a/print/ghostscript7-x11/files/patch-src:unix-dll.mak b/print/ghostscript7-x11/files/patch-src_unix-dll.mak
index f6032f9f08ac..3762f90eda3a 100644
--- a/print/ghostscript7-x11/files/patch-src:unix-dll.mak
+++ b/print/ghostscript7-x11/files/patch-src_unix-dll.mak
@@ -1,6 +1,6 @@
---- src/unix-dll.mak.orig	2003-01-17 09:49:05.000000000 +0900
-+++ src/unix-dll.mak	2015-08-22 01:13:03.452736000 +0900
-@@ -47,12 +47,17 @@
+--- src/unix-dll.mak.orig	2003-01-17 00:49:05 UTC
++++ src/unix-dll.mak
+@@ -47,12 +47,17 @@ GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME)
  GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
  
  # shared library
@@ -22,7 +22,7 @@
  
  # Shared object is built by redefining GS_XE in a recursive make.
  
-@@ -68,15 +73,16 @@
+@@ -68,15 +73,16 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
  
  # Build the small Ghostscript loaders, with Gtk+ and without
  
@@ -44,7 +44,7 @@
   GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
   STDIO_IMPLEMENTATION=c\
   DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
-@@ -98,21 +104,26 @@
+@@ -98,21 +104,26 @@ sodebug: SODIRS
  	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
  
  install-so: so
diff --git a/print/ghostscript7-x11/files/patch-src-unixinst.mak b/print/ghostscript7-x11/files/patch-src_unixinst.mak
index 1a8041d74861..4236b575f6af 100644
--- a/print/ghostscript7-x11/files/patch-src-unixinst.mak
+++ b/print/ghostscript7-x11/files/patch-src_unixinst.mak
@@ -1,6 +1,6 @@
---- src/unixinst.mak.orig	2003-01-17 09:49:05.000000000 +0900
-+++ src/unixinst.mak	2015-08-22 00:31:09.540215000 +0900
-@@ -30,24 +30,24 @@
+--- src/unixinst.mak.orig	2003-01-17 00:49:05 UTC
++++ src/unixinst.mak
+@@ -30,24 +30,24 @@ install: install-exec install-scripts in
  # rules, just in case bindir or scriptdir is a subdirectory of any of these.
  
  install-exec: $(GS_XE)
@@ -35,7 +35,7 @@
  	done'
  
  PSDOCDIR=$(PSLIBDIR)/../doc
-@@ -60,10 +60,10 @@
+@@ -60,10 +60,10 @@ install-data: install-libdata install-do
  # one file from each subdirectory just as a sanity check.
  
  install-libdata: 
@@ -50,7 +50,7 @@
  	$(SH) -c 'for f in \
  Fontmap Fontmap.GS \
  CIDFnmap CIDFnmap.Ore CIDFnmap.ARP CIDFnmap.Bae CIDFnmap.Koc \
-@@ -83,13 +83,13 @@
+@@ -83,13 +83,13 @@ viewcmyk.ps viewgif.ps viewjpeg.ps viewm
  viewpcx.ps viewpbm.ps viewps2a.ps \
  winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
  pdf2dsc.ps pdfopt.ps ;\
@@ -67,7 +67,7 @@
  	done'
  
  # install html documentation
-@@ -106,20 +106,20 @@
+@@ -106,20 +106,20 @@ DOC_PAGES=PUBLIC README index.html gs.cs
  	   Psfiles.htm Public.htm Readme.htm Release.htm \
  	   Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
  install-doc: $(PSDOCDIR)/News.htm
@@ -93,7 +93,7 @@
  	  ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
  	  for f in $(PSMANDIR)/$$d/*.1 ;\
  	    do $(INSTALL_DATA) $$f $$man1dir ;\
-@@ -146,17 +146,22 @@
+@@ -146,17 +146,22 @@ install-man: $(PSMANDIR)/gs.1
  
  # install the example files
  install-examples:
diff --git a/print/ghostscript7-x11/files/patch-src-zarith.c b/print/ghostscript7-x11/files/patch-src_zarith.c
index 582f61e8f144..371179a786fc 100644
--- a/print/ghostscript7-x11/files/patch-src-zarith.c
+++ b/print/ghostscript7-x11/files/patch-src_zarith.c
@@ -1,5 +1,5 @@
---- src/zarith.c.orig	2013-04-30 11:07:41.000000000 +0900
-+++ src/zarith.c	2013-04-30 11:08:43.000000000 +0900
+--- src/zarith.c.orig	2003-01-17 00:49:05 UTC
++++ src/zarith.c
 @@ -32,9 +32,9 @@
   */
  
@@ -13,7 +13,7 @@
  
  /* <num1> <num2> add <sum> */
  /* We make this into a separate procedure because */
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ zop_add(register os_ptr op)
  	    op[-1].value.realval += (double)op->value.intval;
  	    break;
  	case t_integer: {
@@ -22,7 +22,7 @@
  
  	    if (((op[-1].value.intval += int2) ^ int2) < 0 &&
  		((op[-1].value.intval - int2) ^ int2) >= 0
-@@ -158,10 +158,10 @@
+@@ -158,10 +158,10 @@ zmul(i_ctx_t *i_ctx_p)
  	    op[-1].value.realval *= (double)op->value.intval;
  	    break;
  	case t_integer: {
@@ -37,7 +37,7 @@
  	    float fprod;
  
  	    if ((abs1 > MAX_HALF_INTVAL || abs2 > MAX_HALF_INTVAL) &&
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ zop_sub(register os_ptr op)
  	    op[-1].value.realval -= (double)op->value.intval;
  	    break;
  	case t_integer: {
diff --git a/print/ghostscript7-x11/files/patch-src-zcontrol.c b/print/ghostscript7-x11/files/patch-src_zcontrol.c
index d00a600c19ec..ca23edd3f421 100644
--- a/print/ghostscript7-x11/files/patch-src-zcontrol.c
+++ b/print/ghostscript7-x11/files/patch-src_zcontrol.c
@@ -1,6 +1,6 @@
---- src/zcontrol.c.orig	2013-04-30 11:09:59.000000000 +0900
-+++ src/zcontrol.c	2013-04-30 11:11:03.000000000 +0900
-@@ -356,7 +356,7 @@
+--- src/zcontrol.c.orig	2003-01-17 00:49:05 UTC
++++ src/zcontrol.c
+@@ -356,7 +356,7 @@ for_pos_int_continue(i_ctx_t *i_ctx_p)
  {
      os_ptr op = osp;
      register es_ptr ep = esp;
@@ -9,7 +9,7 @@
  
      if (var > ep[-1].value.intval) {
  	esp -= 5;		/* pop everything */
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ for_neg_int_continue(i_ctx_t *i_ctx_p)
  {
      os_ptr op = osp;
      register es_ptr ep = esp;
diff --git a/print/ghostscript7-x11/files/patch-src-zdict.c b/print/ghostscript7-x11/files/patch-src_zdict.c
index 050ecc841717..7c806e3c0810 100644
--- a/print/ghostscript7-x11/files/patch-src-zdict.c
+++ b/print/ghostscript7-x11/files/patch-src_zdict.c
@@ -1,6 +1,6 @@
---- src/zdict.c.orig	2013-04-30 11:04:05.000000000 +0900
-+++ src/zdict.c	2013-04-30 11:04:34.000000000 +0900
-@@ -35,12 +35,9 @@
+--- src/zdict.c.orig	2003-01-17 00:49:05 UTC
++++ src/zdict.c
+@@ -35,12 +35,9 @@ zdict(i_ctx_t *i_ctx_p)
      os_ptr op = osp;
  
      check_type(*op, t_integer);
@@ -14,7 +14,7 @@
      return dict_create((uint) op->value.intval, op);
  }
  
-@@ -458,12 +455,8 @@
+@@ -458,12 +455,8 @@ zsetmaxlength(i_ctx_t *i_ctx_p)
      check_type(*op1, t_dictionary);
      check_dict_write(*op1);
      check_type(*op, t_integer);
diff --git a/print/ghostscript7-x11/files/patch-src-zdps.c b/print/ghostscript7-x11/files/patch-src_zdps.c
index 414a296cd4ea..e520715fbfdc 100644
--- a/print/ghostscript7-x11/files/patch-src-zdps.c
+++ b/print/ghostscript7-x11/files/patch-src_zdps.c
@@ -1,6 +1,6 @@
---- src/zdps.c.orig	2013-04-30 11:05:10.000000000 +0900
-+++ src/zdps.c	2013-04-30 11:05:50.000000000 +0900
-@@ -46,19 +46,18 @@
+--- src/zdps.c.orig	2003-01-17 00:49:05 UTC
++++ src/zdps.c
+@@ -46,19 +46,18 @@ zsetscreenphase(i_ctx_t *i_ctx_p)
  {
      os_ptr op = osp;
      int code;
diff --git a/print/ghostscript7-x11/files/patch-src-zfunc4.c b/print/ghostscript7-x11/files/patch-src_zfunc4.c
index 0d8610978652..a1d67a42e6ab 100644
--- a/print/ghostscript7-x11/files/patch-src-zfunc4.c
+++ b/print/ghostscript7-x11/files/patch-src_zfunc4.c
@@ -1,6 +1,6 @@
---- src/zfunc4.c.orig	2013-04-30 10:45:00.000000000 +0900
-+++ src/zfunc4.c	2013-04-30 10:45:23.000000000 +0900
-@@ -150,10 +150,6 @@
+--- src/zfunc4.c.orig	2003-01-17 00:49:06 UTC
++++ src/zfunc4.c
+@@ -150,10 +150,6 @@ check_psc_function(i_ctx_t *i_ctx_p, con
  	case t_integer: {
  	    int i = elt.value.intval;
  
diff --git a/print/ghostscript7-x11/files/patch-src-zgeneric.c b/print/ghostscript7-x11/files/patch-src_zgeneric.c
index d99189a5e16a..8f4415d717e8 100644
--- a/print/ghostscript7-x11/files/patch-src-zgeneric.c
+++ b/print/ghostscript7-x11/files/patch-src_zgeneric.c
@@ -1,6 +1,6 @@
---- src/zgeneric.c.orig	2013-04-30 10:55:48.000000000 +0900
-+++ src/zgeneric.c	2013-04-30 10:56:40.000000000 +0900
-@@ -76,7 +76,7 @@
+--- src/zgeneric.c.orig	2003-01-17 00:49:06 UTC
++++ src/zgeneric.c
+@@ -76,7 +76,7 @@ zcopy_integer(i_ctx_t *i_ctx_p)
      int count, i;
      int code;
  
@@ -9,7 +9,7 @@
  	/* There might be enough elements in other blocks. */
  	check_int_ltu(*op, ref_stack_count(&o_stack));
  	count = op->value.intval;
-@@ -471,7 +471,7 @@
+@@ -471,7 +471,7 @@ dict_continue(i_ctx_t *i_ctx_p)
  {
      os_ptr op = osp;
      es_ptr obj = esp - 2;
diff --git a/print/ghostscript7-x11/files/patch-src-ziodev.c b/print/ghostscript7-x11/files/patch-src_ziodev.c
index 2cd6f0add7a9..8dd578526301 100644
--- a/print/ghostscript7-x11/files/patch-src-ziodev.c
+++ b/print/ghostscript7-x11/files/patch-src_ziodev.c
@@ -1,6 +1,6 @@
---- src/ziodev.c.orig	2013-04-30 11:06:19.000000000 +0900
-+++ src/ziodev.c	2013-04-30 11:06:30.000000000 +0900
-@@ -79,8 +79,6 @@
+--- src/ziodev.c.orig	2003-01-17 00:49:06 UTC
++++ src/ziodev.c
+@@ -79,8 +79,6 @@ zgetiodevice(i_ctx_t *i_ctx_p)
      const byte *dname;
  
      check_type(*op, t_integer);
diff --git a/print/ghostscript7-x11/files/patch-src-zmath.c b/print/ghostscript7-x11/files/patch-src_zmath.c
index 94576da80fdf..40b47b967330 100644
--- a/print/ghostscript7-x11/files/patch-src-zmath.c
+++ b/print/ghostscript7-x11/files/patch-src_zmath.c
@@ -1,6 +1,6 @@
---- src/zmath.c.orig	2013-04-30 10:43:55.000000000 +0900
-+++ src/zmath.c	2013-04-30 10:44:23.000000000 +0900
-@@ -229,14 +229,10 @@
+--- src/zmath.c.orig	2003-01-17 00:49:06 UTC
++++ src/zmath.c
+@@ -229,14 +229,10 @@ private int
  zsrand(i_ctx_t *i_ctx_p)
  {
      os_ptr op = osp;
diff --git a/print/ghostscript7-x11/files/patch-src:zmedia2.c b/print/ghostscript7-x11/files/patch-src_zmedia2.c
index 9033a4388085..73e050c2aeaa 100644
--- a/print/ghostscript7-x11/files/patch-src:zmedia2.c
+++ b/print/ghostscript7-x11/files/patch-src_zmedia2.c
@@ -1,6 +1,6 @@
---- src/zmedia2.c.orig	Fri Apr 27 02:57:41 2001
-+++ src/zmedia2.c	Fri Nov  2 04:08:16 2001
-@@ -429,11 +429,17 @@
+--- src/zmedia2.c.orig	2003-01-17 00:49:06 UTC
++++ src/zmedia2.c
+@@ -429,11 +429,17 @@ make_adjustment_matrix(const gs_point * 
  
  	rx = ry, ry = temp;
      }
diff --git a/print/ghostscript7-x11/files/patch-src-zstack.c b/print/ghostscript7-x11/files/patch-src_zstack.c
index f1359936e410..3959aac5d4ae 100644
--- a/print/ghostscript7-x11/files/patch-src-zstack.c
+++ b/print/ghostscript7-x11/files/patch-src_zstack.c
@@ -1,6 +1,6 @@
---- src/zstack.c.orig	2013-04-30 10:54:14.000000000 +0900
-+++ src/zstack.c	2013-04-30 10:54:26.000000000 +0900
-@@ -70,7 +70,7 @@
+--- src/zstack.c.orig	2003-01-17 00:49:06 UTC
++++ src/zstack.c
+@@ -70,7 +70,7 @@ zindex(i_ctx_t *i_ctx_p)
      register os_ptr opn;
  
      check_type(*op, t_integer);
diff --git a/print/ghostscript7-x11/files/patch-src-ztype.c b/print/ghostscript7-x11/files/patch-src_ztype.c
index 98be203c6abe..c9828301667f 100644
--- a/print/ghostscript7-x11/files/patch-src-ztype.c
+++ b/print/ghostscript7-x11/files/patch-src_ztype.c
@@ -1,6 +1,6 @@
---- src/ztype.c.orig	2013-04-30 10:46:12.000000000 +0900
-+++ src/ztype.c	2013-04-30 10:46:55.000000000 +0900
-@@ -53,10 +53,10 @@
+--- src/ztype.c.orig	2003-01-17 00:49:06 UTC
++++ src/ztype.c
+@@ -53,10 +53,10 @@ private int convert_to_string(P2(os_ptr,
   * constant expressions, so we can't use min_long and max_long.
   * What a nuisance!
   */
@@ -15,7 +15,7 @@
  
  #define REAL_CAN_BE_INT(v)\
    ((v) > min_int_real && (v) < max_int_real)
-@@ -356,14 +356,14 @@
+@@ -356,14 +356,14 @@ zcvrs(i_ctx_t *i_ctx_p)
  		return_op_typecheck(op - 2);
  	}
      } else {
diff --git a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap b/print/ghostscript8-base/files/patch-Resource_Init_cidfmap
index 8ed71789f4fe..02d24cb091e8 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap
+++ b/print/ghostscript8-base/files/patch-Resource_Init_cidfmap
@@ -1,5 +1,5 @@
---- Resource/Init/cidfmap.orig	2008-08-08 13:22:38.000000000 +0900
-+++ Resource/Init/cidfmap	2009-12-20 03:03:17.000000000 +0900
+--- Resource/Init/cidfmap.orig	2008-08-08 04:22:38 UTC
++++ Resource/Init/cidfmap
 @@ -26,3 +26,64 @@
  %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
  %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
diff --git a/print/ghostscript8-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript8-base/files/patch-Resource_Init_gs__statd.ps
index ab50080daeb8..22f8bedf4f08 100644
--- a/print/ghostscript8-base/files/patch-Resource-Init-gs_statd.ps
+++ b/print/ghostscript8-base/files/patch-Resource_Init_gs__statd.ps
@@ -1,6 +1,6 @@
---- Resource/Init/gs_statd.ps.orig	2009-03-16 07:42:53.000000000 +0900
-+++ Resource/Init/gs_statd.ps	2009-12-20 01:35:53.000000000 +0900
-@@ -111,6 +111,12 @@
+--- Resource/Init/gs_statd.ps.orig	2009-03-15 22:42:53 UTC
++++ Resource/Init/gs_statd.ps
+@@ -111,6 +111,12 @@ STRICT { (%END SIZES) .skipeof } if
   /pa4 {595 792 //.setpagesize exec} bind def
  	% Japanese postcard size, 100mm x 148mm
   /hagaki {283 420 //.setpagesize exec} bind def
@@ -13,7 +13,7 @@
  % /tabloid {792 1224 //.setpagesize exec} bind def  % 11x17 portrait
  % /csheet {1224 1584 //.setpagesize exec} bind def % ANSI C 17x22
  % /dsheet {1584 2448 //.setpagesize exec} bind def % ANSI D 22x34
-@@ -127,6 +133,7 @@
+@@ -127,6 +133,7 @@ statusdict begin
   [ /letter /note	%do not change this line, needed by 'setpagetype'
     /legal /lettersmall
     /11x17 /ledger
diff --git a/print/ghostscript8-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript8-base/files/patch-Resource_Init_gs__ttf.ps
index 0d5a025abe1c..38e7c092adf8 100644
--- a/print/ghostscript8-base/files/patch-Resource-Init-gs_ttf.ps
+++ b/print/ghostscript8-base/files/patch-Resource_Init_gs__ttf.ps
@@ -1,6 +1,6 @@
---- Resource/Init/gs_ttf.ps.orig	Tue Feb  6 20:07:48 2007
-+++ Resource/Init/gs_ttf.ps	Sat Mar 24 16:15:49 2007
-@@ -997,10 +997,17 @@
+--- Resource/Init/gs_ttf.ps.orig	2010-01-03 01:07:12 UTC
++++ Resource/Init/gs_ttf.ps
+@@ -1104,10 +1104,17 @@ mark
    } ifelse
  		% Stack: ... /FontInfo mark key1 value1 ...
    post null ne {
diff --git a/print/ghostscript8-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript8-base/files/patch-Resource_Init_pdf__font.ps
index c966e57fba11..f0295a2c7798 100644
--- a/print/ghostscript8-base/files/patch-Resource-Init-pdf_font.ps
+++ b/print/ghostscript8-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	2010-02-08 16:45:18 UTC
++++ Resource/Init/pdf_font.ps
+@@ -1514,10 +1514,12 @@ currentdict /CMap_read_dict undef
  
  /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
    dup /BaseFont get findCIDFont exch pop
diff --git a/print/ghostscript8-base/files/patch-base-Makefile.in b/print/ghostscript8-base/files/patch-base_Makefile.in
index fdfac547a986..b995843e7051 100644
--- a/print/ghostscript8-base/files/patch-base-Makefile.in
+++ b/print/ghostscript8-base/files/patch-base_Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig	2009-12-18 16:04:10.000000000 +0900
-+++ base/Makefile.in	2014-11-23 17:40:23.000000000 +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@
@@ -122,7 +122,7 @@
  
  
  # Shared library target to build.
-@@ -490,6 +490,7 @@
+@@ -490,6 +490,7 @@ CC_SHARED=$(CC_) @DYNAMIC_LDFLAGS@
  # ---------------- End of platform-specific section ---------------- #
  
  INSTALL_CONTRIB=@INSTALL_CONTRIB@
diff --git a/print/ghostscript8-base/files/patch-base-configure.ac b/print/ghostscript8-base/files/patch-base_configure.ac
index 955405b1c8e7..d1c15b13891d 100644
--- a/print/ghostscript8-base/files/patch-base-configure.ac
+++ b/print/ghostscript8-base/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:48:08.929511000 +0900
-@@ -402,7 +402,7 @@
+--- base/configure.ac.orig	2009-11-24 08:36:27 UTC
++++ base/configure.ac
+@@ -402,7 +402,7 @@ if test -f libpng/pngread.c; then
  	PNGDEVS="$PNGDEVS_ALL"
  else
  	AC_MSG_RESULT([no])
@@ -9,7 +9,7 @@
  	  AC_CHECK_HEADERS(png.h, [
  		SHARE_LIBPNG=1
  		PNGDEVS="$PNGDEVS_ALL"
-@@ -434,7 +434,7 @@
+@@ -434,7 +434,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])
@@ -18,7 +18,7 @@
  	    AC_MSG_NOTICE([Could not find a copy of libtiff on your system.
  Disabling tiff output devices.])
  	else
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@ X_CFLAGS=""
  X_DEVS=""
  X_LIBS=""
  
@@ -27,7 +27,7 @@
  	if test "$x_libraries" = "/usr/lib"; then
  		echo "Ignoring X library directory \"$x_libraries\" requested by configure."
  		x_libraries="NONE"
-@@ -1063,7 +1063,11 @@
+@@ -1063,7 +1063,11 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
  		;;
  		*BSD)
  		DYNAMIC_CFLAGS="-fPIC"
@@ -40,7 +40,7 @@
  		DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
  		DYNAMIC_LDFLAGS="-fPIC -shared"
  		DYNAMIC_LIBS=""
-@@ -1119,11 +1123,11 @@
+@@ -1119,11 +1123,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-base/files/patch-base-contrib.mak b/print/ghostscript8-base/files/patch-base_contrib.mak
index 9f9406007bb4..e3bdbf72aa65 100644
--- a/print/ghostscript8-base/files/patch-base-contrib.mak
+++ b/print/ghostscript8-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	2009-04-28 22:11:03 UTC
++++ base/contrib.mak
+@@ -858,3 +858,5 @@ $(DD)picty180.dev : $(cdeskjet_)
  	$(SETPDEV) $(DD)picty180 $(cdeskjet_)
  
  #########################################################################
diff --git a/print/ghostscript8-base/files/patch-base-devs.mak b/print/ghostscript8-base/files/patch-base_devs.mak
index 8c7cc96f7620..f3e36e8ac530 100644
--- a/print/ghostscript8-base/files/patch-base-devs.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base-errors.h b/print/ghostscript8-base/files/patch-base_errors.h
index 89a493c96120..c8f7797f4bda 100644
--- a/print/ghostscript8-base/files/patch-base-errors.h
+++ b/print/ghostscript8-base/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-base/files/patch-base_gdevl256.c
index 60be4a072b51..342a0d562b98 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevl256.c
+++ b/print/ghostscript8-base/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-base/files/patch-base_gdevperm.c
index 94b9020eb2c5..58eb6619560d 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevperm.c
+++ b/print/ghostscript8-base/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-base/files/patch-base_gdevvglb.c
index b0f061ff3a66..a4348edbb9e1 100644
--- a/print/ghostscript8-x11/files/patch-base-gdevvglb.c
+++ b/print/ghostscript8-base/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-gs.mak b/print/ghostscript8-base/files/patch-base_gs.mak
index ecb6f57e0dd7..1a7f4ab1f725 100644
--- a/print/ghostscript8-x11/files/patch-base-gs.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base_gsmalloc.c
index c4982de93012..4ae8db0c87ab 100644
--- a/print/ghostscript8-x11/files/patch-base-gsmalloc.c
+++ b/print/ghostscript8-base/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/ghostscript9-agpl-base/files/patch-base-gxobj.h b/print/ghostscript8-base/files/patch-base_gxobj.h
index 529efe379df2..4480528156c2 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-gxobj.h
+++ b/print/ghostscript8-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	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-base/files/patch-base-ijs.mak b/print/ghostscript8-base/files/patch-base_ijs.mak
index 26e407247ede..261878a9c294 100644
--- a/print/ghostscript8-base/files/patch-base-ijs.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base-lib.mak b/print/ghostscript8-base/files/patch-base_lib.mak
index 037390f44f0d..7018a89c1edb 100644
--- a/print/ghostscript8-base/files/patch-base-lib.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base-sjpx.c b/print/ghostscript8-base/files/patch-base_sjpx.c
index 761f1423b700..298a5af1bb08 100644
--- a/print/ghostscript8-base/files/patch-base-sjpx.c
+++ b/print/ghostscript8-base/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-base/files/patch-base_unix-dll.mak
index 96876e3bfb15..55eef1884d19 100644
--- a/print/ghostscript8-x11/files/patch-base-unix-dll.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base-unix-gcc.mak b/print/ghostscript8-base/files/patch-base_unix-gcc.mak
index 4277ce7ed6c3..5c2ba4321deb 100644
--- a/print/ghostscript8-base/files/patch-base-unix-gcc.mak
+++ b/print/ghostscript8-base/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-base/files/patch-base-unixinst.mak b/print/ghostscript8-base/files/patch-base_unixinst.mak
index 4f6006f3a9a8..db0680a3a156 100644
--- a/print/ghostscript8-base/files/patch-base-unixinst.mak
+++ b/print/ghostscript8-base/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
diff --git a/print/ghostscript8-base/files/patch-contrib-contrib.mak b/print/ghostscript8-base/files/patch-contrib_contrib.mak
index f255865761a5..8476d2af847a 100644
--- a/print/ghostscript8-base/files/patch-contrib-contrib.mak
+++ b/print/ghostscript8-base/files/patch-contrib_contrib.mak
@@ -1,6 +1,6 @@
---- contrib/contrib.mak.orig	2012-06-13 01:22:12.000000000 +0900
-+++ contrib/contrib.mak	2012-06-13 01:22:40.000000000 +0900
-@@ -956,7 +956,7 @@
+--- contrib/contrib.mak.orig	2009-07-27 16:59:50 UTC
++++ contrib/contrib.mak
+@@ -956,7 +956,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/ghostscript8-base/files/patch-contrib__japanese__dmp_site.ps b/print/ghostscript8-base/files/patch-contrib_japanese_dmp__site.ps
index 472e54c82318..7c36f32ac809 100644
--- a/print/ghostscript8-base/files/patch-contrib__japanese__dmp_site.ps
+++ b/print/ghostscript8-base/files/patch-contrib_japanese_dmp__site.ps
@@ -1,5 +1,5 @@
---- contrib/japanese/dmp_site.ps.orig	2007-05-09 07:00:10.000000000 +0900
-+++ contrib/japanese/dmp_site.ps	2015-08-21 19:15:38.311336000 +0900
+--- contrib/japanese/dmp_site.ps.orig	2007-05-08 22:00:10 UTC
++++ contrib/japanese/dmp_site.ps
 @@ -1,7 +1,7 @@
  %!
  BeginConfig
diff --git a/print/ghostscript8-base/files/patch-contrib__japanese__gdevdmpr.c b/print/ghostscript8-base/files/patch-contrib_japanese_gdevdmpr.c
index 1e6c3261d464..0c048042a441 100644
--- a/print/ghostscript8-base/files/patch-contrib__japanese__gdevdmpr.c
+++ b/print/ghostscript8-base/files/patch-contrib_japanese_gdevdmpr.c
@@ -1,5 +1,5 @@
---- contrib/japanese/gdevdmpr.c.orig	Thu Apr 26 01:27:24 2007
-+++ contrib/japanese/gdevdmpr.c	Tue May 15 01:44:09 2007
+--- contrib/japanese/gdevdmpr.c.orig	2007-09-25 13:31:24 UTC
++++ contrib/japanese/gdevdmpr.c
 @@ -41,8 +41,6 @@
  /* include library header. */
  #include "dviprlib.h"
@@ -9,7 +9,7 @@
  #define LOCAL_DEBUG 0
  
  #define DEVICE_NAME "dmprt"
-@@ -405,8 +403,6 @@
+@@ -405,8 +403,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;
    
@@ -18,7 +18,7 @@
    return code;
  }
  
-@@ -425,8 +421,6 @@
+@@ -425,8 +421,6 @@ gdev_dmprt_put_dmprt_params(gx_device *p
    if (code < 0) return code;
    if (code == 0) pddev->dmprt.debug_f = vbool;
    
@@ -27,7 +27,7 @@
    code = param_read_bool(plist, "Verbose", &vbool);
    if (code < 0) return code;
    pddev->dmprt.verbose_f = vbool;
-@@ -841,13 +835,12 @@
+@@ -841,13 +835,12 @@ gdev_dmprt_dviprt_lib_fopen(const char *
    char *env;
  
    strcpy(fname,fnamebase);
diff --git a/print/ghostscript8-base/files/patch-lips:gdevlips.c b/print/ghostscript8-base/files/patch-contrib_lips4_gdevlips.c
index 95f8b06f4841..7605c0d7236b 100644
--- a/print/ghostscript8-base/files/patch-lips:gdevlips.c
+++ b/print/ghostscript8-base/files/patch-contrib_lips4_gdevlips.c
@@ -1,6 +1,6 @@
---- contrib/lips4/gdevlips.c.orig	Thu Nov  2 12:09:18 2000
-+++ contrib/lips4/gdevlips.c	Tue Jan 13 01:23:47 2004
-@@ -62,7 +62,15 @@
+--- contrib/lips4/gdevlips.c.orig	2007-09-25 13:31:24 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/ghostscript8-base/files/patch-contrib_lips4_gdevlips.h
index b3520ba1ac33..d52e8efd138b 100644
--- a/print/ghostscript9-base/files/patch-lips:gdevlips.h
+++ b/print/ghostscript8-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	2007-05-08 22:00:10 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/ghostscript8-base/files/patch-epag-ert.c b/print/ghostscript8-base/files/patch-epag-3.09_ert.c
index f063aeddabc2..d4395ca747a5 100644
--- a/print/ghostscript8-base/files/patch-epag-ert.c
+++ b/print/ghostscript8-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/ert.c	2012-02-13 03:38:07.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-agpl-base/files/patch-epag__gdevepag.c b/print/ghostscript8-base/files/patch-epag-3.09_gdevepag.c
index 6012768b4d9c..f4d3f11e7b8c 100644
--- a/print/ghostscript9-agpl-base/files/patch-epag__gdevepag.c
+++ b/print/ghostscript8-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/ghostscript8-base/files/patch-lib-FAPIcidfmap b/print/ghostscript8-base/files/patch-lib_FAPIcidfmap
index 156c3e8458f2..b897b30dd0bc 100644
--- a/print/ghostscript8-base/files/patch-lib-FAPIcidfmap
+++ b/print/ghostscript8-base/files/patch-lib_FAPIcidfmap
@@ -1,5 +1,5 @@
---- lib/FAPIcidfmap.orig	2006-06-01 00:29:52.000000000 +0900
-+++ lib/FAPIcidfmap	2009-05-15 03:27:31.000000000 +0900
+--- lib/FAPIcidfmap.orig	2006-05-31 15:29:52 UTC
++++ lib/FAPIcidfmap
 @@ -29,4 +29,59 @@
  %
  %  /Ryumin-Medium     << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
diff --git a/print/ghostscript8-base/files/patch-lib-FAPIconfig b/print/ghostscript8-base/files/patch-lib_FAPIconfig
index f72f2fd9a6c0..f54370144a3e 100644
--- a/print/ghostscript8-base/files/patch-lib-FAPIconfig
+++ b/print/ghostscript8-base/files/patch-lib_FAPIconfig
@@ -1,5 +1,5 @@
---- lib/FAPIconfig.orig	2008-03-04 06:50:24.000000000 +0900
-+++ lib/FAPIconfig	2008-03-04 06:51:30.000000000 +0900
+--- lib/FAPIconfig.orig	2006-06-20 16:31:15 UTC
++++ lib/FAPIconfig
 @@ -2,10 +2,14 @@
  % $Id: FAPIconfig 6870 2006-06-20 16:31:15Z leonardo $
  % This is configuration file for FAPI client.
diff --git a/print/ghostscript8-base/files/patch-lib-pdf2dsc.ps b/print/ghostscript8-base/files/patch-lib_pdf2dsc.ps
index dab7f7a1b84c..37ea16ef3dc7 100644
--- a/print/ghostscript8-base/files/patch-lib-pdf2dsc.ps
+++ b/print/ghostscript8-base/files/patch-lib_pdf2dsc.ps
@@ -1,6 +1,6 @@
---- lib/pdf2dsc.ps.orig	2011-05-24 05:26:51.000000000 +0900
-+++ lib/pdf2dsc.ps	2011-05-24 05:27:14.000000000 +0900
-@@ -116,7 +116,7 @@
+--- lib/pdf2dsc.ps.orig	2008-02-25 05:48:45 UTC
++++ lib/pdf2dsc.ps
+@@ -116,7 +116,7 @@ systemdict /.setsafe known { .setsafe } 
     DSCfile PDFname write==only
     ( \(r\) file { DELAYSAFER { .setsafe } if } stopped pop\n) puts
     ( pdfopen begin\n) puts
diff --git a/print/ghostscript8-base/files/patch-libpng15 b/print/ghostscript8-base/files/patch-libpng15
index dca4f07607f7..ecd768102da0 100644
--- a/print/ghostscript8-base/files/patch-libpng15
+++ b/print/ghostscript8-base/files/patch-libpng15
@@ -2,7 +2,7 @@ $NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
 
 Fix build with png-1.5. From John Bowler.
 
---- base/gdevpng.c.orig	2008-07-17 02:34:01.000000000 +0000
+--- base/gdevpng.c.orig	2008-07-17 02:34:01 UTC
 +++ base/gdevpng.c
 @@ -36,12 +36,14 @@
  #include "gdevpccm.h"
diff --git a/print/ghostscript8-base/files/patch-psi-zicc.c b/print/ghostscript8-base/files/patch-psi-zicc.c
deleted file mode 100644
index 98c4eed85c37..000000000000
--- a/print/ghostscript8-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-agpl-base/files/patch-psi-zicc.c b/print/ghostscript8-base/files/patch-psi_zicc.c
index 98c4eed85c37..f03847458a5a 100644
--- a/print/ghostscript9-agpl-base/files/patch-psi-zicc.c
+++ b/print/ghostscript8-base/files/patch-psi_zicc.c
@@ -1,8 +1,8 @@
---- 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;
+--- psi/zicc.c.orig	2009-01-21 15:34:55 UTC
++++ psi/zicc.c
+@@ -161,6 +161,9 @@ zseticcspace(i_ctx_t * i_ctx_p)
+     if (2*ncomps > sizeof(range_buff)/sizeof(range_buff[0]))
+         return_error(e_rangecheck);
  
 +    if (2*ncomps > sizeof(range_buff)/sizeof(float))
 +	return_error(e_rangecheck);
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-base/files/patch-base-gdevl256.c b/print/ghostscript8-x11/files/patch-base_gdevl256.c
index 60be4a072b51..342a0d562b98 100644
--- a/print/ghostscript8-base/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-base/files/patch-base-gdevperm.c b/print/ghostscript8-x11/files/patch-base_gdevperm.c
index 94b9020eb2c5..58eb6619560d 100644
--- a/print/ghostscript8-base/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-base/files/patch-base-gdevvglb.c b/print/ghostscript8-x11/files/patch-base_gdevvglb.c
index b0f061ff3a66..a4348edbb9e1 100644
--- a/print/ghostscript8-base/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-base/files/patch-base-gs.mak b/print/ghostscript8-x11/files/patch-base_gs.mak
index ecb6f57e0dd7..1a7f4ab1f725 100644
--- a/print/ghostscript8-base/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-base/files/patch-base-gsmalloc.c b/print/ghostscript8-x11/files/patch-base_gsmalloc.c
index c4982de93012..4ae8db0c87ab 100644
--- a/print/ghostscript8-base/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/ghostscript9-agpl-x11/files/patch-base-gxobj.h b/print/ghostscript8-x11/files/patch-base_gxobj.h
index 529efe379df2..4480528156c2 100644
--- a/print/ghostscript9-agpl-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-base/files/patch-base-unix-dll.mak b/print/ghostscript8-x11/files/patch-base_unix-dll.mak
index 96876e3bfb15..55eef1884d19 100644
--- a/print/ghostscript8-base/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
diff --git a/print/ghostscript9-agpl-base/files/patch-Makefile.in b/print/ghostscript9-agpl-base/files/patch-Makefile.in
index 0f905cb84fa6..383975f6f4fa 100644
--- a/print/ghostscript9-agpl-base/files/patch-Makefile.in
+++ b/print/ghostscript9-agpl-base/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2014-03-26 21:53:48.000000000 +0900
-+++ Makefile.in	2014-11-23 17:01:12.000000000 +0900
-@@ -52,9 +52,9 @@
+--- Makefile.in.orig	2015-03-30 08:21:24 UTC
++++ Makefile.in
+@@ -52,9 +52,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@
-@@ -199,7 +199,7 @@
+@@ -199,7 +199,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,
-@@ -207,12 +207,12 @@
+@@ -207,12 +207,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@
  TIFFCONFDIR=@LIBTIFFCONFDIR@
  TIFFPLATFORM=unix
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,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
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,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
-@@ -336,7 +336,7 @@
+@@ -335,7 +335,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@
-@@ -389,8 +389,8 @@
+@@ -388,8 +388,8 @@ LDFLAGS_SO=@DYNAMIC_LDFLAGS@
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -75,7 +75,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -434,7 +434,7 @@
+@@ -433,7 +433,7 @@ XLIBS=@X_LIBS@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -84,7 +84,7 @@
  
  # programs we use
  RM=rm -f
-@@ -528,28 +528,27 @@
+@@ -527,28 +527,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 $(DD)psdcmykog.dev $(DD)fpng.dev
  DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@
@@ -134,7 +134,7 @@
  
  # Shared library target to build.
  GS_SHARED_OBJS=@DYNAMIC_DEVS@
-@@ -592,6 +591,7 @@
+@@ -591,6 +590,7 @@ MAKEDIRSTOP=
  # ---------------- End of platform-specific section ---------------- #
  
  INSTALL_CONTRIB=@INSTALL_CONTRIB@
diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIcidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap
index 2c6bf45839b2..21249a697dde 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIcidfmap
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-Resource-Init-FAPIconfig b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig
index e2ff81b58276..1b15ceeff3ce 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIconfig
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-Resource-Init-cidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
index 8ed71789f4fe..8745e073270b 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-cidfmap
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__statd.ps
index a9996b623de8..d8b9a3a9cdee 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-Resource_Init_gs__ttf.ps
index 19fc072bd4e2..620da9b1960b 100644
--- a/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ Resource/Init/gs_ttf.ps
+@@ -1093,10 +1093,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-agpl-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-agpl-base/files/patch-Resource_Init_pdf__font.ps
index c966e57fba11..7ef0135da2ef 100644
--- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ Resource/Init/pdf_font.ps
+@@ -1835,10 +1835,12 @@ currentdict /CMap_read_dict undef
  
  /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
    dup /BaseFont get findCIDFont exch pop
diff --git a/print/ghostscript9-agpl-x11/files/patch-base-gp_unix.c b/print/ghostscript9-agpl-base/files/patch-base_gp__unix.c
index 5e89d3b811a4..eb39270d5fb4 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-gp_unix.c
+++ b/print/ghostscript9-agpl-base/files/patch-base_gp__unix.c
@@ -1,6 +1,6 @@
---- base/gp_unix.c.orig	2015-08-22 03:07:24.257409000 +0900
-+++ base/gp_unix.c	2015-08-22 03:08:15.753173000 +0900
-@@ -52,6 +52,7 @@
+--- base/gp_unix.c.orig	2015-03-30 08:21:24 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-agpl-x11/files/patch-base-gs.mak b/print/ghostscript9-agpl-base/files/patch-base_gs.mak
index 50d31a63a2d2..a7a035bd4f06 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-gs.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gs.mak
+@@ -426,7 +426,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-agpl-base/files/patch-base-gsicc_create.c b/print/ghostscript9-agpl-base/files/patch-base_gsicc__create.c
index 82bfee6c37ef..465789dfeaad 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-gsicc_create.c
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gsicc_create.c
+@@ -116,6 +116,7 @@ Note: All profile data must be encoded a
  
     */
  
diff --git a/print/ghostscript9-agpl-base/files/patch-base-gsmalloc.c b/print/ghostscript9-agpl-base/files/patch-base_gsmalloc.c
index 030f702d9415..6651a121aeb0 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-gsmalloc.c
+++ b/print/ghostscript9-agpl-base/files/patch-base_gsmalloc.c
@@ -1,6 +1,6 @@
---- base/gsmalloc.c.orig	2015-08-22 03:09:16.838614000 +0900
-+++ base/gsmalloc.c	2015-08-22 03:09:34.776354000 +0900
-@@ -178,7 +178,7 @@
+--- base/gsmalloc.c.orig	2015-03-30 08:21:24 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/ghostscript8-base/files/patch-base-gxobj.h b/print/ghostscript9-agpl-base/files/patch-base_gxobj.h
index 529efe379df2..992cee7b4d9c 100644
--- a/print/ghostscript8-base/files/patch-base-gxobj.h
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gxobj.h
+@@ -144,11 +144,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-agpl-x11/files/patch-base-openjpeg.mak b/print/ghostscript9-agpl-base/files/patch-base_openjpeg.mak
index 3d85cb70abf1..cf38fe8c16bc 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-openjpeg.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/openjpeg.mak
+@@ -113,7 +113,7 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_M
  	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
  
  # define our specific compiler
@@ -8,4 +8,4 @@
 +OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I)  $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
  OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX)
  
- OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK)
+ OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) $(MAKEDIRS)
diff --git a/print/ghostscript9-agpl-x11/files/patch-base-unix-gcc.mak b/print/ghostscript9-agpl-base/files/patch-base_unix-gcc.mak
index 2fd1d5ad7885..566a90f70542 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-unix-gcc.mak
+++ b/print/ghostscript9-agpl-base/files/patch-base_unix-gcc.mak
@@ -1,5 +1,5 @@
---- base/unix-gcc.mak.orig	2014-03-26 21:53:47.000000000 +0900
-+++ base/unix-gcc.mak	2014-08-25 00:19:13.000000000 +0900
+--- base/unix-gcc.mak.orig	2015-03-30 08:21:24 UTC
++++ base/unix-gcc.mak
 @@ -22,19 +22,19 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -32,7 +32,7 @@
  
  # Do not edit the next group of lines.
  
-@@ -53,11 +53,10 @@
+@@ -53,11 +53,10 @@ PSD=$(PSGENDIR)/
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -47,7 +47,7 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -107,7 +106,7 @@
+@@ -107,7 +106,7 @@ GENOPT=
  #               This uses the more secure temporary file creation call
  #               Enable this if it is available on your platform.
  
@@ -56,7 +56,7 @@
  
  # Define the name of the executable file.
  
-@@ -142,7 +141,7 @@
+@@ -142,7 +141,7 @@ JSRCDIR=jpeg
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -65,7 +65,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -156,13 +155,13 @@
+@@ -156,13 +155,13 @@ PNGSRCDIR=libpng
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -81,7 +81,7 @@
  TIFFSRCDIR=tiff
  TIFFCONFDIR=tiff
  TIFFPLATFORM=unix
-@@ -180,12 +179,12 @@
+@@ -180,12 +179,12 @@ ZSRCDIR=zlib
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -96,7 +96,7 @@
  JBIG2_LIB=jbig2dec
  JBIG2SRCDIR=jbig2dec
  
-@@ -225,7 +224,7 @@
+@@ -225,7 +224,7 @@ RANLIB=ranlib
  
  # Define the name of the C compiler.
  
@@ -105,7 +105,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -242,7 +241,7 @@
+@@ -242,7 +241,7 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -114,7 +114,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg -O2
  CFLAGS_SO=-fPIC
-@@ -258,7 +257,8 @@
+@@ -258,7 +257,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.
@@ -124,7 +124,7 @@
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,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.
@@ -133,7 +133,7 @@
  
  LDFLAGS=$(XLDFLAGS)
  
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ LDFLAGS=$(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -142,7 +142,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ STDLIBS=-lm
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -151,7 +151,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
-@@ -317,29 +317,29 @@
+@@ -317,29 +317,29 @@ XINCLUDE=-I/usr/X11R6/include
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
@@ -186,7 +186,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
-@@ -488,6 +488,7 @@
+@@ -488,6 +488,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-agpl-base/files/patch-base_unixinst.mak
index 51d6baa31dad..1fb2e130e3af 100644
--- a/print/ghostscript9-base/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-configure.ac b/print/ghostscript9-agpl-base/files/patch-configure.ac
index 9b68cce459f5..14d40344ab49 100644
--- a/print/ghostscript9-agpl-base/files/patch-configure.ac
+++ b/print/ghostscript9-agpl-base/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2015-03-30 17:21:24.000000000 +0900
-+++ configure.ac	2015-08-22 03:22:12.231575000 +0900
-@@ -1607,7 +1607,7 @@
+--- configure.ac.orig	2015-03-30 08:21:24 UTC
++++ configure.ac
+@@ -1607,7 +1607,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"
-@@ -2074,7 +2074,10 @@
+@@ -2074,7 +2074,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"
-@@ -2133,11 +2136,11 @@
+@@ -2133,11 +2136,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-agpl-base/files/patch-contrib-contrib.mak b/print/ghostscript9-agpl-base/files/patch-contrib_contrib.mak
index a9263619fd93..f2bde44902d0 100644
--- a/print/ghostscript9-agpl-base/files/patch-contrib-contrib.mak
+++ b/print/ghostscript9-agpl-base/files/patch-contrib_contrib.mak
@@ -1,6 +1,6 @@
---- contrib/contrib.mak.orig	2014-03-26 21:53:47.000000000 +0900
-+++ contrib/contrib.mak	2014-08-25 00:49:19.000000000 +0900
-@@ -943,7 +943,7 @@
+--- contrib/contrib.mak.orig	2015-03-30 08:21:24 UTC
++++ contrib/contrib.mak
+@@ -943,7 +943,7 @@ $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev
  $(DEVOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
  	$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c
  
@@ -9,7 +9,7 @@
  	$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
  
  extra-dmprt-install:
-@@ -1095,3 +1095,5 @@
+@@ -1095,3 +1095,5 @@ extra-upp-install:
  ### ------------ Build/Install special features ------------ ###
  
  install-contrib-extras: extra-dmprt-install extra-upp-install
diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__gomni.c b/print/ghostscript9-agpl-base/files/patch-contrib_gomni.c
index 4129fdebbf74..a8cf980d3035 100644
--- a/print/ghostscript9-agpl-base/files/patch-contrib__gomni.c
+++ b/print/ghostscript9-agpl-base/files/patch-contrib_gomni.c
@@ -1,6 +1,6 @@
---- contrib/gomni.c.orig	2013-04-28 02:09:12.000000000 +0900
-+++ contrib/gomni.c	2013-04-28 02:09:14.000000000 +0900
-@@ -530,7 +530,7 @@
+--- contrib/gomni.c.orig	2015-03-30 08:21:24 UTC
++++ contrib/gomni.c
+@@ -530,7 +530,7 @@ CloseDevice (gx_device * pdev)
        && pDev->pcoreOmni->pszJobOptions
        )
     {
@@ -9,7 +9,7 @@
     }
  
     if (  pDev->pcoreOmni
-@@ -549,7 +549,7 @@
+@@ -549,7 +549,7 @@ CloseDevice (gx_device * pdev)
  
     if (pDev->pcoreOmni)
     {
@@ -18,7 +18,7 @@
        pDev->pcoreOmni = 0;
     }
  
-@@ -720,7 +720,7 @@
+@@ -720,7 +720,7 @@ SetupDevice (gx_device *pgxdev, gs_param
     {
        PDEVSTRUCT p;
  
@@ -27,7 +27,7 @@
        if (!p)
        {
            dprintf ("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
-@@ -734,7 +734,7 @@
+@@ -734,7 +734,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
        memset (pDev, 0, sizeof (Omni_Dev));
  
@@ -36,7 +36,7 @@
  
        if (!pDev->pcoreOmni)
        {
-@@ -783,7 +783,7 @@
+@@ -783,7 +783,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
        for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
        {
@@ -45,7 +45,7 @@
                                              strlen (cOmnilib)
                                              + strlen (apszLibraryPaths[i])
                                              + 1,
-@@ -796,7 +796,7 @@
+@@ -796,7 +796,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
                if (fDebugOutput) dprintf2 ("SetupDevice: Trying to load %s = %p\n", pszDeviceLib, pDev->hmodOmni);
            }
@@ -54,7 +54,7 @@
        }
  
        if (!pDev->hmodOmni)
-@@ -810,7 +810,7 @@
+@@ -810,7 +810,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
           for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
           {
@@ -63,7 +63,7 @@
                                                 strlen (cOmnilib)
                                                 + strlen (apszLibraryPaths[i])
                                                 + 1,
-@@ -830,7 +830,7 @@
+@@ -830,7 +830,7 @@ SetupDevice (gx_device *pgxdev, gs_param
                      g_module_close (pModule);
                   }
               }
@@ -72,7 +72,7 @@
           }
  
           return 1;
-@@ -953,7 +953,7 @@
+@@ -953,7 +953,7 @@ SetupDevice (gx_device *pgxdev, gs_param
           )
        {
           if (!pDev->pcoreOmni->pszJobOptions)
@@ -81,7 +81,7 @@
           memcpy (pDev->pcoreOmni->pszJobOptions, fname.data, fname.size);
           pDev->pcoreOmni->pszJobOptions[fname.size] = '\0';
        }
-@@ -1044,7 +1044,7 @@
+@@ -1044,7 +1044,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
           for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
           {
@@ -90,7 +90,7 @@
                                                strlen (cDialogName)
                                                + strlen (apszLibraryPaths[i])
                                                + 1,
-@@ -1059,7 +1059,7 @@
+@@ -1059,7 +1059,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
                  pModule = g_module_open (pszDeviceLib, (GModuleFlags)0);
              }
@@ -99,7 +99,7 @@
           }
  
           if (!pModule)
-@@ -1070,7 +1070,7 @@
+@@ -1070,7 +1070,7 @@ SetupDevice (gx_device *pgxdev, gs_param
  
              for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
              {
@@ -108,7 +108,7 @@
                                                   strlen (cDialogName)
                                                   + strlen (apszLibraryPaths[i])
                                                   + 1,
-@@ -1092,7 +1092,7 @@
+@@ -1092,7 +1092,7 @@ SetupDevice (gx_device *pgxdev, gs_param
                        g_module_close (pModule);
                     }
                 }
@@ -117,7 +117,7 @@
              }
           }
           else
-@@ -1107,13 +1107,13 @@
+@@ -1107,13 +1107,13 @@ SetupDevice (gx_device *pgxdev, gs_param
  
                 if (pDev->pcoreOmni->pszJobOptions)
                 {
@@ -133,7 +133,7 @@
  
                 strcpy (pDev->pcoreOmni->pszJobOptions, pszSelectedJobProperties);
  
-@@ -1375,7 +1375,7 @@
+@@ -1375,7 +1375,7 @@ PrintPage (gx_device_printer *pgx_prt_de
        iBytesToAlloc += (iNumColors - 1) * sizeof (RGB2);
     }
  
@@ -142,7 +142,7 @@
     if (!pbmi)
     {
        eprintf("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
-@@ -1481,7 +1481,7 @@
+@@ -1481,7 +1481,7 @@ PrintPage (gx_device_printer *pgx_prt_de
        }
     }
  
@@ -151,7 +151,7 @@
  
     if (pGSData == 0)
        /* can't allocate row buffer */
-@@ -1501,7 +1501,7 @@
+@@ -1501,7 +1501,7 @@ PrintPage (gx_device_printer *pgx_prt_de
                                  pasyncDev->pDev->iVertDots,
                                  8000*1024);                 /*eight meg buffer */
  
@@ -160,7 +160,7 @@
  
     if(!pBitmapMem)
     {
-@@ -1613,7 +1613,7 @@
+@@ -1613,7 +1613,7 @@ PrintPage (gx_device_printer *pgx_prt_de
              {
                 if (prtMode.iBitCount < 16)
                 {
@@ -169,7 +169,7 @@
  
                    if (pMonoData)
                    {
-@@ -1661,7 +1661,7 @@
+@@ -1661,7 +1661,7 @@ PrintPage (gx_device_printer *pgx_prt_de
                 /* We're done with the mono band */
                 /* now free up the mono buffer so we can get clean data buffer if more lines are to be */
                 /* gray-scaled */
@@ -178,7 +178,7 @@
  
                 pMonoData = NULL;
              }
-@@ -1709,11 +1709,11 @@
+@@ -1709,11 +1709,11 @@ PrintPage (gx_device_printer *pgx_prt_de
  
  done:
  
diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__dmp_site.ps b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_dmp__site.ps
index f24d26c6d2b7..0d1538f5d268 100644
--- a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__dmp_site.ps
+++ b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_dmp__site.ps
@@ -1,5 +1,5 @@
---- contrib/japanese/dmp_site.ps.orig	2015-03-30 17:21:24.000000000 +0900
-+++ contrib/japanese/dmp_site.ps	2015-08-22 03:10:27.500014000 +0900
+--- contrib/japanese/dmp_site.ps.orig	2015-03-30 08:21:24 UTC
++++ contrib/japanese/dmp_site.ps
 @@ -1,7 +1,7 @@
  %!
  BeginConfig
diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__gdevdmpr.c b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_gdevdmpr.c
index e4ed6582cf78..7d943a123a87 100644
--- a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__gdevdmpr.c
+++ b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_gdevdmpr.c
@@ -1,5 +1,5 @@
---- contrib/japanese/gdevdmpr.c.orig	2014-03-26 21:53:47.000000000 +0900
-+++ contrib/japanese/gdevdmpr.c	2014-08-25 00:36:18.000000000 +0900
+--- contrib/japanese/gdevdmpr.c.orig	2015-03-30 08:21:24 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-agpl-base/files/patch-contrib_lips4_gdevlips.c
index 0917be89e49a..379db51cd66c 100644
--- a/print/ghostscript9-base/files/patch-lips:gdevlips.c
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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/ghostscript8-base/files/patch-lips:gdevlips.h b/print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.h
index b3520ba1ac33..f9f5f0906b27 100644
--- a/print/ghostscript8-base/files/patch-lips:gdevlips.h
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-base/files/patch-devices-devs.mak b/print/ghostscript9-agpl-base/files/patch-devices_devs.mak
index a1c1d134dd66..01d2cce19295 100644
--- a/print/ghostscript9-agpl-base/files/patch-devices-devs.mak
+++ b/print/ghostscript9-agpl-base/files/patch-devices_devs.mak
@@ -1,6 +1,6 @@
---- devices/devs.mak.orig	2015-03-30 17:21:24.000000000 +0900
-+++ devices/devs.mak	2015-07-14 08:48:48.795797000 +0900
-@@ -546,7 +546,7 @@
+--- devices/devs.mak.orig	2015-03-30 08:21:24 UTC
++++ devices/devs.mak
+@@ -546,7 +546,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdev
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS)
diff --git a/print/ghostscript9-base/files/patch-base-gdevl256.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevl256.c
index d2fcd1b42baa..86ebbb32fbd8 100644
--- a/print/ghostscript9-base/files/patch-base-gdevl256.c
+++ b/print/ghostscript9-agpl-base/files/patch-devices_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 @@
+--- devices/gdevl256.c.orig	2015-03-30 08:21:24 UTC
++++ devices/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-agpl-x11/files/patch-devices-gdevperm.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevperm.c
index ed420367dc22..13a816906c13 100644
--- a/print/ghostscript9-agpl-x11/files/patch-devices-gdevperm.c
+++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevperm.c
@@ -1,6 +1,6 @@
---- devices/gdevperm.c.orig	2012-02-08 17:48:48.000000000 +0900
-+++ devices/gdevperm.c	2012-02-13 00:44:23.000000000 +0900
-@@ -285,7 +285,7 @@
+--- devices/gdevperm.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevperm.c
+@@ -288,7 +288,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 @@
+@@ -335,7 +335,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-agpl-x11/files/patch-devices-gdevplib.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevplib.c
index b14a47184e50..2213e572f3db 100644
--- a/print/ghostscript9-agpl-x11/files/patch-devices-gdevplib.c
+++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevplib.c
@@ -1,6 +1,6 @@
---- devices/gdevplib.c.orig	2015-03-30 17:21:24.000000000 +0900
-+++ devices/gdevplib.c	2015-07-14 08:51:50.711673000 +0900
-@@ -156,7 +156,11 @@
+--- devices/gdevplib.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevplib.c
+@@ -156,7 +156,11 @@ void __aebi_memmove(void *dest, const vo
  
  #ifdef  TESTING_WITH_NO_BAND_DONOR
  
diff --git a/print/ghostscript9-base/files/patch-base-gdevvglb.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevvglb.c
index 8f7d239726ff..86adcbcb2497 100644
--- a/print/ghostscript9-base/files/patch-base-gdevvglb.c
+++ b/print/ghostscript9-agpl-base/files/patch-devices_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 @@
+--- devices/gdevvglb.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevvglb.c
+@@ -368,12 +368,3 @@ vgalib_put_params(gx_device * dev, gs_pa
      }
      return 0;
  }
diff --git a/print/ghostscript9-base/files/patch-epag-ert.c b/print/ghostscript9-agpl-base/files/patch-epag-3.09_ert.c
index 6a6dd2540b8a..d4395ca747a5 100644
--- a/print/ghostscript9-base/files/patch-epag-ert.c
+++ b/print/ghostscript9-agpl-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-agpl-base/files/patch-epag-3.09_gdevepag.c
index 6012768b4d9c..f4d3f11e7b8c 100644
--- a/print/ghostscript9-base/files/patch-epag__gdevepag.c
+++ b/print/ghostscript9-agpl-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-agpl-base/files/patch-openjpeg-src-lib-openjp2-opj_includes.h b/print/ghostscript9-agpl-base/files/patch-openjpeg_src_lib_openjp2_opj__includes.h
index c76c46f4ad48..922a0841f540 100644
--- a/print/ghostscript9-agpl-base/files/patch-openjpeg-src-lib-openjp2-opj_includes.h
+++ b/print/ghostscript9-agpl-base/files/patch-openjpeg_src_lib_openjp2_opj__includes.h
@@ -1,7 +1,7 @@
---- openjpeg/src/lib/openjp2/opj_includes.h.orig	2012-02-13 08:48:33.000000000 +0900
-+++ openjpeg/src/lib/openjp2/opj_includes.h	2012-02-13 08:50:41.000000000 +0900
-@@ -77,7 +77,7 @@
- #endif /* INLINE */
+--- openjpeg/src/lib/openjp2/opj_includes.h.orig	2015-03-30 08:21:24 UTC
++++ openjpeg/src/lib/openjp2/opj_includes.h
+@@ -109,7 +109,7 @@
+ 
  
  /* Are restricted pointers available? (C99) */
 -#if (__STDC_VERSION__ != 199901L)
diff --git a/print/ghostscript9-agpl-base/files/patch-psi_zicc.c b/print/ghostscript9-agpl-base/files/patch-psi_zicc.c
new file mode 100644
index 000000000000..c2d2953c91d1
--- /dev/null
+++ b/print/ghostscript9-agpl-base/files/patch-psi_zicc.c
@@ -0,0 +1,12 @@
+--- psi/zicc.c.orig	2015-03-30 08:21:24 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);
diff --git a/print/ghostscript9-agpl-base/files/patch-trio-triodef.h b/print/ghostscript9-agpl-base/files/patch-trio_triodef.h
index 8428c0fedc98..ac09c5f67d16 100644
--- a/print/ghostscript9-agpl-base/files/patch-trio-triodef.h
+++ b/print/ghostscript9-agpl-base/files/patch-trio_triodef.h
@@ -1,5 +1,5 @@
---- trio/triodef.h.orig	2015-07-19 03:20:32.007345000 +0900
-+++ trio/triodef.h	2015-07-19 03:27:30.381863000 +0900
+--- trio/triodef.h.orig	2015-03-30 08:21:24 UTC
++++ trio/triodef.h
 @@ -185,12 +185,13 @@
  # endif
  #endif
diff --git a/print/ghostscript9-agpl-base/files/patch-trio-triop.h b/print/ghostscript9-agpl-base/files/patch-trio_triop.h
index 795b3299e564..41c2cae08857 100644
--- a/print/ghostscript9-agpl-base/files/patch-trio-triop.h
+++ b/print/ghostscript9-agpl-base/files/patch-trio_triop.h
@@ -1,6 +1,6 @@
---- trio/triop.h.orig	2015-03-30 17:21:24.000000000 +0900
-+++ trio/triop.h	2015-07-21 06:00:48.713329000 +0900
-@@ -404,7 +404,11 @@
+--- trio/triop.h.orig	2015-03-30 08:21:24 UTC
++++ trio/triop.h
+@@ -404,7 +404,11 @@ trio_pointer_t trio_register TRIO_PROTO(
  void trio_unregister TRIO_PROTO((trio_pointer_t handle));
  
  TRIO_CONST char *trio_get_format TRIO_PROTO((trio_pointer_t ref));
diff --git a/print/ghostscript9-agpl-x11/files/patch-Makefile.in b/print/ghostscript9-agpl-x11/files/patch-Makefile.in
index 59e1221d2405..62e79a8678f1 100644
--- a/print/ghostscript9-agpl-x11/files/patch-Makefile.in
+++ b/print/ghostscript9-agpl-x11/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-03-30 17:21:24.000000000 +0900
-+++ Makefile.in	2015-08-22 03:35:53.805008000 +0900
-@@ -52,9 +52,9 @@
+--- Makefile.in.orig	2015-03-30 08:21:24 UTC
++++ Makefile.in
+@@ -52,9 +52,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@
-@@ -199,7 +199,7 @@
+@@ -199,7 +199,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,
-@@ -207,12 +207,12 @@
+@@ -207,12 +207,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@
  TIFFCONFDIR=@LIBTIFFCONFDIR@
  TIFFPLATFORM=unix
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,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
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,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
-@@ -335,7 +335,7 @@
+@@ -335,7 +335,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@
-@@ -388,8 +388,8 @@
+@@ -388,8 +388,8 @@ LDFLAGS_SO=@DYNAMIC_LDFLAGS@
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -75,7 +75,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -433,7 +433,7 @@
+@@ -433,7 +433,7 @@ XLIBS=@X_LIBS@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -84,7 +84,7 @@
  
  # programs we use
  RM=rm -f
-@@ -527,28 +527,27 @@
+@@ -527,28 +527,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 $(DD)psdcmykog.dev $(DD)fpng.dev
  DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@
@@ -134,7 +134,7 @@
  
  # Shared library target to build.
  GS_SHARED_OBJS=@DYNAMIC_DEVS@
-@@ -609,7 +608,6 @@
+@@ -609,7 +608,6 @@ include $(GLSRCDIR)/jbig2.mak
  include $(GLSRCDIR)/ldf_jb2.mak
  include $(GLSRCDIR)/lwf_jp2.mak
  include $(GLSRCDIR)/openjpeg.mak
diff --git a/print/ghostscript9-agpl-base/files/patch-base-gp_unix.c b/print/ghostscript9-agpl-x11/files/patch-base_gp__unix.c
index 5e89d3b811a4..eb39270d5fb4 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-gp_unix.c
+++ b/print/ghostscript9-agpl-x11/files/patch-base_gp__unix.c
@@ -1,6 +1,6 @@
---- base/gp_unix.c.orig	2015-08-22 03:07:24.257409000 +0900
-+++ base/gp_unix.c	2015-08-22 03:08:15.753173000 +0900
-@@ -52,6 +52,7 @@
+--- base/gp_unix.c.orig	2015-03-30 08:21:24 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-agpl-x11/files/patch-base_gs.mak
index 50d31a63a2d2..a7a035bd4f06 100644
--- a/print/ghostscript9-base/files/patch-base-gs.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gs.mak
+@@ -426,7 +426,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-agpl-x11/files/patch-base-gsicc_create.c b/print/ghostscript9-agpl-x11/files/patch-base_gsicc__create.c
index 82bfee6c37ef..465789dfeaad 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-gsicc_create.c
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gsicc_create.c
+@@ -116,6 +116,7 @@ Note: All profile data must be encoded a
  
     */
  
diff --git a/print/ghostscript9-agpl-x11/files/patch-base-gsmalloc.c b/print/ghostscript9-agpl-x11/files/patch-base_gsmalloc.c
index 030f702d9415..6651a121aeb0 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-gsmalloc.c
+++ b/print/ghostscript9-agpl-x11/files/patch-base_gsmalloc.c
@@ -1,6 +1,6 @@
---- base/gsmalloc.c.orig	2015-08-22 03:09:16.838614000 +0900
-+++ base/gsmalloc.c	2015-08-22 03:09:34.776354000 +0900
-@@ -178,7 +178,7 @@
+--- base/gsmalloc.c.orig	2015-03-30 08:21:24 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/ghostscript8-x11/files/patch-base-gxobj.h b/print/ghostscript9-agpl-x11/files/patch-base_gxobj.h
index 529efe379df2..992cee7b4d9c 100644
--- a/print/ghostscript8-x11/files/patch-base-gxobj.h
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/gxobj.h
+@@ -144,11 +144,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-agpl-x11/files/patch-base_lib.mak
index 033be0a928e3..87836021f4cd 100644
--- a/print/ghostscript9-x11/files/patch-base-lib.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 UTC
++++ base/lib.mak
+@@ -1025,7 +1025,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-base/files/patch-base-openjpeg.mak b/print/ghostscript9-agpl-x11/files/patch-base_openjpeg.mak
index 3d85cb70abf1..cf38fe8c16bc 100644
--- a/print/ghostscript9-base/files/patch-base-openjpeg.mak
+++ b/print/ghostscript9-agpl-x11/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	2015-03-30 08:21:24 UTC
++++ base/openjpeg.mak
+@@ -113,7 +113,7 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_M
  	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
  
  # define our specific compiler
@@ -8,4 +8,4 @@
 +OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I)  $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
  OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX)
  
- OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK)
+ OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) $(MAKEDIRS)
diff --git a/print/ghostscript9-agpl-base/files/patch-base-unix-gcc.mak b/print/ghostscript9-agpl-x11/files/patch-base_unix-gcc.mak
index 2fd1d5ad7885..566a90f70542 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-unix-gcc.mak
+++ b/print/ghostscript9-agpl-x11/files/patch-base_unix-gcc.mak
@@ -1,5 +1,5 @@
---- base/unix-gcc.mak.orig	2014-03-26 21:53:47.000000000 +0900
-+++ base/unix-gcc.mak	2014-08-25 00:19:13.000000000 +0900
+--- base/unix-gcc.mak.orig	2015-03-30 08:21:24 UTC
++++ base/unix-gcc.mak
 @@ -22,19 +22,19 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -32,7 +32,7 @@
  
  # Do not edit the next group of lines.
  
-@@ -53,11 +53,10 @@
+@@ -53,11 +53,10 @@ PSD=$(PSGENDIR)/
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -47,7 +47,7 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -107,7 +106,7 @@
+@@ -107,7 +106,7 @@ GENOPT=
  #               This uses the more secure temporary file creation call
  #               Enable this if it is available on your platform.
  
@@ -56,7 +56,7 @@
  
  # Define the name of the executable file.
  
-@@ -142,7 +141,7 @@
+@@ -142,7 +141,7 @@ JSRCDIR=jpeg
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -65,7 +65,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -156,13 +155,13 @@
+@@ -156,13 +155,13 @@ PNGSRCDIR=libpng
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -81,7 +81,7 @@
  TIFFSRCDIR=tiff
  TIFFCONFDIR=tiff
  TIFFPLATFORM=unix
-@@ -180,12 +179,12 @@
+@@ -180,12 +179,12 @@ ZSRCDIR=zlib
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -96,7 +96,7 @@
  JBIG2_LIB=jbig2dec
  JBIG2SRCDIR=jbig2dec
  
-@@ -225,7 +224,7 @@
+@@ -225,7 +224,7 @@ RANLIB=ranlib
  
  # Define the name of the C compiler.
  
@@ -105,7 +105,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -242,7 +241,7 @@
+@@ -242,7 +241,7 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -114,7 +114,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg -O2
  CFLAGS_SO=-fPIC
-@@ -258,7 +257,8 @@
+@@ -258,7 +257,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.
@@ -124,7 +124,7 @@
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,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.
@@ -133,7 +133,7 @@
  
  LDFLAGS=$(XLDFLAGS)
  
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ LDFLAGS=$(XLDFLAGS)
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -142,7 +142,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ STDLIBS=-lm
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -151,7 +151,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
-@@ -317,29 +317,29 @@
+@@ -317,29 +317,29 @@ XINCLUDE=-I/usr/X11R6/include
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
@@ -186,7 +186,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
-@@ -488,6 +488,7 @@
+@@ -488,6 +488,7 @@ include $(GLSRCDIR)/unixlink.mak
  include $(GLSRCDIR)/unix-dll.mak
  include $(GLSRCDIR)/unix-end.mak
  include $(GLSRCDIR)/unixinst.mak
diff --git a/print/ghostscript9-x11/files/patch-base-unixinst.mak b/print/ghostscript9-agpl-x11/files/patch-base_unixinst.mak
index 51d6baa31dad..1fb2e130e3af 100644
--- a/print/ghostscript9-x11/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-agpl-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	2015-03-30 08:21:24 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-agpl-x11/files/patch-configure.ac b/print/ghostscript9-agpl-x11/files/patch-configure.ac
index dc8baba689f2..991c83ab7acf 100644
--- a/print/ghostscript9-agpl-x11/files/patch-configure.ac
+++ b/print/ghostscript9-agpl-x11/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2015-03-30 17:21:24.000000000 +0900
-+++ configure.ac	2015-08-22 03:37:13.515866000 +0900
-@@ -892,35 +892,6 @@
+--- configure.ac.orig	2015-03-30 08:21:24 UTC
++++ configure.ac
+@@ -892,35 +892,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
-@@ -1607,7 +1578,7 @@
+@@ -1607,7 +1578,7 @@ X_CFLAGS=""
  X_DEVS=""
  X_LIBS=""
  
@@ -45,7 +45,7 @@
          if test "$x_libraries" = "/usr/lib"; then
                  echo "Ignoring X library directory \"$x_libraries\" requested by configure."
                  x_libraries="NONE"
-@@ -2074,7 +2045,10 @@
+@@ -2074,7 +2045,10 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING(
                          DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
                          ;;
                          *BSD)
@@ -57,7 +57,7 @@
                          DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
                          X11_DEVS=""
                          OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
-@@ -2133,11 +2107,11 @@
+@@ -2133,11 +2107,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-agpl-x11/files/patch-devices-devs.mak b/print/ghostscript9-agpl-x11/files/patch-devices_devs.mak
index a1c1d134dd66..01d2cce19295 100644
--- a/print/ghostscript9-agpl-x11/files/patch-devices-devs.mak
+++ b/print/ghostscript9-agpl-x11/files/patch-devices_devs.mak
@@ -1,6 +1,6 @@
---- devices/devs.mak.orig	2015-03-30 17:21:24.000000000 +0900
-+++ devices/devs.mak	2015-07-14 08:48:48.795797000 +0900
-@@ -546,7 +546,7 @@
+--- devices/devs.mak.orig	2015-03-30 08:21:24 UTC
++++ devices/devs.mak
+@@ -546,7 +546,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdev
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
  $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS)
diff --git a/print/ghostscript9-x11/files/patch-base-gdevl256.c b/print/ghostscript9-agpl-x11/files/patch-devices_gdevl256.c
index d2fcd1b42baa..86ebbb32fbd8 100644
--- a/print/ghostscript9-x11/files/patch-base-gdevl256.c
+++ b/print/ghostscript9-agpl-x11/files/patch-devices_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 @@
+--- devices/gdevl256.c.orig	2015-03-30 08:21:24 UTC
++++ devices/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-agpl-base/files/patch-devices-gdevperm.c b/print/ghostscript9-agpl-x11/files/patch-devices_gdevperm.c
index ed420367dc22..13a816906c13 100644
--- a/print/ghostscript9-agpl-base/files/patch-devices-gdevperm.c
+++ b/print/ghostscript9-agpl-x11/files/patch-devices_gdevperm.c
@@ -1,6 +1,6 @@
---- devices/gdevperm.c.orig	2012-02-08 17:48:48.000000000 +0900
-+++ devices/gdevperm.c	2012-02-13 00:44:23.000000000 +0900
-@@ -285,7 +285,7 @@
+--- devices/gdevperm.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevperm.c
+@@ -288,7 +288,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 @@
+@@ -335,7 +335,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-agpl-base/files/patch-devices-gdevplib.c b/print/ghostscript9-agpl-x11/files/patch-devices_gdevplib.c
index b14a47184e50..2213e572f3db 100644
--- a/print/ghostscript9-agpl-base/files/patch-devices-gdevplib.c
+++ b/print/ghostscript9-agpl-x11/files/patch-devices_gdevplib.c
@@ -1,6 +1,6 @@
---- devices/gdevplib.c.orig	2015-03-30 17:21:24.000000000 +0900
-+++ devices/gdevplib.c	2015-07-14 08:51:50.711673000 +0900
-@@ -156,7 +156,11 @@
+--- devices/gdevplib.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevplib.c
+@@ -156,7 +156,11 @@ void __aebi_memmove(void *dest, const vo
  
  #ifdef  TESTING_WITH_NO_BAND_DONOR
  
diff --git a/print/ghostscript9-agpl-x11/files/patch-devices-gdevvglb.c b/print/ghostscript9-agpl-x11/files/patch-devices_gdevvglb.c
index ca8dcf130c2c..86adcbcb2497 100644
--- a/print/ghostscript9-agpl-x11/files/patch-devices-gdevvglb.c
+++ b/print/ghostscript9-agpl-x11/files/patch-devices_gdevvglb.c
@@ -1,6 +1,6 @@
---- devices/gdevvglb.c.orig	2011-07-17 19:56:33.000000000 +0900
-+++ devices/gdevvglb.c	2011-07-17 19:57:10.000000000 +0900
-@@ -367,12 +367,3 @@
+--- devices/gdevvglb.c.orig	2015-03-30 08:21:24 UTC
++++ devices/gdevvglb.c
+@@ -368,12 +368,3 @@ vgalib_put_params(gx_device * dev, gs_pa
      }
      return 0;
  }
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/ghostscript8-base/files/patch-Resource-Init-cidfmap b/print/ghostscript9-base/files/patch-Resource_Init_cidfmap
index 8ed71789f4fe..9c7c8c88e703 100644
--- a/print/ghostscript8-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-agpl-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-agpl-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-x11/files/patch-base-gsicc_create.c b/print/ghostscript9-base/files/patch-base-gsicc__create.c
index 82bfee6c37ef..fdf8f5e33be3 100644
--- a/print/ghostscript9-x11/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-gxobj.h b/print/ghostscript9-base/files/patch-base-gxobj.h
deleted file mode 100644
index 529efe379df2..000000000000
--- a/print/ghostscript9-base/files/patch-base-gxobj.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 @@
-  * required by the hardware, regardless of the value of obj_align_mod.
-  * See gsmemraw.h for more information about this.
-  */
-+#if !defined(__ia64__) && !defined(__amd64__)
- #define obj_align_mod\
-   (((ARCH_ALIGN_MEMORY_MOD - 1) |\
-     (align_bitmap_mod - 1) |\
-     (obj_back_scale - 1)) + 1)
- /* The only possible values for obj_align_mod are 4, 8, or 16.... */
-+#else
-+#define obj_align_mod  16
-+#endif
- #if obj_align_mod == 4
- #  define log2_obj_align_mod 2
- #else
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-agpl-x11/files/patch-devices-gdevl256.c b/print/ghostscript9-base/files/patch-base_gdevl256.c
index ed7d36002a62..5e109c1a71ef 100644
--- a/print/ghostscript9-agpl-x11/files/patch-devices-gdevl256.c
+++ b/print/ghostscript9-base/files/patch-base_gdevl256.c
@@ -1,6 +1,6 @@
---- devices/gdevl256.c.orig	2011-07-17 19:57:32.000000000 +0900
-+++ devices/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-agpl-base/files/patch-devices-gdevvglb.c b/print/ghostscript9-base/files/patch-base_gdevvglb.c
index ca8dcf130c2c..c6b38a6c68be 100644
--- a/print/ghostscript9-agpl-base/files/patch-devices-gdevvglb.c
+++ b/print/ghostscript9-base/files/patch-base_gdevvglb.c
@@ -1,6 +1,6 @@
---- devices/gdevvglb.c.orig	2011-07-17 19:56:33.000000000 +0900
-+++ devices/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-agpl-base/files/patch-base-gs.mak b/print/ghostscript9-base/files/patch-base_gs.mak
index 50d31a63a2d2..99f9426dc787 100644
--- a/print/ghostscript9-agpl-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
new file mode 100644
index 000000000000..762709c55265
--- /dev/null
+++ b/print/ghostscript9-base/files/patch-base_gxobj.h
@@ -0,0 +1,18 @@
+--- 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.
+  */
++#if !defined(__ia64__) && !defined(__amd64__)
+ #define obj_align_mod\
+   (((ARCH_ALIGN_MEMORY_MOD - 1) |\
+     (align_bitmap_mod - 1) |\
+     (obj_back_scale - 1)) + 1)
+ /* The only possible values for obj_align_mod are 4, 8, or 16.... */
++#else
++#define obj_align_mod  16
++#endif
+ #if obj_align_mod == 4
+ #  define log2_obj_align_mod 2
+ #else
diff --git a/print/ghostscript9-agpl-base/files/patch-base-openjpeg.mak b/print/ghostscript9-base/files/patch-base_openjpeg.mak
index 3d85cb70abf1..4e29b5603b64 100644
--- a/print/ghostscript9-agpl-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-agpl-base/files/patch-base-unixinst.mak b/print/ghostscript9-base/files/patch-base_unixinst.mak
index 0c67aa7c058b..75d285cb2c60 100644
--- a/print/ghostscript9-agpl-base/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-base/files/patch-base_unixinst.mak
@@ -1,6 +1,6 @@
---- base/unixinst.mak.orig	2014-03-26 21:53:47.000000000 +0900
-+++ base/unixinst.mak	2014-11-23 17:01:40.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-agpl-base/files/patch-lips:gdevlips.c b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c
index 0917be89e49a..760cdfd5cd07 100644
--- a/print/ghostscript9-agpl-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-agpl-base/files/patch-lips:gdevlips.h b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h
index b3520ba1ac33..68b4769ae8ff 100644
--- a/print/ghostscript9-agpl-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-agpl-base/files/patch-epag-ert.c b/print/ghostscript9-base/files/patch-epag-3.09_ert.c
index 6a6dd2540b8a..d4395ca747a5 100644
--- a/print/ghostscript9-agpl-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/ghostscript8-base/files/patch-epag__gdevepag.c b/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c
index 6012768b4d9c..f4d3f11e7b8c 100644
--- a/print/ghostscript8-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);
diff --git a/print/ghostscript9-x11/files/patch-base-gxobj.h b/print/ghostscript9-x11/files/patch-base-gxobj.h
deleted file mode 100644
index 529efe379df2..000000000000
--- a/print/ghostscript9-x11/files/patch-base-gxobj.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 @@
-  * required by the hardware, regardless of the value of obj_align_mod.
-  * See gsmemraw.h for more information about this.
-  */
-+#if !defined(__ia64__) && !defined(__amd64__)
- #define obj_align_mod\
-   (((ARCH_ALIGN_MEMORY_MOD - 1) |\
-     (align_bitmap_mod - 1) |\
-     (obj_back_scale - 1)) + 1)
- /* The only possible values for obj_align_mod are 4, 8, or 16.... */
-+#else
-+#define obj_align_mod  16
-+#endif
- #if obj_align_mod == 4
- #  define log2_obj_align_mod 2
- #else
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-agpl-base/files/patch-devices-gdevl256.c b/print/ghostscript9-x11/files/patch-base_gdevl256.c
index ed7d36002a62..5e109c1a71ef 100644
--- a/print/ghostscript9-agpl-base/files/patch-devices-gdevl256.c
+++ b/print/ghostscript9-x11/files/patch-base_gdevl256.c
@@ -1,6 +1,6 @@
---- devices/gdevl256.c.orig	2011-07-17 19:57:32.000000000 +0900
-+++ devices/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-base/files/patch-base-gsicc_create.c b/print/ghostscript9-x11/files/patch-base_gsicc__create.c
index 82bfee6c37ef..fdf8f5e33be3 100644
--- a/print/ghostscript9-base/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
new file mode 100644
index 000000000000..762709c55265
--- /dev/null
+++ b/print/ghostscript9-x11/files/patch-base_gxobj.h
@@ -0,0 +1,18 @@
+--- 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.
+  */
++#if !defined(__ia64__) && !defined(__amd64__)
+ #define obj_align_mod\
+   (((ARCH_ALIGN_MEMORY_MOD - 1) |\
+     (align_bitmap_mod - 1) |\
+     (obj_back_scale - 1)) + 1)
+ /* The only possible values for obj_align_mod are 4, 8, or 16.... */
++#else
++#define obj_align_mod  16
++#endif
+ #if obj_align_mod == 4
+ #  define log2_obj_align_mod 2
+ #else
diff --git a/print/ghostscript9-agpl-x11/files/patch-base-lib.mak b/print/ghostscript9-x11/files/patch-base_lib.mak
index c0008e2eb361..3c8c2a846b9f 100644
--- a/print/ghostscript9-agpl-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-22 03:38:11.784264000 +0900
-+++ base/lib.mak	2015-08-22 03:38:19.947660000 +0900
-@@ -1025,7 +1025,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-agpl-x11/files/patch-base-unixinst.mak b/print/ghostscript9-x11/files/patch-base_unixinst.mak
index 0c67aa7c058b..75d285cb2c60 100644
--- a/print/ghostscript9-agpl-x11/files/patch-base-unixinst.mak
+++ b/print/ghostscript9-x11/files/patch-base_unixinst.mak
@@ -1,6 +1,6 @@
---- base/unixinst.mak.orig	2014-03-26 21:53:47.000000000 +0900
-+++ base/unixinst.mak	2014-11-23 17:01:40.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/security/gnupg1/files/patch-doc:Makefile.in b/security/gnupg1/files/patch-doc_Makefile.in
index ce54485eee35..ee587f84b295 100644
--- a/security/gnupg1/files/patch-doc:Makefile.in
+++ b/security/gnupg1/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2015-02-27 17:37:51.000000000 +0900
-+++ doc/Makefile.in	2015-02-28 23:39:40.404690107 +0900
-@@ -77,7 +77,7 @@
+--- doc/Makefile.in.orig	2015-12-20 07:53:15 UTC
++++ doc/Makefile.in
+@@ -77,7 +77,7 @@ am__make_running_with_option = \
    test $$has_opt = yes
  am__make_dryrun = (target_option=n; $(am__make_running_with_option))
  am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
@@ -9,7 +9,7 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -422,7 +422,11 @@
+@@ -422,7 +422,11 @@ gnupg1_TEXINFOS = gnupg1.texi
  
  # Need this to avoid building of dvis with automake 1.4
  DVIS = 
@@ -21,7 +21,7 @@
  
  # we can't add gpg.texi gpgv.texi here because automake does not like them to
  # be built files.
-@@ -670,6 +674,8 @@
+@@ -670,6 +674,8 @@ uninstall-man1:
  	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
  	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
  install-pkgdataDATA: $(pkgdata_DATA)
@@ -30,7 +30,7 @@
  	@$(NORMAL_INSTALL)
  	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
  	if test -n "$$list"; then \
-@@ -684,6 +690,7 @@
+@@ -684,6 +690,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
  	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
  	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done
diff --git a/security/gnupg1/files/patch-g10:Makefile.in b/security/gnupg1/files/patch-g10_Makefile.in
index c77e91423ede..fa656a6e9861 100644
--- a/security/gnupg1/files/patch-g10:Makefile.in
+++ b/security/gnupg1/files/patch-g10_Makefile.in
@@ -1,6 +1,6 @@
---- g10/Makefile.in.orig	2015-02-27 17:37:51.000000000 +0900
-+++ g10/Makefile.in	2015-02-28 23:43:42.178420136 +0900
-@@ -79,7 +79,7 @@
+--- g10/Makefile.in.orig	2015-12-20 07:53:15 UTC
++++ g10/Makefile.in
+@@ -79,7 +79,7 @@ am__make_running_with_option = \
    test $$has_opt = yes
  am__make_dryrun = (target_option=n; $(am__make_running_with_option))
  am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
@@ -9,7 +9,7 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -465,7 +465,11 @@
+@@ -465,7 +465,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
  	@LIBUSB_CPPFLAGS@ $(am__append_1)
  needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
  other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
@@ -21,7 +21,7 @@
  @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = 
  @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c
  common_source = \
-@@ -731,6 +735,8 @@
+@@ -731,6 +735,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
@@ -30,7 +30,7 @@
  	@$(NORMAL_INSTALL)
  	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
  	if test -n "$$list"; then \
-@@ -745,6 +751,7 @@
+@@ -745,6 +751,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata
  	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
  	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done
diff --git a/security/gnupg1/files/patch-config.links b/security/gnupg1/files/patch-mpi_config.links
index 7b59e4da6aa5..c3917be5dd23 100644
--- a/security/gnupg1/files/patch-config.links
+++ b/security/gnupg1/files/patch-mpi_config.links
@@ -1,6 +1,6 @@
---- mpi/config.links.orig	Thu Apr 24 20:15:58 2003
-+++ mpi/config.links	Sat May 10 16:29:28 2003
-@@ -40,7 +40,7 @@
+--- mpi/config.links.orig	2015-12-19 14:08:22 UTC
++++ mpi/config.links
+@@ -40,7 +40,7 @@ case "${host}" in
         ;;
      i[3467]86*-*-openbsd*      | \
      i[3467]86*-*-freebsd*-elf  | \
@@ -9,8 +9,8 @@
      i[3467]86*-*-freebsdelf*   | \
      i[3467]86*-*-netbsd*       | \
      i[3467]86*-*-k*bsd*)
-@@ -142,6 +142,12 @@
-        echo '/* configured for sparc64-*netbsd */' >>./mpi/asm-syntax.h
+@@ -141,6 +141,12 @@ case "${host}" in
+        echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
         path=""
         ;;
 +    sparc64-*-freebsd*)
@@ -20,9 +20,9 @@
 +       path=""
 +       ;;
      sparc9*-*-*     | \
-     sparc64*-*-*    | \
      ultrasparc*-*-* )
-@@ -227,8 +227,8 @@
+ 	echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h
+@@ -230,8 +236,8 @@ case "${host}" in
  	path="powerpc32"
  	;;
  
diff --git a/security/gnupg1/files/patch-mpi_longlong.h b/security/gnupg1/files/patch-mpi_longlong.h
index 4e08c5033ae0..35148e74d6b5 100644
--- a/security/gnupg1/files/patch-mpi_longlong.h
+++ b/security/gnupg1/files/patch-mpi_longlong.h
@@ -1,4 +1,4 @@
---- mpi/longlong.h.orig	2014-06-30 16:46:23 UTC
+--- mpi/longlong.h.orig	2015-12-19 14:08:22 UTC
 +++ mpi/longlong.h
 @@ -184,8 +184,8 @@ extern UDItype __udiv_qrnnd ();
  #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
diff --git a/security/gnupg1/files/patch-g10-trustdb.c b/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c
index 62c7ec532245..2370ae859038 100644
--- a/security/gnupg1/files/patch-g10-trustdb.c
+++ b/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c
@@ -1,10 +1,10 @@
 Index: security/gnupg1/files/patch-g10-trustdb.c
 ===================================================================
---- security/gnupg1/files/patch-g10-trustdb.c	(revision 0)
-+++ security/gnupg1/files/patch-g10-trustdb.c	(working copy)
+--- security/gnupg1/files/patch-g10-trustdb.c.orig	2016-06-17 21:55:32 UTC
++++ security/gnupg1/files/patch-g10-trustdb.c
 @@ -0,0 +1,10 @@
 +--- g10/trustdb.c.orig	2013-12-13 08:28:22.000000000 +0100
-++++ g10/trustdb.c	2014-05-17 19:47:21.125216457 +0200
+++++ g10/trustdb.c
 +@@ -927,6 +927,7 @@
 +   TRUSTREC rec;
 +   int rc;
diff --git a/security/p5-SAVI-Perl/files/patch-sav_if:s_comput.h b/security/p5-SAVI-Perl/files/patch-sav__if_s__comput.h
index 425aea1d2b9d..741324dc0e46 100644
--- a/security/p5-SAVI-Perl/files/patch-sav_if:s_comput.h
+++ b/security/p5-SAVI-Perl/files/patch-sav__if_s__comput.h
@@ -1,5 +1,5 @@
---- sav_if/s_comput.h.orig	2009-09-18 21:22:27.000000000 +0900
-+++ sav_if/s_comput.h	2009-09-18 21:22:52.000000000 +0900
+--- sav_if/s_comput.h.orig	2004-11-16 20:59:20 UTC
++++ sav_if/s_comput.h
 @@ -642,7 +642,7 @@
   * Hardware platform.
   */
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 955d6b1dcef9..3d1a119ba74d 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --disable-Werror
 CFLAGS+=	-Dgetopt_long_only=getopt_long
 
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-progsreiserfs_libmisc_Makefile.in
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/sysutils/progsreiserfs/files/extrapatch-progsreiserfs::libmisc::Makefile.in b/sysutils/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
index cf1a04460f8f..b482ec8293dd 100644
--- a/sysutils/progsreiserfs/files/extrapatch-progsreiserfs::libmisc::Makefile.in
+++ b/sysutils/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
@@ -1,6 +1,6 @@
---- progsreiserfs/libmisc/Makefile.in.orig	Wed Sep  1 12:29:59 2004
-+++ progsreiserfs/libmisc/Makefile.in	Wed Sep  1 12:30:29 2004
-@@ -110,7 +110,7 @@
+--- progsreiserfs/libmisc/Makefile.in.orig	2002-12-12 12:38:22 UTC
++++ progsreiserfs/libmisc/Makefile.in
+@@ -110,7 +110,7 @@ am__quote = @am__quote@
  install_sh = @install_sh@
  
  noinst_LTLIBRARIES = libmisc.la
@@ -9,7 +9,7 @@
  
  INCLUDES = -I$(top_srcdir)/include @INTLINCS@
  subdir = progsreiserfs/libmisc
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
  
  libmisc_la_LDFLAGS =
  libmisc_la_LIBADD =
@@ -18,7 +18,7 @@
  libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS)
  
  DEFS = @DEFS@
-@@ -130,7 +130,7 @@
+@@ -130,7 +130,7 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -27,7 +27,7 @@
  @AMDEP_TRUE@	$(DEPDIR)/tools.Plo
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -177,7 +177,6 @@
+@@ -177,7 +177,6 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
diff --git a/sysutils/progsreiserfs/files/patch-libdal-file.c b/sysutils/progsreiserfs/files/patch-libdal_file.c
index 82a52fc6e393..76a7926d532f 100644
--- a/sysutils/progsreiserfs/files/patch-libdal-file.c
+++ b/sysutils/progsreiserfs/files/patch-libdal_file.c
@@ -1,5 +1,5 @@
---- libdal/file.c.orig	Thu Dec 12 21:32:34 2002
-+++ libdal/file.c	Sat Aug 12 15:35:27 2006
+--- libdal/file.c.orig	2002-12-12 12:32:34 UTC
++++ libdal/file.c
 @@ -14,6 +14,7 @@
  
  #if defined(__freebsd__)
@@ -8,7 +8,7 @@
  #endif
  
  #ifndef DJGPP
-@@ -154,6 +155,15 @@
+@@ -154,6 +155,15 @@ static count_t file_len(dal_t *dal) {
      
  #endif
      
diff --git a/sysutils/progsreiserfs/files/patch-libreiserfs__journal.c b/sysutils/progsreiserfs/files/patch-libreiserfs_journal.c
index fe5c6165905f..da24c4593308 100644
--- a/sysutils/progsreiserfs/files/patch-libreiserfs__journal.c
+++ b/sysutils/progsreiserfs/files/patch-libreiserfs_journal.c
@@ -1,6 +1,6 @@
---- libreiserfs/journal.c	Thu Dec 12 13:32:35 2002
-+++ libreiserfs/journal.c.new	Thu May 13 00:01:43 2004
-@@ -482,7 +482,7 @@
+--- libreiserfs/journal.c.orig	2002-12-12 12:32:35 UTC
++++ libreiserfs/journal.c
+@@ -482,7 +482,7 @@ static int callback_journal_replay(reise
  blk_t reiserfs_journal_boundary_transactions(reiserfs_journal_t *journal,
      reiserfs_journal_trans_t *oldest, reiserfs_journal_trans_t *newest)
  {
diff --git a/www/mod_jk/files/patch-tomcat-connectors-src:native:configure b/www/mod_jk/files/patch-configure
index e6d0772a6126..9f0a918455e5 100644
--- a/www/mod_jk/files/patch-tomcat-connectors-src:native:configure
+++ b/www/mod_jk/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.ori  2009-01-08 09:42:19.000000000 -0800
-+++ configure      2009-01-08 10:06:18.000000000 -0800
-@@ -3066,7 +3066,7 @@
+--- configure.orig	2015-07-26 22:21:39 UTC
++++ configure
+@@ -3638,7 +3638,7 @@ $as_echo "APRINCLUDEDIR is $APRINCLUDEDI
                  APXSCC="`$APXS -q CC`"
                  APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
                  APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
diff --git a/x11-fonts/gfe/files/patch-src:main.c b/x11-fonts/gfe/files/patch-src:main.c
deleted file mode 100644
index b6a75a81ddbf..000000000000
--- a/x11-fonts/gfe/files/patch-src:main.c
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN src.dist/main.c src/main.c
---- src.dist/main.c    Tue Feb 26 09:11:19 2002
-+++ src/main.c Tue Feb 26 09:11:47 2002
-@@ -37,6 +37,7 @@
-   int i;
- 
-   /* process gtk/X switches */
-+  gtk_set_locale();
-   gtk_init(&argc, &argv);
- 
-   show_version = FALSE;
diff --git a/x11-fonts/gfe/files/patch-src:auxil.c b/x11-fonts/gfe/files/patch-src_auxil.c
index 0d56dfdc0ff4..127f02761a38 100644
--- a/x11-fonts/gfe/files/patch-src:auxil.c
+++ b/x11-fonts/gfe/files/patch-src_auxil.c
@@ -1,7 +1,6 @@
 Only in src.dist: about_dialog.o
-diff -u src.dist/auxil.c src/auxil.c
---- src.dist/auxil.c	Thu Dec 27 06:00:20 2001
-+++ src/auxil.c	Thu Dec 27 06:01:59 2001
+--- src/auxil.c.orig	2000-06-27 07:19:31 UTC
++++ src/auxil.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -11,10 +10,8 @@ diff -u src.dist/auxil.c src/auxil.c
  #include <gtk/gtk.h>
  
  #include "auxil.h"
-Only in src.dist: auxil.o
-diff -u src.dist/bitmap.c src/bitmap.c
---- src.dist/bitmap.c	Thu Dec 27 06:00:20 2001
-+++ src/bitmap.c	Thu Dec 27 06:01:59 2001
+--- src/bitmap.c.orig	2000-06-27 07:19:31 UTC
++++ src/bitmap.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -24,9 +21,8 @@ diff -u src.dist/bitmap.c src/bitmap.c
  
  #include "bitmap.h"
  
-diff -u src.dist/file.c src/file.c
---- src.dist/file.c	Thu Dec 27 06:00:20 2001
-+++ src/file.c	Thu Dec 27 06:01:59 2001
+--- src/file.c.orig	2000-07-03 05:43:15 UTC
++++ src/file.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -36,9 +32,8 @@ diff -u src.dist/file.c src/file.c
  
  #include "auxil.h"
  #include "bdf.h"
-diff -u src.dist/font.c src/font.c
---- src.dist/font.c	Thu Dec 27 06:00:20 2001
-+++ src/font.c	Thu Dec 27 06:01:59 2001
+--- src/font.c.orig	2000-06-27 07:19:31 UTC
++++ src/font.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -48,9 +43,8 @@ diff -u src.dist/font.c src/font.c
  
  #include "auxil.h"
  #include "font.h"
-diff -u src.dist/glyph.c src/glyph.c
---- src.dist/glyph.c	Thu Dec 27 06:00:20 2001
-+++ src/glyph.c	Thu Dec 27 06:01:59 2001
+--- src/glyph.c.orig	2000-06-27 07:19:31 UTC
++++ src/glyph.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -60,9 +54,8 @@ diff -u src.dist/glyph.c src/glyph.c
  
  #include "auxil.h"
  #include "glyph.h"
-diff -u src.dist/gui.c src/gui.c
---- src.dist/gui.c	Thu Dec 27 06:00:20 2001
-+++ src/gui.c	Thu Dec 27 06:01:59 2001
+--- src/gui.c.orig	2000-06-29 15:33:23 UTC
++++ src/gui.c
 @@ -16,7 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -72,10 +65,8 @@ diff -u src.dist/gui.c src/gui.c
  
  #include "auxil.h"
  #include "character.h"
-Common subdirectories: src.dist/pixmaps and src/pixmaps
-diff -u src.dist/raster_font.c src/raster_font.c
---- src.dist/raster_font.c	Thu Dec 27 06:00:20 2001
-+++ src/raster_font.c	Thu Dec 27 06:01:59 2001
+--- src/raster_font.c.orig	2000-06-27 07:19:31 UTC
++++ src/raster_font.c
 @@ -15,7 +15,7 @@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -85,9 +76,8 @@ diff -u src.dist/raster_font.c src/raster_font.c
  
  #include "auxil.h"
  #include "bitmap.h"
-diff -u src.dist/raster_glyph.c src/raster_glyph.c
---- src.dist/raster_glyph.c	Thu Dec 27 06:00:20 2001
-+++ src/raster_glyph.c	Thu Dec 27 06:01:59 2001
+--- src/raster_glyph.c.orig	2000-06-27 07:19:31 UTC
++++ src/raster_glyph.c
 @@ -17,7 +17,7 @@
   */
  #include <gtk/gtk.h>
diff --git a/x11-fonts/gfe/files/patch-src_bdf.c b/x11-fonts/gfe/files/patch-src_bdf.c
index 1bce397a0a62..82e7a1416fca 100644
--- a/x11-fonts/gfe/files/patch-src_bdf.c
+++ b/x11-fonts/gfe/files/patch-src_bdf.c
@@ -1,5 +1,5 @@
---- src/bdf.c.orig	Tue Jun 27 12:36:09 2000
-+++ src/bdf.c	Sat Nov 30 02:04:14 2002
+--- src/bdf.c.orig	2000-06-27 10:36:09 UTC
++++ src/bdf.c
 @@ -18,7 +18,8 @@
  #include <gtk/gtk.h>
  
diff --git a/x11-fonts/gfe/files/patch-src_glyph.h b/x11-fonts/gfe/files/patch-src_glyph.h
index c9e8fdc60210..e888b5b4fb56 100644
--- a/x11-fonts/gfe/files/patch-src_glyph.h
+++ b/x11-fonts/gfe/files/patch-src_glyph.h
@@ -1,5 +1,5 @@
---- src/glyph.h.orig	Sat Nov 30 02:01:40 2002
-+++ src/glyph.h	Sat Nov 30 02:06:16 2002
+--- src/glyph.h.orig	2000-06-27 07:19:31 UTC
++++ src/glyph.h
 @@ -20,7 +20,7 @@
  #define __GFE_GLYPH_H__
  
diff --git a/x11-fonts/gfe/files/patch-src_main.c b/x11-fonts/gfe/files/patch-src_main.c
new file mode 100644
index 000000000000..823bba9882d1
--- /dev/null
+++ b/x11-fonts/gfe/files/patch-src_main.c
@@ -0,0 +1,10 @@
+--- src/main.c.orig	2000-06-29 08:16:34 UTC
++++ src/main.c
+@@ -37,6 +37,7 @@ main(int argc, char *argv[])
+   int i;
+ 
+   /* process gtk/X switches */
++  gtk_set_locale();
+   gtk_init(&argc, &argv);
+ 
+   show_version = FALSE;
diff --git a/x11/eterm/files/patch-doc:Makefile.in b/x11/eterm/files/patch-doc_Makefile.in
index f6cf121fed70..86ce3672154d 100644
--- a/x11/eterm/files/patch-doc:Makefile.in
+++ b/x11/eterm/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Tue Aug 22 20:40:17 2006
-+++ doc/Makefile.in	Fri Dec  8 20:44:14 2006
-@@ -372,7 +372,6 @@
+--- doc/Makefile.in.orig	2011-03-16 06:10:30 UTC
++++ doc/Makefile.in
+@@ -375,7 +375,6 @@ info-am:
  
  install-data-am: install-man
  	@$(NORMAL_INSTALL)
@@ -8,8 +8,8 @@
  
  install-exec-am:
  
-@@ -414,26 +413,17 @@
- 	uninstall-man1
+@@ -417,26 +416,17 @@ uninstall-man: uninstall-man1
+ 	uninstall-man uninstall-man1
  
  
 -all: Makefile Eterm.1.html
diff --git a/x11/eterm/files/patch-src_command.c b/x11/eterm/files/patch-src_command.c
index 5de8248acf73..e40e892c5a3c 100644
--- a/x11/eterm/files/patch-src_command.c
+++ b/x11/eterm/files/patch-src_command.c
@@ -1,6 +1,6 @@
---- src/command.c.orig
+--- src/command.c.orig	2011-03-16 06:05:03 UTC
 +++ src/command.c
-@@ -1561,7 +1561,7 @@
+@@ -1561,7 +1561,7 @@ get_tty(void)
       * child processes remain alive upon deletion of the window.
       */
      {
diff --git a/x11/eterm/files/patch-themes-Eterm:menus.cfg b/x11/eterm/files/patch-themes-Eterm:menus.cfg
deleted file mode 100644
index 26bed650b360..000000000000
--- a/x11/eterm/files/patch-themes-Eterm:menus.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
---- themes/Eterm/menus.cfg.orig	Thu Feb 13 19:46:52 2003
-+++ themes/Eterm/menus.cfg	Thu Feb 13 19:46:57 2003
-@@ -1,4 +1,4 @@
--<Eterm-0.9.1>
-+<Eterm-0.9.2>
- begin menu
-   title Font
-   begin menuitem
diff --git a/x11/eterm/files/patch-themes-auto:menus.cfg b/x11/eterm/files/patch-themes-auto:menus.cfg
deleted file mode 100644
index 3b73bcc83eaa..000000000000
--- a/x11/eterm/files/patch-themes-auto:menus.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
---- themes/auto/menus.cfg.orig	Thu Feb 13 19:42:55 2003
-+++ themes/auto/menus.cfg	Thu Feb 13 19:43:09 2003
-@@ -1,4 +1,4 @@
--<Eterm-0.9.1>
-+<Eterm-0.9.2>
- begin menu
-   title Font
-   begin menuitem
diff --git a/x11/eterm/files/patch-themes-trans:menus.cfg b/x11/eterm/files/patch-themes-trans:menus.cfg
deleted file mode 100644
index 3fc18d6699a9..000000000000
--- a/x11/eterm/files/patch-themes-trans:menus.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
---- themes/trans/menus.cfg.orig	Thu Feb 13 19:43:48 2003
-+++ themes/trans/menus.cfg	Thu Feb 13 19:43:57 2003
-@@ -1,4 +1,4 @@
--<Eterm-0.9.1>
-+<Eterm-0.9.2>
- begin menu
-   title Font
-   begin menuitem
diff --git a/x11/eterm/files/patch-themes_Eterm_menus.cfg b/x11/eterm/files/patch-themes_Eterm_menus.cfg
new file mode 100644
index 000000000000..03e3a735c190
--- /dev/null
+++ b/x11/eterm/files/patch-themes_Eterm_menus.cfg
@@ -0,0 +1,8 @@
+--- themes/Eterm/menus.cfg.orig	2008-08-17 09:38:39 UTC
++++ themes/Eterm/menus.cfg
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/eterm/files/patch-themes_auto_menus.cfg b/x11/eterm/files/patch-themes_auto_menus.cfg
new file mode 100644
index 000000000000..4ab56b0b7dd1
--- /dev/null
+++ b/x11/eterm/files/patch-themes_auto_menus.cfg
@@ -0,0 +1,8 @@
+--- themes/auto/menus.cfg.orig	2008-08-17 09:38:39 UTC
++++ themes/auto/menus.cfg
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/eterm/files/patch-themes_trans_menus.cfg b/x11/eterm/files/patch-themes_trans_menus.cfg
new file mode 100644
index 000000000000..10769ab5c9f5
--- /dev/null
+++ b/x11/eterm/files/patch-themes_trans_menus.cfg
@@ -0,0 +1,8 @@
+--- themes/trans/menus.cfg.orig	2008-08-17 09:38:39 UTC
++++ themes/trans/menus.cfg
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/mlterm/files/patch-configure b/x11/mlterm/files/patch-configure
index d805e562b7f2..2ad8cfcc4ca9 100644
--- a/x11/mlterm/files/patch-configure
+++ b/x11/mlterm/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-05-25 14:42:27.000000000 +0900
-+++ configure	2014-06-16 19:51:51.000000000 +0900
-@@ -21375,7 +21375,7 @@
+--- configure.orig	2016-03-13 10:57:40 UTC
++++ configure
+@@ -21869,7 +21869,7 @@ if test "$utmp" = "yes" -a "$pty_helper"
  	if test "$has_utmp" ; then
  		INSTALL_OPT="-m 2755 -g utmp"
  	else
@@ -9,11 +9,11 @@
  	fi
  else
  	INSTALL_OPT="-m 755"
-@@ -21529,6 +21529,7 @@
+@@ -22095,6 +22095,7 @@ $as_echo "yes" >&6; }
  fi
  	fi
  	if test "$have_vte" = "yes" ; then
 +		MAKE_DIRS="gtk ${MAKE_DIRS}"
  		OUTPUT_FILES="gtk/Makefile ${OUTPUT_FILES}"
- 		# "tr ..." is hack for cygwin.
- 		# (removing \r which is output by win32 native pkg-config.)
+ 
+ 	fi
diff --git a/x11/mlterm/files/patch-gtk_Makefile.in b/x11/mlterm/files/patch-gtk_Makefile.in
index 93fe2eb2b733..b8a4fc735d61 100644
--- a/x11/mlterm/files/patch-gtk_Makefile.in
+++ b/x11/mlterm/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig	2015-08-30 09:03:13.000000000 +0900
-+++ gtk/Makefile.in	2015-09-05 21:29:04.086830000 +0900
-@@ -30,7 +30,7 @@
+--- gtk/Makefile.in.orig	2016-03-13 10:57:40 UTC
++++ gtk/Makefile.in
+@@ -30,7 +30,7 @@ LIB_VERSION_2.90 = 9:0:0
  LIB_VERSION_2.91 = 0:0:0
  
  TARGET = $(TARGET_$(VTE_ABI))
diff --git a/x11/mlterm/files/patch-inputmethod_ibus_im_ibus.c b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c
index 3eaeddfdf0a7..c07336139de8 100644
--- a/x11/mlterm/files/patch-inputmethod_ibus_im_ibus.c
+++ b/x11/mlterm/files/patch-inputmethod_ibus_im__ibus.c
@@ -1,6 +1,6 @@
---- inputmethod/ibus/im_ibus.c.orig	2011-05-29 01:07:42.000000000 +0900
-+++ inputmethod/ibus/im_ibus.c	2011-05-29 04:57:48.000000000 +0900
-@@ -631,7 +631,7 @@
+--- inputmethod/ibus/im_ibus.c.orig	2016-03-13 10:57:40 UTC
++++ inputmethod/ibus/im_ibus.c
+@@ -1289,7 +1289,7 @@ im_ibus_get_info(
  	}
  
  	result->id = strdup( "ibus") ;
diff --git a/x11/mlterm/files/patch-tool:w3mmlconfig:mlconfig.cgi.in b/x11/mlterm/patch-tool_w3mmlconfig_mlconfig.cgi.in
index 844f217fcef1..844f217fcef1 100644
--- a/x11/mlterm/files/patch-tool:w3mmlconfig:mlconfig.cgi.in
+++ b/x11/mlterm/patch-tool_w3mmlconfig_mlconfig.cgi.in