Update to 7.04.

Modifications against PR are:
  o $MASTER_SITES substitution.
  o Typo in scripts/configure.

I don't know why $MLINKS entries are not in generated plist...

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

4 files changed, 30 insertions, 42 deletions

diff --git a/print/ghostscript-gpl/files/hpijs.contrib.mak b/print/ghostscript-gpl/files/hpijs.contrib.mak
deleted file mode 100644
index 6e94367c778c..000000000000
--- a/print/ghostscript-gpl/files/hpijs.contrib.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-### ------------- IJS Interface -------------- ###
-
-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ)
-
-$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c
-
-$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c
-
-$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c
-
-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
-
-$(DD)ijs.dev : $(ijs_) $(DD)page.dev
-	$(SETPDEV) $(DD)ijs $(ijs_)
-
diff --git a/print/ghostscript-gpl/files/patch-lib:gs_init.ps b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
index d3e7e8130021..70de88245ddc 100644
--- a/print/ghostscript-gpl/files/patch-lib:gs_init.ps
+++ b/print/ghostscript-gpl/files/patch-lib:gs_init.ps
@@ -1,6 +1,6 @@
---- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
-+++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
-@@ -1263,7 +1263,7 @@
+--- lib/gs_init.ps.orig	Fri Feb  1 12:25:45 2002
++++ lib/gs_init.ps	Sat Feb  9 01:42:10 2002
+@@ -1274,7 +1274,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,8 +9,8 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1815,3 +1815,7 @@
- (END GC) VMDEBUG
+@@ -1874,3 +1874,7 @@
+ userdict /AGM_preserve_spots false put
  
  % The interpreter will run the initial procedure (start).
 +
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
index 4c6b7163bb5d..94085a8e0710 100644
--- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Sat Sep 15 17:55:32 2001
-+++ src/unix-gcc.mak	Sat Dec 15 04:19:08 2001
+--- src/unix-gcc.mak.orig	Fri Feb  1 15:27:58 2002
++++ src/unix-gcc.mak	Sat Feb  9 04:34:53 2002
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -54,7 +54,7 @@
  
 -PSRCDIR=libpng
 +PSRCDIR=${LOCALBASE}/include
- PVERSION=10012
+ PVERSION=10201
  
  # Choose whether to use a shared version of the PNG library, and if so,
  # what its name is.
@@ -74,7 +74,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -196,7 +196,7 @@
+@@ -203,7 +203,7 @@
  
  # Define the name of the C compiler.
  
@@ -83,28 +83,38 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -229,9 +229,9 @@
+@@ -220,9 +220,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:
+@@ -236,7 +236,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.
-@@ -240,7 +240,7 @@
+@@ -247,7 +247,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
  
-@@ -273,7 +273,7 @@
+@@ -280,7 +280,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -113,7 +123,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
-@@ -285,12 +285,12 @@
+@@ -292,12 +292,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
diff --git a/print/ghostscript-gpl/files/stp.contrib.mak b/print/ghostscript-gpl/files/stp.contrib.mak
index 613116007dd3..862d329324ee 100644
--- a/print/ghostscript-gpl/files/stp.contrib.mak
+++ b/print/ghostscript-gpl/files/stp.contrib.mak
@@ -4,14 +4,11 @@
 
 stp_=$(GLOBJ)gdevstp.$(OBJ)
 
-STPINCDIR=-I$(GLSRC)
-STPLIBDIR=-L$(GLOBJ)
 STPLIB=gimpprint
 
 $(DD)stp.dev:	$(stp_) $(DD)page.dev
 	$(SETPDEV) $(DD)stp $(stp_)
-	$(ADDMOD) $(DD)stp -link $(STPLIBDIR)
 	$(ADDMOD) $(DD)stp -lib $(STPLIB)
 
 $(GLOBJ)gdevstp.$(OBJ) : $(GLSRC)gdevstp.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(STPINCDIR) $(GLSRC)gdevstp.c
+	$(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(GLSRC)gdevstp.c