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

[vince at macports.org]

Revision: 127813
          https://trac.macports.org/changeset/127813
Author:   vince at macports.org
Date:     2014-11-04 07:25:44 -0800 (Tue, 04 Nov 2014)
Log Message:
-----------
QGis : bump to v 2.6

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

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2014-11-04 15:20:10 UTC (rev 127812)
+++ trunk/dports/gis/qgis/Portfile	2014-11-04 15:25:44 UTC (rev 127813)
@@ -6,7 +6,7 @@
 PortGroup           qt4     1.0
 
 name                qgis
-version             2.4.0
+version             2.6.0
 categories          gis
 maintainers         vince
 description         QGIS is a user-friendly GIS based on Qt 4
@@ -25,9 +25,9 @@
 master_sites        http://qgis.org/downloads/
 use_bzip2           yes
 
-checksums           md5     c509ae14d34bf35456ee95c71b909172 \
-                    sha1    a72a9c748572853f27ebdfe80f0c77e62de3085b \
-                    rmd160  7a3cd6c16ba946bb7f812b15e97ea0231e546607
+checksums           md5     5540e0648caf261a264c2370be484163 \
+                    sha1    21911cdaedc29df78e366e636f79b7ac781f50cc \
+                    rmd160  f9f43329148a65153cc49d4ac8769dc2c4a68248
 
 patchfiles          patch-app_info_plist_in.diff
 
@@ -71,7 +71,7 @@
 if {![variant_isset postgresql91] && ![variant_isset postgresql92] && \
     ![variant_isset postgresql93]} {
 
-    default_variants    +postgresql92
+    default_variants    +postgresql93
 }
 
 # Python related stuff
@@ -124,16 +124,7 @@
     }
 }
 
-variant postgresql91    conflicts postgresql92 postgresql93 \
-                        description "Use postgresql 9.1" {
-
-    depends_lib-append      port:postgresql91
-    set PGSQL_DIR           ${prefix}/lib/postgresql91
-    configure.args-append   \
-                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
-}
-
-variant postgresql92    conflicts postgresql91 postgresql93 \
+variant postgresql92    conflicts postgresql93 \
                         description "Use postgresql 9.2" {
 
     depends_lib-append      port:postgresql92
@@ -142,7 +133,7 @@
                 "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
 }
 
-variant postgresql93    conflicts postgresql91 postgresql92 \
+variant postgresql93    conflicts postgresql92 \
                         description "Use postgresql 9.3" {
 
     depends_lib-append      port:postgresql93
@@ -182,7 +173,7 @@
 configure.args-append  "-DGDAL_INCLUDE_DIR=${prefix}/include"
 configure.args-append  "-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib"
 configure.args-append  "-DGEOS_CONFIG=${prefix}/bin/geos-config"
-configure.args-append  "-DGEOS_INCLUDE_DIR=${prefix}/include/geos"
+configure.args-append  "-DGEOS_INCLUDE_DIR=${prefix}/include"
 configure.args-append  "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
 configure.args-append  "-DGSL_CONFIG=${prefix}/bin/gsl-config"
 configure.args-append  "-DPROJ_INCLUDE_DIR=${prefix}/include"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141104/84211eb1/attachment.html>