Index: branches/2020Q1/security/softether5/Makefile
===================================================================
--- branches/2020Q1/security/softether5/Makefile	(revision 526443)
+++ branches/2020Q1/security/softether5/Makefile	(revision 526444)
@@ -1,81 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	softether
 DISTVERSION=	5.01.9672
 PORTREVISION=	1
 CATEGORIES=	security net-vpn
 PKGNAMESUFFIX=	5
 DIST_SUBDIR=	${PORTNAME}
 
 # Some patches are managed in my GitHub fork
-PATCH_SITES=	https://github.com/metalefty/${GH_ACCOUNT}/commit/
-PATCHFILES=	7a7bed1.patch:-p1 501135e.patch:-p1 13f0ec3.patch:-p1
+PATCH_SITES=	https://github.com/metalefty/${GH_PROJECT}/commit/
+PATCHFILES=	7dcfce9.patch:-p1 5832425.patch:-p1 9093f9e.patch:-p1
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	SoftEther VPN 5 (Developer Edition)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		cmake:noninja compiler:c11 iconv:wchar_t \
 		localbase:ldflags ncurses readline ssl
 USE_RC_SUBR=	softether_bridge softether_client softether_server
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	SoftEtherVPN
 GH_PROJECT=	SoftEtherVPN
 
 CMAKE_ARGS+=	 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 OPTIONS_DEFINE=	DOCS UNLOCK
 
 # Use of some functions in Japan and China is restricted.
 # This option Unlocks regional lockout following functions:
 #  - RADIUS / NT Domain user authentication function
 #  - RSA certificate user authentication function
 #  - Deep-inspect packet logging function
 #  - Source IP address control list function
 #  - syslog transfer function
 UNLOCK_DESC=	Unlock regional lockout (JP and CN)
-UNLOCK_PATCHFILES=	940a202.patch:-p1
+UNLOCK_PATCHFILES=	d41c3ae.patch:-p1
 
 PORTDOCS=	DISCLAIMER.md WARNING.TXT
 CONFLICTS_INSTALL=	softether-4.[0-9]* softether-devel-4.[0-9]*
 
 SE_DBDIR?=	/var/db/${PORTNAME}
 SE_LOGDIR?=	/var/log/${PORTNAME}
 SE_PIDDIR?=	/var/run/${PORTNAME}
 PLIST_SUB=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
 SUB_LIST=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 # devel/cpu_features not available on these archs, see devel/cpu_features/Makefile
 .if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64)
 # skip cpu_features when devel/cpu_features is not available
 CFLAGS+=	-DSKIP_CPU_FEATURES
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features
 .endif
 
 post-patch:
 	# SoftEther scatters logs, config files and PID files in PREFIX/libexec
 	# directory. To write them in the right place, replace it.
 	${REINPLACE_CMD} \
 		-e "s|%%SE_DBDIR%%|${SE_DBDIR}|g" \
 		-e "s|%%SE_LOGDIR%%|${SE_LOGDIR}|g" \
 		-e "s|%%SE_PIDDIR%%|${SE_PIDDIR}|g" \
 		${WRKSRC}/src/Mayaqua/FileIO.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} ${STAGEDIR}${SE_PIDDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${FIND} ${WRKSRC} -name ${doc} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
 .endfor
 
 .include <bsd.port.post.mk>
Index: branches/2020Q1/security/softether5/distinfo
===================================================================
--- branches/2020Q1/security/softether5/distinfo	(revision 526443)
+++ branches/2020Q1/security/softether5/distinfo	(revision 526444)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1574728978
+TIMESTAMP = 1582012314
 SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.01.9672_GH0.tar.gz) = 71db32ac42ac52af8d50c61190834b0c96759363d5e1911a69a0e3155a4c9644
 SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.01.9672_GH0.tar.gz) = 107032019
-SHA256 (softether/7a7bed1.patch) = 49150dee64f7183bad195f6da591311a21b22a36cd8bb5cac00ea9edb14ab6fa
-SIZE (softether/7a7bed1.patch) = 1081
-SHA256 (softether/501135e.patch) = b6a27221a19ee7dada2213cecdcf7d7531fad686416383fc2a272c2306512a98
-SIZE (softether/501135e.patch) = 12581
-SHA256 (softether/13f0ec3.patch) = 715bc54a9d50ded2e5d9440ad3d1c77a0e5b605ee674c7381094b6da4a3adb0c
-SIZE (softether/13f0ec3.patch) = 2046
-SHA256 (softether/940a202.patch) = 61051f05b71193e263b1817f64b62d86b56cbd9a88679aebd22954f2b2f5aefc
-SIZE (softether/940a202.patch) = 930
+SHA256 (softether/7dcfce9.patch) = 43192adaedf65c3e5f0c5b22a489b41d2e192e6d4b4e24e2f7de1280d3b13dd9
+SIZE (softether/7dcfce9.patch) = 801
+SHA256 (softether/5832425.patch) = bea99778e2d0ebaf2e80a2511cdc5c91a13430678f371b56ff6c37ebdf009dfa
+SIZE (softether/5832425.patch) = 12581
+SHA256 (softether/9093f9e.patch) = aba81b81e21829356f8caeacc986cc3e6d94fe0c7dfb371a63485702ea6c0a53
+SIZE (softether/9093f9e.patch) = 2046
+SHA256 (softether/d41c3ae.patch) = 33bc1239c13737869fba80f5e3aba0b293f125b70221cb586da885fbcd405412
+SIZE (softether/d41c3ae.patch) = 930
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 526443)
+++ branches/2020Q1	(revision 526444)

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