Update to include a bunch of new patches among other things.

PR:		6477
Submitted by:	maintainer

4 files changed, 46 insertions, 28 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 02547b7172ae..51b4da75a42f 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.18 1998/03/28 19:33:07 asami Exp $
+# $Id: Makefile,v 1.19 1998/03/31 00:17:02 asami Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -21,7 +21,8 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
 		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.bpe.es.osaka-u.ac.jp/~watanabe/
+		http://www.bpe.es.osaka-u.ac.jp/~watanabe/ \
+		ftp://ftp.iijnet.or.jp/humbleSoft/pub/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -41,21 +42,22 @@ PRINTER=	${WRKSRC}/jp-printers
 GS_SOURCES=	ghostscript-5.10.tar.gz
 GS_SOURCES+=	jpegsrc.v6a.tar.gz
 GS_SOURCES+=	libpng-0.96.tgz
-GS_DRIVERS=	gs5.10-vflib-1.1.tar.gz
+GS_DRIVERS=	gs5.10-vflib-1.2.tar.gz
 GS_DRIVERS+=	gs5.10-jpdf-0.2.tar.gz
-GS_DRIVERS+=	gs5.10-VFlibBM-PL1.diff.gz
+GS_DRIVERS+=	gs5.10-VFlibBM-PL2.diff.gz
 GS_DRIVERS+=	gdevlips4-1.2.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
 GS_DRIVERS+=	gdevrpdl.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
 GS_DRIVERS+=	gdevnpdl-1.4.tar.gz
+GS_DRIVERS+=	epag-3.01.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-4.0.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-4.40.tar.gz
+GS_FONTS_STD=	ghostscript-fonts-std-5.10.tar.gz
+GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 pre-fetch:
 .if !defined(PDFENCRYPT)
@@ -64,21 +66,20 @@ pre-fetch:
 .endif
 
 pre-patch:
-	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.1.tar.gz )
-	(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.2.tar.gz )
-	(cd ${WRKDIR} ; \
-	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.1/gs5.10-vflib-1.1.diff \
+	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-vflib-1.2.tar.gz )
+	@(cd ${WRKSRC} ; tar xzf ${DISTDIR}/gs5.10-jpdf-0.2.tar.gz )
+	@(cd ${WRKDIR} ; \
+	  ${PATCH} -p < ${WRKSRC}/gs5.10-vflib-1.2/gs5.10-vflib-1.2.diff \
 		>/dev/null 2>&1)
