Alter dependencies. Packages needing X11 drivers use

	DEPENDS+=	ghostscript-[6-9]*:../../print/ghostscript

and packages needing just any ghostscript binary use

	DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript

8 files changed, 16 insertions, 16 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index deffebdc607..87be9140bce 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/05/07 02:11:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/05/10 15:39:06 jlam Exp $
 #
 
 DISTNAME=	hylafax-4.1beta2
@@ -15,7 +15,7 @@ HOMEPAGE=	http://www.hylafax.org/
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	mawk>=1.2.2:../../lang/mawk
-DEPENDS+=	ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 
 CONFLICTS=	mgetty-*
 
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 4ec8cb46791..0540de765d3 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/05/07 02:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2000/05/10 15:39:06 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp
 #
 
@@ -17,7 +17,7 @@ PATCHFILES=     xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch # (for tiff3.4)
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.trilon.com/xv/
 
-DEPENDS+=	ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 DEPENDS+=	png>=1.0.6:../png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index f6981b6723d..d15121771e1 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/05/07 02:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2000/05/10 15:39:07 jlam Exp $
 #
 
 DISTNAME=	ggv-0.50
@@ -9,7 +9,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-DEPENDS+=	ghostscript-x11-*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript-[6-9]*:../../print/ghostscript
 DEPENDS+=	gnome-core-*:../../x11/gnome-core
 
 GNU_CONFIGURE=	YES
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index f092d118206..2d02d97140c 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/05/07 02:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2000/05/10 15:39:07 jlam Exp $
 #
 
 DISTNAME=		gnome-print-0.18
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.levien.com/gnome/print-arch.html
 
 DEPENDS+=		gnome-libs>=1.0.56:../../x11/gnome-libs
 DEPENDS+=		libxml>=1.8.5:../../textproc/libxml
-DEPENDS+=		ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=		ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 
 USE_LIBTOOL=		# defined
 USE_X11BASE=		# defined
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 469f73477d2..8250bab4ba1 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/05/07 02:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2000/05/10 15:39:07 jlam Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://wwwthep.physik.uni-mainz.de/~plass/gv/
 
-DEPENDS+=	ghostscript-x11-*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript-[6-9]*:../../print/ghostscript
 
 USE_IMAKE=	yes
 USE_XAW=	yes
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index cd7ca18ee8c..d3837626aed 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/07 02:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/10 15:39:07 jlam Exp $
 #
 
 DISTNAME=	html2ps-1.0b1
@@ -9,7 +9,7 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.tdb.uu.se/~jan/html2ps.html
 
 DEPENDS+=	ImageMagick-*:../../graphics/ImageMagick
-DEPENDS+=	ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	p5-PerlMagick-*:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-libwww-*:../../www/p5-libwww
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 514eebcdbc2..6c119d54d4f 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2000/05/07 02:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2000/05/10 15:39:07 jlam Exp $
 
 DISTNAME=	magicfilter-1.2
 CATEGORIES=	print
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=system/printing/}
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	a2ps-*:../../print/a2ps
-DEPENDS+=	ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 DEPENDS+=	netpbm-*:../../graphics/netpbm
 DEPENDS+=	teTeX-bin-*:../../print/teTeX-bin
 DEPENDS+=	papersize-*:../../print/papersize
diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile
index f3c75f65213..8008f87a7f5 100644
--- a/print/stylewriter/Makefile
+++ b/print/stylewriter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/07 02:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/05/10 15:39:08 jlam Exp $
 #
 
 DISTNAME=	stylewriter
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.pobox.com/~monroe/styl/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.pobox.com/~monroe/styl/
 
-DEPENDS+=	ghostscript{,-nox11,-x11}-[0-9]*:../../print/ghostscript-x11
+DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 DEPENDS+=	enscript-1.6.1:../../print/enscript
 
 NO_CONFIGURE=	yes