Add patches to work with NetBSD's curses.

6 files changed, 63 insertions, 9 deletions

diff --git a/audio/moc-devel/Makefile b/audio/moc-devel/Makefile
index ea0d83fe89e..a921be7a11a 100644
--- a/audio/moc-devel/Makefile
+++ b/audio/moc-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/07 21:18:52 joerg Exp $
 
 DISTNAME=		moc-2.5.0-alpha3
 PKGNAME=		${DISTNAME:S/-alpha/./:moc%=moc-devel%}
@@ -18,13 +18,9 @@ CONFLICTS=		moc-[0-9]*
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_NCURSES=		yes
 USE_TOOLS+=		pkg-config
 #USE_TOOLS+=		autoconf automake
 
-# We require ncurses because with curses arrow key navigation is buggy
-CONFIGURE_ARGS+=	--with-ncurses
-
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
 SUBST_FILES.oss=	config.example options.c
diff --git a/audio/moc-devel/distinfo b/audio/moc-devel/distinfo
index 10c17df8cdf..794b170b867 100644
--- a/audio/moc-devel/distinfo
+++ b/audio/moc-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/06/08 07:25:20 hasso Exp $
+$NetBSD: distinfo,v 1.3 2009/07/07 21:18:52 joerg Exp $
 
 SHA1 (moc-2.5.0-alpha3.tar.bz2) = 59251b6239ad38f3f5ba8a1f73d1e90246765ab7
 RMD160 (moc-2.5.0-alpha3.tar.bz2) = 7a603538e2080f3e182a543bc82100a09a56c2fe
@@ -6,4 +6,7 @@ Size (moc-2.5.0-alpha3.tar.bz2) = 489824 bytes
 SHA1 (patch-aa) = 058c2f72e22d3a31aee6e921aa9c110326a305f3
 SHA1 (patch-ab) = 750f9a75c368788cf7d6f55e2ef44d7e41d99aa4
 SHA1 (patch-ac) = 6b42e7df0dc3dfeb0a7c5e5226a28b01d2fd27c7
-SHA1 (patch-ad) = 5785a54e683f8c063e7b603e7cc07a33dd080590
+SHA1 (patch-ad) = 4816d3a17e832ee1b8be76f342a4512fad9fc642
+SHA1 (patch-ae) = f7b98f7af3843432bab24049b17c8639a0dfce59
+SHA1 (patch-af) = 0176dff0c460a12a563df10685818face3c4b3d5
+SHA1 (patch-ag) = 818df09cf6d06165cbd1c62681a3b5d84daa30bf
diff --git a/audio/moc-devel/patches/patch-ad b/audio/moc-devel/patches/patch-ad
index 59cdfa159d4..fdc445c516d 100644
--- a/audio/moc-devel/patches/patch-ad
+++ b/audio/moc-devel/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
+$NetBSD: patch-ad,v 1.2 2009/07/07 21:18:52 joerg Exp $
 
---- configure.orig	2008-02-25 17:38:19.000000000 -0500
+--- configure.orig	2008-02-25 23:38:19.000000000 +0100
 +++ configure
 @@ -22895,6 +22895,72 @@ if test `eval echo '${'$as_ac_var'}'` = 
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -75,3 +75,11 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
  fi
  done
  
+@@ -27118,6 +27184,7 @@ else
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	mp_cv_ncursesw=no
++        LIBS="$mp_save_LIBS"
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
diff --git a/audio/moc-devel/patches/patch-ae b/audio/moc-devel/patches/patch-ae
new file mode 100644
index 00000000000..82d4e41a355
--- /dev/null
+++ b/audio/moc-devel/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2009/07/07 21:18:52 joerg Exp $
+
+--- interface_elements.h.orig	2009-07-07 12:34:49.000000000 +0200
++++ interface_elements.h
+@@ -1,7 +1,13 @@
+ #ifndef INTERFACE_ELEMENTS_H
+ #define INTERFACE_ELEMENTS_H
+ 
+-#include <ncurses.h>
++#ifdef HAVE_NCURSESW_H
++# include <ncursesw/curses.h>
++#elif HAVE_NCURSES_H
++# include <ncurses.h>
++#elif HAVE_CURSES_H
++# include <curses.h>
++#endif
+ 
+ #include "files.h"
+ #include "keys.h"
diff --git a/audio/moc-devel/patches/patch-af b/audio/moc-devel/patches/patch-af
new file mode 100644
index 00000000000..7208817fd98
--- /dev/null
+++ b/audio/moc-devel/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2009/07/07 21:18:52 joerg Exp $
+
+--- m4/mp_with_curses.m4.orig	2009-07-07 12:30:19.000000000 +0200
++++ m4/mp_with_curses.m4
+@@ -45,8 +45,8 @@ AC_DEFUN([MP_WITH_CURSES],
+    if test ! "$CURSES_LIB" -a "$with_ncurses" != yes
+    then
+      AC_CACHE_CHECK([for working curses], mp_cv_curses,
+-       [LIBS="$LIBS -lcurses"
+-        AC_TRY_LINK(
++       [LIBS="$mp_save_LIBS -lcurses"
++        AC_TRYLINK(
+           [#include <curses.h>],
+           [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ],
+           mp_cv_curses=yes, mp_cv_curses=no)])
diff --git a/audio/moc-devel/patches/patch-ag b/audio/moc-devel/patches/patch-ag
new file mode 100644
index 00000000000..bee91e33782
--- /dev/null
+++ b/audio/moc-devel/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2009/07/07 21:18:52 joerg Exp $
+
+--- interface_elements.c.orig	2009-07-07 13:23:11.000000000 +0200
++++ interface_elements.c
+@@ -2526,7 +2526,7 @@ static void info_win_draw_title (const s
+ 		}
+ 		else {
+ 		wattrset (w->win, get_color(CLR_TITLE));
+-		xmvwaddnstr (w->win, 1, 4, w->title, COLS - 5);
++		xmvwaddnstr (w->win, 1, 4, w->title ? w->title : "", COLS - 5);
+ 		}
+ 	}
+