s/${ENV}/${SETENV}/, noted by Kevin P. Neal in connection with PR 19586.

NetBSD · Feb 9, 2003 · 246e1b5 · 246e1b5
1 parent 8798553
commit 246e1b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/01/05 13:37:15 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.52 2003/02/09 14:38:52 wiz Exp $
 #
 
 .include "mk/bsd.prefs.mk"
@@ -73,7 +73,7 @@ README.html: .PRECIOUS
 		esac;							\
 		cd ${.CURDIR} ;						\
 	fi;								\
-	${ENV} TMPDIR=${TMPDIR:U/tmp}/mkreadme	 			\
+	${SETENV} TMPDIR=${TMPDIR:U/tmp}/mkreadme	 		\
 		BMAKE=${MAKE} AWK=${AWK} EXPR=${EXPR} 			\
 		./mk/scripts/mkreadme --pkgsrc ${.CURDIR} 		\
 		--packages ${PACKAGES} ${_README_TYPE_FLAG} $$MULTIARCH \

diff --git a/cad/electric/Makefile b/cad/electric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 06:05:55 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/09 14:38:52 wiz Exp $
 #
 
 DISTNAME=	electric-6.05
@@ -21,7 +21,7 @@ post-patch:
 		> ${WRKSRC}/src/include/config.h
 
 post-install:
-	cd ${WRKSRC} && ${ENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.html
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.html
 
 .include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/30 14:54:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/09 14:38:53 wiz Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -25,6 +25,6 @@ post-patch:
 
 do-configure:
 	cd ${WRKSRC} && printf "1\n2\n6\n\n\n\n\n\n\n\n\n\n\n" | \
-		${ENV} ${MAKE_ENV} ./scripts/config
+		${SETENV} ${MAKE_ENV} ./scripts/config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1136 2003/01/29 19:34:14 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1137 2003/02/09 14:38:51 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -3638,7 +3638,7 @@ show-vulnerabilities-html:
 # the target used to generate the README.html file.
 .PHONY: README.html
 README.html: .PRECIOUS
-	@${ENV} AWK=${AWK} BMAKE=${MAKE} ../../mk/scripts/mkdatabase -f [email protected]
+	@${SETENV} AWK=${AWK} BMAKE=${MAKE} ../../mk/scripts/mkdatabase -f [email protected]
 	@if [ -e ${PACKAGES} ]; then					\
 		cd ${PACKAGES};						\
 		case `${PWD_CMD}` in					\

diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:10 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/09 14:38:53 wiz Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -51,7 +51,7 @@ do-install:
 # Part of regression test
 do-test:
 	@cd ${WRKSRC}/src/cmd/ksh93/tests && \
-		${ENV} SHELL=${PREFIX}/bin/ksh93 ${PREFIX}/bin/ksh93 shtests
+		${SETENV} SHELL=${PREFIX}/bin/ksh93 ${PREFIX}/bin/ksh93 shtests
 # XXX Their 'test' target needs nmake (Korn's another tool)
 #	@cd ${WRKSRC}; \
 #		${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test