From 30aaff1192acd09c20cd6e8c70c9e8d023d4c818 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Apr 2003 20:30:30 +0000
Subject: Migrate to a new way of dealing with building from old revisions of
 FreeBSD.  This method attempts to centralize all the necessary hacks or work
 arounds in one of two places in the tree (src/Makefile.inc1 and
 src/tools/build).  We build a small compatibility library (libbuild.a) as
 well as selectively installing necessary include files.  We then include this
 directory when building host binaries.

This removes all the past release compatibilty hacks from various
places in the tree.  We still build on tip of stable and current.  I
will work with those that want to support more, although I anticipate
it will just work.

Many thanks to ru@, obrien@ and jhb@ for providing valuable input at
various stage of implementation, as well as for working together to
positively effect a change for the better.
---
 usr.bin/xargs/xargs.c     | 15 +--------------
 usr.bin/xinstall/Makefile |  7 -------
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 8b75dbb97864b..a31f2a62a0e34 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -52,19 +52,12 @@ static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#if (__FreeBSD_version >= 450002 && __FreeBSD_version < 500000) || \
-    __FreeBSD_version >= 500017
-#define HAS_LANGINFO
-#endif
-
 #include <sys/wait.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAS_LANGINFO
 #include <langinfo.h>
-#endif
 #include <locale.h>
 #include <paths.h>
 #include <regex.h>
@@ -590,13 +583,7 @@ prompt(void)
 	(void)fprintf(stderr, "?...");
 	(void)fflush(stderr);
 	if ((response = fgetln(ttyfp, &rsize)) == NULL ||
-	    regcomp(&cre,
-#ifdef HAS_LANGINFO
-		nl_langinfo(YESEXPR),
-#else
-		"^[yY]",
-#endif
-		REG_BASIC) != 0) {
+	    regcomp(&cre, nl_langinfo(YESEXPR), REG_BASIC) != 0) {
 		(void)fclose(ttyfp);
 		return (0);
 	}
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 2ed1eea375c0a..3116d07f97718 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -6,11 +6,4 @@ PROGNAME=	install
 SRCS=		xinstall.c
 MAN=		install.1
 
-.if defined(BOOTSTRAPPING) && \
-    ( ${BOOTSTRAPPING} < 400021 || \
-    ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500007 ))
-.PATH: ${.CURDIR}/../../lib/libc/gen
-SRCS+=		strtofflags.c
-.endif
-
 .include <bsd.prog.mk>
-- 
cgit v1.3