6 files changed, 60 insertions, 58 deletions

diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index b61144e95950..e005219d66f7 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -7,18 +7,16 @@
 
 PORTNAME=	vfghostscript
 PORTVERSION=	5.50a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/gs550/ \
-		ftp://ftp.cs.wisc.edu/ghost/gnu/fonts/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs550/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
 		${MASTER_SITE_LOCAL} \
 		${MASTER_SITE_PORTS_JP} \
-		http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/ \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \
 		http://www.humblesoft.com/pub/ \
-		http://www6.vc-net.ne.jp/~umi/ \
 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \
 		http://www.epkowa.on.arena.ne.jp/pips/data/9400/\
 		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/hpinkjet/g}
@@ -40,10 +38,11 @@ WRKSRC=		${WRKDIR}/gs5.50
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
+MAKE_ENV=	CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}"
 MAKEFILE=	unix-gcc.mak
 MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 pdf2dsc.1 ps2ps.1
 
-CFLAGS+=	-DA4
+XCFLAGS=	-DA4
 GSINST_DIR=	${PREFIX}/share/ghostscript/5.50vflib
 DOC_DIR=	${GSINST_DIR}/doc
 PRINTER=	${WRKSRC}/jp-printers
@@ -61,13 +60,13 @@ GS_DRIVERS+=	gdevlips-2.3.6-550.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+=	gdevnpdl-1.6.3.tar.gz
 GS_DRIVERS+=	epag-3.09.tar.gz
 GS_DRIVERS+=	gdevalps-0.21.tar.gz
 GS_DRIVERS+=	gdevmd2k-0.2a.tar.gz
 GS_DRIVERS+=	gdevrpdl-1.4.tar.gz
 GS_DRIVERS+=	eplaser-2.0.6-550.tgz
-GS_DRIVERS+=	hpijs0.97.tar.gz
+GS_DRIVERS+=	hpijs-1.0.1.tar.gz
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
@@ -82,18 +81,23 @@ post-extract:
 	  ${TAR} --unlink -xzf ${_DISTDIR}/gdev10v.tar.gz ; \
 	  ${MKDIR} ${PRINTER}/gdevdmpr ; \
 	  ${TAR} -C gdevdmpr --unlink -xzf ${_DISTDIR}/dmprt-2.01.tar.gz ; \
-	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevnpdl-1.6.2.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevnpdl-1.6.3.tar.gz ; \
 	  ${TAR} --unlink -xzf ${_DISTDIR}/epag-3.09.tar.gz ; \
 	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevalps-0.21.tar.gz ; \
 	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevmd2k-0.2a.tar.gz ; \
 	  ${TAR} --unlink -xzf ${_DISTDIR}/gdevrpdl-1.4.tar.gz ; \
 	  ${TAR} --unlink -xzf ${_DISTDIR}/eplaser-2.0.6-550.tgz ; \
