Update pkgtools/libnbcompat to 20040809. Changes from version 20040805

include:

   * Re-adding a default value for pkg_use_nbcompat_vis; this was
     causing the configure script to fail on platforms that had funky
     versions of vis().  This should fix reported problems on Solaris 8
     and on IRIX 5.3.

   * Added setgroupent() and setpassent() compatibility functions so
     that pwcache.c will build without complaining about an incompatible
     pointer type assignment.

   * Remove unused tests for <arpa/nameser.h>, <netdb.h>, h_errno and
     hstrerror().  These were originally used to bootstrap lukemftp, but
     tnftp doesn't need libnbcompat to build nowadays, so we don't need
     these anymore.

   * Cleanup: in cases where we test for a function using AC_REPLACE_FUNCS,
     move the function prototype into a nbcompat header that is the
     same name as the NetBSD header that contains that declaration,
     and include that file in place of the original one within
     nbcompat.h.

This version has been tested to build on the following systems:

	FreeBSD-4.8/i386	NetBSD-1.6.2/i386
	FreeBSD-5.2.1/i386	NetBSD-2.0_BETA/i386
	IRIX 6.5		Red Hat Linux 8.0
	MacOS X 10.3.4		Solaris 8
	MacOS X 10.3.5		Solaris 9

1 files changed, 15 insertions, 293 deletions

diff --git a/pkgtools/libnbcompat/files/nbcompat.h b/pkgtools/libnbcompat/files/nbcompat.h
index a766af48afe..8bdad20bc46 100644
--- a/pkgtools/libnbcompat/files/nbcompat.h
+++ b/pkgtools/libnbcompat/files/nbcompat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbcompat.h,v 1.35 2004/08/06 16:55:09 jlam Exp $	*/
+/*	$NetBSD: nbcompat.h,v 1.36 2004/08/10 18:47:55 jlam Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -41,36 +41,33 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
-#include <netdb.h>
-#include <pwd.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <termios.h>
-#include <unistd.h>
 
-/* Augment <sys/queue.h> with any needed macros that are missing. */
-#if HAVE_SYS_QUEUE_H
-# include <sys/queue.h>
-#endif
+#include <nbcompat/fnmatch.h>
+#include <nbcompat/grp.h>
+#include <nbcompat/limits.h>
+#include <nbcompat/paths.h>
+#include <nbcompat/pwd.h>
 #include <nbcompat/queue.h>
+#include <nbcompat/stat.h>
+#include <nbcompat/statvfs.h>
+#include <nbcompat/stdlib.h>
+#include <nbcompat/stdio.h>
+#include <nbcompat/string.h>
+#include <nbcompat/time.h>
+#include <nbcompat/tzfile.h>
+#include <nbcompat/unistd.h>
+#include <nbcompat/util.h>
 
 #if !HAVE_POLL
 # undef HAVE_POLL_H
@@ -100,17 +97,6 @@
 # include <nbcompat/fts.h>
 #endif
 
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
 #if HAVE_ASSERT_H
 # include <assert.h>
 #endif
@@ -135,24 +121,6 @@
 # endif
 #endif
 
-#if HAVE_PATHS_H
-# include <paths.h>
-#endif
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL	"/bin/sh"
-#endif
-#ifndef _PATH_TMP
-#define _PATH_TMP	"/tmp/"
-#endif
-
-#ifndef _PATH_DEFTAPE
-# ifdef DEFTAPE
-#  define _PATH_DEFTAPE DEFTAPE
-# else
-#  define _PATH_DEFTAPE "/dev/tape"
-# endif /* DEFTAPE */
-#endif /* _PATH_DEFTAPE */
-
 #if HAVE_TERMCAP_H
 # include <termcap.h>
 #else
@@ -164,51 +132,6 @@ char	*tgoto(const char *, int, int);
 void	 tputs(const char *, int, int (*)(int));
 #endif
 
-/* not all systems define all of these in tzfile.h */
-#if HAVE_TZFILE_H
-# include <tzfile.h>
-#endif
-
-#ifndef DAYSPERNYEAR
-# define DAYSPERNYEAR	365
-#endif
-
-#ifndef EPOCH_YEAR
-# define EPOCH_YEAR	1970
-#endif
-
-#ifndef HOURSPERDAY
-# define HOURSPERDAY	24
-#endif
-
-#ifndef MINSPERHOUR
-# define MINSPERHOUR	60
-#endif
-
-#ifndef SECSPERHOUR
-# define SECSPERHOUR	3600
-#endif
-
-#ifndef SECSPERMIN
-# define SECSPERMIN	60
-#endif
-
-#ifndef SECSPERDAY
-# define SECSPERDAY	86400
-#endif
-
-#ifndef TM_YEAR_BASE
-# define TM_YEAR_BASE	1900
-#endif
-
-#if HAVE_UTIL_H
-# include <util.h>
-#endif
-
-#if HAVE_LIBUTIL_H
-# include <libutil.h>
-#endif
-
 #if HAVE_NBCOMPAT_MD5INIT
 # if HAVE_MD5_H
 #  undef HAVE_MD5_H
@@ -250,169 +173,14 @@ void	 tputs(const char *, int, int (*)(int));
 # include <nbcompat/getopt.h>
 #endif
 
-#if !HAVE_OPTARG_D
-extern char    *optarg;
-#endif
-
-#if !HAVE_OPTIND_D
-extern int	optind;
-#endif
-
 #if !HAVE_D_NAMLEN
 # define DIRENT_MISSING_D_NAMLEN
 #endif
 
-#if !HAVE_H_ERRNO_D
-#ifndef _AIX
-extern int	h_errno;
-#endif
-#endif
-#define HAVE_H_ERRNO	1		/* XXX: an assumption for now... */
-
-#if !HAVE_FCLOSE_D
-int	fclose(FILE *);
-#endif
-
 #if !HAVE_ISBLANK
 int     isblank(int);
 #endif
 
