Index: audio/ncmpcpp/Makefile
===================================================================
--- audio/ncmpcpp/Makefile
+++ audio/ncmpcpp/Makefile
@@ -1,28 +1,26 @@
-# Created by: Dennis Herrmann <adox@mcx2.org>
 # $FreeBSD$
 
 PORTNAME=	ncmpcpp
-PORTVERSION=	0.5.10
-PORTREVISION=	4
+PORTVERSION=	0.6.1
 CATEGORIES=	audio
-MASTER_SITES=	http://unkart.ovh.org/ncmpcpp/ \
-		http://mirror.mcx2.org/
+MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	ncurses mpd client, clone of ncmpc with some new features
 
 LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
 
-USES=		iconv libtool ncurses pkgconfig tar:bzip2
-USE_GCC=	any
+USES=		compiler:c++11-lib iconv libtool ncurses pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	BOOST_LIB_SUFFIX=""
 
 OPTIONS_DEFINE=	CURL CLOCK UTF8 TAGLIB OUTPUTS VISUALIZER DOCS
-OPTIONS_DEFAULT=	CURL CLOCK OUTPUTS VISUALIZER
+OPTIONS_DEFAULT=	CURL CLOCK OUTPUTS TAGLIB UTF8 VISUALIZER
 CURL_DESC=	Enable fetching lyrics from the Internet
 CLOCK_DESC=	clock-screen support
 TAGLIB_DESC=	taglib support
@@ -32,13 +30,8 @@
 .include <bsd.port.options.mk>
 
 PLIST_FILES=	bin/ncmpcpp \
-		man/man1/ncmpcpp.1.gz \
-		%%DOCSDIR%%/config \
-		%%DOCSDIR%%/keys \
-		%%DOCSDIR%%/NEWS \
-		%%DOCSDIR%%/AUTHORS \
-		%%DOCSDIR%%/COPYING
-PLIST_DIRS=	%%DOCSDIR%%
+		man/man1/ncmpcpp.1.gz
+PORTDOCS=	AUTHORS COPYING NEWS bindings config ncmpcpp-completion.bash
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
@@ -88,11 +81,8 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/AUTHORS
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}/COPYING
-	${INSTALL_DATA} ${WRKSRC}/doc/config ${STAGEDIR}${DOCSDIR}/config
-	${INSTALL_DATA} ${WRKSRC}/doc/keys ${STAGEDIR}${DOCSDIR}/keys
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/bindings ${WRKSRC}/doc/config ${WRKSRC}/doc/ncmpcpp-completion.bash ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.post.mk>
Index: audio/ncmpcpp/distinfo
===================================================================
--- audio/ncmpcpp/distinfo
+++ audio/ncmpcpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.5.10.tar.bz2) = ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8
-SIZE (ncmpcpp-0.5.10.tar.bz2) = 381162
+SHA256 (ncmpcpp-0.6.1.tar.bz2) = 15a37e442a584050e50a4b5479b2af25f1f3556a747a604bad1a6020210a6a0c
+SIZE (ncmpcpp-0.6.1.tar.bz2) = 418332
Index: audio/ncmpcpp/files/patch-src__status.cpp
===================================================================
--- /dev/null
+++ audio/ncmpcpp/files/patch-src__status.cpp
@@ -0,0 +1,11 @@
+--- src/status.cpp_orig	2014-11-16 09:21:55.651181899 +0100
++++ src/status.cpp	2014-11-16 09:21:59.233203196 +0100
+@@ -21,6 +21,8 @@
+ #include <boost/date_time/posix_time/posix_time.hpp>
+ #include <netinet/tcp.h>
+ #include <netinet/in.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ 
+ #include "browser.h"
+ #include "charset.h"
Index: audio/ncmpcpp/files/patch-src__visualizer.h
===================================================================
--- audio/ncmpcpp/files/patch-src__visualizer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/visualizer.h.orig	2012-04-01 20:49:09.000000000 +0400
-+++ src/visualizer.h	2014-06-16 19:07:34.000000000 +0400
-@@ -34,6 +34,8 @@
- # include <fftw3.h>
- #endif
- 
-+#include <sys/time.h>
-+
- class Visualizer : public Screen<Window>
- {
- 	public:
Index: audio/ncmpcpp/pkg-message
===================================================================
--- audio/ncmpcpp/pkg-message
+++ audio/ncmpcpp/pkg-message
@@ -1,14 +1,10 @@
 ###########################################################################
 ncmpcpp has been installed.
 
-Attention: ncmpcpp doesn't use ~/.ncmpcpprc and ~/.ncmpcpp_keys as config
-files anymore. It's been using respectively ~/.ncmpcpp/config and
-~/.ncmpcpp/keys for this since ver. 0.2.4!
+Attention: ncmpcpp doesn't use ~/.ncmpcpp/keys anymore. It was replaced
+by the incompatible ~/.ncmpcpp/bindings.
 
 --------------------------------------------------------------------------
-Attention: Marker for right alignment in song format has changed from %r
-to $R since 0.4 version.
---------------------------------------------------------------------------
 
 A default config has been installed to:
 PREFIX/share/doc/ncmpcpp/config