databases/grass7: update to 7.6.1

PR:		236830
Submitted by:	lbartoletti <lbartoletti@tuxfamily.org> (maintainer)

3 files changed, 69 insertions, 67 deletions

diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 1ef2d10c92ac..3e46248ba4aa 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grass
-PORTVERSION=	7.6.0
-PORTREVISION=	3
+PORTVERSION=	7.6.1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -76,7 +75,7 @@ MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
-		VERSION="${PORTVERSION}" \
+		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
@@ -88,7 +87,7 @@ OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB MOTIF NETCDF MYSQL ODBC
 OPTIONS_SUB=		yes
 
 #BLAS_DESC=		BLAS/LAPACK support
-#GOTOBLAS_DESC=		GotoBLAS implementation
+#GOTOBLAS_DESC=		GotoBLAS implementationS
 LAS_DESC=		Enable LiDAR modules
 PDAL_DESC=		Enable points cloud data modules
 #ATLAS_USES=		blaslapack:atlas
@@ -123,10 +122,10 @@ SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_F
 .include <bsd.port.options.mk>
 
 .if !defined (GRASS_INST_DIR)
-GRASS_INST_DIR=	${PORTNAME}-${PORTVERSION}
+GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
 
-MANDIRS=	${PREFIX}/grass-${PORTVERSION}/docs/man/man1
+MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
 	${REINPLACE_CMD} -e \
