[src/trunk]: src/external/bsd/blacklist/port more FreeBSD changes from Kurt L...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a969e5a68864
branches:  trunk
changeset: 344581:a969e5a68864
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 05 12:28:57 2016 +0000

description:
more FreeBSD changes from Kurt Lidl.

diffstat:

 external/bsd/blacklist/port/config.h            |  4 ++++
 external/bsd/blacklist/port/pidfile.c           |  7 +++++--
 external/bsd/blacklist/port/port.h              |  2 ++
 external/bsd/blacklist/port/sockaddr_snprintf.c |  7 +++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (77 lines):

diff -r 189f02bf712b -r a969e5a68864 external/bsd/blacklist/port/config.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/blacklist/port/config.h      Tue Apr 05 12:28:57 2016 +0000
@@ -0,0 +1,4 @@
+#if defined(__FreeBSD__)
+#define HAVE_FPARSELN
+#include "port.h"
+#endif
diff -r 189f02bf712b -r a969e5a68864 external/bsd/blacklist/port/pidfile.c
--- a/external/bsd/blacklist/port/pidfile.c     Tue Apr 05 10:58:04 2016 +0000
+++ b/external/bsd/blacklist/port/pidfile.c     Tue Apr 05 12:28:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pidfile.c,v 1.1 2015/01/22 16:19:53 christos Exp $     */
+/*     $NetBSD: pidfile.c,v 1.2 2016/04/05 12:28:57 christos Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidfile.c,v 1.1 2015/01/22 16:19:53 christos Exp $");
+__RCSID("$NetBSD: pidfile.c,v 1.2 2016/04/05 12:28:57 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -45,6 +45,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
diff -r 189f02bf712b -r a969e5a68864 external/bsd/blacklist/port/port.h
--- a/external/bsd/blacklist/port/port.h        Tue Apr 05 10:58:04 2016 +0000
+++ b/external/bsd/blacklist/port/port.h        Tue Apr 05 12:28:57 2016 +0000
@@ -78,7 +78,9 @@
 #define CLOCK_REALTIME 0
 #endif
 
+#if !defined(__FreeBSD__)
 #define _PATH_BLCONF "conf"
 #define _PATH_BLCONTROL "control"
 #define _PATH_BLSOCK "blacklistd.sock"
 #define _PATH_BLSTATE "blacklistd.db"
+#endif
diff -r 189f02bf712b -r a969e5a68864 external/bsd/blacklist/port/sockaddr_snprintf.c
--- a/external/bsd/blacklist/port/sockaddr_snprintf.c   Tue Apr 05 10:58:04 2016 +0000
+++ b/external/bsd/blacklist/port/sockaddr_snprintf.c   Tue Apr 05 12:28:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockaddr_snprintf.c,v 1.9 2015/01/23 03:29:18 christos Exp $   */
+/*     $NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $  */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.9 2015/01/23 03:29:18 christos Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -57,6 +57,9 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif