Submitted by: MITA Yoshio <mita@jp.FreeBSD.org>

1. Added RPDL (Ricoh Printer Description Language) 600dpi drivers.
2. Removed gdevbitps driver which is obsoleted by psmono driver.
3. Fixed typo (X Windows -> X)

6 files changed, 32 insertions, 26 deletions

diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 13a5adf33244..89d3c2f1e753 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.3 1997/01/01 15:40:14 torstenb Exp $
+# $Id: Makefile,v 1.4 1997/01/03 01:38:33 max Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -12,7 +12,8 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
+		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -32,8 +33,8 @@ 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+=	gdevbitps-1.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
+GS_DRIVERS+=	gdevrpdl.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
@@ -54,22 +55,22 @@ pre-patch:
 post-patch:
 	@( mkdir ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  tar xzf ${DISTDIR}/gdevbitps-1.0.tar.gz ; \
 	  ${PATCH} -p0 < ${FILESDIR}/gdevep82.patch >/dev/null 2>&1 ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.0.1.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
 	  ${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} gdevep82/gdevep82.c gdevep82/gdevep82.mak ${WRKSRC}; \
-	  ${CP} gdevbitps/gdevbitps.c gdevbitps/bitps4.03.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}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
-	@${CAT} ${WRKSRC}/bitps4.03.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
 
 
@@ -89,7 +90,6 @@ pre-install:
 post-install:
 	@strip ${PREFIX}/bin/gs
 	@( \
-	  ${CP} ${PRINTER}/gdevbitps/gdevbitps.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.0.1/Readme ${DOC_DIR}/gdevlips4.euc ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
diff --git a/japanese/vfghostscript5/distinfo b/japanese/vfghostscript5/distinfo
index fb3cdfb629f7..1abac2725952 100644
--- a/japanese/vfghostscript5/distinfo
+++ b/japanese/vfghostscript5/distinfo
@@ -2,7 +2,7 @@ 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 (gdevbitps-1.0.tar.gz) = ab9d251877dab7de718568cd2be27081
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
+MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
 MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-3.0.tar.gz) = afe46faf7fde6518ae004a7e8d9a4af4
diff --git a/japanese/vfghostscript5/scripts/configure b/japanese/vfghostscript5/scripts/configure
index 7b4413c7c7a4..f9590b724201 100644
--- a/japanese/vfghostscript5/scripts/configure
+++ b/japanese/vfghostscript5/scripts/configure
@@ -41,14 +41,13 @@ file format drivers. The gs4 default drivers and some drivers for Japanese \n\
 printers are preselected. \n\
 Have fun with this new configuration style !     -andreas \n\n\
   Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
-   "x11"      "X Windows version 11, release >=4" ON \
-   "x11alpha" "X Windows masquer. as device with alpha capability" ON \
-   "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
-   "x11mono"  "X Windows masquer. as black-and-white device" ON \
+   "x11"      "X version 11, release >=4" ON \
+   "x11alpha" "X masquer. as device with alpha capability" ON \
+   "x11cmyk"  "X masquer. as 1-bit-per-plane CMYK device" ON \
+   "x11mono"  "X masquer. as black-and-white device" ON \
    "sxlcrt"   "CRT sixels, e.g. for VT240-like terminals" OFF \
    "ap3250"   "Epson AP3250" OFF \
    "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
-   "bitps"    "Bitmapped PostScript" ON \
    "bj10e"    "Canon BubbleJet BJ10e" ON \
    "bj200"    "Canon BubbleJet BJ200" ON \
    "bjc600"   "Canon Color BubbleJet BJC-600/4000/70" ON \
@@ -109,6 +108,10 @@ Have fun with this new configuration style !     -andreas \n\n\
    "pjxl"     "HP PaintJet XL color printer" ON \
    "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
    "r4081"    "Ricoh 4081 laser printer" OFF \
+   "rpdlA3"  "Ricoh Printer Description Language (RPDL) A3 600 dpi" ON \
+   "rpdlA4"  "Ricoh Printer Description Language (RPDL) A4 600 dpi" ON \
+   "rpdlB4"  "Ricoh Printer Description Language (RPDL) B4 600 dpi" ON \
+   "rpdlB5"  "Ricoh Printer Description Language (RPDL) B5 600 dpi" ON \
    "sj48"     "StarJet 48 inkjet printer" OFF \
    "st800"    "Epson Stylus 800 printer" OFF \
    "stcolor"  "Epson Stylus Color" OFF \
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 13a5adf33244..89d3c2f1e753 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1997/01/01 15:40:14 torstenb Exp $
+# $Id: Makefile,v 1.4 1997/01/03 01:38:33 max Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -12,7 +12,8 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
+		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
 MAINTAINER=	mita@jp.FreeBSD.org
