Upgrade to 2.3. Also split patch-aa so that each patch affects only

one file.  Version 2.3 adds an interface to web browsers (Netscape
and Mosaic), a smaller-format window in addition to the traditional
window, and "tool tips" that pop up over the buttons.

1 files changed, 62 insertions, 31 deletions

diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 117a6751ce83..a6c0da226723 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -1,89 +1,116 @@
 bin/xmcd
 bin/cda
+bin/cddbcmd
 bin/wm2xmcd
 lib/X11/app-defaults/XMcd
+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/DpAbout.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/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/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/Power.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/help/WwCancel.btn
+lib/X11/xmcd/help/WwGo.btn
+lib/X11/xmcd/help/WwSearch.opt
+lib/X11/xmcd/help/WwSelect.rbx
 lib/X11/xmcd/cddb/misc/4102560a
 lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd_a.px
@@ -91,6 +118,7 @@ lib/X11/xmcd/pixmaps/xmcd_b.px
 lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/config/common.cfg
 lib/X11/xmcd/config/device.cfg
+lib/X11/xmcd/config/sites
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
@@ -122,13 +150,16 @@ 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
 man/man1/xmcd.1.gz
 man/man1/cda.1.gz
+man/man1/cddbcmd.1.gz
 man/man1/wm2xmcd.1.gz
+@dirrm lib/X11/xmcd/docs
 @dirrm lib/X11/xmcd/pixmaps
 @dirrm lib/X11/xmcd/help
 @dirrm lib/X11/xmcd/config/.tbl