From 9fe75e179d3cc2fd64d362e5ab35b30d8f8ad922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= Date: Tue, 23 Feb 2021 05:58:35 +0000 Subject: [PATCH] graphics/gdal: Set the default options as a workable set - reinstate r552962 (was reverted in r553000) - remove pkg-message from qgis and qgis-ltr - Bump PORTREVSION on all consumers PR: 224004 Approved by: portmgr --- astro/libosmium/Makefile | 1 + astro/merkaartor/Makefile | 2 +- astro/qmapshack/Makefile | 1 + cad/sumo/Makefile | 2 +- databases/grass7/Makefile | 2 +- databases/postgis24/Makefile | 2 +- databases/postgis25/Makefile | 2 +- databases/postgis30/Makefile | 1 + databases/postgis31/Makefile | 1 + databases/postgresql-ogr_fdw/Makefile | 1 + games/flightgear-terragear/Makefile | 2 +- graphics/R-cran-rgdal/Makefile | 1 + graphics/gdal/Makefile | 6 ++++-- graphics/gmt/Makefile | 2 +- graphics/mapcache/Makefile | 1 + graphics/mapserver/Makefile | 1 + graphics/openorienteering-mapper/Makefile | 2 +- graphics/osg/Makefile | 2 +- graphics/osg34/Makefile | 2 +- graphics/osgearth/Makefile | 2 +- graphics/p5-Geo-GDAL/Makefile | 1 + graphics/py-fiona/Makefile | 1 + graphics/py-gdal/Makefile | 1 + graphics/qgis-ltr/Makefile | 4 +--- graphics/qgis-ltr/files/pkg-message.in | 18 ------------------ graphics/qgis/Makefile | 3 +-- graphics/qgis/files/pkg-message.in | 18 ------------------ math/R-cran-sf/Makefile | 1 + math/pdal/Makefile | 2 +- math/saga/Makefile | 2 +- 30 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 graphics/qgis-ltr/files/pkg-message.in delete mode 100644 graphics/qgis/files/pkg-message.in diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile index 08317054b2a8..e091179db4a0 100644 --- a/astro/libosmium/Makefile +++ b/astro/libosmium/Makefile @@ -3,6 +3,7 @@ PORTNAME= libosmium PORTVERSION= 2.16.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= astro geography devel diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index 24aaf34c45c7..55a77931a8ac 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -3,7 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.2 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= astro MAINTAINER= dev2@heesakkers.info diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 4daf32790f6f..950e9ce8c995 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -3,6 +3,7 @@ PORTNAME= qmapshack PORTVERSION= 1.15.2 +PORTREVISION= 1 DISTVERSIONPREFIX= V_ CATEGORIES= astro diff --git a/cad/sumo/Makefile b/cad/sumo/Makefile index 3d617d5a21c5..b3762377bd32 100644 --- a/cad/sumo/Makefile +++ b/cad/sumo/Makefile @@ -2,7 +2,7 @@ PORTNAME= sumo DISTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/ DISTFILES= ${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX} diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile index a4d2d8262265..58fb2f977492 100644 --- a/databases/grass7/Makefile +++ b/databases/grass7/Makefile @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 7.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ diff --git a/databases/postgis24/Makefile b/databases/postgis24/Makefile index 186bb6ac90d2..ceef8236477b 100644 --- a/databases/postgis24/Makefile +++ b/databases/postgis24/Makefile @@ -3,7 +3,7 @@ PORTNAME= postgis PORTVERSION= 2.4.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases geography MASTER_SITES= https://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 24 diff --git a/databases/postgis25/Makefile b/databases/postgis25/Makefile index 5be0a29891c6..f90592728935 100644 --- a/databases/postgis25/Makefile +++ b/databases/postgis25/Makefile @@ -3,7 +3,7 @@ PORTNAME= postgis PORTVERSION= 2.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases geography MASTER_SITES= https://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 25 diff --git a/databases/postgis30/Makefile b/databases/postgis30/Makefile index e594ac3d3fc4..f1daae79197b 100644 --- a/databases/postgis30/Makefile +++ b/databases/postgis30/Makefile @@ -3,6 +3,7 @@ PORTNAME= postgis PORTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= https://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 30 diff --git a/databases/postgis31/Makefile b/databases/postgis31/Makefile index f18d417ccd3e..7cd9f50ea78d 100644 --- a/databases/postgis31/Makefile +++ b/databases/postgis31/Makefile @@ -2,6 +2,7 @@ PORTNAME= postgis PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= databases geography MASTER_SITES= https://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 31 diff --git a/databases/postgresql-ogr_fdw/Makefile b/databases/postgresql-ogr_fdw/Makefile index 2c831ab4a3bd..a49ff599ae68 100644 --- a/databases/postgresql-ogr_fdw/Makefile +++ b/databases/postgresql-ogr_fdw/Makefile @@ -3,6 +3,7 @@ PORTNAME= ogr_fdw DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- diff --git a/games/flightgear-terragear/Makefile b/games/flightgear-terragear/Makefile index c9146055efdf..b6a3f91d796d 100644 --- a/games/flightgear-terragear/Makefile +++ b/games/flightgear-terragear/Makefile @@ -2,7 +2,7 @@ PORTNAME= flightgear-terragear PORTVERSION= 20171007 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MAINTAINER= ports@FreeBSD.org diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile index 666b5e3de0a4..934a7be827e5 100644 --- a/graphics/R-cran-rgdal/Makefile +++ b/graphics/R-cran-rgdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= rgdal DISTVERSION= 1.5-23 +PORTREVISION= 1 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 501e301ad9dc..37cbb111d986 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet @@ -27,7 +27,9 @@ LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ OPTIONS_DEFINE= ARMADILLO CFITSIO CHARLS CRYPTOPP CURL DODS ECW EXPAT EXR FREEXL GEOS GTA HDF5 JASPER KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER -OPTIONS_DEFAULT=JASPER +OPTIONS_DEFAULT= CURL EXPAT FREEXL GEOS HDF5 JASPER \ + KML LIBXML2 NETCDF OPENJPEG PCRE PGSQL SFCGAL \ + SPATIALITE SQLITE WEBP XERCES ZSTD POPPLER OPTIONS_SUB= yes CHARLS_DESC= JPEG-Lossless support via charls CRYPTOPP_DESC= Cryptopp support diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile index 1b939687b4ec..41115899c274 100644 --- a/graphics/gmt/Makefile +++ b/graphics/gmt/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmt DISTVERSION= 6.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= lbartoletti@FreeBSD.org diff --git a/graphics/mapcache/Makefile b/graphics/mapcache/Makefile index 5cb0a214d563..717498e9ee59 100644 --- a/graphics/mapcache/Makefile +++ b/graphics/mapcache/Makefile @@ -3,6 +3,7 @@ PORTNAME= mapcache DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/mapserver/ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 7b72d58ff33f..21c4c60dcb3f 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -3,6 +3,7 @@ PORTNAME= mapserver PORTVERSION= 7.6.2 +PORTREVISION= 1 CATEGORIES= graphics www geography MASTER_SITES= https://download.osgeo.org/mapserver/ diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile index d268c58cbd3c..a5b0f0b42c7e 100644 --- a/graphics/openorienteering-mapper/Makefile +++ b/graphics/openorienteering-mapper/Makefile @@ -3,7 +3,7 @@ PORTNAME= openorienteering-mapper PORTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= graphics geography diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 54155198738d..b6db17855ef2 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.6.5 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile index 1dd27595c1b7..6a9db4882b85 100644 --- a/graphics/osg34/Makefile +++ b/graphics/osg34/Makefile @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics PKGNAMESUFFIX= 34 diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 1f502c3c7126..4081a7a9b53b 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -4,7 +4,7 @@ PORTNAME= osgearth PORTVERSION= 2.10.1 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics geography MAINTAINER= lbartoletti@FreeBSD.org diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile index 06c089dc7d14..89e4559cd4f0 100644 --- a/graphics/p5-Geo-GDAL/Makefile +++ b/graphics/p5-Geo-GDAL/Makefile @@ -3,6 +3,7 @@ PORTNAME= Geo-GDAL PORTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/py-fiona/Makefile b/graphics/py-fiona/Makefile index 619f0b91c409..1b36aa7edd1a 100644 --- a/graphics/py-fiona/Makefile +++ b/graphics/py-fiona/Makefile @@ -2,6 +2,7 @@ PORTNAME= Fiona DISTVERSION= 1.8.18 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile index 349335e87636..022afadd89d4 100644 --- a/graphics/py-gdal/Makefile +++ b/graphics/py-gdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 62aefe459268..5f83f4c267e6 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_10_14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr @@ -138,8 +138,6 @@ CMAKE_OFF+= SUPPRESS_QT_WARNINGS CONFLICTS_INSTALL= qgis -SUB_FILES= pkg-message - PLIST_SUB= DISTVERSION=${PORTVERSION} OPTIONS_DEFINE= GRASS SERVER diff --git a/graphics/qgis-ltr/files/pkg-message.in b/graphics/qgis-ltr/files/pkg-message.in deleted file mode 100644 index 68debd28f108..000000000000 --- a/graphics/qgis-ltr/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -[ -{ type: install - message: <