Upgrade to 2.2.

PR:		4490
Submitted by:	"Daniel M. Eischen" <deischen@iworks.InterWorks.org>

5 files changed, 106 insertions, 65 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 7f949e8835e4..fb2357e10c05 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmcd
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.6 1996/11/18 09:52:29 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/29 23:39:57 torstenb Exp $
 #
 
-DISTNAME=	xmcd-2.1
+DISTNAME=	xmcd-2.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/xmcd
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 741903c76e34..4562ae2314ce 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-2.1.tar.gz) = 8262015c2c4908f5ce06315529e85c3d
+MD5 (xmcd-2.2.tar.gz) = aec0ee581c93247d6282ca70a3f2ca08
diff --git a/audio/xmcd/files/patch-aa b/audio/xmcd/files/patch-aa
index bcc2c81e320e..ee4bcf547f66 100644
--- a/audio/xmcd/files/patch-aa
+++ b/audio/xmcd/files/patch-aa
@@ -44,11 +44,28 @@
   
   /*
    * C Source files
-*** cda_d/Imakefile.orig	Mon Jan 20 10:13:51 1997
---- cda_d/Imakefile	Sat Apr 26 07:12:09 1997
+*** cda_d/Imakefile.orig	Tue Aug 12 19:13:31 1997
+--- cda_d/Imakefile	Sun Sep  7 15:34:34 1997
 ***************
-*** 102,107 ****
---- 102,108 ----
+*** 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 */
   
diff --git a/audio/xmcd/files/patch-ab b/audio/xmcd/files/patch-ab
index b0e4480b3a98..b4646bbae0cc 100644
--- a/audio/xmcd/files/patch-ab
+++ b/audio/xmcd/files/patch-ab
@@ -1,8 +1,8 @@
-*** install.sh.orig	Mon Jan 20 10:12:42 1997
---- install.sh	Sat Apr 26 07:15:36 1997
+*** install.sh.orig	Tue Aug 12 19:12:27 1997
+--- install.sh	Sun Sep  7 16:23:43 1997
 ***************
-*** 47,52 ****
---- 47,55 ----
+*** 48,53 ****
+--- 48,56 ----
   ERRFILE=/tmp/xmcd.err
   TMPFILE=/tmp/xmcdinst.$$
   
@@ -13,7 +13,7 @@
   # Utility functions
   #
 ***************
-*** 550,556 ****
+*** 586,592 ****
   
   while :
   do
@@ -21,7 +21,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 553,563 ----
+--- 589,599 ----
   
   while :
   do
@@ -34,7 +34,7 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 602,608 ****
+*** 634,640 ****
   
   while :
   do
@@ -42,7 +42,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 609,619 ----
+--- 641,651 ----
   
   while :
   do
@@ -55,7 +55,7 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 621,627 ****
+*** 657,663 ****
   APPDEFAULTSDIR=$LIBDIR/app-defaults
   while :
   do
@@ -63,7 +63,7 @@
   	then
   		if [ -d "$ANS" ]
   		then
---- 632,642 ----
+--- 668,678 ----
   APPDEFAULTSDIR=$LIBDIR/app-defaults
   while :
   do
@@ -76,62 +76,63 @@
   		if [ -d "$ANS" ]
   		then
 ***************
-*** 656,662 ****
-  	MANFILE=`echo $MANFILE | sed 's/\/\//\//g'`
-  fi
-  
-! if getstr "\nEnter xmcd on-line manual file path\n[${MANFILE}]:"
-  then
-  	MANFILE=$ANS
-  fi
---- 671,680 ----
-  	MANFILE=`echo $MANFILE | sed 's/\/\//\//g'`
-  fi
-  
-! if [ -n "$NO_PROMPT" ]
-! then
-! 	$ECHO "xmcd on-line manual file path - using ${MANFILE}"
-! elif getstr "\nEnter xmcd on-line manual file path\n[${MANFILE}]:"
-  then
-  	MANFILE=$ANS
-  fi
+*** 680,686 ****
+  XMCDLIB=$LIBDIR/xmcd
+  while :
+  do
+! 	if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
+  	then
+  		if [ -d "$ANS" ]
+  		then
+--- 695,705 ----
+  XMCDLIB=$LIBDIR/xmcd
+  while :
+  do
+! 	if [ -n "$NO_PROMPT" ]
+! 	then
+! 		$ECHO "xmcd library directory - using ${XMCDLIB}"
+! 		break
+! 	elif getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
+  	then
+  		if [ -d "$ANS" ]
+  		then
 ***************
-*** 678,684 ****
-  # Determine CMANFILE
+*** 733,739 ****
+  $ECHO "\n\nThe on-line manual directory is where the man pages in"
+  $ECHO "in the xmcd package will be installed."
   
-  CMANFILE="`dirname $MANFILE`/`basename $MANFILE | sed 's/xmcd/cda/'`"
-! if getstr "\nEnter cda on-line manual file path\n[${CMANFILE}]:"
+! if getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
   then
-  	CMANFILE=$ANS
+  	MANDIR=$ANS
   fi
---- 696,705 ----
-  # Determine CMANFILE
+--- 752,761 ----
+  $ECHO "\n\nThe on-line manual directory is where the man pages in"
+  $ECHO "in the xmcd package will be installed."
   
-  CMANFILE="`dirname $MANFILE`/`basename $MANFILE | sed 's/xmcd/cda/'`"
 ! if [ -n "$NO_PROMPT" ]
 ! then
-! 	$ECHO "cda on-line manual file path - using ${CMANFILE}"
-! elif getstr "\nEnter cda on-line manual file path\n[${CMANFILE}]:"
+! 	$ECHO "xmcd on-line manual directory - using ${MANDIR}"
+! elif getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
   then
-  	CMANFILE=$ANS
+  	MANDIR=$ANS
   fi
 ***************
-*** 700,706 ****
-  # Determine WMANFILE
+*** 758,764 ****
+  		MANSUFFIX=1
+  	fi
   
-  WMANFILE="`dirname $MANFILE`/`basename $MANFILE | sed 's/xmcd/wm2xmcd/'`"
-! if getstr "\nEnter wm2xmcd on-line manual file path\n[${WMANFILE}]:"
-  then
-  	WMANFILE=$ANS
-  fi
---- 721,730 ----
-  # Determine WMANFILE
+! 	if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
+  	then
+  		MANSUFFIX=$ANS
+  	fi
+--- 780,789 ----
+  		MANSUFFIX=1
+  	fi
   
-  WMANFILE="`dirname $MANFILE`/`basename $MANFILE | sed 's/xmcd/wm2xmcd/'`"
-! if [ -n "$NO_PROMPT" ]
-! then
-! 	$ECHO "wm2xmcd on-line manual file path - using ${WMANFILE}"
-! elif getstr "\nEnter wm2xmcd on-line manual file path\n[${WMANFILE}]:"
-  then
-  	WMANFILE=$ANS
-  fi
+! 	if [ -n "$NO_PROMPT" ]
+! 	then
+! 		$ECHO "xmcd on-line manual file name suffix - using ${MANSUFFIX}"
+! 	elif getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
+  	then
+  		MANSUFFIX=$ANS
+  	fi
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 6c7b60988575..117a6751ce83 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -31,8 +31,10 @@ 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/LsCancel.btn
 lib/X11/xmcd/help/LsOk.btn
+lib/X11/xmcd/help/NextDisc.btn
 lib/X11/xmcd/help/NextIdx.btn
 lib/X11/xmcd/help/NextTrk.btn
 lib/X11/xmcd/help/OpBalCtr.btn
@@ -42,6 +44,7 @@ lib/X11/xmcd/help/OpSave.btn
 lib/X11/xmcd/help/Options.btn
 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/Rew.btn
@@ -49,6 +52,7 @@ 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
@@ -76,6 +80,7 @@ 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
@@ -91,6 +96,7 @@ lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
 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/DEC
 lib/X11/xmcd/config/.tbl/Goldstar
@@ -123,3 +129,20 @@ lib/X11/xmcd/config/config.sh
 man/man1/xmcd.1.gz
 man/man1/cda.1.gz
 man/man1/wm2xmcd.1.gz
+@dirrm lib/X11/xmcd/pixmaps
+@dirrm lib/X11/xmcd/help
+@dirrm lib/X11/xmcd/config/.tbl
+@dirrm lib/X11/xmcd/config
+@dirrm lib/X11/xmcd/cddb/soundtrack
+@dirrm lib/X11/xmcd/cddb/rock
+@dirrm lib/X11/xmcd/cddb/reggae
+@dirrm lib/X11/xmcd/cddb/newage
+@dirrm lib/X11/xmcd/cddb/misc
+@dirrm lib/X11/xmcd/cddb/jazz
+@dirrm lib/X11/xmcd/cddb/folk
+@dirrm lib/X11/xmcd/cddb/data
+@dirrm lib/X11/xmcd/cddb/country
+@dirrm lib/X11/xmcd/cddb/classical
+@dirrm lib/X11/xmcd/cddb/blues
+@dirrm lib/X11/xmcd/cddb
+@dirrm lib/X11/xmcd