4 files changed, 80 insertions, 41 deletions

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index acdffef5e30e..421bcf0a7f81 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,34 +7,73 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.5.1a
+PORTVERSION=	0.5.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://www.ovmj.org/GNUnet/download/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	GNUnet-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ponomarew@oberon.net
 COMMENT=	An anonymous, distributed, reputation-based network
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_GNOME=	gtk12
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
 
-MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-download.1 gnunet-gtk.1 \
+.if defined(WITH_GDBM)
+LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+PLIST_SUB+=	WITH_GDBM=""
+.else
+CONFIGURE_ARGS+=	--without-gdbm
+PLIST_SUB+=	WITH_GDBM="@comment "
+.endif
+
+.if defined(WITH_MYSQL)
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+.if defined(WITH_TDB)
+LIB_DEPENDS+=	tdb.1:${PORTSDIR}/databases/tdb
+PLIST_SUB+=	WITH_TDB=""
+.else
+CONFIGURE_ARGS+=	--without-tdb
+PLIST_SUB+=	WITH_TDB="@comment "
+.endif
+
+.if defined(WITH_BDB3)
+LIB_DEPENDS+=	db3:${PORTSDIR}/databases/db3
+CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-bdb
+.endif
+
+MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
+		gnunet-delete.1 gnunet-download.1 gnunet-gtk.1 \
 		gnunet-insert-multi.1 gnunet-insert.1 gnunet-search.1 \
-		gnunet-tbench.1 gnunetd.1
+		gnunet-tbench.1 gnunet-tracekit.1 \
+		gnunet-transport-check.1 gnunetd.1
 MAN5=		gnunet.conf.5
 
+pre-everything::
+	@${ECHO_MSG} ""
+	@${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_GDBM=yes		Turn on GNU dbm support"
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index 1798ccce29e6..a9dcc6a86059 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.5.1a.tar.bz2) = 0e506d602cdc168e6a0f8065da85e565
+MD5 (GNUnet-0.5.4.tar.bz2) = 885476e1234d5cb71bc0fa044e868e49
diff --git a/net/gnunet/files/patch-configure b/net/gnunet/files/patch-configure
deleted file mode 100644
index 4fd97ef8bb58..000000000000
--- a/net/gnunet/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/gnunet/pkg-plist b/net/gnunet/pkg-plist
index 249ddd3f8d18..30ee86fae95b 100644
--- a/net/gnunet/pkg-plist
+++ b/net/gnunet/pkg-plist
@@ -1,7 +1,7 @@
-@comment $FreeBSD$
 bin/gnunet-chat
 bin/gnunet-check
 bin/gnunet-convert
+bin/gnunet-delete
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
@@ -9,56 +9,66 @@ bin/gnunet-peer-info
 bin/gnunet-search
 bin/gnunet-stats
 bin/gnunet-tbench
+bin/gnunet-tracekit
 bin/gnunet-transport-check
 bin/gnunetd
-lib/libgnunetafs_blocks.a
+lib/libgnunetafs_blocks.la
 lib/libgnunetafs_blocks.so
 lib/libgnunetafs_blocks.so.0
-lib/libgnunetafs_database.a
+lib/libgnunetafs_database.la
 lib/libgnunetafs_database.so
 lib/libgnunetafs_database.so.0
-lib/libgnunetafs_database_directory.a
+lib/libgnunetafs_database_directory.la
 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
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so.0
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.la
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.so.0
+lib/libgnunetafs_decoding.la
 lib/libgnunetafs_decoding.so
 lib/libgnunetafs_decoding.so.0
-lib/libgnunetafs_encoding.a
+lib/libgnunetafs_delete.la
+lib/libgnunetafs_delete.so
+lib/libgnunetafs_delete.so.0
+lib/libgnunetafs_encoding.la
 lib/libgnunetafs_encoding.so
 lib/libgnunetafs_encoding.so.0
-lib/libgnunetafs_policy.a
+lib/libgnunetafs_policy.la
 lib/libgnunetafs_policy.so
 lib/libgnunetafs_policy.so.0
-lib/libgnunetafs_protocol.a
+lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
 lib/libgnunetafs_protocol.so.0
-lib/libgnunetafs_search.a
+lib/libgnunetafs_search.la
 lib/libgnunetafs_search.so
 lib/libgnunetafs_search.so.0
-lib/libgnunetafs_util.a
+lib/libgnunetafs_util.la
 lib/libgnunetafs_util.so
 lib/libgnunetafs_util.so.0
-lib/libgnunetchat_protocol.a
+lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
 lib/libgnunetchat_protocol.so.0
-lib/libgnunetcommon.a
+lib/libgnunetcommon.la
 lib/libgnunetcommon.so
 lib/libgnunetcommon.so.0
-lib/libgnunettbench_protocol.a
+lib/libgnunettbench_protocol.la
 lib/libgnunettbench_protocol.so
 lib/libgnunettbench_protocol.so.0
-lib/libgnunettransport_smtp.a
+lib/libgnunettracekit_protocol.la
+lib/libgnunettracekit_protocol.so
+lib/libgnunettracekit_protocol.so.0
+lib/libgnunettransport_smtp.la
 lib/libgnunettransport_smtp.so
 lib/libgnunettransport_smtp.so.0
-lib/libgnunettransport_tcp.a
+lib/libgnunettransport_tcp.la
 lib/libgnunettransport_tcp.so
 lib/libgnunettransport_tcp.so.0
-lib/libgnunettransport_udp.a
+lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
 lib/libgnunettransport_udp.so.0
-lib/libgnunetutil.a
+lib/libgnunetutil.la
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0