4 files changed, 232 insertions, 262 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 2020127b764e..315635d4b378 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: Japanese Aladdin ghostscript + vector font library(FreeType)
+# New ports collection makefile for: Japanese GNU ghostscript + vector font library(FreeType)
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
@@ -8,45 +8,50 @@
 PORTNAME=	vfghostscript
 PORTVERSION=	5.10
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-		ftp://ftp.uu.net/graphics/png/src/ \
-		ftp://ftp.uu.net/graphics/jpeg/ \
-		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
+		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
 		${MASTER_SITE_LOCAL} \
 		${MASTER_SITE_PORTS_JP} \
 		http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/ \
-		http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/ \
-		http://www.jaist.ac.jp/~daisuke/Linux/gs/gs5/Original-sources/OLD/ \
 		http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
-		http://www.necs.co.jp/~umi/ \
+		http://www6.vc-net.ne.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
 		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs${PORTVERSION}/ \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
-		ftp://ftp.humblesoft.com/pub/
-# former for ${MASTER_SITE_LOCAL}, latter for ${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS .
-DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
-DISTNAME=	ghostscript-${PORTVERSION}
+		http://www.humblesoft.com/pub/
+# first for ${MASTER_SITE_GNU}, second for ${MASTER_SITE_LOCAL},
+# third for ${MASTER_SITE_PORTS_JP}
+MASTER_SITE_SUBDIR=	ghostscript asami/LOCAL_PORTS .
+DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
+		${DECRYPT_PDF} ${GS_DRIVERS}
+EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
+		VFlib2.24:${PORTSDIR}/japanese/vflib
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} jpegsrc.v6a.tar.gz libpng-0.96.tgz
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 MAKEFILE=	unix-gcc.mak
-MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1
 
 CFLAGS+=	-DA4
 GSINST_DIR=	${PREFIX}/share/ghostscript/${PORTVERSION}vflib
 DOC_DIR=	${GSINST_DIR}/doc
 PRINTER=	${WRKSRC}/jp-printers
-GS_SOURCES=	${DISTNAME}.tar.gz
-GS_SOURCES+=	jpegsrc.v6a.tar.gz
-GS_SOURCES+=	libpng-0.96.tgz
+
+GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
+#  Note: the following two are real files that have symlinks with
+#  later version numbers pointing to them.  To avoid unnecessarily
+#  downloading distfiles, do not change these when upgrading the port
+#  unless the files really change.
+GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
+GS_FONTS_OTHER=	ghostscript-fonts-other-${PORTVERSION}.tar.gz
+
 GS_DRIVERS=	gs${PORTVERSION}-vflib-1.2.tar.gz
 GS_DRIVERS+=	gs${PORTVERSION}-jpdf-0.2.tar.gz
 GS_DRIVERS+=	gs${PORTVERSION}-VFlibBM-PL2.diff.gz
@@ -54,49 +59,43 @@ GS_DRIVERS+=	gdevlips-2.3.2-510.tar.gz
 GS_DRIVERS+=	gdevmjc-0.8.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
-GS_DRIVERS+=	gdevalps-0.2.tar.gz
+GS_DRIVERS+=	gdevalps-0.21.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.2-510.tar.gz
 GS_DRIVERS+=	gdevnpdl-1.6.2.tar.gz
-GS_DRIVERS+=	epag-3.08.tar.gz
-#  Note: the following two are real files that have symlinks with
-#  later version numbers pointing to them.  To avoid unnecessarily
-#  downloading distfiles, do not change these when upgrading the port
-#  unless the files really change.
-GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-${PORTVERSION}.tar.gz
-
-pre-fetch:
-.if !defined(PDFENCRYPT)
-	@${ECHO_MSG} "NOTE: You can have encrypted PDF support by adding "
-	@${ECHO_MSG} "\"PDFENCRYPT=yes\" to argument of make."
-.endif
+GS_DRIVERS+=	epag-3.09.tar.gz
 
-pre-patch:
-	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.2.tar.gz )
-	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs${PORTVERSION}-jpdf-0.2.tar.gz )
-	@(cd ${WRKDIR} ; \
-	  ${PATCH} -p < ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/gs${PORTVERSION}-vflib-1.2.diff \
-		>/dev/null 2>&1)
-	@(cd ${WRKDIR} ; \
-	  ${PATCH} -p < ${WRKSRC}/gs${PORTVERSION}-jpdf-0.2/gs${PORTVERSION}-jpdf-0.2.diff \
-		>/dev/null 2>&1)
-	@(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs${PORTVERSION}-VFlibBM-PL2.diff.gz | \
-		${PATCH} -p >/dev/null 2>&1)
+# replacement for pdf_sec.ps, that allows you to read encrypted PDF files
+DECRYPT_PDF=	pdf_sec.ps
 
