6 files changed, 48 insertions, 92 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index ea7e4903dc82..2f967a2cc737 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.1c
+PORTVERSION=	0.6.1d
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -19,18 +19,18 @@ COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
+USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
-USE_SIZE=	yes
-USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_BZIP2=	yes
+USE_GNOME=	gnometarget gtk12 lthack
+USE_LIBTOOL_VER=13
 USE_OPENSSL=	yes
-USE_GNOME=	gtk12
-USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
+
+INSTALLS_SHLIB=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-ltdl-install
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -45,7 +45,6 @@ PLIST_SUB+=	WITH_GDBM="@comment "
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	323
 CONFIGURE_ARGS+=	--with-mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -75,11 +74,9 @@ PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
 MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
-		gnunet-delete.1 gnunet-directory-emptydb.1 gnunet-directory-listdb.1 \
-		gnunet-directory-print.1 gnunet-download.1 \
-		gnunet-gtk.1 gnunet-insert.1 gnunet-peer-info.1 \
-		gnunet-pseudonym-create.1 gnunet-pseudonym-delete.1 \
-		gnunet-pseudonym-list.1 gnunet-search-sblock.1 \
+		gnunet-delete.1 gnunet-directory.1 \
+		gnunet-download.1 gnunet-gtk.1 gnunet-insert.1 \
+		gnunet-peer-info.1 gnunet-pseudonym.1 \
 		gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \
 		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
 		gnunetd.1
@@ -90,7 +87,7 @@ pre-everything::
 	@${ECHO_MSG} "You can build GNUnet with the following options:"
 	@${ECHO_MSG} "		WITH_MYSQL=yes		Turn on MySQL support"
 	@${ECHO_MSG} "		WITH_TDB=yes		Turn on TDB support"
-	@${ECHO_MSG} "		WITH_BDB41=yes		Turn on Berkely DB library support"
+	@${ECHO_MSG} "		WITH_BDB3=yes		Turn on Berkely DB library support"
 	@${ECHO_MSG} "		WITH_GDBM=yes		Turn on GNU dbm support"
 	@${ECHO_MSG} "		WITH_IPV6=yes		Turn on to enable IPv6 support"
 	@${ECHO_MSG} ""
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index fef636c1315c..c44d17c1e8c3 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.1c.tar.bz2) = b5eaac27b1ba018f4560f5a17e2f049f
-SIZE (GNUnet-0.6.1c.tar.bz2) = 1078225
+MD5 (GNUnet-0.6.1d.tar.bz2) = 37fd82efbe474247df3df400315e64d6
+SIZE (GNUnet-0.6.1d.tar.bz2) = 1103768
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 248e17ee9ade..e8c830a446c9 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -2,18 +2,13 @@ bin/gnunet-chat
 bin/gnunet-check
 bin/gnunet-convert
 bin/gnunet-delete
-bin/gnunet-directory-emptydb
-bin/gnunet-directory-listdb
-bin/gnunet-directory-print
+bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
 bin/gnunet-peer-info
-bin/gnunet-pseudonym-create
-bin/gnunet-pseudonym-delete
-bin/gnunet-pseudonym-list
+bin/gnunet-pseudonym
 bin/gnunet-search
-bin/gnunet-search-sblock
 bin/gnunet-setup
 bin/gnunet-stats
 bin/gnunet-tbench
@@ -25,40 +20,26 @@ include/gnunet_afs_esed2.h
 include/gnunet_core.h
 include/gnunet_transport.h
 include/gnunet_util.h
+include/platform.h
 include/winproc.h
-lib/libgnunet_afs_esed2.la
+lib/libgnunet_afs_esed2.a
 lib/libgnunet_afs_esed2.so
 lib/libgnunet_afs_esed2.so.0
-lib/libgnunetafs_database_directory.la
 lib/libgnunetafs_database_directory.so
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.la
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
-lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
-lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
-lib/libgnunettbench_protocol.la
 lib/libgnunettbench_protocol.so
-lib/libgnunettestbed_protocol.la
 lib/libgnunettestbed_protocol.so
-lib/libgnunettracekit_protocol.la
 lib/libgnunettracekit_protocol.so
-lib/libgnunettransport_http.la
 lib/libgnunettransport_http.so
-lib/libgnunettransport_nat.la
 lib/libgnunettransport_nat.so
-lib/libgnunettransport_smtp.la
 lib/libgnunettransport_smtp.so
-lib/libgnunettransport_tcp.la
 lib/libgnunettransport_tcp.so
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.la
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
-lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
-%%WITH_IPV6%%lib/libgnunettransport_udp6.la
-%%WITH_IPV6%%lib/libgnunettransport_udp6.so
-lib/libgnunetutil.la
+lib/libgnunetutil.a
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
+%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
+%%WITH_IPV6%%lib/libgnunettransport_udp6.so
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index ea7e4903dc82..2f967a2cc737 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.1c
+PORTVERSION=	0.6.1d
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -19,18 +19,18 @@ COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
+USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
-USE_SIZE=	yes
-USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_BZIP2=	yes
+USE_GNOME=	gnometarget gtk12 lthack
+USE_LIBTOOL_VER=13
 USE_OPENSSL=	yes
-USE_GNOME=	gtk12
-USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
+
+INSTALLS_SHLIB=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-ltdl-install
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -45,7 +45,6 @@ PLIST_SUB+=	WITH_GDBM="@comment "
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	323
 CONFIGURE_ARGS+=	--with-mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -75,11 +74,9 @@ PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
 MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
-		gnunet-delete.1 gnunet-directory-emptydb.1 gnunet-directory-listdb.1 \
-		gnunet-directory-print.1 gnunet-download.1 \
-		gnunet-gtk.1 gnunet-insert.1 gnunet-peer-info.1 \
-		gnunet-pseudonym-create.1 gnunet-pseudonym-delete.1 \
-		gnunet-pseudonym-list.1 gnunet-search-sblock.1 \
+		gnunet-delete.1 gnunet-directory.1 \
+		gnunet-download.1 gnunet-gtk.1 gnunet-insert.1 \
+		gnunet-peer-info.1 gnunet-pseudonym.1 \
 		gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \
 		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
 		gnunetd.1
@@ -90,7 +87,7 @@ pre-everything::
 	@${ECHO_MSG} "You can build GNUnet with the following options:"
 	@${ECHO_MSG} "		WITH_MYSQL=yes		Turn on MySQL support"
 	@${ECHO_MSG} "		WITH_TDB=yes		Turn on TDB support"
-	@${ECHO_MSG} "		WITH_BDB41=yes		Turn on Berkely DB library support"
+	@${ECHO_MSG} "		WITH_BDB3=yes		Turn on Berkely DB library support"
 	@${ECHO_MSG} "		WITH_GDBM=yes		Turn on GNU dbm support"
 	@${ECHO_MSG} "		WITH_IPV6=yes		Turn on to enable IPv6 support"
 	@${ECHO_MSG} ""
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index fef636c1315c..c44d17c1e8c3 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.1c.tar.bz2) = b5eaac27b1ba018f4560f5a17e2f049f
-SIZE (GNUnet-0.6.1c.tar.bz2) = 1078225
+MD5 (GNUnet-0.6.1d.tar.bz2) = 37fd82efbe474247df3df400315e64d6
+SIZE (GNUnet-0.6.1d.tar.bz2) = 1103768
diff --git a/net/gnunet/pkg-plist b/net/gnunet/pkg-plist
index 248e17ee9ade..e8c830a446c9 100644
--- a/net/gnunet/pkg-plist
+++ b/net/gnunet/pkg-plist
@@ -2,18 +2,13 @@ bin/gnunet-chat
 bin/gnunet-check
 bin/gnunet-convert
 bin/gnunet-delete
-bin/gnunet-directory-emptydb
-bin/gnunet-directory-listdb
-bin/gnunet-directory-print
+bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
 bin/gnunet-peer-info
-bin/gnunet-pseudonym-create
-bin/gnunet-pseudonym-delete
-bin/gnunet-pseudonym-list
+bin/gnunet-pseudonym
 bin/gnunet-search
-bin/gnunet-search-sblock
 bin/gnunet-setup
 bin/gnunet-stats
 bin/gnunet-tbench
@@ -25,40 +20,26 @@ include/gnunet_afs_esed2.h
 include/gnunet_core.h
 include/gnunet_transport.h
 include/gnunet_util.h
+include/platform.h
 include/winproc.h
-lib/libgnunet_afs_esed2.la
+lib/libgnunet_afs_esed2.a
 lib/libgnunet_afs_esed2.so
 lib/libgnunet_afs_esed2.so.0
-lib/libgnunetafs_database_directory.la
 lib/libgnunetafs_database_directory.so
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.la
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
-lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
-lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
-lib/libgnunettbench_protocol.la
 lib/libgnunettbench_protocol.so
-lib/libgnunettestbed_protocol.la
 lib/libgnunettestbed_protocol.so
-lib/libgnunettracekit_protocol.la
 lib/libgnunettracekit_protocol.so
-lib/libgnunettransport_http.la
 lib/libgnunettransport_http.so
-lib/libgnunettransport_nat.la
 lib/libgnunettransport_nat.so
-lib/libgnunettransport_smtp.la
 lib/libgnunettransport_smtp.so
-lib/libgnunettransport_tcp.la
 lib/libgnunettransport_tcp.so
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.la
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
-lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
-%%WITH_IPV6%%lib/libgnunettransport_udp6.la
-%%WITH_IPV6%%lib/libgnunettransport_udp6.so
-lib/libgnunetutil.la
+lib/libgnunetutil.a
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
+%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
+%%WITH_IPV6%%lib/libgnunettransport_udp6.so