[pkgsrc/trunk]: pkgsrc/mk Collapse two .for blocks to improve readability:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ac156e38757
branches:  trunk
changeset: 503341:5ac156e38757
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Nov 18 17:07:13 2005 +0000

description:
Collapse two .for blocks to improve readability:
_ULIMIT_CMD to use a ${...:@var@loop ...@} construct
_ACCEPTABLE to use a !empty(var:Mfoo) conditional

diffstat:

 mk/bsd.pkg.mk |  17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diffs (39 lines):

diff -r ff83433dbc2b -r 5ac156e38757 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 18 16:47:35 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 18 17:07:13 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1760 2005/11/18 14:40:21 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1761 2005/11/18 17:07:13 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -368,14 +368,7 @@
 BUILD_DEFS+=           _PLIST_IGNORE_FILES
 
 # Automatically increase process limit where necessary for building.
-_ULIMIT_CMD=
-.if defined(UNLIMIT_RESOURCES)
-.  for __tmp__ in ${UNLIMIT_RESOURCES}
-.    if defined(ULIMIT_CMD_${__tmp__})
-_ULIMIT_CMD+=  ${ULIMIT_CMD_${__tmp__}} ;
-.    endif
-.  endfor
-.endif
+_ULIMIT_CMD=           ${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@}
 
 # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script.
 # also pass in a CONFIG_SHELL to avoid picking up bash
@@ -947,12 +940,8 @@
 .  endif
 
 .  if defined(LICENSE)
-.    if defined(ACCEPTABLE_LICENSES)
-.      for _lic in ${ACCEPTABLE_LICENSES}
-.        if ${LICENSE} == "${_lic}"
+.    if defined(ACCEPTABLE_LICENSES) && !empty(ACCEPTABLE_LICENSES:M${LICENSE})
 _ACCEPTABLE=   yes
-.        endif # LICENSE == _lic
-.      endfor  # _lic
 .    endif     # ACCEPTABLE_LICENSES
 .    if !defined(_ACCEPTABLE)
 PKG_FAIL_REASON+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \