Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jan 2002 19:17:26 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/33598: Update port: japanese/vfghostscript55
Message-ID:  <200201060317.g063HQM13773@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         33598
>Category:       ports
>Synopsis:       Update port: japanese/vfghostscript55
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 19:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update HPinkjet driver to version 1.0

New file:
files/gdevijs.mak.patch

Remove file:
files/hpijs.patch

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/japanese/vfghostscript55/Makefile japanese/vfghostscript55/Makefile
--- /usr/ports/japanese/vfghostscript55/Makefile	Thu Nov  1 22:17:24 2001
+++ japanese/vfghostscript55/Makefile	Sun Jan  6 10:18:49 2002
@@ -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 @@
 
 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
@@ -67,7 +66,7 @@
 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.tar.gz
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
@@ -88,12 +87,17 @@
 	  ${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.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 -O0"|g ; \
+	  s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS -O0"|g' \
+	    ${PRINTER}/hpijs-1.0/configure
+	@find ${PRINTER}/hpijs-1.0 -name '*.h' | xargs ${PERL} -pi -e \
+	  's|#include <malloc.h>||g'
 
 post-patch:
 	@( cd ${PRINTER} ; \
@@ -108,10 +112,13 @@
 	  ${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/gdevijs.[ch] hpijs-1.0/ijs.[ch]  ${WRKSRC}; \
+	  ${CP} hpijs-1.0/ijs_client.[ch] hpijs-1.0/ijs_exec_unix.c ${WRKSRC}; \
+	  ${CP} hpijs-1.0/unistd_.h ${WRKSRC}; \
+	  ${SED} -n -e '/^### -* IJS Interface -*/,/^###/p' \
+	    hpijs-1.0/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 @@
 	@${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 @@
 	@${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 ; \
+	  ${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 ; \
+	  ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile)
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript
@@ -151,7 +164,7 @@
 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/hpijs ${PREFIX}/bin
 	@strip ${PREFIX}/bin/gs
 	@( \
 	  ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \
@@ -183,6 +196,7 @@
 	  ${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/hpijs_readme.html ${DOC_DIR} ; \
 	)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/vfghostscript55/distinfo japanese/vfghostscript55/distinfo
--- /usr/ports/japanese/vfghostscript55/distinfo	Thu Nov  1 22:17:25 2001
+++ japanese/vfghostscript55/distinfo	Sat Jan  5 14:57:47 2002
@@ -13,4 +13,4 @@
 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.tar.gz) = 9ec7d86d2cc2dd613f8829891b02104b
diff -urN /usr/ports/japanese/vfghostscript55/files/gdevijs.mak.patch japanese/vfghostscript55/files/gdevijs.mak.patch
--- /usr/ports/japanese/vfghostscript55/files/gdevijs.mak.patch	Thu Jan  1 09:00:00 1970
+++ japanese/vfghostscript55/files/gdevijs.mak.patch	Sat Jan  5 20:55:27 2002
@@ -0,0 +1,12 @@
+--- gdevijs.mak.orig	Sat Jan  5 20:43:03 2002
++++ gdevijs.mak	Sat Jan  5 20:43:28 2002
+@@ -14,7 +14,7 @@
+ $(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH)
+ 	$(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
+ 
+-$(DD)ijs.dev : $(ijs_) $(DD)page.dev
+-	$(SETPDEV) $(DD)ijs $(ijs_)
++ijs.dev : $(ijs_) page.dev
++	$(SETPDEV) ijs $(ijs_)
+ 
+ ### ------------ The H-P PaintJet color printer device ----------------- ###
diff -urN /usr/ports/japanese/vfghostscript55/files/hpijs.patch japanese/vfghostscript55/files/hpijs.patch
--- /usr/ports/japanese/vfghostscript55/files/hpijs.patch	Sun Oct 14 19:41:20 2001
+++ japanese/vfghostscript55/files/hpijs.patch	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/japanese/vfghostscript55/files/patch-al japanese/vfghostscript55/files/patch-al
--- /usr/ports/japanese/vfghostscript55/files/patch-al	Fri Sep 29 11:14:18 2000
+++ japanese/vfghostscript55/files/patch-al	Sat Jan  5 21:50:29 2002
@@ -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 -urN /usr/ports/japanese/vfghostscript55/pkg-plist japanese/vfghostscript55/pkg-plist
--- /usr/ports/japanese/vfghostscript55/pkg-plist	Wed Oct 10 19:57:06 2001
+++ japanese/vfghostscript55/pkg-plist	Sat Jan  5 23:10:14 2002
@@ -79,25 +79,26 @@
 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/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 -urN /usr/ports/japanese/vfghostscript55/scripts/configure japanese/vfghostscript55/scripts/configure
--- /usr/ports/japanese/vfghostscript55/scripts/configure	Thu Nov  1 22:17:26 2001
+++ japanese/vfghostscript55/scripts/configure	Sat Jan  5 15:00:13 2002
@@ -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 @@
    "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 \

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201060317.g063HQM13773>