Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 28 insertions, 12 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 48a8c9461de8..1fb513c92c2a 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.6.6b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -20,18 +20,16 @@ COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_AUTOTOOLS=	libltdl:15 libtool:13:inc
+USE_AUTOTOOLS=	libltdl:15
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETOPT_LONG=	yes
+USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 lthack
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
-
 INSTALLS_SHLIB=	yes
-
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-ltdl-install --with-crypto
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 7ff5c2b77282..a98328d2394b 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -30,40 +30,58 @@ include/gnunet_dht_service.h
 include/gnunet_rpc_service.h
 include/gnunet_transport.h
 include/gnunet_util.h
-lib/libgnunet_afs_esed2.a
+lib/libgnunet_afs_esed2.la
 lib/libgnunet_afs_esed2.so
 lib/libgnunet_afs_esed2.so.0
-lib/libgnunetafs_database_directory.so
+lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
+lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
-lib/libgnunetdht_api.a
+lib/libgnunetdht_api.la
 lib/libgnunetdht_api.so
 lib/libgnunetdht_api.so.0
-lib/libgnunetdht_datastore_memory.a
+lib/libgnunetdht_datastore_memory.la
 lib/libgnunetdht_datastore_memory.so
 lib/libgnunetdht_datastore_memory.so.0
+lib/libgnunetdht_protocol.la
 lib/libgnunetdht_protocol.so
+lib/libgnunetrpc_protocol.la
 lib/libgnunetrpc_protocol.so
-lib/libgnunetrpc_util.a
+lib/libgnunetrpc_util.la
 lib/libgnunetrpc_util.so
 lib/libgnunetrpc_util.so.0
+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
+lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
-lib/libgnunetutil.a
+lib/libgnunetutil.la
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0
 share/GNUnet/gnunet_logo.png
 share/locale/de/LC_MESSAGES/GNUnet.mo
+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
+%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.la
 %%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.so
+%%WITH_IPV6%%lib/libgnunettransport_tcp6.la
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so
+%%WITH_IPV6%%lib/libgnunettransport_udp6.la
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so
 @dirrm share/GNUnet
 %%PORTDOCS%%%%DOCSDIR%%/README