New Ticket     Tickets     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Changeset 80975


Ignore:
Timestamp:
07/22/11 14:13:51 (4 years ago)
Author:
jmr@…
Message:

Berkeley DB ports: change no_java variant to java, make java default on pre-Lion only, and change no_sql to sql

Location:
trunk/dports/databases
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/databases/db46/Portfile

    r80500 r80975  
    5959configure.cmd           ../dist/configure 
    6060configure.args          --enable-cxx \ 
    61                                 --enable-java \ 
    6261                                --includedir=\\\${prefix}/include/db46 \ 
    6362                                --libdir=\\\${prefix}/lib/db46 \ 
    … …  
    8382} 
    8483 
    85 variant no_java description {don't build the Java API} { 
    86         configure.args-delete   --enable-java 
     84variant java conflicts no_java description {Build the Java API} { 
     85    configure.args-append  --enable-java 
     86    platform macosx { 
     87        pre-configure { 
     88            if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} { 
     89                ui_error "${name} requires the Java for Mac OS X development headers." 
     90                if {${os.major} == 10} { 
     91                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
     92                } elseif {${os.major} == 9} { 
     93                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
     94                } else { 
     95                    ui_error "Make sure your Xcode installation is complete." 
     96                } 
     97                return -code error "missing Java headers" 
     98            } 
     99        } 
     100    } 
     101} 
     102variant no_java conflicts java description {Legacy compatibility variant} {} 
     103if {[variant_isset no_java]} { 
     104    default_variants -java 
     105} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} { 
     106    default_variants +java 
    87107} 
    88108 
    … …  
    91111        configure.args-delete   --disable-tcl 
    92112        configure.args-append   --enable-tcl --with-tcl=${prefix}/lib 
    93 } 
    94  
    95 platform macosx { 
    96     pre-configure { 
    97         if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} { 
    98             ui_error "${name} requires the Java for Mac OS X development headers." 
    99             if {${os.major} == 10} { 
    100                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
    101             } elseif {${os.major} == 9} { 
    102                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
    103             } else { 
    104                 ui_error "Make sure your Xcode installation is complete." 
    105             } 
    106             return -code error "missing Java headers" 
    107         } 
    108     } 
    109113} 
    110114 

  • trunk/dports/databases/db47/Portfile

    r80500 r80975  
    6464configure.args          \ 
    6565    --enable-cxx \ 
    66     --enable-java \ 
    6766    --includedir=\\\${prefix}/include/db${branch} \ 
    6867    --libdir=\\\${prefix}/lib/db${branch} 
    … …  
    8281} 
    8382 
    84 variant no_java description {don't build the Java API} { 
    85     configure.args-delete  --enable-java 
     83variant java conflicts no_java description {Build the Java API} { 
     84    configure.args-append  --enable-java 
     85    platform macosx { 
     86        pre-configure { 
     87            if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} { 
     88                ui_error "${name} requires the Java for Mac OS X development headers." 
     89                if {${os.major} == 10} { 
     90                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
     91                } elseif {${os.major} == 9} { 
     92                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
     93                } else { 
     94                    ui_error "Make sure your Xcode installation is complete." 
     95                } 
     96                return -code error "missing Java headers" 
     97            } 
     98        } 
     99    } 
     100} 
     101variant no_java conflicts java description {Legacy compatibility variant} {} 
     102if {[variant_isset no_java]} { 
     103    default_variants -java 
     104} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} { 
     105    default_variants +java 
    86106} 
    87107 
    … …  
    89109    depends_lib-append     port:tcl 
    90110    configure.args-append  --enable-tcl --with-tcl=${prefix}/lib 
    91 } 
    92  
    93 platform macosx { 
    94     pre-configure { 
    95         if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} { 
    96             ui_error "${name} requires the Java for Mac OS X development headers." 
    97             if {${os.major} == 10} { 
    98                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
    99             } elseif {${os.major} == 9} { 
    100                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
    101             } else { 
    102                 ui_error "Make sure your Xcode installation is complete." 
    103             } 
    104             return -code error "missing Java headers" 
    105         } 
    106     } 
    107111} 
    108112 

  • trunk/dports/databases/db48/Portfile

    r78825 r80975  
    6262if {[variant_isset no_java]} { 
    6363    default_variants -java 
    64 } elseif {${os.subplatform} == "macosx"} { 
     64} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} { 
    6565    default_variants +java 
    6666} 

  • trunk/dports/databases/db51/Portfile

    r79921 r80975  
    3939configure.args          \ 
    4040    --enable-cxx \ 
    41     --enable-java \ 
    42     --enable-sql \ 
    4341    --includedir=\\\${prefix}/include/db${branch} \ 
    4442    --libdir=\\\${prefix}/lib/db${branch} 
    … …  
    6260} 
    6361 
    64 variant no_java description {don't build the Java API} { 
    65     configure.args-delete  --enable-java 
     62variant java conflicts no_java description {Build the Java API} { 
     63    configure.args-append  --enable-java 
     64    platform macosx { 
     65        pre-configure { 
     66            if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} { 
     67                ui_error "${name} requires the Java for Mac OS X development headers." 
     68                if {${os.major} == 10} { 
     69                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
     70                } elseif {${os.major} == 9} { 
     71                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
     72                } else { 
     73                    ui_error "Make sure your Xcode installation is complete." 
     74                } 
     75                return -code error "missing Java headers" 
     76            } 
     77        } 
     78    } 
     79} 
     80variant no_java conflicts java description {Legacy compatibility variant} {} 
     81if {[variant_isset no_java]} { 
     82    default_variants -java 
     83} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} { 
     84    default_variants +java 
    6685} 
    6786 
    68 variant no_sql description {don't build the SQL API} { 
    69     configure.args-delete  --enable-sql 
     87variant sql conflicts no_sql description {Build the SQL API} { 
     88    configure.args-append  --enable-sql 
     89} 
     90variant no_sql conflicts sql description {Legacy compatibility variant} {} 
     91if {[variant_isset no_sql]} { 
     92    default_variants -sql 
     93} else { 
     94    default_variants +sql 
    7095} 
    7196 

  • trunk/dports/databases/db52/Portfile

    r79922 r80975  
    3939configure.args          \ 
    4040    --enable-cxx \ 
    41     --enable-java \ 
    42     --enable-sql \ 
    4341    --includedir=\\\${prefix}/include/db${branch} \ 
    4442    --libdir=\\\${prefix}/lib/db${branch} 
    … …  
    6260} 
    6361 
    64 variant no_java description {don't build the Java API} { 
    65     configure.args-delete  --enable-java 
     62variant java conflicts no_java description {Build the Java API} { 
     63    configure.args-append  --enable-java 
     64    platform macosx { 
     65        pre-configure { 
     66            if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} { 
     67                ui_error "${name} requires the Java for Mac OS X development headers." 
     68                if {${os.major} == 10} { 
     69                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>" 
     70                } elseif {${os.major} == 9} { 
     71                    ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>" 
     72                } else { 
     73                    ui_error "Make sure your Xcode installation is complete." 
     74                } 
     75                return -code error "missing Java headers" 
     76            } 
     77        } 
     78    } 
     79} 
     80variant no_java conflicts java description {Legacy compatibility variant} {} 
     81if {[variant_isset no_java]} { 
     82    default_variants -java 
     83} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} { 
     84    default_variants +java 
    6685} 
    6786 
    68 variant no_sql description {don't build the SQL API} { 
    69     configure.args-delete  --enable-sql 
     87variant sql conflicts no_sql description {Build the SQL API} { 
     88    configure.args-append  --enable-sql 
     89} 
     90variant no_sql conflicts sql description {Legacy compatibility variant} {} 
     91if {[variant_isset no_sql]} { 
     92    default_variants -sql 
     93} else { 
     94    default_variants +sql 
    7095} 
    7196 
Note: See TracChangeset for help on using the changeset viewer.