r1199 - in trunk/freebsd6-buildutils/debian: . patches
Author: rmh
Date: 2006-02-14 13:50:11 +0000 (Tue, 14 Feb 2006)
New Revision: 1199
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
Log:
patches/09_ports_path.diff: Remove hunks that replace "uname -p" with "uname -m" (we have -p now).
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-14 07:13:23 UTC (rev 1198)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-14 13:50:11 UTC (rev 1199)
@@ -56,7 +56,7 @@
- patches/09_ports_path.diff: Remove most of the patch, and re-diff.
- patches/10_linux_utils.diff: Merge into 09_ports_path.diff
- -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 14:44:41 +0100
+ -- Robert Millan <rmh@aybabtu.com> Tue, 14 Feb 2006 14:49:24 +0100
freebsd5-buildutils (5.4-3) unstable; urgency=low
Modified: trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-14 07:13:23 UTC (rev 1198)
+++ trunk/freebsd6-buildutils/debian/patches/09_ports_path.diff 2006-02-14 13:50:11 UTC (rev 1199)
@@ -1,15 +1,6 @@
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
- .endif
-
- # Kludge for pre-3.0 systems
@@ -1913,15 +1913,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
@@ -93,15 +84,6 @@
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
- .endif
- .if !defined(OSREL)
- OSREL!= uname -r | sed -e 's/[-(].*//'
@@ -61,7 +61,7 @@
.endif
.endif
Reply to: