View | Details | Raw Unified | Return to bug 230057
Collapse All | Expand All

(-)net/wireshark/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME?=	wireshark
4
PORTNAME?=	wireshark
5
PORTVERSION=	2.6.0
5
PORTVERSION=	2.6.2
6
PORTREVISION?=	1
6
PORTREVISION?=	0
7
CATEGORIES=	net ipv6
7
CATEGORIES=	net ipv6
8
MASTER_SITES=	http://www.wireshark.org/download/src/ \
8
MASTER_SITES=	http://www.wireshark.org/download/src/ \
9
		http://ftp.uni-kl.de/pub/wireshark/src/ \
9
		http://ftp.uni-kl.de/pub/wireshark/src/ \
(-)net/wireshark/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1525189786
1
TIMESTAMP = 1532470666
2
SHA256 (wireshark-2.6.0.tar.xz) = 711c7f01d27a8817d58277a5487cef3e3c7bab1c8caaf8f4c92aa21015b9117f
2
SHA256 (wireshark-2.6.2.tar.xz) = 49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094
3
SIZE (wireshark-2.6.0.tar.xz) = 28314868
3
SIZE (wireshark-2.6.2.tar.xz) = 28392140
(-)net/wireshark/files/patch-plugins_codecs_l16__mono_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- plugins/codecs/l16_mono/CMakeLists.txt.orig	2018-05-22 12:49:38 UTC
2
+++ plugins/codecs/l16_mono/CMakeLists.txt
3
@@ -28,7 +28,7 @@ set_source_files_properties(
4
 )
5
 
6
 include_directories(
7
-	${CMAKE_SOURCE_DIR}/codec
8
+	${CMAKE_SOURCE_DIR}/codecs
9
 	${CMAKE_CURRENT_SOURCE_DIR}
10
 )
11
 
(-)net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.am (-11 lines)
Lines 1-11 Link Here
1
--- plugins/codecs/l16_mono/Makefile.am.orig	2018-05-22 12:50:18 UTC
2
+++ plugins/codecs/l16_mono/Makefile.am
3
@@ -26,7 +26,7 @@ NONGENERATED_REGISTER_C_FILES = \
4
 NONGENERATED_C_FILES = \
5
 	$(NONGENERATED_REGISTER_C_FILES)
6
 
7
-wiretap_plugin_LTLIBRARIES = l16mono.la
8
+codecs_plugin_LTLIBRARIES = l16mono.la
9
 
10
 l16mono_la_SOURCES = \
11
 	$(SRC_FILES)	\
(-)net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.in (-150 lines)
Lines 1-150 Link Here
1
--- plugins/codecs/l16_mono/Makefile.in.orig	2018-05-22 16:01:15 UTC
2
+++ plugins/codecs/l16_mono/Makefile.in
3
@@ -197,8 +197,8 @@ am__uninstall_files_from_dir = { \
4
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
5
          $(am__cd) "$$dir" && rm -f $$files; }; \
6
   }
7
-am__installdirs = "$(DESTDIR)$(wiretap_plugindir)"
8
-LTLIBRARIES = $(wiretap_plugin_LTLIBRARIES)
9
+am__installdirs = "$(DESTDIR)$(codecs_plugindir)"
10
+LTLIBRARIES = $(codecs_plugin_LTLIBRARIES)
11
 l16mono_la_LIBADD =
12
 am__objects_1 = l16mono_la-l16decode.lo
13
 am__objects_2 = $(am__objects_1)
14
@@ -523,7 +523,6 @@ rawshark_bin = @rawshark_bin@
15
 rawshark_man = @rawshark_man@
16
 reordercap_bin = @reordercap_bin@
17
 reordercap_man = @reordercap_man@
18
-runstatedir = @runstatedir@
19
 sbindir = @sbindir@
20
 sharedstatedir = @sharedstatedir@
21
 sharkd_bin = @sharkd_bin@
22
@@ -741,7 +740,7 @@ NONGENERATED_REGISTER_C_FILES = \
23
 NONGENERATED_C_FILES = \
24
 	$(NONGENERATED_REGISTER_C_FILES)
25
 
