5 files changed, 52 insertions, 36 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 59dfe14a7e4f..65ec68341ea5 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	xmcd
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
+DISTNAME=	xmcd-3.1.1
 
 MAINTAINER=	eischen@vigrid.com
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-WRKSRC=		$(WRKDIR)/xmcd-3.0
+WRKSRC=		${WRKDIR}/xmcd-3.1
 PLIST_SUB+=	RELEASE=${OSREL:R} ARCH=${ARCH}
 
 MAN1=		cda.1 xmcd.1
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 79b45d86e16a..cdc1eac51fbc 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1 +1 @@
-MD5 (xmcd-3.0.2.tar.gz) = 3a4bfe86ca44486adddfb7b0e1a41388
+MD5 (xmcd-3.1.1.tar.gz) = 11a335ccfac89de01388b7bc167207be
diff --git a/audio/xmcd/files/patch-ad b/audio/xmcd/files/patch-ad
new file mode 100644
index 000000000000..031d2e2f247e
--- /dev/null
+++ b/audio/xmcd/files/patch-ad
@@ -0,0 +1,15 @@
+--- cdda_d/Imakefile.orig	Fri Jun  7 13:33:15 2002
++++ cdda_d/Imakefile	Fri Jun  7 13:33:21 2002
+@@ -76,6 +76,12 @@
+ #endif  /* Linux Sun AIX Ultrix USL SVR4 */
+ #endif
+ 
++#if defined(FreeBSDArchitecture)
++/* The following is BSD-make specific */
++.if exists(/usr/include/camlib.h)
++DEFINES+= -DFREEBSD_CAM -DHAS_SETEUID
++.endif
++#endif
+ 
+ /*
+  * Add local include path
diff --git a/audio/xmcd/files/patch-ae b/audio/xmcd/files/patch-ae
index ebe1ebe82e04..f2474e60a65e 100644
--- a/audio/xmcd/files/patch-ae
+++ b/audio/xmcd/files/patch-ae
@@ -1,20 +1,11 @@
-*** make.inc.orig	Wed May 16 15:58:57 2001
---- make.inc	Sat Jul  7 03:04:53 2001
-***************
-*** 53,59 ****
-  AR=		ar cq
-  RM=		rm -f
-  LN=		ln -s
-! CFLAGS=		-O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO)
-  ARCH=		-DSVR4 -Di386
-  TIMER=		-DUSE_SELECT
-  TERMIO=		-DUSE_TERMIOS
---- 53,60 ----
-  AR=		ar cq
-  RM=		rm -f
-  LN=		ln -s
-! CFLAGS?=	-O
-! CFLAGS+=	$(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO)
-  ARCH=		-DSVR4 -Di386
-  TIMER=		-DUSE_SELECT
-  TERMIO=		-DUSE_TERMIOS
+--- make.inc.orig	Fri May 17 14:22:36 2002
++++ make.inc	Fri Jun  7 13:19:02 2002
+@@ -66,7 +66,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
+ TIMER=		-DUSE_SELECT
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 71fca5577b9a..8deaa532aab6 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -8,9 +8,6 @@ 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%%/xmcd
-lib/X11/xmcd/config/common.cfg
-lib/X11/xmcd/config/device.cfg
-lib/X11/xmcd/config/wwwwarp.cfg
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
@@ -21,6 +18,7 @@ lib/X11/xmcd/config/.tbl/Creative
 lib/X11/xmcd/config/.tbl/Cyberdri
 lib/X11/xmcd/config/.tbl/DEC
 lib/X11/xmcd/config/.tbl/Goldstar
+lib/X11/xmcd/config/.tbl/Grundig
 lib/X11/xmcd/config/.tbl/HP
 lib/X11/xmcd/config/.tbl/Hitachi
 lib/X11/xmcd/config/.tbl/IBM
@@ -52,23 +50,26 @@ 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/discog/bkgnd.gif
-lib/X11/xmcd/discog/cda.html
-lib/X11/xmcd/discog/discog.html
-lib/X11/xmcd/discog/index.html
-lib/X11/xmcd/discog/xmcd.html
-lib/X11/xmcd/discog/xmcdlogo.gif
+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/discog/Classical/General_Classical/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/Newage/General_Newage/index.html
+lib/X11/xmcd/discog/New_Age/General_New_Age/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
+lib/X11/xmcd/discog/index.html
+lib/X11/xmcd/discog/xmcd.html
+lib/X11/xmcd/discog/xmcdlogo.gif
 lib/X11/xmcd/docs/ACKS
 lib/X11/xmcd/docs/CDDB
 lib/X11/xmcd/docs/CHANGES
@@ -119,6 +120,7 @@ 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/ClrPgm.btn
 lib/X11/xmcd/help/Dp/DCredits.btn
 lib/X11/xmcd/help/Dp/DExt.btn
@@ -127,7 +129,6 @@ lib/X11/xmcd/help/Dp/FName.btn
 lib/X11/xmcd/help/Dp/Flush.btn
 lib/X11/xmcd/help/Dp/Offline.btn
 lib/X11/xmcd/help/Dp/Ok.btn
-lib/X11/xmcd/help/Dp/UserReg.btn
 lib/X11/xmcd/help/Dp/PgmSeq.txw
 lib/X11/xmcd/help/Dp/Reload.btn
 lib/X11/xmcd/help/Dp/SavePgm.btn
@@ -140,6 +141,7 @@ lib/X11/xmcd/help/Dp/TimSel.btn
 lib/X11/xmcd/help/Dp/Title.txw
 lib/X11/xmcd/help/Dp/TotTim.lbl
 lib/X11/xmcd/help/Dp/Trk.lsw
+lib/X11/xmcd/help/Dp/UserReg.btn
 lib/X11/xmcd/help/Dt/Artist.txw
 lib/X11/xmcd/help/Dt/AutoTr.btn
 lib/X11/xmcd/help/Dt/BPM.txw
@@ -167,16 +169,23 @@ lib/X11/xmcd/help/Ms/Match.lsw
 lib/X11/xmcd/help/Ms/Ok.btn
 lib/X11/xmcd/help/Op/Bal.scl
 lib/X11/xmcd/help/Op/BalCtr.btn
+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/Exit.rbx
+lib/X11/xmcd/help/Op/FileFmt.opt
+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/Mode.cbx
 lib/X11/xmcd/help/Op/Ok.btn
+lib/X11/xmcd/help/Op/Path.txt
+lib/X11/xmcd/help/Op/Prog.txt
 lib/X11/xmcd/help/Op/Reset.btn
 lib/X11/xmcd/help/Op/Save.btn
+lib/X11/xmcd/help/Op/TrkFile.btn
 lib/X11/xmcd/help/Op/VolTpr.rbx
 lib/X11/xmcd/help/Rs/Ok.btn
 lib/X11/xmcd/help/Rs/Region.lsw
@@ -264,8 +273,8 @@ lib/X11/xmcd/scripts/genidx
 @dirrm lib/X11/xmcd/discog/Folk
 @dirrm lib/X11/xmcd/discog/Jazz/General_Jazz
 @dirrm lib/X11/xmcd/discog/Jazz
-@dirrm lib/X11/xmcd/discog/Newage/General_Newage
-@dirrm lib/X11/xmcd/discog/Newage
+@dirrm lib/X11/xmcd/discog/New_Age/General_New_Age
+@dirrm lib/X11/xmcd/discog/New_Age
 @dirrm lib/X11/xmcd/discog/Rock/General_Rock
 @dirrm lib/X11/xmcd/discog/Rock
 @dirrm lib/X11/xmcd/discog/Soundtrack/General_Soundtrack