--- a/components/cyrus-sasl/Makefile	Wed May 25 11:17:48 2016 -0700
+++ b/components/cyrus-sasl/Makefile	Wed May 25 13:56:46 2016 -0700
@@ -60,6 +60,8 @@
 # Migrated from ON in S12, including stuff from system/header, so this
 # cannot be installed on an S11 box.
 ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
 PUBLISH_STAMP=
 endif
 
@@ -197,9 +199,6 @@
 REQUIRED_PACKAGES += developer/build/automake-115
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
-ifneq ($(KRB5_API), solaris)
-    REQUIRED_PACKAGES += security/kerberos-5
-else
-    REQUIRED_PACKAGES += system/library/security/gss
-endif
+REQUIRED_PACKAGES += security/kerberos-5
+REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network/ldap/openldap

--- a/components/openssh/Makefile	Wed May 25 11:17:48 2016 -0700
+++ b/components/openssh/Makefile	Wed May 25 13:56:46 2016 -0700
@@ -108,22 +108,13 @@
       cd $(@D); autoconf; \
     )
 
-# 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 += library/libedit
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
-ifeq ($(KRB5_API), solaris)
-    # require the solaris version of Kerberos/GSS
-    REQUIRED_PACKAGES += service/security/kerberos-5
-    REQUIRED_PACKAGES += system/library/security/gss
-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/core-os
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network
 REQUIRED_PACKAGES += text/groff/groff-core

--- a/components/proftpd/Makefile	Wed May 25 11:17:48 2016 -0700
+++ b/components/proftpd/Makefile	Wed May 25 13:56:46 2016 -0700
@@ -115,19 +115,10 @@
 # attributes.
 LICENSE_TRANSFORMS =
 
-# 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 += library/security/openssl
-ifeq ($(KRB5_API), solaris)
-    # require the solaris version of Kerberos/GSS
-    REQUIRED_PACKAGES += service/security/kerberos-5
-    REQUIRED_PACKAGES += system/library/security/gss
-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 += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/network

--- 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