diff --git databases/grass7/Makefile databases/grass7/Makefile index 59b0de82118c..cd8c5ae78a25 100644 --- databases/grass7/Makefile +++ databases/grass7/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= grass -PORTVERSION= 7.6.1 -PORTREVISION= 12 +PORTVERSION= 7.8.2 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ @@ -27,7 +26,8 @@ LICENSE_FILE= ${WRKSRC}/GPL.TXT BROKEN_sparc64= Does not configure on sparc64 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_NUMPY} \ + ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal \ libpng.so:graphics/png \ libproj.so:graphics/proj \ @@ -36,11 +36,11 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgeos.so:graphics/geos -RUN_DEPENDS= bash:shells/bash +RUN_DEPENDS= ${PY_NUMPY} \ + ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} -USES= blaslapack fortran gmake gl gnome \ - iconv jpeg perl5 pkgconfig python:2.7 \ - readline shebangfix tk xorg +USES= blaslapack compiler:openmp fortran gl gmake gnome iconv \ + jpeg perl5 pkgconfig python:3.7 readline shebangfix tk xorg SHEBANG_LANG= nviz nviz_OLD_CMD= nviz nviz_CMD= ${PREFIX}/${GRASS_INST_DIR}/bin/nviz @@ -49,7 +49,6 @@ USE_GL= gl glu USE_GNOME= cairo USE_WX= 3.0 WX_COMPS= wx:build python:run -USE_GCC= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ @@ -67,8 +66,8 @@ CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-proj-share=${LOCALBASE}/share/proj \ --with-geos=${LOCALBASE}/bin/geos-config \ --with-gdal=${LOCALBASE}/bin/gdal-config \ - --with-pthread=yes - #--with-openmp + --with-pthread=yes \ + --with-openmp ALL_TARGET= default USE_LDCONFIG= ${PREFIX}/${GRASS_INST_DIR}/lib @@ -97,8 +96,6 @@ OPTIONS_SUB= yes LAS_DESC= Enable LiDAR modules PDAL_DESC= Enable points cloud data modules DB_DESC= Database support -NLS_CONFIGURE_WITH= nls -NLS_USES= gettext LAS_CONFIGURE_ON= --with-liblas=yes LAS_LIB_DEPENDS= liblas.so:devel/liblas \ libboost_program_options.so:devel/boost-libs \ @@ -110,14 +107,16 @@ MYSQL_CONFIGURE_ON= --with-mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql NETCDF_CONFIGURE_ON= --with-netcdf=${LOCALBASE}/bin/nc-config NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf +NLS_CONFIGURE_WITH= nls +NLS_USES= gettext ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -ODBC_CONFIGURE_ON= --with-odbc +ODBC_CONFIGURE_WITH= odbc PDAL_CONFIGURE_ON= --with-pdal=${LOCALBASE}/bin/pdal-config PDAL_LIB_DEPENDS= libpdal_base.so:math/pdal PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgres +PGSQL_CONFIGURE_WITH= postgres SQLITE_USES= sqlite -SQLITE_CONFIGURE_ON= --with-sqlite +SQLITE_CONFIGURE_WITH= sqlite SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd @@ -147,7 +146,7 @@ post-patch: /^$$(INST_DIR)\//s|$$(INST_DIR)|$${DESTDIR}$${INST_DIR}|g ; \ s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/include/Make/Install.make ${REINPLACE_CMD} \ - 's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in + 's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in ${REINPLACE_CMD} \ "s|'make'|'gmake'|g" ${WRKSRC}/scripts/g.extension/g.extension.py ${REINPLACE_CMD} \ @@ -158,39 +157,52 @@ post-patch: ${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \ ${WRKSRC}/lib/init/grass.sh ${REINPLACE_CMD} \ - "s|environ\['GRASS_PYTHON'\] = "'"python"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \ + "s|environ\['GRASS_PYTHON'\] = "'"python3"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \ ${WRKSRC}/lib/python/script/setup.py cd ${WRKSRC}; \ for i in `${FIND} . -type f -print`; do \ ${REINPLACE_CMD} \ - 's|#!/usr/bin/env python|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \ + 's|#!/usr/bin/env python3|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \ done post-install: +# remove useless files + ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/db.test/ ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/ ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png - ${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/ -.for file in i_atcorr_B02_atcorr.png \ - i_ortho_photo_step1.png \ - i_ortho_photo_step5.png \ - i_ortho_photo_step6.png \ - i_ortho_photo_step7.png \ - i_ortho_photo_step8.png \ - r.viewshed.png \ - rterraflow_accumulation.png \ - rterraflow_dir2.png \ - rterraflow_dir3.png \ - sweep1.png \ - sweep2.png - ${TOUCH} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/${file} + ${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" | ${XARGS} ${RM} -rf + +# fix pkg-plist issues +# poudriere testport, poudriere bulk -t and make ports can create different pkg-plist + for i in `${FIND} ${WRKSRC}/scripts -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/gui/wxpython -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/raster -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/imagery -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done +.for file in wms_base.py wms_drv.py wms_gdal_drv.py wms_cap_parsers.py srs.py + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/r.in.wms/${file} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/r.in.wms/${file} .endfor + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/wxpyimgview/wxpyimgview_gui.py ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/wxpyimgview_gui.py + ${MKDIR} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar + ${INSTALL_DATA} ${WRKSRC}/scripts/d.polar/ps_defs.eps ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar + +# STRIP PART ${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 +.for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i} .endfor - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/* + +# symlink grass7 ${LN} -sf ${PORTNAME}${VER} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} .include diff --git databases/grass7/distinfo databases/grass7/distinfo index 0147058a51d2..ace71b10610d 100644 --- databases/grass7/distinfo +++ databases/grass7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553326217 -SHA256 (grass-7.6.1.tar.gz) = 9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b -SIZE (grass-7.6.1.tar.gz) = 59952303 +TIMESTAMP = 1583004075 +SHA256 (grass-7.8.2.tar.gz) = 33576f7078f805b39ca20c2fa416ac79c64260c0581072a6dc7d813f53aa9abb +SIZE (grass-7.8.2.tar.gz) = 60563736 diff --git databases/grass7/pkg-message databases/grass7/pkg-message index 649ab0d86992..abb9a75355ad 100644 --- databases/grass7/pkg-message +++ databases/grass7/pkg-message @@ -3,18 +3,18 @@ message: <