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.

35 files changed, 75 insertions, 195 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index a321f6692c2..9f5e5f664be 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=	xcircuit-3.3.0
 CATEGORIES=	cad graphics
@@ -10,6 +10,7 @@ HOMEPAGE=	http://xcircuit.ece.jhu.edu/
 COMMENT=	Drawing program for X11 (especially for circuits)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_TOOLS+=	gs:run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcl
 CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include
@@ -32,5 +33,4 @@ post-install:
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 303c0d8a60a..3be2d084f47 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/11/13 22:50:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2005/11/28 06:41:20 jlam Exp $
 
 VERS=		4.2.2
 DISTNAME=	hylafax-${VERS}
@@ -18,6 +18,7 @@ CONFLICTS=	hylafax-devel-[0-9]* mgetty-[0-9]*
 
 USE_PKGINSTALL=		yes
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		gs:run
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-MAKE=${MAKE_PROGRAM}
 CONFIGURE_ARGS+=	--with-INSTALL="" --nointeractive
@@ -54,5 +55,4 @@ post-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile
index 7d36189f878..9143047d893 100644
--- a/converters/doc2html/Makefile
+++ b/converters/doc2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/28 06:41:20 jlam Exp $
 #
 
 DISTNAME=	doc2html
@@ -16,7 +16,7 @@ DEPENDS+=	rtf2html-[0-9]*:../../converters/rtf2html
 DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
 DEPENDS+=	catdoc-[0-9]*:../../textproc/catdoc
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	gs:run perl:run
 
 INSTALLATION_DIRS=	bin
 
