libnbcompat-20140725:

  Newer Linux systems have moved libutil.h to bsd/libutil.h, add the
  necessary checks for that location.  Fixes at least Ubuntu 12.04.

6 files changed, 22 insertions, 12 deletions

diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index cf3f558fa22..227f73a0b3a 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.80 2014/03/03 03:30:53 obache Exp $
+# $NetBSD: Makefile,v 1.81 2014/07/25 13:26:24 jperkin 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.
 #
 
-PKGNAME=		libnbcompat-20130908
+PKGNAME=		libnbcompat-20140725
 CATEGORIES=		pkgtools devel
 
 MAINTAINER=		joerg@NetBSD.org
diff --git a/pkgtools/libnbcompat/files/README b/pkgtools/libnbcompat/files/README
index a01b722d7ad..347a63d10b8 100644
--- a/pkgtools/libnbcompat/files/README
+++ b/pkgtools/libnbcompat/files/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.19 2013/09/08 16:24:43 ryoon Exp $
+$NetBSD: README,v 1.20 2014/07/25 13:26:24 jperkin Exp $
 
  0 Introduction
  ==============
@@ -91,6 +91,11 @@ on the following operating systems:
 	DragonFly/amd64 3.4.1		<ryoon@NetBSD.org>
 	Debian GNU/Linux/amd64 7.1	<ryoon@NetBSD.org>
 
+libnbcompat-20140725 has been tested to build and install correctly
+on the following operating systems:
+
+	Ubuntu GNU/Linux/amd64 12.04	<jperkin@joyent.com>
+
  3 Usage
  =======
 
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index f97e295a351..0c157efbe56 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -4383,9 +4383,9 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 fi
 
 
-for ac_header in alloca.h assert.h ctype.h dirent.h endian.h err.h errno.h \
-	fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h limits.h \
-	machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
+for ac_header in alloca.h assert.h bsd/libutil.h ctype.h dirent.h endian.h \
+	err.h errno.h fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h \
+	limits.h machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
 	stdarg.h stddef.h stdint.h stdio.h \
 	stdlib.h string.h sys/byteorder.h sys/cdefs.h sys/dir.h sys/endian.h \
 	sys/file.h sys/mkdev.h sys/ndir.h sys/param.h sys/socket.h sys/stat.h \
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index 204014d3fe5..7fc8a61cad7 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.82 2014/03/14 22:08:17 ryoon Exp $
+dnl $NetBSD: configure.ac,v 1.83 2014/07/25 13:26:24 jperkin Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -33,9 +33,9 @@ AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_STDBOOL
 
-AC_CHECK_HEADERS([alloca.h assert.h ctype.h dirent.h endian.h err.h errno.h \
-	fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h limits.h \
-	machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
+AC_CHECK_HEADERS([alloca.h assert.h bsd/libutil.h ctype.h dirent.h endian.h \
+	err.h errno.h fcntl.h fnmatch.h fts.h grp.h inttypes.h libutil.h \
+	limits.h machine/endian.h ndir.h netdb.h paths.h pwd.h signal.h \
 	stdarg.h stddef.h stdint.h stdio.h \
 	stdlib.h string.h sys/byteorder.h sys/cdefs.h sys/dir.h sys/endian.h \
 	sys/file.h sys/mkdev.h sys/ndir.h sys/param.h sys/socket.h sys/stat.h \
diff --git a/pkgtools/libnbcompat/files/nbcompat/config.h.in b/pkgtools/libnbcompat/files/nbcompat/config.h.in
index ce8d2240e76..dbfe4b096b1 100644
--- a/pkgtools/libnbcompat/files/nbcompat/config.h.in
+++ b/pkgtools/libnbcompat/files/nbcompat/config.h.in
@@ -174,6 +174,9 @@
 /* Define to 1 if you have the `util' library (-lutil). */
 #undef HAVE_LIBUTIL
 
+/* Define to 1 if you have the <bsd/libutil.h> header file. */
+#undef HAVE_BSD_LIBUTIL_H
+
 /* Define to 1 if you have the <libutil.h> header file. */
 #undef HAVE_LIBUTIL_H
 
diff --git a/pkgtools/libnbcompat/files/nbcompat/util.h b/pkgtools/libnbcompat/files/nbcompat/util.h
index fd1b84903d6..29c6c7e7e4c 100644
--- a/pkgtools/libnbcompat/files/nbcompat/util.h
+++ b/pkgtools/libnbcompat/files/nbcompat/util.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.2 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: util.h,v 1.3 2014/07/25 13:26:24 jperkin Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -35,7 +35,9 @@
 #if HAVE_UTIL_H
 # include <util.h>
 #endif
-#if HAVE_LIBUTIL_H
+#if HAVE_BSD_LIBUTIL_H
+# include <bsd/libutil.h>
+#elif HAVE_LIBUTIL_H
 # include <libutil.h>
 #endif