Attachment 201521 Details for Bug 235307 – grass 7.6.0 and update QGIS' makefile for grass

[patch] grass 7.6.0 and update QGIS' makefile for grass

grass-7.6.0.diff (text/plain), 11.03 KB, created by Loïc Bartoletti on 2019-01-30 07:44:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2019-01-30 07:44:54 UTC

Size: 11.03 KB

patch

obsolete

>diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
>index ef3dd3963..cd6fa5b83 100644
>--- a/databases/grass7/Makefile
>+++ b/databases/grass7/Makefile
>@@ -1,8 +1,8 @@
> # Created by: Mikael URANKAR and LoÃ¯c BARTOLETTI
>-# $FreeBSD$
>+# $FreeBSD: head/databases/grass7/Makefile 489928 2019-01-11 00:36:58Z wen $
> 
> 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
>@@ -37,8 +37,8 @@ LIB_DEPENDS=	libgdal.so:graphics/gdal \
> 		libgeos.so:graphics/geos
> RUN_DEPENDS=	bash:shells/bash
> 
>-USES=		blaslapack compiler:openmp fortran gettext gmake gl iconv \
>-		jpeg perl5 pkgconfig python:2.7 readline shebangfix tk
>+USES=		blaslapack compiler:openmp fortran gettext gmake gl gnome \
>+		iconv jpeg perl5 pkgconfig python:2.7 readline shebangfix tk
> SHEBANG_LANG=	nviz
> nviz_OLD_CMD=	nviz
> nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
>@@ -72,10 +72,12 @@ 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 +190,6 @@ 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
>-
>+	${RLN}  ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VER} \
>+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
> .include <bsd.port.mk>
>diff --git a/databases/grass7/distinfo b/databases/grass7/distinfo
>index 9be324f69..9ba1e9f8c 100644
>--- a/databases/grass7/distinfo
>+++ b/databases/grass7/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1546991213
>-SHA256 (grass-7.4.4.tar.gz) = 96a39e273103f7375a670eba94fa3e5dad2819c5c5664c9aee8f145882a94e8c
>-SIZE (grass-7.4.4.tar.gz) = 58454921
>+TIMESTAMP = 1548202455
>+SHA256 (grass-7.6.0.tar.gz) = 07628f83ad59ba6d9d097cdc91c490efaf5b1d57bc7ee1fc2709183162741b6a
>+SIZE (grass-7.6.0.tar.gz) = 60605953
>diff --git a/databases/grass7/pkg-plist b/databases/grass7/pkg-plist
>index 7c0d036a4..1102469c6 100644
>--- a/databases/grass7/pkg-plist
>+++ b/databases/grass7/pkg-plist
>@@ -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
>@@ -598,6 +603,8 @@ bin/grass%%VER%%
> %%GRASS_INST_DIR%%/docs/html/displaydrivers.html
> %%GRASS_INST_DIR%%/docs/html/dshade.png
> %%GRASS_INST_DIR%%/docs/html/full_index.html
>+%%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.access.html
> %%GRASS_INST_DIR%%/docs/html/g.cairocomp.html
> %%GRASS_INST_DIR%%/docs/html/g.copy.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
>@@ -1246,6 +1254,10 @@ 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.html
>+%%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,6 +3633,10 @@ 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/utils.py
>+%%GRASS_INST_DIR%%/gui/wxpython/startup/utils.pyc
> %%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.py
> %%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.pyc
> %%GRASS_INST_DIR%%/gui/wxpython/timeline/__init__.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
>diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
>index 020d6f1ab..dbf3a1c22 100644
>--- a/graphics/qgis/Makefile
>+++ b/graphics/qgis/Makefile
>@@ -1,10 +1,10 @@
> # Created by: Laurent Courty
>-# $FreeBSD$
>+# $FreeBSD: head/graphics/qgis/Makefile 490472 2019-01-16 11:13:44Z tijl $
> 
> 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

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 235307: 201521