[137656] trunk/dports/gis/qgis/Portfile
vince at macports.org
vince at macports.org
Tue Jun 16 09:22:13 PDT 2015
Revision: 137656
https://trac.macports.org/changeset/137656
Author: vince at macports.org
Date: 2015-06-16 09:22:13 -0700 (Tue, 16 Jun 2015)
Log Message:
-----------
qgis: ditch obsolete options (postgis, python26), makes postgresql94 the default and solves #46759
Modified Paths:
--------------
trunk/dports/gis/qgis/Portfile
Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile 2015-06-16 16:08:43 UTC (rev 137655)
+++ trunk/dports/gis/qgis/Portfile 2015-06-16 16:22:13 UTC (rev 137656)
@@ -7,6 +7,7 @@
name qgis
version 2.8.2
+revision 1
categories gis
maintainers vince
description QGIS is a user-friendly GIS based on Qt 4
@@ -43,11 +44,21 @@
port:gsl \
port:qwt52 \
port:fcgi \
- port:spatialindex
+ port:spatialindex \
+ port:postgis2 \
+ port:python27 \
+ port:py27-pyqt4 \
+ port:py27-qscintilla \
+ port:py27-gdal
-depends_build-append port:bison \
- port:ld64
+depends_build-append \
+ port:bison \
+ port:ld64 \
+ port:py27-sip
+depends_run-append port:py27-psycopg2 \
+ port:py27-spatialite
+
post-extract {
system -W ${worksrcpath} "mkdir build"
}
@@ -57,83 +68,30 @@
reinplace -E "s|@@@|${prefix}|g" \
${worksrcpath}/mac/app.info.plist.in
}
+
# Overrides default
-if {![variant_isset postgis] && ![variant_isset postgis2]} {
- default_variants +postgis2
-}
+if {![variant_isset postgresql93] && ![variant_isset postgresql94]} {
-if {![variant_isset python26] && ![variant_isset python27]} {
-
- default_variants +python27
+ default_variants +postgresql94
}
-if {![variant_isset postgresql92] && ![variant_isset postgresql93] && \
- ![variant_isset postgresql94]} {
-
- default_variants +postgresql93
-}
-
# Python related stuff
-variant python26 conflicts python27 \
- description use Python 2.6 {
+set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.7
- depends_lib-append port:py26-pyqt4 \
- port:py26-qscintilla \
- port:py26-gdal
- depends_build-append port:py26-sip
- depends_run-append port:py26-psycopg2 \
- port:py26-spatialite
+configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
+configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
+configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
+configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
+configure.args-append "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
- set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.6
-
- configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
- configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6"
- configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.6"
- configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
- configure.args-append "-DSIP_BINARY_PATH=${Py_FRM}/bin/sip-2.6"
-
- pre-configure {
- reinplace -E "s|Versions/Current|Versions/2.6|" \
- ${worksrcpath}/cmake/FindPythonLibrary.cmake
- }
+pre-configure {
+ reinplace -E "s|Versions/Current|Versions/2.7|" \
+ ${worksrcpath}/cmake/FindPythonLibrary.cmake
}
-variant python27 conflicts python26 \
- description use Python 2.7 {
-
- depends_lib-append port:py27-pyqt4 \
- port:py27-qscintilla \
- port:py27-gdal
- depends_build-append port:py27-sip
- depends_run-append port:py27-psycopg2 \
- port:py27-spatialite
-
- set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.7
-
- configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
- configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
- configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
- configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
- configure.args-append "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
-
- pre-configure {
- reinplace -E "s|Versions/Current|Versions/2.7|" \
- ${worksrcpath}/cmake/FindPythonLibrary.cmake
- }
-}
-
-variant postgresql92 conflicts postgresql93 postgresql94 \
- description "Use postgresql 9.2" {
-
- depends_lib-append port:postgresql92
- set PGSQL_DIR ${prefix}/lib/postgresql92
- configure.args-append \
- "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
-}
-
-variant postgresql93 conflicts postgresql92 postgresql94 \
+variant postgresql93 conflicts postgresql94 \
description "Use postgresql 9.3" {
depends_lib-append port:postgresql93
@@ -142,7 +100,7 @@
"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
}
-variant postgresql94 conflicts postgresql92 postgresql93 \
+variant postgresql94 conflicts postgresql93 \
description "Use postgresql 9.4" {
depends_lib-append port:postgresql94
@@ -151,18 +109,6 @@
"-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
}
-variant postgis description "Build postgis 1.x support" \
- conflicts postgis2 {
-
- depends_lib-append port:postgis
-}
-
-variant postgis2 description "Build postgis 2.x support" \
- conflicts postgis {
-
- depends_lib-append port:postgis2
-}
-
variant grass description "Build Grass (6.43) plugin" {
#depends_lib-append port:grass
@@ -178,6 +124,7 @@
configure.args-append "-DEXPAT_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib"
configure.args-append "-DCMAKE_INSTALL_PREFIX=${applications_dir}"
+configure.args-append "-DQGIS_MACAPP_BUNDLE=0"
configure.args-append "-DGDAL_CONFIG=${prefix}/bin/gdal-config"
configure.args-append "-DGDAL_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150616/084f4e46/attachment.html>
More information about the macports-changes
mailing list