2.4

6 files changed, 200 insertions, 355 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 2afbe9c8ae4..ae03769392d 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,26 +1,32 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:16:40 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1998/11/05 06:26:08 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp 
 #
 
-DISTNAME=	xmcd-2.3
+DISTNAME=	xmcd-2.4
 CATEGORIES=	audio
 MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd/src/
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://sunsite.unc.edu/~cddb/xmcd/index.html
 
+DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+
+CONFLICTS=	xmcd-2.3
+
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
 
 post-install:
-	@strip ${PREFIX}/bin/xmcd
 	@strip ${PREFIX}/bin/cda
 	@strip ${PREFIX}/bin/cddbcmd
 	@strip ${PREFIX}/bin/wm2xmcd
-	${MV} ${PREFIX}/man/cat1/xmcd.1 ${PREFIX}/man/man1/xmcd.1
+	@strip ${PREFIX}/bin/xmcd
 	${MV} ${PREFIX}/man/cat1/cda.1 ${PREFIX}/man/man1/cda.1
 	${MV} ${PREFIX}/man/cat1/cddbcmd.1 ${PREFIX}/man/man1/cddbcmd.1
+	${MV} ${PREFIX}/man/cat1/dp2xmcd.1 ${PREFIX}/man/man1/dp2xmcd.1
 	${MV} ${PREFIX}/man/cat1/wm2xmcd.1 ${PREFIX}/man/man1/wm2xmcd.1
+	${MV} ${PREFIX}/man/cat1/xmcd.1 ${PREFIX}/man/man1/xmcd.1
+	${PREFIX}/lib/X11/xmcd/config/config.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/files/md5 b/audio/xmcd/files/md5
index daf78ee5aea..f84b136b182 100644
--- a/audio/xmcd/files/md5
+++ b/audio/xmcd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:16:57 agc Exp $
+$NetBSD: md5,v 1.5 1998/11/05 06:26:08 mycroft Exp $
 
