Hi,
Here is an update to ncmpc. It looks like the "official" web-page is not
used anymore and isout of date. The MPD wikia page has newer versions of
ncmpc listed.
Thanks
--
Best Regards
Edd Barrett
(Freelance software developer / technical writer / open-source developer)
http://students.dec.bmth.ac.uk/ebarrett
diff -urN ncmpc/Makefile ncmpc.new/Makefile
--- ncmpc/Makefile Fri May 22 19:56:46 2009
+++ ncmpc.new/Makefile Fri May 22 19:52:54 2009
@@ -5,11 +5,11 @@
COMMENT= curses based frontend for mpd
-DISTNAME= ncmpc-20070917
-PKGNAME= ${DISTNAME}p1
+DISTNAME= ncmpc-0.14
+EXTRACT_SUFX = .tar.bz2
CATEGORIES= audio
-HOMEPAGE= http://hem.bredband.net/kaw/ncmpc/
+HOMEPAGE= http://mpd.wikia.com/wiki/Client:Ncmpc
MAINTAINER= Tobias Ulmer <[email protected]>
@@ -22,27 +22,12 @@
WANTLIB= c ncurses
LIB_DEPENDS= glib-2.0::devel/glib2
-USE_LIBTOOL= Yes
-
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
MODULES= devel/gettext
-MASTER_SITES= http://humppa.nl/distfiles/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
CONFIGURE_STYLE= gnu
-AUTOMAKE_VERSION= 1.8
-AUTOCONF_VERSION= 2.61
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -ftrampolines
-
-WRKDIST= ${WRKDIR}/ncmpc
-
-pre-configure:
- cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include <bsd.port.mk>
diff -urN ncmpc/distinfo ncmpc.new/distinfo
--- ncmpc/distinfo Fri May 22 19:56:46 2009
+++ ncmpc.new/distinfo Fri May 22 19:27:24 2009
@@ -1,5 +1,5 @@
-MD5 (ncmpc-20070917.tar.gz) = OqGlggazd/isBhJYbw/oBg==
-RMD160 (ncmpc-20070917.tar.gz) = wIIALvJO/u0mkGUzj+YuhRySxoQ=
-SHA1 (ncmpc-20070917.tar.gz) = GhgwMJZ4bsQEsb7Cu3jc0xQ+8Pg=
-SHA256 (ncmpc-20070917.tar.gz) = kM/BD6vSt/KT64PQ2HEw8RGkgMG0nrxzcrl0w7lHzaA=
-SIZE (ncmpc-20070917.tar.gz) = 247962
+MD5 (ncmpc-0.14.tar.bz2) = pio0VFee//fMpxaRo7CY+w==
+RMD160 (ncmpc-0.14.tar.bz2) = z2h7ML/ow2xZconDWaiwzhSSNXU=
+SHA1 (ncmpc-0.14.tar.bz2) = Ci6okBKc+cwpKauTVU1Ikvfxnn8=
+SHA256 (ncmpc-0.14.tar.bz2) = 0E1HmN8chX6c2+/hRviCeZW/f+Q1f9jPBCEpn3oM3Ic=
+SIZE (ncmpc-0.14.tar.bz2) = 247783
diff -urN ncmpc/patches/patch-doc_Makefile_am
ncmpc.new/patches/patch-doc_Makefile_am
--- ncmpc/patches/patch-doc_Makefile_am Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-doc_Makefile_am Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-doc_Makefile_am,v 1.1 2007/09/19 19:15:12 jasper Exp $
---- doc/Makefile.am.orig Wed Sep 19 19:34:17 2007
-+++ doc/Makefile.am Wed Sep 19 19:34:30 2007
-@@ -3,6 +3,6 @@
- #
-
- man_MANS = ncmpc.1
--docdir = $(prefix)/share/doc/$(PACKAGE)
-+docdir = $(prefix)/share/examples/$(PACKAGE)
- doc_DATA = config.sample keys.sample ncmpc.lirc
- EXTRA_DIST = $(man_MANS) $(doc_DATA)
diff -urN ncmpc/patches/patch-src_libmpdclient_c
ncmpc.new/patches/patch-src_libmpdclient_c
--- ncmpc/patches/patch-src_libmpdclient_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_libmpdclient_c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_libmpdclient_c,v 1.1 2007/10/31 06:34:55 jasper Exp $
---- src/libmpdclient.c.orig Wed Sep 19 18:27:39 2007
-+++ src/libmpdclient.c Thu Oct 25 13:04:31 2007
-@@ -197,6 +197,9 @@ mpd_Connection * mpd_newConnection(const char * host,
- connection->sock = 0;
- continue;
- }
-+
-+ /* success! */
-+ break;
- }
- }
-
diff -urN ncmpc/patches/patch-src_main_c ncmpc.new/patches/patch-src_main_c
--- ncmpc/patches/patch-src_main_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_main_c Thu Jan 1 01:00:00 1970
@@ -1,33 +0,0 @@
-$OpenBSD: patch-src_main_c,v 1.1 2008/07/21 07:53:03 bernd Exp $
---- src/main.c.orig Wed Sep 19 19:27:39 2007
-+++ src/main.c Sat Jul 12 10:45:07 2008
-@@ -153,6 +153,13 @@ sigstop(void)
- kill(0, SIGSTOP); /* issue SIGSTOP */
- }
-
-+void
-+catch_sigwinch(int x)
-+{
-+ (void)x;
-+ screen_resize();
-+}
-+
- #ifdef DEBUG
- void
- D(char *format, ...)
-@@ -237,6 +244,15 @@ main(int argc, const char *argv[])
- if( sigaction(SIGCONT, &act, NULL)<0 )
- {
- perror("sigaction(SIGCONT)");
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ sigemptyset(&act.sa_mask);
-+ act.sa_flags = 0;
-+ act.sa_handler = catch_sigwinch;
-+ if( sigaction(SIGWINCH, &act, NULL)<0 )
-+ {
-+ perror("sigaction(SIGWINCH)");
- exit(EXIT_FAILURE);
- }
-
diff -urN ncmpc/patches/patch-src_mpdclient_c
ncmpc.new/patches/patch-src_mpdclient_c
--- ncmpc/patches/patch-src_mpdclient_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_mpdclient_c Thu Jan 1 01:00:00 1970
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_mpdclient_c,v 1.2 2007/09/19 19:15:13 jasper Exp $
---- src/mpdclient.c.orig Wed Sep 19 19:27:39 2007
-+++ src/mpdclient.c Wed Sep 19 19:37:41 2007
-@@ -848,10 +848,9 @@ mpdclient_filelist_get(mpdclient_t *c, gchar *path)
- {
- mpdclient_filelist_t *filelist;
- mpd_InfoEntity *entity;
-- gchar *path_utf8 = locale_to_utf8(path);
-
-- D("mpdclient_filelist_get(%s)\n", path);
-- mpd_sendLsInfoCommand(c->connection, path_utf8);
-+ D("mpdclient_filelist_get(%s)\n", utf8_to_locale(path));
-+ mpd_sendLsInfoCommand(c->connection, path);
- filelist = g_malloc0(sizeof(mpdclient_filelist_t));
- if( path && path[0] && strcmp(path, "/") )
- {
-@@ -873,11 +872,9 @@ mpdclient_filelist_get(mpdclient_t *c, gchar *path)
-
- if( mpdclient_finish_command(c) )
- {
-- g_free(path_utf8);
- return mpdclient_filelist_free(filelist);
- }
-
-- g_free(path_utf8);
- filelist->path = g_strdup(path);
- filelist->updated = TRUE;
-
diff -urN ncmpc/patches/patch-src_screen_c ncmpc.new/patches/patch-src_screen_c
--- ncmpc/patches/patch-src_screen_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_screen_c Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_screen_c,v 1.1 2008/07/21 07:53:03 bernd Exp $
---- src/screen.c.orig Wed Sep 19 19:27:39 2007
-+++ src/screen.c Sat Jul 12 10:53:09 2008
-@@ -23,6 +23,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <time.h>
-+#include <termios.h>
- #include <locale.h>
- #include <glib.h>
- #include <ncurses.h>
-@@ -449,13 +450,22 @@ void
- screen_resize(void)
- {
- gint i;
-+ struct winsize ws;
-
-+ if (ioctl(fileno(stdout), TIOCGWINSZ, &ws) == 0) {
-+ LINES = ws.ws_row;
-+ COLS = ws.ws_col;
-+ }
-+
- D("Resize rows %d->%d, cols %d->%d\n",screen->rows,LINES,screen->cols,COLS);
- if( COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS )
- {
-- screen_exit();
-- fprintf(stderr, _("Error: Screen to small!\n"));
-- exit(EXIT_FAILURE);
-+ /*
-+ * Do not resize under a certain minimum, because that will fuck up the
-+ * playlist amongst other things
-+ */
-+ LINES = SCREEN_MIN_ROWS;
-+ COLS = SCREEN_MIN_COLS;
- }
-
- resizeterm(LINES, COLS);
diff -urN ncmpc/patches/patch-src_screen_file_c
ncmpc.new/patches/patch-src_screen_file_c
--- ncmpc/patches/patch-src_screen_file_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_screen_file_c Thu Jan 1 01:00:00 1970
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_screen_file_c,v 1.2 2007/09/19 19:15:13 jasper Exp $
---- src/screen_file.c.orig Wed Sep 19 19:27:39 2007
-+++ src/screen_file.c Wed Sep 19 19:37:41 2007
-@@ -230,7 +230,7 @@ change_directory(screen_t *screen, mpdclient_t *c, fil
- {
- /* enter sub */
- mpd_Directory *dir = entity->info.directory;
-- path = utf8_to_locale(dir->path);
-+ path = g_strdup(dir->path);
- /* save current list window state */
- list_window_push_state(lw_state,lw);
- }
-@@ -549,7 +549,7 @@ browse_close(void)
- static char *
- browse_title(char *str, size_t size)
- {
-- g_snprintf(str, size, _("Browse: %s"), basename(filelist->path));
-+ g_snprintf(str, size, _("Browse: %s"),
utf8_to_locale(basename(filelist->path)));
- return str;
- }
-
diff -urN ncmpc/patches/patch-src_support_c
ncmpc.new/patches/patch-src_support_c
--- ncmpc/patches/patch-src_support_c Fri May 22 19:56:46 2009
+++ ncmpc.new/patches/patch-src_support_c Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_support_c,v 1.2 2007/09/19 19:15:13 jasper Exp $
---- src/support.c.orig Wed Sep 19 19:27:39 2007
-+++ src/support.c Wed Sep 19 19:37:42 2007
-@@ -168,6 +168,7 @@ utf8_to_locale(char *utf8str)
- gchar *str;
- gsize rb, wb;
- GError *error;
-+ const char *charset;
-
- if( noconvert )
- return g_strdup(utf8str);
-@@ -175,15 +176,11 @@ utf8_to_locale(char *utf8str)
- rb = 0; /* bytes read */
- wb = 0; /* bytes written */
- error = NULL;
-- str=g_locale_from_utf8(utf8str,
-- strlen(utf8str),
-- &wb, &rb,
-- &error);
-+ g_get_charset(&charset);
-+ str = g_convert_with_fallback(
-+ utf8str, -1, charset, "UTF-8", "?", &rb, &wb, &error);
- if( error )
- {
-- const char *charset;
--
-- g_get_charset(&charset);
- screen_status_printf(_("Error: Unable to convert characters to %s"),
- charset);
- D("utf8_to_locale(): %s\n", error->message);
diff -urN ncmpc/pkg/PLIST ncmpc.new/pkg/PLIST
--- ncmpc/pkg/PLIST Fri May 22 19:56:46 2009
+++ ncmpc.new/pkg/PLIST Fri May 22 19:41:53 2009
@@ -1,20 +1,10 @@
-...@comment $OpenBSD: PLIST,v 1.2 2007/09/19 19:15:13 jasper Exp $
-bin/ncmpc
+...@comment $OpenBSD$
+...@bin bin/ncmpc
@man man/man1/ncmpc.1
share/doc/ncmpc/
share/doc/ncmpc/AUTHORS
share/doc/ncmpc/NEWS
share/doc/ncmpc/README
-share/examples/ncmpc/
-share/examples/ncmpc/config.sample
-share/examples/ncmpc/keys.sample
-share/examples/ncmpc/ncmpc.lirc
-share/locale/da/LC_MESSAGES/ncmpc.mo
-share/locale/de/LC_MESSAGES/ncmpc.mo
-share/locale/es/LC_MESSAGES/ncmpc.mo
-share/locale/fr/LC_MESSAGES/ncmpc.mo
-share/locale/gl/LC_MESSAGES/ncmpc.mo
-share/locale/no/LC_MESSAGES/ncmpc.mo
-share/locale/ru/LC_MESSAGES/ncmpc.mo
-share/locale/sv/LC_MESSAGES/ncmpc.mo
-...@comment share/ncmpc/
+share/doc/ncmpc/config.sample
+share/doc/ncmpc/keys.sample
+share/doc/ncmpc/ncmpc.lirc
