<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch apr-util
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b0c6379ebe8b03a6d1d49f51c95f1c293a23508e">https://github.com/macports/macports-ports/commit/b0c6379ebe8b03a6d1d49f51c95f1c293a23508e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b0c6379ebe8b03a6d1d49f51c95f1c293a23508e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Dec 3 07:39:22 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> apr-util, mod_qos: use Berkeley db48, add mode line
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/57707
</span>---
devel/apr-util/Portfile | 14 ++++++++------
www/mod_qos/Portfile | 5 +++--
2 files changed, 11 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apr-util/Portfile b/devel/apr-util/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ec8f1a..79bd640 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apr-util/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apr-util/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name apr-util
version 1.6.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel
maintainers {geeklair.net:dluke @danielluke}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +24,13 @@ checksums md5 8ff5dc36fa39a2a3db1df196d3ed6086 \
</span> size 428595
depends_lib port:apr port:expat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv port:db46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv port:db48 \
</span> port:sqlite3
use_parallel_build yes
configure.ccache no
configure.args --with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db48 \
</span> --without-mysql --without-pgsql --without-sqlite2 --with-sqlite3=${prefix} \
--without-odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +43,8 @@ pre-test {
</span>
variant no_bdb description {Build without BerkeleyDB support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:db46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-berkeley-db=${prefix}/include:${prefix}/lib/db46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-berkeley-db=${prefix}/include:${prefix}/lib/db48
</span> configure.args-append --without-berkeley-db
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +62,7 @@ variant openldap description {Build with OpenLDAP support} {
</span> --with-ldap-lib=${prefix}/lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set extralibs "-L${prefix}/lib/db46"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set extralibs "-L${prefix}/lib/db48"
</span>
pre-configure {
reinplace "s|^Libs: |Libs: ${extralibs} |" $worksrcpath/apr-util.pc.in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/mod_qos/Portfile b/www/mod_qos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8972b54..27df89c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/mod_qos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/mod_qos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name mod_qos
version 11.59
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories www
license Apache-2
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +23,7 @@ depends_build port:autoconf \
</span> port:automake
depends_lib port:apache2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 \
</span> port:libpng \
path:lib/libssl.dylib:openssl \
port:pcre
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +31,7 @@ depends_lib port:apache2 \
</span> patchfiles patch-tools-Makefile.in.diff
configure.dir ${worksrcpath}/tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LDFLAGS=-L${prefix}/lib/db46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env LDFLAGS=-L${prefix}/lib/db48
</span> build.dir ${configure.dir}
pre-configure { copy ${filespath}/aclocal.m4 ${worksrcpath}/tools }
</pre><pre style='margin:0'>
</pre>