summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-05-22 02:05:37 +0000
committerhubertf <hubertf@pkgsrc.org>2000-05-22 02:05:37 +0000
commit0bd0d1f6573865c6225ca1033cfa291ea3e20b70 (patch)
tree027a4949d36b5bba2c1cf7efdbc3b09bf7d7d29b
parent6713d6c885ee53e0e5234d8d672d8f65f26dee35 (diff)
downloadpkgsrc-0bd0d1f6573865c6225ca1033cfa291ea3e20b70.tar.gz
Fix for platforms that have $MACHINE != $MACHINE_ARCH, like macppc.
Patches sent in by SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp> in PR 10168.
-rw-r--r--sysutils/cdrecord-current/Makefile4
-rw-r--r--sysutils/cdrecord-current/files/patch-sum3
-rw-r--r--sysutils/cdrecord-current/patches/patch-af13
3 files changed, 17 insertions, 3 deletions
diff --git a/sysutils/cdrecord-current/Makefile b/sysutils/cdrecord-current/Makefile
index 9d8b0c67cb5..2a16290c96f 100644
--- a/sysutils/cdrecord-current/Makefile
+++ b/sysutils/cdrecord-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/03/04 10:10:10 tron Exp $
+# $NetBSD: Makefile,v 1.9 2000/05/22 02:05:37 hubertf Exp $
DISTNAME= cdrecord-1.8.1a01
CATEGORIES= sysutils
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/pr
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//}
-TARGET_ARCH= ${MACHINE}-netbsd-cc
+TARGET_ARCH= ${MACHINE_ARCH}-netbsd-cc
TARGET_DIR= OBJ/${TARGET_ARCH}
do-configure:
diff --git a/sysutils/cdrecord-current/files/patch-sum b/sysutils/cdrecord-current/files/patch-sum
index 5f8e6f6032a..40737296ed3 100644
--- a/sysutils/cdrecord-current/files/patch-sum
+++ b/sysutils/cdrecord-current/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.9 2000/03/15 00:28:42 hubertf Exp $
+$NetBSD: patch-sum,v 1.10 2000/05/22 02:05:38 hubertf Exp $
MD5 (patch-aa) = 6e6b138bdc80a899779c5e94c6324bd8
MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
MD5 (patch-ac) = ae67c9a36c6b7370ca040f8b86e3b5d0
MD5 (patch-ae) = 4c3938baa5a03adc55193361aa43c697
+MD5 (patch-af) = 82018d82a174d9d22e4f0f09d2a20276
diff --git a/sysutils/cdrecord-current/patches/patch-af b/sysutils/cdrecord-current/patches/patch-af
new file mode 100644
index 00000000000..077e5c9fce1
--- /dev/null
+++ b/sysutils/cdrecord-current/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2000/05/22 02:05:38 hubertf Exp $
+
+--- RULES/mk-gmake.id.orig Thu Mar 9 22:36:18 2000
++++ RULES/mk-gmake.id Thu Mar 9 22:36:52 2000
+@@ -41,7 +41,7 @@
+ _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
+
+ XP_ARCH:= $(shell $(_MACHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+-XK_ARCH:= $(shell uname -m | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
++XK_ARCH:= $(shell uname -p | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+ XM_ARCH:= $(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
+
+ P_ARCH= $(XP_ARCH)