mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

- Replace HP2200 driver (currently unavailable at master site)

Browse Source 
with HP8XX driver
- Update ghotscript-fonts-std to version 8.11
- Update EPLASER driver to version 3.1.4
- Fix minor bug in paparsize handling of LIPS driver
- Fix minor bug in Japanese vertical font support

PR:		61249
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2004-01-12 14:34:03 +00:00
parent 278dd13104
commit 81ec0cfbc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=98003
22 changed files with 448 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
print/ghostscript-gnu/Makefile
View File

@ -7,11 +7,10 @@
PORTNAME= ghostscript
PORTVERSION= ${GS_VERSION}
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \
${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
http://hp.sourceforge.net/:hp2200 \
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
http://www.harsch.net/Download/:dj970 \
http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
@ -23,9 +22,9 @@ MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \
http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
http://www.linuxprinting.org/download/printing/:lxm3200 \
http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:gs_fonts \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERSION:S/.//}/:gs_srcs
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,ports_jp_gs \
gimp-print/:gprint \
bjc250gs/:bjc250 \
./:ports_jp
@ -33,7 +32,7 @@ PKGNAMESUFFIX= -gnu
DISTFILES= ${GS_SRCS}:gs_srcs \
${GS_FONTS_STD}:gs_fonts \
${GS_FONTS_OTHER}:gs_fonts \
${HP2200_SRCS}:hp2200 \
${HP8XX_SRCS}:hp8xx \
${HPDJ_SRCS}:hpdj_pcl3 \
${PCL3_SRCS}:hpdj_pcl3 \
${DJ970_SRCS}:dj970 \
@ -52,7 +51,6 @@ DISTFILES= ${GS_SRCS}:gs_srcs \
${LXM3200_SRCS}:lxm3200 \
${LX5000_SRCS}:lx5000 \
${LEX7000_SRCS}:lx5000
DIST_SUBDIR= ghostscript
EXTRACT_ONLY= ${GS_SRCS}
@ -116,19 +114,15 @@ PLIST_SUB+= SHLIB="@comment "
.endif
GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
# 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
# unless the files really change.
GS_FONTS_STD= gnu-gs-fonts-std-6.0.tar.gz
GS_FONTS_OTHER= gnu-gs-fonts-other-6.0.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-8.11.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-6.0.tar.gz
# Additional Drivers:
# HP2200 - additional driver for HP DeskJet 8xx and Business Inkjet 2200
# http://hp.sourceforge.net/gs-hp2200.php
HP2200= hp2200
HP2200_SRCS= gs-hp2200.tar.gz
# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
# http://www.gelhaus.net/hp880c/
HP8XX= cdj880
HP8XX_SRCS= gdevcd8.tar.gz
# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
# still present, just for the case pcl3 is missing some hpdj feature
@ -222,9 +216,9 @@ EPAG_NAME= ${EPAG}-${EPAG_VERS}
EPAG_SRCS= ${EPAG_NAME}.tar.gz
# EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
# http://www.epkowa.co.jp/linux/lpd.html
# http://www.epkowa.co.jp/english/linux_e/index.html
EPLASER= eplaser
EPLASER_VERS= 3.1.1
EPLASER_VERS= 3.1.3
EPLASER_NAME= ${EPLASER}-${EPLASER_VERS}
EPLASER_SRCS= ${EPLASER_NAME}-705.tgz
@ -272,14 +266,12 @@ pre-everything::
post-extract:
${ECHO_MSG} ">>> in post-extract ..."
# ** 3rd party driver **
# Note: don't forget to add those devices in scripts/configure and
# configure.batch, which update unix-gcc.mak to build gs with these
# new devices !
# Note: don't forget to add those devices in scripts/configure,
# which update unix-gcc.mak to build gs with these new devices !
#
# for HP2200 driver
${ECHO_MSG} ">>> extracting ${HP2200_SRCS} ..."
${MKDIR} ${WRKSRC}/${HP2200}
${TAR} -C ${WRKSRC}/${HP2200} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP2200_SRCS}
# for HP8XX driver
${ECHO_MSG} ">>> extracting ${HP8XX_SRCS} ..."
${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
# for HPDJ driver
${ECHO_MSG} ">>> extracting ${HPDJ_SRCS} ..."
${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
@ -369,9 +361,9 @@ post-patch:
# advantage: you see unmodified makefiles after a pure make extract
pre-configure:
${ECHO_MSG} ">>> in pre-configure ..."
# for HP2200 driver
${ECHO_MSG} ">>> adding ${HP2200} driver to contrib.mak ..."
${CAT} ${FILESDIR}/chp2200.contrib.mak \
# for HP8XX driver
${ECHO_MSG} ">>> adding ${HP8XX} driver to contrib.mak ..."
${CAT} ${FILESDIR}/cdj850.contrib.mak \
>> ${WRKSRC}/src/contrib.mak
# for HPDJ driver
${ECHO_MSG} ">>> adding ${HPDJ} driver to contrib.mak ..."
@ -461,11 +453,6 @@ pre-build:
${ECHO_MSG} ">>> creating directories for compilation ..."
${MKDIR} ${WRKSRC}/obj
${MKDIR} ${WRKSRC}/bin
# for HP2200 driver
${ECHO_MSG} ">>> creating symlinks for ${HP2200} ..."
.for i in gdevcd8.c
${LN} -sf ${WRKSRC}/${HP2200}/${i} ${WRKSRC}/src
.endfor
# for Gimp-Print driver
${ECHO_MSG} ">>> building ${GPRINT} library ..."
cd ${WRKSRC}/${GPRINT_NAME} ; \

8
print/ghostscript-gnu/distinfo
View File

@ -1,7 +1,7 @@
MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
@ -14,7 +14,7 @@ MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
MD5 (ghostscript/eplaser-3.1.1-705.tgz) = 3b984ec8c3d2f161b569783f4884fdea
MD5 (ghostscript/eplaser-3.1.3-705.tgz) = 036ce4658aee899f8412396736ad9fc9
MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b
MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b

6
print/ghostscript-gnu/files/chp2200.contrib.mak → print/ghostscript-gnu/files/cdj850.contrib.mak
View File

@ -1,5 +1,4 @@
### --------------- The H-P Buisiness Inkjet 2200 devices --------------- ###
###- cdj850 - HP 850 Driver under development -------- ###
cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
@ -17,9 +16,6 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
$(gsparam_h) $(gxlum_h) $(gdevpcl_h)
$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c

29
print/ghostscript-gnu/files/patch-eplaser:gdevescv.c
View File

@ -1,15 +1,28 @@
--- eplaser/gdevescv.c.orig Fri Jul 25 20:59:58 2003
+++ eplaser/gdevescv.c Tue Sep 9 22:03:50 2003
@@ -37,8 +37,6 @@
--- eplaser/gdevescv.c.orig Thu Oct 30 21:41:16 2003
+++ eplaser/gdevescv.c Thu Dec 18 17:51:49 2003
@@ -37,10 +37,6 @@
*/
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <string.h>
-
#include "math_.h"
@@ -321,6 +319,16 @@
#include "gx.h"
#include "gserrors.h"
@@ -62,6 +58,10 @@
#include "gspath.h"
#include "gzpath.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
/* ---------------- Device definition ---------------- */
/* Device procedures */
@@ -335,6 +335,16 @@
};
/* Vector device implementation */
@ -26,7 +39,7 @@
private int escv_beginpage(P1(gx_device_vector * vdev));
private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
@@ -329,10 +337,25 @@
@@ -343,10 +353,25 @@
private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
@ -52,7 +65,7 @@
private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
@@ -345,6 +368,7 @@
@@ -359,6 +384,7 @@
floatp x_start, floatp y_start, gx_path_type_t type));
private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));

