[93207] trunk/dports/gis/qgis/Portfile

[vince at macports.org]

Revision: 93207
          https://trac.macports.org/changeset/93207
Author:   vince at macports.org
Date:     2012-05-17 12:49:43 -0700 (Thu, 17 May 2012)
Log Message:
-----------
Make PostGIS 2.0 default and fixes a conflict between default_variants.

Modified Paths:
--------------
    trunk/dports/gis/qgis/Portfile

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2012-05-17 19:40:27 UTC (rev 93206)
+++ trunk/dports/gis/qgis/Portfile	2012-05-17 19:49:43 UTC (rev 93207)
@@ -51,6 +51,23 @@
 	system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
 }
 
+# Overrides default
+
+if {![variant_isset postgis] && ![variant_isset postgis2]} {
+	default_variants		+postgis2
+}
+
+if {![variant_isset python25] && ![variant_isset python26] &&
+	![variant_isset python27]} {
+	
+	default_variants		+python27
+}
+
+if {![variant_isset postgresql90] && ![variant_isset postgresql91]} {
+	
+	default_variants		+postgresql91
+}
+
 set Py_own_FRM	${worksrcpath}/Python.framework
 
 # Python related stuff
@@ -140,22 +157,6 @@
 	configure.args-append	"-DGRASS_PREFIX=${prefix}/share/grass-6.4.0"
 }
 
-# Overrides default
-
-default_variants			+postgis
-
-if {![variant_isset python25] && ![variant_isset python26] &&
-	![variant_isset python27]} {
-	
-	default_variants		+python27
-}
-
-if {[variant_isset postgis] && ![variant_isset postgresql90] &&
-	![variant_isset postgresql91]} {
-	
-	default_variants		+postgresql91
-}
-
 configure.dir				${worksrcpath}/build									
 configure.cmd				cmake ..
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120517/9cf29671/attachment-0001.html>