Changeset 80031

Timestamp:

07/03/11 01:15:21 (4 years ago)

Author:

ryandesign@…

Message:

libgda: do not make use of database engines whose variants were not requested (#15147); upgrade to using postgres 8.4 (#17102); move code related to specific variants into those variants

File:

• trunk/dports/gnome/libgda/Portfile (modified) (2 diffs)

trunk/dports/gnome/libgda/Portfile

@@ -5 +5 @@
 version         1.2.4
 set branch  [join [lrange [split ${version} .] 0 1] .]
-revision        3
+revision        4
 description     GDA provides uniform access to different kinds of data sources.
 long_description        GNU Data Access (GDA) is an attempt to provide \
@@ -23 +23 @@
 depends_build   port:gnome-doc-utils
 
-# Wow this is ugly. The database ports should probably support
-# ${prefix}/database instead of this weird include/database lib/database
-# magic.
-set mysqldir "${workpath}/mysql"
-
-configure.cppflags-append   -I${prefix}/include/db44 -I${prefix}/include/postgresql82
-configure.ldflags-append    -L${prefix}/lib/postgresql82 -L${prefix}/lib/db44
+configure.args  --without-bdb \
+                --without-mysql \
+                --without-postgres \
+                --without-sqlite
 
 default_variants +mysql5 +db4 +postgresql8 +sqlite
 
-post-patch {
-        if {[variant_isset "mysql5"]} {
-                file mkdir ${mysqldir}
-                system "ln -s \"[file join ${prefix} include mysql5]\" \"[file join ${mysqldir} include]\""
-                system "ln -s \"[file join ${prefix} lib mysql5]\" \"[file join ${mysqldir} lib]\""
-        }
-}
-
+set mysqldir ${workpath}/mysql
 variant mysql5 {
         depends_lib-append      path:bin/mysql_config5:mysql5
+    post-patch {
+        file mkdir ${mysqldir}
+        system "ln -s \"[file join ${prefix} include mysql5]\" \"[file join ${mysqldir} include]\""
+        system "ln -s \"[file join ${prefix} lib mysql5]\" \"[file join ${mysqldir} lib]\""
+    }
+        configure.args-delete   --without-mysql
         configure.args-append   --with-mysql=${mysqldir}
 }
 
 variant postgresql8 {
-        depends_lib-append      port:postgresql80
+        depends_lib-append      port:postgresql84
+        configure.args-delete   --without-postgres
         configure.args-append   --with-postgres=yes
+    configure.cppflags-append   -I${prefix}/include/postgresql84
+    configure.ldflags-append    -L${prefix}/lib/postgresql84
 }
 
 variant db4 {
         depends_lib-append      port:db44
+        configure.args-delete   --without-bdb
         configure.args-append   --with-bdb=${prefix}
     build.args-append   BDB_LIBS=-ldb-4
+    configure.cppflags-append   -I${prefix}/include/db44
+    configure.ldflags-append    -L${prefix}/lib/db44
 }
 
 variant sqlite {
         depends_lib-append      port:sqlite3
+        configure.args-delete   --without-sqlite
         configure.args-append   --with-sqlite=${prefix}
 }