29
print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c
View File

@ -1,15 +1,28 @@
--- eplaser/gdevesmv.c.orig Tue Aug 26 19:45:23 2003
+++ eplaser/gdevesmv.c Tue Sep 9 22:08:25 2003
@@ -34,8 +34,6 @@
--- eplaser/gdevesmv.c.orig Tue Oct 28 19:40:09 2003
+++ eplaser/gdevesmv.c Thu Dec 18 17:52:35 2003
@@ -34,10 +34,6 @@
*/
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <string.h>
-
#include "math_.h"
@@ -407,6 +405,16 @@
#include "gx.h"
#include "gserrors.h"
@@ -59,6 +55,10 @@
#include "gspath.h"
#include "gzpath.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
/* ---------------- Device definition ---------------- */
/* Device procedures */
@@ -428,6 +428,16 @@
/* Vector device implementation */
@ -26,7 +39,7 @@
private int esmv_beginpage(P1(gx_device_vector * vdev));
private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
@@ -415,10 +423,25 @@
@@ -436,10 +446,25 @@
private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
@ -52,7 +65,7 @@
private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
@@ -431,6 +454,7 @@
@@ -452,6 +477,7 @@
floatp x_start, floatp y_start, gx_path_type_t type));
private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));

155
print/ghostscript-gnu/files/patch-lib:gs_ttf.ps
View File

@ -1,5 +1,5 @@
--- lib/gs_ttf.ps.orig Sat Apr 12 23:02:38 2003
+++ lib/gs_ttf.ps Fri Jul 25 13:25:33 2003
+++ lib/gs_ttf.ps Sat Jan 10 00:51:05 2004
@@ -575,7 +575,7 @@
(maxp) 1 index
(name) 1 index
@ -31,13 +31,56 @@
} if
counttomark 0 ne { .dicttomark } { pop pop } ifelse
/XUID [orgXUID 42 curxuid]
@@ -1119,41 +1126,52 @@
@@ -1097,9 +1104,26 @@
% 4 2 Offset Coverage(--)
% 6 2 uint16 GlyphCount
% 8 2 GlyphID Substitute(vertically oriented glyphs)
-% -- 2 uint16 SubstFormat
-% +2 2 uint16 GlyphCount(same as above GlyphCount)
-% +4 2 GlyphID GlyphArray(horizontally oriented glyphs)
+%
+% [Coverage Format 1, Individual glyph indices]
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 uint16 CoverageFormat (Format identifier-format = 1)
+% 2 2 uint16 GlyphCount (same as above GlyphCount)
+% 4 2 GlyphID GlyphArray (horizontally oriented glyphs)
+%
+% [Coverage Format 2, Range of glyphs
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 uint16 CoverageFormat (Format identifier-format = 2)
+% 2 2 uint16 RangeCount
+% 4 2 struct RangeRecord[RangeCount]
+% [RangeRecord]
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 GlyphID First GlyphID in the range
+% 2 2 GlyphID Last GlyphID in the range
+% 4 2 uint16 Coverage Index of first GlpyhID in range
% -----------------------------------
% References
% 1. http://www.microsoft.com/typography/OTSPEC/gsub.htm
@@ -1110,50 +1134,101 @@
/gsubh2v null def
tabdict /GSUB .knownget { % if
dup /gsubver exch 0 getu32 def
- %dup /gsubosl exch 4 getu16 12 add def
- %dup /gsubofl exch 6 getu16 12 add def
- dup /gsuboll exch 8 getu16 12 add def
+ %dup /gsubosl exch 4 getu16 def
+ %dup /gsubofl exch 6 getu16 def
+ dup /gsuboll exch 8 getu16 def
DEBUG {
(gsubver: ) print gsubver =
%(gsubosl: ) print gsubosl =
%(gsubofl: ) print gsubofl =
(gsuboll: ) print gsuboll =
} if
- dup /gsubfmt exch gsuboll 0 add getu16 def
+ % /gsuboll should be pointed out the LookupList table, but not Lookup table.
+ % so this is wrong: dup /gsubfmt exch gsuboll 0 add getu16 def
+ % so this is wrong:
+ % dup /gsubfmt exch gsuboll 0 add getu16 def
+ dup /gsublc exch gsuboll 0 add getu16 def
DEBUG {
- (gsubfmt: ) print gsubfmt =
@ -55,7 +98,9 @@
+ gsublc 0 ne {
+ 0 1 gsublc 1 sub {
+ 2 mul /gsubolt exch 2 index exch gsuboll 2 add add getu16 gsuboll add def
+ dup /gsubfmt exch gsubolt 0 add getu16 def
+ dup /gsubltype exch gsubolt 0 add getu16 def
+ dup /gsublflag exch gsubolt 2 add getu16 def
+ dup /gsubsubc exch gsubolt 4 add getu16 def
DEBUG {
- (gsubocv: ) print gsubocv =
- (gsubglc: ) print gsubglc =
@ -66,8 +111,75 @@
- gsubhog exch getu16 =only
- (->) =only
- gsubvog exch getu16 =
- } for
+ (gsubfmt: ) print gsubfmt =
+ (gsubolt: ) print gsubolt =
+ (gsubltype: ) print gsubltype =
+ (gsublflag: ) print gsublflag =
+ (gsubsubc: ) print gsubsubc =
+ } if
+ gsubsubc 0 ne {
+ 0 1 gsubsubc 1 sub {
+ 2 mul /gsubost exch 2 index exch gsubolt 6 add add getu16 gsubolt add def
+ dup /substfmt exch gsubost 0 add getu16 def
+ DEBUG {
+ (gsubost: ) print gsubost =
+ (substfmt: ) print substfmt =
+ } if
+% gsubver 16#00010000 eq { % ifelse
+ gsubltype 1 eq substfmt 2 eq and { % ifelse
+ dup /gsubocv exch gsubost 2 add getu16 def
+ dup /gsubglc exch gsubost 4 add getu16 def
+ % hacked by suzuki toshiya at 2001/3/6
+ %dup /gsubvog exch gsubost 6 add gsubglc getinterval def
+ %dup /gsubhog exch gsubost gsubocv add 4 add gsubglc getinterval def
+ dup /gsubvog exch gsubost 6 add gsubglc 2 mul getinterval def
+ dup /cvfmt exch gsubost gsubocv add 0 add getu16 def
+ dup /cvglc exch gsubost gsubocv add 2 add getu16 def
+ dup /gsubhog exch gsubost gsubocv add 4 add cvglc 2 mul getinterval def
+ DEBUG {
+ (gsubocv: ) print gsubocv =
+ (gsubglc: ) print gsubglc =
+ (cvfmt: ) print cvfmt =
+
+ (gsubhog->gsubvog ) =
+ 0 2 gsubhog length 2 sub { % for
+ dup
+ gsubhog exch getu16 =only
+ (->) =only
+ gsubvog exch getu16 =
+ } for
+ } if
+ cvfmt 1 eq {
+ /gsubh2v << 0 2 gsubhog length 2 sub {
+ dup gsubhog exch getu16
+ exch gsubvog exch getu16
+ } for >> def
+ } {
+ cvfmt 2 eq {
+ /gsubh2v << 0 6 gsubhog length 6 sub {
+ dup 0 add /fgid exch gsubhog exch getu16 def
+ dup 2 add /lgid exch gsubhog exch getu16 def
+ 4 add /cvidx exch gsubhog exch getu16 def
+ DEBUG {
+ (fgid: ) print fgid =
+ (lgid: ) print lgid =
+ (cvidx: ) print cvidx =
+ } if
+ fgid 1 lgid {
+ dup cvidx add fgid sub
+ exch gsubvog exch getu16
+ } for
+ } for >> def
+ } {
+ %(UNKNWON COVERAGE FORMAT.) = flush
+ } ifelse
+ } ifelse
+ } {
+ %(UNKNOWN GSUB FORMAT.) = flush
+ } ifelse
+% } {
+% (ILLEGAL GSUB VERSION.) = flush
+% } ifelse
} for
} if
- /gsubh2v << 0 2 gsubhog length 2 sub {
- dup gsubhog exch getu16
@ -79,37 +191,6 @@
-% } {
-% (ILLEGAL GSUB VERSION.) = flush
-% } ifelse
+% gsubver 16#00010000 eq { % ifelse
+ gsubfmt 2 eq { % ifelse
+ dup /gsubocv exch gsubolt 2 add getu16 def
+ dup /gsubglc exch gsubolt 4 add getu16 def
+ % hacked by suzuki toshiya at 2001/3/6
+ %dup /gsubvog exch gsubolt 6 add gsubglc getinterval def
+ %dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc getinterval def
+ dup /gsubvog exch gsubolt 6 add gsubglc 2 mul getinterval def
+ dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc 2 mul getinterval def
+ DEBUG {
+ (gsubocv: ) print gsubocv =
+ (gsubglc: ) print gsubglc =
+
+ (gsubhog->gsubvog ) =
+ 0 2 gsubhog length 2 sub { % for
+ dup
+ gsubhog exch getu16 =only
+ (->) =only
+ gsubvog exch getu16 =
+ } for
+ } if
+ /gsubh2v << 0 2 gsubhog length 2 sub {
+ dup gsubhog exch getu16
+ exch gsubvog exch getu16
+ } for >> def
+ } {
+ %(UNKNOWN GSUB FORMAT.) = flush
+ } ifelse
+% } {
+% (ILLEGAL GSUB VERSION.) = flush
+% } ifelse
+ } for
+ } if
pop

