[98520] trunk/dports/databases
blair at macports.org
blair at macports.org
Sun Oct 7 18:11:44 PDT 2012
Revision: 98520
http://trac.macports.org//changeset/98520
Author: blair at macports.org
Date: 2012-10-07 18:11:44 -0700 (Sun, 07 Oct 2012)
Log Message:
-----------
db{44,46,47,48,51,52,53}: whitespace consistency changes.
Make the db?? ports whitespace consistent so that diffs are minimal.
This will make forthcoming changes easier to apply to all of them (or
maybe even unify as subports).
Modified Paths:
--------------
trunk/dports/databases/db44/Portfile
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
trunk/dports/databases/db53/Portfile
Modified: trunk/dports/databases/db44/Portfile
===================================================================
--- trunk/dports/databases/db44/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db44/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -1,93 +1,102 @@
# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name db44
-version 4.4.20
-revision 1
-categories databases
-license Sleepycat
-maintainers nomaintainer
-platforms darwin
-use_parallel_build yes
-description The Berkeley DB package, version 4.4
+name db44
+version 4.4.20
+revision 1
+categories databases
+license Sleepycat
+maintainers nomaintainer
+platforms darwin
+use_parallel_build yes
+description The Berkeley DB package, version 4.4
-long_description \
- Version 4.4 of the Berkeley Data Base library which \
- offers (key/value) storage with optional concurrent \
- access or transactions interface. This port will \
- install the AES (American Encryption Standard) \
- enabled version. Utilities are included in the \
- distribution to convert v1.85 databases to v4.4 \
- databases, and a backwards compatible API is \
- provided to maintain compatibility with programs \
- using the v1.85 interface.
+long_description \
+ Version 4.4 of the Berkeley Data Base library which offers \
+ (key/value) storage with optional concurrent access or \
+ transactions interface. This port will install the AES (American \
+ Encryption Standard) enabled version. Utilities are included in \
+ the distribution to convert v1.85 databases to v4.4 databases, and \
+ a backwards compatible API is provided to maintain compatibility \
+ with programs using the v1.85 interface.
-homepage http://www.oracle.com/database/berkeley-db/
-master_sites http://download-west.oracle.com/berkeley-db/ \
- http://download-east.oracle.com/berkeley-db/ \
- http://download-uk.oracle.com/berkeley-db/
-patch_sites http://download.oracle.com/berkeley-db/patches/db/${version}/
+homepage http://www.oracle.com/database/berkeley-db/
+master_sites http://download-west.oracle.com/berkeley-db/ \
+ http://download-east.oracle.com/berkeley-db/ \
+ http://download-uk.oracle.com/berkeley-db/
+patch_sites http://download.oracle.com/berkeley-db/patches/db/${version}/
-patchfiles patch.${version}.1 \
- patch.${version}.2 \
- patch.${version}.3 \
- patch.${version}.4
+patchfiles patch.${version}.1 \
+ patch.${version}.2 \
+ patch.${version}.3 \
+ patch.${version}.4
-distname db-${version}
-patch.dir ${workpath}/${distname}
+distname db-${version}
+patch.dir ${workpath}/${distname}
-checksums ${distname}${extract.suffix} \
- md5 d84dff288a19186b136b0daf7067ade3 \
- sha1 bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b \
- rmd160 5940d9244b4df4897f66f1b67d3c967081c18b85 \
- patch.${version}.1 \
- md5 66584d621355df055b6e05b4a02e9c3e \
- sha1 5843380b67561134432f46dce53b67a133ef7962 \
- rmd160 57ecff5ecb934e1eb771c49e4e67246d579702b2 \
- patch.${version}.2 \
- md5 85df93a0867f6cace3501671cdeb6ed1 \
- sha1 75f0ae6ef06a23a690e5ebe6460552a11448ef32 \
- rmd160 e560b07cc20dbd6865d8aad91941515f8fb031c1 \
- patch.${version}.3 \
- md5 88ee91889ebf5498b22b2e7bed945d41 \
- sha1 580265cdccc394ed988a6334f6c9a7d2bb15d141 \
- rmd160 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 \
- patch.${version}.4 \
- md5 c2ef7b3e59460c35950fab5f2faa3fc0 \
- sha1 8875add3312fdc0548fbd4dedb71b4f8637dc6c9 \
- rmd160 46cf2177aee1ce00c0044817610231541722c4d3
+checksums ${distname}${extract.suffix} \
+ md5 d84dff288a19186b136b0daf7067ade3 \
+ sha1 bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b \
+ rmd160 5940d9244b4df4897f66f1b67d3c967081c18b85 \
+ patch.${version}.1 \
+ md5 66584d621355df055b6e05b4a02e9c3e \
+ sha1 5843380b67561134432f46dce53b67a133ef7962 \
+ rmd160 57ecff5ecb934e1eb771c49e4e67246d579702b2 \
+ patch.${version}.2 \
+ md5 85df93a0867f6cace3501671cdeb6ed1 \
+ sha1 75f0ae6ef06a23a690e5ebe6460552a11448ef32 \
+ rmd160 e560b07cc20dbd6865d8aad91941515f8fb031c1 \
+ patch.${version}.3 \
+ md5 88ee91889ebf5498b22b2e7bed945d41 \
+ sha1 580265cdccc394ed988a6334f6c9a7d2bb15d141 \
+ rmd160 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 \
+ patch.${version}.4 \
+ md5 c2ef7b3e59460c35950fab5f2faa3fc0 \
+ sha1 8875add3312fdc0548fbd4dedb71b4f8637dc6c9 \
+ rmd160 46cf2177aee1ce00c0044817610231541722c4d3
-worksrcdir ${distname}/build_unix
+worksrcdir ${distname}/build_unix
-configure.cmd ../dist/configure
-configure.args --enable-cxx --enable-compat185 --enable-dump185 \
- --includedir=\\\${prefix}/include/db44 \
- --libdir=\\\${prefix}/lib/db44 \
- --program-transform-name="s,^db,db44," \
- --disable-tcl
+configure.cmd ../dist/configure
+configure.args --enable-cxx --enable-compat185 --enable-dump185 \
+ --includedir=\\\${prefix}/include/db44 \
+ --libdir=\\\${prefix}/lib/db44 \
+ --program-transform-name="s,^db,db44," \
+ --disable-tcl
-destroot.destdir prefix=${destroot}${prefix} \
- docdir=${destroot}${prefix}/share/${name}-${version}/
+destroot.destdir \
+ prefix=${destroot}${prefix} \
+ docdir=${destroot}${prefix}/share/${name}-${version}/
post-destroot {
- foreach bin { archive hotbackup dump dump185 printlog upgrade checkpoint recover verify deadlock load stat } {
- move ${destroot}${prefix}/bin/db_${bin} \
- ${destroot}${prefix}/bin/db44_${bin}
- }
+ foreach bin {archive
+ hotbackup
+ dump
+ dump185
+ printlog
+ upgrade
+ checkpoint
+ recover
+ verify
+ deadlock
+ load
+ stat} {
+ move ${destroot}${prefix}/bin/db_${bin} \
+ ${destroot}${prefix}/bin/db44_${bin}
+ }
}
variant java {
- configure.args-append --enable-java
+ configure.args-append --enable-java
}
variant tcl {
- depends_lib-append port:tcl
- configure.args-delete --disable-tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib/
+ depends_lib-append port:tcl
+ configure.args-delete --disable-tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib/
}
-livecheck.type regex
-livecheck.url http://www.oracle.com/technology/software/products/berkeley-db/db/
-livecheck.regex "Berkeley DB (4\\.4\\.\\d+(?:\\.\\d+)*)"
-
+livecheck.type regex
+livecheck.url http://www.oracle.com/technology/software/products/berkeley-db/db/
+livecheck.regex "Berkeley DB (4\\.4\\.\\d+(?:\\.\\d+)*)"
Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db46/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -3,69 +3,71 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db46
+name db46
set minor_version 21
-version 4.6.${minor_version}
-revision 6
-categories databases
-license Sleepycat
-maintainers blair openmaintainer
-platforms darwin
+version 4.6.${minor_version}
+revision 6
+categories databases
+license Sleepycat
+maintainers blair openmaintainer
+platforms darwin
use_parallel_build yes
-description The Berkeley DB package, version 4.6
-long_description Version 4.6 of the Berkeley Data Base library which \
- offers (key/value) storage with optional concurrent \
- access or transactions interface. This port will \
- install the AES (American Encryption Standard) \
- enabled version.
+description The Berkeley DB package, version 4.6
+long_description \
+ Version 4.6 of the Berkeley Data Base library which \
+ offers (key/value) storage with optional concurrent \
+ access or transactions interface. This port will \
+ install the AES (American Encryption Standard) \
+ enabled version.
-homepage http://www.oracle.com/database/berkeley-db/index.html
-master_sites http://download-west.oracle.com/berkeley-db/ \
- http://download-east.oracle.com/berkeley-db/ \
- http://download-uk.oracle.com/berkeley-db/
-patch_sites http://download.oracle.com/berkeley-db/patches/db/${version}/
-patchfiles patch.${version}.1 \
- patch.${version}.2 \
- patch.${version}.3 \
- patch.${version}.4
+homepage http://www.oracle.com/database/berkeley-db/index.html
+master_sites http://download-west.oracle.com/berkeley-db/ \
+ http://download-east.oracle.com/berkeley-db/ \
+ http://download-uk.oracle.com/berkeley-db/
+patch_sites http://download.oracle.com/berkeley-db/patches/db/${version}/
+patchfiles patch.${version}.1 \
+ patch.${version}.2 \
+ patch.${version}.3 \
+ patch.${version}.4
-distname db-${version}
-patch.dir ${workpath}/${distname}
-dist_subdir db4/${version}_6
-checksums ${distname}${extract.suffix} \
- md5 718082e7e35fc48478a2334b0bc4cd11 \
- sha1 5be3beb82e42a78ff671a3f5a4c30e5652972119 \
- rmd160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e \
- patch.${version}.1 \
- md5 4878872edfc53c6ecb871b1062a4bdaf \
- sha1 c7c155705687e4de03d06c2ea86940f573fdac0b \
- rmd160 8c11e9b991ac6559f22ece2d93617b16126049e8 \
- patch.${version}.2 \
- md5 55074e53d3acae2dcbeae8322f96e522 \
- sha1 a694b71088ba99b74042e7568f395fe467bb6590 \
- rmd160 f8abf554552db668037e046dea54700ce3340bf8 \
- patch.${version}.3 \
- md5 7a6e11b54712caf752f9c4a52babe60c \
- sha1 d52aa498943cfaa339ad6bf2cf7b836a40627701 \
- rmd160 4e6b7ed1e1c69cba54351d76a0b8543107a655b8 \
- patch.${version}.4 \
- md5 ae7d3d587355fe85b512ef09b9a77d19 \
- sha1 e2190185c667edb97e800495ce6eb4f95f43eb87 \
- rmd160 f1d18e59c311fb4e1f00a3b6220269fca17df312
+distname db-${version}
+patch.dir ${workpath}/${distname}
+dist_subdir db4/${version}_6
+checksums ${distname}${extract.suffix} \
+ md5 718082e7e35fc48478a2334b0bc4cd11 \
+ sha1 5be3beb82e42a78ff671a3f5a4c30e5652972119 \
+ rmd160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e \
+ patch.${version}.1 \
+ md5 4878872edfc53c6ecb871b1062a4bdaf \
+ sha1 c7c155705687e4de03d06c2ea86940f573fdac0b \
+ rmd160 8c11e9b991ac6559f22ece2d93617b16126049e8 \
+ patch.${version}.2 \
+ md5 55074e53d3acae2dcbeae8322f96e522 \
+ sha1 a694b71088ba99b74042e7568f395fe467bb6590 \
+ rmd160 f8abf554552db668037e046dea54700ce3340bf8 \
+ patch.${version}.3 \
+ md5 7a6e11b54712caf752f9c4a52babe60c \
+ sha1 d52aa498943cfaa339ad6bf2cf7b836a40627701 \
+ rmd160 4e6b7ed1e1c69cba54351d76a0b8543107a655b8 \
+ patch.${version}.4 \
+ md5 ae7d3d587355fe85b512ef09b9a77d19 \
+ sha1 e2190185c667edb97e800495ce6eb4f95f43eb87 \
+ rmd160 f1d18e59c311fb4e1f00a3b6220269fca17df312
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args --enable-cxx \
- --includedir=\\\${prefix}/include/db46 \
- --libdir=\\\${prefix}/lib/db46 \
- --program-transform-name="s,^db,db46," \
- --enable-dump185 \
- --disable-tcl
+configure.cmd ../dist/configure
+configure.args --enable-cxx \
+ --includedir=\\\${prefix}/include/db46 \
+ --libdir=\\\${prefix}/lib/db46 \
+ --program-transform-name="s,^db,db46," \
+ --enable-dump185 \
+ --disable-tcl
-destroot.destdir prefix=${destroot}${prefix} \
- docdir=${destroot}${prefix}/share/doc/${name}/
+destroot.destdir \
+ prefix=${destroot}${prefix} \
+ docdir=${destroot}${prefix}/share/doc/${name}/
pre-extract {
if {[file exists "/usr/local/include/db.h"]} {
@@ -136,7 +138,7 @@
}
}
-livecheck.type regex
-livecheck.url http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
-livecheck.version ${minor_version}
-livecheck.regex {4.6.(\d+(?:\.\d+)*)}
+livecheck.type regex
+livecheck.url http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
+livecheck.version ${minor_version}
+livecheck.regex {4.6.(\d+(?:\.\d+)*)}
Modified: trunk/dports/databases/db47/Portfile
===================================================================
--- trunk/dports/databases/db47/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db47/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -4,16 +4,16 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db47
-version 4.7.25
+name db47
+version 4.7.25
revision 2
-set branch [join [lrange [split ${version} .] 0 1] {}]
-categories databases
-license Sleepycat
-maintainers mcalhoun openmaintainer
-platforms darwin
-description The Berkeley DB package, version 4.7
-long_description \
+set branch [join [lrange [split ${version} .] 0 1] {}]
+categories databases
+license Sleepycat
+maintainers mcalhoun openmaintainer
+platforms darwin
+description The Berkeley DB package, version 4.7
+long_description \
Version 4.7 of the Berkeley Data Base library which \
offers (key/value) storage with optional concurrent \
access or transactions interface. This port will \
@@ -21,7 +21,7 @@
enabled version.
homepage http://www.oracle.com/database/berkeley-db/index.html
-master_sites \
+master_sites \
http://download-west.oracle.com/berkeley-db/ \
http://download-east.oracle.com/berkeley-db/ \
http://download-uk.oracle.com/berkeley-db/
@@ -32,10 +32,10 @@
patch.${version}.3 \
patch.${version}.4
-distname db-${version}
-patch.dir ${workpath}/${distname}
+distname db-${version}
+patch.dir ${workpath}/${distname}
-checksums \
+checksums \
${distname}${extract.suffix} \
md5 ec2b87e833779681a0c3a814aa71359e \
sha1 957c10358df1211e1dc37ea997aadef42117d6a5 \
@@ -57,31 +57,31 @@
sha1 0eb5566ad2ca2232b92d8c71285bfaf32aba54dc \
rmd160 0b235122060785887eb41fa7657379bd4f1e57bf
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args \
+configure.cmd ../dist/configure
+configure.args \
--enable-cxx \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-use_parallel_build yes
+use_parallel_build yes
-destroot.destdir \
+destroot.destdir \
prefix=${destroot}${prefix} \
docdir=${destroot}${prefix}/share/doc/${name}
post-destroot {
- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
set newbin [regsub {^db_} ${bin} "db${branch}_"]
- move ${destroot}${prefix}/bin/${bin} \
- ${destroot}${prefix}/bin/${newbin}
- }
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${newbin}
+ }
}
variant java conflicts no_java description {Build the Java API} {
- configure.args-append --enable-java
+ configure.args-append --enable-java
platform macosx {
pre-configure {
if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
@@ -106,8 +106,8 @@
}
variant tcl description {build Tcl API} {
- depends_lib-append port:tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib
+ depends_lib-append port:tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
if { [variant_isset universal] } {
Modified: trunk/dports/databases/db48/Portfile
===================================================================
--- trunk/dports/databases/db48/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db48/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -4,15 +4,15 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db48
-version 4.8.30
-set branch [join [lrange [split ${version} .] 0 1] {}]
-categories databases
-license Sleepycat
-maintainers jmr openmaintainer
-platforms darwin
-description The Berkeley DB package, version 4.8
-long_description \
+name db48
+version 4.8.30
+set branch [join [lrange [split ${version} .] 0 1] {}]
+categories databases
+license Sleepycat
+maintainers jmr openmaintainer
+platforms darwin
+description The Berkeley DB package, version 4.8
+long_description \
Version 4.8 of the Berkeley Data Base library which \
offers (key/value) storage with optional concurrent \
access or transactions interface. This port will \
@@ -20,44 +20,45 @@
enabled version.
homepage http://www.oracle.com/database/berkeley-db/index.html
-master_sites \
+master_sites \
http://download-west.oracle.com/berkeley-db/ \
http://download-east.oracle.com/berkeley-db/ \
http://download-uk.oracle.com/berkeley-db/
-distname db-${version}
+distname db-${version}
-checksums \
+checksums \
md5 f80022099c5742cd179343556179aa8c \
sha1 ab36c170dda5b2ceaad3915ced96e41c6b7e493c \
rmd160 dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args \
+configure.cmd ../dist/configure
+configure.args \
--enable-cxx \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-use_parallel_build yes
+use_parallel_build yes
-destroot.destdir \
+destroot.destdir \
prefix=${destroot}${prefix} \
docdir=${destroot}${prefix}/share/doc/${name}
post-destroot {
- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
set newbin [regsub {^db_} ${bin} "db${branch}_"]
- move ${destroot}${prefix}/bin/${bin} \
- ${destroot}${prefix}/bin/${newbin}
- }
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${newbin}
+ }
}
variant java conflicts no_java description {Build the Java API} {
- configure.args-append --enable-java
+ configure.args-append --enable-java
}
+
variant no_java conflicts java description {Legacy compatibility variant} {}
if {[variant_isset no_java]} {
default_variants -java
@@ -66,8 +67,8 @@
}
variant tcl description {build Tcl API} {
- depends_lib-append port:tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib
+ depends_lib-append port:tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
if { [variant_isset universal] } {
Modified: trunk/dports/databases/db51/Portfile
===================================================================
--- trunk/dports/databases/db51/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db51/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -4,15 +4,15 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db51
-version 5.1.29
-set branch [join [lrange [split ${version} .] 0 1] {}]
-categories databases
-license Sleepycat
-maintainers afb openmaintainer
-platforms darwin
-description The Berkeley DB package, version 5.1
-long_description \
+name db51
+version 5.1.29
+set branch [join [lrange [split ${version} .] 0 1] {}]
+categories databases
+license Sleepycat
+maintainers afb openmaintainer
+platforms darwin
+description The Berkeley DB package, version 5.1
+long_description \
Version 5.1 of the Berkeley Data Base library which \
offers (key/value) storage with optional concurrent \
access or transactions interface. This port will \
@@ -22,42 +22,42 @@
homepage http://www.oracle.com/us/products/database/berkeley-db/db/
master_sites http://download.oracle.com/berkeley-db/
-distname db-${version}
+distname db-${version}
-checksums \
+checksums \
md5 a94ea755ab695bc04f82b94d2e24a1ef \
sha1 42dc96c71873c7fde543c916ed866cadee6fa51d \
rmd160 0c1124f08f121fdd8e43e5622cc3b8ddfd724c78
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args \
+configure.cmd ../dist/configure
+configure.args \
--enable-cxx \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-use_parallel_build yes
+use_parallel_build yes
-destroot.destdir \
+destroot.destdir \
prefix=${destroot}${prefix} \
docdir=${destroot}${prefix}/share/doc/${name}
post-destroot {
- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
set newbin [regsub {^db_} ${bin} "db${branch}_"]
- move ${destroot}${prefix}/bin/${bin} \
- ${destroot}${prefix}/bin/${newbin}
- }
- if { ![variant_isset no_sql] } {
- move ${destroot}${prefix}/bin/dbsql \
- ${destroot}${prefix}/bin/db${branch}sql
- }
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${newbin}
+ }
+ if { ![variant_isset no_sql] } {
+ move ${destroot}${prefix}/bin/dbsql \
+ ${destroot}${prefix}/bin/db${branch}sql
+ }
}
variant java conflicts no_java description {Build the Java API} {
- configure.args-append --enable-java
+ configure.args-append --enable-java
platform macosx {
pre-configure {
if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
@@ -74,6 +74,7 @@
}
}
}
+
variant no_java conflicts java description {Legacy compatibility variant} {}
if {[variant_isset no_java]} {
default_variants -java
@@ -82,8 +83,9 @@
}
variant sql conflicts no_sql description {Build the SQL API} {
- configure.args-append --enable-sql
+ configure.args-append --enable-sql
}
+
variant no_sql conflicts sql description {Legacy compatibility variant} {}
if {[variant_isset no_sql]} {
default_variants -sql
@@ -92,8 +94,8 @@
}
variant tcl description {build Tcl API} {
- depends_lib-append port:tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib
+ depends_lib-append port:tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
if { [variant_isset universal] } {
Modified: trunk/dports/databases/db52/Portfile
===================================================================
--- trunk/dports/databases/db52/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db52/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -4,15 +4,15 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db52
-version 5.2.42
-set branch [join [lrange [split ${version} .] 0 1] {}]
-categories databases
-license Sleepycat
-maintainers afb openmaintainer
-platforms darwin
-description The Berkeley DB package, version 5.2
-long_description \
+name db52
+version 5.2.42
+set branch [join [lrange [split ${version} .] 0 1] {}]
+categories databases
+license Sleepycat
+maintainers afb openmaintainer
+platforms darwin
+description The Berkeley DB package, version 5.2
+long_description \
Version 5.2 of the Berkeley Data Base library which \
offers (key/value) storage with optional concurrent \
access or transactions interface. This port will \
@@ -22,42 +22,42 @@
homepage http://www.oracle.com/us/products/database/berkeley-db/db/
master_sites http://download.oracle.com/berkeley-db/
-distname db-${version}
+distname db-${version}
-checksums \
+checksums \
md5 28c39545efbeb926d1efef0bf33135b9 \
sha1 c533839056ab465a12808d48d3af0a35e50019be \
rmd160 717b2b68ff7d225edaed834289d8e06a3c1d7cc7
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args \
+configure.cmd ../dist/configure
+configure.args \
--enable-cxx \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-use_parallel_build yes
+use_parallel_build yes
-destroot.destdir \
+destroot.destdir \
prefix=${destroot}${prefix} \
docdir=${destroot}${prefix}/share/doc/${name}
post-destroot {
- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
set newbin [regsub {^db_} ${bin} "db${branch}_"]
- move ${destroot}${prefix}/bin/${bin} \
- ${destroot}${prefix}/bin/${newbin}
- }
- if { ![variant_isset no_sql] } {
- move ${destroot}${prefix}/bin/dbsql \
- ${destroot}${prefix}/bin/db${branch}sql
- }
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${newbin}
+ }
+ if { ![variant_isset no_sql] } {
+ move ${destroot}${prefix}/bin/dbsql \
+ ${destroot}${prefix}/bin/db${branch}sql
+ }
}
variant java conflicts no_java description {Build the Java API} {
- configure.args-append --enable-java
+ configure.args-append --enable-java
platform macosx {
pre-configure {
if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
@@ -74,6 +74,7 @@
}
}
}
+
variant no_java conflicts java description {Legacy compatibility variant} {}
if {[variant_isset no_java]} {
default_variants -java
@@ -82,9 +83,10 @@
}
variant sql conflicts no_sql description {Build the SQL API} {
- patchfiles-append patch-sqlite.diff
- configure.args-append --enable-sql
+ patchfiles-append patch-sqlite.diff
+ configure.args-append --enable-sql
}
+
variant no_sql conflicts sql description {Legacy compatibility variant} {}
if {[variant_isset no_sql]} {
default_variants -sql
@@ -93,8 +95,8 @@
}
variant tcl description {build Tcl API} {
- depends_lib-append port:tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib
+ depends_lib-append port:tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
if { [variant_isset universal] } {
Modified: trunk/dports/databases/db53/Portfile
===================================================================
--- trunk/dports/databases/db53/Portfile 2012-10-08 00:07:57 UTC (rev 98519)
+++ trunk/dports/databases/db53/Portfile 2012-10-08 01:11:44 UTC (rev 98520)
@@ -4,15 +4,15 @@
PortSystem 1.0
PortGroup muniversal 1.0
-name db53
-version 5.3.21
-set branch [join [lrange [split ${version} .] 0 1] {}]
-categories databases
-license Sleepycat
-maintainers afb openmaintainer
-platforms darwin
-description The Berkeley DB package, version 5.3
-long_description \
+name db53
+version 5.3.21
+set branch [join [lrange [split ${version} .] 0 1] {}]
+categories databases
+license Sleepycat
+maintainers afb openmaintainer
+platforms darwin
+description The Berkeley DB package, version 5.3
+long_description \
Version 5.3 of the Berkeley Data Base library which \
offers (key/value) storage with optional concurrent \
access or transactions interface. This port will \
@@ -22,42 +22,42 @@
homepage http://www.oracle.com/us/products/database/berkeley-db/db/
master_sites http://download.oracle.com/berkeley-db/
-distname db-${version}
+distname db-${version}
-checksums \
+checksums \
md5 3fda0b004acdaa6fa350bfc41a3b95ca \
sha1 32e43c4898c8996750c958a90c174bd116fcba83 \
rmd160 5768a4d835d02020165c6561cc5c406339662fa0
-configure.dir ${worksrcpath}/build_unix
-build.dir ${configure.dir}
+configure.dir ${worksrcpath}/build_unix
+build.dir ${configure.dir}
-configure.cmd ../dist/configure
-configure.args \
+configure.cmd ../dist/configure
+configure.args \
--enable-cxx \
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-use_parallel_build yes
+use_parallel_build yes
-destroot.destdir \
+destroot.destdir \
prefix=${destroot}${prefix} \
docdir=${destroot}${prefix}/share/doc/${name}
post-destroot {
- foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
set newbin [regsub {^db_} ${bin} "db${branch}_"]
- move ${destroot}${prefix}/bin/${bin} \
- ${destroot}${prefix}/bin/${newbin}
- }
- if { [variant_isset sql] } {
- move ${destroot}${prefix}/bin/dbsql \
- ${destroot}${prefix}/bin/db${branch}sql
- }
+ move ${destroot}${prefix}/bin/${bin} \
+ ${destroot}${prefix}/bin/${newbin}
+ }
+ if { [variant_isset sql] } {
+ move ${destroot}${prefix}/bin/dbsql \
+ ${destroot}${prefix}/bin/db${branch}sql
+ }
}
variant java description {Build the Java API} {
- configure.args-append --enable-java
+ configure.args-append --enable-java
platform macosx {
pre-configure {
if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
@@ -74,19 +74,20 @@
}
}
}
+
if {${os.subplatform} == "macosx" && ${os.major} < 11} {
default_variants +java
}
variant sql description {Build the SQL API} {
- patchfiles-append patch-sqlite.diff
- configure.args-append --enable-sql
+ patchfiles-append patch-sqlite.diff
+ configure.args-append --enable-sql
}
default_variants +sql
variant tcl description {build Tcl API} {
- depends_lib-append port:tcl
- configure.args-append --enable-tcl --with-tcl=${prefix}/lib
+ depends_lib-append port:tcl
+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
if { [variant_isset universal] } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121007/9b3e4326/attachment-0001.html>
More information about the macports-changes
mailing list