26
-wiretap_plugin_LTLIBRARIES = l16mono.la
27
+codecs_plugin_LTLIBRARIES = l16mono.la
28
 l16mono_la_SOURCES = \
29
 	$(SRC_FILES)	\
30
 	$(HEADER_FILES)
31
@@ -794,33 +793,33 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
32
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
33
 $(am__aclocal_m4_deps):
34
 
35
-install-wiretap_pluginLTLIBRARIES: $(wiretap_plugin_LTLIBRARIES)
36
+install-codecs_pluginLTLIBRARIES: $(codecs_plugin_LTLIBRARIES)
37
 	@$(NORMAL_INSTALL)
38
-	@list='$(wiretap_plugin_LTLIBRARIES)'; test -n "$(wiretap_plugindir)" || list=; \
39
+	@list='$(codecs_plugin_LTLIBRARIES)'; test -n "$(codecs_plugindir)" || list=; \
40
 	list2=; for p in $$list; do \
41
 	  if test -f $$p; then \
42
 	    list2="$$list2 $$p"; \
43
 	  else :; fi; \
44
 	done; \
45
 	test -z "$$list2" || { \
46
-	  echo " $(MKDIR_P) '$(DESTDIR)$(wiretap_plugindir)'"; \
47
-	  $(MKDIR_P) "$(DESTDIR)$(wiretap_plugindir)" || exit 1; \
48
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(wiretap_plugindir)'"; \
49
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(wiretap_plugindir)"; \
50
+	  echo " $(MKDIR_P) '$(DESTDIR)$(codecs_plugindir)'"; \
51
+	  $(MKDIR_P) "$(DESTDIR)$(codecs_plugindir)" || exit 1; \
52
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(codecs_plugindir)'"; \
53
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(codecs_plugindir)"; \
54
 	}
55
 
56
-uninstall-wiretap_pluginLTLIBRARIES:
57
+uninstall-codecs_pluginLTLIBRARIES:
58
 	@$(NORMAL_UNINSTALL)
59
-	@list='$(wiretap_plugin_LTLIBRARIES)'; test -n "$(wiretap_plugindir)" || list=; \
60
+	@list='$(codecs_plugin_LTLIBRARIES)'; test -n "$(codecs_plugindir)" || list=; \
61
 	for p in $$list; do \
62
 	  $(am__strip_dir) \
63
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(wiretap_plugindir)/$$f'"; \
64
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(wiretap_plugindir)/$$f"; \
65
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(codecs_plugindir)/$$f'"; \
66
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(codecs_plugindir)/$$f"; \
67
 	done
68
 
69
-clean-wiretap_pluginLTLIBRARIES:
70
-	-test -z "$(wiretap_plugin_LTLIBRARIES)" || rm -f $(wiretap_plugin_LTLIBRARIES)
71
-	@list='$(wiretap_plugin_LTLIBRARIES)'; \
72
+clean-codecs_pluginLTLIBRARIES:
73
+	-test -z "$(codecs_plugin_LTLIBRARIES)" || rm -f $(codecs_plugin_LTLIBRARIES)
74
+	@list='$(codecs_plugin_LTLIBRARIES)'; \
75
 	locs=`for p in $$list; do echo $$p; done | \
76
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
77
 	      sort -u`; \
78
@@ -830,7 +829,7 @@ clean-wiretap_pluginLTLIBRARIES:
79
 	}
80
 
81
 l16mono.la: $(l16mono_la_OBJECTS) $(l16mono_la_DEPENDENCIES) $(EXTRA_l16mono_la_DEPENDENCIES) 
