Update to 7.03

PR:		31723
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

7 files changed, 36 insertions, 81 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index f65b78d28029..3f867cfda7ed 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	7.00
+PORTVERSION=	7.03
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
 		http://www.gelhaus.net/hp880c/1.4beta/ \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
 		http://www.harsch.net/Download/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs700/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
 MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
 PKGNAMESUFFIX=	-afpl
@@ -89,7 +89,7 @@ HPDJ_MAN1=	gs-hpdj.1
 # additional driver for HP PCL3 Printers, by Martin Lottermoser
 # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 PCL3=		pcl3
-PCL3_VERS=	3.2
+PCL3_VERS=	3.3
 PCL3_NAME=	${PCL3}-${PCL3_VERS}
 PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
@@ -188,7 +188,7 @@ pre-configure:
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
@@ -257,7 +257,7 @@ post-install:
 		${DATADIR}/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
+	${ECHO_MSG} ">>>   installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
 	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index c708efd40600..70e8f208a144 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,10 +1,10 @@
-MD5 (ghostscript/ghostscript-7.00.tar.gz) = 7e11f6408fd2305b926cd44c5577440f
+MD5 (ghostscript/ghostscript-7.03.tar.gz) = d9b5c31e0df09db9c439eec01c077532
 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
 MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
 MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
-MD5 (ghostscript/pcl3-3.2.tar.gz) = c98b9404dfc47d5ff907f9ad81dcbd46
+MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
 MD5 (ghostscript/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
 MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
diff --git a/print/ghostscript-afpl/files/patch-pcl3:eprn:gdeveprn.c b/print/ghostscript-afpl/files/patch-pcl3:eprn:gdeveprn.c
deleted file mode 100644
index 605148be439c..000000000000
--- a/print/ghostscript-afpl/files/patch-pcl3:eprn:gdeveprn.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- pcl3/eprn/gdeveprn.c.orig	Sun Mar 25 13:59:11 2001
-+++ pcl3/eprn/gdeveprn.c	Tue Apr 10 17:53:03 2001
-@@ -81,6 +81,9 @@
- #include "gstypes.h"	/* needed by gsstate.h */
- #include "gsstate.h"	/* needed by icstate.h */
- #include "icstate.h"	/* for struct gs_context_state_s */
-+#if !defined(GS_REVISION) || GS_REVISION >= 700
-+#include "iapi.h"	/* needed by iminst.h */
-+#endif
- #include "iminst.h"	/* for struct gs_main_instance_s */
- #include "imain.h"	/* for gs_main_instance_default() */
- #include "gscoord.h"	/* for gs_setdefaultmatrix() */
diff --git a/print/ghostscript-afpl/files/patch-src:gp_unifs.c b/print/ghostscript-afpl/files/patch-src:gp_unifs.c
deleted file mode 100644
index 68c9bcaf175b..000000000000
--- a/print/ghostscript-afpl/files/patch-src:gp_unifs.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/gp_unifs.c.orig	Tue Mar 13 15:51:39 2001
-+++ src/gp_unifs.c	Wed Jun 20 04:06:02 2001
-@@ -28,6 +28,7 @@
- #include "stat_.h"
- #include "dirent_.h"
- #include <sys/param.h>		/* for MAXPATHLEN */
-+#include <unistd.h>
- 
- /* Some systems (Interactive for example) don't define MAXPATHLEN,
-  * so we define it here.  (This probably should be done via a Config-Script.)
-@@ -58,6 +59,8 @@
- 		     const char *mode)
- {				/* The -8 is for XXXXXX plus a possible final / and -. */
-     int len = gp_file_name_sizeof - strlen(prefix) - 8;
-+    int fd;
-+    FILE *f;
- 
-     if (gp_gettmpdir(fname, &len) != 0)
- 	strcpy(fname, "/tmp/");
-@@ -70,8 +73,12 @@
-     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
- 	strcat(fname, "-");
-     strcat(fname, "XXXXXX");
--    mktemp(fname);
--    return gp_fopentemp(fname, mode);
-+    fd = mkstemp(fname);
-+    if (fd == -1)
-+	return NULL;
-+    if ((f = fdopen(fd, mode)) == NULL)
-+	close(fd);
-+    return f;
- }
- 
- /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
index dbadbe4eb3c1..22ec0928c428 100644
--- a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Mon Apr  9 14:52:57 2001
-+++ src/unix-gcc.mak	Wed Sep 12 22:54:27 2001
+--- src/unix-gcc.mak.orig	Fri Nov  2 03:45:56 2001
++++ src/unix-gcc.mak	Fri Nov  2 03:54:59 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -39,7 +39,7 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -128,7 +128,7 @@
+@@ -137,7 +137,7 @@
  # You may need to change this if the IJG library version changes.
  # See jpeg.mak for more information.
  
