[pkgsrc/trunk]: pkgsrc Remove USE_TBL from pkgsrc and replace with USE_TOOLS+...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/51a9a77eb2fe
branches:  trunk
changeset: 494292:51a9a77eb2fe
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 22 21:04:41 2005 +0000

description:
Remove USE_TBL from pkgsrc and replace with USE_TOOLS+=tbl.

diffstat:

 devel/ncurses/Makefile            |  6 ++----
 mail/fetchmail/Makefile           |  4 ++--
 mk/tools/replace.mk               |  9 +++------
 sysutils/cdrecord/Makefile        |  5 ++---
 sysutils/cdrtools-ossdvd/Makefile |  5 ++---
 x11/openmotif/Makefile            |  4 ++--
 6 files changed, 13 insertions(+), 20 deletions(-)

diffs (126 lines):

diff -r 1d3d734d362a -r 51a9a77eb2fe devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Sun May 22 20:58:27 2005 +0000
+++ b/devel/ncurses/Makefile    Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2005/05/22 21:04:41 jlam Exp $
 
 DISTNAME=      ncurses-${NC_VERS}
 PKGREVISION=   1
@@ -16,6 +16,7 @@
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           YES
+USE_TOOLS+=            gawk tbl
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-libtool
@@ -28,9 +29,6 @@
 CONFIGURE_ARGS+=       --with-manpage-format=normal
 CONFIGURE_ARGS+=       --with-manpage-tbl
 
-USE_TOOLS+=            gawk
-USE_TBL=               yes
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff -r 1d3d734d362a -r 51a9a77eb2fe mail/fetchmail/Makefile
--- a/mail/fetchmail/Makefile   Sun May 22 20:58:27 2005 +0000
+++ b/mail/fetchmail/Makefile   Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.152 2005/05/22 21:04:41 jlam Exp $
 
 DISTNAME=      fetchmail-6.2.5
 PKGREVISION=   4
@@ -20,8 +20,8 @@
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-hesiod
-USE_TBL=               yes
 LDFLAGS+=              ${CFLAGS}
+USE_TOOLS+=            tbl
 
 .include "options.mk"
 
diff -r 1d3d734d362a -r 51a9a77eb2fe mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sun May 22 20:58:27 2005 +0000
+++ b/mk/tools/replace.mk       Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.92 2005/05/22 20:08:52 jlam Exp $
+# $NetBSD: replace.mk,v 1.93 2005/05/22 21:04:42 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -79,12 +79,9 @@
 #      TOOLS_DEPMETHOD.tbl=    DEPENDS
 #
 
-# Continue to allow USE_TBL and USE_PERL5 until packages have been taught
-# to use the new syntax.
+# Continue to allow USE_PERL5 until packages have been taught to use the
+# new syntax.
 #
-.if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS])
-USE_TOOLS+=    tbl
-.endif
 .if defined(USE_PERL5)
 USE_TOOLS+=    perl
 .  if empty(USE_PERL5:Mbuild)
diff -r 1d3d734d362a -r 51a9a77eb2fe sysutils/cdrecord/Makefile
--- a/sysutils/cdrecord/Makefile        Sun May 22 20:58:27 2005 +0000
+++ b/sysutils/cdrecord/Makefile        Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/05/22 21:04:42 jlam Exp $
 
 DISTNAME=      cdrtools-2.00.3
 PKGNAME=       cdrecord-2.00.3
@@ -16,8 +16,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=            gmake
-USE_TBL=               yes
+USE_TOOLS+=            gmake tbl
 
 # avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
diff -r 1d3d734d362a -r 51a9a77eb2fe sysutils/cdrtools-ossdvd/Makefile
--- a/sysutils/cdrtools-ossdvd/Makefile Sun May 22 20:58:27 2005 +0000
+++ b/sysutils/cdrtools-ossdvd/Makefile Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 21:04:42 jlam Exp $
 
 DISTNAME=      cdrtools-2.01a32
 PKGNAME=       cdrtools-ossdvd-2.01.1.32
@@ -20,8 +20,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=                        ${WRKDIR}/cdrtools-2.01
-USE_TOOLS+=            gmake
-USE_TBL=               yes
+USE_TOOLS+=            gmake tbl
 
 .if ${LOCALBASE} != "/opt/schily"
 BUILDLINK_TRANSFORM+=  rmdir:/opt/schily
diff -r 1d3d734d362a -r 51a9a77eb2fe x11/openmotif/Makefile
--- a/x11/openmotif/Makefile    Sun May 22 20:58:27 2005 +0000
+++ b/x11/openmotif/Makefile    Sun May 22 21:04:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 21:04:42 jlam Exp $
 
 PKGVER=                2.1.30
 DISTNAME=      openmotif${PKGVER}
@@ -27,7 +27,7 @@
 USE_X11BASE=           yes
 USE_PKGINSTALL=                yes
 BUILD_TARGET=          World
-USE_TBL=               yes
+USE_TOOLS+=            tbl
 
 DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL