- Update to 0.8

- Changelog: https://rybczak.net/ncmpcpp/

PR:	219534
Submitted by:	yamagi@yamagi.org (maintainer)
Approved by:	rene (mentor)
Differential Revision:	https://reviews.freebsd.org/D10960

12 files changed, 12 insertions, 108 deletions

diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 15c5001f3ae0..795049e6ffd7 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ncmpcpp
-PORTVERSION=	0.7.7
-PORTREVISION=	3
+PORTVERSION=	0.8
 CATEGORIES=	audio
 MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
 
@@ -16,19 +15,19 @@ LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
 		libfftw3.so:math/fftw3 \
 		libicudata.so:devel/icu \
 		libicuuc.so:devel/icu \
-		libboost_filesystem.so:devel/boost-libs
+		libboost_filesystem.so:devel/boost-libs \
+		libcurl.so:ftp/curl
 
 BROKEN_powerpc64=	fails to compile: tags.cpp: undefined reference to TagLib::String::to8Bit
 
-USES=		compiler:c++11-lib iconv libtool localbase ncurses pkgconfig readline tar:bzip2
+USES=		compiler:c++14-lang iconv libtool localbase ncurses:port pkgconfig readline tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 LDFLAGS+=	-lpthread
 CONFIGURE_ENV=	BOOST_LIB_SUFFIX=""
 
-OPTIONS_DEFINE=	CURL CLOCK DOCS OUTPUTS TAGLIB UTF8 VISUALIZER
-OPTIONS_DEFAULT=	CURL CLOCK OUTPUTS TAGLIB UTF8 VISUALIZER
-CURL_DESC=	Enable fetching lyrics from the Internet
+OPTIONS_DEFINE=	CLOCK DOCS OUTPUTS TAGLIB UTF8 VISUALIZER
+OPTIONS_DEFAULT=	CLOCK OUTPUTS TAGLIB UTF8 VISUALIZER
 CLOCK_DESC=	clock-screen support
 TAGLIB_DESC=	taglib support
 OUTPUTS_DESC=	Enable outputs screen
@@ -38,9 +37,6 @@ PLIST_FILES=	bin/ncmpcpp \
 		man/man1/ncmpcpp.1.gz
 PORTDOCS=	AUTHORS COPYING NEWS bindings config
 
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_CONFIGURE_WITH=	curl
-
 CLOCK_CONFIGURE_ENABLE=	clock
 
 UTF8_CONFIGURE_ENABLE=	unicode
