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