- fix typo in variable name (Louis), changed it to HP8XX_DRV afterwards

- make configure script work (Louis)
- make configure.batch script work (Andreas)
- extract contributed HP8XX driver in ${WRKSRC}/src
- make png driver compile (add $(PREFIX)/include to XINCLUDE variable)

Dunno, if this will be the last round of cleanups...

Submitted by:	"Louis A. Mamakos" <louie@TransSys.COM>

5 files changed, 29 insertions, 13 deletions

diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 16fdc9524499..cb7eb45402c6 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -13,12 +13,10 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
 		http://www.proaxis.com/~mgelhaus/linux/software/hp880c/1.31/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${DECRYPT_PDF} ${HP880_DRV}
+		${DECRYPT_PDF} ${HP8XX_DRV}
 
 MAINTAINER=	andreas@FreeBSD.org
 
-BROKEN=		"needs more work, does not built cleanly"
-
 Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract
@@ -49,7 +47,7 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 # Additional Drivers:
 
 # http://www.proaxis.com/~mgelhaus/linux/software/hp880c/hp880c.html
-HP880_DRV=	gdevcd8.tar.gz
+HP8XX_DRV=	gdevcd8.tar.gz
 
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
@@ -75,7 +73,7 @@ pre-fetch:
 
 post-extract:
 	@${LN} -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	@cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${HP850_DRV}
+	@cd ${WRKSRC}/src; ${TAR} -xzf ${DISTDIR}/${HP8XX_DRV}
 
 do-configure:
 .if defined(BATCH)
diff --git a/print/ghostscript6/files/patch-aa b/print/ghostscript6/files/patch-aa
index 94fb537e6a01..9706ac798453 100644
--- a/print/ghostscript6/files/patch-aa
+++ b/print/ghostscript6/files/patch-aa
@@ -1,5 +1,5 @@
 --- src/unix-gcc.mak.orig	Sat Mar 18 05:13:40 2000
-+++ src/unix-gcc.mak	Sat Mar 25 15:43:57 2000
++++ src/unix-gcc.mak	Sat Mar 25 21:47:45 2000
 @@ -52,11 +52,10 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
@@ -74,7 +74,7 @@
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/local/X/include
-+XINCLUDE=-I$(X11BASE)/include
++XINCLUDE=-I$(X11BASE)/include -I$(PREFIX)/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
diff --git a/print/ghostscript6/files/patch-ab b/print/ghostscript6/files/patch-ab
new file mode 100644
index 000000000000..bb2d26d40db7
--- /dev/null
+++ b/print/ghostscript6/files/patch-ab
@@ -0,0 +1,11 @@
+--- src/contrib.mak.orig	Sat Mar 25 21:15:07 2000
++++ src/contrib.mak	Sat Mar 25 21:15:58 2000
+@@ -343,7 +343,7 @@
+ 	$(SETPDEV) $(DD)coslw2p $(coslw_)
+ 
+ $(DD)coslwxl.dev : $(coslw_) $(DD)page.dev
+-	$(SETPDEV) ($DD)coslwxl $(coslw_)
++	$(SETPDEV) $(DD)coslwxl $(coslw_)
+ 
+ $(GLOBJ)gdevcslw.$(OBJ) : $(GLSRC)gdevcslw.c $(PDEVH)
+ 	$(GLCC) $(GLO_)gdevcslw.$(OBJ) $(C_) $(GLSRC)gdevcslw.c
diff --git a/print/ghostscript6/scripts/configure b/print/ghostscript6/scripts/configure
index 393df5898bf4..cf3ab9cb4bf0 100644
--- a/print/ghostscript6/scripts/configure
+++ b/print/ghostscript6/scripts/configure
@@ -189,12 +189,18 @@ case $retval in
 esac
 
 # bring it into the right format with '.dev' appended to each driver name
+#old:
+#echo "DEVICE_DEVS=$choice" \
+#	| sed -e "s/\"//g" \
+#	| sed -e "s/ /.dev /g" \
+#	| sed -e "s/$/.dev/g" \
+#	> ${WRKSRC}/src/unix-gcc.mak.new
+# XXX new:
 echo "DEVICE_DEVS=$choice" \
-	| sed -e "s/\"//g" \
-	| sed -e "s/ /.dev /g" \
-	| sed -e "s/$/.dev/g" \
+	| perl -pe 's|"([a-z0-9]+)"|\$(DD)\1.dev|g' \
 	> ${WRKSRC}/src/unix-gcc.mak.new
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/src/unix-gcc.mak >> ${WRKSRC}/src/unix-gcc.mak.new
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
 mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index 6fda85d6c300..5531110c22e0 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -1,9 +1,10 @@
 #! /bin/sh
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=appledmp.dev iwhi.dev iwlo.dev iwlq.dev hl7x0.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev lbp8.dev lips3.dev m8510.dev coslw2p.dev coslwxl.dev uniprint.dev lj250.dev declj250.dev ap3250.dev epson.dev eps9mid.dev eps9high.dev lp8000.dev lq850.dev epsonc.dev st800.dev stcolor.dev lp2563.dev dnj650c.dev deskjet.dev djet500.dev cdeskjet.dev djet500c.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj670.dev cdj850.dev cdj880.dev cdj890.dev cdj1600.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljet4d.dev lj4dith.dev cljet5.dev cljet5c.dev cljet5pr.dev lj5mono.dev lj5gray.dev pj.dev pjetxl.dev pjxl.dev paintjet.dev pjxl300.dev pxlmono.dev pxlcolor.dev ibmpro.dev jetp3852.dev imagen.dev fs600.dev lxm5700m.dev cp50.dev necp6.dev oce9050.dev oki182.dev okiibm.dev r4081.dev sj48.dev bmpmono.dev bmpgray.dev bmp16.dev bmp256.dev bmp16m.dev bmp32b.dev bmpsep1.dev bmpsep8.dev ccr.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev miff24.dev inferno.dev jpeg.dev jpeggray.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 pdfwrite.dev bit.dev bitrgb.dev bitcmyk.dev plan9bm.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 pksm.dev pksmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev pswrite.dev epswrite.dev sgirgb.dev sunhmono.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev x11rg16x.dev x11rg32x.dev
+DEVICE_DEVS=\$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)r4081.dev \$(DD)sj48.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
-cat ${WRKSRC}/src/unix-gcc.mak >> ${WRKSRC}/src/unix-gcc.mak.new
+sed -e '/^DEVICE_DEVS=/d' ${WRKSRC}/src/unix-gcc.mak \
+	>> ${WRKSRC}/src/unix-gcc.mak.new
 mv ${WRKSRC}/src/unix-gcc.mak.new ${WRKSRC}/src/unix-gcc.mak