@@ -33,5 +33,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html
 	${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 7708bb8eb08..f1f3af3e5cc 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=	doxygen-1.4.5.src
 PKGNAME=	doxygen-1.4.5
@@ -12,7 +12,7 @@ COMMENT=	Documentation system for C++, Java, IDL and C
 
 TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+=		gmake perl flex
+USE_TOOLS+=		gmake gs:run perl flex
 USE_LANGUAGES=		c c++
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--make ${GMAKE}
@@ -36,6 +36,5 @@ post-install:
 
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/doc/guide/Makefile.common b/doc/guide/Makefile.common
index 672a221bcdc..d878336c492 100644
--- a/doc/guide/Makefile.common
+++ b/doc/guide/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2005/11/03 01:57:15 tv Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/11/28 06:41:20 jlam Exp $
 #
 # This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
 #
@@ -30,9 +30,12 @@ _GUIDE_DEPENDS+=	w3m>=0.4:../../www/w3m
 .if !empty(_GUIDE_OUTPUTS:Mps) || !empty(_GUIDE_OUTPUTS:Mpdf)
 _GUIDE_DEPENDS+=	openjade>=1.3.2:../../textproc/openjade
 _GUIDE_DEPENDS+=	tex-jadetex>=3.13:../../print/tex-jadetex
-USE_GHOSTSCRIPT?=	${_GUIDE_DEPTYPE}
 GHOSTSCRIPT_REQD=	7.05
-.  include "../../mk/ghostscript.mk"
+.  if ${_GUIDE_DEPTYPE} == "run"
+USE_TOOLS+=		gs:run
+.  else
+USE_TOOLS+=		gs
+.  endif
 .endif
 
 .if ${_GUIDE_DEPTYPE} == "run"
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index 8005f80def1..b04b9a7ba32 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=	ghostscript-cidfonts-20000901
 PKGREVISION=	1
@@ -19,6 +19,7 @@ GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
 EXTRACT_ONLY=		# empty
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
+USE_TOOLS+=		gs:run
 USE_PKGINSTALL=		yes
 
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
@@ -32,5 +33,4 @@ REQD_DIRS=		${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
 
 do-install:	# nothing
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile
index a09e1b86835..6828d1d1d9c 100644
--- a/fonts/ghostscript-cmaps/Makefile
+++ b/fonts/ghostscript-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/28 06:41:20 jlam Exp $
 
 DISTNAME=	ghostscript-cmaps-20020913
 PKGREVISION=	1
@@ -17,6 +17,7 @@ ADOBE_RESOURCEDIR=	${PREFIX}/share/Adobe/Resource
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
 
 EXTRACT_ONLY=		# empty
+USE_TOOLS+=		gs:run
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 USE_PKGINSTALL=		yes
@@ -32,5 +33,4 @@ REQD_DIRS=		${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap
 
 do-install:	# nothing
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile
index 8b404b4c0d4..54c0ee970b9 100644
--- a/mail/sylpheed-claws-ghostscript-viewer/Makefile
+++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/28 06:41:21 jlam Exp $
 #
 
 DISTNAME=	ghostscript-viewer-0.6
@@ -12,7 +12,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://reboot.animeirc.de/sylpheed/ghostscript_viewer/
 COMMENT=	Plugin to make Sylpheed-claws display PostScript and PDF attachments
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gs:run pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -22,6 +22,4 @@ MESSAGE_SRC+=	${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
 
 .include "../../mail/sylpheed-claws/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index 78f1d93f43c..5ab675322cc 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:16:53 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/28 06:41:21 jlam Exp $
 #
 
 DISTNAME=	netbsd-doc-print-1.2
@@ -18,9 +18,9 @@ NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_MTREE=	yes
+USE_TOOLS+=	gs:run
 
 do-install:	# empty
 
 .include "../../textproc/opensp/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/ghostscript.mk b/mk/ghostscript.mk
deleted file mode 100644
index cfecd85b83f..00000000000
--- a/mk/ghostscript.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-# $NetBSD: ghostscript.mk,v 1.14 2005/10/12 19:24:20 abs Exp $
-#
-# This Makefile fragment is included by packages that require a run-time
-# dependency on a ghostscript Postscript interpreter.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally set GHOSTSCRIPT_REQD to the minimum version number of
-#     Ghostscript required by the package,
-# (2) Optionally set USE_GHOSTSCRIPT to "build" to only add a build-time
-#     dependency on Ghostscript,
-# (3) And include this Makefile fragment in the package Makefile,
-
-.include "../../mk/bsd.prefs.mk"
-
-GHOSTSCRIPT_REQD?=	6.01
-USE_GHOSTSCRIPT?=	run
-
-.if defined(NO_X11)
-.  if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-_GS_PKGSRCDIR?=	../../print/ghostscript-esp-nox11
-.  else
-_GS_PKGSRCDIR?=	../../print/ghostscript-gnu-nox11
-.  endif
-.else
-.  if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-_GS_PKGSRCDIR?=	../../print/ghostscript-esp
-.  else
-_GS_PKGSRCDIR?=	../../print/ghostscript-gnu
-.  endif
-.endif
-
-_VALID_GS=	# empty
-
-# ghostscript-afpl satisfies ${GHOSTSCRIPT_REQD}<=7.07.1
-#
-.for _gs_pattern_ in [0-6].* 7.0 7.0[1-6]* 7.07 7.07.1
-.  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11)
-_VALID_GS+=	ghostscript-afpl>=${GHOSTSCRIPT_REQD}
-.    else
-_VALID_GS+=	ghostscript-afpl>=${GHOSTSCRIPT_REQD}
-.    endif
-.  endif
-.endfor
-
-# ghostscript-esp{,-x11,-nox11} satisfies ${GHOSTSCRIPT_REQD}<=7.07.1
-#
-.for _gs_pattern_ in [0-6].* 7.0 7.0[1-6]* 7.07 7.07.1
-.  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11)
-_VALID_GS+=	ghostscript-esp>=${GHOSTSCRIPT_REQD}
-.    else
-_VALID_GS+=	ghostscript-esp>=${GHOSTSCRIPT_REQD}
-_VALID_GS+=	ghostscript-esp-nox11>=${GHOSTSCRIPT_REQD}
-.    endif
-.  endif
-.endfor
-
-# ghostscript-gnu{,-x11,-nox11} satisfies ${GHOSTSCRIPT_REQD}<=7.07
-#
-.for _gs_pattern_ in [0-6].* 7.0 7.0[1-6]* 7.07
-.  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11)
-_VALID_GS+=	ghostscript-gnu>=${GHOSTSCRIPT_REQD}
-_VALID_GS+=	ghostscript-gnu-x11>=${GHOSTSCRIPT_REQD}
-.    else
-_VALID_GS+=	ghostscript-gnu>=${GHOSTSCRIPT_REQD}
-_VALID_GS+=	ghostscript-gnu-x11>=${GHOSTSCRIPT_REQD}
-_VALID_GS+=	ghostscript-gnu-nox11>=${GHOSTSCRIPT_REQD}
-.    endif
-.  endif
-.endfor
-
-# ghostscript{,-nox11} satisfies ${GHOSTSCRIPT_REQD}<=6.01
-#
-.for _gs_pattern_ in [0-5].* 6.0 6.01
-.  if !empty(GHOSTSCRIPT_REQD:M${_gs_pattern_})
-.    if defined(USE_X11)
-_VALID_GS+=	ghostscript>=${GHOSTSCRIPT_REQD}
-.    else
-_VALID_GS+=	ghostscript>=${GHOSTSCRIPT_REQD}
-_VALID_GS+=	ghostscript-nox11>=${GHOSTSCRIPT_REQD}
-.    endif
-.  endif
-.endfor
-
-.if !defined(GHOSTSCRIPT_DEPENDS) && !empty(_VALID_GS)
-_GS_DEPENDS!=	${ECHO} '${_VALID_GS}' | ${SED} -e "s:^ *::" -e "s: :,:g"
-.  if !empty(_GS_DEPENDS:M*,*)
-GHOSTSCRIPT_DEPENDS=	{${_GS_DEPENDS}}:${_GS_PKGSRCDIR}
-.  else
-GHOSTSCRIPT_DEPENDS=	${_GS_DEPENDS}:${_GS_PKGSRCDIR}
-.  endif
-#MAKEFLAGS+=		GHOSTSCRIPT_DEPENDS="${GHOSTSCRIPT_DEPENDS}"
-.endif
-
-.if (${USE_GHOSTSCRIPT} == "build")
-_GS_DEPMETHOD=		BUILD_DEPENDS
-.else
-USE_GHOSTSCRIPT:=	run
-_GS_DEPMETHOD=		DEPENDS
-.endif
-
-${_GS_DEPMETHOD}+=	${GHOSTSCRIPT_DEPENDS}
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 3ed295d364d..5829053828e 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=		advi-1.6.0
 CATEGORIES=		print
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=		ocaml>=3.04:../../lang/ocaml
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gs:run
 
 post-extract:
 	@${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc
@@ -50,5 +50,4 @@ post-install:
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index d92a8101cb5..59bb42d3644 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/10/10 20:10:37 reed Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $
 #
 
 DISTNAME=	apsfilter-7.2.5
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/apsfilter
 HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
 USE_PKGINSTALL=	YES
-USE_TOOLS+=	awk
+USE_TOOLS+=	awk gs:run
 
 CONFIGURE_ARGS+=--prefix=${PREFIX}
 CONFIGURE_ARGS+=--with-shell=${SH}
@@ -43,5 +43,4 @@ post-patch:
 		${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i;			\
 	done
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index b2210f08764..ad0bf053532 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	cupsomatic
 PKGNAME=	${DISTNAME}-2.2
@@ -31,7 +31,7 @@ DEPENDS+=	cups>=1.1.14nb1:../../print/cups
 DEPENDS+=	foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
 DEPENDS+=	mpage-[0-9]*:../../print/mpage
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	perl:run gs:run
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
 
 FILTERDIR=	${PREFIX}/libexec/cups/filter
@@ -53,5 +53,4 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/$${file} ${FILTERDIR};	\
 	done
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index f580c67dca4..1f3287ae65b 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/11/13 05:30:11 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGREVISION=	5
@@ -15,6 +15,7 @@ CONFLICTS+=	teTeX-bin>=2.0			# Part of teTeX>=2.0
 TEX_ACCEPTED=	teTeX1
 
 WRKSRC=			${WRKDIR}/dvipdfm
+USE_TOOLS+=		gs:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 # needed to get the stdarg.h version of kpathsea/c-varargs.h instead of the
@@ -32,6 +33,5 @@ post-patch:
 .endif
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../print/teTeX/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 6e35dda0463..eecfbbbdbbf 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/20 19:14:50 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	dvipdfmx-20050627
 PKGNAME=	${DISTNAME:S/-/-0.0.0./}
@@ -14,12 +14,12 @@ DEPENDS+=	adobe-cmaps>=20051109:../../fonts/adobe-cmaps
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 
+USE_TOOLS+=		gs:run
 GNU_CONFIGURE=		YES
 MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../print/dvipdfmx/map.mk"
 .include "../../print/teTeX/module.mk"
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index d27edf55e8e..e1c465933bc 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/10 20:30:07 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	foomatic-filters-3.0.2
 PKGREVISION=	1
@@ -27,7 +27,7 @@ CONFIGURE_ENV+= 	CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
 CONFIGURE_ENV+= 	PRINTCAP=/etc/printcap
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
-USE_TOOLS+=	gmake perl:run
+USE_TOOLS+=	gmake gs:run perl:run
 USE_PKGINSTALL=	yes
 INSTALL_TARGET=	install-bin install-man
 
@@ -39,5 +39,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/filter.conf ${EGDIR}
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index b4fe4145638..80940056ee5 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	foomatic-gswrapper
 PKGNAME=	foomatic-gswrapper-1.2
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		gs:run perl:run
 NO_BUILD=		yes
 
 REPLACE_PERL=	${DISTNAME}
@@ -32,5 +32,4 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 1b5f7943518..31d3ac07e9f 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=		gnome-print-0.37
 CATEGORIES=		print gnome
@@ -11,6 +11,7 @@ COMMENT=		Prototype implementation of the Gnome Printing Architecture
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		gs:run
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-admin		# currently unstable
@@ -22,5 +23,4 @@ MAKE_ENV+=		HOME=${WRKSRC}
 .include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
 .include "../../textproc/libunicode/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 1fb9650d317..4d98858f845 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/06/01 19:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2005/11/28 06:41:21 jlam Exp $
 
 DISTNAME=	gv-3.6.1
 CATEGORIES=	print
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.gnu.org/software/gv/
 COMMENT=	PostScript and PDF previewer
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gs:run
 
 USE_MAKEINFO=		yes
 TEXINFO_REQD=		4.2
@@ -23,5 +23,4 @@ post-extract:
 .endif
 
 .include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index beb2649886d..3a34fa12998 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/28 06:41:21 jlam Exp $
 #
 
 DISTNAME=	html2ps-1.0b4
@@ -16,7 +16,7 @@ DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	weblint-[0-9]*:../../www/weblint
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	gs:run perl:run
 TEX_ACCEPTED=	teTeX1 teTeX2 teTeX3
 
 NO_CONFIGURE=	yes
@@ -27,6 +27,5 @@ do-install:
 	@cd ${WRKSRC} && ./install ${PREFIX}
 	@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/lib/html2ps/sample.rc
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile
index a165e0a5e20..3074ca75705 100644
--- a/print/if-psprint/Makefile
+++ b/print/if-psprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/28 06:41:22 jlam Exp $
 #
 
 DISTNAME=	if-psprint-1.7
@@ -12,7 +12,7 @@ COMMENT=	Print text or postscript to arbitrary printer, can use smb
 
 DEPENDS+=	enscript>=1.6.3nb1:../../print/enscript
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	gs:run perl:run
 
 INSTALLATION_DIRS=	libexec man/man1
 
@@ -26,5 +26,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/if-psprint ${PREFIX}/libexec/if-psprint
 	${INSTALL_MAN} ${WRKSRC}/if-psprint.1 ${PREFIX}/man/man1/if-psprint.1
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index 3735cd90a46..173c4d92af0 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/13 05:30:11 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/28 06:41:22 jlam Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGNAME=	ja-${DISTNAME}
@@ -19,6 +19,7 @@ CONFLICTS+=	dvipdfmx-[0-9]*
 TEX_ACCEPTED=	teTeX1
 
 WRKSRC=		${WRKDIR}/dvipdfm
+USE_TOOLS+=	gs:run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 
@@ -33,5 +34,4 @@ post-patch:
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/teTeX/module.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index d0ddedb5588..a439f47fc4c 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/11/08 20:48:32 tonio Exp $
+# $NetBSD: Makefile,v 1.36 2005/11/28 06:41:22 jlam Exp $
 #
 
 DISTNAME=	lilypond-2.4.3
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.mftrace+=	mftrace>=1.1.0
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gs:run
 MAKEFILE=		GNUmakefile
 
 USE_MAKEINFO=	YES
@@ -49,5 +49,4 @@ post-install:
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/emacs.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index c93571a2ee9..33292abb9ed 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.45 2005/11/28 06:41:22 jlam Exp $
 
 DISTNAME=	magicfilter-1.2
 PKGREVISION=	4
@@ -14,9 +14,9 @@ DEPENDS+=	a2ps-[0-9]*:../../print/a2ps
 DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 DEPENDS+=	papersize-[0-9]*:../../print/papersize
 
-USE_TOOLS+=	gmake gzip
+USE_TOOLS+=	gmake gs:run gzip
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	GHOSTSCRIPT=${LOCALBASE}/bin/gs
+CONFIGURE_ENV+=	GHOSTSCRIPT=${TOOLS_PATH.gs}
 CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
 TEX_ACCEPTED=	teTeX1 teTeX2 teTeX3
 
@@ -44,6 +44,5 @@ post-install:
 	  done)
 	@${ECHO} "@dirrm ${FILTER_DIR}" >>${PLIST_SRC}
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 1fe94e8ef5a..61f672813e9 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:22 jlam Exp $
 
 DISTNAME=		mgv-3.1.5
 PKGREVISION=		2
@@ -11,6 +11,7 @@ COMMENT=		Motif/LessTif user interface for Ghostscript
 
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
+USE_TOOLS+=		gs:run
 
 CONFIGURE_ARGS+=	--with-motif-includes=${MOTIFBASE}/include
 CONFIGURE_ARGS+=	--with-motif-libs=${MOTIFBASE}/lib
@@ -23,5 +24,4 @@ post-install:
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile
index 2923aed77cf..d934ddb4481 100644
--- a/print/stylewriter/Makefile
+++ b/print/stylewriter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/17 12:44:42 salo Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/28 06:41:22 jlam Exp $
 #
 
 DISTNAME=	stylewriter
@@ -13,6 +13,7 @@ COMMENT=	Apple StyleWriter driver for un*x
 
 DEPENDS+=	enscript>=1.6.3nb1:../../print/enscript
 
+USE_TOOLS+=	gs:run
 NO_CONFIGURE=	yes
 
 PLIST_SRC=	${WRKDIR}/PLIST
@@ -58,5 +59,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/styl.ppd ${PREFIX}/share/examples/stylewriter
 	${INSTALL_DATA_DIR} /var/spool/lpd/stylps
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index e8a37e0aa3a..b63570475e2 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:22 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/28 06:41:22 jlam Exp $
 #
 
 DISTNAME=	gworkspace-0.7.1
@@ -13,8 +13,8 @@ COMMENT=	GNUstep Workspace manager
 CONFLICTS+=	GWLib-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/gw/GW/}
+USE_TOOLS+=	gs:run
 
 .include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index d33ae3a6a2a..3070ded6c7f 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/11/28 06:41:22 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.1
@@ -16,7 +16,7 @@ DEPENDS+=	psutils>=1.17:../../print/psutils
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH="${PERL5}"
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		gs:run perl:run
 
 INFO_FILES=	groff
 
@@ -40,5 +40,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mdoc.local \
 		${PREFIX}/share/groff/site-tmac
 
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 6de957df7d5..5677485b276 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:22 jlam Exp $
 
 DISTNAME=	latex2html-2002-2-1
 PKGNAME=	latex2html-2002.2.1
@@ -13,7 +13,7 @@ COMMENT=	LaTeX to HTML converter
 DEPENDS+=	netpbm>=10.29nb2:../../graphics/netpbm
 
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		gs:run perl:run
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,5 +27,4 @@ CONFIGURE_ARGS+=	--with-iconpath=${LATEX2HTML_ICONPATH}
 .endif
 
 .include "../../mk/tex.buildlink3.mk"
-.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"