* Replaced the NPDL driver from a version modified by Ohmori-san to

an original version (by Watabe-san)

* Replaced the ESC/Page driver from a version modified by Mr. Ohmori to
an original version (by Narimatus-san)

The replaced drivers are better than Ohmori-san's version

PR:		ports/12774
Submitter:	a maintainer

5 files changed, 64 insertions, 7 deletions

diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 5f009b10438f..752570a4df06 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Aug 1997
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.32 1999/06/14 01:02:14 taoka Exp $
+# $Id: Makefile,v 1.33 1999/06/16 16:16:09 taoka Exp $
 #
 
 DISTNAME=	ghostscript-5.50
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		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.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
 		ftp://ftp.humblesoft.com/pub/ \
 		http://www.necs.co.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
@@ -51,6 +52,8 @@ GS_DRIVERS+=	gdevlips-2.3.2.tar.gz
 GS_DRIVERS+=	gdevmjc-0.8.tar.gz
 GS_DRIVERS+=	gdev10v.tar.gz
 GS_DRIVERS+=	dmprt-2.01.tar.gz
+GS_DRIVERS+=	gdevnpdl-1.6.2.tar.gz
+GS_DRIVERS+=	epag-3.08.tar.gz
 GS_DRIVERS+=	gdevalps-0.2.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.2.tar.gz
