Split ghostscript into base ghostscript package without X11 drivers and

a ghostscript-x11 package containing a gsx11 binary compiled with ONLY
X11 drivers.

We can now install gs-based print filter software without installing the
xbase.tgz set.

7 files changed, 135 insertions, 129 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 7d047a1d8ce..7778d11d52c 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,49 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2000/03/21 22:40:56 tron Exp $
-#
+# $NetBSD: Makefile,v 1.51 2000/03/24 18:15:29 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/ \
-		http://www.ozemail.com.au/~geoffk/pdfencrypt/ \
-		ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
-DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
-		${HP850_DRV} ${HPDJ_DRV} ${PDF_SEC}
+MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
+DISTFILES+=	${GS_FONTS_STD} ${GS_FONTS_OTHER} ${PDF_SEC}
 
-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
-
-MAINTAINER=	explorer@netbsd.org
-HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
-
-BUILD_DEPENDS=	${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract
-BUILD_DEPENDS+=	unzip:../../archivers/unzip
-DEPENDS=	png>=1.0.6:../../graphics/png
-
-USE_X11=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-DIST_SUBDIR=	${DISTNAME:C/-.*$//}
-EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
-ALL_TARGET=	std
-MAKEFILE=	unix-gcc.mak
-MAKE_ENV+=	MAKEOBJDIR=. prefix=${PREFIX}
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=	-L${LOCALBASE}/bsd/lib
-.elif ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32
-CFLAGS=
-.endif
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
-MAKE_FLAGS+=	-DA4
-.endif
-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 ->
@@ -53,51 +12,21 @@ GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-5.10a.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
-# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
-HP850_DRV=	hp8xxs13.zip
-
-# Additional driver for several HP deskjets
-HPDJ_VER=	2.6
-HPDJ_DRV=	hpdj-${HPDJ_VER}.tar.gz
-
 # PostScript source to decode encrypted PDF files
 PDF_SEC=	pdf_sec.ps
 
-SCRIPT_SUFFIX=	.batch
-
-post-extract:
-	${GTAR} -xf ${WRKDIR}/hpdj-${HPDJ_VER}/hpdj.tar -C ${WRKSRC}
-	${RM} -f ${WRKSRC}/jpeg
-	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
-	cd ${WRKSRC} && unzip -uLa ${_DISTDIR}/${HP850_DRV}
+post-extract:	common-post-extract
 	${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
-
-post-patch:
-	@${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
-
-do-configure:
-	@${SETENV} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
-		${SH} ${SCRIPTDIR}/configure${SCRIPT_SUFFIX}
-
 pre-install:
-	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
-	(cd ${PREFIX}/share/ghostscript ; \
-			${GTAR} -xzf ${_DISTDIR}/${GS_FONTS_STD})
-	(cd ${PREFIX}/share/ghostscript/fonts ; \
-			${GTAR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER})
+	${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
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../print/ghostscript5/Makefile.common"
diff --git a/print/ghostscript5/Makefile.common b/print/ghostscript5/Makefile.common
new file mode 100644
index 00000000000..3dd7bf3e181
--- /dev/null
+++ b/print/ghostscript5/Makefile.common
@@ -0,0 +1,78 @@
+# $NetBSD: Makefile.common,v 1.1 2000/03/24 18:15:30 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}
+
+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
+
+MAINTAINER=	explorer@netbsd.org
+HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
+
+BUILD_DEPENDS+=	${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract
+BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:../../archivers/unzip
+DEPENDS+=	png>=1.0.6:../../graphics/png
+
+FILESDIR=	${.CURDIR}/../../print/ghostscript5/files
+PATCHDIR=	${.CURDIR}/../../print/ghostscript5/patches
+SCRIPTDIR=	${.CURDIR}/../../print/ghostscript5/scripts
+
+.include "../../mk/bsd.prefs.mk"
+
+DIST_SUBDIR=	${DISTNAME:C/-.*$//}
+EXTRACT_ONLY=	${GS_SOURCES} ${HPDJ_DRV}
+ALL_TARGET=	std
+MAKEFILE=	unix-gcc.mak
+MAKE_ENV+=	MAKEOBJDIR=. prefix=${PREFIX}
+.if ${OPSYS} == "SunOS"
+LDFLAGS+=	-L${LOCALBASE}/bsd/lib
+.elif ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32
+CFLAGS=
+.endif
+.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+MAKE_FLAGS+=	-DA4
+.endif
+WRKSRC=		${WRKDIR}/gs5.50
+
+GS_SOURCES=	ghostscript-5.50.tar.gz
+GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
+
+# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
+HP850_DRV=	hp8xxs13.zip
+
+# Additional driver for several HP deskjets
+HPDJ_VER=	2.6
+HPDJ_DRV=	hpdj-${HPDJ_VER}.tar.gz
+
+SCRIPT_SUFFIX=	.batch
+
+common-post-extract:	.USE
+	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}
+
+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
+
+post-patch:
+	${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
+
+do-configure:
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure${SCRIPT_SUFFIX}
+
+pre-clean:
+	@cd ../../graphics/jpeg && ${MAKE} clean
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript5/files/patch-sum b/print/ghostscript5/files/patch-sum
index 23e88f34f4b..b0236f17492 100644
--- a/print/ghostscript5/files/patch-sum
+++ b/print/ghostscript5/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.4 1999/12/02 14:26:30 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/03/24 18:15:31 jlam Exp $
 
-MD5 (patch-aa) = 716e5127c6aeda4ec5c3b34b3d887a90
+MD5 (patch-aa) = 1d59f5d7400efb5efc9215765389079f
 MD5 (patch-ab) = 9b2c0662b1f8e65c3dab1abd5b6f3f88
+MD5 (patch-ac) = 02fa08136588a031a533c6c1c12777ef
 MD5 (patch-af) = fe0ee02b0925399aa6f3216b77482346
 MD5 (patch-ag) = af60f2d8c2dc97609ee6240596abd32c
 MD5 (patch-ah) = 3e8217b7a5494c9623eda655ae88bbc7
diff --git a/print/ghostscript5/patches/patch-aa b/print/ghostscript5/patches/patch-aa
index d3728f9aada..8e5f76bec88 100644
--- a/print/ghostscript5/patches/patch-aa
+++ b/print/ghostscript5/patches/patch-aa
@@ -1,15 +1,8 @@
-$NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
+$NetBSD: patch-aa,v 1.10 2000/03/24 18:15:32 jlam Exp $
 
---- unix-gcc.mak.orig	Thu Sep 17 08:06:06 1998
-+++ unix-gcc.mak	Thu Dec  2 15:20:22 1999
-@@ -1,3 +1,6 @@
-+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 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
-+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 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
-+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 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
- #    Copyright (C) 1997, 1998 Aladdin Enterprises.  All rights reserved.
- # 
- # This file is part of Aladdin Ghostscript.
-@@ -53,7 +56,7 @@
+--- unix-gcc.mak.orig	Wed Sep 16 23:06:06 1998
++++ unix-gcc.mak	Wed Mar 22 23:29:09 2000
+@@ -53,7 +53,7 @@
  INSTALL_PROGRAM = $(INSTALL) -m 755
  INSTALL_DATA = $(INSTALL) -m 644
  
@@ -18,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -141,7 +144,7 @@
+@@ -141,7 +141,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -27,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -153,7 +156,7 @@
+@@ -153,7 +153,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -36,7 +29,7 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -205,7 +208,7 @@
+@@ -205,7 +205,7 @@
  #   gcc to accept ANSI-style function prototypes and function definitions.
  XCFLAGS=
  
@@ -45,7 +38,7 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
-@@ -216,7 +219,7 @@
+@@ -216,7 +216,7 @@
  # XLDFLAGS can be set from the command line.
  XLDFLAGS=
  
@@ -54,7 +47,7 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  
  # Define any extra libraries to link into the executable.
  # ISC Unix 2.2 wants -linet.
-@@ -224,7 +227,7 @@
+@@ -224,7 +224,7 @@
  # SVR4 may need -lnsl.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -63,32 +56,35 @@ $NetBSD: patch-aa,v 1.9 1999/12/02 14:26:30 tron Exp $
  
  # 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
-@@ -234,7 +237,7 @@
+@@ -234,7 +234,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${X11BASE}/include
++#XINCLUDE=-I${X11BASE}/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
-@@ -246,12 +249,12 @@
- # Solaris and other SVR4 systems with dynamic linking probably want
- #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
- # X11R6 (on any platform) may need
--#XLIBS=Xt SM ICE Xext X11
-+XLIBS=Xt SM ICE Xext X11
+@@ -249,9 +249,16 @@
+ #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
++#XLIBDIRS=-L${X11BASE}/lib
++#XLIBDIR=
++#XLIBS=Xt Xext X11
++
++.if defined(USE_X11)
++XINCLUDE=-I${X11BASE}/include
 +XLIBDIRS=-L${X11BASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
-+#XLIBS=Xt Xext X11
++XLIBS=Xt SM ICE Xext X11
++.endif
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -295,23 +298,23 @@
+@@ -295,23 +302,23 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
diff --git a/print/ghostscript5/patches/patch-ac b/print/ghostscript5/patches/patch-ac
new file mode 100644
index 00000000000..648a68926aa
--- /dev/null
+++ b/print/ghostscript5/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/03/24 18:18:00 jlam Exp $
+
+--- unix-end.mak.orig	Mon Sep 14 19:03:52 1998
++++ unix-end.mak	Wed Mar 22 19:59:59 2000
+@@ -34,7 +34,7 @@
+ 	@if test ! -d $(PSOBJDIR)/$(PGRELDIR); then mkdir $(PSOBJDIR)/$(PGRELDIR); fi
+ 
+ PGDEFS=GENOPT='' CFLAGS='$(CFLAGS_PROFILE) $(GCFLAGS) $(XCFLAGS)'\
+- LDFLAGS='$(XLDFLAGS) -pg' XLIBS='Xt SM ICE Xext X11' CC_LEAF='$(CC_)'\
++ LDFLAGS='$(XLDFLAGS) -pg' XLIBS='$(XLIBS)' CC_LEAF='$(CC_)'\
+  GLGENDIR=$(GLGENDIR)/$(PGRELDIR) GLOBJDIR=$(GLOBJDIR)/$(PGRELDIR)\
+  PSGENDIR=$(PSGENDIR)/$(PGRELDIR) PSOBJDIR=$(PSOBJDIR)/$(PGRELDIR)
+ 
diff --git a/print/ghostscript5/pkg/DESCR b/print/ghostscript5/pkg/DESCR
index 56476d284f9..6e30f528126 100644
--- a/print/ghostscript5/pkg/DESCR
+++ b/print/ghostscript5/pkg/DESCR
@@ -1,20 +1,3 @@
-This is Aladdin Ghostscript 5.10, the non-GPL version that comes
-with a licence different from the GPL. Read the file PUBLIC in the
-work/gs5.10 directory or in /usr/pkg/share/ghostscript/5.10/doc/PUBLIC
-after installation for details.
-
-Just about every device ghostscript supports is compiled in, including
-an additional driver for HP 850/650 series.
-
 Ghostscript is the well-known PostScript interpreter which is
 available for all common and most esoteric platforms and supports
 many different printers and some displays.
-
-Thomas Merz has written a Ghostscript manual which is available in
-PDF from this site (456k) and also from Thomas Merz's site in Germany.
-
-	http://www.cs.wisc.edu/~ghost/merz.html
-
-On the german site the manual is also available in German language.
-
-	http://www.muc.de/~tm/free/free.html
diff --git a/print/ghostscript5/scripts/configure.batch b/print/ghostscript5/scripts/configure.batch
index 152b8982db3..5dafa8e9b81 100644
--- a/print/ghostscript5/scripts/configure.batch
+++ b/print/ghostscript5/scripts/configure.batch
@@ -1,14 +1,20 @@
 #! /bin/sh
 #
-# $NetBSD: configure.batch,v 1.5 1998/11/29 16:34:28 frueauf Exp $
+# $NetBSD: configure.batch,v 1.6 2000/03/24 18:15:32 jlam 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 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
+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
+!EOT
+fi
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
 cat ${WRKSRC}/unix-gcc.mak >> ${WRKSRC}/unix-gcc.mak.new