pkg/44832: net/netatalk build error on DragonFly BSD and old FreeBSD

[matthias.rampke%googlemail.com@localhost]

>Number:         44832
>Category:       pkg
>Synopsis:       net/netatalk build error on DragonFly BSD and old FreeBSD
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 06 02:00:01 +0000 2011
>Originator:     Matthias Rampke
>Release:        DragonFlyBSD 2.8.2
>Organization:
>Environment:
DragonFly zz.2pktfkt.net 2.8-RELEASE DragonFly v2.8.2.68.g41750d-RELEASE #6: 
Tue Mar  8 00:05:12 CET 2011     
matthias%zz.2pktfkt.net@localhost:/usr/obj/usr/src/sys/X86_64_GENERIC_SMP  
x86_64
>Description:
Build fails:

In file included from dsi_attn.c:17:
../../include/atalk/dsi.h:63: error: field 'server' has incomplete type
../../include/atalk/dsi.h:63: error: field 'client' has incomplete type

due to a missing <sys/socket.h> include.

This has been fixed in FreeBSD ports:

http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/netatalk/files/patch-include_atalk_dsi.h?rev=1.1
http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/netatalk/files/patch-include_atalk_util.h?rev=1.1

Attached is a patch to pull this fix into pkgsrc.
>How-To-Repeat:
cd /usr/pkgsrc/net/netatalk && bmake
>Fix:
commit 3e3b2b8b595d413b52329b95bc5db5e7b63a2551
Author: Matthias Rampke <matthias%rampke.de@localhost>
Date:   Sun Jan 23 23:56:17 2011 +0100

    fix netatalk on DragonFlyBSD and old FreeBSD

diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 044f894..1d1104f 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -21,3 +21,5 @@ SHA1 (patch-as) = db1b120beb2311959b9d012a3d2e13231f59f137
 SHA1 (patch-at) = 02946db1ffc6eccc1f7925461c39000c0d0845f2
 SHA1 (patch-au) = cff38d7d61af4ee260cead2c741f6aae07be3ddd
 SHA1 (patch-bj) = e1e0fc2be101554a2e0d53c24d113b593556eb41
+SHA1 (patch-bk) = d4fd2489297897a20c63c26f75d449f287bf229e
+SHA1 (patch-bl) = d7ac4472636b35b43642cb673f2595c88c30910a
diff --git a/net/netatalk/patches/patch-bk b/net/netatalk/patches/patch-bk
new file mode 100644
index 0000000..7df14fa
--- /dev/null
+++ b/net/netatalk/patches/patch-bk
@@ -0,0 +1,10 @@
+--- include/atalk/util.h.orig  2010-06-09 18:45:10.000000000 -0400
++++ include/atalk/util.h       2010-06-09 18:45:22.000000000 -0400
+@@ -17,6 +17,7 @@
+ 
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
diff --git a/net/netatalk/patches/patch-bl b/net/netatalk/patches/patch-bl
new file mode 100644
index 0000000..28885f0
--- /dev/null
+++ b/net/netatalk/patches/patch-bl
@@ -0,0 +1,10 @@
+--- include/atalk/dsi.h.orig   2010-06-09 18:46:15.000000000 -0400
++++ include/atalk/dsi.h        2010-06-09 18:44:22.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <sys/time.h>
+ #include <signal.h>
+ 
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <atalk/afp.h>
+ #include <atalk/server_child.h>