fix compilation problems after jpeg lib upgrade

4 files changed, 24 insertions, 21 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index c22401c82faf..068978971c39 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.18 1998/03/03 02:13:00 jseger Exp $
+# $Id: Makefile,v 1.19 1998/04/01 01:43:05 asami Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -59,7 +59,7 @@ post-extract:
 	${TOUCH} ${WRKSRC}/adler32.o
 	${TOUCH} ${WRKSRC}/deflate.o
 	${TOUCH} ${WRKSRC}/trees.o
-	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
+	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg-6b
 	ln -s ${PORTSDIR}/graphics/png/work/libpng-1.0.1 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
 
diff --git a/print/ghostscript-gnu/files/patch-aa b/print/ghostscript-gnu/files/patch-aa
index 9a32f8c0ed18..a85c443dd632 100644
--- a/print/ghostscript-gnu/files/patch-aa
+++ b/print/ghostscript-gnu/files/patch-aa
@@ -1,11 +1,15 @@
---- unix-gcc.mak.orig	Sat Aug  9 20:27:58 1997
-+++ unix-gcc.mak	Sun Aug 24 15:44:56 1997
-@@ -1,3 +1,4 @@
-+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
- #    Copyright (C) 1997 Aladdin Enterprises.  All rights reserved.
- # 
- # This file is part of Aladdin Ghostscript.
-@@ -150,7 +151,7 @@
+--- unix-gcc.mak.orig	Tue Nov 25 03:29:01 1997
++++ unix-gcc.mak	Sun Apr 19 19:34:18 1998
+@@ -130,7 +130,7 @@
+ # You may need to change this if the IJG library version changes.
+ # See jpeg.mak for more information.
+ 
+-JSRCDIR=jpeg-6a
++JSRCDIR=jpeg-6b
+ JVERSION=6
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -151,7 +151,7 @@
  # Define the directory where the zlib sources are stored.
  # See zlib.mak for more information.
  
@@ -14,7 +18,7 @@
  
  # Choose whether to use a shared version of the zlib library, and if so,
  # what its name is (usually libz, but sometimes libgz).
-@@ -175,7 +176,7 @@
+@@ -176,7 +176,7 @@
  
  # Define the name of the C compiler.
  
@@ -23,7 +27,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -217,7 +218,7 @@
+@@ -218,7 +218,7 @@
  # SVR4 may need -lnsl.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -32,7 +36,7 @@
  
  # 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
-@@ -227,7 +228,7 @@
+@@ -228,7 +228,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -41,7 +45,7 @@
  
  # 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
-@@ -242,7 +243,7 @@
+@@ -243,7 +243,7 @@
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
@@ -50,7 +54,7 @@
  XLIBDIR=
  XLIBS=Xt Xext X11
  
-@@ -286,22 +287,22 @@
+@@ -287,22 +287,22 @@
  
  # Choose the device(s) to include.  See devs.mak for details.
  
@@ -89,7 +93,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -3629,8 +3630,8 @@
+@@ -3676,8 +3676,8 @@
  libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
  	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
  
@@ -100,7 +104,7 @@
  #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
  # 
  # This file is part of Aladdin Ghostscript.
-@@ -3711,7 +3712,7 @@
+@@ -3758,7 +3758,7 @@
  zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
  	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
  
@@ -109,7 +113,7 @@
  zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
  	$(SETMOD) zlibe_0 $(zlibe_)
  	$(ADDMOD) zlibe_0 -include zlibc
-@@ -3758,11 +3759,11 @@
+@@ -3805,11 +3805,11 @@
  
  zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
  zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -126,7 +130,7 @@
  
  infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
  	$(CP_) $(ZSRC)infblock.c .
-@@ -4537,8 +4538,13 @@
+@@ -4584,8 +4584,13 @@
  
  cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
  
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 4d1d89967a4c..d3d1570903be 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -50,7 +50,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "laserjet" "HP LaserJet" ON \
   "la50"     "DEC LA50 printer" ON \
   "la70"     "DEC LA70 printer" ON \
-  "la70t"    "DEC LA70 printer with low resol. text enhancement" ON \
   "la75"     "DEC LA75 printer" ON \
   "la75plus" "DEC LA75plus printer" ON \
   "lbp8"     "Canon LBP-8II laser printer" ON \
diff --git a/print/ghostscript-gnu/scripts/configure.batch b/print/ghostscript-gnu/scripts/configure.batch
index 469cba521c97..fe9c8d6918a9 100644
--- a/print/ghostscript-gnu/scripts/configure.batch
+++ b/print/ghostscript-gnu/scripts/configure.batch
@@ -4,7 +4,7 @@
 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 la70t.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 lq850.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 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
+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 lq850.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 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