[111043] trunk/dports/lang/smlnj
cal at macports.org
cal at macports.org
Fri Sep 13 16:46:07 PDT 2013
Revision: 111043
https://trac.macports.org/changeset/111043
Author: cal at macports.org
Date: 2013-09-13 16:46:07 -0700 (Fri, 13 Sep 2013)
Log Message:
-----------
smlnj: add more modules, closes #38270, maintainer timeout, make sure smlnj is UsingTheRightCompiler
Modified Paths:
--------------
trunk/dports/lang/smlnj/Portfile
Added Paths:
-----------
trunk/dports/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff
Removed Paths:
-------------
trunk/dports/lang/smlnj/files/patch-install.sh.diff
Modified: trunk/dports/lang/smlnj/Portfile
===================================================================
--- trunk/dports/lang/smlnj/Portfile 2013-09-13 23:40:03 UTC (rev 111042)
+++ trunk/dports/lang/smlnj/Portfile 2013-09-13 23:46:07 UTC (rev 111043)
@@ -5,6 +5,7 @@
name smlnj
version 110.75
+revision 1
categories lang ml
license BSD
maintainers bfulgham
@@ -25,25 +26,25 @@
# Files needed for basic distribution.
set srcs [list \
- config.tgz 527cb179b48abcf1463089d168b171fd05eb814d \
+ ckit.tgz 0dbca80174f969a549d85ef3e15a4a8ecce7ed22 \
+ cml.tgz 8938aa0685453c16f57bae23e96ed23b1409f419 \
cm.tgz a4310413102c5649ed43d92962ffa307ebec4a39 \
compiler.tgz efd03a1cc84104c22776f56dca67e0ae5e9145e8 \
- runtime.tgz dd81ce2963ca0ea4b1e92b22c7587d5ae64783f8 \
- system.tgz 0f7536bbdcd6d1584f4dcbf3b30a553d98fb0cb1 \
- MLRISC.tgz 041b6463d98d0effa0afc457fc5b09e74f081b85 \
- smlnj-lib.tgz 33f4d3a8dc653cd015ed15a27776dd0e3f2fbb04 \
- ckit.tgz 0dbca80174f969a549d85ef3e15a4a8ecce7ed22 \
- nlffi.tgz b881390f58df7bbc5d84c45eec20af7fcfbfa40c \
- cml.tgz 8938aa0685453c16f57bae23e96ed23b1409f419 \
+ config.tgz 527cb179b48abcf1463089d168b171fd05eb814d \
eXene.tgz f8608de797634faaad632fbdfd43838c4de85e42 \
+ heap2asm.tgz 49c81c4343db2095fe7c28ae5ef40086d225421c \
+ ml-burg.tgz 202f62c604e6d11b0ebed82ce78210a8e5224a9d \
+ ml-lex.tgz 6557d928f85b28938d4c299925835a6d5eb1e68b \
ml-lpt.tgz d0b68f304a5e29173a9599a3959c12e84ea479ee \
- ml-lex.tgz 6557d928f85b28938d4c299925835a6d5eb1e68b \
+ MLRISC.tgz 041b6463d98d0effa0afc457fc5b09e74f081b85 \
ml-yacc.tgz 1bec52fbc6557dcd7d4363a1ae13be540bfc89a5 \
- ml-burg.tgz 202f62c604e6d11b0ebed82ce78210a8e5224a9d \
+ nlffi.tgz b881390f58df7bbc5d84c45eec20af7fcfbfa40c \
pgraph.tgz 7b6425de5ca1648caf230dea5e8db34f90b481c9 \
+ runtime.tgz dd81ce2963ca0ea4b1e92b22c7587d5ae64783f8 \
+ smlnj-c.tgz adbc3874f8715d53bc1f032047c3289cff0af8e9 \
+ smlnj-lib.tgz 33f4d3a8dc653cd015ed15a27776dd0e3f2fbb04 \
+ system.tgz 0f7536bbdcd6d1584f4dcbf3b30a553d98fb0cb1 \
trace-debug-profile.tgz c828e9d2728171a5d087a41fcbb923ac460a9d50 \
- heap2asm.tgz 49c81c4343db2095fe7c28ae5ef40086d225421c \
- smlnj-c.tgz adbc3874f8715d53bc1f032047c3289cff0af8e9 \
]
foreach {tarball checksum} $srcs {
@@ -55,17 +56,13 @@
# Platform-specific boot code (omitted: sparc-unix, x86-win32)
platform powerpc {
distfiles-append boot.ppc-unix.tgz
- checksums-append boot.ppc-unix.tgz sha1 78e2aa861a2861c8a0e0678936a4b5d29a645979
+ checksums-append boot.ppc-unix.tgz sha1 815447275d6321f85b6c97e84aa223f6d710b516
}
platform i386 {
distfiles-append boot.x86-unix.tgz
checksums-append boot.x86-unix.tgz sha1 0e459e33f54811750a42311a22bc4572ab16ebcb
}
-post-patch {
- reinplace "s|__MACPORTS_CC__|${configure.cc}|" ${worksrcpath}/config/install.sh
-}
-
### extract ###
pre-extract {
file mkdir ${worksrcpath}
@@ -74,22 +71,34 @@
extract.only config.tgz
### patch ###
-patchfiles patch-install.sh.diff
+patchfiles patch-config__install.sh-correct-compiler.diff
+post-patch {
+ reinplace "s|@CC@|${configure.cc}|" ${worksrcpath}/config/install.sh
+ reinplace "s|@CPP@|${configure.cc}|" ${worksrcpath}/config/install.sh
+ reinplace "s|@CFLAGS@|${configure.cflags}|" ${worksrcpath}/config/install.sh
+ reinplace "s|@LDFLAGS@|${configure.ldflags}|" ${worksrcpath}/config/install.sh
+}
+
### configure ###
configure {
reinplace "s|SRCARCHIVEURL=.*|SRCARCHIVEURL=file://${distpath}|" \
${worksrcpath}/config/srcarchiveurl
-
- reinplace "s|#request|request|" ${worksrcpath}/config/targets
- reinplace "s|request ml-antlr-grm-ext|#request ml-antlr-grm-ext|" ${worksrcpath}/config/targets
- reinplace "s|request ml-lex-lex-ext|#request ml-lex-lex-ext|" ${worksrcpath}/config/targets
- reinplace "s|request ml-lex-mllex-tool|#request ml-lex-mllex-tool|" ${worksrcpath}/config/targets
+ reinplace "s|#request src-smlnj|request src-smlnj|" \
+ ${worksrcpath}/config/targets
+ reinplace "s|#request eXene|request eXene|" \
+ ${worksrcpath}/config/targets
+ reinplace "s|#request mlrisc-tools|request mlrisc-tools|" \
+ ${worksrcpath}/config/targets
+ reinplace "s|#request heap2asm |request heap2asm|" \
+ ${worksrcpath}/config/targets
}
### build ###
-build.env URLGETTER=curl
-build.cmd ${worksrcpath}/config/install.sh
+build.env URLGETTER=curl \
+ CC=${configure.cc} \
+ CPP=\"${configure.cc} -x assembler-with-cpp -E\"
+build.cmd ${worksrcpath}/config/install.sh
build.target
### destroot ###
Added: trunk/dports/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff
===================================================================
--- trunk/dports/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff (rev 0)
+++ trunk/dports/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff 2013-09-13 23:46:07 UTC (rev 111043)
@@ -0,0 +1,16 @@
+--- config/install.sh.orig 2013-09-14 01:10:48.000000000 +0200
++++ config/install.sh 2013-09-14 01:17:54.000000000 +0200
+@@ -337,6 +337,13 @@
+ else
+ "$CONFIGDIR"/unpack "$ROOT" runtime
+ cd "$BASEDIR"/runtime/objs
++ echo $this: Adjusting the build scripts to MacPorts requirements
++ /usr/bin/sed -E -i '.orig' \
++ -e 's|^CC[ ]*=[ ]*cc|CC = @CC@|g' \
++ -e 's|^CPP[ ]*=[ ]*cc|CPP = @CPP@|g' \
++ -e 's|^CFLAGS[ ]*=(.*)$|CFLAGS = \1 @CFLAGS@|g' \
++ -e 's|^LD_LIBS[ ]*=(.*)$|LD_LIBS = \1 @LDFLAGS@|g' \
++ mk.$ARCH-$OPSYS
+ echo $this: Compiling the run-time system.
+ $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
+ if [ -x run.$ARCH-$OPSYS ]; then
Deleted: trunk/dports/lang/smlnj/files/patch-install.sh.diff
===================================================================
--- trunk/dports/lang/smlnj/files/patch-install.sh.diff 2013-09-13 23:40:03 UTC (rev 111042)
+++ trunk/dports/lang/smlnj/files/patch-install.sh.diff 2013-09-13 23:46:07 UTC (rev 111043)
@@ -1,10 +0,0 @@
---- config/install.sh.orig 2007-06-12 12:43:58.000000000 -0400
-+++ config/install.sh 2009-03-30 13:45:46.000000000 -0400
-@@ -318,6 +318,7 @@
- else
- "$CONFIGDIR"/unpack "$ROOT" runtime
- cd "$BASEDIR"/runtime/objs
-+ /usr/bin/sed -i bak 's|cc |__MACPORTS_CC__ |' mk.$ARCH-$OPSYS
- echo $this: Compiling the run-time system.
- $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
- if [ -x run.$ARCH-$OPSYS ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130913/97f547d8/attachment.html>
More information about the macports-changes
mailing list