diff options
| author | dholland <dholland@pkgsrc.org> | 2016-07-03 18:23:35 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2016-07-03 18:23:35 +0000 |
| commit | c76605b2cbedc7e25a2ac2be7d8a7f5582839832 (patch) | |
| tree | 74d9b08f22eef7b616d1b6ad43cb608520649892 | |
| parent | d03e57470c12db8b9e40f05985b08061fd75138e (diff) | |
| download | pkgsrc-c76605b2cbedc7e25a2ac2be7d8a7f5582839832.tar.gz | |
sync pkglint-type changes from main smlnj package
| -rw-r--r-- | lang/smlnj11072/Makefile | 12 | ||||
| -rw-r--r-- | lang/smlnj11072/Makefile.common | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lang/smlnj11072/Makefile b/lang/smlnj11072/Makefile index fbd3152dbc8..409982a851f 100644 --- a/lang/smlnj11072/Makefile +++ b/lang/smlnj11072/Makefile @@ -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 from Bell Labs 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 diff --git a/lang/smlnj11072/Makefile.common b/lang/smlnj11072/Makefile.common index 64992379517..fb66c4d705e 100644 --- a/lang/smlnj11072/Makefile.common +++ b/lang/smlnj11072/Makefile.common @@ -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. |