<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/34ffea56d67386ade0e9a381903c4a091abf7d60">https://github.com/macports/macports-ports/commit/34ffea56d67386ade0e9a381903c4a091abf7d60</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 34ffea56d67386ade0e9a381903c4a091abf7d60
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Feb 28 13:14:44 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> db48: move java and tcl bindings to subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use the java portgroup and fix other java build issues.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45826
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57743
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64470
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65831
</span>---
databases/db48/Portfile | 96 +++++++++++++++++++++++++++++++-----
databases/db48/files/java_vers.patch | 11 +++++
2 files changed, 95 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db48/Portfile b/databases/db48/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81454432556..9870d324827 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/db48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name db48
</span> # Increase the revision of p5-berkeleydb any time the db48 version changes.
# See https://trac.macports.org/ticket/56561
version 4.8.30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> set branch [join [lrange [split ${version} .] 0 1] {}]
categories databases
license Sleepycat
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,25 +57,97 @@ configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span>
destroot.args docdir=${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set newbin [regsub {^db_} ${bin} "db${branch}_"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/${bin} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/${newbin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newbin [regsub {^db_} ${bin} "db${branch}_"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/${bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${newbin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/doc/${name}/java
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant java description {Build the Java API} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport db48-java {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Java bindings for Berkeley DB, version 4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Java bindings for version 4.8 of the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Berkeley Data Base library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append java_vers.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 1.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${java.home}/include -I${java.home}/include/${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-append --enable-java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_ver 1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.platform} eq "darwin" && ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_ver 1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_ver 1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "JAVACFLAGS=-source ${java_ver} -target ${java_ver}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is no Java specific install target, so delete everything
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but the Java related files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install the docs into the main ports's doc directory so that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the link in index.html to java/index.html works.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tails -directory ${p}/share/doc/${name} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${f} ne "java"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/share/doc/${name}/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${name} ${p}/share/doc/${subport}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.subplatform} eq "macosx" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tails -directory ${p}/lib/${name} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${f} ne "db.jar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![string match libdb_java* ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/lib/${name}/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant tcl description {Build Tcl API} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport db48-tcl {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Tcl bindings for Berkeley DB, version 4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Tcl bindings for version 4.8 of the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Berkeley Data Base library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name} port:tcl
</span> configure.args-append --enable-tcl --with-tcl=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -tails -directory ${p}/lib/${name} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string match libdb_tcl* ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${p}/lib/${name}/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "The Java and Tcl bindings are now provided by the db48-java and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+db48-tcl subports."
</span> }
variant umrw description {Mask harmless uninitialized memory read/writes for the benefit of memory debuggers such as Valgrind} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db48/files/java_vers.patch b/databases/db48/files/java_vers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89e018abafa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db48/files/java_vers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/configure.orig 2023-02-28 12:05:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dist/configure 2023-02-28 12:10:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16915,7 +16915,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$JAVA_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$JAVA_VERSION" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 1.[3456789]* | 1.[1-9][0-9]* | [23456789]* ) ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 1.[3456789]* | 1.[1-9][0-9]* | [23456789]* | 1[0-9]* ) ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error "Java version 1.3 or higher required, got $JAVA_VERSION" "$LINENO" 5 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span></pre><pre style='margin:0'>
</pre>