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

[vince at macports.org]

Revision: 144950
          https://trac.macports.org/changeset/144950
Author:   vince at macports.org
Date:     2016-01-22 03:02:01 -0800 (Fri, 22 Jan 2016)
Log Message:
-----------
qgis: add postgresql95 variant, remove dependency to qca-ossl (not needed anymore).

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

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2016-01-22 10:36:16 UTC (rev 144949)
+++ trunk/dports/gis/qgis/Portfile	2016-01-22 11:02:01 UTC (rev 144950)
@@ -71,11 +71,7 @@
 
 # Overrides default
 
-if {![variant_isset postgresql93] && ![variant_isset postgresql94]} {
 
-    default_variants    +postgresql94
-}
-
 if {![variant_isset qt4] && ![variant_isset qt5]} {
 
     default_variants    +qt4
@@ -131,27 +127,39 @@
     depends_lib-append      port:py27-pyqt4 \
                             port:py27-qscintilla \
                             port:qca \
-                            port:qca-ossl \
                             port:qwt61
 }
 
-variant postgresql93    conflicts postgresql94 \
-                        description "Use postgresql 9.3" {
+# Database variants (from the GDAL port)
+set postgresql_suffixes {93 94 95}
 
-    depends_lib-append      port:postgresql93
-    set PGSQL_DIR           ${prefix}/lib/postgresql93
-    configure.args-append   \
-                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
+set portsgresql_variants {}
+foreach s ${postgresql_suffixes} {
+    lappend portsgresql_variants postgresql${s}
 }
 
-variant postgresql94    conflicts postgresql93 \
-                        description "Use postgresql 9.4" {
+foreach s ${postgresql_suffixes} {
+    set p postgresql${s}
+    set v [string index ${s} 0].[string index ${s} 1]
+    set i [lsearch -exact ${portsgresql_variants} ${p}]
+    set c [lreplace ${portsgresql_variants} ${i} ${i}]
+    eval [subst {
+        variant ${p} description "Enable PostgreSQL ${v} support" conflicts ${c} {
+            depends_lib-append      port:${p}
+            configure.args-append   \
+                    "-DPOSTGRESQL_CONFIG=${prefix}/lib/${p}/bin/pg_config"
+        }
+    }]
+}
 
-    depends_lib-append      port:postgresql94
-    set PGSQL_DIR           ${prefix}/lib/postgresql94
-    configure.args-append   \
-                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
+# postgresql default
+set pgd "if {"
+foreach s ${postgresql_suffixes} {
+    set pgd "${pgd}!\[variant_isset postgresql${s}\] && "
 }
+set pgd [string range ${pgd} 0 end-4]
+set pgd "${pgd}} { default_variants +postgresql94 }"
+eval ${pgd}
 
 variant grass               description "Build Grass 7 plugin" {
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160122/66819719/attachment-0001.html>