-MD5 (xmcd-2.3.tar.gz) = cd36c43c388f001767495e7edf88182f
+MD5 (xmcd-2.4.tar.gz) = 34de843d84620b0e0e593faf0fc0fc2f
diff --git a/audio/xmcd/patches/patch-aa b/audio/xmcd/patches/patch-aa
index 222e592a182..286da0ca9dc 100644
--- a/audio/xmcd/patches/patch-aa
+++ b/audio/xmcd/patches/patch-aa
@@ -1,77 +1,11 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:20 agc Exp $
-
-*** ./xmcd_d/Imakefile.orig	Thu Apr  4 21:42:31 1996
---- ./xmcd_d/Imakefile	Thu Apr  4 23:31:17 1996
-***************
-*** 43,49 ****
-   * #include "Motif.tmpl"
-   * #include "Motif.rules"
-   */
-! LOCAL_LIBRARIES= XmClientLibs
-  
-  
-  /**** Optional defines:  Change as you see fit. *****************************
---- 43,49 ----
-   * #include "Motif.tmpl"
-   * #include "Motif.rules"
-   */
-! LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-  
-  
-  /**** Optional defines:  Change as you see fit. *****************************
-***************
-*** 67,78 ****
-  DEFINES=
-  #endif
-  
-  
-  /*
-   * Add local include path
-   */
-  INCLUDES=-I..
-- 
-  
-  /*
-   * C Source files
---- 67,78 ----
-  DEFINES=
-  #endif
-  
-+ MANSUFFIX = 1
-  
-  /*
-   * Add local include path
-   */
-  INCLUDES=-I..
-  
-  /*
-   * C Source files
-*** cda_d/Imakefile.orig	Tue Aug 12 19:13:31 1997
---- cda_d/Imakefile	Sun Sep  7 15:34:34 1997
-***************
-*** 95,101 ****
-  #if defined(__QNX__)
-  LOCAL_LIBRARIES=-lncurses
-  #else
-! LOCAL_LIBRARIES=-lcurses
-  #endif	/* __QNX__ */
-  #endif	/* SINIX */
-  #endif	/* ultrix */
---- 95,101 ----
-  #if defined(__QNX__)
-  LOCAL_LIBRARIES=-lncurses
-  #else
-! LOCAL_LIBRARIES=-lcurses -lmytinfo
-  #endif	/* __QNX__ */
-  #endif	/* SINIX */
-  #endif	/* ultrix */
-***************
-*** 104,109 ****
---- 104,110 ----
-  #endif	/* LinuxArchitecture */
-  #endif	/* SunArchitecture */
-  
-+ MANSUFFIX = 1
-  
-  /*
-   * C Source files
+--- xmcd_d/Imakefile.orig	Wed Oct 28 03:03:18 1998
++++ xmcd_d/Imakefile	Wed Nov  4 22:07:57 1998
+@@ -43,7 +43,7 @@
+  * #include "Motif.tmpl"
+  * #include "Motif.rules"
+  */
+-LOCAL_LIBRARIES= XmClientLibs
++LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
+ 
+ #if defined(FreeBSDArchitecture)
+ .if exists(/usr/include/camlib.h)
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index 026fa1b0a78..1fbdb71b3b5 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,140 +1,61 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:21 agc Exp $
-
-*** install.sh.orig	Tue Aug 12 19:12:27 1997
---- install.sh	Sun Sep  7 16:23:43 1997
-***************
-*** 48,53 ****
---- 48,56 ----
-  ERRFILE=/tmp/xmcd.err
-  TMPFILE=/tmp/xmcdinst.$$
-  
-+ # Flag for indicating we do not want to prompt the user if possible.
-+ NO_PROMPT=1
-+ 
-  #
-  # Utility functions
-  #
-***************
-*** 586,592 ****
-  
-  while :
-  do
-! 	if getstr "\nEnter X binary directory\n[${BINDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
---- 589,599 ----
-  
-  while :
-  do
-! 	if [ -n "$NO_PROMPT" ]
-! 	then
-! 		$ECHO "X binary directory - using ${BINDIR}"
-! 		break
-! 	elif getstr "\nEnter X binary directory\n[${BINDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
-***************
-*** 634,640 ****
-  
-  while :
-  do
-! 	if getstr "\nEnter X library directory\n[${LIBDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
---- 641,651 ----
-  
-  while :
-  do
-! 	if [ -n "$NO_PROMPT" ]
-! 	then
-! 		$ECHO "X library directory - using ${LIBDIR}"
-! 		break
-! 	elif getstr "\nEnter X library directory\n[${LIBDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
-***************
-*** 657,663 ****
-  APPDEFAULTSDIR=$LIBDIR/app-defaults
-  while :
-  do
-! 	if getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
---- 668,678 ----
-  APPDEFAULTSDIR=$LIBDIR/app-defaults
-  while :
-  do
-! 	if [ -n "$NO_PROMPT" ]
-! 	then
-! 		$ECHO "X app-defaults directory - using ${LIBDIR}"
-! 		break
-! 	elif getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
-***************
-*** 680,686 ****
-  XMCDLIB=$LIBDIR/xmcd
-  while :
-  do
-! 	if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
---- 695,705 ----
-  XMCDLIB=$LIBDIR/xmcd
-  while :
-  do
-! 	if [ -n "$NO_PROMPT" ]
-! 	then
-! 		$ECHO "xmcd library directory - using ${XMCDLIB}"
-! 		break
-! 	elif getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
-  	then
-  		if [ -d "$ANS" ]
-  		then
-***************
-*** 733,739 ****
-  $ECHO "\n\nThe on-line manual directory is where the man pages in"
-  $ECHO "in the xmcd package will be installed."
-  
-! if getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
-  then
-  	MANDIR=$ANS
-  fi
---- 752,761 ----
-  $ECHO "\n\nThe on-line manual directory is where the man pages in"
-  $ECHO "in the xmcd package will be installed."
-  
-! if [ -n "$NO_PROMPT" ]
-! then
-! 	$ECHO "xmcd on-line manual directory - using ${MANDIR}"
-! elif getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
-  then
-  	MANDIR=$ANS
-  fi
-***************
-*** 758,764 ****
-  		MANSUFFIX=1
-  	fi
-  
-! 	if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
-  	then
-  		MANSUFFIX=$ANS
-  	fi
---- 780,789 ----
-  		MANSUFFIX=1
-  	fi
-  
-! 	if [ -n "$NO_PROMPT" ]
-! 	then
-! 		$ECHO "xmcd on-line manual file name suffix - using ${MANSUFFIX}"
-! 	elif getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
-  	then
-  		MANSUFFIX=$ANS
-  	fi
+--- 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)
+ DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
+ #else
+-#if defined(NetBSDArchitecture) || defined(__bsdi__)
++#if defined(__bsdi__)
+ DEFINES= -DBSDCOMPAT -DNOVISUAL -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 @@
+ #endif	/* LinuxArchitecture */
+ #endif	/* SunArchitecture */
+ 
+-INCLUDES=-I..
++INCLUDES=-I.. -I${LOCALBASE}/include
+ 
+ 
+ /*
+@@ -97,7 +97,10 @@
+ LOCAL_LIBRARIES+= -lcam
+ .endif
+ #else
+-#if defined(NetBSDArchitecture) || defined(__bsdi__)
++#if defined(NetBSDArchitecture)
++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 */
+ 
+ 
diff --git a/audio/xmcd/patches/patch-ac b/audio/xmcd/patches/patch-ac
index 1f2ecb5efb4..32c3142e097 100644
--- a/audio/xmcd/patches/patch-ac
+++ b/audio/xmcd/patches/patch-ac
@@ -1,29 +1,10 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:21 agc Exp $
-
---- util_d/Imakefile.orig	Sat May 23 08:31:58 1998
-+++ util_d/Imakefile	Tue Jun  2 23:19:11 1998
-@@ -34,8 +34,12 @@
- /*
-  * Source files
-  */
--SRCS=	cddbcmd.c wm2xmcd.c
+--- Imakefile.orig	Wed Oct 28 03:03:10 1998
++++ Imakefile	Wed Nov  4 22:09:38 1998
+@@ -66,6 +66,6 @@
  
