Author: rmh
Date: 2006-02-14 19:57:26 +0000 (Tue, 14 Feb 2006)
New Revision: 1201
Modified:
trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
Log:
Revert 1199. Use uname -m with some sed magic.
Modified: trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-14
17:21:27 UTC (rev 1200)
+++ trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-14
19:57:26 UTC (rev 1201)
@@ -1,6 +1,15 @@
diff -ur ports.old/Mk/bsd.port.mk ports/Mk/bsd.port.mk
--- ports.old/Mk/bsd.port.mk 2006-02-13 14:38:58.000000000 +0100
+++ ports/Mk/bsd.port.mk 2006-02-13 14:40:38.000000000 +0100
+@@ -1028,7 +1028,7 @@
+
+ # Get the architecture
+ .if !defined(ARCH)
+-ARCH!= ${UNAME} -p
++ARCH!= ${UNAME} -m | sed -e "s/^i[4-9]86$/i386/g"
+ .endif
+
+ # Kludge for pre-3.0 systems
@@ -1913,15 +1913,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
@@ -84,6 +93,15 @@
diff -ur ports.old/Mk/bsd.port.subdir.mk ports/Mk/bsd.port.subdir.mk
--- ports.old/Mk/bsd.port.subdir.mk 2006-02-13 14:38:58.000000000 +0100
+++ ports/Mk/bsd.port.subdir.mk 2006-02-13 14:39:23.000000000 +0100
+@@ -48,7 +48,7 @@
+
+ .if !defined(NOPRECIOUSMAKEVARS)
+ .if !defined(ARCH)
+-ARCH!= uname -p
++ARCH!= uname -m | sed -e "s/^i[4-9]86$/i386/g"
+ .endif
+ .if !defined(OSREL)
+ OSREL!= uname -r | sed -e 's/[-(].*//'
@@ -61,7 +61,7 @@
.endif
.endif
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