-post-patch:
+post-extract:
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
+	@${TAR} -C ${WRKSRC} --unlink -xzf ${DISTDIR}/gs${PORTVERSION}-vflib-1.2.tar.gz
+	@${TAR} -C ${WRKSRC} --unlink -xzf ${DISTDIR}/gs${PORTVERSION}-jpdf-0.2.tar.gz
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  tar xzf ${DISTDIR}/gdevlips-2.3.2-510.tar.gz ; \
-	  tar xzf ${DISTDIR}/epag-3.08.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdev10v.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevlips-2.3.2-510.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/epag-3.09.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
-	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevalps-0.2.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevrpdl-1.2-510.tar.gz ; \
-	  tar xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  ${TAR} -C gdevdmpr --unlink -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevalps-0.21.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevrpdl-1.2-510.tar.gz ; \
+	  ${TAR} --unlink -xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  )
+
+pre-patch:
+	@${CAT} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/gs${PORTVERSION}-vflib-1.2.diff | \
+		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
+	@${CAT} ${WRKSRC}/gs${PORTVERSION}-jpdf-0.2/gs${PORTVERSION}-jpdf-0.2.diff | \
+		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
+	@${GZCAT} ${DISTDIR}/gs${PORTVERSION}-VFlibBM-PL2.diff.gz | \
+		${PATCH} -d ${WRKDIR} -p --forward --quiet -E
+
+post-patch:
+	@( cd ${PRINTER} ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.8/*.[ch] gdevmjc-0.8/gdevmjc.mak ${WRKSRC}; \
 	  ${CP} gdevlips-2.3.2-510/gdevlips.c gdevlips-2.3.2-510/gdevlips.mak ${WRKSRC}; \
@@ -104,11 +103,11 @@ post-patch:
 	  ${CP} gdevlips-2.3.2-510/gdevlprn.c gdevlips-2.3.2-510/gdevlprn.h ${WRKSRC}; \
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
-	  ${CP} epag-3.08/gdevepag.c epag-3.08/gdevepag.mak ${WRKSRC}; \
+	  ${CP} epag-3.09/gdevepag.c epag-3.09/gdevepag.mak ${WRKSRC}; \
 	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak ${WRKSRC}; \
 	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak ${WRKSRC}; \
 	  ${CP} gdevrpdl-1.2-510/gdevrpdl.c gdevrpdl-1.2-510/gdevrpdl.mak ${WRKSRC}; \
-	  ${PATCH} -d gdevnpdl < ${PRINTER}/gdevnpdl/gdevnpdl.patch-gs${PORTVERSION} ; \
+	  ${PATCH} -d gdevnpdl --forward --quiet -E < ${PRINTER}/gdevnpdl/gdevnpdl.patch-gs${PORTVERSION} ; \
 	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
@@ -129,14 +128,15 @@ post-patch:
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
-	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	@tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
+	@${TAR} -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER}
 
 post-build:
-	@(cd ${PRINTER}/epag-3.08 ;  ${MAKE})
+	@(cd ${PRINTER}/epag-3.09 ;  ${MAKE})
 
 post-install:
-	${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
+	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
+	${INSTALL_PROGRAM} ${PRINTER}/epag-3.09/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs${PORTVERSION}-vflib-1.2/README ${DOC_DIR}/README.gs${PORTVERSION}-vflib ; \
@@ -163,22 +163,12 @@ post-install:
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_site.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \
-	  ${MKDIR} ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/FILES ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/*.txt ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/adjust.ps ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/gsepagif.sh ${DOC_DIR}/epag-3.08 ; \
-	  ${CP} ${PRINTER}/epag-3.08/psprint ${DOC_DIR}/epag-3.08 ; \
+	  ${MKDIR} ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/FILES ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/*.txt ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/adjust.ps ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/gsepagif.sh ${DOC_DIR}/epag-3.09 ; \
+	  ${CP} ${PRINTER}/epag-3.09/psprint ${DOC_DIR}/epag-3.09 ; \
 	)
-.if defined(PDFENCRYPT)
-	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
-.endif
-
-# encrypted PDF support.  can't be packaged due to export control issues.
-.if defined(PDFENCRYPT)
-MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
-DISTFILES+=	pdf_sec.ps
-RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 49c2a58bf237..dd2171d1f5a1 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -1,6 +1,4 @@
 MD5 (ghostscript-5.10.tar.gz) = b8dbc2595c06305f452a9c38bd0effef
-MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
-MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
 MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
 MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
 MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
@@ -8,11 +6,11 @@ MD5 (gdevlips-2.3.2-510.tar.gz) = d4eacdc3b716521aee1a1364089cad43
 MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11
+MD5 (gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (gdevrpdl-1.2-510.tar.gz) = c1dda082bc614753e6294e306f3e7914
 MD5 (gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
-MD5 (epag-3.08.tar.gz) = e5e57176f55abc2c5224d405b5c402d1
+MD5 (epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/japanese/vfghostscript5/files/patch-aa b/japanese/vfghostscript5/files/patch-aa
index f274bee57320..16b5ffb365ae 100644
--- a/japanese/vfghostscript5/files/patch-aa
+++ b/japanese/vfghostscript5/files/patch-aa
@@ -1,175 +1,157 @@
-*** unix-gcc.mak.orig	Wed Dec  9 04:02:58 1998
---- unix-gcc.mak	Wed Dec  9 04:04:16 1998
-***************
-*** 213,219 ****
-  # XLDFLAGS can be set from the command line.
-  XLDFLAGS=
-  
-! LDFLAGS=$(XLDFLAGS)
-  
-  # Define any extra libraries to link into the executable.
-  # ISC Unix 2.2 wants -linet.
---- 213,219 ----
-  # XLDFLAGS can be set from the command line.
-  XLDFLAGS=
-  
-! LDFLAGS=$(XLDFLAGS) -L/usr/local/lib
-  
-  # Define any extra libraries to link into the executable.
-  # ISC Unix 2.2 wants -linet.
-***************
-*** 221,227 ****
-  # SVR4 may need -lnsl.
-  # (Libraries required by individual drivers are handled automatically.)
-  
-! EXTRALIBS=
-  
-  # 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
---- 221,227 ----
-  # SVR4 may need -lnsl.
-  # (Libraries required by individual drivers are handled automatically.)
-  
-! EXTRALIBS=-lz
-  
-  # 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
-***************
-*** 3679,3686 ****
-  libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
-  	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
-  
-! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
-! 	$(SETMOD) libpng96 pngwio.$(OBJ) -include crc32
-  #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
-  # 
-  # This file is part of Aladdin Ghostscript.
---- 3679,3686 ----
-  libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
-  	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
-  
-! libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) # crc32.dev
-! 	$(SETMOD) libpng96 pngwio.$(OBJ) # -include crc32
-  #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
-  # 
-  # This file is part of Aladdin Ghostscript.
-***************
-*** 3761,3767 ****
-  zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
-  	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-  
-! zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
-  zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
-  	$(SETMOD) zlibe_0 $(zlibe_)
-  	$(ADDMOD) zlibe_0 -include zlibc
---- 3761,3767 ----
-  zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
-  	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-  
-! zlibe_=
-  zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
-  	$(SETMOD) zlibe_0 $(zlibe_)
-  	$(ADDMOD) zlibe_0 -include zlibc
-***************
-*** 3808,3818 ****
-  
-  zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
-  zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
-! zlibd_ = $(zlibd1_) $(zlibd2_)
-! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibd_)
-! 	$(SETMOD) zlibd_0 $(zlibd1_)
-! 	$(ADDMOD) zlibd_0 -obj $(zlibd2_)
-! 	$(ADDMOD) zlibd_0 -include zlibc
-  
-  infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
-  	$(CP_) $(ZSRC)infblock.c .
---- 3808,3818 ----
-  
-  zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
-  zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
-! zlibd_=
-! zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev
-! 	$(SETMOD) zlibd_0
-! 	$(ADDMOD) zlibd_0
-! 	$(ADDMOD) zlibd_0
-  
-  infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
-  	$(CP_) $(ZSRC)infblock.c .
-***************
-*** 4799,4807 ****
-  lbp8.dev: $(lbp8_) page.dev
-  	$(SETPDEV) lbp8 $(lbp8_)
-  
-- lips3.dev: $(lbp8_) page.dev
-- 	$(SETPDEV) lips3 $(lbp8_)
-- 
-  gdevlbp8.$(OBJ): gdevlbp8.c $(PDEVH)
-  
-  ### ----------- The DEC LN03/LA50/LA70/LA75 printer devices ------------ ###
---- 4799,4804 ----
-***************
-*** 5458,5468 ****
-  
-  # ---------------- Kanji Font Utility ---------------- #
-  
-! kanji_=kfutil.$(OBJ)
-  kanji.dev: $(kanji_)
-  	$(SETMOD) kanji $(kanji_)
-  
-  kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
-  
-  # ---------------- Kanji Font(VFlib) ---------------- #
-  
---- 5455,5468 ----
-  
-  # ---------------- Kanji Font Utility ---------------- #
-  
-! kanji_=kfutil.$(OBJ) zkfimpath.$(OBJ)
-  kanji.dev: $(kanji_)
-  	$(SETMOD) kanji $(kanji_)
-+ 	$(ADDMOD) kanji -oper zkfimagepath
-  
-  kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
-+ zkfimpath.$(OBJ): zkfimpath.c $(OP) $(gsmatrix_h) $(gspath_h) \
-+ 					$(igstate_h) $(store_h)
-  
-  # ---------------- Kanji Font(VFlib) ---------------- #
-  
-***************
-*** 5470,5479 ****
-  kfvflib.dev: $(kfvflib_) kanji.dev
-  	$(SETMOD) kfvflib $(kfvflib_)
-  	$(ADDMOD) kfvflib -oper zkfVFlib
-! 	$(ADDMOD) kfvflib -ps kfvflib
-! 	$(ADDMOD) kfvflib -lib VFlib
-  
-  zkfvflib.$(OBJ): zkfvflib.c 
-  
-  #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
-  # 
---- 5470,5482 ----
-  kfvflib.dev: $(kfvflib_) kanji.dev
-  	$(SETMOD) kfvflib $(kfvflib_)
-  	$(ADDMOD) kfvflib -oper zkfVFlib
-! 	$(ADDMOD) kfvflib -ps kfvflib kfvfbm
-! 	$(ADDMOD) kfvflib -lib VFlib2
-! ## VFlib without freetype
-! 	$(ADDMOD) kfvflib -lib ttf    
-  
-  zkfvflib.$(OBJ): zkfvflib.c 
-+ 	${CC} ${CFLAGS} -I${PREFIX}/include/ -c zkfvflib.c
-  
-  #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
-  # 
-***************
-*** 5611,5616 ****
---- 5614,5622 ----
-  	./echogs -w ldt.tr -n - $(CCLD) $(LDFLAGS) $(XLIBDIRS) -o $(GS_XE)
-  	./echogs -a ldt.tr -n -s gs.$(OBJ) -s
-  	cat ld.tr >>ldt.tr
-+ .if ${PORTOBJFORMAT} == "elf"
-+ 	echo '-lICE -lSM \' >>ldt.tr
-+ .endif
-  	./echogs -a ldt.tr -s - $(EXTRALIBS) -lm
-  	LD_RUN_PATH=$(XLIBDIR); export LD_RUN_PATH; \
-  	XCFLAGS= XINCLUDE= XLDFLAGS= XLIBDIRS= XLIBS= \
+--- unix-gcc.mak.orig	Sat Sep 30 17:32:21 2000
++++ unix-gcc.mak	Sat Sep 30 17:35:22 2000
+@@ -82,11 +82,10 @@
+ # initialization files (gs_*.ps) and the fonts.
+ 
+ # If your system has installbsd, change install to installbsd in the next line.
+-INSTALL = install -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+@@ -143,7 +142,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+ 
+-JSRCDIR=jpeg-6a
++JSRCDIR=jpeg
+ JVERSION=6
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -151,14 +150,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=96
+ 
+ # Choose whether to use a shared version of the PNG library, and if so,
+ # what its name is.
+ # See gs.mak and make.txt for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+@@ -170,7 +169,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and make.txt for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -189,7 +188,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -216,12 +215,12 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=-O $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=-O $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS=-L${LOCALBASE}/lib
+ 
+ LDFLAGS=$(XLDFLAGS)
+ 
+@@ -241,7 +240,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I${X11BASE}/include
+ 
+ # 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
+@@ -256,7 +255,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L${X11BASE}/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+ 
+@@ -3719,8 +3718,8 @@
+ libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
+ 	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
+ 
+-libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
+-	$(SETMOD) libpng96 pngwio.$(OBJ) -include crc32
++libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) # crc32.dev
++	$(SETMOD) libpng96 pngwio.$(OBJ) # -include crc32
+ #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+ # 
+ # This file is part of GNU Ghostscript.
+@@ -4849,9 +4848,6 @@
+ lbp8.dev: $(lbp8_) page.dev
+ 	$(SETPDEV) lbp8 $(lbp8_)
+ 
+-lips3.dev: $(lbp8_) page.dev
+-	$(SETPDEV) lips3 $(lbp8_)
+-
+ gdevlbp8.$(OBJ): gdevlbp8.c $(PDEVH)
+ 
+ ### ----------- The DEC LN03/LA50/LA70/LA75 printer devices ------------ ###
+@@ -5508,11 +5504,14 @@
+ 
+ # ---------------- Kanji Font Utility ---------------- #
+ 
+-kanji_=kfutil.$(OBJ)
++kanji_=kfutil.$(OBJ) zkfimpath.$(OBJ)
+ kanji.dev: $(kanji_)
+ 	$(SETMOD) kanji $(kanji_)
++	$(ADDMOD) kanji -oper zkfimagepath
+ 
+ kfutil.$(OBJ): kfutil.c $(OP) $(gsmatrix_h)
++zkfimpath.$(OBJ): zkfimpath.c $(OP) $(gsmatrix_h) $(gspath_h) \
++					$(igstate_h) $(store_h)
+ 
+ # ---------------- Kanji Font(VFlib) ---------------- #
+ 
+@@ -5520,10 +5519,13 @@
+ kfvflib.dev: $(kfvflib_) kanji.dev
+ 	$(SETMOD) kfvflib $(kfvflib_)
+ 	$(ADDMOD) kfvflib -oper zkfVFlib
+-	$(ADDMOD) kfvflib -ps kfvflib
+-	$(ADDMOD) kfvflib -lib VFlib
++	$(ADDMOD) kfvflib -ps kfvflib kfvfbm
++	$(ADDMOD) kfvflib -lib VFlib2
++## VFlib without freetype
++	$(ADDMOD) kfvflib -lib ttf    
+ 
+ zkfvflib.$(OBJ): zkfvflib.c 
++	${CC} ${CFLAGS} -I${LOCALBASE}/include -c zkfvflib.c
+ 
+ #    Copyright (C) 1990, 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
+ # 
+@@ -5666,6 +5668,9 @@
+ 	./echogs -w ldt.tr -n - $(CCLD) $(LDFLAGS) $(XLIBDIRS) -o $(GS_XE)
+ 	./echogs -a ldt.tr -n -s gs.$(OBJ) -s
+ 	cat ld.tr >>ldt.tr
++.if ${PORTOBJFORMAT} == "elf"
++	echo '-lICE -lSM \' >>ldt.tr
++.endif
+ 	./echogs -a ldt.tr -s - $(EXTRALIBS) -lm
+ 	LD_RUN_PATH=$(XLIBDIR); export LD_RUN_PATH; \
+ 	XCFLAGS= XINCLUDE= XLDFLAGS= XLIBDIRS= XLIBS= \
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index 7adb6dfce899..902d0429c38e 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -70,12 +70,12 @@ share/ghostscript/5.10vflib/doc/gdevrpdl.doc
 share/ghostscript/5.10vflib/doc/gs261j.doc
 share/ghostscript/5.10vflib/doc/gs261j.jis
 share/ghostscript/5.10vflib/doc/gs_statd.dif
-share/ghostscript/5.10vflib/doc/epag-3.08/FILES
-share/ghostscript/5.10vflib/doc/epag-3.08/gdevepag.txt
-share/ghostscript/5.10vflib/doc/epag-3.08/ert.txt
-share/ghostscript/5.10vflib/doc/epag-3.08/adjust.ps
-share/ghostscript/5.10vflib/doc/epag-3.08/gsepagif.sh
-share/ghostscript/5.10vflib/doc/epag-3.08/psprint
+share/ghostscript/5.10vflib/doc/epag-3.09/FILES
+share/ghostscript/5.10vflib/doc/epag-3.09/gdevepag.txt
+share/ghostscript/5.10vflib/doc/epag-3.09/ert.txt
+share/ghostscript/5.10vflib/doc/epag-3.09/adjust.ps
+share/ghostscript/5.10vflib/doc/epag-3.09/gsepagif.sh
+share/ghostscript/5.10vflib/doc/epag-3.09/psprint
 share/ghostscript/5.10vflib/doc/helpers.txt
 share/ghostscript/5.10vflib/doc/hershey.txt
 share/ghostscript/5.10vflib/doc/history1.txt
@@ -401,7 +401,7 @@ share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/5.10vflib/doc/gdevmjc-0.8
-@dirrm share/ghostscript/5.10vflib/doc/epag-3.08
+@dirrm share/ghostscript/5.10vflib/doc/epag-3.09
 @dirrm share/ghostscript/5.10vflib/doc
 @dirrm share/ghostscript/5.10vflib/examples
 @dirrm share/ghostscript/5.10vflib/kanji