8 files changed, 91 insertions, 95 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index efe8306c6415..22ef97729d48 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	xmcd
-PORTVERSION=	3.1
+PORTVERSION=	3.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.1.1/src/
-DISTNAME=	xmcd-3.1.1
+MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.2.0/src/
+DISTNAME=	xmcd-3.2.0
 
 MAINTAINER=	eischen@vigrid.com
 
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/xmcd-3.1
+WRKSRC=		${WRKDIR}/xmcd-3.2.0
 PLIST_SUB+=	RELEASE=${OSREL:R} ARCH=${ARCH}
 
 MAN1=		cda.1 xmcd.1
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index cdc1eac51fbc..9bb3fb323927 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-3.1.1.tar.gz) = 11a335ccfac89de01388b7bc167207be
+MD5 (xmcd-3.2.0.tar.gz) = 3bed299c7e3e81f0f6ff40bfe45f72e6
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
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 8deaa532aab6..8138e1e4cb0f 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -1,12 +1,12 @@
 bin/.xmcd_start
 bin/cda
 bin/xmcd
-lib/X11/app-defaults/XMcd
 lib/X11/xmcd/app-defaults/XMcd
 lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/README
 lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/cda
 lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/gobrowser
+lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/has_alsa
 lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/xmcd
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
@@ -37,9 +37,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/SGI
 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
 lib/X11/xmcd/config/.tbl/Sony
@@ -49,21 +49,21 @@ 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/config/common.cfg
 lib/X11/xmcd/config/device.cfg
 lib/X11/xmcd/config/wwwwarp.cfg
-lib/X11/xmcd/discog/Blues/General_Blues/index.html
+lib/X11/xmcd/config/config.sh
 lib/X11/xmcd/discog/Classical/General_Classical/index.html
+lib/X11/xmcd/discog/Blues/General_Blues/index.html
 lib/X11/xmcd/discog/Country/General_Country/index.html
 lib/X11/xmcd/discog/Data/General_Data/index.html
 lib/X11/xmcd/discog/Folk/General_Folk/index.html
 lib/X11/xmcd/discog/Jazz/General_Jazz/index.html
 lib/X11/xmcd/discog/New_Age/General_New_Age/index.html
+lib/X11/xmcd/discog/Reggae/General_Reggae/index.html
 lib/X11/xmcd/discog/Rock/General_Rock/index.html
 lib/X11/xmcd/discog/Soundtrack/General_Soundtrack/index.html
 lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable/index.html
-lib/X11/xmcd/discog/World/Reggae/index.html
 lib/X11/xmcd/discog/bkgnd.gif
 lib/X11/xmcd/discog/cda.html
 lib/X11/xmcd/discog/discog.html
@@ -119,8 +119,8 @@ lib/X11/xmcd/help/Dl/ReScan.btn
 lib/X11/xmcd/help/Dl/Show.btn
 lib/X11/xmcd/help/Dl/Type.opt
 lib/X11/xmcd/help/Dp/AddPgm.btn
-lib/X11/xmcd/help/Dp/Artist.txw
 lib/X11/xmcd/help/Dp/Apply.btn
+lib/X11/xmcd/help/Dp/Artist.txw
 lib/X11/xmcd/help/Dp/ClrPgm.btn
 lib/X11/xmcd/help/Dp/DCredits.btn
 lib/X11/xmcd/help/Dp/DExt.btn
@@ -167,26 +167,45 @@ lib/X11/xmcd/help/Kp/Sel.btn
 lib/X11/xmcd/help/Kp/Warp.scl
 lib/X11/xmcd/help/Ms/Match.lsw
 lib/X11/xmcd/help/Ms/Ok.btn
+lib/X11/xmcd/help/Op/AddTag.btn
 lib/X11/xmcd/help/Op/Bal.scl
 lib/X11/xmcd/help/Op/BalCtr.btn
+lib/X11/xmcd/help/Op/Bitrate.opt
+lib/X11/xmcd/help/Op/CacheTo.txt
 lib/X11/xmcd/help/Op/Categ.lsw
 lib/X11/xmcd/help/Op/ChRt.rbx
 lib/X11/xmcd/help/Op/Chgr.cbx
 lib/X11/xmcd/help/Op/Done.cbx
 lib/X11/xmcd/help/Op/Eject.cbx
