Pullup ticket 488 - requested by Lubomir Sedlacik

infrastructure fixes regarding whitespace

Revisions pulled up:
- pkgsrc/mk/bsd.pkg.mk	1.1615, 1.1632

    Module Name:    pkgsrc
    Committed By:   tv
    Date:           Thu Apr 21 15:53:53 UTC 2005

    Modified Files:
            pkgsrc/mk: bsd.pkg.mk

    Log Message:
    Work around brain damaged autoconf by stripping leading and trailing
    whitespace from *FLAGS and LIBS before doing :Q quoting.

    Should fix PR pkg/29945.
----
    Module Name:    pkgsrc
    Committed By:   jlam
    Date:           Tue May 10 01:34:05 UTC 2005

    Modified Files:
            pkgsrc/mk: bsd.pkg.mk

    Log Message:
    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.

1 files changed, 8 insertions, 8 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 40eadfac7c8..b78bd829f0f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1601 2005/03/20 18:18:09 jmmv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1601.2.1 2005/05/12 21:42:33 snj Exp $
 #
 # This file is in the public domain.
 #
@@ -296,14 +296,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 ALL_ENV+=	CC=${CC:Q}
-ALL_ENV+=	CFLAGS=${CFLAGS:Q}
-ALL_ENV+=	CPPFLAGS=${CPPFLAGS:Q}
-ALL_ENV+=	CXX=${CXX:Q}
-ALL_ENV+=	CXXFLAGS=${CXXFLAGS: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:Q}
+ALL_ENV+=	FFLAGS=${FFLAGS:M*:Q}
 ALL_ENV+=	LANG=C
 ALL_ENV+=	LC_COLLATE=C
 ALL_ENV+=	LC_CTYPE=C
@@ -311,7 +311,7 @@ ALL_ENV+=	LC_MESSAGES=C
 ALL_ENV+=	LC_MONETARY=C
 ALL_ENV+=	LC_NUMERIC=C
 ALL_ENV+=	LC_TIME=C
-ALL_ENV+=	LDFLAGS=${LDFLAGS: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}
@@ -407,7 +407,7 @@ _ULIMIT_CMD+=	${ULIMIT_CMD_${__tmp__}} ;
 .if defined(GNU_CONFIGURE)
 CONFIG_SHELL?=		${SH}
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
-CONFIGURE_ENV+=		LIBS=${LIBS: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}