FreeBSD Bugzilla – Attachment 194243 Details for
Bug 228975
databases/grass7: update port and (another try to) remove BROKEN
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-v2
grass.diff (text/plain), 4.40 KB, created by
Kurt Jaeger
on 2018-06-14 07:54:16 UTC
(
hide
)
Description:
patch-v2
Filename:
MIME Type:
Creator:
Kurt Jaeger
Created:
2018-06-14 07:54:16 UTC
Size:
4.40 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 472282) >+++ Makefile (working copy) >@@ -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 \ >@@ -125,11 +128,11 @@ > MANDIRS= ${PREFIX}/grass-${PORTVERSION}/docs/man/man1 > > post-patch: >- @${REINPLACE_CMD} -e \ >+ ${REINPLACE_CMD} -e \ > 's|-lblas|${BLASLIB}|g ; \ > s|-llapack|${LAPACKLIB}|g ; \ > s|g2c|f2c|g' ${WRKSRC}/configure >- @${REINPLACE_CMD} -e \ >+ ${REINPLACE_CMD} -e \ > 's|make -C|$$(MAKE) -C| ; \ > /^BINDIR/s|=.*|= $${DESTDIR}$${UNIX_BIN}| ; \ > /test /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \ >@@ -140,31 +143,29 @@ > /$$(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 >- @${REINPLACE_CMD} \ >+ ${REINPLACE_CMD} \ > 's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in >- @${REINPLACE_CMD} \ >+ ${REINPLACE_CMD} \ > "s|'make'|'gmake'|g" ${WRKSRC}/scripts/g.extension/g.extension.py >- @${REINPLACE_CMD} \ >+ ${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" \ >+ ${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' \ >+ ${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \ > ${WRKSRC}/lib/init/grass.sh >- @${REINPLACE_CMD} \ >+ ${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' >+ cd ${WRKSRC}; \ >+ for i in `${FIND} . -type f -print`; do \ >+ ${REINPLACE_CMD} \ >+ 's|#!/usr/bin/env python|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \ >+ done > > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 228975
:
194217
|
194243
|
196775