libnbcompat-20080519:

Many of the hash function headers are incompatible with the OpenSSL
headers, so don't include them by default and require the caller to
include them on demand.

3 files changed, 12 insertions, 15 deletions

diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index 0f9dd582cf7..19b593aae64 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libnbcompat 20070622.
+# Generated by GNU Autoconf 2.62 for libnbcompat 20080519.
 #
 # Report bugs to <grant@NetBSD.org>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libnbcompat'
 PACKAGE_TARNAME='libnbcompat'
-PACKAGE_VERSION='20070622'
-PACKAGE_STRING='libnbcompat 20070622'
+PACKAGE_VERSION='20080519'
+PACKAGE_STRING='libnbcompat 20080519'
 PACKAGE_BUGREPORT='grant@NetBSD.org'
 
 # Factoring default headers for most tests.
@@ -1271,7 +1271,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libnbcompat 20070622 to adapt to many kinds of systems.
+\`configure' configures libnbcompat 20080519 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1341,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libnbcompat 20070622:";;
+     short | recursive ) echo "Configuration of libnbcompat 20080519:";;
    esac
   cat <<\_ACEOF
 
@@ -1427,7 +1427,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libnbcompat configure 20070622
+libnbcompat configure 20080519
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1441,7 +1441,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libnbcompat $as_me 20070622, which was
+It was created by libnbcompat $as_me 20080519, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -14291,7 +14291,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libnbcompat $as_me 20070622, which was
+This file was extended by libnbcompat $as_me 20080519, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14340,7 +14340,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libnbcompat config.status 20070622
+libnbcompat config.status 20080519
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index 3b81d0a59d6..da822490cd7 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,8 +1,8 @@
-dnl $NetBSD: configure.ac,v 1.62 2008/04/21 22:24:43 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.63 2008/05/19 12:52:57 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([libnbcompat], [20070622], [grant@NetBSD.org])
+AC_INIT([libnbcompat], [20080519], [grant@NetBSD.org])
 AC_CONFIG_HEADER(nbcompat/config.h)
 AC_ARG_PROGRAM
 
diff --git a/pkgtools/libnbcompat/files/nbcompat.h b/pkgtools/libnbcompat/files/nbcompat.h
index 1f2ca928d05..41be3a5958a 100644
--- a/pkgtools/libnbcompat/files/nbcompat.h
+++ b/pkgtools/libnbcompat/files/nbcompat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbcompat.h,v 1.39 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: nbcompat.h,v 1.40 2008/05/19 12:52:57 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -108,21 +108,18 @@
 # if HAVE_MD5_H
 #  undef HAVE_MD5_H
 # endif
-# include <nbcompat/md5.h>
 #endif
 
 #if HAVE_NBCOMPAT_RMD160
 # if HAVE_RMD160_H
 #  undef HAVE_RMD160_H
 # endif
-# include <nbcompat/rmd160.h>
 #endif
 
 #if HAVE_NBCOMPAT_SHA1
 # if HAVE_SHA1_H
 #  undef HAVE_SHA1_H
 # endif
-# include <nbcompat/sha1.h>
 #endif
 
 #if HAVE_NBCOMPAT_VIS