Attachment 213577 Details for Bug 243550 – grass without fortran

[patch] grass without fortran

grass_test (text/plain), 6.24 KB, created by Loïc Bartoletti on 2020-04-19 21:30:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2020-04-19 21:30:30 UTC

Size: 6.24 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 531143)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	grass
> PORTVERSION=	7.8.2
>+PORTREVISION=	1
> CATEGORIES=	databases geography
> MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
> 		http://grass.cict.fr/%SUBDIR%/ \
>@@ -39,8 +40,8 @@
> RUN_DEPENDS=	${PY_NUMPY} \
> 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
> 
>-USES=		blaslapack compiler:openmp fortran gl gmake gnome iconv \
>-		jpeg perl5 pkgconfig python:3.6+ readline shebangfix tk xorg
>+USES=		blaslapack compiler:c11 gl gmake gnome iconv \
>+		jpeg perl5 pkgconfig python:3.6+ readline shebangfix xorg
> SHEBANG_GLOB=	*.py
> SHEBANG_LANG=	nviz
> nviz_OLD_CMD=	nviz
>@@ -68,7 +69,9 @@
> 		--with-geos=${LOCALBASE}/bin/geos-config \
> 		--with-gdal=${LOCALBASE}/bin/gdal-config \
> 		--with-pthread=yes \
>-		--with-openmp
>+		--with-openmp \
>+		--prefix=${LOCALBASE} \
>+		--exec-prefix=${LOCALBASE}
> 
> SUB_FILES=	pkg-message
> SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
>@@ -134,11 +137,11 @@
> MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
> 
> post-patch:
>+#	${REINPLACE_CMD} -e \
>+#		's|-lblas|${BLASLIB}|g ; \
>+#		 s|-llapack|${LAPACKLIB}|g ; \
>+#		 s|g2c|f2c|g' ${WRKSRC}/configure
> 	${REINPLACE_CMD} -e \
>-		's|-lblas|${BLASLIB}|g ; \
>-		 s|-llapack|${LAPACKLIB}|g ; \
>-		 s|g2c|f2c|g' ${WRKSRC}/configure
>-	${REINPLACE_CMD} -e \
> 		's|make -C|$$(MAKE) -C| ; \
> 		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
> 		 /test /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
>@@ -148,12 +151,14 @@
> 		 /rm /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
> 		 /$$(MAKE) /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
> 		 /^$$(INST_DIR)\//s|$$(INST_DIR)|$${DESTDIR}$${INST_DIR}|g ; \
>-		 s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/include/Make/Install.make
>+		 s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' \
>+		${WRKSRC}/include/Make/Install.make
> 	${REINPLACE_CMD} \
> 		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
>+	${REINPLACE_CMD} -e \
>+		"s|'make'|'gmake'|g; \
>+		 s|gcc|${CC}|" ${WRKSRC}/scripts/g.extension/g.extension.py
> 	${REINPLACE_CMD} \
>-		"s|'make'|'gmake'|g" ${WRKSRC}/scripts/g.extension/g.extension.py
>-	${REINPLACE_CMD} \
> 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
> # Replace hardcoded python interpreter to PYTHON_CMD
> 	${REINPLACE_CMD} "s|'GRASS_PYTHON', 'python'|'GRASS_PYTHON', \'${PYTHON_CMD}\'|g" \
>@@ -204,3 +209,4 @@
> 	${LN} -sf ${PORTNAME}${VER} \
> 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
> .include <bsd.port.mk>
>+
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 531143)
>+++ pkg-plist	(working copy)
>@@ -782,6 +782,7 @@
> %%GRASS_INST_DIR%%/docs/html/i_vi_ndvi.png
> %%GRASS_INST_DIR%%/docs/html/i.albedo.html
> %%GRASS_INST_DIR%%/docs/html/i.aster.toar.html
>+%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
> %%GRASS_INST_DIR%%/docs/html/i.biomass.html
> %%GRASS_INST_DIR%%/docs/html/i.cca.html
> %%GRASS_INST_DIR%%/docs/html/i.cluster.html
>@@ -1252,6 +1253,7 @@
> %%GRASS_INST_DIR%%/docs/html/r.surf.idw.html
> %%GRASS_INST_DIR%%/docs/html/r.surf.random.html
> %%GRASS_INST_DIR%%/docs/html/r.texture.html
>+%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
> %%GRASS_INST_DIR%%/docs/html/r.thin.html
> %%GRASS_INST_DIR%%/docs/html/r.tile.html
> %%GRASS_INST_DIR%%/docs/html/r.tileset.html
>@@ -1268,6 +1270,7 @@
> %%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.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
>@@ -1395,6 +1398,7 @@
> %%GRASS_INST_DIR%%/docs/html/timeline_2D.jpg
> %%GRASS_INST_DIR%%/docs/html/topic_ACCA.html
> %%GRASS_INST_DIR%%/docs/html/topic_accumulation.html
>+%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
> %%GRASS_INST_DIR%%/docs/html/topic_aerial.html
> %%GRASS_INST_DIR%%/docs/html/topic_aggregation.html
> %%GRASS_INST_DIR%%/docs/html/topic_albedo.html
>@@ -1490,6 +1494,7 @@
> %%GRASS_INST_DIR%%/docs/html/topic_unit_test.html
> %%GRASS_INST_DIR%%/docs/html/topic_vector.html
> %%GRASS_INST_DIR%%/docs/html/topic_vegetation_index.html
>+%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
> %%GRASS_INST_DIR%%/docs/html/topic_visualization.html
> %%GRASS_INST_DIR%%/docs/html/topic_volume.html
> %%GRASS_INST_DIR%%/docs/html/topic_voxel.html
>@@ -1899,6 +1904,7 @@
> %%GRASS_INST_DIR%%/docs/man/man1/htmldriver.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/i.albedo.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/i.aster.toar.1.gz
>+%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/i.biomass.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/i.cca.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/i.cluster.1.gz
>@@ -2113,6 +2119,7 @@
> %%GRASS_INST_DIR%%/docs/man/man1/r.surf.idw.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.surf.random.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.texture.1.gz
>+%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.thin.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.tile.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.tileset.1.gz
>@@ -2127,6 +2134,7 @@
> %%GRASS_INST_DIR%%/docs/man/man1/r.unpack.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.uslek.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.usler.1.gz
>+%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.volume.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.walk.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/r.water.outlet.1.gz
>@@ -2229,6 +2237,7 @@
> %%GRASS_INST_DIR%%/docs/man/man1/topic_albedo.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_algebra.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_attribute_table.1.gz
>+%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_biomass.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_buffer.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_cartography.1.gz
>@@ -2320,6 +2329,7 @@
> %%GRASS_INST_DIR%%/docs/man/man1/topic_vector.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_vegetation_index.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_visualization.1.gz
>+%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_volume.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topic_voxel.1.gz
> %%GRASS_INST_DIR%%/docs/man/man1/topics.1.gz

Actions: View | Diff

Attachments on bug 243550: 210994 | 213085 | 213577 | 213648