Upgrade to 3.2.0.

Xmcd now provides audio extraction and playback directly to
a sound device.

5 files changed, 53 insertions, 81 deletions

diff --git a/audio/xmcd/files/patch-aa b/audio/xmcd/files/patch-aa
index 7071bccbfd6c..d7049500be93 100644
--- a/audio/xmcd/files/patch-aa
+++ b/audio/xmcd/files/patch-aa
@@ -1,29 +1,19 @@
-*** xmcd_d/Imakefile.orig	Mon Jul 16 13:52:06 2001
---- xmcd_d/Imakefile	Tue Jul 17 03:04:47 2001
-***************
-*** 54,60 ****
-  SYS_LIBRARIES= $(LIBCDDB)
-  #endif
-  
-! LOCAL_LIBRARIES= XmClientLibs
-  
-  #if defined(FreeBSDArchitecture)
-  .if exists(/usr/include/camlib.h)
---- 54,60 ----
-  SYS_LIBRARIES= $(LIBCDDB)
-  #endif
-  
-! LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-  
-  #if defined(FreeBSDArchitecture)
-  .if exists(/usr/include/camlib.h)
-***************
-*** 98,103 ****
---- 98,104 ----
-  #endif	/* Linux Sun AIX Ultrix USL SVR4 */
-  #endif	/* BSD Osf sony_news Sun4 */
-  
-+ MANSUFFIX=1
-  
-  /*
-   * Add local include path
+--- xmcd_d/Imakefile.orig	Mon Nov  4 06:44:44 2002
++++ xmcd_d/Imakefile	Mon Nov  4 04:44:28 2002
+@@ -82,7 +82,7 @@
+ #endif	/* OSF1 */
+ #endif	/* Linux */
+ 
+-LOCAL_LIBRARIES= XmClientLibs
++LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
+ 
+ #if defined(FreeBSDArchitecture)
+ .if exists(/usr/include/camlib.h)
+@@ -137,6 +137,7 @@
+ #endif	/* Linux Sun AIX Ultrix USL SVR4 */
+ #endif	/* BSD OSF1 sony_news Sun4 */
+ 
++MANSUFFIX=1
+ 
+ /*
+  * Add local include path
diff --git a/audio/xmcd/files/patch-ab b/audio/xmcd/files/patch-ab
index 658ac7543438..68b33fc1577f 100644
--- a/audio/xmcd/files/patch-ab
+++ b/audio/xmcd/files/patch-ab
@@ -1,17 +1,9 @@
-*** Imakefile.orig	Wed May 16 15:58:57 2001
---- Imakefile	Sat Jul  7 02:49:45 2001
-***************
-*** 73,78 ****
-  
-  install::
-  	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
-! 		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
-  
-  
---- 73,78 ----
-  
-  install::
-  	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
-! 		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
-  
-  
+--- Imakefile.orig	Mon Nov  4 06:44:33 2002
++++ Imakefile	Mon Nov  4 05:02:09 2002
+@@ -77,5 +77,5 @@
+  */
+ install::
+ 	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
+-		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n
++		MANSUFFIX=$(MANSUFFIX) $(SHELL) ./install.sh -n -b
+ 
diff --git a/audio/xmcd/files/patch-ac b/audio/xmcd/files/patch-ac
index 26012719da0c..d227389ac584 100644
--- a/audio/xmcd/files/patch-ac
+++ b/audio/xmcd/files/patch-ac
@@ -1,12 +1,10 @@
-*** cda_d/Imakefile.orig	Wed May 16 15:59:15 2001
---- cda_d/Imakefile	Sat Jul  7 02:48:15 2001
-***************
-*** 143,148 ****
---- 143,149 ----
-  #endif	/* LinuxArchitecture OpenBSDArchitecture */
-  #endif	/* SunArchitecture */
-  
-+ MANSUFFIX=1
-  
-  /*
-   * C Source files
+--- cda_d/Imakefile.orig	Mon Nov  4 06:44:55 2002
++++ cda_d/Imakefile	Mon Nov  4 05:06:59 2002
+@@ -186,6 +186,7 @@
+ #endif	/* LinuxArchitecture OpenBSDArchitecture */
+ #endif	/* SunArchitecture */
+ 
++MANSUFFIX=1
+ 
+ /*
+  * C Source files
diff --git a/audio/xmcd/files/patch-ae b/audio/xmcd/files/patch-ae
index f2474e60a65e..b9142a72d0f2 100644
--- a/audio/xmcd/files/patch-ae
+++ b/audio/xmcd/files/patch-ae
@@ -1,11 +1,11 @@
---- make.inc.orig	Fri May 17 14:22:36 2002
-+++ make.inc	Fri Jun  7 13:19:02 2002
-@@ -66,7 +66,7 @@
+--- make.inc.orig	Mon Nov  4 06:44:33 2002
++++ make.inc	Mon Nov  4 05:13:15 2002
+@@ -69,7 +69,7 @@
  AR=		ar cq
  RM=		rm -f
  LN=		ln -s
 -CFLAGS=		-O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC)
 +CFLAGS?=	-O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC)
  ARCH=		-DSVR4 -Di386
- MISC=		-DHAS_SETEUID -DHAS_ICONV
+ MISC=		-DHAS_SETEUID -DHAS_ICONV -DHAS_LAME -DHAS_VORBIS
  TIMER=		-DUSE_SELECT
diff --git a/audio/xmcd/files/patch-ag b/audio/xmcd/files/patch-ag
index 5ecbb308c8b8..4e2cfdcc93e1 100644
--- a/audio/xmcd/files/patch-ag
+++ b/audio/xmcd/files/patch-ag
@@ -1,19 +1,11 @@
-*** ./install.sh.orig	Wed May 16 15:58:57 2001
---- ./install.sh	Sat Jul  7 02:37:04 2001
-***************
-*** 1132,1138 ****
-  make_dir $ARCHLIB $DIRPERM $OWNER $GROUP
-  make_dir $DISCOGDIR $GDIRPERM $OWNER $GROUP
-  
-! if [ -n "$MANDIR" ]
-  then
-  	make_dir $MANDIR $DIRPERM $OWNER $GROUP
-  fi
---- 1132,1138 ----
-  make_dir $ARCHLIB $DIRPERM $OWNER $GROUP
-  make_dir $DISCOGDIR $GDIRPERM $OWNER $GROUP
-  
-! if [ -n "$MANDIR" -a ! -d "$MANDIR" ]
-  then
-  	make_dir $MANDIR $DIRPERM $OWNER $GROUP
-  fi
+--- install.sh.orig	Mon Nov  4 05:17:09 2002
++++ install.sh	Mon Nov  4 05:16:44 2002
+@@ -1120,7 +1120,7 @@
+ make_dir $ARCHLIB $DIRPERM $OWNER $GROUP
+ make_dir $DISCOGDIR $GDIRPERM $OWNER $GROUP
+ 
+-if [ -n "$MANDIR" ]
++if [ -n "$MANDIR" -a ! -d "$MANDIR" ]
+ then
+ 	make_dir $MANDIR $DIRPERM $OWNER $GROUP
+ fi