r2174 - in trunk

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: sonny_jim
Date: 2008-03-18 20:58:30 +0100 (Tue, 18 Mar 2008)
New Revision: 2174

Log:
Change ncurses.h to curses.h, add makefile and integrate ncmpc into build system

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/config/Configure.help	2008-03-18 19:58:30 UTC (rev 2174)
@@ -3410,6 +3410,9 @@
 CONFIG_USER_NESSUS_NASL
   The Nessus scripting language (NASL) interpreter.
 
+CONFIG_USER_NCMPC
+  Curses based MPD (http://musicpd.org/) client
+
 CONFIG_USER_MSNTP_MSNTP
   Simple Network Time Protocol utility.
   Approx. binary size: 66k

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/config/config.in	2008-03-18 19:58:30 UTC (rev 2174)
@@ -831,6 +831,7 @@
 bool 'mawk'			CONFIG_USER_MAWK_AWK
 bool 'mc'			CONFIG_USER_MC
 bool 'mpc'			CONFIG_USER_MPC
+bool 'ncmpc'			CONFIG_USER_NCMPC
 bool 'mysql'			CONFIG_USER_MYSQL
 if [ "$CONFIG_USER_MYSQL" = "y" ]; then
 	bool '  client library'	CONFIG_USER_MYSQL_CLIB

Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/Makefile	2008-03-18 19:58:30 UTC (rev 2174)
@@ -223,6 +223,7 @@
 dir_$(CONFIG_USER_NANO)                     += nano
 dir_$(CONFIG_USER_JOE)                      += joe
 dir_$(CONFIG_USER_NCFTP_NCFTP)              += ncftp
+dir_$(CONFIG_USER_NCMPC) 	            += ncmpc
 dir_$(CONFIG_USER_NESSUS_NASL)              += nessus
 dir_$(CONFIG_USER_NETCAT_NETCAT)            += netcat
 dir_$(CONFIG_USER_NETFLASH_NETFLASH)        += netflash

Added: trunk/user/ncmpc/Makefile

Copied: trunk/user/ncmpc/src (from rev 2173, tags/ncmpc/ncmpc-0.11.1)

Modified: trunk/user/ncmpc/src/src/Makefile.in
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/Makefile.in	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/Makefile.in	2008-03-18 19:58:30 UTC (rev 2174)
@@ -149,7 +149,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -liconv -lintl
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/colors.Po ./$(DEPDIR)/command.Po \

Modified: trunk/user/ncmpc/src/src/colors.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/colors.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/colors.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ncurses.h>
+#include <curses.h>
 #include <glib.h>
 
 #include "config.h"

Modified: trunk/user/ncmpc/src/src/command.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/command.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/command.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <glib.h>
 #include <signal.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "ncmpc.h"

Modified: trunk/user/ncmpc/src/src/conf.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/conf.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/conf.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -29,7 +29,7 @@
 #include <fcntl.h>
 
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 #include "config.h"
 #include "ncmpc.h"
 #include "options.h"

Modified: trunk/user/ncmpc/src/src/list_window.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/list_window.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/list_window.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "options.h"

Modified: trunk/user/ncmpc/src/src/main.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/main.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/main.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
-#include <ncurses.h>
+#include <curses.h>
 #include <glib.h>
 
 #include "config.h"

Modified: trunk/user/ncmpc/src/src/options.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/options.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/options.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ncurses.h>
+#include <curses.h>
 #include <glib.h>
 
 #include "config.h"

Modified: trunk/user/ncmpc/src/src/screen.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <locale.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "ncmpc.h"

Modified: trunk/user/ncmpc/src/src/screen.h
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen.h	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen.h	2008-03-18 19:58:30 UTC (rev 2174)
@@ -1,6 +1,6 @@
 #ifndef SCREEN_H
 #define SCREEN_H
-#include <ncurses.h>
+#include <curses.h>
 #include "list_window.h"
 
 #define IS_PLAYING(s) (s==MPD_STATUS_STATE_PLAY)

Modified: trunk/user/ncmpc/src/src/screen_clock.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_clock.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_clock.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 

Modified: trunk/user/ncmpc/src/src/screen_file.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_file.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_file.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "ncmpc.h"

Modified: trunk/user/ncmpc/src/src/screen_help.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_help.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_help.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "ncmpc.h"

Modified: trunk/user/ncmpc/src/src/screen_keydef.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_keydef.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_keydef.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 

Modified: trunk/user/ncmpc/src/src/screen_play.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_play.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_play.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 #include <panel.h>
 
 #include "config.h"

Modified: trunk/user/ncmpc/src/src/screen_search.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_search.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_search.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #ifndef DISABLE_SEARCH_SCREEN

Modified: trunk/user/ncmpc/src/src/screen_utils.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/screen_utils.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/screen_utils.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include <ncurses.h>
+#include <curses.h>
 
 #include "config.h"
 #include "ncmpc.h"

Modified: trunk/user/ncmpc/src/src/wreadln.c
===================================================================
--- tags/ncmpc/ncmpc-0.11.1/src/wreadln.c	2008-03-18 19:37:22 UTC (rev 2173)
+++ trunk/user/ncmpc/src/src/wreadln.c	2008-03-18 19:58:30 UTC (rev 2174)
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ncurses.h>
+#include <curses.h>
 #include <glib.h>
 
 #include "config.h"