- Quote macro value used as argument of env

	fix PR#18541

- use ${WRKDIR} as temporary dir instead of /tmp
	fix PR#18748

2 files changed, 25 insertions, 25 deletions

diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index f6c068293fa..7038bc5b726 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/10/19 15:20:35 taya Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/22 14:16:32 taya Exp $
 
 DISTNAME?=	mozilla-source-${MOZ_VER}
 PKGNAME=	${MOZILLA}-${MOZ_VER}
@@ -57,35 +57,35 @@ CONFIGURE_ARGS+=	--enable-svg
 # directory
 SCRIPTS_ENV+=	HOME="${WRKDIR}"
 
-PLIST_SUBST+=	MOZILLA="${MOZILLA}"
-PLIST_SUBST+=	MOZILLA_BIN="${MOZILLA_BIN}"
+PLIST_SUBST+=	MOZILLA=${MOZILLA}
+PLIST_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
 .if ${OBJECT_FMT} == "ELF"
-SO_SUFFIX=	"so"
+SO_SUFFIX=	so
 .else
-SO_SUFFIX=	"so.1.0"
+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}
+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}"
+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
diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install
index 86af4cde40e..8c2ad23d329 100755
--- a/www/mozilla/files/moz-install
+++ b/www/mozilla/files/moz-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.4 2002/10/22 11:38:42 wiz Exp $
+# $NetBSD: moz-install,v 1.5 2002/10/22 14:16:33 taya Exp $
 
 ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA}
 ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA}
@@ -10,8 +10,8 @@ ${CHMOD} ${BINMODE} ${PREFIX}/bin/${MOZILLA}
 #
 #	Substitute variables
 #
-TMP_PLIST=/tmp/TMP_PLIST.$$
-trap "${RM} -f ${TMP_PLIST}" 1 2 3 10 11
+TMP_PLIST=${WRKDIR}/TMP_PLIST.$$
+trap "${RM} -f ${TMP_PLIST}" 1 2 15
 
 ${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" < ${PLIST_SRC} > ${TMP_PLIST}
 
@@ -50,7 +50,7 @@ for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${
 	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
 done
 
-#${RM} -f ${TMP_PLIST}
+${RM} -f ${TMP_PLIST}
 #
 #
 #