Update pkgtools/libnbcompat to 20030827. Changes from previous version

include only building __fts13.o into libnbcompat.a if the fts_*()
functions aren't present in the system.

6 files changed, 98 insertions, 8 deletions

diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index 8e740ce41fa..dddb26f162b 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/09/03 13:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/03 16:38:36 jlam Exp $
 #
 
-DISTNAME=		libnbcompat-20030826
+DISTNAME=		libnbcompat-20030827
 CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/libnbcompat/buildlink2.mk b/pkgtools/libnbcompat/buildlink2.mk
index 6604c1636e6..60557db6193 100644
--- a/pkgtools/libnbcompat/buildlink2.mk
+++ b/pkgtools/libnbcompat/buildlink2.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/09/03 13:11:12 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/09/03 16:38:37 jlam Exp $
 
 .if !defined(LIBNBCOMPAT_BUILDLINK2_MK)
 LIBNBCOMPAT_BUILDLINK2_MK=     # defined
 
-BUILDLINK_DEPENDS.libnbcompat?=		libnbcompat>=20030826
+BUILDLINK_DEPENDS.libnbcompat?=		libnbcompat>=20030827
 BUILDLINK_PKGSRCDIR.libnbcompat?=	../../pkgtools/libnbcompat
 BUILDLINK_DEPMETHOD.libnbcompat?=	build
 
diff --git a/pkgtools/libnbcompat/files/Makefile.in b/pkgtools/libnbcompat/files/Makefile.in
index b2e8f6ed2a7..26ddc736c73 100644
--- a/pkgtools/libnbcompat/files/Makefile.in
+++ b/pkgtools/libnbcompat/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.13 2003/09/03 13:11:13 jlam Exp $
+# $NetBSD: Makefile.in,v 1.14 2003/09/03 16:38:38 jlam Exp $
 #
 
 srcdir=		@srcdir@
@@ -27,9 +27,8 @@ INCS=		extern.h ftpglob.h getopt.h md5.h mtree.h nbcompat.h \
 
 OBJS=		@LIBOBJS@ \
 		md5c.o md5hl.o rmd160.o rmd160hl.o sha1.o sha1hl.o \
-		sha2.o sha2hl.o setmode.o __fts13.o getid.o misc.o \
-		pack_dev.o spec.o setmode.o stat_flags.o pwcache.o \
-		getopt_long.o
+		sha2.o sha2hl.o setmode.o getid.o misc.o pack_dev.o \
+		spec.o setmode.o stat_flags.o pwcache.o getopt_long.o
 
 LINK=		$(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
 COMPILE=	$(CC) $(CPPFLAGS) $(CFLAGS)
@@ -71,6 +70,7 @@ bits: bits.c
 	$(CC) -o bits bits.c
 
 install:
+	$(INSTALL) -m 755 -d $(prefix)/lib
 	$(INSTALL) -m 555 ${LIB} $(prefix)/lib
 	$(RANLIB) $(prefix)/lib/$(LIB)
 	$(INSTALL) -m 755 -d $(prefix)/include/libnbcompat
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index 7b60fe2cfb1..aae73b27503 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -6281,6 +6281,92 @@ fi
 done
 
 
+for ac_func in fts_open
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (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
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ :
+else
+  LIBOBJS="$LIBOBJS __fts13.$ac_objext"
+fi
+done
+
+
 
 
 
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index 3b7d89ed913..05be5695722 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -90,6 +90,7 @@ AC_CHECK_FUNCS([bcopy bzero memset memcpy setlocale])
 AC_CHECK_FUNCS([getmode setmode])
 AC_CHECK_FUNCS([gid_from_group group_from_gid pwcache_groupdb pwcache_userdb \
 		uid_from_user user_from_uid])
+AC_CHECK_FUNCS(fts_open, [:], [AC_LIBOBJ(__fts13)])
 
 AC_CHECK_FUNCS([strunvis strvis strsvis],
 	[pkg_use_nbcompat_vis=no],
diff --git a/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in b/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in
index 6715c64c501..f90acd51f47 100644
--- a/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in
+++ b/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in
@@ -52,6 +52,9 @@
 /* Define to 1 if you have the <fts.h> header file. */
 #undef HAVE_FTS_H
 
+/* Define to 1 if you have the `fts_open' function. */
+#undef HAVE_FTS_OPEN
+
 /* Define to 1 if you have the `getenv' function. */
 #undef HAVE_GETENV