@@ -32,8 +33,8 @@ 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+=	gdevbitps-1.0.tar.gz
 GS_DRIVERS+=	gdevmjc-0.7.tar.gz
+GS_DRIVERS+=	gdevrpdl.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
@@ -54,22 +55,22 @@ pre-patch:
 post-patch:
 	@( mkdir ${PRINTER} ; \
 	  cd ${PRINTER} ; \
-	  tar xzf ${DISTDIR}/gdevbitps-1.0.tar.gz ; \
 	  ${PATCH} -p0 < ${FILESDIR}/gdevep82.patch >/dev/null 2>&1 ; \
 	  tar xzf ${DISTDIR}/gdevlips4-1.0.1.tar.gz ; \
 	  tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \
+	  tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \
 	  ${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} gdevep82/gdevep82.c gdevep82/gdevep82.mak ${WRKSRC}; \
-	  ${CP} gdevbitps/gdevbitps.c gdevbitps/bitps4.03.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}/mjc.dev.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch
-	@${CAT} ${WRKSRC}/bitps4.03.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
 
 
@@ -89,7 +90,6 @@ pre-install:
 post-install:
 	@strip ${PREFIX}/bin/gs
 	@( \
-	  ${CP} ${PRINTER}/gdevbitps/gdevbitps.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevep82/gdevep82.jis ${DOC_DIR} ; \
 	  ${CP} ${PRINTER}/gdevlips4-1.0.1/Readme ${DOC_DIR}/gdevlips4.euc ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index fb3cdfb629f7..1abac2725952 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -2,7 +2,7 @@ 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 (gdevbitps-1.0.tar.gz) = ab9d251877dab7de718568cd2be27081
 MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7
+MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7
 MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-3.0.tar.gz) = afe46faf7fde6518ae004a7e8d9a4af4
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index 7b4413c7c7a4..f9590b724201 100644
--- a/japanese/vfghostscript55/scripts/configure
+++ b/japanese/vfghostscript55/scripts/configure
@@ -41,14 +41,13 @@ file format drivers. The gs4 default drivers and some drivers for Japanese \n\
 printers are preselected. \n\
 Have fun with this new configuration style !     -andreas \n\n\
   Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
-   "x11"      "X Windows version 11, release >=4" ON \
-   "x11alpha" "X Windows masquer. as device with alpha capability" ON \
-   "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
-   "x11mono"  "X Windows masquer. as black-and-white device" ON \
+   "x11"      "X version 11, release >=4" ON \
+   "x11alpha" "X masquer. as device with alpha capability" ON \
+   "x11cmyk"  "X masquer. as 1-bit-per-plane CMYK device" ON \
+   "x11mono"  "X masquer. as black-and-white device" ON \
    "sxlcrt"   "CRT sixels, e.g. for VT240-like terminals" OFF \
    "ap3250"   "Epson AP3250" OFF \
    "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
-   "bitps"    "Bitmapped PostScript" ON \
    "bj10e"    "Canon BubbleJet BJ10e" ON \
    "bj200"    "Canon BubbleJet BJ200" ON \
    "bjc600"   "Canon Color BubbleJet BJC-600/4000/70" ON \
@@ -109,6 +108,10 @@ Have fun with this new configuration style !     -andreas \n\n\
    "pjxl"     "HP PaintJet XL color printer" ON \
    "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
    "r4081"    "Ricoh 4081 laser printer" OFF \
+   "rpdlA3"  "Ricoh Printer Description Language (RPDL) A3 600 dpi" ON \
+   "rpdlA4"  "Ricoh Printer Description Language (RPDL) A4 600 dpi" ON \
+   "rpdlB4"  "Ricoh Printer Description Language (RPDL) B4 600 dpi" ON \
+   "rpdlB5"  "Ricoh Printer Description Language (RPDL) B5 600 dpi" ON \
    "sj48"     "StarJet 48 inkjet printer" OFF \
    "st800"    "Epson Stylus 800 printer" OFF \
    "stcolor"  "Epson Stylus Color" OFF \