Update xmcd to 2.6. New command line option to start playing

a particular track immediately, more. Complete history at
<http://metalab.unc.edu/tkan/xmcd/changes.txt>

6 files changed, 40 insertions, 60 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 3c2675e9b14..a218a5f9907 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2000/01/15 18:46:24 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2000/02/13 19:17:23 fredb Exp $
 #
 
-DISTNAME=	xmcd-2.5
+DISTNAME=	xmcd-2.6
 CATEGORIES=	audio
 MASTER_SITES=	http://metalab.unc.edu/tkan/download/xmcd/src/
 
diff --git a/audio/xmcd/files/md5 b/audio/xmcd/files/md5
index c05246f0177..2a9916d0bc2 100644
--- a/audio/xmcd/files/md5
+++ b/audio/xmcd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1999/08/08 22:57:26 tron Exp $
+$NetBSD: md5,v 1.8 2000/02/13 19:17:24 fredb Exp $
 
-MD5 (xmcd-2.5.tar.gz) = 316dd535081bc714c0745217471cfd65
+MD5 (xmcd-2.6.tar.gz) = ce3208e21d8e37059e44ce9310d08f5f
diff --git a/audio/xmcd/files/patch-sum b/audio/xmcd/files/patch-sum
index ccfc3481c66..732439f68fe 100644
--- a/audio/xmcd/files/patch-sum
+++ b/audio/xmcd/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:16 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/13 19:17:24 fredb Exp $
 
 MD5 (patch-aa) = 042e405c0c3e32708d6701b5f111a8e2
-MD5 (patch-ab) = f2993d65520bddafda5415c4a75b2181
+MD5 (patch-ab) = b4302466309ca3ff5d31ed2d8b816df5
 MD5 (patch-ac) = b818b87617b278c9e35716b7cd965f4d
-MD5 (patch-ad) = afbf0e7538aff8657e84da4a6908d650
+MD5 (patch-ad) = 60add0bf30a0e45a0fec362f0a775126
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index 4018735fcf5..6edf98b0091 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,33 +1,17 @@
-$NetBSD: patch-ab,v 1.4 1998/11/12 15:48:34 agc Exp $
+$NetBSD: patch-ab,v 1.5 2000/02/13 19:17:24 fredb Exp $
 
---- cda_d/Imakefile.orig	Wed Oct 28 03:03:25 1998
-+++ cda_d/Imakefile	Wed Nov  4 22:37:14 1998
-@@ -42,11 +42,11 @@
-  *	One of these should be defined for tty mode control
-  */
- #if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || \
--    defined(OsfArchitecture) || \
-+    defined(OsfArchitecture) || defined(NetBSDArchitecture) || \
-     (defined(SunArchitecture) && OSMajorVersion == 4)
+--- cda_d/Imakefile.orig	Sat Feb  5 01:26:38 2000
++++ cda_d/Imakefile	Sun Feb 13 08:20:52 2000
+@@ -50,7 +50,7 @@
  DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
  #else
--#if defined(NetBSDArchitecture) || defined(__bsdi__)
-+#if defined(__bsdi__)
- DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS
+ #if defined(NetBSDArchitecture)
+-DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS
++DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
  #else
- #if defined(sony_news)
-@@ -62,8 +62,8 @@
- #endif	/* XmacIIServer */
- #endif	/* BSD */
- #endif	/* sony_news */
--#endif	/* NetBSDArchitecture __bsdi__ */
--#endif	/* FreeBSD OpenBSD OsfArchitecture SunArchitecture */
-+#endif	/* __bsdi__ */
-+#endif	/* FreeBSD OpenBSD OsfArchitecture NetBSD SunArchitecture */
- 
- 
- /*
-@@ -79,7 +79,7 @@
+ #if defined(__bsdi__)
+ .if exists(/usr/include/ncurses.h)
+@@ -90,7 +90,7 @@
  #endif	/* LinuxArchitecture */
  #endif	/* SunArchitecture */
  
@@ -36,28 +20,12 @@ $NetBSD: patch-ab,v 1.4 1998/11/12 15:48:34 agc Exp $
  
  
  /*
-@@ -97,7 +97,10 @@
- LOCAL_LIBRARIES+= -lcam
+@@ -109,7 +109,7 @@
  .endif
  #else
--#if defined(NetBSDArchitecture) || defined(__bsdi__)
-+#if defined(NetBSDArchitecture)
+ #if defined(NetBSDArchitecture)
+-LOCAL_LIBRARIES=
 +LOCAL_LIBRARIES=-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lncurses
-+#else
-+#if defined(__bsdi__)
- LOCAL_LIBRARIES=
  #else
- #if defined(OpenBSDArchitecture)
-@@ -117,9 +120,10 @@
- #endif	/* SINIX */
- #endif	/* ultrix */
- #endif	/* OpenBSDArchitecture */
--#endif	/* NetBSDArchitecture __bsdi__ */
-+#endif	/* __bsdi__ */
-+#endif	/* NetBSDArchitecture */
- #endif	/* FreeBSDArchitecture */
--#endif	/* LinuxArchitecture OpenBSDArchitecture */
-+#endif	/* LinuxArchitecture */
- #endif	/* SunArchitecture */
- 
- 
+ #if defined(__bsdi__)
+ .if exists(/usr/include/ncurses.h)
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index f12bfb5f52f..1531d213657 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,11 +1,20 @@
-$NetBSD: patch-ad,v 1.4 1999/06/28 07:49:06 tron Exp $
+$NetBSD: patch-ad,v 1.5 2000/02/13 19:17:24 fredb Exp $
 
---- install.sh.orig	Sat Apr 24 03:40:51 1999
-+++ install.sh	Sat Jun 26 01:34:32 1999
-@@ -401,7 +401,7 @@
+--- install.sh.orig	Sat Feb  5 01:26:20 2000
++++ install.sh	Sun Feb 13 08:29:05 2000
+@@ -60,7 +60,7 @@
+ XBINGROUP=bin
+ ERRFILE=/tmp/xmcd.err
+ TMPFILE=/tmp/xmcdinst.$$
+-STARTUP_SCRIPT=.xmcd_start
++STARTUP_SCRIPT=xmcd_start
+ 
+ #
+ # Utility functions
+@@ -416,7 +416,7 @@
  #
  OS_SYS=`(uname -s) 2>/dev/null`
- OS_VER=`(uname -r) 2>/dev/null`
+ OS_REL=`(uname -r) 2>/dev/null`
 -OS_MACH=`(uname -m) 2>/dev/null`
 +OS_MACH=$MACHINE_ARCH
  
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index 244666ae965..bcce455ce4f 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 1999/06/28 07:49:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/02/13 19:17:24 fredb Exp $
 bin/cda
 bin/cddbcmd
 bin/dp2xmcd
 bin/wm2xmcd
+bin/xmcd_start
 bin/xmcd
+lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/app-defaults/XMcd
 lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cda
 lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cddbcmd
@@ -22,6 +24,7 @@ lib/X11/xmcd/config/.tbl/Goldstar
 lib/X11/xmcd/config/.tbl/HP
 lib/X11/xmcd/config/.tbl/Hitachi
 lib/X11/xmcd/config/.tbl/IBM
+lib/X11/xmcd/config/.tbl/Kenwood
 lib/X11/xmcd/config/.tbl/Longshin
 lib/X11/xmcd/config/.tbl/MDI
 lib/X11/xmcd/config/.tbl/MediaVis