@@ -48,13 +48,13 @@
  JVERSION=6
  
  # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -148,14 +148,14 @@
+@@ -157,14 +157,14 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
 -PSRCDIR=libpng
 +PSRCDIR=${LOCALBASE}/include
- PVERSION=10010
+ PVERSION=10012
  
  # Choose whether to use a shared version of the PNG library, and if so,
  # what its name is.
@@ -65,7 +65,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -167,7 +167,7 @@
+@@ -176,7 +176,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -74,7 +74,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -187,7 +187,7 @@
+@@ -196,7 +196,7 @@
  
  # Define the name of the C compiler.
  
@@ -83,7 +83,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -220,9 +220,11 @@
+@@ -229,9 +229,11 @@
  # 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.
@@ -97,7 +97,7 @@
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
-@@ -231,7 +233,7 @@
+@@ -240,7 +242,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.
@@ -106,7 +106,7 @@
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -264,7 +266,7 @@
+@@ -273,7 +275,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -115,7 +115,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
-@@ -277,11 +279,16 @@
+@@ -286,11 +288,16 @@
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
  #XLIBS=Xt SM ICE Xext X11
diff --git a/print/ghostscript-afpl/files/patch-src:zmedia2.c b/print/ghostscript-afpl/files/patch-src:zmedia2.c
index 7db33eaecc44..9033a4388085 100644
--- a/print/ghostscript-afpl/files/patch-src:zmedia2.c
+++ b/print/ghostscript-afpl/files/patch-src:zmedia2.c
@@ -1,10 +1,10 @@
---- src/zmedia2.c.orig	Wed Sep 20 04:00:54 2000
-+++ src/zmedia2.c	Wed Jun 20 04:06:24 2001
-@@ -427,11 +427,17 @@
+--- 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 @@
  
  	rx = ry, ry = temp;
      }
--    /* Adjust the medium size if flexible. */
+-    /* Adjust the medium size if flexible. */ 
 -    if (medium->p.x < MIN_MEDIA_SIZE && mx > rx)
 -	mx = rx;
 -    if (medium->p.y < MIN_MEDIA_SIZE && my > ry)
@@ -21,5 +21,5 @@
 +      else if (my > ry) my = ry;	/* fits */
 +      /* else use medium->q.y, i.e., the maximum */
  
-     /* Translate to align the centers. */
+     /* Translate to align the centers. */ 
      gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 0089e7022f71..a25d9974bba9 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -46,8 +46,8 @@ share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
 share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
 share/ghostscript/%%GS_VERSION%%/doc/Current.htm
 share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
-share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
 share/ghostscript/%%GS_VERSION%%/doc/Develop.htm
+share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
 share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
 share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
 share/ghostscript/%%GS_VERSION%%/doc/Helpers.htm
@@ -69,10 +69,10 @@ share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
 share/ghostscript/%%GS_VERSION%%/doc/PUBLIC
 share/ghostscript/%%GS_VERSION%%/doc/Projects.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Ps2epsi.htm
 share/ghostscript/%%GS_VERSION%%/doc/Ps2pdf.htm
 share/ghostscript/%%GS_VERSION%%/doc/Psfiles.htm
-share/ghostscript/%%GS_VERSION%%/doc/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Public.htm
 share/ghostscript/%%GS_VERSION%%/doc/README
 share/ghostscript/%%GS_VERSION%%/doc/Readme.htm
@@ -82,16 +82,9 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
-share/ghostscript/%%GS_VERSION%%/gimp-print/README
-share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
-share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
-share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
-share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
+share/ghostscript/%%GS_VERSION%%/doc/gs.css
+share/ghostscript/%%GS_VERSION%%/doc/index.html
 share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
-share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
 share/ghostscript/%%GS_VERSION%%/examples/chess.ps
 share/ghostscript/%%GS_VERSION%%/examples/colorcir.ps
 share/ghostscript/%%GS_VERSION%%/examples/doretree.ps
@@ -103,6 +96,14 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
 share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
 share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
 share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
+share/ghostscript/%%GS_VERSION%%/gimp-print/README
+share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
+share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
+share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
+share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
 share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@@ -489,6 +490,7 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+@dirrm share/ghostscript/fonts
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/hpijs
@@ -497,7 +499,6 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
-@dirrm share/ghostscript/fonts
 @dirrm share/ghostscript
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj