Work around Makefile bugs.

3 files changed, 31 insertions, 2 deletions

diff --git a/print/ghostscript5/patches/patch-af b/print/ghostscript5/patches/patch-af
new file mode 100644
index 00000000000..c0b40dd162d
--- /dev/null
+++ b/print/ghostscript5/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 1998/11/04 23:36:49 mycroft Exp $
+
+--- devs.mak.orig	Mon Sep 14 22:03:52 1998
++++ devs.mak	Wed Nov  4 18:15:26 1998
+@@ -896,8 +896,8 @@
+ png_i_=-include $(PNGGENDIR)$(D)libpng
+ 
+ $(GLOBJ)gdevpng.$(OBJ): $(GLSRC)gdevpng.c\
+- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(PNGSRC)png.h
+-	$(CC_) $(I_)$(GLI_) $(II)$(PI_)$(_I) $(GLF_) $(GLO_)gdevpng.$(OBJ) $(C_) $(GLSRC)gdevpng.c
++ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h)
++	$(CC_) $(I_)$(PREFIX)/include $(I_)$(GLI_) $(II)$(PI_)$(_I) $(GLF_) $(GLO_)gdevpng.$(OBJ) $(C_) $(GLSRC)gdevpng.c
+ 
+ pngmono.dev: $(libpng_dev) $(png_) page.dev
+ 	$(SETPDEV2) pngmono $(png_)
diff --git a/print/ghostscript5/patches/patch-ag b/print/ghostscript5/patches/patch-ag
new file mode 100644
index 00000000000..b629af73332
--- /dev/null
+++ b/print/ghostscript5/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 1998/11/04 23:36:49 mycroft Exp $
+
+--- contrib.mak.orig	Mon Sep 14 22:03:52 1998
++++ contrib.mak	Wed Nov  4 18:27:02 1998
+@@ -432,6 +432,9 @@
+ 
+ cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
+ 
++$(GLOBJ)gdevcd8.$(OBJ): $(GLSRC)gdevcd8.c $(PDEVH) $(gdevpcl_h)
++	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
++
+ cdj850.dev: $(cdeskjet8_) page.dev
+ 	$(SETPDEV) cdj850 $(cdeskjet8_)
+ 
diff --git a/print/ghostscript5/scripts/configure.batch b/print/ghostscript5/scripts/configure.batch
index 3c93b5297ca..39580219b44 100644
--- a/print/ghostscript5/scripts/configure.batch
+++ b/print/ghostscript5/scripts/configure.batch
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: configure.batch,v 1.3 1998/11/04 21:42:14 mycroft Exp $
+# $NetBSD: configure.batch,v 1.4 1998/11/04 23:42:27 mycroft Exp $
 #
 
 # without that no way :)
 touch ${WRKSRC}/makefile
 
 cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.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 jpeg.dev jpeggray.dev miff24.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 plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.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 djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la70t.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev nwp533.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev r4081.dev sj48.dev sparc.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev
+DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.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 jpeg.dev jpeggray.dev miff24.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 plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.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 djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.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 cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices