summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/ghostscript-afpl/Makefile16
-rw-r--r--print/ghostscript-afpl/distinfo4
-rw-r--r--print/ghostscript-afpl/files/patch-eplaser:gdevescv.c18
-rw-r--r--print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c18
-rw-r--r--print/ghostscript-afpl/files/patch-lib:ps2epsi27
-rw-r--r--print/ghostscript-afpl/files/patch-lib:ps2epsi.ps202
-rw-r--r--print/ghostscript-afpl/files/patch-src:dviprlib.c20
-rw-r--r--print/ghostscript-afpl/scripts/configure2
-rw-r--r--print/ghostscript-afpl/scripts/configure.batch2
-rw-r--r--print/ghostscript-gpl/Makefile16
-rw-r--r--print/ghostscript-gpl/distinfo4
-rw-r--r--print/ghostscript-gpl/files/patch-eplaser:gdevescv.c18
-rw-r--r--print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c18
-rw-r--r--print/ghostscript-gpl/files/patch-lib:ps2epsi27
-rw-r--r--print/ghostscript-gpl/files/patch-lib:ps2epsi.ps202
-rw-r--r--print/ghostscript-gpl/files/patch-src:dviprlib.c20
-rw-r--r--print/ghostscript-gpl/scripts/configure2
-rw-r--r--print/ghostscript-gpl/scripts/configure.batch2
-rw-r--r--print/ghostscript8/Makefile16
-rw-r--r--print/ghostscript8/distinfo4
-rw-r--r--print/ghostscript8/files/patch-eplaser:gdevescv.c18
-rw-r--r--print/ghostscript8/files/patch-eplaser:gdevesmv.c18
-rw-r--r--print/ghostscript8/files/patch-lib:ps2epsi27
-rw-r--r--print/ghostscript8/files/patch-lib:ps2epsi.ps202
-rw-r--r--print/ghostscript8/files/patch-src:dviprlib.c20
-rw-r--r--print/ghostscript8/scripts/configure2
-rw-r--r--print/ghostscript8/scripts/configure.batch2
27 files changed, 804 insertions, 123 deletions
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index a0eb64d0821c..3f6fbcbef645 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,9 +7,9 @@
PORTNAME= ghostscript
PORTVERSION= 7.04
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
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 \
@@ -20,16 +20,15 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
- ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/ \
- ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
MASTER_SITE_SUBDIR= ${PORTNAME} \
gimp-print/:gprint \
hpinkjet/:hpijs \
ghostscript/:ports_jp
PKGNAMESUFFIX= -afpl
DISTFILES= ${GS_SRCS}:DEFAULT \
- ${GS_FONTS_STD}:DEFAULT \
- ${GS_FONTS_OTHER}:DEFAULT \
+ ${GS_FONTS_STD}:fonts \
+ ${GS_FONTS_OTHER}:fonts \
${HP8XX_SRCS}:hp8xx \
${HPDJ_SRCS}:hpdj_pcl3 \
${PCL3_SRCS}:hpdj_pcl3 \
@@ -144,7 +143,7 @@ DJ970_SRCS= ${DJ970}.c.gz
# Gimp-Print - very high quality driver for Epson, HPs,...
# http://gimp-print.sourceforge.net/
GPRINT= gimp-print
-GPRINT_VERS= 4.2.0
+GPRINT_VERS= 4.2.1
GPRINT_NAME= ${GPRINT}-${GPRINT_VERS}
GPRINT_SRCS= ${GPRINT_NAME}.tar.gz
@@ -396,8 +395,7 @@ post-configure:
${ECHO_MSG} ">>> running configure script for ${GPRINT} library ..."
cd ${WRKSRC}/${GPRINT_NAME} ; \
${SETENV} ${MAKE_ENV} ${SH} ./configure \
- --without-cups --without-translated-ppds \
- --with-ghost --without-foomatic \
+ --without-translated-ppds --with-ghost \
--without-gimp --without-samples \
--without-user-guide --disable-escputil \
--disable-nls --disable-shared \
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 87d4256f3518..f70ed92e0624 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -4,8 +4,8 @@ MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1
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) = f09ef883b8ba837fb42c608c01af7375
-MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
+MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
+MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
index b1b6fc57f0c0..dbc3f4a109a9 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001
-+++ eplaser/gdevescv.c Fri Mar 15 04:27:39 2002
-@@ -1760,13 +1760,13 @@
++++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002
+@@ -37,8 +37,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1760,13 +1759,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1784,7 @@
+@@ -1784,7 +1783,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1922,13 +1922,13 @@
+@@ -1922,13 +1921,13 @@
private int
diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
index 8764eb63292f..bce92ff8358c 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001
-+++ eplaser/gdevesmv.c Fri Mar 15 04:28:41 2002
-@@ -1799,13 +1799,13 @@
++++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002
+@@ -34,8 +34,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1799,13 +1798,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1823,7 @@
+@@ -1823,7 +1822,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1980,13 +1980,13 @@
+@@ -1980,13 +1979,13 @@
private int
diff --git a/print/ghostscript-afpl/files/patch-lib:ps2epsi b/print/ghostscript-afpl/files/patch-lib:ps2epsi
new file mode 100644
index 000000000000..06389642bb93
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib:ps2epsi
@@ -0,0 +1,27 @@
+--- lib/ps2epsi.orig Sat Jun 23 01:09:22 2001
++++ lib/ps2epsi Tue Apr 23 05:18:24 2002
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: ps2epsi,v 1.7 2001/06/22 16:09:22 lpd Exp $
++# $Id: ps2epsi,v 1.7.2.1 2002/04/22 20:18:24 giles Exp $
+
+ tmpfile=/tmp/ps2epsi$$
+
+@@ -58,7 +58,8 @@
+ cat << BEGINEPS
+ save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+ %%EndProlog
+-%%Page 1 1
++%%Page: 1 1
++%%BeginDocument: ${infile}
+ BEGINEPS
+
+ cat "${infile}" |
+@@ -66,6 +67,7 @@
+ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
+
+ cat << ENDEPS
++%%EndDocument
+ %%Trailer
+ cleartomark countdictstack exch sub { end } repeat restore
+ %%EOF
diff --git a/print/ghostscript-afpl/files/patch-lib:ps2epsi.ps b/print/ghostscript-afpl/files/patch-lib:ps2epsi.ps
index 8e150354428c..19ccc7d0b022 100644
--- a/print/ghostscript-afpl/files/patch-lib:ps2epsi.ps
+++ b/print/ghostscript-afpl/files/patch-lib:ps2epsi.ps
@@ -1,11 +1,203 @@
---- lib/ps2epsi.ps.orig Tue Jun 5 15:31:41 2001
-+++ lib/ps2epsi.ps Sat Apr 20 15:57:44 2002
-@@ -52,7 +52,7 @@
+--- lib/ps2epsi.ps.orig Wed Apr 4 13:45:42 2001
++++ lib/ps2epsi.ps Tue Apr 23 05:30:39 2002
+@@ -1,27 +1,31 @@
+-% Copyright (C) 1990, 2000 Aladdin Enterprises. All rights reserved.
++% Copyright (C) 1990-2002 artofcode LLC. All rights reserved.
+ %
+-% This file is part of AFPL Ghostscript.
++% This software is provided AS-IS with no warranty, either express or
++% implied.
+ %
+-% AFPL Ghostscript is distributed with NO WARRANTY OF ANY KIND. No author or
+-% distributor accepts any responsibility for the consequences of using it, or
+-% for whether it serves any particular purpose or works at all, unless he or
+-% she says so in writing. Refer to the Aladdin Free Public License (the
+-% "License") for full details.
++% This software is distributed under license and may not be copied,
++% modified or distributed except as expressly authorized under the terms
++% of the license contained in the file LICENSE in this distribution.
+ %
+-% Every copy of AFPL Ghostscript must include a copy of the License, normally
+-% in a plain ASCII text file named PUBLIC. The License grants you the right
+-% to copy, modify and redistribute AFPL Ghostscript, but only under certain
+-% conditions described in the License. Among other things, the License
+-% requires that the copyright notice and this notice be preserved on all
+-% copies.
++% For more information about licensing, please refer to
++% http://www.ghostscript.com/licensing/. For information on
++% commercial licensing, go to http://www.artifex.com/licensing/ or
++% contact Artifex Software, Inc., 101 Lucas Valley Road #110,
++% San Rafael, CA 94903, U.S.A., +1(415)492-9861.
+
+-% $Id: ps2epsi.ps,v 1.5 2001/04/04 04:45:42 alexcher Exp $
++% $Id: ps2epsi.ps,v 1.5.2.3 2002/04/22 20:30:39 giles Exp $
+ % Convert an arbitrary PostScript file to an EPSI file.
+ %
+ % Please do not contact these users if you have questions. They no longer
+ % have the time, interest, or current expertise to keep this code working.
+ % If you find bugs, please send proposed fixes to bug-gs@aladdin.com.
+ %
++% Bug fix 2002-04-20 by rayjj: Bounding box was incorrect since it depended
++% on the dither pattern and gray shade at the boundary. Changed to use
++% 8-bit grayscale preview image to allow correct bounding box (at the
++% expense of a 8x larger preview image). Also moved .setsafe until after
++% the device and file operations are complete (but still before the input
++% file is processed.
+ % Bug fix 2000-04-11 by lpd: if a font didn't have a FontName (which is the
+ % case for bitmap fonts produced by recent versions of dvips), setfont
+ % caused an error.
+@@ -51,7 +55,6 @@
/ps2epsi
{ % Open the file
outfile (w) file /epsifile exch def
- //systemdict /.setsafe known { .setsafe } if
-+% //systemdict /.setsafe known { .setsafe } if
% Get the device parameters
- currentdevice getdeviceprops .dicttomark
+ currentdevice getdeviceprops .dicttomark
/HWSize get aload pop
+@@ -59,17 +62,23 @@
+ /devwidth exch def
+ matrix defaultmatrix
+ /devmatrix exch def
+- % Make a corresponding memory device
+- devmatrix devwidth devheight <ff 00>
++ % Make a corresponding 8-bit deep memory device
++ devmatrix devwidth devheight
++ 256 string 0 1 255 { 1 index exch dup 255 exch sub put } for
+ makeimagedevice
+ /arraydevice exch def
+- arraydevice setdevice % (does an erasepage)
+- /rowwidth devwidth 7 add 8 idiv def
++ arraydevice
++ % Turn on anti-aliasing
++ mark /TextAlphaBits 4 /GraphicsAlphaBits 4 6 -1 roll
++ putdeviceprops
++ setdevice % (does an erasepage)
++ /rowwidth devwidth def
+ /row rowwidth string def
+ /zerorow rowwidth string def % all zero
+ % Replace the definition of showpage
+ userdict /showpage { ps2edict begin epsipage end } bind put
+ userdict /setfont { ps2edict begin epsisetfont end } bind put
++ //systemdict /.setsafe known { .setsafe } if
+ } bind def
+
+ /epsifontdict 100 dict def
+@@ -125,8 +134,8 @@
+
+ % Initialise limit variables
+ /loopcount rowwidth 1 sub def
+- /lm loopcount def /lmb 0 def
+- /rm 0 def /rmb 0 def
++ /lm loopcount def
++ /rm 0 def
+
+ % Find left and right boundaries of image
+ tm 1 bm
+@@ -135,47 +144,29 @@
+ % Scan from left to find first non-zero element
+ % We save first the element, then the index
+ -1 0 1 loopcount
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exch pop exit }{ pop } ifelse
+ } for
+ % If we found -1, row is blank ..
+ dup -1 ne
+ { % Find the leftmost index
+ dup lm lt
+ % If the new index is less, we save index and element
+- { /lm exch def /lmb exch def }
+- % If the index is equal, we or the bits together
+- { lm eq { lmb or /lmb exch def }{ pop } ifelse
+- } ifelse
++ { /lm exch def } { pop } ifelse
+ % Now find the rightmost index
+ loopcount -1 0
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exit }{ pop } ifelse
+ } for
+ dup rm gt
+ % If the new index is greater, we save index and element
+- { /rm exch def /rmb exch def }
+- % If the index is equal, or the bits
+- { rm eq { rmb or /rmb exch def } { pop } ifelse
+- } ifelse
++ { /rm exch def } { pop } ifelse
+ } if
+- pop
+ } for
+
+- % Now we find the real left & right bit positions
+- 256 0 1 7
+- { exch 2 div dup lmb le { pop exit }{ exch pop } ifelse
+- } for
+- /lmb exch def
+-
+- 1 7 -1 0
+- { exch dup dup rmb and eq { pop exit }{ 2 mul exch pop } ifelse
+- } for
+- /rmb exch def
+-
+ % Calculate the bounding box values.
+ % Note that these must be corrected to produce closed-open intervals.
+- /llx lm 8 mul lmb add def
++ /llx lm def
+ /lly devheight bm sub 1 sub def
+- /urx rm 8 mul rmb add 1 add def
++ /urx rm 1 add def
+ /ury devheight tm sub def
+
+ % Write out the magic string and bounding box information
+@@ -206,38 +197,31 @@
+ epsifile lly write==only epsifile ( ) writestring
+ epsifile urx write==only epsifile ( ) writestring
+ epsifile ury write==
+- epsifile (%%BeginPreview: ) writestring
+- epsifile urx llx sub write==only epsifile ( ) writestring
+- epsifile bm tm sub 1 add write==only epsifile ( 1 ) writestring
+- epsifile bm tm sub 1 add write==
+- epsifile flushfile
+
+ % Define character and bit widths for the output line buffer:
+ /cwidth rm lm sub 1 add def
+- /bwidth cwidth 8 mul def
+- /owidth urx llx sub 7 add 8 idiv def
+ /out cwidth string def
+
+- % Create a 1-bit-high device for bitblt to align with the bbox
+- gsave
+- matrix cwidth 8 mul 1 <00 ff> makeimagedevice setdevice
++ epsifile (%%BeginPreview: ) writestring
++ epsifile cwidth write==only epsifile ( ) writestring
++ epsifile bm tm sub 1 add write==only epsifile ( 8 ) writestring
++ epsifile bm tm sub 1 add
++ cwidth 39 add 40 idiv mul write==
++ epsifile flushfile
+
+- % 'image' a zero string to clear the line device
+- bwidth 1 1 matrix cwidth string image
++ gsave
+
+ tm 1 bm
+ { % Get a scan line interval from the array device
+ arraydevice exch row copyscanlines lm cwidth getinterval
+- lmb 0 gt
+- { % 'image' it into the line device with the lmb offset
+- bwidth 1 1 [1 0 0 1 lmb 0] 5 -1 roll image
+- % Now we get the modified scan line
+- currentdevice 0 out copyscanlines 0 owidth getinterval
+- } if
+- % Write out the hex data
+- epsifile (% ) writestring
+- epsifile exch writehexstring
+- epsifile (\n) writestring
++ % Write out the hex data as 40 bytes per line (82 chars)
++ 0 40 cwidth
++ { epsifile (% ) writestring
++ epsifile exch 2 index exch
++ dup cwidth exch sub 40 .min getinterval writehexstring
++ epsifile (\n) writestring
++ } for
++ pop
+ } for
+
+ epsifile (%%EndImage\n) writestring
diff --git a/print/ghostscript-afpl/files/patch-src:dviprlib.c b/print/ghostscript-afpl/files/patch-src:dviprlib.c
index 1fc25e484764..67662665f273 100644
--- a/print/ghostscript-afpl/files/patch-src:dviprlib.c
+++ b/print/ghostscript-afpl/files/patch-src:dviprlib.c
@@ -1,23 +1,13 @@
---- src/dviprlib.c.orig Tue May 13 00:14:09 1997
-+++ src/dviprlib.c Thu Apr 4 03:18:57 2002
-@@ -1433,7 +1433,8 @@
+--- src/dviprlib.c.orig Tue May 13 16:14:09 1997
++++ src/dviprlib.c Mon Apr 22 23:02:58 2002
+@@ -1433,7 +1433,9 @@
char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
-private FILE *dviprt_messagestream = stderr;
+private FILE *dviprt_messagestream;
-+private int dviprt_messagestream_init;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
/*--- library functions ---*/
int
-@@ -1505,6 +1506,10 @@
- liblocal int
- dviprt_printmessage(char *str,int len)
- {
-+ if (!dviprt_messagestream_init) {
-+ dviprt_messagestream = stderr;
-+ dviprt_messagestream_init = 1;
-+ }
- if (dviprt_messagestream && str) {
- if (len >= 0) fwrite(str,len,1,dviprt_messagestream);
- else fputs(str,dviprt_messagestream);
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index d38894e6e079..4a2a196840d2 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -129,7 +129,7 @@ Have fun with this new configuration style ! -andreas \n\n\
"pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
"pcl3" "HP PCL 3+ (generic) [PCL3]" ON \
"hpdj" "HP PCL 3+ (old drv.) [HPDJ]" ON \
- "ijs" "HP PhotoSmart/DeskJet series [HPinkjet]" ON \
+ "ijs" "HP Inkjet and other raster devices" ON \
"ibmpro" "IBM 9-pin Proprinter" OFF \
"jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
"imagen" "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index 4e842efde165..720d16a198ab 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -10,7 +10,7 @@ ifndef WITHOUT_X11
DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
endif
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
!EOT
# create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index a0eb64d0821c..3f6fbcbef645 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,9 +7,9 @@
PORTNAME= ghostscript
PORTVERSION= 7.04
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
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 \
@@ -20,16 +20,15 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
- ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/ \
- ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
MASTER_SITE_SUBDIR= ${PORTNAME} \
gimp-print/:gprint \
hpinkjet/:hpijs \
ghostscript/:ports_jp
PKGNAMESUFFIX= -afpl
DISTFILES= ${GS_SRCS}:DEFAULT \
- ${GS_FONTS_STD}:DEFAULT \
- ${GS_FONTS_OTHER}:DEFAULT \
+ ${GS_FONTS_STD}:fonts \
+ ${GS_FONTS_OTHER}:fonts \
${HP8XX_SRCS}:hp8xx \
${HPDJ_SRCS}:hpdj_pcl3 \
${PCL3_SRCS}:hpdj_pcl3 \
@@ -144,7 +143,7 @@ DJ970_SRCS= ${DJ970}.c.gz
# Gimp-Print - very high quality driver for Epson, HPs,...
# http://gimp-print.sourceforge.net/
GPRINT= gimp-print
-GPRINT_VERS= 4.2.0
+GPRINT_VERS= 4.2.1
GPRINT_NAME= ${GPRINT}-${GPRINT_VERS}
GPRINT_SRCS= ${GPRINT_NAME}.tar.gz
@@ -396,8 +395,7 @@ post-configure:
${ECHO_MSG} ">>> running configure script for ${GPRINT} library ..."
cd ${WRKSRC}/${GPRINT_NAME} ; \
${SETENV} ${MAKE_ENV} ${SH} ./configure \
- --without-cups --without-translated-ppds \
- --with-ghost --without-foomatic \
+ --without-translated-ppds --with-ghost \
--without-gimp --without-samples \
--without-user-guide --disable-escputil \
--disable-nls --disable-shared \
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 87d4256f3518..f70ed92e0624 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -4,8 +4,8 @@ MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1
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) = f09ef883b8ba837fb42c608c01af7375
-MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
+MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
+MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
index b1b6fc57f0c0..dbc3f4a109a9 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001
-+++ eplaser/gdevescv.c Fri Mar 15 04:27:39 2002
-@@ -1760,13 +1760,13 @@
++++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002
+@@ -37,8 +37,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1760,13 +1759,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1784,7 @@
+@@ -1784,7 +1783,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1922,13 +1922,13 @@
+@@ -1922,13 +1921,13 @@
private int
diff --git a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
index 8764eb63292f..bce92ff8358c 100644
--- a/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001
-+++ eplaser/gdevesmv.c Fri Mar 15 04:28:41 2002
-@@ -1799,13 +1799,13 @@
++++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002
+@@ -34,8 +34,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1799,13 +1798,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1823,7 @@
+@@ -1823,7 +1822,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1980,13 +1980,13 @@
+@@ -1980,13 +1979,13 @@
private int
diff --git a/print/ghostscript-gpl/files/patch-lib:ps2epsi b/print/ghostscript-gpl/files/patch-lib:ps2epsi
new file mode 100644
index 000000000000..06389642bb93
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib:ps2epsi
@@ -0,0 +1,27 @@
+--- lib/ps2epsi.orig Sat Jun 23 01:09:22 2001
++++ lib/ps2epsi Tue Apr 23 05:18:24 2002
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: ps2epsi,v 1.7 2001/06/22 16:09:22 lpd Exp $
++# $Id: ps2epsi,v 1.7.2.1 2002/04/22 20:18:24 giles Exp $
+
+ tmpfile=/tmp/ps2epsi$$
+
+@@ -58,7 +58,8 @@
+ cat << BEGINEPS
+ save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+ %%EndProlog
+-%%Page 1 1
++%%Page: 1 1
++%%BeginDocument: ${infile}
+ BEGINEPS
+
+ cat "${infile}" |
+@@ -66,6 +67,7 @@
+ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
+
+ cat << ENDEPS
++%%EndDocument
+ %%Trailer
+ cleartomark countdictstack exch sub { end } repeat restore
+ %%EOF
diff --git a/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps b/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps
index 8e150354428c..19ccc7d0b022 100644
--- a/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps
+++ b/print/ghostscript-gpl/files/patch-lib:ps2epsi.ps
@@ -1,11 +1,203 @@
---- lib/ps2epsi.ps.orig Tue Jun 5 15:31:41 2001
-+++ lib/ps2epsi.ps Sat Apr 20 15:57:44 2002
-@@ -52,7 +52,7 @@
+--- lib/ps2epsi.ps.orig Wed Apr 4 13:45:42 2001
++++ lib/ps2epsi.ps Tue Apr 23 05:30:39 2002
+@@ -1,27 +1,31 @@
+-% Copyright (C) 1990, 2000 Aladdin Enterprises. All rights reserved.
++% Copyright (C) 1990-2002 artofcode LLC. All rights reserved.
+ %
+-% This file is part of AFPL Ghostscript.
++% This software is provided AS-IS with no warranty, either express or
++% implied.
+ %
+-% AFPL Ghostscript is distributed with NO WARRANTY OF ANY KIND. No author or
+-% distributor accepts any responsibility for the consequences of using it, or
+-% for whether it serves any particular purpose or works at all, unless he or
+-% she says so in writing. Refer to the Aladdin Free Public License (the
+-% "License") for full details.
++% This software is distributed under license and may not be copied,
++% modified or distributed except as expressly authorized under the terms
++% of the license contained in the file LICENSE in this distribution.
+ %
+-% Every copy of AFPL Ghostscript must include a copy of the License, normally
+-% in a plain ASCII text file named PUBLIC. The License grants you the right
+-% to copy, modify and redistribute AFPL Ghostscript, but only under certain
+-% conditions described in the License. Among other things, the License
+-% requires that the copyright notice and this notice be preserved on all
+-% copies.
++% For more information about licensing, please refer to
++% http://www.ghostscript.com/licensing/. For information on
++% commercial licensing, go to http://www.artifex.com/licensing/ or
++% contact Artifex Software, Inc., 101 Lucas Valley Road #110,
++% San Rafael, CA 94903, U.S.A., +1(415)492-9861.
+
+-% $Id: ps2epsi.ps,v 1.5 2001/04/04 04:45:42 alexcher Exp $
++% $Id: ps2epsi.ps,v 1.5.2.3 2002/04/22 20:30:39 giles Exp $
+ % Convert an arbitrary PostScript file to an EPSI file.
+ %
+ % Please do not contact these users if you have questions. They no longer
+ % have the time, interest, or current expertise to keep this code working.
+ % If you find bugs, please send proposed fixes to bug-gs@aladdin.com.
+ %
++% Bug fix 2002-04-20 by rayjj: Bounding box was incorrect since it depended
++% on the dither pattern and gray shade at the boundary. Changed to use
++% 8-bit grayscale preview image to allow correct bounding box (at the
++% expense of a 8x larger preview image). Also moved .setsafe until after
++% the device and file operations are complete (but still before the input
++% file is processed.
+ % Bug fix 2000-04-11 by lpd: if a font didn't have a FontName (which is the
+ % case for bitmap fonts produced by recent versions of dvips), setfont
+ % caused an error.
+@@ -51,7 +55,6 @@
/ps2epsi
{ % Open the file
outfile (w) file /epsifile exch def
- //systemdict /.setsafe known { .setsafe } if
-+% //systemdict /.setsafe known { .setsafe } if
% Get the device parameters
- currentdevice getdeviceprops .dicttomark
+ currentdevice getdeviceprops .dicttomark
/HWSize get aload pop
+@@ -59,17 +62,23 @@
+ /devwidth exch def
+ matrix defaultmatrix
+ /devmatrix exch def
+- % Make a corresponding memory device
+- devmatrix devwidth devheight <ff 00>
++ % Make a corresponding 8-bit deep memory device
++ devmatrix devwidth devheight
++ 256 string 0 1 255 { 1 index exch dup 255 exch sub put } for
+ makeimagedevice
+ /arraydevice exch def
+- arraydevice setdevice % (does an erasepage)
+- /rowwidth devwidth 7 add 8 idiv def
++ arraydevice
++ % Turn on anti-aliasing
++ mark /TextAlphaBits 4 /GraphicsAlphaBits 4 6 -1 roll
++ putdeviceprops
++ setdevice % (does an erasepage)
++ /rowwidth devwidth def
+ /row rowwidth string def
+ /zerorow rowwidth string def % all zero
+ % Replace the definition of showpage
+ userdict /showpage { ps2edict begin epsipage end } bind put
+ userdict /setfont { ps2edict begin epsisetfont end } bind put
++ //systemdict /.setsafe known { .setsafe } if
+ } bind def
+
+ /epsifontdict 100 dict def
+@@ -125,8 +134,8 @@
+
+ % Initialise limit variables
+ /loopcount rowwidth 1 sub def
+- /lm loopcount def /lmb 0 def
+- /rm 0 def /rmb 0 def
++ /lm loopcount def
++ /rm 0 def
+
+ % Find left and right boundaries of image
+ tm 1 bm
+@@ -135,47 +144,29 @@
+ % Scan from left to find first non-zero element
+ % We save first the element, then the index
+ -1 0 1 loopcount
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exch pop exit }{ pop } ifelse
+ } for
+ % If we found -1, row is blank ..
+ dup -1 ne
+ { % Find the leftmost index
+ dup lm lt
+ % If the new index is less, we save index and element
+- { /lm exch def /lmb exch def }
+- % If the index is equal, we or the bits together
+- { lm eq { lmb or /lmb exch def }{ pop } ifelse
+- } ifelse
++ { /lm exch def } { pop } ifelse
+ % Now find the rightmost index
+ loopcount -1 0
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exit }{ pop } ifelse
+ } for
+ dup rm gt
+ % If the new index is greater, we save index and element
+- { /rm exch def /rmb exch def }
+- % If the index is equal, or the bits
+- { rm eq { rmb or /rmb exch def } { pop } ifelse
+- } ifelse
++ { /rm exch def } { pop } ifelse
+ } if
+- pop
+ } for
+
+- % Now we find the real left & right bit positions
+- 256 0 1 7
+- { exch 2 div dup lmb le { pop exit }{ exch pop } ifelse
+- } for
+- /lmb exch def
+-
+- 1 7 -1 0
+- { exch dup dup rmb and eq { pop exit }{ 2 mul exch pop } ifelse
+- } for
+- /rmb exch def
+-
+ % Calculate the bounding box values.
+ % Note that these must be corrected to produce closed-open intervals.
+- /llx lm 8 mul lmb add def
++ /llx lm def
+ /lly devheight bm sub 1 sub def
+- /urx rm 8 mul rmb add 1 add def
++ /urx rm 1 add def
+ /ury devheight tm sub def
+
+ % Write out the magic string and bounding box information
+@@ -206,38 +197,31 @@
+ epsifile lly write==only epsifile ( ) writestring
+ epsifile urx write==only epsifile ( ) writestring
+ epsifile ury write==
+- epsifile (%%BeginPreview: ) writestring
+- epsifile urx llx sub write==only epsifile ( ) writestring
+- epsifile bm tm sub 1 add write==only epsifile ( 1 ) writestring
+- epsifile bm tm sub 1 add write==
+- epsifile flushfile
+
+ % Define character and bit widths for the output line buffer:
+ /cwidth rm lm sub 1 add def
+- /bwidth cwidth 8 mul def
+- /owidth urx llx sub 7 add 8 idiv def
+ /out cwidth string def
+
+- % Create a 1-bit-high device for bitblt to align with the bbox
+- gsave
+- matrix cwidth 8 mul 1 <00 ff> makeimagedevice setdevice
++ epsifile (%%BeginPreview: ) writestring
++ epsifile cwidth write==only epsifile ( ) writestring
++ epsifile bm tm sub 1 add write==only epsifile ( 8 ) writestring
++ epsifile bm tm sub 1 add
++ cwidth 39 add 40 idiv mul write==
++ epsifile flushfile
+
+- % 'image' a zero string to clear the line device
+- bwidth 1 1 matrix cwidth string image
++ gsave
+
+ tm 1 bm
+ { % Get a scan line interval from the array device
+ arraydevice exch row copyscanlines lm cwidth getinterval
+- lmb 0 gt
+- { % 'image' it into the line device with the lmb offset
+- bwidth 1 1 [1 0 0 1 lmb 0] 5 -1 roll image
+- % Now we get the modified scan line
+- currentdevice 0 out copyscanlines 0 owidth getinterval
+- } if
+- % Write out the hex data
+- epsifile (% ) writestring
+- epsifile exch writehexstring
+- epsifile (\n) writestring
++ % Write out the hex data as 40 bytes per line (82 chars)
++ 0 40 cwidth
++ { epsifile (% ) writestring
++ epsifile exch 2 index exch
++ dup cwidth exch sub 40 .min getinterval writehexstring
++ epsifile (\n) writestring
++ } for
++ pop
+ } for
+
+ epsifile (%%EndImage\n) writestring
diff --git a/print/ghostscript-gpl/files/patch-src:dviprlib.c b/print/ghostscript-gpl/files/patch-src:dviprlib.c
index 1fc25e484764..67662665f273 100644
--- a/print/ghostscript-gpl/files/patch-src:dviprlib.c
+++ b/print/ghostscript-gpl/files/patch-src:dviprlib.c
@@ -1,23 +1,13 @@
---- src/dviprlib.c.orig Tue May 13 00:14:09 1997
-+++ src/dviprlib.c Thu Apr 4 03:18:57 2002
-@@ -1433,7 +1433,8 @@
+--- src/dviprlib.c.orig Tue May 13 16:14:09 1997
++++ src/dviprlib.c Mon Apr 22 23:02:58 2002
+@@ -1433,7 +1433,9 @@
char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
-private FILE *dviprt_messagestream = stderr;
+private FILE *dviprt_messagestream;
-+private int dviprt_messagestream_init;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
/*--- library functions ---*/
int
-@@ -1505,6 +1506,10 @@
- liblocal int
- dviprt_printmessage(char *str,int len)
- {
-+ if (!dviprt_messagestream_init) {
-+ dviprt_messagestream = stderr;
-+ dviprt_messagestream_init = 1;
-+ }
- if (dviprt_messagestream && str) {
- if (len >= 0) fwrite(str,len,1,dviprt_messagestream);
- else fputs(str,dviprt_messagestream);
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index d38894e6e079..4a2a196840d2 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -129,7 +129,7 @@ Have fun with this new configuration style ! -andreas \n\n\
"pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
"pcl3" "HP PCL 3+ (generic) [PCL3]" ON \
"hpdj" "HP PCL 3+ (old drv.) [HPDJ]" ON \
- "ijs" "HP PhotoSmart/DeskJet series [HPinkjet]" ON \
+ "ijs" "HP Inkjet and other raster devices" ON \
"ibmpro" "IBM 9-pin Proprinter" OFF \
"jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
"imagen" "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 4e842efde165..720d16a198ab 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -10,7 +10,7 @@ ifndef WITHOUT_X11
DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
endif
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
!EOT
# create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index a0eb64d0821c..3f6fbcbef645 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,9 +7,9 @@
PORTNAME= ghostscript
PORTVERSION= 7.04
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
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 \
@@ -20,16 +20,15 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
- ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/ \
- ftp://gatekeeper.dec.com/pub/GNU/ghostscript/:gatekeeper
+ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
MASTER_SITE_SUBDIR= ${PORTNAME} \
gimp-print/:gprint \
hpinkjet/:hpijs \
ghostscript/:ports_jp
PKGNAMESUFFIX= -afpl
DISTFILES= ${GS_SRCS}:DEFAULT \
- ${GS_FONTS_STD}:DEFAULT \
- ${GS_FONTS_OTHER}:DEFAULT \
+ ${GS_FONTS_STD}:fonts \
+ ${GS_FONTS_OTHER}:fonts \
${HP8XX_SRCS}:hp8xx \
${HPDJ_SRCS}:hpdj_pcl3 \
${PCL3_SRCS}:hpdj_pcl3 \
@@ -144,7 +143,7 @@ DJ970_SRCS= ${DJ970}.c.gz
# Gimp-Print - very high quality driver for Epson, HPs,...
# http://gimp-print.sourceforge.net/
GPRINT= gimp-print
-GPRINT_VERS= 4.2.0
+GPRINT_VERS= 4.2.1
GPRINT_NAME= ${GPRINT}-${GPRINT_VERS}
GPRINT_SRCS= ${GPRINT_NAME}.tar.gz
@@ -396,8 +395,7 @@ post-configure:
${ECHO_MSG} ">>> running configure script for ${GPRINT} library ..."
cd ${WRKSRC}/${GPRINT_NAME} ; \
${SETENV} ${MAKE_ENV} ${SH} ./configure \
- --without-cups --without-translated-ppds \
- --with-ghost --without-foomatic \
+ --without-translated-ppds --with-ghost \
--without-gimp --without-samples \
--without-user-guide --disable-escputil \
--disable-nls --disable-shared \
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 87d4256f3518..f70ed92e0624 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -4,8 +4,8 @@ MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1
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) = f09ef883b8ba837fb42c608c01af7375
-MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
+MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
+MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript8/files/patch-eplaser:gdevescv.c b/print/ghostscript8/files/patch-eplaser:gdevescv.c
index b1b6fc57f0c0..dbc3f4a109a9 100644
--- a/print/ghostscript8/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript8/files/patch-eplaser:gdevescv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001
-+++ eplaser/gdevescv.c Fri Mar 15 04:27:39 2002
-@@ -1760,13 +1760,13 @@
++++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002
+@@ -37,8 +37,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1760,13 +1759,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1784,7 @@
+@@ -1784,7 +1783,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1922,13 +1922,13 @@
+@@ -1922,13 +1921,13 @@
private int
diff --git a/print/ghostscript8/files/patch-eplaser:gdevesmv.c b/print/ghostscript8/files/patch-eplaser:gdevesmv.c
index 8764eb63292f..bce92ff8358c 100644
--- a/print/ghostscript8/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript8/files/patch-eplaser:gdevesmv.c
@@ -1,6 +1,16 @@
--- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001
-+++ eplaser/gdevesmv.c Fri Mar 15 04:28:41 2002
-@@ -1799,13 +1799,13 @@
++++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002
+@@ -34,8 +34,7 @@
+
+ */
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+
+ #include "math_.h"
+ #include "gx.h"
+@@ -1799,13 +1798,13 @@
/* Process the next piece of an image. */
private int
@@ -16,7 +26,7 @@
gx_device *dev = info->dev;
#endif
gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1823,7 @@
+@@ -1823,7 +1822,7 @@
{
@@ -25,7 +35,7 @@
if (height == 260)
height = 1;
#endif
-@@ -1980,13 +1980,13 @@
+@@ -1980,13 +1979,13 @@
private int
diff --git a/print/ghostscript8/files/patch-lib:ps2epsi b/print/ghostscript8/files/patch-lib:ps2epsi
new file mode 100644
index 000000000000..06389642bb93
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib:ps2epsi
@@ -0,0 +1,27 @@
+--- lib/ps2epsi.orig Sat Jun 23 01:09:22 2001
++++ lib/ps2epsi Tue Apr 23 05:18:24 2002
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: ps2epsi,v 1.7 2001/06/22 16:09:22 lpd Exp $
++# $Id: ps2epsi,v 1.7.2.1 2002/04/22 20:18:24 giles Exp $
+
+ tmpfile=/tmp/ps2epsi$$
+
+@@ -58,7 +58,8 @@
+ cat << BEGINEPS
+ save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+ %%EndProlog
+-%%Page 1 1
++%%Page: 1 1
++%%BeginDocument: ${infile}
+ BEGINEPS
+
+ cat "${infile}" |
+@@ -66,6 +67,7 @@
+ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
+
+ cat << ENDEPS
++%%EndDocument
+ %%Trailer
+ cleartomark countdictstack exch sub { end } repeat restore
+ %%EOF
diff --git a/print/ghostscript8/files/patch-lib:ps2epsi.ps b/print/ghostscript8/files/patch-lib:ps2epsi.ps
index 8e150354428c..19ccc7d0b022 100644
--- a/print/ghostscript8/files/patch-lib:ps2epsi.ps
+++ b/print/ghostscript8/files/patch-lib:ps2epsi.ps
@@ -1,11 +1,203 @@
---- lib/ps2epsi.ps.orig Tue Jun 5 15:31:41 2001
-+++ lib/ps2epsi.ps Sat Apr 20 15:57:44 2002
-@@ -52,7 +52,7 @@
+--- lib/ps2epsi.ps.orig Wed Apr 4 13:45:42 2001
++++ lib/ps2epsi.ps Tue Apr 23 05:30:39 2002
+@@ -1,27 +1,31 @@
+-% Copyright (C) 1990, 2000 Aladdin Enterprises. All rights reserved.
++% Copyright (C) 1990-2002 artofcode LLC. All rights reserved.
+ %
+-% This file is part of AFPL Ghostscript.
++% This software is provided AS-IS with no warranty, either express or
++% implied.
+ %
+-% AFPL Ghostscript is distributed with NO WARRANTY OF ANY KIND. No author or
+-% distributor accepts any responsibility for the consequences of using it, or
+-% for whether it serves any particular purpose or works at all, unless he or
+-% she says so in writing. Refer to the Aladdin Free Public License (the
+-% "License") for full details.
++% This software is distributed under license and may not be copied,
++% modified or distributed except as expressly authorized under the terms
++% of the license contained in the file LICENSE in this distribution.
+ %
+-% Every copy of AFPL Ghostscript must include a copy of the License, normally
+-% in a plain ASCII text file named PUBLIC. The License grants you the right
+-% to copy, modify and redistribute AFPL Ghostscript, but only under certain
+-% conditions described in the License. Among other things, the License
+-% requires that the copyright notice and this notice be preserved on all
+-% copies.
++% For more information about licensing, please refer to
++% http://www.ghostscript.com/licensing/. For information on
++% commercial licensing, go to http://www.artifex.com/licensing/ or
++% contact Artifex Software, Inc., 101 Lucas Valley Road #110,
++% San Rafael, CA 94903, U.S.A., +1(415)492-9861.
+
+-% $Id: ps2epsi.ps,v 1.5 2001/04/04 04:45:42 alexcher Exp $
++% $Id: ps2epsi.ps,v 1.5.2.3 2002/04/22 20:30:39 giles Exp $
+ % Convert an arbitrary PostScript file to an EPSI file.
+ %
+ % Please do not contact these users if you have questions. They no longer
+ % have the time, interest, or current expertise to keep this code working.
+ % If you find bugs, please send proposed fixes to bug-gs@aladdin.com.
+ %
++% Bug fix 2002-04-20 by rayjj: Bounding box was incorrect since it depended
++% on the dither pattern and gray shade at the boundary. Changed to use
++% 8-bit grayscale preview image to allow correct bounding box (at the
++% expense of a 8x larger preview image). Also moved .setsafe until after
++% the device and file operations are complete (but still before the input
++% file is processed.
+ % Bug fix 2000-04-11 by lpd: if a font didn't have a FontName (which is the
+ % case for bitmap fonts produced by recent versions of dvips), setfont
+ % caused an error.
+@@ -51,7 +55,6 @@
/ps2epsi
{ % Open the file
outfile (w) file /epsifile exch def
- //systemdict /.setsafe known { .setsafe } if
-+% //systemdict /.setsafe known { .setsafe } if
% Get the device parameters
- currentdevice getdeviceprops .dicttomark
+ currentdevice getdeviceprops .dicttomark
/HWSize get aload pop
+@@ -59,17 +62,23 @@
+ /devwidth exch def
+ matrix defaultmatrix
+ /devmatrix exch def
+- % Make a corresponding memory device
+- devmatrix devwidth devheight <ff 00>
++ % Make a corresponding 8-bit deep memory device
++ devmatrix devwidth devheight
++ 256 string 0 1 255 { 1 index exch dup 255 exch sub put } for
+ makeimagedevice
+ /arraydevice exch def
+- arraydevice setdevice % (does an erasepage)
+- /rowwidth devwidth 7 add 8 idiv def
++ arraydevice
++ % Turn on anti-aliasing
++ mark /TextAlphaBits 4 /GraphicsAlphaBits 4 6 -1 roll
++ putdeviceprops
++ setdevice % (does an erasepage)
++ /rowwidth devwidth def
+ /row rowwidth string def
+ /zerorow rowwidth string def % all zero
+ % Replace the definition of showpage
+ userdict /showpage { ps2edict begin epsipage end } bind put
+ userdict /setfont { ps2edict begin epsisetfont end } bind put
++ //systemdict /.setsafe known { .setsafe } if
+ } bind def
+
+ /epsifontdict 100 dict def
+@@ -125,8 +134,8 @@
+
+ % Initialise limit variables
+ /loopcount rowwidth 1 sub def
+- /lm loopcount def /lmb 0 def
+- /rm 0 def /rmb 0 def
++ /lm loopcount def
++ /rm 0 def
+
+ % Find left and right boundaries of image
+ tm 1 bm
+@@ -135,47 +144,29 @@
+ % Scan from left to find first non-zero element
+ % We save first the element, then the index
+ -1 0 1 loopcount
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exch pop exit }{ pop } ifelse
+ } for
+ % If we found -1, row is blank ..
+ dup -1 ne
+ { % Find the leftmost index
+ dup lm lt
+ % If the new index is less, we save index and element
+- { /lm exch def /lmb exch def }
+- % If the index is equal, we or the bits together
+- { lm eq { lmb or /lmb exch def }{ pop } ifelse
+- } ifelse
++ { /lm exch def } { pop } ifelse
+ % Now find the rightmost index
+ loopcount -1 0
+- { dup row exch get dup 0 ne { exch exit }{ pop pop } ifelse
++ { dup row exch get 0 ne { exit }{ pop } ifelse
+ } for
+ dup rm gt
+ % If the new index is greater, we save index and element
+- { /rm exch def /rmb exch def }
+- % If the index is equal, or the bits
+- { rm eq { rmb or /rmb exch def } { pop } ifelse
+- } ifelse
++ { /rm exch def } { pop } ifelse
+ } if
+- pop
+ } for
+
+- % Now we find the real left & right bit positions
+- 256 0 1 7
+- { exch 2 div dup lmb le { pop exit }{ exch pop } ifelse
+- } for
+- /lmb exch def
+-
+- 1 7 -1 0
+- { exch dup dup rmb and eq { pop exit }{ 2 mul exch pop } ifelse
+- } for
+- /rmb exch def
+-
+ % Calculate the bounding box values.
+ % Note that these must be corrected to produce closed-open intervals.
+- /llx lm 8 mul lmb add def
++ /llx lm def
+ /lly devheight bm sub 1 sub def
+- /urx rm 8 mul rmb add 1 add def
++ /urx rm 1 add def
+ /ury devheight tm sub def
+
+ % Write out the magic string and bounding box information
+@@ -206,38 +197,31 @@
+ epsifile lly write==only epsifile ( ) writestring
+ epsifile urx write==only epsifile ( ) writestring
+ epsifile ury write==
+- epsifile (%%BeginPreview: ) writestring
+- epsifile urx llx sub write==only epsifile ( ) writestring
+- epsifile bm tm sub 1 add write==only epsifile ( 1 ) writestring
+- epsifile bm tm sub 1 add write==
+- epsifile flushfile
+
+ % Define character and bit widths for the output line buffer:
+ /cwidth rm lm sub 1 add def
+- /bwidth cwidth 8 mul def
+- /owidth urx llx sub 7 add 8 idiv def
+ /out cwidth string def
+
+- % Create a 1-bit-high device for bitblt to align with the bbox
+- gsave
+- matrix cwidth 8 mul 1 <00 ff> makeimagedevice setdevice
++ epsifile (%%BeginPreview: ) writestring
++ epsifile cwidth write==only epsifile ( ) writestring
++ epsifile bm tm sub 1 add write==only epsifile ( 8 ) writestring
++ epsifile bm tm sub 1 add
++ cwidth 39 add 40 idiv mul write==
++ epsifile flushfile
+
+- % 'image' a zero string to clear the line device
+- bwidth 1 1 matrix cwidth string image
++ gsave
+
+ tm 1 bm
+ { % Get a scan line interval from the array device
+ arraydevice exch row copyscanlines lm cwidth getinterval
+- lmb 0 gt
+- { % 'image' it into the line device with the lmb offset
+- bwidth 1 1 [1 0 0 1 lmb 0] 5 -1 roll image
+- % Now we get the modified scan line
+- currentdevice 0 out copyscanlines 0 owidth getinterval
+- } if
+- % Write out the hex data
+- epsifile (% ) writestring
+- epsifile exch writehexstring
+- epsifile (\n) writestring
++ % Write out the hex data as 40 bytes per line (82 chars)
++ 0 40 cwidth
++ { epsifile (% ) writestring
++ epsifile exch 2 index exch
++ dup cwidth exch sub 40 .min getinterval writehexstring
++ epsifile (\n) writestring
++ } for
++ pop
+ } for
+
+ epsifile (%%EndImage\n) writestring
diff --git a/print/ghostscript8/files/patch-src:dviprlib.c b/print/ghostscript8/files/patch-src:dviprlib.c
index 1fc25e484764..67662665f273 100644
--- a/print/ghostscript8/files/patch-src:dviprlib.c
+++ b/print/ghostscript8/files/patch-src:dviprlib.c
@@ -1,23 +1,13 @@
---- src/dviprlib.c.orig Tue May 13 00:14:09 1997
-+++ src/dviprlib.c Thu Apr 4 03:18:57 2002
-@@ -1433,7 +1433,8 @@
+--- src/dviprlib.c.orig Tue May 13 16:14:09 1997
++++ src/dviprlib.c Mon Apr 22 23:02:58 2002
+@@ -1433,7 +1433,9 @@
char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
-private FILE *dviprt_messagestream = stderr;
+private FILE *dviprt_messagestream;
-+private int dviprt_messagestream_init;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
/*--- library functions ---*/
int
-@@ -1505,6 +1506,10 @@
- liblocal int
- dviprt_printmessage(char *str,int len)
- {
-+ if (!dviprt_messagestream_init) {
-+ dviprt_messagestream = stderr;
-+ dviprt_messagestream_init = 1;
-+ }
- if (dviprt_messagestream && str) {
- if (len >= 0) fwrite(str,len,1,dviprt_messagestream);
- else fputs(str,dviprt_messagestream);
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index d38894e6e079..4a2a196840d2 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -129,7 +129,7 @@ Have fun with this new configuration style ! -andreas \n\n\
"pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
"pcl3" "HP PCL 3+ (generic) [PCL3]" ON \
"hpdj" "HP PCL 3+ (old drv.) [HPDJ]" ON \
- "ijs" "HP PhotoSmart/DeskJet series [HPinkjet]" ON \
+ "ijs" "HP Inkjet and other raster devices" ON \
"ibmpro" "IBM 9-pin Proprinter" OFF \
"jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
"imagen" "Imagen ImPress printers" OFF \
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 4e842efde165..720d16a198ab 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -10,7 +10,7 @@ ifndef WITHOUT_X11
DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
endif
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
!EOT
# create one new Makefile, where DEVICE_DEVS contains all wanted devices