+lib/X11/xmcd/help/Op/Encode.opt
 lib/X11/xmcd/help/Op/Exit.rbx
 lib/X11/xmcd/help/Op/FileFmt.opt
+lib/X11/xmcd/help/Op/Filters.txt
+lib/X11/xmcd/help/Op/Flags.btn
+lib/X11/xmcd/help/Op/HbeatTo.txt
 lib/X11/xmcd/help/Op/Jitter.btn
 lib/X11/xmcd/help/Op/Load.cbx
-lib/X11/xmcd/help/Op/Load.rbx
+lib/X11/xmcd/help/Op/Lookup.rbx
+lib/X11/xmcd/help/Op/Mbrowser.rbx
 lib/X11/xmcd/help/Op/Mode.cbx
+lib/X11/xmcd/help/Op/Mp3Algo.scl
+lib/X11/xmcd/help/Op/Mp3Mode.opt
 lib/X11/xmcd/help/Op/Ok.btn
 lib/X11/xmcd/help/Op/Path.txt
+lib/X11/xmcd/help/Op/PathExp.btn
+lib/X11/xmcd/help/Op/PerfMon.btn
 lib/X11/xmcd/help/Op/Prog.txt
+lib/X11/xmcd/help/Op/Proxy.btn
+lib/X11/xmcd/help/Op/Qual.scl
 lib/X11/xmcd/help/Op/Reset.btn
 lib/X11/xmcd/help/Op/Save.btn
+lib/X11/xmcd/help/Op/Sched.rbx
+lib/X11/xmcd/help/Op/ServTo.txt
+lib/X11/xmcd/help/Op/Subst.btn
 lib/X11/xmcd/help/Op/TrkFile.btn
 lib/X11/xmcd/help/Op/VolTpr.rbx
+lib/X11/xmcd/help/Pm/Cancel.btn
+lib/X11/xmcd/help/Pm/PerfMon.lbl
 lib/X11/xmcd/help/Rs/Ok.btn
 lib/X11/xmcd/help/Rs/Region.lsw
 lib/X11/xmcd/help/Sg/Add.btn
@@ -258,6 +277,7 @@ lib/X11/xmcd/pixmaps/xmcd.xpm
 lib/X11/xmcd/scripts/genidx
 @dirrm lib/X11/xmcd/app-defaults
 @dirrm lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%
+@dirrm lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%%
 @unexec rm -rf %D/lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%%
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
@@ -275,14 +295,14 @@ lib/X11/xmcd/scripts/genidx
 @dirrm lib/X11/xmcd/discog/Jazz
 @dirrm lib/X11/xmcd/discog/New_Age/General_New_Age
 @dirrm lib/X11/xmcd/discog/New_Age
+@dirrm lib/X11/xmcd/discog/Reggae/General_Reggae
+@dirrm lib/X11/xmcd/discog/Reggae
 @dirrm lib/X11/xmcd/discog/Rock/General_Rock
 @dirrm lib/X11/xmcd/discog/Rock
 @dirrm lib/X11/xmcd/discog/Soundtrack/General_Soundtrack
 @dirrm lib/X11/xmcd/discog/Soundtrack
 @dirrm lib/X11/xmcd/discog/Unclassifiable/General_Unclassifiable
 @dirrm lib/X11/xmcd/discog/Unclassifiable
-@dirrm lib/X11/xmcd/discog/World/Reggae
-@dirrm lib/X11/xmcd/discog/World
 @dirrm lib/X11/xmcd/discog
 @dirrm lib/X11/xmcd/docs
 @dirrm lib/X11/xmcd/help/Cr
@@ -295,6 +315,7 @@ lib/X11/xmcd/scripts/genidx
 @dirrm lib/X11/xmcd/help/Kp
 @dirrm lib/X11/xmcd/help/Ms
 @dirrm lib/X11/xmcd/help/Op
+@dirrm lib/X11/xmcd/help/Pm
 @dirrm lib/X11/xmcd/help/Rs
 @dirrm lib/X11/xmcd/help/Sg
 @dirrm lib/X11/xmcd/help/Su