Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Feb 2019 06:48:37 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491916 - in head: databases/grass7 graphics/qgis
Message-ID:  <201902020648.x126mbor000641@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Feb  2 06:48:37 2019
New Revision: 491916
URL: https://svnweb.freebsd.org/changeset/ports/491916

Log:
  - Update `databases/grass7' to version 7.6.0
  - Reformat pkg-message for better readability
    and kill stray EOL whitespace
  
  PR:		235307
  Submitted by:	maintainer

Modified:
  head/databases/grass7/Makefile
  head/databases/grass7/distinfo
  head/databases/grass7/pkg-message
  head/databases/grass7/pkg-plist
  head/graphics/qgis/Makefile

Modified: head/databases/grass7/Makefile
==============================================================================
--- head/databases/grass7/Makefile	Sat Feb  2 06:47:15 2019	(r491915)
+++ head/databases/grass7/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grass
-PORTVERSION=	7.4.4
+PORTVERSION=	7.6.0
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -15,7 +15,7 @@ MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
-MASTER_SITE_SUBDIR=	grass74/source
+MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	lbartoletti@tuxfamily.org
@@ -72,10 +72,11 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
+VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" \
-		VER="${PORTVERSION:R:C/\.//}"
+		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
 OPTIONS_MULTI=		DB
@@ -188,5 +189,7 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
+	${LN} -sf ${PORTNAME}${VER} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>

Modified: head/databases/grass7/distinfo
==============================================================================
--- head/databases/grass7/distinfo	Sat Feb  2 06:47:15 2019	(r491915)
+++ head/databases/grass7/distinfo	Sat Feb  2 06:48:37 2019	(r491916)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546991213
-SHA256 (grass-7.4.4.tar.gz) = 96a39e273103f7375a670eba94fa3e5dad2819c5c5664c9aee8f145882a94e8c
-SIZE (grass-7.4.4.tar.gz) = 58454921
+TIMESTAMP = 1547714655
+SHA256 (grass-7.6.0.tar.gz) = 07628f83ad59ba6d9d097cdc91c490efaf5b1d57bc7ee1fc2709183162741b6a
+SIZE (grass-7.6.0.tar.gz) = 60605953

Modified: head/databases/grass7/pkg-message
==============================================================================
--- head/databases/grass7/pkg-message	Sat Feb  2 06:47:15 2019	(r491915)
+++ head/databases/grass7/pkg-message	Sat Feb  2 06:48:37 2019	(r491916)
@@ -1,14 +1,14 @@
 To run the wxpython based GUI:
 
-export GRASS_PYTHON=python2.7 (or your local python version)
-grass -gui 
+    export GRASS_PYTHON=python2.7 (or your local python version)
+    grass -gui
 
 To map gcc for numpy, add:
 
-libgcc_s.so.1   gcc6/libgcc_s.so.1
-libgomp.so.1    gcc6/libgomp.so.1
-libssp.so.0     gcc6/libssp.so.0
-libstdc++.so.6  gcc6/libstdc++.so.6
+    libgcc_s.so.1   gcc6/libgcc_s.so.1
+    libgomp.so.1    gcc6/libgomp.so.1
+    libssp.so.0     gcc6/libssp.so.0
+    libstdc++.so.6  gcc6/libstdc++.so.6
 
 to %%LOCALBASE%%/etc/libmap.d/gcc.conf. Use your local gcc version
 instead of gcc6.

Modified: head/databases/grass7/pkg-plist
==============================================================================
--- head/databases/grass7/pkg-plist	Sat Feb  2 06:47:15 2019	(r491915)
+++ head/databases/grass7/pkg-plist	Sat Feb  2 06:48:37 2019	(r491916)
@@ -1,3 +1,4 @@
+bin/grass%%MAJVER%%
 bin/grass%%VER%%
 %%GRASS_INST_DIR%%/AUTHORS
 %%GRASS_INST_DIR%%/CHANGES
@@ -122,6 +123,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/ps.map
 %%GRASS_INST_DIR%%/bin/r.basins.fill
 %%GRASS_INST_DIR%%/bin/r.buffer
+%%GRASS_INST_DIR%%/bin/r.buildvrt
 %%GRASS_INST_DIR%%/bin/r.carve
 %%GRASS_INST_DIR%%/bin/r.category
 %%GRASS_INST_DIR%%/bin/r.circle
@@ -137,7 +139,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r.cross
 %%GRASS_INST_DIR%%/bin/r.describe
 %%GRASS_INST_DIR%%/bin/r.distance
-%%GRASS_INST_DIR%%/bin/r.drain
 %%GRASS_INST_DIR%%/bin/r.external
 %%GRASS_INST_DIR%%/bin/r.external.out
 %%GRASS_INST_DIR%%/bin/r.fill.dir
@@ -195,6 +196,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r.out.vtk
 %%GRASS_INST_DIR%%/bin/r.param.scale
 %%GRASS_INST_DIR%%/bin/r.patch
+%%GRASS_INST_DIR%%/bin/r.path
 %%GRASS_INST_DIR%%/bin/r.profile
 %%GRASS_INST_DIR%%/bin/r.proj
 %%GRASS_INST_DIR%%/bin/r.quant
@@ -471,10 +473,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/colortables/grey255.png
 %%GRASS_INST_DIR%%/docs/html/colortables/gyr.png
 %%GRASS_INST_DIR%%/docs/html/colortables/haxby.png
+%%GRASS_INST_DIR%%/docs/html/colortables/inferno.png
 %%GRASS_INST_DIR%%/docs/html/colortables/kelvin.png
+%%GRASS_INST_DIR%%/docs/html/colortables/magma.png
 %%GRASS_INST_DIR%%/docs/html/colortables/ndvi.png
 %%GRASS_INST_DIR%%/docs/html/colortables/ndwi.png
 %%GRASS_INST_DIR%%/docs/html/colortables/oranges.png
+%%GRASS_INST_DIR%%/docs/html/colortables/plasma.png
 %%GRASS_INST_DIR%%/docs/html/colortables/population.png
 %%GRASS_INST_DIR%%/docs/html/colortables/population_dens.png
 %%GRASS_INST_DIR%%/docs/html/colortables/precipitation.png
@@ -694,6 +699,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_7.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_8.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_sample_areas.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_tplot_export_csv.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_tplot_labels.png
 %%GRASS_INST_DIR%%/docs/html/g_mapsets_gui.png
 %%GRASS_INST_DIR%%/docs/html/g_parser_test.png
 %%GRASS_INST_DIR%%/docs/html/general.html
@@ -1018,6 +1025,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.blend.html
 %%GRASS_INST_DIR%%/docs/html/r.buffer.html
 %%GRASS_INST_DIR%%/docs/html/r.buffer.lowmem.html
+%%GRASS_INST_DIR%%/docs/html/r.buildvrt.html
 %%GRASS_INST_DIR%%/docs/html/r.carve.html
 %%GRASS_INST_DIR%%/docs/html/r.category.html
 %%GRASS_INST_DIR%%/docs/html/r.circle.html
@@ -1104,6 +1112,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.pack.html
 %%GRASS_INST_DIR%%/docs/html/r.param.scale.html
 %%GRASS_INST_DIR%%/docs/html/r.patch.html
+%%GRASS_INST_DIR%%/docs/html/r.path.html
 %%GRASS_INST_DIR%%/docs/html/r.plane.html
 %%GRASS_INST_DIR%%/docs/html/r.profile.html
 %%GRASS_INST_DIR%%/docs/html/r.proj.html
@@ -1246,6 +1255,9 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r_param_scale_morph.jpg
 %%GRASS_INST_DIR%%/docs/html/r_patch.png
 %%GRASS_INST_DIR%%/docs/html/r_patch_zeros_as_nulls.png
+%%GRASS_INST_DIR%%/docs/html/r_path.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_bitmask.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_r_watershed_direction.png
 %%GRASS_INST_DIR%%/docs/html/r_random_cells.png
 %%GRASS_INST_DIR%%/docs/html/r_relief.png
 %%GRASS_INST_DIR%%/docs/html/r_resamp_interp_new_250m.png
@@ -1281,6 +1293,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/raster_graphical.html
 %%GRASS_INST_DIR%%/docs/html/rasterintro.html
 %%GRASS_INST_DIR%%/docs/html/rcost_knightsmove.png
+%%GRASS_INST_DIR%%/docs/html/rcost_solvedir.png
 %%GRASS_INST_DIR%%/docs/html/rhorizon_polar_plot.png
 %%GRASS_INST_DIR%%/docs/html/rhorizon_shaded_dem_point.png
 %%GRASS_INST_DIR%%/docs/html/rhorizon_singlepoint_plot.png
@@ -1419,6 +1432,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/topic_measurement.html
 %%GRASS_INST_DIR%%/docs/html/topic_metadata.html
 %%GRASS_INST_DIR%%/docs/html/topic_modules.html
+%%GRASS_INST_DIR%%/docs/html/topic_mosaic.html
 %%GRASS_INST_DIR%%/docs/html/topic_multispectral.html
 %%GRASS_INST_DIR%%/docs/html/topic_network.html
 %%GRASS_INST_DIR%%/docs/html/topic_null_data.html
@@ -1592,6 +1606,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/v_buffer_line_s.png
 %%GRASS_INST_DIR%%/docs/html/v_buffer_lines.png
 %%GRASS_INST_DIR%%/docs/html/v_buffer_no_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_point_s.png
 %%GRASS_INST_DIR%%/docs/html/v_buffer_points.png
 %%GRASS_INST_DIR%%/docs/html/v_buffer_rounded_cap.png
 %%GRASS_INST_DIR%%/docs/html/v_buffer_square_cap.png
@@ -1730,6 +1745,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/wxGUI_vnet.jpg
 %%GRASS_INST_DIR%%/docs/html/wxpyimgview.html
 %%GRASS_INST_DIR%%/docs/html/ximgview.html
+%%GRASS_INST_DIR%%/docs/html/zipcodes_larger2000ha.png
+%%GRASS_INST_DIR%%/docs/html/zipcodes_minor1000ha.png
 %%GRASS_INST_DIR%%/docs/man/man1/cairodriver.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/class_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/d.barscale.1.gz
@@ -1922,6 +1939,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r.blend.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.buffer.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.buffer.lowmem.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.buildvrt.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.carve.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.category.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.circle.1.gz
@@ -2008,6 +2026,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r.pack.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.param.scale.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.patch.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.path.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.plane.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.profile.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.proj.1.gz
@@ -2230,6 +2249,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/topic_measurement.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_metadata.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_modules.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_mosaic.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_multispectral.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_network.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_null_data.1.gz
@@ -2453,10 +2473,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/colors/grey255
 %%GRASS_INST_DIR%%/etc/colors/gyr
 %%GRASS_INST_DIR%%/etc/colors/haxby
+%%GRASS_INST_DIR%%/etc/colors/inferno
 %%GRASS_INST_DIR%%/etc/colors/kelvin
+%%GRASS_INST_DIR%%/etc/colors/magma
 %%GRASS_INST_DIR%%/etc/colors/ndvi
 %%GRASS_INST_DIR%%/etc/colors/ndwi
 %%GRASS_INST_DIR%%/etc/colors/oranges
+%%GRASS_INST_DIR%%/etc/colors/plasma
 %%GRASS_INST_DIR%%/etc/colors/population
 %%GRASS_INST_DIR%%/etc/colors/population_dens
 %%GRASS_INST_DIR%%/etc/colors/precipitation
@@ -3610,8 +3633,12 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/wizard.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/startup/__init__.py
 %%GRASS_INST_DIR%%/gui/wxpython/startup/__init__.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/guiutils.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/guiutils.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.py
 %%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/utils.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/__init__.py
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/__init__.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/frame.py
@@ -4043,6 +4070,9 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasslibs.mo
 %%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grassmods.mo
 %%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasswxpy.mo
 %%GRASS_INST_DIR%%/scripts/d.correlate
 %%GRASS_INST_DIR%%/scripts/d.frame
 %%GRASS_INST_DIR%%/scripts/d.out.file
@@ -4089,6 +4119,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/scripts/r.blend
 %%GRASS_INST_DIR%%/scripts/r.buffer.lowmem
 %%GRASS_INST_DIR%%/scripts/r.colors.stddev
+%%GRASS_INST_DIR%%/scripts/r.drain
 %%GRASS_INST_DIR%%/scripts/r.fillnulls
 %%GRASS_INST_DIR%%/scripts/r.grow
 %%GRASS_INST_DIR%%/scripts/r.import

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Feb  2 06:47:15 2019	(r491915)
+++ head/graphics/qgis/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
@@ -4,7 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_4_3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -112,7 +112,7 @@ NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
-GRASS_BUILD_DEPENDS=	grass74:databases/grass7
+GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 GRASS_FORCE_MAKE_JOBS=	NO



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902020648.x126mbor000641>