Subject: Re: pkg/18541: parameters to 'env' are not properly quoted in www/mozilla/Makefile.common
To: NetBSD GNATS submissions and followups <gnats-bugs@gnats.netbsd.org>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 10/21/2002 02:35:20
Here's a corrected patch to the previously corrected patch to make
www/mozilla/Makefile.common properly quote macro values used to
initialize envrionment variables with :Q.  The one in my previous
followup mail was not tested.  This one has been tested with www/phoenix.

Index: www/mozilla/Makefile.common
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/www/mozilla/Makefile.common,v
retrieving revision 1.4
diff -c -r1.4 Makefile.common
*** www/mozilla/Makefile.common	19 Oct 2002 15:20:35 -0000	1.4
--- www/mozilla/Makefile.common	21 Oct 2002 05:55:11 -0000
***************
*** 57,91 ****
  # directory
  SCRIPTS_ENV+=	HOME="${WRKDIR}"
  
! PLIST_SUBST+=	MOZILLA="${MOZILLA}"
! PLIST_SUBST+=	MOZILLA_BIN="${MOZILLA_BIN}"
  .if ${OBJECT_FMT} == "ELF"
! SO_SUFFIX=	"so"
  .else
! SO_SUFFIX=	"so.1.0"
  .endif
  PLIST_SUBST+=	SO_SUFFIX=${SO_SUFFIX}
  
! SCRIPTS_ENV+=	OBJECT_FMT=${OBJECT_FMT}
! SCRIPTS_ENV+=	PLIST_SRC=${PLIST_SRC}
! SCRIPTS_ENV+=	SED=${SED}
! SCRIPTS_ENV+=	RM=${RM}
! SCRIPTS_ENV+=	EGREP=${EGREP}
! SCRIPTS_ENV+=	CHOWN=${CHOWN}
! SCRIPTS_ENV+=	CHGRP=${CHGRP}
! SCRIPTS_ENV+=	CHMOD=${CHMOD}
! SCRIPTS_ENV+=	BINOWN=${BINOWN}
! SCRIPTS_ENV+=	BINGRP=${BINGRP}
! SCRIPTS_ENV+=	BINMODE=${BINMODE}
! SCRIPTS_ENV+=	SETENV=${SETENV}
! SCRIPTS_ENV+=   MOZILLA=${MOZILLA}
! SCRIPTS_ENV+=   MOZILLA_BIN=${MOZILLA_BIN}
! SCRIPTS_ENV+=	SO_SUFFIX=${SO_SUFFIX}
  
  PTHREAD_OPTS+=	native optional
  
  COPTS?=			-O2
! CONFIGURE_ARGS+=	--enable-optimize="${COPTS}"
  
  XPTCFILES+=	xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
  XPTCFILES+=	xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
--- 57,91 ----
  # directory
  SCRIPTS_ENV+=	HOME="${WRKDIR}"
  
! PLIST_SUBST+=	MOZILLA=${MOZILLA}
! PLIST_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
  .if ${OBJECT_FMT} == "ELF"
! SO_SUFFIX=	so
  .else
! SO_SUFFIX=	so.1.0
  .endif
  PLIST_SUBST+=	SO_SUFFIX=${SO_SUFFIX}
  
! SCRIPTS_ENV+=	OBJECT_FMT=${OBJECT_FMT:Q}
! SCRIPTS_ENV+=	PLIST_SRC=${PLIST_SRC:Q}
! SCRIPTS_ENV+=	SED=${SED:Q}
! SCRIPTS_ENV+=	RM=${RM:Q}
! SCRIPTS_ENV+=	EGREP=${EGREP:Q}
! SCRIPTS_ENV+=	CHOWN=${CHOWN:Q}
! SCRIPTS_ENV+=	CHGRP=${CHGRP:Q}
! SCRIPTS_ENV+=	CHMOD=${CHMOD:Q}
! SCRIPTS_ENV+=	BINOWN=${BINOWN:Q}
! SCRIPTS_ENV+=	BINGRP=${BINGRP:Q}
! SCRIPTS_ENV+=	BINMODE=${BINMODE:Q}
! SCRIPTS_ENV+=	SETENV=${SETENV:Q}
! SCRIPTS_ENV+=   MOZILLA=${MOZILLA:Q}
! SCRIPTS_ENV+=   MOZILLA_BIN=${MOZILLA_BIN:Q}
! SCRIPTS_ENV+=	SO_SUFFIX=${SO_SUFFIX:Q}
  
  PTHREAD_OPTS+=	native optional
  
  COPTS?=			-O2
! CONFIGURE_ARGS+=	--enable-optimize=${COPTS:Q}
  
  XPTCFILES+=	xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
  XPTCFILES+=	xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
***************
*** 103,109 ****
  	${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
  
  do-install:
! 	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install
  
  .include "../../mk/pthread.buildlink2.mk"
  
--- 103,109 ----
  	${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
  
  do-install:
! 	${SETENV} ${SCRIPTS_ENV} ${SH} -x ${FILESDIR}/moz-install
  
  .include "../../mk/pthread.buildlink2.mk"
  

-- 
								Greg A. Woods

+1 416 218-0098;            <g.a.woods@ieee.org>;           <woods@robohack.ca>
Planix, Inc. <woods@planix.com>; VE3TCP; Secrets of the Weird <woods@weird.com>