-	  ${TAR} --unlink -xzf ${_DISTDIR}/hpijs0.97.tar.gz ; \
+	  ${TAR} --unlink -xzf ${_DISTDIR}/hpijs-1.0.1.tar.gz ; \
 	)
 
 pre-patch:
 	@${CAT} ${WRKSRC}/gs5.50-vflib-1.0/gs5.50-vflib-1.0.diff | \
 		${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E
+	@${PERL} -pi -e 's|CFLAGS="-O2 -Wall"|CFLAGS=\$$CFLAGS"| ; \
+	   s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g ; \
+	    ${WRKSRC}/hpijs-1.0.1/configure
+	@find ${PRINTER}/hpijs-1.0.1 -name '*.h' | xargs ${PERL} -pi -e \
+	  's|#include <malloc.h>||g'
 
 post-patch:
 	@( cd ${PRINTER} ; \
@@ -104,14 +108,17 @@ post-patch:
 	  ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \
 	  ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h   ${WRKSRC}; \
 	  ${CP} epag-3.09/gdevepag.c epag-3.09/gdevepag.mak ${WRKSRC}; \
-	  ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \
+	  ${CP} gdevnpdl-1.6.3/gdevnpdl.c gdevnpdl-1.6.3/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.4/gdevrpdl.c gdevrpdl-1.4/gdevrpdl.mak ${WRKSRC}; \
-	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak eplaser/gdevesmv.c eplaser/gdevesmv.mak ${WRKSRC}; \
-	  ${CP} hpijs0.97/gdevhpij.[ch] ${WRKSRC}; \
-	  ${SED} -n -e '/^### -* Hewlett-Packard Co. Inkjet Driver -*/,/^###/p' \
-	    hpijs0.97/contrib.mak | ${SED} '$d' > ${WRKSRC}/gdevhpij.mak; \
+	  ${CP} eplaser/gdevescv.[ch] eplaser/gdevescv.mak ${WRKSRC}; \
+	  ${CP} eplaser/gdevesmv.c eplaser/gdevesmv.mak ${WRKSRC}; \
+	  ${CP} hpijs-1.0.1/gdevijs.[ch] hpijs-1.0.1/ijs.[ch] ${WRKSRC}; \
+	  ${CP} hpijs-1.0.1/ijs_client.[ch] hpijs-1.0.1/ijs_exec_unix.c ${WRKSRC}; \
+	  ${CP}	hpijs-1.0.1/unistd_.h ${WRKSRC}; \
+	  ${SED} -n -e '/^### -* IJS Interface -*/,/^###/p' \
+	    hpijs-1.0.1/contrib.mak | ${SED} '$d' > ${WRKSRC}/gdevijs.mak; \
 	  )
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch
@@ -122,6 +129,7 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevlips.mak.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevescv.c.patch
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevesmv.c.patch
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevijs.mak.patch
 	@${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/contrib.mak
@@ -133,15 +141,20 @@ post-patch:
 	@${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevescv.mak >> ${WRKSRC}/contrib.mak
 	@${CAT} ${WRKSRC}/gdevesmv.mak >> ${WRKSRC}/contrib.mak
-	@${CAT} ${WRKSRC}/gdevhpij.mak >> ${WRKSRC}/contrib.mak
-	@${PATCH} ${PATCH_ARGS} -d ${PRINTER}/hpijs0.97 < ${FILESDIR}/hpijs.patch
+	@${CAT} ${WRKSRC}/gdevijs.mak >> ${WRKSRC}/contrib.mak
+
+post-configure:
+	@(cd ${PRINTER}/hpijs-1.0.1 ; \
+	  ${SETENV} ${MAKE_ENV} ${SH} ./configure --prefix=${PREFIX})
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
 
 post-build:
-	@(cd ${PRINTER}/epag-3.09 ;  ${MAKE})
-	@(cd ${PRINTER}/hpijs0.97 ;  ${MAKE})
+	@(cd ${PRINTER}/epag-3.09 ; \
+	  ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile)
+	@(cd ${PRINTER}/hpijs-1.0.1 ; \
+	  ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile)
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
@@ -151,7 +164,7 @@ pre-install:
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/pdf_sec.ps ${GSINST_DIR}
 	${INSTALL_PROGRAM} ${PRINTER}/epag-3.09/ert ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${PRINTER}/hpijs0.97/hpijs ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${PRINTER}/hpijs-1.0.1/hpijs ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
@@ -174,7 +187,7 @@ 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} ; \
+	  ${CP} ${PRINTER}/gdevnpdl-1.6.3/gdevnpdl.jis ${DOC_DIR} ; \
 	  ${MKDIR} ${DOC_DIR}/epag-3.09 ; \
 	  ${CP} ${PRINTER}/epag-3.09/FILES ${DOC_DIR}/epag-3.09 ; \
 	  ${CP} ${PRINTER}/epag-3.09/*.txt ${DOC_DIR}/epag-3.09 ; \
@@ -183,6 +196,7 @@ post-install:
 	  ${CP} ${PRINTER}/epag-3.09/psprint ${DOC_DIR}/epag-3.09 ; \
 	  ${CP} ${PRINTER}/gdevmjc-0.8/gdevmjc.ps ${GSINST_DIR} ; \
 	  ${CP} ${PRINTER}/eplaser/readme-eplaser.euc ${DOC_DIR} ; \
+	  ${CP} ${PRINTER}/hpijs-1.0.1/hpijs_readme.html ${DOC_DIR} ; \
 	)
 
 .include <bsd.port.mk>
diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo
index cc69c2251148..94d1c79bfa2d 100644
--- a/japanese/vfghostscript55/distinfo
+++ b/japanese/vfghostscript55/distinfo
@@ -7,10 +7,10 @@ MD5 (ghostscript/gdevlips-2.3.6-550.tar.gz) = 07bf7a0d6112ae86ed832b308c5f3fbb
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
 MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-MD5 (ghostscript/gdevnpdl-1.6.2.tar.gz) = 07ac0d55a1f941be069074104e22fc11
+MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevrpdl-1.4.tar.gz) = c273943f9c7ad85dd58bb8aca0738854
 MD5 (ghostscript/eplaser-2.0.6-550.tgz) = a6603117f0f2b6a500af4d8b3359e6c1
-MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8
+MD5 (ghostscript/hpijs-1.0.1.tar.gz) = 4ac76910a69eb781e35c8eca31db6008
diff --git a/japanese/vfghostscript55/files/hpijs.patch b/japanese/vfghostscript55/files/hpijs.patch
index bb1c143a03cc..e69de29bb2d1 100644
--- a/japanese/vfghostscript55/files/hpijs.patch
+++ b/japanese/vfghostscript55/files/hpijs.patch
@@ -1,10 +0,0 @@
---- platform.h.orig	Mon Oct  1 14:01:29 2001
-+++ platform.h	Mon Oct  1 14:01:39 2001
-@@ -8,7 +8,6 @@
- // your development environment.
- 
- #include <stdlib.h>
--#include <malloc.h>
- #include <memory.h>
- #include <string.h>
- #include <stdio.h>
diff --git a/japanese/vfghostscript55/files/patch-al b/japanese/vfghostscript55/files/patch-al
index 309532fe8769..a28355378341 100644
--- a/japanese/vfghostscript55/files/patch-al
+++ b/japanese/vfghostscript55/files/patch-al
@@ -1,5 +1,5 @@
---- unix-gcc.mak.orig	Sat Sep  2 04:47:06 2000
-+++ unix-gcc.mak	Sat Sep  2 04:58:56 2000
+--- unix-gcc.mak.orig	Sat Jan  5 21:01:57 2002
++++ unix-gcc.mak	Sat Jan  5 21:49:17 2002
 @@ -57,11 +57,10 @@
  # initialization files (gs_*.ps) and the fonts.
  
@@ -50,12 +50,15 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -213,7 +212,7 @@
+@@ -211,9 +210,9 @@
+ # We don't include -ansi, because this gets in the way of the platform-
+ #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
- XCFLAGS=
+-XCFLAGS=
++#XCFLAGS=
  
 -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++CFLAGS+=$(XCFLAGS)
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist
index 83a15acaea14..375fe103545d 100644
--- a/japanese/vfghostscript55/pkg-plist
+++ b/japanese/vfghostscript55/pkg-plist
@@ -79,25 +79,26 @@ share/ghostscript/5.50vflib/doc/Unix-lpr.htm
 share/ghostscript/5.50vflib/doc/Use.htm
 share/ghostscript/5.50vflib/doc/Xfonts.htm
 share/ghostscript/5.50vflib/doc/djgpp.sj
+share/ghostscript/5.50vflib/doc/epag-3.09/FILES
+share/ghostscript/5.50vflib/doc/epag-3.09/adjust.ps
+share/ghostscript/5.50vflib/doc/epag-3.09/ert.txt
+share/ghostscript/5.50vflib/doc/epag-3.09/gdevepag.txt
+share/ghostscript/5.50vflib/doc/epag-3.09/gsepagif.sh
+share/ghostscript/5.50vflib/doc/epag-3.09/psprint
 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/MJ700V2C.FAQ
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mjc
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mje
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.noz
-share/ghostscript/5.50vflib/doc/gdevmjc-0.8/MJ700V2C.FAQ
 share/ghostscript/5.50vflib/doc/gdevmjc-0.8/cpem.doc
-share/ghostscript/5.50vflib/doc/gdevrpdl.doc 
+share/ghostscript/5.50vflib/doc/gdevnpdl.jis
+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.09/FILES
-share/ghostscript/5.50vflib/doc/epag-3.09/gdevepag.txt
-share/ghostscript/5.50vflib/doc/epag-3.09/ert.txt
-share/ghostscript/5.50vflib/doc/epag-3.09/adjust.ps
-share/ghostscript/5.50vflib/doc/epag-3.09/gsepagif.sh
-share/ghostscript/5.50vflib/doc/epag-3.09/psprint
+share/ghostscript/5.50vflib/doc/hpijs_readme.html
 share/ghostscript/5.50vflib/doc/kfvflib.sj
 share/ghostscript/5.50vflib/doc/ps2epsi.txt
 share/ghostscript/5.50vflib/doc/readme-eplaser.euc
@@ -404,11 +405,11 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+@dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/5.50vflib/vflib
+@dirrm share/ghostscript/5.50vflib/examples
 @dirrm share/ghostscript/5.50vflib/doc/gdevmjc-0.8
 @dirrm share/ghostscript/5.50vflib/doc/epag-3.09
 @dirrm share/ghostscript/5.50vflib/doc
-@dirrm share/ghostscript/5.50vflib/examples
-@dirrm share/ghostscript/5.50vflib/vflib
 @dirrm share/ghostscript/5.50vflib
-@dirrm share/ghostscript/fonts
 @dirrm share/ghostscript
diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure
index 735cbe0efd33..7acbe77999f6 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 epag.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev lp2200.dev lp9400.dev lp8700.dev lp8100.dev lp3000c.dev lp8000c.dev lp8200c.dev lp8300c.dev lp8500c.dev lp8600f.dev lp8400f.dev lp8300f.dev lp1900.dev lp1800.dev hpijs.dev DJ630.dev DJ6xx.dev DJ6xxP.dev DJ8xx.dev DJ9xx.dev DJ9xxVIP.dev AP21xx.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 lp2200.dev lp9400.dev lp8700.dev lp8100.dev lp3000c.dev lp8000c.dev lp8200c.dev lp8300c.dev lp8500c.dev lp8600f.dev lp8400f.dev lp8300f.dev lp1900.dev lp1800.dev ijs.dev'
 
 sed -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev st800.dev uniprint.dev bmp16m.dev ${PRINTER_JAPAN};" \
     < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
@@ -138,13 +138,7 @@ Have fun with this new configuration style !     -andreas \n\n\
    "pjetxl"   "alternate HP PaintJet XL driver" OFF \
    "pjxl"     "HP PaintJet XL color printer" ON \
    "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
-   "DJ6xx"    "HP DeskJet 600C Series, e-Series (e-20)" ON \
-   "DJ6xxP"   "HP DJ 600C Series Photo" ON \
-   "DJ630"    "HP DJ 630C Series" ON \
-   "DJ8xx"    "HP DJ 800C Series" ON \
-   "DJ9xx"    "HP DJ 900C Series, Photo Smart" ON \
-   "DJ9xxVIP" "HP DJ 990C Series, Photo Smart" ON \
-   "AP21xx"   "Apollo 2100 Series" ON \
+   "ijs"      "HP PhotoSmart/DeskJet series (HP developed driver)" ON \
    "m8510"    "C.Itoh M8510 printer" OFF \
    "cp50"     "Mitsubishi CP50 color" OFF \
    "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \