2 files changed, 81 insertions, 0 deletions

diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in
new file mode 100644
index 000000000000..65591b95a180
--- /dev/null
+++ b/net/wireshark/files/patch-Makefile.in
@@ -0,0 +1,68 @@
+--- Makefile.in.orig	2007-12-23 15:36:38.000000000 -0500
++++ Makefile.in	2007-12-23 15:38:47.000000000 -0500
+@@ -159,7 +159,7 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca
+ 	ringbuffer.$(OBJEXT) sync_pipe_write.$(OBJEXT) \
+ 	tempfile.$(OBJEXT) version_info.$(OBJEXT) \
+ 	unicode-utils.$(OBJEXT) privileges.$(OBJEXT)
+-dumpcap_OBJECTS = $(am_dumpcap_OBJECTS)
++dumpcap_OBJECTS = $(am_dumpcap_OBJECTS) @INET_NTOP_O@
+ dumpcap_DEPENDENCIES = wiretap/libwiretap.la
+ am__editcap_SOURCES_DIST = editcap.c epan/crypt/crypt-md5.c \
+ 	epan/plugins.c epan/report_err.c epan/privileges.c \
+@@ -200,7 +200,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a
+ 	capture_opts.$(OBJEXT) capture_sync.$(OBJEXT) \
+ 	tempfile.$(OBJEXT) tshark-tap-register.$(OBJEXT) \
+ 	tshark.$(OBJEXT)
+-tshark_OBJECTS = $(am_tshark_OBJECTS)
++tshark_OBJECTS = $(am_tshark_OBJECTS) @INET_NTOP_O@
+ tshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \
+ 	epan/libwireshark.la $(am__DEPENDENCIES_2)
+ tshark_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -885,6 +885,7 @@ wireshark_SOURCES = \
+ 	fileset.c	\
+ 	filters.c	\
+ 	g711.c \
++	@INET_NTOP_C@ \
+ 	merge.c	\
+ 	proto_hier_stats.c	\
+ 	summary.c	\
+@@ -925,6 +926,7 @@ tshark_SOURCES = \
+ 	$(TSHARK_TAP_SRC)	\
+ 	capture_opts.c		\
+ 	capture_sync.c		\
++	@INET_NTOP_C@		\
+ 	tempfile.c		\
+ 	tshark-tap-register.c	\
+ 	tshark.c
+@@ -975,6 +977,7 @@ dumpcap_SOURCES = \
+ 	clopts_common.c	\
+ 	conditions.c	\
+ 	dumpcap.c	\
++	@INET_NTOP_C@	\
+ 	pcapio.c	\
+ 	ringbuffer.c	\
+ 	sync_pipe_write.c	\
+@@ -1030,7 +1033,6 @@ wireshark_LDADD = \
+ 	codecs/libcodec.a		\
+ 	wiretap/libwiretap.la		\
+ 	epan/libwireshark.la		\
+-	@INET_PTON_LO@			\
+ 	@SSL_LIBS@ 			\
+ 	$(plugin_ldadd)			\
+ 	@PCRE_LIBS@			\
+@@ -1049,7 +1051,6 @@ tshark_LDADD = \
+ 	$(wireshark_optional_objects)	\
+ 	wiretap/libwiretap.la		\
+ 	epan/libwireshark.la		\
+-	@INET_PTON_LO@			\
+ 	@SSL_LIBS@			\
+ 	$(plugin_ldadd)			\
+ 	@PCRE_LIBS@			\
+@@ -1117,7 +1118,6 @@ dftest_LDADD = \
+ # Libraries with which to link dumpcap.
+ dumpcap_LDADD = \
+ 	wiretap/libwiretap.la		\
+-	@INET_NTOP_LO@			\
+ 	@GLIB_LIBS@			\
+ 	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @FRAMEWORKS@ \
+ 	@LIBGCRYPT_LIBS@		\
diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in
new file mode 100644
index 000000000000..a56deb03bd07
--- /dev/null
+++ b/net/wireshark/files/patch-epan_Makefile.in
@@ -0,0 +1,13 @@
+--- epan/Makefile.in.orig	2007-12-23 15:39:26.000000000 -0500
++++ epan/Makefile.in	2007-12-23 15:40:35.000000000 -0500
+@@ -768,8 +768,8 @@ MAINTAINERCLEANFILES = \
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
+-libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
++libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
++libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
+ RUNLEX = $(top_srcdir)/tools/runlex.sh
+ LEMON = ../tools/lemon
+ @ENABLE_STATIC_FALSE@@HAVE_PLUGINS_TRUE@plugin_src =