Revision: 93980 https://trac.macports.org/changeset/93980 Author: ryandesign@macports.org Date: 2012-06-05 21:30:02 -0700 (Tue, 05 Jun 2012) Log Message: ----------- pure, pure-docs: update to 0.55; use llvm 3.1 Modified Paths: -------------- trunk/dports/lang/pure/Portfile trunk/dports/lang/pure-docs/Portfile trunk/dports/lang/pure-docs/files/patch-openbrowser.diff Removed Paths: ------------- trunk/dports/lang/pure/files/patch-interpreter.cc.diff Modified: trunk/dports/lang/pure/Portfile =================================================================== --- trunk/dports/lang/pure/Portfile 2012-06-06 04:05:04 UTC (rev 93979) +++ trunk/dports/lang/pure/Portfile 2012-06-06 04:30:02 UTC (rev 93980) @@ -5,7 +5,7 @@ name pure # Keep the versions of pure and pure-docs in sync. -version 0.54 +version 0.55 categories lang platforms darwin maintainers ryandesign @@ -29,12 +29,12 @@ are licensed under LGPL-3, the interpreter is GPL-3, \ and the examples are BSD-licensed. -checksums rmd160 900c1564793047276d2bae784b47e493da8d6efe \ - sha256 ca09b655e09312912fb626d00b828d713fdccbb12caf532512330bbf643efb7e +checksums rmd160 39b758f5ae081b50c79fb4de13f99e17872cbb53 \ + sha256 36dbf1b77719a8031766b30812ac89102188d01ae9da80c2b53889f501cb58a7 livecheck.type none -set llvm_version 3.0 +set llvm_version 3.1 set llvm_prefix ${prefix}/libexec/llvm-${llvm_version} configure.env PATH=${llvm_prefix}/bin:$env(PATH) @@ -48,16 +48,11 @@ depends_run path:bin/w3m:w3m - patchfiles patch-interpreter.cc.diff - - post-patch { - reinplace "s|@LLVM_PREFIX@|${llvm_prefix}|g" ${worksrcpath}/interpreter.cc - } - # llvm-${llvm_version} is not universal universal_variant no - configure.args --without-elisp + configure.args --without-elisp \ + --with-tool-prefix=${llvm_prefix}/bin/ # Prevent build failure when old llvm port is installed configure.cppflags -I${llvm_prefix}/include ${configure.cppflags} Deleted: trunk/dports/lang/pure/files/patch-interpreter.cc.diff =================================================================== --- trunk/dports/lang/pure/files/patch-interpreter.cc.diff 2012-06-06 04:05:04 UTC (rev 93979) +++ trunk/dports/lang/pure/files/patch-interpreter.cc.diff 2012-06-06 04:30:02 UTC (rev 93980) @@ -1,13 +0,0 @@ ---- interpreter.cc.orig 2012-05-19 00:05:31.000000000 -0500 -+++ interpreter.cc 2012-05-22 18:30:16.000000000 -0500 -@@ -10580,8 +10580,8 @@ - // The -disable-cfi seems to be needed on OSX as of LLVM 3.0. - custom_opts = "-disable-cfi "; - #endif -- string cmd = "opt -f -std-compile-opts "+quote(target)+ -- " | llc "+custom_opts+string(pic?"-relocation-model=pic ":"")+ -+ string cmd = "@LLVM_PREFIX@/bin/opt -f -std-compile-opts "+quote(target)+ -+ " | @LLVM_PREFIX@/bin/llc "+custom_opts+string(pic?"-relocation-model=pic ":"")+ - "-o "+quote(asmfile); - if (vflag) std::cerr << cmd << '\n'; - unlink(asmfile.c_str()); Modified: trunk/dports/lang/pure-docs/Portfile =================================================================== --- trunk/dports/lang/pure-docs/Portfile 2012-06-06 04:05:04 UTC (rev 93979) +++ trunk/dports/lang/pure-docs/Portfile 2012-06-06 04:30:02 UTC (rev 93980) @@ -5,7 +5,7 @@ PortGroup pure 1.0 # Keep the versions of pure and pure-docs in sync. -pure.setup docs 0.54 +pure.setup docs 0.55 categories lang platforms darwin maintainers ryandesign @@ -17,8 +17,8 @@ long_description ${name} is the set of ${description}. -checksums rmd160 07808fba115b2574c74e693aace9ed72b3e7f4c2 \ - sha256 1d1d52fbe8b5c7fb1ec26b6afef003884640b0d9c71eb4f0cafe0875a0ca19ef +checksums rmd160 7f618b99d914d5d62ea70fd1cc5575f6ac4e7e5e \ + sha256 2cd0045c8fd126cf41cb847f2842e11b7c0480c8cb8d5ea33470cf7edcfd1db9 platform macosx { patchfiles patch-openbrowser.diff Modified: trunk/dports/lang/pure-docs/files/patch-openbrowser.diff =================================================================== --- trunk/dports/lang/pure-docs/files/patch-openbrowser.diff 2012-06-06 04:05:04 UTC (rev 93979) +++ trunk/dports/lang/pure-docs/files/patch-openbrowser.diff 2012-06-06 04:30:02 UTC (rev 93980) @@ -1,5 +1,5 @@ ---- _sources/pure.txt.orig 2012-03-22 14:12:46.000000000 -0500 -+++ _sources/pure.txt 2012-03-22 18:50:42.000000000 -0500 +--- _sources/pure.txt.orig 2012-06-04 09:31:56.000000000 -0500 ++++ _sources/pure.txt 2012-06-05 23:07:47.000000000 -0500 @@ -1075,7 +1075,7 @@ .. envvar:: PURE_HELP @@ -9,7 +9,7 @@ .. envvar:: PURE_INCLUDE -@@ -7040,9 +7040,9 @@ +@@ -7026,9 +7026,9 @@ manuals of the addon modules available from the Pure website. You need to have a html browser installed to make this work. By default, the @@ -22,8 +22,8 @@ When invoked without arguments, the ``help`` command displays an overview of the available documentation, from which you can follow the links to the ---- pure.html.orig 2012-03-22 14:13:06.000000000 -0500 -+++ pure.html 2012-03-22 18:50:42.000000000 -0500 +--- pure.html.orig 2012-06-04 09:31:56.000000000 -0500 ++++ pure.html 2012-06-05 23:07:47.000000000 -0500 @@ -1290,7 +1290,7 @@ <dt id="envvar-PURE_HELP"> <tt class="descname">PURE_HELP</tt><a class="headerlink" href="#envvar-PURE_HELP" title="Permalink to this definition">¶</a></dt> @@ -33,7 +33,7 @@ </dd></dl> <dl class="envvar"> -@@ -7062,7 +7062,7 @@ +@@ -7046,7 +7046,7 @@ format; this includes the present manual, the <a class="reference internal" href="purelib.html"><em>Pure Library Manual</em></a>, as well as all manuals of the addon modules available from the Pure website.</p> <p>You need to have a html browser installed to make this work. By default, the