@@ -83,14 +86,19 @@ post-patch:
 	  tar xzf ${DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
 	  tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  tar xzf ${DISTDIR}/epag-3.08.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevalps-0.2.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevrpdl-1.2.tar.gz ; \
 	  ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \
 	  ${CP} gdevmjc-0.8/*.[ch] gdevmjc-0.8/gdevmjc.mak ${WRKSRC}; \
-	  ${CP} gdevlips-2.3.2/*.[ch] gdevlips-2.3.2/gdevlips.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.2/gdevlips.[ch] gdevlips-2.3.2/gdevlips.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.2/gdevl4[rv].c gdevlips-2.3.2/gdevlprn.[ch] ${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} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \
 	  ${CP} gdevrpdl-1.2/gdevrpdl.c gdevrpdl-1.2/gdevrpdl.mak ${WRKSRC}; \
@@ -98,23 +106,30 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.mak.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevepag.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
-#	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips.mak.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevlips.mak >> ${WRKSRC}/contrib.mak
+	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevalps.mak-5.50 >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
 
+post-build:
+	@(cd ${PRINTER}/epag-3.08 ;  ${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.08/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
@@ -137,13 +152,19 @@ 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} ; \
+	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_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 ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/gdevmjc.ps ${GSINST_DIR} ; \
 	)
 .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/
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index be35d7f53ecd..921b859a3800 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -6,8 +6,10 @@ MD5 (gdevlips-2.3.2.tar.gz) = 5484c0530330adb7d7bb8ec4daf37203
 MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
+MD5 (epag-3.08.tar.gz) = e5e57176f55abc2c5224d405b5c402d1
 MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11
 MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
+MD5 (gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
 MD5 (gdevrpdl-1.2.tar.gz) = af11f7926674b5b59c2028efab281889
 MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57
diff --git a/japanese/vfghostscript55/files/gdevlips.mak.patch b/japanese/vfghostscript55/files/gdevlips.mak.patch
new file mode 100644
index 000000000000..1503e15324ec
--- /dev/null
+++ b/japanese/vfghostscript55/files/gdevlips.mak.patch
@@ -0,0 +1,26 @@
+--- gdevlips.mak.orig	Tue Jul 27 17:04:03 1999
++++ gdevlips.mak	Tue Jul 27 17:10:11 1999
+@@ -31,23 +31,3 @@
+  $(ghost_h) $(gzstate_h) $(igstate_h)
+ 	$(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(GLSRC)gdevl4v.c
+ 
+-### ------- Epson ESC/Page printer device ----------------- ###
+-
+-escpage_=$(GLOBJ)gdevespg.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
+-$(GLOBJ)gdevespg.$(OBJ): $(GLSRC)gdevespg.c $(GLSRC)gdevlprn.h $(PDEVH)
+-	$(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(GLSRC)gdevespg.c
+-
+-escpage.dev: $(escpage_) page.dev
+-	$(SETPDEV) escpage $(escpage_)
+-
+-lp2000.dev: $(escpage_) page.dev
+-	$(SETPDEV) lp2000 $(escpage_)
+-
+-### --- The NEC NPDL language printer device ------ ###
+-
+-npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
+-$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
+-	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
+-
+-npdl.dev: $(npdl_) page.dev
+-	$(SETPDEV) npdl $(npdl_)
diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist
index d2c624d13a96..50b142efffb6 100644
--- a/japanese/vfghostscript55/pkg-plist
+++ b/japanese/vfghostscript55/pkg-plist
@@ -16,6 +16,7 @@ bin/ps2epsi
 bin/ps2pdf
 bin/ps2ps
 bin/wftopfa
+bin/ert
 share/ghostscript/5.50vflib/Fontmap
 share/ghostscript/5.50vflib/acctest.ps
 share/ghostscript/5.50vflib/align.ps
@@ -83,6 +84,7 @@ share/ghostscript/5.50vflib/doc/Xfonts.htm
 share/ghostscript/5.50vflib/doc/djgpp.sj
 share/ghostscript/5.50vflib/doc/gdev10v.jis
 share/ghostscript/5.50vflib/doc/gdevdmpr.sj
+share/ghostscript/5.50vflib/doc/gdevnpdl.jis
 share/ghostscript/5.50vflib/doc/gdevmd2k.jis
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mjc
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mje
@@ -93,6 +95,12 @@ share/ghostscript/5.50vflib/doc/gdevrpdl.doc
 share/ghostscript/5.50vflib/doc/gs261j.doc
 share/ghostscript/5.50vflib/doc/gs261j.jis
 share/ghostscript/5.50vflib/doc/gs_statd.dif
+share/ghostscript/5.50vflib/doc/epag-3.08/FILES
+share/ghostscript/5.50vflib/doc/epag-3.08/gdevepag.txt
+share/ghostscript/5.50vflib/doc/epag-3.08/ert.txt
+share/ghostscript/5.50vflib/doc/epag-3.08/adjust.ps
+share/ghostscript/5.50vflib/doc/epag-3.08/gsepagif.sh
+share/ghostscript/5.50vflib/doc/epag-3.08/psprint
 share/ghostscript/5.50vflib/doc/kfvflib.sj
 share/ghostscript/5.50vflib/doc/ps2epsi.txt
 share/ghostscript/5.50vflib/docie.ps
@@ -397,6 +405,7 @@ share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/5.50vflib/doc/gdevmjc-0.8
+@dirrm share/ghostscript/5.50vflib/doc/epag-3.08
 @dirrm share/ghostscript/5.50vflib/doc
 @dirrm share/ghostscript/5.50vflib/examples
 @dirrm share/ghostscript/5.50vflib/vflib
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index ddb5b7782484..f0142d1f9b4f 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -4,7 +4,7 @@
 
 if [ ! "X"${BATCH} = "X" ] ; then
 
-PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev lp2000.dev escpage.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev'
+PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev  bjc880j.dev epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.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;" \
@@ -94,8 +94,7 @@ Have fun with this new configuration style !     -andreas \n\n\
    "declj250" "alternate DEC LJ250 driver" OFF \
    "dmprt"    "Generic Printer" ON \
    "ap3250"   "Epson AP3250" OFF \
-   "escpage"  "Epson ESC/Page laser printer 60-600dpi, mono" ON \
-   "lp2000"   "Epson LP-2000/3000/7000/7000G, mono" ON \
+   "epag"     "Epson ESC/Page laser printer 60-600dpi, mono" ON \
    "md2k"     "ALPS MD2000/2010/4000/1300/1500/5000 driver" ON \
    "md5k"     "ALPS MD5000 driver" ON \
    "md50Mono" "ALPS MD5000 monochrome driver" OFF \