Fix columns generation without configuration file (the text of the

playlist disappeared in columns display mode when there is no config
file)
(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)

help: fix typo
(upstream git commit a22e875473bb796eb1e905ca4d40b39c90133637)

audio/ncmpcpp/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2012/04/02 14:09:36 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.12 2012/08/08 12:32:10 dcoppa Exp $
 
 COMMENT =		ncurses mpd client inspired by ncmpc
 
 DISTNAME =		ncmpcpp-0.5.10
+REVISION =		0
 
 EXTRACT_SUFX =		.tar.bz2
 

audio/ncmpcpp/distinfo

@@ -1,5 +1,2 @@
-MD5 (ncmpcpp-0.5.10.tar.bz2) = KY7WYyW8/jWON+GGx+pIYQ==
-RMD160 (ncmpcpp-0.5.10.tar.bz2) = 2nlGSa42UJo4XPBKBlr2uXFWHb4=
-SHA1 (ncmpcpp-0.5.10.tar.bz2) = XjRzPn+68oYvBP34r4GVzoYKkBQ=
 SHA256 (ncmpcpp-0.5.10.tar.bz2) = /21TdqLZyrpvW7eOaK93zvvbLwTNJW9zjjn4rJp5pKg=
 SIZE (ncmpcpp-0.5.10.tar.bz2) = 381162

audio/ncmpcpp/patches/patch-src_help_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_help_cpp,v 1.1 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix typo
+(upstream git commit a22e875473bb796eb1e905ca4d40b39c90133637)
+
+--- src/help.cpp.orig	Wed Aug  8 13:43:54 2012
++++ src/help.cpp	Wed Aug  8 13:44:20 2012
+@@ -297,7 +297,7 @@ void Help::GetKeybindings()
+ 	*w << DisplayKeys(Key.SwitchTagTypeList)	<< "Tag type list switcher (left column)\n";
+ 	
+ 	
+-	*w << "\n\n   " << fmtBold << "Keys - Playlist Editor\n -----------------------------------------\n" << fmtBoldEnd;
++	*w << "\n\n   " << fmtBold << "Keys - Playlist editor\n -----------------------------------------\n" << fmtBoldEnd;
+ 	*w << DisplayKeys(Key.PrevColumn)		<< "Previous column\n";
+ 	*w << DisplayKeys(Key.NextColumn)		<< "Next column\n";
+ 	*w << DisplayKeys(Key.Enter)			<< "Add item to playlist and play\n";

audio/ncmpcpp/patches/patch-src_ncmpcpp_cpp

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_ncmpcpp_cpp,v 1.4 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/ncmpcpp.cpp.orig	Sun Apr  1 18:49:09 2012
++++ src/ncmpcpp.cpp	Wed Aug  8 13:41:05 2012
+@@ -249,6 +249,8 @@ int main(int argc, char **argv)
+ 	Config.Read();
+ 	Key.Read();
+ 	
++	Config.GenerateColumns();
++	
+ 	if (getenv("MPD_HOST"))
+ 		Mpd.SetHostname(getenv("MPD_HOST"));
+ 	if (getenv("MPD_PORT"))

audio/ncmpcpp/patches/patch-src_settings_cpp

@@ -0,0 +1,22 @@
+$OpenBSD: patch-src_settings_cpp,v 1.3 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/settings.cpp.orig	Sun Apr  1 18:49:09 2012
++++ src/settings.cpp	Wed Aug  8 13:41:05 2012
+@@ -1330,7 +1330,11 @@ void NcmpcppConfig::Read()
+ 		}
+ 	}
+ 	f.close();
+-	
++}
++
++void NcmpcppConfig::GenerateColumns()
++{
++	columns.clear();
+ 	std::string width;
+ 	while (!(width = GetLineValue(song_list_columns_format, '(', ')', 1)).empty())
+ 	{

audio/ncmpcpp/patches/patch-src_settings_h

@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_settings_h,v 1.1 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/settings.h.orig	Sun Apr  1 18:49:09 2012
++++ src/settings.h	Wed Aug  8 13:41:05 2012
+@@ -149,6 +149,7 @@ struct NcmpcppConfig
+ 	
+ 	void SetDefaults();
+ 	void Read();
++	void GenerateColumns();
+ 	
+ 	std::string ncmpcpp_directory;
+ 	std::string lyrics_directory;