Merge commit '0343d066dab077d1391640c53198199b16bef993' into integrated

diff --cc configure.in
index 2fa474a30eb71b95c49ecacd020872b79118ce42,54993dfce457e020a1949b2974a702711340b86f..3059d79282bce0723b29d5164c0c71e3d8688479
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -121,8 -138,22 +121,10 @@@ els
                                CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
                                LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
                                ;;
 -              ipv6:freebsd*)  sysdesc=bsd-v6
 -                              ;;
 -              ipv4:freebsd*)  sysdesc=bsd
 -                              ;;
 -              ipv6:dragonfly*)        sysdesc=bsd-v6
 -                              ;;
 -              ipv4:dragonfly*)        sysdesc=bsd
 -                              ;;
 -              ipv6:kfreebsd*) sysdesc=bsd-v6
 -                              ;;
 -              ipv4:kfreebsd*) sysdesc=bsd
 -                              ;;
 -              ipv6:openbsd*)  sysdesc=bsd-v6
 +              openbsd*)       sysdesc=bsd
                                ;;
 -              ipv4:openbsd*)  sysdesc=bsd
++              dragonfly*)     sysdesc=bsd
+                               ;;
                *)              AC_MSG_ERROR([Cannot determine correct system configuration. Please use --with-sysconfig to set it manually.])
                                ;;
                esac

diff --cc nest/neighbor.c
Simple merge

diff --cc sysdep/unix/krt.c
Simple merge