From aa5619ca9eea6f1014ea457333b33f55b80cf59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sat, 6 Apr 2002 13:59:43 +0000
Subject: [PATCH] Build a working version of sort(1) from contrib.  Use
 netbsd.h as a hack to avoid bringing the sources off the vendor branch just
 to #ifdef out the RCS and SCCS IDs.

---
 usr.bin/sort/Makefile | 9 +++++++--
 usr.bin/sort/netbsd.h | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 usr.bin/sort/netbsd.h

diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index d7259ba3e4f..efa36331cb9 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -1,7 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 2001/01/08 19:16:49 jdolecek Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$FreeBSD$
+
+SRCDIR=	${.CURDIR}/../../contrib/sort
 
 PROG=	sort
 SRCS=	append.c fields.c files.c fsort.c init.c msort.c sort.c tmp.c
+MAN=	sort.1
+CFLAGS+=-I${SRCDIR} -include ${.CURDIR}/netbsd.h
 
 .include <bsd.prog.mk>
+
+.PATH:	${SRCDIR}
diff --git a/usr.bin/sort/netbsd.h b/usr.bin/sort/netbsd.h
new file mode 100644
index 00000000000..ebfefade3a0
--- /dev/null
+++ b/usr.bin/sort/netbsd.h
@@ -0,0 +1,4 @@
+/* $FreeBSD$ */
+
+#define __RCSID(x) /* nothing */
+#define __SCCSID(x) /* nothing */