[pkgsrc/trunk]: pkgsrc/lang Use BUILD_ENV properly.

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63953f9cc885
branches:  trunk
changeset: 349316:63953f9cc885
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jul 03 19:16:03 2016 +0000

description:
Use BUILD_ENV properly.

diffstat:

 lang/smlnj/Makefile      |  15 +++++++++++----
 lang/smlnj11072/Makefile |  15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 11ee02d0f28c -r 63953f9cc885 lang/smlnj/Makefile
--- a/lang/smlnj/Makefile       Sun Jul 03 19:15:50 2016 +0000
+++ b/lang/smlnj/Makefile       Sun Jul 03 19:16:03 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/07/03 19:15:02 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $
 #
 
 DISTNAME=      boot.${BOX}-unix
@@ -45,6 +45,15 @@
 SML_BINDIR=    ${SML_BASE}/bin
 SML_SCRIPTS=   _link-sml _run-sml _ml-build _ml-makedepend
 
+# while building, the work directory is the "installation"
+BUILD_ENV+=    SMLNJ_HOME="${WRKDIR}"
+
+# the build uses patch directly (yuk)
+BUILD_ENV+=    PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q}
+
+# not sure why this is needed (XXX?)
+BUILD_ENV+=    FILESDIR=${FILESDIR}
+
 # note that this includes bsd.prefs.mk
 .include "../../lang/smlnj/Makefile.common"
 
@@ -115,9 +124,7 @@
 
 # The build target needs to run $WRKDIR/config/install.sh
 do-build:
-       cd ${WRKDIR} && unset PWD && \
-       FILESDIR=${FILESDIR} PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} \
-               SMLNJ_HOME="${WRKDIR}" ./config/install.sh
+       cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh
 
 # install target
 # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
diff -r 11ee02d0f28c -r 63953f9cc885 lang/smlnj11072/Makefile
--- a/lang/smlnj11072/Makefile  Sun Jul 03 19:15:50 2016 +0000
+++ b/lang/smlnj11072/Makefile  Sun Jul 03 19:16:03 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/07/03 19:15:02 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2016/07/03 19:16:03 dholland Exp $
 #
 
 DISTNAME=      boot.${BOX}-unix
@@ -44,6 +44,15 @@
 SML_BINDIR=    ${SML_BASE}/bin
 SML_SCRIPTS=   _link-sml _run-sml _ml-build _ml-makedepend
 
+# while building, the work directory is the "installation"
+BUILD_ENV+=    SMLNJ_HOME="${WRKDIR}"
+
+# the build uses patch directly (yuk)
+BUILD_ENV+=    PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q}
+
+# not sure why this is needed (XXX?)
+BUILD_ENV+=    FILESDIR=${FILESDIR}
+
 # note that this includes bsd.prefs.mk
 .include "../../lang/smlnj/Makefile.common"
 
@@ -114,9 +123,7 @@
 
 # The build target needs to run $WRKDIR/config/install.sh
 do-build:
-       cd ${WRKDIR} && unset PWD && \
-       FILESDIR=${FILESDIR} PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} \
-               SMLNJ_HOME="${WRKDIR}" ./config/install.sh
+       cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh
 
 # install target
 # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)