<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/fd187a63833b1e1e48b085b80981790354e459bf">https://github.com/macports/macports-ports/commit/fd187a63833b1e1e48b085b80981790354e459bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fd187a63833b1e1e48b085b80981790354e459bf
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 1 11:13:53 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> mapnick: simplify via boost pg, and rev-bump
</span>---
gis/mapnik/Portfile | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
<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 97897ae14a9..7415a96b20a 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;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup boost 1.0
</span>
name mapnik
version 3.0.23
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories gis devel
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,14 +37,12 @@ checksums rmd160 14ec14c48ab790c8c3a2d30d51f8dd23b4dcd470 \
</span> sha256 4b1352e01f7ce25ab099e586d7ae98e0b74145a3bf94dd365cb0a2bdab3b9dc2 \
size 10110103
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set boost_port boost169
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set boost_path ${prefix}/libexec/boost/${boost_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.69
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:${boost_port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:harfbuzz \
</span> port:icu \
port:libpng \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,20 +112,13 @@ 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:#ffe0e0;'>- BOOST_INCLUDES=${boost_path}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOST_LIBS=${boost_path}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ_LIBS=${prefix}/lib/proj49/lib
</span>
foreach lib {ICU PNG JPEG TIFF CAIRO SQLITE HB WEBP} {
configure.args-append ${lib}_INCLUDES=${prefix}/include \
${lib}_LIBS=${prefix}/lib
}
<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${boost_path}/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${boost_path}/lib
</span> destroot.destdir
pre-configure {
</pre><pre style='margin:0'>
</pre>