Changes 2.27:

      docs: remove very basic git usage info
      docs: remove todo items that will never happen
      output: remove empty element from xml
      add touched addresses counts to xml and json reports
      add xml format check
      improve html output
      add hint about configure options to README
      man: fix character class change
      gitignore: update gnulib file list

4 files changed, 8 insertions, 90 deletions

diff --git a/net/dhcpd-pools/Makefile b/net/dhcpd-pools/Makefile
index 900d0ddaa9b..474d0211338 100644
--- a/net/dhcpd-pools/Makefile
+++ b/net/dhcpd-pools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/10/07 13:02:39 adam Exp $
 
-DISTNAME=	dhcpd-pools-2.16
-PKGREVISION=	5
+DISTNAME=	dhcpd-pools-2.27
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dhcpd-pools/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://dhcpd-pools.sourceforge.net/
@@ -27,4 +27,5 @@ SUBST_SED.fix-name=	-e 's,program_invocation_short_name,"dhcpd-pools",g'
 
 LDFLAGS.SunOS+=	-lnsl
 
+.include "../../devel/uthash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dhcpd-pools/distinfo b/net/dhcpd-pools/distinfo
index d4b6b702949..ba471fc9d3d 100644
--- a/net/dhcpd-pools/distinfo
+++ b/net/dhcpd-pools/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/11/05 14:26:44 he Exp $
+$NetBSD: distinfo,v 1.4 2015/10/07 13:02:39 adam Exp $
 
-SHA1 (dhcpd-pools-2.16.tar.gz) = 747546172df1027a3ed743822b6593eb8d9a3c82
-RMD160 (dhcpd-pools-2.16.tar.gz) = 646d172a5c6f1f2a5b7d800d732adbef248e8f21
-Size (dhcpd-pools-2.16.tar.gz) = 367461 bytes
-SHA1 (patch-src_dhcpd-pools.h) = 41fe0881bc3741189ea802337bab1ba4aaeeb9bc
-SHA1 (patch-src_getdata.c) = 4234ec99f8df193d56a2d818ff8951521a5c2a1d
+SHA1 (dhcpd-pools-2.27.tar.xz) = e386f4d4fb89c8fdd87163877ebd0fc208bb75f2
+RMD160 (dhcpd-pools-2.27.tar.xz) = 54d1f7ca0a4a421367416dc533bdb0c61d81448e
+Size (dhcpd-pools-2.27.tar.xz) = 633208 bytes
diff --git a/net/dhcpd-pools/patches/patch-src_dhcpd-pools.h b/net/dhcpd-pools/patches/patch-src_dhcpd-pools.h
deleted file mode 100644
index 05c3462e317..00000000000
--- a/net/dhcpd-pools/patches/patch-src_dhcpd-pools.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_dhcpd-pools.h,v 1.1 2011/07/20 07:03:53 adam Exp $
-
-Include <string.h> here.
-
---- src/dhcpd-pools.h.orig	2011-07-20 06:31:06.000000000 +0000
-+++ src/dhcpd-pools.h
-@@ -52,6 +52,12 @@ extern char *malloc();
- #define EXIT_SUCCESS	0
- #endif				/* STDC_HEADERS */
- 
-+#ifdef  HAVE_STRING_H
-+#include <string.h>
-+#else
-+#include <strings.h>
-+#endif
-+
- #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
- #  ifdef HAVE___PROGNAME
- extern char *__progname;
diff --git a/net/dhcpd-pools/patches/patch-src_getdata.c b/net/dhcpd-pools/patches/patch-src_getdata.c
deleted file mode 100644
index 4d821014574..00000000000
--- a/net/dhcpd-pools/patches/patch-src_getdata.c
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-src_getdata.c,v 1.2 2012/11/05 14:26:44 he Exp $
-
-Don't include features.h; move string.h to dhcpd-pools.h.
-Check return value of posix_fadvise(), not just whether errno != 0.
-
---- src/getdata.c.orig	2011-07-10 22:30:00.000000000 +0000
-+++ src/getdata.c
-@@ -43,19 +43,12 @@ extern char *malloc();
- #define EXIT_SUCCESS    0	/* Successful exit status.  */
- #endif				/* STDC_HEADERS */
- 
--#ifdef  HAVE_STRING_H
--#include <string.h>
--#else
--#include <strings.h>
--#endif
--
- #include <arpa/inet.h>
- #include <assert.h>
- #include <ctype.h>
- #include <err.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <features.h>
- #include <netinet/in.h>
- #include <stddef.h>
- #include <stdint.h>
-@@ -89,15 +82,13 @@ int parse_leases(void)
- 		err(EXIT_FAILURE, "parse_leases: %s", config.dhcpdlease_file);
- 	}
- #ifdef POSIX_FADV_WILLNEED
--	posix_fadvise(fileno(dhcpd_leases), 0, 0, POSIX_FADV_WILLNEED);
--	if (errno) {
-+	if (posix_fadvise(fileno(dhcpd_leases), 0, 0, POSIX_FADV_WILLNEED) != 0) {
- 		err(EXIT_FAILURE, "parse_leases: fadvise %s",
- 		    config.dhcpdlease_file);
- 	}
- #endif				/* POSIX_FADV_WILLNEED */
- #ifdef POSIX_FADV_SEQUENTIAL
--	posix_fadvise(fileno(dhcpd_leases), 0, 0, POSIX_FADV_SEQUENTIAL);
--	if (errno) {
-+	if (posix_fadvise(fileno(dhcpd_leases), 0, 0, POSIX_FADV_SEQUENTIAL) != 0) {
- 		err(EXIT_FAILURE, "parse_leases: fadvise %s",
- 		    config.dhcpdlease_file);
- 	}
-@@ -269,14 +260,12 @@ void parse_config(int is_include, char *
- 		err(EXIT_FAILURE, "parse_config: %s", config_file);
- 	}
- #ifdef POSIX_FADV_WILLNEED
--	posix_fadvise(fileno(dhcpd_config), 0, 0, POSIX_FADV_WILLNEED);
--	if (errno) {
-+	if (posix_fadvise(fileno(dhcpd_config), 0, 0, POSIX_FADV_WILLNEED) != 0) {
- 		err(EXIT_FAILURE, "parse_config: fadvise %s", config_file);
- 	}
- #endif				/* POSIX_FADV_WILLNEED */
- #ifdef POSIX_FADV_SEQUENTIAL
--	posix_fadvise(fileno(dhcpd_config), 0, 0, POSIX_FADV_SEQUENTIAL);
--	if (errno) {
-+	if (posix_fadvise(fileno(dhcpd_config), 0, 0, POSIX_FADV_SEQUENTIAL) != 0) {
- 		err(EXIT_FAILURE, "parse_config: fadvise %s", config_file);
- 	}
- #endif				/* POSIX_FADV_SEQUENTIAL */