82
-	$(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(wiretap_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) $(LIBS)
83
+	$(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(codecs_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) $(LIBS)
84
 
85
 mostlyclean-compile:
86
 	-rm -f *.$(OBJEXT)
87
@@ -972,7 +971,7 @@ check: $(BUILT_SOURCES)
88
 	$(MAKE) $(AM_MAKEFLAGS) check-am
89
 all-am: Makefile $(LTLIBRARIES)
90
 installdirs:
91
-	for dir in "$(DESTDIR)$(wiretap_plugindir)"; do \
92
+	for dir in "$(DESTDIR)$(codecs_plugindir)"; do \
93
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
94
 	done
95
 install: $(BUILT_SOURCES)
96
@@ -1010,7 +1009,7 @@ maintainer-clean-generic:
97
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
98
 clean: clean-am
99
 
100
-clean-am: clean-generic clean-libtool clean-wiretap_pluginLTLIBRARIES \
101
+clean-am: clean-codecs_pluginLTLIBRARIES clean-generic clean-libtool \
102
 	mostlyclean-am
103
 
104
 distclean: distclean-am
105
@@ -1031,7 +1030,7 @@ info: info-am
106
 
107
 info-am:
108
 
109
-install-data-am: install-wiretap_pluginLTLIBRARIES
110
+install-data-am: install-codecs_pluginLTLIBRARIES
111
 
112
 install-dvi: install-dvi-am
113
 
114
@@ -1077,24 +1076,24 @@ ps: ps-am
115
 
116
 ps-am:
117
 
118
-uninstall-am: uninstall-wiretap_pluginLTLIBRARIES
119
+uninstall-am: uninstall-codecs_pluginLTLIBRARIES
120
 
121
 .MAKE: all check install install-am install-strip
122
 
123
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
124
-	clean-libtool clean-wiretap_pluginLTLIBRARIES cscopelist-am \
125
-	ctags ctags-am distclean distclean-compile distclean-generic \
126
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
127
-	html-am info info-am install install-am install-data \
128
-	install-data-am install-dvi install-dvi-am install-exec \
129
-	install-exec-am install-html install-html-am install-info \
130
-	install-info-am install-man install-pdf install-pdf-am \
131
-	install-ps install-ps-am install-strip \
132
-	install-wiretap_pluginLTLIBRARIES installcheck installcheck-am \
133
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
134
+	clean-codecs_pluginLTLIBRARIES clean-generic clean-libtool \
135
+	cscopelist-am ctags ctags-am distclean distclean-compile \
136
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
137
+	dvi-am html html-am info info-am install install-am \
138
+	install-codecs_pluginLTLIBRARIES install-data install-data-am \
139
+	install-dvi install-dvi-am install-exec install-exec-am \
140
+	install-html install-html-am install-info install-info-am \
141
+	install-man install-pdf install-pdf-am install-ps \
142
+	install-ps-am install-strip installcheck installcheck-am \
143
 	installdirs maintainer-clean maintainer-clean-generic \
144
 	mostlyclean mostlyclean-compile mostlyclean-generic \
145
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
146
-	uninstall-am uninstall-wiretap_pluginLTLIBRARIES
147
+	uninstall-am uninstall-codecs_pluginLTLIBRARIES
148
 
149
 .PRECIOUS: Makefile
150
 
(-)net/wireshark/pkg-plist (-5 / +5 lines)
Lines 636-649 Link Here
636
include/wireshark/wsutil/wspcap.h
636
include/wireshark/wsutil/wspcap.h
637
include/wireshark/wsutil/xtea.h
637
include/wireshark/wsutil/xtea.h
638
lib/libwireshark.so
638
lib/libwireshark.so
639
lib/libwireshark.so.11
639
lib/libwireshark.so.10
640
lib/libwireshark.so.11.0.0
640
lib/libwireshark.so.10.1.2
641
lib/libwiretap.so
641
lib/libwiretap.so
642
lib/libwiretap.so.8
642
lib/libwiretap.so.8
643
lib/libwiretap.so.8.0.0
643
lib/libwiretap.so.8.0.2
644
%%GUI%%lib/libwscodecs.so
644
%%GUI%%lib/libwscodecs.so
645
%%GUI%%lib/libwscodecs.so.0
645
%%GUI%%lib/libwscodecs.so.2
646
%%GUI%%lib/libwscodecs.so.0.0.0
646
%%GUI%%lib/libwscodecs.so.2.0.0
647
lib/libwsutil.so
647
lib/libwsutil.so
648
lib/libwsutil.so.9
648
lib/libwsutil.so.9
649
lib/libwsutil.so.9.0.0
649
lib/libwsutil.so.9.0.0

Return to bug 230057