Upgrade to 6.53.

PR:		ports/36674
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

1 files changed, 52 insertions, 35 deletions

diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index 2143001118ad..626241a4d32e 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Tue Jul 10 12:01:06 2001
-+++ src/unix-gcc.mak	Sat Dec 15 04:22:49 2001
+--- src/unix-gcc.mak.orig	Tue Feb  5 09:20:42 2002
++++ src/unix-gcc.mak	Fri Feb  8 05:16:49 2002
 @@ -27,14 +27,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -46,23 +46,30 @@
  datadir = $(prefix)/share
  gsdir = $(datadir)/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
-@@ -104,6 +105,15 @@
+@@ -103,14 +104,6 @@
+ #	  No execution time or space penalty.
  
  GENOPT=
+-# Choose capability options.
+-
+-# -DHAVE_MKSTEMP
+-#	uses mkstemp instead of mktemp
+-#		This gets rid of several security warnings that look
+-#		ominous.  Enable this if you wish to get rid of them.
+-
+-CAPOPT= -DHAVE_MKSTEMP
  
-+# Choose capability options.
-+
-+# -DHAVE_MKSTEMP
-+#	uses mkstemp instead of mktemp
-+#		This gets rid of several security warnings that look
-+#		ominous.  Enable this if you wish to get rid of them.
-+
-+CAPOPT= -DHAVE_MKSTEMP
-+
+ # Choose capability options.
+ 
+@@ -121,7 +114,6 @@
+ 
+ CAPOPT= -DHAVE_MKSTEMP
+ 
+-
  # Define the name of the executable file.
  
  GS=gs
-@@ -129,7 +139,7 @@
+@@ -147,7 +139,7 @@
  # You may need to change this if the IJG library version changes.
  # See jpeg.mak for more information.
  
@@ -71,7 +78,7 @@
  JVERSION=6
  
  # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -149,14 +159,14 @@
+@@ -167,14 +159,14 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -88,7 +95,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -168,7 +178,7 @@
+@@ -186,7 +178,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -97,7 +104,16 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -183,7 +193,7 @@
+@@ -197,6 +189,8 @@
+ IJSSRCDIR=ijs
+ IJSEXECTYPE=unix
+ 
++STPLIB=gimpprint
++
+ # Define how to build the library archives.  (These are not used in any
+ # standard configuration.)
+ 
+@@ -208,7 +202,7 @@
  
  # Define the name of the C compiler.
  
@@ -106,28 +122,38 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -216,9 +226,9 @@
+@@ -225,9 +219,9 @@
+ # Define the added flags for standard, debugging, profiling 
+ # and shared object builds.
+ 
+-CFLAGS_STANDARD=-O2
+-CFLAGS_DEBUG=-g -O
+-CFLAGS_PROFILE=-pg -O2
++CFLAGS_STANDARD?=-O2
++CFLAGS_DEBUG=-g
++CFLAGS_PROFILE=-pg
+ CFLAGS_SO=-fPIC
+ 
+ # Define the other compilation flags.  Add at most one of the following:
+@@ -241,7 +235,7 @@
  # 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.
 -XCFLAGS=
-+#XCFLAGS=
++XCFLAGS+=-I${.CURDIR}/gimp-print
  
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+CFLAGS+=$(XCFLAGS)
+ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -227,7 +237,7 @@
+@@ -252,7 +246,7 @@
  #	-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.
 -XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
++XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -260,7 +270,7 @@
+@@ -285,7 +279,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -136,7 +162,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
-@@ -272,12 +282,12 @@
+@@ -297,12 +291,12 @@
  # 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
@@ -152,12 +178,3 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -406,7 +416,7 @@
- 
- # Define the compilation rules and flags.
- 
--CCFLAGS=$(GENOPT) $(CFLAGS)
-+CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS)
- CC_=$(CC) `cat $(AK)` $(CCFLAGS)
- CCAUX=$(CC) `cat $(AK)`
- CC_LEAF=$(CC_) -fomit-frame-pointer