Patch is applied.

PR:		ports/34029

1 files changed, 35 insertions, 21 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>