Date: Mon, 26 Feb 2018 08:29:43 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462996 - head/graphics/qgis Message-ID: <201802260829.w1Q8ThND076969@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Feb 26 08:29:43 2018 New Revision: 462996 URL: https://svnweb.freebsd.org/changeset/ports/462996 Log: graphics/qgis: Update to 2.18.17 Additional port changes: * Added PYUIC_PROGRAM because cmake couldn't find pyuic4 * Flavorized some dependencies with missing flavors * Silenced/improved some commands * Updated WWW PR: 226190 Submitted by: Rainer Hurling <rhurlin@gwdg.de> (maintainer) Approved by: tcberner (mentor, implicit) Modified: head/graphics/qgis/Makefile head/graphics/qgis/distinfo head/graphics/qgis/pkg-descr head/graphics/qgis/pkg-plist Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Mon Feb 26 08:16:59 2018 (r462995) +++ head/graphics/qgis/Makefile Mon Feb 26 08:29:43 2018 (r462996) @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 2_18_15 -PORTREVISION= 1 +DISTVERSION= 2_18_17 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -28,17 +27,14 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ USES= bison cmake compiler:features cpe desktop-file-utils \ fortran gmake pyqt:4 python:2.7 sqlite:3 - USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} - USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run - USE_QT4= corelib designer doc gui linguist_build moc_build \ network qmake_build rcc_build script sql sql-pgsql \ sql-sqlite3 svg testlib uic_build webkit xml - USE_LDCONFIG= yes + ICON_SIZES= 8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512 OPTIONS_DEFINE= PYTHON POSTGIS GRASS SERVER @@ -55,7 +51,8 @@ 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 + -DWITH_GLOBE:BOOL=FALSE \ + -DPYUIC_PROGRAM:STRING="${LOCALBASE}/bin/pyuic4" # cmake script fails to find it without PYUIC_PROGRAM .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev @@ -102,7 +99,7 @@ PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0 ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3: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 \ + ${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} \ @@ -125,7 +122,7 @@ PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.1 ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3: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 \ + ${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} \ @@ -174,7 +171,7 @@ post-patch: ${WRKSRC}/python/ext-libs/CMakeLists.txt post-install: - ${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak + @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @@ -188,9 +185,9 @@ post-install: .endfor post-install-TESTS-on: - ${RM} /tmp/srs.db + @${RM} /tmp/srs.db check: - (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include <bsd.port.mk> Modified: head/graphics/qgis/distinfo ============================================================================== --- head/graphics/qgis/distinfo Mon Feb 26 08:16:59 2018 (r462995) +++ head/graphics/qgis/distinfo Mon Feb 26 08:29:43 2018 (r462996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513436777 -SHA256 (qgis-QGIS-final-2_18_15_GH0.tar.gz) = d47eb5ab7ad7c469f911eb8e8249a771becc9969c3909f773a48d29774a653c7 -SIZE (qgis-QGIS-final-2_18_15_GH0.tar.gz) = 99339627 +TIMESTAMP = 1519478387 +SHA256 (qgis-QGIS-final-2_18_17_GH0.tar.gz) = 1d031fbe287c90aa4a90499e83200261b7d38844838c5dd6660e2ce6e9f29d88 +SIZE (qgis-QGIS-final-2_18_17_GH0.tar.gz) = 99352557 Modified: head/graphics/qgis/pkg-descr ============================================================================== --- head/graphics/qgis/pkg-descr Mon Feb 26 08:16:59 2018 (r462995) +++ head/graphics/qgis/pkg-descr Mon Feb 26 08:29:43 2018 (r462996) @@ -11,4 +11,4 @@ Some of the major features include: - GRASS Digitizing - Feature labeling -WWW: http://www.qgis.org/ +WWW: https://www.qgis.org/en/site/ Modified: head/graphics/qgis/pkg-plist ============================================================================== --- head/graphics/qgis/pkg-plist Mon Feb 26 08:16:59 2018 (r462995) +++ head/graphics/qgis/pkg-plist Mon Feb 26 08:29:43 2018 (r462996) @@ -758,21 +758,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.15 +lib/libqgis_analysis.so.2.18.17 lib/libqgis_app.so -lib/libqgis_app.so.2.18.15 +lib/libqgis_app.so.2.18.17 lib/libqgis_core.so -lib/libqgis_core.so.2.18.15 +lib/libqgis_core.so.2.18.17 lib/libqgis_gui.so -lib/libqgis_gui.so.2.18.15 +lib/libqgis_gui.so.2.18.17 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.18.15 +lib/libqgis_networkanalysis.so.2.18.17 %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.2.18.15 +%%SERVER%%lib/libqgis_server.so.2.18.17 %%GRASS%%lib/libqgisgrass7.so -%%GRASS%%lib/libqgisgrass7.so.2.18.15 +%%GRASS%%lib/libqgisgrass7.so.2.18.17 %%PYTHON%%lib/libqgispython.so -%%PYTHON%%lib/libqgispython.so.2.18.15 +%%PYTHON%%lib/libqgispython.so.2.18.17 %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser7 @@ -821,7 +821,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.15 +%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.17 man/man1/qbrowser.1.gz man/man1/qgis.1.gz share/applications/qgis.desktop @@ -2721,6 +2721,7 @@ share/icons/hicolor/96x96/apps/qgis.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.dissolve.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.distance.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.drape.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.drape.where.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.edit.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.extract.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.extrude.txt @@ -4906,6 +4907,7 @@ share/icons/hicolor/96x96/apps/qgis.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/images/runalgorithm.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/images/saga.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/images/script.png +%%PYTHON%%%%DATADIR%%/python/plugins/processing/images/search.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/images/taudem.svg %%PYTHON%%%%DATADIR%%/python/plugins/processing/images/tool.png %%PYTHON%%%%DATADIR%%/python/plugins/processing/metadata.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802260829.w1Q8ThND076969>