Update pkgtools/libnbcompat to 20040822. Changes from version 20040814

include:

* Rework the way that poll() is detected so that it more closely
  follows how the rest of the replacement functions are detected.

* Split err*() and warn*() functions into separate err.c and warn.c
  files so that we can more finely isolate the objects files pulled
  in by the linker.  This should fix building textproc/nbsed on Solaris.

* Move more definitions from nbcompat.h into nbcompat/*.h.  This makes
  it more clear which NetBSD headers are expected to provide which
  function declarations and macro definitions.

* Clean out nbconfig.h by moving all of the relevant definitions into
  the correct nbcompat/*.h files.

* Update all of the library functions to the latest from src HEAD.
  Also change the way that sources are modified when imported -- we
  now include <nbcompat.h> before the first system header, include
  <nbcompat/*.h> versions of headers instead of system ones where
  available, and "#if 0" the sections that make no sense when being
  built outside of the NetBSD source tree.  This should make future
  updates from src HEAD, e.g. for security updates or bug fixes,
  easier.

* Move all private headers into a subdirectory and include the headers
  from the private directory.  This avoids any nameclashes with system
  headers with the same name.

1 files changed, 115 insertions, 0 deletions

diff --git a/pkgtools/libnbcompat/files/warn.c b/pkgtools/libnbcompat/files/warn.c
new file mode 100644
index 00000000000..e3522c854d3
--- /dev/null
+++ b/pkgtools/libnbcompat/files/warn.c
@@ -0,0 +1,115 @@
+/*	$NetBSD: warn.c,v 1.1 2004/08/23 03:32:13 jlam Exp $	*/
+
+/*
+ * Copyright 1997-2000 Luke Mewburn <lukem@netbsd.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: warn.c,v 1.1 2004/08/23 03:32:13 jlam Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#ifndef __NO_NAMESPACE_H	/* XXX */
+#if 0
+#include "namespace.h"
+#endif
+#endif
+#include <nbcompat/err.h>
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#if 0
+#ifdef __weak_alias
+__weak_alias(warn, _warn)
+#endif
+#endif
+
+void
+warn(const char *fmt, ...)
+{
+	va_list	ap;
+        int	sverrno;
+
+	sverrno = errno;
+        (void)fprintf(stderr, "%s: ", getprogname());
+	va_start(ap, fmt);
+        if (fmt != NULL) {
+                (void)vfprintf(stderr, fmt, ap);
+                (void)fprintf(stderr, ": ");
+        }
+	va_end(ap);
+        (void)fprintf(stderr, "%s\n", strerror(sverrno));
+}
+
+void
+warnx(const char *fmt, ...)
+{
+	va_list	ap;
+
+        (void)fprintf(stderr, "%s: ", getprogname());
+	va_start(ap, fmt);
+        if (fmt != NULL)
+                (void)vfprintf(stderr, fmt, ap);
+	va_end(ap);
+        (void)fprintf(stderr, "\n");
+}
+
+void
+vwarn(fmt, ap)
+	const char *fmt;
+	va_list ap;
+{
+	int sverrno;
+
+	sverrno = errno;
+	(void)fprintf(stderr, "%s: ", getprogname());
+	if (fmt != NULL) {
+		(void)vfprintf(stderr, fmt, ap);
+		(void)fprintf(stderr, ": ");
+	}
+	(void)fprintf(stderr, "%s\n", strerror(sverrno));
+}
+
+void
+vwarnx(fmt, ap)
+	const char *fmt;
+	va_list ap;
+{
+	(void)fprintf(stderr, "%s: ", getprogname());
+	if (fmt != NULL)
+		(void)vfprintf(stderr, fmt, ap);
+	(void)fprintf(stderr, "\n");
+}