Index: branches/2020Q4/net/openntpd/Makefile
===================================================================
--- branches/2020Q4/net/openntpd/Makefile	(revision 557748)
+++ branches/2020Q4/net/openntpd/Makefile	(revision 557749)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	openntpd
 PORTVERSION=	6.2p3
-PORTREVISION=	8
+PORTREVISION=	9
 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
 
 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
 .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} . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
 .endif # SSL_DEFAULT
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4/net/relayd/Makefile
===================================================================
--- branches/2020Q4/net/relayd/Makefile	(revision 557748)
+++ branches/2020Q4/net/relayd/Makefile	(revision 557749)
@@ -1,54 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	relayd
 PORTVERSION=	5.5.20140810
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	OpenBSD relay daemon
 
 LICENSE=	ISCL
 
 GH_ACCOUNT=	mmatuska
 
 USES=		ssl uidfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	relayd
 WRKSRC_SUBDIR=	src/usr.sbin
 
 CFLAGS+=	-Wall
 
 MAKE_ARGS+=	BINDIR=${PREFIX}/sbin \
 		MANDIR=${PREFIX}/man/man
 
 USERS=		_relayd
 GROUPS=		_relayd
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \
 		${STAGEDIR}${PREFIX}/etc/relayd.conf.sample
 
 .include <bsd.port.pre.mk>
 
 .if ! ${SSL_DEFAULT:Mlibressl*}
 . ifnmake describe
 STAGEDIR_libressl!=	${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl
 . endif
 BUILD_DEPENDS+=	${NONEXISTENT}:security/libressl:stage
 .endif # SSL_DEFAULT
 
 CFLAGS+=	-I${STAGEDIR_libressl}${LOCALBASE}/include
 
 post-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/relayd/relay.c \
 		${WRKSRC}/relayd/relayd.h \
 		${WRKSRC}/relayd/relayd.conf.5 \
 		${WRKSRC}/relayd/relayd.8
 	${REINPLACE_CMD} 's|-lssl|${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a|g' \
 		 ${WRKSRC}/relayd/Makefile
 	${REINPLACE_CMD} 's|-lcrypto|${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a|g' \
 		${WRKSRC}/relayd/Makefile
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4/security/dsniff/Makefile
===================================================================
--- branches/2020Q4/security/dsniff/Makefile	(revision 557748)
+++ branches/2020Q4/security/dsniff/Makefile	(revision 557749)
@@ -1,64 +1,64 @@
 # Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dsniff
 DISTVERSION=	2.4b1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	http://www.monkey.org/~dugsong/${PORTNAME}/beta/ \
 		LOCAL/sbz
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Various sniffing utilities for penetration testing
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
 LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		gettext gnome pkgconfig
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
 DESTDIRNAME=	install_prefix
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/..$//}
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=	yes
 
 X11_USES=	xorg
 X11_USE=	xorg=x11,xmu
 X11_CONFIGURE_WITH=x
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085
 USES+=		ssl
 .endif
 
 .if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl
 # Requires LibreSSL for old SSL interface
 BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
 CPPFLAGS+=		-nostdinc -I/usr/include -I${WRKDIR}/libressl/include
 LDFLAGS+=		-L${WRKDIR}/libressl/lib
 CONFIGURE_ARGS+=	--with-openssl=${WRKDIR}/libressl
 
 # 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
 BROKEN_SSL=	openssl
 BROKEN_SSL_REASON_openssl=	incomplete definition of type 'struct rsa_st'
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,csin,_csin,g' \
 		${WRKSRC}/webmitm.c \
 		${WRKSRC}/sshmitm.c
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 557748)
+++ branches/2020Q4	(revision 557749)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r557748