Also patch the start and config skripts to use ${MACHINE_ARCH} instead

of uname -m (instead of only install skript only).
Addresses pkg/10017.

5 files changed, 41 insertions, 6 deletions

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 25392b9b69b..7abead238f7 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2000/03/16 15:30:02 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2000/09/09 17:33:13 wiz Exp $
 #
 
 DISTNAME=	xmcd-2.6
@@ -13,7 +13,14 @@ DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes	# asks a lot of questions
-MAKE_ENV+=	MACHINE_ARCH="${MACHINE_ARCH}" SHELL=/bin/sh
+MAKE_ENV+=	SHELL=/bin/sh
+
+pre-install:
+	cd ${WRKSRC} && \
+	for f in libdi_d/config.sh misc_d/start.sh install.sh; do \
+		${SED} -e "s/@MACHINE_ARCH@/${MACHINE_ARCH}/" $$f > $$f.new; \
+		${MV} -f $$f.new $$f; \
+	done
 
 post-install:
 .for FILE in cda cddbcmd wm2xmcd xmcd
diff --git a/audio/xmcd/files/patch-sum b/audio/xmcd/files/patch-sum
index 732439f68fe..af740d9e858 100644
--- a/audio/xmcd/files/patch-sum
+++ b/audio/xmcd/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2000/02/13 19:17:24 fredb Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/09 17:33:13 wiz Exp $
 
 MD5 (patch-aa) = 042e405c0c3e32708d6701b5f111a8e2
 MD5 (patch-ab) = b4302466309ca3ff5d31ed2d8b816df5
 MD5 (patch-ac) = b818b87617b278c9e35716b7cd965f4d
-MD5 (patch-ad) = 60add0bf30a0e45a0fec362f0a775126
+MD5 (patch-ad) = 1167152e7f89ddfe4cdb985e5ba6350d
+MD5 (patch-ae) = 1383d3f671dfade388a2bc8b4a8b3650
+MD5 (patch-af) = bac878a3609ba06d647b5175d64b8d2c
diff --git a/audio/xmcd/patches/patch-ad b/audio/xmcd/patches/patch-ad
index 1531d213657..23fbc8913e9 100644
--- a/audio/xmcd/patches/patch-ad
+++ b/audio/xmcd/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2000/02/13 19:17:24 fredb Exp $
+$NetBSD: patch-ad,v 1.6 2000/09/09 17:33:13 wiz Exp $
 
 --- install.sh.orig	Sat Feb  5 01:26:20 2000
 +++ install.sh	Sun Feb 13 08:29:05 2000
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.5 2000/02/13 19:17:24 fredb Exp $
  OS_SYS=`(uname -s) 2>/dev/null`
  OS_REL=`(uname -r) 2>/dev/null`
 -OS_MACH=`(uname -m) 2>/dev/null`
-+OS_MACH=$MACHINE_ARCH
++OS_MACH=@MACHINE_ARCH@
  
  if [ -z "$OS_SYS" ]
  then
diff --git a/audio/xmcd/patches/patch-ae b/audio/xmcd/patches/patch-ae
new file mode 100644
index 00000000000..584f47d2d4e
--- /dev/null
+++ b/audio/xmcd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/09/09 17:33:13 wiz Exp $
+
+--- misc_d/start.sh.orig	Sat Feb  5 08:26:39 2000
++++ misc_d/start.sh
+@@ -42,7 +42,7 @@
+ PROG=`(basename $0) 2>/dev/null`
+ 
+ SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+-MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
++MACH=`echo @MACHINE_ARCH@ | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+ REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+ 
+ # Platform-specific handling
diff --git a/audio/xmcd/patches/patch-af b/audio/xmcd/patches/patch-af
new file mode 100644
index 00000000000..3fec7116829
--- /dev/null
+++ b/audio/xmcd/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2000/09/09 17:33:13 wiz Exp $
+
+--- libdi_d/config.sh.orig	Sat Feb  5 08:26:23 2000
++++ libdi_d/config.sh
+@@ -1770,7 +1770,7 @@
+ # Get platform information
+ OS_SYS=`(uname -s) 2>/dev/null`
+ OS_REL=`(uname -r) 2>/dev/null`
+-OS_MACH=`(uname -m) 2>/dev/null`
++OS_MACH=@MACHINE_ARCH@
+ OS_NODE=`(uname -n) 2>/dev/null`
+ 
+ if [ -z "$OS_SYS" ]