<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e08962ba955d1743b6ac30a46dbef3ec922a7d5">https://github.com/macports/macports-ports/commit/8e08962ba955d1743b6ac30a46dbef3ec922a7d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8e08962 libcxx-bootstrap ports: don't change prefix
</span>8e08962 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e08962ba955d1743b6ac30a46dbef3ec922a7d5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Oct 7 15:23:44 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> libcxx-bootstrap ports: don't change prefix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> That prevents archives from being used (sigh).
</span>---
archivers/xz/Portfile | 10 +++++++---
devel/gettext/Portfile | 26 ++++++++++++++++---------
devel/gperf/Portfile | 7 ++++---
devel/icu/Portfile | 2 +-
devel/ncurses/Portfile | 19 +++++++++++--------
devel/pkgconfig/Portfile | 20 +++++++++++++-------
lang/python27/Portfile | 47 +++++++++++++++++++++++++++-------------------
textproc/libiconv/Portfile | 15 ++++++++++-----
textproc/libxml2/Portfile | 22 ++++++++++++----------
9 files changed, 103 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xz/Portfile b/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1671c6..87d6108 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,15 @@ checksums rmd160 0c5a6ffd47d657fed0c7192f413422e503b79c69 \
</span>
depends_lib port:libiconv port:gettext
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${my_prefix}
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap \
port:gettext port:gettext-bootstrap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${my_prefix}/lib
</span> # Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,13 +49,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span>
patchfiles c89.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-libiconv-prefix=${my_prefix} --with-libintl-prefix=${my_prefix}
</span>
# document that we always need legacy symlinks now that "lzmautils" refers here
configure.args-append --enable-lzma-links
# the internal "check.h" header conflicts with port check's <check.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags -I${worksrcpath}/src/liblzma/check -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags -I${worksrcpath}/src/liblzma/check -I${my_prefix}/include
</span>
livecheck.url ${homepage}
livecheck.regex xz-(\[0-9.a-z\]*)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gettext/Portfile b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1459a1c..b12fa5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +49,21 @@ post-patch {
</span> depends_lib port:libiconv \
port:ncurses
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set myprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set mypath $env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags -no-cpp-precomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${myprefix}
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap \
port:ncurses port:ncurses-bootstrap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mypath ${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${mypath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${myprefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${myprefix}/lib
</span> configure.cxx_stdlib libstdc++
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +72,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PATH=${localbindir}:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags -no-cpp-precomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PATH=${localbindir}:${mypath}
</span>
configure.args ac_cv_prog_AWK=/usr/bin/awk \
ac_cv_path_GREP=/usr/bin/grep \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,11 +100,11 @@ test.run yes
</span> test.target check
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/lib/charset.alias]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${myprefix}/lib/charset.alias]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${myprefix}/lib/charset.alias
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/share/locale/locale.alias]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/locale/locale.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${myprefix}/share/locale/locale.alias]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${myprefix}/share/locale/locale.alias
</span> }
xinstall -m 644 -W ${worksrcpath} \
AUTHORS \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +116,7 @@ post-destroot {
</span> NEWS \
README \
THANKS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${myprefix}/share/doc/${name}
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperf/Portfile b/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 228d9cd..1c125f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,12 @@ checksums md5 9e251c0a618ad0824b51117d5d9db87e \
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --infodir=${prefix}/share/info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --infodir=${prefix}/libexec/libcxx-bootstrap/share/info
</span> configure.cxx_stdlib libstdc++
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +37,5 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --infodir=${prefix}/share/info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4dbaa10..2906770 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ checksums rmd160 df06e7b18a87e383d3762564f2e9a59fd75865f9 \
</span>
# This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${prefix}/libexec/libcxx-bootstrap
</span> configure.cxx_stdlib libstdc++
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ncurses/Portfile b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe0789e..84373e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ncurses/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,12 @@ checksums rmd160 938235f3922f9c6ef0f1081d643ecb2da1347a17 \
</span> # hex.diff from https://opensource.apple.com/source/ncurses/ncurses-44/patches.applied/
patchfiles hex.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set myprefix $prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${myprefix}
</span> configure.cxx_stdlib libstdc++
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +48,7 @@ configure.args --enable-widec \
</span> --without-ada \
--with-manpage-format=normal \
--enable-pc-files \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pkg-config-libdir="${prefix}/lib/pkgconfig" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pkg-config-libdir="${myprefix}/lib/pkgconfig" \
</span> --disable-mixed-case
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,13 +66,13 @@ if {[variant_isset universal]} {
</span> post-destroot {
set major [lindex [split $version .] 0]
foreach f {form menu ncurses ncurses++ panel} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.${major}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s lib${f}.a ${destroot}${prefix}/lib/lib${f}w.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${f}.pc ${destroot}${prefix}/lib/pkgconfig/${f}w.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.${major}.dylib ${destroot}${myprefix}/lib/lib${f}w.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.${major}.dylib ${destroot}${myprefix}/lib/lib${f}w.${major}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib${f}.a ${destroot}${myprefix}/lib/lib${f}w.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${f}.pc ${destroot}${myprefix}/lib/pkgconfig/${f}w.pc
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libncurses.${major}.dylib ${destroot}${prefix}/lib/libtermcap.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ncurses6-config ${destroot}${prefix}/bin/ncursesw6-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libncurses.${major}.dylib ${destroot}${myprefix}/lib/libtermcap.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ncurses6-config ${destroot}${myprefix}/bin/ncursesw6-config
</span> }
livecheck.regex ${name}-(\[\\d.-\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/pkgconfig/Portfile b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 207f26a..0b9f062 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,19 @@ depends_lib port:libiconv
</span> patchfiles patch-glib-configure.diff \
patch-glib-glib-gmessages.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set myprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${myprefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${myprefix}
</span> depends_lib-replace port:libiconv port:libiconv-bootstrap
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${myprefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${myprefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${myprefix}/bin:$env(PATH)
</span> # Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +52,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-silent-rules \
--disable-host-tool \
--with-internal-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,12 +59,12 @@ configure.args --disable-silent-rules \
</span>
if {$subport eq "${name}-bootstrap"} {
# search bootstrap prefix and then normal prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${stdprefix}/lib/pkgconfig:${stdprefix}/share/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pc-path=${myprefix}/lib/pkgconfig:${myprefix}/share/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
</span> } else {
configure.args-append --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PKG_CONFIG=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PKG_CONFIG=false
</span>
post-configure {
system "ed - ${worksrcpath}/glib/config.h < ${filespath}/glib-config.h.ed"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +73,7 @@ post-configure {
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/lib/pkgconfig ${destroot}${prefix}/share/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${myprefix}/lib/pkgconfig ${destroot}${myprefix}/share/pkgconfig
</span>
post-destroot {
xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5b6465..f5c085b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,15 +55,19 @@ depends_lib port:bzip2 \
</span> depends_run port:python_select \
port:python2_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_applications ${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_frameworks ${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set frameworks_dir ${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set applications_dir ${prefix}/Applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${stdprefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${stdprefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${my_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_frameworks ${my_prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_applications ${my_prefix}/Applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span> configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
patchfiles-delete patch-libedit.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,33 +82,33 @@ subport ${name}-bootstrap {
</span> use_xz no
depends_extract port:xz-bootstrap
extract.suffix .tar.xz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.cmd ${prefix}/bin/xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.cmd ${my_prefix}/bin/xz
</span> }
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-framework=${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-framework=${my_frameworks} \
</span> --enable-ipv6 \
--with-system-expat \
--with-system-ffi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${my_prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${my_prefix}/lib/db48
</span>
configure.ccache no
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${my_prefix}|g" \
</span> ${worksrcpath}/Lib/cgi.py \
${worksrcpath}/Lib/ctypes/macholib/dyld.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@APPLICATIONS_DIR@@|${my_applications}|" \
</span> ${worksrcpath}/configure
}
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s;/* #undef PY_FORMAT_LONG_LONG */;#define PY_FORMAT_LONG_LONG \"ll\";" pyconfig.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s;/* #undef PY_FORMAT_LONG_LONG */;#define PY_FORMAT_LONG_LONG \"ll\";" ${worksrcpath}/pyconfig.h
</span> }
build.target all
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +118,7 @@ test.target test
</span>
destroot.target frameworkinstall maninstall
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span> set pythonNoDot python[string map {. {}} $branch]
select.entries [list python python-$pythonNoDot $pythonNoDot] \
[list python2 python2-$pythonNoDot $pythonNoDot]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,9 +130,10 @@ the 'python' or 'python2' commands), run one or both of:
</span> sudo port select --set python $pythonNoDot
sudo port select --set python2 $pythonNoDot
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewpath ${my_frameworks}/Python.framework
</span> set framewdir ${framewpath}/Versions/${branch}
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,9 +162,12 @@ platform darwin {
</span> file delete ${destroot}${framewpath}/${dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${my_prefix}/share/man/man1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${my_prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${my_prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/Python ${destroot}${my_prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${my_prefix}/lib/pkgconfig/
</span>
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +185,7 @@ platform darwin {
</span>
post-destroot {
foreach unversionedFile {2to3 2to3-2 idle idle2 pydoc pydoc2 python python2 python-config python2-config pythonw pythonw2 smtpd.py smtpd2.py} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin/${unversionedFile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${my_prefix}/bin/${unversionedFile}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libiconv/Portfile b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2606a4f..adda083 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libiconv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,15 @@ patchfiles \
</span> patch-src-Makefile.in-darwin.diff \
patch-c99.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set myprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-replace port:gperf port:gperf-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${myprefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-replace port:gperf port:gperf-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${myprefix}/bin:$env(PATH)
</span> # Avoid macports-clang dep (doesn't use C++ anyway)
configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +58,7 @@ configure.args \
</span> ac_cv_path_GREP=/usr/bin/grep \
ac_cv_path_SED=/usr/bin/sed \
--enable-static \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --docdir=${prefix}/share/doc/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --docdir=${myprefix}/share/doc/${name} \
</span> --without-libiconv-prefix \
--without-libintl-prefix \
--disable-nls \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +78,8 @@ platform freebsd {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/lib/charset.alias]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${myprefix}/lib/charset.alias]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${myprefix}/lib/charset.alias
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/Portfile b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d87db3..fa36957 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,15 @@ checksums rmd160 a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21 \
</span> sha256 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 \
size 5476717
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${stdprefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${stdprefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args --prefix=${my_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span> configure.cxx_stdlib
depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
depends_lib-replace port:libiconv port:libiconv-bootstrap \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,8 +58,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> patchfiles-append include.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|/etc|${prefix}/etc|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${my_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|/etc|${my_prefix}/etc|g" \
</span> ${worksrcpath}/catalog.c \
${worksrcpath}/runtest.c \
${worksrcpath}/xmlcatalog.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +76,10 @@ configure.args --disable-silent-rules \
</span> --with-icu \
--without-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${my_prefix}/etc/xml
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/include/unicode ${destroot}${prefix}/include/libxml2/unicode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${my_prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${my_prefix}/include/unicode ${destroot}${my_prefix}/include/libxml2/unicode
</span> }
test.run yes
</pre><pre style='margin:0'>
</pre>