Don't use buildlink framework just to do a conditional dependency for a

binary tool.  We can now use the tools framework for this.  Remove the
various nroff/groff buildlink3.mk/builtin.mk files as editors/jove was
their only user in pkgsrc.

4 files changed, 2 insertions, 52 deletions

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 144332c6378..065883627e0 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/26 21:49:39 jlam Exp $
 #
 
 DISTNAME=	jove4.16.0.63
@@ -11,10 +11,10 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Small emacs-style editor, but lacks the LISP engine
 
 NO_CONFIGURE=	yes
+USE_TOOLS+=	nroff
 
 MAKE_ENV+=	ROOT_GROUP=${ROOT_GROUP:Q}
 MAKE_ENV+=	ROOT_USER=${ROOT_USER:Q}
 MAKE_FLAGS+=	NROFF=${NROFF:Q}
 
-.include "../../mk/nroff.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/nroff.buildlink3.mk b/mk/nroff.buildlink3.mk
deleted file mode 100644
index 049391b2397..00000000000
--- a/mk/nroff.buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: nroff.buildlink3.mk,v 1.1 2005/03/15 04:45:50 tv Exp $
-#
-# This fragment provides a NROFF macro, and includes a dependency
-# on textproc/groff if needed.  This does not depend on the OS providing
-# groff; if any system-supplied nroff is available, it is accepted.
-#
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(NROFF)
-.  if exists(/usr/bin/nroff)
-NROFF?=			/usr/bin/nroff
-.  else
-.    include "../../textproc/groff/buildlink3.mk"
-NROFF?=			${BUILDLINK_PREFIX.groff}/bin/nroff
-.  endif
-.endif
diff --git a/textproc/groff/buildlink3.mk b/textproc/groff/buildlink3.mk
deleted file mode 100644
index 09fd4738a90..00000000000
--- a/textproc/groff/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/07/07 19:06:23 drochner Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GROFF_BUILDLINK3_MK:=	${GROFF_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	groff
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngroff}
-BUILDLINK_PACKAGES+=	groff
-
-.if !empty(GROFF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.groff+=	groff>=1.19nb4
-BUILDLINK_PKGSRCDIR.groff?=	../../textproc/groff
-
-BUILDLINK_DEPMETHOD.groff?=	build
-.endif	# GROFF_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/groff/builtin.mk b/textproc/groff/builtin.mk
deleted file mode 100644
index 77dcc1646b0..00000000000
--- a/textproc/groff/builtin.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: builtin.mk,v 1.3 2005/03/14 19:48:52 tv Exp $
-
-.if !defined(IS_BUILTIN.groff)
-.  if exists(/usr/bin/groff)
-IS_BUILTIN.groff=	yes
-.  else
-IS_BUILTIN.groff=	no
-.  endif
-.endif  # IS_BUILTIN.groff
-
-USE_BUILTIN.groff?=	${IS_BUILTIN.groff}
-GROFF?=			${BUILDLINK_PREFIX.groff}/bin/groff
-TBL?=			${BUILDLINK_PREFIX.groff}/bin/tbl