6 files changed, 76 insertions, 18 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 6d59c634e00d..bb91bd50f5a8 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,13 +7,15 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.4.6
+PORTVERSION=	0.5.1a
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		http://www.ovmj.org/GNUnet/download/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	GNUnet-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
@@ -23,12 +25,15 @@ USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_SHLIB=	yes
 
-MAN1=		gnunet-check.1 gnunet-download.1 gnunet-gtk.1 \
-		gnunet-insert-multi.1 gnunet-insert.1 gnunet-search.1 gnunetd.1
+MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-download.1 gnunet-gtk.1 \
+		gnunet-insert-multi.1 gnunet-insert.1 gnunet-search.1 \
+		gnunet-tbench.1 gnunetd.1
 MAN5=		gnunet.conf.5
 
 post-patch:
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 8498480a74f7..1798ccce29e6 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.4.6.tar.bz2) = be99b483b512d0d60345fdc5a0a749b4
+MD5 (GNUnet-0.5.1a.tar.bz2) = 0e506d602cdc168e6a0f8065da85e565
diff --git a/net-p2p/gnunet/files/patch-configure b/net-p2p/gnunet/files/patch-configure
new file mode 100644
index 000000000000..4fd97ef8bb58
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Dec 21 01:25:22 2002
++++ configure	Sun Dec 22 15:27:06 2002
+@@ -8701,6 +8701,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net-p2p/gnunet/files/patch-src::include::gtkui::insert.h b/net-p2p/gnunet/files/patch-src::include::gtkui::insert.h
deleted file mode 100644
index 500f57224013..000000000000
--- a/net-p2p/gnunet/files/patch-src::include::gtkui::insert.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/gtkui/insert.h.orig	Mon Aug 12 02:48:18 2002
-+++ src/include/gtkui/insert.h	Sat Aug 17 13:14:07 2002
-@@ -26,6 +26,7 @@
- #define GTKUI_INSERT_H
- 
- #include "config.h"
-+#include <pthread.h>
- #include <gtk/gtk.h>
- #include <glib.h>
- 
diff --git a/net-p2p/gnunet/pkg-comment b/net-p2p/gnunet/pkg-comment
deleted file mode 100644
index 0d398337ab68..000000000000
--- a/net-p2p/gnunet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An anonymous, distributed, reputation-based network
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 5e393f91bc2a..249ddd3f8d18 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -1,10 +1,64 @@
+@comment $FreeBSD$
+bin/gnunet-chat
 bin/gnunet-check
+bin/gnunet-convert
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
+bin/gnunet-peer-info
 bin/gnunet-search
 bin/gnunet-stats
+bin/gnunet-tbench
+bin/gnunet-transport-check
 bin/gnunetd
+lib/libgnunetafs_blocks.a
+lib/libgnunetafs_blocks.so
+lib/libgnunetafs_blocks.so.0
+lib/libgnunetafs_database.a
+lib/libgnunetafs_database.so
+lib/libgnunetafs_database.so.0
+lib/libgnunetafs_database_directory.a
+lib/libgnunetafs_database_directory.so
+lib/libgnunetafs_database_directory.so.0
+lib/libgnunetafs_database_gdbm.a
+lib/libgnunetafs_database_gdbm.so
+lib/libgnunetafs_database_gdbm.so.0
+lib/libgnunetafs_decoding.a
+lib/libgnunetafs_decoding.so
+lib/libgnunetafs_decoding.so.0
+lib/libgnunetafs_encoding.a
+lib/libgnunetafs_encoding.so
+lib/libgnunetafs_encoding.so.0
+lib/libgnunetafs_policy.a
+lib/libgnunetafs_policy.so
+lib/libgnunetafs_policy.so.0
+lib/libgnunetafs_protocol.a
+lib/libgnunetafs_protocol.so
+lib/libgnunetafs_protocol.so.0
+lib/libgnunetafs_search.a
+lib/libgnunetafs_search.so
+lib/libgnunetafs_search.so.0
+lib/libgnunetafs_util.a
+lib/libgnunetafs_util.so
+lib/libgnunetafs_util.so.0
+lib/libgnunetchat_protocol.a
+lib/libgnunetchat_protocol.so
+lib/libgnunetchat_protocol.so.0
 lib/libgnunetcommon.a
-lib/libgnunetfilesharing.a
+lib/libgnunetcommon.so
+lib/libgnunetcommon.so.0
+lib/libgnunettbench_protocol.a
+lib/libgnunettbench_protocol.so
+lib/libgnunettbench_protocol.so.0
+lib/libgnunettransport_smtp.a
+lib/libgnunettransport_smtp.so
+lib/libgnunettransport_smtp.so.0
+lib/libgnunettransport_tcp.a
+lib/libgnunettransport_tcp.so
+lib/libgnunettransport_tcp.so.0
+lib/libgnunettransport_udp.a
+lib/libgnunettransport_udp.so
+lib/libgnunettransport_udp.so.0
 lib/libgnunetutil.a
+lib/libgnunetutil.so
+lib/libgnunetutil.so.0