Use ghostscript.mk.

5 files changed, 13 insertions, 11 deletions

diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 08d07ab789e..9a0c039fbd3 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/24 19:45:24 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/13 06:53:33 jlam Exp $
 
 DISTNAME=		gri-2.8.7
 CATEGORIES=		graphics
@@ -11,9 +11,9 @@ COMMENT=		language for scientific graphics applications
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
-BUILD_DEPENDS+=		ghostscript-[6-9]*:../../print/ghostscript
 
 GNU_CONFIGURE=		# defined
+USE_X11=		# defined
 USE_GMAKE=		# defined
 USE_BUILDLINK_ONLY= 	# defined
 INFO_FILES=		gri.info
@@ -24,5 +24,6 @@ pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
 
 .include "../../devel/netcdf/buildlink.mk"
+.include "../../mk/ghostscript.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index ca9c16d6866..f401930ce4f 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:10 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/13 06:53:33 jlam Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -13,12 +13,12 @@ COMMENT=		Interactive Mapping of Geoscientific Datasets
 DEPENDS+=		GMT>=3.3.6:../../graphics/GMT
 DEPENDS+=		tcl>=8.0:../../lang/tcl
 DEPENDS+=		tk>=8.0:../../x11/tk
-DEPENDS+=		ghostscript-[0-9]*:../../print/ghostscript
 DEPENDS+=		gv-[0-9]*:../../print/gv
 DEPENDS+=		ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 
 WRKSRC=			${WRKDIR}/igmt_1.2
 NO_BUILD=		yes
+USE_X11=		yes
 
 GMT_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		GMT_PREFIX=GMT
@@ -51,4 +51,5 @@ 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/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 8fc584517a2..7e6985e7803 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/04 14:47:37 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/13 06:53:34 jlam Exp $
 
 DISTNAME=	kdegraphics-2.2.2
 PKGREVISION=	1
@@ -22,5 +22,6 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/ghostscript.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 237b09a5640..facd0109413 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/04 14:47:37 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/13 06:53:34 jlam Exp $
 
 DISTNAME=	kdegraphics-3.0.3
 CATEGORIES=	graphics
@@ -6,7 +6,6 @@ COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
 .include "../../x11/kde3/Makefile.kde3"
 
-DEPENDS+=	ghostscript>=6.01:../../print/ghostscript
 #DEPENDS+=	gPhoto2
 #DEPENDS+=	gpio
 
@@ -21,5 +20,6 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../x11/kde3/buildlink.mk"
 .include "../../x11/kdebase3/buildlink.mk"
+.include "../../mk/ghostscript.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 11373c118c1..f1676bd209f 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/07/02 12:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/13 06:53:35 jlam Exp $
 
 DISTNAME=	pstoedit_3_31
 PKGNAME=	pstoedit-3.31
@@ -12,8 +12,6 @@ COMMENT=	Convert PostScript / PDF into various vector graphic formats
 
 # Requires C++ support of plotutils.
 DEPENDS+=	plotutils>=2.4.1:../../graphics/plotutils
-# Any ghostscript pkg will probably do, if not a font pkg.
-DEPENDS+=	ghostscript-[^f]*:../../print/ghostscript
 
 RESTRICTED?=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -26,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la"
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
 CONFIGURE_ENV+=	LDLIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ENV+=	AWK=${AWK} GS=${PREFIX}/bin/gs
+CONFIGURE_ENV+=	AWK=${AWK} GS=${LOCALBASE}/bin/gs
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit	# plugin dir -- unused for now
 ALL_TARGET=
@@ -42,4 +40,5 @@ post-install:
 	${INSTALL_DATA} ${DOCSRC}/*.htm		${DOCDIR}
 	${INSTALL_DATA} ${DOCSRC}/readme.txt	${DOCDIR}
 
+.include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"