diff -urN qgis.orig/Makefile qgis/Makefile --- qgis.orig/Makefile 2016-01-11 11:02:26.549293000 +0100 +++ qgis/Makefile 2016-01-18 18:05:06.302324000 +0100 @@ -2,7 +2,7 @@ # $FreeBSD: head/graphics/qgis/Makefile 405724 2016-01-10 16:55:26Z bapt $ PORTNAME= qgis -PORTVERSION= 2.12.2 +PORTVERSION= 2.12.3 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -23,19 +23,19 @@ USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} -GH_TAGNAME= B403532 +GH_TAGNAME= 99ac688 -USES= cpe bison cmake execinfo fortran gmake sqlite python +USES= cpe bison cmake execinfo fortran gmake python sqlite USE_QT4= gui svg xml network sql designer testlib linguist_build \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes -OPTIONS_DEFINE= POSTGIS PYTHON GRASS SERVER DEBUG -OPTIONS_DEFAULT= POSTGIS PYTHON +OPTIONS_DEFINE= PYTHON POSTGIS GRASS SERVER DEBUG +OPTIONS_DEFAULT= PYTHON POSTGIS OPTIONS_SUB= yes NO_OPTIONS_SORT= yes -SERVER_DESC= Enable QGIS server +SERVER_DESC= Enable QGIS server CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE @@ -43,6 +43,9 @@ CMAKE_ARGS+= -Wno-dev .endif +DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug +DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release + GRASS_BUILD_DEPENDS= grass64:${PORTSDIR}/databases/grass GRASS_RUN_DEPENDS= grass64:${PORTSDIR}/databases/grass GRASS_CMAKE_ON= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.5 @@ -53,10 +56,6 @@ POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE -SERVER_LIB_DEPENDS= libfcgi.so:${PORTSDIR}/www/fcgi -SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE -SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE - PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \ @@ -82,8 +81,9 @@ PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE -DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug -DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release +SERVER_LIB_DEPENDS= libfcgi.so:${PORTSDIR}/www/fcgi +SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE +SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE .include @@ -99,5 +99,19 @@ pre-patch: @${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "%1" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "" + tr( "${GH_TAGNAME}" ) + ""|g' \ ${WRKSRC}/src/app/qgisapp.cpp +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 +# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23 +# 'Hide shared library symbols by default on GCC and Clang', +# some layer properties are not visible on FreeBSD > 9.x + @${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|#SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|g' \ + ${WRKSRC}/src/analysis/CMakeLists.txt \ + ${WRKSRC}/src/app/CMakeLists.txt \ + ${WRKSRC}/src/core/CMakeLists.txt \ + ${WRKSRC}/src/customwidgets/CMakeLists.txt \ + ${WRKSRC}/src/gui/CMakeLists.txt \ + ${WRKSRC}/src/plugins/CMakeLists.txt \ + ${WRKSRC}/src/python/CMakeLists.txt \ + ${WRKSRC}/src/server/CMakeLists.txt +.endif .include diff -urN qgis.orig/distinfo qgis/distinfo --- qgis.orig/distinfo 2016-01-10 07:36:32.019097000 +0100 +++ qgis/distinfo 2016-01-18 17:45:13.249119000 +0100 @@ -1,2 +1,2 @@ -SHA256 (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 47b3c1d67af3a02c6c387036c032245e044d5bd65fd2c8c4da2bcc45ff86ccfd -SIZE (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 80837408 +SHA256 (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 550fc21c7a8c4b7a5f1997fdfcc338916a880050a94eee792218c61a12a7fd9e +SIZE (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 80834484 diff -urN qgis.orig/pkg-plist qgis/pkg-plist --- qgis.orig/pkg-plist 2016-01-10 07:36:32.003688000 +0100 +++ qgis/pkg-plist 2016-01-18 18:24:03.642225000 +0100 @@ -613,21 +613,21 @@ include/qgis/ui_qgsquerybuilderbase.h include/qgis/ui_qgssublayersdialogbase.h lib/libqgis_analysis.so -lib/libqgis_analysis.so.2.12.2 +lib/libqgis_analysis.so.2.12.3 lib/libqgis_app.so -lib/libqgis_app.so.2.12.2 +lib/libqgis_app.so.2.12.3 lib/libqgis_core.so -lib/libqgis_core.so.2.12.2 +lib/libqgis_core.so.2.12.3 lib/libqgis_gui.so -lib/libqgis_gui.so.2.12.2 +lib/libqgis_gui.so.2.12.3 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.12.2 +lib/libqgis_networkanalysis.so.2.12.3 %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.2.12.2 +%%SERVER%%lib/libqgis_server.so.2.12.3 %%GRASS%%lib/libqgisgrass6.so -%%GRASS%%lib/libqgisgrass6.so.2.12.2 +%%GRASS%%lib/libqgisgrass6.so.2.12.3 %%PYTHON%%lib/libqgispython.so -%%PYTHON%%lib/libqgispython.so.2.12.2 +%%PYTHON%%lib/libqgispython.so.2.12.3 lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6 %%GRASS%%lib/qgis/grass/modules/qgis.d.rast6 @@ -664,7 +664,7 @@ lib/qgis/plugins/libroadgraphplugin.so lib/qgis/plugins/libspatialiteprovider.so lib/qgis/plugins/libspatialqueryplugin.so -%%POSTGIS%%lib/qgis/plugins/libspitplugin.so +lib/qgis/plugins/libspitplugin.so lib/qgis/plugins/libtopolplugin.so lib/qgis/plugins/libwcsprovider.so lib/qgis/plugins/libwfsprovider.so @@ -2015,30 +2015,30 @@ %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/html_elems.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/info_model.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/plugin.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py -%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/connector.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/data_model.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/icons/postgis_elephant.png +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/info_model.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugin.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_mbr.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node_label.qml +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py +%%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py