<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4a9c2e2d067fa9ee27ecffc03000f8b1cd108c6">https://github.com/macports/macports-ports/commit/a4a9c2e2d067fa9ee27ecffc03000f8b1cd108c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a4a9c2e2d067fa9ee27ecffc03000f8b1cd108c6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 1 10:00:32 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> boost: encapsulate ports into top-level boost dir
</span>---
_resources/port1.0/group/boost-1.0.tcl | 2 +-
devel/boost169/Portfile | 10 ++++++----
devel/boost171/Portfile | 2 +-
devel/boost176/Portfile | 2 +-
gis/mapnik/Portfile | 33 +++++++++++++++------------------
5 files changed, 24 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/boost-1.0.tcl b/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e55ba5b5e62..be2443c4453 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ proc boost::version_nodot {} {
</span>
proc boost::install_area {} {
global prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${prefix}/libexec/boost[boost::version_nodot]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix}/libexec/boost/boost[boost::version_nodot]
</span> }
proc boost::include_dir {} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost169/Portfile b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5c60342551..ecd963b089c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,8 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set bprefix ${prefix}/libexec/boost/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # patch-apple-clang-no-libcxx.diff fixes a clang configuration error
# that occurs on OS X 10.7 and 10.8 due to the assumption that if
# clang is the compiler in use it must be using libc++. Apple Clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +129,7 @@ configure.universal_args
</span>
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|-install_name \"|&${prefix}/libexec/${name}/lib/|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|-install_name \"|&${bprefix}/lib/|" \
</span> ${worksrcpath}/tools/build/src/tools/darwin.jam
set compileflags ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,7 +172,7 @@ destroot.cmd ${worksrcpath}/b2
</span> destroot.post_args
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args {*}${build.args} --prefix=${destroot}${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args {*}${build.args} --prefix=${destroot}${bprefix}
</span> system "find ${worksrcpath} -type f -name '*.gch' -exec rm {} \\;"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +295,7 @@ variant docs description {Enable building documentation} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete file {*}[glob ${destroot}${prefix}/libexec/${name}/include/boost/python/numpy*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete file {*}[glob ${destroot}${bprefix}/include/boost/python/numpy*]
</span> }
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,7 +327,7 @@ if {[mpi_variant_isset]} {
</span> xinstall -m 644 ${worksrcpath}/libs/mpi/build/__init__.py \
${destroot}${site_packages}/boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set f ${destroot}${prefix}/libexec/${name}/lib/mpi.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${destroot}${bprefix}/lib/mpi.so
</span> if {[info exists ${f}]} {
set l ${site_packages}/boost/mpi.so
move ${f} ${destroot}${l}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/Portfile b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 405354077ae..0abdcf48a6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ post-extract {
</span> }
# Install prefix for this port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set bprefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bprefix ${prefix}/libexec/boost/${name}
</span>
# patch-apple-clang-no-libcxx.diff fixes a clang configuration error
# that occurs on OS X 10.7 and 10.8 due to the assumption that if
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost176/Portfile b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 382529475ed..fd611541bde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ post-extract {
</span> }
# Install prefix for this port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set bprefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bprefix ${prefix}/libexec/boost/${name}
</span>
# patch-apple-clang-no-libcxx.diff fixes a clang configuration error
# that occurs on OS X 10.7 and 10.8 due to the assumption that if
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapnik/Portfile b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 636b458174f..97897ae14a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +36,13 @@ checksums rmd160 14ec14c48ab790c8c3a2d30d51f8dd23b4dcd470 \
</span> sha256 4b1352e01f7ce25ab099e586d7ae98e0b74145a3bf94dd365cb0a2bdab3b9dc2 \
size 10110103
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set boost_port boost169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set boost_path ${prefix}/libexec/boost/${boost_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${boost_port} \
</span> port:harfbuzz \
port:icu \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,13 +113,20 @@ configure.args CXX="\$CXX" \
</span> CPP_TESTS=False \
FREETYPE_CONFIG=${prefix}/bin/freetype-config \
PROJ_INCLUDES=${prefix}/lib/proj49/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PROJ_LIBS=${prefix}/lib/proj49/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ_LIBS=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOST_INCLUDES=${boost_path}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOST_LIBS=${boost_path}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach lib {BOOST ICU PNG JPEG TIFF CAIRO SQLITE HB WEBP} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append ${lib}_INCLUDES=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append ${lib}_LIBS=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach lib {ICU PNG JPEG TIFF CAIRO SQLITE HB WEBP} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${lib}_INCLUDES=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${lib}_LIBS=${prefix}/lib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid conflicts_build-append port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${boost_path}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${boost_path}/lib
</span> destroot.destdir
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,19 +147,6 @@ post-destroot {
</span> copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-replace port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost169
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-replace BOOST_INCLUDES=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOST_INCLUDES=${prefix}/libexec/boost169/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOST_LIBS=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOST_LIBS=${prefix}/libexec/boost169/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid conflicts_build-append port:boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-prepend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/libexec/boost169/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/libexec/boost169/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url http://mapnik.org/pages/downloads.html
livecheck.regex {mapnik-v(\d+(?:\.\d+)*)[.tz]}
</pre><pre style='margin:0'>
</pre>