Modified: trunk/dports/gis/qgis/Portfile (91394 => 91395)

--- trunk/dports/gis/qgis/Portfile	2012-03-31 16:37:05 UTC (rev 91394)
+++ trunk/dports/gis/qgis/Portfile	2012-03-31 16:59:18 UTC (rev 91395)
@@ -55,7 +55,9 @@
 
 # Python related stuff
 
-variant python25 conflicts universal description use Python 2.5 {	
+variant python25	conflicts universal python26 python27 python31 \
+					description use Python 2.5 {	
+
 	depends_lib-append	port:py25-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5"
@@ -65,7 +67,9 @@
 				"-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip"
 }
 
-variant python26 description use Python 2.6 {
+variant python26	conflicts python25 python27 python31 \
+					description use Python 2.6 {
+	
 	depends_lib-append	port:py26-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
@@ -76,7 +80,9 @@
 
 }
 
-variant python27 description use Python 2.7 {
+variant python27 	conflicts python25 python26 python31 \
+					description use Python 2.7 {
+					
 	depends_lib-append	port:py27-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
@@ -87,7 +93,9 @@
 
 }
 
-variant python31 description use Python 3.1 {
+variant python31	conflicts python25 python26 python27 \
+					description use Python 3.1 {
+					
 	depends_lib-append	port:py31-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python3.1"
@@ -98,21 +106,30 @@
 
 }
 
-variant postgresql90		description "Use postgresql 9.0" {
+variant postgresql90	conflicts postgresql91 \
+						description "Use postgresql 9.0" {
+						
 	depends_lib-append		port:postgresql90
-	set PGSQL_DIR	${prefix}/lib/postgresql90
+	set PGSQL_DIR			${prefix}/lib/postgresql90
 	configure.args-append	"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgresql91		description "Use postgresql 9.1" {
+variant postgresql91	conflicts postgresql90 \
+						description "Use postgresql 9.1" {
+						
 	depends_lib-append		port:postgresql91
-	set PGSQL_DIR	${prefix}/lib/postgresql91
+	set PGSQL_DIR			${prefix}/lib/postgresql91
 	configure.args-append	"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgis				description "Build postgis support" {
+variant postgis			description "Build postgis support" {
 	
 	depends_lib-append		port:postgis
+	
+	if {![variant_isset postgresql90] &&
+		![variant_isset postgresql91] } {
+		return -code error "Please select a postgresql variant"
+	}
 }
 
 variant	grass				description "Build the grass (6.4) plugin" {