diff -urN qgis.orig/Makefile qgis/Makefile --- qgis.orig/Makefile 2016-03-01 19:00:34.190586000 +0100 +++ qgis/Makefile 2016-03-26 11:56:21.495802000 +0100 @@ -2,7 +2,7 @@ # $FreeBSD: head/graphics/qgis/Makefile 409866 2016-03-01 10:43:40Z madpilot $ PORTNAME= qgis -PORTVERSION= 2.14.0 +PORTVERSION= 2.14.1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -23,9 +23,9 @@ USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} -GH_TAGNAME= 654fabd +GH_TAGNAME= ea85bef -USES= cpe bison cmake desktop-file-utils execinfo fortran gmake python sqlite +USES= cpe bison cmake desktop-file-utils execinfo fortran gmake python:2 sqlite USE_QT4= gui svg xml network sql designer testlib linguist_build \ qmake_build moc_build rcc_build uic_build @@ -106,6 +106,8 @@ SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE +INSTALLS_ICONS= yes + .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 @@ -136,12 +138,29 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/bin/qgis|${LOCALBASE}/bin/qgis|g' ${WRKSRC}/debian/${PORTNAME}.desktop - @${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' ${WRKSRC}/debian/${PORTNAME}.desktop + @${REINPLACE_CMD} -e 's|/usr/bin/qgis|${LOCALBASE}/bin/qgis|g' \ + ${WRKSRC}/debian/${PORTNAME}.desktop + @${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' \ + ${WRKSRC}/debian/${PORTNAME}.desktop + @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \ + ${WRKSRC}/python/ext-libs/pygments/util.py \ + ${WRKSRC}/python/ext-libs/pytz/tzfile.py \ + ${WRKSRC}/scripts/generate_test_mask_image.py \ + ${WRKSRC}/scripts/random_vector.py \ + ${WRKSRC}/scripts/widgets_tree.py \ + ${WRKSRC}/src/plugins/grass/qgis_grass_test.py \ + ${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \ + ${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \ + ${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \ + ${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \ + ${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py post-install: + ${RM} ${STAGEDIR}${DATADIR}/python/pygments/util.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/ + ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor .for SZ in ${ICON_SIZES} diff -urN qgis.orig/distinfo qgis/distinfo --- qgis.orig/distinfo 2016-03-01 19:00:34.176117000 +0100 +++ qgis/distinfo 2016-03-26 11:28:05.024735000 +0100 @@ -1,2 +1,2 @@ -SHA256 (qgis-QGIS-2.14.0-654fabd_GH0.tar.gz) = b60e168cc14f279d9d6e4376e1e4906aaf684f3a66f827e69aed29502bc6efbd -SIZE (qgis-QGIS-2.14.0-654fabd_GH0.tar.gz) = 89968339 +SHA256 (qgis-QGIS-2.14.1-ea85bef_GH0.tar.gz) = 268ab9736c8953b9e9758c492d348bfa254000cdeba8bc907aa6806ea2c52368 +SIZE (qgis-QGIS-2.14.1-ea85bef_GH0.tar.gz) = 87768282 diff -urN qgis.orig/pkg-plist qgis/pkg-plist --- qgis.orig/pkg-plist 2016-03-01 19:00:34.192225000 +0100 +++ qgis/pkg-plist 2016-03-26 11:55:52.465919000 +0100 @@ -406,6 +406,7 @@ include/qgis/qgsmultirenderchecker.h include/qgis/qgsnetworkaccessmanager.h include/qgis/qgsnetworkcontentfetcher.h +include/qgis/qgsnetworkdiskcache.h include/qgis/qgsnetworkreplyparser.h include/qgis/qgsnewhttpconnection.h include/qgis/qgsnewmemorylayerdialog.h @@ -656,21 +657,21 @@ include/qgis/ui_qgsquerybuilderbase.h include/qgis/ui_qgssublayersdialogbase.h lib/libqgis_analysis.so -lib/libqgis_analysis.so.2.14.0 +lib/libqgis_analysis.so.2.14.1 lib/libqgis_app.so -lib/libqgis_app.so.2.14.0 +lib/libqgis_app.so.2.14.1 lib/libqgis_core.so -lib/libqgis_core.so.2.14.0 +lib/libqgis_core.so.2.14.1 lib/libqgis_gui.so -lib/libqgis_gui.so.2.14.0 +lib/libqgis_gui.so.2.14.1 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.14.0 +lib/libqgis_networkanalysis.so.2.14.1 %%SERVER%%lib/libqgis_server.so -%%SERVER%%lib/libqgis_server.so.2.14.0 +%%SERVER%%lib/libqgis_server.so.2.14.1 %%GRASS%%lib/libqgisgrass6.so -%%GRASS%%lib/libqgisgrass6.so.2.14.0 +%%GRASS%%lib/libqgisgrass6.so.2.14.1 %%PYTHON%%lib/libqgispython.so -%%PYTHON%%lib/libqgispython.so.2.14.0 +%%PYTHON%%lib/libqgispython.so.2.14.1 %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6 @@ -716,7 +717,7 @@ lib/qgis/plugins/libzonalstatisticsplugin.so lib/qgis/qgis_help %%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so -%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.14.0 +%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.14.1 man/man1/qbrowser.1.gz man/man1/qgis.1.gz share/applications/qgis.desktop @@ -4111,6 +4112,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultiDirectionLeeFilter.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation(fromGrid).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolation.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultilevelB-SplineInterpolationforCategories.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultipleRegressionAnalysis(GridGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultipleRegressionAnalysis(PointsGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/MultiresolutionIndexofValleyBottomFlatness(MRVBF).txt @@ -4186,9 +4188,8 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/SurfaceSpecificPoints.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/TPIBasedLandformClassification.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/TerrainRuggednessIndex(TRI).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Global).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(Local).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline(TIN).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/ThinPlateSpline.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/ThresholdBuffer.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/TopographicCorrection.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.0/TopographicPositionIndex(TPI).txt @@ -4238,6 +4239,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/CloseGapswithSpline.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/CloseOneCellGaps.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ClusterAnalysisforGrids.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ConfusionMatrix(GridPolygons).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ContourLinesfromGrid.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ConvergenceIndex(SearchRadius).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ConvergenceIndex.txt @@ -4260,6 +4262,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/DirectionalStatisticsforSingleGrid.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/DistanceMatrix.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/DiurnalAnisotropicHeating.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/DiversityOfCategories.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/DownslopeDistanceGradient.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/EdgeContamination.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/EffectiveAirFlowHeights.txt @@ -4345,6 +4348,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultiDirectionLeeFilter.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolation(fromGrid).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolation.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultilevelB-SplineInterpolationforCategories.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultipleRegressionAnalysis(GridGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultipleRegressionAnalysis(PointsGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/MultiresolutionIndexofValleyBottomFlatness(MRVBF).txt @@ -4420,9 +4424,8 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/SurfaceSpecificPoints.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/TPIBasedLandformClassification.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/TerrainRuggednessIndex(TRI).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline(Global).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline(Local).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline(TIN).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ThinPlateSpline.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/ThresholdBuffer.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/TopographicCorrection.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.2/TopographicPositionIndex(TPI).txt @@ -4472,6 +4475,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CloseGapswithSpline.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CloseOneCellGaps.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ClusterAnalysisforGrids.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConfusionMatrix(GridPolygons).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ContourLinesfromGrid.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConvergenceIndex(SearchRadius).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConvergenceIndex.txt @@ -4483,7 +4487,8 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConvertPolygonLineVerticestoPoints.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConvertPolygonstoLines.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ConvexHull.txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CreateGraticule.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CreateLinesGraticule.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CreatePolygonsGraticule.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CropToData.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/Cross-ClassificationandTabulation.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CrossProfiles.txt @@ -4491,9 +4496,12 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CurvatureClassification.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/CutShapesLayer.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DTMFilter(slope-based).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DiffusiveHillslopeEvolution(ADI).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DiffusiveHillslopeEvolution(FTCS).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DirectionalStatisticsforSingleGrid.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DistanceMatrix.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DiurnalAnisotropicHeating.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DiversityOfCategories.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/DownslopeDistanceGradient.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/EdgeContamination.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/EffectiveAirFlowHeights.txt @@ -4501,6 +4509,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FastRepresentativeness.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FillGapsinRecords.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FillSinks(PlanchonDarboux,2001).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FillSinks(QMofESP).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FillSinks(WangLiu).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FillSinksXXL(WangLiu).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FilterClumps.txt @@ -4508,6 +4517,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FitNPointstoshape.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlatDetection.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlowAccumulation(FlowTracing).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlowAccumulation(QMofESP).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlowAccumulation(Recursive).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlowAccumulation(Top-Down).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/FlowPathLength.txt @@ -4579,6 +4589,7 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultiDirectionLeeFilter.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolation(fromGrid).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolation.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultilevelB-SplineInterpolationforCategories.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultipleRegressionAnalysis(GridGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultipleRegressionAnalysis(PointsGrids).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/MultiresolutionIndexofValleyBottomFlatness(MRVBF).txt @@ -4650,13 +4661,13 @@ %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/StatisticsforGrids.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/StrahlerOrder.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/StreamPowerIndex.txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/SuccessiveFlowRouting.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/SupervisedClassification.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/SurfaceSpecificPoints.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/TPIBasedLandformClassification.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/TerrainRuggednessIndex(TRI).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline(Global).txt -%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline(Local).txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline(TIN).txt +%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ThinPlateSpline.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/ThresholdBuffer.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/TopographicCorrection.txt %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/2.2.3/TopographicPositionIndex(TPI).txt