audio/xmcd: Unbreak on !amd64, support DragonFly

The staging attempted didn't go quite right as it was hardcoded for
FreeBSD 9 AMD.  Since I'm fixing this anyway, bring in dports patches
to support DragonFly.

4 files changed, 31 insertions, 22 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 733bf580ba88..0881108ed657 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 
@@ -16,11 +16,11 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USES=		imake motif
 USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
-PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH}
+PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH} OPSYS=${OPSYS}
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-LIBBINDIR=	${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-FreeBSD_${OSREL:R:R}-${ARCH}
+LIBBINDIR=	${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH}
 
 post-extract:
 	@${CHMOD} -R u+w ${WRKSRC}
@@ -70,7 +70,7 @@ post-install:
 		-e 's:${STAGEDIR}::' \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/discog/discog.html \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/config/config.sh \
-		${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-FreeBSD_9-amd64/README
+		${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH}/README
 	@${FIND} ${STAGEDIR} -name \*.bak -delete
 
 .include <bsd.port.mk>
diff --git a/audio/xmcd/files/patch-ag b/audio/xmcd/files/patch-ag
deleted file mode 100644
index 4e2cfdcc93e1..000000000000
--- a/audio/xmcd/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-install.sh b/audio/xmcd/files/patch-install.sh
new file mode 100644
index 000000000000..14a554f47255
--- /dev/null
+++ b/audio/xmcd/files/patch-install.sh
@@ -0,0 +1,20 @@
+--- install.sh.orig	2004-04-21 19:27:01.000000000 +0000
++++ install.sh
+@@ -625,7 +625,7 @@ if [ "$OS_SYS" = A/UX ]
+ then
+ 	# Apple A/UX
+ 	SHELL=/bin/ksh
+-elif [ "$OS_SYS" = FreeBSD ]
++elif [ "$OS_SYS" = FreeBSD -o "$OS_SYS" = DragonFly ]
+ then
+ 	# FreeBSD
+ 	OS_REL_T=`echo "$OS_REL_T" | sed 's/\..*$//'`
+@@ -1170,7 +1170,7 @@ make_dir $ARCHBIN $DIRPERM $OWNER $GROUP
+ 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 300906e6ad5b..542af85f3aec 100644
--- a/audio/xmcd/pkg-plist
+++ b/audio/xmcd/pkg-plist
@@ -5,11 +5,11 @@ lib/X11/app-defaults/XMcd
 lib/X11/xmcd/app-defaults/XKeysymDB
 lib/X11/xmcd/app-defaults/XMcd
 lib/X11/xmcd/app-defaults/XMcd.sgi
-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/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/README
+lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/cda
+lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/gobrowser
+lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/has_alsa
+lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/xmcd
 lib/X11/xmcd/config/.tbl/Acer
 lib/X11/xmcd/config/.tbl/Apple
 lib/X11/xmcd/config/.tbl/Aztech
@@ -290,8 +290,8 @@ lib/X11/xmcd/scripts/genidx
 man/man1/cda.1.gz
 man/man1/xmcd.1.gz
 @dirrm lib/X11/xmcd/app-defaults
-@dirrm lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%
-@dirrmtry lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%%
+@dirrm lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%
+@dirrmtry lib/X11/xmcd/lib-%%OPSYS%%_%%RELEASE%%-%%ARCH%%
 @dirrm lib/X11/xmcd/config/.tbl
 @dirrm lib/X11/xmcd/config
 @dirrm lib/X11/xmcd/discog/Blues/General_Blues