As the seemingly untested -Werror changes break the bootstrap at least

on Linux, update libnbcompat to 20150615:
- Assume a C89 environment and malloc, vprintf, memcpy, memset, memmove
  to be present and working.
- Use full prototypes for isblank, snprintf, asprintf and strdup.
  This avoids GCC failing to do conflicts with the builtins.

10 files changed, 110 insertions, 238 deletions

diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index cddb1ef6a91..7e9108025f6 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.83 2015/04/19 12:24:21 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2015/06/08 00:44:46 joerg Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 # 	pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #	list of tested and supported platforms.
 #
 
-PKGNAME=		libnbcompat-20150419
+PKGNAME=		libnbcompat-20150615
 CATEGORIES=		pkgtools devel
 
 MAINTAINER=		joerg@NetBSD.org
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index 0e15f3dd19c..0a0e083be42 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -5533,73 +5533,6 @@ _ACEOF
 
 
 # Checks for library functions.
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
 ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
   ac_have_decl=1
@@ -5916,48 +5849,76 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-for ac_func in vprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF
-
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
-
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_snprintf(char *, size_t, const char *, ...)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "snprintf(char *, size_t, const char *, ...)" "$as_ac_Symbol" "#include <stdio.h>
+"
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
 fi
 
-fi
-done
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
 
+else
+  case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
 
+fi
 
-ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "#include <stdio.h>
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_asprintf(char **, const char *, ...)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "asprintf(char **, const char *, ...)" "$as_ac_Symbol" "#define _GNU_SOURCE
+             #include <stdio.h>
 "
-if test "x$ac_cv_have_decl_snprintf" = xyes; then :
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SNPRINTF $ac_have_decl
+#define HAVE_DECL_ASPRINTF $ac_have_decl
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "#include <stdio.h>
+if test $ac_have_decl = 1; then :
+
+else
+  case " $LIBOBJS " in
+  *" asprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+ ;;
+esac
+
+fi
+
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_strdup(const char *)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "strdup(const char *)" "$as_ac_Symbol" "#include <string.h>
 "
-if test "x$ac_cv_have_decl_vasprintf" = xyes; then :
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_VASPRINTF $ac_have_decl
+#define HAVE_DECL_STRDUP $ac_have_decl
 _ACEOF
+if test $ac_have_decl = 1; then :
+
+else
+  case " $LIBOBJS " in
+  *" strdup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+esac
+
+fi
 
 
 case $host_os in
@@ -5967,19 +5928,30 @@ darwin*)
 	;;
 esac
 
-ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
-if test "x$ac_cv_func_asprintf" = xyes; then :
-  $as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_isblank(int)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "isblank(int)" "$as_ac_Symbol" "#include <ctype.h>
+"
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISBLANK $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
 
 else
   case " $LIBOBJS " in
-  *" asprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+  *" isblank.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS isblank.$ac_objext"
  ;;
 esac
 
 fi
 
+
 ac_fn_c_check_func "$LINENO" "err" "ac_cv_func_err"
 if test "x$ac_cv_func_err" = xyes; then :
   $as_echo "#define HAVE_ERR 1" >>confdefs.h
@@ -6071,19 +6043,6 @@ esac
 
 fi
 
-ac_fn_c_check_func "$LINENO" "isblank" "ac_cv_func_isblank"
-if test "x$ac_cv_func_isblank" = xyes; then :
-  $as_echo "#define HAVE_ISBLANK 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" isblank.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS isblank.$ac_objext"
- ;;
-esac
-
-fi
-
 ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags"
 if test "x$ac_cv_func_lchflags" = xyes; then :
   $as_echo "#define HAVE_LCHFLAGS 1" >>confdefs.h
@@ -6227,19 +6186,6 @@ esac
 
 fi
 
-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
-if test "x$ac_cv_func_snprintf" = xyes; then :
-  $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" snprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
- ;;
-esac
-
-fi
-
 ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
 if test "x$ac_cv_func_statvfs" = xyes; then :
   $as_echo "#define HAVE_STATVFS 1" >>confdefs.h
