Index: head/net/openntpd/Makefile
===================================================================
--- head/net/openntpd/Makefile	(revision 535778)
+++ head/net/openntpd/Makefile	(revision 535779)
@@ -1,58 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	openntpd
 PORTVERSION=	6.2p3
-PORTREVISION=	5
+PORTREVISION=	6
 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
 
-CONFLICTS=	ntp-[0-9].* ntp-devel-*
-
 USES=		ssl
 
+CONFLICTS=	ntp-[0-9].* 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
+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
 .if ${SSL_DEFAULT:Mlibressl*}
 CPPFLAGS+=		-I${OPENSSLINC}
 LDFLAGS+=		-L${OPENSSLLIB}
 .else # SSL_DEFAULT
 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} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
 .endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>
Index: head/net/openntpd/files/pkg-message.in
===================================================================
--- head/net/openntpd/files/pkg-message.in	(nonexistent)
+++ head/net/openntpd/files/pkg-message.in	(revision 535779)
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+OpenNTPD's man page has been installed as %%MANPREFIX%%/man/man8/ntpd.8.
+To view it instead of the base system ntpd's, override the manual search
+path:
+
+    MANPATH=%%MANPREFIX%%/man man ntpd
+EOM
+}
+]

Property changes on: head/net/openntpd/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property