12
print/ghostscript-gnu/files/patch-lips:gdevl4v.c
View File

@ -1,5 +1,5 @@
--- lips/gdevl4v.c.orig Thu Nov 2 12:09:18 2000
+++ lips/gdevl4v.c Fri Sep 12 10:11:25 2003
+++ lips/gdevl4v.c Wed Dec 10 19:42:42 2003
@@ -230,41 +230,66 @@
};
@ -33,7 +33,7 @@
+private int
+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+ floatp y, gx_path_type_t type);
+private int
private int
+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+ floatp y, gx_path_type_t type);
+private int
@ -42,7 +42,8 @@
+ gx_path_type_t type);
+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
+ floatp y_start, gx_path_type_t type);
+
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
+#else
+private int lips4v_beginpage(P1(gx_device_vector * vdev));
@ -56,9 +57,8 @@
+private int
+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
+ gs_logical_operation_t diff);
private int
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+private int
+
+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
private int
-lips4v_moveto(P6

10
print/ghostscript-gnu/files/patch-lips:gdevlips.mak
View File

@ -1,6 +1,6 @@
--- lips/gdevlips.mak.orig Thu Nov 2 12:12:13 2000
+++ lips/gdevlips.mak Fri Sep 12 09:34:24 2003
@@ -1,6 +1,8 @@
+++ lips/gdevlips.mak Sat Sep 27 22:16:20 2003
@@ -1,17 +1,19 @@
# ---------------- Laser Printer devices ---------------- #
# $Id: gdevlips.mak $
@ -8,8 +8,10 @@
+
$(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\
$(gdevprn_h) $(PDEVH)
$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
@@ -9,9 +11,9 @@
- $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
+ $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlprn.c
### --- The Canon LIPS II+/III/IVc/IV printer device --- ###
lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
$(GLOBJ)gdevl4r.$(OBJ): $(GLSRC)gdevl4r.c $(GLSRC)gdevlips.h $(PDEVH)

2
print/ghostscript-gnu/files/patch-src:unix-gcc.mak
View File

@ -93,7 +93,7 @@
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
-XCFLAGS=
+XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include
+XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)

22
print/ghostscript-gnu/pkg-plist
View File

@ -368,6 +368,11 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
share/ghostscript/fonts/COPYING
share/ghostscript/fonts/ChangeLog
share/ghostscript/fonts/README
share/ghostscript/fonts/README.tweaks
share/ghostscript/fonts/TODO
share/ghostscript/fonts/a010013l.afm
share/ghostscript/fonts/a010013l.pfb
share/ghostscript/fonts/a010013l.pfm
@ -402,19 +407,14 @@ share/ghostscript/fonts/bchri.afm
share/ghostscript/fonts/bchri.pfa
share/ghostscript/fonts/c059013l.afm
share/ghostscript/fonts/c059013l.pfb
share/ghostscript/fonts/c059013l.pfm
share/ghostscript/fonts/c059016l.afm
share/ghostscript/fonts/c059016l.pfb
share/ghostscript/fonts/c059016l.pfm
share/ghostscript/fonts/c059033l.afm
share/ghostscript/fonts/c059033l.pfb
share/ghostscript/fonts/c059033l.pfm
share/ghostscript/fonts/c059036l.afm
share/ghostscript/fonts/c059036l.pfb
share/ghostscript/fonts/c059036l.pfm
share/ghostscript/fonts/d050000l.afm
share/ghostscript/fonts/d050000l.pfb
share/ghostscript/fonts/d050000l.pfm
share/ghostscript/fonts/fcyr.afm
share/ghostscript/fonts/fcyr.gsf
share/ghostscript/fonts/fcyri.afm
@ -474,13 +474,10 @@ share/ghostscript/fonts/n019024l.pfb
share/ghostscript/fonts/n019024l.pfm
share/ghostscript/fonts/n019043l.afm
share/ghostscript/fonts/n019043l.pfb
share/ghostscript/fonts/n019043l.pfm
share/ghostscript/fonts/n019044l.afm
share/ghostscript/fonts/n019044l.pfb
share/ghostscript/fonts/n019044l.pfm
share/ghostscript/fonts/n019063l.afm
share/ghostscript/fonts/n019063l.pfb
share/ghostscript/fonts/n019063l.pfm
share/ghostscript/fonts/n019064l.afm
share/ghostscript/fonts/n019064l.pfb
share/ghostscript/fonts/n019064l.pfm
@ -498,35 +495,26 @@ share/ghostscript/fonts/n021024l.pfb
share/ghostscript/fonts/n021024l.pfm
share/ghostscript/fonts/n022003l.afm
share/ghostscript/fonts/n022003l.pfb
share/ghostscript/fonts/n022003l.pfm
share/ghostscript/fonts/n022004l.afm
share/ghostscript/fonts/n022004l.pfb
share/ghostscript/fonts/n022004l.pfm
share/ghostscript/fonts/n022023l.afm
share/ghostscript/fonts/n022023l.pfb
share/ghostscript/fonts/n022023l.pfm
share/ghostscript/fonts/n022024l.afm
share/ghostscript/fonts/n022024l.pfb
share/ghostscript/fonts/n022024l.pfm
share/ghostscript/fonts/p052003l.afm
share/ghostscript/fonts/p052003l.pfb
share/ghostscript/fonts/p052003l.pfm
share/ghostscript/fonts/p052004l.afm
share/ghostscript/fonts/p052004l.pfb
share/ghostscript/fonts/p052004l.pfm
share/ghostscript/fonts/p052023l.afm
share/ghostscript/fonts/p052023l.pfb
share/ghostscript/fonts/p052023l.pfm
share/ghostscript/fonts/p052024l.afm
share/ghostscript/fonts/p052024l.pfb
share/ghostscript/fonts/p052024l.pfm
share/ghostscript/fonts/putb.pfa
share/ghostscript/fonts/putbi.pfa
share/ghostscript/fonts/putr.pfa
share/ghostscript/fonts/putri.pfa
share/ghostscript/fonts/s050000l.afm
share/ghostscript/fonts/s050000l.pfb
share/ghostscript/fonts/s050000l.pfm
share/ghostscript/fonts/u003043t.afm
share/ghostscript/fonts/u003043t.gsf
share/ghostscript/fonts/u003043t.pfm

32
print/ghostscript-gnu/scripts/configure vendored
View File

@ -35,17 +35,19 @@ else
lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
epag \
escpage lp2000 \
alc8600 alc8500 alc2000 alc4000 alc1900 \
lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
epl6100 epl5900 epl5800 epl2050 epl2050p epl2120 epl2750 \
lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 \
lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 \
lp9600 lp8600 lp1800 \
alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \
lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \
lp8200c lp8000c \
epl6100 epl5900 epl5800 \
epl2050 epl2050p epl2120 epl2500 epl2750 \
lp9000b lp2500 lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 \
lp8900 lp8700 lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 \
lp9600s lp9300 lp9600 lp8600 lp1800 \
lq850 epsonc \
mjc180 mjc360 mjc720 mj500c \
st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \
djet500c cdjcolor cdjmono cdj500 cdj550 \
cdj670 cdj850 cdj880 cdj890 cdj1600 chp2200 cdj970 \
cdj670 cdj850 cdj880 cdj890 cdj1600 cdj970 \
laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
cljet5 cljet5c cljet5pr lj5mono lj5gray \
pj pjetxl pjxl paintjet \
@ -160,6 +162,8 @@ Have fun with this new configuration style ! -andreas \n\n\
"alc2000" "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
"alc4000" "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
"alc1900" "Epson AL-C1900 color laser printer [EPLASER]" "$status_alc1900" \
"alc4100" "Epson AL-C4100 color laser printer [EPLASER]" "$status_alc4100" \
"lp9000c" "Epson LP-9000C color laser printer [EPLASER]" "$status_lp9000c" \
"lp9500c" "Epson LP-9500C color laser printer [EPLASER]" "$status_lp9500c" \
"lp8800c" "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \
"lp8300c" "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \
@ -173,7 +177,10 @@ Have fun with this new configuration style ! -andreas \n\n\
"epl2050" "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \
"epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \
"epl2120" "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \
"epl2500" "Epson EPL-N2500 laser printer [EPLASER]" "$status_epl2500" \
"epl2750" "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \
"lp9000b" "Epson LP-9000B laser printer [EPLASER]" "$status_lp9000b" \
"lp2500" "Epson LP-2500 laser printer [EPLASER]" "$status_lp2500" \
"lp9100" "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \
"lp7900" "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \
"lp7500" "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \
@ -212,12 +219,11 @@ Have fun with this new configuration style ! -andreas \n\n\
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \
"cdj500" "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \
"cdj550" "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \
"cdj670" "HP DeskJet 670/690 [HP2200]" "$status_cdj670" \
"cdj850" "HP DeskJet 850/855/870/1100 [HP2200]" "$status_cdj850" \
"cdj880" "HP DeskJet 880 [HP2200]" "$status_cdj880" \
"cdj890" "HP DeskJet 890 [HP2200]" "$status_cdj890" \
"cdj1600" "HP DeskJet 1600 [HP2200]" "$status_cdj1600" \
"chp2200" "HP Buisiness Inkjet 2200 [HP2200]" "$status_chp2200" \
"cdj670" "HP DeskJet 670/690 [HP8XX]" "$status_cdj670" \
"cdj850" "HP DeskJet 850/855/870/1100 [HP8XX]" "$status_cdj850" \
"cdj880" "HP DeskJet 880 [HP8XX]" "$status_cdj880" \
"cdj890" "HP DeskJet 890 [HP8XX]" "$status_cdj890" \
"cdj1600" "HP DeskJet 1600 [HP8XX]" "$status_cdj1600" \
"cdj970" "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \
"laserjet" "HP LaserJet" "$status_laserjet" \
"ljetplus" "HP LaserJet Plus" "$status_ljetplus" \

57
print/ghostscript7/Makefile
View File

@ -7,11 +7,10 @@
PORTNAME= ghostscript
PORTVERSION= ${GS_VERSION}
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \
${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
http://hp.sourceforge.net/:hp2200 \
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
http://www.harsch.net/Download/:dj970 \
http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/:md2k \
@ -23,9 +22,9 @@ MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \
http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
http://www.linuxprinting.org/download/printing/:lxm3200 \
http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:gs_fonts \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERSION:S/.//}/:gs_srcs
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,ports_jp_gs \
gimp-print/:gprint \
bjc250gs/:bjc250 \
./:ports_jp
@ -33,7 +32,7 @@ PKGNAMESUFFIX= -gnu
DISTFILES= ${GS_SRCS}:gs_srcs \
${GS_FONTS_STD}:gs_fonts \
${GS_FONTS_OTHER}:gs_fonts \
${HP2200_SRCS}:hp2200 \
${HP8XX_SRCS}:hp8xx \
${HPDJ_SRCS}:hpdj_pcl3 \
${PCL3_SRCS}:hpdj_pcl3 \
${DJ970_SRCS}:dj970 \
@ -52,7 +51,6 @@ DISTFILES= ${GS_SRCS}:gs_srcs \
${LXM3200_SRCS}:lxm3200 \
${LX5000_SRCS}:lx5000 \
${LEX7000_SRCS}:lx5000
DIST_SUBDIR= ghostscript
EXTRACT_ONLY= ${GS_SRCS}
@ -116,19 +114,15 @@ PLIST_SUB+= SHLIB="@comment "
.endif
GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
# 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
# unless the files really change.
GS_FONTS_STD= gnu-gs-fonts-std-6.0.tar.gz
GS_FONTS_OTHER= gnu-gs-fonts-other-6.0.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-8.11.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-6.0.tar.gz
# Additional Drivers:
# HP2200 - additional driver for HP DeskJet 8xx and Business Inkjet 2200
# http://hp.sourceforge.net/gs-hp2200.php
HP2200= hp2200
HP2200_SRCS= gs-hp2200.tar.gz
# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
# http://www.gelhaus.net/hp880c/
HP8XX= cdj880
HP8XX_SRCS= gdevcd8.tar.gz
# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser
# still present, just for the case pcl3 is missing some hpdj feature
@ -222,9 +216,9 @@ EPAG_NAME= ${EPAG}-${EPAG_VERS}
EPAG_SRCS= ${EPAG_NAME}.tar.gz
# EPLASER - additional driver for ESC/Page printers (Epson Kowa developed)
# http://www.epkowa.co.jp/linux/lpd.html
# http://www.epkowa.co.jp/english/linux_e/index.html
EPLASER= eplaser
EPLASER_VERS= 3.1.1
EPLASER_VERS= 3.1.3
EPLASER_NAME= ${EPLASER}-${EPLASER_VERS}
EPLASER_SRCS= ${EPLASER_NAME}-705.tgz
@ -272,14 +266,12 @@ pre-everything::
post-extract:
${ECHO_MSG} ">>> in post-extract ..."
# ** 3rd party driver **
# Note: don't forget to add those devices in scripts/configure and
# configure.batch, which update unix-gcc.mak to build gs with these
# new devices !
# Note: don't forget to add those devices in scripts/configure,
# which update unix-gcc.mak to build gs with these new devices !
#
# for HP2200 driver
${ECHO_MSG} ">>> extracting ${HP2200_SRCS} ..."
${MKDIR} ${WRKSRC}/${HP2200}
${TAR} -C ${WRKSRC}/${HP2200} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP2200_SRCS}
# for HP8XX driver
${ECHO_MSG} ">>> extracting ${HP8XX_SRCS} ..."
${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
# for HPDJ driver
${ECHO_MSG} ">>> extracting ${HPDJ_SRCS} ..."
${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS}
@ -369,9 +361,9 @@ post-patch:
# advantage: you see unmodified makefiles after a pure make extract
pre-configure:
${ECHO_MSG} ">>> in pre-configure ..."
# for HP2200 driver
${ECHO_MSG} ">>> adding ${HP2200} driver to contrib.mak ..."
${CAT} ${FILESDIR}/chp2200.contrib.mak \
# for HP8XX driver
${ECHO_MSG} ">>> adding ${HP8XX} driver to contrib.mak ..."
${CAT} ${FILESDIR}/cdj850.contrib.mak \
>> ${WRKSRC}/src/contrib.mak
# for HPDJ driver
${ECHO_MSG} ">>> adding ${HPDJ} driver to contrib.mak ..."
@ -461,11 +453,6 @@ pre-build:
${ECHO_MSG} ">>> creating directories for compilation ..."
${MKDIR} ${WRKSRC}/obj
${MKDIR} ${WRKSRC}/bin
# for HP2200 driver
${ECHO_MSG} ">>> creating symlinks for ${HP2200} ..."
.for i in gdevcd8.c
${LN} -sf ${WRKSRC}/${HP2200}/${i} ${WRKSRC}/src
.endfor
# for Gimp-Print driver
${ECHO_MSG} ">>> building ${GPRINT} library ..."
cd ${WRKSRC}/${GPRINT_NAME} ; \

8
print/ghostscript7/distinfo
View File

@ -1,7 +1,7 @@
MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
@ -14,7 +14,7 @@ MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
MD5 (ghostscript/eplaser-3.1.1-705.tgz) = 3b984ec8c3d2f161b569783f4884fdea
MD5 (ghostscript/eplaser-3.1.3-705.tgz) = 036ce4658aee899f8412396736ad9fc9
MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b
MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b

6
print/ghostscript7/files/chp2200.contrib.mak → print/ghostscript7/files/cdj850.contrib.mak
View File

@ -1,5 +1,4 @@
### --------------- The H-P Buisiness Inkjet 2200 devices --------------- ###
###- cdj850 - HP 850 Driver under development -------- ###
cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
@ -17,9 +16,6 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
$(gsparam_h) $(gxlum_h) $(gdevpcl_h)
$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c

29
print/ghostscript7/files/patch-eplaser:gdevescv.c
View File

@ -1,15 +1,28 @@
--- eplaser/gdevescv.c.orig Fri Jul 25 20:59:58 2003
+++ eplaser/gdevescv.c Tue Sep 9 22:03:50 2003
@@ -37,8 +37,6 @@
--- eplaser/gdevescv.c.orig Thu Oct 30 21:41:16 2003
+++ eplaser/gdevescv.c Thu Dec 18 17:51:49 2003
@@ -37,10 +37,6 @@
*/
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <string.h>
-
#include "math_.h"
@@ -321,6 +319,16 @@
#include "gx.h"
#include "gserrors.h"
@@ -62,6 +58,10 @@
#include "gspath.h"
#include "gzpath.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
/* ---------------- Device definition ---------------- */
/* Device procedures */
@@ -335,6 +335,16 @@
};
/* Vector device implementation */
@ -26,7 +39,7 @@
private int escv_beginpage(P1(gx_device_vector * vdev));
private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
@@ -329,10 +337,25 @@
@@ -343,10 +353,25 @@
private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
@ -52,7 +65,7 @@
private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
@@ -345,6 +368,7 @@
@@ -359,6 +384,7 @@
floatp x_start, floatp y_start, gx_path_type_t type));
private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));

