Revert to original ghostscript installation with `gs' binary without

X11 drivers.

6 files changed, 47 insertions, 65 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index c72f536c76e..59b9d904140 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,35 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2000/04/16 17:25:59 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2000/04/20 16:28:47 jlam Exp $
 
-PKGNAME=	${DISTNAME}nb1
-MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
-DISTFILES+=	${GS_FONTS_STD} ${GS_FONTS_OTHER} ${PDF_SEC}
+PKGNAME=	${DISTNAME}nb2
 
-#  Note: the following two are special files.  In the 5.50 directory
-#  on the FTP site, there are symlinks:
-#        ghostscript-fonts-other-5.50.tar.gz ->
-#               ../fonts/ghostscript-fonts-other-4.40.tar.gz
-#  To avoid unnecessarily downloading distfiles, do not change these
-#  when upgrading the port unless the symlinks/files really change.
-GS_FONTS_STD=	ghostscript-fonts-std-5.10a.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
-
-# PostScript source to decode encrypted PDF files
-PDF_SEC=	pdf_sec.ps
-
-post-extract:	common-post-extract
-	${RM} -f ${WRKSRC}/${PDF_SEC}
-	${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/${PDF_SEC}
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
-	cd ${PREFIX}/share/ghostscript; \
-		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_STD}
-	cd ${PREFIX}/share/ghostscript/fonts; \
-		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_OTHER}
-
-post-install:
-	${LN} -sf gs.1 ${PREFIX}/man/man1/gstty.1
-	${MV} ${PREFIX}/bin/gs ${PREFIX}/bin/gstty
-	strip ${PREFIX}/bin/gstty
+CONFLICTS=	ghostscript-x11-*
 
 .include "../../print/ghostscript5/Makefile.common"
diff --git a/print/ghostscript5/Makefile.common b/print/ghostscript5/Makefile.common
index b6933aef03c..770ee9af095 100644
--- a/print/ghostscript5/Makefile.common
+++ b/print/ghostscript5/Makefile.common
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile.common,v 1.2 2000/04/06 22:35:26 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/04/20 16:28:47 jlam Exp $
 
 DISTNAME=	ghostscript-5.50
 CATEGORIES=	print
 MASTER_SITES+=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
-		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
-		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
-DISTFILES+=	${GS_SOURCES} ${HP850_DRV} ${HPDJ_DRV}
+		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/
+DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} ${PDF_SEC} \
+		${HP850_DRV} ${HPDJ_DRV}
 
-PATCH_SITES+=	http://www.cs.wisc.edu/~ghost/aladdin/relnotes/gs550/
-PATCHFILES+=	990524.txt 990220c.txt 990220b.txt 990220a.txt 990220.txt \
+PATCH_SITES=	http://www.cs.wisc.edu/~ghost/aladdin/relnotes/gs550/
+PATCHFILES=	990524.txt 990220c.txt 990220b.txt 990220a.txt 990220.txt \
 		990120a.txt 990120.txt 990117.txt 990115a.txt 981222.txt \
 		981221.txt 981220.txt
 
@@ -23,6 +22,7 @@ DEPENDS+=	png>=1.0.6:../../graphics/png
 FILESDIR=	${.CURDIR}/../../print/ghostscript5/files
 PATCHDIR=	${.CURDIR}/../../print/ghostscript5/patches
 SCRIPTDIR=	${.CURDIR}/../../print/ghostscript5/scripts
+PLIST_SRC=	${.CURDIR}/../../print/ghostscript5/pkg/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,27 +44,44 @@ WRKSRC=		${WRKDIR}/gs5.50
 GS_SOURCES=	ghostscript-5.50.tar.gz
 GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 
+#  Note: the following two are special files.  In the 5.50 directory
+#  on the FTP site, there are symlinks:
+#	ghostscript-fonts-other-5.50.tar.gz ->
+#		../fonts/ghostscript-fonts-other-4.40.tar.gz
+#  To avoid unnecessarily downloading distfiles, do not change these
+#  when upgrading the port unless the symlinks/files really change.
+GS_FONTS_STD=	ghostscript-fonts-std-5.10a.tar.gz
+GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
+
+# PostScript source to decode encrypted PDF files
+MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+PDF_SEC=	pdf_sec.ps
+
 # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
+MASTER_SITES+=	http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/
 HP850_DRV=	hp8xxs13.zip
 
 # Additional driver for several HP deskjets
+MASTER_SITES+=	ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
 HPDJ_VER=	2.6
 HPDJ_DRV=	hpdj-${HPDJ_VER}.tar.gz
 
 SCRIPT_SUFFIX=	.batch
 
-common-post-extract:	.USE
+post-extract:
 	cd ${WRKSRC}; ${PAX} -rf ${WRKDIR}/hpdj-${HPDJ_VER}/hpdj.tar
 	${RM} -f ${WRKSRC}/jpeg
 	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
 	cd ${WRKSRC}; ${LOCALBASE}/bin/unzip -uLa ${_DISTDIR}/${HP850_DRV}
+	${RM} -f ${WRKSRC}/${PDF_SEC}
+	${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/${PDF_SEC}
 
 pre-patch:
 	${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
 	${LN} -s . ${WRKSRC}/lib
 	${LN} -s . ${WRKSRC}/src
 	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/zmedia2.c-5.50.diff
-	${CAT} ${WRKSRC}/contrib.mak-5.50.add >>${WRKSRC}/contrib.mak
+	${CAT} ${WRKSRC}/contrib.mak-5.50.add >> ${WRKSRC}/contrib.mak
 
 post-patch:
 	${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
@@ -72,6 +89,16 @@ post-patch:
 do-configure:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure${SCRIPT_SUFFIX}
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
+	cd ${PREFIX}/share/ghostscript; \
+		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_STD}
+	cd ${PREFIX}/share/ghostscript/fonts; \
+		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_OTHER}
+
+post-install:
+	strip ${PREFIX}/bin/gs
+
 pre-clean:
 	@cd ../../graphics/jpeg && ${MAKE} clean
 
diff --git a/print/ghostscript5/files/patch-sum b/print/ghostscript5/files/patch-sum
index a5818964572..66e4d4e459a 100644
--- a/print/ghostscript5/files/patch-sum
+++ b/print/ghostscript5/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/04/15 18:36:43 mycroft Exp $
+$NetBSD: patch-sum,v 1.8 2000/04/20 16:28:48 jlam Exp $
 
 MD5 (patch-aa) = 1d59f5d7400efb5efc9215765389079f
 MD5 (patch-ab) = 9b2c0662b1f8e65c3dab1abd5b6f3f88
@@ -7,5 +7,4 @@ MD5 (patch-af) = fe0ee02b0925399aa6f3216b77482346
 MD5 (patch-ag) = af60f2d8c2dc97609ee6240596abd32c
 MD5 (patch-ah) = 3e8217b7a5494c9623eda655ae88bbc7
 MD5 (patch-ai) = 0bbd7840cb931e18def4ebd1415abbdc
-MD5 (patch-aj) = 8fe6eed926cb23efbdc1c67212f50fcc
 MD5 (patch-ak) = 0a345f6e31c179cfb3e771ed24fc9dac
diff --git a/print/ghostscript5/patches/patch-aj b/print/ghostscript5/patches/patch-aj
deleted file mode 100644
index 81e159bbd3e..00000000000
--- a/print/ghostscript5/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/04/10 02:19:18 jlam Exp $
-
---- unixinst.mak.orig	Sun Apr  9 21:59:30 2000
-+++ unixinst.mak	Sun Apr  9 22:04:08 2000
-@@ -45,7 +45,10 @@
- gsbj gsdj gsdj500 gslj gslp gsnd \
- bdftops dvipdf font2c \
- pdf2dsc pdf2ps pf2afm printafm ps2ascii ps2epsi ps2pdf ps2ps wftopfa ;\
--	do if ( test -f $$f ); then $(INSTALL_PROGRAM) $$f $(scriptdir)/$$f; fi;\
-+	do if ( test -f $$f ); then \
-+		mv $$f $$f.orig; \
-+		sed -e "s,gs ,gstty ,g" $$f.orig > $$f; \
-+		$(INSTALL_PROGRAM) $$f $(scriptdir)/$$f; fi;\
- 	done'
- 
- MAN1_PAGES=gs pdf2dsc pdf2ps ps2ascii ps2epsi ps2pdf ps2ps gs-hpdj
diff --git a/print/ghostscript5/pkg/PLIST b/print/ghostscript5/pkg/PLIST
index d805d7cb4dc..2acea312eed 100644
--- a/print/ghostscript5/pkg/PLIST
+++ b/print/ghostscript5/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.8 2000/04/10 02:19:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/04/20 16:28:48 jlam Exp $
 bin/bdftops
 bin/dvipdf
 bin/font2c
+bin/gs
 bin/gsbj
 bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
-bin/gstty
 bin/pdf2dsc
 bin/pdf2ps
 bin/printafm
diff --git a/print/ghostscript5/scripts/configure.batch b/print/ghostscript5/scripts/configure.batch
index 899e53d18fb..0da60d002c7 100644
--- a/print/ghostscript5/scripts/configure.batch
+++ b/print/ghostscript5/scripts/configure.batch
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: configure.batch,v 1.7 2000/04/16 18:23:40 rh Exp $
+# $NetBSD: configure.batch,v 1.8 2000/04/20 16:28:48 jlam Exp $
 #
 
 # without that no way :)
@@ -10,12 +10,12 @@ if [ "${USE_X11}" = "yes" -o "${USE_X11}" = "YES" ]; then
 	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
 !EOT
-else
-	cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=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 cdj670.dev cdj890.dev cdj1600.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 hpdj.dev
-!EOT
 fi
 
+cat - >> ${WRKSRC}/unix-gcc.mak.new << !EOT
+DEVICE_DEVS+=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 cdj670.dev cdj890.dev cdj1600.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 hpdj.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