Change all instances of including mk/ghostscript.mk into asking for

the appropriate tool via USE_TOOLS (usually "gs:run"), and remove
ghostscript.mk.  This change removes a rather out-dated file from
pkgsrc and switches packages to use the more compact implementation
of the Ghostcript-handling inside the tools framework.

6 files changed, 14 insertions, 16 deletions

diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 165717bb137..994dedad719 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:11 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=		gri-2.12.5
 PKGREVISION=	1
@@ -13,13 +13,12 @@ COMMENT=		Language for scientific graphics applications
 BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake gs:run perl
 REPLACE_PERL=		gri_merge gri_unpage
 
 USE_MAKEINFO=		yes
 INFO_FILES=		gri.info
 
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index f0264f4544d..9d16c92c43b 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -19,6 +19,7 @@ DEPENDS+=		ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 WRKSRC=			${WRKDIR}/igmt_1.2
 NO_BUILD=		yes
 
+USE_TOOLS=		gs:run
 GMT_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		GMT_PREFIX=GMT
 EVAL_PREFIX+=		TK_PREFIX=tk
@@ -53,5 +54,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} example*.ps.gz			\
 		${WRKSRC}/example*.dat ${PREFIX}/share/examples/igmt/
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 96c32f54c0e..b4ed740a1be 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=		kbarcode-1.8.1
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.kbarcode.net/
 COMMENT=		KDE barcode and label printing application
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gs:run
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
@@ -21,5 +21,4 @@ BUILDLINK_DEPENDS.kdelibs=     kdelibs>=3.3.0
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 4148b88e001..66b9df17412 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/10/13 13:17:59 markd Exp $
+# $NetBSD: Makefile,v 1.51 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
 CATEGORIES=	graphics
@@ -7,6 +7,7 @@ COMMENT=	Graphics programs for the KDE integrated X11 desktop
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_DIRS+=		xdg-1.1
+USE_TOOLS+=		gs:run
 
 BUILDLINK_DEPENDS.lcms=	lcms>=1.12
 
@@ -27,5 +28,4 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 8babaa11b5d..16c09854b7b 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/19 15:49:52 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	pstoedit-3.41
 CATEGORIES=	converters graphics print
@@ -12,6 +12,9 @@ RESTRICTED?=	"The author writes: If you include this program on a CDROM, please
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+# XXX Avoid hard dependency on Ghostscript
+#USE_TOOLS+=	gs:run
+
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c++
 GNU_CONFIGURE=	yes
@@ -37,6 +40,4 @@ post-install:
 
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-# XXX avoid hard dependency
-#.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile
index 6fe69cae5f1..9073d4250d4 100644
--- a/graphics/ruby-RMagick/Makefile
+++ b/graphics/ruby-RMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/03 07:20:28 taca Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	RMagick-1.9.3
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Ruby ImageMagick extension
 
 RUBY_HAS_ARCHLIB=	yes
 GNU_CONFIGURE=		yes
-USE_GHOSTSCRIPT=	build
+USE_TOOLS+=		gs
 
 CONFIGURE_ARGS+=	--with-doc-dir=${RUBY_DOCDIR}/RMagick
 CONFIGURE_ARGS+=	--without-graphics-magick
@@ -25,5 +25,4 @@ post-install:
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"