29
print/ghostscript7/files/patch-eplaser:gdevesmv.c
View File

@ -1,15 +1,28 @@
--- eplaser/gdevesmv.c.orig Tue Aug 26 19:45:23 2003
+++ eplaser/gdevesmv.c Tue Sep 9 22:08:25 2003
@@ -34,8 +34,6 @@
--- eplaser/gdevesmv.c.orig Tue Oct 28 19:40:09 2003
+++ eplaser/gdevesmv.c Thu Dec 18 17:52:35 2003
@@ -34,10 +34,6 @@
*/
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <string.h>
-
#include "math_.h"
@@ -407,6 +405,16 @@
#include "gx.h"
#include "gserrors.h"
@@ -59,6 +55,10 @@
#include "gspath.h"
#include "gzpath.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
/* ---------------- Device definition ---------------- */
/* Device procedures */
@@ -428,6 +428,16 @@
/* Vector device implementation */
@ -26,7 +39,7 @@
private int esmv_beginpage(P1(gx_device_vector * vdev));
private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
@@ -415,10 +423,25 @@
@@ -436,10 +446,25 @@
private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
@ -52,7 +65,7 @@
private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
@@ -431,6 +454,7 @@
@@ -452,6 +477,7 @@
floatp x_start, floatp y_start, gx_path_type_t type));
private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));

