Make xmcd use native curses in 1.6T and forward by replacing calls to

putp(cursor_*) with curs_set().
Fixes lib/20030 by Thomas Klausner.

4 files changed, 143 insertions, 11 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 18d25537201..eb2dd176315 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/03/29 12:40:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2003/06/09 19:01:12 jdc Exp $
 
 DISTNAME=	xmcd-3.0.2
+PKGREVISION=    1
 WRKSRC=		${WRKDIR}/xmcd-3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
@@ -15,13 +16,15 @@ PATCH_DIST_STRIP=	-p1
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
-USE_NCURSES=		# cursor_normal, cursor_invisible (in ncurses in term.h)
 USE_IMAKE=		yes
 MAKE_ENV+=		BATCH_BINDIR=${PREFIX}/bin
 MAKE_ENV+=		BATCH_LIBDIR=${PREFIX}/lib/X11
 MAKE_ENV+=		BATCH_MANDIR=${PREFIX}/man/man1
 MAKE_ENV+=		SHELL=${SH}
 
+INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-*
+INCOMPAT_CURSES+=	NetBSD-1.6-* NetBSD-1.6.1-* NetBSD-1.6[A-S]-*
+
 ARCHBIN=	${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
 XMCDDIR=	${PREFIX}/lib/X11/xmcd
 
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 42efeff448a..eeec259f3a7 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.10 2002/10/08 11:50:04 jlam Exp $
+$NetBSD: distinfo,v 1.11 2003/06/09 19:01:12 jdc Exp $
 
 SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
 Size (xmcd-3.0.2.tar.gz) = 690285 bytes
 SHA1 (xmcd-3.0.2-proxyauth-patch) = a6114c73e5470747fe2dcfe16cb11bc7c5e5b4dd
 Size (xmcd-3.0.2-proxyauth-patch) = 2922 bytes
 SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
-SHA1 (patch-ab) = e262ffe7ce8d6d87a7867c9bc4de9a210f0a0b73
+SHA1 (patch-ab) = fe4a9bd81fafc2c25380352f34b7ad88dcf82d00
 SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
 SHA1 (patch-ad) = b887cbc81cb57bc5598a65dcb70e136eb427044b
 SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
 SHA1 (patch-af) = e8bc1a3b791f6df15f12f074712a55423fa3fadf
 SHA1 (patch-ag) = cdca79fa131a6b2e74c7cea377167f8d0290c162
 SHA1 (patch-ah) = bae28364d50709529cad5ce5ebf3362dd14cf99b
+SHA1 (patch-ai) = 949461d182ad97d3f794a0a5cf107cb3feeb7c68
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index 2b7578752ee..c354e24258a 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2002/10/08 11:50:04 jlam Exp $
-
---- cda_d/Imakefile.orig	Mon Jul 16 12:52:16 2001
-+++ cda_d/Imakefile	Mon Jul 23 14:43:24 2001
-@@ -50,7 +50,7 @@
+--- cda_d/Imakefile.orig	Wed Aug  8 01:15:13 2001
++++ cda_d/Imakefile	Mon Jun  2 18:20:49 2003
+@@ -53,7 +53,7 @@
  DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
  #else
  #if defined(NetBSDArchitecture)
@@ -11,13 +9,13 @@ $NetBSD: patch-ab,v 1.9 2002/10/08 11:50:04 jlam Exp $
  #else
  #if defined(__bsdi__)
  .if exists(/usr/include/ncurses.h)
-@@ -120,11 +120,12 @@
+@@ -127,11 +127,12 @@
  .endif
  #else
  #if defined(NetBSDArchitecture)
 -LOCAL_LIBRARIES=
 +LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-+LOCAL_LIBRARIES+=-lncurses
++LOCAL_LIBRARIES+=-lcurses
  #else
  #if defined(__bsdi__)
  .if exists(/usr/include/ncurses.h)
diff --git a/audio/xmcd/patches/patch-ai b/audio/xmcd/patches/patch-ai
new file mode 100644
index 00000000000..af8454dd4f4
--- /dev/null
+++ b/audio/xmcd/patches/patch-ai
@@ -0,0 +1,130 @@
+--- cda_d/visual.c.orig	Wed Aug  8 01:15:14 2001
++++ cda_d/visual.c	Mon Jun  2 18:20:51 2003
+@@ -52,7 +52,7 @@
+ #if defined(ultrix) || defined(__ultrix)
+ #include <cursesX.h>
+ #else
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
++#if defined(__FreeBSD__) || defined(__bsdi__)
+ #include <ncurses.h>
+ #else
+ #include <curses.h>
+@@ -60,7 +60,7 @@
+ #endif	/* ultrix */
+ #endif	/* SYSV */
+ 
+-#ifndef __QNX__
++#if !((defined __QNX__) || defined(__NetBSD__))
+ #include <term.h>
+ #endif
+ 
+@@ -425,7 +425,8 @@
+ 		cda_clrstatus();
+ 		wprintw(status_win, "Choose one (1-%d): ", i);
+ 		cda_v_echo(TRUE);
+-		putp(cursor_normal);
++		curs_set(1);
++		/*putp(cursor_normal);*/
+ 		wrefresh(status_win);
+ 		cda_wgetstr(status_win, input, 60);
+ 
+@@ -437,7 +438,8 @@
+ 	}
+ 
+ 	cda_v_echo(FALSE);
+-	putp(cursor_invisible);
++	curs_set(0);
++	/*putp(cursor_invisible);*/
+ 
+ 	if (n == i)
+ 		return 0;
+@@ -508,7 +510,8 @@
+ 	cda_clrstatus();
+ 	wprintw(status_win, "Username: ");
+ 	cda_v_echo(TRUE);
+-	putp(cursor_normal);
++	curs_set(1);
++	/*putp(cursor_normal);*/
+ 	wrefresh(status_win);
+ 	cda_wgetstr(status_win, input, 60);
+ 	if (input[0] == '\0')
+@@ -1575,7 +1578,8 @@
+ 		cda_clrstatus();
+ 		wprintw(status_win, "Program: ");
+ 		cda_v_echo(TRUE);
+-		putp(cursor_normal);
++		curs_set(1);
++		/*putp(cursor_normal);*/
+ 		wrefresh(status_win);
+ 
+ 		/* Before reading the program list, check for
+@@ -1616,7 +1620,8 @@
+ 		}
+ 
+ 		cda_v_echo(FALSE);
+-		putp(cursor_invisible);
++		curs_set(0);
++		/*putp(cursor_invisible);*/
+ 
+ 		refresh_sts = TRUE;
+ 	}
+@@ -2061,7 +2066,8 @@
+ 	cda_clrstatus();
+ 	wprintw(status_win, "Track n [mins secs] : ");
+ 	cda_v_echo(TRUE);
+-	putp(cursor_normal);
++	curs_set(1);
++	/*putp(cursor_normal);*/
+ 	wrefresh(status_win);
+ 
+ 	cda_wgetstr(status_win, inbuf, 20);
+@@ -2091,7 +2097,8 @@
+ 	}
+ 
+ 	cda_v_echo(FALSE);
+-	putp(cursor_invisible);
++	curs_set(0);
++	/*putp(cursor_invisible);*/
+ 	refresh_sts = TRUE;
+ }
+ 
+@@ -2119,7 +2126,8 @@
+ 	/* Put screen in sane state */
+ 	move(LINES-1, 0);
+ 	printw("\r\n\n");
+-	putp(cursor_normal);
++	curs_set(1);
++	/*putp(cursor_normal);*/
+ 	refresh();
+ 	reset_shell_mode();
+ 
+@@ -2150,7 +2158,8 @@
+ 
+ 	/* Restore visual attributes */
+ 	reset_prog_mode();
+-	putp(cursor_invisible);
++	curs_set(0);
++	/*putp(cursor_invisible);*/
+ 
+ 	/* Set up for auto refresh */
+ 	wclear(info_win);
+@@ -2184,7 +2193,8 @@
+ {
+ 	if (isvisual) {
+ 		keypad(stdscr, FALSE);
+-		putp(cursor_normal);
++		curs_set(1);
++		/*putp(cursor_normal);*/
+ 		clear();
+ 
+ 		move(LINES-1, 0);
+@@ -2293,7 +2303,8 @@
+ 
+ 	noecho();
+ 	cbreak();
+-	putp(cursor_invisible);
++	curs_set(0);
++	/*putp(cursor_invisible);*/
+ 
+ 	if ((info_win = newpad(MAXTRACK * 2, COLS)) == (WINDOW *) NULL) {
+ 		cda_quit(s);