6 files changed, 38 insertions, 14 deletions

diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index dfc18b179490..b27c46ec226f 100644
--- a/net-p2p/libfreenet/Makefile
+++ b/net-p2p/libfreenet/Makefile
@@ -7,18 +7,19 @@
 #
 
 PORTNAME=	libfreenet
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 CATEGORIES=	net
 MASTER_SITES=	http://thalassocracy.org/libfreenet/
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_OPENSSL=	yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/libfreenet
-
-USE_GMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${PERL} -pi -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/net-p2p/libfreenet/distinfo b/net-p2p/libfreenet/distinfo
index 6946435a70da..1c8d23d73951 100644
--- a/net-p2p/libfreenet/distinfo
+++ b/net-p2p/libfreenet/distinfo
@@ -1 +1 @@
-MD5 (libfreenet-0.4.0.tar.gz) = 9fa1231689528a46821a7728802469f1
+MD5 (libfreenet-0.5.0.tar.gz) = 04b7222576520e825e67b005c478cbb0
diff --git a/net-p2p/libfreenet/files/patch-client.c b/net-p2p/libfreenet/files/patch-client.c
new file mode 100644
index 000000000000..ba0702f37af3
--- /dev/null
+++ b/net-p2p/libfreenet/files/patch-client.c
@@ -0,0 +1,12 @@
+--- client.c.orig	Wed Jun 13 19:04:37 2001
++++ client.c	Sun Dec 30 14:35:28 2001
+@@ -15,7 +15,9 @@
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <openssl/dsa.h>
+ 
diff --git a/net-p2p/libfreenet/files/patch-protocol.c b/net-p2p/libfreenet/files/patch-protocol.c
index 59fed2289318..66628daab52d 100644
--- a/net-p2p/libfreenet/files/patch-protocol.c
+++ b/net-p2p/libfreenet/files/patch-protocol.c
@@ -1,15 +1,18 @@
---- protocol.c.orig	Thu Mar 22 13:27:34 2001
-+++ protocol.c	Sat Mar 31 15:14:32 2001
-@@ -17,6 +17,8 @@
+--- protocol.c.orig	Wed Jun 13 19:03:11 2001
++++ protocol.c	Sun Dec 30 14:37:45 2001
+@@ -16,7 +16,11 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  #include <stdio.h>
++#ifdef HAVE_MALLOC_H
  #include <malloc.h>
++#endif
 +#include <sys/types.h>
 +#include <netinet/in.h>
  #include <sys/socket.h>
  #include <netdb.h>
  #include <string.h>
-@@ -24,7 +26,6 @@
+@@ -24,7 +28,6 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <unistd.h>
diff --git a/net-p2p/libfreenet/files/patch-testserver.c b/net-p2p/libfreenet/files/patch-testserver.c
index 876e5a6733f1..9df4920aefe2 100644
--- a/net-p2p/libfreenet/files/patch-testserver.c
+++ b/net-p2p/libfreenet/files/patch-testserver.c
@@ -1,6 +1,12 @@
---- testserver.c.orig	Tue May 22 05:04:28 2001
-+++ testserver.c	Sun May 27 18:47:01 2001
-@@ -19,6 +19,7 @@
+--- testserver.c.orig	Wed Jun 13 19:05:19 2001
++++ testserver.c	Sun Dec 30 14:36:07 2001
+@@ -15,10 +15,13 @@
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
  #include <string.h>
  #include <unistd.h>
  #include <stdlib.h>
diff --git a/net-p2p/libfreenet/pkg-plist b/net-p2p/libfreenet/pkg-plist
index a46a92fa1bd4..5778fa48f50f 100644
--- a/net-p2p/libfreenet/pkg-plist
+++ b/net-p2p/libfreenet/pkg-plist
@@ -6,14 +6,16 @@ include/libfreenet/client.h
 include/libfreenet/client_util.h
 include/libfreenet/config.h
 include/libfreenet/endtoend.h
+include/libfreenet/message.h
 include/libfreenet/protocol.h
 include/libfreenet/rijndael-alg-fst.h
 include/libfreenet/rijndael-api-fst.h
+include/libfreenet/status.h
 include/libfreenet/stream.h
 include/libfreenet/twofish.h
 include/libfreenet/uri.h
 include/libfreenet/util.h
-@dirrm include/libfreenet
 lib/libfreenet.a
 lib/libfreenet.so
-lib/libfreenet.so.0
+lib/libfreenet.so.1
+@dirrm include/libfreenet