Fix build on AMD64

4 files changed, 34 insertions, 9 deletions

diff --git a/devel/libassa/Makefile b/devel/libassa/Makefile
index e62ee577df05..f709136d50a9 100644
--- a/devel/libassa/Makefile
+++ b/devel/libassa/Makefile
@@ -19,10 +19,4 @@ USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libassa/files/patch-assa-IPv4Socket.cpp b/devel/libassa/files/patch-assa-IPv4Socket.cpp
new file mode 100644
index 000000000000..d7e315a2532d
--- /dev/null
+++ b/devel/libassa/files/patch-assa-IPv4Socket.cpp
@@ -0,0 +1,11 @@
+--- assa/IPv4Socket.cpp.orig	Mon Mar 29 12:01:10 2004
++++ assa/IPv4Socket.cpp	Mon Mar 29 12:02:18 2004
+@@ -151,7 +151,7 @@
+ 	  are not guaranteed to be aligned correctly!!!
+ 	*/
+ 	trace_with_mask("IPv4Socket::accept",SOCKTRACE);
+-	size_t length = 0;
++	socklen_t length = 0;
+ 	int new_fd = -1;
+ 	SA* remote_address;
+ 
diff --git a/devel/libassa/files/patch-assa-UnConUDPSocket.cpp b/devel/libassa/files/patch-assa-UnConUDPSocket.cpp
new file mode 100644
index 000000000000..b87f53dadaa0
--- /dev/null
+++ b/devel/libassa/files/patch-assa-UnConUDPSocket.cpp
@@ -0,0 +1,11 @@
+--- assa/UnConUDPSocket.cpp.orig	Mon Mar 29 12:11:09 2004
++++ assa/UnConUDPSocket.cpp	Mon Mar 29 12:11:45 2004
+@@ -34,7 +34,7 @@
+ 	// recvfrom() returns zeroed out address structure!!!
+ 
+ 	int len;
+-	size_t pa_len = peer_addr_->getLength();
++	socklen_t pa_len = peer_addr_->getLength();
+ 	SA* pa = peer_addr_->getAddress();
+ 
+ 	len = ::recvfrom(getHandler(), buf_, size_, 0, pa, 
diff --git a/devel/libassa/files/patch-assa:Socket.cpp b/devel/libassa/files/patch-assa:Socket.cpp
index da5c6dabdeb5..84665a31d0b8 100644
--- a/devel/libassa/files/patch-assa:Socket.cpp
+++ b/devel/libassa/files/patch-assa:Socket.cpp
@@ -1,5 +1,5 @@
---- assa/Socket.cpp.orig	Wed Dec 24 17:28:22 2003
-+++ assa/Socket.cpp	Wed Dec 24 17:28:36 2003
+--- assa/Socket.cpp.orig	Fri Jul 25 08:51:00 2003
++++ assa/Socket.cpp	Mon Mar 29 12:05:59 2004
 @@ -16,6 +16,7 @@
  
  #include <sstream>
@@ -8,3 +8,12 @@
  
  #include "assa/Socket.h"
  
+@@ -190,7 +191,7 @@
+ 	int level = SOL_SOCKET;
+ 	bool bin = false;
+ 
+-	size_t len = sizeof (optval);
++	socklen_t len = sizeof (optval);
+ 	int ret;
+ 
+ 	if (rcvlowat == opt_)      optname = SO_RCVLOWAT;