3 files changed, 35 insertions, 20 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 50fb45dba6e8..3f1c5f54e372 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,16 +1,19 @@
 # New ports collection makefile for:	xmcd
-# Date created:		16 Februar 1995
+# Date created:		16 February 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xmcd
-PORTVERSION=	3.2.1
+PORTVERSION=	3.3.1
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.2.1/src/
-DISTNAME=	xmcd-3.2.1
+MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.0/src/:xmcd \
+		http://www.ibiblio.org/tkan/xmcd/:xmcd_331_patch
+DISTFILES=	xmcd-3.3.0.tar.gz:xmcd \
+		xmcd-330_331.patch:xmcd_331_patch
+EXTRACT_ONLY=	xmcd-3.3.0.tar.gz
 
 MAINTAINER=	eischen@vigrid.com
 COMMENT=	Motif CD player
@@ -18,11 +21,12 @@ COMMENT=	Motif CD player
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
+USE_REINPLACE=	yes
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/xmcd-3.2.1
 PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH}
 
+WRKSRC= 	${WRKDIR}/xmcd-3.3.0
 MAN1=		cda.1 xmcd.1
 MANCOMPRESSED=	no
 RMAN=		${X11BASE}/bin/rman
@@ -36,10 +40,16 @@ post-extract:
 
 pre-patch:
 	@${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${WRKSRC}/xmcd_d/XMcd.ad.in
+	@(cd ${WRKDIR}; ${PATCH} -p0 --quiet < ${DISTDIR}/xmcd-330_331.patch)
+	@${RM} -f ${WRKSRC}/docs_d/CHANGES.orig
 
 post-patch:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${WRKSRC}/xmcd_d/XMcd.ad.in \
 		> ${WRKSRC}/xmcd_d/XMcd.ad
+	@${FIND} ${WRKSRC} -name Makefile -o -name Imakefile | \
+		${XARGS} ${REINPLACE_CMD} \
+		-e 's|_CFLAGS= -pthread|_CFLAGS= ${PTHREAD_CFLAGS}|g; \
+		s|_LDFLAGS= -pthread|_LDFLAGS= ${PTHREAD_LIBS}|g'
 
 .if ${XFREE86_VERSION} == 4
 post-build:
diff --git a/audio/xmcd/distinfo b/audio/xmcd/distinfo
index 80e606e32db9..35034e3c839b 100644
--- a/audio/xmcd/distinfo
+++ b/audio/xmcd/distinfo
@@ -1,2 +1,4 @@
-MD5 (xmcd-3.2.1.tar.gz) = 9a21bd7c6f2b92f6e36652c9540e2d98
-SIZE (xmcd-3.2.1.tar.gz) = 973419
+MD5 (xmcd-3.3.0.tar.gz) = 0108b6f99342e31a11f22d54b87f89f8
+SIZE (xmcd-3.3.0.tar.gz) = 1059012
+MD5 (xmcd-330_331.patch) = 17c7907bf3d9e395fac78d79dbb55b6f
+SIZE (xmcd-330_331.patch) = 18855
diff --git a/audio/xmcd/pkg-plist b/audio/xmcd/pkg-plist
index 1e648893f16b..fa09901ab16a 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -1,9 +1,9 @@
 bin/.xmcd_start
 bin/cda
 bin/xmcd
+lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/app-defaults/XMcd
 lib/X11/xmcd/app-defaults/XMcd.sgi
-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
@@ -38,9 +38,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
@@ -50,12 +50,12 @@ 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/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/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
@@ -175,36 +175,39 @@ 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/CacheTo.txw
 lib/X11/xmcd/help/Op/Categ.lsw
+lib/X11/xmcd/help/Op/CddaAtt.scl
+lib/X11/xmcd/help/Op/ChanMode.opt
 lib/X11/xmcd/help/Op/ChRt.rbx
 lib/X11/xmcd/help/Op/Chgr.cbx
+lib/X11/xmcd/help/Op/CompAlgo.scl
 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/Filters.txw
 lib/X11/xmcd/help/Op/Flags.btn
-lib/X11/xmcd/help/Op/HbeatTo.txt
+lib/X11/xmcd/help/Op/HbeatTo.txw
 lib/X11/xmcd/help/Op/Jitter.btn
+lib/X11/xmcd/help/Op/LameOpts.txw
 lib/X11/xmcd/help/Op/Load.cbx
 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/OutPort.cbx
+lib/X11/xmcd/help/Op/Path.txw
 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/Prog.txw
 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/ServTo.txw
 lib/X11/xmcd/help/Op/Subst.btn
 lib/X11/xmcd/help/Op/TrkFile.btn
 lib/X11/xmcd/help/Op/VolTpr.rbx
@@ -285,7 +288,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%%
-@unexec rm -rf %D/lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%%
+@unexec rm -rf %D/lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%% 2>&1 >/dev/null || true
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
 @dirrm lib/X11/xmcd/discog/Blues/General_Blues