Index: head/databases/grass7/Makefile
===================================================================
--- head/databases/grass7/Makefile	(revision 494421)
+++ head/databases/grass7/Makefile	(revision 494422)
@@ -1,196 +1,196 @@
 # Created by: Mikael URANKAR and Loïc BARTOLETTI
 # $FreeBSD$
 
 PORTNAME=	grass
 PORTVERSION=	7.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
 		http://grass.fbk.eu/%SUBDIR%/ \
 		http://grass.gis-lab.info/%SUBDIR%/ \
 		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
 		http://grass.polytechnic.edu.na/%SUBDIR%/ \
 		http://grass.unibuc.ro/%SUBDIR%/ \
 		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
 MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Open source Geographical Information System (GIS)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 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 \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		blaslapack compiler:openmp fortran gettext gmake gl iconv \
 		jpeg perl5 pkgconfig python:2.7 readline shebangfix tk
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
 nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 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 \
 		--with-libs=${LOCALBASE}/lib \
 		--with-opengl-includes=${LOCALBASE}/include/ \
 		--with-opengl-libs=${LOCALBASE}/lib/ \
 		--with-freetype \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-blas \
 		--with-lapack \
 		--with-cairo \
 		--with-nls \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
 		--with-openmp
 
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		LAS MOTIF NETCDF PDAL
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
 OPTIONS_DEFAULT=	LAS PDAL PGSQL SQLITE NETLIB MOTIF NETCDF MYSQL ODBC
 OPTIONS_SUB=		yes
 
 #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
 #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 \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
 MOTIF_USES=		motif
 MOTIF_USE=		GL=glw
 MOTIF_CONFIGURE_ON=	--with-motif --with-glw
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ON=	--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
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}-${PORTVERSION}
 .endif
 
 MANDIRS=	${PREFIX}/grass-${PORTVERSION}/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|make -C|$$(MAKE) -C| ; \
 		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
 		 /test /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /chmod /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /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
 	${REINPLACE_CMD} \
 		's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${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" \
 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
 	${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" \
 		${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; \
 	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
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}-${PORTVERSION}/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}-${PORTVERSION}/docs/html/${file}
 .endfor
 	${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
 	${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}/lib/libgrass_*.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
 	${LN} -sf ${PORTNAME}${VER} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
Index: head/graphics/gdal/Makefile
===================================================================
--- head/graphics/gdal/Makefile	(revision 494421)
+++ head/graphics/gdal/Makefile	(revision 494422)
@@ -1,158 +1,159 @@
 # Created by: Randall Hopper
 # $FreeBSD$
 
 PORTNAME=	gdal
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
 		KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \
 		SPATIALITE SQLITE WEBP XERCES ZSTD
 OPTIONS_DEFAULT=JASPER
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_SUB=	yes
 PCRE_DESC=	Regular expression support for SQLite
 
 USES=		compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--enable-static=yes \
 		--with-geotiff=yes \
 		--with-gif=yes \
 		--with-gnm=yes \
 		--with-jpeg=yes \
 		--with-libjson-c=yes \
 		--with-liblzma=yes \
 		--with-libtiff=yes \
 		--with-libz=/usr \
 		--with-png=yes \
 		--with-proj=yes \
 		--with-threads=yes \
 		--without-libtool \
 		${ICONV_CONFIGURE_ARG}
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${ICONV_LIB}
 MAKE_JOBS_UNSAFE=	yes
 MAKEFILE=	GNUmakefile
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/py-gdal
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 ARMADILLO_CONFIGURE_WITH=	armadillo
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CURL_CONFIGURE_OFF=	--with-curl=no
 CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 ECW_CONFIGURE_WITH=	ecw
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 FREEXL_CONFIGURE_WITH=	freexl
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CONFIGURE_WITH=	gta
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 KML_CONFIGURE_WITH=	libkml
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LIBXML2_CONFIGURE_OFF=	--with-xml2=no
 LIBXML2_CONFIGURE_ON=	--with-xml2=${LOCALBASE}/bin/xml2-config
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_CONFIGURE_WITH=openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PGSQL_CONFIGURE_OFF=	--with-pg=no
 PGSQL_CONFIGURE_ON=	--with-pg=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
 PODOFO_CONFIGURE_WITH=	podofo
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CONFIGURE_WITH=	poppler=${LOCALBASE}
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 SFCGAL_CONFIGURE_OFF=	--with-sfcgal=no
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CONFIGURE_WITH=	spatialite
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USES=		sqlite
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^#GDAL_SLIB_SONAME/ s|^#||' ${WRKSRC}/GDALmake.opt.in
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|; s| LICENSE.TXT||' ${WRKSRC}/GNUmakefile
 	@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|getCString()|c_str()|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
 
 .include <bsd.port.mk>
Index: head/graphics/gmt/Makefile
===================================================================
--- head/graphics/gmt/Makefile	(revision 494421)
+++ head/graphics/gmt/Makefile	(revision 494422)
@@ -1,108 +1,109 @@
 # Created by: sec@42.org
 # $FreeBSD$
 
 PORTNAME=	gmt
 DISTVERSION=	4.5.18
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
 		ftp://ftp.iag.usp.br/%SUBDIR%/ \
 		ftp://ftp.scc.u-tokai.ac.jp/pub/%SUBDIR%/ \
 		http://gd.tuwien.ac.at/graphics/visual/%SUBDIR%/ \
 		http://gmt.mirror.ac.za/%SUBDIR%/ \
 		ftp://ftp.soest.hawaii.edu/gshhg/:gshhg \
 		ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/:gshhg
 MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/legacy
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${GSHHG_DISTNAME}.tar.gz:gshhg
 
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Generic Mapping Tools - data processing and display software package
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 LICENSE_DISTFILES_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_LGPL3=	${GSHHG_DISTNAME}${EXTRACT_SUFX}
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		autoreconf:build gmake pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	gmtswitch doc/examples/*/*.sh src/GMT.in \
 		src/gmt_shell_functions.sh.in src/gmtget.in \
 		src/gmtlogo.in src/isogmt.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--with-gshhg-dir=${DATADIR}/coast
 INSTALL_TARGET=	install-gmt install-data install-man install-doc
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*
 
 PORTSCOUT=	limitw:0,even
 
 OPTIONS_DEFINE=		DEBUG DOCS EPS GDAL IMPERIAL OCTAVE SHARED X11
 OPTIONS_DEFAULT=	GDAL SHARED X11
 OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ON=	--enable-debug --enable-devdebug
 EPS_DESC=		Set .eps as default output format, otherwise .ps
 EPS_CONFIGURE_ON=	--enable-eps
 GDAL_DESC=		Compile in experimental GDAL support
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CONFIGURE_ON=	--enable-gdal
 IMPERIAL_DESC=		Choose Imperial (inch) units over metric (cm)
 IMPERIAL_CONFIGURE_ON=	--enable-US
 OCTAVE_DESC=		Build GMT-octave interface
 OCTAVE_RUN_DEPENDS=	octave:math/octave
 OCTAVE_CONFIGURE_ON=	--enable-octave --enable-mex
 OCTAVE_CONFIGURE_OFF=	--disable-mex
 SHARED_DESC=		Build shared (dynamic) libraries
 SHARED_CONFIGURE_ON=	--enable-shared
 SHARED_USE=		LDCONFIG=yes
 X11_USE=		XORG=x11,xaw,xmu,xt
 X11_CONFIGURE_OFF=	--disable-xgrid
 
 STRIP_BINS=	blockmean blockmedian blockmode filter1d fitcircle \
 		gmt2rgb gmtconvert gmtdefaults gmtmath gmtselect \
 		gmtset grd2cpt grd2xyz grdblend grdclip \
 		grdcontour grdcut grdedit grdfft grdfilter \
 		grdgradient grdhisteq grdimage grdinfo grdlandmask \
 		grdmask grdmath grdpaste grdproject grdreformat \
 		grdsample grdtrack grdtrend grdvector grdview \
 		grdvolume greenspline makecpt mapproject minmax \
 		nearneighbor project ps2raster psbasemap psclip \
 		pscoast pscontour pshistogram psimage pslegend \
 		psmask psrose psscale pstext pswiggle \
 		psxy psxyz sample1d spectrum1d splitxyz \
 		surface trend1d trend2d triangulate xyz2grd
 STRIP_LIBS=	libgmt.so.4 libgmtps.so.4 libpsl.so.4
 
 # http://www.soest.hawaii.edu/pwessel/gshhg/
 GSHHG_DISTNAME=	gshhg-gmt-2.3.7
 
 pre-configure:
 	@cd ${CONFIGURE_WRKSRC} && ${SETENV} AUTOHEADER="${TRUE}" \
 		${AUTORECONF} -f -i
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/coast
 	cd ${WRKDIR}/${GSHHG_DISTNAME} && ${INSTALL_DATA} README.TXT *.nc \
 		${STAGEDIR}${DATADIR}/coast
 .for i in ${STRIP_BINS}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 post-install-X11-on:
 	cd ${WRKSRC}/src/xgrid && ${INSTALL_PROGRAM} xgridedit \
 		${STAGEDIR}${PREFIX}/bin
 
 post-install-SHARED-on:
 .for i in ${STRIP_LIBS}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i}
 .endfor
 
 .include <bsd.port.mk>
Index: head/graphics/gmt5/Makefile
===================================================================
--- head/graphics/gmt5/Makefile	(revision 494421)
+++ head/graphics/gmt5/Makefile	(revision 494422)
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	gmt5
 DISTVERSION=	5.4.5
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
 		ftp://ftp.iag.usp.br/%SUBDIR%/ \
 		ftp://ftp.scc.u-tokai.ac.jp/pub/%SUBDIR%/ \
 		http://gd.tuwien.ac.at/graphics/visual/%SUBDIR%/ \
 		http://gmt.mirror.ac.za/%SUBDIR%/ \
 		ftp://ftp.soest.hawaii.edu/gshhg/:gshhg \
 		ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/:gshhg
 MASTER_SITE_SUBDIR=	gmt gmt/legacy
 DISTNAME=	gmt-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Generic Mapping Tools - data processing and display software package
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
 		libfftw3f_threads.so:math/fftw3-float \
 		libgdal.so:graphics/gdal
 RUN_DEPENDS=	bash:shells/bash
 BUILD_DEPENDS=	${LOCALBASE}/share/dcw-gmt/dcw-gmt.nc:graphics/gmt5-dcw \
 		${LOCALBASE}/share/gshhg-gmt/binned_GSHHS_c.nc:graphics/gmt5-gshhg
 
 USES=		shebangfix cmake
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.sh *.in
 SHEBANG_FILES=	share/tools/ncdeflate src/img/img2google src/gmtswitch
 WRKSRC=		${WRKDIR}/gmt-${PORTVERSION}
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_C_FLAGS=-fstrict-aliasing \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DDCW_ROOT=${LOCALBASE}/share/dcw-gmt \
 		-DGSHHG_ROOT=${LOCALBASE}/share/gshhg-gmt \
 		-DGMT_INSTALL_MODULE_LINKS=off \
 		-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \
 		-DGMT_DATADIR=share/${PORTNAME} \
 		-DGMT_DOCDIR=share/doc/${PORTNAME} \
 		-DGMT_MANDIR=share/doc/${PORTNAME}/man \
 		-DGMT_INSTALL_NAME_SUFFIX=-gmt5
 
 .include <bsd.port.mk>
Index: head/graphics/grads/Makefile
===================================================================
--- head/graphics/grads/Makefile	(revision 494421)
+++ head/graphics/grads/Makefile	(revision 494422)
@@ -1,83 +1,83 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	grads
 PORTVERSION=	1.9b4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics science math
 MASTER_SITES=	ftp://grads.iges.org/grads/1.9/:src \
 		ftp://cola.gmu.edu/grads/1.9/:src \
 		ftp://grads.iges.org/grads/:other \
 		ftp://cola.gmu.edu/grads/:other
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}:src \
 		example.tar.gz:other
 EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The Grid Analysis and Display System
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libudunits2.a:science/udunits \
 		${LOCALBASE}/lib/libsx.a:x11/libsx
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libpng.so:graphics/png
 
 USES=		jpeg ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		SUPPLIBS="${LOCALBASE}"
 CONFIGURE_ARGS+=	--enable-dyn-supplibs \
 			--with-readline \
 			--with-printim \
 			--with-gui \
 			--with-x
 
 OPTIONS_DEFINE=	HDF NETCDF DOCS EXAMPLES
 OPTIONS_DEFAULT=	NETCDF
 HDF_DESC=	Build hdf-support (only hdf OR netcdf is supported)
 NETCDF_DESC=	Build netcdf-support
 
 PORTDATA=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	*
 .endif
 
 .if ${PORT_OPTIONS:MHDF}
 BROKEN=			Fails to package
 LIB_DEPENDS+=		libmfhdf.so:science/hdf
 CONFIGURE_ARGS+=	--with-hdf
 PLIST_SUB+=		NETCDF="@comment " HDF=""
 .endif
 
 .if ${PORT_OPTIONS:MNETCDF}
 LIB_DEPENDS+=		libnetcdf.so:science/netcdf
 CONFIGURE_ARGS+=	--with-nc
 PLIST_SUB+=		NETCDF="" HDF="@comment "
 .endif
 
 post-extract:
 	${MKDIR} "${WRKSRC}/examples"
 	cd "${WRKSRC}/examples" && ${TAR} -xzf "${DISTDIR}/example.tar.gz"
 
 post-configure:
 	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" ${WRKSRC}/src/gx.h
 	${REINPLACE_CMD} -e "s:ludunits:ludunits2:" ${WRKSRC}/src/Makefile
 
 post-install:
 	${MKDIR} "${STAGEDIR}${DATADIR}"
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . "${STAGEDIR}${DATADIR}"
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . "${STAGEDIR}${EXAMPLESDIR}"
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} "${STAGEDIR}${DOCSDIR}"
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . "${STAGEDIR}${DOCSDIR}"
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/opendx/Makefile
===================================================================
--- head/graphics/opendx/Makefile	(revision 494421)
+++ head/graphics/opendx/Makefile	(revision 494422)
@@ -1,110 +1,110 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	graphics math java
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
 LICENSE=	IBM-OVDX-v1
 LICENSE_NAME=	IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6	\
 		libtiff.so:graphics/tiff		\
 		libcdf.so:science/cdf			\
 		libXp.so:x11/libXp
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		bison compiler:c++17-lang gmake libtool motif
 USE_XORG=	x11 xt xinerama xext xpm xmu sm ice
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	ARCH=freebsd
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 NO_MTREE=	yes
 PLIST_SUB=	ARCH=freebsd
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF)
 IGNORE=	HDF and NETCDF are conflicting
 .endif
 
 .if defined(WITH_HDF)
 LIB_DEPENDS+=	libmfhdf.so:science/hdf
 .else
 CONFIGURE_ARGS+=	--without-hdf
 .endif
 
 .if !defined(WITHOUT_NETCDF)
 LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 .else
 CONFIGURE_ARGS+=	--without-netcdf
 .endif
 
 .if defined(WITH_JAVA)
 ONLY_FOR_ARCHS=	i386
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
 			--with-java40jar-path=${JAVALIBDIR}/java40.jar \
 			--with-jni-path=${JAVA_HOME}/include:${JAVA_HOME}/include/freebsd
 PLIST_SUB+=	JAVA=""
 DIR2PRUNE=	dx/java/user dx/java/server/nets
 .else
 CONFIGURE_ARGS+=	--without-javadx
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 PLIST_SUB+=	UNAMEP=${ARCH}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${RM} ${WRKSRC}/include/stamp-h.in
 .for dir in doc help html man
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor
 	@${REINPLACE_CMD} -e "s;/usr/X11R6;${LOCALBASE};g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|startserver.bat||" \
 		${WRKSRC}/src/uipp/java/server/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(ARCH)|@ARCH@|' \
 		${WRKSRC}/src/misc/Makefile.*
 	@${REINPLACE_CMD} -e 's/void exit (int);/[[noreturn]] void exit (int);/' \
 		${WRKSRC}/configure
 	for f in `find ${WRKSRC} -name "*.bm"`; do \
 		if [ $${f%/*} != "${WRKSRC}/src/uipp/widgets" ]; then \
 				${REINPLACE_CMD} -E 's/0x(..)/static_cast<char>(0x\1)/g' $$f; \
 				${REINPLACE_CMD} -E 's/static unsigned char/static char/g' $$f; \
 		fi; \
 	done
 
 post-install:
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 .if defined(WITH_JAVA)
 	${CHMOD} 0775 ${STAGEDIR}${PREFIX}/dx/java/server/nets
 	${TOUCH} ${DIR2PRUNE:S|^|${STAGEDIR}${PREFIX}/|:S|$|/.keepme|}
 	@${ECHO} "---------------------------------------------------------"	\
 		>> ${PKGMESSAGE}
 	@${ECHO} "Before starting ${PREFIX}/dx/java/server/bin/startserver"	\
 		>> ${PKGMESSAGE}
 	@${ECHO} "you must install the port graphics/opendx-samples."		\
 		>> ${PKGMESSAGE}
 .endif
 	@${ECHO} "---------------------------------------------------------"	\
 		>> ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: head/graphics/qgis/Makefile
===================================================================
--- head/graphics/qgis/Makefile	(revision 494421)
+++ head/graphics/qgis/Makefile	(revision 494422)
@@ -1,140 +1,141 @@
 # Created by: Laurent Courty
 # $FreeBSD$
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_6_0
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		txt2tags:textproc/txt2tags \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
 RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libproj.so:graphics/proj \
 		libqca-qt5.so:devel/qca@qt5 \
 		libqjson-qt5.so:devel/qjson@qt5 \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6@qt5 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
 		fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \
 		sqlite:3
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer doc gui linguist_build location network \
 		printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools \
 		webengine widgets webkit xml
 USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml webkit_run
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
 CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 GRASS_FORCE_MAKE_JOBS=	NO
 
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|markupsafe ||g' \
 		${WRKSRC}/python/ext-libs/CMakeLists.txt
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
Index: head/math/grace/Makefile
===================================================================
--- head/math/grace/Makefile	(revision 494421)
+++ head/math/grace/Makefile	(revision 494422)
@@ -1,79 +1,79 @@
 # Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
 # $FreeBSD$
 
 PORTNAME=	grace
 PORTVERSION=	5.1.25
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
 		ftp://ftp.ntua.gr/pub/graphics/grace/src/stable/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/grace/src/stable/ \
 		ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful 2D plotting tool (successor of xmgr)
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libt1.so:devel/t1lib \
 		libpng.so:graphics/png \
 		libXbae.so:x11-toolkits/xbae
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		gmake jpeg motif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
 		--with-extra-incpath=${LOCALBASE}/include \
 		--with-extra-ldpath=${LOCALBASE}/lib \
 		--with-helpviewer="xdg-open %s" \
 		--without-bundled-xbae
 MAKE_ARGS=	LINUXDOC="${TRUE}" PDFLATEX="${TRUE}"
 
 DESKTOP_ENTRIES="XMgrace" "2D Plotting tool for scientific data" \
 		"${PREFIX}/share/pixmaps/mini-xmgr3.xpm" "xmgrace" \
 		 "" ""
 
 OPTIONS_DEFINE=		DOCS EXAMPLES FFTW NETCDF PDF XMHTML
 OPTIONS_DEFAULT=	FFTW NETCDF PDF XMHTML
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 NETCDF_CONFIGURE_ENABLE=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PDF_DESC=		PDF output
 PDF_CONFIGURE_ENABLE=	pdfdrv
 PDF_LIB_DEPENDS=	libpdf.so:print/pdflib
 XMHTML_DESC=		XmHTML based on-line help
 XMHTML_CONFIGURE_ENABLE=	xmhtml
 XMHTML_LIB_DEPENDS=	libXmHTML.so:x11-toolkits/xmhtml
 
 post-configure:
 	${REINPLACE_CMD} -e \
 		'/SCRIPTS/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/auxiliary/Makefile
 	${REINPLACE_CMD} -e \
 		'/cd /!s|$$(GRACE_HOME)/doc|${DOCSDIR}| ; \
 		 /cd /s|$$(GRACE_HOME)/doc|$$(DESTDIR)$$(PREFIX)/man/man1| ; \
 		 /^install/s|$$(MANPAGES)||' \
 		${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/examples|${EXAMPLESDIR}| ; \
 		 /DOTEST/s|INSTALL_PROGRAM|INSTALL_SCRIPT|' \
 		${WRKSRC}/examples/Makefile
 	${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/include|$$(PREFIX)/include| ; \
 		 s|$$(GRACE_HOME)/lib|$$(PREFIX)/lib|' \
 		${WRKSRC}/grace_np/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(GRACE_HOME)/bin|$$(PREFIX)/bin|'
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/[c-g]*.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${FILESDIR}/mini-xmgr3.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf xmgrace ${STAGEDIR}${PREFIX}/bin/grace
 	${LN} -sf grace.1 ${STAGEDIR}${MANPREFIX}/man/man1/xmgrace.1
 	${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
 	${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .include <bsd.port.mk>
Index: head/math/gri/Makefile
===================================================================
--- head/math/gri/Makefile	(revision 494421)
+++ head/math/gri/Makefile	(revision 494422)
@@ -1,74 +1,74 @@
 # Created by: M. L. Dodson, <bdodson@scms.utmb.edu>
 # $FreeBSD$
 
 PORTNAME=	gri
 PORTVERSION=	2.12.23
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 LICENSE=	GPLv2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible plotting language for producing scientific graphs
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		gmake readline shebangfix makeinfo
 SHEBANG_FILES=	doc/examples/FEM.pl src/gri_merge src/gri_unpage
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-FreeBSD
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		gri
 USE_TEX=	formats:build dvipsk:build
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 BUILD_DEPENDS+=	convert:graphics/ImageMagick6
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/gzip/s|^|#| ; \
 		 /EXAMPLES_DIR/s|^|#|' ${WRKSRC}/doc/Makefile.in
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .else
 	(cd ${WRKSRC}/doc && makeinfo gri.texi)
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .else
 	${INSTALL_MAN} ${WRKSRC}/doc/gri-manpage.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri.1
 	${INSTALL_MAN} ${WRKSRC}/doc/gri_merge.1-skel \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri_merge.1
 	${INSTALL_MAN} ${WRKSRC}/doc/gri_unpage.1-skel \
 		${STAGEDIR}${MANPREFIX}/man/man1/gri_unpage.1
 	${INSTALL_DATA} ${WRKSRC}/doc/gri.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} model* *.dat *.gri e*.ps \
 		${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC}/doc/examples \
 		&& ${INSTALL_SCRIPT} FEM.pl ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
Index: head/math/labplot/Makefile
===================================================================
--- head/math/labplot/Makefile	(revision 494421)
+++ head/math/labplot/Makefile	(revision 494422)
@@ -1,54 +1,54 @@
 # Created by: Kay Lehmann <kay_lehmann@web.de>
 # $FreeBSD$
 
 PORTNAME=	labplot
 PORTVERSION=	2.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Data plotting and function analysis tool for KDE
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		bison cmake desktop-file-utils kde:5 qt:5 shared-mime-info tar:xz
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 		coreaddons crash ecm_build guiaddons i18n iconthemes itemviews \
 		jobwidgets kdelibs4support kio newstuff notifications parts \
 		service solid sonnet syntaxhighlighting textwidgets unitconversion \
 		widgetsaddons windowsystem xmlgui
 USE_QT=		concurrent core dbus gui network printsupport serialport \
 		sql svg widgets xml \
 		buildtools_build qmake_build
 
 CMAKE_OFF=	ENABLE_LIBCERF
 
 DATADIR=	${PREFIX}/share/labplot2
 
 OPTIONS_DEFINE=		CANTOR FITS FFTW3 HDF5 NETCDF
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CANTOR_DESC=		Build with Cantor support
 CANTOR_CMAKE_BOOL=	ENABLE_CANTOR
 CANTOR_LIB_DEPENDS=	libcantorlibs.so:math/cantor
 FITS_DESC=		Flexible Image Transport System Data Format (FITS) Library
 FITS_CMAKE_BOOL=	ENABLE_FITS
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FFTW3_DESC=		Build with FFTW support
 FFTW3_CMAKE_BOOL=	ENABLE_FFTW
 FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3
 HDF5_DESC=		Build with HDF5 support
 HDF5_CMAKE_BOOL=	ENABLE_HDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 NETCDF_DESC=		Build with NetCDF support
 NETCDF_CMAKE_BOOL=	ENABLE_NETCDF
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: head/math/moab/Makefile
===================================================================
--- head/math/moab/Makefile	(revision 494421)
+++ head/math/moab/Makefile	(revision 494422)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	moab
 DISTVERSION=	5.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component for representing and evaluating mesh data
 
 LICENSE=	BSD2CLAUSE
 xLICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas
 
 USES=		cmake:noninja eigen:3 fortran
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so
 
 BB_ACCOUNT=	fathomteam
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	c4eed56fd6d2
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 OPTIONS_DEFINE=		MPI
 OPTIONS_DEFAULT=	MPI
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		ENABLE_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 .include <bsd.port.mk>
Index: head/math/octave-forge-netcdf/Makefile
===================================================================
--- head/math/octave-forge-netcdf/Makefile	(revision 494421)
+++ head/math/octave-forge-netcdf/Makefile	(revision 494422)
@@ -1,30 +1,30 @@
 # Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	octave-forge-netcdf
 PORTVERSION=	1.0.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 GNU_CONFIGURE=	yes
 
 LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
 	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
Index: head/math/p5-NetCDF/Makefile
===================================================================
--- head/math/p5-NetCDF/Makefile	(revision 494421)
+++ head/math/p5-NetCDF/Makefile	(revision 494422)
@@ -1,27 +1,27 @@
 # Created by: Douglas K. Rand (rand@meridian-enviro.com)
 # $FreeBSD$
 
 PORTNAME=	NetCDF
 PORTVERSION=	1.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math perl5
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	netcdf-perl-${PORTVERSION}
 
 MAINTAINER=	rand@meridian-enviro.com
 COMMENT=	Perl5 module to read and write netCDF files
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		perl5 fakeroot
 
 WRKSRC_SUBDIR=		src
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPP_NETCDF=-I${LOCALBASE}/include LD_NETCDF=-lnetcdf \
 		PERL_MANDIR=${STAGEDIR}${SITE_PERL}/man PERL=${PERL}
 
 pre-install:
 	@${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/perl/Makefile
 
 .include <bsd.port.mk>
Index: head/math/py-scientific/Makefile
===================================================================
--- head/math/py-scientific/Makefile	(revision 494421)
+++ head/math/py-scientific/Makefile	(revision 494422)
@@ -1,36 +1,36 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scientific
 PORTVERSION=	2.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math python
 MASTER_SITES=	http://sourcesup.cru.fr/frs/download.php/2309/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ScientificPython-${PORTVERSION}
 
 MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	Collection of Python modules for scientific computing
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/${DISTNAME}/Doc; ${TAR} -c --exclude='*~' -f - . | \
 	    (cd ${STAGEDIR}${DOCSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKDIR}/${DISTNAME}/Examples; ${TAR} -c --exclude='*~' -f - . | \
 	    (cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} -xf -)
 
 .include <bsd.port.mk>
Index: head/science/cdo/Makefile
===================================================================
--- head/science/cdo/Makefile	(revision 494421)
+++ head/science/cdo/Makefile	(revision 494422)
@@ -1,81 +1,82 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	cdo
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/19299/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 USES=		compiler:c++11-lang gmake libtool localbase pathfix
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/szip
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR_CONDATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.post.mk>
Index: head/science/eccodes/Makefile
===================================================================
--- head/science/eccodes/Makefile	(revision 494421)
+++ head/science/eccodes/Makefile	(revision 494422)
@@ -1,56 +1,57 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	eccodes
 PORTVERSION=	2.12.0
 DISTVERSIONSUFFIX=	-Source
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/45757960/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECMWF API for WMO FM-92 GRIB and FM-94 BUFR messages
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
 OPTIONS_DEFINE=	AEC
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
 OPTIONS_DEFAULT=OPENJPEG
 AEC_DESC=	Adaptive Entropy Coding support
 
 PORTSCOUT=	site:https://confluence.ecmwf.int/display/ECC/Releases
 
 USES=		cmake shebangfix
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS=BOTH
 CMAKE_OFF=	ENABLE_ALIGN_MEMORY \
 		ENABLE_ECCODES_OMP_THREADS \
 		ENABLE_EXTRA_TESTS \
 		ENABLE_FORTRAN \
 		ENABLE_GRIB_TIMER \
 		ENABLE_MEMFS \
 		ENABLE_MEMORY_MANAGEMENT \
 		ENABLE_PYTHON
 CMAKE_ON=	ECCODES_INSTALL_EXTRA_TOOLS \
 		ENABLE_ECCODES_THREADS \
 		ENABLE_EXAMPLES \
 		ENABLE_INSTALL_ECCODES_DEFINITIONS \
 		ENABLE_NETCDF \
 		ENABLE_PNG
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	tools/bufr_compare_dir
 
 AEC_CMAKE_BOOL=		ENABLE_AEC
 AEC_LIB_DEPENDS=	libaec.so:science/libaec
 JASPER_CMAKE_BOOL=	ENABLE_JPG
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 .include <bsd.port.mk>
Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile	(revision 494421)
+++ head/science/gnudatalanguage/Makefile	(revision 494422)
@@ -1,154 +1,154 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
 PORTVERSION=	0.9.9
-PORTREVISION=	4
 DISTVERSIONPREFIX=	v
+PORTREVISION=	5
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
 		libpng.so:graphics/png		\
 		libsz.so:science/szip		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 USE_GITHUB=	yes
 GH_PROJECT=	gdl
 
 USES=		cmake compiler:c++11-lang fortran ncurses pkgconfig readline tar:tgz
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
 # defaulting to gnu++14. Force c++11 instead.
 # For a more detailed discussion see:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
 USE_CXXSTD=	gnu++11
 
 # Disable ncurses and readline from ports
 # Disable ImageMagick (does'nt work with plplot because dynamic drivers
 #	are enabled by default)
 # TODO: add a slave port for mpich
 # TODO: create a port for Cmsvlib http://cow.physics.wisc.edu/~craigm/idl/down/cmsvlib.tar.gz
 # TODO:	create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz
 # TODO:	create a port for TexToIdl http://physics.mnstate.edu/mcraig/textoidl/textoidl-2-1-2.tar
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=NO		\
 		-DNCURSESDIR:STRING="/usr"	\
 		-DMAGICK:BOOL=OFF
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GLPK_DESC=		Support GLPK for Simplex (Linear programming)
 GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libgrib_api.so:science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_CMAKE_ON=		-DMPICH:BOOL=ON
 MPI_CMAKE_OFF=		-DMPICH:BOOL=OFF
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python:2.7
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 # QHULL IS NOT NEEDED YET!
 #QHULL_DESC=		Enable Triangulate and Qhull support
 #QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
 #QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 #QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES
 PLIST=		${.CURDIR}/pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/GDL.so ${STAGEDIR}${PYTHON_SITELIBDIR}/
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
Index: head/science/grib_api/Makefile
===================================================================
--- head/science/grib_api/Makefile	(revision 494421)
+++ head/science/grib_api/Makefile	(revision 494422)
@@ -1,41 +1,42 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	grib_api
 PORTVERSION=	1.28.0
 DISTVERSIONSUFFIX=	-Source
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://confluence.ecmwf.int/download/attachments/3473437/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ECMWF API for WMO FM-92 GRIB messages
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf \
 		libpng.so:graphics/png
 
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
 OPTIONS_DEFAULT=OPENJPEG
 
 PORTSCOUT=	site:https://software.ecmwf.int/wiki/display/GRIB/Releases
 
 USES=		libtool pathfix
 
 CONFIGURE_ARGS=	--enable-pthread --with-netcdf=${LOCALBASE} --with-png-support
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_CONFIGURE_ON=	--with-openjpeg=${LOCALBASE}
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/grib1to2 ${STAGEDIR}${PREFIX}/bin/grib1to2
 
 .include <bsd.port.mk>
Index: head/science/kst2/Makefile
===================================================================
--- head/science/kst2/Makefile	(revision 494421)
+++ head/science/kst2/Makefile	(revision 494422)
@@ -1,77 +1,77 @@
 # Created by: Markus Brueffer <markus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science kde
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
 LICENSE=	GPLv2 GFDL LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/COPYING-DOCS
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libtiff.so:graphics/tiff
 
 KST_VERSION=	2.0.8
 KST_DATE=	20181123
 
 USES=		cmake desktop-file-utils pkgconfig \
 		shared-mime-info
 _USE_QT4=	corelib gui xml designer network svg linguisttools_build \
 		qmake_build moc_build rcc_build uic_build
 _USE_QT5=	concurrent core gui network printsupport svg widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kst-plot
 GH_TAGNAME=	c5dddb1
 
 CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
 		-Dkst_revision=${KST_DATE} \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
 OPTIONS_DEFINE=	FITS MATLAB NETCDF
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
 OPTIONS_DEFAULT=	QT5
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FITS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CFITSIO=ON
 
 MATLAB_DESC=	Support for data in MATLAB format
 MATLAB_LIB_DEPENDS=	libmatio.so:math/matio
 MATLAB_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Matio=ON
 
 NETCDF_DESC=	Support for data in NetCDF format (broken)
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 NETCDF_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON
 
 TOOLKIT_DESC=	Qt toolkit
 QT4_USES=	qt:4
 QT4_USE=	${_USE_QT4:S/^/QT=/}
 QT5_USES=	compiler:c++11-lang qt:5
 QT5_USE=	${_USE_QT5:S/^/QT=/}
 QT5_CMAKE_ON=	-Dkst_qt5=on
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 .endif
 
 .include <bsd.port.mk>
Index: head/science/minc2/Makefile
===================================================================
--- head/science/minc2/Makefile	(revision 494421)
+++ head/science/minc2/Makefile	(revision 494422)
@@ -1,45 +1,45 @@
 # Created by: jbacon
 # $FreeBSD$
 
 PORTNAME=	minc
 PORTVERSION=	2.2.00
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	science biology
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BIC-MNI
 
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf bison gmake libtool perl5 shebangfix
 SHEBANG_FILES=	progs/mincview/mincview
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-error=return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	minc-1* zh-tk-[0-9]*
 
 pre-patch:
 	@${RM} ${WRKSRC}/ac_config_aux/*
 	@${RM} ${WRKSRC}/progs/minccalc/gram.[ch]
 	@${RM} ${WRKSRC}/progs/mincgen/ncgentab.[ch]
 
 .include <bsd.port.mk>
Index: head/science/netcdf/Makefile
===================================================================
--- head/science/netcdf/Makefile	(revision 494421)
+++ head/science/netcdf/Makefile	(revision 494422)
@@ -1,57 +1,58 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	netcdf
-PORTVERSION=	4.6.2
+PORTVERSION=	4.6.3
 DISTVERSIONPREFIX=	c-
 CATEGORIES=	science
 MASTER_SITES=	https://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library for machine-independent, array-oriented data access
 
 LICENSE=	UCAR_UNIDATA
 LICENSE_NAME=	University Corporation for Atmospheric Research/Unidata
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
 
 OPTIONS_DEFINE=	DAP DOCS DOXYGEN SZIP
 OPTIONS_DEFAULT=DAP SZIP
 DAP_DESC=	Build DAP client and remote testing
 SZIP_DESC=	SZIP support (required if HDF5 was built with SZIP)
 
 USES=		gmake libtool localbase ncurses pathfix pkgconfig:run
 
 CONFIGURE_ARGS=	--disable-filter-testing --enable-netcdf-4
 CPPFLAGS+=	-fPIC -DPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 DAP_CONFIGURE_ENABLE=	dap
 DAP_LIB_DEPENDS=	libcurl.so:ftp/curl
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_PORTDOCS=	*
 SZIP_LIB_DEPENDS=	libsz.so:science/szip
 SZIP_LIBS=		-lsz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/ int fileno(FILE\*);/d' ${WRKSRC}/libdispatch/d*.c ${WRKSRC}/ncgen/ncgen* ${WRKSRC}/ncgen3/ncgen* ${WRKSRC}/oc2/ocdump.c
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/docs/ && ${LOCALBASE}/bin/doxygen .
 
 post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/science/netcdf/distinfo
===================================================================
--- head/science/netcdf/distinfo	(revision 494421)
+++ head/science/netcdf/distinfo	(revision 494422)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547388092
-SHA256 (netcdf-c-4.6.2.tar.gz) = c37525981167b3cd82d32e1afa3022afb94e59287db5f116c57f5ed4d9c6a638
-SIZE (netcdf-c-4.6.2.tar.gz) = 5794393
+TIMESTAMP = 1551529750
+SHA256 (netcdf-c-4.6.3.tar.gz) = 335fdf16d7531f430ad75e732ed1a9a3fc83ad3ef91fb33a70119a555dd5415c
+SIZE (netcdf-c-4.6.3.tar.gz) = 5961248
Index: head/science/netcdf/pkg-plist
===================================================================
--- head/science/netcdf/pkg-plist	(revision 494421)
+++ head/science/netcdf/pkg-plist	(revision 494422)
@@ -1,20 +1,21 @@
 bin/nc-config
 bin/nccopy
 bin/ncdump
 bin/ncgen
 bin/ncgen3
 include/netcdf.h
 include/netcdf_aux.h
+include/netcdf_filter.h
 include/netcdf_mem.h
 include/netcdf_meta.h
 lib/libnetcdf.a
 lib/libnetcdf.settings
 lib/libnetcdf.so
-lib/libnetcdf.so.13
-lib/libnetcdf.so.13.1.1
+lib/libnetcdf.so.15
+lib/libnetcdf.so.15.0.0
 libdata/pkgconfig/netcdf.pc
 man/man1/nccopy.1.gz
 man/man1/ncdump.1.gz
 man/man1/ncgen.1.gz
 man/man1/ncgen3.1.gz
 man/man3/netcdf.3.gz
Index: head/science/netcdf-cxx/Makefile
===================================================================
--- head/science/netcdf-cxx/Makefile	(revision 494421)
+++ head/science/netcdf-cxx/Makefile	(revision 494422)
@@ -1,34 +1,34 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	netcdf-cxx
 PORTVERSION=	4.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
 		LOCAL/sunpoet
 DISTNAME=	${PORTNAME}4-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C++ library for machine-independent, array-oriented data access
 
 LICENSE=	UCAR_UNIDATA
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME=	University Corporation for Atmospheric Research/Unidata
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 CONFLICTS=	netcdf-3.* netcdf-4.[0-2].*
 
 CPPFLAGS+=	-fPIC -DPIC
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 USES=		libtool localbase pathfix
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnetcdf_c++4.so.1
 
 .include <bsd.port.mk>
Index: head/science/netcdf-fortran/Makefile
===================================================================
--- head/science/netcdf-fortran/Makefile	(revision 494421)
+++ head/science/netcdf-fortran/Makefile	(revision 494422)
@@ -1,34 +1,35 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	netcdf-fortran
 PORTVERSION=	4.4.5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fortran library for machine-independent, array-oriented data access
 
 LICENSE=	UCAR_UNIDATA
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_NAME=	University Corporation for Atmospheric Research/Unidata
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 USES=		fortran libtool localbase makeinfo pathfix
 
 CPPFLAGS+=	-fPIC -DPIC -DgFortran
 GNU_CONFIGURE=	yes
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	Unidata
 USE_GITHUB=	yes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnetcdff.so.6.1.1
 
 .include <bsd.port.mk>
Index: head/science/py-ScientificPython/Makefile
===================================================================
--- head/science/py-ScientificPython/Makefile	(revision 494421)
+++ head/science/py-ScientificPython/Makefile	(revision 494422)
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	ScientificPython
 DISTVERSION=	2.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Various Python modules for scientific computing
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python:2.7
 USE_PYTHON=	distutils cython concurrent autoplist
 
 MAKE_ENV=	COMPILE_CYTHON=1
 
 .include <bsd.port.mk>
Index: head/science/py-netCDF4/Makefile
===================================================================
--- head/science/py-netCDF4/Makefile	(revision 494421)
+++ head/science/py-netCDF4/Makefile	(revision 494422)
@@ -1,58 +1,58 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	netCDF4
 PORTVERSION=	1.3.1
-PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	rel
+PORTREVISION=	5
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/bin/cython:lang/cython
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils cython
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 GH_ACCOUNT=	Unidata
 GH_PROJECT=	netcdf4-python
 USE_GITHUB=	yes
 
 post-patch:
 	@${ECHO_CMD} -n > ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[options]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "use_ncconfig=True" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "ncconfig=${LOCALBASE}/bin/nc-config" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "[directories]" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_libdir=${LOCALBASE}/lib" >> ${WRKSRC}/setup.cfg
 	@${ECHO_CMD} "HDF5_incdir=${LOCALBASE}/include" >> ${WRKSRC}/setup.cfg
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/netCDF4/_netCDF4.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/netcdftime/_netcdftime.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/science/pycdf/Makefile
===================================================================
--- head/science/pycdf/Makefile	(revision 494421)
+++ head/science/pycdf/Makefile	(revision 494422)
@@ -1,26 +1,26 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	pycdf
 PORTVERSION=	0.6.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science python
 MASTER_SITES=	SF/pysclint/${PORTNAME}/${PORTNAME}-${PORTVERSION}b
 DISTNAME=	${PORTNAME}-0.6-3b
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Interface to the Unidata NetCDF Library
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pycdf/_pycdfext.so
 
 .include <bsd.port.mk>
Index: head/science/rubygem-ruby-netcdf/Makefile
===================================================================
--- head/science/rubygem-ruby-netcdf/Makefile	(revision 494421)
+++ head/science/rubygem-ruby-netcdf/Makefile	(revision 494422)
@@ -1,20 +1,20 @@
 # Created by: Shin-ya Murakami <murashin@gfd-dennou.org>
 # $FreeBSD$
 
 PORTNAME=	ruby-netcdf
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the NetCDF scientific IO library
 
 LIB_DEPENDS=	libnetcdf.so:science/netcdf
 RUN_DEPENDS=	rubygem-narray>=0:math/rubygem-narray \
 		rubygem-narray_miss>=0:math/rubygem-narray_miss
 
 USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
Index: head/science/v_sim/Makefile
===================================================================
--- head/science/v_sim/Makefile	(revision 494421)
+++ head/science/v_sim/Makefile	(revision 494422)
@@ -1,86 +1,86 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	v_sim
 PORTVERSION=	3.7.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	science
 MASTER_SITES=	http://inac.cea.fr/L_Sim/V_Sim/download/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Visualization of atomic structures
 
 LICENSE=	CeCILL
 LICENSE_NAME=	CeCILL
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2	\
 		libftgl.so:graphics/ftgl
 
 USES=		compiler:c11 fortran gl gmake gnome libtool localbase:ldflags \
 		pkgconfig tar:bzip2
 USE_XORG=	x11
 USE_GNOME=	gtk20 intltool cairo
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc --disable-python-module
 CPPFLAGS+=	${CFLAGS}
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS NLS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if !defined(WITHOUT_CDF)
 LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE}
 PLIST_SUB+=	CDF=""
 .else
 CONFIGURE_ARGS+=--without-netcdf
 PLIST_SUB+=	CDF="@comment "
 .endif
 
 .if !defined(WITHOUT_BABEL)
 LIB_DEPENDS+=	libopenbabel.so:science/openbabel
 CONFIGURE_ARGS+=--with-openbabel
 PLIST_SUB+=	BABEL=""
 .else
 CONFIGURE_ARGS+=--without-openbabel
 PLIST_SUB+=	BABEL="@comment "
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$$datadir/doc/$$PACKAGE/examples|${EXAMPLESDIR}|'	\
 		-e 's| CFLAGS="-O2"|#CFLAGS="-O2"|;s|Werror ansi pedantic-errors||'	\
 		-e 's| FCFLAGS="-O2"|FCFLAGS=${FFLAGS}|;s|$${docdir}/examples|${EXAMPLESDIR}|'	\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 .if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e 's|	po ||'	\
 		${WRKSRC}/Makefile.in
 .endif
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|Documentation||'	\
 		${WRKSRC}/Makefile.in
 .endif
 .if ! ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e 's|pixmaps \\|pixmaps|;s|examples$$||'	\
 		${WRKSRC}/Makefile.in
 	${FIND} ${WRKSRC}/lib/plug-ins -name Makefile.in | ${XARGS} \
 	${REINPLACE_CMD} -e	\
 	's|install-v_simexamplesDATA install-v_simpixmapsDATA|install-v_simpixmapsDATA|'
 	${REINPLACE_CMD} -e 's|: install-v_simexamplesDATA|:|'	\
 		${WRKSRC}/lib/python/Makefile.in
 .endif
 
 .include <bsd.port.mk>
Index: head/science/vmd/Makefile
===================================================================
--- head/science/vmd/Makefile	(revision 494421)
+++ head/science/vmd/Makefile	(revision 494422)
@@ -1,170 +1,170 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
 
 PORTNAME=	vmd
 DISTVERSION=	1.9.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science graphics python tcl tk
 MASTER_SITES=	http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/:tachyon \
 		http://www.photonlimited.com/~johns/tachyon/files/0.99b6/:tachyon \
 		http://webclu.bio.wzw.tum.de/stride/:stride \
 		ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/:stride
 DISTFILES=	${VMD_DIST} \
 		${TACHYON_DIST}:tachyon \
 		${STRIDE_DIST}:stride
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Molecular visualization program
 
 LICENSE=	VMD BSD3CLAUSE STRIDE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	makedepend:devel/makedepend \
 		${PYNUMPY}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfltk.so:x11-toolkits/fltk \
 		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
 LICENSE_FILE_VMD=	${WRKSRC}/LICENSE
 LICENSE_PERMS_VMD=	no-auto-accept
 LICENSE_NAME_VMD=	Visual Molecular Dynamics Software License Agreement
 LICENSE_DISTFILES_VMD=	${VMD_DIST}
 
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/lib/tachyon/Copyright
 LICENSE_DISTFILES_BSD3CLAUSE=	${TACHYON_DIST}
 
 LICENSE_TEXT_STRIDE=	${FILESDIR}/stride.txt
 LICENSE_PERMS_STRIDE=	dist-mirror pkg-mirror auto-accept
 LICENSE_NAME_STRIDE=	Stride Copyright Notice
 LICENSE_DISTFILES_STRIDE=${STRIDE_DIST}
 
 USES=		gmake perl5 python shebangfix sqlite tcl tk
 
 SHEBANG_FILES=	${WRKDIR}/plugins/topotools/*.tcl
 
 USE_PERL5=	build
 USE_GL=		gl glu
 USE_XORG=	x11
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 CONFIGURE_ENV=	PYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
 		PYTHON_LIBRARY_DIR=${PYTHON_LIBDIR} \
 		NUMPY_INCLUDE_DIR=${PYTHON_SITELIBDIR}/numpy/core/include \
 		NUMPY_LIBRARY_DIR=${PYTHON_SITELIBDIR} \
 		TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \
 		TCL_LIBRARY_DIR=${LOCALBASE}/lib \
 		TK_INCLUDE_DIR=${TK_INCLUDEDIR} \
 		TK_LIBRARY_DIR=${LOCALBASE}/lib
 CONFIGURE_ARGS=	${VMD_ARCH} OPENGL FLTK TK IMD TCL PTHREADS LIBTACHYON NETCDF NUMPY PYTHON
 INSTALL_WRKSRC=	${WRKSRC}/src
 MAKE_ENV=	EXPATINC=-I${LOCALBASE}/include \
 		EXPATLIB=-L${LOCALBASE}/lib \
 		EXPATLDFLAGS=-lexpat \
 		EXPATDYNAMIC=1 \
 		NETCDFINC=-I${LOCALBASE}/include \
 		NETCDFLIB=-L${LOCALBASE}/lib \
 		NETCDFLDFLAGS=-lnetcdf \
 		SQLITEINC=-I${LOCALBASE}/include \
 		SQLITELIB=-L${LOCALBASE}/lib \
 		SQLITELDFLAGS=-lsqlite3 \
 		SQLITEDYNAMIC=1 \
 		TCLLIB=-L${LOCALBASE}/lib \
 		TCLINC=-I${TCL_INCLUDEDIR} \
 		TCLLDFLAGS=-ltcl${TCL_VER:S/.//} \
 		TKLDFLAGS="-ltk${TK_VER:S/.//} -lX11"
 
 VMD_DIST=	${PORTNAME}-${DISTVERSION}.src.tar.gz
 TACHYON_DIST=	tachyon-0.99b6.tar.gz
 STRIDE_DIST=	stride.tar.gz
 STRIDE_DOC=	stride.doc
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 VMD_ARCH=		FREEBSDAMD64
 .else
 VMD_ARCH=		FREEBSD
 .endif
 
 PLIST_SUB+=		VMD_ARCH=${VMD_ARCH}
 
 # Check for VMD sources
 .if !exists(${DISTDIR}/${VMD_DIST})
 IGNORE=	license restrictions require manual fetching of the distribution\
 	source.  Please visit http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD\
 	with a browser.  You will be required to register, log in, and accept\
 	the University of Illinois agreement before you can download the\
 	${VMD_DIST} source file.  Place this file in ${DISTDIR} and try again.
 .endif
 
 do-extract:
 	${MKDIR} ${WRKDIR} ${WRKSRC}/lib/stride
 	${TAR} -xzf ${DISTDIR}/${VMD_DIST} -C ${WRKDIR}
 	${TAR} -xzf ${WRKSRC}/lib/surf/surf.tar.Z -C ${WRKSRC}/lib/surf
 	${TAR} -xzf ${DISTDIR}/${TACHYON_DIST} -C ${WRKSRC}/lib
 	${TAR} -xzf ${DISTDIR}/${STRIDE_DIST} -C ${WRKSRC}/lib/stride
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e "s|-lpython2.5|-l${PYTHON_VERSION}${PYTHON_ABIVER}|" \
 		-e "s|/usr/local|${LOCALBASE}|g"  \
 		-e "s|-fno-for-scope||g" \
 		-e "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
 	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile
 	${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" \
 		${WRKSRC}/src/Orbital.C
 	${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \
 		${WRKDIR}/plugins/Make-arch
 	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \
 		${WRKSRC}/lib/stride/Makefile \
 		${WRKSRC}/lib/surf/Makefile \
 		${WRKSRC}/lib/tachyon/unix/Make-arch \
 		${WRKDIR}/plugins/cionize/Makefile.specialbuilds \
 		${WRKDIR}/plugins/cionize/Makefile.mine \
 		${WRKDIR}/plugins/cionize/Makefile.testing \
 		${WRKDIR}/plugins/Make-arch \
 		${WRKDIR}/plugins/molfile_plugin/f77/Makefile
 	${REINPLACE_CMD} -E "s/(CXX[[:space:]]*=[[:space:]]*)g\+\+/\1${CXX}/" \
 		${WRKDIR}/plugins/fmtool/Makefile.specialbuilds \
 		${WRKDIR}/plugins/hesstrans/src/foo/Makefile \
 		${WRKDIR}/plugins/hesstrans/src/foo/nm_gnu.mak \
 		${WRKDIR}/plugins/Make-arch
 	${REINPLACE_CMD} -e "s/return *;/return 0;/g" \
 		${WRKSRC}/lib/surf/*.c
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} bsd -C ${WRKSRC}/lib/tachyon/unix
 		${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon ${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH}
 	${SETENV} ${MAKE_ENV} PLUGINDIR=${WRKSRC}/plugins ${MAKE_CMD} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} all -C ${WRKSRC}/src
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} depend -C ${WRKSRC}/lib/surf
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} surf -C ${WRKSRC}/lib/surf
 		${MV} ${WRKSRC}/lib/surf/surf ${WRKSRC}/lib/surf/surf_${VMD_ARCH}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} -C ${WRKSRC}/lib/stride 
 		${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH}
 
 post-install:
 	${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' ${STAGEDIR}${PREFIX}/bin/vmd
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/*${VMD_ARCH} \
 	    ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/molfile/*.so
 .for f in tcl/autopsf1.6/psfcheck.so tcl/hesstrans1.0/hesstrans.so \
 	  tcl/mutator1.5/libalchemify.so tcl/pmepot1.0/libpmepot.so \
 	  tcl/psfgen1.6/libpsfgen.so tcl/rnaview1.1/rnaview \
 	  tcl/signalproc1.1/specden.so tcl/signalproc1.1/fftcmds.so \
 	  tcl/signalproc1.1/sgsmooth.so tcl/volutil1.3/volutil \
 	  tcl/clustalw1.1/clustalw tcl/libbiokit1.1/tcl_libbiokit.so \
 	  tcl/libbiokit1.1/q tcl/libbiokit1.1/seqqr \
 	  tcl/libbiokit1.1/structqr tcl/libbiokit1.1/qpair \
 	  tcl/libbiokit1.1/rmsd tcl/libbiokit1.1/percid \
 	  tcl/phylotree1.2/upgmaclu tcl/stamp1.2/stamp \
 	  tcl/bossconvert1.0/Topology \
 	  bin/catdcd5.1/catdcd bin/cionize1.0/cionize
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/vmd/plugins/${VMD_ARCH}/${f}
 .endfor
 
 .include <bsd.port.post.mk>