4 files changed, 54 insertions, 54 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index c3512b5c3b7e..2f7664dc02e8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.17 1999/01/08 22:53:25 mph Exp $
+# $Id: Makefile,v 1.18 1999/02/22 03:27:30 steve Exp $
 #
 
-DISTNAME=	xmcd-2.4
+DISTNAME=	xmcd-2.5
 CATEGORIES=	audio
-MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd/src/
+MASTER_SITES=	http://metalab.unc.edu/tkan/download/xmcd/src/
 
 MAINTAINER=	eischen@vigrid.com
 
@@ -30,5 +30,6 @@ post-patch:
 
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
+	@${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${PREFIX}/lib/X11/app-defaults/XMcd
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index bd570dacba8e..e2bd834f5d59 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-2.4.tar.gz) = 34de843d84620b0e0e593faf0fc0fc2f
+MD5 (xmcd-2.5.tar.gz) = de8d66770be5acc492e0c7c3ff03e0a0
diff --git a/audio/xmcd/files/patch-ae b/audio/xmcd/files/patch-ae
index 7b8e21cf7204..f6f9cda401d4 100644
--- a/audio/xmcd/files/patch-ae
+++ b/audio/xmcd/files/patch-ae
@@ -10,15 +10,3 @@
  ARCH=		-DSVR4 -Di386
  TIMER=		-DUSE_SELECT
  TERMIO=		-DUSE_TERMIOS
---- makedgux.inc.orig	Tue Dec 29 15:53:17 1998
-+++ makedgux.inc	Tue Dec 29 15:55:11 1998
-@@ -52,7 +52,8 @@
- RANLIB=		/bin/true
- AR=		ar cq
- RM=		rm -f
--CFLAGS=		-O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO)
-+CFLAGS?=	-O
-+CFLAGS+=	$(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO)
- # ARCH=
- TIMER=		-DUSE_SELECT
- TERMIO=		-DUSE_TERMIOS
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index efa5fe38bb0b..993e4c717896 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -20,105 +20,115 @@ 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/DlDisc.lsw
+lib/X11/xmcd/help/DlReScan.btn
+lib/X11/xmcd/help/DlShow.btn
+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/DpDList.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/DpSubmit.btn
 lib/X11/xmcd/help/DpTExt.btn
+lib/X11/xmcd/help/DpTTitle.txw
 lib/X11/xmcd/help/DpTimSel.btn
-lib/X11/xmcd/help/DpWeb.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/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/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/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/pixmaps/xmcd.icon
 lib/X11/xmcd/pixmaps/xmcd_a.px
 lib/X11/xmcd/pixmaps/xmcd_b.px
 lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/config/common.cfg
+lib/X11/xmcd/config/config.sh
 lib/X11/xmcd/config/device.cfg
 lib/X11/xmcd/config/sites
 lib/X11/xmcd/config/.tbl/Acer
@@ -148,6 +158,7 @@ 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/Ricoh
 lib/X11/xmcd/config/.tbl/SGI
 lib/X11/xmcd/config/.tbl/Samsung
 lib/X11/xmcd/config/.tbl/Sanyo
@@ -158,7 +169,7 @@ 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/genidx
 lib/X11/xmcd/scripts/ncsarmt
 lib/X11/xmcd/scripts/ncsawrap
 lib/X11/xmcd/scripts/nswrap