From 943451521df8bff780010cd8f9f4248d3fa60fd9 Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Sun, 7 Apr 1996 08:34:21 +0000
Subject: [PATCH] Change ${ENV} -> ${SETENV}.  The former coincides with
 startup file names of bash et al.

Submitted by:	Thomas Gellekum <thomas@ghpc8.ihf.rwth-aachen.de>
---
 Mk/bsd.port.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index d83674b50175..e1424e2adc8e 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3,7 +3,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.198 1996/03/31 10:35:26 asami Exp $
+# $Id: bsd.port.mk,v 1.199 1996/04/01 11:12:58 asami Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -326,7 +326,7 @@ PKG_DBDIR?=		/var/db/pkg
 ECHO?=		/bin/echo
 CAT+=		/bin/cat
 CP?=		/bin/cp
-ENV?=		/usr/bin/env
+SETENV?=	/usr/bin/env
 RM?=		/bin/rm
 MKDIR?=		/bin/mkdir
 GZCAT?=		/usr/bin/gzcat
@@ -416,7 +416,7 @@ package:
 
 .if defined(ALL_HOOK)
 all:
-	@${ENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
+	@${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
 	  DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
 	  PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 	  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
@@ -626,7 +626,7 @@ do-patch:
 .if !target(do-configure)
 do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
-		${ENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
+		${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
 		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
@@ -750,7 +750,7 @@ _PORT_USE: .USE
 .endif
 	@${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/pre-/}
 	@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \
-		${ENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
+		${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
 		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
@@ -759,7 +759,7 @@ _PORT_USE: .USE
 	@${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/do-/}
 	@${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/post-/}
 	@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/post-/} ]; then \
-		${ENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
+		${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
 		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \