Index: head/audio/csound/Makefile
===================================================================
--- head/audio/csound/Makefile	(revision 432125)
+++ head/audio/csound/Makefile	(revision 432126)
@@ -1,159 +1,161 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	csound
 PORTVERSION=	5.19.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
 		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
 DISTFILES=	${PORTNAME:S/c/C/}${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	csound
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sound synthesizer
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	swig13>0:devel/swig13 \
 		eigen>0:math/eigen3 \
 		gmm++>0:math/gmm++
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 PORTSCOUT=	limit:^5\.
 
 CONFLICTS_INSTALL=	outguess-* csound6
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/c/C/}${PORTVERSION}
 
 USES=		bison cpe gettext scons compiler:openmp python
+# math/gmm++ requires c++11
+USE_CXXSTD=	c++11
 CPE_VENDOR=	csounds
 MAKE_ARGS=	instdir="${STAGEDIR}" prefix="${PREFIX}" \
 		CC="${CC}" CXX="${CXX}" \
 		buildCsoundAC=0 buildCsoundVST=0 buildInterfaces=1 \
 		buildRelease=1 buildVirtual=1 dynamicCsoundLibrary=1 \
 		install=1 noDebug=1 useDouble=1 \
 		useGettext=1 usePortMIDI=0
 USE_LDCONFIG=	yes
 SSP_UNSAFE=	yes
 
 CFLAGS+=	-fPIC -fopenmp -DUSE_OPENMP
 LDFLAGS+=	-pthread -Wl,-export-dynamic
 LINKFLAGS=	# empty
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	ALSA PNG DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS
 OPTIONS_DEFAULT=FLTK
 OPTIONS_SUB=	yes
 
 ALSA_DESC=		ALSA I/O module
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		useALSA=1
 ALSA_MAKE_ARGS_OFF=	useALSA=0
 ALSA_VARS=		ALSA_H=alsa/asoundlib.h
 ALSA_VARS_OFF=		ALSA_H=##alsa/asoundlib.h##
 
 PNG_DESC=		Image opcodes
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS=		buildImageOpcodes=1
 PNG_MAKE_ARGS_OFF=	buildImageOpcodes=0
 
 DSSI_DESC=		DSSI/LADSPA host opcodes
 DSSI_BUILD_DEPENDS=	dssi>=0:audio/dssi
 DSSI_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DSSI_RUN_DEPENDS=	dssi>=0:audio/dssi
 DSSI_MAKE_ARGS=		buildDSSI=1
 DSSI_MAKE_ARGS_OFF=	buildDSSI=0
 
 FLUIDSYNTH_DESC=	FluidSynth opcodes
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_VARS=	FLUIDSYNTH_H=fluidsynth.h
 FLUIDSYNTH_VARS_OFF=	FLUIDSYNTH_H=##fluidsynth.h##
 
 JACK_DESC=		Jack I/O module and opcodes
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_MAKE_ARGS=		useJack=1
 JACK_MAKE_ARGS_OFF=	useJack=0
 
 OSC_DESC=		OSC opcodes
 OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 OSC_MAKE_ARGS=		useOSC=1
 OSC_MAKE_ARGS_OFF=	useOSC=0
 
 PORTAUDIO_DESC=		PortAudio I/O module
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_MAKE_ARGS=	usePortAudio=1
 PORTAUDIO_MAKE_ARGS_OFF=usePortAudio=0
 
 PULSEAUDIO_DESC=	PulseAudio I/O module
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_VARS=	PULSEAUDIO_H=pulse/simple.h
 PULSEAUDIO_VARS_OFF=	PULSEAUDIO_H=##pulse/simple.h##
 
 FLTK_DESC=		FLTK plugin and GUI
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_MAKE_ARGS=		buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
 FLTK_MAKE_ARGS_OFF=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
 
 DOCS_DISTFILES=		Csound${PORTVERSION:R}_manual_html.zip:manual
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == sparc64 || ${ARCH} == ia64
 MAKE_ARGS+=	Word64=1
 .endif
 
 .if ${OPSYS} == FreeBSD
 CXXLIB=		c++
 .endif
 
 BROKEN_powerpc64=	Does not build
 
 post-patch:
 	@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \
 		< ${FILESDIR}/custom.py.in > ${WRKSRC}/custom.py
 	@${REINPLACE_CMD} -e "s|'unsupported'|'linux'|; \
 		s|Exit(-1)|print \"\"|; \
 		/CCFLAGS/s|\['-Wno-format'\]|Split('${CFLAGS}')|; \
 		/CXXFLAGS/s|\['-Wno-format'\]|Split('${CXXFLAGS}')|; \
 		s|/usr/local|${LOCALBASE}|; \
 		s|/usr/X11R6|${LOCALBASE}|; \
 		/LINKFLAGS/s|\['-Wl,-Bdynamic'\]|Split('${LDFLAGS}')|; \
 		s|\"pthread\"|\"\"|; \
 		s|'pthread'|''|; \
 		s|\"boost/any.hpp\"|\"##boost/any.hpp##\"|; \
 		s|\"alsa/asoundlib.h\"|\"${ALSA_H}\"|; \
 		s|'xmlfile.h'|'##xmlfile.h##'|; \
 		s|\"pulse/simple.h\"|\"${PULSEAUDIO_H}\"|; \
 		s|\"m_pd.h\"|\"##m_pd.h##\"|; \
 		s|\"tcl.h\"|\"##tcl.h##\"|; \
 		s|'5.2'|'5'|; \
 		s|'dl'|''|; \
 		s|'stdc++'|'${CXXLIB}'|; \
 		/linuxjoystick/s|^.*|    print \"\"|; \
 		s|\"fluidsynth.h\"|\"${FLUIDSYNTH_H}\"|; \
 		/mixer_main.c/s|'mixer'|'csmixer'|; \
 		/jpluginEnvironment/s|'asound'|''|; \
 		/portaudioEnvironment/s|'asound'|''|; \
 		/jackEnvironment/s|'asound'|''|" ${WRKSRC}/SConstruct
 	@${REINPLACE_CMD} -e "s|linux/if.h|sys/types.h|" \
 		${WRKSRC}/OOps/remote.c
 	@${REINPLACE_CMD} -e "/Str/!s|fdclose|my_fdclose|" \
 		${WRKSRC}/OOps/*.c \
 		${WRKSRC}/Top/csound.c \
 		${WRKSRC}/Engine/auxfd.c \
 		${WRKSRC}/H/prototyp.h
 
 post-install:
 	${LN} -sf libcsound64.so.5 ${STAGEDIR}${PREFIX}/lib/libcsound64.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \
 		${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
Index: head/audio/csound6/Makefile
===================================================================
--- head/audio/csound6/Makefile	(revision 432125)
+++ head/audio/csound6/Makefile	(revision 432126)
@@ -1,141 +1,143 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	csound
 PORTVERSION=	6.06
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
 PKGNAMESUFFIX=	6
 DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
 DIST_SUBDIR=	csound
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sound synthesizer
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		swig>2:devel/swig20 \
 		eigen>0:math/eigen3 \
 		gmm++>0:math/gmm++
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
 USES=		alias bison cmake:outsource localbase python:2
+# math/gmm++ requires c++11
+USE_CXXSTD=	c++11
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DBUILD_JAVA_INTERFACE:BOOL=OFF \
 		-DBUILD_P5GLOVE_OPCODES:BOOL=OFF \
 		-DBUILD_PD_CLASS:BOOL=OFF \
 		-DBUILD_STK_OPCODES:BOOL=OFF \
 		-DBUILD_TESTS:BOOL=OFF \
 		-DBUILD_WIIMOTE_OPCODES:BOOL=OFF \
 		-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}"
 USE_LDCONFIG=	yes
 SSP_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=		csound-5.*
 CONFLICTS_INSTALL=	outguess-*
 
 OPTIONS_DEFINE=		ALSA CURL DSSI FLTK FLUIDSYNTH HDF5 JACK LUA NLS \
 			OPENMP OSC PNG PORTAUDIO PULSEAUDIO
 OPTIONS_DEFAULT=	FLTK OPENMP
 OPTIONS_SUB=		yes
 
 ALSA_DESC=		Build ALSA I/O module
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=		-DUSE_ALSA:BOOL=OFF
 ALSA_PREVENTS=		DSSI
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_OFF=		-DUSE_CURL:BOOL=OFF
 DSSI_DESC=		Build DSSI/LADSPA host opcodes
 DSSI_BUILD_DEPENDS=	dssi>0:audio/dssi
 DSSI_LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat
 DSSI_RUN_DEPENDS=	dssi>0:audio/dssi
 DSSI_CMAKE_OFF=		-DBUILD_DSSI_OPCODES:BOOL=OFF
 DSSI_CFLAGS=		-isystem ${LOCALBASE}/include/dssi
 DSSI_PREVENTS=		ALSA
 FLTK_DESC=		Build FLTK plugin and GUI
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_CMAKE_ON=		-DBUILD_WINSOUND:BOOL=ON
 FLTK_CMAKE_OFF=		-DBUILD_CSOUND_AC:BOOL=OFF \
 			-DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \
 			-DUSE_FLTK:BOOL=OFF
 FLUIDSYNTH_DESC=	Building FluidSynth opcodes
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_OFF=	-DBUILD_FLUID_OPCODES:BOOL=OFF
 HDF5_DESC=		Build HDF5 read/write opcodes
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_OFF=		-DBUILD_HDF5_OPCODES:BOOL=OFF
 JACK_DESC=		Build Jack I/O module and opcodes
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_OFF=		-DBUILD_JACK_OPCODES:BOOL=OFF \
 			-DUSE_JACK:BOOL=OFF
 LUA_DESC=		Build Lua Interface and opcodes
 LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUA_CMAKE_OFF=		-DBUILD_CSOUND_AC_LUA_INTERFACE:BOOL=OFF \
 			-DBUILD_LUA_INTERFACE:BOOL=OFF \
 			-DBUILD_LUA_OPCODES:BOOL=OFF
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \
 			-DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \
 			-DLIBINTL_LIBRARY:FILEPATH="" \
 			-DUSE_GETTEXT:BOOL=OFF
 OPENMP_USES=		compiler:gcc-c++11-lib
 OPENMP_USES_OFF=	compiler:c++11-lib
 OPENMP_CMAKE_OFF=	-DUSE_OPEN_MP:BOOL=OFF
 OSC_DESC=		Build OSC opcodes
 OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 OSC_CMAKE_OFF=		-DBUILD_OSC_OPCODES:BOOL=OFF
 PNG_DESC=		Build Image opcodes
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_OFF=		-DBUILD_IMAGE_OPCODES:BOOL=OFF
 PORTAUDIO_DESC=		Build PortAudio I/O module
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=	-DUSE_PORTAUDIO:BOOL=OFF
 PULSEAUDIO_DESC=	Build PulseAudio I/O module
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSEAUDIO:BOOL=OFF
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/-O3/s|^|#| ; \
 		 /PYTHON_MODULE_INSTALL_DIR/s|^|#| ; \
 		 /CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"| ; \
 		 s|(LIBINTL_LIBRARY OR LINUX)|(LIBINTL_LIBRARY)| ; \
 		 s|(NOT LINUX)|(LINUX)| ; \
 		 s|-D_GNU_SOURCE|| ; \
 		 s| dl)|)|' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/InOut/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
 		 s|/usr/local|${LOCALBASE}| ; \
 		 /linuxjoystick/s|^|#| ; \
 		 s| dl)|)|' \
 		${WRKSRC}/Opcodes/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		'/CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"|' \
 		${WRKSRC}/frontends/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's| mixer)| csmixer)|' \
 		${WRKSRC}/util/CMakeLists.txt
 .for i in Engine/auxfd.c H/prototyp.h OOps/diskin2.c OOps/dumpf.c \
 	Opcodes/partials.c Top/csound.c
 	@${REINPLACE_CMD} -e \
 		's|\([[:blank:]]fd\)\(close\)|\1__\2|' ${WRKSRC}/${i}
 .endfor
 
 post-install:
 	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6
 	@${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6
 
 post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
 
 .include <bsd.port.mk>
Index: head/math/gmm++/Makefile
===================================================================
--- head/math/gmm++/Makefile	(revision 432125)
+++ head/math/gmm++/Makefile	(revision 432126)
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	gmm++
-PORTVERSION=	4.3
+PORTVERSION=	5.1
 CATEGORIES=	math
 MASTER_SITES=	http://download.gna.org/getfem/stable/
 DISTNAME=	${PORTNAME:S/+//g}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Generic matrix template library
 
 # Note: even though the port's COPYING file mentions gmm++ is licensed under
 # the LGPL version 2.1 with the GCC runtime exception,
 # <http://download.gna.org/getfem/html/homepage/whatsnew/4.2.html> mentions
 # v4.2 is licensed under the LGPL version 3 with the GCC runtime exception, and
 # so say the headers which are installed.
 LICENSE=	LGPL3
 
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.mk>
Index: head/math/gmm++/distinfo
===================================================================
--- head/math/gmm++/distinfo	(revision 432125)
+++ head/math/gmm++/distinfo	(revision 432126)
@@ -1,2 +1,3 @@
-SHA256 (gmm-4.3.tar.gz) = 09ee01312df1eb11cace9839e6006d842ac492f0e62f0c22bcab6181ef2d5c1b
-SIZE (gmm-4.3.tar.gz) = 488181
+TIMESTAMP = 1472681977
+SHA256 (gmm-5.1.tar.gz) = 90e6bf309b81f496b401a375fe99826ad4b5c6ba99db6c92b37f9261db462636
+SIZE (gmm-5.1.tar.gz) = 537290
Index: head/math/gmm++/pkg-plist
===================================================================
--- head/math/gmm++/pkg-plist	(revision 432125)
+++ head/math/gmm++/pkg-plist	(revision 432126)
@@ -1,54 +1,55 @@
 include/gmm/gmm.h
 include/gmm/gmm_MUMPS_interface.h
 include/gmm/gmm_algobase.h
 include/gmm/gmm_blas.h
 include/gmm/gmm_blas_interface.h
 include/gmm/gmm_condition_number.h
 include/gmm/gmm_conjugated.h
 include/gmm/gmm_def.h
 include/gmm/gmm_dense_Householder.h
 include/gmm/gmm_dense_lu.h
+include/gmm/gmm_dense_matrix_functions.h
 include/gmm/gmm_dense_qr.h
 include/gmm/gmm_dense_sylvester.h
 include/gmm/gmm_domain_decomp.h
 include/gmm/gmm_except.h
 include/gmm/gmm_inoutput.h
 include/gmm/gmm_interface.h
 include/gmm/gmm_interface_bgeot.h
 include/gmm/gmm_iter.h
 include/gmm/gmm_iter_solvers.h
 include/gmm/gmm_kernel.h
 include/gmm/gmm_lapack_interface.h
 include/gmm/gmm_least_squares_cg.h
 include/gmm/gmm_matrix.h
 include/gmm/gmm_modified_gram_schmidt.h
 include/gmm/gmm_opt.h
 include/gmm/gmm_precond.h
 include/gmm/gmm_precond_diagonal.h
 include/gmm/gmm_precond_ildlt.h
 include/gmm/gmm_precond_ildltt.h
 include/gmm/gmm_precond_ilu.h
 include/gmm/gmm_precond_ilut.h
 include/gmm/gmm_precond_ilutp.h
 include/gmm/gmm_precond_mr_approx_inverse.h
 include/gmm/gmm_range_basis.h
 include/gmm/gmm_real_part.h
 include/gmm/gmm_ref.h
 include/gmm/gmm_scaled.h
 include/gmm/gmm_solver_Schwarz_additive.h
 include/gmm/gmm_solver_bfgs.h
 include/gmm/gmm_solver_bicgstab.h
 include/gmm/gmm_solver_cg.h
 include/gmm/gmm_solver_constrained_cg.h
 include/gmm/gmm_solver_gmres.h
 include/gmm/gmm_solver_idgmres.h
 include/gmm/gmm_solver_qmr.h
 include/gmm/gmm_std.h
 include/gmm/gmm_sub_index.h
 include/gmm/gmm_sub_matrix.h
 include/gmm/gmm_sub_vector.h
 include/gmm/gmm_superlu_interface.h
 include/gmm/gmm_transposed.h
 include/gmm/gmm_tri_solve.h
 include/gmm/gmm_vector.h
 include/gmm/gmm_vector_to_matrix.h