Index: head/multimedia/miro/Makefile
===================================================================
--- head/multimedia/miro/Makefile	(revision 488467)
+++ head/multimedia/miro/Makefile	(revision 488468)
@@ -1,73 +1,74 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	miro
 PORTVERSION=	6.0
 PORTREVISION=	23
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Video player to get internet TV broadcasts
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${PY_FLAVOR} \
 		update-mime-database:misc/shared-mime-info \
 		${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \
 		${LOCALBASE}/include/taglib/taglib.h:audio/taglib
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>0:net-p2p/py-libtorrent-rasterbar@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen@${PY_FLAVOR}
 
 BUILD_WRKSRC=	${WRKSRC}/linux
 INSTALL_WRKSRC=	${WRKSRC}/linux
 
-USE_GNOME=	gconf2 gtk20
-USE_GSTREAMER=	python gconf
-USES=		gettext gmake pkgconfig desktop-file-utils python:2.7 shared-mime-info shebangfix
+USES=		compiler:c++11-lang desktop-file-utils gettext gmake gnome \
+		pkgconfig python:2.7 shared-mime-info shebangfix
 SHEBANG_FILES=	resources/testdata/7digital-replies/generate.py \
 		resources/testdata/echonest-replies/generate.py
+USE_GNOME=	gconf2 gtk20
+USE_GSTREAMER=	python gconf
 USE_PYTHON=	distutils
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
 .SILENT:
 
 post-patch:
 .for file in setup.py plat/resources.py plat/options.py
 	${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g ; \
 		 s|%%MANPREFIX%%|${MANPREFIX}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 .for file in miro.real
 	${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 .for file in run.sh
 	${REINPLACE_CMD} -e 's|^PREFIX=.*|PREFIX=${PREFIX}|g' \
 		${BUILD_WRKSRC}/${file}
 .endfor
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${PREFIX}/bin/miro --unittest
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/miro/files/patch-linux_contrib_echoprint-codegen_src_Makefile
===================================================================
--- head/multimedia/miro/files/patch-linux_contrib_echoprint-codegen_src_Makefile	(revision 488467)
+++ head/multimedia/miro/files/patch-linux_contrib_echoprint-codegen_src_Makefile	(revision 488468)
@@ -1,17 +1,17 @@
 --- linux/contrib/echoprint-codegen/src/Makefile.orig	2013-04-05 16:02:42.000000000 +0000
 +++ linux/contrib/echoprint-codegen/src/Makefile	2013-08-17 03:52:32.669519516 +0000
 @@ -5,11 +5,11 @@
  VERSION_MAJ := $(word 1, $(EP_VERSION))
  VERSION_COMPAT := $(word 1, $(EP_VERSION)).$(word 2, $(EP_VERSION))
  UNAME := $(shell uname -s)
 -CXX=g++
 -CC=gcc
-+CXX=c++
-+CC=cc
++CXX?=c++
++CC?=cc
  #OPTFLAGS=-g -O0
  OPTFLAGS=-O3 -DBOOST_UBLAS_NDEBUG -DNDEBUG
 -BOOST_CFLAGS=-I/usr/local/include/boost-1_35
 +BOOST_CFLAGS=-I/usr/local/include
  TAGLIB_CFLAGS=`taglib-config --cflags`
  TAGLIB_LIBS=`taglib-config --libs`
  CXXFLAGS=-Wall $(BOOST_CFLAGS) $(TAGLIB_CFLAGS) -fPIC $(OPTFLAGS)