CVS commit: pkgsrc/lang/smlnj11072

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Jul  3 18:23:35 UTC 2016

Modified Files:
        pkgsrc/lang/smlnj11072: Makefile Makefile.common

Log Message:
sync pkglint-type changes from main smlnj package


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/smlnj11072/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/smlnj11072/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/smlnj11072/Makefile
diff -u pkgsrc/lang/smlnj11072/Makefile:1.1 pkgsrc/lang/smlnj11072/Makefile:1.2
--- pkgsrc/lang/smlnj11072/Makefile:1.1 Sun Jul  3 17:50:31 2016
+++ pkgsrc/lang/smlnj11072/Makefile     Sun Jul  3 18:23:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/07/03 17:50:31 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/03 18:23:35 dholland Exp $
 #
 
 DISTNAME=      boot.${BOX}-unix
@@ -32,8 +32,6 @@ COMMENT=      Popular functional language fro
 
 SML_VERSION=   110.72
 
-PKG_DESTDIR_SUPPORT=   user-destdir
-
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   smlnj-${SML_VERSION}
 USE_TOOLS+=    gmake pax
@@ -67,12 +65,14 @@ post-extract:
 
 # resolve definition of SML_BASE, CFLAGS in patched files
 do-configure:
+       set -e;                                                 \
        if [ ${MACHINE_ARCH} = "powerpc" ]; then                \
-               ${AWK} '(! /^request nlffi$$/) { print }' \
+               ${AWK} '(! /^request nlffi$$/) { print }'       \
                < ${WRKDIR}/config/targets                      \
                > ${WRKDIR}/temp;                               \
                ${MV} ${WRKDIR}/temp ${WRKDIR}/config/targets;  \
        fi
+       set -e;                                         \
        cd ${WRKDIR}/config;                            \
        for f in ${SML_SCRIPTS}; do                     \
                ${CP} "$${f}" "$${f}.tmp";              \
@@ -82,14 +82,14 @@ do-configure:
        cd ${WRKDIR}/src/runtime/objs;                  \
        for f in *; do                                  \
                ${CP} "$${f}" "$${f}.tmp";              \
-               ${SED} -e 's|@CFLAGS@|${CFLAGS}|g'      \
+               ${SED} -e 's|@CFLAGS@|'${CFLAGS:Q}'|g'  \
                        < "$${f}.tmp" > "$${f}";        \
        done
 
 # The build target needs to run $WRKDIR/config/install.sh
 do-build:
        cd ${WRKDIR} && unset PWD && \
-       FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
+       FILESDIR=${FILESDIR} PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} \
                SMLNJ_HOME="${WRKDIR}" ./config/install.sh
 
 # install target

Index: pkgsrc/lang/smlnj11072/Makefile.common
diff -u pkgsrc/lang/smlnj11072/Makefile.common:1.2 pkgsrc/lang/smlnj11072/Makefile.common:1.3
--- pkgsrc/lang/smlnj11072/Makefile.common:1.2  Sun Jul  3 18:21:39 2016
+++ pkgsrc/lang/smlnj11072/Makefile.common      Sun Jul  3 18:23:35 2016
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2016/07/03 18:21:39 dholland Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/07/03 18:23:35 dholland Exp $
+#
+# used by lang/smlnj/Makefile
 
 # smlnj supports i386, hppa, sparc, ppc, mlrisc & alpha
 # but this package only handles i386, ppc, and sparc.