Index: head/devel/py-tables/Makefile
===================================================================
--- head/devel/py-tables/Makefile	(revision 377317)
+++ head/devel/py-tables/Makefile	(revision 377318)
@@ -1,68 +1,69 @@
 # Created by: ijliao@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	tables
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/py${PORTNAME:tl}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	tables-${PORTVERSION}.tar.gz pytablesmanual-${PORTVERSION}.pdf
 EXTRACT_ONLY=	tables-${PORTVERSION}.tar.gz
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Hierarchical database for Python
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:${PORTSDIR}/math/py-numexpr
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
 		libucl.so:${PORTSDIR}/archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=			python
 USE_PYTHON=		distutils
 
 PLIST_FILES=	bin/pt2to3 bin/ptdump bin/ptrepack
 
 OPTIONS_DEFINE=	PYREX DOCS EXAMPLES
 PYREX_DESC=	Use code generated by Pyrex to build
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYREX}
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables ! -type d | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables -type d | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/pytablesmanual-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${ECHO} '${STAGEDIR}${DOCSDIR}/pytablesmanual-${PORTVERSION}.pdf' | ${SED} 's,^${STAGEDIR}${PREFIX}/,,' \
 		 >> ${TMPPLIST}
 	${ECHO} '${STAGEDIR}${DOCSDIR}' | ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' \
 		>> ${TMPPLIST}
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR}
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} ! -type d | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
Index: head/french/aster/Makefile
===================================================================
--- head/french/aster/Makefile	(revision 377317)
+++ head/french/aster/Makefile	(revision 377318)
@@ -1,384 +1,384 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Aster finite element method solver
 
 LICENSE=	GPLv2
 
 #-----------------------------------------------------------------------
 # You may define these options:
 #
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
 # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITH_ATLAS: replace blas;
 # - WITH_BLAS: don't link with atlas, even if present, but with blas;
 #			(blas might be slower, but is lighter)
 # - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
 # - WITHOUT_EFICAS: don't install ASter Command FIle Editor;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
 # - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
 # - WITHOUT_MACR_RECAL: don't install Numerical Python
 #			(required by the macro MACR_RECAL);
 # - WITHOUT_SCOTCH: don't install Scotch.
 # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental)
 #
 #-----------------------------------------------------------------------
 
 BUILD_DEPENDS+=	${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
 		${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch		\
 		python:${PORTSDIR}/lang/python					\
 		${PYNUMPY}
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5				\
 		libmed.so:${PORTSDIR}/french/med				\
 		libmetis.so.0:${PORTSDIR}/math/metis-edf
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
 		${LOCALBASE}/bin/onmetis:${PORTSDIR}/math/metis-edf		\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
 
 USES=		bison fortran tk python:2
 
 .if defined(WITH_ATLAS)
 USES+=		blaslapack:atlas
 .else
 USES+=		blaslapack:netlib
 .endif
 
 HAS_CONFIGURE=	yes
 MAKE_ENV=	INCLUDES="${LOCALBASE}/include ${LOCALBASE}/include/metis"
 REINPLACE_ARGS=	-i ""
 
 VER=		${PORTVERSION:R}
 VE=		${VER:R}
 WRKSRC=		${WRKDIR}/${PORTNAME}-full-src-${VER}
 
 PLIST_SUB=	VE=${VE}
 .if defined(WITHOUT_ASTK_CLI)
 SUB_FILES=	pkg-message.sans-astk
 .else
 SUB_FILES=	pkg-message
 .endif
 SUB_LIST=	tools_dir=${tools_dir}
 
 INTERACTIVE_SCRIPTS=	check_compilers.py setup.py
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 FLAGARCH=	-DP_LINUX -DLINUX
 .else
 FLAGARCH=	-DLINUX64
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
 RUN_DEPENDS+=	${ASTKDIR}:${PORTSDIR}/cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_EFICAS)
 RUN_DEPENDS+=	${LOCALBASE}/apps/eficas:${PORTSDIR}/french/eficas
 PLIST_SUB+=	EFICAS=""
 .else
 PLIST_SUB+=	EFICAS="@comment "
 .endif
 .if !defined(WITHOUT_GMSH)
 RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:${PORTSDIR}/cad/gmsh
 PLIST_SUB+=	GMSH=""
 .else
 PLIST_SUB+=	GMSH="@comment "
 .endif
 .if !defined(WITHOUT_GRACE)
 RUN_DEPENDS+=	xmgrace:${PORTSDIR}/math/grace
 PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
 .endif
 .if !defined(WITHOUT_MACR_RECAL)
 RUN_DEPENDS+=	${PYNUMPY}
 .endif
 
 .if !defined(WITH_MPI)
 MUMPS_PORT=	mumps
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs	\
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 MUMPS_PORT=	mumps-mpich
 MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
 .endif
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
 
 .if defined(WITH_MPI)
 LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
 HOME_MPI=	${LOCALBASE}
 .endif
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
 SHIA=		bash
 .elif defined(WITH_KSH)
 SHIA=		ksh93
 .elif exists(${LOCALBASE}/bin/zsh)
 SHIA=		zsh
 .elif exists(${LOCALBASE}/bin/bash)
 SHIA=		bash
 .elif exists(${LOCALBASE}/bin/ksh93)
 SHIA=		ksh93
 .else
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit
 . else
 WITH_ED=	vi
 . endif
 .endif
 
 INST_DAT=	elements
 INST_SH=	as_run parallel_cp
 PFX2FIX=	bin/as_run ${VE}/include/aster/asterc_config.h ${VE}/config.txt	\
 		${VE}/include/aster/asterf_config.h ${VE}/profile.sh		\
 		${VE}/lib/aster/aster_pkginfo.py
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		kmetis onmetis pmetis gnuplot
 .if !defined(WITHOUT_EFICAS)
 tools+=		eficas eficasQt
 .endif
 .if !defined(WITHOUT_GMSH)
 tools+=		gmsh
 .endif
 .if !defined(WITHOUT_GRACE)
 tools+=		gracebat xmgrace
 .endif
 v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
 hdf_dir=	${LOCALBASE}
 lib_math=	"-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} ${ATLASLIB}"
 
 LASTKDIR?=	${PORTNAME}/ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
 BASH2RC=	products_data.py
 
 pre-everything::
 .if defined(WITH_MPI)
 	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'"
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|'	\
 		${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|/opt/aster|${STAGEDIR}${inst_dir}|'	\
 		${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|'	\
 		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g"	\
 		-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
 	${REINPLACE_CMD} -e 's|%%FILESDIR%%|${FILESDIR}|' ${WRKSRC}/as_setup.py
 .for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 .endfor
 .if defined(WITH_ATLAS)
 	${REINPLACE_CMD} -e "s|cfg\['BLASLIB'\]|cfg['BLASLIB'], cfg['ATLASLIB']|"	\
 		${WRKSRC}/products.py
 .endif
 	${ECHO_CMD} "_install_hdf5 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_med = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tcl = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_tk  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Pmw = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_Numeric = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gmsh2 = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_gibi = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_grace = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "XMGRACE = 'xmgrace'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_homard = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_eficas = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk_serv = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mumps = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORB = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORBpy = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_pylotage = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_aster_Linux = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_scotch  = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 .if ${MUMPS_PORT} == "mumps-mpich"
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic -lutil ${PTHREAD_LIBS} -lz'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SYSLIB='${PTHREAD_LIBS} -lz'"		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = 'mpirun'"				>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "HOME_MPI = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MPIRUN = ''"				>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "HOME_ZMAT = ''"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_HDF='${hdf_dir}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MED='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_ATLAS)
 	${ECHO_CMD} "ATLASLIB='${_ATLASLIB}'"			>> ${WRKSRC}/setup.cfg
 .endif
 	${ECHO_CMD} "BLASLIB='${_BLASLIB}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LAPACKLIB='lapack'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'"	\
 		>> ${WRKSRC}/setup.cfg
 .else
 	${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 .endif
 .for is in ${INTERACTIVE_SCRIPTS}
 	${REINPLACE_CMD} -e '/should_continue()/d'		\
 		${WRKSRC}/${is}
 .endfor
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
 	&& TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} test	\
 		--prefix=${STAGEDIR}${inst_dir}	| tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
 	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 post-configure:
 	${MKDIR} ${STAGEDIR}${inst_dir}/etc
 	${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/
 	${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster
 	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
 		${STAGEDIR}${inst_dir}
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|'	\
 		${STAGEDIR}${inst_dir}/bin/as_run
 .for sf in etc/codeaster/profile.sh asrun/installation.py
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g'	\
 		-e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g'	\
 		${STAGEDIR}${inst_dir}/${sf}
 .endfor
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
 	TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster	\
 		--prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log)
 
 do-install:
 	# build: already did the installation
 	@${DO_NADA}
 
 post-install:
 	${RM} -rf ${STAGEDIR}${inst_dir}/etc	# Installed by cad/astk-serveur
 	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests	\
 		${STAGEDIR}${inst_dir}/${VE}/
 	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/*	\
 		${STAGEDIR}${inst_dir}/${VE}/
 	${RM} -rf ${STAGEDIR}${inst_dir}/${VE}/share
 .for f in ${PFX2FIX}
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
 .endfor
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||})
 	${CP} -p ${STAGEDIR}${inst_dir}/${VE}/bin/aster					\
 		${STAGEDIR}${inst_dir}/${VE}/bin/asterd
 	${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster
 	${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export	\
 		> ${STAGEDIR}${inst_dir}/${VE}/astout.export
 	(cd ${STAGEDIR}${inst_dir} &&	\
 		${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE})
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
 .if !defined(WITHOUT_ASTK_CLI)
 	${MKDIR} ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 	${LN} -fs ${ASTKDIR}/etc/astkrc/*	\
 		${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc
 . for outil in astk bsf
 	${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 . endfor
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
 	${CP} ${inst_dir}/${VE}/astout.export /tmp/
 	(cd ${inst_dir}/${VE} &&	\
 	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run --list --all --vers=${VE}	\
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
 	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export) || ${TRUE}
 	@${ECHO_MSG} "Check /tmp/resu_test/*.erre"
 .endif
 
 .include <bsd.port.post.mk>
Index: head/french/med/Makefile
===================================================================
--- head/french/med/Makefile	(revision 377317)
+++ head/french/med/Makefile	(revision 377318)
@@ -1,66 +1,66 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	med
 DISTVERSION=	3.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modelisation et Echanges de Donnees
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		fortran gmake libtool tk
 CONFIGURE_ARGS=	--disable-python --with-hdf5=${LOCALBASE}
 CONFIGURE_ENV=	WISH=${WISH}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 PATCH_TK_SCRIPTS=	tools/mdump/xmdump2.in tools/mdump/xmdump3.in
 
 DOC2FIX=	. dox gif html html.dox jpg png
 TST2FIX=	c f
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.options.mk>
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
 		${WRKSRC}/include/2.3.6/med_outils.h \
 		${WRKSRC}/include/med_outils.h
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 .endif
 .if ! ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e '/SUBDIRS/ s|tests||' ${WRKSRC}/Makefile.in
 .endif
 .for dd in ${DOC2FIX}
 	${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = @docdir@|'	\
 		${WRKSRC}/doc/${dd}/Makefile.in
 .endfor
 .for dd in ${TST2FIX}
 	${FIND} ${WRKSRC}/tests -name Makefile.in | ${XARGS}	\
 	${REINPLACE_CMD} -e 's|test${dd}dir = $$(bindir)/test|test${dd}dir = ${EXAMPLESDIR}/test|' \
 			-e 's|unittestsdir = $$(bindir)/unit|unittestsdir = ${EXAMPLESDIR}/unit|' \
 			-e 's|usescasesdir = $$(bindir)/uses|usescasesdir = ${EXAMPLESDIR}/uses|'
 .endfor
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf mdump3 mdump	\
 		&& ${LN} -sf xmdump3 xmdump)
 
 regression-test:
 	(cd ${BUILD_WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
Index: head/graphics/openimageio/Makefile
===================================================================
--- head/graphics/openimageio/Makefile	(revision 377317)
+++ head/graphics/openimageio/Makefile	(revision 377318)
@@ -1,84 +1,84 @@
 # Created by: Shane Ambler <FreeBSD@Shaneware.biz>
 # $FreeBSD$
 
 PORTNAME=	openimageio
 PORTVERSION=	1.4.14
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
 COMMENT?=	OpenImageIO graphics library
 
 LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 GH_TAGNAME=	Release-${PORTVERSION}
 GH_COMMIT=	08ce694
 
 # fbm also installs bin/idiff
 CONFLICTS=	fbm-[0-9]*
 
 USES=		cmake:outsource
 CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DLINKSTATIC:BOOL=OFF \
 		-DNOTHREADS:BOOL=OFF \
 		-DSTOP_ON_WARNING:BOOL=OFF
 
 OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO TEST
 OPTIONS_DEFAULT=	OCIO
 OPTIONS_SUB=		yes
 
 IMAGEVIEWER_DESC=	Build image viewer
 OCIO_DESC=		Colour management support
 
 DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
 DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
 
 OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
 OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
 OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
 
 TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
 TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
 		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
 		libwebp.so:${PORTSDIR}/graphics/webp
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON
 .else
 LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \
 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
 USES+=		python
 PLIST=		${PKGDIR}/pkg-plist-pybind
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEVIEWER}
 USE_GL=		glew
 USE_QT4=	corelib gui opengl qmake_build moc_build rcc_build uic_build
 CMAKE_ARGS+=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
 CMAKE_ENV+=	QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR}
 .else
 CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
 .if ${SLAVE_PORT} == no
 	${LN} -sf libOpenImageIO.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
 	${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/vigra/Makefile
===================================================================
--- head/graphics/vigra/Makefile	(revision 377317)
+++ head/graphics/vigra/Makefile	(revision 377318)
@@ -1,108 +1,108 @@
 # Created by: cartola (Carlos E. G. Carvalho)
 # $FreeBSD$
 
 PORTNAME=	vigra
 DISTVERSION=	1.10.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src-with-docu
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 
 LICENSE=	MIT
 
 USE_GITHUB=
 GH_ACCOUNT=     ukoethe
 GH_COMMIT=      e6c21f3
 GH_TAGNAME=     ${GH_COMMIT}
 FETCH_ARGS?=    -Fpr
 
 WRKSRC=		${WRKDIR}/ukoethe-${PORTNAME}-${GH_COMMIT}
 
 USES=		cmake
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS
 OPTIONS_DEFAULT=	HDF5 OPENEXR
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHDF5}
 CMAKE_ARGS+=	-DWITH_HDF5=1
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5
 .else
 CMAKE_ARGS+=	-DWITH_HDF5=0
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 CMAKE_ARGS+=	-DWITH_OPENEXR=1
 LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
 .else
 CMAKE_ARGS+=	-DWITH_OPENEXR=0
 .endif
 
 .if ${PORT_OPTIONS:MNUMPY}
 # Should ignore Python3 since commit f51b0b5
 #CONFLICTS_BUILD=	python3*
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
 USES+=		compiler:gcc-c++11-lib python:2
 BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
 #BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 PLIST_SUB+=	PYTHON=""
 .else
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=0
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 # Vigra's CMakeLists.txt does not support disabling those so we hook them
 # as dependencies here unconditionally (without OPTIONS=) even though if
 # they are not present then Vigra/CMake will do without them (they are not
 # mandatory).
 #
 # Notice that if you define e.g. WITHOUT_VIGRA_TIFF and graphics/tiff is
 # installed on your system, then the lib will be picked up by Vigra, the
 # dependency will not be recorded by the ports system and later deletion
 # of graphics/tiff will break Vigra. Only define WITHOUT_VIGRA_TIFF if you
 # do not have graphics/tiff installed and do not want TIFF support in Vigra.
 
 .if !defined(WITHOUT_VIGRA_TIFF)
 LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
 .endif
 
 .if !defined(WITHOUT_VIGRA_JPEG)
 LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 .endif
 
 .if !defined(WITHOUT_VIGRA_PNG)
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 .endif
 
 .if !defined(WITHOUT_VIGRA_FFTW)
 LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
 LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
 .endif
 
 pre-everything::
 .if ${PORT_OPTIONS:MNUMPY}
 	@${ECHO} ""
 	@${ECHO} "* BEWARE!"
 	@${ECHO} "* Using py-NumPY implies Fortran and GCC 4.7+ as hard dependencies"
 	@${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes"
 	@${ECHO} ""
 .endif
 
 post-patch:
 # FIXME: This is ugly
 	@${RM} ${WRKSRC}/include/vigra/*.orig
 
 .include <bsd.port.post.mk>
Index: head/math/armadillo/Makefile
===================================================================
--- head/math/armadillo/Makefile	(revision 377317)
+++ head/math/armadillo/Makefile	(revision 377318)
@@ -1,20 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	armadillo
 PORTVERSION=	4.600.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	C++ linear algebra library
 
 LICENSE=	MPL
 
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libarpack.so:${PORTSDIR}/math/arpack \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 
 USES=		cmake blaslapack
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: head/math/matio/Makefile
===================================================================
--- head/math/matio/Makefile	(revision 377317)
+++ head/math/matio/Makefile	(revision 377318)
@@ -1,28 +1,28 @@
 # Created by: rfarmer@predatorlabs.net
 # $FreeBSD$
 
 PORTNAME=	matio
 PORTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Library for reading and writing Matlab MAT files
 
 LICENSE=	BSD2CLAUSE
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	HDF5
 OPTIONS_DEFAULT=	HDF5
 
 HDF5_DESC=	Support for MAT file version 7.3
 HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 HDF5_CONFIGURE_ON=	--enable-mat73=yes \
 			--with-hdf5=${LOCALBASE}
 
 .include <bsd.port.mk>
Index: head/math/octave/Makefile
===================================================================
--- head/math/octave/Makefile	(revision 377317)
+++ head/math/octave/Makefile	(revision 377318)
@@ -1,128 +1,128 @@
 # Created by: chuckr@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	octave
 PORTVERSION=	3.8.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	octave
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		gsed:${PORTSDIR}/textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		gsed:${PORTSDIR}/textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \
 		libarpack.so:${PORTSDIR}/math/arpack \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
 		libftgl.so:${PORTSDIR}/graphics/ftgl \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libqhull.so.5:${PORTSDIR}/math/qhull5 \
 		libqrupdate.so:${PORTSDIR}/math/qrupdate \
 		libumfpack.so:${PORTSDIR}/math/suitesparse \
 		libglpk.so:${PORTSDIR}/math/glpk \
 		libgl2ps.so:${PORTSDIR}/print/gl2ps \
 		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
 
 USES=		charsetfix fortran gmake libtool perl5 pkgconfig tar:bzip2
 USE_PERL5=	build
 USE_TEX=	dvipsk:build
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 USE_QT4=	gui network uic_build moc_build rcc_build linguist_build
 
 OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf" \
 		JAVA_HOME=${JAVA_HOME} \
 		MAKEINFO=${LOCALBASE}/bin/makeinfo
 CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
 		--with-lapack="${LAPACK}" \
 		--enable-shared \
 		--disable-jit
 
 OPTIONS_DEFINE=	DOCS
 
 INFO=		octave liboctave
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libopenblas.so)
 WITH_BLAS?=	openblas
 .elif exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 . if ${WITH_BLAS} == reference
 LIB_DEPENDS+=	libblas.so.2:${PORTSDIR}/math/blas \
 		liblapack.so.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == openblas
 LIB_DEPENDS+=	libopenblas.so:${PORTSDIR}/math/openblas
 BLAS=		-lopenblasp
 LAPACK=		-lopenblasp
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
 	${REINPLACE_CMD} 's+-lumfpack+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACK}+' ${WRKSRC}/configure
 	${REINPLACE_CMD} 's+-lcholmod+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACK}+' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/icons/octave.desktop \
 		${STAGEDIR}${DESKTOPDIR}/www.octave.org-octave.desktop
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in liboctave/liboctave.ps \
 	refcard/refcard-a4.ps refcard/refcard-legal.ps \
 	refcard/refcard-letter.ps interpreter/octave.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${RM} -f ${WRKDIR}/PLIST
 .for d in ${PREFIX}/include/octave-${OCTAVE_VERSION} ${PREFIX}/share/octave/${OCTAVE_VERSION} ${PREFIX}/share/octave/site ${PREFIX}/lib/octave/${OCTAVE_VERSION} ${PREFIX}/libexec/octave/${OCTAVE_VERSION}
 	@${FIND} -s ${STAGEDIR}$d -not -type d -not -name '*.la' | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${WRKDIR}/PLIST
 	@${FIND} -s ${STAGEDIR}$d -type d -empty | \
 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' \
 		>> ${WRKDIR}/PLIST
 .endfor
 .for d in ${PREFIX}/libexec/octave/api-v49+ ${PREFIX}/libexec/octave/site ${PREFIX}/lib/octave/site
 	@${FIND} -s ${STAGEDIR}$d -type d -empty | \
 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' \
 		>> ${WRKDIR}/PLIST
 .endfor
 	cd ${WRKDIR} ; ${SED} -i.bak -e "/PLIST/ r PLIST" ${TMPPLIST}
 
 check regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 .include <bsd.port.post.mk>
Index: head/math/scilab/Makefile
===================================================================
--- head/math/scilab/Makefile	(revision 377317)
+++ head/math/scilab/Makefile	(revision 377318)
@@ -1,182 +1,182 @@
 # Created by: js@jeannot.org
 # $FreeBSD$
 
 PORTNAME=	scilab
 PORTVERSION=	5.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math cad java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scientific software package for numerical computations
 
 # A partial dependencies list can be found at:
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libarpack.so:${PORTSDIR}/math/arpack \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libmatio.so:${PORTSDIR}/math/matio \
 		libamd.so:${PORTSDIR}/math/suitesparse
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USES=		desktop-file-utils fortran gettext gmake iconv libtool \
 		pathfix pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gfortran \
 		--without-emf \
 		-disable-static-system-lib
 CONFIGURE_ENV=	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
 MAKE_ENV=	LANG=en_US.UTF-8 \
 		LC_ALL=en_US.UTF-8
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	ATLAS GUI OCAML TK
 OPTIONS_DEFAULT=	GUI OCAML TK
 OPTIONS_SUB=	yes
 
 ATLAS_DESC=	Use Atlas instead of Blas
 GUI_DESC=	Graphical User Interface (Java)
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
 # Java dependencies:
 _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:${PORTSDIR}/devel/flexdock \
 		${JAVALIBDIR}/jogl2.jar:${PORTSDIR}/graphics/jogamp-jogl \
 		foprep:${PORTSDIR}/math/jeuclid \
 		${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
 		${JAVALIBDIR}/jrosetta-api.jar:${PORTSDIR}/java/jrosetta \
 		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
 		${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
 		${JAVALIBDIR}/jlatexmath.jar:${PORTSDIR}/math/jlatexmath \
 		${LOCALBASE}/share/java/ecj-4.5.jar:${PORTSDIR}/lang/gcc-ecj45
 # Documentation, graphic export:
 _GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:${PORTSDIR}/textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:${PORTSDIR}/math/jlatexmath \
 		${LOCALBASE}/share/java/batik/lib/batik-all.jar:${PORTSDIR}/graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
 		${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons
 # Code quality:
 _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
 		${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr \
 		${JAVALIBDIR}/junit4.jar:${PORTSDIR}/java/junit \
 		${LOCALBASE}/bin/splint:${PORTSDIR}/devel/splint
 # Documentation building:
 _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		${JAVALIBDIR}/saxon9he.jar:${PORTSDIR}/textproc/saxon-he \
 		${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 # Other gui deps:
 _GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
 		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target
 GUI_BUILD_DEPENDS=	${_GUI_DEPENDS} \
 			ant:${PORTSDIR}/devel/apache-ant
 GUI_RUN_DEPENDS=	${_GUI_DEPENDS}
 
 GUI_ALL_TARGET=	all doc
 GUI_USE=	GL=gl
 GUI_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-bin-JAVA_HOME
 GUI_CONFIGURE_ON=	--with-jdk=${JAVA_HOME} \
 			--with-docbook=${LOCALBASE}/share/xsl/docbook \
 			--enable-build-help
 GUI_CONFIGURE_OFF=	--without-gui \
 			--without-javasci \
 			--without-xcos \
 			--disable-build-help
 CONFIGURE_ENV_OFF=	JAVADOC="${TRUE}"
 
 OCAML_CONFIGURE_WITH=	modelica
 OCAML_BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
 OCAML_RUN_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
 
 TK_CONFIGURE_OFF=	--without-tk
 TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
 			--with-tk-include=${TK_INCLUDEDIR} \
 			--with-tcl-library=${LOCALBASE}/lib \
 			--with-tcl-include=${TCL_INCLUDEDIR}
 TK_USES=	tk
 TK_USE=		XORG=x11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS_LIBS=	-lf77blas
 LAPACK_LIBS=	-lalapack -lcblas
 .else
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack \
 		libblas.so:${PORTSDIR}/math/blas
 BLAS_LIBS=	-lblas
 LAPACK_LIBS=	-llapack
 .endif
 
 .if ${PORT_OPTIONS:MGUI}
 USE_JAVA=	yes
 # bsdjava (ie java/jdk16) doesn't have some "extra" classes that aren't in
 # the standard java. namespace, but are required by scilab, such as
 # javax.xml.bind.annotation.XmlSeeAlso
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 .endif
 
 post-patch:
 	@# Configure fixes
 	@${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd $$LAPACK_LIBS $$BLAS_LIBS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"x=" ==|"x" =|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"x" ==|"x" =|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|sparc64-\*-netbsd\*|amd64-\*-freebsd\*|' ${WRKSRC}/configure
 	@# Build fixes
 	@${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
 	@${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
 	@# malloc.h -> stdlib.h conversions
 	@${GREP} -lr "<malloc.h>" ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} -e \
 		's/[<"]malloc.h[>"]/<stdlib.h>/'
 	@# Run fixes
 	@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
 .if ${PORT_OPTIONS:MGUI}
 	@# Configure fixes
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$jardir/batik-all.jar|${LOCALBASE}/share/java/batik/lib/batik-all.jar|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' ${WRKSRC}/configure
 	@# Run fixes
 	@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab
 	@${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop
 	@${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \
 		${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop
 .if ${OSVERSION} < 900000 && ${ARCH} == "amd64"
 	@# Avoids segfault when building help
 	@${REINPLACE_CMD} 's|JIT|NONE|' ${WRKSRC}/etc/jvm_options.xml
 .endif
 .endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/.atoms
 	@${TOUCH} ${STAGEDIR}${DATADIR}/.atoms/.keep_me
 
 post-install:
 	@# Remove empty dirs in DATADIR/modules - they will be removed by the
 	@# toolbox uninstaller otherwise if 3rd party toolboxes are used
 	@${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete
 
 check test regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 		${MAKE_ARGS} check)
 
 .include <bsd.port.mk>
Index: head/science/cdo/Makefile
===================================================================
--- head/science/cdo/Makefile	(revision 377317)
+++ head/science/cdo/Makefile	(revision 377318)
@@ -1,82 +1,83 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	cdo
 PORTVERSION=	1.6.7
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://code.zmaw.de/attachments/download/9444/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
 OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
 OPTIONS_SUB=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-cgribex \
 		--disable-data \
 		--disable-extra \
 		--disable-grib \
 		--disable-ieg \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 USE_LDCONFIG=	yes
 USES=		gmake libtool pathfix
 
 CGRIBEX_CONFIGURE_OFF=	--without-cgribex
 CGRIBEX_CONFIGURE_ON=	--with-cgribex=${LOCALBASE}
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:${PORTSDIR}/science/cgribex
 HDF5_CONFIGURE_OFF=	--without-hdf5
 HDF5_CONFIGURE_ON=	--with-hdf5=${LOCALBASE}
 HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 JASPER_CONFIGURE_OFF=	--without-jasper
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
 JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
 NETCDF_CONFIGURE_OFF=	--without-netcdf
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 PROJ_CONFIGURE_OFF=	--without-proj
 PROJ_CONFIGURE_ON=	--with-proj=${LOCALBASE}
 PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
 SZIP_CONFIGURE_OFF=	--without-szlib
 SZIP_CONFIGURE_ON=	--with-szlib=${LOCALBASE}
 SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
 UDUNITS_CONFIGURE_OFF=	--without-udunits2
 UDUNITS_CONFIGURE_ON=	--with-udunits2=${LOCALBASE}
 UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/science/udunits
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHDF5} && !${PORT_OPTIONS:MSZIP}
 IGNORE=		HDF5 option requires SZIP option
 .endif
 
 .if ${PORT_OPTIONS:MNETCDF} && !${PORT_OPTIONS:MHDF5}
 IGNORE=		NETCDF option requires HDF5 option
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR_CONDATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 
 regression-test test: build
 .if ${PORT_OPTIONS:MNETCDF}
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 .endif
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
Index: head/science/cgnslib/Makefile
===================================================================
--- head/science/cgnslib/Makefile	(revision 377317)
+++ head/science/cgnslib/Makefile	(revision 377318)
@@ -1,77 +1,77 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	cgnslib
 DISTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	science
 MASTER_SITES=	SF/cgns/${PORTNAME}_${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	CFD General Notation System library code
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	HDF5 SZIP TESTS TOOLS
 HDF5_DESC=	Enable HDF5 interface
 TESTS_DESC=	Enable test programs
 TOOLS_DESC=	Build the CGNSTools package
 SZIP_DESC=	SZIP support in HDF5
 
 OPTIONS_DEFAULT=HDF5 TESTS TOOLS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHDF5}
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5
 CMAKE_ARGS+=	-DCGNS_ENABLE_HDF5:BOOL=TRUE -DHDF5_NEED_ZLIB:BOOL=TRUE	\
 		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 PLIST_SUB=	HDF5=""
 . if ${PORT_OPTIONS:MSZIP}
 CMAKE_ARGS+=	-DHDF5_NEED_SZIP:BOOL=OFF
 . endif
 .else
 CMAKE_ARGS+=	-DCGNS_ENABLE_HDF5:BOOL=OFF
 PLIST_SUB=	HDF5="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 USES+=		fortran
 CMAKE_ARGS+=	-DCGNS_ENABLE_TESTS:BOOL=TRUE -DCGNS_ENABLE_FORTRAN:BOOL=TRUE
 TESTSBIN=	cgwrite cgread test_partial
 .endif
 
 .if ${PORT_OPTIONS:MTOOLS}
 USES+=		tk
 USE_GL=		gl glu
 USE_XORG=	xmu
 CMAKE_ARGS+=	-DCGNS_BUILD_CGNSTOOLS:BOOL=TRUE			\
 		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}"	\
 		-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
 PLIST_SUB=	TOOLS=""
 .else
 PLIST_SUB=	TOOLS="@comment "
 .endif
 
 LIBVER=		${PORTVERSION:R}
 
 .if ${PORT_OPTIONS:MTESTS}
 regression-test:
 . for pg in ${TESTSBIN}
 	@(cd ${BUILD_WRKSRC}/src/tests; ./${pg})
 . endfor
 .endif
 
 post-install:
 	${LN} -sf libcgns.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${LIBVER:R}
 
 .include <bsd.port.mk>
Index: head/science/ecs/Makefile
===================================================================
--- head/science/ecs/Makefile	(revision 377317)
+++ head/science/ecs/Makefile	(revision 377318)
@@ -1,78 +1,79 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	ecs
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://code-saturne.org/releases/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Preprocessor
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch
 LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med	\
 		libbft.so:${PORTSDIR}/science/bft	\
 		libhdf5.so:${PORTSDIR}/science/hdf5	\
 		libcgns.so:${PORTSDIR}/science/cgnslib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		gmake
 USE_TEX=	dvipsk
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
 		--without-adf --without-ccm	\
 		--with-scotch=${LOCALBASE}	\
 		--with-med=${LOCALBASE}		\
 		--with-metis=${LOCALBASE}	\
 		--with-metis-include=${LOCALBASE}/include/metis
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 
 DOCS_USE=	TEX=tex:build
 DOCS_BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	mi_ecs.pdf mt_ecs.pdf
 MAKE_JOBS_UNSAFE=yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/bin/graphchk)
 # The regular metis is present, so we cannot depend on metis-edf
 LIB_DEPENDS+=	libmetis.so.1:${PORTSDIR}/math/metis4
 .else
 # Prefer metis-edf to avoid conflict with Code_Aster
 LIB_DEPENDS+=	libmetis.so.0:${PORTSDIR}/math/metis-edf
 .endif
 
 pre-configure:
 .if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^SUBDIRS/s| po| po doc|' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/science/fvm/Makefile
===================================================================
--- head/science/fvm/Makefile	(revision 377317)
+++ head/science/fvm/Makefile	(revision 377318)
@@ -1,64 +1,64 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	fvm
 PORTVERSION=	0.15.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science parallel
 MASTER_SITES=	http://code-saturne.org/releases/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Finite Volume Mesh
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med	\
 		libbft.so:${PORTSDIR}/science/bft	\
 		libhdf5.so:${PORTSDIR}/science/hdf5	\
 		libcgns.so:${PORTSDIR}/science/cgnslib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}	\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
 		--with-med=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 
 .if defined(WITH_LAM)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/liblam.a:${PORTSDIR}/net/lam
 RUN_DEPENDS+=	${LOCALBASE}/bin/lamboot:${PORTSDIR}/net/lam
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}
 .elif defined(WITH_OPENMPI)
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}/mpi/openmpi
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}
 # Do not directly depend on Fortran, but FFLAGS needed to link with mpich2
 USES+=		fortran
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 TESTSBIN=	fvm_file_test fvm_interface_test fvm_selector_postfix_test fvm_selector_test
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lmpich|-lmpich -lmpl|'	\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	# No useful doc there
 	${REINPLACE_CMD} -e 's|tests doc|tests|' ${WRKSRC}/Makefile.in
 
 regression-test:
 .for pg in ${TESTSBIN}
 	(cd ${WRKSRC}/tests; ./${pg})
 .endfor
 
 .include <bsd.port.mk>
Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile	(revision 377317)
+++ head/science/gnudatalanguage/Makefile	(revision 377318)
@@ -1,132 +1,132 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 DISTNAME=	gdl-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libplplotd.so:${PORTSDIR}/math/plplot	\
 		libpng.so:${PORTSDIR}/graphics/png	\
 		libps.so:${PORTSDIR}/print/pslib	\
 		libgsl.so:${PORTSDIR}/math/gsl
 
 USE_WX=		2.8
 WX_UNICODE=	yes
 USE_XORG=	x11 sm ice xext
 USES=		cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline
 
 # 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
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
 		-DNCURSESDIR:STRING="/usr"		\
 		-DMPICH:BOOL=NO				\
 		-DMAGICK:BOOL=NO
 CPPFLAGS+=	${CFLAGS} -fno-inline ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON UDUNITS
 OPTIONS_DEFAULT=EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
 EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3		\
 			libfftw3f.so:${PORTSDIR}/math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/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:${PORTSDIR}/science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/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=	libproj4.so:${PORTSDIR}/math/libproj4
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:${PORTSDIR}/net/mpich2
 MPICH2_CMAKE_ON=	-DMPICH:BOOL=YES
 MPICH2_CMAKE_OFF=	-DMPICH:BOOL=NO
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/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 -DOPENMP:BOOL=NO
 PLIST=		pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800503
 BROKEN=	Does not build with ancient binutils
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-stage:
 	${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.post.mk>
Index: head/science/h5utils/Makefile
===================================================================
--- head/science/h5utils/Makefile	(revision 377317)
+++ head/science/h5utils/Makefile	(revision 377318)
@@ -1,26 +1,26 @@
 # Created by: Klaus Aehlig <aehlig@linta.de>
 # $FreeBSD$
 
 PORTNAME=	h5utils
 PORTVERSION=	1.12.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/${PORTNAME}/
 
 MAINTAINER=	aehlig@linta.de
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	YES
 CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include \
 		${PTHREAD_LIBS}
 
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libmatheval.so:${PORTSDIR}/devel/libmatheval
 
 .include <bsd.port.mk>
Index: head/science/hdf-java/Makefile
===================================================================
--- head/science/hdf-java/Makefile	(revision 377317)
+++ head/science/hdf-java/Makefile	(revision 377318)
@@ -1,88 +1,88 @@
 # Created by: rfarmer@predatorlabs.net
 # $FreeBSD$
 
 PORTNAME=	hdf-java
 PORTVERSION=	2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science java
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdf-java-${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java interface to HDF5
 
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6 1.7
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
 USES=		dos2unix gmake
 DOS2UNIX_REGEX=	.*/examples/.*Makefile.in
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=${STAGEDIR}${PREFIX}
 GNU_CONFIGURE_MANPREFIX=${STAGEDIR}${PREFIX}
 CONFIGURE_ARGS=	--with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \
 		--with-hdf5=${LOCALBASE}/include \
 		--with-libz=/lib \
 		--with-libjpeg=${LOCALBASE} \
 		--without-hdf4 \
 		--without-h4toh5
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	SZIP DOCS
 SZIP_DESC=	SZIP support (must match with science/hdf5)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSZIP}
 CONFIGURE_ARGS+=	--with-libsz=${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--without-libsz
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET=	all javadocs
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION} == "1.6.0"
 PLIST_SUB+=	JDK6=""
 .else
 PLIST_SUB+=	JDK6="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' \
 		-e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' \
 		-e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' \
 		-e 's|LLEXT="a"|LLEXT="so"|g' \
 		-e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(JH45INSTALLDIR)/lib|${STAGEDIR}${JAVAJARDIR}|g' \
 		-e 's|INSTALL_LIB |${INSTALL_LIB} |' \
 		-e 's|cp |${INSTALL_DATA} |g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|$$HDFJAVA"/lib/freebsd:"$$HDFJAVA"/lib/ext|${PREFIX}/lib"|' \
 		-e 's|$$HDFJAVA"/lib|${JAVAJARDIR}"|g' \
 		${WRKSRC}/bin/hdfview.sh.in
 
 post-build:
 	@${REINPLACE_CMD} -e 's|${STAGEDIR}||' ${WRKSRC}/bin/hdfview.sh
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/UsersGuide
 	(cd ${WRKSRC}/docs/hdfview/ && ${COPYTREE_SHARE} "UsersGuide" \
 	    ${STAGEDIR}${DOCSDIR}/)
 	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} "javadocs" \
 	    ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
Index: head/science/hdf5/Makefile
===================================================================
--- head/science/hdf5/Makefile	(revision 377317)
+++ head/science/hdf5/Makefile	(revision 377318)
@@ -1,62 +1,62 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	hdf5
-PORTVERSION=	1.8.13
-PORTREVISION=	1
+PORTVERSION=	1.8.14
 CATEGORIES=	science archivers graphics
-MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/releases/${DISTNAME}/src/ \
+MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/current/src/ \
+		ftp://ftp.hdfgroup.org/HDF5/current/src/ \
+		http://www.hdfgroup.org/ftp/HDF5/releases/${DISTNAME}/src/ \
 		ftp://ftp.hdfgroup.org/HDF5/releases/${DISTNAME}/src/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 
 LICENSE=	BSD4CLAUSE
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* hdf5-1.6.[0-9]*
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES FORTRAN SZIP
 OPTIONS_SUB=	yes
 
-#CFLAGS+=	-D__BSD_VISIBLE
 CONFIGURE_ARGS=	--enable-cxx \
 		--enable-hl \
 		--enable-instrument \
 		--enable-strict-format-checks \
 		--with-pthread=/usr \
 		--with-zlib=/usr
 GNU_CONFIGURE=	yes
-MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
+INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USES=		libtool tar:bzip2
 
 PORTEXAMPLES=	*
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	does not compile
 
 DEBUG_CONFIGURE_OFF=	--enable-production
 DEBUG_CONFIGURE_ON=	--disable-production --enable-debug=all
 FORTRAN_CONFIGURE_ENV=	F9X=${FC}
 FORTRAN_CONFIGURE_OFF=	--disable-fortran --disable-fortran2003
 FORTRAN_CONFIGURE_ON=	--enable-fortran --enable-fortran2003
 FORTRAN_USES=		fortran
 SZIP_CONFIGURE_ARGS=	--with-szlib=${LOCALBASE}
 SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags
 	@${REINPLACE_CMD} \
 		-e '/LD_LIBRARY_PATH/ s|^|#|' \
 		-e 's|/share/hdf5_examples|/${EXAMPLESDIR_REL}|' \
 		-e 's|(INSTALL)|(INSTALL_DATA)|' \
 			`${FIND} ${WRKSRC} -regex '.*/examples/Makefile.in'`
 	@${REINPLACE_CMD} -e 's|\[ -a|\[ -f|g' `${FIND} ${WRKSRC} -name \*.sh\*`
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
Index: head/science/hdf5/distinfo
===================================================================
--- head/science/hdf5/distinfo	(revision 377317)
+++ head/science/hdf5/distinfo	(revision 377318)
@@ -1,2 +1,2 @@
-SHA256 (hdf5-1.8.13.tar.bz2) = c2f5a412107aba6f99fd7a4a9db6ce5f5fc8171ec931472784e5839d26aa17ef
-SIZE (hdf5-1.8.13.tar.bz2) = 9496378
+SHA256 (hdf5-1.8.14.tar.bz2) = 53722cb9f5977af2908f92fc1a3f8c597800a5cb448cfe5c75060d6335bb9bab
+SIZE (hdf5-1.8.14.tar.bz2) = 9503743
Index: head/science/hdf5/pkg-plist
===================================================================
--- head/science/hdf5/pkg-plist	(revision 377317)
+++ head/science/hdf5/pkg-plist	(revision 377318)
@@ -1,152 +1,152 @@
 bin/gif2h5
 bin/h52gif
 bin/h5c++
 bin/h5cc
 bin/h5copy
 bin/h5debug
 bin/h5diff
 bin/h5dump
 %%FORTRAN%%bin/h5fc
 bin/h5import
 bin/h5jam
 bin/h5ls
 bin/h5mkgrp
 bin/h5perf_serial
 bin/h5redeploy
 bin/h5repack
 bin/h5repart
 bin/h5stat
 bin/h5unjam
 include/H5ACpublic.h
 include/H5AbstractDs.h
 include/H5Apublic.h
 include/H5ArrayType.h
 include/H5AtomType.h
 include/H5Attribute.h
 include/H5Classes.h
 include/H5CommonFG.h
 include/H5CompType.h
 include/H5Cpp.h
 include/H5CppDoc.h
 include/H5Cpublic.h
 include/H5DOpublic.h
 include/H5DSpublic.h
 include/H5DataSet.h
 include/H5DataSpace.h
 include/H5DataType.h
 include/H5DcreatProp.h
 include/H5Dpublic.h
 include/H5DxferProp.h
 include/H5EnumType.h
 include/H5Epubgen.h
 include/H5Epublic.h
 include/H5Exception.h
 include/H5FDcore.h
 include/H5FDdirect.h
 include/H5FDfamily.h
 include/H5FDlog.h
 include/H5FDmpi.h
 include/H5FDmpio.h
 include/H5FDmulti.h
 include/H5FDpublic.h
 include/H5FDsec2.h
 include/H5FDstdio.h
 include/H5FaccProp.h
 include/H5FcreatProp.h
 include/H5File.h
 include/H5FloatType.h
 include/H5Fpublic.h
 include/H5Gpublic.h
 include/H5Group.h
 include/H5IMpublic.h
 include/H5IdComponent.h
 include/H5Include.h
 include/H5IntType.h
 include/H5Ipublic.h
 include/H5LTpublic.h
 include/H5Library.h
 include/H5Location.h
 include/H5Lpublic.h
 include/H5MMpublic.h
 include/H5Object.h
 include/H5Opublic.h
 include/H5PLextern.h
 include/H5PTpublic.h
 include/H5PacketTable.h
 include/H5Ppublic.h
 include/H5PredType.h
 include/H5PropList.h
 include/H5Rpublic.h
 include/H5Spublic.h
 include/H5StrType.h
 include/H5TBpublic.h
 include/H5Tpublic.h
 include/H5VarLenType.h
 include/H5Zpublic.h
 include/H5api_adpt.h
 %%FORTRAN%%include/H5f90i.h
 %%FORTRAN%%include/H5f90i_gen.h
 include/H5overflow.h
 include/H5pubconf.h
 include/H5public.h
 include/H5version.h
 %%FORTRAN%%include/h5_dble_interface.mod
 %%FORTRAN%%include/h5a.mod
 %%FORTRAN%%include/h5a_provisional.mod
 %%FORTRAN%%include/h5d.mod
 %%FORTRAN%%include/h5d_provisional.mod
 %%FORTRAN%%include/h5ds.mod
 %%FORTRAN%%include/h5e.mod
 %%FORTRAN%%include/h5e_provisional.mod
 %%FORTRAN%%include/h5f.mod
 %%FORTRAN%%include/h5f_provisional.mod
 %%FORTRAN%%include/h5fortran_types.mod
 %%FORTRAN%%include/h5g.mod
 %%FORTRAN%%include/h5global.mod
 %%FORTRAN%%include/h5i.mod
 %%FORTRAN%%include/h5im.mod
 %%FORTRAN%%include/h5l.mod
 %%FORTRAN%%include/h5l_provisional.mod
 %%FORTRAN%%include/h5lib.mod
 %%FORTRAN%%include/h5lib_provisional.mod
 %%FORTRAN%%include/h5lt.mod
 %%FORTRAN%%include/h5o.mod
 %%FORTRAN%%include/h5o_provisional.mod
 %%FORTRAN%%include/h5p.mod
 %%FORTRAN%%include/h5p_provisional.mod
 %%FORTRAN%%include/h5r.mod
 %%FORTRAN%%include/h5r_provisional.mod
 %%FORTRAN%%include/h5s.mod
 %%FORTRAN%%include/h5t.mod
 %%FORTRAN%%include/h5t_provisional.mod
 %%FORTRAN%%include/h5tb.mod
 %%FORTRAN%%include/h5test_kind_sizeof_mod.mod
 %%FORTRAN%%include/h5z.mod
 include/hdf5.h
 %%FORTRAN%%include/hdf5.mod
 include/hdf5_hl.h
 lib/libhdf5.a
 lib/libhdf5.settings
 lib/libhdf5.so
-lib/libhdf5.so.8
-lib/libhdf5.so.8.0.2
+lib/libhdf5.so.9
+lib/libhdf5.so.9.0.0
 lib/libhdf5_cpp.a
 lib/libhdf5_cpp.so
-lib/libhdf5_cpp.so.8
-lib/libhdf5_cpp.so.8.0.2
+lib/libhdf5_cpp.so.9
+lib/libhdf5_cpp.so.9.0.0
 %%FORTRAN%%lib/libhdf5_fortran.a
 %%FORTRAN%%lib/libhdf5_fortran.so
-%%FORTRAN%%lib/libhdf5_fortran.so.8
-%%FORTRAN%%lib/libhdf5_fortran.so.8.0.2
+%%FORTRAN%%lib/libhdf5_fortran.so.9
+%%FORTRAN%%lib/libhdf5_fortran.so.9.0.0
 lib/libhdf5_hl.a
 lib/libhdf5_hl.so
-lib/libhdf5_hl.so.8
-lib/libhdf5_hl.so.8.0.2
+lib/libhdf5_hl.so.9
+lib/libhdf5_hl.so.9.0.0
 lib/libhdf5_hl_cpp.a
 lib/libhdf5_hl_cpp.so
-lib/libhdf5_hl_cpp.so.8
-lib/libhdf5_hl_cpp.so.8.0.2
+lib/libhdf5_hl_cpp.so.9
+lib/libhdf5_hl_cpp.so.9.0.0
 %%FORTRAN%%lib/libhdf5hl_fortran.a
 %%FORTRAN%%lib/libhdf5hl_fortran.so
-%%FORTRAN%%lib/libhdf5hl_fortran.so.8
-%%FORTRAN%%lib/libhdf5hl_fortran.so.8.0.2
+%%FORTRAN%%lib/libhdf5hl_fortran.so.9
+%%FORTRAN%%lib/libhdf5hl_fortran.so.9.0.0
Index: head/science/meep/Makefile
===================================================================
--- head/science/meep/Makefile	(revision 377317)
+++ head/science/meep/Makefile	(revision 377318)
@@ -1,48 +1,48 @@
 # Created by: Stas Timokhin <devel@stasyan.com>
 # $FreeBSD$
 
 PORTNAME=	meep
 PORTVERSION=	1.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
 BROKEN=		Depends on conflicting guile and guile2 (via libctl)
 
 BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
 		libblas.so:${PORTSDIR}/math/blas \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 RUN_DEPENDS=	harminv:${PORTSDIR}/science/harminv
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USES=		fortran gettext gmake iconv libtool pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_DEFINE=		OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 OPENMPI_DESC=		MPI support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 CONFIGURE_ARGS+=--with-mpi
 CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
 CFLAGS+=	-I${LOCALBASE}/mpi/openmpi/include
 PLIST_SUB+=	MPI="" NOMPI="@comment "
 .else
 CONFIGURE_ARGS+=--without-mpi
 PLIST_SUB+=	MPI="@comment " NOMPI=""
 .endif
 
 .include <bsd.port.mk>
Index: head/science/minc2/Makefile
===================================================================
--- head/science/minc2/Makefile	(revision 377317)
+++ head/science/minc2/Makefile	(revision 377318)
@@ -1,46 +1,46 @@
 # Created by: jbacon
 # $FreeBSD$
 
 PORTNAME=	minc
 PORTVERSION=	2.2.00
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science biology
 MASTER_SITES=	GH
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libnetcdf.so:${PORTSDIR}/science/netcdf
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BIC-MNI
 GH_TAGNAME=	release-${PORTVERSION}
 GH_COMMIT=	6f2f5b9
 
 USES=		bison gmake libtool perl5 shebangfix
 SHEBANG_FILES=	progs/mincview/mincview
 USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
 ACLOCAL_ARGS=	-I m4 --automake-acdir=${ACLOCAL_DIR}
 AUTOMAKE_ARGS=	--add-missing --copy --force-missing
 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} -f ${WRKSRC}/ac_config_aux/*
 	@${RM} -f ${WRKSRC}/progs/minccalc/gram.[ch]
 	@${RM} -f ${WRKSRC}/progs/mincgen/ncgentab.[ch]
 
 .include <bsd.port.mk>
Index: head/science/mpb/Makefile
===================================================================
--- head/science/mpb/Makefile	(revision 377317)
+++ head/science/mpb/Makefile	(revision 377318)
@@ -1,52 +1,53 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	mpb
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/mpb/
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	MIT Photonic-Bands
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libguile-2.0.so:${PORTSDIR}/lang/guile2
 
 OPTIONS_DEFINE=	ATLAS NLOPT
 ATLAS_DESC=	Use math/atlas instead of math/lapack
 NLOPT_DESC=	Use math/nlopt (check also in science/libctl)
 
 USES=		fortran libtool pkgconfig
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 NLOPT_LIB_DEPENDS=	libnlopt.so:${PORTSDIR}/math/nlopt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 CONFIGURE_ARGS+=	--with-lapack=-lalapack
 .else
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 		liblapack.so:${PORTSDIR}/math/lapack
 CONFIGURE_ARGS+=	--with-lapack=-llapack
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 ${PTHREAD_LIBS} |g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e '/INSTALL/s/$$(prefix)/$$(DESTDIR)$$(prefix)/' \
 		-e '/INSTALL/s/$$(mandir)/$$(DESTDIR)$$(mandir)/' \
 		${WRKSRC}/mpb/Makefile.in ${WRKSRC}/utils/Makefile.in
 
 .include <bsd.port.mk>
Index: head/science/netcdf/Makefile
===================================================================
--- head/science/netcdf/Makefile	(revision 377317)
+++ head/science/netcdf/Makefile	(revision 377318)
@@ -1,68 +1,69 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 # $FreeBSD$
 
 PORTNAME=	netcdf
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://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
 
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
 PORTSCOUT=	limit:^4\.
 
 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)
 
 CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include -fPIC -DPIC
 CMAKE_ARGS=	-DHDF5_INCLUDE_DIRS=${LOCALBASE} -DUSE_HDF5=ON -DZLIB_INCLUDE_DIRS=/usr
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USES=		cmake pathfix
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 DAP_CMAKE_OFF=		-DENABLE_DAP=OFF -DENABLE_DAP_REMOTE_TESTS=OFF
 DAP_CMAKE_ON=		-DCURL_INCLUDE_DIRS=${LOCALBASE} -DENABLE_DAP=ON
 DAP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN=OFF
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN=ON
 SZIP_CMAKE_OFF=		-DUSE_SZIP=OFF
 SZIP_CMAKE_ON=		-DSZIP_DIR=${LOCALBASE} -DSZIP_INCLUDE_DIRS=${LOCALBASE} -DUSE_SZIP=ON
 SZIP_LDFLAGS=		-lsz
 SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 PORTDOCS=	*
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/man4/d; s|share/cmake|&/Modules|; s|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/libsrc/CMakeLists.txt ${WRKSRC}/ncdump/CMakeLists.txt ${WRKSRC}/ncgen/CMakeLists.txt ${WRKSRC}/ncgen3/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|mmap|_&|g' ${WRKSRC}/nc_test/tst_diskless.c ${WRKSRC}/nc_test/tst_diskless3.c
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
 	@cd ${WRKSRC}/man4 && ${LOCALBASE}/bin/doxygen .
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/man4/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
Index: head/science/paraview/Makefile
===================================================================
--- head/science/paraview/Makefile	(revision 377317)
+++ head/science/paraview/Makefile	(revision 377318)
@@ -1,123 +1,123 @@
 # Created by: anholt@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	paraview
 PORTVERSION=	4.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v${VERMAJORMINOR}/
 DISTNAME=	ParaView-v${PORTVERSION}-source
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Powerful scientific data visualization application
 
 LICENSE=	ParaView_License_1.2
 LICENSE_NAME=	ParaView_License
 LICENSE_FILE=	${PATCH_WRKSRC}/License_v1.2.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN=		Fails to build
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		liborc-0.4.so:${PORTSDIR}/devel/orc \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libffi.so:${PORTSDIR}/devel/libffi \
 		libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		linguist_build assistant_run qt3support \
 		dbus designer gui help-tools network script \
 		sql svg xml webkit assistantclient clucene \
 		xmlpatterns xmlpatterns-tool help
 USE_GL=		yes
 USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
 USES=		alias cmake:outsource execinfo gmake python shebangfix
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS="ON" \
 		-DVTK_USE_SYSTEM_PNG="ON" \
 		-DVTK_USE_SYSTEM_JPEG="ON" \
 		-DVTK_USE_SYSTEM_TIFF="ON" \
 		-DVTK_USE_SYSTEM_ZLIB="ON" \
 		-DVTK_USE_SYSTEM_FREETYPE="ON" \
 		-DVTK_USE_SYSTEM_EXPAT="ON" \
 		-DVTK_USE_X="ON" \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DPARAVIEW_ENABLE_PYTHON:BOOL="ON" \
 		-DPARAVIEW_ENABLE_FFMPEG:BOOL="OFF" \
 		-DBUILD_TESTING:BOOL="OFF" \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 MAKE_ENV=	XDG_CONFIG_HOME=${WRKDIR}
 
 SHEBANG_FILES=	Catalyst/catalyze.py VTK/Examples/SearchScript.sh \
 		VTK/Utilities/Maintenance/*.sh	\
 		Web/Applications/Parallel/server/launcher.sh \
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/basicbench.cxxlist	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/*.sh	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/bench_unrolling	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/benchmark_suite	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/blas/testing/*	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/scripts/*	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/eigen2/*	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/*.sh	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/testsuite.cmake	\
 		Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/btl/data/*
 
 OPTIONS_DEFINE=	OSMESA GL2PS DOCS
 OSMESA_DESC=	Use Mesa for off-screen rendering
 GL2PS_DESC=	Install support conversion OpenGL to PostScript
 #		VTKMPEG2	"Install patented MPEG2 encoder module" Off \
 
 VERMAJORMINOR=	${PORTVERSION:R}
 WRKSRC=		${WRKDIR}/ParaView-v${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOSMESA}
 LIB_DEPENDS+=	libOSMesa32.so:${PORTSDIR}/graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so
 .endif
 
 .if ${PORT_OPTIONS:MGL2PS}
 LIB_DEPENDS+=	libgl2ps.so:${PORTSDIR}/print/gl2ps
 CMAKE_ARGS+=	-DVTK_USE_GL2PS:BOOL=ON
 PLIST_SUB+=	GL2PS=""
 .else
 PLIST_SUB+=	GL2PS="@comment "
 .endif
 
 PLIST_SUB+=	VERMAJORMINOR=${VERMAJORMINOR}
 CMAKE2INST=	ParaViewConfig.cmake \
 		cmake_install.cmake
 LIB_INSTDIR=	${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR}
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx
 	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|'	\
 		${PATCH_WRKSRC}/VTK/Testing/Core/vtk_site_history.py
 
 post-install:
 .for c2f in ${CMAKE2INST}
 	${SED} -e 's|${BUILD_WRKSRC}|${LIB_INSTDIR}|g' \
 		-e 's|${PATCH_WRKSRC}|${LIB_INSTDIR}|g' \
 		${BUILD_WRKSRC}/${c2f} > ${STAGEDIR}${LIB_INSTDIR}/`${BASENAME} ${c2f}`
 .endfor
 	${INSTALL_DATA} ${PATCH_WRKSRC}/CMake/UseParaView.cmake \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR}
 
 .include <bsd.port.mk>
Index: head/science/py-h5py/Makefile
===================================================================
--- head/science/py-h5py/Makefile	(revision 377317)
+++ head/science/py-h5py/Makefile	(revision 377318)
@@ -1,42 +1,43 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
 PORTNAME=	h5py
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	xmj@chaot.net
 COMMENT=	General-purpose Python interface to the HDF5 library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		cython:${PORTSDIR}/lang/cython
 RUN_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	h5py
 GH_COMMIT=	c614d61
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 PORTDOCS=	README.rst
 PORTEXAMPLES=	multiprocessing_example.py \
 		threading_example.py
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
Index: head/science/py-netCDF4/Makefile
===================================================================
--- head/science/py-netCDF4/Makefile	(revision 377317)
+++ head/science/py-netCDF4/Makefile	(revision 377318)
@@ -1,51 +1,52 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	netCDF4
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 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}
 LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libnetcdf.so:${PORTSDIR}/science/netcdf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 GH_ACCOUNT=	Unidata
 GH_COMMIT=	08e4708
 GH_PROJECT=	netcdf4-python
 GH_TAGNAME=	v${PORTVERSION}rel
 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.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/science/silo/Makefile
===================================================================
--- head/science/silo/Makefile	(revision 377317)
+++ head/science/silo/Makefile	(revision 377318)
@@ -1,76 +1,77 @@
 # Created by: Pedro F. Giffuni <giffunip@tutopia.com>
 # $FreeBSD$
 
 PORTNAME=	silo
 PORTVERSION=	4.10
 DISTVERSIONSUFFIX=	-bsd
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mesh and field I/O library and scientific database
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool readline
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=			FORTRAN HDF5 PYTHON QT4
 OPTIONS_DEFAULT=		HDF5
 OPTIONS_SUB=			yes
 
 FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_USES=			fortran
 
 HDF5_LIB_DEPENDS=		libhdf5.so:${PORTSDIR}/science/hdf5
 HDF5_CONFIGURE_ON=		--with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib
 HDF5_PLIST_SUB=			SUFX_HDF5="h5"
 HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
 
 PYTHON_CONFIGURE_ENABLE=	pythonmodule
 PYTHON_USES=			python:2
 
 QT4_USE=			XORG=xext,xi,xmu,xt \
 				QT4=gui,linguist_build,moc_build,uic_build
 QT4_CONFIGURE_ON=		--with-Qt-dir=${QT_PREFIX} \
 				--with-Qt-lib="QtGui -lQtCore"
 QT4_CONFIGURE_ENABLE=		silex
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
 DESKTOP_ENTRIES="Silex" "Silex browser for Silo files" "" "silex" "" true
 .endif
 
 post-extract:
 	@${CHMOD} -R a+rX ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\(_Qt_dir/include\)"|\1/qt4"| ; \
 		 s|\(_Qt_dir/lib\)"|\1/qt4"| ; \
 		 s|\(/uic\)"|\1-qt4"| ; \
 		 s|\(/moc\)"|\1-qt4"| ; \
 		 s|\(/lrelease\)"|\1-qt4"| ; \
 		 s|\(/lupdate\)"|\1-qt4"|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/-avoid-version/s|^|#| ; \
 		 /^install-data-am/s|:.*|:|' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/-ldl/s|^|#|' ${WRKSRC}/tests/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|@libdir@|@pythondir@|' ${WRKSRC}/tools/python/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|\(INBUILD\));|\1, me);|' ${WRKSRC}/src/hdf5_drv/silo_hdf5.c
 
 .if defined(MAINTAINER_MODE)
 regression-test: build
 	@cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 .endif
 
 .include <bsd.port.mk>
Index: head/sysutils/slurm-hpc/Makefile
===================================================================
--- head/sysutils/slurm-hpc/Makefile	(revision 377317)
+++ head/sysutils/slurm-hpc/Makefile	(revision 377318)
@@ -1,90 +1,90 @@
 # Created by: Jason Bacon <jwbacon@tds.net>
 # $FreeBSD$
 
 PORTNAME=	slurm
 PORTVERSION=	2.6.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.schedmd.com/download/archive/ \
 		http://www.schedmd.com/download/latest/ \
 		http://www.schedmd.com/download/development/
 PKGNAMESUFFIX=	-hpc
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Simple Linux Utility for Resource Management
 
 LICENSE=	GPLv1
 
 LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
 		libhwloc.so:${PORTSDIR}/devel/hwloc \
 		libmunge.so:${PORTSDIR}/security/munge \
 		librrd.so:${PORTSDIR}/databases/rrdtool \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool perl5 python tar:bzip2
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS MYSQL PGSQL GTK2
 
 USERS=		slurm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	slurmctld slurmd
 SUB_FILES+=	slurm.conf
 
 # This is a new and complex port.  Allow debugging.
 STRIP_CMD=	# NONE
 CFLAGS+=	-I${LOCALBASE}/include -g -O1
 LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/slurm.conf ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes	# Job accounting
 PLIST_FILES+=	lib/slurm/accounting_storage_mysql.a \
 		lib/slurm/accounting_storage_mysql.la \
 		lib/slurm/accounting_storage_mysql.so \
 		lib/slurm/jobcomp_mysql.a \
 		lib/slurm/jobcomp_mysql.la \
 		lib/slurm/jobcomp_mysql.so
 .else
 # Can't disable configure test, so make it fail
 CONFIGURE_ARGS+=--with-mysql_config=/nomysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql	# Job accounting
 PLIST_FILES+=	lib/slurm/accounting_storage_pgsql.a \
 		lib/slurm/accounting_storage_pgsql.la \
 		lib/slurm/accounting_storage_pgsql.so \
 		lib/slurm/jobcomp_pgsql.a \
 		lib/slurm/jobcomp_pgsql.la \
 		lib/slurm/jobcomp_pgsql.so
 .else
 # Can't disable configure test, so make it fail
 CONFIGURE_ARGS+=--with-pg_config=/nopostgres
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 # Note: Configure could not find pcre when building with no ports
 # preinstalled on 9.1-RELEASE.  Worked fine on second try.
 USE_GNOME=	glib20 gtk20	# sview
 PLIST_FILES+=	bin/sview
 .endif
 
 post-patch:
 # Can't disable configure test, so make it fail
 .if ! ${PORT_OPTIONS:MGTK2}
 	${REINPLACE_CMD} -e 's|min_gtk_version=2.7.1|min_gtk_version=200.7.1|' \
 		${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} \
 		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
 		${WRKSRC}/doc/html/shtml2html.py \
 		${WRKSRC}/doc/man/man2html.py
 
 .include <bsd.port.mk>