diff options
24 files changed, 94 insertions, 96 deletions
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index eac0758c3935..ff16b3fb506a 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -7,8 +7,7 @@ # PORTNAME= gnunet -PORTVERSION= 0.6.6 -PORTREVISION= 1 +PORTVERSION= 0.6.6b CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo index d98f989cc14a..180c3f89f5fe 100644 --- a/net-p2p/gnunet/distinfo +++ b/net-p2p/gnunet/distinfo @@ -1,2 +1,2 @@ -MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed -SIZE (GNUnet-0.6.6.tar.bz2) = 1267600 +MD5 (GNUnet-0.6.6b.tar.bz2) = dc04ecf7d1e7d4ccfde62fad101a301f +SIZE (GNUnet-0.6.6b.tar.bz2) = 1291441 diff --git a/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in index ed9c6fa42c10..8952e613bd82 100644 --- a/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/afs/module/Makefile.in.orig +++ src/applications/afs/module/Makefile.in -@@ -1031,7 +1031,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -203,7 +203,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ + SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ $(libgnunetafs_database_directory_la_SOURCES) \ $(libgnunetafs_database_gdbm_la_SOURCES) \ diff --git a/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in index f07ef036b211..d9a2b848d970 100644 --- a/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/afs/tools/Makefile.in.orig +++ src/applications/afs/tools/Makefile.in -@@ -310,7 +310,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -104,7 +104,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ + SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ $(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \ $(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES) diff --git a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in index c35810645ba1..9139ec802848 100644 --- a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/chat/Makefile.in.orig +++ src/applications/chat/Makefile.in -@@ -265,7 +265,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -80,7 +80,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES) DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \ $(gnunet_chat_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am diff --git a/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in index 683fdf94a673..6342016773f5 100644 --- a/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/dht/tools/Makefile.in.orig +++ src/applications/dht/tools/Makefile.in -@@ -279,7 +279,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -84,7 +84,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ + SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ $(gnunet_dht_query_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \ diff --git a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in index 363cedae963e..1134073ae1bf 100644 --- a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/stats/Makefile.in.orig +++ src/applications/stats/Makefile.in -@@ -240,7 +240,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -71,7 +71,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(gnunet_stats_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(gnunet_stats_SOURCES) + DIST_SOURCES = $(gnunet_stats_SOURCES) + ETAGS = etags diff --git a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in index 0987f8395984..b3c0253bf1d6 100644 --- a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/tbench/Makefile.in.orig +++ src/applications/tbench/Makefile.in -@@ -266,7 +266,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -81,7 +81,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ + SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ $(gnunet_tbench_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ diff --git a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in index b48de24acaed..23b0ed59044f 100644 --- a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/testbed/Makefile.in.orig +++ src/applications/testbed/Makefile.in -@@ -281,7 +281,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -84,7 +84,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ + SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ $(gnunet_testbed_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ diff --git a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in index de24d7d5cd42..5a089ab930ab 100644 --- a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/tracekit/Makefile.in.orig +++ src/applications/tracekit/Makefile.in -@@ -266,7 +266,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -81,7 +81,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ + SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ $(gnunet_tracekit_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ diff --git a/net-p2p/gnunet/files/patch-src_conf_Makefile.in b/net-p2p/gnunet/files/patch-src_conf_Makefile.in index 74c5c69df56d..270399434142 100644 --- a/net-p2p/gnunet/files/patch-src_conf_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_conf_Makefile.in @@ -3,21 +3,21 @@ $FreeBSD$ --- src/conf/Makefile.in.orig +++ src/conf/Makefile.in -@@ -253,7 +253,7 @@ - +@@ -100,7 +100,7 @@ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c + DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c + ETAGS = etags +@@ -312,7 +312,7 @@ + gnunet-setup.c gnunet_setup_LDFLAGS = \ - $(curses_lib) + $(curses_lib) $(LTLIBINTL) - gnunet_setup_LDADD = \ -@@ -319,7 +319,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c + $(top_builddir)/src/util/libgnunetutil.la diff --git a/net-p2p/gnunet/files/patch-src_server_Makefile.in b/net-p2p/gnunet/files/patch-src_server_Makefile.in index ad6351ed3b2c..15587ef6d6bd 100644 --- a/net-p2p/gnunet/files/patch-src_server_Makefile.in +++ b/net-p2p/gnunet/files/patch-src_server_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/server/Makefile.in.orig +++ src/server/Makefile.in -@@ -362,7 +362,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -108,7 +108,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ + SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ $(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \ $(gnunetd_SOURCES) diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index eac0758c3935..ff16b3fb506a 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -7,8 +7,7 @@ # PORTNAME= gnunet -PORTVERSION= 0.6.6 -PORTREVISION= 1 +PORTVERSION= 0.6.6b CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo index d98f989cc14a..180c3f89f5fe 100644 --- a/net/gnunet/distinfo +++ b/net/gnunet/distinfo @@ -1,2 +1,2 @@ -MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed -SIZE (GNUnet-0.6.6.tar.bz2) = 1267600 +MD5 (GNUnet-0.6.6b.tar.bz2) = dc04ecf7d1e7d4ccfde62fad101a301f +SIZE (GNUnet-0.6.6b.tar.bz2) = 1291441 diff --git a/net/gnunet/files/patch-src_applications_afs_module_Makefile.in b/net/gnunet/files/patch-src_applications_afs_module_Makefile.in index ed9c6fa42c10..8952e613bd82 100644 --- a/net/gnunet/files/patch-src_applications_afs_module_Makefile.in +++ b/net/gnunet/files/patch-src_applications_afs_module_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/afs/module/Makefile.in.orig +++ src/applications/afs/module/Makefile.in -@@ -1031,7 +1031,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -203,7 +203,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ + SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ $(libgnunetafs_database_directory_la_SOURCES) \ $(libgnunetafs_database_gdbm_la_SOURCES) \ diff --git a/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in b/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in index f07ef036b211..d9a2b848d970 100644 --- a/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in +++ b/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/afs/tools/Makefile.in.orig +++ src/applications/afs/tools/Makefile.in -@@ -310,7 +310,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -104,7 +104,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ + SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ $(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \ $(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES) diff --git a/net/gnunet/files/patch-src_applications_chat_Makefile.in b/net/gnunet/files/patch-src_applications_chat_Makefile.in index c35810645ba1..9139ec802848 100644 --- a/net/gnunet/files/patch-src_applications_chat_Makefile.in +++ b/net/gnunet/files/patch-src_applications_chat_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/chat/Makefile.in.orig +++ src/applications/chat/Makefile.in -@@ -265,7 +265,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -80,7 +80,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES) DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \ $(gnunet_chat_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am diff --git a/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in b/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in index 683fdf94a673..6342016773f5 100644 --- a/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in +++ b/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/dht/tools/Makefile.in.orig +++ src/applications/dht/tools/Makefile.in -@@ -279,7 +279,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -84,7 +84,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ + SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ $(gnunet_dht_query_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \ diff --git a/net/gnunet/files/patch-src_applications_stats_Makefile.in b/net/gnunet/files/patch-src_applications_stats_Makefile.in index 363cedae963e..1134073ae1bf 100644 --- a/net/gnunet/files/patch-src_applications_stats_Makefile.in +++ b/net/gnunet/files/patch-src_applications_stats_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/stats/Makefile.in.orig +++ src/applications/stats/Makefile.in -@@ -240,7 +240,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -71,7 +71,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(gnunet_stats_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(gnunet_stats_SOURCES) + DIST_SOURCES = $(gnunet_stats_SOURCES) + ETAGS = etags diff --git a/net/gnunet/files/patch-src_applications_tbench_Makefile.in b/net/gnunet/files/patch-src_applications_tbench_Makefile.in index 0987f8395984..b3c0253bf1d6 100644 --- a/net/gnunet/files/patch-src_applications_tbench_Makefile.in +++ b/net/gnunet/files/patch-src_applications_tbench_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/tbench/Makefile.in.orig +++ src/applications/tbench/Makefile.in -@@ -266,7 +266,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -81,7 +81,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ + SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ $(gnunet_tbench_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ diff --git a/net/gnunet/files/patch-src_applications_testbed_Makefile.in b/net/gnunet/files/patch-src_applications_testbed_Makefile.in index b48de24acaed..23b0ed59044f 100644 --- a/net/gnunet/files/patch-src_applications_testbed_Makefile.in +++ b/net/gnunet/files/patch-src_applications_testbed_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/testbed/Makefile.in.orig +++ src/applications/testbed/Makefile.in -@@ -281,7 +281,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -84,7 +84,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ + SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ $(gnunet_testbed_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ diff --git a/net/gnunet/files/patch-src_applications_tracekit_Makefile.in b/net/gnunet/files/patch-src_applications_tracekit_Makefile.in index de24d7d5cd42..5a089ab930ab 100644 --- a/net/gnunet/files/patch-src_applications_tracekit_Makefile.in +++ b/net/gnunet/files/patch-src_applications_tracekit_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/applications/tracekit/Makefile.in.orig +++ src/applications/tracekit/Makefile.in -@@ -266,7 +266,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -81,7 +81,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ + SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ $(gnunet_tracekit_SOURCES) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ diff --git a/net/gnunet/files/patch-src_conf_Makefile.in b/net/gnunet/files/patch-src_conf_Makefile.in index 74c5c69df56d..270399434142 100644 --- a/net/gnunet/files/patch-src_conf_Makefile.in +++ b/net/gnunet/files/patch-src_conf_Makefile.in @@ -3,21 +3,21 @@ $FreeBSD$ --- src/conf/Makefile.in.orig +++ src/conf/Makefile.in -@@ -253,7 +253,7 @@ - +@@ -100,7 +100,7 @@ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c + DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c + ETAGS = etags +@@ -312,7 +312,7 @@ + gnunet-setup.c gnunet_setup_LDFLAGS = \ - $(curses_lib) + $(curses_lib) $(LTLIBINTL) - gnunet_setup_LDADD = \ -@@ -319,7 +319,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am - SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c + $(top_builddir)/src/util/libgnunetutil.la diff --git a/net/gnunet/files/patch-src_server_Makefile.in b/net/gnunet/files/patch-src_server_Makefile.in index ad6351ed3b2c..15587ef6d6bd 100644 --- a/net/gnunet/files/patch-src_server_Makefile.in +++ b/net/gnunet/files/patch-src_server_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- src/server/Makefile.in.orig +++ src/server/Makefile.in -@@ -362,7 +362,7 @@ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -108,7 +108,7 @@ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ + SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ $(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \ $(gnunetd_SOURCES) |