Fixes build failure on DragonFly-2.8.2.

* not have libresolv, but required functions in libc.
* need to include <sys/socket.h> exactly in some place.

4 files changed, 39 insertions, 2 deletions

diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 9884e09d2bb..1af970146bc 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/12/09 05:22:01 obache Exp $
+# $NetBSD: Makefile,v 1.5 2011/01/01 12:13:10 obache Exp $
 #
 
 DISTNAME=	openvas-libraries-2.0.0
@@ -20,6 +20,13 @@ USE_TOOLS+=	pkg-config
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
+.include "../../mk/bsd.prefs.mk"
+
+# DragonFly-2.8.2 has dn_expand(3) in libc, and not have libresolv.
+.if ${OPSYS} == "DragonFly"
+BUILDLINK_TRANSFORM+=	rm:-lresolv
+.endif
+
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
diff --git a/security/openvas-libraries/distinfo b/security/openvas-libraries/distinfo
index 52ef9f12902..f22f790e069 100644
--- a/security/openvas-libraries/distinfo
+++ b/security/openvas-libraries/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/09/09 17:32:29 joerg Exp $
+$NetBSD: distinfo,v 1.3 2011/01/01 12:13:10 obache Exp $
 
 SHA1 (openvas-libraries-2.0.0.tar.gz) = e3b5614e8fa4721ad93a9eb483f4f0a23242d84b
 RMD160 (openvas-libraries-2.0.0.tar.gz) = c7365d81289bca625ae984fceab901ced0626ce0
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = e2d36036d2043fb0a4ad1ada281ec165ed9c08ea
 SHA1 (patch-af) = edbabcc8b5f3a3a654f52ab678c932471f2fb1a7
 SHA1 (patch-ag) = 16d1e43ec3f098b86019e54e189a4b66a87d8b64
 SHA1 (patch-ah) = 097d76cced6ef5f5b909e1b9ab9fb9e0815b876a
+SHA1 (patch-ai) = a60270be1eccc5bfc2b8bd36ed969f498a9c1e05
+SHA1 (patch-aj) = ab833a1146f2e9962d9ecdeda0c84a722ff49eb6
diff --git a/security/openvas-libraries/patches/patch-ai b/security/openvas-libraries/patches/patch-ai
new file mode 100644
index 00000000000..6582b76861b
--- /dev/null
+++ b/security/openvas-libraries/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2011/01/01 12:13:11 obache Exp $
+
+* need to include sys/socket.h exactly on DragonFly.
+
+--- libopenvas/ftp_funcs.c.orig	2008-12-16 13:03:21.000000000 +0000
++++ libopenvas/ftp_funcs.c
+@@ -30,6 +30,7 @@
+ /* this works for libc6 systems, unclear
+  * wether it will not work on other systems */
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ 
+ #include "network.h"
+ 
diff --git a/security/openvas-libraries/patches/patch-aj b/security/openvas-libraries/patches/patch-aj
new file mode 100644
index 00000000000..3b63f6f12af
--- /dev/null
+++ b/security/openvas-libraries/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2011/01/01 12:13:11 obache Exp $
+
+* need to include sys/socket.h exactly on DragonFly.
+
+--- libopenvas/ids_send.c.orig	2008-12-16 13:03:21.000000000 +0000
++++ libopenvas/ids_send.c
+@@ -36,6 +36,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <arpa/inet.h>
++#include <sys/socket.h>
+ 
+ #include "arglists.h"
+ #include "bpf_share.h"