Attachment 50698 Details for Bug 77185 – file.diff

[patch] file.diff

file.diff (text/plain), 10.53 KB, created by giffunip on 2005-02-07 01:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: giffunip

Created: 2005-02-07 01:20:16 UTC

Size: 10.53 KB

patch

obsolete

>diff -ruN ghostscript-gpl.orig/Makefile ghostscript-gpl/Makefile
>--- ghostscript-gpl.orig/Makefile	Sun Feb  6 13:29:58 2005
>+++ ghostscript-gpl/Makefile	Sun Feb  6 19:55:36 2005
>@@ -12,6 +12,7 @@
> CATEGORIES=	print
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
> 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
>+		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:pcl3 \
> 		http://www.harsch.net/Download/:dj970 \
> 		http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
> 		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
>@@ -29,6 +30,7 @@
> PKGNAMESUFFIX=	-gpl
> DISTFILES=	${GS_SRCS}:gs_srcs \
> 		${HP8XX_SRCS}:hp8xx \
>+		${PCL3_SRCS}:pcl3 \
> 		${DJ970_SRCS}:dj970 \
> 		${MD2K_SRCS}:md2k \
> 		${ALPS_SRCS}:ports_jp_gs \
>@@ -59,6 +61,9 @@
> USE_GMAKE=	yes
> MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
> 		XCFLAGS="${XCFLAGS}"
>+ALL_TARGET=	all
>+INSTALL_TARGET= install
>+
> PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
> 		CIDFONTDIR=${CIDFONTDIR}
> 
>@@ -121,6 +126,19 @@
> HP8XX=		cdj880
> HP8XX_SRCS=	gdevcd8.tar.gz
> 
>+# PCL3 (hpdj successor now in RELEASE quality)
>+# additional driver for HP PCL3 printers, by Martin Lottermoser
>+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
>+ALL_TARGET+=	pcl3opts
>+INSTALL_TARGET+=	pcl3-install
>+PCL3=		pcl3
>+PCL3_VERS=	3.3
>+PCL3_NAME=	${PCL3}-${PCL3_VERS}
>+PCL3_SRCS=	${PCL3_NAME}.tar.gz
>+PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
>+MAN1+=		${PCL3_MAN1}
>+
>+#
> # DJ970 - additional driver for HP DeskJet 970, supports duplex printing
> # http://www.harsch.net/Ghostscript/ghostscript.html
> DJ970=		gdevdj9
>@@ -230,6 +248,12 @@
> # for HP8XX driver
> 	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
> 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
>+# for PCL3 driver
>+	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
>+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
>+	${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3}
>+	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
>+		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
> # for DJ970 driver
> 	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
> 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
>@@ -301,6 +325,10 @@
> 	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
> 	${CAT} ${FILESDIR}/cdj850.contrib.mak \
> 		>> ${WRKSRC}/src/contrib.mak
>+# for PCL3 driver
>+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
>+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
>+		>> ${WRKSRC}/src/contrib.mak
> # for DJ970 driver
> 	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
> 	${CAT} ${FILESDIR}/dj970.contrib.mak \
>@@ -447,6 +475,18 @@
> .else
> 	${STRIP_CMD} ${PREFIX}/bin/gs
> .endif
>+# for PCL3 driver, stuff which might be interesting for runtime
>+	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
>+	${MKDIR} ${DATADIR}/${GS_VERSION}/${PCL3}
>+	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
>+.for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
>+	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
>+	ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
>+	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
>+	ps/margins-LetterRotated.ps
>+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
>+		${DATADIR}/${GS_VERSION}/${PCL3}
>+.endfor
> # for EPAG driver
> 	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
> 	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
>@@ -462,6 +502,13 @@
> .if !defined(NOPORTDOCS)
> 	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
> 	${MKDIR} ${DOCSDIR}/${GS_VERSION}
>+# for PCL3 driver
>+	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
>+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${PCL3}
>+.for i in NEWS doc/how-to-report.txt
>+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
>+		${DOCSDIR}/${GS_VERSION}/${PCL3}
>+.endfor
> # for MD2K driver
> 	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
> 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MD2K}
>diff -ruN ghostscript-gpl.orig/distinfo ghostscript-gpl/distinfo
>--- ghostscript-gpl.orig/distinfo	Sun Feb  6 13:29:58 2005
>+++ ghostscript-gpl/distinfo	Sun Feb  6 13:52:08 2005
>@@ -2,6 +2,8 @@
> SIZE (ghostscript/ghostscript-8.15.tar.bz2) = 6931694
> MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
> SIZE (ghostscript/gdevcd8.tar.gz) = 24803
>+MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
>+SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
> MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
> SIZE (ghostscript/gdevdj9.c.gz) = 20139
> MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
>diff -ruN ghostscript-gpl.orig/pkg-descr ghostscript-gpl/pkg-descr
>--- ghostscript-gpl.orig/pkg-descr	Sun Feb  6 13:29:58 2005
>+++ ghostscript-gpl/pkg-descr	Sun Feb  6 15:10:38 2005
>@@ -7,6 +7,8 @@
> under certain conditions (including, in some cases, commercial distribution).
> 
> This port includes add-on packages (not part of the official gs release)
>+	o PCL driver for HP DeskJet printers
>+	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
> 	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
> 	  - http://hp.sourceforge.net/gs-hp2200.php
> 	o DJ970 driver for HP DeskJet 970CXi
>diff -ruN ghostscript-gpl.orig/pkg-plist ghostscript-gpl/pkg-plist
>--- ghostscript-gpl.orig/pkg-plist	Sun Feb  6 13:29:58 2005
>+++ ghostscript-gpl/pkg-plist	Sun Feb  6 19:56:21 2005
>@@ -15,6 +15,7 @@
> bin/gsnd
> %%SHLIB%%bin/gsx
> bin/lprsetup.sh
>+bin/pcl3opts
> bin/pdf2dsc
> bin/pdf2ps
> bin/pdfopt
>@@ -34,25 +35,6 @@
> bin/wftopfa
> %%SHLIB%%lib/libgs.so
> %%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/alps/README.gdevalps
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/bj10v/gdev10v.jis
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ert.txt
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gdevepag.txt
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gsepagif.sh
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/psprint
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/gdi/README
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lips/Gdevlips.htm
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/README
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/md2k/README.jis
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mjc
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mje
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.noz
>-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/cpem.doc
> %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H
> %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V
> %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H
>@@ -238,6 +220,8 @@
> %%DATADIR%%/%%GS_VERSION%%/doc/Use.htm
> %%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm
> %%DATADIR%%/%%GS_VERSION%%/doc/gs.css
>+%%DATADIR%%/%%GS_VERSION%%/doc/gs-pcl3.html
>+%%DATADIR%%/%%GS_VERSION%%/doc/pcl3opts.html
> %%DATADIR%%/%%GS_VERSION%%/doc/index.html
> %%DATADIR%%/%%GS_VERSION%%/examples/alphabet.ps
> %%DATADIR%%/%%GS_VERSION%%/examples/chess.ps
>@@ -481,6 +465,21 @@
> %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
> %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
> %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/BUGS
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/NEWS
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/README
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/calign.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/dumppdd.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/example.mcf
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/if-pcl3
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/levels-test.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
>+%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
>+@dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
> @exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
> @unexec rm -f %%CIDFONTDIR%%/CIDFont
> @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
>@@ -492,6 +491,28 @@
> @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
> @unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true
> @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/alps/README.gdevalps
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/bj10v/gdev10v.jis
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ert.txt
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gdevepag.txt
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gsepagif.sh
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/psprint
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/gdi/README
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lips/Gdevlips.htm
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/README
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/md2k/README.jis
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mjc
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mje
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.noz
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/cpem.doc
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/how-to-report.txt
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200
>diff -ruN ghostscript-gpl.orig/scripts/configure ghostscript-gpl/scripts/configure
>--- ghostscript-gpl.orig/scripts/configure	Sun Feb  6 13:29:58 2005
>+++ ghostscript-gpl/scripts/configure	Sun Feb  6 16:47:08 2005
>@@ -50,6 +50,7 @@
> 		laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
> 		cljet5 cljet5c cljet5pr lj5mono lj5gray \
> 		pj pjetxl pjxl paintjet \
>+		pcl3 \
> 		pjxl300 pxlmono pxlcolor \
> 		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
> 		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
>@@ -240,6 +241,7 @@
>   "pjxl"     "HP PaintJet XL color printer" "$status_pjxl" \
>   "paintjet" "HP PaintJet color printer (alternate)" "$status_paintjet" \
>   "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" "$status_pjxl300" \
>+  "pcl3"     "HP PCL 3 (generic) [PCL3]" "$status_pcl3" \
>   "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \
>   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \
>   "ijs"      "HP Inkjet and other raster devices" "$status_ijs" \

Actions: View | Diff

Attachments on bug 77185: 50698