Index: head/net/openntpd/Makefile
===================================================================
--- head/net/openntpd/Makefile	(revision 561962)
+++ head/net/openntpd/Makefile	(revision 561963)
@@ -1,59 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	openntpd
 PORTVERSION=	6.8p1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenNTPD
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Network Time Protocol (NTP) daemon
 
 LICENSE=	ISCL
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
-USES=		ssl
+USES=		localbase ssl
 
 CONFLICTS=	ntp ntp-devel ntpsec
 
 USE_RC_SUBR=	openntpd
 USERS=		_ntp
 GROUPS=		_ntp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cacert=${LOCALBASE}/etc/ssl/cert.pem
 
 SUB_FILES=	480.status-openntpd pkg-message
 SUB_LIST=	MANPREFIX="${MANPREFIX}"
 
 pre-build:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 	    ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/480.status-openntpd \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily
 
 .include <bsd.port.pre.mk>
 
-# Requires libtls from LibreSSL
+# When using LibreSSL use its own libtls, but when using OpenSSL
+# use libtls from libretls.
 .if ${SSL_DEFAULT:Mlibressl*}
-CPPFLAGS+=		-I${OPENSSLINC}
-LDFLAGS+=		-L${OPENSSLLIB}
-.else # SSL_DEFAULT
+#	/* empty */
+
+# Drop after FreeBSD 11 EOL: requires libtls from LibreSSL
+.elif ${SSL_DEFAULT:Mbase} && exists(/usr/include/openssl/ssl23.h)
 BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
 CPPFLAGS+=		-I${WRKDIR}/libressl/include
 LDFLAGS+=		-L${WRKDIR}/libressl/lib
 
 # Don't use COPYTREE_SHARE here as it hard links files, and the original files
 # are owned by root, which creates problems of its own.
 pre-configure:
 	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \
 	    && ${FIND} . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
+
+.else
+LIB_DEPENDS+=	libtls.so:security/libretls
 .endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>