From c58d4ddea5807664b42919a8aa43453cd6cda353 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 14 Dec 2011 03:17:25 +0000
Subject: Don't pick up GNU patch on Darwin, Linux and SunOS. It has a number
 of restrictions including line length, asymmetric context and interaction
 with read-only patches. It is just not worth the trouble.

---
 mk/tools/tools.Darwin.mk |  5 +++--
 mk/tools/tools.Linux.mk  |  7 +++----
 mk/tools/tools.SunOS.mk  | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'mk')

diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 89989e362a4..79dc12a13bc 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.43 2010/11/09 07:57:16 adam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.44 2011/12/14 03:17:25 joerg Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -78,7 +78,8 @@ TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
-TOOLS_PLATFORM.patch?=		/usr/bin/patch
+# Don't use GNU patch
+#TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index f7735c829e0..c00c91cecec 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.47 2010/02/13 08:30:59 obache Exp $
+# $NetBSD: tools.Linux.mk,v 1.48 2011/12/14 03:17:25 joerg Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -190,9 +190,8 @@ TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 .if exists(/usr/bin/openssl)
 TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
 .endif
-.if exists(/usr/bin/patch)
-TOOLS_PLATFORM.patch?=		/usr/bin/patch
-.endif
+# Don't use GNU patch
+#TOOLS_PLATFORM.patch?=		/usr/bin/patch
 .if exists(/usr/bin/printf)
 TOOLS_PLATFORM.printf?=		/usr/bin/printf
 .endif
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index bc4bc10fe01..e62206dd53d 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.35 2011/10/04 13:08:42 hans Exp $
+# $NetBSD: tools.SunOS.mk,v 1.36 2011/12/14 03:17:25 joerg Exp $
 #
 # System-supplied tools for the Solaris operating system.
 #
@@ -153,10 +153,10 @@ TOOLS_PLATFORM.nroff?=		/usr/bin/gnroff
 .if exists(/usr/bin/openssl)
 TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
 .endif
-.if exists(/usr/bin/gpatch)
-TOOLS_PLATFORM.gpatch?=		/usr/bin/gpatch
-TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
-.endif
+# Don't use GNU patch
+#TOOLS_PLATFORM.gpatch?=		/usr/bin/gpatch
+#TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
+
 #.if exists(/usr/bin/perl)
 #TOOLS_PLATFORM.perl?=		/usr/bin/perl
 #TOOLS_PLATFORM.pod2man?=	/usr/perl5/bin/pod2man
-- 
cgit v1.2.3