Update:

1. Added new driver for Cannon bubblejet BJ-10V
2. Update to Cannon lips printer driver.
3. Typo fix.
4. Integrate scripts/configure.batch into scripts/configure.

6 files changed, 82 insertions, 34 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 03697a92d1f5..153a6ecf0cde 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1997/03/05 09:20:07 asami Exp $
+# $Id: Makefile,v 1.7 1997/04/30 03:18:03 asami Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	ghostscript-4.03.tar.gz
 WRKSRC=		${WRKDIR}/gs4.03
 MAKEFILE=	unix-gcc.mak
 MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
-MAN1=		gs.1
+MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
 
 CFLAGS+=	-DA4
 DOC_DIR=	${PREFIX}/share/ghostscript/4.03vflib/doc 
@@ -32,9 +32,10 @@ PRINTER=	${WRKSRC}/jp-printers
 GS_SOURCES=	ghostscript-4.03.tar.gz
 GS_SOURCES+=	ghostscript-4.03gnu.tar.gz
 GS_DRIVERS=	gs4.03-vflib.tar.gz
-GS_DRIVERS+=	gdevlips4-1.0.1.tar.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
 #  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
@@ -56,33 +57,25 @@ post-patch:
 	@( mkdir ${PRINTER} ; \
 	  cd ${PRINTER} ; \
 	  ${PATCH} -p0 < ${FILESDIR}/gdevep82.patch >/dev/null 2>&1 ; \
-	  tar xzf ${DISTDIR}/gdevlips4-1.0.1.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevlips4-1.2.0.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdev10v.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.0.1/gdevlips4.c gdevlips4-1.0.1/gdevlips4.mak ${WRKSRC}; \
+	  ${CP} gdevlips4-1.2.0/gdevlips4.c gdevlips4-1.2.0/gdevlips4.mak ${WRKSRC}; \
 	  ${CP} gdevep82/gdevep82.c gdevep82/gdevep82.mak ${WRKSRC}; \
 	  ${CP} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \
 	  )
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips4.mak.patch
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips4.c.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
+	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevep82.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevlips4.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/unix-gcc.mak
 	@${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/unix-gcc.mak
 
-
-do-configure:
-.if defined(BATCH)
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure.batch
-.else
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		/bin/sh ${SCRIPTDIR}/configure
-.endif
-
 pre-install:
 	@mkdir -p ${PREFIX}/share/ghostscript
 	@tar -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
@@ -91,8 +84,9 @@ pre-install:
 post-install:
 	@strip ${PREFIX}/bin/gs
 	@( \
+	  ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
-	  ${CP} ${PRINTER}/gdevlips4-1.0.1/Readme ${DOC_DIR}/gdevlips4.euc ; \
+	  ${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} ; \
 	)
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index 1abac2725952..7015a9942544 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -1,8 +1,9 @@
 MD5 (ghostscript-4.03.tar.gz) = 6a466ffdb3414e741da471a53a85dcab
 MD5 (ghostscript-4.03gnu.tar.gz) = 269c51c3054d9945b5acc145cb412c22
 MD5 (gs4.03-vflib.tar.gz) = 9935e711db0a4ffaa68407fef704a3d7
-MD5 (gdevlips4-1.0.1.tar.gz) = 150de01fbdcd88c2579d4f45efa7762e
+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 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-3.0.tar.gz) = afe46faf7fde6518ae004a7e8d9a4af4
diff --git a/japanese/vfghostscript5/files/gdev10v.mak.patch b/japanese/vfghostscript5/files/gdev10v.mak.patch
new file mode 100644
index 000000000000..01fdf9f885b5
--- /dev/null
+++ b/japanese/vfghostscript5/files/gdev10v.mak.patch
@@ -0,0 +1,25 @@
+*** gdev10v.mak.orig	Sun Apr 20 01:02:16 1997
+--- gdev10v.mak	Sun Apr 20 01:04:27 1997
+***************
+*** 1,10 ****
+  ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
+  
+  bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
+! bj10v.dev: $(bj10v_)
+! 	$(SHP)gssetdev bj10v $(bj10v_)
+! bj10vh.dev: $(bj10v_)
+! 	$(SHP)gssetdev bj10vh $(bj10v_)
+  
+  # Uncomment the following line if you are using MS-DOS on PC9801 series.
+  
+--- 1,10 ----
+  ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
+  
+  bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
+! bj10v.dev: $(bj10v_) page.dev
+! 	$(SETPDEV) bj10v $(bj10v_)
+! bj10vh.dev: $(bj10v_) page.dev
+! 	$(SETPDEV) bj10vh $(bj10v_)
+  
+  # Uncomment the following line if you are using MS-DOS on PC9801 series.
+  
diff --git a/japanese/vfghostscript5/files/mjc.dev.patch b/japanese/vfghostscript5/files/mjc.dev.patch
index ef640775e559..9ec7aba53f29 100644
--- a/japanese/vfghostscript5/files/mjc.dev.patch
+++ b/japanese/vfghostscript5/files/mjc.dev.patch
@@ -1,27 +1,29 @@
-*** mjc.dev.orig	Sat Nov  9 22:51:15 1996
---- mjc.dev	Sat Nov  9 22:53:25 1996
+*** mjc.dev.orig	Sun Apr 20 01:41:48 1997
+--- mjc.dev	Sun Apr 20 01:43:46 1997
 ***************
-*** 17,27 ****
+*** 16,27 ****
+  gdevmjc.$(OBJ): gdevmjc.c $(PDEVH) $(gdevpcl_h)
   	$(CCC) gdevmjc.c
   
-  mjc180.dev: $(mj700v2c_)
+! mjc180.dev: $(mj700v2c_)
 ! 	$(SHP)gssetdev mjc180 $(mj700v2c_)
-  mjc360.dev: $(mj700v2c_)
+! mjc360.dev: $(mj700v2c_)
 ! 	$(SHP)gssetdev mjc360 $(mj700v2c_)
-  mjc720.dev: $(mj700v2c_)
+! mjc720.dev: $(mj700v2c_)
 ! 	$(SHP)gssetdev mjc720 $(mj700v2c_)
-  mj500c.dev: $(mj700v2c_)
+! mj500c.dev: $(mj700v2c_)
 ! 	$(SHP)gssetdev mj500c $(mj700v2c_)
   
---- 17,27 ----
+--- 16,27 ----
+  gdevmjc.$(OBJ): gdevmjc.c $(PDEVH) $(gdevpcl_h)
   	$(CCC) gdevmjc.c
   
-  mjc180.dev: $(mj700v2c_)
+! mjc180.dev: $(mj700v2c_) page.dev
 ! 	$(SETPDEV) mjc180 $(mj700v2c_)
-  mjc360.dev: $(mj700v2c_)
+! mjc360.dev: $(mj700v2c_) page.dev
 ! 	$(SETPDEV) mjc360 $(mj700v2c_)
-  mjc720.dev: $(mj700v2c_)
+! mjc720.dev: $(mj700v2c_) page.dev
 ! 	$(SETPDEV) mjc720 $(mj700v2c_)
-  mj500c.dev: $(mj700v2c_)
+! mj500c.dev: $(mj700v2c_) page.dev
 ! 	$(SETPDEV) mj500c $(mj700v2c_)
   
diff --git a/japanese/vfghostscript5/pkg-plist b/japanese/vfghostscript5/pkg-plist
index 82d806c26456..15ef2224e7f3 100644
--- a/japanese/vfghostscript5/pkg-plist
+++ b/japanese/vfghostscript5/pkg-plist
@@ -15,6 +15,10 @@ bin/gsdj
 bin/gsdj500
 bin/gs
 man/man1/gs.1.gz
+man/man1/pdf2ps.1.gz
+man/man1/ps2ascii.1.gz
+man/man1/ps2epsi.1.gz
+man/man1/ps2pdf.1.gz
 share/ghostscript/4.03vflib/Fontmap
 share/ghostscript/4.03vflib/acctest.ps
 share/ghostscript/4.03vflib/align.ps
@@ -108,6 +112,7 @@ share/ghostscript/4.03vflib/doc/current.txt
 share/ghostscript/4.03vflib/doc/devices.txt
 share/ghostscript/4.03vflib/doc/drivers.txt
 share/ghostscript/4.03vflib/doc/fonts.txt
+share/ghostscript/4.03vflib/doc/gdev10v.jis
 share/ghostscript/4.03vflib/doc/gdevep82.jis
 share/ghostscript/4.03vflib/doc/gdevlips4.euc
 share/ghostscript/4.03vflib/doc/gdevmjc.jis
diff --git a/japanese/vfghostscript5/scripts/configure b/japanese/vfghostscript5/scripts/configure
index f9590b724201..2de28e129be3 100644
--- a/japanese/vfghostscript5/scripts/configure
+++ b/japanese/vfghostscript5/scripts/configure
@@ -1,8 +1,26 @@
 #! /bin/sh
 
+# Set printer drivers automatically if BATCH is set
+
+if [ ! "X"${BATCH} = "X" ] ; then
+
+PRINTER_JAPAN=' epag300.dev epag600.dev mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips4.dev lips4c.dev rpdlA3.dev rpdlA4.dev rpdlB4.dev rpdlB5.dev bj10v.dev bj10vh.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;" \
+    -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
+    -e "s;PSRCDIR=libpng;PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
+    -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
+    -e "s;CC=gcc;CC=cc;" \
+    -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev ${PRINTER_JAPAN};" \
+    < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
+    mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
+touch ${WRKSRC}/makefile
+
+else
+
 # Define the directories for the X11 library files.
 # This can be null if these files are in the default linker search path.
-
 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;" \
     -e "s;JSRCDIR=jpeg-6a;JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
@@ -48,8 +66,10 @@ Have fun with this new configuration style !     -andreas \n\n\
    "sxlcrt"   "CRT sixels, e.g. for VT240-like terminals" OFF \
    "ap3250"   "Epson AP3250" OFF \
    "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
-   "bj10e"    "Canon BubbleJet BJ10e" ON \
-   "bj200"    "Canon BubbleJet BJ200" ON \
+   "bj10e"    "Canon BubbleJet BJ10e" OFF \
+   "bj10v"    "Canon BubbleJet BJ10v" ON \
+   "bj10vh"    "Canon BubbleJet BJ10v" ON \
+   "bj200"    "Canon BubbleJet BJ200" OFF \
    "bjc600"   "Canon Color BubbleJet BJC-600/4000/70" ON \
    "bjc800"   "Canon Color BubbleJet BJC-800" ON \
    "ccr"      "CalComp Raster format" OFF \
@@ -200,3 +220,4 @@ echo "DEVICE_DEVS=$choice" \
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
 cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
 mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
+fi