[Midnightbsd-cvs] mports: print/ghostscript-gpl: Update to 8.63.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Sat Jan 3 19:25:22 EST 2009
Log Message:
-----------
Update to 8.63.
Modified Files:
--------------
mports/print/ghostscript-gpl:
Makefile (r1.8 -> r1.9)
distinfo (r1.2 -> r1.3)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.2 -> r1.3)
mports/print/ghostscript-gpl/files:
patch-epag__gdevepag.c (r1.1 -> r1.2)
patch-src:fapi_ft.c (r1.2 -> r1.3)
patch-src:unix-gcc.mak (r1.2 -> r1.3)
patch-src__gdevperm.c (r1.1 -> r1.2)
Added Files:
-----------
mports/print/ghostscript-gpl:
Makefile.drivers (r1.1)
mports/print/ghostscript-gpl/files:
Makefile.dmprt (r1.1)
Makefile.epag (r1.1)
Makefile.pcl3 (r1.1)
patch-contrib__japanese__dmp_site.ps (r1.1)
patch-contrib__japanese__gdevdmpr.c (r1.1)
patch-lib-FAPIcidfmap (r1.1)
patch-lib-FAPIconfig (r1.1)
patch-lib-cidfmap (r1.1)
patch-src-Makefile.in (r1.1)
patch-src-contrib.mak (r1.1)
patch-src-gdevl256.c (r1.1)
patch-src-gdevvglb.c (r1.1)
patch-src-unixinst.mak (r1.1)
patch-src__devs.mak (r1.1)
patch-src__zicc.c (r1.1)
pkg-message.in (r1.1)
Removed Files:
-------------
mports/print/ghostscript-gpl:
Makefile.inc
mports/print/ghostscript-gpl/files:
bjc250.contrib.mak
cdj850.contrib.mak
dj970.contrib.mak
gdevhl12-hl1250.mak
lex7000.contrib.mak
lx5000.contrib.mak
lxm3200.contrib.mak
patch-alps:gdevalps.mak
patch-alps__gdevalps.c
patch-bjc250:src:gdevbjc_.c
patch-bjc250:src:gdevbjc_.h
patch-bjc250:src:gdevbjca.c
patch-eplaser:gdevescv.c
patch-eplaser:gdevesmv.c
patch-gdev10v:gdev10v.mak
patch-gdev10v__gdev10v.c
patch-lex7000__src__gdevlx7.c
patch-lib::cidfmap
patch-lib:gs_init.ps
patch-lib__ps2epsi.CAN-2004-0967
patch-lib__pv.sh.CAN-2004-0967
patch-lips:gdevl4r.c
patch-lips:gdevl4v.c
patch-lips:gdevlips.c
patch-lips:gdevlips.h
patch-lips:gdevlips.mak
patch-lips:gdevlprn.h
patch-lips__gdevespg.c
patch-lips__gdevlprn.c
patch-lips__gdevnpdl.c
patch-lips__gdevrpdl.c
patch-lxm3200:gdevlx32.c
patch-md2k:gdevmd2k.c
patch-md2k:gdevmd2k.mak
patch-mjc:gdevmjc.c
patch-mjc:gdevmjc.mak
patch-pcl3__eprn__gdeveprn.c
patch-pcl3_eprn_eprnrend.c
patch-src-dmp_site.ps
patch-src-dviprlib.c
patch-src-dviprlib.h
patch-src-gdevdmpr.c
patch-src-gdevdmpr.mak
patch-src-gdevijs.c
patch-src:cpca_gdevl4v.c
patch-src:gdevcd8.c
patch-src:gdevdj9.c
patch-src:gdevgdi.c
patch-src:gdevhl12.c
patch-src:gdevl256.c
patch-src:gdevlbp8.c
patch-src:gdevlx50.c
patch-src:gdevvglb.c
patch-src:smartgdi-contrib.mak
patch-src__unix-dll.mak
patch-src_cpca_mk_cmd.c
stc740ih.upp
stc740p.upp
stc740pl.upp
-------------- next part --------------
--- print/ghostscript-gpl/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $MidnightBSD: mports/print/ghostscript-gpl/Makefile.inc,v 1.5 2009/01/03 20:49:03 ctriv Exp $
-
-GS_VERSION= 8.56
-GS_REVISION= 2
-GS_EPOCH= 0
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/pkg-descr -L print/ghostscript-gpl/pkg-descr -u -r1.1 -r1.2
--- print/ghostscript-gpl/pkg-descr
+++ print/ghostscript-gpl/pkg-descr
@@ -2,9 +2,9 @@
all common and most esoteric platforms and supports many different printers
and some displays.
-Versions entitled "GPL Ghostscript" are distributed with the GNU General
-Public License, which allows free use, and free copying and redistribution
-under certain conditions (including, in some cases, commercial distribution).
+This is distributed with the GNU General Public License, which allows
+free use, and free copying and redistribution under certain conditions
+(including, in some cases, commercial distribution).
This port includes add-on packages (not part of the official gs release)
o HP8XX driver for HP DeskJet 880C/882C/895C
--- /dev/null
+++ print/ghostscript-gpl/Makefile.drivers
@@ -0,0 +1,336 @@
+# $FreeBSD: ports/print/ghostscript8/Makefile.drivers,v 1.4 2008/06/20 18:12:06 hrs Exp $
+
+OPTIONS_GS_DEFAULT_ON= on
+OPTIONS_GS_DEFAULT_OFF= off
+
+.if !defined(WITHOUT_X11)
+OPTIONS_X11_DEFAULT= on
+.else
+OPTIONS_X11_DEFAULT= off
+.endif
+
+.if !defined(WITH_SVGALIB)
+OPTIONS_SVGALIB_DEFAULT= off
+.else
+OPTIONS_SVGALIB_DEFAULT= on
+.endif
+
+.if !defined(WITHOUT_ICONV)
+OPTIONS_ICONV_DEFAULT= on
+.else
+OPTIONS_ICONV_DEFAULT= off
+.endif
+
+.if make(makesum)
+OPTIONS_X11_DEFAULT= on
+OPTIONS_SVGALIB_DEFAULT=on
+OPTIONS_ICONV_DEFAULT= on
+OPTIONS_GS_DEFAULT_ON= on
+OPTIONS_GS_DEFAULT_OFF= on
+.endif
+
+OPTIONS_X11= \
+GS_x11 "D: X Window System version 11, release >=4" ${OPTIONS_X11_DEFAULT} \
+GS_x11alpha "D: X Window System masquer. alpha capability" ${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk "D: X Window System masquer. 1bit/plane CMYK" ${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk2 "D: X Window System 2-bit-per-plane CMYK" ${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk4 "D: X Window System 4-bit-per-plane CMYK" ${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk8 "D: X Window System 8-bit-per-plane CMYK" ${OPTIONS_X11_DEFAULT} \
+GS_x11gray2 "D: X Window System 2-bit gray-scale" ${OPTIONS_X11_DEFAULT} \
+GS_x11gray4 "D: X Window System 4-bit gray-scale" ${OPTIONS_X11_DEFAULT} \
+GS_x11mono "D: X Window System masquer. black-and-white" ${OPTIONS_X11_DEFAULT} \
+GS_x11rg16x "D: X Window System G5/B5/R6 pixel layout" ${OPTIONS_X11_DEFAULT} \
+GS_x11rg32x "D: X Window System G11/B10/R11 pixel layout" ${OPTIONS_X11_DEFAULT}
+
+OPTIONS_SVGALIB= \
+GS_lvga256 "D: SVGAlib, 256-color VGA modes" ${OPTIONS_SVGALIB_DEFAULT} \
+GS_vgalib "D: SVGAlib, 16-color VGA modes" ${OPTIONS_SVGALIB_DEFAULT}
+
+OPTIONS_ICONV= \
+GS_oprp "D: OpenPrinting Raster driver interface" ${OPTIONS_ICONV_DEFAULT} \
+GS_opvp "D: OpenPrinting Vecter driver interface" ${OPTIONS_ICONV_DEFAULT}
+
+OPTIONS+= ${OPTIONS_X11}
+OPTIONS+= ${OPTIONS_SVGALIB}
+OPTIONS+= ${OPTIONS_ICONV}
+
+OPTIONS+= \
+GS_display "D: display device for GS shared library" ${OPTIONS_GS_DEFAULT_ON} \
+GS_md2k "D: ALPS MD-2000/2010/4000/1300/1500/5000" ${OPTIONS_GS_DEFAULT_ON} \
+GS_md5k "D: ALPS MD-5000 Eco Mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_md50Mono "D: ALPS MD-5000 Monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_md50Eco "D: ALPS MD-5000 Eco Mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_md1xMono "D: ALPS MD-1x00 Monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_appledmp "D: Apple Dot Matrix Printer/Imagewriter" ${OPTIONS_GS_DEFAULT_ON} \
+GS_iwhi "D: Apple Imagewriter, high-resolution mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_iwlo "D: Apple Imagewriter, low-resolution mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_iwlq "D: Apple Imagewriter LQ in 320x216dpi mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_hl7x0 "D: Brother HL-720/730/760(=PCL), MFC6550MC" ${OPTIONS_GS_DEFAULT_ON} \
+GS_hl1240 "D: Brother HL-1030/1240" ${OPTIONS_GS_DEFAULT_ON} \
+GS_hl1250 "D: Brother HL-1050/1070/1250/1270N" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10e "D: Canon BJ-10e" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10v "D: Canon BJ-10v" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10vh "D: Canon BJ-10v, high-mergin" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bj200 "D: Canon BJ-200/BJC-240(mono)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc600 "D: Canon BJC-600/4xxx/70, StyleWriter 2x00" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc800 "D: Canon BJC-240/800" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjccmyk "D: Canon BJC-210/240/250/265/1000" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjccolor "D: Canon BJC-210/240/250/265/1000 truecolor" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjcgray "D: Canon BJC-210/240/250/265/1000 grayscale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjcmono "D: Canon BJC-210/240/250/265/1000 monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp8 "D: Canon LBP-8II" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp310 "D: Canon LBP-310" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp320 "D: Canon LBP-320 Pro/LBP-350" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lips2p "D: Canon LIPS II+" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lips3 "D: Canon LIPS III" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lips4 "D: Canon LIPS IV" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc880j "D: Canon LIPS IVc, BJC-680J/880J" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lips4v "D: Canon LIPS IV, vector output mode" ${OPTIONS_GS_DEFAULT_ON} \
+GS_m8510 "D: C.Itoh M8510 printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_coslw2p "D: CoStar LabelWriter II II/Plus" ${OPTIONS_GS_DEFAULT_ON} \
+GS_coslwxl "D: CoStar LabelWriter XL" ${OPTIONS_GS_DEFAULT_ON} \
+GS_uniprint "D: Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dmprt "D: Configurable dot matrix printer driver" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dl2100 "D: DEC DL2100" ${OPTIONS_GS_DEFAULT_ON} \
+GS_la50 "D: DEC LA50" ${OPTIONS_GS_DEFAULT_ON} \
+GS_la70 "D: DEC LA70" ${OPTIONS_GS_DEFAULT_ON} \
+GS_la75 "D: DEC LA75" ${OPTIONS_GS_DEFAULT_ON} \
+GS_la75plus "D: DEC LA75+" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ln03 "D: DEC LN03" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lj250 "D: DEC LJ250 Companion color printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_declj250 "D: DEC LJ250 driver (alternate)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ap3250 "D: Epson ActionPrinter 3250" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epson "D: Epson dot matrix, 9/24-pin" ${OPTIONS_GS_DEFAULT_ON} \
+GS_eps9mid "D: Epson 9-pin, interleaved lines, medium res" ${OPTIONS_GS_DEFAULT_ON} \
+GS_eps9high "D: Epson 9-pin, interleaved lines, triple res" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8000 "D: Epson LP-8000 line printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epag "D: Epson ESC/Page laser printer (generic)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_escpage "D: Epson ESC/Page laser printer (generic)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2000 "D: Epson LP-2000/3000/7000/7000G laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc8600 "D: Epson AL-C8600 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc8500 "D: Epson AL-C8500 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc2000 "D: Epson AL-C2000 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc4000 "D: Epson AL-C4000 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc1900 "D: Epson AL-C1900 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_alc4100 "D: Epson AL-C4100 color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9800c "D: Epson LP-9800C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9000c "D: Epson LP-9000C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9500c "D: Epson LP-9500C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8800c "D: Epson LP-8800C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8300c "D: Epson LP-8300C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8500c "D: Epson LP-8500C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp3000c "D: Epson LP-3000C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8200c "D: Epson LP-8200C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8000c "D: Epson LP-8000C color laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl6100 "D: Epson EPL-6100 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl5900 "D: Epson EPL-5900 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl5800 "D: Epson EPL-5800 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2050 "D: Epson EPL-N2050 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2050p "D: Epson EPL-N2050+ laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2120 "D: Epson EPL-N2120 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2500 "D: Epson EPL-N2500 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2750 "D: Epson EPL-N2750 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9000b "D: Epson LP-9000B laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2500 "D: Epson LP-2500 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9100 "D: Epson LP-9100(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7900 "D: Epson LP-7900(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7500 "D: Epson LP-7500(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2400 "D: Epson LP-2400 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2200 "D: Epson LP-2200 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9400 "D: Epson LP-9400(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8900 "D: Epson LP-8900(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8700 "D: Epson LP-8700(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8100 "D: Epson LP-8100(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7700 "D: Epson LP-7700(R) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8600f "D: Epson LP-8600FX(N) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8400f "D: Epson LP-8400FX(N) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8300f "D: Epson LP-8300F laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp1900 "D: Epson LP-1900(N) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9600s "D: Epson LP-9600S laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9300 "D: Epson LP-9300 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9600 "D: Epson LP-9600 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8600 "D: Epson LP-8600FX(N) laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp1800 "D: Epson LP-1800 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lq850 "D: Epson LQ-850 (360x360, emul on Canon BJ300)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epsonc "D: Epson LQ-2550, Fujitsu 3400/2400/1200 color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mj700v2c "D: Epson MachJet series, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mj500c "D: Epson MachJet MJ-500C 360dpi, CMY/mono" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mj6000c "D: Epson MachJet MJ-830C/930C/6000C" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mj8000c "D: Epson MachJet MJ-8000C" ${OPTIONS_GS_DEFAULT_ON} \
+GS_st800 "D: Epson Stylus 800 printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_stcolor "D: Epson Stylus Color and II/IIs/1500" ${OPTIONS_GS_DEFAULT_ON} \
+GS_photoex "D: Epson Stylus Color Photo/Photo EX/Photo 700" ${OPTIONS_GS_DEFAULT_ON} \
+GS_fmlbp "D: Fujitsu contrib2xx Page Printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_fmpr "D: Fujitsu contrib" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2563 "D: HP 2563B line printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dnj650c "D: HP DesignJet 650C" ${OPTIONS_GS_DEFAULT_ON} \
+GS_deskjet "D: HP DeskJet and DeskJet Plus" ${OPTIONS_GS_DEFAULT_ON} \
+GS_djet500 "D: HP DeskJet 500 (for DeskJet 600 use -r600)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdeskjet "D: HP DeskJet 500C (1b/px)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_djet500c "D: HP DeskJet 500C (alternative)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdjcolor "D: HP DeskJet 500C/540C (24b/px)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdjmono "D: HP DeskJet 500/510/520/540C (mono)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj500 "D: HP DeskJet 500/540C (same as cdjcolor)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj550 "D: HP DeskJet 550C/560C/660C/660Cse" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dj505j "D: HP DeskJet 505J" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj670 "D: HP DeskJet 670/690" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj850 "D: HP DeskJet 850/855/870/1100" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj880 "D: HP DeskJet 880" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj890 "D: HP DeskJet 890" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj1600 "D: HP DeskJet 1600" ${OPTIONS_GS_DEFAULT_ON} \
+GS_chp2200 "D: HP Business Inkjet 2200" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj970 "D: HP DeskJet 970CXi" ${OPTIONS_GS_DEFAULT_ON} \
+GS_laserjet "D: HP LaserJet" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljetplus "D: HP LaserJet Plus" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet2p "D: HP LaserJet IId/IIp/III* (TIFF compression)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet3 "D: HP LaserJet III* (Delta Row compression)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet3d "D: HP LaserJet IIID (duplex capability)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4 "D: HP LaserJet 4/5L/5P (not real LJ5), 600dpi" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4d "D: HP LaserJet 4 (duplex + 600dpi)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lj4dith "D: HP LaserJet 4 (Floyd-Steinberg dithering)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4pjl "D: HP LaserJet 4V/4LJ Pro" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lj4dithp "D: HP LaserJet 4V/4LJ Pro (dithering)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5 "D: HP LaserJet 5/5M Color (new)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5c "D: HP LaserJet 5/5M Color Simple" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5pr "D: HP LaserJet 5/5M Color (old)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lj5mono "D: HP LaserJet 5/6 (PCL5/PCL XL), bitmap" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lj5gray "D: HP LaserJet 5/6 gray-scale bitmap" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pj "D: HP PaintJet XL driver" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pjetxl "D: HP PaintJet XL driver (alternate)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pjxl "D: HP PaintJet XL color printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_paintjet "D: HP PaintJet color printer (alternate)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pjxl300 "D: HP PaintJet XL300, DeskJet 1200C, CopyJet" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pxlmono "D: HP PCL XL mono (LaserJet 5/6 family)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pxlcolor "D: HP PCL XL color (Color LaserJet 4500/5000)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcl3 "D: HP PCL 3+ (generic)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ijs "D: HP Inkjet and other raster devices" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ibmpro "D: IBM 9-pin Proprinter" ${OPTIONS_GS_DEFAULT_ON} \
+GS_jetp3852 "D: IBM Jetprinter ink-jet color (Model \#3852)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_imagen "D: Imagen ImPress printers" ${OPTIONS_GS_DEFAULT_ON} \
+GS_fs600 "D: Kyocera FS-600 (600 dpi)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lxm5700m "D: Lexmark 5700 monotone" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lxm3200 "D: Lexmark 3200/Z12/Z22/Z31/Z32" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lx5000 "D: Lexmark 5000/Z51/Z82" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lex2050 "D: Lexmark 2050" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lex3200 "D: Lexmark 3200" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lex5700 "D: Lexmark 5700" ${OPTIONS_GS_DEFAULT_ON} \
+GS_lex7000 "D: Lexmark 7000" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cp50 "D: Mitsubishi CP50 color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pr1000 "D: NEC PC-PR 1000" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pr1000_4 "D: NEC PC-PR 1000/4" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pr150 "D: NEC PC-PR 150" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pr201 "D: NEC PC-PR 201" ${OPTIONS_GS_DEFAULT_ON} \
+GS_picty180 "D: NEC PICTY 180 (PC-PR101J/180)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_necp6 "D: NEC PinWriter P6/P6+/P60 (360x360)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_npdl "D: NEC Printer Description Language" ${OPTIONS_GS_DEFAULT_ON} \
+GS_oce9050 "D: OCE 9050 printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_oki182 "D: Okidata MicroLine 182" ${OPTIONS_GS_DEFAULT_ON} \
+GS_okiibm "D: Okidata MicroLine IBM-compatible printers" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ml600 "D: Okidata Microline 600CL/620CL" ${OPTIONS_GS_DEFAULT_ON} \
+GS_oki4w "D: Okidata OkiPage 4w+" ${OPTIONS_GS_DEFAULT_ON} \
+GS_atx23 "D: Practical Automation ATX-23" ${OPTIONS_GS_DEFAULT_ON} \
+GS_atx24 "D: Practical Automation ATX-24" ${OPTIONS_GS_DEFAULT_ON} \
+GS_atx38 "D: Practical Automation ATX-38" ${OPTIONS_GS_DEFAULT_ON} \
+GS_r4081 "D: Ricoh 4081 laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_rpdl "D: Ricoh Printer Description Language" ${OPTIONS_GS_DEFAULT_ON} \
+GS_gdi "D: Samsung SmartGDI laser printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_jj100 "D: Star JJ-100" ${OPTIONS_GS_DEFAULT_ON} \
+GS_sj48 "D: StarJet 48 inkjet printer" ${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d2 "D: Tektronix 4693d color, 2b/RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d4 "D: Tektronix 4693d color, 4b/RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d8 "D: Tektronix 4693d color, 8b/RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tek4696 "D: Tektronix 4695/4696 inkjet plotter" ${OPTIONS_GS_DEFAULT_ON} \
+GS_xes "D: Xerox XES (2700, 3700, 4045, etc.)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpmono "D: BMP Monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpgray "D: BMP 8-bit gray" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp16 "D: BMP 4-bit EGA/VGA" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp256 "D: BMP 8-bit 256-color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp16m "D: BMP 24-bit" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp32b "D: BMP 32-bit pseudo-.BMP" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpsep1 "D: BMP Separated 1-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpsep8 "D: BMP Separated 8-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ccr "D: CalComp Raster format" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cgmmono "D: CGM Monochrome -- LOW LEVEL OUTPUT ONLY" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cgm8 "D: CGM 8-bit 256-color -- DITTO" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cgm24 "D: CGM 24-bit color -- DITTO" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cif "D: CIF file format for VLSI" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dfaxhigh "D: DigiBoard, DigiFAX (high res)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_dfaxlow "D: DigiFAX (normal res)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_xcf "D: Gimp XCF, RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_xcfcmyk "D: Gimp XCF, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg3 "D: Group 3 FAX (EOL + no header/EOD)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg32d "D: Group 3 2-D FAX (EOL + no header/EOD)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg4 "D: Group 4 FAX (EOL + no header/EOD)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_miff24 "D: ImageMagick MIFF, 24-bit direct color, RLE" ${OPTIONS_GS_DEFAULT_ON} \
+GS_inferno "D: Inferno bitmaps" ${OPTIONS_GS_DEFAULT_ON} \
+GS_jpeg "D: JPEG format, RGB output" ${OPTIONS_GS_DEFAULT_ON} \
+GS_jpeggray "D: JPEG format, gray output" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mag16 "D: MAG format, 16-color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mag256 "D: MAG format, 256-color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrmono "D: MGR devices 1-bit monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray2 "D: MGR devices 2-bit gray scale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray4 "D: MGR devices 4-bit gray scale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray8 "D: MGR devices 8-bit gray scale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgr4 "D: MGR devices 4-bit (VGA) color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_mgr8 "D: MGR devices 8-bit color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxmono "D: PCX, 1-bit monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxgray "D: PCX, 8-bit gray scale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx16 "D: PCX, 4-bit planar EGA/VGA color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx256 "D: PCX, 8-bit chunky color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx24b "D: PCX, 24-bit color 3x8-bit planes" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxcmyk "D: PCX, 4-bit chunky CMYK color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pdfwrite "D: Portable Document Format" ${OPTIONS_GS_DEFAULT_ON} \
+GS_psdrgb "D: PhotoShop PSD, RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_psdcmyk "D: PhotoShop PSD, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bit "D: Plain bits, monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bitrgb "D: Plain bits, RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bitcmyk "D: Plain bits, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plan9bm "D: Plan 9 bitmap format" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pam "D: Portable Arbitrary Map file" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pbm "D: Portable Bitmap, plain" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pbmraw "D: Portable Bitmap, raw" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pgm "D: Portable Graymap, plain" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pgmraw "D: Portable Graymap, raw" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pgnm "D: Portable Graymap, plain (PBM opt)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pgnmraw "D: Portable Graymap, raw (PBM opt)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pnm "D: Portable Pixmap, plain RGB (PGM/PBM opt)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pnmraw "D: Portable Pixmap, raw RGB (PGM/PBM opt)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ppm "D: Portable Pixmap, plain RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ppmraw "D: Portable Pixmap, raw RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pkm "D: Portable inKmap, plain (4b CMYK=>RGB)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pkmraw "D: Portable inKmap, raw (4b CMYK=>RGB)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pksm "D: Portable Separated map, plain (4b CMYK=>4p)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pksmraw "D: Portable Separated map, raw (4b CMYK=>4p)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pngmono "D: PNG (Portable Network Graphics) Mono" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pnggray "D: PNG 8-bit Gray" ${OPTIONS_GS_DEFAULT_ON} \
+GS_png16 "D: PNG 4-bit Color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_png256 "D: PNG 8-bit Color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_png16m "D: PNG 24-bit Color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pngalpha "D: PNG 32-bit RGBA Color" ${OPTIONS_GS_DEFAULT_ON} \
+GS_psmono "D: PostScript (Level 1) monochrome image" ${OPTIONS_GS_DEFAULT_ON} \
+GS_psgray "D: PostScript (Level 1) 8-bit gray image" ${OPTIONS_GS_DEFAULT_ON} \
+GS_psrgb "D: PostScript (Level 2) 24-bit color image" ${OPTIONS_GS_DEFAULT_ON} \
+GS_pswrite "D: PostScript (like PostScript Distiller)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_ps2write "D: PostScript (Level 2) output" ${OPTIONS_GS_DEFAULT_ON} \
+GS_epswrite "D: Encapsulated PostScript" ${OPTIONS_GS_DEFAULT_ON} \
+GS_cfax "D: SFF format for CAPI FAX interface" ${OPTIONS_GS_DEFAULT_ON} \
+GS_sgirgb "D: SGI RGB pixmap format" ${OPTIONS_GS_DEFAULT_ON} \
+GS_sunhmono "D: Harlequin variant of 1-bit Sun raster file" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffcrle "D: TIFF CCITT RLE 1 dim (G3 FAX with no EOL)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg3 "D: TIFF Group 3 FAX (with EOL)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg32d "D: TIFF Group 3 2-D FAX" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg4 "D: TIFF Group 4 FAX" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffgray "D: TIFF 8-bit gray, no compress" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff12nc "D: TIFF 12-bit RGB, no compress" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff24nc "D: TIFF 24-bit RGB, no compress, NeXT format" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff32nc "D: TIFF 32-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffsep "D: TIFF gray + CMYK composite" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tifflzw "D: TIFF LZW, tag = 5, mono" ${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffpack "D: TIFF PackBits, tag = 32773, mono" ${OPTIONS_GS_DEFAULT_ON} \
+GS_bbox "D: Bounding box output" ${OPTIONS_GS_DEFAULT_ON} \
+GS_devicen "D: DeviceN process color model device" ${OPTIONS_GS_DEFAULT_ON} \
+GS_perm "D: DeviceN which permutes color components" ${OPTIONS_GS_DEFAULT_ON} \
+GS_spotcmyk "D: DeviceN with CMYK and spot color support" ${OPTIONS_GS_DEFAULT_ON} \
+GS_imdi "D: IMDI color converting device" ${OPTIONS_GS_DEFAULT_ON} \
+GS_wtsimdi "D: WTS halftoning device" ${OPTIONS_GS_DEFAULT_ON} \
+GS_wtscmyk "D: WTS halftoning CMYK device" ${OPTIONS_GS_DEFAULT_ON}
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/pkg-plist -L print/ghostscript-gpl/pkg-plist -u -r1.2 -r1.3
--- print/ghostscript-gpl/pkg-plist
+++ print/ghostscript-gpl/pkg-plist
@@ -1,22 +1,22 @@
- at comment $FreeBSD: ports/print/ghostscript-gpl/pkg-plist,v 1.41 2007/03/27 19:59:20 rafan Exp $
+ at comment $FreeBSD: ports/print/ghostscript8/pkg-plist,v 1.50 2008/11/02 15:42:28 hrs Exp $
bin/bdftops
bin/dumphint
bin/dvipdf
bin/eps2eps
-bin/ert
+%%GS_dmprt%%bin/ert
bin/fixmswrd.pl
bin/font2c
bin/gs
bin/gsbj
-%%SHLIB%%bin/gsc
+bin/gsc
bin/gsdj
bin/gsdj500
bin/gslj
bin/gslp
bin/gsnd
-%%SHLIB%%bin/gsx
+bin/gsx
bin/lprsetup.sh
-bin/pcl3opts
+%%GS_pcl3%%bin/pcl3opts
bin/pdf2dsc
bin/pdf2ps
bin/pdfopt
@@ -35,35 +35,13 @@
bin/pv.sh
bin/unix-lpr.sh
bin/wftopfa
-%%SHLIB%%include/ghostscript/iapi.h
-%%SHLIB%%include/ghostscript/ierrors.h
-%%SHLIB%%lib/libgs.so
-%%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
-%%SHLIB%%lib/libgs.so.%%GS_VERSION%%
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/alps/README.gdevalps
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/bj10v/gdev10v.jis
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/dmprt/gdevdmpr.sj
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ert.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gdevepag.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gsepagif.sh
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/psprint
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/gdi/README
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lips/Gdevlips.htm
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/README
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/md2k/README.jis
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mjc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mje
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.noz
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/cpem.doc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/gs-pcl3.html
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/how-to-report.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/pcl3opts.html
+include/ghostscript/gdevdsp.h
+include/ghostscript/iapi.h
+include/ghostscript/ierrors.h
+ at dirrm include/ghostscript
+lib/libgs.so
+lib/libgs.so.%%SHLIB_VER%%
+lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H
@@ -282,11 +260,19 @@
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H
@@ -309,6 +295,41 @@
%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding
%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode
%%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/Wingdings
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Ital
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Roma
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Dingbats
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-BoldObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-ReguObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Medi
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-MediItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-ReguItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCond
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCondItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCond
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCondItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/StandardSymL
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-Ligh
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-LighItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWChanceryL-MediItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Book
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-BookObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Demi
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-DemiObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Ital
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Roma
%%DATADIR%%/%%GS_VERSION%%/doc/API.htm
%%DATADIR%%/%%GS_VERSION%%/doc/C-style.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Changes.htm
@@ -337,7 +358,6 @@
%%DATADIR%%/%%GS_VERSION%%/doc/Issues.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Language.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Lib.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Maintain.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Make.htm
%%DATADIR%%/%%GS_VERSION%%/doc/News.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Projects.htm
@@ -349,7 +369,6 @@
%%DATADIR%%/%%GS_VERSION%%/doc/Readme.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Release.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Source.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Testing.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Unix-lpr.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Use.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm
@@ -368,11 +387,32 @@
%%DATADIR%%/%%GS_VERSION%%/examples/tiger.eps
%%DATADIR%%/%%GS_VERSION%%/examples/vasarely.ps
%%DATADIR%%/%%GS_VERSION%%/examples/waterfal.ps
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIcidfmap
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIconfig
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIfontmap
%%DATADIR%%/%%GS_VERSION%%/lib/FCOfontmap-PCLPS2
%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap
%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap.GS
%%DATADIR%%/%%GS_VERSION%%/lib/PDFA_def.ps
%%DATADIR%%/%%GS_VERSION%%/lib/PDFX_def.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/PM760p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM760pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM820p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM820pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc670p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc670pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc680p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc680pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc740p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc740pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc760p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc760pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc777p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc777pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp720p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp720pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp870p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp870pl.upp
%%DATADIR%%/%%GS_VERSION%%/lib/acctest.ps
%%DATADIR%%/%%GS_VERSION%%/lib/addxchar.ps
%%DATADIR%%/%%GS_VERSION%%/lib/align.ps
@@ -384,6 +424,8 @@
%%DATADIR%%/%%GS_VERSION%%/lib/bj8pa06n.upp
%%DATADIR%%/%%GS_VERSION%%/lib/bj8pp12f.upp
%%DATADIR%%/%%GS_VERSION%%/lib/bj8ts06n.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000a1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000b1.upp
%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a0.upp
%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a1.upp
%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a2.upp
@@ -512,9 +554,9 @@
%%DATADIR%%/%%GS_VERSION%%/lib/landscap.ps
%%DATADIR%%/%%GS_VERSION%%/lib/level1.ps
%%DATADIR%%/%%GS_VERSION%%/lib/lines.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70ch.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cm.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70ch.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cl.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cm.upp
%%DATADIR%%/%%GS_VERSION%%/lib/markhint.ps
%%DATADIR%%/%%GS_VERSION%%/lib/markpath.ps
%%DATADIR%%/%%GS_VERSION%%/lib/mkcidfm.ps
@@ -525,6 +567,7 @@
%%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/pdf_cslayer.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps
@@ -551,8 +594,12 @@
%%DATADIR%%/%%GS_VERSION%%/lib/ras4.upp
%%DATADIR%%/%%GS_VERSION%%/lib/ras8m.upp
%%DATADIR%%/%%GS_VERSION%%/lib/rollconv.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/s400a1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/s400b1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/sharp.upp
%%DATADIR%%/%%GS_VERSION%%/lib/showchar.ps
%%DATADIR%%/%%GS_VERSION%%/lib/showpage.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/sipixa6.upp
%%DATADIR%%/%%GS_VERSION%%/lib/st640ih.upp
%%DATADIR%%/%%GS_VERSION%%/lib/st640ihg.upp
%%DATADIR%%/%%GS_VERSION%%/lib/st640p.upp
@@ -575,8 +622,6 @@
%%DATADIR%%/%%GS_VERSION%%/lib/stc600pl.upp
%%DATADIR%%/%%GS_VERSION%%/lib/stc640p.upp
%%DATADIR%%/%%GS_VERSION%%/lib/stc740ih.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc740p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc740pl.upp
%%DATADIR%%/%%GS_VERSION%%/lib/stc800ih.upp
%%DATADIR%%/%%GS_VERSION%%/lib/stc800p.upp
%%DATADIR%%/%%GS_VERSION%%/lib/stc800pl.upp
@@ -605,27 +650,23 @@
%%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
%%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
%%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/BUGS
-%%DATADIR%%/%%GS_VERSION%%/pcl3/NEWS
-%%DATADIR%%/%%GS_VERSION%%/pcl3/README
-%%DATADIR%%/%%GS_VERSION%%/pcl3/calign.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/dumppdd.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/example.mcf
-%%DATADIR%%/%%GS_VERSION%%/pcl3/if-pcl3
-%%DATADIR%%/%%GS_VERSION%%/pcl3/levels-test.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
- at exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
- at unexec rm -f %%CIDFONTDIR%%/CIDFont
-%%SHLIB%%@dirrm include/ghostscript
- at dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/calign.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/dumppdd.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/example.mcf
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/if-pcl3
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/levels-test.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
+%%CIDFONTDIR%%/CIDFont
+%%GS_pcl3%%@dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
@dirrm %%DATADIR%%/%%GS_VERSION%%/lib
@dirrm %%DATADIR%%/%%GS_VERSION%%/examples
@dirrm %%DATADIR%%/%%GS_VERSION%%/doc
+ at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Font
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
@@ -633,16 +674,3 @@
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
@dirrmtry %%DATADIR%%/%%GS_VERSION%%
@dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/gdi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/eplaser
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/epag
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/dmprt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/bj10v
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/alps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L print/ghostscript-gpl/Makefile -L print/ghostscript-gpl/Makefile -u -r1.8 -r1.9
--- print/ghostscript-gpl/Makefile
+++ print/ghostscript-gpl/Makefile
@@ -1,87 +1,66 @@
-# New ports collection makefile for: ghostscript
-# Date created: Tue Jun 10 21:58:54 CEST 1997
-# Whom: Andreas Klemm <andreas at klemm.gtn.com>
#
-# $FreeBSD: ports/print/ghostscript-gpl/Makefile,v 1.143 2006/08/15 00:56:22 clsung Exp $
# $MidnightBSD$
#
PORTNAME= ghostscript
-PORTVERSION= ${GS_VERSION}
-PORTREVISION= ${GS_REVISION}
-PORTEPOCH= ${GS_EPOCH}
+PORTVERSION= 8.63
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
- http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
- http://home.vrweb.de/~martin.lottermoser/pcl3dist/:pcl3 \
- http://www.harsch.net/Download/:dj970 \
- http://www33.ocn.ne.jp/~higamasa/gdevmd2k/:md2k \
- ${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
- ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
- http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
- http://www.humblesoft.com/pub/:epag \
- ${MASTER_SITE_FREEBSD_LOCAL}:eplaser \
- http://www.openprinting.org/download/printing/ghostscript-8.x/drivers/hl1250/:hl1250 \
- 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/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
-MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,ports_jp_gs \
- bjc250gs/:bjc250 \
- ./:ports_jp \
- arved/:eplaser
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \
+ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
+ http://www.humblesoft.com/pub/:epag
+MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
PKGNAMESUFFIX= -gpl
-DISTFILES= ${GS_SRCS}:gs_srcs \
- ${HP8XX_SRCS}:hp8xx \
- ${PCL3_SRCS}:pcl3 \
- ${DJ970_SRCS}:dj970 \
- ${MD2K_SRCS}:md2k \
- ${ALPS_SRCS}:ports_jp_gs \
- ${BJ10V_SRCS}:ports_jp_gs \
- ${BJC250_SRCS}:bjc250 \
- ${CPCA_SRCS}:cpca \
- ${LIPS_SRCS}:lips \
- ${DMPRT_SRCS}:ports_jp_gs \
- ${EPAG_SRCS}:epag \
- ${EPLASER_SRCS}:eplaser \
- ${MJC_SRCS}:ports_jp \
- ${GDI_SRCS}:gdi \
- ${LXM3200_SRCS}:lxm3200 \
- ${LX5000_SRCS}:lx5000 \
- ${LEX7000_SRCS}:lx5000 \
- ${HL1250_SRCS}:hl1250
-DIST_SUBDIR= ghostscript
-EXTRACT_ONLY= ${GS_SRCS}
+DISTNAME= ${PORTNAME:S,8$,,}-${PORTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
+DIST_SUBDIR= ${PORTNAME:S,8$,,}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= GPL Postscript interpreter
+COMMENT= Ghostscript 8.x PostScript interpreter
LICENSE= gpl2
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME:S,8,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
-FAKE_OPTS= trueprefix
+CONFLICTS= gambc-[0-9]*
-CONFLICTS= ghostscript-afpl*
USE_BZIP2= yes
USE_GMAKE= yes
WANT_GNOME= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd6.0 \
- --host=${ARCH}-portbld-freebsd6.0 \
- --target=${ARCH}-portbld-freebsd6.0
-MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
- XCFLAGS="${XCFLAGS}"
-PLIST_SUB= GS_VERSION="${GS_VERSION}" \
- CIDFONTDIR=${CIDFONTDIR}
-
-SCRIPTS_ENV= GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
- WITHOUT_X11="${WITHOUT_X11}" \
- WITH_SVGALIB="${WITH_SVGALIB}"
-
-MAN1= dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 \
- pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 \
- ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+
+MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \
+ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
+ EXTRALIBS="${EXTRALIBS}" \
+ SOC_LOADER="dxmainc.c"
+CONFIGURE_ENV= ${MAKE_ENV} \
+ CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-compile-inits \
+ --enable-contrib \
+ --enable-dynamic \
+ --with-ijs \
+ --with-jasper
+XCFLAGS= ${PTHREAD_CFLAGS}
+XLDFLAGS= ${PTHREAD_LIBS}
+
+PLIST_SUB= GS_VERSION="${PORTVERSION}" \
+ CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}"
+SUB_FILES= pkg-message
+SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
+PKGMESSAGE= ${WRKDIR}/pkg-message
+DATADIR= ${PREFIX}/share/${PORTNAME:S,8$,,}
+
+OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \
+ FONTCONFIG "fontconfig support" on \
+ FT_BRIDGE "FreeType bridge" off \
+ X11 "X11 support" on
+
+MAN1= dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 \
+ pdf2dsc.1 pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 \
+ ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
MLINKS= gslp.1 gsbj.1 \
gslp.1 gsdj.1 \
gslp.1 gsdj500.1 \
@@ -90,562 +69,202 @@
ps2pdf.1 ps2pdf13.1 \
ps2ps.1 eps2eps.1
-XCFLAGS= -DUPD_SIGNAL=0 -DHAVE_HYPOT=1 -DSYS_TYPES_HAS_STDINT_TYPES=1
+CIDFONTDIR= ${DATADIR}/${PORTVERSION}/Resource
-.if defined(A4)
-XCFLAGS+= -DA4
-.endif
+.include "Makefile.drivers"
+.include <bsd.port.pre.mk>
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11
+.for D in ${OPTIONS:MGS_*:S/^GS_//}
+.if !defined(WITHOUT_GS_${D})
+PLIST_SUB+= GS_${D}=""
.else
-USE_XORG= xt xext
+PLIST_SUB+= GS_${D}="@comment "
+.endif
+.endfor
+
+.if !defined(WITHOUT_GS_dmprt)
+.include "${FILESDIR}/Makefile.dmprt"
+.endif
+
+.if !defined(WITHOUT_GS_epag)
+.include "${FILESDIR}/Makefile.epag"
+.endif
+
+EPAG_BASE= epag
+EPAG_SRCS= ${EPAG_BASE}-3.09.tar.gz
+EPAG_NAME= ${EPAG_SRCS:S,.tar.gz$,,}
+
+post-extract-epag:
+ ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
+ ${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE}
+ ${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/src/epag.contrib.mak
+
+post-extract: post-extract-epag
+
+.if !defined(WITHOUT_GS_pcl3)
+.include "${FILESDIR}/Makefile.pcl3"
+.endif
+
+.if defined(WITHOUT_SVGALIB)
+.undef WITH_GS_lvga256
+.undef WITH_GS_vgalib
.endif
-.if defined(WITH_SVGALIB)
+.if defined(WITH_GS_lvga256) \
+ || defined(WITH_GS_vgalib)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
.endif
-.if defined(WITH_FT_BRIDGE)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2
-MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a"
+.if defined(WITHOUT_X11)
+. undef WITH_GS_x11
+. undef WITH_GS_x11alpha
+. undef WITH_GS_x11cmyk
+. undef WITH_GS_x11cmyk2
+. undef WITH_GS_x11cmyk4
+. undef WITH_GS_x11cmyk8
+. undef WITH_GS_x11gray2
+. undef WITH_GS_x11gray4
+. undef WITH_GS_x11mono
+. undef WITH_GS_x11rg16x
+. undef WITH_GS_x11rg32x
.endif
-.if defined(WITHOUT_SHLIB)
-ALL_TARGET= all pcl3opts
-PLIST_SUB+= SHLIB="@comment "
+.if defined(WITH_GS_x11) \
+ || defined(WITH_GS_x11alpha) \
+ || defined(WITH_GS_x11cmyk) \
+ || defined(WITH_GS_x11cmyk2) \
+ || defined(WITH_GS_x11cmyk4) \
+ || defined(WITH_GS_x11cmyk8) \
+ || defined(WITH_GS_x11gray2) \
+ || defined(WITH_GS_x11gray4) \
+ || defined(WITH_GS_x11mono) \
+ || defined(WITH_GS_x11rg16x) \
+ || defined(WITH_GS_x11rg32x)
+USE_XORG= xt xext
+CONFIGURE_ARGS+=--with-x \
+ --x-includes=${X11BASE}/include \
+ --x-libraries=${X11BASE}/lib
+CONFLICTS+= ghostscript8-nox11-[0-9]*
.else
-.undef WITHOUT_X11
-USE_GNOME+= gtk20
-ALL_TARGET= so pcl3opts
-INSTALL_TARGET= soinstall
-USE_LDCONFIG= yes
-PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}"
-INCLUDEDIR= ${PREFIX}/include/ghostscript
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11
+CONFIGURE_ARGS+=--without-x
+CONFLICTS+= ghostscript8-[0-9]*
.endif
-GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
-CIDFONTDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
+.if defined(WITHOUT_ICONV)
+. undef WITH_GS_oprp
+. undef WITH_GS_opvp
+.endif
-# Additional Drivers:
+_ICONV_ARG= no
+.if defined(WITH_GS_oprp) \
+ || defined(WITH_GS_opvp)
+USE_ICONV= yes
+_ICONV_ARG= gnu
+EXTRALIBS+= -liconv
+.endif
+CONFIGURE_ARGS+=--with-libiconv=${_ICONV_ARG}
-# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
-# http://www.gelhaus.net/hp880c/
-HP8XX= cdj880
-HP8XX_SRCS= gdevcd8.tar.gz
-
-# PCL3 - additional driver for HP PCL3 printers, by Martin Lottermoser
-# http://home.vrweb.de/martin.lottermoser/pcl3.html
-# broken
-PCL3= pcl3
-PCL3_VERS= 3.3
-PCL3_NAME= ${PCL3}-${PCL3_VERS}
-PCL3_SRCS= ${PCL3_NAME}.tar.gz
-PCL3_MAN1= gs-pcl3.1 pcl3opts.1
-MAN1+= ${PCL3_MAN1}
-
-# DJ970 - additional driver for HP DeskJet 970, supports duplex printing
-# http://www.harsch.net/Ghostscript/ghostscript.html
-DJ970= gdevdj9
-DJ970_SRCS= ${DJ970}.c.gz
-
-# MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
-# http://www33.ocn.ne.jp/~higamasa/gdevmd2k/
-MD2K= md2k
-MD2K_VERS= 0.2a
-MD2K_NAME= gdevmd2k-${MD2K_VERS}
-MD2K_SRCS= ${MD2K_NAME}.tar.gz
-
-# ALPS - additional driver for Alps MD-5000
-ALPS= alps
-ALPS_VERS= 0.2
-ALPS_NAME= gdevalps-${ALPS_VERS}
-ALPS_SRCS= gdevalps-0.21.tar.gz
-
-# BJ10V - additional driver for Canon BJ-10V
-BJ10V= bj10v
-BJ10V_NAME= gdev10v
-BJ10V_SRCS= ${BJ10V_NAME}.tar.gz
-
-# BJC250 - additional driver for Canon BJC-210/240/250/265/1000
-# http://bjc250gs.sourceforge.net/
-BJC250= bjc250
-BJC250_VERS= 0.756
-BJC250_NAME= ${BJC250}-v${BJC250_VERS}
-BJC250_SRCS= gs7.05-${BJC250_NAME}.diff.gz
-
-# CPCA - additional driver for Canon CPCA printers
-# http://cweb.canon.jp/open-mie/technical/index-j.html
-CPCA= cpca
-CPCA_VERS= 1.0.0
-CPCA_NAME= canon-lips4-${CPCA_VERS}
-CPCA_SRCS= ${CPCA_NAME}-651.tgz
-
-# LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers
-# http://www.ucatv.ne.jp/~taeko/software/gs/
-LIPS= lips
-LIPS_VERS= 2.4.0
-LIPS_NAME= gdevlips-${LIPS_VERS}
-LIPS_SRCS= ${LIPS_NAME}.tar.gz
-
-# DMPRT - additional driver for generic dot matrix printers
-DMPRT= dmprt
-DMPRT_VERS= 2.01
-DMPRT_NAME= ${DMPRT}-${DMPRT_VERS}
-DMPRT_SRCS= ${DMPRT_NAME}.tar.gz
-
-# EPAG - additional driver for Epson ESC/Page printers
-# http://www.humblesoft.com/gdevepag.html
-EPAG= epag
-EPAG_VERS= 3.09
-EPAG_NAME= ${EPAG}-${EPAG_VERS}
-EPAG_SRCS= ${EPAG_NAME}.tar.gz
-
-# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
-# http://www.avasys.jp/english/linux_e/index.html
-EPLASER= eplaser
-EPLASER_VERS= 3.1.4
-EPLASER_NAME= ${EPLASER}-${EPLASER_VERS}
-EPLASER_SRCS= ${EPLASER_NAME}-705.tgz
-
-# MJC - additional driver for Epson MachJet series
-MJC= mjc
-MJC_VERS= 0.8
-MJC_NAME= gdevmjc-${MJC_VERS}
-MJC_SRCS= ${MJC_NAME}.tar.gz
-
-# GDI - additional driver for Samsung SmartGDI laser printers
-GDI= gdi
-GDI_NAME= Samsung-SmartGDI-all-GS
-GDI_SRCS= ${GDI_NAME}.orig.tar.gz
-
-# LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32
-LXM3200= lxm3200
-LXM3200_VERS= 20030501
-LXM3200_NAME= ${LXM3200}-tweaked-${LXM3200_VERS}
-LXM3200_SRCS= ${LXM3200_NAME}.tar.gz
-
-# LX5000 - additional driver for Lexmark 5000/Z51/Z82
-# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
-LX5000= lx5000
-LX5000_SRCS= gdevlx50.c
-
-# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
-# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
-LEX7000= lex7000
-LEX7000_SRCS= gs6.0.lexmark7000.patch
-
-# HL1250 - additional driver for Brother HL-1050/1070/1250/1270N/1030/1240
-HL1250= hl1250
-HL1250_SRCS= gdevhl12.c
-
-# contributed uniprint profiles
-CONTRIB_UPP= lqx70ch.upp lqx70cl.upp lqx70cm.upp \
- stc740ih.upp stc740p.upp stc740pl.upp
+.if !defined(WITH_LETTERSIZE)
+.if defined(A4) || defined(WITH_A4SIZE)
+XCFLAGS+= -DA4
+MSG_PAPERSIZE= "NOTE: Default paper size will be A4."
+.endif
+.endif
-.include "Makefile.inc"
-.include <bsd.port.pre.mk>
-.SILENT:
+.if !defined(WITHOUT_FONTCONFIG)
+LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+CONFIGURE_ARGS+= --enable-fontconfig
+.else
+CONFIGURE_ARGS+= --disable-fontconfig
+.endif
-pre-everything::
-.if !defined(A4)
- ${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.if !defined(WITHOUT_FT_BRIDGE)
+LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
+MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so"
+PLIST_SUB+= FAPI=""
.else
- ${ECHO_MSG} "Using -DA4 for compilation."
+PLIST_SUB+= FAPI="@comment "
.endif
-post-extract:
- ${ECHO_MSG} ">>> in post-extract ..."
-# ** 3rd party driver **
-# Note: don't forget to add those devices in scripts/configure,
-# which update unix-gcc.mak to build gs with these new devices!
-#
-# for HP8XX driver
- ${ECHO_MSG} ">>> extracting ${HP8XX_SRCS} ..."
- ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
-# for PCL3 driver
- ${ECHO_MSG} ">>> extracting ${PCL3_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
- ${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3}
- ${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
- ${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
-# for DJ970 driver
- ${ECHO_MSG} ">>> extracting ${DJ970_SRCS} ..."
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
- ${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
-# for MD2K driver
- ${ECHO_MSG} ">>> extracting ${MD2K_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
- ${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K}
-# for ALPS driver
- ${ECHO_MSG} ">>> extracting ${ALPS_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRCS}
- ${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS}
-# for BJ10V driver
- ${ECHO_MSG} ">>> extracting ${BJ10V_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${BJ10V_SRCS}
-# for BJC250 driver
- ${ECHO_MSG} ">>> extracting ${BJC250_SRCS} ..."
- ${MKDIR} ${WRKSRC}/${BJC250_NAME}/src
- ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${BJC250_SRCS} | \
- ${PATCH} -d ${WRKSRC}/${BJC250_NAME} -f -s -N -E -p1 \
- 2>/dev/null || ${TRUE}
- ${LN} -sf ${BJC250_NAME} ${WRKSRC}/${BJC250}
-# for CPCA driver
- ${ECHO_MSG} ">>> extracting ${CPCA_SRCS} ..."
- ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${CPCA_SRCS}
-# for LIPS driver
- ${ECHO_MSG} ">>> extracting ${LIPS_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
- ${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
-# for DMPRT driver
- ${ECHO_MSG} ">>> extracting ${DMPRT_SRCS} ..."
- ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${DMPRT_SRCS}
-# for EPAG driver
- ${ECHO_MSG} ">>> extracting ${EPAG_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
- ${LN} -sf ${EPAG_NAME} ${WRKSRC}/${EPAG}
-# for EPLASER driver
- ${ECHO_MSG} ">>> extracting ${EPLASER_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRCS}
- ${LN} -sf ${EPLASER_NAME} ${WRKSRC}/${EPLASER}
-# for MJC driver
- ${ECHO_MSG} ">>> extracting ${MJC_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
- ${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
-# for GDI driver
- ${ECHO_MSG} ">>> extracting ${GDI_SRCS} ..."
- ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
-# for LXM3200 driver
- ${ECHO_MSG} ">>> extracting ${LXM3200_SRCS} ..."
- ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LXM3200_SRCS}
- ${LN} -sf ${LXM3200_NAME} ${WRKSRC}/${LXM3200}
-# for LX5000 driver
- ${ECHO_MSG} ">>> extracting ${LX5000_SRCS} ..."
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${LX5000_SRCS} ${WRKSRC}/src
-# for LEX7000 driver
- ${ECHO_MSG} ">>> extracting ${LEX7000_SRCS} ..."
- ${MKDIR} ${WRKSRC}/${LEX7000}
- ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${LEX7000_SRCS} | \
- ${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
- 2>/dev/null || ${TRUE}
-# for HL1250 driver
- ${ECHO_MSG} ">>> extracting ${HL1250_SRCS} ..."
- ${MKDIR} ${WRKSRC}/${HL1250}
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${HL1250_SRCS} ${WRKSRC}/src
+ALL_TARGET= so
+INSTALL_TARGET= soinstall
+USE_LDCONFIG= yes
+PLIST_SUB+= SHLIB_VER="${PORTVERSION:R}"
+
+PORTDOCS= japanese chp2200 epson740 lxm3200-tweaked md2k_md5k
+PORTDOC_FILES= japanese/Gdevlips.htm japanese/README.gs550j \
+ japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt \
+ japanese/gdev10v.txt japanese/gdevalps.txt \
+ japanese/gdevcd8.txt japanese/gdevdmpr.txt \
+ japanese/gdevfmlbp.txt japanese/gdevj100.txt \
+ japanese/gdevlbp3.txt japanese/gdevmag.txt \
+ japanese/gdevmd2k.txt japanese/gdevmjc.txt \
+ japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc \
+ japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL \
+ epson740/README epson740/upp-HowTo-to-be \
+ lxm3200-tweaked/LICENSE lxm3200-tweaked/README \
+ lxm3200-tweaked/RELEASE_NOTES \
+ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis
+
+pre-everything::
+ @${ECHO_MSG} ${MSG_PAPERSIZE}
post-patch:
- ${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
- ${WRKSRC}/src/unix-gcc.mak
- ${REINPLACE_CMD} -e 's|\. de|\.|g' \
- ${WRKSRC}/src/unixinst.mak
-# for DMPRT driver
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
- s|%%GS_VERSION%%|${GS_VERSION}|g' \
- ${WRKSRC}/src/dmp_site.ps
+ s|%%GS_VERSION%%|${PORTVERSION}|g' \
+ ${WRKSRC}/contrib/japanese/dmp_site.ps
+
+pre-build-drivers.mak:
+ @${ECHO_CMD} 'DEVICE_DEVS= \' > ${WRKSRC}/src/drivers.mak
+.for D in ${OPTIONS:MGS_*:S/^GS_//}
+.if defined(WITH_GS_${D})
+ @${ECHO_CMD} '$$(DD)${D}.dev \' >> ${WRKSRC}/src/drivers.mak
+.endif
+.endfor
-# here we apply the modifications necessary to build the 3rd party drivers
-# advantage: you see unmodified makefiles after a pure make extract
-pre-configure:
- ${ECHO_MSG} ">>> in pre-configure ..."
-# for HP8XX driver
- ${ECHO_MSG} ">>> adding ${HP8XX} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/cdj850.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for PCL3 driver
- ${ECHO_MSG} ">>> adding ${PCL3} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
- >> ${WRKSRC}/src/contrib.mak
-# for DJ970 driver
- ${ECHO_MSG} ">>> adding ${DJ970} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/dj970.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for MD2K driver
- ${ECHO_MSG} ">>> adding ${MD2K} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
- >> ${WRKSRC}/src/contrib.mak
-# for ALPS driver
- ${ECHO_MSG} ">>> adding ${ALPS} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${ALPS_NAME}/gdevalps.mak-5.50 \
- >> ${WRKSRC}/src/contrib.mak
-# for BJ10V driver
- ${ECHO_MSG} ">>> adding ${BJ10V} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for BJC250 driver
- ${ECHO_MSG} ">>> adding ${BJC250} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/bjc250.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for CPCA driver
- ${ECHO_MSG} ">>> adding ${CPCA} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/src/cpca_gdev.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for LIPS driver
- ${ECHO_MSG} ">>> adding ${LIPS} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for DMPRT driver
- ${ECHO_MSG} ">>> adding ${DMPRT} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/src/gdevdmpr.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for EPAG driver
- ${ECHO_MSG} ">>> adding ${EPAG} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/epag.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for EPLASER driver
- ${ECHO_MSG} ">>> adding ${EPLASER} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv7.mak \
- >> ${WRKSRC}/src/contrib.mak
- ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv7.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for MJC driver
- ${ECHO_MSG} ">>> adding ${MJC} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for GDI driver
- ${ECHO_MSG} ">>> adding ${GDI} driver to contrib.mak ..."
- ${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for LXM3200 driver
- ${ECHO_MSG} ">>> adding ${LXM3200} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/lxm3200.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for LX5000 driver
- ${ECHO_MSG} ">>> adding ${LX5000} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/lx5000.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for LEX7000 driver
- ${ECHO_MSG} ">>> adding ${LEX7000} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/lex7000.contrib.mak \
- >> ${WRKSRC}/src/contrib.mak
-# for HL1250 driver
- ${ECHO_MSG} ">>> adding ${HL1250} driver to contrib.mak ..."
- ${CAT} ${FILESDIR}/gdevhl12-hl1250.mak \
- >> ${WRKSRC}/src/contrib.mak
-
-post-configure:
- ${ECHO_MSG} ">>> in post-configure ..."
- cd ${WRKSRC}/jasper ; \
- ${SETENV} ${MAKE_ENV} ${SH} ./configure --build=${ARCH}-mports-freebsd6.0
-
-pre-build:
- ${ECHO_MSG} ">>> in pre-build ..."
- ${ECHO_MSG} ">>> creating directories for compilation ..."
+pre-build: pre-build-drivers.mak
${MKDIR} ${WRKSRC}/obj
${MKDIR} ${WRKSRC}/bin
-# for MD2K driver
- ${ECHO_MSG} ">>> creating symlinks for ${MD2K} ..."
-.for i in gdevmd2k.c
- ${LN} -sf ${WRKSRC}/${MD2K_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for ALPS driver
- ${ECHO_MSG} ">>> creating symlinks for ${ALPS} ..."
-.for i in gdevalps.c
- ${LN} -sf ${WRKSRC}/${ALPS_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for BJ10V driver
- ${ECHO_MSG} ">>> creating symlinks for ${BJ10V} ..."
-.for i in gdev10v.c
- ${LN} -sf ${WRKSRC}/${BJ10V_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for BJC250 driver
- ${ECHO_MSG} ">>> creating symlinks for ${BJC250} ..."
-.for i in gdevbjc_.[ch] gdevbjca.c
- ${LN} -sf ${WRKSRC}/${BJC250_NAME}/src/${i} ${WRKSRC}/src
-.endfor
-# for LIPS driver
- ${ECHO_MSG} ">>> creating symlinks for ${LIPS} ..."
-.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \
- gdevnpdl.c gdevrpdl.c
- ${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for EPAG driver
- ${ECHO_MSG} ">>> building ${EPAG} utility ..."
- cd ${WRKSRC}/${EPAG_NAME} ; \
- ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
- ${ECHO_MSG} ">>> creating symlinks for ${EPAG} ..."
-.for i in gdevepag.c
- ${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for EPLASER driver
- ${ECHO_MSG} ">>> creating symlinks for ${EPLASER} ..."
-.for i in gdevescv.[ch] gdevesmv.c
- ${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for MJC driver
- ${ECHO_MSG} ">>> creating symlinks for ${MJC} ..."
-.for i in gdevmjc.c mjbarrie.c mjbksep.c mjespdtc.c mjespdtm.c mjespdty.c \
- mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
- ${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for LXM3200 driver
- ${ECHO_MSG} ">>> creating symlinks for ${LXM3200} ..."
-.for i in gdevlx32.c
- ${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for LEX7000 driver
- ${ECHO_MSG} ">>> creating symlinks for ${LEX7000} ..."
-.for i in gdevlx7.c
- ${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src
-.endfor
.if defined(WITH_FT_BRIDGE)
${MKDIR} ${WRKSRC}/freetype/include
- ${LN} -sf ${LOCALBASE}/include/ft2build.h \
+ ${LN} -s -f ${LOCALBASE}/include/ft2build.h \
${WRKSRC}/freetype/include/ft2build.h
- ${LN} -sf ${LOCALBASE}/include/freetype2/freetype \
+ ${LN} -s -f ${LOCALBASE}/include/freetype2/freetype \
${WRKSRC}/freetype/include/freetype
${MKDIR} ${WRKSRC}/freetype/objs
- ${LN} -sf ${LOCALBASE}/lib/libfreetype.a \
- ${WRKSRC}/freetype/objs/freetype214MT_D.a
+ ${LN} -s -f ${LOCALBASE}/lib/libfreetype.so \
+ ${WRKSRC}/freetype/objs/freetype214MT_D.so
.endif
pre-install:
- ${ECHO_MSG} ">>> in pre-install ..."
- ${ECHO_MSG} ">>> creating ghostscript destdir ..."
- ${MKDIR} ${DATADIR}/${GS_VERSION}/examples
- ${MKDIR} ${CIDFONTDIR}
+ ${MKDIR} ${DATADIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-.if defined(WITH_SHLIB)
- ${MKDIR} ${INCLUDEDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR}
+
+post-install-docs:
+ ${MKDIR} ${WRKSRC}/contrib/japanese
+ ${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* ${WRKSRC}/contrib/japanese
+ ${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC}/contrib && \
+ ${TAR} -cf - ${PORTDOC_FILES} | \
+ ( cd ${DOCSDIR} && ${TAR} -xof - )
+
+.if defined(WITH_FT_BRIDGE)
+post-install-fapi:
+ ${INSTALL_DATA} ${WRKSRC}/lib/FAPIcidfmap \
+ ${WRKSRC}/lib/FAPIconfig ${WRKSRC}/lib/FAPIfontmap \
+ ${DATADIR}/${PORTVERSION}/lib
+
+post-install: post-install-fapi
.endif
post-install:
- ${ECHO_MSG} ">>> in post-install ..."
- ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
- ${ECHO_MSG} ">>> stripping gs ..."
-.if !defined(WITHOUT_SHLIB)
${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
${LN} -sf gsc ${PREFIX}/bin/gs
- ${MKDIR} ${INCLUDEDIR}
-.for i in iapi.h ierrors.h
- ${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR}
-.endfor
-.else
- ${STRIP_CMD} ${PREFIX}/bin/gs
-.endif
-# for PCL3 driver
- ${ECHO_MSG} ">>> installing ${PCL3} utility in bindir ..."
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
- ${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
-.for i in ${PCL3_MAN1}
- ${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${MANPREFIX}/man/man1
-.endfor
-# other pcl3 stuff, which might be interesting for runtime
- ${ECHO_MSG} ">>> creating ${PCL3} destdir ..."
- ${MKDIR} ${DATADIR}/${GS_VERSION}/${PCL3}
- ${ECHO_MSG} ">>> installing files in ${PCL3} destdir ..."
-.for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
- ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
- ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
- ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
- ps/margins-LetterRotated.ps
- ${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
- ${DATADIR}/${GS_VERSION}/${PCL3}
-.endfor
-# for DMPRT driver
- ${ECHO_MSG} ">>> installing ${DMPRT} resources ..."
-.for i in dmp_init.ps dmp_site.ps escp_24.src
- ${INSTALL_DATA} ${WRKSRC}/src/${i} \
- ${DATADIR}/${GS_VERSION}/lib
-.endfor
-# for EPAG driver
- ${ECHO_MSG} ">>> installing ${EPAG} utility in bindir ..."
- ${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
-# contributed UPP driver
- ${ECHO_MSG} ">>> installing contributed UPP profiles ..."
-.for i in ${CONTRIB_UPP}
- ${INSTALL_DATA} ${FILESDIR}/${i} \
- ${DATADIR}/${GS_VERSION}/lib
-.endfor
-#
-# now NOPORTDOCS dependend stuff
-#
+ ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
+
.if !defined(NOPORTDOCS)
- ${ECHO_MSG} ">>> installing PORTDOC stuff ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}
-# for PCL3 driver
- ${ECHO_MSG} ">>> installing ${PCL3} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${PCL3}
-.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
- ${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${PCL3}
-.endfor
-# for MD2K driver
- ${ECHO_MSG} ">>> installing ${MD2K} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MD2K}
-.for i in README.jis
- ${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${MD2K}
-.endfor
-# for ALPS driver
- ${ECHO_MSG} ">>> installing ${ALPS} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${ALPS}
-.for i in README.gdevalps
- ${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${ALPS}
-.endfor
-# for BJ10V driver
- ${ECHO_MSG} ">>> installing ${BJ10V} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${BJ10V}
-.for i in gdev10v.jis
- ${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${BJ10V}
-.endfor
-# for LIPS driver
- ${ECHO_MSG} ">>> installing ${LIPS} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LIPS}
-.for i in Gdevlips.htm
- ${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${LIPS}
-.endfor
-# for DMPRT driver
- ${ECHO_MSG} ">>> installing ${DMPRT} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
-.for i in gdevdmpr.sj
- ${INSTALL_DATA} ${WRKSRC}/src/${i} \
- ${DOCSDIR}/${GS_VERSION}/${DMPRT}
-.endfor
-# for EPAG driver
- ${ECHO_MSG} ">>> installing ${EPAG} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
-.for i in ert.txt gdevepag.txt ChangeLog
- ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${EPAG}
-.endfor
-.for i in psprint gsepagif.sh
- ${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${EPAG}
-.endfor
-# for EPLASER driver
- ${ECHO_MSG} ">>> installing ${EPLASER} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER}
-.for i in readme-eplaser-705.euc
- ${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${EPLASER}
-.endfor
-# for MJC driver
- ${ECHO_MSG} ">>> installing ${MJC} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MJC}
-.for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc
- ${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${MJC}
-.endfor
-# for GDI driver
- ${ECHO_MSG} ">>> installing ${GDI} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
-.for i in README
- ${INSTALL_DATA} ${WRKSRC}/src/${i} \
- ${DOCSDIR}/${GS_VERSION}/${GDI}
-.endfor
-# for LXM3200 driver
- ${ECHO_MSG} ">>> installing ${LXM3200} docs ..."
- ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LXM3200}
-.for i in README RELEASE_NOTES Z12-Z31-QuickSetup
- ${INSTALL_DATA} ${WRKSRC}/${LXM3200_NAME}/${i} \
- ${DOCSDIR}/${GS_VERSION}/${LXM3200}
-.endfor
+post-install: post-install-docs
.endif
- ${ECHO_MSG} "> post-installation tasks completed."
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/distinfo -L print/ghostscript-gpl/distinfo -u -r1.2 -r1.3
--- print/ghostscript-gpl/distinfo
+++ print/ghostscript-gpl/distinfo
@@ -1,57 +1,6 @@
-MD5 (ghostscript/ghostscript-8.56.tar.bz2) = 498015a278308d147bea563be2c5165e
-SHA256 (ghostscript/ghostscript-8.56.tar.bz2) = 6b61f82e464a6e05bac017c9d0e22a01ea7be229cdbf92d303114cc194e77b2d
-SIZE (ghostscript/ghostscript-8.56.tar.bz2) = 12224304
-MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
-SHA256 (ghostscript/gdevcd8.tar.gz) = f52656a951e402f3775fdf09087944dba6f7a58edff17ce350692cee101cccf9
-SIZE (ghostscript/gdevcd8.tar.gz) = 24803
-MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
-SHA256 (ghostscript/pcl3-3.3.tar.gz) = 20fc33c741096a88c2aa6f6a03c025cad9bb224729dfffb91673c65c367ac714
-SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
-MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
-SHA256 (ghostscript/gdevdj9.c.gz) = 7657dece1c2d9af15b7599e92f3170b9aaf927d429d90e4e928d3d7052fb376f
-SIZE (ghostscript/gdevdj9.c.gz) = 20139
-MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
-SHA256 (ghostscript/gdevmd2k-0.2a.tar.gz) = c99d6b4cc026c78729331c99a6d9ced24960c61b356c3a61162d2268274a7e7c
-SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955
-MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
-SHA256 (ghostscript/gdevalps-0.21.tar.gz) = 250f54084bc186237e24233aa3cbffcc192e14b19620876a518b38ffe9b14421
-SIZE (ghostscript/gdevalps-0.21.tar.gz) = 4452
-MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
-SHA256 (ghostscript/gdev10v.tar.gz) = 99f51fa42c9223e2c6b3658d82c790cffbf146bd8ef60c89ddba56128c7a40d3
-SIZE (ghostscript/gdev10v.tar.gz) = 6099
-MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621d
-SHA256 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = aeeaa041a04a3ca95b50c1c1ebc60b7a570668fd110671610c0f21dab07ddd64
-SIZE (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 16501
-MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
-SHA256 (ghostscript/canon-lips4-1.0.0-651.tgz) = e11d11fa9d8645e4102a36d293cdf42498b5fbecc966d0bd104c5aa951c08cae
-SIZE (ghostscript/canon-lips4-1.0.0-651.tgz) = 38835
-MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
-SHA256 (ghostscript/gdevlips-2.4.0.tar.gz) = 24164cdc12cb0d03512c2f04ed82fa1e901625504367b8c53cc74134ee9c3047
-SIZE (ghostscript/gdevlips-2.4.0.tar.gz) = 67683
-MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-SHA256 (ghostscript/dmprt-2.01.tar.gz) = c3d8245ae48893856c6b63508262afbf54a3b16c3e606ab07797f46eb9e15ce7
-SIZE (ghostscript/dmprt-2.01.tar.gz) = 44232
+MD5 (ghostscript/ghostscript-8.63.tar.bz2) = c770eedfdd846a53e211e3ba5339de21
+SHA256 (ghostscript/ghostscript-8.63.tar.bz2) = 0801ec174fa8ee67679c9ae42af547f5cbc2cc98faab6268187f69c22b86b0a1
+SIZE (ghostscript/ghostscript-8.63.tar.bz2) = 15017410
MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
SIZE (ghostscript/epag-3.09.tar.gz) = 12858
-MD5 (ghostscript/eplaser-3.1.4-705.tgz) = 94246b034af171b4336d90198e9f4bd8
-SHA256 (ghostscript/eplaser-3.1.4-705.tgz) = ed1ccdf6ec613eb5e028786ad59cb3060f00c2ffa8ca5792bfd219514dc69f42
-SIZE (ghostscript/eplaser-3.1.4-705.tgz) = 44523
-MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
-SHA256 (ghostscript/gdevmjc-0.8.tar.gz) = cd922677798ce85b7e06d92694bb8b0012bc5d6ed66d6982f20eed471974f05b
-SIZE (ghostscript/gdevmjc-0.8.tar.gz) = 102654
-MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b
-SHA256 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 2c8c43e2318dd8b143344235ad7ccc203a3a8c4c50419f3967f1a999a92ea430
-SIZE (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 10488
-MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
-SHA256 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 9156ca7948158102938b127b356dfcd778e79a271893f56efe7cb65a41f46380
-SIZE (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 39000
-MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf
-SHA256 (ghostscript/gdevlx50.c) = 668de62188819f5c27f00ab04f1b7b58ff9ff52ac16497429a0637f412112117
-SIZE (ghostscript/gdevlx50.c) = 99428
-MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
-SHA256 (ghostscript/gs6.0.lexmark7000.patch) = 509dfc02436639ce6b9f98465ec306dd2e7f9342feded043c78b0c9cf44021df
-SIZE (ghostscript/gs6.0.lexmark7000.patch) = 27361
-MD5 (ghostscript/gdevhl12.c) = 277c5ddac9c6fb0e2897e95265eb1ff1
-SHA256 (ghostscript/gdevhl12.c) = 0abaa60cbe950b9c923753a687181b775910ecff0848917641e281737f03527a
-SIZE (ghostscript/gdevhl12.c) = 22001
--- print/ghostscript-gpl/files/patch-lips:gdevlprn.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- lips/gdevlprn.h.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevlprn.h Sat Sep 13 23:06:38 2003
-@@ -28,8 +28,13 @@
-
- #include "gdevprn.h"
-
-+#if GS_VERSION_MAJOR >= 8
-+#define lprn_dev_proc_image_out(proc)\
-+ void proc(gx_device_printer *, FILE *, int, int, int, int)
-+#else
- #define lprn_dev_proc_image_out(proc)\
- void proc(P6(gx_device_printer *, FILE *, int, int, int, int))
-+#endif
-
- #define dev_proc_image_out(proc) lprn_dev_proc_image_out(proc)
-
--- print/ghostscript-gpl/files/patch-lips__gdevlprn.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- lips/gdevlprn.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevlprn.c Fri Dec 17 19:21:08 2004
-@@ -219,13 +219,13 @@
- maxBy = (pdev->height + lprn->nBh - 1) / lprn->nBh;
- maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
-
-- if (!(lprn->ImageBuf = gs_malloc(bpl, maxY, "lprn_print_image(ImageBuf)")))
-+ if (!(lprn->ImageBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_image(ImageBuf)")))
- return_error(gs_error_VMerror);
-- if (!(lprn->TmpBuf = gs_malloc(bpl, maxY, "lprn_print_iamge(TmpBuf)")))
-+ if (!(lprn->TmpBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_iamge(TmpBuf)")))
- return_error(gs_error_VMerror);
-- if (!(lprn->bubbleTbl = gs_malloc(sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
-+ if (!(lprn->bubbleTbl = gs_malloc(pdev->memory, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
- return_error(gs_error_VMerror);
-- if (!(bubbleBuffer = gs_malloc(sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
-+ if (!(bubbleBuffer = gs_malloc(pdev->memory, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
- return_error(gs_error_VMerror);
-
- for (i = 0; i < maxBx; i++)
-@@ -261,10 +261,10 @@
- }
- lprn_bubble_flush_all(pdev, fp); /* flush the rest of bubble */
-
-- gs_free(lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
-- gs_free(lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
-- gs_free(lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
-- gs_free(bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
-+ gs_free(pdev->memory, lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
-+ gs_free(pdev->memory, lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
-+ gs_free(pdev->memory, lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
-+ gs_free(pdev->memory, bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
-
- return code;
- }
--- print/ghostscript-gpl/files/patch-src:gdevl256.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gdevl256.c.orig Fri Feb 22 07:24:51 2002
-+++ src/gdevl256.c Tue May 20 03:08:15 2003
-@@ -147,10 +147,12 @@
- /* for compatibility with the older display modes: */
- /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */
- gx_color_index
--lvga256_map_rgb_color(gx_device * dev, gx_color_value r, gx_color_value g,
-- gx_color_value b)
-+lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[])
- {
- #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
- static const byte cube_bits[32] =
- {0, 128, 128, 128, 128, 128, 128, 128, 128, 128,
--- print/ghostscript-gpl/files/stc740pl.upp
+++ /dev/null
@@ -1,32 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2
--r360x360
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveYPasses=3
--dupOutputPins=48
--dupWeaveYFeeds="{47 50 47}"
--dupWeaveInitialYFeeds="{1 1 46}"
--dupWeaveInitialPins="{ 16 48 32}"
--dupBeginPageCommand="<
- 1b40 1b40
- 1b2847 0100 01
- 1b2855 0100 0A
- 1b5500
- 1b2865 0200 0002
- 1b2843 0200 0000
- 1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)"
-
Index: patch-src:unix-gcc.mak
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src:unix-gcc.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/files/patch-src:unix-gcc.mak -L print/ghostscript-gpl/files/patch-src:unix-gcc.mak -u -r1.2 -r1.3
--- print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,6 +1,6 @@
---- src/unix-gcc.mak.orig Fri Jul 7 06:32:50 2006
-+++ src/unix-gcc.mak Fri Mar 23 14:44:08 2007
-@@ -21,15 +21,16 @@
+--- src/unix-gcc.mak.orig Sat Nov 10 06:18:04 2007
++++ src/unix-gcc.mak Sat Nov 24 15:09:41 2007
+@@ -21,15 +21,17 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -23,10 +23,11 @@
+PSRESDIR=${.CURDIR}/Resource
+PSGENDIR=${.CURDIR}/obj
+PSOBJDIR=${.CURDIR}/obj
++CONTRIBDIR=${.CURDIR}/contrib
# Do not edit the next group of lines.
-@@ -48,11 +49,10 @@
+@@ -48,11 +50,10 @@
# the directories also define the default search path for the
# initialization files (gs_*.ps) and the fonts.
@@ -41,7 +42,16 @@
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
scriptdir = $(bindir)
-@@ -143,7 +143,7 @@
+@@ -107,7 +108,7 @@
+ # -DHAVE_HYPOT
+ # use the system hypot() call
+
+-CAPOPT= -DHAVE_MKSTEMP
++CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT
+
+ # Define the name of the executable file.
+
+@@ -141,7 +142,7 @@
# some older JPEG streams that violate the standard. If the JPEG
# library built from local sources, the patch will be applied.
@@ -50,7 +60,7 @@
JPEG_NAME=jpeg
# Define the directory where the PNG library sources are stored,
-@@ -158,7 +158,7 @@
+@@ -155,7 +156,7 @@
# what its name is.
# See gs.mak and Make.htm for more information.
@@ -59,7 +69,7 @@
LIBPNG_NAME=png
# Define the directory where the zlib sources are stored.
-@@ -170,7 +170,7 @@
+@@ -167,7 +168,7 @@
# what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information.
@@ -68,7 +78,7 @@
#ZLIB_NAME=gz
ZLIB_NAME=z
-@@ -179,6 +179,14 @@
+@@ -176,6 +177,14 @@
JBIG2_LIB=jbig2dec
JBIG2SRCDIR=jbig2dec
@@ -83,7 +93,7 @@
# Define the directory where the icclib source are stored.
# See icclib.mak for more information
-@@ -202,7 +210,7 @@
+@@ -204,7 +213,7 @@
# Define the name of the C compiler.
@@ -92,47 +102,57 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -219,9 +227,9 @@
+@@ -221,10 +230,10 @@
# Define the added flags for standard, debugging, profiling
# and shared object builds.
-CFLAGS_STANDARD=-O2
--CFLAGS_DEBUG=-g -O0
--CFLAGS_PROFILE=-pg -O2
+CFLAGS_STANDARD?=-O2
-+CFLAGS_DEBUG=-g
-+CFLAGS_PROFILE=-pg
- CFLAGS_SO=-fPIC
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg -O2
+-CFLAGS_SO=-fPIC -shared
++CFLAGS_SO=-fPIC
# Define the other compilation flags. Add at most one of the following:
-@@ -235,7 +243,7 @@
+ # -DBSD4_2 for 4.2bsd systems.
+@@ -237,7 +246,8 @@
# We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
--XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+-XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++#XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-@@ -246,7 +254,7 @@
+@@ -248,7 +258,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line.
-XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
++XLDFLAGS+=-L${LOCALBASE}/lib
LDFLAGS=$(XLDFLAGS)
-@@ -279,7 +287,7 @@
+@@ -259,7 +269,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+
+-EXTRALIBS=-rdynamic -ldl
++EXTRALIBS+=-Wl,-export-dynamic
+
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+@@ -281,7 +291,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
-XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
# Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -291,12 +299,12 @@
+@@ -293,12 +303,12 @@
# Solaris and other SVR4 systems with dynamic linking probably want
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
@@ -141,14 +161,43 @@
#XLIBDIRS=-L/usr/local/X/lib
-XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
XLIBDIR=
-XLIBS=Xt Xext X11
+#XLIBS=Xt Xext X11
# Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -447,6 +455,9 @@
+@@ -316,16 +326,16 @@
+
+ # If POSIX sync primitives are used, also change the STDLIBS to include
+ # the pthread library.
+-#SYNC=posync
++SYNC=posync
+
+ # Default is No sync primitives since some platforms don't have it (HP-UX)
+-SYNC=nosync
++#SYNC=nosync
+
+ # ------ Devices and features ------ #
+
+ # Choose the language feature(s) to include. See gs.mak for details.
+
+-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev
++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev
+ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
+ # The following is strictly for testing.
+ FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
+@@ -415,7 +425,7 @@
+ DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
+
+ # Shared library target to build.
+-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
++#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
+ #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
+
+ # ---------------------------- End of options --------------------------- #
+@@ -454,6 +464,9 @@
include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/libpng.mak
include $(GLSRCDIR)/jbig2.mak
@@ -158,3 +207,11 @@
include $(GLSRCDIR)/icclib.mak
include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/devs.mak
+@@ -463,6 +476,7 @@
+ include $(GLSRCDIR)/unix-dll.mak
+ include $(GLSRCDIR)/unix-end.mak
+ include $(GLSRCDIR)/unixinst.mak
++include $(CONTRIBDIR)/contrib.mak
+
+ # This has to come last so it won't be taken as the default target.
+ $(AK):
--- print/ghostscript-gpl/files/patch-src-dviprlib.c
+++ /dev/null
@@ -1,135 +0,0 @@
---- src/dviprlib.c.orig Tue May 13 16:14:09 1997
-+++ src/dviprlib.c Tue May 24 21:41:09 2005
-@@ -39,8 +39,8 @@
-
-
- /*--- forward declarations ---*/
--private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
--private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
-+private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
-+private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
-
- /*--- library functions ---*/
- int
-@@ -429,21 +429,21 @@
-
- /*--- forward declarations ---*/
- private int dviprt_set_select
-- (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
-+ (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_integer
-- (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
-+ (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_strings
-- (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
-+ (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_rpexpr
-- (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
-+ (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
- private int dviprt_set_code
-- (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
-+ (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
-
--private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
--private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
--private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
-+private long dviprt_oct2long(uchar *,uchar *,uchar **);
-+private long dviprt_dec2long(uchar *,uchar *,uchar **);
-+private long dviprt_hex2long(uchar *,uchar *,uchar **);
-
--private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
-+private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
-
- /*--- macros ---*/
- #define strlcmp(tmplt,str,len) \
-@@ -1433,7 +1433,11 @@
- char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
- char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
-
-+#if 0
- private FILE *dviprt_messagestream = stderr;
-+#else /* patch for glibc 2.1.x by Shin Fukui <shita at april.co.jp> */
-+private FILE *dviprt_messagestream;
-+#endif
-
- /*--- library functions ---*/
- int
-@@ -1568,16 +1572,16 @@
-
-
- /*--- forward declarations ---*/
--private int dviprt_getmaximalwidth(P1(dviprt_print *));
--private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
--private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_reverse_bits(P2(uchar far *,uint));
--private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
--private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
--private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
--private long dviprt_getbuffersize(P1(dviprt_print *));
-+private int dviprt_getmaximalwidth(dviprt_print *);
-+private int dviprt_flush_buffer(dviprt_print *,uchar far *);
-+private int dviprt_output_transpose(dviprt_print *,uchar far *,uint);
-+private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint);
-+private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint);
-+private int dviprt_reverse_bits(uchar far *,uint);
-+private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
-+private int dviprt_output_expr(dviprt_print *,int,uint,uint);
-+private int dviprt_default_outputproc(uchar far *,long ,void *);
-+private long dviprt_getbuffersize(dviprt_print *);
-
- /*--- library functions ---*/
- long
-@@ -1618,7 +1622,7 @@
- int
- dviprt_setstream
- #ifdef __PROTOTYPES__
-- (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
-+ (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
- #else
- (pprint,func,pstream)
- dviprt_print *pprint;
-@@ -2264,19 +2268,19 @@
- #define DVIPRT_SUPPORT_PCL 1
-
- /*--- forward declarations ---*/
--private long dviprt_null_getworksize(P2(dviprt_print *,long ));
--private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
--private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
--private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_null_getworksize(dviprt_print *,long );
-+private long dviprt_null_encode(dviprt_print *,long ,int );
-+private long dviprt_hex_getworksize(dviprt_print *,long );
-+private long dviprt_hex_encode(dviprt_print *,long ,int );
- #if DVIPRT_SUPPORT_FAX
--private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
--private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_fax_getworksize(dviprt_print *,long );
-+private long dviprt_fax_encode(dviprt_print *,long ,int );
- #endif
- #if DVIPRT_SUPPORT_PCL
--private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
--private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
--private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
--private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_pcl1_getworksize(dviprt_print *,long );
-+private long dviprt_pcl1_encode(dviprt_print *,long ,int );
-+private long dviprt_pcl2_getworksize(dviprt_print *,long );
-+private long dviprt_pcl2_encode(dviprt_print *,long ,int );
- #endif
-
- private dviprt_encoder dviprt_encoder_list[] = {
-@@ -2468,9 +2472,9 @@
- int o_count;
- int o_bufcount;
- } FaxEncodeInfo;
--private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
--private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
--private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
-+private int dviprt_fax_set_white(int,FaxEncodeInfo *);
-+private int dviprt_fax_set_black(int,FaxEncodeInfo *);
-+private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
-
- private long
- dviprt_fax_encode(dviprt_print *pprint,long s,int f)
--- print/ghostscript-gpl/files/patch-lips:gdevlips.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevlips.c Tue Jan 13 01:23:47 2004
-@@ -62,7 +62,15 @@
- height = tmp;
- }
- for (pt = lips_paper_table; pt->num_unit < 80; pt++)
-+/* add by shige 11/06 2003 */
-+#ifdef USE_LIPS_SIZE_ERROR
-+ if(pt->width+LIPS_SIZE_ERROR_VALUE>=width
-+ && pt->width-LIPS_SIZE_ERROR_VALUE<=width
-+ && pt->height+LIPS_SIZE_ERROR_VALUE>=height
-+ && pt->height-LIPS_SIZE_ERROR_VALUE<=height)
-+#else
- if (pt->width == width && pt->height == height)
-+#endif
- break;
-
- return pt->num_unit + landscape;
--- print/ghostscript-gpl/files/patch-src-gdevdmpr.c
+++ /dev/null
@@ -1,134 +0,0 @@
---- src/gdevdmpr.c.orig Tue May 13 20:43:37 1997
-+++ src/gdevdmpr.c Sat Mar 24 15:41:48 2007
-@@ -41,7 +41,7 @@
- /* include library header. */
- #include "dviprlib.h"
-
--extern FILE *lib_fopen(P1(const char *));
-+extern FILE *lib_fopen(const char *);
-
- #define LOCAL_DEBUG 0
-
-@@ -87,12 +87,12 @@
- private dev_proc_close_device(gdev_dmprt_close);
-
- /* declarations of sub functions to get printer properties. */
--private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
--private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
--private int gdev_dmprt_check_code_props(P2(byte * ,int ));
--private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
-+private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
-+private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
-+private int gdev_dmprt_check_code_props(byte * ,int );
-+private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
-
--private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
-+private int gdev_dmprt_error_no_dviprt_to_gs(int );
-
- /* The device descriptor */
- gx_device_procs prn_dmprt_procs = {
-@@ -405,7 +405,9 @@
- if (pddev->dmprt.max_height>0 && pddev->dmprt.max_height<pddev->height)
- pddev->height = pddev->dmprt.max_height;
-
-+#if 0
- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
-+#endif
-
- return code;
- }
-@@ -425,7 +427,9 @@
- if (code < 0) return code;
- if (code == 0) pddev->dmprt.debug_f = vbool;
-
-+#if 0
- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
-+#endif
-
- code = param_read_bool(plist, "Verbose", &vbool);
- if (code < 0) return code;
-@@ -475,14 +479,14 @@
- code = param_read_string(plist, "FileName", &vstr);
- if (code < 0) return code;
- if (code == 0) {
-- char *filename = gs_malloc(vstr.size + 1, 1,
-+ char *filename = gs_malloc(pdev->memory, vstr.size + 1, 1,
- "gdev_dmprt_put_props(filename)");
- int ccode;
- if (filename == 0) return e_VMerror;
- strncpy(filename, (const char*)vstr.data, vstr.size);
- filename[vstr.size] = '\0';
- ccode = gdev_dmprt_get_printer_props(pddev,filename);
-- gs_free(filename, vstr.size+1, 1, "gdev_dmprt_put_props(filename)");
-+ gs_free(pdev->memory, filename, vstr.size+1, 1, "gdev_dmprt_put_props(filename)");
- if (ccode < 0) return ccode;
- }
-
-@@ -686,7 +690,7 @@
- byte *in;
-
- /* get work buffer */
-- in = (byte *)gs_malloc(1, i_buf_size ,"gdev_dmprt_print_page(in)");
-+ in = (byte *)gs_malloc(pdev->memory, 1, i_buf_size ,"gdev_dmprt_print_page(in)");
- if ( in == 0 )
- return e_VMerror;
-
-@@ -737,7 +741,7 @@
- eprintf1(" %lu bytes\n",dviprt_getoutputbytes(pprint)-prev_bytes);
- }
- error_ex:
-- gs_free((char *)in, 1, i_buf_size,"gdev_dmprt_print_page(in)");
-+ gs_free(pdev->memory, (char *)in, 1, i_buf_size,"gdev_dmprt_print_page(in)");
-
- return code;
- }
-@@ -797,7 +801,7 @@
- dviprt_cfg_t cfg;
- char *fname;
-
-- fname = gs_malloc(256,1,"dviprt_lib_fname");
-+ fname = gs_malloc(pdev->memory, 256,1,"dviprt_lib_fname");
- if (fname == NULL) return e_VMerror;
-
- fp = gdev_dmprt_dviprt_lib_fopen(fnamebase,fname);
-@@ -828,11 +832,12 @@
- cfg.integer[CFG_Y_DPI] > 0 ? cfg.integer[CFG_Y_DPI] : pddev->dmprt.orig_x_dpi;
- }
-
-- gs_free(fname,256,1,"dviprt_lib_fname");
-+ gs_free(pdev->memory, fname,256,1,"dviprt_lib_fname");
-
- return code;
- }
-
-+private const char * gp_file_name_concat_string(const char *, unsigned);
- private FILE *
- gdev_dmprt_dviprt_lib_fopen(const char *fnamebase,char *fname)
- {
-@@ -845,9 +850,7 @@
- env = getenv("TEXCFG");
- if (env) {
- strcpy(fname,env);
-- strcat(fname,
-- gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
-- strcat(fname,fnamebase);
-+ strcat(fname, gp_file_name_concat_string(env,strlen(env)));
- fp = fopen(fname,gp_fmode_rb);
- }
- }
-@@ -867,4 +870,15 @@
- default:
- return -1;
- }
-+}
-+
-+/* Answer the string to be used for combining a directory/device prefix */
-+/* with a base file name. The prefix directory/device is examined to */
-+/* determine if a separator is needed and may return an empty string */
-+private const char *
-+gp_file_name_concat_string(const char *prefix, unsigned plen)
-+{
-+ if (plen > 0 && prefix[plen - 1] == '/')
-+ return "";
-+ return "/";
- }
--- print/ghostscript-gpl/files/patch-md2k:gdevmd2k.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- md2k/gdevmd2k.c.orig Sun May 2 14:07:57 1999
-+++ md2k/gdevmd2k.c Fri Dec 17 19:10:22 2004
-@@ -495,7 +495,7 @@
- int i, j;
-
- /* allocate memory */
-- work = (byte *)gs_malloc(3+sizeof(int), line_size,
-+ work = (byte *)gs_malloc(pdev->memory, 3+sizeof(int), line_size,
- "alps_print_page(work)");
- if (work == 0)
- return_error(gs_error_VMerror);
-@@ -597,7 +597,7 @@
- "\033\052\162\103"
- "\033\045\0\130", 1, 9, prn_stream);
-
-- gs_free((char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
-+ gs_free(pdev->memory, (char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
- return 0;
- }
-
-@@ -638,11 +638,13 @@
- (k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
-
- private gx_color_index
--alps_map_cmyk_color(gx_device* pdev,
-- gx_color_value c, gx_color_value m,
-- gx_color_value y, gx_color_value k)
-+alps_map_cmyk_color(gx_device* pdev, const gx_color_value cv[])
- {
- gx_color_index color;
-+ gx_color_value c = cv[0];
-+ gx_color_value m = cv[1];
-+ gx_color_value y = cv[2];
-+ gx_color_value k = cv[3];
-
- switch (pdev->color_info.depth) {
- case 1:
-@@ -675,10 +677,12 @@
- }
-
- private gx_color_index
--alps_map_cmy_color(gx_device* pdev,
-- gx_color_value c, gx_color_value m,
-- gx_color_value y, gx_color_value k)
-+alps_map_cmy_color(gx_device* pdev, const gx_color_value cv[])
- {
-+ gx_color_value c = cv[0];
-+ gx_color_value m = cv[1];
-+ gx_color_value y = cv[2];
-+ gx_color_value k = cv[3];
- int nbits = pdev->color_info.depth;
- ulong weight = ((gx_max_color_value - k) << 10) / gx_max_color_value;
- c = ((c * weight) >> 10) + k;
-@@ -694,10 +698,12 @@
- /* Mapping of RGB colors to gray values. */
-
- private gx_color_index
--alps_map_rgb_color(gx_device *pdev,
-- gx_color_value r, gx_color_value g, gx_color_value b)
-+alps_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
- {
-
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff) {
- return (gx_color_index) 0; /* White */
- } else {
Index: patch-epag__gdevepag.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-epag__gdevepag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/files/patch-epag__gdevepag.c -L print/ghostscript-gpl/files/patch-epag__gdevepag.c -u -r1.1 -r1.2
--- print/ghostscript-gpl/files/patch-epag__gdevepag.c
+++ print/ghostscript-gpl/files/patch-epag__gdevepag.c
@@ -1,37 +1,217 @@
--- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000
-+++ epag/gdevepag.c Thu May 26 00:12:48 2005
++++ epag/gdevepag.c Sat Nov 24 15:25:11 2007
+@@ -102,30 +102,30 @@
+ } EpagBubble;
+
+ /* The device descriptors */
+-private dev_proc_open_device(epag_open);
+-private dev_proc_close_device(epag_close);
+-private dev_proc_print_page(epag_print_page);
+-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
+-private dev_proc_print_page(epag_print_page);
+-private dev_proc_get_params(epag_get_params);
+-private dev_proc_put_params(epag_put_params);
+-private void epag_paper_set(gx_device_printer *pdev, FILE *fp);
+-private void epag_bubble_flush_all(EpagPageCont *cont);
+-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
+-private void epag_page_close(EpagPageCont *cont);
+-private int epag_read_image(EpagPageCont *cont);
+-private void epag_process_line(EpagPageCont *cont);
+-private int epag_is_black(EpagPageCont *cont, int bx);
+-private void epag_rect_add(EpagPageCont *cont,int start,int end);
+-private void epag_bubble_gen(EpagPageCont *cont,
++static dev_proc_open_device(epag_open);
++static dev_proc_close_device(epag_close);
++static dev_proc_print_page(epag_print_page);
++static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
++static dev_proc_print_page(epag_print_page);
++static dev_proc_get_params(epag_get_params);
++static dev_proc_put_params(epag_put_params);
++static void epag_paper_set(gx_device_printer *pdev, FILE *fp);
++static void epag_bubble_flush_all(EpagPageCont *cont);
++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
++static void epag_page_close(EpagPageCont *cont);
++static int epag_read_image(EpagPageCont *cont);
++static void epag_process_line(EpagPageCont *cont);
++static int epag_is_black(EpagPageCont *cont, int bx);
++static void epag_rect_add(EpagPageCont *cont,int start,int end);
++static void epag_bubble_gen(EpagPageCont *cont,
+ int x0, int x1, int y0, int y1);
+-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
+-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
++static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
+
+ /*
+ * ¥Ç¥Ð¥¤¥¹¤ÎÀë¸À
+ */
+-private gx_device_procs prn_epag_procs =
++static gx_device_procs prn_epag_procs =
+ prn_params_procs(epag_open, gdev_prn_output_page, epag_close,
+ epag_get_params, epag_put_params);
+ gx_device_printer far_data gs_epag_device =
+@@ -140,13 +140,13 @@
+ static char *epson_remote_start = "\033\001 at EJL \r\n";
+
+ /* Open the printer, adjusting the margins if necessary. */
+-private int
++static int
+ epag_open(gx_device *pdev)
+ {
+ return gdev_prn_open(pdev);
+ }
+
+-private int
++static int
+ epag_close(gx_device *pdev)
+ {
+ gdev_prn_open_printer(pdev, 1);
+@@ -163,7 +163,7 @@
+ return gdev_prn_close(pdev);
+ }
+
+-private int
++static int
+ epag_print_page(gx_device_printer *pdev, FILE *fp)
+ {
+ EpagPageCont cont;
+@@ -205,7 +205,7 @@
+ GS, '2', 'a', 'b', 'P', /* ¥¤¥á¡¼¥¸ÉÁ²è¸å²¼¤Ø */
+ };
+
+-private void
++static void
+ epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies)
+ {
+ double xDpi,yDpi;
+@@ -260,7 +260,7 @@
+ fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255);
+ }
+
+-private int
++static int
+ epag_get_params(gx_device *pdev, gs_param_list *plist)
+ {
+ int code;
+@@ -286,7 +286,7 @@
+ }
+
+ /* Put properties. */
+-private int
++static int
+ epag_put_params(gx_device *pdev, gs_param_list *plist)
+ {
+ param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf);
+@@ -380,7 +380,7 @@
+ /*
+ * epag_bubble_flush_all: »Ä¤Ã¤Æ¤¤¤ë bubble¤òÁ´¤Æ½ÐÎϤ¹¤ë¡£
+ */
+-private void epag_bubble_flush_all(EpagPageCont *cont)
++static void epag_bubble_flush_all(EpagPageCont *cont)
+ {
+ int i;
+
+@@ -392,7 +392,7 @@
+ /*
+ * epag_page_cont_init: EpagPageCont¤Î½é´ü²½¡¢¥Ð¥Ã¥Õ¥¡³ÎÊÝÅù
+ */
+-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
+ EpagPageCont *cont)
+ {
+ int bpl;
@@ -417,15 +417,15 @@
cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
if(cont->maxY < cont->bh) cont->maxY = cont->bh;
- cont->bp = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)");
- cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
-+ cont->bp = gs_malloc(pdev->memory, bpl , cont->maxY, "epag_skip_blank_init(bp)");
-+ cont->bp2 = gs_malloc(pdev->memory, bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
++ cont->bp = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl , cont->maxY, "epag_skip_blank_init(bp)");
++ cont->bp2 = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
cont->h = cont->r = 0;
- cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
-+ cont->bubbleTbl=gs_malloc(pdev->memory, sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
++ cont->bubbleTbl = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
for(i=0;i<cont->maxBx;i++)
cont->bubbleTbl[i] = NULL;
- cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
-+ cont->bubbleBuffer=gs_malloc(pdev->memory, sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
++ cont->bubbleBuffer=gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
bbtbl = (EpagBubble *)cont->bubbleBuffer;
for(i=0;i<cont->maxBx-1;i++)
bbtbl[i].next = &bbtbl[i+1];
-@@ -436,9 +436,11 @@
- private void
+@@ -433,15 +433,15 @@
+ cont->freeBubbleList = &bbtbl[0];
+ }
+
+-private void
++static void
epag_page_close(EpagPageCont *cont)
{
- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
- gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
- gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
-+ gx_device* pdev;
-+
-+ gs_free(pdev->memory, cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
-+ gs_free(pdev->memory, cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
-+ gs_free(pdev->memory, cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
+ }
+
+-private int
++static int
+ epag_read_image(EpagPageCont *cont)
+ {
+ int bh = cont->bh;
+@@ -473,7 +473,7 @@
+ /*
+ * bh¹Ôʬ¤Î¥é¥¹¥¿¡¼¥Ç¡¼¥¿¤ò½èÍý¤¹¤ë
+ */
+-private void
++static void
+ epag_process_line(EpagPageCont *cont)
+ {
+ int bh = cont->bh;
+@@ -502,7 +502,7 @@
+ else epag_rect_add(cont, 0, cont->maxBx-1);
+ }
+
+-private int
++static int
+ epag_is_black(EpagPageCont *cont, int bx)
+ {
+ int bh = cont->bh;
+@@ -520,7 +520,7 @@
+ return 0;
+ }
+
+-private void
++static void
+ epag_rect_add(EpagPageCont *cont,int start,int end)
+ {
+ int x0 = start * cont->bw;
+@@ -544,7 +544,7 @@
+ }
+ }
+
+-private void
++static void
+ epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1)
+ {
+ EpagBubble *bbl;
+@@ -569,7 +569,7 @@
+ }
}
- private int
+-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
+ {
+ int bx,bx0,bx1;
+
+@@ -588,7 +588,7 @@
+
+ /* ¥¤¥á¡¼¥¸¤ò½ÐÎÏ */
+
+-private void
++static void
+ epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl)
+ {
+ FILE *fp = cont->fp;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-contrib__japanese__gdevdmpr.c
@@ -0,0 +1,44 @@
+--- contrib/japanese/gdevdmpr.c.orig Thu Apr 26 01:27:24 2007
++++ contrib/japanese/gdevdmpr.c Tue May 15 01:44:09 2007
+@@ -41,8 +41,6 @@
+ /* include library header. */
+ #include "dviprlib.h"
+
+-extern FILE *lib_fopen(const char *);
+-
+ #define LOCAL_DEBUG 0
+
+ #define DEVICE_NAME "dmprt"
+@@ -405,8 +403,6 @@
+ if (pddev->dmprt.max_height>0 && pddev->dmprt.max_height<pddev->height)
+ pddev->height = pddev->dmprt.max_height;
+
+- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
+-
+ return code;
+ }
+
+@@ -425,8 +421,6 @@
+ if (code < 0) return code;
+ if (code == 0) pddev->dmprt.debug_f = vbool;
+
+- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
+-
+ code = param_read_bool(plist, "Verbose", &vbool);
+ if (code < 0) return code;
+ pddev->dmprt.verbose_f = vbool;
+@@ -841,13 +835,12 @@
+ char *env;
+
+ strcpy(fname,fnamebase);
+- fp = lib_fopen(fname);
++ fp = fopen(fname,"r");
+ if (fp == NULL) {
+ env = getenv("TEXCFG");
+ if (env) {
+ strcpy(fname,env);
+ strcat(fname, gp_file_name_concat_string(env,strlen(env)));
+- strcat(fname,fnamebase);
+ fp = fopen(fname,gp_fmode_rb);
+ }
+ }
--- print/ghostscript-gpl/files/patch-lips:gdevlips.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- lips/gdevlips.h.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevlips.h Tue Jan 13 01:23:47 2004
-@@ -188,6 +188,14 @@
- bool faceup;\
- char mediaType[LIPS_MEDIACHAR_MAX];
-
-+/* added by shige 11/06 2003 */
-+#define USE_LIPS_SIZE_ERROR
-+#define LIPS_SIZE_ERROR_VALUE 2
-+
-+/* added by shige 11/09 2003 */
-+#define LIPS_HEIGHT_MAX_720 11906
-+#define LIPS_WIDTH_MAX_720 8419
-+
- int lips_media_selection(int width, int height);
- int lips_packbits_encode(byte * inBuff, byte * outBuff, int Length);
- int lips_mode3format_encode(byte * inBuff, byte * outBuff, int Length);
--- print/ghostscript-gpl/files/patch-src:gdevgdi.c
+++ /dev/null
@@ -1,1007 +0,0 @@
---- src/gdevgdi.c.orig Wed Jun 19 19:32:49 2002
-+++ src/gdevgdi.c Fri Dec 31 17:41:18 2004
-@@ -60,8 +60,8 @@
- #define GDI_REPEAT_LENGTH 2
- #define GDI_BAND_HEIGHT 128
- #define GDI_MAX_BAND 66
--//#define GDI_BAND_WIDTH 4928
--//#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)
-+/*#define GDI_BAND_WIDTH 4928*/
-+/*#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)*/
-
- #define GDI_PRE_COMP 2
- #define GDI_REAL_COMP 0
-@@ -74,8 +74,8 @@
-
- #define GDI_MARGINS_A4 0.167, 0.167, 0.167, 0.167
- #define GDI_MARGINS_LETTER 0.167, 0.167, 0.167, 0.167
--//#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0
--//#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0
-+/*#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0*/
-+/*#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0*/
-
- /* The number of blank lines that make it worthwhile to reposition */
- /* the cursor. */
-@@ -86,9 +86,15 @@
-
- int GDI_BAND_WIDTH[] = {4768, 4928};
-
-+#if GS_VERSION_MAJOR >= 8
-+private int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream);
-+private int gdi_open(gx_device *pdev);
-+private int gdi_close(gx_device *pdev);
-+#else
- private int gdi_print_page(P2(gx_device_printer *pdev, FILE *prn_stream));
- private int gdi_open(P1(gx_device *pdev));
- private int gdi_close(P1(gx_device *pdev));
-+#endif
-
- /* The device descriptors */
- private dev_proc_open_device(gdi_open);
-@@ -107,6 +113,14 @@
- 1, /* color bit */
- gdi_print_page);
-
-+gx_device_printer far_data gs_samsunggdi_device =
-+ prn_device(prn_gdi_procs, "samsunggdi",
-+ DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */
-+ X_DPI2, Y_DPI2,
-+ 0.20, 0.25, 0.25, 0.25, /* margins filled in by gdi_open */
-+ 1, /* color bit */
-+ gdi_print_page);
-+
- private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
- private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo,
- unsigned char ubCompMode, unsigned int usBandWidth,
-@@ -193,9 +207,9 @@
- }
-
- ul_band_size = band_width_bytes * band_height;
-- ibp = (byte *)gs_malloc(ul_band_size, 1, "gdi_print_page");
-- obp = (byte *)gs_malloc(ul_band_size*13/10, 1, "gdi_print_page");
-- tmp = (byte *)gs_malloc(raster, 1, "gdi_print_page");
-+ ibp = (byte *)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page");
-+ obp = (byte *)gs_malloc(pdev->memory, ul_band_size*13/10, 1, "gdi_print_page");
-+ tmp = (byte *)gs_malloc(pdev->memory, raster, 1, "gdi_print_page");
-
- if (!ibp) return_error(gs_error_VMerror);
- if (!obp) return_error(gs_error_VMerror);
-@@ -220,7 +234,7 @@
- memset(obp, 0x00, ul_band_size*13/10);
- for (j=0; j<band_height; j++) {
- memset(tmp, 0x00, raster);
-- //code = gdev_prn_copy_scan_lines(pdev, i*band_height+j,
-+ /*code = gdev_prn_copy_scan_lines(pdev, i*band_height+j, */
- if (y == num_rows) break;
- code = gdev_prn_copy_scan_lines(pdev, y++,
- (byte*)tmp, raster);
-@@ -232,15 +246,71 @@
-
- /* Write Band Data
- Because of Scanline compression, extract Scanline compression mode */
-- //ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);
-- //ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);
-- //ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;
-+ /*ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
-+ /*ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
-+ /*ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;*/
- ul_min_size = ul_tiff_size;
- compression_type = GDI_COMP_MODITIFF;
-- //compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;
-+ /*compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;*/
- switch (compression_type) {
- case GDI_COMP_MODITIFF:
-+#define FUDGE_BIG_BANDS
-+#ifndef FUDGE_BIG_BANDS
- ul_comp_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
-+#else
-+ {
-+ /* Very ugly. The printer will hose if the compressed
-+ band size is over 65536, so we "fudge" the data in
-+ this case repeatedly until we get what we want.
-+
-+ The fudge algorithm is simple, this is kinda-sorta
-+ RLE, so we just round groups of bits in groups of
-+ 2, then 3, then 4, etc until the thing works. */
-+#define MAXBAND 0xffff
-+#define ASSERT(x)
-+ int fudge=0;
-+ byte *use_band=ibp;
-+ do {
-+ ul_comp_size = FrameTiffComp(obp, use_band,
-+ band_height, band_width_bytes,
-+ GDI_REAL_COMP);
-+ if (ul_comp_size > MAXBAND-8) {
-+ int f, g, h;
-+ if (!fudge) {
-+ ASSERT(use_band == ibp);
-+ use_band = (byte*)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page/fudge");
-+ fudge=1;
-+ }
-+ memcpy(use_band, ibp, ul_band_size);
-+ fudge++;
-+ ASSERT(fudge>=2);
-+ {
-+#define FUDGE2(x) ( (((((x)>>6)&0x3)?3:0)<<6) \
-+ | (((((x)>>4)&0x3)?3:0)<<4) \
-+ | (((((x)>>2)&0x3)?3:0)<<2) \
-+ | (((((x)>>0)&0x3)?3:0)) )
-+#define FUDGE4(x) ( (((((x)>>4)&0xf)?0xf:0)<<4) \
-+ | (((((x)>>0)&0xf)?0xf:0)) )
-+#define FUDGE8(x) ( (((((x)>>0)&0xff)?0xf:0)) )
-+#define FUDGE(fudge, x) ( (fudge == 2 ? FUDGE2(x) \
-+ : fudge == 3 ? FUDGE4(x) \
-+ : fudge == 4 ? FUDGE8(x) \
-+ : 0 ) )
-+
-+ for(f=0;f<ul_band_size; f++) {
-+ use_band[f] = FUDGE(fudge, ibp[f]);
-+ }
-+ }
-+ }
-+ } while (ul_comp_size > MAXBAND-8);
-+ oh_well:
-+ if (fudge > 1) {
-+ ASSERT(use_band != ibp);
-+ gs_free(pdev->memory, use_band, ul_band_size, 1, "gdi_print_page/fudge");
-+ /*fprintf(stderr, "smartgdi: band %d fudge factor is %d\n", i, fudge);*/
-+ }
-+ }
-+#endif
- break;
- case GDI_COMP_SCANLINE:
- ul_comp_size = bmp2run(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
-@@ -253,15 +323,15 @@
-
- prn_stream = WriteBandHeader(prn_stream, i, compression_type, (band_width_bytes * 8),
- band_height, ul_comp_size);
-- //fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);
-+ /*fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);*/
- fwrite(obp, ul_comp_size, 1, prn_stream);
- }
-
- /* Trailer Output */
- WriteTrailerData(prn_stream);
-- gs_free(ibp, ul_band_size, 1, "gdi_line_buffer");
-- gs_free(obp, ul_band_size*13/10, 1, "gdi_line_buffer");
-- gs_free(tmp, raster, 1, "gdi_line_buffer");
-+ gs_free(pdev->memory, ibp, ul_band_size, 1, "gdi_line_buffer");
-+ gs_free(pdev->memory, obp, ul_band_size*13/10, 1, "gdi_line_buffer");
-+ gs_free(pdev->memory, tmp, raster, 1, "gdi_line_buffer");
- return code;
- }
-
-@@ -271,50 +341,50 @@
- unsigned char buffer[300];
- int dots_per_inch = (int)pdev->y_pixels_per_inch;
-
-- strcpy(buffer, "\x1b%-12345X");
-+ strcpy(buffer, "\033%-12345X");
-
-- // Paper Type
-- strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\x0d\x0a");
-- //Density
-- strcat(buffer, "@PJL SET DENSITY = 1\x0d\x0a");
-- // Toner Save
-- strcat(buffer, "@PJL SET TONERSAVE = OFF\x0d\x0a");
-- // Enter Language SMART
-- strcat(buffer, "@PJL ENTER LANGUAGE = SMART\x0d\x0a");
-- // JobStart
-- strcat(buffer, "$PJL JOB START\x0d\x0a");
-+ /* Paper Type*/
-+ strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\015\012");
-+ /*Density*/
-+ strcat(buffer, "@PJL SET DENSITY = 1\015\012");
-+ /* Toner Save*/
-+ strcat(buffer, "@PJL SET TONERSAVE = OFF\015\012");
-+ /* Enter Language SMART*/
-+ strcat(buffer, "@PJL ENTER LANGUAGE = SMART\015\012");
-+ /* JobStart*/
-+ strcat(buffer, "$PJL JOB START\015\012");
-
-- // Resolution
-+ /* Resolution*/
- if (dots_per_inch == 600)
-- strcat(buffer, "$PJL RESOLUTION = 600\x0d\x0a");
-+ strcat(buffer, "$PJL RESOLUTION = 600\015\012");
- else
-- strcat(buffer, "$PJL RESOLUTION = 300\x0d\x0a");
-+ strcat(buffer, "$PJL RESOLUTION = 300\015\012");
-
-- // Copies
-- strcat(buffer, "$PJL COPIES = 1\x0d\x0a");
-- // Paper Size
-+ /* Copies*/
-+ strcat(buffer, "$PJL COPIES = 1\015\012");
-+ /* Paper Size*/
- switch (gdev_pcl_paper_size((gx_device*)pdev))
- {
- case PAPER_SIZE_A4:
-- strcat(buffer, "$PJL PAGE A4 AUTO\x0d\x0a");
-+ strcat(buffer, "$PJL PAGE A4 AUTO\015\012");
- break;
- case PAPER_SIZE_LETTER:
-- strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
-+ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
- break;
- case PAPER_SIZE_LEGAL:
-- strcat(buffer, "$PJL PAGE LEGAL AUTO\x0d\x0a");
-+ strcat(buffer, "$PJL PAGE LEGAL AUTO\015\012");
- break;
- default:
-- strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
-+ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
- break;
- }
-- // bitmap start
-- strcat(buffer, "$PJL BITMAP START\x0d\x0a");
-- // write buffer to file.
-+ /* bitmap start*/
-+ strcat(buffer, "$PJL BITMAP START\015\012");
-+ /* write buffer to file.*/
- ulSize = strlen(buffer);
- fwrite(buffer, 1, ulSize, fp );
- return(fp);
--} // WritePJLHeaderData()
-+} /* WritePJLHeaderData() */
-
-
- FILE *WriteBandHeader
-@@ -335,33 +405,33 @@
-
- ulBandSize += 8;
-
-- // bandsize
-+ /* bandsize*/
- buf[i++] = (unsigned char)((ulBandSize >> 24) & 0xff);
- buf[i++] = (unsigned char)((ulBandSize >> 16) & 0xff);
- buf[i++] = (unsigned char)((ulBandSize >> 8) & 0xff);
- buf[i++] = (unsigned char)(ulBandSize & 0xff);
-
-- // id
-+ /* id */
- buf[i++] = (unsigned char)((usBandNo >> 8) & 0xff);
- buf[i++] = (unsigned char)(usBandNo & 0xff);
-
-- // compress mode
-+ /* compress mode */
- buf[i++] = (unsigned char)(ubCompMode & 0xff);
-
-- // ubLeft
-+ /* ubLeft */
- buf[i++] = (unsigned char)(ubLeft & 0xff);
-
-- // height
-+ /* height*/
- buf[i++] = (unsigned char)((usBandHeight >> 8) & 0xff);
- buf[i++] = (unsigned char)(usBandHeight & 0xff);
-
-- // width
-+ /* width */
- buf[i++] = (unsigned char)((usBandWidth >> 8) & 0xff);
- buf[i++] = (unsigned char)(usBandWidth & 0xff);
-
- fwrite(buf, 1, i, fp);
- return(fp);
--} // end of WriteBandHeader()
-+} /* end of WriteBandHeader()*/
-
- FILE *WriteTrailerData(FILE *fp)
- {
-@@ -369,18 +439,18 @@
- unsigned long buffer[200];
-
- memset((char*)buffer, 0x00, 200);
-- strcpy((char*)buffer, "$PJL PRINT 4\x0d\x0a");
-- strcat((char*)buffer, "$PJL EOJ\x0d\x0a");
-- strcat((char*)buffer, "$PJL SYNC\x0d\x0a");
-- strcat((char*)buffer, "$PJL RELEASE 0 2047\x0d\x0a");
-- strcat((char*)buffer, "$PJL GARBAGE\x0d\x0a");
-- strcat((char*)buffer, "\x1b%-12345X\x0d\x0a");
-+ strcpy((char*)buffer, "$PJL PRINT 4\015\012");
-+ strcat((char*)buffer, "$PJL EOJ\015\012");
-+ strcat((char*)buffer, "$PJL SYNC\015\012");
-+ strcat((char*)buffer, "$PJL RELEASE 0 2047\015\012");
-+ strcat((char*)buffer, "$PJL GARBAGE\015\012");
-+ strcat((char*)buffer, "\033%-12345X\015\012");
-
- ulSize = strlen((char*)buffer);
- fwrite(buffer, 1, ulSize, fp);
-
- return(fp);
--} // WriteTrailerData()
-+} /* WriteTrailerData()*/
-
- unsigned long FrameTiffComp(unsigned char *pubDest,
- unsigned char *pubSrc,
-@@ -399,7 +469,7 @@
-
- for (i = 0; i < usTotalLines; i++)
- {
-- if (!(ubMode & 0x02)) //
-+ if (!(ubMode & 0x02))
- {
- usLineSize = FrameTiff_Comp(SrcPtr, TgtPtr, usBytesPerLine);
- }
-@@ -416,7 +486,7 @@
- ulret += usLineSize;
- }
-
-- if (!(ubMode & 0x02)) //
-+ if (!(ubMode & 0x02))
- {
- switch (ulret%4)
- {
-@@ -448,7 +518,7 @@
- }
- }
- return(ulret);
--} // FrameTiffComp()
-+} /* FrameTiffComp()*/
-
- unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf, unsigned int nSrcBytes)
- {
-@@ -528,13 +598,13 @@
- usEndCnt = 16384;
- }
- usEndCnt = usCount - 2;
-- // usEndCnt = usCount - 2; original
-- // 19990824 by LSM : for end file while (usEndCnt--)
-+ /* usEndCnt = usCount - 2; original*/
-+ /* 19990824 by LSM : for end file while (usEndCnt--)*/
- while (usEndCnt--)
- {
- /* read next data */
- ubFirst = ubSecond;
-- ubSecond = *pubSrc++; // read 3rd Data
-+ ubSecond = *pubSrc++; /* read 3rd Data*/
- if (ubFirst == ubSecond)
- {
- if (usEndCnt <= 1)
-@@ -544,7 +614,7 @@
- }
- else
- {
-- ubSecond = *pubSrc++; // read 4th Data
-+ ubSecond = *pubSrc++; /* read 4th Data*/
- usEndCnt--;
- if (ubFirst == ubSecond)
- {
-@@ -660,14 +730,14 @@
- {
- usEndCnt = 16384;
- }
-- // usEndCnt = usCount - 2;
-+ /* usEndCnt = usCount - 2;*/
- usEndCnt = usCount - 2;
-- // 19990824 by LSM : for Last file while (usEndCnt--)
-+ /* 19990824 by LSM : for Last file while (usEndCnt--)*/
- while (usEndCnt--)
- {
- /* read next data */
- ubFirst = ubSecond;
-- ubSecond = *pubSrc++; // read 3rd Data
-+ ubSecond = *pubSrc++; /* read 3rd Data*/
- if (ubFirst == ubSecond)
- {
- if (usEndCnt <= 1)
-@@ -677,8 +747,8 @@
- }
- else
- {
-- ubSecond = *pubSrc++; // read 4th Data
-- usEndCnt--; // 19990824 by LSM
-+ ubSecond = *pubSrc++; /* read 4th Data*/
-+ usEndCnt--; /* 19990824 by LSM*/
- if (ubFirst == ubSecond)
- {
- ubMisCnt = 3;
-@@ -691,7 +761,7 @@
- /* save data */
- usControl = (unsigned int) (pubSrc - pubOrg);
- usControl -= ubMisCnt;
-- // 19990824 by LSM : for fixing GPF on Photoshop
-+ /* 19990824 by LSM : for fixing GPF on Photoshop*/
- if (usControl > usCount)
- {
- usControl = usCount;
-@@ -728,77 +798,77 @@
- } sc_tbl;
-
- static sc_tbl gdi_ScanTbl[256] = {
--{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, // 0x00
-+{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, /* 0x00*/
- { 5, 1, 0 }, { 0, 0, 1 }, { 5, 2, 0 }, { 5, 3, 1 },
- { 4, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 4, 2, 0 }, { 0, 0, 1 }, { 4, 3, 0 }, { 4, 4, 1 },
--{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x10
-+{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x10*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 3, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 3, 3, 0 }, { 0, 0, 1 }, { 3, 4, 0 }, { 3, 5, 1 },
--{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x20
-+{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x20*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x30
-+{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x30*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 2, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 2, 4, 0 }, { 0, 0, 1 }, { 2, 5, 0 }, { 2, 6, 1 },
--{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x40
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x40*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x50
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x50*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x60
-+{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x60*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x70
-+{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x70*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 1, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 1, 5, 0 }, { 0, 0, 1 }, { 1, 6, 0 }, { 1, 7, 1 },
--{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x80
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x80*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x90
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x90*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xa0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xa0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xb0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xb0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xc0
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xc0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xd0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xd0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xe0
-+{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xe0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
--{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xf0
-+{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xf0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 5, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },
- { 0, 6, 0 }, { 0, 0, 1 }, { 0, 7, 0 }, { 0, 8, 1 },
- };
-
- static sc_tbl gdi_ScanTbl4[16] = {
--{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, // 0x00
--{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, // 0x04
--{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x08
--{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } // 0x0c
-+{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, /* 0x00*/
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, /* 0x04*/
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x08*/
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } /* 0x0c*/
- };
-
- long SaveScanData( unsigned char *, unsigned short, unsigned short, unsigned short, unsigned short, unsigned short );
-@@ -816,32 +886,32 @@
- lWarp = (long)(usWarp << 3);
- lDis = ((long)usDy * lWarp) + (long)sDx;
-
-- // 1st, 2nd, 3rd & 4th byte
-- ultmp_dat = 0xc0000000;
-+ /* 1st, 2nd, 3rd & 4th byte*/
-+ ultmp_dat = 0xc0000000ul;
- if (lDis < 0)
- {
-- ultmp_dat |= 0x20000000;
-+ ultmp_dat |= 0x20000000ul;
- }
-- ultmp_dat |= (lDis & 0x1fffffff);
-- *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000) >> 24);
-- *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000) >> 16);
-- *out_buf++ = (unsigned char)((ultmp_dat & 0xff00) >> 8);
-- *out_buf++ = (unsigned char)(ultmp_dat & 0xff);
-+ ultmp_dat |= (lDis & 0x1ffffffful);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000ul) >> 24);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000ul) >> 16);
-+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff00ul) >> 8);
-+ *out_buf++ = (unsigned char)(ultmp_dat & 0xfful);
-
-- // 5th & 6th byte
-+ /* 5th & 6th byte*/
- ustmp_dat = 0xc000;
- ustmp_dat |= (usRl & 0x3fff);
- *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
- *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
-
- return(6);
--} // Save6Bytes()
-+} /* Save6Bytes()*/
-
- long Save4Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
- {
- unsigned short ustmp_dat;
-
-- // 1st & 2nd byte
-+ /* 1st & 2nd byte*/
- ustmp_dat = 0x8000;
- if (sDx < 0)
- {
-@@ -851,7 +921,7 @@
- *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
- *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
-
-- // 3rd & 4th byte
-+ /* 3rd & 4th byte*/
- ustmp_dat = 0x8000;
- ustmp_dat |= ((usDy & 0x03) << 12);
- ustmp_dat |= (usRl & 0xfff);
-@@ -859,13 +929,13 @@
- *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
-
- return(4);
--} // end of Save4Bytes()
-+} /* end of Save4Bytes()*/
-
- long Save2Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
- {
- unsigned char ubtmp_dat;
-
-- // 1st byte
-+ /* 1st byte*/
- ubtmp_dat = 0x00;
- if (usDy == 1)
- {
-@@ -874,7 +944,7 @@
- ubtmp_dat |= (usRl & 0x3f);
- *out_buf++ = ubtmp_dat;
-
-- // 2nd byte
-+ /* 2nd byte*/
- if (sDx < 0)
- {
- ubtmp_dat = 0x80;
-@@ -886,7 +956,7 @@
- ubtmp_dat |= ((unsigned char)sDx & 0x7f);
- *out_buf++ = ubtmp_dat;
- return(2);
--} // end of Save2Bytes()
-+} /* end of Save2Bytes()*/
-
- long SaveScanData (unsigned char *out_buf,
- unsigned short us1Cnt,
-@@ -900,26 +970,26 @@
-
- sDisX = (int)usPosX01 - (int)usPosX10;
-
-- // 48 bit
-+ /* 48 bit*/
- if ( (usDy > 3) || (us1Cnt > 4095) )
- {
- Save6Bytes(out_buf, usDy, us1Cnt, sDisX, usWarp);
- lRet = 6;
- }
-- // 32 bit
-+ /* 32 bit*/
- else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) )
- {
- Save4Bytes(out_buf, usDy, us1Cnt, sDisX);
- lRet = 4;
- }
-- // 16 bit
-+ /* 16 bit*/
- else
- {
- Save2Bytes(out_buf, usDy, us1Cnt, sDisX);
- lRet = 2;
- }
- return(lRet);
--} // end of SaveScanData()
-+} /* end of SaveScanData()*/
-
-
- long UpdateScanSize (unsigned char *out_buf,
-@@ -934,23 +1004,23 @@
-
- sDisX = usPosX01 - usPosX10;
-
-- // 48 bit
-+ /* 48 bit*/
- if ( (usDy > 3) || (us1Cnt > 4095) )
- {
- lRet = 6;
- }
-- // 32 bit
-+ /* 32 bit*/
- else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) )
- {
- lRet = 4;
- }
-- // 16 bit
-+ /* 16 bit*/
- else
- {
- lRet = 2;
- }
- return(lRet);
--} // end of UpdateScanSize() by bglee 19981224
-+} /* end of UpdateScanSize() by bglee 19981224*/
-
- long GetSimpleScan(unsigned char *out_buf,
- unsigned char ubSizeMode,
-@@ -983,10 +1053,10 @@
- }
-
-
-- // 1 X 1 X
-+ /* 1 X 1 X*/
- if (ubPreBit)
- {
-- // 1 0 1 X
-+ /* 1 0 1 X*/
- if (ubDx)
- {
- lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -994,23 +1064,23 @@
- *usPosX01 = usBytePos + ubDx;
- *us1Count = ubRl;
- *usDy = 0;
-- // 1 0 1 0
-+ /* 1 0 1 0*/
- if (!ubLastBit)
- {
-- // 19990330 by bglee
-+ /* 19990330 by bglee*/
- out_buf = out_buf + lScanSize;
-
- lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
- *usPosX10 = *usPosX01 ;
- *us1Count = 0;
- }
-- // 1 0 1 1
-+ /* 1 0 1 1*/
- }
-- // 1 1 1 X
-+ /* 1 1 1 X*/
- else
- {
- *us1Count += ubRl;
-- // 1 1 1 0
-+ /* 1 1 1 0*/
- if (!ubLastBit)
- {
- lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -1018,16 +1088,16 @@
- *us1Count = 0;
- *usDy = 0;
- }
-- // 1 1 1 1
-+ /* 1 1 1 1*/
- }
- }
-- // 0 X 1 X
-+ /* 0 X 1 X*/
- else
- {
-- // 0 X 1 X
-+ /* 0 X 1 X*/
- *usPosX01 = usBytePos + ubDx;
- *us1Count += ubRl;
-- // 0 X 1 0
-+ /* 0 X 1 0*/
- if (!ubLastBit)
- {
- lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -1035,11 +1105,11 @@
- *us1Count = 0;
- *usDy = 0;
- }
-- // 0 X 1 1
-+ /* 0 X 1 1*/
- }
-
- return(lScanSize);
--} // end of GetSimpleScan()
-+} /* end of GetSimpleScan() */
-
-
- long scan_map (unsigned char *in_buf,
-@@ -1049,7 +1119,7 @@
- unsigned char ubMode)
- {
- unsigned int i, j, k;
-- unsigned char ubPreBit, ubCrtByte;//, ubLastBit;
-+ unsigned char ubPreBit, ubCrtByte;/*, ubLastBit;*/
- long lScanSize, lTmp;
- long lCrtSize;
- unsigned short us1Count;
-@@ -1078,7 +1148,7 @@
- switch (ubCrtByte)
- {
- case 0x00:
-- // 1 0
-+ /* 1 0 */
- if (ubPreBit)
- {
- lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1088,16 +1158,16 @@
- us1Count = 0;
- usDy = 0;
- }
-- // 0 0
-+ /* 0 0*/
- break;
-
- case 0xff:
-- // 1 1
-+ /* 1 1*/
- if (ubPreBit)
- {
- us1Count += 8;
- }
-- // 0 1
-+ /* 0 1*/
- else
- {
- us1Count = 8;
-@@ -1106,7 +1176,7 @@
- break;
-
- default:
-- // X X 1 X
-+ /* X X 1 X*/
- if (gdi_ScanTbl[ubCrtByte].ubRl)
- {
- usBytePos = (j << 3);
-@@ -1114,7 +1184,7 @@
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
- }
-- // complex pattern
-+ /* complex pattern*/
- else
- {
- for (k = 0; k < 2; k++)
-@@ -1124,7 +1194,7 @@
- switch (ubTemp)
- {
- case 0x00:
-- // 1 0
-+ /* 1 0*/
- if (ubPreBit)
- {
- lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1134,16 +1204,16 @@
- us1Count = 0;
- usDy = 0;
- }
-- // 0 0
-+ /* 0 0*/
- break;
-
- case 0x0f:
-- // 1 1
-+ /* 1 1*/
- if (ubPreBit)
- {
- us1Count += 4;
- }
-- // 0 1
-+ /* 0 1*/
- else
- {
- us1Count = 4;
-@@ -1152,7 +1222,7 @@
- break;
-
- case 0x05:
-- // 1 0101
-+ /* 1 0101*/
- if (ubPreBit)
- {
- lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1162,13 +1232,13 @@
- usPosX10 = usBytePos - us1Count;
- usDy = 0;
- }
-- // 0 0101
-+ /* 0 0101*/
- usPosX01 = usBytePos + 1;
- lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, usDy, usPosX10, usPosX01, usWidth);
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-
-- // next
-+ /* next*/
- usPosX10 = 0;
- usPosX01 = 2;
- usDy = 0;
-@@ -1176,12 +1246,12 @@
- break;
-
- case 0x09:
-- // 1 1001
-+ /* 1 1001*/
- if (ubPreBit)
- {
- us1Count++;
- }
-- // 0 1001
-+ /* 0 1001*/
- else
- {
- usPosX01 = usBytePos;
-@@ -1191,7 +1261,7 @@
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-
-- // next
-+ /* next*/
- if (ubPreBit)
- {
- usPosX10 = usBytePos - us1Count + 1;
-@@ -1207,12 +1277,12 @@
- break;
-
- case 0x0a:
-- // 1 1010
-+ /* 1 1010*/
- if (ubPreBit)
- {
- us1Count++;
- }
-- // 0 1010
-+ /* 0 1010*/
- else
- {
- us1Count = 1;
-@@ -1222,25 +1292,25 @@
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-
-- // next
-+ /* next*/
- usPosX10 = usBytePos - us1Count + 1;
- usPosX01 = usBytePos + 2;
- lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, 0, usPosX10, usPosX01, usWidth);
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-- // next
-+ /* next*/
- usPosX10 = usBytePos + 2;
- usDy = 0;
- us1Count = 0;
- break;
-
- case 0x0b:
-- // 1 1011
-+ /* 1 1011*/
- if (ubPreBit)
- {
- us1Count++;
- }
-- // 0 1011
-+ /* 0 1011*/
- else
- {
- us1Count = 1;
-@@ -1250,7 +1320,7 @@
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-
-- // next
-+ /* next*/
- if (ubPreBit)
- {
- usPosX10 = usBytePos - us1Count + 1;
-@@ -1267,12 +1337,12 @@
- break;
-
- case 0x0d:
-- // 1 1101
-+ /* 1 1101*/
- if (ubPreBit)
- {
- us1Count += 2;
- }
-- // 0 1101
-+ /* 0 1101*/
- else
- {
- us1Count = 2;
-@@ -1282,7 +1352,7 @@
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
-
-- // next
-+ /* next*/
- if (ubPreBit)
- {
- usPosX10 = usBytePos - us1Count + 2;
-@@ -1298,17 +1368,17 @@
- break;
-
- default:
-- // X X 1 X
-+ /* X X 1 X*/
- lTmp = GetSimpleScan(out_buf, ubSizeMode, &us1Count, &usDy, &usPosX10, &usPosX01, usBytePos, ubTemp, 4, ubPreBit, usWidth);
- out_buf = out_buf + lTmp;
- lScanSize += lTmp;
- break;
-- } // end of switch()
-+ } /* end of switch()*/
- ubPreBit = ubTemp & 0x01;
-- } // end of k-loop
-+ } /* end of k-loop*/
- }
- break;
-- } // end of switch()
-+ } /* end of switch()*/
-
- ubPreBit = ubCrtByte & 0x01;
- } /*for usWidth */
-@@ -1326,7 +1396,7 @@
- }
- usDy++;
-
-- // check size over
-+ /* check size over*/
- if ( (i % 5) == 4 )
- {
- lCrtSize = (long)((long)usWidth * (long)(i + 1));
-@@ -1342,7 +1412,7 @@
- lScanSize = -1;
- }
- return(lScanSize);
--} // end of scan_map()
-+} /* end of scan_map() */
-
- /*****************************************************************
- * H : bmp2run
-@@ -1362,7 +1432,7 @@
- unsigned char *tmp_buf1, *tmp_buf2;
- long scan_size;
-
-- //return(-1); // 19990323 by bglee - request from SM Lee
-+ /*return(-1);*/ /* 19990323 by bglee - request from SM Lee*/
-
- tmp_buf1 = in_buf;
- tmp_buf2 = out_buf;
-@@ -1372,7 +1442,7 @@
- return(-1);
- }
-
-- if ( !(ubMode & 0x02) ) // real compression //---
-+ if ( !(ubMode & 0x02) ) /* real compression */
- {
- out_buf = tmp_buf2 + scan_size;
- *out_buf++ = 0x00;
-@@ -1385,7 +1455,7 @@
- scan_size += 2;
- }
- }
-- else // pre-compression
-+ else /* pre-compression*/
- {
- scan_size += 2;
- if (scan_size % 4)
--- print/ghostscript-gpl/files/patch-lips__gdevrpdl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevrpdl.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevrpdl.c Fri Dec 31 17:34:04 2004
-@@ -81,7 +81,7 @@
- if (pdev->PageCount == 0)
- rpdl_printer_initialize(pdev, prn_stream, num_coipes);
-
-- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
-+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
- return_error(gs_error_VMerror);
-
- lprn->NegativePrint = false; /* Not Support */
-@@ -90,7 +90,7 @@
- if (code < 0)
- return code;
-
-- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
-+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
-
- fprintf(prn_stream, "\014"); /* Form Feed */
-
--- print/ghostscript-gpl/files/patch-src:smartgdi-contrib.mak
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/smartgdi-contrib.mak.orig Wed Jun 19 21:43:43 2002
-+++ src/smartgdi-contrib.mak Mon Jul 21 13:59:00 2003
-@@ -3,10 +3,12 @@
- ### Note : this driver is used by Samsung SmartGDI compatible printers. ###
- ###
-
-+gdi_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR)
-+
- GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
-
- $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
- $(SETPDEV) $(DD)gdi $(GDIMONO)
-
- $(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
-- $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-+ $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(gdi_opts) $(GLSRC)gdevgdi.c
--- print/ghostscript-gpl/files/patch-src-gdevdmpr.mak
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gdevdmpr.mak.orig Mon May 1 20:24:43 2000
-+++ src/gdevdmpr.mak Mon May 1 20:26:23 2000
-@@ -1,8 +1,12 @@
- ### ---------------- Dot matrix printer device ---------------- ###
--dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
-+dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
-
--dmprt.dev: $(dmprt_)
-- $(SETDEV) dmprt $(dmprt_)
-- $(ADDMOD) dmprt -ps dmp_init
--gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
--dviprlib.$(OBJ): dviprlib.c dviprlib.h
-+$(DD)dmprt.dev: $(dmprt_)
-+ $(SETDEV) $(DD)dmprt $(dmprt_)
-+ $(ADDMOD) $(DD)dmprt -ps dmp_init
-+
-+$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
-+ $(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
-+
-+$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
-+ $(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
--- print/ghostscript-gpl/files/patch-lips:gdevl4r.c
+++ /dev/null
@@ -1,176 +0,0 @@
---- lips/gdevl4r.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevl4r.c Fri Dec 17 19:19:02 2004
-@@ -53,8 +53,8 @@
- #define lips_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\
- print_page_copies, image_out, cassetFeed, username)\
- { std_device_std_color_full_body(dtype, &procs, dname,\
-- (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\
-- (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\
-+ (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\
-+ (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\
- xdpi, ydpi, color_bits,\
- -(lm) * (xdpi), -(tm) * (ydpi),\
- (lm) * 72.0, (bm) * 72.0,\
-@@ -68,8 +68,8 @@
- #define lips4_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\
- print_page_copies, image_out, cassetFeed, username)\
- { std_device_std_color_full_body(dtype, &procs, dname,\
-- (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\
-- (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\
-+ (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\
-+ (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\
- xdpi, ydpi, color_bits,\
- -(lm) * (xdpi), -(tm) * (ydpi),\
- (lm) * 72.0, (bm) * 72.0,\
-@@ -178,8 +178,13 @@
- private int lips4c_output_page(gx_device_printer * pdev, FILE * prn_stream);
- private int lips_delta_encode(byte * inBuff, byte * prevBuff, byte * outBuff, byte * diffBuff, int Length);
- private int lips_byte_cat(byte * TotalBuff, byte * Buff, int TotalLen, int Len);
-+#if GS_VERSION_MAJOR >= 8
-+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
-+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
-+#else
- private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
- private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
-+#endif
- private int lips4type_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, int num_copies, int ptype);
-
- private int
-@@ -597,7 +602,7 @@
- /* Initialize printer. */
- lips_job_start(pdev, ptype, prn_stream, num_copies);
-
-- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
-+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
- return_error(gs_error_VMerror);
-
-
-@@ -607,7 +612,7 @@
- if (code < 0)
- return code;
-
-- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-
- /* eject page */
- lips_job_end(pdev, prn_stream);
-@@ -641,9 +646,9 @@
-
- if (pdev->color_info.depth == 1)
- {
-- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
-+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
- return_error(gs_error_VMerror);
-- if (!(lprn->CompBuf2 = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
-+ if (!(lprn->CompBuf2 = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
- return_error(gs_error_VMerror);
-
- if (lprn->NegativePrint) {
-@@ -663,8 +668,8 @@
- if (code < 0)
- return code;
-
-- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-- gs_free(lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
-+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-+ gs_free(pdev->memory, lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
- }
- else
- {
-@@ -903,15 +908,15 @@
- int lnum = 0;
-
- /* Memory Allocate */
-- if (!(pBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
-+ if (!(pBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
- return_error(gs_error_VMerror);
-- if (!(prevBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
-+ if (!(prevBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
- return_error(gs_error_VMerror);
-- if (!(ComBuff = (byte *) gs_malloc(Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
-+ if (!(ComBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
- return_error(gs_error_VMerror);
-- if (!(TotalBuff = (byte *) gs_malloc((Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
-+ if (!(TotalBuff = (byte *) gs_malloc(pdev->memory, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
- return_error(gs_error_VMerror);
-- if (!(diffBuff = (byte *) gs_malloc(Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
-+ if (!(diffBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
- return_error(gs_error_VMerror);
-
- /* make output data */
-@@ -927,11 +932,11 @@
- pdev->height - (lnum - NUM_LINES_4C));
- }
- /* Free Memory */
-- gs_free(pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
-- gs_free(prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
-- gs_free(ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
-- gs_free(TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
-- gs_free(diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
-+ gs_free(pdev->memory, pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
-+ gs_free(pdev->memory, prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
-+ gs_free(pdev->memory, ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
-+ gs_free(pdev->memory, TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
-+ gs_free(pdev->memory, diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
-
- return 0;
- }
-@@ -1065,11 +1070,25 @@
- if (paper_size == USER_SIZE) {
- fprintf(prn_stream, "%c2 I", LIPS_CSI);
- fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI,
-- width * 10, height * 10);
-+ /* modified by shige 06/27 2003
-+ width * 10, height * 10); */
-+ /* modified by shige 11/09 2003
-+ height * 10, width * 10); */
-+ (height * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (height * 10),
-+ (width * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (width * 10));
- } else if (paper_size == USER_SIZE + LANDSCAPE) {
- fprintf(prn_stream, "%c2 I", LIPS_CSI);
- fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI,
-- height * 10, width * 10);
-+ /* modified by shige 06/27 2003
-+ width * 10, height * 10); */
-+ /* modified by shige 11/09 2003
-+ width * 10, height * 10); */
-+ (width * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (width * 10),
-+ (height * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (height * 10));
- } else {
- fprintf(prn_stream, "%c%dp", LIPS_CSI, paper_size);
- }
-@@ -1078,14 +1097,28 @@
- prev_paper_height != height) {
- fprintf(prn_stream, "%c2 I", LIPS_CSI);
- fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI,
-- width * 10, height * 10);
-+ /* modified by shige 06/27 2003
-+ width * 10, height * 10); */
-+ /* modified by shige 11/09 2003
-+ height * 10, width * 10); */
-+ (height * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (height * 10),
-+ (width * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (width * 10));
- }
- } else if (paper_size == USER_SIZE + LANDSCAPE) {
- if (prev_paper_width != width ||
- prev_paper_height != height) {
- fprintf(prn_stream, "%c2 I", LIPS_CSI);
- fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI,
-- height * 10, width * 10);
-+ /* modified by shige 06/27 2003
-+ height * 10, width * 10); */
-+ /* modified by shige 11/09 2003
-+ width * 10, height * 10); */
-+ (width * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (width * 10),
-+ (height * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (height * 10));
- }
- }
- /* desired number of copies */
--- print/ghostscript-gpl/files/patch-src__unix-dll.mak
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./src/unix-dll.mak.orig 2009-01-03 14:55:23 -0500
-+++ ./src/unix-dll.mak 2009-01-03 14:57:45 -0500
-@@ -108,19 +108,19 @@
- $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
-
- install-so: so
-- -mkdir -p $(prefix)
-- -mkdir -p $(datadir)
-- -mkdir -p $(gsdir)
-- -mkdir -p $(gsdatadir)
-- -mkdir -p $(bindir)
-- -mkdir -p $(libdir)
-- $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
-- $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
-- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-- $(RM_) $(libdir)/$(GS_SONAME)
-- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-- $(RM_) $(libdir)/$(GS_SONAME_MAJOR)
-- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+ -mkdir -p $(DESTDIR)$(prefix)
-+ -mkdir -p $(DESTDIR)$(datadir)
-+ -mkdir -p $(DESTDIR)$(gsdir)
-+ -mkdir -p $(DESTDIR)$(gsdatadir)
-+ -mkdir -p $(DESTDIR)$(bindir)
-+ -mkdir -p $(DESTDIR)$(libdir)
-+ $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+ $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-
- soinstall: install-so install-scripts install-data
-
--- print/ghostscript-gpl/files/patch-src:gdevdj9.c
+++ /dev/null
@@ -1,273 +0,0 @@
---- src/gdevdj9.c.orig Fri Dec 17 19:31:42 2004
-+++ src/gdevdj9.c Fri Dec 17 19:44:07 2004
-@@ -243,19 +243,19 @@
- };
-
- private int
-- rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise1x1(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise2x1(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise1x2(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise2x2(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
-
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
- {
- rescale_byte_wise1x1, rescale_byte_wise1x2
- },
-@@ -264,7 +264,7 @@
- }
- };
- /*
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
- {
- rescale_byte_wise1x1, rescale_byte_wise1x1
- },
-@@ -273,8 +273,8 @@
- }
- };
- */
--private int cdj970_write_header(P2(gx_device *, FILE *));
--private int cdj970_write_trailer(P2(gx_device *, FILE *));
-+private int cdj970_write_header(gx_device *, FILE *);
-+private int cdj970_write_trailer(gx_device *, FILE *);
-
- /*
- * Drivers stuff.
-@@ -422,16 +422,16 @@
- };
-
- /* function pointer typedefs for device driver struct */
--typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
-- FILE * prn_stream));
--typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
-+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
-+ FILE * prn_stream);
-+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
-
--typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
-+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
-
- typedef struct gx_device_cdj970_s {
- gx_device_common;
-@@ -529,18 +529,18 @@
- }
-
- private void
-- cdj970_start_raster_mode(P3(gx_device_printer * pdev,
-- int papersize, FILE * prn_stream));
-+ cdj970_start_raster_mode(gx_device_printer * pdev,
-+ int papersize, FILE * prn_stream);
-
- private void
-- cdj970_print_non_blank_lines(P6(gx_device_printer * pdev,
-+ cdj970_print_non_blank_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
- private void
-- cdj970_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+ cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-
-
- private const gx_device_procs cdj970_procs =
-@@ -555,12 +555,12 @@
- cdj970_terminate_page);
-
- /* Forward references */
--private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
-- int *, int, int, int));
--private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
-- *, float, float, int));
--private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
--private int cdj_set_bpp(P3(gx_device *, int, int));
-+private int cdj_put_param_int(gs_param_list *, gs_param_name,
-+ int *, int, int, int);
-+private int cdj_put_param_float(gs_param_list *, gs_param_name, float
-+ *, float, float, int);
-+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-+private int cdj_set_bpp(gx_device *, int, int);
-
- static int PageCtr = 0;
-
-@@ -692,70 +692,70 @@
-
- /* internal functions */
- private void
-- FSDlinebw(P7(int scan, int plane_size,
-+ FSDlinebw(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * kP,
-- int n, int *ep, byte * dp));
-+ int n, int *ep, byte * dp);
-
- private void
-- FSDlinec2(P9(int scan, int plane_size,
-+ FSDlinec2(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa, int n,
-- byte * dp, int *ep));
-+ byte * dp, int *ep);
-
- private void
-- FSDlinec3(P12(int scan, int plane_size,
-+ FSDlinec3(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa,
- byte * cPb, byte * mPb, byte * yPb,
-- int n, byte * dp, int *ep));
-+ int n, byte * dp, int *ep);
-
- private void
-- FSDlinec4(P12(int scan, int plane_size,
-+ FSDlinec4(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa,
- byte * cPb, byte * mPb, byte * yPb,
-- int n, byte * dp, int *ep));
-+ int n, byte * dp, int *ep);
-
- private void
- init_error_buffer(struct misc_struct *misc_vars,
- struct ptr_arrays *data_ptrs);
-
- private void
-- do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
-+ do_floyd_steinberg(int scan, int cscan, int plane_size,
- int plane_size_c, int n,
- struct ptr_arrays *data_ptrs,
- gx_device_printer * pdev,
-- struct error_val_field *error_values));
-+ struct error_val_field *error_values);
-
-
- private int
-- do_gcr(P7(int bytecount, byte * inbyte, const byte * kvalues,
-+ do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
- const byte * cvalues, const byte * mvalues,
-- const byte * yvalues, const int *kcorrect));
-+ const byte * yvalues, const int *kcorrect);
-
- private void
-- send_scan_lines(P6(gx_device_printer * pdev,
-+ send_scan_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
-
- private void
-- do_gamma(P3(float mastergamma, float gammaval, byte * values));
-+ do_gamma(float mastergamma, float gammaval, byte * values);
-
- private void
-- do_black_correction(P2(float kvalue, int *kcorrect));
-+ do_black_correction(float kvalue, int *kcorrect);
-
- private void
-- init_data_structure(P3(gx_device_printer * pdev,
-+ init_data_structure(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
-- struct misc_struct *misc_vars));
-+ struct misc_struct *misc_vars);
-
- private void
-- calculate_memory_size(P2(gx_device_printer * pdev,
-- struct misc_struct *misc_vars));
-+ calculate_memory_size(gx_device_printer * pdev,
-+ struct misc_struct *misc_vars);
-
-
- /* assign_dpi:
-@@ -863,7 +863,7 @@
- 2bpp feature of the hp970 someday, it is sized like storage.
- storagee contains the errors from b/w fs-ditherng */
-
-- data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
-+ data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
- "cdj970_print_page");
-
- /* if we can't allocate working area */
-@@ -884,7 +884,7 @@
- (*cdj970->terminate_page) (pdev, prn_stream);
-
- /* Free Memory */
-- gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
-+ gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
- "hp970_print_page");
-
- PageCtr ++;
-@@ -2292,12 +2292,13 @@
- /* gdev_cmyk_map_cmyk_color:
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_cmyk_map_cmyk_color(gx_device *pdev,
-- gx_color_value cyan,
-- gx_color_value magenta,
-- gx_color_value yellow,
-- gx_color_value black)
-+ const gx_color_value cv[])
- {
- gx_color_index color;
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
-
- switch (pdev->color_info.depth) {
- case 1:
-@@ -2331,10 +2332,11 @@
- /* gdev_cmyk_map_rgb_color: Mapping of RGB colors to gray values.
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_cmyk_map_rgb_color( gx_device *pdev,
-- gx_color_value r,
-- gx_color_value g,
-- gx_color_value b)
-+ const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff) {
- return (gx_color_index) 0; /* White */
- } else {
-@@ -2427,10 +2429,11 @@
- /* gdev_pcl_map_rgb_color:
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_pcl_map_rgb_color( gx_device *pdev,
-- gx_color_value r,
-- gx_color_value g,
-- gx_color_value b)
-+ const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff)
- return (gx_color_index) 0; /* white */
- else {
--- print/ghostscript-gpl/files/patch-src-gdevijs.c
+++ /dev/null
@@ -1,659 +0,0 @@
---- src/gdevijs.c.orig Thu Mar 10 23:57:23 2005
-+++ src/gdevijs.c Fri May 27 02:56:55 2005
-@@ -27,15 +27,29 @@
- * which is a security risk, since any program can be run.
- * You should use -dSAFER which sets .LockSafetyParams to true
- * before opening this device.
-+ *
-+ * 11/26/03 David Suffield
-+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
-+ *
-+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
-+ * 2. Added krgb support.
-+ *
-+ * 02/21/05 David Suffield
-+ * 1. Fixed segfault issue with 1-bit color space.
-+ * 2. Fixed z-order issue with colored text on black rectangle.
-+ *
- */
-
- #include "unistd_.h" /* for dup() */
- #include <stdlib.h>
-+#include <fcntl.h>
- #include "gdevprn.h"
- #include "gp.h"
- #include "ijs.h"
- #include "ijs_client.h"
-
-+/*#define KRGB_DEBUG*/
-+
- /* This should go into gdevprn.h, or, better yet, gdevprn should
- acquire an API for changing resolution. */
- int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
-@@ -52,6 +66,14 @@
- private dev_proc_put_params(gsijs_put_params);
- private dev_proc_finish_copydevice(gsijs_finish_copydevice);
-
-+/* Following definitions are for krgb support. */
-+private dev_proc_create_buf_device(gsijs_create_buf_device);
-+private dev_proc_fill_rectangle(gsijs_fill_rectangle);
-+private dev_proc_copy_mono(gsijs_copy_mono);
-+private dev_proc_fill_mask(gsijs_fill_mask);
-+private dev_proc_fill_path(gsijs_fill_path);
-+private dev_proc_stroke_path(gsijs_stroke_path);
-+
- private const gx_device_procs gsijs_procs = {
- gsijs_open,
- NULL, /* get_initial_matrix */
-@@ -126,6 +148,14 @@
-
- IjsClientCtx *ctx;
- int ijs_version;
-+
-+ /* Additional parameters for krgb support. */
-+ int krgb_mode; /* 0=false, 1=true */
-+ int k_path; /* k plane path, 0=false, 1=true */
-+ int k_width; /* k plane width in pixels */
-+ int k_band_size; /* k plane buffer size in bytes, byte aligned */
-+ unsigned char *k_band; /* k plane buffer */
-+ gx_device_procs prn_procs; /* banding playback procedures */
- };
-
- #define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */
-@@ -153,7 +183,12 @@
- FALSE, /* Tumble_set */
-
- NULL, /* IjsClient *ctx */
-- 0 /* ijs_version */
-+ 0, /* ijs_version */
-+ 0, /* krgb_mode */
-+ 0, /* k_path */
-+ 0, /* k_width */
-+ 0, /* k_band_size */
-+ NULL /* k_band buffer */
- };
-
-
-@@ -169,12 +204,254 @@
-
- /**************************************************************************/
-
--/* ------ Private definitions ------ */
-+/* ---------------- Low-level graphic procedures ---------------- */
-+
-+static unsigned char xmask[] =
-+{
-+ 0x80, /* x=0 */
-+ 0x40, /* 1 */
-+ 0x20, /* 2 */
-+ 0x10, /* 3 */
-+ 0x08, /* 4 */
-+ 0x04, /* 5 */
-+ 0x02, /* 6 */
-+ 0x01 /* 7 */
-+};
-+
-+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
-+ gx_color_index color)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+
-+ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0)
-+ {
-+ int raster = (ijsdev->k_width+7) >> 3;
-+ register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3);
-+ int dest_start_bit = x & 7;
-+ int i,j,w1;
-+
-+ if (h <= 0 || w <= 0)
-+ return 0;
-+
-+ if ((x+w) > ijsdev->k_width)
-+ w1 = ijsdev->k_width - x;
-+ else
-+ w1 = w;
-+
-+ /* Note x,y orgin 0,0 is stored first byte 0 left to right. */
-+
-+ if (color==0x0)
-+ {
-+ /* Color is black, store in k plane band instead of regular band. */
-+ for (j=0; j<h; j++)
-+ {
-+ for (i=0; i<w1; i++)
-+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7];
-+ dest+=raster;
-+ }
-+ return 0;
-+ }
-+ else
-+ {
-+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
-+ for (j=0; j<h; j++)
-+ {
-+ for (i=0; i<w1; i++)
-+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7];
-+ dest+=raster;
-+ }
-+ }
-+ }
-+
-+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color);
-+}
-+
-+private int gsijs_copy_mono(gx_device * dev, const byte * data,
-+ int dx, int draster, gx_bitmap_id id,
-+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+
-+ /* if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) */
-+ if (ijsdev->krgb_mode && ijsdev->k_path)
-+ {
-+ /* Store in k plane band instead of regular band. */
-+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
-+ register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3);
-+ register const unsigned char *scan=data+(dx >> 3);
-+ int dest_start_bit = x & 7;
-+ int scan_start_bit = dx & 7;
-+ int i, h=height;
-+
-+ if (h <= 0 || w <= 0)
-+ return 0;
-+
-+ if (one==0x0)
-+ {
-+ /* Color is black, store in k plane band instead of regular band. */
-+ while (h-- > 0)
-+ {
-+ for (i=0; i<w; i++)
-+ {
-+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
-+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7];
-+ }
-+ scan+=draster;
-+ dest+=raster;
-+ }
-+ return 0;
-+ }
-+ else
-+ {
-+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
-+ while (h-- > 0)
-+ {
-+ for (i=0; i<w; i++)
-+ {
-+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
-+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7];
-+ }
-+ scan+=draster;
-+ dest+=raster;
-+ }
-+ }
-+ }
-+
-+ return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id, x, y, w, height, zero, one);
-+}
-+
-+/* ---------------- High-level graphic procedures ---------------- */
-+
-+private int gsijs_fill_mask(gx_device * dev,
-+ const byte * data, int dx, int raster, gx_bitmap_id id,
-+ int x, int y, int w, int h,
-+ const gx_drawing_color * pdcolor, int depth,
-+ gs_logical_operation_t lop, const gx_clip_path * pcpath)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+ int code;
-+
-+ ijsdev->k_path = 1;
-+
-+ code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id, x, y, w, h, pdcolor, depth, lop, pcpath);
-+
-+ ijsdev->k_path = 0;
-+
-+ return code;
-+}
-+
-+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
-+ gx_path * ppath, const gx_fill_params * params,
-+ const gx_drawing_color * pdcolor,
-+ const gx_clip_path * pcpath)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+ int code;
-+
-+ ijsdev->k_path = 1;
-+
-+ code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params, pdcolor, pcpath);
-+
-+ ijsdev->k_path = 0;
-+
-+ return 0;
-+}
-+
-+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
-+ gx_path * ppath, const gx_stroke_params * params,
-+ const gx_drawing_color * pdcolor,
-+ const gx_clip_path * pcpath)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+ int code;
-+
-+ ijsdev->k_path = 1;
-
--/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
-- require some workarounds. When more up-to-date hpijs versions
-- become ubiquitous, all these workarounds should be removed. */
--#define HPIJS_1_0_VERSION 29
-+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath);
-+
-+ ijsdev->k_path = 0;
-+
-+ return code;
-+}
-+
-+/* ---------------- krgb banding playback procedures ---------------- */
-+
-+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
-+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
-+ int band_height = cdev->page_info.band_params.BandHeight;
-+ int band_number = y/band_height;
-+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
-+ int y1=raster*(y-(band_height*band_number));
-+
-+ if (y1 == 0)
-+ {
-+ /* First raster for band, clear k_band. Banding playback occurs on first raster. */
-+ memset(ijsdev->k_band, 0, ijsdev->k_band_size);
-+ }
-+
-+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from regular band */
-+}
-+
-+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
-+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
-+ int band_height = cdev->page_info.band_params.BandHeight;
-+ int band_number = y/band_height;
-+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
-+ int y1=raster*(y-(band_height*band_number));
-+
-+ *actual_data = ijsdev->k_band+y1;
-+
-+ return 0;
-+}
-+
-+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
-+ const gx_render_plane_t *render_plane, gs_memory_t *mem, bool for_band)
-+{
-+ gx_device_ijs *ijsdev = (gx_device_ijs *)target;
-+ int n_chan = ijsdev->color_info.num_components;
-+ int code = gx_default_create_buf_device(pbdev, target, render_plane, mem, for_band);
-+ if (code < 0 || n_chan != 3)
-+ return code;
-+
-+ /* Save buffer (vector) procedures so that we can hook them during banding playback. */
-+ ijsdev->prn_procs = (*pbdev)->procs;
-+
-+ /* Replace buffer procedures with krgb procedures. */
-+ set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle);
-+ set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono);
-+ set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask);
-+ set_dev_proc(*pbdev, fill_path, gsijs_fill_path);
-+ set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path);
-+
-+ return code;
-+}
-+
-+/* See if IJS server supports krgb. Return value: 0=false, 1=true. */
-+private int
-+gsijs_set_krgb_mode(gx_device_ijs *ijsdev)
-+{
-+ char buf[256];
-+ int n_chan = ijsdev->color_info.num_components;
-+ int code;
-+
-+ if (n_chan != 3)
-+ return 0; /* no krgb support, not RGB colorspace */
-+
-+ buf[0] = 0;
-+ code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace", buf, sizeof(buf)-1);
-+ if (code >= 0)
-+ buf[code] = 0;
-+ if (strstr(buf, "KRGB") == NULL)
-+ return 0; /* no krgb support */
-+
-+ return 1; /* krgb is supported */
-+}
-+
-+/* ------ Private definitions ------ */
-
- private int
- gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
-@@ -212,34 +489,6 @@
- }
-
- /**
-- * gsijs_set_generic_params_hpijs: Set generic IJS parameters.
-- *
-- * This version is specialized for hpijs 1.0 through 1.0.2, and
-- * accommodates a number of quirks.
-- **/
--private int
--gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev)
--{
-- char buf[256];
-- int code = 0;
--
-- /* IjsParams, Duplex, and Tumble get set at this point because
-- they may affect margins. */
-- if (ijsdev->IjsParams) {
-- code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams);
-- }
--
-- if (code == 0 && ijsdev->Duplex_set) {
-- int duplex_val;
--
-- duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0;
-- sprintf (buf, "%d", duplex_val);
-- code = gsijs_client_set_param(ijsdev, "Duplex", buf);
-- }
-- return code;
--}
--
--/**
- * gsijs_set_generic_params: Set generic IJS parameters.
- **/
- private int
-@@ -250,9 +499,6 @@
- int i, j;
- char *value;
-
-- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
-- return gsijs_set_generic_params_hpijs(ijsdev);
--
- /* Split IjsParams into separate parameters and send to ijs server */
- value = NULL;
- for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -293,68 +539,6 @@
- }
-
- /**
-- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server.
-- *
-- * This version is specialized for hpijs 1.0 through 1.0.2, and
-- * accommodates a number of quirks.
-- **/
--private int
--gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev)
--{
-- char buf[256];
-- int code = 0;
--
-- if (code == 0) {
-- sprintf(buf, "%d", ijsdev->width);
-- code = gsijs_client_set_param(ijsdev, "Width", buf);
-- }
-- if (code == 0) {
-- sprintf(buf, "%d", ijsdev->height);
-- code = gsijs_client_set_param(ijsdev, "Height", buf);
-- }
--
-- if (code == 0) {
-- double printable_width, printable_height;
-- double printable_left, printable_top;
-- float m[4];
--
-- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea",
-- buf, sizeof(buf));
-- if (code == IJS_EUNKPARAM)
-- /* IJS server doesn't support margin negotiations.
-- That's ok. */
-- return 0;
-- else if (code >= 0) {
-- code = gsijs_parse_wxh(buf, code,
-- &printable_width, &printable_height);
-- }
--
-- if (code == 0) {
-- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft",
-- buf, sizeof(buf));
-- if (code == IJS_EUNKPARAM)
-- return 0;
-- else if (code >= 0) {
-- code = gsijs_parse_wxh(buf, code,
-- &printable_left, &printable_top);
-- }
-- }
--
-- if (code == 0) {
-- m[0] = printable_left;
-- m[1] = ijsdev->MediaSize[1] * (1.0 / 72) -
-- printable_top - printable_height;
-- m[2] = ijsdev->MediaSize[0] * (1.0 / 72) -
-- printable_left - printable_width;
-- m[3] = printable_top;
-- gx_device_set_margins((gx_device *)ijsdev, m, true);
-- }
-- }
--
-- return code;
--}
--
--/**
- * gsijs_set_margin_params: Do margin negotiation with IJS server.
- **/
- private int
-@@ -365,9 +549,6 @@
- int i, j;
- char *value;
-
-- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
-- return gsijs_set_margin_params_hpijs(ijsdev);
--
- /* Split IjsParams into separate parameters and send to ijs server */
- value = NULL;
- for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -534,12 +715,18 @@
- char buf[256];
- bool use_outputfd;
- int fd = -1;
-+ long max_bitmap = ijsdev->space_params.MaxBitmap;
-
- if (strlen(ijsdev->IjsServer) == 0) {
- eprintf("ijs server not specified\n");
- return gs_note_error(gs_error_ioerror);
- }
-
-+ ijsdev->space_params.MaxBitmap = 0; /* force banding */
-+
-+ /* Set create_buf_device in printer device, so that we can hook the banding playback procedures. */
-+ ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device;
-+
- /* Decide whether to use OutputFile or OutputFD. Note: how to
- determine this is a tricky question, so we just allow the
- user to set it.
-@@ -554,6 +741,8 @@
- if (code < 0)
- return code;
-
-+ ijsdev->space_params.MaxBitmap = max_bitmap;
-+
- if (use_outputfd) {
- /* Note: dup() may not be portable to all interesting IJS
- platforms. In that case, this branch should be #ifdef'ed out.
-@@ -613,6 +802,9 @@
- if (code >= 0)
- code = gsijs_set_margin_params(ijsdev);
-
-+ if (code >= 0)
-+ ijsdev->krgb_mode = gsijs_set_krgb_mode(ijsdev);
-+
- return code;
- }
-
-@@ -695,21 +887,6 @@
- return min(width, end);
- }
-
--private int ijs_all_white(unsigned char *data, int size)
--{
-- int clean = 1;
-- int i;
-- for (i = 0; i < size; i++)
-- {
-- if (data[i] != 0xFF)
-- {
-- clean = 0;
-- break;
-- }
-- }
-- return clean;
--}
--
- /* Print a page. Don't use normal printer gdev_prn_output_page
- * because it opens the output file.
- */
-@@ -720,8 +897,9 @@
- gx_device_printer *pdev = (gx_device_printer *)dev;
- int raster = gdev_prn_raster(pdev);
- int ijs_width, ijs_height;
-- int row_bytes;
-+ int row_bytes, k_row_bytes=0;
- int n_chan = pdev->color_info.num_components;
-+ int krgb_mode = ijsdev->krgb_mode;
- unsigned char *data;
- char buf[256];
- double xres = pdev->HWResolution[0];
-@@ -737,13 +915,23 @@
-
- /* Determine bitmap width and height */
- ijs_height = gdev_prn_print_scan_lines(dev);
-- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) {
-- ijs_width = pdev->width;
-- } else {
- ijs_width = gsijs_raster_width(dev);
-- }
-+
- row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3;
-
-+ if (krgb_mode)
-+ {
-+ gx_device_clist_common *cdev = (gx_device_clist_common *)dev;
-+ int band_height = cdev->page_info.band_params.BandHeight;
-+ k_row_bytes = (ijs_width + 7) >> 3;
-+
-+ /* Create banding buffer for k plane. */
-+ ijsdev->k_width = ijs_width;
-+ ijsdev->k_band_size = band_height * k_row_bytes;
-+ if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size, 1, "gsijs_output_page")) == (unsigned char *)NULL)
-+ return gs_note_error(gs_error_VMerror);
-+ }
-+
- /* Required page parameters */
- sprintf(buf, "%d", n_chan);
- gsijs_client_set_param(ijsdev, "NumChan", buf);
-@@ -752,44 +940,71 @@
-
- /* This needs to become more sophisticated for DeviceN. */
- strcpy(buf, (n_chan == 4) ? "DeviceCMYK" :
-- ((n_chan == 3) ? "DeviceRGB" : "DeviceGray"));
-+ ((n_chan == 3) ? (krgb_mode ? "KRGB" : "DeviceRGB") : "DeviceGray"));
- gsijs_client_set_param(ijsdev, "ColorSpace", buf);
-
-- /* If hpijs 1.0, don't set width and height here, because it
-- expects them to be the paper size. */
-- if (ijsdev->ijs_version != HPIJS_1_0_VERSION) {
-- sprintf(buf, "%d", ijs_width);
-- gsijs_client_set_param(ijsdev, "Width", buf);
-- sprintf(buf, "%d", ijs_height);
-- gsijs_client_set_param(ijsdev, "Height", buf);
-- }
-+ sprintf(buf, "%d", ijs_width);
-+ gsijs_client_set_param(ijsdev, "Width", buf);
-+ sprintf(buf, "%d", ijs_height);
-+ gsijs_client_set_param(ijsdev, "Height", buf);
-
- sprintf(buf, "%gx%g", xres, yres);
- gsijs_client_set_param(ijsdev, "Dpi", buf);
-
-+#ifdef KRGB_DEBUG
-+ int kfd, rgbfd;
-+ char sz[128];
-+ kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644);
-+ rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644);
-+ snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n", ijs_width, ijs_height);
-+ write(kfd, sz, strlen(sz));
-+ snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n", ijs_width, ijs_height);
-+ write(rgbfd, sz, strlen(sz));
-+#endif
-+
- for (i=0; i<num_copies; i++) {
- unsigned char *actual_data;
- ijs_client_begin_cmd (ijsdev->ctx, IJS_CMD_BEGIN_PAGE);
- status = ijs_client_send_cmd_wait(ijsdev->ctx);
-
- for (y = 0; y < ijs_height; y++) {
-- code = gdev_prn_get_bits(pdev, y, data, &actual_data);
-- if (code < 0)
-- break;
-+ if (krgb_mode)
-+ code = gsijs_get_bits(pdev, y, data, &actual_data);
-+ else
-+ code = gdev_prn_get_bits(pdev, y, data, &actual_data);
-+ if (code < 0)
-+ break;
-+#ifdef KRGB_DEBUG
-+ write(rgbfd, actual_data, row_bytes);
-+#endif
-+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, row_bytes);
-+ if (status)
-+ break;
-
-- if (ijsdev->ijs_version == HPIJS_1_0_VERSION &&
-- ijs_all_white(actual_data, row_bytes))
-- status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0);
-- else
-- status = ijs_client_send_data_wait(ijsdev->ctx, 0,
-- (char *)actual_data, row_bytes);
-- if (status)
-- break;
-+ if (krgb_mode) {
-+ code = gsijs_k_get_bits(pdev, y, &actual_data);
-+ if (code < 0)
-+ break;
-+#ifdef KRGB_DEBUG
-+ write(kfd, actual_data, k_row_bytes);
-+#endif
-+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, k_row_bytes);
-+ if (status)
-+ break;
-+ }
- }
- ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE);
- status = ijs_client_send_cmd_wait(ijsdev->ctx);
- }
-
-+#ifdef KRGB_DEBUG
-+ close(kfd);
-+ close(rgbfd);
-+#endif
-+
-+ if(krgb_mode)
-+ gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size, 1, "gsijs_output_page");
-+
- gs_free_object(pdev->memory, data, "gsijs_output_page");
-
- endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
-@@ -1093,7 +1308,6 @@
- dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
- return code;
- }
--
-
- private int
- gsijs_set_color_format(gx_device_ijs *ijsdev)
--- print/ghostscript-gpl/files/bjc250.contrib.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-### ----------------- The BJC-210/240/250/250ex/265/1000 ---------------- ###
-
-###
-### For questions about the driver, mailto://szaszg@hu.inter.net
-### http://bjc250gs.sourceforge.net
-###
-
-bjc_h=$(GLSRC)gdevbjc_.h
-
-bjc_=$(GLOBJ)gdevbjc_.$(OBJ) $(GLOBJ)gdevbjca.$(OBJ)
-
-$(GLOBJ)gdevbjc_.$(OBJ) : $(GLSRC)gdevbjc_.c $(PDEVH) $(bjc_h)
- $(GLCC) $(GLO_)gdevbjc_.$(OBJ) $(C_) $(GLSRC)gdevbjc_.c
-
-$(GLOBJ)gdevbjca.$(OBJ) : $(GLSRC)gdevbjca.c $(PDEVH) $(bjc_h)
- $(GLCC) $(GLO_)gdevbjca.$(OBJ) $(C_) $(GLSRC)gdevbjca.c
-
-$(DD)bjcmono.dev : $(bjc_) $(DD)page.dev
- $(SETPDEV) $(DD)bjcmono $(bjc_)
-
-$(DD)bjcgray.dev : $(bjc_) $(DD)page.dev
- $(SETPDEV) $(DD)bjcgray $(bjc_)
-
-$(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev
- $(SETPDEV) $(DD)bjccmyk $(bjc_)
-
-$(DD)bjccolor.dev : $(bjc_) $(DD)page.dev
- $(SETPDEV) $(DD)bjccolor $(bjc_)
-
-### -------------------- The H-P Color LaserJet 5/5M -------------------- ###
-
--- print/ghostscript-gpl/files/patch-src:cpca_gdevl4v.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/cpca_gdevl4v.c.orig Tue May 7 00:30:00 2002
-+++ src/cpca_gdevl4v.c Wed Dec 10 19:54:46 2003
-@@ -316,41 +316,35 @@
- };
-
- /* Vector device implementation */
--private int lips4v_beginpage(P1(gx_device_vector * vdev));
--private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
-- const gx_drawing_color * pdc));
--private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
-- const gx_drawing_color * pdc));
--private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
-- uint count, floatp offset));
--private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
-+private int lips4v_beginpage(gx_device_vector * vdev);
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+ uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
- private int
--lips4v_setlogop(P3
--
-- (gx_device_vector * vdev, gs_logical_operation_t lop,
-- gs_logical_operation_t diff));
-+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));
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
- private int
--lips4v_moveto(P6
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-- floatp y, gx_path_type_t type));
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
- private int
--lips4v_lineto(P6
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-- floatp y, gx_path_type_t type));
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
- private int
--lips4v_curveto(P10
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
- floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
-- gx_path_type_t type));
-+ gx_path_type_t type);
- private int
--lips4v_closepath(P6
-- (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-- floatp y_start, 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);
-
--private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
- private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
- private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -2296,7 +2290,7 @@
- }
- color_set_pure(&color, one);
- code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
-- &color);
-+ NULL, &color);
- }
- if (code < 0)
- return 0;
-@@ -2438,7 +2432,7 @@
- if (w <= 0 || h <= 0)
- return 0;
- if (depth > 1 ||
-- gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- gdev_vector_update_log_op(vdev, lop) < 0)
- return gx_default_fill_mask(dev, data, data_x, raster, id,
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-cidfmap
@@ -0,0 +1,61 @@
+--- lib/cidfmap.orig 2005-12-29 04:56:24.000000000 +0900
++++ lib/cidfmap 2008-03-04 07:04:11.000000000 +0900
+@@ -26,3 +26,58 @@
+ % /ShinGo-Bold /HeiseiKakuGo-W5 ;
+ % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+ %
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++
++/Ryumin-Medium /Ryumin-Light ;
++/Ryumin-Regular /Ryumin-Light ;
++/RyuminPro-Light /Ryumin-Light ;
++
++/GothicBBBPro-Medium /GothicBBB-Medium ;
++
++/KozGoPro-Bold /GothicBBB-Medium ;
++/KozGoPro-Heavy /GothicBBB-Medium ;
++/KozGoPro-Medium /GothicBBB-Medium ;
++/KozGoPro-Regular /GothicBBB-Medium ;
++
++/KozMinPro-Bold /Ryumin-Light ;
++/KozMinPro-Light /Ryumin-Light ;
++/KozMinPro-Medium /Ryumin-Light ;
++/KozMinPro-Regular /Ryumin-Light ;
++
++/HiraKakuPro-W3 /GothicBBB-Medium ;
++/HiraKakuPro-W6 /GothicBBB-Medium ;
++/HiraKakuStd-W8 /GothicBBB-Medium ;
++
++/HiraMaruPro-W4 /GothicBBB-Medium ;
++
++/HiraMinPro-W3 /Ryumin-Light ;
++
++/HeiseiMin-W3 /Ryumin-Light ;
++/HeiseiKakuGo-W5 /GothicBBB-Medium ;
++
++/FutoMinA101-Bold /Ryumin-Light ;
++/FutoMinA101Pro-Bold /Ryumin-Light ;
++/FutoGoB101-Bold /GothicBBB-Medium ;
++/FutoGoB101Pro-Bold /GothicBBB-Medium ;
++
++/Jun101-Light /Ryumin-Light ;
++/Jun101Pro-Light /Ryumin-Light ;
++
++/MidashiGo-MB31 /GothicBBB-Medium ;
++/MidashiGoPro-MB31 /GothicBBB-Medium ;
++
++/MidashiMinPro-MA31 /Ryumin-Light ;
++
++%/Munhwa-Regular /Munhwa-Regular ;
++%/MunhwaGothic-Regular /MunhwaGothic-Regular ;
++%/Munhwa-Bold /Munhwa-Bold ;
++%/MunhwaGothic-Bold /MunhwaGothic-Bold ;
++
++/HYGoThic-Medium /MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium /Munhwa-Regular ;
++/HYRGoThic-Medium /MunhwaGothic-Bold ;
++
++/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular.ttf) /SubfontID 0 /CSI [(CNS1) 5] >> ;
++/STSong-Light << /FileType /TrueType /Path (STSong-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
++/MSung-Light << /FileType /TrueType /Path (MSung-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
--- print/ghostscript-gpl/files/cdj850.contrib.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-###- cdj850 - HP 850 Driver under development -------- ###
-cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
-
-$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
-
-$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
-
-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
-
-$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
-
-$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
-
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
- $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
- $(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjca.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- bjc250/src/gdevbjca.c.orig Fri Nov 8 06:15:15 2002
-+++ bjc250/src/gdevbjca.c Fri Nov 8 07:47:41 2002
-@@ -46,10 +46,10 @@
- #include <math.h>
- #include <time.h>
-
--private void bjc_put_bytes(P3(FILE *file, const char *data, int count));
--private void bjc_put_hi_lo(P2(FILE *file, int value));
--private void bjc_put_lo_hi(P2(FILE *file, int value));
--private void bjc_put_command(P3(FILE *file, char command, int count));
-+private void bjc_put_bytes(FILE *file, const char *data, int count);
-+private void bjc_put_hi_lo(FILE *file, int value);
-+private void bjc_put_lo_hi(FILE *file, int value);
-+private void bjc_put_command(FILE *file, char command, int count);
-
- /* ---------------- Utilities ---------------- */
-
--- print/ghostscript-gpl/files/patch-src_cpca_mk_cmd.c
+++ /dev/null
@@ -1,270 +0,0 @@
---- src/cpca_mk_cmd.c.orig Wed Mar 15 15:00:26 2006
-+++ src/cpca_mk_cmd.c Wed Mar 15 15:33:26 2006
-@@ -586,6 +586,7 @@
- Ptr data ;
- short size ;
- Ptr work ;
-+ short *swork ;
- unsigned long comSize = 0 ;
-
- if (p && str) {
-@@ -594,7 +595,9 @@
- if (data) {
- work = data ;
-
-- *( ( short *)work )++ = id_val_code_set_Shift_JIS ;
-+ swork = (short *)work ;
-+ *swork++ = id_val_code_set_Shift_JIS ;
-+ work = (Ptr)swork ;
- memcpy( work, str, (unsigned char)str[ 0 ] + 1 ) ;
- comSize = glue_cpcaSetJob( p,
- Attribute,
-@@ -867,6 +870,7 @@
- short size ;
- Ptr data ;
- Ptr work ;
-+ unsigned short *uswork ;
- unsigned long comSize = 0 ;
-
- if (p) {
-@@ -877,8 +881,10 @@
-
- *work++ = id_val_resolution_type_dpi ;
-
-- *( ( unsigned short *)work )++ = resolutionX ;
-- *( ( unsigned short *)work )++ = resolutionY ;
-+ uswork = (unsigned short *)work ;
-+ *uswork++ = resolutionX ;
-+ *uswork++ = resolutionY ;
-+ work = (Ptr)uswork ;
-
- comSize = glue_cpcaSetDocument ( p,
- id_att_resolution,
-@@ -1597,6 +1603,8 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaHANDLE *cpcaHANDLEp ;
-+ cpcaUBYTE *cpcaUBYTEp ;
-
-
- z_setUserInfo( userInfo, &userID, &password ) ;
-@@ -1616,9 +1624,14 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaHANDLE *)p )++ = inParam->Object1 ;
-- *( ( cpcaUBYTE *)p )++ = inParam->Mode ;
-- *( ( cpcaHANDLE *)p )++ = inParam->Object2 ;
-+ cpcaHANDLEp = (cpcaHANDLE *)p ;
-+ *cpcaHANDLEp++ = inParam->Object1 ;
-+ cpcaUBYTEp = (cpcaUBYTE *)cpcaHANDLEp ;
-+ *cpcaUBYTEp++ = inParam->Mode ;
-+ cpcaHANDLEp = (cpcaHANDLE *)cpcaUBYTEp ;
-+ *cpcaHANDLEp++ = inParam->Object2 ;
-+ p = (Ptr)cpcaHANDLEp ;
-+
- comSize += 9;
-
- return comSize ;
-@@ -1644,7 +1657,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
--
-+ cpcaATTRIB *cpcaATTRIBp;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = 2 + inParam->Size ;
-@@ -1661,7 +1674,9 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ;
-+ cpcaATTRIBp = (cpcaATTRIB *)p ;
-+ *cpcaATTRIBp++ = inParam->Attribute ;
-+ p = (Ptr)cpcaATTRIBp ;
- if ( inParam->Data && ( inParam->Size > 0 ) )
- {
- memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1687,6 +1702,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaHANDLE *cpcaHANDLEp ;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = sizeof( cpcaHANDLE ) ;
-@@ -1703,7 +1719,10 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaHANDLE *)p )++ = inParam->Object ;
-+ cpcaHANDLEp = (cpcaHANDLE *)p ;
-+ *cpcaHANDLEp++ = inParam->Object ;
-+ p = (Ptr)cpcaHANDLEp ;
-+
- comSize += paramSize ;
-
- return comSize ;
-@@ -1723,6 +1742,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaATTRIB *cpcaATTRIBp;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = sizeof( cpcaATTRIB ) + inParam->Size ;
-@@ -1739,7 +1759,9 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ;
-+ cpcaATTRIBp = (cpcaATTRIB *)p;
-+ *cpcaATTRIBp++ = inParam->Attribute ;
-+ p = (Ptr)cpcaATTRIBp ;
- if ( inParam->Data && ( inParam->Size > 0 ) )
- {
- memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1764,22 +1786,27 @@
- short comSize ;
- Ptr work ;
- char BindName;
-+ unsigned char *ucwork ;
-
- work = p ;
-
- /* ¥Ó¥ó¥¨¥¤¥ê¥¢¥¹¤ÎÀßÄê */
-- *( ( unsigned char *)work )++ = bindInfo;
-+ ucwork = (unsigned char *)work ;
-+ *ucwork++ = bindInfo;
- /* ¥Ó¥óÈÖ¹æ¤ÎÀßÄê¡á¤Ê¤·¡Ê£°¤ò»ØÄê) */
-- *( ( unsigned char *)work )++ = bindNum ;
-+ *ucwork++ = bindNum ;
- /* ¥Ó¥ó̾¾Î»ØÄê */
- /* nullʸ»úÎó»ØÄê */
- BindName = 0;
-+ work = (Ptr)ucwork ;
-
- memcpy( ( StringPtr )work, &BindName, 1 ) ;
- work += 1 ;
- /* ³«»Ï¥Ó¥ó¡¢½ªÎ»¥Ó¥ó»ØÄê */
-- *( ( unsigned char *)work )++ = 0 ;
-- *( ( unsigned char *)work )++ = 0 ;
-+ ucwork = (unsigned char *)work ;
-+ *ucwork++ = 0 ;
-+ *ucwork++ = 0 ;
-+ work = (Ptr)ucwork ;
- /* ¥µ¥¤¥º¤Î¼èÆÀ */
- comSize = work - p ;
-
-@@ -1803,19 +1830,24 @@
- Ptr work ;
- char count;
- char str_count;
-+ unsigned char *ucwork ;
-+ unsigned short *uswork ;
-
- work = p ;
- count = 1;
- str_count = 1;
-
- /* Type:¥Õ¥£¥Ë¥Ã¥·¥ó¥°ÊýË¡¤ÎÀßÄê */
-- *( ( unsigned char *)work )++ = str_count;
-+ ucwork = (unsigned char *)work ;
-+ *ucwork++ = str_count;
- /* Type:¥Õ¥£¥Ë¥Ã¥·¥ó¥°ÊýË¡¤ÎÀßÄê */
-- *( ( unsigned char *)work )++ = id_val_finishing_type_staple_stitching;
-+ *ucwork++ = id_val_finishing_type_staple_stitching;
- /* Count:¥Õ¥£¥Ë¥Ã¥·¥ó¥°¤ò¹Ô¤¦¸Ä¿ô */
-- *( ( unsigned char *)work )++ = count ;
-+ *ucwork++ = count ;
- /* Locate:¥Õ¥£¥Ë¥Ã¥·¥ó¥°¤ò¹Ô¤¦²Õ½ê */
-- *( ( unsigned short *)work )++ = staple_val;
-+ uswork = (unsigned short *)ucwork ;
-+ *uswork++ = staple_val;
-+ work = (Ptr)uswork ;
- /* ¥µ¥¤¥º¤Î¼èÆÀ */
- comSize = work - p ;
-
-@@ -1839,6 +1871,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaHANDLE *cpcaHANDLEp ;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = 4 ;
-@@ -1855,7 +1888,9 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaHANDLE *)p )++ = inParam->Object ;
-+ cpcaHANDLEp = (cpcaHANDLE *)p ;
-+ *cpcaHANDLEp++ = inParam->Object ;
-+ p = (Ptr)cpcaHANDLEp ;
- comSize += paramSize ;
-
- return comSize ;
-@@ -1876,7 +1911,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
--
-+ cpcaATTRIB *cpcaATTRIBp ;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = 2 + inParam->Size ;
-@@ -1893,7 +1928,9 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ;
-+ cpcaATTRIBp = (cpcaATTRIB *)p ;
-+ *cpcaATTRIBp++ = inParam->Attribute ;
-+ p = (Ptr)cpcaATTRIBp ;
- if ( inParam->Data && ( inParam->Size > 0 ) )
- {
- memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1918,6 +1955,8 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaHANDLE *cpcaHANDLEp ;
-+ cpcaUSHORT *cpcaUSHORTp ;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = 6 + inParam->Size ;
-@@ -1934,8 +1973,11 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaHANDLE *)p )++ = inParam->Object ;
-- *( ( cpcaUSHORT *)p )++ = inParam->Method ;
-+ cpcaHANDLEp = (cpcaHANDLE *)p ;
-+ *cpcaHANDLEp++ = inParam->Object ;
-+ cpcaUSHORTp = (cpcaUSHORT *)cpcaHANDLEp ;
-+ *cpcaUSHORTp++ = inParam->Method ;
-+ p = (Ptr)cpcaUSHORTp ;
- if ( inParam->Data && ( inParam->Size > 0 ) )
- {
- memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -2075,6 +2117,7 @@
- short paramSize ;
- unsigned long userID ;
- unsigned long password ;
-+ cpcaUBYTE *cpcaUBYTEp ;
-
- z_setUserInfo( userInfo, &userID, &password ) ;
- paramSize = 1 ;
-@@ -2091,7 +2134,9 @@
- p += comSize ;
-
- /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */
-- *( ( cpcaUBYTE *)p )++ = inParam->Code ;
-+ cpcaUBYTEp = (cpcaUBYTE *)p ;
-+ *cpcaUBYTEp++ = inParam->Code ;
-+ p = (Ptr)cpcaUBYTEp ;
- comSize += paramSize ;
-
- return comSize ;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-gdevl256.c
@@ -0,0 +1,17 @@
+--- src/gdevl256.c.orig Mon Jun 4 00:54:57 2007
++++ src/gdevl256.c Mon Jun 4 01:13:56 2007
+@@ -143,9 +143,12 @@
+ /* for compatibility with the older display modes: */
+ /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */
+ gx_color_index
+-lvga256_map_rgb_color(gx_device * dev, gx_color_value r, gx_color_value g,
+- gx_color_value b)
++lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[])
+ {
++ gx_color_value r = cv[0];
++ gx_color_value g = cv[1];
++ gx_color_value b = cv[2];
++
+ #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
+ ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
+ static const byte cube_bits[32] =
--- print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- eplaser/gdevescv.c.orig Mon May 17 14:25:19 2004
-+++ eplaser/gdevescv.c Mon Aug 2 14:04:30 2004
-@@ -37,10 +37,6 @@
-
- */
-
--#include <stdlib.h>
--#include <unistd.h>
--#include <string.h>
--
- #include "math_.h"
- #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 */
-@@ -342,6 +342,16 @@
- };
-
- /* Vector device implementation */
-+#if GS_VERSION_MAJOR >= 8
-+private int escv_beginpage(gx_device_vector * vdev);
-+private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int escv_setdash(gx_device_vector * vdev, const float *pattern,
-+ uint count, floatp offset);
-+private int escv_setflat(gx_device_vector * vdev, floatp flatness);
-+private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+ gs_logical_operation_t diff);
-+#else
- 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));
-@@ -350,10 +360,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));
-+#endif
- private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- fixed y1, gx_path_type_t type);
- private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
- gx_path_type_t type);
-+#if GS_VERSION_MAJOR >= 8
-+private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x, floatp y, gx_path_type_t type);
-+private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x, floatp y, gx_path_type_t type);
-+private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x1, floatp y1, floatp x2, floatp y2,
-+ floatp x3, floatp y3, gx_path_type_t type);
-+private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y,
-+ floatp x_start, floatp y_start, gx_path_type_t type);
-+
-+private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
- 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));
-@@ -366,6 +391,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));
-+#endif
- private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
- private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -1578,7 +1604,7 @@
- pdev->MaskState = 1;
- }
- color_set_pure(&color, one);
-- code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
-+ code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
-
- /* ¤³¤³¤òÄ̲ᤷ¤¿¤é°Ê²¼¤Î¿§ÀßÄê¤Ï̵°ÕÌ£¡© */
- }
-@@ -1671,13 +1697,13 @@
- gs_logical_operation_t lop, const gx_clip_path * pcpath)
- {
- gx_device_vector const *vdev = (gx_device_vector *) dev;
-- gx_device_escv const *pdev = (gx_device_escv *) dev;
-+ gx_device_escv *pdev = (gx_device_escv *) dev;
- stream *s = gdev_vector_stream(vdev);
-
- if (w <= 0 || h <= 0) return 0;
-
- if (depth > 1 ||
-- gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- gdev_vector_update_log_op(vdev, lop) < 0
- )
--- print/ghostscript-gpl/files/patch-src-dmp_site.ps
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dmp_site.ps.orig Tue May 27 09:57:00 1997
-+++ src/dmp_site.ps Tue Apr 2 23:05:45 2002
-@@ -1,6 +1,6 @@
- BeginConfig
- %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
--/printer (epsimage.src)
-+/printer (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
- % horizontal / vertical
- % /resolution [ 160.0 180.0 ]
- % horizontal / vertical
--- print/ghostscript-gpl/files/patch-alps__gdevalps.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- alps/gdevalps.c.orig Wed Nov 24 09:28:35 1999
-+++ alps/gdevalps.c Fri Dec 17 19:12:35 2004
-@@ -173,7 +173,7 @@
- {
- int lnum;
- int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
-- byte *data = (byte *)gs_malloc(8, line_size, "md50_print_page(data)" );
-+ byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md50_print_page(data)" );
- int skipping = 0;
- int nbyte;
- int nskip;
-@@ -232,8 +232,8 @@
- {
- int lnum;
- int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
-- byte *data = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
-- byte *out_start = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
-+ byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
-+ byte *out_start = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
- int skipping = 0;
- int nbyte;
-
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-FAPIconfig
@@ -0,0 +1,21 @@
+--- lib/FAPIconfig.orig 2008-03-04 06:50:24.000000000 +0900
++++ lib/FAPIconfig 2008-03-04 06:51:30.000000000 +0900
+@@ -2,10 +2,14 @@
+ % $Id: FAPIconfig 6870 2006-06-20 16:31:15Z leonardo $
+ % This is configuration file for FAPI client.
+
+-/FontPath (/Fonts) % A default directory for FAPI-handled font files path in FAPIfontmap.
+-/CIDFontPath (/CIDFonts) % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
+-/HookDiskFonts [1 2 9 11 42] % FontType values for disk PS fonts to be redirected to FAPI.
+-/HookEmbeddedFonts [1 2 9 11 42] % FontType values for embedded PS fonts to be redirected to FAPI.
++%/FontPath (/Fonts) % A default directory for FAPI-handled font files path in FAPIfontmap.
++/FontPath () % A default directory for FAPI-handled font files path in FAPIfontmap.
++%/CIDFontPath (/CIDFonts) % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
++/CIDFontPath () % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
++%/HookDiskFonts [1 2 9 11 42] % FontType values for disk PS fonts to be redirected to FAPI.
++/HookDiskFonts [] % FontType values for disk PS fonts to be redirected to FAPI.
++%/HookEmbeddedFonts [1 2 9 11 42] % FontType values for embedded PS fonts to be redirected to FAPI.
++/HookEmbeddedFonts [] % FontType values for embedded PS fonts to be redirected to FAPI.
+
+ % Values allowed for HookDiskFonts and HookEmbeddedFonts are 1, 2, 9, 11, 42.
+ % "Disk fonts" are fonts being installed to Ghostscript with 'lib/Fontmap' or with GS_FONTPATH,
--- print/ghostscript-gpl/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,59 +0,0 @@
---- lips/gdevlips.mak.orig Thu Nov 2 12:12:13 2000
-+++ lips/gdevlips.mak Sat Sep 27 22:16:20 2003
-@@ -1,17 +1,19 @@
- # ---------------- Laser Printer devices ---------------- #
- # $Id: gdevlips.mak $
-
-+lips_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR)
-+
- $(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\
- $(gdevprn_h) $(PDEVH)
-- $(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)
-- $(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(GLSRC)gdevl4r.c
-+ $(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4r.c
- $(GLOBJ)gdevlips.$(OBJ): $(GLSRC)gdevlips.c
-- $(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(GLSRC)gdevlips.c
-+ $(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlips.c
- $(DD)lips2p.dev: $(lipsr_) $(DD)page.dev
- $(SETPDEV) $(DD)lips2p $(lipsr_)
- $(DD)lips3.dev: $(lipsr_) $(DD)page.dev
-@@ -29,13 +31,13 @@
- $(GLOBJ)gdevl4v.$(OBJ): $(GLSRC)gdevl4v.c $(GLSRC)gdevlips.h $(GDEV) $(math__h)\
- $(gscspace_h) $(gsutil_h) $(gsparam_h) $(gsmatrix_h) $(gdevvec_h)\
- $(ghost_h) $(gzstate_h) $(igstate_h)
-- $(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(GLSRC)gdevl4v.c
-+ $(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4v.c
-
- ### ------- Epson ESC/Page printer device ----------------- ###
-
- escpage_=$(GLOBJ)gdevespg.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevespg.$(OBJ): $(GLSRC)gdevespg.c $(GLSRC)gdevlprn.h $(PDEVH)
-- $(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(GLSRC)gdevespg.c
-+ $(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevespg.c
-
- $(GLOBJ)escpage.dev: $(escpage_) $(DD)page.dev
- $(SETPDEV) $(DD)escpage $(escpage_)
-@@ -47,7 +49,7 @@
-
- npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
-- $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
-+ $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevnpdl.c
-
- $(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
- $(SETPDEV) $(DD)npdl $(npdl_)
-@@ -56,7 +58,7 @@
-
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevrpdl.$(OBJ): $(GLSRC)gdevrpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
-- $(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(GLSRC)gdevrpdl.c
-+ $(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevrpdl.c
-
- $(GLOBJ)rpdl.dev: $(rpdl_) $(DD)page.dev
- $(SETPDEV) $(DD)rpdl $(rpdl_)
--- print/ghostscript-gpl/files/patch-lib:gs_init.ps
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/gs_init.ps.orig Sat Mar 5 07:02:23 2005
-+++ lib/gs_init.ps Thu Apr 21 13:05:43 2005
-@@ -1440,7 +1440,7 @@
- % Set the default screen and BG/UCR.
- /.setdefaultbgucr {
- systemdict /setblackgeneration known {
-- { pop 0 } dup setblackgeneration setundercolorremoval
-+ {} dup setblackgeneration setundercolorremoval
- } if
- } bind def
- /.useloresscreen { % - .useloresscreen <bool>
-@@ -2241,3 +2241,7 @@
- ifelse
-
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
--- print/ghostscript-gpl/files/patch-gdev10v:gdev10v.mak
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdev10v/gdev10v.mak.orig Thu Oct 12 11:17:50 2000
-+++ gdev10v/gdev10v.mak Thu Oct 12 11:21:12 2000
-@@ -1,12 +1,13 @@
- ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
-
--bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
--bj10v.dev: $(bj10v_)
-- $(SHP)gssetdev bj10v $(bj10v_)
--bj10vh.dev: $(bj10v_)
-- $(SHP)gssetdev bj10vh $(bj10v_)
-+bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
-+$(DD)bj10v.dev: $(bj10v_) $(DD)page.dev
-+ $(SETPDEV) $(DD)bj10v $(bj10v_)
-+$(DD)bj10vh.dev: $(bj10v_) $(DD)page.dev
-+ $(SETPDEV) $(DD)bj10vh $(bj10v_)
-
- # Uncomment the following line if you are using MS-DOS on PC9801 series.
-
--gdev10v.$(OBJ): gdevbj10.c $(PDEVH)
-+$(GLOBJ)gdev10v.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
-+ $(GLCC) $(GLO_)gdev10v.$(OBJ) $(C_) $(GLSRC)gdev10v.c
- # $(CCC) -DPC9801 gdev10v.c
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-Makefile.in
@@ -0,0 +1,75 @@
+--- src/Makefile.in.orig 2008-06-22 15:43:28.000000000 +0900
++++ src/Makefile.in 2008-11-03 00:09:12.000000000 +0900
+@@ -46,9 +46,8 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+
+-INSTALL = $(GLSRCDIR)/instcopy -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
+ INSTALL_SHARED = @INSTALL_SHARED@
+
+ prefix = @prefix@
+@@ -164,7 +163,7 @@
+ # some older JPEG streams that violate the standard. If the JPEG
+ # library built from local sources, the patch will be applied.
+
+-SHARE_JPEG=@SHARE_LIBJPEG@
++SHARE_JPEG=1
+ JPEG_NAME=jpeg
+
+ # Define the directory where the PNG library sources are stored,
+@@ -172,14 +171,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-SHARE_LIBPNG=@SHARE_LIBPNG@
++SHARE_LIBPNG=1
+ PNGSRCDIR=@LIBPNGDIR@
+ LIBPNG_NAME=png
+
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-SHARE_ZLIB=@SHARE_ZLIB@
++SHARE_ZLIB=1
+ ZSRCDIR=@ZLIBDIR@
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+@@ -250,7 +249,7 @@
+ # Define the added flags for standard, debugging, profiling
+ # and shared object builds.
+
+-CFLAGS_STANDARD=@OPT_CFLAGS@
++CFLAGS_STANDARD?=@OPT_CFLAGS@
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg @OPT_CFLAGS@
+ CFLAGS_SO=@DYNAMIC_CFLAGS@
+@@ -295,7 +294,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ -Wl,-export-dynamic
+
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+@@ -339,7 +338,7 @@
+ # the pthread library. Otherwise use SYNC=nosync
+ #SYNC=posync
+ #SYNC=nosync
+-SYNC=@SYNC@
++SYNC=posync
+
+ # programs we use
+ RM=rm -f
+@@ -498,6 +497,7 @@
+ # ---------------- End of platform-specific section ---------------- #
+
+ INSTALL_CONTRIB=@INSTALL_CONTRIB@
++include $(GLSRCDIR)/drivers.mak
+ include $(GLSRCDIR)/unixhead.mak
+ include $(GLSRCDIR)/gs.mak
+ # psromfs.mak must precede lib.mak
Index: patch-src__gdevperm.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src__gdevperm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/files/patch-src__gdevperm.c -L print/ghostscript-gpl/files/patch-src__gdevperm.c -u -r1.1 -r1.2
--- print/ghostscript-gpl/files/patch-src__gdevperm.c
+++ print/ghostscript-gpl/files/patch-src__gdevperm.c
@@ -1,9 +1,9 @@
---- src/gdevperm.c.orig Fri Jun 18 16:00:47 2004
-+++ src/gdevperm.c Fri Dec 31 18:06:42 2004
-@@ -289,7 +289,7 @@
+--- src/gdevperm.c.orig Tue Sep 25 22:31:24 2007
++++ src/gdevperm.c Sat Nov 24 15:11:12 2007
+@@ -286,7 +286,7 @@
(strncmp((const char *)name, (const char *)str, name_size) == 0))
- private int
+ static int
-perm_get_color_comp_index(const gx_device *pdev, const char *pname,
+perm_get_color_comp_index(gx_device *pdev, const char *pname,
int name_size, int component_type)
--- print/ghostscript-gpl/files/lx5000.contrib.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-### ----------------- LexMark 5000 printer ----------------------------- ###
-### Note: this driver was contributed by users. Please contact: ###
-### Peter B. West <p.west at uq.net.au> ###
-
-lx5000_=$(GLOBJ)gdevlx50.$(OBJ)
-$(DD)lx5000.dev: $(lx5000_)
- $(SETPDEV) $(DD)lx5000 $(lx5000_)
-
-$(GLOBJ)gdevlx50.$(OBJ): $(GLSRC)gdevlx50.c $(PDEVH)
- $(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c
-
--- print/ghostscript-gpl/files/gdevhl12-hl1250.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-### -------------------- The Brother HL-1250 printer -------------------- ###
-### This printer is ljet4-compatible, plus support for source tray ###
-### selection and special 1200x600 dpi mode. ###
-
-hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
-$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
- $(SETPDEV) $(DD)hl1250 $(hl1250_)
-
-$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
- $(SETPDEV) $(DD)hl1240 $(hl1250_)
-
-# Author: Marek Michalkiewicz <marekm at linux.org.pl>
-# Printer: Brother HL-1250 (may work with some other models too)
-$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
- $(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c
-
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.pcl3
@@ -0,0 +1,37 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.pcl3,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+PORTDOCS+= pcl3
+PORTDOC_FILES+= pcl3/NEWS pcl3/BUGS pcl3/README pcl3/gs-pcl3.html \
+ pcl3/how-to-report.txt pcl3/pcl3opts.html
+
+MAN1+= gs-pcl3.1 pcl3opts.1
+
+post-build-pcl3:
+ cd ${WRKSRC} && \
+ ${CC} ${CFLAGS} -I./obj -I./soobj -I./src \
+ -I./contrib/pcl3/eprn -o bin/pcl3opts \
+ contrib/pcl3/src/pcl3opts.c contrib/pcl3/src/pclscan.c \
+ contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c
+
+post-install-pcl3:
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
+ ${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3
+ cd ${WRKSRC}/contrib/pcl3 && \
+ ${INSTALL_DATA} lib/example.mcf lib/if-pcl3 \
+ ps/calign.ps ps/dumppdd.ps ps/levels-test.ps \
+ ps/margins-A4.ps ps/margins-A4Rotated.ps \
+ ps/margins-Env10Rotated.ps \
+ ps/margins-EnvDLRotated.ps \
+ ps/margins-Letter.ps \
+ ps/margins-LetterRotated.ps \
+ ${DATADIR}/${PORTVERSION}/pcl3
+ cd ${WRKSRC}/contrib/pcl3/doc && \
+ ${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 ${MANPREFIX}/man/man1
+
+post-install-docs-pcl3:
+ ${MKDIR} ${WRKSRC}/contrib/pcl3
+ ${INSTALL_DATA} ${WRKSRC}/contrib/pcl3/doc/* ${WRKSRC}/contrib/pcl3
+
+post-build: post-build-pcl3
+post-install: post-install-pcl3
+post-install-docs: post-install-docs-pcl3
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-gdevvglb.c
@@ -0,0 +1,19 @@
+--- src/gdevvglb.c.orig Tue Sep 25 22:31:24 2007
++++ src/gdevvglb.c Sat Nov 24 23:00:49 2007
+@@ -149,10 +149,13 @@
+ }
+
+ static gx_color_index
+-vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
+- gx_color_value green, gx_color_value blue)
++vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
+ {
+- return pc_4bit_map_rgb_color(dev, red, green, blue);
++ gx_color_value r = cv[0];
++ gx_color_value g = cv[1];
++ gx_color_value b = cv[2];
++
++ return pc_4bit_map_rgb_color(dev, cv);
+ }
+
+ static int
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.epag
@@ -0,0 +1,23 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.epag,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+# EPAG - additional driver for Epson ESC/Page printers
+# http://www.humblesoft.com/gdevepag.html
+
+PORTDOCS+= epag
+PORTDOC_FILES+= epag/ert.txt epag/gdevepag.txt epag/ChangeLog \
+ epag/psprint epag/gsepagif.sh
+
+pre-build-epag:
+ ${LN} -s -f ${WRKSRC}/${EPAG_NAME}/gdevepag.c ${WRKSRC}/src
+
+post-build-epag:
+ cd ${WRKSRC}/${EPAG_NAME} && \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
+
+post-install-docs-epag:
+ ${MKDIR} ${WRKSRC}/contrib/epag
+ ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/* ${WRKSRC}/contrib/epag
+
+pre-build: pre-build-epag
+post-build: post-build-epag
+post-install-docs: post-install-docs-epag
--- print/ghostscript-gpl/files/patch-lxm3200:gdevlx32.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- lxm3200/gdevlx32.c.orig Wed Apr 23 01:06:20 2003
-+++ lxm3200/gdevlx32.c Thu May 26 00:11:50 2005
-@@ -422,9 +422,11 @@
- * of the nearest color.
- */
- private gx_color_index
--lxm3200_map_rgb_color(gx_device *dev, gx_color_value r,
-- gx_color_value g, gx_color_value b)
-+lxm3200_map_rgb_color(gx_device *dev, const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- gx_color_index col;
- int c, m, y;
-
-@@ -479,7 +481,7 @@
- break;
-
- default:
-- col = gdev_prn_map_rgb_color(dev, r, g, b);
-+ col = gdev_prn_map_rgb_color(dev, cv);
- break;
- }
-
-@@ -732,10 +734,10 @@
- /* Allocate memory for the buffers and
- * verify that the allocation was done properly.
- */
-- gendata.scanbuf = (byte *)gs_malloc(gendata.numbytes, gendata.numblines,
-+ gendata.scanbuf = (byte *)gs_malloc(pdev->memory, gendata.numbytes, gendata.numblines,
- "lxm3200_print_page(scanbuf)");
-
-- gendata.outdata = (byte *)gs_malloc(gendata.numbytes, 30,
-+ gendata.outdata = (byte *)gs_malloc(pdev->memory, gendata.numbytes, 30,
- "lxm3200_print_page(outdata)");
-
- if(gendata.scanbuf == NULL ||
-@@ -943,12 +945,14 @@
- private void
- freeresources(void)
- {
-+ gx_device *pdev;
-+
- if(gendata.scanbuf)
-- gs_free((char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
-+ gs_free(pdev->memory, (char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
- "lxm3200:freeresources(scanbuf)");
-
- if(gendata.outdata)
-- gs_free((char *)gendata.outdata, gendata.numbytes, 30,
-+ gs_free(pdev->memory, (char *)gendata.outdata, gendata.numbytes, 30,
- "lxm3200:freeresources(outdata)");
- }
-
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.h
+++ /dev/null
@@ -1,93 +0,0 @@
---- bjc250/src/gdevbjc_.h.orig Fri Nov 8 06:15:15 2002
-+++ bjc250/src/gdevbjc_.h Fri Nov 8 07:44:18 2002
-@@ -183,48 +183,48 @@
-
- /* Put a BJL command to stream */
-
--void bjc_put_bjl_command(P2(FILE * file, int bjl_command));
-+void bjc_put_bjl_command(FILE * file, int bjl_command);
-
--void bjc_put_LF(P1(FILE *file));
--void bjc_put_FF(P1(FILE *file));
--void bjc_put_CR(P1(FILE *file));
--void bjc_put_initialize(P1(FILE *file));
--void bjc_put_set_initial(P1(FILE *file));
--void bjc_put_set_compression(P2(FILE *file, char compression));
--void bjc_put_print_method_short(P2(FILE *file, char color));
--void bjc_put_print_method(P5(FILE *file, char color, char media, char quality, char density));
--void bjc_put_raster_resolution(P3(FILE *file, int x_resolution, int y_resolution));
--void bjc_put_raster_skip(P2(FILE *file, int skip));
--void bjc_put_page_margins(P5(FILE *file, int length, int lm, int rm, int top));
--void bjc_put_media_supply(P3(FILE *file, char supply, char type));
--void bjc_put_cmyk_image(P4(FILE *file, char component, const char *data, int count));
--void bjc_put_move_lines(P2(FILE *file, int lines));
--void bjc_put_move_lines_unit(P2(FILE *file, int unit));
--void bjc_put_extended_margins(P5(FILE *file, int length, int lm, int rm, int top));
--void bjc_put_image_format(P4(FILE *file, char depth, char format, char ink));
--void bjc_put_page_id(P2(FILE *file, int id));
--void bjc_put_continue_image(P3(FILE *file, const char *data, int count));
--void bjc_put_indexed_image(P4(FILE *file, int dot_rows, int dot_cols, int layers));
--
--bool bjc_invert_bytes(P4(byte *row, uint raster, bool inverse, byte lastmask));
--bool bjc_invert_cmyk_bytes(P8(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
-- bool inverse, byte lastmask, skip_t *skip));
--uint bjc_compress(P3(const byte *row, uint raster, byte *compressed));
--
--int FloydSteinbergInitG(P1(gx_device_printer * pdev));
--void FloydSteinbergDitheringG(P5(byte *row, byte *dithered, uint width, uint raster, bool limit_extr));
--void FloydSteinbergCloseG(P1(gx_device_printer *pdev));
--
--int FloydSteinbergForwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
--int FloydSteinbergBckwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
--int FloydSteinbergInitC(P1(gx_device_printer * pdev));
--void FloydSteinbergDitheringC(P6(byte *row, byte *dithered, uint width, uint raster,
-- bool limit_extr, bool composeK));
--void FloydSteinbergCloseC(P1(gx_device_printer *pdev));
--
--void bjc_build_gamma_table(P2(float gamma, char color));
--void bjc_rgb_to_cmy (P6(byte r, byte g, byte b, int *c, int *m, int *y));
--void bjc_rgb_to_gray(P4(byte r, byte g, byte b, int *k));
-+void bjc_put_LF(FILE *file);
-+void bjc_put_FF(FILE *file);
-+void bjc_put_CR(FILE *file);
-+void bjc_put_initialize(FILE *file);
-+void bjc_put_set_initial(FILE *file);
-+void bjc_put_set_compression(FILE *file, char compression);
-+void bjc_put_print_method_short(FILE *file, char color);
-+void bjc_put_print_method(FILE *file, char color, char media, char quality, char density);
-+void bjc_put_raster_resolution(FILE *file, int x_resolution, int y_resolution);
-+void bjc_put_raster_skip(FILE *file, int skip);
-+void bjc_put_page_margins(FILE *file, int length, int lm, int rm, int top);
-+void bjc_put_media_supply(FILE *file, char supply, char type);
-+void bjc_put_cmyk_image(FILE *file, char component, const char *data, int count);
-+void bjc_put_move_lines(FILE *file, int lines);
-+void bjc_put_move_lines_unit(FILE *file, int unit);
-+void bjc_put_extended_margins(FILE *file, int length, int lm, int rm, int top);
-+void bjc_put_image_format(FILE *file, char depth, char format, char ink);
-+void bjc_put_page_id(FILE *file, int id);
-+void bjc_put_continue_image(FILE *file, const char *data, int count);
-+void bjc_put_indexed_image(FILE *file, int dot_rows, int dot_cols, int layers);
-+
-+bool bjc_invert_bytes(byte *row, uint raster, bool inverse, byte lastmask);
-+bool bjc_invert_cmyk_bytes(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
-+ bool inverse, byte lastmask, skip_t *skip);
-+uint bjc_compress(const byte *row, uint raster, byte *compressed);
-+
-+int FloydSteinbergInitG(gx_device_printer * pdev);
-+void FloydSteinbergDitheringG(byte *row, byte *dithered, uint width, uint raster, bool limit_extr);
-+void FloydSteinbergCloseG(gx_device_printer *pdev);
-+
-+int FloydSteinbergForwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
-+int FloydSteinbergBckwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
-+int FloydSteinbergInitC(gx_device_printer * pdev);
-+void FloydSteinbergDitheringC(byte *row, byte *dithered, uint width, uint raster,
-+ bool limit_extr, bool composeK);
-+void FloydSteinbergCloseC(gx_device_printer *pdev);
-+
-+void bjc_build_gamma_table(float gamma, char color);
-+void bjc_rgb_to_cmy (byte r, byte g, byte b, int *c, int *m, int *y);
-+void bjc_rgb_to_gray(byte r, byte g, byte b, int *k);
- uint bjc_rand(void);
--void bjc_init_tresh(P1(int rnd));
-+void bjc_init_tresh(int rnd);
- #endif /* gdevbjc_INCLUDED */
--- print/ghostscript-gpl/files/patch-lib::cidfmap
+++ /dev/null
@@ -1,41 +0,0 @@
---- lib/cidfmap.orig Fri Feb 7 09:31:11 2003
-+++ lib/cidfmap Sun Jun 13 23:58:08 2004
-@@ -26,3 +26,38 @@
- % /ShinGo-Bold /HeiseiKakuGo-W5 ;
- % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
- %
-+/Ryumin-Light <<
-+/FileType /TrueType
-+/Path (kochi-mincho-subst.ttf)
-+/SubfontID 0
-+/CSI [(Japan1) 3]
-+>> ;
-+
-+/GothicBBB-Medium <<
-+/FileType /TrueType
-+/Path (kochi-gothic-subst.ttf)
-+/SubfontID 0
-+/CSI [(Japan1) 3]
-+>> ;
-+
-+/HeiseiMin-W3 /Ryumin-Light ;
-+%/HeiseiMin-W3 /WadaMin-Regular ;
-+/HeiseiKakuGo-W5 /GothicBBB-Medium ;
-+%/HeiseiKakuGo-W5 /WadaGo-Bold ;
-+/FutoMinA101-Bold /Ryumin-Light ;
-+%/FutoMinA101-Bold /WadaMin-Regular ;
-+/FutoGoB101-Bold /GothicBBB-Medium ;
-+%/FutoGoB101-Bold /WadaGo-Bold ;
-+/Jun101-Light /Ryumin-Light ;
-+%/Jun101-Light /WadaMin-Regular ;
-+/MidashiGo-MB31 /GothicBBB-Medium ;
-+%/MidashiGo-MB31 /WadaGo-Bold ;
-+
-+%/Munhwa-Regular /Munhwa-Regular ;
-+%/MunhwaGothic-Regular /MunhwaGothic-Regular ;
-+%/Munhwa-Bold /Munhwa-Bold ;
-+%/MunhwaGothic-Bold /MunhwaGothic-Bold ;
-+
-+/HYGoThic-Medium /MunhwaGothic-Regular ;
-+/HYSMyeongJo-Medium /Munhwa-Regular ;
-+/HYRGoThic-Medium /MunhwaGothic-Bold ;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-unixinst.mak
@@ -0,0 +1,11 @@
+--- src/unixinst.mak.orig 2007-08-15 05:48:29.000000000 +0900
++++ src/unixinst.mak 2008-05-05 16:48:06.000000000 +0900
+@@ -128,7 +128,7 @@
+ done'
+
+ # install the man pages for each locale
+-MAN_LCDIRS=. de
++MAN_LCDIRS=.
+ MAN1_LINKS_PS2PS=eps2eps
+ MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
+ MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src__zicc.c
@@ -0,0 +1,12 @@
+--- src/zicc.c
++++ src/zicc.c 2008-02-05 16:11:59.000000000 +0000
+@@ -77,6 +77,9 @@ zseticcspace(i_ctx_t * i_ctx_p)
+ dict_find_string(op, "N", &pnval);
+ ncomps = pnval->value.intval;
+
++ if (2*ncomps > sizeof(range_buff)/sizeof(float))
++ return_error(e_rangecheck);
++
+ /* verify the DataSource entry */
+ if (dict_find_string(op, "DataSource", &pstrmval) <= 0)
+ return_error(e_undefined);
--- /dev/null
+++ print/ghostscript-gpl/files/patch-contrib__japanese__dmp_site.ps
@@ -0,0 +1,11 @@
+--- contrib/japanese/dmp_site.ps.orig Wed Nov 29 20:56:17 2006
++++ contrib/japanese/dmp_site.ps Sun May 13 21:06:03 2007
+@@ -1,7 +1,7 @@
+ %!
+ BeginConfig
+ %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
+-/printer (escp_24.src)
++/printer (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
+ % horizontal / vertical
+ % /resolution [ 180.0 180.0 ]
+ % horizontal / vertical
--- print/ghostscript-gpl/files/patch-lips:gdevl4v.c
+++ /dev/null
@@ -1,173 +0,0 @@
---- lips/gdevl4v.c.orig Thu Nov 2 05:09:18 2000
-+++ lips/gdevl4v.c Sun Jun 11 15:57:43 2006
-@@ -230,41 +230,67 @@
- };
-
- /* Vector device implementation */
--private int lips4v_beginpage(P1(gx_device_vector * vdev));
--private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
-- const gx_drawing_color * pdc));
--private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
-- const gx_drawing_color * pdc));
--private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
-- uint count, floatp offset));
--private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
-+#if GS_VERSION_MAJOR >= 8
-+private int lips4v_beginpage(gx_device_vector * vdev);
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+ uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
-+private int
-+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+ gs_logical_operation_t diff);
-+private int
-+
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
-+private int
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
- private int
--lips4v_setlogop(P3
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+ floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
-+ gx_path_type_t type);
-+private int
-+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-+ floatp y_start, gx_path_type_t type);
-
-- (gx_device_vector * vdev, gs_logical_operation_t lop,
-- gs_logical_operation_t diff));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
-+private int lips4v_beginpage(P1(gx_device_vector * vdev));
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+ const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+ uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
-+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));
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
- private int
--lips4v_moveto(P6
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-- floatp y, gx_path_type_t type));
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
- private int
--lips4v_lineto(P6
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-- floatp y, gx_path_type_t type));
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+ floatp y, gx_path_type_t type);
- private int
--lips4v_curveto(P10
-- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
- floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
-- gx_path_type_t type));
-+ gx_path_type_t type);
- private int
--lips4v_closepath(P6
-- (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-- floatp y_start, 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);
-
--private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#endif
- private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
- private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -758,10 +784,26 @@
- /* Íѻ極¥¤¥º */
- if (pdev->prev_paper_size != paper_size) {
- if (paper_size == USER_SIZE) {
-- sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
-+ /* modified by shige 06/27 2003
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+ /* modified by shige 11/09 2003
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI,
-+ (height * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (height * 10),
-+ (width * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (width * 10));
- lputs(s, paper);
- } else if (paper_size == USER_SIZE + LANDSCAPE) {
-- sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
-+ /* modified by shige 06/27 2003
-+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+ /* modified by shige 11/09 2003
-+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI,
-+ (width * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (width * 10),
-+ (height * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (height * 10));
- lputs(s, paper);
- } else {
- sprintf(paper, "%c%dp", LIPS_CSI, paper_size);
-@@ -770,12 +812,28 @@
- } else if (paper_size == USER_SIZE) {
- if (pdev->prev_paper_width != width ||
- pdev->prev_paper_height != height)
-- sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
-+ /* modified by shige 06/27 2003
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+ /* modified by shige 11/09 2003
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI,
-+ (height * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (height * 10),
-+ (width * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (width * 10));
- lputs(s, paper);
- } else if (paper_size == USER_SIZE + LANDSCAPE) {
- if (pdev->prev_paper_width != width ||
- pdev->prev_paper_height != height)
-- sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
-+ /* modified by shige 06/27 2003
-+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+ /* modified by shige 11/09 2003
-+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI,
-+ (width * 10 > LIPS_HEIGHT_MAX_720)?
-+ LIPS_HEIGHT_MAX_720 : (width * 10),
-+ (height * 10 > LIPS_WIDTH_MAX_720)?
-+ LIPS_WIDTH_MAX_720 : (height * 10));
- lputs(s, paper);
- }
- pdev->prev_paper_size = paper_size;
-@@ -1881,7 +1939,7 @@
- }
- color_set_pure(&color, one);
- code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
-- &color);
-+ NULL, &color);
- }
- if (code < 0)
- return 0;
-@@ -2026,7 +2084,7 @@
- if (w <= 0 || h <= 0)
- return 0;
- if (depth > 1 ||
-- gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- gdev_vector_update_log_op(vdev, lop) < 0)
- return gx_default_fill_mask(dev, data, data_x, raster, id,
--- print/ghostscript-gpl/files/stc740p.upp
+++ /dev/null
@@ -1,36 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2
--r720x720
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupBlackTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupCyanTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupYellowTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveYPasses=6
--dupOutputPins=48
--dupWeaveYFeeds="{47 47 47 53 47 47}"
--dupWeaveInitialYFeeds="{1 1 1 1 1 43}"
--dupWeaveInitialPins="{ 8 48 40 31 23 15}"
--dupBeginPageCommand="<
- 1b40 1b40
- 1b2847 0100 01
- 1b2855 0100 05
- 1b5500
- 1b2865 0200 0002
- 1b2843 0200 0000
- 1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)"
-
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-FAPIcidfmap
@@ -0,0 +1,61 @@
+--- lib/FAPIcidfmap.orig 2006-06-01 00:29:52.000000000 +0900
++++ lib/FAPIcidfmap 2008-03-04 07:05:55.000000000 +0900
+@@ -29,4 +29,58 @@
+ %
+ % /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
+ % /HeiseiKakuGo-W5 << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/Ryumin-Light << /Path (Ryumin-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/GothicBBB-Medium << /Path (GothicBBB-Medium.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++
++/Ryumin-Medium /Ryumin-Light ;
++/Ryumin-Regular /Ryumin-Light ;
++/RyuminPro-Light /Ryumin-Light ;
++
++/GothicBBBPro-Medium /GothicBBB-Medium ;
++
++/KozGoPro-Bold /GothicBBB-Medium ;
++/KozGoPro-Heavy /GothicBBB-Medium ;
++/KozGoPro-Medium /GothicBBB-Medium ;
++/KozGoPro-Regular /GothicBBB-Medium ;
++
++/KozMinPro-Bold /Ryumin-Light ;
++/KozMinPro-Light /Ryumin-Light ;
++/KozMinPro-Medium /Ryumin-Light ;
++/KozMinPro-Regular /Ryumin-Light ;
++
++/HiraKakuPro-W3 /GothicBBB-Medium ;
++/HiraKakuPro-W6 /GothicBBB-Medium ;
++/HiraKakuStd-W8 /GothicBBB-Medium ;
++
++/HiraMaruPro-W4 /GothicBBB-Medium ;
++
++/HiraMinPro-W3 /Ryumin-Light ;
++
++/HeiseiMin-W3 /Ryumin-Light ;
++/HeiseiKakuGo-W5 /GothicBBB-Medium ;
++
++/FutoMinA101-Bold /Ryumin-Light ;
++/FutoMinA101Pro-Bold /Ryumin-Light ;
++/FutoGoB101-Bold /GothicBBB-Medium ;
++/FutoGoB101Pro-Bold /GothicBBB-Medium ;
+
++/Jun101-Light /Ryumin-Light ;
++/Jun101Pro-Light /Ryumin-Light ;
++
++/MidashiGo-MB31 /GothicBBB-Medium ;
++/MidashiGoPro-MB31 /GothicBBB-Medium ;
++
++/MidashiMinPro-MA31 /Ryumin-Light ;
++
++%/Munhwa-Regular /Munhwa-Regular ;
++%/MunhwaGothic-Regular /MunhwaGothic-Regular ;
++%/Munhwa-Bold /Munhwa-Bold ;
++%/MunhwaGothic-Bold /MunhwaGothic-Bold ;
++
++/HYGoThic-Medium /MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium /Munhwa-Regular ;
++/HYRGoThic-Medium /MunhwaGothic-Bold ;
++
++%/STHeiti-Regular << /Path (STHeiti-Regular.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/STSong-Light << /Path (STSong-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
++%/MSung-Light << /Path (MSung-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
--- print/ghostscript-gpl/files/stc740ih.upp
+++ /dev/null
@@ -1,60 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2XY
--r1440x720
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupBlackTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupCyanTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupMagentaTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupYellowTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveXPasses=2
--dupOutputXStep=2
--dupWeaveYPasses=6
--dupOutputPins=46
--dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}"
--dupWeaveXStarts="{0 1 0 1 0 1 1 0 1 0 1 0}"
--dupWeaveYOffset=50
--dupWeaveInitialYFeeds="{ 5 5 5 5 5 5 5 5 5 5 5 23}"
--dupWeaveInitialXStarts="{0 1 0 1 0 1 1 0 1 0 1 0}"
--dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}"
--dupFormatYabsolute
--dupBeginPageCommand="<
- 1b40 1b40
- 1b2847 0100 01
- 1b2855 0100 05
- 1b2873 0100 02
- 1b5501
- 1b2865 0200 0001
- 1b2843 0200 0000
- 1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupXStepCommand="<1b285c 0400 a005 0100 0000>"
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)"
-
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- bjc250/src/gdevbjc_.c.orig Fri Nov 8 06:15:15 2002
-+++ bjc250/src/gdevbjc_.c Fri Nov 8 07:43:31 2002
-@@ -54,9 +54,9 @@
- private dev_proc_put_params(gdev_bjc_put_params);
- private dev_proc_get_params(gdev_bjc_get_params);
- const stringParamDescription *
-- paramValueToParam(P2(const stringParamDescription *, int));
-+ paramValueToParam(const stringParamDescription *, int);
- const stringParamDescription *
-- paramStringToParam(P3(const stringParamDescription *, const char *, uint));
-+ paramStringToParam(const stringParamDescription *, const char *, uint);
-
- BJL_command BJL_command_set[] = {
- { "@Cleaning=1", BJC_BJL_CLEANING, 11},
--- print/ghostscript-gpl/files/dj970.contrib.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-###- cdj970 - HP 970Cxi Driver under development -------- ###
-cdeskjet9_=$(GLOBJ)gdevdj9.$(OBJ) $(HPPCL)
-
-$(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev
- $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
-
-$(GLOBJ)gdevdj9.$(OBJ) : $(GLSRC)gdevdj9.c $(PDEVH) $(math__h) \
- $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
- $(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(GLSRC)gdevdj9.c
--- print/ghostscript-gpl/files/patch-lips__gdevespg.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevespg.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevespg.c Fri Dec 17 19:39:57 2004
-@@ -142,7 +142,7 @@
- if (pdev->PageCount == 0)
- escpage_printer_initialize(pdev, fp, num_coipes);
-
-- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
-+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
- return_error(gs_error_VMerror);
-
- if (lprn->NegativePrint) {
-@@ -154,7 +154,7 @@
- if (code < 0)
- return code;
-
-- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
-+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
-
- if (pdev->Duplex)
- fprintf(fp, "%c0dpsE", GS);
--- print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
+++ /dev/null
@@ -1,102 +0,0 @@
---- eplaser/gdevesmv.c.orig Mon May 17 14:25:19 2004
-+++ eplaser/gdevesmv.c Mon Aug 2 14:05:21 2004
-@@ -34,10 +34,6 @@
-
- */
-
--#include <stdlib.h>
--#include <unistd.h>
--#include <string.h>
--
- #include "math_.h"
- #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 */
-+#if GS_VERSION_MAJOR >= 8
-+private int esmv_beginpage(gx_device_vector * vdev);
-+private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int esmv_setdash(gx_device_vector * vdev, const float *pattern,
-+ uint count, floatp offset);
-+private int esmv_setflat(gx_device_vector * vdev, floatp flatness);
-+private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+ gs_logical_operation_t diff);
-+#else
- 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));
-@@ -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));
-+#endif
- private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- fixed y1, gx_path_type_t type);
- private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
- gx_path_type_t type);
-+#if GS_VERSION_MAJOR >= 8
-+private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x, floatp y, gx_path_type_t type);
-+private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x, floatp y, gx_path_type_t type);
-+private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+ floatp x1, floatp y1, floatp x2, floatp y2,
-+ floatp x3, floatp y3, gx_path_type_t type);
-+private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y,
-+ floatp x_start, floatp y_start, gx_path_type_t type);
-+
-+private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
- 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));
-@@ -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));
-+#endif
- private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
- private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -1688,7 +1714,7 @@
- pdev->MaskState = 1;
- }
- color_set_pure(&color, one);
-- code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
-+ code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
-
- /* ¤³¤³¤òÄ̲ᤷ¤¿¤é°Ê²¼¤Î¿§ÀßÄê¤Ï̵°ÕÌ£¡© */
- }
-@@ -1771,7 +1797,7 @@
- gs_logical_operation_t lop, const gx_clip_path * pcpath)
- {
- gx_device_vector const *vdev = (gx_device_vector *) dev;
-- gx_device_esmv const *pdev = (gx_device_esmv *) dev;
-+ gx_device_esmv *pdev = (gx_device_esmv *) dev;
- stream *s = gdev_vector_stream(vdev);
- gx_color_index color = gx_dc_pure_color(pdcolor);
- char obuf[64];
-@@ -1779,7 +1805,7 @@
- if (w <= 0 || h <= 0) return 0;
-
- if (depth > 1 ||
-- gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- gdev_vector_update_log_op(vdev, lop) < 0
- )
--- print/ghostscript-gpl/files/patch-md2k:gdevmd2k.mak
+++ /dev/null
@@ -1,19 +0,0 @@
---- md2k/gdevmd2k.mak-5.50.orig Sun Nov 19 18:42:20 2000
-+++ md2k/gdevmd2k.mak-5.50 Sun Nov 19 18:52:14 2000
-@@ -3,11 +3,11 @@
-
- md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
-
--md2k.dev: $(md2k_) page.dev
-- $(SETPDEV) md2k $(md2k_)
-+$(DD)md2k.dev: $(md2k_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md2k $(md2k_)
-
--md5k.dev: $(md2k_) page.dev
-- $(SETPDEV) md5k $(md2k_)
-+$(DD)md5k.dev: $(md2k_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md5k $(md2k_)
-
--$(GLOBJ)gdevmd2k.$(OBJ): gdevmd2k.c $(PDEVH) $(gsparam_h)
-+$(GLOBJ)gdevmd2k.$(OBJ): $(GLSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
- $(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(GLSRC)gdevmd2k.c
Index: patch-src:fapi_ft.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src:fapi_ft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/files/patch-src:fapi_ft.c -L print/ghostscript-gpl/files/patch-src:fapi_ft.c -u -r1.2 -r1.3
--- print/ghostscript-gpl/files/patch-src:fapi_ft.c
+++ print/ghostscript-gpl/files/patch-src:fapi_ft.c
@@ -1,16 +1,20 @@
---- src/fapi_ft.c.orig Mon Mar 13 17:18:19 2006
-+++ src/fapi_ft.c Sun Mar 18 16:23:21 2007
-@@ -26,11 +26,14 @@
- #include "math_.h"
+--- src/fapi_ft.c.orig Wed Jul 11 09:26:24 2007
++++ src/fapi_ft.c Fri Aug 10 02:40:41 2007
+@@ -28,11 +28,14 @@
+ #include "gserror.h"
/* FreeType headers */
-#include "freetype/freetype.h"
+-#include "freetype/ftincrem.h"
+-#include "freetype/ftglyph.h"
+-#include "freetype/ftoutln.h"
+-#include "freetype/fttrigon.h"
+#include "ft2build.h"
+#include FT_FREETYPE_H
- #include "freetype/ftincrem.h"
- #include "freetype/ftglyph.h"
- #include "freetype/ftoutln.h"
- #include "freetype/fttrigon.h"
++#include FT_INCREMENTAL_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
+#include "gserrors.h"
+#include "gserror.h"
--- print/ghostscript-gpl/files/patch-lex7000__src__gdevlx7.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- lex7000/src/gdevlx7.c.orig Fri Dec 31 17:22:48 2004
-+++ lex7000/src/gdevlx7.c Fri Dec 31 17:24:39 2004
-@@ -615,14 +615,14 @@
- dprintf2("Current resolution is %f width x %f height dpi\n",
- pdev->x_pixels_per_inch, pdev->y_pixels_per_inch );
- #endif
-- pbuf = (byte *)gs_malloc(rpbufsize, 1, "lxmgen_print_page(pbuf)");
-+ pbuf = (byte *)gs_malloc(pdev->memory, rpbufsize, 1, "lxmgen_print_page(pbuf)");
- if (pbuf == NULL)
- return_error(gs_error_VMerror);
-
-- outbuf = (byte *)gs_malloc(OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-+ outbuf = (byte *)gs_malloc(pdev->memory, OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
- if (outbuf == NULL)
- {
-- gs_free((char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
-+ gs_free(pdev->memory, (char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
- return_error(gs_error_VMerror);
- }
- /* initialize begin of outbuf ... */
-@@ -799,8 +799,8 @@
-
- /* eject page */
- lex_eject(prn_stream);
-- gs_free((char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
-- gs_free((char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-+ gs_free(pdev->memory, (char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
-+ gs_free(pdev->memory, (char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-
- #ifdef DEBUG
- dprintf1("[%s] print_page() end\n",pdev->dname);
--- print/ghostscript-gpl/files/patch-src:gdevhl12.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdevhl12.c.orig Wed Mar 28 14:10:35 2007
-+++ src/gdevhl12.c Wed Mar 28 14:13:21 2007
-@@ -472,7 +472,7 @@
- for (y = ytop; y < ybottom; y++) {
- if (hl1250_compress_line(s, y))
- continue;
--#if 1
-+#if 0
- /* XXX - please report if you ever see this, then change to #if 0 */
- fprintf(stderr,
- "hl1250: compression failed (y=%u), doing 1200x300 dpi\n",
--- print/ghostscript-gpl/files/patch-src:gdevlx50.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/gdevlx50.c.orig Fri Dec 17 19:31:43 2004
-+++ src/gdevlx50.c Fri Dec 17 22:31:26 2004
-@@ -1120,18 +1120,18 @@
-
- /* Allocate a buffer for a single scan line */
- lineBuffer = (byte *)gs_alloc_byte_array
-- ( &gs_memory_default, lx5000dev->scanLineBytes, 1,
-+ ( lx5000dev->memory, lx5000dev->scanLineBytes, 1,
- "lx5000_print_page(lineBuffer)" );
-
- swipeBuf = (byte *)gs_alloc_byte_array
-- ( &gs_memory_default, lx5000dev->swipeBufSize, 1,
-+ ( lx5000dev->memory, lx5000dev->swipeBufSize, 1,
- "lx5000_print_page(swipeBuf)" );
-
- for ( colour = 0 ; colour < numColours; colour++ )
- {
- if ( ( colourBufs[colour] =
- (byte *)gs_alloc_byte_array
-- ( &gs_memory_default, lx5000dev->penBufSize, 1,
-+ ( lx5000dev->memory, lx5000dev->penBufSize, 1,
- "lx5000_print_page(colourBufs)"
- )
- ) == NULL )
-@@ -1172,19 +1172,19 @@
- for ( colour = 0; colour < numColours; colour++ )
- {
- if ( colourBufs[colour] != NULL )
-- gs_free_object( &gs_memory_default,
-+ gs_free_object( lx5000dev->memory,
- (char *)colourBufs[colour],
- "lx5000_print_page(colourBufs)" );
- colourBufs[ colour ] = NULL;
- colourBufPtrs[ colour ] = NULL;
- }
- if ( swipeBuf != NULL )
-- gs_free_object( &gs_memory_default,
-+ gs_free_object( lx5000dev->memory,
- (char *)swipeBuf, "lx5000_print_page(swipeBuf)" );
- swipeBuf = NULL;
- *swipeBufPtr = NULL;
- if ( lineBuffer != NULL )
-- gs_free_object( &gs_memory_default,
-+ gs_free_object( lx5000dev->memory,
- (char *)lineBuffer, "lx5000_print_page(lineBuffer)" );
- lineBuffer = NULL;
- *lineBufferPtr = NULL;
-@@ -2603,9 +2603,12 @@
-
- /* Map CMYK to color. */
- private gx_color_index
--lx5000_map_cmyk_color(gx_device * dev, gx_color_value cyan,
-- gx_color_value magenta, gx_color_value yellow, gx_color_value black)
-+lx5000_map_cmyk_color(gx_device * dev, const gx_color_value cv[])
- {
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
- int bpc = dev->color_info.depth / 4;
- int drop = sizeof(gx_color_value) * 8 - bpc;
- gx_color_index color =
--- print/ghostscript-gpl/files/patch-lib__pv.sh.CAN-2004-0967
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/pv.sh.orig Mon Nov 28 02:18:26 2005
-+++ lib/pv.sh Mon Nov 28 02:18:59 2005
-@@ -29,9 +29,10 @@
- PAGE=$1
- shift
- FILE=$1
-+TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
- shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-+trap "rm -rf $TEMPFILE" 0 1 2 15
- #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--gs $FILE.$$.pv
-+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+gs $TEMPFILE
- exit 0
--- print/ghostscript-gpl/files/patch-gdev10v__gdev10v.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- gdev10v/gdev10v.c.orig Sat Dec 11 04:10:45 1993
-+++ gdev10v/gdev10v.c Fri Dec 17 19:15:49 2004
-@@ -152,8 +152,8 @@
- int bytes_per_column = bits_per_column / 8;
- int x_skip_unit = bytes_per_column * (xres / 180);
- int y_skip_unit = (yres / 180);
-- byte *in = (byte *)gs_malloc(8, line_size, "bj10v_print_page(in)");
-- byte *out = (byte *)gs_malloc(bits_per_column, line_size, "bj10v_print_page(out)");
-+ byte *in = (byte *)gs_malloc(pdev->memory, 8, line_size, "bj10v_print_page(in)");
-+ byte *out = (byte *)gs_malloc(pdev->memory, bits_per_column, line_size, "bj10v_print_page(out)");
- int lnum = 0;
- int y_skip = 0;
- int code = 0;
-@@ -275,7 +275,7 @@
- /* Eject the page */
- xit: prn_putc(pdev, 014); /* form feed */
- prn_flush(pdev);
-- gs_free((char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
-- gs_free((char *)in, 8, line_size, "bj10v_print_page(in)");
-+ gs_free(pdev->memory, (char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
-+ gs_free(pdev->memory, (char *)in, 8, line_size, "bj10v_print_page(in)");
- return code;
- }
--- print/ghostscript-gpl/files/patch-src:gdevcd8.c
+++ /dev/null
@@ -1,303 +0,0 @@
---- src/gdevcd8.c.orig Mon Feb 28 16:01:59 2000
-+++ src/gdevcd8.c Fri Dec 17 19:42:52 2004
-@@ -406,19 +406,19 @@
- };
-
- private int
-- rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise1x1(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise2x1(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise1x2(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
- private int
-- rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
-- const byte * inbyteb, byte * outbyte));
-+ rescale_byte_wise2x2(int bytecount, const byte * inbytea,
-+ const byte * inbyteb, byte * outbyte);
-
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
- {
- rescale_byte_wise1x1, rescale_byte_wise1x2
- },
-@@ -571,16 +571,16 @@
- };
-
- /* function pointer typedefs for device driver struct */
--typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
-- FILE * prn_stream));
--typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
-+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
-+ FILE * prn_stream);
-+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
-
--typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
-+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
-
- typedef struct gx_device_cdj850_s {
- gx_device_common;
-@@ -699,52 +699,52 @@
- * functions.
- */
- private void
-- cdj850_start_raster_mode(P3(gx_device_printer * pdev,
-- int papersize, FILE * prn_stream));
-+ cdj850_start_raster_mode(gx_device_printer * pdev,
-+ int papersize, FILE * prn_stream);
-
- private void
-- cdj850_print_non_blank_lines(P6(gx_device_printer * pdev,
-+ cdj850_print_non_blank_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
-
- private void
-- cdj850_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+ cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-
- /* The 880C and siblings need a separate set of functions because they seem
- * to require a somewhat different version of PCL3+.
- */
- private void
-- cdj880_start_raster_mode(P3(gx_device_printer * pdev,
-- int papersize, FILE * prn_stream));
-+ cdj880_start_raster_mode(gx_device_printer * pdev,
-+ int papersize, FILE * prn_stream);
-
- private void
-- cdj880_print_non_blank_lines(P6(gx_device_printer * pdev,
-+ cdj880_print_non_blank_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
-
- private void
-- cdj880_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+ cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-
- /* Functions for the 1600C.
- */
- private void
-- cdj1600_start_raster_mode(P3(gx_device_printer * pdev,
-- int papersize, FILE * prn_stream));
-+ cdj1600_start_raster_mode(gx_device_printer * pdev,
-+ int papersize, FILE * prn_stream);
- private void
-- cdj1600_print_non_blank_lines(P6(gx_device_printer * pdev,
-+ cdj1600_print_non_blank_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
- private void
-- cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+ cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-
-
-
-@@ -804,12 +804,12 @@
- cdj1600_terminate_page);
-
- /* Forward references */
--private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
-- int *, int, int, int));
--private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
-- *, float, float, int));
--private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
--private int cdj_set_bpp(P3(gx_device *, int, int));
-+private int cdj_put_param_int(gs_param_list *, gs_param_name,
-+ int *, int, int, int);
-+private int cdj_put_param_float(gs_param_list *, gs_param_name, float
-+ *, float, float, int);
-+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-+private int cdj_set_bpp(gx_device *, int, int);
-
-
- /* hp_colour_open()
-@@ -1028,73 +1028,73 @@
-
- /* internal functions */
- private void
-- FSDlinebw(P7(int scan, int plane_size,
-+ FSDlinebw(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * kP,
-- int n, int *ep, byte * dp));
-+ int n, int *ep, byte * dp);
- private void
-- FSDlinec2(P9(int scan, int plane_size,
-+ FSDlinec2(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa, int n,
-- byte * dp, int *ep));
-+ byte * dp, int *ep);
- private void
-- FSDlinec3(P12(int scan, int plane_size,
-+ FSDlinec3(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa,
- byte * cPb, byte * mPb, byte * yPb,
-- int n, byte * dp, int *ep));
-+ int n, byte * dp, int *ep);
- private void
-- FSDlinec4(P12(int scan, int plane_size,
-+ FSDlinec4(int scan, int plane_size,
- struct error_val_field *error_values,
- byte * cPa, byte * mPa, byte * yPa,
- byte * cPb, byte * mPb, byte * yPb,
-- int n, byte * dp, int *ep));
-+ int n, byte * dp, int *ep);
- private void
- init_error_buffer(struct misc_struct *misc_vars,
- struct ptr_arrays *data_ptrs);
- private void
-- do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
-+ do_floyd_steinberg(int scan, int cscan, int plane_size,
- int plane_size_c, int n,
- struct ptr_arrays *data_ptrs,
- gx_device_printer * pdev,
-- struct error_val_field *error_values));
-+ struct error_val_field *error_values);
- private int
-- do_gcr(P8(int bytecount, byte * inbyte, const byte * kvalues,
-+ do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
- const byte * cvalues, const byte * mvalues,
- const byte * yvalues, const int *kcorrect,
-- word * inword));
-+ word * inword);
-
- /* UNUSED
- *private int
-- *test_scan (P4(int size,
-+ *test_scan (int size,
- * byte * current,
- * byte * last,
-- * byte * control));
-+ * byte * control);
- *private void
-- *save_color_data(P3(int size,
-+ *save_color_data(int size,
- * byte * current,
-- * byte * saved));
-+ * byte * saved);
- *
- */
- private void
-- send_scan_lines(P6(gx_device_printer * pdev,
-+ send_scan_lines(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
- struct misc_struct *misc_vars,
- struct error_val_field *error_values,
- const Gamma *gamma,
-- FILE * prn_stream));
-+ FILE * prn_stream);
- private void
-- do_gamma(P3(float mastergamma, float gammaval, byte * values));
-+ do_gamma(float mastergamma, float gammaval, byte * values);
- private void
-- do_black_correction(P2(float kvalue, int *kcorrect));
-+ do_black_correction(float kvalue, int *kcorrect);
-
- private void
-- init_data_structure(P3(gx_device_printer * pdev,
-+ init_data_structure(gx_device_printer * pdev,
- struct ptr_arrays *data_ptrs,
-- struct misc_struct *misc_vars));
-+ struct misc_struct *misc_vars);
- private void
-- calculate_memory_size(P2(gx_device_printer * pdev,
-- struct misc_struct *misc_vars));
-+ calculate_memory_size(gx_device_printer * pdev,
-+ struct misc_struct *misc_vars);
-
-
- private void
-@@ -1175,7 +1175,7 @@
- 2bpp feature of the hp850 someday, it is sized like storage.
- storagee contains the errors from b/w fs-ditherng */
-
-- data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
-+ data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
- "cdj850_print_page");
-
- /* if we can't allocate working area */
-@@ -1196,7 +1196,7 @@
- (*cdj850->terminate_page) (pdev, prn_stream);
-
- /* Free Memory */
-- gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
-+ gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
- "hp850_print_page");
-
- return 0;
-@@ -2744,13 +2744,14 @@
- (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
-
- private gx_color_index
--gdev_cmyk_map_cmyk_color(gx_device * pdev,
-- gx_color_value cyan, gx_color_value magenta,
-- gx_color_value yellow,
-- gx_color_value black)
-+gdev_cmyk_map_cmyk_color(gx_device * pdev, const gx_color_value cv[])
- {
-
- gx_color_index color;
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
-
- switch (pdev->color_info.depth) {
- case 1:
-@@ -2783,9 +2784,11 @@
- /* Mapping of RGB colors to gray values. */
-
- private gx_color_index
--gdev_cmyk_map_rgb_color(gx_device * pdev, gx_color_value r, gx_color_value
-- g, gx_color_value b)
-+gdev_cmyk_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff) {
- return (gx_color_index) 0; /* White */
- } else {
-@@ -2873,9 +2876,11 @@
- }
-
- private gx_color_index
--gdev_pcl_map_rgb_color(gx_device * pdev, gx_color_value r,
-- gx_color_value g, gx_color_value b)
-+gdev_pcl_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff)
- return (gx_color_index) 0; /* white */
- else {
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-contrib.mak
@@ -0,0 +1,8 @@
+--- src/contrib.mak.orig 2008-03-04 06:06:45.000000000 +0900
++++ src/contrib.mak 2008-03-04 06:07:11.000000000 +0900
+@@ -858,3 +858,5 @@
+ $(SETPDEV) $(DD)picty180 $(cdeskjet_)
+
+ #########################################################################
++
++include $(GLSRCDIR)/epag.contrib.mak
--- print/ghostscript-gpl/files/patch-src-dviprlib.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/dviprlib.h.orig Tue May 13 16:10:34 1997
-+++ src/dviprlib.h Tue May 24 21:41:14 2005
-@@ -337,23 +337,23 @@
- #ifdef dviprlib_implementation
- typedef struct {
- int no;
-- long (*getworksize)(P2(dviprt_print *,long ));
-- long (*encode)(P3(dviprt_print *,long,int));
-+ long (*getworksize)(dviprt_print *,long);
-+ long (*encode)(dviprt_print *,long,int);
- } dviprt_encoder;
-
- #define liblocal private
-
--liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
--liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
--liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
--liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
--liblocal int dviprt_printmessage(P2(char *,int ));
--liblocal int dviprt_printerror(P2(char *,int ));
--liblocal int dviprt_printwarning(P2(char *,int ));
--liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
--liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
-+liblocal dviprt_encoder *dviprt_getencoder_(int);
-+liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int);
-+liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
-+liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
-+liblocal int dviprt_printmessage(char *,int);
-+liblocal int dviprt_printerror(char *,int);
-+liblocal int dviprt_printwarning(char *,int);
-+liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int);
-+liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int);
-
--extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
-+extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
- extern char dviprt_message_buffer[];
- #endif dviprlib_implementation
-
--- print/ghostscript-gpl/files/patch-pcl3__eprn__gdeveprn.c
+++ /dev/null
@@ -1,180 +0,0 @@
---- pcl3/eprn/gdeveprn.c.orig Mon Apr 30 14:15:51 2001
-+++ pcl3/eprn/gdeveprn.c Sun Mar 25 22:22:54 2007
-@@ -142,11 +142,13 @@
- if_debug0(EPRN_TRACE_CHAR,
- "! eprn_get_initial_matrix(): code is still ms_none.\n");
- #endif
-+#if 0
- if (eprn_set_page_layout(dev) != 0)
- fputs(" Processing can't be stopped at this point although this error "
- "occurred.\n", stderr);
- /* The current function has a signature without the ability to signal
- an error condition. */
-+#endif
- }
-
- quarters = dev->eprn.default_orientation +
-@@ -607,6 +609,7 @@
- }
- }
-
-+#if 0
- /* Now the 'best_*match' variables indicate for each of the categories of
- page descriptions to which extent the size is supported at all (non-NULL
- value) and what the best flag match in the category is. Here we now check
-@@ -647,6 +650,7 @@
- return -1;
- }
- }
-+#endif
- /* Now we have: best_dmatch != NULL || best_cmatch != NULL &&
- (eprn->media_overrides == NULL || best_cdmatch != NULL). */
-
-@@ -692,7 +696,9 @@
- }
- /* If we've found a match, 'code' is no longer 'ms_none'. */
- if (eprn->code == ms_none) {
-+#if 0
- eprn_flag_mismatch(stderr, eprn, no_match);
-+#endif
- return -1;
- }
-
-@@ -762,9 +768,11 @@
-
- rc = gdev_prn_open((gx_device *)dev);
- if (rc < 0) {
-+#if 0
- fprintf(stderr, "%s" ERRPREF
- "Failure of gdev_prn_open(), code is %d.\n",
- epref, rc);
-+#endif
- return rc;
- }
- }
-@@ -875,7 +883,7 @@
- &hres, &vres, &eprn->black_levels, &eprn->non_black_levels);
-
- if (eprn->pagecount_file != NULL) {
-- gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+ gs_free(dev->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
- sizeof(char), "eprn_init_device");
- eprn->pagecount_file = NULL;
- }
-@@ -944,17 +952,21 @@
- &eprn->black_levels, &eprn->non_black_levels) != 0) {
- gs_param_string str;
-
-+#if 0
- fprintf(stderr, "%s" ERRPREF "The requested combination of colour model (",
- epref);
-+#endif
- str.size = 0;
- if (eprn_get_string(eprn->colour_model, eprn_colour_model_list, &str) != 0)
- assert(0); /* Bug. No harm on NDEBUG because I've just set the size. */
-+#if 0
- fwrite(str.data, str.size, sizeof(str.data[0]), stderr);
- fprintf(stderr, "),\n"
- "%s resolution (%gx%g ppi) and intensity levels (%d, %d) is\n"
- "%s not supported by the %s.\n",
- epref, device->HWResolution[0], device->HWResolution[1],
- eprn->black_levels, eprn->non_black_levels, epref, eprn->cap->name);
-+#endif
- return_error(gs_error_rangecheck);
- }
-
-@@ -1017,11 +1029,13 @@
- inappropriate :-). Note that eprn does not use 'PageCount' for
- updating the file. */
- else {
-+#if 0
- /* pcf_getcount() has issued an error message. */
- fputs(
- " No further attempts will be made to access the page count file.\n",
- stderr);
-- gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+#endif
-+ gs_free(device->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
- sizeof(char), "eprn_open_device");
- eprn->pagecount_file = NULL;
- }
-@@ -1034,31 +1048,33 @@
- /* Just in case a previous open call failed in a derived device (note that
- 'octets_per_line' is still the same as then): */
- if (eprn->scan_line.str != NULL)
-- gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+ gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- "eprn_open_device");
- if (eprn->next_scan_line.str != NULL) {
-- gs_free(eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+ gs_free(device->memory, eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- "eprn_open_device");
- eprn->next_scan_line.str = NULL;
- }
-
- /* Calls which might depend on prn having been initialized */
- eprn->octets_per_line = gdev_prn_raster((gx_device_printer *)device);
-- eprn->scan_line.str = (eprn_Octet *) gs_malloc(eprn->octets_per_line,
-+ eprn->scan_line.str = (eprn_Octet *) gs_malloc(device->memory, eprn->octets_per_line,
- sizeof(eprn_Octet), "eprn_open_device");
- if (eprn->intensity_rendering == eprn_IR_FloydSteinberg) {
-- eprn->next_scan_line.str = (eprn_Octet *) gs_malloc(eprn->octets_per_line,
-+ eprn->next_scan_line.str = (eprn_Octet *) gs_malloc(device->memory, eprn->octets_per_line,
- sizeof(eprn_Octet), "eprn_open_device");
- if (eprn->next_scan_line.str == NULL && eprn->scan_line.str != NULL) {
-- gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+ gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- "eprn_open_device");
- eprn->scan_line.str = NULL;
- }
- }
- if (eprn->scan_line.str == NULL) {
-+#if 0
- fprintf(stderr, "%s" ERRPREF
- "Memory allocation failure from gs_malloc() in eprn_open_device().\n",
- epref);
-+#endif
- return_error(gs_error_VMerror);
- }
-
-@@ -1080,12 +1096,12 @@
- #endif
-
- if (eprn->scan_line.str != NULL) {
-- gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+ gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- "eprn_close_device");
- eprn->scan_line.str = NULL;
- }
- if (eprn->next_scan_line.str != NULL) {
-- gs_free(eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+ gs_free(device->memory, eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- "eprn_close_device");
- eprn->next_scan_line.str = NULL;
- }
-@@ -1152,20 +1168,24 @@
- accounting, this seems unfair.
- */
- if (rc == 0 && eprn->CUPS_accounting)
-+#if 0
- fprintf(stderr, "PAGE: %ld %d\n", dev->ShowpageCount, num_copies);
- /* The arguments are the number of the page, starting at 1, and the number
- of copies of that page. */
-+#endif
-
- #ifndef EPRN_NO_PAGECOUNTFILE
- /* On success, record the number of pages printed */
- if (rc == 0 && eprn->pagecount_file != NULL) {
- assert(num_copies > 0); /* because of signed/unsigned */
- if (pcf_inccount(eprn->pagecount_file, num_copies) != 0) {
-+#if 0
- /* pcf_inccount() has issued an error message. */
- fputs(
- " No further attempts will be made to access the page count file.\n",
- stderr);
-- gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+#endif
-+ gs_free(dev->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
- sizeof(char), "eprn_output_page");
- eprn->pagecount_file = NULL;
- }
--- print/ghostscript-gpl/files/patch-alps:gdevalps.mak
+++ /dev/null
@@ -1,25 +0,0 @@
---- alps/gdevalps.mak-5.50.orig Sat Jan 12 13:21:12 2002
-+++ alps/gdevalps.mak-5.50 Sat Jan 12 13:23:45 2002
-@@ -2,15 +2,15 @@
-
- alps_=$(GLOBJ)gdevalps.$(OBJ)
-
--md50Mono.dev: $(alps_) page.dev
-- $(SETPDEV) md50Mono $(alps_)
-+$(DD)md50Mono.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md50Mono $(alps_)
-
--md50Eco.dev: $(alps_) page.dev
-- $(SETPDEV) md50Eco $(alps_)
-+$(DD)md50Eco.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md50Eco $(alps_)
-
--md1xMono.dev: $(alps_) page.dev
-- $(SETPDEV) md1xMono $(alps_)
-+$(DD)md1xMono.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md1xMono $(alps_)
-
--$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(PDEVH)
-+$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(gdevprn_h) $(PDEVH)
- $(GLCC) $(GLO_)gdevalps.$(OBJ) $(C_) $(GLSRC)gdevalps.c
-
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.dmprt
@@ -0,0 +1,9 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.dmprt,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+post-install-dmprt:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
+ cd ${FILESDIR} && \
+ ${INSTALL_DATA} lqx70ch.upp lqx70cl.upp lqx70cm.upp \
+ ${DATADIR}/${PORTVERSION}/lib
+
+post-install: post-install-dmprt
--- print/ghostscript-gpl/files/patch-mjc:gdevmjc.mak
+++ /dev/null
@@ -1,43 +0,0 @@
---- mjc/gdevmjc.mak.orig Tue May 23 19:19:13 2000
-+++ mjc/gdevmjc.mak Tue May 23 19:19:40 2000
-@@ -4,25 +4,22 @@
- # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C
- #
- ##
--#
--# Append this file to Makefile
--#
--##
--MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \
-- mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c
-+MJCSRC = $(GLSRC)gdevmjc.c $(GLSRC)mjmtx2.c $(GLSRC)mjbksep.c \
-+ $(GLSRC)mjhtocmy.c $(GLSRC)mjvtbl.c $(GLSRC)mjgrnsp.c \
-+ $(GLSRC)mjgrnsp2.c $(GLSRC)mjespdtc.c $(GLSRC)mjespdtm.c \
-+ $(GLSRC)mjespdty.c $(GLSRC)mjbarrie.c
-
--mj700v2c_=gdevmjc.$(OBJ) $(HPPCL)
-+mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL)
-
- # To make A4 paper the default, change the second line below this to
--gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
-- $(CCC) -DA4 gdevmjc.c
--
--mjc180.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc180 $(mj700v2c_)
--mjc360.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc360 $(mj700v2c_)
--mjc720.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc720 $(mj700v2c_)
--mj500c.dev: $(mj700v2c_)
-- $(SHP)gssetdev mj500c $(mj700v2c_)
-+$(GLOBJ)gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
-+ $(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c
-
-+$(GLOBJ)mjc180.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc180 $(mj700v2c_)
-+$(GLOBJ)mjc360.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc360 $(mj700v2c_)
-+$(GLOBJ)mjc720.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc720 $(mj700v2c_)
-+$(GLOBJ)mj500c.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mj500c $(mj700v2c_)
--- print/ghostscript-gpl/files/lex7000.contrib.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-# ------ The Lexmark 5700 and 7000 devices ------ #
-
-lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev
- $(SETPDEV) $(DD)lex7000 $(lex7000_)
-
-lex5700_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex5700.dev: $(lex5700_) $(DD)page.dev
- $(SETPDEV) $(DD)lex5700 $(lex5700_)
-
-lex3200_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex3200.dev: $(lex3200_) $(DD)page.dev
- $(SETPDEV) $(DD)lex3200 $(lex3200_)
-
-lex2050_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex2050.dev: $(lex2050_) $(DD)page.dev
- $(SETPDEV) $(DD)lex2050 $(lex2050_)
-
-$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH)
- $(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c
-
--- print/ghostscript-gpl/files/patch-lib__ps2epsi.CAN-2004-0967
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/ps2epsi.orig Thu May 25 02:19:27 2006
-+++ lib/ps2epsi Fri Mar 23 10:55:11 2007
-@@ -5,14 +5,8 @@
- # executable name set in the makefile
- GS_EXECUTABLE=gs
-
--# try to create a temporary file securely
--tmpdir=/tmp/ps2epsi.$$
--(umask 077 && mkdir $tmpdir)
--if test ! -d $tmpdir; then
-- echo "failed: could not create temporary file"
-- exit 1
--fi
--tmpfile=$tmpdir/ps2epsi$$
-+tmpfile=`mktemp -t ps2epsi.XXXXXX || exit 1`
-+trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
-
- export outfile
-
--- print/ghostscript-gpl/files/lxm3200.contrib.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-### ---------------- Lexmark 3200 device ----------------- ###
-
-lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
-
-$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
- $(SETPDEV) $(DD)lxm3200 $(lxm3200_)
-
-$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
- $(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
-
--- print/ghostscript-gpl/files/patch-mjc:gdevmjc.c
+++ /dev/null
@@ -1,413 +0,0 @@
---- mjc/gdevmjc.c.orig Sat Nov 2 17:58:50 1996
-+++ mjc/gdevmjc.c Fri Dec 31 16:24:50 2004
-@@ -43,7 +43,8 @@
- #include <limits.h>
- #include "gdevprn.h"
- #include "gdevpcl.h"
--#include "gsprops.h"
-+#include "gsparam.h"
-+#include "gsstate.h"
-
- #include "mjmtx2.c"
- #include "mjbksep.c"
-@@ -150,7 +151,9 @@
-
- /* Undefined macros expected to be defined in gdevpcl.h */
- #define PAPER_SIZE_A3_NOBI 28
-+#ifndef PAPER_SIZE_A2
- #define PAPER_SIZE_A2 29
-+#endif
- #define PAPER_SIZE_B4 30
- #define PAPER_SIZE_B5 31
-
-@@ -190,18 +193,16 @@
- private dev_proc_print_page(mjc720_print_page);
- private dev_proc_print_page(mj500c_print_page);
-
--private dev_proc_get_props(mj_get_props);
--private dev_proc_put_props(mj_put_props);
--
--private void expand_line(P4(word*, int, int, int));
--private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
--private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
-+private dev_proc_get_params(mj_get_params);
-+private dev_proc_put_params(mj_put_params);
-
--private void set_bpp(P2(gx_device *, int));
-+private void expand_line(word*, int, int, int);
-+private int mj_put_param_int(gs_param_list *, gs_param_name, int *, int, int, int);
-+private void mj_set_bpp(gx_device *, int);
-
--private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
-+private uint gdev_prn_rasterwidth(const gx_device_printer *, int );
-
--private gx_color_index mjc_correct_color(P2(gx_device_printer *, gx_color_index));
-+private gx_color_index mjc_correct_color(gx_device_printer *, gx_color_index);
-
- /* The device descriptors */
- struct gx_device_mj_s {
-@@ -224,7 +225,7 @@
- #define mj ((gx_device_mj *) pdev)
-
- #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\
-- prn_device_body(gx_device_printer, procs, dev_name,\
-+ prn_device_body(gx_device_mj, procs, dev_name,\
- WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
- bpp, 0, 0, 0, 0, print_page)
-
-@@ -235,9 +236,9 @@
- }
-
-
--#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\
-+#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\
- proc_colour_open,\
-- gdev_pcl_get_initial_matrix,\
-+ gx_default_get_initial_matrix,\
- gx_default_sync_output,\
- gdev_prn_output_page,\
- gdev_prn_close,\
-@@ -249,15 +250,15 @@
- NULL, /* copy_color */\
- NULL, /* draw_line */\
- gx_default_get_bits,\
-- proc_get_props,\
-- proc_put_props\
-+ proc_get_params,\
-+ proc_put_params\
- }
-
--private int mjc_open(P1(gx_device *));
--private int mj_colour_open(P1(gx_device *));
-+private int mjc_open(gx_device *);
-+private int mj_colour_open(gx_device *);
-
- private gx_device_procs mj_procs =
--mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
-+mj_colour_procs(mjc_open, mj_get_params, mj_put_params);
-
- gx_device_mj far_data gs_mjc180_device =
- mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL,
-@@ -306,14 +307,14 @@
- static const float mj_b4[4] = { MJ700V2C_MARGINS_B4 };
- static const float mj_b5[4] = { MJ700V2C_MARGINS_B5 };
- static const float mj_letter[4] = { MJ700V2C_MARGINS_LETTER };
-- const float _ds *m;
-+ const float *m;
- int psize;
-
- int paper_size;
-
- /* Set up colour params if put_props has not already done so */
- if (pdev->color_info.num_components == 0)
-- set_bpp(pdev, pdev->color_info.depth);
-+ mj_set_bpp(pdev, pdev->color_info.depth);
-
- paper_size = gdev_mjc_paper_size(pdev);
- if (paper_size == PAPER_SIZE_A2 ) {
-@@ -332,10 +333,7 @@
- m = mj_letter;
- }
-
-- pdev->l_margin = m[0];
-- pdev->b_margin = m[1];
-- pdev->r_margin = m[2];
-- pdev->t_margin = m[3];
-+ gx_device_set_margins(pdev, m, true);
-
- switch (mj->colorcomp) {
- case 1:
-@@ -360,84 +358,78 @@
- * and control over the bits-per-pixel used in output rendering */
- /* Added properties for DeskJet 5xxC */
-
--private const gs_prop_item props_mj[] = {
-- /* Read-write properties. */
-- prop_def("Density", prt_int),
-- prop_def("Cyan", prt_int),
-- prop_def("Magenta", prt_int),
-- prop_def("Yellow", prt_int),
-- prop_def("Black", prt_int),
-- prop_def("Dither", prt_int),
-- prop_def("ColorComponent", prt_int),
-- prop_def("Direction", prt_int),
-- prop_def("MicroWeave", prt_int),
-- prop_def("DotSize", prt_int),
--};
--
- private int
--mj_get_props(gx_device *pdev, gs_prop_item *plist)
--{ int start = gdev_prn_get_props(pdev, plist);
-- if ( plist != 0 ) {
-- register gs_prop_item *pi = plist + start;
-- memcpy(pi, props_mj, sizeof(props_mj));
-- pi[0].value.i = mj->density;
-- pi[1].value.i = mj->cyan;
-- pi[2].value.i = mj->magenta;
-- pi[3].value.i = mj->yellow;
-- pi[4].value.i = mj->black;
-- pi[5].value.i = mj->dither;
-- pi[6].value.i = mj->colorcomp;
-- pi[7].value.i = mj->direction;
-- pi[8].value.i = mj->microweave;
-- pi[9].value.i = mj->dotsize;
-- }
-- return start + sizeof(props_mj) / sizeof(gs_prop_item);
-+mj_get_params(gx_device *pdev, gs_param_list *plist)
-+{ int code = gdev_prn_get_params(pdev, plist);
-+ if ( code < 0 ||
-+ (code = param_write_int(plist, "Density", &mj->density)) < 0 ||
-+ (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 ||
-+ (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 ||
-+ (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 ||
-+ (code = param_write_int(plist, "Black", &mj->black)) < 0 ||
-+ (code = param_write_int(plist, "Dither", &mj->dither)) < 0 ||
-+ (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 ||
-+ (code = param_write_int(plist, "Direction", &mj->direction)) < 0 ||
-+ (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 ||
-+ (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0
-+ )
-+ return code;
-+ return code;
- }
-
- /* Put properties. */
- private int
--mj_put_props(gx_device *pdev, gs_prop_item *plist, int count)
-+mj_put_params(gx_device *pdev, gs_param_list *plist)
- {
-- static const argn = 10;
--/* gs_prop_item *known[argn]; */
-- gs_prop_item *known[10];
- int old_bpp = mj->color_info.depth;
- int bpp = 0;
- int code = 0;
--
-- props_extract(plist, count, props_mj, argn, known, 0);
-- code = gdev_prn_put_props(pdev, plist, count);
-- if ( code < 0 ) return code;
--
-- code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code);
-- code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code);
-- code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code);
-- code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code);
-- code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code);
-- code = put_prop_int(known[5], &mj->dither, 0, 1, code);
-- code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code);
-- code = put_prop_int(known[7], &mj->direction, 1, 2, code);
-- code = put_prop_int(known[8], &mj->microweave, 0, 1, code);
-- code = put_prop_int(known[9], &mj->dotsize, 0, 1, code);
--
-+ int density = mj->density;
-+ int cyan = mj->cyan;
-+ int magenta = mj->magenta;
-+ int yellow = mj->yellow;
-+ int black = mj->black;
-+ int dither = mj->dither;
-+ int colorcomp = mj->colorcomp;
-+ int direction = mj->direction;
-+ int microweave = mj->microweave;
-+ int dotsize = mj->dotsize;
-+ code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code);
-+ code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code);
-+ code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code);
-+ code = mj_put_param_int(plist, "MicroWeave", µweave, 0, 1, code);
-+ code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code);
-+ code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code);
- if ( code < 0 )
-- return_error(code);
--
-- if (bpp != 0) {
-- set_bpp(pdev, bpp);
--
-- /* Close the device; gs_putdeviceprops will reopen it. */
-+ return code;
-+ mj->density = density;
-+ mj->cyan = cyan;
-+ mj->magenta = magenta;
-+ mj->yellow = yellow;
-+ mj->black = black;
-+ mj->dither = dither;
-+ mj->colorcomp = colorcomp;
-+ mj->direction = direction;
-+ mj->microweave = microweave;
-+ mj->dotsize = dotsize;
-+ if ( bpp != 0 ) {
-+ mj_set_bpp(pdev, bpp);
-+ gdev_prn_put_params(pdev, plist);
- if ( bpp != old_bpp && pdev->is_open )
-- { int ccode = gs_closedevice(pdev);
-- if ( ccode < 0 ) return ccode;
-- }
-+ return gs_closedevice(pdev);
-+ return 0;
- }
--
-- return code;
-+ else
-+ return gdev_prn_put_params(pdev, plist);
- }
-
- /* ------ Internal routines ------ */
--private int mj_colour_print_page(P3(gx_device_printer *, FILE *, int));
-+private int mj_colour_print_page(gx_device_printer *, FILE *, int);
-
-
- private int
-@@ -988,7 +980,7 @@
-
- /* NOZ */
- xtalbuff_size = plane_size*8 + 64;
-- xtalbuff = (short *) gs_malloc( xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-+ xtalbuff = (short *) gs_malloc(pdev->memory, xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
- memset(xtalbuff, 0, xtalbuff_size*(16*4+2*4) * W);
- {
- int i;
-@@ -1027,12 +1019,12 @@
- p += xtalbuff_size;
- }
-
-- storage = (word *) gs_malloc(storage_size_words, W, "mj_colour_print_page");
-+ storage = (word *) gs_malloc(pdev->memory, storage_size_words, W, "mj_colour_print_page");
-
- /* prepare a temporary buffer for mj_raster_cmd */
-
- mj_tmp_buf_size = plane_size;
-- mj_tmp_buf = (byte *) gs_malloc(mj_tmp_buf_size, W ,"mj_raster_buffer");
-+ mj_tmp_buf = (byte *) gs_malloc(pdev->memory, mj_tmp_buf_size, W ,"mj_raster_buffer");
-
- #if 0
- fprintf(stderr, "storage_size_words :%d\n", storage_size_words);
-@@ -1163,7 +1155,8 @@
-
- /* Send each scan line in turn */
- {
-- long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi;
-+ long int lend = pdev->height -
-+ (dev_t_margin_points(pdev) + dev_b_margin_points(pdev));
- int cErr, mErr, yErr, kErr;
- int this_pass, i;
- long int lnum;
-@@ -1403,19 +1396,19 @@
- fflush(prn_stream);
- }
- /* free temporary storage */
-- gs_free((char *) storage, storage_size_words, W, "mj_colour_print_page");
-- gs_free((char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
-- gs_free((char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-+ gs_free(pdev->memory, (char *) storage, storage_size_words, W, "mj_colour_print_page");
-+ gs_free(pdev->memory, (char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
-+ gs_free(pdev->memory, (char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-
- return 0;
- }
-
- void
- mj_color_correct(gx_color_value *Rptr ,gx_color_value *Gptr , gx_color_value *Bptr )
-- /* R,G,B : 0`255 */
-+ /* R,G,B : 0)B`255 */
- {
-- short R,G,B; /* R,G,B : 0`255 */
-- short C,M,Y; /* C,M,Y : 0`1023 */
-+ short R,G,B; /* R,G,B : 0)B`255 */
-+ short C,M,Y; /* C,M,Y : 0)B`1023 */
- short H,D,Wa; /* ese-HSV */
- long S; /* HSV */
-
-@@ -1517,9 +1510,11 @@
- * c, m, y, inks by reducing the cyan component to give a truer black.
- */
- private gx_color_index
--gdev_mjc_map_rgb_color(gx_device *pdev, gx_color_value r,
-- gx_color_value g, gx_color_value b)
-+gdev_mjc_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
- {
-+ gx_color_value r = cv[0];
-+ gx_color_value g = cv[1];
-+ gx_color_value b = cv[2];
- if (gx_color_value_to_byte(r & g & b) == 0xff)
- return (gx_color_index)0; /* white */
- else {
-@@ -1685,39 +1680,25 @@
- }
-
- private int
--put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code)
--{
-- if ( pi == 0 )
-- return (code);
--
-- if ( pi->value.i < minval || pi->value.i > maxval )
-- { pi->status = pv_rangecheck;
-- return (gs_error_rangecheck);
-- }
-- else
-- { *property = pi->value.i;
-- return (code ? code : 1);
-- }
--}
--
--private int
--put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code)
--{
-- if ( pi == 0 )
-- return (code);
--
-- if ( pi->value.f < minval || pi->value.f > maxval )
-- { pi->status = pv_rangecheck;
-- return (gs_error_rangecheck);
-- }
-- else
-- { *property = pi->value.f;
-- return (code ? code : 1);
-- }
-+mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue,
-+ int minval, int maxval, int ecode)
-+{ int code, value;
-+ switch ( code = param_read_int(plist, pname, &value) )
-+ {
-+ default:
-+ return code;
-+ case 1:
-+ return ecode;
-+ case 0:
-+ if ( value < minval || value > maxval )
-+ param_signal_error(plist, pname, gs_error_rangecheck);
-+ *pvalue = value;
-+ return (ecode < 0 ? ecode : 1);
-+ }
- }
-
- private void
--set_bpp(gx_device *pdev, int bits_per_pixel)
-+mj_set_bpp(gx_device *pdev, int bits_per_pixel)
- { gx_device_color_info *ci = &pdev->color_info;
- /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */
- int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 :
-@@ -1725,9 +1706,9 @@
- ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3);
- ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp);
- ci->max_gray = (bpp >= 8 ? 255 : 1);
-- ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
-- ci->dither_gray = (bpp >= 8 ? 5 : 2);
-- ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
-+ ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
-+ ci->dither_grays = (bpp >= 8 ? 5 : 2);
-+ ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
- }
-
- /* This returns either the number of pixels in a scan line, or the number
-@@ -1736,7 +1717,7 @@
- gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
- {
- word raster_width =
-- pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin);
-+ pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]);
- return (pixelcount ?
- (uint)raster_width :
- (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
--- print/ghostscript-gpl/files/patch-pcl3_eprn_eprnrend.c
+++ /dev/null
@@ -1,182 +0,0 @@
---- pcl3/eprn/eprnrend.c.orig Wed Aug 1 14:12:56 2001
-+++ pcl3/eprn/eprnrend.c Tue May 24 20:19:18 2005
-@@ -161,8 +161,11 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_RGB(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
- static const gx_color_value half = gx_max_color_value/2;
- gx_color_index value = 0;
- const eprn_Device *dev = (eprn_Device *)device;
-@@ -197,8 +200,11 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_CMY_or_K(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
- static const gx_color_value half = gx_max_color_value/2;
- gx_color_index value = (CYAN_BIT | MAGENTA_BIT | YELLOW_BIT);
- const eprn_Device *dev = (eprn_Device *)device;
-@@ -240,8 +246,11 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_RGB_flex(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
- gx_color_index value = 0;
- gx_color_value step;
- unsigned int level;
-@@ -284,8 +293,12 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_CMY_or_K_flex(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
-+ gx_color_value tmpcv[4];
- const eprn_Device *dev = (eprn_Device *)device;
-
- #ifdef EPRN_TRACE
-@@ -298,11 +311,17 @@
- /* Treat pure grey levels differently if we have black. This implies that for
- CMY+K only "true" grey shades will be printed with black ink, all others
- will be mixed from CMY. */
-- if (dev->eprn.colour_model != eprn_DeviceCMY && red == green && green == blue)
-- return eprn_map_cmyk_color_flex(device, 0, 0, 0, gx_max_color_value - red);
-+ if (dev->eprn.colour_model != eprn_DeviceCMY && red == green && green == blue) {
-+ tmpcv[0] = 0; tmpcv[1] = 0; tmpcv[2] = 0;
-+ tmpcv[3] = gx_max_color_value - red;
-+ return eprn_map_cmyk_color_flex(device, tmpcv);
-
-- return eprn_map_cmyk_color_flex(device, gx_max_color_value - red,
-- gx_max_color_value - green, gx_max_color_value - blue, 0);
-+ }
-+ tmpcv[0] = gx_max_color_value - red;
-+ tmpcv[1] = gx_max_color_value - green;
-+ tmpcv[2] = gx_max_color_value - blue;
-+ tmpcv[3] = 0;
-+ return eprn_map_cmyk_color_flex(device, tmpcv);
- }
-
- /******************************************************************************
-@@ -315,8 +334,11 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_RGB_max(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
- gx_color_index value;
-
- #ifdef EPRN_TRACE
-@@ -345,8 +367,12 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_rgb_color_for_CMY_or_K_max(gx_device *device,
-- gx_color_value red, gx_color_value green, gx_color_value blue)
-+ const gx_color_value cv[])
- {
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
-+ gx_color_value tmpcv[4];
- const eprn_Device *dev = (eprn_Device *)device;
-
- #ifdef EPRN_TRACE
-@@ -356,13 +382,18 @@
- red, green, blue);
- #endif
-
-- if (dev->eprn.colour_model == eprn_DeviceGray)
-- return eprn_map_cmyk_color_max(device, 0, 0, 0, gx_max_color_value - red);
--
-+ if (dev->eprn.colour_model == eprn_DeviceGray) {
-+ tmpcv[0] = 0; tmpcv[1] = 0; tmpcv[2] = 0;
-+ tmpcv[3] = gx_max_color_value - red;
-+ return eprn_map_cmyk_color_max(device, tmpcv);
-+ }
- /* Note that the conversion from composite black to true black for CMY+K can
- only happen at the output pixel level, not here. */
-- return eprn_map_cmyk_color_max(device, gx_max_color_value - red,
-- gx_max_color_value - green, gx_max_color_value - blue, 0);
-+ tmpcv[0] = gx_max_color_value - red;
-+ tmpcv[1] = gx_max_color_value - green;
-+ tmpcv[2] = gx_max_color_value - blue;
-+ tmpcv[3] = 0;
-+ return eprn_map_cmyk_color_max(device, tmpcv);
- }
-
- /******************************************************************************
-@@ -389,7 +420,7 @@
- ******************************************************************************/
-
- int eprn_map_color_rgb(gx_device *device, gx_color_index color,
-- gx_color_value rgb[3])
-+ gx_color_value rgb[])
- {
- #ifdef EPRN_TRACE
- if_debug1(EPRN_TRACE_CHAR,
-@@ -415,9 +446,12 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_cmyk_color(gx_device *device,
-- gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
-- gx_color_value black)
-+ const gx_color_value cv[])
- {
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
- gx_color_index value = 0;
- static const gx_color_value threshold = gx_max_color_value/2;
-
-@@ -449,9 +483,12 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_cmyk_color_flex(gx_device *device,
-- gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
-- gx_color_value black)
-+ const gx_color_value cv[])
- {
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
- gx_color_index value = 0;
- gx_color_value step;
- unsigned int level;
-@@ -530,9 +567,12 @@
- ******************************************************************************/
-
- gx_color_index eprn_map_cmyk_color_max(gx_device *device,
-- gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
-- gx_color_value black)
-+ const gx_color_value cv[])
- {
-+ gx_color_value cyan = cv[0];
-+ gx_color_value magenta = cv[1];
-+ gx_color_value yellow = cv[2];
-+ gx_color_value black = cv[3];
- gx_color_index value;
-
- #ifdef EPRN_TRACE
--- print/ghostscript-gpl/files/patch-src:gdevlbp8.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/gdevlbp8.c.orig Wed Aug 1 09:48:23 2001
-+++ src/gdevlbp8.c Thu Mar 14 20:56:05 2002
-@@ -22,6 +22,8 @@
-
- /*
- Modifications:
-+ 3.10.00 Johnny Lam
-+ Removed LIPS III code, as it's obsoleted by gdevlips driver.
- 2.2.97 Lauri Paatero
- Changed CSI command into ESC [. DCS commands may still need to be changed
- (to ESC P).
-@@ -49,7 +51,6 @@
-
- /* The device descriptors */
- private dev_proc_print_page(lbp8_print_page);
--private dev_proc_print_page(lips3_print_page);
-
- const gx_device_printer far_data gs_lbp8_device =
- prn_device(prn_std_procs, "lbp8",
-@@ -58,14 +59,6 @@
- 0.16, 0.2, 0.32, 0.21, /* margins: left, bottom, right, top */
- 1, lbp8_print_page);
-
--const gx_device_printer far_data gs_lips3_device =
-- prn_device(prn_std_procs, "lips3",
-- 82, /* width_10ths, 8.3" */
-- 117, /* height_10ths, 11.7" */
-- X_DPI, Y_DPI,
-- 0.16, 0.27, 0.23, 0.27, /* margins */
-- 1, lips3_print_page);
--
- /* ------ Internal routines ------ */
-
- #define ESC 0x1b
-@@ -84,23 +77,6 @@
-
- static const char *lbp8_end = NULL;
-
--static const char lips3_init[] = {
-- ESC, '<', /* soft reset */
-- DCS, '0', 'J', ST, /* JOB END */
-- DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */
-- ESC, '<', /* soft reset */
-- DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST, /* Printing (gs) display */
-- ESC, '[', '?', '1', 'l', /* auto cr-lf disable */
-- ESC, '[', '?', '2', 'h', /* auto ff disable */
-- ESC, '[', '1', '1', 'h', /* set mode */
-- ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/
-- ESC, '[', 'f' /* move to home position */
--};
--
--static const char lips3_end[] = {
-- DCS, '0', 'J', ST /* JOB END */
--};
--
- /* Send the page to the printer. */
- private int
- can_print_page(gx_device_printer *pdev, FILE *prn_stream,
-@@ -203,11 +179,4 @@
- lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
- { return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
- lbp8_end, sizeof(lbp8_end));
--}
--
--/* Print a LIPS III page. */
--private int
--lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
--{ return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
-- lips3_end, sizeof(lips3_end));
- }
--- /dev/null
+++ print/ghostscript-gpl/files/pkg-message.in
@@ -0,0 +1,8 @@
+Note: in order to use the script dvipdf, dvips must be installed.
+This program may be provided by either print/dvips or print/dvipsk-tetex
+(print/dvipsk-tetex may be preferable since it doesn't conflict with
+tetex things).
+
+Also note that FAPIfontmap and FAPIcidfmap in
+%%DATADIR%%/%%PORTVERSION%%/lib have to be configured first if
+WITH_FT_BRIDGE is enabled.
--- print/ghostscript-gpl/files/patch-src:gdevvglb.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gdevvglb.c.orig Fri Feb 22 07:24:52 2002
-+++ src/gdevvglb.c Tue May 20 23:57:29 2003
-@@ -152,10 +152,12 @@
- }
-
- private gx_color_index
--vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
-- gx_color_value green, gx_color_value blue)
-+vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
- {
-- return pc_4bit_map_rgb_color(dev, red, green, blue);
-+ gx_color_value red = cv[0];
-+ gx_color_value green = cv[1];
-+ gx_color_value blue = cv[2];
-+ return pc_4bit_map_rgb_color(dev, cv);
- }
-
- private int
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src__devs.mak
@@ -0,0 +1,25 @@
+--- src/devs.mak.orig Thu Jun 7 07:03:27 2007
++++ src/devs.mak Wed Aug 8 23:26:52 2007
+@@ -426,11 +426,11 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+
+ $(GLOBJ)lvga256.so: $(lvga256_)
+- $(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl
++ $(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl $(XLDFLAGS)
+ mv lvga256.so $(GLOBJ)lvga256.so
+
+ $(GLOBJ)vgalib.so: $(vgalib_)
+- $(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl
++ $(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl $(XLDFLAGS)
+ mv vgalib.so $(GLOBJ)vgalib.so
+
+ ### -------------------------- The X11 device -------------------------- ###
+@@ -534,7 +534,7 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+
+ $(GLOBJ)X11.so: $(x11alt_) $(x11_)
+- $(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
++ $(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ mv X11.so $(GLOBJ)X11.so
+
+ ###### --------------- Memory-buffered printer devices --------------- ######
--- print/ghostscript-gpl/files/patch-lips__gdevnpdl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevnpdl.c.orig Thu Nov 2 12:09:18 2000
-+++ lips/gdevnpdl.c Fri Dec 31 17:32:52 2004
-@@ -582,7 +582,7 @@
- int code;
- int maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
-
-- if (!(lprn->CompBuf = gs_malloc(line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
-+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
- return_error(gs_error_VMerror);
-
-
-@@ -680,7 +680,7 @@
- /* Form Feed */
- fputs("\014", prn_stream);
-
-- gs_free(lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
-+ gs_free(pdev->memory, lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
- return 0;
- }
-
More information about the Midnightbsd-cvs
mailing list