155
print/ghostscript7/files/patch-lib:gs_ttf.ps
View File

@ -1,5 +1,5 @@
--- lib/gs_ttf.ps.orig Sat Apr 12 23:02:38 2003
+++ lib/gs_ttf.ps Fri Jul 25 13:25:33 2003
+++ lib/gs_ttf.ps Sat Jan 10 00:51:05 2004
@@ -575,7 +575,7 @@
(maxp) 1 index
(name) 1 index
@ -31,13 +31,56 @@
} if
counttomark 0 ne { .dicttomark } { pop pop } ifelse
/XUID [orgXUID 42 curxuid]
@@ -1119,41 +1126,52 @@
@@ -1097,9 +1104,26 @@
% 4 2 Offset Coverage(--)
% 6 2 uint16 GlyphCount
% 8 2 GlyphID Substitute(vertically oriented glyphs)
-% -- 2 uint16 SubstFormat
-% +2 2 uint16 GlyphCount(same as above GlyphCount)
-% +4 2 GlyphID GlyphArray(horizontally oriented glyphs)
+%
+% [Coverage Format 1, Individual glyph indices]
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 uint16 CoverageFormat (Format identifier-format = 1)
+% 2 2 uint16 GlyphCount (same as above GlyphCount)
+% 4 2 GlyphID GlyphArray (horizontally oriented glyphs)
+%
+% [Coverage Format 2, Range of glyphs
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 uint16 CoverageFormat (Format identifier-format = 2)
+% 2 2 uint16 RangeCount
+% 4 2 struct RangeRecord[RangeCount]
+% [RangeRecord]
+% Index Size Type Name of Entry
+% -----------------------------------
+% 0 2 GlyphID First GlyphID in the range
+% 2 2 GlyphID Last GlyphID in the range
+% 4 2 uint16 Coverage Index of first GlpyhID in range
% -----------------------------------
% References
% 1. http://www.microsoft.com/typography/OTSPEC/gsub.htm
@@ -1110,50 +1134,101 @@
/gsubh2v null def
tabdict /GSUB .knownget { % if
dup /gsubver exch 0 getu32 def
- %dup /gsubosl exch 4 getu16 12 add def
- %dup /gsubofl exch 6 getu16 12 add def
- dup /gsuboll exch 8 getu16 12 add def
+ %dup /gsubosl exch 4 getu16 def
+ %dup /gsubofl exch 6 getu16 def
+ dup /gsuboll exch 8 getu16 def
DEBUG {
(gsubver: ) print gsubver =
%(gsubosl: ) print gsubosl =
%(gsubofl: ) print gsubofl =
(gsuboll: ) print gsuboll =
} if
- dup /gsubfmt exch gsuboll 0 add getu16 def
+ % /gsuboll should be pointed out the LookupList table, but not Lookup table.
+ % so this is wrong: dup /gsubfmt exch gsuboll 0 add getu16 def
+ % so this is wrong:
+ % dup /gsubfmt exch gsuboll 0 add getu16 def
+ dup /gsublc exch gsuboll 0 add getu16 def
DEBUG {
- (gsubfmt: ) print gsubfmt =
@ -55,7 +98,9 @@
+ gsublc 0 ne {
+ 0 1 gsublc 1 sub {
+ 2 mul /gsubolt exch 2 index exch gsuboll 2 add add getu16 gsuboll add def
+ dup /gsubfmt exch gsubolt 0 add getu16 def
+ dup /gsubltype exch gsubolt 0 add getu16 def
+ dup /gsublflag exch gsubolt 2 add getu16 def
+ dup /gsubsubc exch gsubolt 4 add getu16 def
DEBUG {
- (gsubocv: ) print gsubocv =
- (gsubglc: ) print gsubglc =
@ -66,8 +111,75 @@
- gsubhog exch getu16 =only
- (->) =only
- gsubvog exch getu16 =
- } for
+ (gsubfmt: ) print gsubfmt =
+ (gsubolt: ) print gsubolt =
+ (gsubltype: ) print gsubltype =
+ (gsublflag: ) print gsublflag =
+ (gsubsubc: ) print gsubsubc =
+ } if
+ gsubsubc 0 ne {
+ 0 1 gsubsubc 1 sub {
+ 2 mul /gsubost exch 2 index exch gsubolt 6 add add getu16 gsubolt add def
+ dup /substfmt exch gsubost 0 add getu16 def
+ DEBUG {
+ (gsubost: ) print gsubost =
+ (substfmt: ) print substfmt =
+ } if
+% gsubver 16#00010000 eq { % ifelse
+ gsubltype 1 eq substfmt 2 eq and { % ifelse
+ dup /gsubocv exch gsubost 2 add getu16 def
+ dup /gsubglc exch gsubost 4 add getu16 def
+ % hacked by suzuki toshiya at 2001/3/6
+ %dup /gsubvog exch gsubost 6 add gsubglc getinterval def
+ %dup /gsubhog exch gsubost gsubocv add 4 add gsubglc getinterval def
+ dup /gsubvog exch gsubost 6 add gsubglc 2 mul getinterval def
+ dup /cvfmt exch gsubost gsubocv add 0 add getu16 def
+ dup /cvglc exch gsubost gsubocv add 2 add getu16 def
+ dup /gsubhog exch gsubost gsubocv add 4 add cvglc 2 mul getinterval def
+ DEBUG {
+ (gsubocv: ) print gsubocv =
+ (gsubglc: ) print gsubglc =
+ (cvfmt: ) print cvfmt =
+
+ (gsubhog->gsubvog ) =
+ 0 2 gsubhog length 2 sub { % for
+ dup
+ gsubhog exch getu16 =only
+ (->) =only
+ gsubvog exch getu16 =
+ } for
+ } if
+ cvfmt 1 eq {
+ /gsubh2v << 0 2 gsubhog length 2 sub {
+ dup gsubhog exch getu16
+ exch gsubvog exch getu16
+ } for >> def
+ } {
+ cvfmt 2 eq {
+ /gsubh2v << 0 6 gsubhog length 6 sub {
+ dup 0 add /fgid exch gsubhog exch getu16 def
+ dup 2 add /lgid exch gsubhog exch getu16 def
+ 4 add /cvidx exch gsubhog exch getu16 def
+ DEBUG {
+ (fgid: ) print fgid =
+ (lgid: ) print lgid =
+ (cvidx: ) print cvidx =
+ } if
+ fgid 1 lgid {
+ dup cvidx add fgid sub
+ exch gsubvog exch getu16
+ } for
+ } for >> def
+ } {
+ %(UNKNWON COVERAGE FORMAT.) = flush
+ } ifelse
+ } ifelse
+ } {
+ %(UNKNOWN GSUB FORMAT.) = flush
+ } ifelse
+% } {
+% (ILLEGAL GSUB VERSION.) = flush
+% } ifelse
} for
} if
- /gsubh2v << 0 2 gsubhog length 2 sub {
- dup gsubhog exch getu16
@ -79,37 +191,6 @@
-% } {
-% (ILLEGAL GSUB VERSION.) = flush
-% } ifelse
+% gsubver 16#00010000 eq { % ifelse
+ gsubfmt 2 eq { % ifelse
+ dup /gsubocv exch gsubolt 2 add getu16 def
+ dup /gsubglc exch gsubolt 4 add getu16 def
+ % hacked by suzuki toshiya at 2001/3/6
+ %dup /gsubvog exch gsubolt 6 add gsubglc getinterval def
+ %dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc getinterval def
+ dup /gsubvog exch gsubolt 6 add gsubglc 2 mul getinterval def
+ dup /gsubhog exch gsubolt gsubocv add 4 add gsubglc 2 mul getinterval def
+ DEBUG {
+ (gsubocv: ) print gsubocv =
+ (gsubglc: ) print gsubglc =
+
+ (gsubhog->gsubvog ) =
+ 0 2 gsubhog length 2 sub { % for
+ dup
+ gsubhog exch getu16 =only
+ (->) =only
+ gsubvog exch getu16 =
+ } for
+ } if
+ /gsubh2v << 0 2 gsubhog length 2 sub {
+ dup gsubhog exch getu16
+ exch gsubvog exch getu16
+ } for >> def
+ } {
+ %(UNKNOWN GSUB FORMAT.) = flush
+ } ifelse
+% } {
+% (ILLEGAL GSUB VERSION.) = flush
+% } ifelse
+ } for
+ } if
pop