-	(cd ${WRKDIR} ; \
+	@(cd ${WRKDIR} ; \
 	  ${PATCH} -p < ${WRKSRC}/gs5.10-jpdf-0.2/gs5.10-jpdf-0.2.diff \
 		>/dev/null 2>&1)
-	(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM-PL1.diff.gz | \
+	@(cd ${WRKDIR} ;  zcat ${DISTDIR}/gs5.10-VFlibBM-PL2.diff.gz | \
 		${PATCH} -p >/dev/null 2>&1)
 
 post-patch:
 	@( ${MKDIR} ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  ${PATCH} -p0 < ${FILESDIR}/gdevep82.patch >/dev/null 2>&1 ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
@@ -87,12 +88,13 @@ post-patch:
 	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevnpdl ; \
 	  tar -C gdevnpdl -xzf ${DISTDIR}/gdevnpdl-1.4.tar.gz ; \
+	  tar xzf ${DISTDIR}/epag-3.01.tar.gz ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.7/gdevmjc.c gdevmjc-0.7/mjc.dev ${WRKSRC}; \
 	  ${CP} gdevlips4-1.2.0/gdevlips4.c gdevlips4-1.2.0/gdevlips4.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
-	  ${CP} gdevep82/gdevep82.c gdevep82/gdevep82.mak ${WRKSRC}; \
+	  ${CP} epag-3.01/gdevepag.c epag-3.01/gdevepag.mak ${WRKSRC}; \
 	  ${CP} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \
 	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  )
@@ -102,27 +104,30 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/unix-gcc.mak
-	@${CAT} ${WRKSRC}/gdevep82.mak >> ${WRKSRC}/unix-gcc.mak
+	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevlips4.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 
+post-build:
+	@(cd ${PRINTER}/epag-3.01 ;  ${MAKE})
+
 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}
 
 post-install:
+	${INSTALL_PROGRAM} ${PRINTER}/epag-3.01/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
-	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/README ${DOC_DIR}/README.gs5.10-vflib ; \
-	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
-	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
-	  ${CP} ${WRKSRC}/gs5.10-vflib-1.1/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
+	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README.CID ${DOC_DIR}/README.CID.gs5.10-vflib ; \
+	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \
+	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/OLD-DOC/gs261j10-doc/* ${DOC_DIR} ; \
 	  ${CP} ${WRKSRC}/gs5.10-jpdf-0.2/README ${DOC_DIR}/README.gs5.10-jpdf ; \
 	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.2.0/Readme ${DOC_DIR}/gdevlips4.euc ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \
@@ -132,6 +137,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.01 ; \
+	  ${CP} ${PRINTER}/epag-3.01/FILES ${DOC_DIR}/epag-3.01 ; \
+	  ${CP} ${PRINTER}/epag-3.01/*.txt ${DOC_DIR}/epag-3.01 ; \
+	  ${CP} ${PRINTER}/epag-3.01/adjust.ps ${DOC_DIR}/epag-3.01 ; \
+	  ${CP} ${PRINTER}/epag-3.01/gsepagif.sh ${DOC_DIR}/epag-3.01 ; \
+	  ${CP} ${PRINTER}/epag-3.01/psprint ${DOC_DIR}/epag-3.01 ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index dfcea6bf4e80..627966fb8c03 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -1,15 +1,16 @@
 MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
 MD5 (jpegsrc.v6a.tar.gz) = 5360e0aa47b415daa44623196f7e6160
 MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
-MD5 (gs5.10-vflib-1.1.tar.gz) = 856599571b5c9845595d830ad2b31b5f
+MD5 (gs5.10-vflib-1.2.tar.gz) = 98a36048a0e1b79ed21dc03e43d8fb5e
 MD5 (gs5.10-jpdf-0.2.tar.gz) = 36f6d346014dba3cede7fbd3bdb723a8
-MD5 (gs5.10-VFlibBM-PL1.diff.gz) = ef5d68c66b2714b01ac3c617359fc38a
+MD5 (gs5.10-VFlibBM-PL2.diff.gz) = c933555772177092fe3e96bf3f28dad9
 MD5 (gdevlips4-1.2.0.tar.gz) = 55d1d9d507701a3d176e352dae74b0bf
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
 MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevnpdl-1.4.tar.gz) = 1b3e62370d10e76a10fdc663e54e3b28
-MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
-MD5 (ghostscript-fonts-other-4.40.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (epag-3.01.tar.gz) = 5c204438866ee28c82b4f4d2027bf3d0
+MD5 (ghostscript-fonts-std-5.10.tar.gz) = 1e0fe2149affd80deaaae144227049b9
+MD5 (ghostscript-fonts-other-5.10.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
 MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index a5cf05396071..79b17157713a 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -14,6 +14,7 @@ bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
 bin/wftopfa
+bin/ert
 man/man1/ps2ascii.1.gz
 man/man1/gs.1.gz
 man/man1/ps2pdf.1.gz
@@ -267,12 +268,17 @@ share/ghostscript/5.10vflib/doc/gs261j.jis
 share/ghostscript/5.10vflib/doc/gs261j.doc
 share/ghostscript/5.10vflib/doc/README.gs5.10-jpdf
 share/ghostscript/5.10vflib/doc/gdev10v.jis
-share/ghostscript/5.10vflib/doc/gdevep82.jis
 share/ghostscript/5.10vflib/doc/gdevlips4.euc
 share/ghostscript/5.10vflib/doc/gdevmjc.jis
 share/ghostscript/5.10vflib/doc/MJ700V2C.FAQ
 share/ghostscript/5.10vflib/doc/gdevdmpr.sj
 share/ghostscript/5.10vflib/doc/gdevnpdl.jis
+share/ghostscript/5.10vflib/doc/epag-3.01/FILES
+share/ghostscript/5.10vflib/doc/epag-3.01/gdevepag.txt
+share/ghostscript/5.10vflib/doc/epag-3.01/ert.txt
+share/ghostscript/5.10vflib/doc/epag-3.01/adjust.ps
+share/ghostscript/5.10vflib/doc/epag-3.01/gsepagif.sh
+share/ghostscript/5.10vflib/doc/epag-3.01/psprint
 share/ghostscript/5.10vflib/gs_btokn.ps
 share/ghostscript/5.10vflib/gs_ccfnt.ps
 share/ghostscript/5.10vflib/gs_cff.ps
@@ -394,6 +400,7 @@ share/ghostscript/5.10vflib/dmp_site.ps
 share/ghostscript/5.10vflib/escp_24.src
 share/ghostscript/5.10vflib/testpage.ps
 @dirrm share/ghostscript/5.10vflib/kanji
+@dirrm share/ghostscript/5.10vflib/doc/epag-3.01
 @dirrm share/ghostscript/5.10vflib/doc
 @dirrm share/ghostscript/5.10vflib/examples
 @dirrm share/ghostscript/5.10vflib
diff --git a/japanese/vfghostscript5/scripts/configure b/japanese/vfghostscript5/scripts/configure
index 08c19299db59..62f55dcd6f37 100644
--- a/japanese/vfghostscript5/scripts/configure
+++ b/japanese/vfghostscript5/scripts/configure
@@ -4,7 +4,7 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' epag300.dev epag600.dev mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips3.dev lips4.dev lips4c.dev rpdlA3.dev rpdlA4.dev rpdlB4.dev rpdlB5.dev bj10v.dev bj10vh.dev dmprt.dev npdl.dev'
+PRINTER_JAPAN=' epag.dev mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips3.dev lips4.dev lips4c.dev rpdlA3.dev rpdlA4.dev rpdlB4.dev rpdlB5.dev bj10v.dev bj10vh.dev dmprt.dev npdl.dev'
 
 sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
     -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
@@ -84,8 +84,7 @@ Have fun with this new configuration style !     -andreas \n\n\
    "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
    "dmprt"    "Generic Printer" ON \
    "dnj650c"  "HP DesignJet 650C" OFF \
-   "epag300"  "Epson ESC/PS laser printer 300dpi, mono" ON \
-   "epag600"  "Epson ESC/PS laser printer 600dpi, mono" ON \
+   "epag"     "Epson ESC/Page laser printer 60-600dpi, mono" ON \
    "mjc180"   "Epson MachJet series  180dpi, CMYK" ON \
    "mjc360"   "Epson MachJet series  360dpi, CMYK" ON \
    "mjc720"   "Epson MachJet series  720dpi, CMYK" ON \