--- a/components/wireshark/Makefile Wed May 25 11:17:48 2016 -0700
+++ b/components/wireshark/Makefile Wed May 25 13:56:46 2016 -0700
@@ -83,10 +83,6 @@
chmod 755 config.status; \
./config.status)
-# If there is no mediator, use MIT. Note, once all userland build systems have
-# the Userland security/kerberos-5 pkg installed this logic can be removed.
-KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
-
REQUIRED_PACKAGES += developer/lexer/flex
REQUIRED_PACKAGES += developer/parser/bison
REQUIRED_PACKAGES += diagnostic/wireshark/wireshark-common
@@ -99,13 +95,8 @@
REQUIRED_PACKAGES += library/security/libgpg-error
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua
-ifeq ($(KRB5_API), solaris)
- # require the solaris version of Kerberos/GSS
- REQUIRED_PACKAGES += service/security/kerberos-5
-else
- # require the Userland version of Kerberos/GSS
- REQUIRED_PACKAGES += security/kerberos-5
-endif
+REQUIRED_PACKAGES += security/kerberos-5
+REQUIRED_PACKAGES += service/security/kerberos-5
REQUIRED_PACKAGES += system/library/libpcap
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/libgcrypt