1 files changed, 47 insertions, 38 deletions

diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 2e3578bc66a2..efa5fe38bb0b 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -1,6 +1,7 @@
 bin/xmcd
 bin/cda
 bin/cddbcmd
+bin/dp2xmcd
 bin/wm2xmcd
 lib/X11/app-defaults/XMcd
 lib/X11/xmcd/docs/ACKS
@@ -19,98 +20,100 @@ 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/WwCancel.btn
+lib/X11/xmcd/help/WwGo.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/DpTotTim.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/WwCancel.btn
-lib/X11/xmcd/help/WwGo.btn
-lib/X11/xmcd/help/WwSearch.opt
+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/HpText.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/WwSelect.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/HpTopic.opt
+lib/X11/xmcd/help/WwSearch.opt
 lib/X11/xmcd/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
@@ -144,7 +147,9 @@ 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
@@ -154,11 +159,15 @@ lib/X11/xmcd/config/.tbl/Teac
 lib/X11/xmcd/config/.tbl/Toshiba
 lib/X11/xmcd/config/.tbl/Yamaha
 lib/X11/xmcd/config/config.sh
-@dirrm lib/X11/xmcd/docs
-@dirrm lib/X11/xmcd/pixmaps
-@dirrm lib/X11/xmcd/help
+lib/X11/xmcd/scripts/ncsarmt
+lib/X11/xmcd/scripts/ncsawrap
+lib/X11/xmcd/scripts/nswrap
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
+@dirrm lib/X11/xmcd/docs
+@dirrm lib/X11/xmcd/help
+@dirrm lib/X11/xmcd/pixmaps
+@dirrm lib/X11/xmcd/scripts
 @unexec rmdir lib/X11/xmcd/cddb/soundtrack 2>/dev/null || true
 @unexec rmdir lib/X11/xmcd/cddb/rock 2>/dev/null || true
 @unexec rmdir lib/X11/xmcd/cddb/reggae 2>/dev/null || true