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.

1 files changed, 12 insertions, 18 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} ; \
 	)