* 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, 68 insertions, 7 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 4a8748c6ec50..66dfde3e72fb 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.32 1999/06/14 09:54:18 taoka Exp $
+# $Id: Makefile,v 1.33 1999/06/16 16:12:50 taoka Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -23,7 +23,9 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/ \
 		http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \
 		http://www.necs.co.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
-		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.10/
+		http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.10/ \
+		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
+		ftp://ftp.humblesoft.com/pub/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -53,6 +55,8 @@ GS_DRIVERS+=	dmprt-2.01.tar.gz
 GS_DRIVERS+=	gdevalps-0.2.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
@@ -82,6 +86,7 @@ post-patch:
 	@( ${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 ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
@@ -89,34 +94,47 @@ post-patch:
 	  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 ; \
 	  ${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/*.[ch] gdevlips-2.3.2-510/gdevlips.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.2-510/gdevlips.c gdevlips-2.3.2-510/gdevlips.mak ${WRKSRC}; \
+	  ${CP} gdevlips-2.3.2-510/gdevl4r.c gdevlips-2.3.2-510/gdevl4v.c gdevlips-2.3.2-510/gdevlips.h ${WRKSRC}; \
+	  ${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} 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-gs5.10 ; \
+	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 #	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips.mak.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}/gdevepag.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevlips.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevalps.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevmd2k.mak >> ${WRKSRC}/unix-gcc.mak
+	@${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/unix-gcc.mak
 
 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-build:
+	@(cd ${PRINTER}/epag-3.08 ;  ${MAKE})
+
 post-install:
+	${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.10-vflib-1.2/README ${DOC_DIR}/README.gs5.10-vflib ; \
@@ -133,15 +151,22 @@ post-install:
 	  ${CP} ${PRINTER}/gdevmjc-0.8/README.mje ${DOC_DIR}/gdevmjc-0.8/ ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/cpem.doc ${DOC_DIR}/gdevmjc-0.8/ ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/MJ700V2C.FAQ ${DOC_DIR}/gdevmjc-0.8/ ; \
+	  ${CP} ${PRINTER}/gdevmjc-0.8/gdevmjc.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/gdevalps-0.2/README.gdevalps ${DOC_DIR}/README.gdevalps ; \
 	  ${CP} ${PRINTER}/gdevmd2k-0.2a/README.jis ${DOC_DIR}/gdevmd2k.jis ; \
 	  ${CP} ${PRINTER}/gdevrpdl-1.2-510/gdevrpdl.doc ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/gdevdmpr.sj ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevdmpr/dmp_init.ps ${GSINST_DIR} ; \
 	  ${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}/gdevmjc-0.8/gdevmjc.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 ; \
 	)
 .if defined(PDFENCRYPT)
 	@${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR}
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 98751191fab6..49c2a58bf237 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -11,6 +11,8 @@ MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
 MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11
 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 (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/gdevlips.mak.patch b/japanese/vfghostscript5/files/gdevlips.mak.patch
new file mode 100644
index 000000000000..d7b76faced0e
--- /dev/null
+++ b/japanese/vfghostscript5/files/gdevlips.mak.patch
@@ -0,0 +1,27 @@
+--- gdevlips.mak.orig	Tue Jul 27 17:05:54 1999
++++ gdevlips.mak	Tue Jul 27 17:06:21 1999
+@@ -28,24 +28,3 @@
+  $(ghost_h) $(gzstate_h) $(igstate_h)
+ 	$(CCC) -DA4 gdevl4v.c
+ 
+-### ------- EPSON ESC/Page printer device ----------------- ###
+-
+-escpage_=gdevespg.$(OBJ) gdevlprn.$(OBJ)
+-gdevespg.$(OBJ): gdevespg.c gdevlprn.h $(PDEVH)
+-	$(CCC) -DA4 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_=gdevnpdl.$(OBJ) gdevlprn.$(OBJ)
+-gdevnpdl.$(OBJ): gdevnpdl.c gdevlprn.h $(PDEVH)
+-	$(CCC) -DA4 gdevnpdl.c
+-
+-npdl.dev: $(npdl_) page.dev
+-	$(SETPDEV) npdl $(npdl_)
+-
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index 6eef51d39d1a..1c42b00101d5 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -64,10 +64,17 @@ share/ghostscript/5.10vflib/doc/gdevmjc-0.8/README.mje
 share/ghostscript/5.10vflib/doc/gdevmjc-0.8/README.noz
 share/ghostscript/5.10vflib/doc/gdevmjc-0.8/MJ700V2C.FAQ
 share/ghostscript/5.10vflib/doc/gdevmjc-0.8/cpem.doc
+share/ghostscript/5.10vflib/doc/gdevnpdl.jis 
 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/helpers.txt
 share/ghostscript/5.10vflib/doc/hershey.txt
 share/ghostscript/5.10vflib/doc/history1.txt
@@ -393,6 +400,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
 @dirrm share/ghostscript/5.10vflib/examples
 @dirrm share/ghostscript/5.10vflib/kanji
diff --git a/japanese/vfghostscript5/scripts/configure b/japanese/vfghostscript5/scripts/configure
index 59dea2fde5fd..ce3ed9ef1ae0 100644
--- a/japanese/vfghostscript5/scripts/configure
+++ b/japanese/vfghostscript5/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;" \
@@ -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 \
-   "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 \