summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-11 05:22:03 +0000
committerjlam <jlam@pkgsrc.org>2005-06-11 05:22:03 +0000
commit9a2b543ac37d2f8187889def024f007af321708e (patch)
treea3053f68cdabaefad6764deea8445dd3b5ec4148
parentdf53a167dae85b10e168ce7ed1510efa4c8f0792 (diff)
downloadpkgsrc-9a2b543ac37d2f8187889def024f007af321708e.tar.gz
Remove unnecessary .undef lines after .for loops as the loop variables
are automatically undefined after the loop exits.
-rw-r--r--mk/tools/autoconf.mk5
-rw-r--r--mk/tools/automake.mk4
-rw-r--r--mk/tools/bsd.tools.mk7
-rw-r--r--mk/tools/defaults.mk4
-rw-r--r--mk/tools/replace.mk10
-rw-r--r--mk/tools/rpcgen.mk3
6 files changed, 6 insertions, 27 deletions
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 3bc6c5e4b47..42105311c04 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.10 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.11 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -84,7 +84,6 @@ _TOOLS_AC_NAMES+= ifnames ifnames-2.13
.for _t_ in ${_TOOLS_AC_NAMES}
_TOOLS_AC_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor _t_
-.undef _t_
.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf)
. if !empty(PKGPATH:Mdevel/autoconf)
@@ -179,7 +178,6 @@ AUTOMAKE_OVERRIDE?= yes
${_TOOLS_AC_TYPE.${_t_}}+= ${_t_}
. endif
. endfor
-. undef _t_
.endif
# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
@@ -209,4 +207,3 @@ tools-libtool-m4-override:
fi; \
done
.endfor
-.undef _pattern_
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index 5b3a5440826..21acd800355 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.13 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: automake.mk,v 1.14 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -102,7 +102,6 @@ _TOOLS_AM_NAMES+= automake automake-1.4 \
.for _t_ in ${_TOOLS_AM_NAMES}
_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor
-.undef _t_
.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake)
. if !empty(PKGPATH:Mdevel/automake)
@@ -175,7 +174,6 @@ AUTOMAKE_OVERRIDE?= yes
${_TOOLS_AM_TYPE.${_t_}}+= ${_t_}
. endif
. endfor
-. undef _t_
.endif
.if !empty(USE_TOOLS:Mgettext-m4)
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 22dbb7a5956..b10eae1b30f 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.28 2005/05/21 04:53:17 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.29 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -125,20 +125,17 @@ USE_TOOLS?= # empty
TOOLS_CREATE+= ${_t_}
TOOLS_REAL_CMDLINE.${_t_}?= exit 0
.endfor
-.undef _t_
.for _t_ in ${TOOLS_BROKEN}
TOOLS_CREATE+= ${_t_}
TOOLS_REAL_CMDLINE.${_t_}?= exit 1
.endfor
-.undef _t_
.for _t_ in ${TOOLS_GNU_MISSING}
TOOLS_CREATE+= ${_t_}
TOOLS_REAL_CMD.${_t_}?= ${PKGSRCDIR}/mk/gnu-config/missing
TOOLS_REAL_CMDLINE.${_t_}?= ${TOOLS_REAL_CMD.${_t_}} ${_t_:T:C/-[0-9].*$//}
.endfor
-.undef _t_
######################################################################
@@ -215,8 +212,6 @@ ${TOOLS_CMD.${_t_}}:
${TEST} ${.TARGET:Q} = ${.TARGET:H:Q}/${_a_} || \
${LN} -fs ${.TARGET:T:Q} ${.TARGET:H:Q}/${_a_}
. endfor
-. undef _a_
.endfor
-.undef _t_
.endif # BSD_TOOLS_MK
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 474469d6fa1..235bda32af9 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.27 2005/06/10 20:53:54 jlam Exp $
+# $NetBSD: defaults.mk,v 1.28 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -179,9 +179,7 @@ _TOOLS_VARNAME_GNU.yacc= YACC
. for _v_ in ${_TOOLS_VARNAME.${_t_}}
${_v_}?= ${TOOLS_PLATFORM.${_t_}}
. endfor
-. undef _v_
. endif
.endfor
-.undef _t_
.endif # TOOLS_DEFAULTS_MK
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index c8720f86fe1..ef583d40cb9 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.99 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: replace.mk,v 1.100 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -141,13 +141,11 @@ _TOOLS_USE_PKGSRC.${_t_}?= no
. endif
_TOOLS_USE_PKGSRC.${_t_}?= yes
.endfor
-.undef _t_
# TOOLS_DEPMETHOD.<tool> defaults to BUILD_DEPENDS.
.for _t_ in ${_USE_TOOLS}
TOOLS_DEPMETHOD.${_t_}?= BUILD_DEPENDS
.endfor
-.undef _t_
######################################################################
@@ -466,7 +464,6 @@ _TOOLS_DEPENDS.flex= # empty
. for _dep_ in ${BUILDLINK_DEPENDS.flex}
_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
-. undef _dep_
TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex}
TOOLS_CREATE+= flex
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.flex=flex
@@ -666,7 +663,6 @@ _TOOLS_DEPENDS.lex= # empty
. for _dep_ in ${BUILDLINK_DEPENDS.flex}
_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
-. undef _dep_
TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex}
TOOLS_CREATE+= lex
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.lex=flex
@@ -1168,7 +1164,6 @@ FIND_PREFIX:= ${TOOLS_FIND_PREFIX}
${TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
. endif
. endfor
-. undef _dep_
. endif
.endfor
@@ -1190,7 +1185,6 @@ ${_TOOLS_VARNAME.${_t_}}= ${TOOLS_${_TOOLS_VARNAME.${_t_}}}
. endif
. endif
.endfor
-.undef _t_
######################################################################
@@ -1234,11 +1228,9 @@ TOOLS_${_TOOLS_VARNAME.${_t_}}= ${_TOOLS_VARNAME.${_t_}}_not_defined_
. for _v_ in ${_TOOLS_VARNAME.${_t_}}
${_v_}?= ${TOOLS_${_TOOLS_VARNAME.${_t_}}}
. endfor
-. undef _v_
. endif
. endif
.endfor
-.undef _t_
######################################################################
diff --git a/mk/tools/rpcgen.mk b/mk/tools/rpcgen.mk
index 7bfef990aa4..c584d6e06ed 100644
--- a/mk/tools/rpcgen.mk
+++ b/mk/tools/rpcgen.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rpcgen.mk,v 1.7 2005/05/21 04:53:17 jlam Exp $
+# $NetBSD: rpcgen.mk,v 1.8 2005/06/11 05:22:03 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,7 +48,6 @@ TOOLS_EXECDIRS.rpcgen?= /bin /sbin /usr/bin /usr/sbin
TOOLS_REAL_CMD.rpcgen?= ${_d_}/rpcgen
. endif
. endfor
-. undef _d_
TOOLS_REAL_CMD.rpcgen?= ${FALSE}
.endif
TOOLS_CMD.rpcgen= ${TOOLS_DIR}/bin/rpcgen