summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjdc <jdc@pkgsrc.org>2003-06-10 20:45:35 +0000
committerjdc <jdc@pkgsrc.org>2003-06-10 20:45:35 +0000
commit8f29583fdc94ce3f504852daa3a5852207947c72 (patch)
treef5de5220eac4f69ddbd25e53666afd980841bb75 /audio
parent55128fd66fa86315639ecd8837b09fea8bfa1232 (diff)
downloadpkgsrc-8f29583fdc94ce3f504852daa3a5852207947c72.tar.gz
Make cda build with either curses or ncurses by putting a conditional
in the Imakefile and testing this in visual.c. Fixes PR pkg/21839 by Matthias Scheler (thanks for testing the fix).
Diffstat (limited to 'audio')
-rw-r--r--audio/xmcd/distinfo6
-rw-r--r--audio/xmcd/patches/patch-ab16
-rw-r--r--audio/xmcd/patches/patch-ai46
3 files changed, 35 insertions, 33 deletions
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index eeec259f3a7..dd23f42bc60 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.11 2003/06/09 19:01:12 jdc Exp $
+$NetBSD: distinfo,v 1.12 2003/06/10 20:45:35 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) = fe4a9bd81fafc2c25380352f34b7ad88dcf82d00
+SHA1 (patch-ab) = 2721877c17a7e810a4039be7056d015b87d94273
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
+SHA1 (patch-ai) = 630d725a223728c75531765dd8f5e1be2f3adc32
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index c354e24258a..5035e96b548 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,21 +1,31 @@
--- 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 @@
++++ cda_d/Imakefile Tue Jun 10 13:29:21 2003
+@@ -53,7 +53,13 @@
DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
#else
#if defined(NetBSDArchitecture)
-DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS
++#if OSMajorVersion == 1 && (OSMinorVersion < 6 || \
++ (OSMinorVersion == 6 && OSTeenyVersion < 20))
+DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
++#else
++DEFINES= -DBSDCOMPAT -DUSE_TERMIOS -DUSE_NETBSD_CURSES
++#define USE_NETBSD_CURSES
++#endif
#else
#if defined(__bsdi__)
.if exists(/usr/include/ncurses.h)
-@@ -127,11 +127,12 @@
+@@ -127,11 +133,16 @@
.endif
#else
#if defined(NetBSDArchitecture)
-LOCAL_LIBRARIES=
+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
++#if defined USE_NETBSD_CURSES
+LOCAL_LIBRARIES+=-lcurses
++#else
++LOCAL_LIBRARIES+=-lncurses
++#endif
#else
#if defined(__bsdi__)
.if exists(/usr/include/ncurses.h)
diff --git a/audio/xmcd/patches/patch-ai b/audio/xmcd/patches/patch-ai
index af8454dd4f4..e14911c44ba 100644
--- a/audio/xmcd/patches/patch-ai
+++ b/audio/xmcd/patches/patch-ai
@@ -1,130 +1,122 @@
--- 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 @@
++++ cda_d/visual.c Tue Jun 10 15:13:16 2003
+@@ -52,15 +52,17 @@
#if defined(ultrix) || defined(__ultrix)
#include <cursesX.h>
#else
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
-+#if defined(__FreeBSD__) || defined(__bsdi__)
++#if defined(__FreeBSD__) || defined(__bsdi__) || \
++(defined(__NetBSD__) && !defined(USE_NETBSD_CURSES))
#include <ncurses.h>
#else
#include <curses.h>
-@@ -60,7 +60,7 @@
+-#endif /* __FreeBSD__ __NetBSD__ __bsdi__ */
++#endif /* __FreeBSD__ __bsdi__ __NetBSD__ */
#endif /* ultrix */
#endif /* SYSV */
-#ifndef __QNX__
-+#if !((defined __QNX__) || defined(__NetBSD__))
++#if !((defined __QNX__) || \
++(defined(__NetBSD__) && defined(USE_NETBSD_CURSES)))
#include <term.h>
#endif
-@@ -425,7 +425,8 @@
+@@ -425,7 +427,7 @@
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 @@
+@@ -437,7 +439,7 @@
}
cda_v_echo(FALSE);
- putp(cursor_invisible);
+ curs_set(0);
-+ /*putp(cursor_invisible);*/
if (n == i)
return 0;
-@@ -508,7 +510,8 @@
+@@ -508,7 +510,7 @@
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 @@
+@@ -1575,7 +1577,7 @@
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 @@
+@@ -1616,7 +1618,7 @@
}
cda_v_echo(FALSE);
- putp(cursor_invisible);
+ curs_set(0);
-+ /*putp(cursor_invisible);*/
refresh_sts = TRUE;
}
-@@ -2061,7 +2066,8 @@
+@@ -2061,7 +2063,7 @@
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 @@
+@@ -2091,7 +2093,7 @@
}
cda_v_echo(FALSE);
- putp(cursor_invisible);
+ curs_set(0);
-+ /*putp(cursor_invisible);*/
refresh_sts = TRUE;
}
-@@ -2119,7 +2126,8 @@
+@@ -2119,7 +2121,7 @@
/* 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 @@
+@@ -2150,7 +2152,7 @@
/* 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 @@
+@@ -2184,7 +2186,7 @@
{
if (isvisual) {
keypad(stdscr, FALSE);
- putp(cursor_normal);
+ curs_set(1);
-+ /*putp(cursor_normal);*/
clear();
move(LINES-1, 0);
-@@ -2293,7 +2303,8 @@
+@@ -2293,7 +2295,7 @@
noecho();
cbreak();
- putp(cursor_invisible);
+ curs_set(0);
-+ /*putp(cursor_invisible);*/
if ((info_win = newpad(MAXTRACK * 2, COLS)) == (WINDOW *) NULL) {
cda_quit(s);