From 4ec0940ae1c94565bd228ae3e79e64df4cda3f6c Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 3 Nov 2006 17:01:10 +0000
Subject: [PATCH] Remove traces of SCRIPTS_ENV

---
 lang/icon/interp/Makefile  | 3 +--
 lang/unicon/Makefile       | 3 +--
 mail/elm/Makefile          | 3 +--
 x11/enlightenment/Makefile | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lang/icon/interp/Makefile b/lang/icon/interp/Makefile
index 39e952cabe3..407ee0b9f44 100644
--- a/lang/icon/interp/Makefile
+++ b/lang/icon/interp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/10/16 10:01:55 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/03 17:01:10 espie Exp $
 
 COMMENT=	"programming language with generators, X11 and more"
 COMMENT-no_x11=	"programming language with generators"
@@ -35,7 +35,6 @@ MAINTAINER=	Marc Espie <espie@openbsd.org>
 FLAVORS=	no_x11
 FLAVOR?=	
 
-SCRIPTS_ENV=	ARCH="${MACHINE_ARCH}"
 MAKE_ENV=	ARCH="${MACHINE_ARCH}"
 CONF_DIR=	${WRKSRC}/config/unix/openbsd
 ALL_TARGET=	Icont Iconc
diff --git a/lang/unicon/Makefile b/lang/unicon/Makefile
index edbcd7f3861..8264a12c884 100644
--- a/lang/unicon/Makefile
+++ b/lang/unicon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/11/02 11:09:01 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/03 17:01:10 espie Exp $
 
 # XXX crashes & hangs, to be dealt with
 NOT_FOR_ARCHS=	powerpc m68k hppa arm sparc
@@ -28,7 +28,6 @@ LIB_DEPENDS=	gdbm.::databases/gdbm
 
 USE_X11=	Yes
 
-SCRIPTS_ENV=	ARCH="${MACHINE_ARCH}"
 MAKE_ENV=	ARCH="${MACHINE_ARCH}"
 CONF_DIR=	${WRKSRC}/config/unix/openbsd
 ALL_TARGET=	Unicon
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index db7db72368c..a903c78420d 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2005/01/02 12:56:04 alek Exp $
+# $OpenBSD: Makefile,v 1.19 2006/11/03 17:01:10 espie Exp $
 
 COMMENT=	"once-popular mail user agent"
 
@@ -19,7 +19,6 @@ CONFIGURE_STYLE=	simple
 CONFIGURE_SCRIPT= Configure
 CONFIGURE_ARGS+= -S -d
 CONFIGURE_ENV+=	PREFIX='$${DESTDIR}${PREFIX}'
-SCRIPTS_ENV=	OPSYS="${OPSYS}"
 
 WRKDIST=	${WRKDIR}/elm2.4.ME+.66
 
diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile
index dcbf16e5259..21d3026f058 100644
--- a/x11/enlightenment/Makefile
+++ b/x11/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2006/08/04 00:10:42 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2006/11/03 17:01:10 espie Exp $
 
 COMMENT=	"themed window manager"
 
@@ -48,11 +48,11 @@ MODULES=	converters/libiconv \
 		devel/gettext
 
 post-configure:
-	@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} ${SCRIPTS_ENV} \
+	@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
 	    ${SH} ./configure ${CONFIGURE_ARGS}
 	@for i in ${THEMES}; do \
 		cd ${WRKDIR}/$$i && \
-		    ${SETENV} ${CONFIGURE_ENV} ${SCRIPTS_ENV} ${SH} \
+		    ${SETENV} ${CONFIGURE_ENV} ${SH} \
 		    ./configure ${CONFIGURE_ARGS}; \
 	done