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.

5 files changed, 101 insertions, 85 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index fb2357e10c05..39e5d7b5b610 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	xmcd
-# Version required:	2.2
+# Version required:	2.3
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.7 1996/11/29 23:39:57 torstenb Exp $
+# $Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp $
 #
 
-DISTNAME=	xmcd-2.2
+DISTNAME=	xmcd-2.3
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications/xmcd
+MASTER_SITES=	http://mercury.hypersurf.com/~amb/download/xmcd/src/
 
 MAINTAINER=	deischen@iworks.InterWorks.org
 
@@ -17,7 +16,6 @@ REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
 
-post-install:
-	${CP} ${WRKSRC}/README ${PREFIX}/lib/X11/xmcd
+MAN1=		cddbcmd.1 wm2xmcd.1
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 0bde8c5fb95f..eff9b8af8de6 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-2.2.tar.gz) = a47e379e7b93c597b9bf729d79c13ded
+MD5 (xmcd-2.3.tar.gz) = cd36c43c388f001767495e7edf88182f
diff --git a/audio/xmcd/files/patch-aa b/audio/xmcd/files/patch-aa
index ee4bcf547f66..87d712103c29 100644
--- a/audio/xmcd/files/patch-aa
+++ b/audio/xmcd/files/patch-aa
@@ -1,5 +1,5 @@
-*** ./xmcd_d/Imakefile.orig	Thu Apr  4 21:42:31 1996
---- ./xmcd_d/Imakefile	Thu Apr  4 23:31:17 1996
+*** xmcd_d/Imakefile.orig	Sat May 23 02:31:49 1998
+--- xmcd_d/Imakefile	Tue May 26 17:32:59 1998
 ***************
 *** 43,49 ****
    * #include "Motif.tmpl"
@@ -18,7 +18,7 @@
   
   /**** Optional defines:  Change as you see fit. *****************************
 ***************
-*** 67,78 ****
+*** 68,79 ****
   DEFINES=
   #endif
   
@@ -31,7 +31,7 @@
   
   /*
    * C Source files
---- 67,78 ----
+--- 68,79 ----
   DEFINES=
   #endif
   
@@ -44,45 +44,3 @@
   
   /*
    * 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
-*** ./dbconv_d/Imakefile.orig	Thu Apr  4 23:33:09 1996
---- ./dbconv_d/Imakefile	Thu Apr  4 23:33:53 1996
-***************
-*** 24,29 ****
---- 24,31 ----
-   *
-   */
-  
-+ MANSUFFIX = 1
-+ 
-  
-  /*
-   * Add local include path
diff --git a/audio/xmcd/files/patch-ac b/audio/xmcd/files/patch-ac
new file mode 100644
index 000000000000..0b88dce19358
--- /dev/null
+++ b/audio/xmcd/files/patch-ac
@@ -0,0 +1,29 @@
+*** cda_d/Imakefile.orig	Sat May 23 02:31:57 1998
+--- cda_d/Imakefile	Tue May 26 17:32:59 1998
+***************
+*** 109,115 ****
+  #if defined(__QNX__)
+  LOCAL_LIBRARIES=-lncurses
+  #else
+! LOCAL_LIBRARIES=-lcurses
+  #endif	/* __QNX__ */
+  #endif	/* SINIX */
+  #endif	/* ultrix */
+--- 109,115 ----
+  #if defined(__QNX__)
+  LOCAL_LIBRARIES=-lncurses
+  #else
+! LOCAL_LIBRARIES=-lcurses -lmytinfo
+  #endif	/* __QNX__ */
+  #endif	/* SINIX */
+  #endif	/* ultrix */
+***************
+*** 119,124 ****
+--- 119,125 ----
+  #endif	/* LinuxArchitecture OpenBSDArchitecture */
+  #endif	/* SunArchitecture */
+  
++ MANSUFFIX = 1
+  
+  /*
+   * C Source files
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