Update xmcd to version 3.0.1. Addresses PR 13519 by Kevin Sindhu.

Ver 3.0 patchlevel 1 released Sat Jul 14 19:58:39 PDT 2001
----------------------------------------------------------
CD-ROM drive support changes:

    - Added a new "scsiVersionCheck" parameter to the device.cfg file.
      This is to make the CD-ROM drive SCSI-2 version checking in xmcd
      and cda configurable.

OS Support changes:

    - Re-introduced support for the OpenVMS operating system on Alpha AXP
      and VAX platforms.

    - Added code to support for IDE/ATAPI drives on the OpenVMS platform.
      Since OpenVMS supports these drives via SCSI-emulation, xmcd should
      be configured for a SCSI device.

Other changes:

    - Replaced the "CDDB disable" button in xmcd with the "Internet Offline"
      button.  The new "offline" mode differs from the old "disable" mode
      in that CDDB lookups will still occur from the local cache (no Internet
      CDDB server will be accessed).  Also, xmcd's wwwWarp menu entries
      which would invoke a remote web site will be disabled.  This should
      be used when the system is not connected to the Internet (e.g., on
      a dialup connection while not online).  Similarly, the -cddb and
      -nocddb command line options in cda have been changed to -online and
      -offline with the same change in semantics.  The disableCddb parameter
      in common.cfg has also been changed to internetOffline.

    - Fixed a bug that was causing submissions to the CDDB² service to
      fail even though the data is acceptable and the network/servers are
      running fine.

    - Fixed an xmcd problem where the keypad time display and track warp
      slider would freeze when the playback mode is not in segment play
      mode but the main window time display is set to "e-seg" or "r-seg".

    - Fixed a problem with using the xmcd keypad to go to another track or
      disc while playing program or shuffle modes.

    - Removed some conditions that could cause SIGALRMs to be received
      while xmcd is handling X events.  Also, fixed certain situations
      where spawned child processes were handling X events instead of the
      parent.  This was causing sporadic X errors and xmcd crashes.

    - Fixed a bug that caused classic CDDB lookup to fail if HTTP proxy
      authorization is enabled.

    - Changed xmcd to keep the Credit Fullname Wizard window open if a user
      clicks the Credit 'Add', 'Modify' or 'Delete' buttons, or
      select/de-select credit list items.  Also, enhance the data fields
      verification for the full name wizard window.

    - Enhanced xmcd and cda to handle erroneous CDDB data more gracefully,
      where a subgenre is set to the value that of a genre, or where a
      subrole is set to the value of a role category.

    - Fixed a missing single quote in libdi_d/config.sh that was causing
      the script to fail while configuring proxy servers.  Also, fixed
      a problem with reading the device configuration files where the
      wrong device parameters would get used.

    - The install.sh and config.sh scripts will now use nawk if it's
      available on the system.  Otherwise it falls back to using awk.

9 files changed, 274 insertions, 209 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 26ed07bfcac..409c45dffbe 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.25 2001/07/02 21:10:37 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/07/24 16:00:01 nra Exp $
 #
 
-DISTNAME=	xmcd-2.6
+DISTNAME=	xmcd-3.0.1
 CATEGORIES=	audio
-MASTER_SITES=	http://metalab.unc.edu/tkan/download/xmcd/src/
+MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://metalab.unc.edu/tkan/xmcd/
+HOMEPAGE=	http://www.ibiblio.org/tkan/xmcd/
 COMMENT=	Motif CD player
 
+WRKSRC=		${WRKDIR}/xmcd-3.0
 USE_BUILDLINK_ONLY=	yes
 USE_NCURSES=		yes
 USE_IMAKE=		yes
 IS_INTERACTIVE=		yes	# asks a lot of questions
-MAKE_ENV+=		SHELL=/bin/sh
+MAKE_ENV+=		SHELL=${SH}
 
 pre-install:
 	cd ${WRKSRC} && \
@@ -23,16 +24,15 @@ pre-install:
 	done
 
 post-install:
