[pkgsrc/trunk]: pkgsrc/mk In make variables, quotes protect embedded whitespa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2bb6d57bfaa4
branches:  trunk
changeset: 493595:2bb6d57bfaa4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 10 01:34:04 2005 +0000

description:
In make variables, quotes protect embedded whitespace in words, so we
can replace :C/^ *//:C/ *$// with :M* to get the same effect -- removing
leading and trailing whitespace and extra spaces between words.

diffstat:

 mk/bsd.pkg.mk |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 8af27e9a0bae -r 2bb6d57bfaa4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue May 10 01:33:50 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue May 10 01:34:04 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1631 2005/05/09 05:06:55 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1632 2005/05/10 01:34:04 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -312,14 +312,14 @@
 CPPFLAGS+=     ${CPP_PRECOMP_FLAGS}
  
 ALL_ENV+=      CC=${CC:Q}
-ALL_ENV+=      CFLAGS=${CFLAGS:C/^ *//:C/ *$//:Q}
-ALL_ENV+=      CPPFLAGS=${CPPFLAGS:C/^ *//:C/ *$//:Q}
-ALL_ENV+=      CXX=${CXX:C/^ *//:C/ *$//:Q}
-ALL_ENV+=      CXXFLAGS=${CXXFLAGS:C/^ *//:C/ *$//:Q}
+ALL_ENV+=      CFLAGS=${CFLAGS:M*:Q}
+ALL_ENV+=      CPPFLAGS=${CPPFLAGS:M*:Q}
+ALL_ENV+=      CXX=${CXX:M*:Q}
+ALL_ENV+=      CXXFLAGS=${CXXFLAGS:M*:Q}
 ALL_ENV+=      COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}
 ALL_ENV+=      F77=${FC:Q}
 ALL_ENV+=      FC=${FC:Q}
-ALL_ENV+=      FFLAGS=${FFLAGS:C/^ *//:C/ *$//:Q}
+ALL_ENV+=      FFLAGS=${FFLAGS:M*:Q}
 ALL_ENV+=      LANG=C
 ALL_ENV+=      LC_COLLATE=C
 ALL_ENV+=      LC_CTYPE=C
@@ -327,7 +327,7 @@
 ALL_ENV+=      LC_MONETARY=C
 ALL_ENV+=      LC_NUMERIC=C
 ALL_ENV+=      LC_TIME=C
-ALL_ENV+=      LDFLAGS=${LDFLAGS:C/^ *//:C/ *$//:Q}
+ALL_ENV+=      LDFLAGS=${LDFLAGS:M*:Q}
 ALL_ENV+=      LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
 ALL_ENV+=      PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
 ALL_ENV+=      PREFIX=${PREFIX}
@@ -425,7 +425,7 @@
 .if defined(GNU_CONFIGURE)
 CONFIG_SHELL?=         ${SH}
 CONFIGURE_ENV+=                CONFIG_SHELL=${CONFIG_SHELL}
-CONFIGURE_ENV+=                LIBS=${LIBS:C/^ *//:C/ *$//:Q}
+CONFIGURE_ENV+=                LIBS=${LIBS:M*:Q}
 CONFIGURE_ENV+=                install_sh=${INSTALL:Q}
 .  if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN_CMD)
 CONFIGURE_ENV+=                lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}