diff options
| -rw-r--r-- | devel/ncurses/Makefile | 6 | ||||
| -rw-r--r-- | mail/fetchmail/Makefile | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 9 | ||||
| -rw-r--r-- | sysutils/cdrecord/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/cdrtools-ossdvd/Makefile | 5 | ||||
| -rw-r--r-- | x11/openmotif/Makefile | 4 |
6 files changed, 13 insertions, 20 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index e48a69c93d6..69cd574a945 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ USE_LIBTOOL= YES +USE_TOOLS+= gawk tbl GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-libtool @@ -28,9 +29,6 @@ CONFIGURE_ARGS+= --without-gpm 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 --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 1044223a419..97920b865c7 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -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_PKGINSTALL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-hesiod -USE_TBL= yes LDFLAGS+= ${CFLAGS} +USE_TOOLS+= tbl .include "options.mk" diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index dbee02ae0db..e1f9f9b72cc 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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 --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 0b26a8755a7..9e5f87b65f7 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .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 --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile index de5fcbd23c3..a53f14cf5d2 100644 --- a/sysutils/cdrtools-ossdvd/Makefile +++ b/sysutils/cdrtools-ossdvd/Makefile @@ -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 @@ CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-* .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 --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 54abffa038f..a20ccf24619 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -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 @@ DIST_SUBDIR= openmotif 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 |