Modified: trunk/dports/databases/libgda5/Portfile (89443 => 89444)

--- trunk/dports/databases/libgda5/Portfile	2012-01-29 14:22:14 UTC (rev 89443)
+++ trunk/dports/databases/libgda5/Portfile	2012-01-29 15:50:25 UTC (rev 89444)
@@ -6,7 +6,7 @@
 name		libgda5
 conflicts       libgda3 libgda4
 set gname       libgda
-version		5.0.1
+version		5.0.3
 license         {GPL-2 LGPL}
 
 set branch      [join [lrange [split ${version} .] 0 1] .]
@@ -21,11 +21,10 @@
 homepage	http://www.gnome-db.org/
 distname	libgda-${version}
 master_sites    gnome:sources/${gname}/${branch}/
-use_bzip2	yes
+use_xz		yes
 
-checksums           md5     581d88637c7a40148c94332395e4953c \
-                    sha1    df5f8bde7d24a475926a311910edc74d89bc08cd \
-                    rmd160  2ba15f7ddd83740d25ca2b9f73812bf6586d0852
+checksums           rmd160  b72781633aec2f139ce6fe1d34006513cd58f7ef \
+                    sha256  82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc
 
 #patchfiles      patch-configure.ac.diff
 
@@ -42,23 +41,8 @@
                 port:libsoup \
                 port:libtool
 
-#
-# prefer Berkeley DB 4.7 over 4.6
-# and depend on it if 4.6 is not installed
-# if both are installed configure will select 4.7
-# otherwise look for 4.6
-#
+default_variants	+bdb
 
-if (![variant_isset without_bdb]) {
-    if !([file exists ${prefix}/include/db46/db.h]) {
-        depends_lib-append port:db47
-    } elseif ([file exists ${prefix}/include/db47/db.h])  {
-        depends_lib-append port:db47
-    } else {
-        depends_lib-append port:db46
-    }
-}
-
 #use_autoreconf    yes
 
 configure.perl  ${prefix}/bin/perl
@@ -79,7 +63,7 @@
 
 use_parallel_build no
 
-variant with_mysql5 \
+variant mysql5 \
     description {support for current MySQL 5.x} {
 	depends_lib-append	path:bin/mysql_config5:mysql5
 	configure.env-append	\
@@ -89,7 +73,7 @@
 	configure.cppflags-append	"-I${prefix}/include/mysql5/mysql"
 }
 
-variant with_postgresql83 conflicts with_postgresql84 with_postgresql90 \
+variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 \
     description {support for PostgreSQL 8.3.x} {
 	configure.cppflags-append	"-I${prefix}/include/postgresql83"
 	depends_lib-append	port:postgresql83
@@ -97,7 +81,7 @@
 	configure.args-append	--with-postgres=${prefix}/lib/postgresql83
 }
 
-variant with_postgresql84 conflicts with_postgresql83 with_postgresql90 \
+variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 \
     description {support for PostgreSQL 8.4.x} {
 	configure.cppflags-append	"-I${prefix}/include/postgresql84"
 	depends_lib-append	port:postgresql84
@@ -105,7 +89,7 @@
 	configure.args-append	--with-postgres=${prefix}/lib/postgresql84
 }
 
-variant with_postgresql90 conflicts with_postgresql83 with_postgresql84 \
+variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 \
     description {support for PostgreSQL 9.0.x} {
 	configure.cppflags-append	"-I${prefix}/include/postgresql90"
 	depends_lib-append	port:postgresql90
@@ -113,12 +97,34 @@
 	configure.args-append	--with-postgres=${prefix}/lib/postgresql90
 }
 
-variant without_bdb \
-    description {remove support for Berkeley DB} {
-	configure.args-delete   --with-bdb=${prefix}
-	configure.args-append	--without-bdb
+variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 \
+    description {support for PostgreSQL 9.1.x} {
+	configure.cppflags-append	"-I${prefix}/include/postgresql91"
+	depends_lib-append	port:postgresql91
+	configure.args-delete   --without-postgres
+	configure.args-append	--with-postgres=${prefix}/lib/postgresql91
 }
 
+variant bdb	description {support for Berkeley DB} {
+#
+# prefer Berkeley DB 4.7 over 4.6
+# and depend on it if 4.6 is not installed
+# if both are installed configure will select 4.7
+# otherwise look for 4.6
+#
+    if ([file exists ${prefix}/include/db52/db.h]) {
+        depends_lib-append port:db52
+    } elseif ([file exists ${prefix}/include/db46/db.h])  {
+        depends_lib-append port:db46
+    } elseif ([file exists ${prefix}/include/db47/db.h])  {
+        depends_lib-append port:db47
+    } elseif ([file exists ${prefix}/include/db48/db.h])  {
+        depends_lib-append port:db48
+    } elseif ([file exists ${prefix}/include/db51/db.h])  {
+        depends_lib-append port:db51
+    }
+}
+
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
 }