Date: Wed, 28 Nov 2018 08:17:40 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486082 - head/graphics/qgis Message-ID: <201811280817.wAS8HeKW025564@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Wed Nov 28 08:17:40 2018 New Revision: 486082 URL: https://svnweb.freebsd.org/changeset/ports/486082 Log: - Update to 2.18.26 - Change LIB_DEPENDS from qwt5 to qwt6 - Reorder CMAKE_ARGS - Adapt QWT_INCLUDE_DIR and QWT_LIBRARY after PyQt changes - Update GRASS7 dependency from 7.2.2 to 7.4.0 - Update several Python dependencies - Remove INSTALLS_ICONS, not needed here PR: 233504 Submitted by: rhurlin@gwdg.de(maintainer) Modified: head/graphics/qgis/Makefile head/graphics/qgis/distinfo head/graphics/qgis/pkg-plist Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Wed Nov 28 08:12:18 2018 (r486081) +++ head/graphics/qgis/Makefile Wed Nov 28 08:17:40 2018 (r486082) @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 2_18_17 -PORTREVISION= 8 +DISTVERSION= 2_18_26 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -21,7 +20,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libqca.so:devel/qca@qt4 \ libqjson.so:devel/qjson@qt4 \ libqscintilla2_qt4.so:devel/qscintilla2 \ - libqwt.so:x11-toolkits/qwt5 \ + libqwt6.so:x11-toolkits/qwt6@qt4 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libxerces-c.so:textproc/xerces-c3 @@ -50,10 +49,15 @@ DEBUG_DESC= Write Debugging Output to Console SERVER_DESC= Enable QGIS server TESTS_DESC= Run the test suite after build process -CMAKE_ARGS+= -DENABLE_QT5=OFF -DENABLE_PYTHON3=OFF \ - -DWITH_ORACLE:BOOL=FALSE \ - -DWITH_GLOBE:BOOL=FALSE \ - -DPYUIC_PROGRAM:STRING="${LOCALBASE}/bin/pyuic4" # cmake script fails to find it without PYUIC_PROGRAM +CMAKE_ARGS+= -DENABLE_QT5=OFF +CMAKE_ARGS+= -DENABLE_PYTHON3=OFF +# cmake script fails to find it without PYUIC_PROGRAM +CMAKE_ARGS+= -DPYUIC_PROGRAM:STRING="${LOCALBASE}/bin/pyuic4" +CMAKE_ARGS+= -DQWT_INCLUDE_DIR:PATH="${LOCALBASE}/include/qt4/qwt6/" +CMAKE_ARGS+= -DQWT_LIBRARY:FILEPATH="${LOCALBASE}/lib/qt4/libqwt6.so" +CMAKE_ARGS+= -DWITH_QWTPOLAR=ON +CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE +CMAKE_ARGS+= -DWITH_GLOBE:BOOL=FALSE .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev @@ -76,9 +80,9 @@ CUSTOMWIDGETS_CMAKE_OFF= -DWITH_CUSTOM_WIDGETS:BOOL=FA DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release -GRASS_BUILD_DEPENDS= grass72:databases/grass7 -GRASS_RUN_DEPENDS= grass72:databases/grass7 -GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.2 +GRASS_BUILD_DEPENDS= grass74:databases/grass7 +GRASS_RUN_DEPENDS= grass74:databases/grass7 +GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.4.0 GRASS_FORCE_MAKE_JOBS= NO GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE @@ -88,49 +92,49 @@ POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE @@ -140,8 +144,6 @@ SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE TESTS_CMAKE_ON= -DENABLE_TESTS=TRUE TESTS_CMAKE_OFF= -DENABLE_TESTS=FALSE - -INSTALLS_ICONS= yes pre-patch: @${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \ Modified: head/graphics/qgis/distinfo ============================================================================== --- head/graphics/qgis/distinfo Wed Nov 28 08:12:18 2018 (r486081) +++ head/graphics/qgis/distinfo Wed Nov 28 08:17:40 2018 (r486082) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519478387 -SHA256 (qgis-QGIS-final-2_18_17_GH0.tar.gz) = 1d031fbe287c90aa4a90499e83200261b7d38844838c5dd6660e2ce6e9f29d88 -SIZE (qgis-QGIS-final-2_18_17_GH0.tar.gz) = 99352557 +TIMESTAMP = 1543089824 +SHA256 (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 08109f3d32e70bd04c396ded4eb979013ce2590b66793648e97132d18b7af915 +SIZE (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 99575234 Modified: head/graphics/qgis/pkg-plist ============================================================================== --- head/graphics/qgis/pkg-plist Wed Nov 28 08:12:18 2018 (r486081) +++ head/graphics/qgis/pkg-plist Wed Nov 28 08:17:40 2018 (r486082) @@ -3,7 +3,6 @@ bin/qbrowser bin/qgis %%TESTS%%bin/qgis_bench %%SERVER%%bin/qgis_mapserv.fcgi -%%TESTS%%%%DEBUG%%bin/qgis_wcstest %%SERVER%%bin/schemaExtension.xsd %%SERVER%%bin/wms_metadata.xml include/qgis/Bezier3D.h @@ -758,21 +757,21 @@ include/qgis/ui_qgsquerybuilderbase.h include/qgis/ui_qgssqlcomposerdialogbase.h include/qgis/ui_qgssublayersdialogbase.h lib/libqgis_analysis.so -lib/libqgis_analysis.so.2.18.17 +lib/libqgis_analysis.so.2.18.26 lib/libqgis_app.so -lib/libqgis_app.so.2.18.17 +lib/libqgis_app.so.2.18.26 lib/libqgis_core.so -lib/libqgis_core.so.2.18.17 +lib/libqgis_core.so.2.18.26 lib/libqgis_gui.so -lib/libqgis_gui.so.2.18.17 +lib/libqgis_gui.so.2.18.26 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.18.17 +lib/libqgis_networkanalysis.so.2.18.26 %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.2.18.17 +%%SERVER%%lib/libqgis_server.so.2.18.26 %%GRASS%%lib/libqgisgrass7.so -%%GRASS%%lib/libqgisgrass7.so.2.18.17 +%%GRASS%%lib/libqgisgrass7.so.2.18.26 %%PYTHON%%lib/libqgispython.so -%%PYTHON%%lib/libqgispython.so.2.18.17 +%%PYTHON%%lib/libqgispython.so.2.18.26 %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser7 @@ -821,7 +820,7 @@ lib/qgis/plugins/libwmsprovider.so lib/qgis/plugins/libzonalstatisticsplugin.so lib/qgis/qgis_help %%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so -%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.17 +%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.26 man/man1/qbrowser.1.gz man/man1/qgis.1.gz share/applications/qgis.desktop @@ -6291,7 +6290,6 @@ share/icons/hicolor/96x96/apps/qgis.png %%DATADIR%%/resources/themes/Night Mapping/icons/up_arrow.png %%DATADIR%%/resources/themes/Night Mapping/style.qss %%DATADIR%%/resources/themes/Night Mapping/variables.qss -%%TESTS%%%%DEBUG%%%%DATADIR%%/resources/wcs-servers.json %%DATADIR%%/svg/accommodation/accommodation_alpinehut.svg %%DATADIR%%/svg/accommodation/accommodation_bed_and_breakfast.svg %%DATADIR%%/svg/accommodation/accommodation_camping.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811280817.wAS8HeKW025564>