16 files changed, 29 insertions, 30 deletions

diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
index 5180934768b28..b29405152ec51 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -241,7 +241,7 @@
 #define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/config.h b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
index 5251d61204fd4..42fd248fcad9b 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -241,7 +241,7 @@
 #define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/config.h b/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
index 63a62c1ee1400..7b2d77734f50c 100644
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/ia64-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -244,7 +244,7 @@
 #define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
index 8e352ef8d9d3c..e7abf15270194 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -244,7 +244,7 @@
 #define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h b/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
index bc0a3f1ee0085..425723ee3cd31 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -241,7 +241,7 @@
 #define TARGET_OS "freebsd5.0"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h b/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h
index 809723fee4a95..54a08b476d91a 100644
--- a/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h
+++ b/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h
@@ -88,7 +88,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -247,7 +247,7 @@
 #define TARGET_OS "freebsd5"
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/gdb/config.h b/gnu/usr.bin/binutils/gdb/config.h
index 1e62d712dbe54..a5731261b088f 100644
--- a/gnu/usr.bin/binutils/gdb/config.h
+++ b/gnu/usr.bin/binutils/gdb/config.h
@@ -260,7 +260,7 @@
 #define HAVE_SOCKETPAIR 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -428,7 +428,7 @@
 /* #undef HAVE_LIBW */
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/ld/config.h b/gnu/usr.bin/binutils/ld/config.h
index 722ec8ff07f0d..4623347d2c948 100644
--- a/gnu/usr.bin/binutils/ld/config.h
+++ b/gnu/usr.bin/binutils/ld/config.h
@@ -83,7 +83,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -149,7 +149,7 @@
 /* #define VERSION "2.13" */
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/libbfd/config.h.fbsd b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
index 05f34096ca3ca..5955063e33b18 100644
--- a/gnu/usr.bin/binutils/libbfd/config.h.fbsd
+++ b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
@@ -101,7 +101,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -188,7 +188,7 @@
 /* #define VERSION "2.13" */
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/libbinutils/config.h b/gnu/usr.bin/binutils/libbinutils/config.h
index 16b5ea7a9c177..75f28a9c9a2aa 100644
--- a/gnu/usr.bin/binutils/libbinutils/config.h
+++ b/gnu/usr.bin/binutils/libbinutils/config.h
@@ -95,7 +95,7 @@
 #define HAVE_SETMODE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -161,7 +161,7 @@
 /* #define VERSION "2.13" */
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/binutils/libopcodes/config.h b/gnu/usr.bin/binutils/libopcodes/config.h
index bce0fcef987b2..2e26a1c82ee9d 100644
--- a/gnu/usr.bin/binutils/libopcodes/config.h
+++ b/gnu/usr.bin/binutils/libopcodes/config.h
@@ -74,7 +74,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@@ -122,7 +122,7 @@
 /* #define VERSION "2.12" */
 
 /* Define if you have the stpcpy function */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if your locale.h file contains LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 67c0e00f9cbd7..a25c9b67a10b5 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -189,7 +189,7 @@
 #define HAVE_SETRLIMIT 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index 5f6ecdd443f9d..9c4224cc473cf 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -3,8 +3,7 @@
 GREP_LIBZ=YES
 
 PROG=	grep
-SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c savedir.c search.c \
-	stpcpy.c
+SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c savedir.c search.c
 
 CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H
 
diff --git a/gnu/usr.bin/grep/config.h b/gnu/usr.bin/grep/config.h
index 70fdeb68bb5c5..2bae7dce4e10b 100644
--- a/gnu/usr.bin/grep/config.h
+++ b/gnu/usr.bin/grep/config.h
@@ -64,7 +64,7 @@
 /* Hack for Visual C++ suggested by irox. */
 /* #undef alloca */
 
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* #undef ENABLE_NLS */
 
@@ -125,7 +125,7 @@
 #define HAVE_SETMODE 1
 
 /* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
diff --git a/gnu/usr.bin/sort/config.h b/gnu/usr.bin/sort/config.h
index 8fa7f9a90b6ee..3f81afdacc6e5 100644
--- a/gnu/usr.bin/sort/config.h
+++ b/gnu/usr.bin/sort/config.h
@@ -247,7 +247,7 @@
 
 /* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
    */
-#define HAVE_DECL_STPCPY 0
+#define HAVE_DECL_STPCPY 1
 
 /* Define to 1 if you have the declaration of `strerror', and to 0 if you
    don't. */
@@ -720,7 +720,7 @@
 /* #undef HAVE_STIME */
 
 /* Define to 1 if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define to 1 if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
diff --git a/gnu/usr.bin/tar/config.h b/gnu/usr.bin/tar/config.h
index 6e7242386090b..32c75f942e7fd 100644
--- a/gnu/usr.bin/tar/config.h
+++ b/gnu/usr.bin/tar/config.h
@@ -288,7 +288,7 @@
 #define HAVE_STDLIB_H 1
 
 /* Define if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1