12
print/ghostscript7/files/patch-lips:gdevl4v.c
View File

@ -1,5 +1,5 @@
--- lips/gdevl4v.c.orig Thu Nov 2 12:09:18 2000
+++ lips/gdevl4v.c Fri Sep 12 10:11:25 2003
+++ lips/gdevl4v.c Wed Dec 10 19:42:42 2003
@@ -230,41 +230,66 @@
};
@ -33,7 +33,7 @@
+private int
+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+ floatp y, gx_path_type_t type);
+private int
private int
+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
+ floatp y, gx_path_type_t type);
+private int
@ -42,7 +42,8 @@
+ gx_path_type_t type);
+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
+ floatp y_start, gx_path_type_t type);
+
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
+#else
+private int lips4v_beginpage(P1(gx_device_vector * vdev));
@ -56,9 +57,8 @@
+private int
+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
+ gs_logical_operation_t diff);
private int
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+private int
+
+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
private int
-lips4v_moveto(P6

10
print/ghostscript7/files/patch-lips:gdevlips.mak
View File

@ -1,6 +1,6 @@
--- lips/gdevlips.mak.orig Thu Nov 2 12:12:13 2000
+++ lips/gdevlips.mak Fri Sep 12 09:34:24 2003
@@ -1,6 +1,8 @@
+++ lips/gdevlips.mak Sat Sep 27 22:16:20 2003
@@ -1,17 +1,19 @@
# ---------------- Laser Printer devices ---------------- #
# $Id: gdevlips.mak $
@ -8,8 +8,10 @@
+
$(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\
$(gdevprn_h) $(PDEVH)
$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
@@ -9,9 +11,9 @@
- $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
+ $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlprn.c
### --- The Canon LIPS II+/III/IVc/IV printer device --- ###
lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
$(GLOBJ)gdevl4r.$(OBJ): $(GLSRC)gdevl4r.c $(GLSRC)gdevlips.h $(PDEVH)

2
print/ghostscript7/files/patch-src:unix-gcc.mak
View File

@ -93,7 +93,7 @@
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
-XCFLAGS=
+XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include
+XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)

22
print/ghostscript7/pkg-plist
View File

@ -368,6 +368,11 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
share/ghostscript/fonts/COPYING
share/ghostscript/fonts/ChangeLog
share/ghostscript/fonts/README
share/ghostscript/fonts/README.tweaks
share/ghostscript/fonts/TODO
share/ghostscript/fonts/a010013l.afm
share/ghostscript/fonts/a010013l.pfb
share/ghostscript/fonts/a010013l.pfm
@ -402,19 +407,14 @@ share/ghostscript/fonts/bchri.afm
share/ghostscript/fonts/bchri.pfa
share/ghostscript/fonts/c059013l.afm
share/ghostscript/fonts/c059013l.pfb
share/ghostscript/fonts/c059013l.pfm
share/ghostscript/fonts/c059016l.afm
share/ghostscript/fonts/c059016l.pfb
share/ghostscript/fonts/c059016l.pfm
share/ghostscript/fonts/c059033l.afm
share/ghostscript/fonts/c059033l.pfb
share/ghostscript/fonts/c059033l.pfm
share/ghostscript/fonts/c059036l.afm
share/ghostscript/fonts/c059036l.pfb
share/ghostscript/fonts/c059036l.pfm
share/ghostscript/fonts/d050000l.afm
share/ghostscript/fonts/d050000l.pfb
share/ghostscript/fonts/d050000l.pfm
share/ghostscript/fonts/fcyr.afm
share/ghostscript/fonts/fcyr.gsf
share/ghostscript/fonts/fcyri.afm
@ -474,13 +474,10 @@ share/ghostscript/fonts/n019024l.pfb
share/ghostscript/fonts/n019024l.pfm
share/ghostscript/fonts/n019043l.afm
share/ghostscript/fonts/n019043l.pfb
share/ghostscript/fonts/n019043l.pfm
share/ghostscript/fonts/n019044l.afm
share/ghostscript/fonts/n019044l.pfb
share/ghostscript/fonts/n019044l.pfm
share/ghostscript/fonts/n019063l.afm
share/ghostscript/fonts/n019063l.pfb
share/ghostscript/fonts/n019063l.pfm
share/ghostscript/fonts/n019064l.afm
share/ghostscript/fonts/n019064l.pfb
share/ghostscript/fonts/n019064l.pfm
@ -498,35 +495,26 @@ share/ghostscript/fonts/n021024l.pfb
share/ghostscript/fonts/n021024l.pfm
share/ghostscript/fonts/n022003l.afm
share/ghostscript/fonts/n022003l.pfb
share/ghostscript/fonts/n022003l.pfm
share/ghostscript/fonts/n022004l.afm
share/ghostscript/fonts/n022004l.pfb
share/ghostscript/fonts/n022004l.pfm
share/ghostscript/fonts/n022023l.afm
share/ghostscript/fonts/n022023l.pfb
share/ghostscript/fonts/n022023l.pfm
share/ghostscript/fonts/n022024l.afm
share/ghostscript/fonts/n022024l.pfb
share/ghostscript/fonts/n022024l.pfm
share/ghostscript/fonts/p052003l.afm
share/ghostscript/fonts/p052003l.pfb
share/ghostscript/fonts/p052003l.pfm
share/ghostscript/fonts/p052004l.afm
share/ghostscript/fonts/p052004l.pfb
share/ghostscript/fonts/p052004l.pfm
share/ghostscript/fonts/p052023l.afm
share/ghostscript/fonts/p052023l.pfb
share/ghostscript/fonts/p052023l.pfm
share/ghostscript/fonts/p052024l.afm
share/ghostscript/fonts/p052024l.pfb
share/ghostscript/fonts/p052024l.pfm
share/ghostscript/fonts/putb.pfa
share/ghostscript/fonts/putbi.pfa
share/ghostscript/fonts/putr.pfa
share/ghostscript/fonts/putri.pfa
share/ghostscript/fonts/s050000l.afm
share/ghostscript/fonts/s050000l.pfb
share/ghostscript/fonts/s050000l.pfm
share/ghostscript/fonts/u003043t.afm
share/ghostscript/fonts/u003043t.gsf
share/ghostscript/fonts/u003043t.pfm

32
print/ghostscript7/scripts/configure vendored
View File

@ -35,17 +35,19 @@ else
lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
epag \
escpage lp2000 \
alc8600 alc8500 alc2000 alc4000 alc1900 \
lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \
epl6100 epl5900 epl5800 epl2050 epl2050p epl2120 epl2750 \
lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 \
lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 \
lp9600 lp8600 lp1800 \
alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \
lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \
lp8200c lp8000c \
epl6100 epl5900 epl5800 \
epl2050 epl2050p epl2120 epl2500 epl2750 \
lp9000b lp2500 lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 \
lp8900 lp8700 lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 \
lp9600s lp9300 lp9600 lp8600 lp1800 \
lq850 epsonc \
mjc180 mjc360 mjc720 mj500c \
st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \
djet500c cdjcolor cdjmono cdj500 cdj550 \
cdj670 cdj850 cdj880 cdj890 cdj1600 chp2200 cdj970 \
cdj670 cdj850 cdj880 cdj890 cdj1600 cdj970 \
laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
cljet5 cljet5c cljet5pr lj5mono lj5gray \
pj pjetxl pjxl paintjet \
@ -160,6 +162,8 @@ Have fun with this new configuration style ! -andreas \n\n\
"alc2000" "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
"alc4000" "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
"alc1900" "Epson AL-C1900 color laser printer [EPLASER]" "$status_alc1900" \
"alc4100" "Epson AL-C4100 color laser printer [EPLASER]" "$status_alc4100" \
"lp9000c" "Epson LP-9000C color laser printer [EPLASER]" "$status_lp9000c" \
"lp9500c" "Epson LP-9500C color laser printer [EPLASER]" "$status_lp9500c" \
"lp8800c" "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \
"lp8300c" "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \
@ -173,7 +177,10 @@ Have fun with this new configuration style ! -andreas \n\n\
"epl2050" "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \
"epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \
"epl2120" "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \
"epl2500" "Epson EPL-N2500 laser printer [EPLASER]" "$status_epl2500" \
"epl2750" "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \
"lp9000b" "Epson LP-9000B laser printer [EPLASER]" "$status_lp9000b" \
"lp2500" "Epson LP-2500 laser printer [EPLASER]" "$status_lp2500" \
"lp9100" "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \
"lp7900" "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \
"lp7500" "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \
@ -212,12 +219,11 @@ Have fun with this new configuration style ! -andreas \n\n\
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \
"cdj500" "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \
"cdj550" "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \
"cdj670" "HP DeskJet 670/690 [HP2200]" "$status_cdj670" \
"cdj850" "HP DeskJet 850/855/870/1100 [HP2200]" "$status_cdj850" \
"cdj880" "HP DeskJet 880 [HP2200]" "$status_cdj880" \
"cdj890" "HP DeskJet 890 [HP2200]" "$status_cdj890" \
"cdj1600" "HP DeskJet 1600 [HP2200]" "$status_cdj1600" \
"chp2200" "HP Buisiness Inkjet 2200 [HP2200]" "$status_chp2200" \
"cdj670" "HP DeskJet 670/690 [HP8XX]" "$status_cdj670" \
"cdj850" "HP DeskJet 850/855/870/1100 [HP8XX]" "$status_cdj850" \
"cdj880" "HP DeskJet 880 [HP8XX]" "$status_cdj880" \
"cdj890" "HP DeskJet 890 [HP8XX]" "$status_cdj890" \
"cdj1600" "HP DeskJet 1600 [HP8XX]" "$status_cdj1600" \
"cdj970" "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \
"laserjet" "HP LaserJet" "$status_laserjet" \
"ljetplus" "HP LaserJet Plus" "$status_ljetplus" \