Attachment 194217 Details for Bug 228975 – grass 7.4.0_3

[patch] grass 7.4.0_3

grass7-7.4.0_3.diff (text/plain), 5.14 KB, created by Loïc Bartoletti on 2018-06-13 08:53:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2018-06-13 08:53:04 UTC

Size: 5.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 472296)
>+++ Makefile	(copie de travail)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	grass
> PORTVERSION=	7.4.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	databases geography
> MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
> 		http://grass.cict.fr/%SUBDIR%/ \
>@@ -25,7 +25,7 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/GPL.TXT
> 
>-BROKEN=		fails to package
>+BROKEN_sparc64=         Does not configure on sparc64
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR}
> LIB_DEPENDS=	libgdal.so:graphics/gdal \
>@@ -38,7 +38,7 @@
> 		libgeos.so:graphics/geos
> RUN_DEPENDS=	bash:shells/bash
> 
>-USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2.7 \
>+USES=		blaslapack compiler:openmp fortran gettext gmake iconv jpeg perl5 pkgconfig python:2.7 \
> 		readline shebangfix tk
> SHEBANG_LANG=	nviz
> nviz_OLD_CMD=	nviz
>@@ -78,19 +78,22 @@
> 		VERSION="${PORTVERSION}" \
> 		VER="${PORTVERSION:R:C/\.//}"
> 
>-BROKEN_sparc64=		Does not configure on sparc64
>-
>-OPTIONS_DEFINE=		ATLAS LAS MOTIF NETCDF PDAL
>+OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
> OPTIONS_MULTI=		DB
> OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
>-OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE
>+#OPTIONS_SINGLE=		BLAS
>+#OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
>+OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB
> OPTIONS_SUB=		yes
> 
>-ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
>+#BLAS_DESC=		BLAS/LAPACK support
>+#GOTOBLAS_DESC=		GotoBLAS implementation
> LAS_DESC=		Enable LiDAR modules
> PDAL_DESC=		Enable points cloud data modules
>-ATLAS_USES=		blaslapack:atlas
>-ATLAS_USES_OFF=		blaslapack
>+#ATLAS_USES=		blaslapack:atlas
>+#NETLIB_USES=		blaslapack
>+#GOTOBLAS_USES=		blaslapack:gotoblas
>+#OPENBLAS_USES=		blaslapack:openblas
> DB_DESC=		Database support
> LAS_CONFIGURE_ON=	--with-liblas=yes
> LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
>@@ -147,12 +150,6 @@
> 	@${REINPLACE_CMD} \
> 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
> # Replace hardcoded python interpreter to PYTHON_CMD
>-	@${REINPLACE_CMD} -e 's|env python|env ${PYTHON_CMD}|g' \
>-		${WRKSRC}/lib/gis/parser_script.c \
>-		${WRKSRC}/general/g.parser/g.parser.html \
>-		${WRKSRC}/lib/python/docs/src/script_intro.rst \
>-		${WRKSRC}/lib/init/grass7.html \
>-		${WRKSRC}/raster/r.solute.transport/r.solute.transport.html
> 	@${REINPLACE_CMD} "s|'GRASS_PYTHON', 'python'|'GRASS_PYTHON', \'${PYTHON_CMD}\'|g" \
> 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
> 	@${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \
>@@ -160,11 +157,14 @@
> 	@${REINPLACE_CMD} \
> 		"s|environ\['GRASS_PYTHON'\] = "'"python"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \
> 		${WRKSRC}/lib/python/script/setup.py
>-	@${FIND} ${WRKSRC} -type f -name "*.py" | ${XARGS} ${REINPLACE_CMD} \
>-		's|env python|env ${PYTHON_CMD}|g'
>+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
>+		's|#!/usr/bin/env python|#!/usr/bin/env ${PYTHON_CMD}|'
>+	@${REINPLACE_CMD} \
>+		's|%%PYTHON_CMD%%|${PYTHON_CMD}|'
> 
> post-install:
> 	@${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
>+	@${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
> .for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 472296)
>+++ pkg-plist	(copie de travail)
>@@ -792,11 +792,6 @@
> %%GRASS_INST_DIR%%/docs/html/i_maxlik_classes.png
> %%GRASS_INST_DIR%%/docs/html/i_maxlik_rejection.png
> %%GRASS_INST_DIR%%/docs/html/i_maxlik_rgb.png
>-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step1.png
>-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step5.png
>-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step6.png
>-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step7.png
>-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step8.png
> %%GRASS_INST_DIR%%/docs/html/i_pca_result.png
> %%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_pan.png
> %%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min100.png
>@@ -1171,7 +1166,6 @@
> %%GRASS_INST_DIR%%/docs/html/r.unpack.html
> %%GRASS_INST_DIR%%/docs/html/r.uslek.html
> %%GRASS_INST_DIR%%/docs/html/r.usler.html
>-%%GRASS_INST_DIR%%/docs/html/r.viewshed.png
> %%GRASS_INST_DIR%%/docs/html/r.volume.html
> %%GRASS_INST_DIR%%/docs/html/r.walk.html
> %%GRASS_INST_DIR%%/docs/html/r.water.outlet.html
>@@ -1303,15 +1297,10 @@
> %%GRASS_INST_DIR%%/docs/html/rlipadrange_formula.png
> %%GRASS_INST_DIR%%/docs/html/rlipadsd_formula.png
> %%GRASS_INST_DIR%%/docs/html/rshade.png
>-%%GRASS_INST_DIR%%/docs/html/rterraflow_accumulation.png
>-%%GRASS_INST_DIR%%/docs/html/rterraflow_dir2.png
>-%%GRASS_INST_DIR%%/docs/html/rterraflow_dir3.png
> %%GRASS_INST_DIR%%/docs/html/runivar_basins.png
> %%GRASS_INST_DIR%%/docs/html/runivar_basins_elev_zonal.png
> %%GRASS_INST_DIR%%/docs/html/slope.png
> %%GRASS_INST_DIR%%/docs/html/sql.html
>-%%GRASS_INST_DIR%%/docs/html/sweep1.png
>-%%GRASS_INST_DIR%%/docs/html/sweep2.png
> %%GRASS_INST_DIR%%/docs/html/t.connect.html
> %%GRASS_INST_DIR%%/docs/html/t.create.html
> %%GRASS_INST_DIR%%/docs/html/t.info.html

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 228975: 194217 | 194243 | 196775