<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/3e962934b4503ee4200d1035af852d12ef4d70af">https://github.com/macports/macports-ports/commit/3e962934b4503ee4200d1035af852d12ef4d70af</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3e962934b4503ee4200d1035af852d12ef4d70af
</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, subversion: 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><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> subversion: use db48
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> subversion-bindings: use db48
</span>---
devel/apr-util/Portfile | 14 ++++++++------
devel/subversion-javahlbindings/Portfile | 9 +++++----
devel/subversion-perlbindings/Portfile | 9 +++++----
devel/subversion-python27bindings/Portfile | 9 +++++----
devel/subversion-rubybindings/Portfile | 9 +++++----
devel/subversion/Portfile | 9 +++++----
www/mod_qos/Portfile | 5 +++--
7 files changed, 36 insertions(+), 28 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/devel/subversion-javahlbindings/Portfile b/devel/subversion-javahlbindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa2212f..2a8dfbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-javahlbindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-javahlbindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name subversion-javahlbindings
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel java
platforms darwin
maintainers {geeklair.net:dluke @danielluke} {blair @blair}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +28,7 @@ depends_build port:junit
</span>
depends_lib port:expat \
port:apr port:apr-util \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 port:subversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 port:subversion \
</span> port:sqlite3 port:gettext \
port:libiconv port:serf1 \
port:cyrus-sasl2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,7 @@ depends_lib port:expat \
</span> port:zlib port:libutf8proc \
port:lz4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
</span> --with-apr=${prefix}/bin/apr-1-config \
--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
--mandir=\\\${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,8 +86,8 @@ platform darwin 9 { pre-fetch {
</span> }
variant no_bdb description {Build without support for BerkeleyDB repositories} {
<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/db46:${prefix}/lib/db46:db-4.6
</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/db48:${prefix}/lib/db48:db-4.8
</span> configure.args-append --without-berkeley-db
}
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion-perlbindings/Portfile b/devel/subversion-perlbindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74b6242..28b3d0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-perlbindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-perlbindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@ PortSystem 1.0
</span>
name subversion-perlbindings
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel perl
platforms darwin
maintainers {geeklair.net:dluke @danielluke} {blair @blair}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +65,7 @@ if {${subport} eq ${name}} {
</span> depends_lib port:apr \
port:apr-util \
port:cyrus-sasl2 \
<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:expat \
port:gettext \
port:libcomerr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +81,7 @@ if {${subport} eq ${name}} {
</span>
depends_build port:swig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
</span> --with-apr=${prefix}/bin/apr-1-config \
--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
--mandir=\\\${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,8 +110,8 @@ if {${subport} eq ${name}} {
</span> }
variant no_bdb description {Build without support for BerkeleyDB repositories} {
<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/db46:${prefix}/lib/db46:db-4.6
</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/db48:${prefix}/lib/db48:db-4.8
</span> configure.args-append --without-berkeley-db
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion-python27bindings/Portfile b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bb9baeb..83679b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name subversion-python27bindings
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel python
platforms darwin
maintainers {geeklair.net:dluke @danielluke} {blair @blair}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,7 @@ dist_subdir subversion
</span>
depends_lib port:expat \
port:apr port:apr-util \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 port:subversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 port:subversion \
</span> port:python27 \
port:sqlite3 \
port:gettext port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +44,7 @@ post-patch {
</span> ${worksrcpath}/subversion/bindings/swig/python/libsvn_swig_py27
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
</span> --with-apr=${prefix}/bin/apr-1-config \
--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
--mandir=\\\${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,8 +86,8 @@ post-configure { reinplace "s|need_relink=yes|need_relink=no|g" \
</span> }
variant no_bdb description {Build without support for BerkeleyDB repositories} {
<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/db46:${prefix}/lib/db46:db-4.6
</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/db48:${prefix}/lib/db48:db-4.8
</span> configure.args-append --without-berkeley-db
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion-rubybindings/Portfile b/devel/subversion-rubybindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e181470..96b229e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-rubybindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-rubybindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name subversion-rubybindings
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel ruby
platforms darwin
maintainers {geeklair.net:dluke @danielluke} {blair @blair}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,7 @@ test.target check-swig-rb
</span>
depends_lib port:expat \
port:apr port:apr-util \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 port:subversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 port:subversion \
</span> port:ruby port:sqlite3 \
port:gettext port:libiconv \
port:serf1 port:cyrus-sasl2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +40,7 @@ depends_lib port:expat \
</span> depends_build port:swig
configure.env RUBY=${prefix}/bin/ruby1.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
</span> --with-apr=${prefix}/bin/apr-1-config \
--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
--mandir=\\\${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,8 +73,8 @@ post-configure { reinplace "s|need_relink=yes|need_relink=no|g" \
</span> }
variant no_bdb description {Build without support for BerkeleyDB repositories} {
<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/db46:${prefix}/lib/db46:db-4.6
</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/db48:${prefix}/lib/db48:db-4.8
</span> configure.args-append --without-berkeley-db
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/Portfile b/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2de6896..041592a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name subversion
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
maintainers {geeklair.net:dluke @danielluke} {blair @blair}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +22,7 @@ checksums rmd160 42ce62a35220ad0345d7994f8db35f42c47c0b1f \
</span>
depends_lib port:expat \
port:apr port:apr-util \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 port:sqlite3 \
</span> port:gettext port:libiconv \
port:serf1 port:cyrus-sasl2 \
port:libmagic port:libcomerr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +40,7 @@ patchfiles config_impl.h.patch
</span> post-patch { reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/subversion/libsvn_subr/config_impl.h
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
</span> --with-apr=${prefix}/bin/apr-1-config \
--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
--mandir=\\\${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,8 +99,8 @@ variant mod_dav_svn description {Install the subversion apache module (mod_dav_
</span> }
variant no_bdb description {Build without support for BerkeleyDB repositories} {
<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/db46:${prefix}/lib/db46:db-4.6
</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/db48:${prefix}/lib/db48:db-4.8
</span> configure.args-append --without-berkeley-db
}
<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>