--- Makefile (révision 471348) +++ 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= compiler:openmp fortran gettext gmake iconv jpeg perl5 pkgconfig python:2.7 \ readline shebangfix tk SHEBANG_LANG= nviz nviz_OLD_CMD= nviz @@ -78,8 +78,6 @@ VERSION="${PORTVERSION}" \ VER="${PORTVERSION:R:C/\.//}" -BROKEN_sparc64= Does not configure on sparc64 - OPTIONS_DEFINE= ATLAS LAS MOTIF NETCDF PDAL OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL ODBC PGSQL SQLITE @@ -147,12 +145,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 +152,12 @@ @${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}|' 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