Resolve conflicts in 8.3.6, generally in favor of the vendor code

1 files changed, 19 insertions, 9 deletions

diff --git a/contrib/bind/port/freebsd/include/port_after.h b/contrib/bind/port/freebsd/include/port_after.h
index 128e2ea..fd768744 100644
--- a/contrib/bind/port/freebsd/include/port_after.h
+++ b/contrib/bind/port/freebsd/include/port_after.h
@@ -8,13 +8,19 @@
 #define HAVE_GETRUSAGE
 #define HAVE_FCHMOD
 #define HAVE_SA_LEN
-#define SETPWENT_VOID
-#define RLIMIT_TYPE rlim_t
-#define RLIMIT_LONGLONG
-#define RLIMIT_FILE_INFINITY
 #define HAVE_MINIMUM_IFREQ
+#define USE_LOG_CONS
 #define HAVE_CHROOT
 #define CAN_CHANGE_ID
+#define USE_IFNAMELINKID
+#if __FreeBSD_version >= 330000
+#define HAVE_STRLCPY
+#define HAVE_STRLCAT
+#endif
+
+#define DIG_PING "/sbin/ping"
+#define DIG_TAIL "/usr/bin/tail"
+#define DIG_PINGFMT "%s -q -c 3 %s | %s -3"
 
 #define _TIMEZONE timezone
 
@@ -25,8 +31,14 @@
 #define KMEM		"/dev/kmem"
 #define UDPSUM		"udpcksum"
 
-#include <sys/types.h>
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 500041
+#undef NEED_PSELECT
 #include <sys/select.h>
+#else
+#define NEED_PSELECT
+#endif
+
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
 #if (!defined(BSD)) || (BSD < 199306)
@@ -47,10 +59,8 @@
  * derived systems for which AF_INET6 is defined.
  */
 #ifndef AF_INET6
-#define AF_INET6	28
-#endif
-
-#ifdef SIN6_LEN
+#define AF_INET6	24
+#else
 #define HAS_INET6_STRUCTS
 #define HAVE_SA_LEN
 #endif