-#if !HAVE_GETPASS_D
-char	*getpass(const char *);
-#endif
-
-#if !HAVE_PCLOSE_D
-int	pclose(FILE *);
-#endif
-
-#if !HAVE_FGETLN
-char   *fgetln(FILE *, size_t *);
-#endif
-
-#if !HAVE_FPARSELN
-# define FPARSELN_UNESCESC	0x01
-# define FPARSELN_UNESCCONT	0x02
-# define FPARSELN_UNESCCOMM	0x04
-# define FPARSELN_UNESCREST	0x08
-# define FPARSELN_UNESCALL	0x0f
-char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
-#endif
-
-#if !HAVE_MKSTEMP
-int	mkstemp(char *);
-#endif
-
-#if !HAVE_MKDTEMP
-char   *mkdtemp(char *);
-#endif
-
-#if !HAVE_LCHMOD
-int	lchmod(const char *, mode_t);
-#endif
-
-#if !HAVE_LCHOWN
-int	lchown(const char *, uid_t, gid_t);
-#endif
-
-#if !HAVE_SETPROGNAME
-const char *getprogname(void);
-void	setprogname(const char *);
-#endif
-
-#if !HAVE_SNPRINTF
-int	snprintf(char *, size_t, const char *, ...);
-#endif
-
-#if !HAVE_STRDUP
-char   *strdup(const char *);
-#endif
-
-#if !HAVE_STRERROR
-char   *strerror(int);
-#endif
-
-#if !HAVE_STRMODE
-void strmode(mode_t, char *);
-#endif
-
-#if HAVE_WORKING_LONG_LONG
-# if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
-long long strtoll(const char *, char **, int);
-# endif
-# if ! defined(LLONG_MAX)
-#  if defined(LONG_LONG_MAX)
-#   define LLONG_MAX	LONG_LONG_MAX
-#  else
-#   define LLONG_MAX	(0x7fffffffffffffffLL)
-#  endif
-# endif
-# if ! defined(LLONG_MIN)
-#  if defined(LONG_LONG_MIN)
-#   define LLONG_MIN	LONG_LONG_MIN
-#  else
-#   define LLONG_MIN	(-0x7fffffffffffffffLL-1)
-#  endif
-# endif
-#else	/* ! HAVE_WORKING_LONG_LONG */
-# define NO_LONG_LONG	1
-#endif	/* ! HAVE_WORKING_LONG_LONG */
-
-#if ! defined(LLONG_MAX)
-# define LLONG_MAX	0x7fffffffffffffffLL	/* max long long */
-#endif
-
-#if ! defined(ULLONG_MAX)
-# define ULLONG_MAX	0xffffffffffffffffULL	/* max unsigned long long */
-#endif
-
-#if !HAVE_HSTRERROR
-char   *strerror(int);
-#endif
-
-#if !HAVE_STRLCAT
-size_t	strlcat(char *, const char *, size_t);
-#endif
-
-#if !HAVE_STRLCPY
-size_t	strlcpy(char *, const char *, size_t);
-#endif
-
-#if !HAVE_STRSEP
-char   *strsep(char **stringp, const char *delim);
-#endif
-
-#if !HAVE_USER_FROM_UID
-const char *user_from_uid(uid_t, int);
-#endif
-
-#if !HAVE_GROUP_FROM_GID
-const char *group_from_gid(gid_t, int);
-#endif
-
-#if !HAVE_UID_FROM_USER
-int uid_from_user(const char *, uid_t *);
-#endif
-
-#if !HAVE_GID_FROM_GROUP
-int gid_from_group(const char *, gid_t *);
-#endif
-
-#if !HAVE_FNMATCH
-# include <nbcompat/fnmatch.h>
-#endif
-
-#if HAVE_NBCOMPAT_STATVFS
-# if HAVE_SYS_STATVFS_H
-#  undef HAVE_SYS_STATVFS_H
-# endif
-# include <nbcompat/statvfs.h>
-#endif
-
-#if !HAVE_MEMMOVE
-# define memmove(a,b,c)	bcopy((b),(a),(c))
-	/* XXX: add others #defines for borken systems? */
-#endif
-
 #if HAVE_GETPASSPHRASE
 # define getpass getpassphrase
 #endif
@@ -424,50 +192,4 @@ int gid_from_group(const char *, gid_t *);
 # define MAX(a, b)	((a) < (b) ? (b) : (a))
 #endif
 
-#if !defined(timersub)
-# define timersub(tvp, uvp, vvp)					\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-#endif
-
-/* not all systems define all of these in sys/stat.h */
-#if !defined(S_ISLNK)
-# define S_ISLNK(m)	((m & S_IFMT) == S_IFLNK)
-#endif
-
-#if !defined(S_ISTXT)
-# define S_ISTXT S_ISVTX
-#endif
-
-#if !defined(ALLPERMS)
-# define ALLPERMS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
-#endif
-
-/* not all systems define all of these in limits.h */
-#ifndef GID_MAX
-# define GID_MAX	2147483647U  /* max value for a gid_t (2^31-2) */
-#endif
-
-#ifndef UID_MAX
-# define UID_MAX	2147483647U  /* max value for a uid_t (2^31-2) */
-#endif
-
-#if !HAVE_SETMODE
-void *setmode(const char *);
-#endif
-
-#if !HAVE_GETMODE
-mode_t getmode(const void *, mode_t);
-#endif
-
-#if !HAVE_UTIMES
-int utimes(const char *, const struct timeval *);
-#endif
-
 #endif /* !_NBCOMPAT_H */