[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files catch up with bootstrap-pkg...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6dc024592e7a
branches:  trunk
changeset: 470691:6dc024592e7a
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Mar 11 13:28:45 2004 +0000

description:
catch up with bootstrap-pkgsrc changes.

- check for existence of fsid_t type, and typedef it if missing
- check for existence of struct statvfs.f_basetype field
- if <sys/mkdev.h> is included and makedev() is missing, try to use mkdev()
- add replacement library file for utimes() by wrappering utime()

diffstat:

 pkgtools/libnbcompat/files/configure            |  189 +++++++++++++++++++++++-
 pkgtools/libnbcompat/files/configure.ac         |   15 +-
 pkgtools/libnbcompat/files/nbcompat.h           |    9 +-
 pkgtools/libnbcompat/files/nbcompat/config.h.in |    9 +
 pkgtools/libnbcompat/files/nbcompat/statfs.h    |    6 +-
 pkgtools/libnbcompat/files/statfs.c             |    6 +-
 6 files changed, 228 insertions(+), 6 deletions(-)

diffs (truncated from 362 to 300 lines):

diff -r 61a2c2a17451 -r 6dc024592e7a pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Thu Mar 11 13:28:37 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure      Thu Mar 11 13:28:45 2004 +0000
@@ -5491,6 +5491,80 @@
 
 fi
 
+echo "$as_me:$LINENO: checking for fsid_t" >&5
+echo $ECHO_N "checking for fsid_t... $ECHO_C" >&6
+if test "${ac_cv_type_fsid_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+
+int
+main ()
+{
+if ((fsid_t *) 0)
+  return 0;
+if (sizeof (fsid_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_fsid_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_fsid_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_fsid_t" >&5
+echo "${ECHO_T}$ac_cv_type_fsid_t" >&6
+if test $ac_cv_type_fsid_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FSID_T 1
+_ACEOF
+
+
+fi
+
 echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
@@ -6888,10 +6962,11 @@
 
 
 
+
 for ac_func in err fgetln fparseln fseeko getenv inet_ntop \
        inet_pton isblank lchflags lchmod lchown lutimes mkstemp mkdtemp \
        poll setprogname snprintf strdup strerror strlcat strlcpy \
-       strmode strptime strsep strtoll timegm usleep
+       strmode strptime strsep strtoll timegm usleep utimes
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9109,6 +9184,118 @@
   *) LIBOBJS="$LIBOBJS statfs.$ac_objext" ;;
 esac
 
+       echo "$as_me:$LINENO: checking for struct statvfs.f_basetype" >&5
+echo $ECHO_N "checking for struct statvfs.f_basetype... $ECHO_C" >&6
+if test "${ac_cv_member_struct_statvfs_f_basetype+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/statvfs.h>
+
+int
+main ()
+{
+static struct statvfs ac_aggr;
+if (ac_aggr.f_basetype)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_statvfs_f_basetype=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/statvfs.h>
+
+int
+main ()
+{
+static struct statvfs ac_aggr;
+if (sizeof ac_aggr.f_basetype)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_statvfs_f_basetype=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_member_struct_statvfs_f_basetype=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_basetype" >&5
+echo "${ECHO_T}$ac_cv_member_struct_statvfs_f_basetype" >&6
+if test $ac_cv_member_struct_statvfs_f_basetype = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATVFS_F_BASETYPE 1
+_ACEOF
+
+
+fi
+
 fi
 
 if test $ac_cv_type_long_long = yes; then
diff -r 61a2c2a17451 -r 6dc024592e7a pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac   Thu Mar 11 13:28:37 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac   Thu Mar 11 13:28:45 2004 +0000
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.36 2004/02/14 04:47:13 simonb Exp $
+dnl $NetBSD: configure.ac,v 1.37 2004/03/11 13:28:45 grant Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -114,6 +114,16 @@
 #if HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif])
+AC_CHECK_TYPES([fsid_t],[],[],
+[#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif])
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(off_t, 0)
 
@@ -125,7 +135,7 @@
 AC_REPLACE_FUNCS([err fgetln fparseln fseeko getenv inet_ntop \
        inet_pton isblank lchflags lchmod lchown lutimes mkstemp mkdtemp \
        poll setprogname snprintf strdup strerror strlcat strlcpy \
-       strmode strptime strsep strtoll timegm usleep])
+       strmode strptime strsep strtoll timegm usleep utimes])
 
 AC_CHECK_FUNCS([setgroupent setgrent setpassent setpwent])
 AC_CHECK_FUNCS([bcopy bzero memset memcpy setlocale])
@@ -219,6 +229,7 @@
                Define to 1 if the `statfs' function is built into the library.
        ])
        AC_LIBOBJ(statfs)
+       AC_CHECK_MEMBERS([struct statvfs.f_basetype],[],[],[#include <sys/statvfs.h>])
 fi
 
 if test $ac_cv_type_long_long = yes; then
diff -r 61a2c2a17451 -r 6dc024592e7a pkgtools/libnbcompat/files/nbcompat.h
--- a/pkgtools/libnbcompat/files/nbcompat.h     Thu Mar 11 13:28:37 2004 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat.h     Thu Mar 11 13:28:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbcompat.h,v 1.31 2004/01/14 08:58:41 grant Exp $      */
+/*     $NetBSD: nbcompat.h,v 1.32 2004/03/11 13:28:45 grant Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -233,6 +233,9 @@
 
 #if HAVE_SYS_MKDEV_H
 # include <sys/mkdev.h>
+# if !defined(makedev) && defined(mkdev)
+#  define makedev mkdev
+# endif
 #endif
 
 #if HAVE_SYS_MOUNT_H
@@ -600,4 +603,8 @@
 mode_t getmode(const void *, mode_t);
 #endif
 
+#ifndef HAVE_UTIMES
+int utimes(const char *, const struct timeval *);
+#endif
+
 #endif /* _NBCOMPAT_H */
diff -r 61a2c2a17451 -r 6dc024592e7a pkgtools/libnbcompat/files/nbcompat/config.h.in
--- a/pkgtools/libnbcompat/files/nbcompat/config.h.in   Thu Mar 11 13:28:37 2004 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/config.h.in   Thu Mar 11 13:28:45 2004 +0000
@@ -49,6 +49,9 @@
 /* Define to 1 if you have the `fseeko' function. */
 #undef HAVE_FSEEKO
 
+/* Define to 1 if the system has the type `fsid_t'. */
+#undef HAVE_FSID_T
+
 /* Define to 1 if you have the <fts.h> header file. */
 #undef HAVE_FTS_H