-+SRCS1=	cddbcmd.c
-+OBJS1=	cddbcmd.o
-+
-+SRCS2=	wm2xmcd.c
-+OBJS2=	wm2xmcd.o
+ install::
+ 	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
+-		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
++		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
  
- /*
-  * No X11 libraries needed for utilities in this directory
-@@ -47,8 +51,8 @@
-  * Build rule
-  */
- AllTarget(cddbcmd wm2xmcd)
--NormalProgramTarget(cddbcmd,cddbcmd.o,,,)
--NormalProgramTarget(wm2xmcd,wm2xmcd.o,,,)
-+ComplexProgramTarget_1(cddbcmd,,)
-+ComplexProgramTarget_2(wm2xmcd,,)
- DependTarget()
- LintTarget()
  
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index 6380fe976d4..b2980606ace 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,173 +1,175 @@
-@comment $NetBSD: PLIST,v 1.7 1998/06/02 21:50:06 tron Exp $
-bin/xmcd
+@comment $NetBSD: PLIST,v 1.8 1998/11/05 06:26:08 mycroft Exp $
 bin/cda
 bin/cddbcmd
+bin/dp2xmcd
 bin/wm2xmcd
+bin/xmcd
 lib/X11/app-defaults/XMcd
-lib/X11/xmcd/help/DpWeb.btn
-lib/X11/xmcd/help/DtDir.btn
-lib/X11/xmcd/help/HpAbout.btn
-lib/X11/xmcd/help/HpCancel.btn
-lib/X11/xmcd/help/Mode.btn
-lib/X11/xmcd/help/Quit.btn
-lib/X11/xmcd/help/WwCancel.btn
-lib/X11/xmcd/help/WwGo.btn
-lib/X11/xmcd/help/DpTotTim.lbl
-lib/X11/xmcd/help/HpText.txw
-lib/X11/xmcd/help/WwSelect.rbx
-lib/X11/xmcd/help/HpTopic.opt
-lib/X11/xmcd/help/WwSearch.opt
+lib/X11/xmcd/config/.tbl/Acer
+lib/X11/xmcd/config/.tbl/Apple
+lib/X11/xmcd/config/.tbl/Aztech
+lib/X11/xmcd/config/.tbl/Chinon
+lib/X11/xmcd/config/.tbl/Compaq
+lib/X11/xmcd/config/.tbl/Compro
+lib/X11/xmcd/config/.tbl/Creative
+lib/X11/xmcd/config/.tbl/DEC
+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/Longshin
+lib/X11/xmcd/config/.tbl/MDI
+lib/X11/xmcd/config/.tbl/MediaVis
+lib/X11/xmcd/config/.tbl/Mitsumi
+lib/X11/xmcd/config/.tbl/NEC
+lib/X11/xmcd/config/.tbl/Nakamich
+lib/X11/xmcd/config/.tbl/Okano
+lib/X11/xmcd/config/.tbl/Opticsto
+lib/X11/xmcd/config/.tbl/Orchid
+lib/X11/xmcd/config/.tbl/Panasoni
+lib/X11/xmcd/config/.tbl/Philips
+lib/X11/xmcd/config/.tbl/Pioneer
+lib/X11/xmcd/config/.tbl/Plextor
+lib/X11/xmcd/config/.tbl/Procom
+lib/X11/xmcd/config/.tbl/Regal
+lib/X11/xmcd/config/.tbl/SGI
+lib/X11/xmcd/config/.tbl/Samsung
+lib/X11/xmcd/config/.tbl/Sanyo
+lib/X11/xmcd/config/.tbl/Sony
+lib/X11/xmcd/config/.tbl/Stratus
+lib/X11/xmcd/config/.tbl/Sun
+lib/X11/xmcd/config/.tbl/Tatung
+lib/X11/xmcd/config/.tbl/Teac
+lib/X11/xmcd/config/.tbl/Toshiba
+lib/X11/xmcd/config/.tbl/Yamaha
+lib/X11/xmcd/config/common.cfg
+lib/X11/xmcd/config/config.sh
+lib/X11/xmcd/config/device.cfg
+lib/X11/xmcd/config/sites
+@comment remove the CD drive configuration file(s). Its name is unknown.
+@unexec rm -f %D/lib/X11/xmcd/config/*
+lib/X11/xmcd/docs/ACKS
+lib/X11/xmcd/docs/CDDB
+lib/X11/xmcd/docs/CHANGES
+lib/X11/xmcd/docs/COPYING
+lib/X11/xmcd/docs/COPYING.LIB
+lib/X11/xmcd/docs/DRIVES
+lib/X11/xmcd/docs/FAQ
+lib/X11/xmcd/docs/FEATURES
+lib/X11/xmcd/docs/INSTALL
+lib/X11/xmcd/docs/INSTALL.VMS
+lib/X11/xmcd/docs/PLATFORM
+lib/X11/xmcd/docs/PORTING
+lib/X11/xmcd/docs/README
+lib/X11/xmcd/docs/RELNOTES
+lib/X11/xmcd/docs/WEB
 lib/X11/xmcd/help/Ab.btn
+lib/X11/xmcd/help/DbMode.lbl
 lib/X11/xmcd/help/DbProg.btn
 lib/X11/xmcd/help/DdCancel.btn
 lib/X11/xmcd/help/DdClr.btn
+lib/X11/xmcd/help/DdDisc.txw
 lib/X11/xmcd/help/DdOk.btn
+lib/X11/xmcd/help/Disc.lbl
+lib/X11/xmcd/help/DiscId.lbl
+lib/X11/xmcd/help/DiscTitl.lbl
 lib/X11/xmcd/help/DpAddPgm.btn
 lib/X11/xmcd/help/DpCancel.btn
 lib/X11/xmcd/help/DpClrPgm.btn
 lib/X11/xmcd/help/DpDExt.btn
+lib/X11/xmcd/help/DpDTitle.txw
 lib/X11/xmcd/help/DpLink.btn
 lib/X11/xmcd/help/DpLoad.btn
+lib/X11/xmcd/help/DpPgmSeq.txw
+lib/X11/xmcd/help/DpRmDsbl.btn
 lib/X11/xmcd/help/DpSave.btn
 lib/X11/xmcd/help/DpSend.btn
 lib/X11/xmcd/help/DpTExt.btn
+lib/X11/xmcd/help/DpTTitle.txw
 lib/X11/xmcd/help/DpTimSel.btn
+lib/X11/xmcd/help/DpTotTim.lbl
+lib/X11/xmcd/help/DpTrk.lsw
+lib/X11/xmcd/help/DpWeb.btn
 lib/X11/xmcd/help/DsCancel.btn
+lib/X11/xmcd/help/DsDir.lsw
 lib/X11/xmcd/help/DsOk.btn
+lib/X11/xmcd/help/DtAutoTr.btn
 lib/X11/xmcd/help/DtCancel.btn
 lib/X11/xmcd/help/DtClr.btn
+lib/X11/xmcd/help/DtDir.btn
 lib/X11/xmcd/help/DtOk.btn
+lib/X11/xmcd/help/DtTrack.txw
 lib/X11/xmcd/help/Eject.btn
 lib/X11/xmcd/help/Ff.btn
 lib/X11/xmcd/help/Help.btn
+lib/X11/xmcd/help/HpAbout.btn
+lib/X11/xmcd/help/HpCancel.btn
+lib/X11/xmcd/help/HpText.txw
+lib/X11/xmcd/help/HpTopic.opt
+lib/X11/xmcd/help/Index.lbl
 lib/X11/xmcd/help/Keypad.btn
+lib/X11/xmcd/help/Keypad.lbl
 lib/X11/xmcd/help/KpCancel.btn
 lib/X11/xmcd/help/KpClear.btn
 lib/X11/xmcd/help/KpEnter.btn
 lib/X11/xmcd/help/KpNum.btn
 lib/X11/xmcd/help/KpSel.btn
+lib/X11/xmcd/help/KpWarp.scl
+lib/X11/xmcd/help/Level.scl
 lib/X11/xmcd/help/LsCancel.btn
+lib/X11/xmcd/help/LsLink.lsw
 lib/X11/xmcd/help/LsOk.btn
+lib/X11/xmcd/help/Main.cbx
+lib/X11/xmcd/help/Mode.btn
 lib/X11/xmcd/help/NextDisc.btn
 lib/X11/xmcd/help/NextIdx.btn
 lib/X11/xmcd/help/NextTrk.btn
+lib/X11/xmcd/help/OpBal.scl
 lib/X11/xmcd/help/OpBalCtr.btn
+lib/X11/xmcd/help/OpChRt.rbx
+lib/X11/xmcd/help/OpChgr.cbx
+lib/X11/xmcd/help/OpDone.cbx
+lib/X11/xmcd/help/OpEject.cbx
+lib/X11/xmcd/help/OpExit.rbx
+lib/X11/xmcd/help/OpLoad.cbx
+lib/X11/xmcd/help/OpLoad.rbx
 lib/X11/xmcd/help/OpOk.btn
 lib/X11/xmcd/help/OpReset.btn
 lib/X11/xmcd/help/OpSave.btn
+lib/X11/xmcd/help/OpVolTpr.rbx
 lib/X11/xmcd/help/Options.btn
+lib/X11/xmcd/help/PlayMode.lbl
 lib/X11/xmcd/help/PlayPaus.btn
 lib/X11/xmcd/help/PrevDisc.btn
 lib/X11/xmcd/help/PrevIdx.btn
 lib/X11/xmcd/help/PrevTrk.btn
+lib/X11/xmcd/help/ProgMode.lbl
+lib/X11/xmcd/help/Quit.btn
 lib/X11/xmcd/help/Rew.btn
+lib/X11/xmcd/help/RptCnt.lbl
 lib/X11/xmcd/help/Sample.btn
 lib/X11/xmcd/help/Stop.btn
 lib/X11/xmcd/help/Time.btn
-lib/X11/xmcd/help/DbMode.lbl
-lib/X11/xmcd/help/Disc.lbl
-lib/X11/xmcd/help/DiscId.lbl
-lib/X11/xmcd/help/DiscTitl.lbl
-lib/X11/xmcd/help/Index.lbl
-lib/X11/xmcd/help/Keypad.lbl
-lib/X11/xmcd/help/PlayMode.lbl
-lib/X11/xmcd/help/ProgMode.lbl
-lib/X11/xmcd/help/RptCnt.lbl
 lib/X11/xmcd/help/Time.lbl
 lib/X11/xmcd/help/TimeMode.lbl
 lib/X11/xmcd/help/Track.lbl
 lib/X11/xmcd/help/TrkTitle.lbl
-lib/X11/xmcd/help/DdDisc.txw
-lib/X11/xmcd/help/DpDTitle.txw
-lib/X11/xmcd/help/DpPgmSeq.txw
-lib/X11/xmcd/help/DpTTitle.txw
-lib/X11/xmcd/help/DtTrack.txw
-lib/X11/xmcd/help/KpWarp.scl
-lib/X11/xmcd/help/Level.scl
-lib/X11/xmcd/help/OpBal.scl
-lib/X11/xmcd/help/DpTrk.lsw
-lib/X11/xmcd/help/DsDir.lsw
-lib/X11/xmcd/help/LsLink.lsw
-lib/X11/xmcd/help/OpChRt.rbx
-lib/X11/xmcd/help/OpExit.rbx
-lib/X11/xmcd/help/OpLoad.rbx
-lib/X11/xmcd/help/OpVolTpr.rbx
-lib/X11/xmcd/help/Main.cbx
-lib/X11/xmcd/help/OpChgr.cbx
-lib/X11/xmcd/help/OpDone.cbx
-lib/X11/xmcd/help/OpEject.cbx
-lib/X11/xmcd/help/OpLoad.cbx
-lib/X11/xmcd/cddb/misc/4102560a
+lib/X11/xmcd/help/WwCancel.btn
+lib/X11/xmcd/help/WwGo.btn
+lib/X11/xmcd/help/WwSearch.opt
+lib/X11/xmcd/help/WwSelect.rbx
 lib/X11/xmcd/pixmaps/xmcd.icon
+lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
-lib/X11/xmcd/pixmaps/xmcd.xpm
-lib/X11/xmcd/docs/ACKS
-lib/X11/xmcd/docs/CDDB
-lib/X11/xmcd/docs/CHANGES
-lib/X11/xmcd/docs/COPYING
-lib/X11/xmcd/docs/COPYING.LIB
-lib/X11/xmcd/docs/DRIVES
-lib/X11/xmcd/docs/FAQ
-lib/X11/xmcd/docs/FEATURES
-lib/X11/xmcd/docs/INSTALL
-lib/X11/xmcd/docs/INSTALL.VMS
-lib/X11/xmcd/docs/PLATFORM
-lib/X11/xmcd/docs/PORTING
-lib/X11/xmcd/docs/README
-lib/X11/xmcd/docs/RELNOTES
-lib/X11/xmcd/docs/WEB
-lib/X11/xmcd/config/common.cfg
-lib/X11/xmcd/config/device.cfg
-lib/X11/xmcd/config/.tbl/Acer
-lib/X11/xmcd/config/.tbl/Apple
-lib/X11/xmcd/config/.tbl/Aztech
-lib/X11/xmcd/config/.tbl/Chinon
-lib/X11/xmcd/config/.tbl/Compaq
-lib/X11/xmcd/config/.tbl/Compro
-lib/X11/xmcd/config/.tbl/Creative
-lib/X11/xmcd/config/.tbl/DEC
-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/Longshin
-lib/X11/xmcd/config/.tbl/MDI
-lib/X11/xmcd/config/.tbl/MediaVis
-lib/X11/xmcd/config/.tbl/Mitsumi
-lib/X11/xmcd/config/.tbl/NEC
-lib/X11/xmcd/config/.tbl/Nakamich
-lib/X11/xmcd/config/.tbl/Okano
-lib/X11/xmcd/config/.tbl/Opticsto
-lib/X11/xmcd/config/.tbl/Orchid
-lib/X11/xmcd/config/.tbl/Panasoni
-lib/X11/xmcd/config/.tbl/Philips
-lib/X11/xmcd/config/.tbl/Pioneer
-lib/X11/xmcd/config/.tbl/Plextor
-lib/X11/xmcd/config/.tbl/Procom
-lib/X11/xmcd/config/.tbl/SGI
-lib/X11/xmcd/config/.tbl/Sanyo
-lib/X11/xmcd/config/.tbl/Sony
-lib/X11/xmcd/config/.tbl/Stratus
-lib/X11/xmcd/config/.tbl/Sun
-lib/X11/xmcd/config/.tbl/Tatung
-lib/X11/xmcd/config/.tbl/Teac
-lib/X11/xmcd/config/.tbl/Toshiba
-lib/X11/xmcd/config/.tbl/Yamaha
-lib/X11/xmcd/config/config.sh
 lib/X11/xmcd/scripts/ncsarmt
 lib/X11/xmcd/scripts/ncsawrap
 lib/X11/xmcd/scripts/nswrap
-@comment remove the CD drive configuration file(s). Its name is unknown.
-@unexec rm -f %D/lib/X11/xmcd/config/*
-man/cat1/xmcd.0
-man/cat1/cda.0
-man/cat1/cddbcmd.0
-man/cat1/wm2xmcd.0
-man/man1/xmcd.1
 man/man1/cda.1
 man/man1/cddbcmd.1
+man/man1/dp2xmcd.1
 man/man1/wm2xmcd.1
+man/man1/xmcd.1
 @exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/soundtrack
 @exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/rock
 @exec /bin/mkdir -p %D/lib/X11/xmcd/cddb/reggae
@@ -187,3 +189,4 @@ man/man1/wm2xmcd.1
 @comment in case users requested using internet cddb server
 @unexec rm -fr %D/lib/X11/xmcd/cddb
 @dirrm lib/X11/xmcd
+@exec %D/lib/X11/xmcd/config/config.sh