summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Klemm <andreas@FreeBSD.org>1997-06-14 09:36:31 +0000
committerAndreas Klemm <andreas@FreeBSD.org>1997-06-14 09:36:31 +0000
commit0ec0586a8d8987e4e54f0dd4e967482e9aa1a266 (patch)
treee73c9ee97d82d2badd9ee78b2047d0def240489d
parentUpgrade, 2.2.1 -> 2.2.2. (diff)
Major cleanup for ghostscript5 port.
- merged patch-af into patch-aa, both patches hacked unix-gcc.mak - merged the scripts/{configure,configure.batch} changes into patch-aa, so that unix-gcc.mak is hacked only by patch-aa - when doing interactive configuration, every device driver is now turned on, so you have to deselect devices - when using BATCH compilation, you now get every supported device, this one is especially for Satoshi, when making gs packages ! - Added a note into unix-gcc.mak, that DEVICE_DEVS now completely are removed in the makefile, instead of this, the two configure scripts now completely control, which devices have to be compiled in. So, the configure target "patches" the unix-gcc.mak Makefile and puts a DEVICE_DEVS line at line 1. When doing batch compilation every device is included in this line, or the wanted devices ... - The compilation option -DA4 is now included if you compile the port by saying "make A4=yes". I hope, I didn't forget a driver, look at that long line ;-) BTW, I didn't create that DEVICE_DEVS line by hand, I did the interactive installation, which created it automatically, and after that I "stealed" that DEVICE_DEVS line for inclusion into configure.batch ;-) So the devices in configure and configure.batch are exactly the same, you only have to compare devices.mak with one of the configure scripts. BTW, should we nuke ghostscript4 ??? Does somebody know if any port needs gs4 ???
Notes
Notes: svn path=/head/; revision=6928
Diffstat
-rw-r--r--print/ghostscript-afpl/Makefile13
-rw-r--r--print/ghostscript-afpl/files/patch-aa149
-rw-r--r--print/ghostscript-afpl/scripts/configure180
-rw-r--r--print/ghostscript-afpl/scripts/configure.batch21
-rw-r--r--print/ghostscript-gnu/Makefile13
-rw-r--r--print/ghostscript-gnu/files/patch-aa149
-rw-r--r--print/ghostscript-gnu/scripts/configure180
-rw-r--r--print/ghostscript-gnu/scripts/configure.batch21
-rw-r--r--print/ghostscript-gpl/Makefile13
-rw-r--r--print/ghostscript-gpl/files/patch-aa149
-rw-r--r--print/ghostscript-gpl/scripts/configure180
-rw-r--r--print/ghostscript-gpl/scripts/configure.batch21
-rw-r--r--print/ghostscript5/Makefile13
-rw-r--r--print/ghostscript5/files/patch-aa149
-rw-r--r--print/ghostscript55/Makefile13
-rw-r--r--print/ghostscript55/files/patch-aa149
-rw-r--r--print/ghostscript55/scripts/configure180
-rw-r--r--print/ghostscript55/scripts/configure.batch21
-rw-r--r--print/ghostscript6/Makefile13
-rw-r--r--print/ghostscript6/files/patch-aa149
-rw-r--r--print/ghostscript6/scripts/configure180
-rw-r--r--print/ghostscript6/scripts/configure.batch21
-rw-r--r--print/ghostscript7/Makefile13
-rw-r--r--print/ghostscript7/files/patch-aa149
-rw-r--r--print/ghostscript7/scripts/configure180
-rw-r--r--print/ghostscript7/scripts/configure.batch21
-rw-r--r--print/ghostscript8/Makefile13
-rw-r--r--print/ghostscript8/files/patch-aa149
-rw-r--r--print/ghostscript8/scripts/configure180
-rw-r--r--print/ghostscript8/scripts/configure.batch21
30 files changed, 1796 insertions, 907 deletions
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript-afpl/files/patch-aa b/print/ghostscript-afpl/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript-afpl/files/patch-aa
+++ b/print/ghostscript-afpl/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript-gnu/files/patch-aa b/print/ghostscript-gnu/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript-gnu/files/patch-aa
+++ b/print/ghostscript-gnu/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript-gnu/scripts/configure.batch b/print/ghostscript-gnu/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript-gnu/scripts/configure.batch
+++ b/print/ghostscript-gnu/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript-gpl/files/patch-aa b/print/ghostscript-gpl/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript-gpl/files/patch-aa
+++ b/print/ghostscript-gpl/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript5/files/patch-aa b/print/ghostscript5/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript5/files/patch-aa
+++ b/print/ghostscript5/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript55/files/patch-aa b/print/ghostscript55/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript55/files/patch-aa
+++ b/print/ghostscript55/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript55/scripts/configure b/print/ghostscript55/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript55/scripts/configure
+++ b/print/ghostscript55/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript55/scripts/configure.batch b/print/ghostscript55/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript55/scripts/configure.batch
+++ b/print/ghostscript55/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript6/files/patch-aa b/print/ghostscript6/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript6/files/patch-aa
+++ b/print/ghostscript6/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript6/scripts/configure b/print/ghostscript6/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript6/scripts/configure
+++ b/print/ghostscript6/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript7/files/patch-aa b/print/ghostscript7/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript7/files/patch-aa
+++ b/print/ghostscript7/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript7/scripts/configure.batch b/print/ghostscript7/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript7/scripts/configure.batch
+++ b/print/ghostscript7/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 82eb0423dccb..15d368b16921 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -3,7 +3,7 @@
# Date created: Tue Jun 10 21:58:54 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.2 1997/06/11 06:37:54 andreas Exp $
+# $Id: Makefile,v 1.3 1997/06/12 16:48:56 andreas Exp $
#
DISTNAME= ghostscript-5.0
@@ -33,8 +33,17 @@ GS_SOURCES+= ghostscript-5.0gnu.tar.gz
GS_FONTS_STD= ghostscript-fonts-std-4.0.tar.gz
GS_FONTS_OTHER= ghostscript-fonts-other-5.0.tar.gz
-#if you are using DIN A4 paper format, keep this _here_ before MAKE_FLAGS
+.if defined(A4)
CFLAGS+= -DA4
+.endif
+
+pre-fetch:
+.if !defined(A4)
+ @${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.else
+ @${ECHO_MSG} "Using -DA4 for compilation."
+.endif
+
post-extract:
touch $(WRKSRC)/adler32.c
diff --git a/print/ghostscript8/files/patch-aa b/print/ghostscript8/files/patch-aa
index c6d98d45fa38..b5f9a7a12527 100644
--- a/print/ghostscript8/files/patch-aa
+++ b/print/ghostscript8/files/patch-aa
@@ -1,6 +1,52 @@
---- unix-gcc.mak.original Thu Oct 17 07:48:54 1996
-+++ unix-gcc.mak Thu Oct 17 07:49:07 1996
-@@ -165,7 +165,7 @@
+--- unix-gcc.mak.orig Sat Jun 7 03:40:37 1997
++++ unix-gcc.mak Sat Jun 14 10:50:37 1997
+@@ -1,3 +1,9 @@
++# FreeBSD ports collection - Porters note:
++# the device(s) we include are now completely controlled
++# be the two scripts configure and configure.batch.
++# A detailled list of supported devices see: devs.mak
++# Andreas ///
++
+ # Copyright (C) 1997 Aladdin Enterprises. All rights reserved.
+ #
+ # This file is part of Aladdin Ghostscript.
+@@ -126,7 +132,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+
+-JSRCDIR=jpeg-6a
++JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ JVERSION=6
+
+ # Define the directory where the PNG library sources are stored,
+@@ -134,7 +140,7 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+
+-PSRCDIR=libpng
++PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ PVERSION=89
+
+ # Choose whether to use a shared version of the PNG library, and if so,
+@@ -147,7 +153,7 @@
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+
+-ZSRCDIR=zlib
++ZSRCDIR=.
+
+ # Choose whether to use a shared version of the zlib library, and if so,
+ # what its name is (usually libz, but sometimes libgz).
+@@ -172,7 +178,7 @@
+
+ # Define the name of the C compiler.
+
+-CC=gcc
++CC=cc
+
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -214,7 +220,7 @@
# SVR4 may need -lnsl.
# (Libraries required by individual drivers are handled automatically.)
@@ -9,16 +55,87 @@
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -3352,7 +3352,7 @@
- zlibe_1.dev: $(ZLIB_MAK) $(ECHOGS_XE)
- $(SETMOD) zlibe_1 -lib gz
+@@ -224,7 +230,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+
+-XINCLUDE=-I/usr/local/X/include
++XINCLUDE=-I/usr/X11R6/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
+@@ -236,7 +242,7 @@
+ #XLIBS=Xt SM ICE Xext X11
+
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11/lib
++XLIBDIRS=-L/usr/X11R6/lib
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+
+@@ -278,25 +284,6 @@
+
+ FILE_IMPLEMENTATION=stdio
+
+-# Choose the device(s) to include. See devs.mak for details.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
+-DEVICE_DEVS1=
+-DEVICE_DEVS2=
+-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
+-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
+-DEVICE_DEVS5=
+-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
+-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
+-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
+-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
+-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
+-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
+-DEVICE_DEVS14=jpeg.dev jpeggray.dev
+-DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
+-
+ # ---------------------------- End of options --------------------------- #
+
+ # Define the name of the partial makefile that specifies options --
+@@ -3204,7 +3191,7 @@
+
+ # JSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the IJG library sources are stored.
+-#JSRCDIR=jpeg-6a
++#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
+ # JVERSION is defined in the platform-specific makefile, not here,
+ # as the IJG library major version number (currently "5" or "6").
+ #JVERSION=6
+@@ -3551,7 +3538,7 @@
+
+ # PSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the PNG library sources are stored.
+-#PSRCDIR=libpng
++#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
+ # PVERSION is defined in the platform-specific makefile, not here,
+ # as the libpng version number ("88", "89", "90", or "95").
+ #PVERSION=95
+@@ -3655,7 +3642,7 @@
+
+ # ZSRCDIR is defined in the platform-specific makefile, not here,
+ # as the directory where the zlib sources are stored.
+-#ZSRCDIR=zlib
++#ZSRCDIR=.
+ ZSRC=$(ZSRCDIR)$(D)
+ # We would like to define
+ #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
+@@ -3704,7 +3691,7 @@
+ zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
+ $(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
-zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
+zlibe_=
zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
$(SETMOD) zlibe_0 $(zlibe_)
$(ADDMOD) zlibe_0 -include zlibc
-@@ -3376,11 +3376,11 @@
+@@ -3751,11 +3738,11 @@
zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -33,5 +150,19 @@
+ $(ADDMOD) zlibd_0
+ $(ADDMOD) zlibd_0
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP)
- $(CCCZ) $(ZSRC)infblock.c
+ infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
+ $(CP_) $(ZSRC)infblock.c .
+@@ -4522,8 +4509,13 @@
+
+ cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
+
++cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
++
+ cdeskjet.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdeskjet $(cdeskjet_)
++
++cdj850.dev: $(cdeskjet8_) page.dev
++ $(SETPDEV) cdj850 $(cdeskjet8_)
+
+ cdjcolor.dev: $(cdeskjet_) page.dev
+ $(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index 6faf1476218a..6c9125d8b4b0 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -1,33 +1,5 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;^DEVICE_DEVS=.*;;" \
- -e "s;^DEVICE_DEVS1=.*;DEVICE_DEVS1=;" \
- -e "s;^DEVICE_DEVS2=.*;DEVICE_DEVS2=;" \
- -e "s;^DEVICE_DEVS3=.*;DEVICE_DEVS3=;" \
- -e "s;^DEVICE_DEVS4=.*;DEVICE_DEVS4=;" \
- -e "s;^DEVICE_DEVS5=.*;DEVICE_DEVS5=;" \
- -e "s;^DEVICE_DEVS6=.*;DEVICE_DEVS6=;" \
- -e "s;^DEVICE_DEVS7=.*;DEVICE_DEVS7=;" \
- -e "s;^DEVICE_DEVS8=.*;DEVICE_DEVS8=;" \
- -e "s;^DEVICE_DEVS9=.*;DEVICE_DEVS9=;" \
- -e "s;^DEVICE_DEVS10=.*;DEVICE_DEVS10=;" \
- -e "s;^DEVICE_DEVS11=.*;DEVICE_DEVS11=;" \
- -e "s;^DEVICE_DEVS12=.*;DEVICE_DEVS12=;" \
- -e "s;^DEVICE_DEVS13=.*;DEVICE_DEVS13=;" \
- -e "s;^DEVICE_DEVS14=.*;DEVICE_DEVS14=;" \
- -e "s;^DEVICE_DEVS15=.*;DEVICE_DEVS15=;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
@@ -39,85 +11,85 @@ only those gs drivers, you really need. Don't think too economical, since \n\
other programs in the ports collection might need some of the default gs \n\
file format drivers. The gs4 default drivers are preselected. \n\
Have fun with this new configuration style ! -andreas \n\n\
- Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+ Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
"x11" "X Windows version 11, release >=4" ON \
"x11alpha" "X Windows masquer. as device with alpha capability" ON \
"x11cmyk" "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
"x11gray2" "X Windows as a 2-bit gray-scale device" ON \
"x11mono" "X Windows masquer. as black-and-white device" ON \
- "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" OFF \
- "ap3250" "Epson AP3250" OFF \
- "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+ "sxlcrt" "CRT sixels, e.g. for VT240-like terminals" ON \
+ "ap3250" "Epson AP3250" ON \
+ "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
"bj10e" "Canon BubbleJet BJ10e" ON \
"bj200" "Canon BubbleJet BJ200" ON \
"bjc600" "Canon Color BubbleJet BJC-600/4000/70+Apple StyleWriter 2x00" ON \
"bjc800" "Canon Color BubbleJet BJC-800" ON \
- "ccr" "CalComp Raster format" OFF \
+ "ccr" "CalComp Raster format" ON \
"cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
"cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
"cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \
"cdj500" "HP DeskJet 500C (same as cdjcolor)" ON \
"cdj550" "HP DeskJet 550C/560C" ON \
"cdj850" "HP DeskJet 850/885/870/890" ON \
- "cp50" "Mitsubishi CP50 color" OFF \
- "declj250" "alternate DEC LJ250 driver" OFF \
+ "cp50" "Mitsubishi CP50 color" ON \
+ "declj250" "alternate DEC LJ250 driver" ON \
"deskjet" "HP DeskJet and DeskJet Plus" ON \
"djet500" "HP DeskJet 500" ON \
- "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
- "dnj650c" "HP DesignJet 650C" OFF \
- "epson" "Epson-compatible dot matrix, 9/24-pin" OFF \
- "eps9mid" "Epson-compatible 9-pin, medium resol" OFF \
- "eps9high" "Epson-compatible 9-pin, high resol" OFF \
- "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
- "ibmpro" "IBM 9-pin Proprinter" OFF \
- "imagen" "Imagen ImPress printers" OFF \
- "iwhi" "Apple Imagewriter, high-resolution mode" OFF \
- "iwlo" "Apple Imagewriter, low-resolution mode" OFF \
- "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
- "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+ "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
+ "dnj650c" "HP DesignJet 650C" ON \
+ "epson" "Epson-compatible dot matrix, 9/24-pin" ON \
+ "eps9mid" "Epson-compatible 9-pin, medium resol" ON \
+ "eps9high" "Epson-compatible 9-pin, high resol" ON \
+ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
+ "ibmpro" "IBM 9-pin Proprinter" ON \
+ "imagen" "Imagen ImPress printers" ON \
+ "iwhi" "Apple Imagewriter, high-resolution mode" ON \
+ "iwlo" "Apple Imagewriter, low-resolution mode" ON \
+ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
+ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
"laserjet" "HP LaserJet" ON \
- "la50" "DEC LA50 printer" OFF \
- "la70" "DEC LA70 printer" OFF \
- "la75" "DEC LA75 printer" OFF \
- "la75plus" "DEC LA75plus printer" OFF \
- "lbp8" "Canon LBP-8II laser printer" OFF \
- "lips3" "Canon LIPS III laser printer in English/CaPSL mode" OFF \
- "ln03" "DEC LN03 printer" OFF \
- "lj250" "DEC LJ250 Companion color printer" OFF \
+ "la50" "DEC LA50 printer" ON \
+ "la70" "DEC LA70 printer" ON \
+ "la75" "DEC LA75 printer" ON \
+ "la75plus" "DEC LA75plus printer" ON \
+ "lbp8" "Canon LBP-8II laser printer" ON \
+ "lips3" "Canon LIPS III laser printer in English/CaPSL mode" ON \
+ "ln03" "DEC LN03 printer" ON \
+ "lj250" "DEC LJ250 Companion color printer" ON \
"ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \
"ljet3" "HP LaserJet III* with Delta Row compression" ON \
- "ljet3d" "HP LaserJet IIID with duplex capability" OFF \
+ "ljet3d" "HP LaserJet IIID with duplex capability" ON \
"ljet4" "HP LaserJet 4 (defaults to 600 dpi)" ON \
- "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+ "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
"ljetplus" "HP LaserJet Plus" ON \
"lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
"lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
- "lp2563" "HP 2563B line printer" OFF \
- "lp8000" "EPSON LP-8000 line printer" OFF \
- "m8510" "C.Itoh M8510 printer" OFF \
- "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
- "oce9050" "OCE 9050 printer" OFF \
- "oki182" "Okidata MicroLine 182" OFF \
- "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \
- "paintjet" "alternate HP PaintJet color printer" OFF \
+ "lp2563" "HP 2563B line printer" ON \
+ "lp8000" "EPSON LP-8000 line printer" ON \
+ "m8510" "C.Itoh M8510 printer" ON \
+ "necp6" "NEC P6/P6+/P60, 360x360 DPI resol" ON \
+ "oce9050" "OCE 9050 printer" ON \
+ "oki182" "Okidata MicroLine 182" ON \
+ "okiibm" "Okidata MicroLine IBM-compatible printers" ON \
+ "paintjet" "alternate HP PaintJet color printer" ON \
"pj" "HP PaintJet XL driver " ON \
- "pjetxl" "alternate HP PaintJet XL driver" OFF \
+ "pjetxl" "alternate HP PaintJet XL driver" ON \
"pjxl" "HP PaintJet XL color printer" ON \
"pjxl300" "HP PaintJet XL300 color printer (also for 1200C)" ON \
"pxlmono" "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
"pxlcolor" "HP color PCL XL printers (none available yet)" ON \
- "r4081" "Ricoh 4081 laser printer" OFF \
- "sj48" "StarJet 48 inkjet printer" OFF \
- "st800" "Epson Stylus 800 printer" OFF \
- "stcolor" "Epson Stylus Color" OFF \
- "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
- "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
- "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
- "tek4696" "Tektronix 4695/4696 inkjet plotter" OFF \
+ "r4081" "Ricoh 4081 laser printer" ON \
+ "sj48" "StarJet 48 inkjet printer" ON \
+ "st800" "Epson Stylus 800 printer" ON \
+ "stcolor" "Epson Stylus Color" ON \
+ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" ON \
+ "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" ON \
+ "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" ON \
+ "tek4696" "Tektronix 4695/4696 inkjet plotter" ON \
"uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
- "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
- "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
- "dfaxlow" "DigiFAX low (normal) resol" OFF \
+ "xes" "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
+ "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
+ "dfaxlow" "DigiFAX low (normal) resol" ON \
"faxg3" "Group 3 fax, with EOLs but no header or EOD" ON \
"faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" ON \
"faxg4" "Group 4 fax, with EOLs but no header or EOD" ON \
@@ -125,38 +97,38 @@ Have fun with this new configuration style ! -andreas \n\n\
"tiffg3" "TIFF Group 3 fax with EOLs" ON \
"tiffg32d" "TIFF Group 3 2-D fax" ON \
"tiffg4" "TIFF Group 4 fax" ON \
- "epswrite" "EPS output (like PostScript Distillery)" OFF \
- "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" OFF \
- "pswrite" "PostScript output (like PostScript Distillery)" OFF \
- "pxlmono" "Black-and-white PCL XL" OFF \
- "pxlcolor" "Color PCL XL" OFF \
+ "epswrite" "EPS output (like PostScript Distillery)" ON \
+ "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+ "pswrite" "PostScript output (like PostScript Distillery)" ON \
+ "pxlmono" "Black-and-white PCL XL" ON \
+ "pxlcolor" "Color PCL XL" ON \
"bit" "Plain bits, monochrome" ON \
"bitrgb" "Plain bits, RGB" ON \
"bitcmyk" "Plain bits, CMYK" ON \
- "bmpmono" "Monochrome MS Windows .BMP file format" OFF \
- "bmp16" "4-bit EGA/VGA .BMP file format" OFF \
- "bmp256" "8-bit 256-color .BMP file format" OFF \
- "bmp16m" "24-bit .BMP file format" OFF \
- "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" OFF \
- "cgm8" "8-bit 256-color CGM -- DITTO" OFF \
- "cgm24" "24-bit color CGM -- DITTO" OFF \
- "cif" "CIF file format for VLSI" OFF \
- "jpeg" "JPEG format, RGB output" OFF \
- "jpeggray" "JPEG format, gray output" OFF \
- "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
- "mgrmono" "1-bit monochrome MGR devices" OFF \
- "mgrgray2" "2-bit gray scale MGR devices" OFF \
- "mgrgray4" "4-bit gray scale MGR devices" OFF \
- "mgrgray8" "8-bit gray scale MGR devices" OFF \
- "mgr4" "4-bit (VGA) color MGR devices" OFF \
- "mgr8" "8-bit color MGR devices" OFF \
+ "bmpmono" "Monochrome MS Windows .BMP file format" ON \
+ "bmp16" "4-bit EGA/VGA .BMP file format" ON \
+ "bmp256" "8-bit 256-color .BMP file format" ON \
+ "bmp16m" "24-bit .BMP file format" ON \
+ "cgmmono" "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
+ "cgm8" "8-bit 256-color CGM -- DITTO" ON \
+ "cgm24" "24-bit color CGM -- DITTO" ON \
+ "cif" "CIF file format for VLSI" ON \
+ "jpeg" "JPEG format, RGB output" ON \
+ "jpeggray" "JPEG format, gray output" ON \
+ "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
+ "mgrmono" "1-bit monochrome MGR devices" ON \
+ "mgrgray2" "2-bit gray scale MGR devices" ON \
+ "mgrgray4" "4-bit gray scale MGR devices" ON \
+ "mgrgray8" "8-bit gray scale MGR devices" ON \
+ "mgr4" "4-bit (VGA) color MGR devices" ON \
+ "mgr8" "8-bit color MGR devices" ON \
"pdfwrite" "Allow writting of pdf files" ON \
"pcxmono" "PCX file format, monochrome 1-bit b/w" ON \
"pcxgray" "PCX file format, 8-bit gray scale" ON \
"pcx16" "PCX file format, 4-bit planar EGA/VGA color" ON \
"pcx256" "PCX file format, 8-bit chunky color" ON \
"pcx24b" "PCX file format, 24-bit color 3x8-bit planes" ON \
- "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" OFF \
+ "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" ON \
"pbm" "Portable Bitmap, plain format" ON \
"pbmraw" "Portable Bitmap, raw format" ON \
"pgm" "Portable Graymap, plain format" ON \
@@ -167,16 +139,16 @@ Have fun with this new configuration style ! -andreas \n\n\
"pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" ON \
"ppm" "Portable Pixmap, plain format RGB" ON \
"ppmraw" "Portable Pixmap, raw format RGB" ON \
- "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" OFF \
- "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" OFF \
+ "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
+ "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
"pngmono" "Monochrome Portable Network Graphics, PNG" ON \
"pnggray" "8-bit gray Portable Network Graphics, PNG" ON \
"png16" "4-bit color Portable Network Graphics, PNG" ON \
"png256" "8-bit color Portable Network Graphics, PNG" ON \
"png16m" "24-bit color Portable Network Graphics, PNG" ON \
"psmono" "PostScript, Level 1, monochrome image" ON \
- "psgray" "PostScript (Level 1) 8-bit gray image" OFF \
- "sgirgb" "SGI RGB pixmap format" OFF \
+ "psgray" "PostScript (Level 1) 8-bit gray image" ON \
+ "sgirgb" "SGI RGB pixmap format" ON \
"tiff12nc" "TIFF 12-bit RGB, no compression" ON \
"tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
"tifflzw" "TIFF LZW, tag = 5, mono" ON \
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index d1be7c3b59bc..ac7b80a28fe8 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -1,17 +1,12 @@
#! /bin/sh
-# Define the directories for the X11 library files.
-# This can be null if these files are in the default linker search path.
-
-sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \
- -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \
- -e "s;JSRCDIR=jpeg-6a;JSRCDIR=\${PORTSDIR}/graphics/jpeg/work/jpeg-6a;" \
- -e "s;PSRCDIR=libpng;PSRCDIR=\${PORTSDIR}/graphics/png/work/libpng-0.89c;" \
- -e "s;ZSRCDIR=zlib;ZSRCDIR=.;" \
- -e "s;CC=gcc;CC=cc;" \
- -e "s;DEVICE_DEVS15=pdfwrite.dev;DEVICE_DEVS15=pdfwrite.dev stcolor.dev;" \
- < ${WRKSRC}/unix-gcc.mak > ${WRKSRC}/unix-gcc.mak.bak && \
- mv ${WRKSRC}/unix-gcc.mak.bak ${WRKSRC}/unix-gcc.mak
-
# without that no way :)
touch ${WRKSRC}/makefile
+
+cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj850.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pdfwrite.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+!EOT
+
+# create one new Makefile, where DEVICE_DEVS contains all wanted devices
+cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new
+mv ${WRKSRC}/unix-gcc.mak.new ${WRKSRC}/unix-gcc.mak
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 13:27:08 +0000