 @@ -6046,91 +6046,144 @@ else
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
 as_val=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
   { $as_echo "$as_me:$LINENO: checking for struct option" >&5
 	{ $as_echo "$as_me:$LINENO: checking for struct option" >&5
 $as_echo_n "checking for struct option... " >&6; }
-if test "${pkg_cv_have_struct_option+set}" = set; then
+if test "${ac_cv_type_struct_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_type_struct_option=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <getopt.h>
-		cat >conftest.$ac_ext <<_ACEOF
+int
 main ()
+{
 if (sizeof (struct option))
        return 0;
+  ;
   return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-  #include <getopt.h>
+#include <getopt.h>
 int
 main ()
+{
-  struct option X; ;
+if (sizeof ((struct option)))
 	  return 0;
+  ;
   return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
    pkg_cv_have_struct_option=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-	 pkg_cv_have_struct_option=no
+	ac_cv_type_struct_option=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 { $as_echo "$as_me:$LINENO: result: $pkg_cv_have_struct_option" >&5
-$as_echo "$pkg_cv_have_struct_option" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	if test "x$pkg_cv_have_struct_option" = "xyes"; then
+fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_option" >&5
-	else
+$as_echo "$ac_cv_type_struct_option" >&6; }
-		case " $LIBOBJS " in
+if test "x$ac_cv_type_struct_option" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_OPTION 1
 _ACEOF
+:
 else
    case " $LIBOBJS " in
   *" getopt_long.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
  ;;
 esac
 fi
 	fi
 else
    case " $LIBOBJS " in
   *" getopt_long.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
  ;;
 esac
 fi
 done
 if test "$enable_bsd_getopt" = yes; then
 	if test "$ac_cv_have_decl_optreset" = no; then
 		case " $LIBOBJS " in
   *" getopt.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;

 @@ -1,14 +1,14 @@
-dnl $NetBSD: configure.ac,v 1.72 2009/03/22 22:33:13 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.73 2009/04/13 11:30:46 joerg Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT([libnbcompat], [20080519], [grant@NetBSD.org])
 AC_CONFIG_HEADER(nbcompat/config.h)
 AC_ARG_PROGRAM
 AC_CANONICAL_HOST
 CANONICAL_HOST=$host
 AC_SUBST(CANONICAL_HOST)
 AC_SUBST(INCLUDES)
 # Checks for programs.
 @@ -138,32 +138,33 @@ AC_SUBST(WITH_DB, $enable_db)
 AC_CHECK_FUNCS(issetugid)
 AC_ARG_ENABLE([bsd-getopt],
 	[AS_HELP_STRING([--enable-bsd-getopt],
 			[force use of BSDish getopt implementation])])
 AC_CHECK_DECLS([optind, optreset], [:], [:], [
 	#include <stdio.h>
 	#include <stdlib.h>
 	#include <unistd.h>
 ])
-AC_CHECK_HEADERS([getopt.h], [
+AC_CHECK_HEADERS([getopt.h],
-	AC_MSG_TRY_COMPILE([for struct option], pkg_cv_have_struct_option,
+	[ AC_CHECK_TYPES([struct option],
-		[ #include <getopt.h> ], [ struct option X; ],
+	    [:],
-		[:],
+	    [ AC_LIBOBJ(getopt_long)],
-		[AC_LIBOBJ(getopt_long)])
+	    [#include <getopt.h>])],
-])
+	[ AC_LIBOBJ(getopt_long)]
+)
 if test "$enable_bsd_getopt" = yes; then
 	if test "$ac_cv_have_decl_optreset" = no; then
 		AC_LIBOBJ(getopt)
 	fi
 fi
 dnl Check that this vis.h has *vis()-related functions because Solaris'
 dnl vis.h doesn't.  Also, only consider the header found if it defines
 dnl all of the functions that we need.
 dnl
 pkg_use_nbcompat_vis=yes
 AC_CHECK_HEADERS([vis.h], [

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nbcompat.h,v 1.42 2008/10/19 21:02:07 joerg Exp $	*/
+/*	$NetBSD: nbcompat.h,v 1.43 2009/04/13 11:30:46 joerg Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * 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.
 @@ -118,19 +118,17 @@
 #if HAVE_NBCOMPAT_SHA1
 # if HAVE_SHA1_H
 #  undef HAVE_SHA1_H
 # endif
 #endif
 #if HAVE_NBCOMPAT_VIS
 # if HAVE_VIS_H
 #  undef HAVE_VIS_H
 # endif
 # include <nbcompat/vis.h>
 #endif
-#if HAVE_NBCOMPAT_GETOPT_LONG
+#if !HAVE_GETOPT_H || !HAVE_STRUCT_OPTION
-# if HAVE_GETOPT_H
+# undef HAVE_GETOPT_H
 #  undef HAVE_GETOPT_H
 # endif
 # include <nbcompat/getopt.h>
 #endif

 @@ -196,29 +196,26 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 /* Define to 1 if you have the `mkdtemp' function. */
 #undef HAVE_MKDTEMP
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 /* Define to 1 if the `fts_*' functions are built into the library. */
 #undef HAVE_NBCOMPAT_FTS
 /* Define to 1 if the `getopt_long' function is built into the library. */
 #undef HAVE_NBCOMPAT_GETOPT_LONG
 /* Define to 1 if the `glob' function is built into the library. */
 #undef HAVE_NBCOMPAT_GLOB
 /* Define to 1 if the `MD5*' functions are built into the library. */
 #undef HAVE_NBCOMPAT_MD5
 /* Define to 1 if the `MD5Init' function is built into the library. */
 #undef HAVE_NBCOMPAT_MD5INIT
 /* Define to 1 if the `poll' function is built into the library. */
 #undef HAVE_NBCOMPAT_POLL
 /* Define to 1 if the `queue' macros are supplied by the library. */
 @@ -359,26 +356,29 @@
 /* Define to 1 if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 /* Define to 1 if the system has the type `struct addrinfo'. */
 #undef HAVE_STRUCT_ADDRINFO
 /* Define to 1 if `d_namlen' is member of `struct dirent'. */
 #undef HAVE_STRUCT_DIRENT_D_NAMLEN
 /* Define to 1 if the system has the type `struct in6_addr'. */
 #undef HAVE_STRUCT_IN6_ADDR
 /* Define to 1 if the system has the type `struct option'. */
 #undef HAVE_STRUCT_OPTION
 /* Define to 1 if the system has the type `struct sockaddr_in6'. */
 #undef HAVE_STRUCT_SOCKADDR_IN6
 /* Define to 1 if the system has the type `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 /* Define to 1 if `f_flags' is member of `struct statfs'. */
 #undef HAVE_STRUCT_STATFS_F_FLAGS
 /* Define to 1 if `f_fsize' is member of `struct statfs'. */
 #undef HAVE_STRUCT_STATFS_F_FSIZE
 /* Define to 1 if `f_iosize' is member of `struct statfs'. */

 @@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.70 2009/03/22 22:33:13 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2009/04/13 11:30:46 joerg Exp $
+#
 # NOTE: If you update this package, it is *mandatory* that you update
 # 	pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #	list of tested and supported platforms.
+#
-DISTNAME=		libnbcompat-20090322
+DISTNAME=		libnbcompat-20090413
 CATEGORIES=		pkgtools devel
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		grant@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/
 COMMENT=		Portable NetBSD compatibility library
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		LIBMODE=${LIBMODE}