@@ -6253,19 +6199,6 @@ esac
 
 fi
 
-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes; then :
-  $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strdup.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
- ;;
-esac
-
-fi
-
 ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
 if test "x$ac_cv_func_strerror" = xyes; then :
   $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
@@ -6644,13 +6577,12 @@ esac
 
 fi
 
-for ac_func in bcopy bzero memset memcpy setlocale
+for ac_func in setlocale
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
+if test "x$ac_cv_func_setlocale" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SETLOCALE 1
 _ACEOF
 
 fi
@@ -6874,7 +6806,7 @@ esac
 
 fi
 
-for ac_func in getpassphrase getpgrp memmove select
+for ac_func in getpassphrase getpgrp select
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index fb55a65f715..47910cd23a1 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.84 2015/04/19 12:22:14 tnn Exp $
+dnl $NetBSD: configure.ac,v 1.85 2015/06/08 00:44:46 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -283,12 +283,17 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(off_t, 0)
 
 # Checks for library functions.
-AC_FUNC_MALLOC
 AC_FUNC_STRERROR_R
 AC_FUNC_VFORK
-AC_FUNC_VPRINTF
 
-AC_CHECK_DECLS([snprintf, vasprintf], [], [], [#include <stdio.h>])
+AC_CHECK_DECLS([snprintf(char *, size_t, const char *, ...)],
+            [], [AC_LIBOBJ(snprintf)], [#include <stdio.h>])
+AC_CHECK_DECLS([asprintf(char **, const char *, ...)],
+            [], [AC_LIBOBJ(asprintf)],
+            [#define _GNU_SOURCE
+             #include <stdio.h>])
+AC_CHECK_DECLS([strdup(const char *)],
+            [], [AC_LIBOBJ(strdup)], [#include <string.h>])
 
 case $host_os in
 darwin*)
@@ -297,9 +302,11 @@ darwin*)
 	;;
 esac
 
-AC_REPLACE_FUNCS([asprintf err fgetln fnmatch fparseln getdelim getenv \
-	getline isblank lchflags lchmod lchown lutimes mkdtemp mkstemp setenv \
-	setgroupent setpassent setprogname shquote snprintf statvfs strdup \
+AC_CHECK_DECLS([isblank(int)], [], [AC_LIBOBJ(isblank)], [#include <ctype.h>])
+
+AC_REPLACE_FUNCS([err fgetln fnmatch fparseln getdelim getenv \
+	getline lchflags lchmod lchown lutimes mkdtemp mkstemp setenv \
+	setgroupent setpassent setprogname shquote statvfs \
 	strerror strlcat strlcpy strmode strsep strtoll unsetenv usleep \
 	utimes warn
 ])
@@ -349,7 +356,7 @@ if test $need_gettemp = yes; then
 	AC_LIBOBJ(gettemp)
 fi
 
-AC_CHECK_FUNCS([bcopy bzero memset memcpy setlocale])
+AC_CHECK_FUNCS([setlocale])
 
 need_setmode=no
 AC_CHECK_FUNCS([getmode setmode], [:], [need_setmode=yes])
@@ -421,7 +428,7 @@ if test $pkg_use_nbcompat_poll = yes; then
 	AC_LIBOBJ(poll)
 fi
 
-AC_CHECK_FUNCS([getpassphrase getpgrp memmove select])
+AC_CHECK_FUNCS([getpassphrase getpgrp select])
 
 AC_CHECK_FUNC(getpgrp, [AC_FUNC_GETPGRP])
 
diff --git a/pkgtools/libnbcompat/files/malloc.c b/pkgtools/libnbcompat/files/malloc.c
deleted file mode 100644
index db858578000..00000000000
--- a/pkgtools/libnbcompat/files/malloc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: malloc.c,v 1.1.1.1 2003/03/31 05:02:54 grant Exp $	*/
-
-#if ! HAVE_MALLOC
-#undef malloc
-
-#include <sys/types.h>
-
-void *malloc();
-
-void *rpl_malloc (size_t n)
-{
-        if (n == 0) n = 1;
-        return malloc(n);
-}
-#endif
diff --git a/pkgtools/libnbcompat/files/md5c.c b/pkgtools/libnbcompat/files/md5c.c
index 0a07dd06db8..fe782d2b362 100644
--- a/pkgtools/libnbcompat/files/md5c.c
+++ b/pkgtools/libnbcompat/files/md5c.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md5c.c,v 1.7 2008/10/06 12:36:20 joerg Exp $	*/
+/*	$NetBSD: md5c.c,v 1.8 2015/06/08 00:44:46 joerg Exp $	*/
 
 /*
  * This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -51,15 +51,7 @@
 
 #if !HAVE_MD5_H
 
-#if defined(HAVE_MEMSET)
 #define ZEROIZE(d, l)		memset((d), 0, (l)) 
-#else 
-# if defined(HAVE_BZERO)
-#define ZEROIZE(d, l)		bzero((d), (l))
-# else
-#error You need either memset or bzero 
-# endif 
-#endif
 
 typedef unsigned char *POINTER;
 typedef uint16_t UINT2;
diff --git a/pkgtools/libnbcompat/files/nbcompat/config.h.in b/pkgtools/libnbcompat/files/nbcompat/config.h.in
index 00a8b016d9f..2fd9e5ffcf7 100644
--- a/pkgtools/libnbcompat/files/nbcompat/config.h.in
+++ b/pkgtools/libnbcompat/files/nbcompat/config.h.in
@@ -15,24 +15,19 @@
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
 /* Define to 1 if you have the <bsd/libutil.h> header file. */
 #undef HAVE_BSD_LIBUTIL_H
 
-/* Define to 1 if you have the `bzero' function. */
-#undef HAVE_BZERO
-
 /* Define to 1 if you have the <ctype.h> header file. */
 #undef HAVE_CTYPE_H
 
+/* Define to 1 if you have the declaration of `asprintf(char **, const char *,
+   ...)', and to 0 if you don't. */
+#undef HAVE_DECL_ASPRINTF
+
 /* Define to 1 if you have the declaration of `endgrent', and to 0 if you
    don't. */
 #undef HAVE_DECL_ENDGRENT
@@ -41,6 +36,10 @@
    don't. */
 #undef HAVE_DECL_ENDPWENT
 
+/* Define to 1 if you have the declaration of `isblank(int)', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ISBLANK
+
 /* Define to 1 if you have the declaration of `optarg', and to 0 if you don't.
    */
 #undef HAVE_DECL_OPTARG
@@ -57,18 +56,18 @@
    don't. */
 #undef HAVE_DECL_SETPASSENT
 
-/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
-   don't. */
+/* Define to 1 if you have the declaration of `snprintf(char *, size_t, const
+   char *, ...)', and to 0 if you don't. */
 #undef HAVE_DECL_SNPRINTF
 
+/* Define to 1 if you have the declaration of `strdup(const char *)', and to 0
+   if you don't. */
+#undef HAVE_DECL_STRDUP
+
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL_VASPRINTF
-
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
@@ -78,9 +77,6 @@
 /* Define to 1 if `dd_fd' is a member of `DIR'. */
 #undef HAVE_DIR_DD_FD
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
 /* Define to 1 if you have the <endian.h> header file. */
 #undef HAVE_ENDIAN_H
 
@@ -162,9 +158,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `isblank' function. */
-#undef HAVE_ISBLANK
-
 /* Define to 1 if you have the `issetugid' function. */
 #undef HAVE_ISSETUGID
 
@@ -201,25 +194,12 @@
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #undef HAVE_MACHINE_ENDIAN_H
 
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
 /* Define to 1 if you have the <md5.h> header file. */
 #undef HAVE_MD5_H
 
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
 /* Define to 1 if you have the `mkdtemp' function. */
 #undef HAVE_MKDTEMP
 
@@ -323,9 +303,6 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
 /* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T
 
@@ -350,9 +327,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -539,9 +513,6 @@
 /* Define to 1 if you have the <vis.h> header file. */
 #undef HAVE_VIS_H
 
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
 /* Define to 1 if you have the `warn' function. */
 #undef HAVE_WARN
 
@@ -636,9 +607,6 @@
    a type exists and the standard includes do not define it. */
 #undef int8_t
 
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
diff --git a/pkgtools/libnbcompat/files/nbcompat/ctype.h b/pkgtools/libnbcompat/files/nbcompat/ctype.h
index a48fd4dfa8b..116885b589c 100644
--- a/pkgtools/libnbcompat/files/nbcompat/ctype.h
+++ b/pkgtools/libnbcompat/files/nbcompat/ctype.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctype.h,v 1.2 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: ctype.h,v 1.3 2015/06/08 00:44:46 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  * Declare macros and functions that may be missing in <ctype.h>.
  */
 
-#if !HAVE_ISBLANK
+#if !HAVE_DECL_ISBLANK
 int	isblank(int);
 #endif
 
diff --git a/pkgtools/libnbcompat/files/nbcompat/stdio.h b/pkgtools/libnbcompat/files/nbcompat/stdio.h
index 5f8a6081a99..bb3d9b19501 100644
--- a/pkgtools/libnbcompat/files/nbcompat/stdio.h
+++ b/pkgtools/libnbcompat/files/nbcompat/stdio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.6 2015/04/19 12:22:14 tnn Exp $	*/
+/*	$NetBSD: stdio.h,v 1.7 2015/06/08 00:44:46 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@ int	snprintf(char *, size_t, const char *, ...);
 int	vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
-#if !HAVE_DECL_VASPRINTF
+#if !HAVE_DECL_ASPRINTF
 int	asprintf(char **, const char *, ...);
 int	vasprintf(char **, const char *, va_list);
 #endif
diff --git a/pkgtools/libnbcompat/files/nbcompat/string.h b/pkgtools/libnbcompat/files/nbcompat/string.h
index f7f0d9d3fad..778642535c9 100644
--- a/pkgtools/libnbcompat/files/nbcompat/string.h
+++ b/pkgtools/libnbcompat/files/nbcompat/string.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.2 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: string.h,v 1.3 2015/06/08 00:44:46 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,11 +40,7 @@
  * Declare functions and macros that may be missing in <string.h>.
  */
 
-#if !HAVE_MEMMOVE
-# define memmove(a,b,c)	bcopy((b),(a),(c))
-#endif
-
-#if !HAVE_STRDUP
+#if !HAVE_DECL_STRDUP
 char	*strdup(const char *);
 #endif
 
diff --git a/pkgtools/libnbcompat/files/rmd160.c b/pkgtools/libnbcompat/files/rmd160.c
index e98aa1590bb..d8c3f79d258 100644
--- a/pkgtools/libnbcompat/files/rmd160.c
+++ b/pkgtools/libnbcompat/files/rmd160.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmd160.c,v 1.8 2008/10/06 12:36:20 joerg Exp $	*/
+/*	$NetBSD: rmd160.c,v 1.9 2015/06/08 00:44:46 joerg Exp $	*/
 
 /********************************************************************\
  *
@@ -25,7 +25,7 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rmd160.c,v 1.8 2008/10/06 12:36:20 joerg Exp $");
+__RCSID("$NetBSD: rmd160.c,v 1.9 2015/06/08 00:44:46 joerg Exp $");
 #endif	/* not lint */
 
 /* header files */
@@ -53,15 +53,7 @@ __weak_alias(RMD160Final,_RMD160Final)
 #endif
 #endif
 
-#if defined(HAVE_MEMSET)
 #define ZEROIZE(d, l)		memset((d), 0, (l)) 
-#else 
-# if defined(HAVE_BZERO)
-#define ZEROIZE(d, l)		bzero((d), (l))
-# else
-#error You need either memset or bzero 
-# endif 
-#endif
 
 /********************************************************************/