@@ -167,7 +166,7 @@ post-patch:
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png
-	${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}-${PORTVERSION}/docs/html/
+	${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/
 .for file in i_atcorr_B02_atcorr.png \
 		i_ortho_photo_step1.png \
 		i_ortho_photo_step5.png \
@@ -180,7 +179,7 @@ post-install:
 		rterraflow_dir3.png \
 		sweep1.png \
 		sweep2.png
-	${TOUCH} ${STAGEDIR}${LOCALBASE}/${PORTNAME}-${PORTVERSION}/docs/html/${file}
+	${TOUCH} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/${file}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
@@ -192,5 +191,6 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
 	${LN} -sf ${PORTNAME}${VER} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
-
+	${LN} -s ${PORTNAME}${VER} \
+		${STAGEDIR}${PREFIX}/${PORTNAME}-${PORTVERSION}
 .include <bsd.port.mk>
diff --git a/databases/grass7/distinfo b/databases/grass7/distinfo
index 84416f6732f3..0147058a51d2 100644
--- a/databases/grass7/distinfo
+++ b/databases/grass7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547714655
-SHA256 (grass-7.6.0.tar.gz) = 07628f83ad59ba6d9d097cdc91c490efaf5b1d57bc7ee1fc2709183162741b6a
-SIZE (grass-7.6.0.tar.gz) = 60605953
+TIMESTAMP = 1553326217
+SHA256 (grass-7.6.1.tar.gz) = 9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
+SIZE (grass-7.6.1.tar.gz) = 59952303
diff --git a/databases/grass7/pkg-plist b/databases/grass7/pkg-plist
index 91568ffe94e0..a99c9e13db96 100644
--- a/databases/grass7/pkg-plist
+++ b/databases/grass7/pkg-plist
@@ -1,3 +1,4 @@
+grass-%%VERSION%%
 bin/grass%%MAJVER%%
 bin/grass%%VER%%
 %%GRASS_INST_DIR%%/AUTHORS
@@ -2445,8 +2446,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/ximgview.1.gz
 %%GRASS_INST_DIR%%/driver/db/dbf
 %%GRASS_INST_DIR%%/driver/db/ogr
-%%GRASS_INST_DIR%%/driver/db/pg
-%%GRASS_INST_DIR%%/driver/db/sqlite
+%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
+%%SQLITE%%%%GRASS_INST_DIR%%/driver/db/sqlite
 %%GRASS_INST_DIR%%/etc/VERSIONNUMBER
 %%GRASS_INST_DIR%%/etc/clean_temp
 %%GRASS_INST_DIR%%/etc/colors.desc
@@ -3883,110 +3884,110 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/vedit.h
 %%GRASS_INST_DIR%%/include/grass/version.h
 %%GRASS_INST_DIR%%/include/grass/waterglobs.h
-%%GRASS_INST_DIR%%/lib/libgrass_arraystats.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_arraystats.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_arraystats.so
-%%GRASS_INST_DIR%%/lib/libgrass_bitmap.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_bitmap.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_bitmap.so
-%%GRASS_INST_DIR%%/lib/libgrass_btree.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_btree.so
-%%GRASS_INST_DIR%%/lib/libgrass_btree2.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree2.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_btree2.so
-%%GRASS_INST_DIR%%/lib/libgrass_cairodriver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cairodriver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_cairodriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_calc.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_calc.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_calc.so
-%%GRASS_INST_DIR%%/lib/libgrass_ccmath.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_ccmath.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_ccmath.so
-%%GRASS_INST_DIR%%/lib/libgrass_cdhc.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cdhc.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_cdhc.so
-%%GRASS_INST_DIR%%/lib/libgrass_cluster.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cluster.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_cluster.so
-%%GRASS_INST_DIR%%/lib/libgrass_datetime.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_datetime.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_datetime.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmibase.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dbstubs.so
-%%GRASS_INST_DIR%%/lib/libgrass_dgl.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dgl.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dgl.so
-%%GRASS_INST_DIR%%/lib/libgrass_dig2.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dig2.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dig2.so
-%%GRASS_INST_DIR%%/lib/libgrass_display.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_display.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_display.so
-%%GRASS_INST_DIR%%/lib/libgrass_driver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_driver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_driver.so
-%%GRASS_INST_DIR%%/lib/libgrass_dspf.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dspf.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_dspf.so
-%%GRASS_INST_DIR%%/lib/libgrass_g3d.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_g3d.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_g3d.so
-%%GRASS_INST_DIR%%/lib/libgrass_gis.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gis.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_gis.so
-%%GRASS_INST_DIR%%/lib/libgrass_gmath.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gmath.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_gmath.so
-%%GRASS_INST_DIR%%/lib/libgrass_gpde.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gpde.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_gpde.so
-%%GRASS_INST_DIR%%/lib/libgrass_gproj.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gproj.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_gproj.so
-%%GRASS_INST_DIR%%/lib/libgrass_htmldriver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_htmldriver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_htmldriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_imagery.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_imagery.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_imagery.so
-%%GRASS_INST_DIR%%/lib/libgrass_interpdata.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpdata.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_interpdata.so
-%%GRASS_INST_DIR%%/lib/libgrass_interpfl.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpfl.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_interpfl.so
-%%GRASS_INST_DIR%%/lib/libgrass_iortho.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_iortho.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_iortho.so
-%%GRASS_INST_DIR%%/lib/libgrass_iostream.%%VERSION%%.a
-%%GRASS_INST_DIR%%/lib/libgrass_lidar.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_iostream.%%VERS%%.a
+%%GRASS_INST_DIR%%/lib/libgrass_lidar.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_lidar.so
-%%GRASS_INST_DIR%%/lib/libgrass_linkm.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_linkm.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_linkm.so
-%%GRASS_INST_DIR%%/lib/libgrass_lrs.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_lrs.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_lrs.so
-%%GRASS_INST_DIR%%/lib/libgrass_manage.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_manage.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_manage.so
-%%GRASS_INST_DIR%%/lib/libgrass_neta.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_neta.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_neta.so
-%%GRASS_INST_DIR%%/lib/libgrass_nviz.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_nviz.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_nviz.so
-%%GRASS_INST_DIR%%/lib/libgrass_ogsf.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_ogsf.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_ogsf.so
-%%GRASS_INST_DIR%%/lib/libgrass_pngdriver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_pngdriver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_pngdriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_psdriver.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_psdriver.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_psdriver.so
-%%GRASS_INST_DIR%%/lib/libgrass_qtree.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_qtree.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_qtree.so
-%%GRASS_INST_DIR%%/lib/libgrass_raster.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_raster.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_raster.so
-%%GRASS_INST_DIR%%/lib/libgrass_rli.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rli.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_rli.so
-%%GRASS_INST_DIR%%/lib/libgrass_rowio.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rowio.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_rowio.so
-%%GRASS_INST_DIR%%/lib/libgrass_rtree.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rtree.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_rtree.so
-%%GRASS_INST_DIR%%/lib/libgrass_segment.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_segment.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_segment.so
-%%GRASS_INST_DIR%%/lib/libgrass_shape.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_shape.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_shape.so
-%%GRASS_INST_DIR%%/lib/libgrass_sim.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_sim.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_sim.so
-%%GRASS_INST_DIR%%/lib/libgrass_sqlp.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_sqlp.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_sqlp.so
-%%GRASS_INST_DIR%%/lib/libgrass_stats.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_stats.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_stats.so
-%%GRASS_INST_DIR%%/lib/libgrass_symb.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_symb.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_symb.so
-%%GRASS_INST_DIR%%/lib/libgrass_temporal.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_temporal.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_temporal.so
-%%GRASS_INST_DIR%%/lib/libgrass_vector.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_vector.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_vector.so
-%%GRASS_INST_DIR%%/lib/libgrass_vedit.%%VERSION%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_vedit.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_vedit.so
 %%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grasslibs.mo
 %%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grassmods.mo
@@ -4253,6 +4254,7 @@ bin/grass%%VER%%
 %%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_mean.png
 %%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_dem_mean3D.jpg
 %%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_zrange.png
+%%GRASS_INST_DIR%%/docs/html/r_in_wms_sentinel2.jpg
 %%LAS%%%%GRASS_INST_DIR%%/docs/html/v.in.lidar.html
 %%LAS%%%%GRASS_INST_DIR%%/docs/html/v.out.lidar.html
 %%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/r.in.lidar.1.gz