diff --git a/audio/ncmpcpp/distinfo b/audio/ncmpcpp/distinfo
index 65cadc111707..8ab1bb39a024 100644
--- a/audio/ncmpcpp/distinfo
+++ b/audio/ncmpcpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481256402
-SHA256 (ncmpcpp-0.7.7.tar.bz2) = b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef
-SIZE (ncmpcpp-0.7.7.tar.bz2) = 443801
+TIMESTAMP = 1495718276
+SHA256 (ncmpcpp-0.8.tar.bz2) = 2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a
+SIZE (ncmpcpp-0.8.tar.bz2) = 464165
diff --git a/audio/ncmpcpp/files/patch-src_browser.cpp b/audio/ncmpcpp/files/patch-src_browser.cpp
deleted file mode 100644
index e82bcc3e0e86..000000000000
--- a/audio/ncmpcpp/files/patch-src_browser.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/browser.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/browser.cpp
-@@ -42,6 +42,7 @@
- #include "utility/comparators.h"
- #include "utility/string.h"
- #include "configuration.h"
-+#include "format_impl.h"
- 
- using Global::MainHeight;
- using Global::MainStartY;
diff --git a/audio/ncmpcpp/files/patch-src_configuration.cpp b/audio/ncmpcpp/files/patch-src_configuration.cpp
deleted file mode 100644
index b07a0a235cb1..000000000000
--- a/audio/ncmpcpp/files/patch-src_configuration.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/configuration.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/configuration.cpp
-@@ -29,6 +29,7 @@
- #include "mpdpp.h"
- #include "settings.h"
- #include "utility/string.h"
-+#include "format_impl.h"
- 
- namespace po = boost::program_options;
- 
diff --git a/audio/ncmpcpp/files/patch-src_helpers.cpp b/audio/ncmpcpp/files/patch-src_helpers.cpp
deleted file mode 100644
index 5989c3dc09e5..000000000000
--- a/audio/ncmpcpp/files/patch-src_helpers.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/helpers.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/helpers.cpp
-@@ -26,6 +26,7 @@
- #include "playlist.h"
- #include "statusbar.h"
- #include "utility/functional.h"
-+#include "format_impl.h"
- 
- const MPD::Song *currentSong(const BaseScreen *screen)
- {
diff --git a/audio/ncmpcpp/files/patch-src_media__library.cpp b/audio/ncmpcpp/files/patch-src_media__library.cpp
deleted file mode 100644
index ef6774836b0f..000000000000
--- a/audio/ncmpcpp/files/patch-src_media__library.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/media_library.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/media_library.cpp
-@@ -40,6 +40,7 @@
- #include "utility/type_conversions.h"
- #include "title.h"
- #include "screen_switcher.h"
-+#include "format_impl.h"
- 
- using Global::MainHeight;
- using Global::MainStartY;
diff --git a/audio/ncmpcpp/files/patch-src_playlist.cpp b/audio/ncmpcpp/files/patch-src_playlist.cpp
deleted file mode 100644
index eabea233322f..000000000000
--- a/audio/ncmpcpp/files/patch-src_playlist.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/playlist.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/playlist.cpp
-@@ -35,6 +35,7 @@
- #include "utility/comparators.h"
- #include "utility/functional.h"
- #include "title.h"
-+#include "format_impl.h"
- 
- using Global::MainHeight;
- using Global::MainStartY;
diff --git a/audio/ncmpcpp/files/patch-src_playlist__editor.cpp b/audio/ncmpcpp/files/patch-src_playlist__editor.cpp
deleted file mode 100644
index 6110fdfa5cfb..000000000000
--- a/audio/ncmpcpp/files/patch-src_playlist__editor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/playlist_editor.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/playlist_editor.cpp
-@@ -39,6 +39,7 @@
- #include "utility/comparators.h"
- #include "title.h"
- #include "screen_switcher.h"
-+#include "format_impl.h"
- 
- using Global::MainHeight;
- using Global::MainStartY;
diff --git a/audio/ncmpcpp/files/patch-src_search__engine.cpp b/audio/ncmpcpp/files/patch-src_search__engine.cpp
deleted file mode 100644
index b4d8e60e8b21..000000000000
--- a/audio/ncmpcpp/files/patch-src_search__engine.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/search_engine.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/search_engine.cpp
-@@ -35,6 +35,7 @@
- #include "utility/comparators.h"
- #include "title.h"
- #include "screen_switcher.h"
-+#include "format_impl.h"
- 
- using Global::MainHeight;
- using Global::MainStartY;
diff --git a/audio/ncmpcpp/files/patch-src_status.cpp b/audio/ncmpcpp/files/patch-src_status.cpp
index 0ebd286df741..9496a113a944 100644
--- a/audio/ncmpcpp/files/patch-src_status.cpp
+++ b/audio/ncmpcpp/files/patch-src_status.cpp
@@ -1,4 +1,4 @@
---- src/status.cpp.orig	2016-04-17 05:41:01 UTC
+--- src/status.cpp.orig	2017-05-25 13:30:40 UTC
 +++ src/status.cpp
 @@ -21,6 +21,8 @@
  #include <boost/date_time/posix_time/posix_time.hpp>
@@ -7,5 +7,5 @@
 +#include <sys/types.h>
 +#include <sys/socket.h>
  
- #include "browser.h"
- #include "charset.h"
+ #include "curses/menu_impl.h"
+ #include "screens/browser.h"
diff --git a/audio/ncmpcpp/files/patch-src_tag__editor.cpp b/audio/ncmpcpp/files/patch-src_tag__editor.cpp
deleted file mode 100644
index b5979181ec7e..000000000000
--- a/audio/ncmpcpp/files/patch-src_tag__editor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tag_editor.cpp.orig	2016-04-17 05:41:01 UTC
-+++ src/tag_editor.cpp
-@@ -42,6 +42,7 @@
- #include "title.h"
- #include "tags.h"
- #include "screen_switcher.h"
-+#include "format_impl.h"
- 
- using Global::myScreen;
- using Global::MainHeight;
diff --git a/audio/ncmpcpp/files/patch-src_window.h b/audio/ncmpcpp/files/patch-src_window.h
deleted file mode 100644
index 7e7c93bda8fc..000000000000
--- a/audio/ncmpcpp/files/patch-src_window.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/window.h.orig	2016-04-17 05:41:01 UTC
-+++ src/window.h
-@@ -23,7 +23,9 @@
- 
- #include "config.h"
- 
-+#define _XOPEN_SOURCE_EXTENDED
- #include "curses.h"
-+
- #include "gcc.h"
- 
- #include <boost/optional.hpp>