-.for FILE in cda cddbcmd wm2xmcd xmcd
+.for FILE in cda xmcd gobrowser
 	@${TEST} -n "${STRIPFLAG}" && \
 	strip ${PREFIX}/lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/${FILE}
 .endfor
 	${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
+.if ! defined(BATCH)
 	${PREFIX}/lib/X11/xmcd/config/config.sh
+.endif
 
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 4ceb65ad549..f8e32c276e0 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/07/02 21:10:37 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/07/24 16:00:01 nra Exp $
 
-SHA1 (xmcd-2.6.tar.gz) = 486e48381d1f24a173815a9283d89e40fe73c90e
-Size (xmcd-2.6.tar.gz) = 553934 bytes
-SHA1 (patch-aa) = 868ecceae5e48a320161c21bbf4db4301fd9467e
-SHA1 (patch-ab) = 3567259b92085480c0c5ea46d3aee57c7982e65b
-SHA1 (patch-ac) = b0748c7be1a1f9d8f40c970b3a00414ffcc9f0b4
-SHA1 (patch-ad) = d748cce51bf0efc6cf7290dd020ab05f4a76ea96
-SHA1 (patch-ae) = 215f60cff3a2f42e8f7106799780d02c946bd952
-SHA1 (patch-af) = 9dae4544584a6af075675ad7cee347eb8fe4eb42
+SHA1 (xmcd-3.0.1.tar.gz) = 936363e5cd984666cba3494b2aa3d3cc845c58ac
+Size (xmcd-3.0.1.tar.gz) = 689345 bytes
+SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
+SHA1 (patch-ab) = 5cb710c688caf4db56f0d04f366bedcc94dcde5d
+SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
+SHA1 (patch-ad) = b62086c7f1801cf500cb8bc93e262e97f015b540
+SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
+SHA1 (patch-af) = 276e4f5ad9041f977be602165334efd0a5895571
diff --git a/audio/xmcd/patches/patch-aa b/audio/xmcd/patches/patch-aa
index 9d343f444be..0b867c6dd36 100644
--- a/audio/xmcd/patches/patch-aa
+++ b/audio/xmcd/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 1998/11/12 15:48:34 agc Exp $
+$NetBSD: patch-aa,v 1.6 2001/07/24 16:00:02 nra Exp $
 
---- 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"
-  */
+--- xmcd_d/Imakefile.orig	Mon Jul 23 14:32:31 2001
++++ xmcd_d/Imakefile	Mon Jul 23 14:33:21 2001
+@@ -54,7 +54,7 @@
+ SYS_LIBRARIES= $(LIBCDDB)
+ #endif
+ 
 -LOCAL_LIBRARIES= XmClientLibs
 +LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
  
diff --git a/audio/xmcd/patches/patch-ab b/audio/xmcd/patches/patch-ab
index 6df8bcb1116..254f9eb0453 100644
--- a/audio/xmcd/patches/patch-ab
+++ b/audio/xmcd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2001/07/02 21:10:39 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2001/07/24 16:00:02 nra Exp $
 
---- cda_d/Imakefile.orig	Sat Feb  5 01:26:38 2000
-+++ cda_d/Imakefile	Sun Feb 13 08:20:52 2000
+--- 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 @@
  DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
  #else
@@ -11,12 +11,18 @@ $NetBSD: patch-ab,v 1.7 2001/07/02 21:10:39 jlam Exp $
  #else
  #if defined(__bsdi__)
  .if exists(/usr/include/ncurses.h)
-@@ -109,7 +109,7 @@
+@@ -120,11 +120,12 @@
  .endif
  #else
  #if defined(NetBSDArchitecture)
 -LOCAL_LIBRARIES=
-+LOCAL_LIBRARIES=-lncurses
++LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
++LOCAL_LIBRARIES+=-lncurses
  #else
  #if defined(__bsdi__)
  .if exists(/usr/include/ncurses.h)
+-LOCAL_LIBRARIES=-lncurses
++LOCAL_LIBRARIES=-I/usr/pkg/include -L/usr/pkg/lib -lncurses
+ .else
+ LOCAL_LIBRARIES=
+ .endif
diff --git a/audio/xmcd/patches/patch-ac b/audio/xmcd/patches/patch-ac
index a933ddefb29..0e5e351e5ac 100644
--- a/audio/xmcd/patches/patch-ac
+++ b/audio/xmcd/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 1998/11/12 15:48:34 agc Exp $
+$NetBSD: patch-ac,v 1.5 2001/07/24 16:00:02 nra Exp $
 
---- Imakefile.orig	Wed Oct 28 03:03:10 1998
-+++ Imakefile	Wed Nov  4 22:09:38 1998
-@@ -66,6 +66,6 @@
+--- Imakefile.orig	Mon Jul 23 13:38:08 2001
++++ Imakefile	Mon Jul 23 13:38:32 2001
+@@ -74,6 +74,6 @@
  
  install::
  	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index 23fbc8913e9..5987d54dea6 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2000/09/09 17:33:13 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2001/07/24 16:00:02 nra Exp $
 
---- install.sh.orig	Sat Feb  5 01:26:20 2000
-+++ install.sh	Sun Feb 13 08:29:05 2000
-@@ -60,7 +60,7 @@
+--- install.sh.orig	Mon Jul 16 12:51:58 2001
++++ install.sh	Mon Jul 23 14:35:29 2001
+@@ -57,7 +57,7 @@
  XBINGROUP=bin
  ERRFILE=/tmp/xmcd.err
  TMPFILE=/tmp/xmcdinst.$$
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.6 2000/09/09 17:33:13 wiz Exp $
  
  #
  # Utility functions
-@@ -416,7 +416,7 @@
+@@ -493,7 +493,7 @@
  #
  OS_SYS=`(uname -s) 2>/dev/null`
  OS_REL=`(uname -r) 2>/dev/null`
diff --git a/audio/xmcd/patches/patch-ae b/audio/xmcd/patches/patch-ae
index 584f47d2d4e..15954250734 100644
--- a/audio/xmcd/patches/patch-ae
+++ b/audio/xmcd/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/09/09 17:33:13 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/07/24 16:00:02 nra Exp $
 
---- misc_d/start.sh.orig	Sat Feb  5 08:26:39 2000
-+++ misc_d/start.sh
-@@ -42,7 +42,7 @@
- PROG=`(basename $0) 2>/dev/null`
+--- misc_d/start.sh.orig	Mon Jul 23 13:54:32 2001
++++ misc_d/start.sh	Mon Jul 23 13:55:10 2001
+@@ -116,7 +116,7 @@
  
+ PROG=`(basename $0) 2>/dev/null`
  SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
 -MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
 +MACH=`echo @MACHINE_ARCH@ | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
  REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
  
- # Platform-specific handling
+ o_path=$PATH
diff --git a/audio/xmcd/patches/patch-af b/audio/xmcd/patches/patch-af
index 3fec7116829..4a820a80168 100644
--- a/audio/xmcd/patches/patch-af
+++ b/audio/xmcd/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2000/09/09 17:33:13 wiz Exp $
+$NetBSD: patch-af,v 1.2 2001/07/24 16:00:02 nra Exp $
 
---- libdi_d/config.sh.orig	Sat Feb  5 08:26:23 2000
-+++ libdi_d/config.sh
-@@ -1770,7 +1770,7 @@
+--- libdi_d/config.sh.orig	Mon Jul 23 13:52:09 2001
++++ libdi_d/config.sh	Mon Jul 23 13:52:36 2001
+@@ -2001,7 +2001,7 @@
  # Get platform information
  OS_SYS=`(uname -s) 2>/dev/null`
  OS_REL=`(uname -r) 2>/dev/null`
diff --git a/audio/xmcd/pkg/PLIST b/audio/xmcd/pkg/PLIST
index aaa5b095fe6..1aff86214d7 100644
--- a/audio/xmcd/pkg/PLIST
+++ b/audio/xmcd/pkg/PLIST
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.11 2001/05/06 00:11:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/07/24 16:00:03 nra Exp $
 bin/cda
-bin/cddbcmd
-bin/dp2xmcd
-bin/wm2xmcd
-bin/xmcd_start
 bin/xmcd
+bin/xmcd_start
 lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/app-defaults/XMcd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/README
 lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cda
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/cddbcmd
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/dp2xmcd
-lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/wm2xmcd
+lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/gobrowser
 lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}/xmcd
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
@@ -19,6 +15,7 @@ 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/Cyberdri
 lib/X11/xmcd/config/.tbl/DEC
 lib/X11/xmcd/config/.tbl/Goldstar
 lib/X11/xmcd/config/.tbl/HP
@@ -54,30 +51,28 @@ 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 exact name is unknown.
-@comment just doing the unexec like it was before is a bit too disruptive,
-@comment though, see pkg/12373. So ask the user to delete it (DEINSTALL).
-@comment unexec rm -f %D/lib/X11/xmcd/config/*
+lib/X11/xmcd/config/wwwwarp.cfg
+lib/X11/xmcd/discog/Blues/General_Blues/index.html
+lib/X11/xmcd/discog/Classical/General_Classical/index.html
+lib/X11/xmcd/discog/Country/General_Country/index.html
+lib/X11/xmcd/discog/Data/General_Data/index.html
+lib/X11/xmcd/discog/Folk/General_Folk/index.html
+lib/X11/xmcd/discog/Jazz/General_Jazz/index.html
+lib/X11/xmcd/discog/Newage/General_Newage/index.html
+lib/X11/xmcd/discog/Rock/General_Rock/index.html
+lib/X11/xmcd/discog/Soundtrack/General_Soundtrack/index.html
+lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable/index.html
+lib/X11/xmcd/discog/World/Reggae/index.html
 lib/X11/xmcd/discog/bkgnd.gif
-lib/X11/xmcd/discog/xmcdlogo.gif
+lib/X11/xmcd/discog/cda.html
 lib/X11/xmcd/discog/discog.html
-lib/X11/xmcd/discog/blues/index.html
-lib/X11/xmcd/discog/classical/index.html
-lib/X11/xmcd/discog/country/index.html
-lib/X11/xmcd/discog/data/index.html
-lib/X11/xmcd/discog/folk/index.html
-lib/X11/xmcd/discog/jazz/index.html
-lib/X11/xmcd/discog/misc/index.html
-lib/X11/xmcd/discog/newage/index.html
-lib/X11/xmcd/discog/reggae/index.html
-lib/X11/xmcd/discog/rock/index.html
-lib/X11/xmcd/discog/soundtrack/index.html
+lib/X11/xmcd/discog/index.html
+lib/X11/xmcd/discog/xmcd.html
+lib/X11/xmcd/discog/xmcdlogo.gif
 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
@@ -85,155 +80,219 @@ 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/PRIVACY
 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/DlCancel.btn
-lib/X11/xmcd/help/DlChgTo.btn
-lib/X11/xmcd/help/DlDel.btn
-lib/X11/xmcd/help/DlDelAll.btn
-lib/X11/xmcd/help/DlReScan.btn
-lib/X11/xmcd/help/DlShow.btn
-lib/X11/xmcd/help/DpDList.btn
-lib/X11/xmcd/help/DpSubmit.btn
-lib/X11/xmcd/help/DlDisc.lsw
-lib/X11/xmcd/help/DlType.opt
-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/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/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/Time.lbl
-lib/X11/xmcd/help/TimeMode.lbl
-lib/X11/xmcd/help/Track.lbl
-lib/X11/xmcd/help/TrkTitle.lbl
-lib/X11/xmcd/help/WWWwarp.btn
-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/help/Cr/Add.btn
+lib/X11/xmcd/help/Cr/AutoTr.btn
+lib/X11/xmcd/help/Cr/Credit.lsw
+lib/X11/xmcd/help/Cr/Delete.btn
+lib/X11/xmcd/help/Cr/Dir.btn
+lib/X11/xmcd/help/Cr/FName.btn
+lib/X11/xmcd/help/Cr/Modify.btn
+lib/X11/xmcd/help/Cr/Name.txw
+lib/X11/xmcd/help/Cr/Notes.txw
+lib/X11/xmcd/help/Cr/Ok.btn
+lib/X11/xmcd/help/Cr/PriRole.opt
+lib/X11/xmcd/help/Cr/SubRole.opt
+lib/X11/xmcd/help/Dd/Comp.btn
+lib/X11/xmcd/help/Dd/Dnum.txw
+lib/X11/xmcd/help/Dd/Genre.opt
+lib/X11/xmcd/help/Dd/Info.lbl
+lib/X11/xmcd/help/Dd/Label.txw
+lib/X11/xmcd/help/Dd/Notes.txw
+lib/X11/xmcd/help/Dd/Ok.btn
+lib/X11/xmcd/help/Dd/Region.txw
+lib/X11/xmcd/help/Dd/SortTt.txw
+lib/X11/xmcd/help/Dd/Tnum.txw
+lib/X11/xmcd/help/Dd/Year.txw
+lib/X11/xmcd/help/Df/Name.txw
+lib/X11/xmcd/help/Df/Ok.btn
+lib/X11/xmcd/help/Dl/Cancel.btn
+lib/X11/xmcd/help/Dl/ChgTo.btn
+lib/X11/xmcd/help/Dl/Del.btn
+lib/X11/xmcd/help/Dl/DelAll.btn
+lib/X11/xmcd/help/Dl/Disc.lsw
+lib/X11/xmcd/help/Dl/ReScan.btn
+lib/X11/xmcd/help/Dl/Show.btn
+lib/X11/xmcd/help/Dl/Type.opt
+lib/X11/xmcd/help/Dp/AddPgm.btn
+lib/X11/xmcd/help/Dp/Artist.txw
+lib/X11/xmcd/help/Dp/ClrPgm.btn
+lib/X11/xmcd/help/Dp/DCredits.btn
+lib/X11/xmcd/help/Dp/DExt.btn
+lib/X11/xmcd/help/Dp/DList.btn
+lib/X11/xmcd/help/Dp/FName.btn
+lib/X11/xmcd/help/Dp/Flush.btn
+lib/X11/xmcd/help/Dp/Offline.btn
+lib/X11/xmcd/help/Dp/Ok.btn
+lib/X11/xmcd/help/Dp/PgmSeq.txw
+lib/X11/xmcd/help/Dp/Reload.btn
+lib/X11/xmcd/help/Dp/SavePgm.btn
+lib/X11/xmcd/help/Dp/Segments.btn
+lib/X11/xmcd/help/Dp/Submit.btn
+lib/X11/xmcd/help/Dp/TCredits.btn
+lib/X11/xmcd/help/Dp/TExt.btn
+lib/X11/xmcd/help/Dp/TTitle.txw
+lib/X11/xmcd/help/Dp/TimSel.btn
+lib/X11/xmcd/help/Dp/Title.txw
+lib/X11/xmcd/help/Dp/TotTim.lbl
+lib/X11/xmcd/help/Dp/Trk.lsw
+lib/X11/xmcd/help/Dp/UserReg.btn
+lib/X11/xmcd/help/Dt/Artist.txw
+lib/X11/xmcd/help/Dt/AutoTr.btn
+lib/X11/xmcd/help/Dt/BPM.txw
+lib/X11/xmcd/help/Dt/Dir.btn
+lib/X11/xmcd/help/Dt/FName.btn
+lib/X11/xmcd/help/Dt/Genre.opt
+lib/X11/xmcd/help/Dt/ISRC.lbl
+lib/X11/xmcd/help/Dt/Label.txw
+lib/X11/xmcd/help/Dt/Notes.txw
+lib/X11/xmcd/help/Dt/Ok.btn
+lib/X11/xmcd/help/Dt/SortTt.txw
+lib/X11/xmcd/help/Dt/Year.txw
+lib/X11/xmcd/help/Hp/About.btn
+lib/X11/xmcd/help/Hp/Cancel.btn
+lib/X11/xmcd/help/Hp/Text.txw
+lib/X11/xmcd/help/Hp/Topic.opt
+lib/X11/xmcd/help/Kp/Cancel.btn
+lib/X11/xmcd/help/Kp/Clear.btn
+lib/X11/xmcd/help/Kp/Enter.btn
+lib/X11/xmcd/help/Kp/Ind.lbl
+lib/X11/xmcd/help/Kp/Num.btn
+lib/X11/xmcd/help/Kp/Sel.btn
+lib/X11/xmcd/help/Kp/Warp.scl
+lib/X11/xmcd/help/Ms/Match.lsw
+lib/X11/xmcd/help/Ms/Ok.btn
+lib/X11/xmcd/help/Op/Bal.scl
+lib/X11/xmcd/help/Op/BalCtr.btn
+lib/X11/xmcd/help/Op/ChRt.rbx
+lib/X11/xmcd/help/Op/Chgr.cbx
+lib/X11/xmcd/help/Op/Done.cbx
+lib/X11/xmcd/help/Op/Eject.cbx
+lib/X11/xmcd/help/Op/Exit.rbx
+lib/X11/xmcd/help/Op/Load.cbx
+lib/X11/xmcd/help/Op/Load.rbx
+lib/X11/xmcd/help/Op/Ok.btn
+lib/X11/xmcd/help/Op/Reset.btn
+lib/X11/xmcd/help/Op/Save.btn
+lib/X11/xmcd/help/Op/VolTpr.rbx
+lib/X11/xmcd/help/Rs/Ok.btn
+lib/X11/xmcd/help/Rs/Region.lsw
+lib/X11/xmcd/help/Sg/Add.btn
+lib/X11/xmcd/help/Sg/Credits.btn
+lib/X11/xmcd/help/Sg/Delete.btn
+lib/X11/xmcd/help/Sg/Fields.txw
+lib/X11/xmcd/help/Sg/Modify.btn
+lib/X11/xmcd/help/Sg/Notes.txw
+lib/X11/xmcd/help/Sg/Ok.btn
+lib/X11/xmcd/help/Sg/PlayPaus.btn
+lib/X11/xmcd/help/Sg/Segment.lsw
+lib/X11/xmcd/help/Sg/Set.btn
+lib/X11/xmcd/help/Sg/Stop.btn
+lib/X11/xmcd/help/Su/Ok.btn
+lib/X11/xmcd/help/Su/SubmURL.txw
+lib/X11/xmcd/help/Su/Submit.btn
+lib/X11/xmcd/help/Ur/Age.txw
+lib/X11/xmcd/help/Ur/AllowM.btn
+lib/X11/xmcd/help/Ur/AllowS.btn
+lib/X11/xmcd/help/Ur/Cancel.btn
+lib/X11/xmcd/help/Ur/Email.txw
+lib/X11/xmcd/help/Ur/Gender.rbx
+lib/X11/xmcd/help/Ur/Handle.txw
+lib/X11/xmcd/help/Ur/Hint.btn
+lib/X11/xmcd/help/Ur/Hint.txw
+lib/X11/xmcd/help/Ur/Ok.btn
+lib/X11/xmcd/help/Ur/Passwd.txw
+lib/X11/xmcd/help/Ur/Postal.txw
+lib/X11/xmcd/help/Ur/Region.txw
+lib/X11/xmcd/help/Ur/Vpaswd.txw
+lib/X11/xmcd/help/Xm/Ab.btn
+lib/X11/xmcd/help/Xm/DbMode.lbl
+lib/X11/xmcd/help/Xm/DbProg.btn
+lib/X11/xmcd/help/Xm/Disc.lbl
+lib/X11/xmcd/help/Xm/DiscTitl.lbl
+lib/X11/xmcd/help/Xm/Eject.btn
+lib/X11/xmcd/help/Xm/Ff.btn
+lib/X11/xmcd/help/Xm/Help.btn
+lib/X11/xmcd/help/Xm/Index.lbl
+lib/X11/xmcd/help/Xm/Keypad.btn
+lib/X11/xmcd/help/Xm/Level.scl
+lib/X11/xmcd/help/Xm/Main.cbx
+lib/X11/xmcd/help/Xm/Mode.btn
+lib/X11/xmcd/help/Xm/NextDisc.btn
+lib/X11/xmcd/help/Xm/NextIdx.btn
+lib/X11/xmcd/help/Xm/NextTrk.btn
+lib/X11/xmcd/help/Xm/Options.btn
+lib/X11/xmcd/help/Xm/PlayMode.lbl
+lib/X11/xmcd/help/Xm/PlayPaus.btn
+lib/X11/xmcd/help/Xm/PrevDisc.btn
+lib/X11/xmcd/help/Xm/PrevIdx.btn
+lib/X11/xmcd/help/Xm/PrevTrk.btn
+lib/X11/xmcd/help/Xm/ProgMode.lbl
+lib/X11/xmcd/help/Xm/Quit.btn
+lib/X11/xmcd/help/Xm/Rew.btn
+lib/X11/xmcd/help/Xm/RptCnt.lbl
+lib/X11/xmcd/help/Xm/Sample.btn
+lib/X11/xmcd/help/Xm/Stop.btn
+lib/X11/xmcd/help/Xm/Time.btn
+lib/X11/xmcd/help/Xm/Time.lbl
+lib/X11/xmcd/help/Xm/TimeMode.lbl
+lib/X11/xmcd/help/Xm/Track.lbl
+lib/X11/xmcd/help/Xm/TrkTitle.lbl
+lib/X11/xmcd/help/Xm/WWWwarp.btn
 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/scripts/genidx
-lib/X11/xmcd/scripts/ncsarmt
-lib/X11/xmcd/scripts/ncsawrap
-lib/X11/xmcd/scripts/nswrap
 man/man1/cda.1
-man/man1/cddbcmd.1
-man/man1/dp2xmcd.1
-man/man1/wm2xmcd.1
 man/man1/xmcd.1
-@exec mkdir -p %D/lib/X11/xmcd/cddb/soundtrack
-@exec mkdir -p %D/lib/X11/xmcd/cddb/rock
-@exec mkdir -p %D/lib/X11/xmcd/cddb/reggae
-@exec mkdir -p %D/lib/X11/xmcd/cddb/newage
-@exec mkdir -p %D/lib/X11/xmcd/cddb/jazz
-@exec mkdir -p %D/lib/X11/xmcd/cddb/folk
-@exec mkdir -p %D/lib/X11/xmcd/cddb/data
-@exec mkdir -p %D/lib/X11/xmcd/cddb/country
-@exec mkdir -p %D/lib/X11/xmcd/cddb/classical
-@exec mkdir -p %D/lib/X11/xmcd/cddb/blues
-@dirrm lib/X11/xmcd/scripts
 @dirrm lib/X11/xmcd/pixmaps
+@dirrm lib/X11/xmcd/help/Xm
+@dirrm lib/X11/xmcd/help/Ur
+@dirrm lib/X11/xmcd/help/Su
+@dirrm lib/X11/xmcd/help/Sg
+@dirrm lib/X11/xmcd/help/Rs
+@dirrm lib/X11/xmcd/help/Op
+@dirrm lib/X11/xmcd/help/Ms
+@dirrm lib/X11/xmcd/help/Kp
+@dirrm lib/X11/xmcd/help/Hp
+@dirrm lib/X11/xmcd/help/Dt
+@dirrm lib/X11/xmcd/help/Dp
+@dirrm lib/X11/xmcd/help/Dl
+@dirrm lib/X11/xmcd/help/Df
+@dirrm lib/X11/xmcd/help/Dd
+@dirrm lib/X11/xmcd/help/Cr
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/docs
-@dirrm lib/X11/xmcd/discog/soundtrack
-@dirrm lib/X11/xmcd/discog/rock
-@dirrm lib/X11/xmcd/discog/reggae
-@dirrm lib/X11/xmcd/discog/newage
-@dirrm lib/X11/xmcd/discog/misc
-@dirrm lib/X11/xmcd/discog/jazz
-@dirrm lib/X11/xmcd/discog/folk
-@dirrm lib/X11/xmcd/discog/data
-@dirrm lib/X11/xmcd/discog/country
-@dirrm lib/X11/xmcd/discog/classical
-@dirrm lib/X11/xmcd/discog/blues
+@dirrm lib/X11/xmcd/discog/World/Reggae
+@dirrm lib/X11/xmcd/discog/World
+@dirrm lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable
+@dirrm lib/X11/xmcd/discog/Unclassifiable
+@dirrm lib/X11/xmcd/discog/Soundtrack/General_Soundtrack
+@dirrm lib/X11/xmcd/discog/Soundtrack
+@dirrm lib/X11/xmcd/discog/Rock/General_Rock
+@dirrm lib/X11/xmcd/discog/Rock
+@dirrm lib/X11/xmcd/discog/Newage/General_Newage
+@dirrm lib/X11/xmcd/discog/Newage
+@dirrm lib/X11/xmcd/discog/Jazz/General_Jazz
+@dirrm lib/X11/xmcd/discog/Jazz
+@dirrm lib/X11/xmcd/discog/Folk/General_Folk
+@dirrm lib/X11/xmcd/discog/Folk
+@dirrm lib/X11/xmcd/discog/Data/General_Data
+@dirrm lib/X11/xmcd/discog/Data
+@dirrm lib/X11/xmcd/discog/Country/General_Country
+@dirrm lib/X11/xmcd/discog/Country
+@dirrm lib/X11/xmcd/discog/Classical/General_Classical
+@dirrm lib/X11/xmcd/discog/Classical
+@dirrm lib/X11/xmcd/discog/Blues/General_Blues
+@dirrm lib/X11/xmcd/discog/Blues
 @dirrm lib/X11/xmcd/discog
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
 @dirrm lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
+@dirrm lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
+@dirrm lib/X11/xmcd/scripts
 @dirrm lib/X11/xmcd/app-defaults
-@dirrm lib/X11/xmcd
-@exec %D/lib/X11/xmcd/config/config.sh