[80975] trunk/dports/databases
jmr at macports.org
jmr at macports.org
Fri Jul 22 14:13:52 PDT 2011
Revision: 80975
http://trac.macports.org/changeset/80975
Author: jmr at macports.org
Date: 2011-07-22 14:13:51 -0700 (Fri, 22 Jul 2011)
Log Message:
-----------
Berkeley DB ports: change no_java variant to java, make java default on pre-Lion only, and change no_sql to sql
Modified Paths:
--------------
trunk/dports/databases/db46/Portfile
trunk/dports/databases/db47/Portfile
trunk/dports/databases/db48/Portfile
trunk/dports/databases/db51/Portfile
trunk/dports/databases/db52/Portfile
Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile 2011-07-22 21:07:43 UTC (rev 80974)
+++ trunk/dports/databases/db46/Portfile 2011-07-22 21:13:51 UTC (rev 80975)
@@ -58,7 +58,6 @@
configure.cmd ../dist/configure
configure.args --enable-cxx \
- --enable-java \
--includedir=\\\${prefix}/include/db46 \
--libdir=\\\${prefix}/lib/db46 \
--program-transform-name="s,^db,db46," \
@@ -82,9 +81,30 @@
}
}
-variant no_java description {don't build the Java API} {
- configure.args-delete --enable-java
+variant java conflicts no_java description {Build the Java API} {
+ configure.args-append --enable-java
+ platform macosx {
+ pre-configure {
+ if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+ ui_error "${name} requires the Java for Mac OS X development headers."
+ if {${os.major} == 10} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
+ } elseif {${os.major} == 9} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
+ } else {
+ ui_error "Make sure your Xcode installation is complete."
+ }
+ return -code error "missing Java headers"
+ }
+ }
+ }
}
+variant no_java conflicts java description {Legacy compatibility variant} {}
+if {[variant_isset no_java]} {
+ default_variants -java
+} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
+ default_variants +java
+}
variant tcl description {build Tcl API} {
depends_lib-append port:tcl
@@ -92,22 +112,6 @@
configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
-platform macosx {
- pre-configure {
- if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
- ui_error "${name} requires the Java for Mac OS X development headers."
- if {${os.major} == 10} {
- ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
- } elseif {${os.major} == 9} {
- ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
- } else {
- ui_error "Make sure your Xcode installation is complete."
- }
- return -code error "missing Java headers"
- }
- }
-}
-
if { [variant_isset universal] } {
if { ${os.arch}=="i386" } {
if { ${os.major} >= 10 } {
Modified: trunk/dports/databases/db47/Portfile
===================================================================
--- trunk/dports/databases/db47/Portfile 2011-07-22 21:07:43 UTC (rev 80974)
+++ trunk/dports/databases/db47/Portfile 2011-07-22 21:13:51 UTC (rev 80975)
@@ -63,7 +63,6 @@
configure.cmd ../dist/configure
configure.args \
--enable-cxx \
- --enable-java \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
@@ -81,31 +80,36 @@
}
}
-variant no_java description {don't build the Java API} {
- configure.args-delete --enable-java
+variant java conflicts no_java description {Build the Java API} {
+ configure.args-append --enable-java
+ platform macosx {
+ pre-configure {
+ if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+ ui_error "${name} requires the Java for Mac OS X development headers."
+ if {${os.major} == 10} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
+ } elseif {${os.major} == 9} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
+ } else {
+ ui_error "Make sure your Xcode installation is complete."
+ }
+ return -code error "missing Java headers"
+ }
+ }
+ }
}
+variant no_java conflicts java description {Legacy compatibility variant} {}
+if {[variant_isset no_java]} {
+ default_variants -java
+} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
+ default_variants +java
+}
variant tcl description {build Tcl API} {
depends_lib-append port:tcl
configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
-platform macosx {
- pre-configure {
- if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
- ui_error "${name} requires the Java for Mac OS X development headers."
- if {${os.major} == 10} {
- ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
- } elseif {${os.major} == 9} {
- ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
- } else {
- ui_error "Make sure your Xcode installation is complete."
- }
- return -code error "missing Java headers"
- }
- }
-}
-
if { [variant_isset universal] } {
if { ${os.arch}=="i386" } {
if { ${os.major} >= 10 } {
Modified: trunk/dports/databases/db48/Portfile
===================================================================
--- trunk/dports/databases/db48/Portfile 2011-07-22 21:07:43 UTC (rev 80974)
+++ trunk/dports/databases/db48/Portfile 2011-07-22 21:13:51 UTC (rev 80975)
@@ -61,7 +61,7 @@
variant no_java conflicts java description {Legacy compatibility variant} {}
if {[variant_isset no_java]} {
default_variants -java
-} elseif {${os.subplatform} == "macosx"} {
+} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
default_variants +java
}
Modified: trunk/dports/databases/db51/Portfile
===================================================================
--- trunk/dports/databases/db51/Portfile 2011-07-22 21:07:43 UTC (rev 80974)
+++ trunk/dports/databases/db51/Portfile 2011-07-22 21:13:51 UTC (rev 80975)
@@ -38,8 +38,6 @@
configure.cmd ../dist/configure
configure.args \
--enable-cxx \
- --enable-java \
- --enable-sql \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
@@ -61,13 +59,40 @@
}
}
-variant no_java description {don't build the Java API} {
- configure.args-delete --enable-java
+variant java conflicts no_java description {Build the Java API} {
+ configure.args-append --enable-java
+ platform macosx {
+ pre-configure {
+ if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+ ui_error "${name} requires the Java for Mac OS X development headers."
+ if {${os.major} == 10} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
+ } elseif {${os.major} == 9} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
+ } else {
+ ui_error "Make sure your Xcode installation is complete."
+ }
+ return -code error "missing Java headers"
+ }
+ }
+ }
}
+variant no_java conflicts java description {Legacy compatibility variant} {}
+if {[variant_isset no_java]} {
+ default_variants -java
+} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
+ default_variants +java
+}
-variant no_sql description {don't build the SQL API} {
- configure.args-delete --enable-sql
+variant sql conflicts no_sql description {Build the SQL API} {
+ configure.args-append --enable-sql
}
+variant no_sql conflicts sql description {Legacy compatibility variant} {}
+if {[variant_isset no_sql]} {
+ default_variants -sql
+} else {
+ default_variants +sql
+}
variant tcl description {build Tcl API} {
depends_lib-append port:tcl
Modified: trunk/dports/databases/db52/Portfile
===================================================================
--- trunk/dports/databases/db52/Portfile 2011-07-22 21:07:43 UTC (rev 80974)
+++ trunk/dports/databases/db52/Portfile 2011-07-22 21:13:51 UTC (rev 80975)
@@ -38,8 +38,6 @@
configure.cmd ../dist/configure
configure.args \
--enable-cxx \
- --enable-java \
- --enable-sql \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
@@ -61,13 +59,40 @@
}
}
-variant no_java description {don't build the Java API} {
- configure.args-delete --enable-java
+variant java conflicts no_java description {Build the Java API} {
+ configure.args-append --enable-java
+ platform macosx {
+ pre-configure {
+ if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+ ui_error "${name} requires the Java for Mac OS X development headers."
+ if {${os.major} == 10} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
+ } elseif {${os.major} == 9} {
+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
+ } else {
+ ui_error "Make sure your Xcode installation is complete."
+ }
+ return -code error "missing Java headers"
+ }
+ }
+ }
}
+variant no_java conflicts java description {Legacy compatibility variant} {}
+if {[variant_isset no_java]} {
+ default_variants -java
+} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
+ default_variants +java
+}
-variant no_sql description {don't build the SQL API} {
- configure.args-delete --enable-sql
+variant sql conflicts no_sql description {Build the SQL API} {
+ configure.args-append --enable-sql
}
+variant no_sql conflicts sql description {Legacy compatibility variant} {}
+if {[variant_isset no_sql]} {
+ default_variants -sql
+} else {
+ default_variants +sql
+}
variant tcl description {build Tcl API} {
depends_lib-append port:tcl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110722/6f93be82/attachment-0001.html>
More information about the macports-changes
mailing list