From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 28 Sep 2004 20:56:38 +0000 (+0000)
Subject: Switch patch(1) from GNU to BSD version.
X-Git-Tag: v2.0.1~10024
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1a7434d5a41f00aa45d7dbc38a15e49b991ba734

Switch patch(1) from GNU to BSD version.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index d2067b6e0e..d3ac280c78 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.38 2004/08/18 16:37:15 dillon Exp $
+# $DragonFly: src/Makefile.inc1,v 1.39 2004/09/28 20:56:38 joerg Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -734,7 +734,7 @@ _strfile=	games/fortune/strfile
 
 bootstrap-tools:
 .for _tool in ${_strfile} \
-    gnu/usr.bin/patch \
+    usr.bin/patch \
     bin/chmod bin/cp bin/dd bin/mkdir bin/rm bin/echo bin/test \
     bin/cat bin/date bin/ln bin/mv bin/csh bin/expr bin/sh bin/ls \
     bin/hostname bin/kill \
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index ccdf809954..07e8b011b8 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $
-# $DragonFly: src/gnu/usr.bin/Makefile,v 1.11 2004/09/20 22:03:14 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/Makefile,v 1.12 2004/09/28 20:56:38 joerg Exp $
 #
 # Note that gcc2 is only built under the i386 architecture.  Other
 # architectures require gcc3.
 
-SUBDIR= cpio dialog diff diff3 gperf grep groff gzip man patch ptx rcs sdiff \
+SUBDIR= cpio dialog diff diff3 gperf grep groff gzip man ptx rcs sdiff \
         send-pr sort tar texinfo
 
 .if !defined(NO_CVS)
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 34e93b0496..2a1a5241a8 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
 # $FreeBSD: src/usr.bin/Makefile,v 1.144.2.17 2003/01/04 17:17:07 obrien Exp $
-# $DragonFly: src/usr.bin/Makefile,v 1.19 2004/09/20 22:03:17 dillon Exp $
+# $DragonFly: src/usr.bin/Makefile,v 1.20 2004/09/28 20:56:38 joerg Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
 # XXX broken:		tconv
-# XXX Use GNU versions: apropos diff grep ld man patch ptx uucp whatis
+# XXX Use GNU versions: apropos diff grep ld man ptx uucp whatis
 # Moved to secure: bdes
 #
 SUBDIR=	alias \
@@ -130,6 +130,7 @@ SUBDIR=	alias \
 	pagesize \
 	passwd \
 	paste \
+	patch \
 	pathchk \
 	pkill \
 	pr \