Index: head/security/softether/Makefile
===================================================================
--- head/security/softether/Makefile	(revision 540773)
+++ head/security/softether/Makefile	(revision 540774)
@@ -1,90 +1,91 @@
 # $FreeBSD$
 
 PORTNAME=	softether
 DISTVERSION=	4.34-9745
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2020.04.05-tree/Source_Code/
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	SoftEther VPN 4 (RTM version)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64 and i386: https://www.softether.org/3-spec
 
 USES=		dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \
 		readline ssl
-USE_RC_SUBR=	softether_bridge softether_client softether_server
+USE_RC_SUBR=	softether_bridge softether_client \
+		softether_server softether_trafficserver
 
 DOS2UNIX_FILES=	ChangeLog LICENSE README *.TXT \
 		src/Cedar/*.* src/Mayaqua/*.*
 
 OPTIONS_DEFINE=	DOCS
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS_INSTALL=	softether-devel-4.* softether5
 PORTDOCS=	AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT
 
 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 vpncmd
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # a pity the source directory has such a naming scheme, but well
 WRKSRC=		${WRKDIR}/v${DISTVERSION}
 
 ALL_TARGET=	build
 
 .include <bsd.port.options.mk>
 
 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
 
 	# skip configure at all and copy the corresponding Makefile in place
 .if ${ARCH} != "amd64"
 	@${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile
 .else
 	@${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile
 .endif
 	# pull in user specific CFLAGS and LDFLAGS
 	@${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile
 
 # manually install to ${PREFIX}/libexec/softether, then the final install will copy scripts
 # into ${PREFIX}/sbin
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
 	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
 	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
 .for i in vpnbridge vpnclient vpncmd vpnserver
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
 .endfor
 	@${MKDIR} \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${SE_DBDIR} \
 		${STAGEDIR}${SE_LOGDIR} \
 		${STAGEDIR}${SE_PIDDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/softether/files/pkg-message.in
===================================================================
--- head/security/softether/files/pkg-message.in	(revision 540773)
+++ head/security/softether/files/pkg-message.in	(revision 540774)
@@ -1,26 +1,29 @@
 [
 { type: install
   message: <<EOM
-To run softether vpn client from startup, run
+To run SoftEtherVPN client from startup, run
 sysrc softether_client_enable=yes
 
-To run softether vpn server from startup, run
+To run SoftEtherVPN server from startup, run
 sysrc softether_server_enable=yes
 
-To run softether vpn bridge from startup, run
+To run SoftEtherVPN bridge from startup, run
 sysrc softether_bridge_enable=yes
+
+To run SoftEtherVPN traffic server from startup, run
+sysrc softether_trafficserver_enable=yes
 
 Initial and further configuration of all softether services can be
 done either by using a Windows client to connect to the running
 services or by vpncmd from command line.
 
 Please note client functionality is not supported on FreeBSD right now.
 
 When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the following directories as well:
 - %%SE_DBDIR%%
 - %%SE_LOGDIR%%
 - %%SE_PIDDIR%%
 EOM
 }
 ]
Index: head/security/softether/files/softether_trafficserver.in
===================================================================
--- head/security/softether/files/softether_trafficserver.in	(nonexistent)
+++ head/security/softether/files/softether_trafficserver.in	(revision 540774)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# PROVIDE: softether_trafficserver
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable softether_trafficserver:
+#
+# softether_trafficserver_enable (bool):
+#         Set it to "YES" to enable.
+#         (default: NO)
+# softether_trafficserver_user (username):
+#         Username used to run the daemon.
+#         (default: nobody)
+# softether_trafficserver_pid (str):
+#         Path of the pid file.
+#         (default: %%SE_PIDDIR%%/trafficserver.pid)
+# softether_trafficserver_log (str):
+#         Path of the log file.
+#         (default: %%SE_LOGDIR%%/trafficserver/trafficserver.log)
+
+. /etc/rc.subr
+
+name=softether_trafficserver
+rcvar=softether_trafficserver_enable
+load_rc_config ${name}
+
+: ${softether_trafficserver_enable:=NO}
+: ${softether_trafficserver_pid:="%%SE_PIDDIR%%/trafficserver.pid"}
+: ${softether_trafficserver_log:="%%SE_LOGDIR%%/trafficserver/trafficserver.log"}
+: ${softether_trafficserver_user:=nobody}
+
+command="%%PREFIX%%/libexec/softether/vpncmd"
+command_args="/TOOLS /CMD:TrafficServer /NOHUP:yes"
+
+logdir="%%SE_LOGDIR%%"
+
+start_precmd="${name}_precmd"
+start_cmd="${name}_start"
+
+pidfile="${softether_trafficserver_pid}"
+ts_user="${softether_trafficserver_user}"
+logfile="${softether_trafficserver_log}"
+
+softether_trafficserver_precmd()
+{
+	if [ ! -d "${logdir}/trafficserver" ]; then
+	    umask 077
+	    mkdir -p ${logdir}/trafficserver
+	fi
+}
+
+softether_trafficserver_start()
+{
+	/usr/sbin/daemon \
+		-c \
+		-t trafficserver \
+		-o "${logfile}" \
+		-p "${pidfile}" \
+		-u "${ts_user}" \
+		${command} ${command_args}
+}
+
+run_rc_command "$1"

Property changes on: head/security/softether/files/softether_trafficserver.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+ON
\ 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
Index: head/security/softether-devel/Makefile
===================================================================
--- head/security/softether-devel/Makefile	(revision 540773)
+++ head/security/softether-devel/Makefile	(revision 540774)
@@ -1,91 +1,92 @@
 # $FreeBSD$
 
 PORTNAME=	softether
 DISTVERSION=	4.34-9745-beta
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-2020.04.05-tree/Source_Code/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Softether VPN 4 (stable beta version)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64 and i386: https://www.softether.org/3-spec
 IGNORE=		no beta version available right now, use security/softether instead
 
 USES=		dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \
 		readline ssl
-USE_RC_SUBR=	softether_bridge softether_client softether_server
+USE_RC_SUBR=	softether_bridge softether_client \
+		softether_server softether_trafficserver
 
 DOS2UNIX_FILES=	ChangeLog LICENSE README *.TXT \
 		src/Cedar/*.* src/Mayaqua/*.*
 
 OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	softether-4.* softether5
 PORTDOCS=	AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT
 
 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 vpncmd
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # a pity the source directory has such a naming scheme, but well
 WRKSRC=		${WRKDIR}/v${DISTVERSION:S/-beta$//}
 
 ALL_TARGET=	build
 
 .include <bsd.port.options.mk>
 
 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
 
 	# skip configure at all and copy the corresponding Makefile in place
 .if ${ARCH} != "amd64"
 	@${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile
 .else
 	@${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile
 .endif
 	# pull in user specific CFLAGS and LDFLAGS
 	@${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile
 
 # manually install to ${PREFIX}/libexec/softether, then the final install will copy scripts
 # into ${PREFIX}/sbin
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
 	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
 	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
 .for i in vpnbridge vpnclient vpncmd vpnserver
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
 .endfor
 	@${MKDIR} \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${SE_DBDIR} \
 		${STAGEDIR}${SE_LOGDIR} \
 		${STAGEDIR}${SE_PIDDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/softether-devel/files/pkg-message.in
===================================================================
--- head/security/softether-devel/files/pkg-message.in	(revision 540773)
+++ head/security/softether-devel/files/pkg-message.in	(revision 540774)
@@ -1,26 +1,29 @@
 [
 { type: install
   message: <<EOM
-To run softether vpn client from startup, run
+To run SoftEtherVPN client from startup, run
 sysrc softether_client_enable=yes
 
-To run softether vpn server from startup, run
+To run SoftEtherVPN server from startup, run
 sysrc softether_server_enable=yes
 
-To run softether vpn bridge from startup, run
+To run SoftEtherVPN bridge from startup, run
 sysrc softether_bridge_enable=yes
+
+To run SoftEtherVPN traffic server from startup, run
+sysrc softether_trafficserver_enable=yes
 
 Initial and further configuration of all softether services can be
 done either by using a Windows client to connect to the running
 services or by vpncmd from command line.
 
 Please note client functionality is not supported on FreeBSD right now.
 
 When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the following directories as well:
 - %%SE_DBDIR%%
 - %%SE_LOGDIR%%
 - %%SE_PIDDIR%%
 EOM
 }
 ]
Index: head/security/softether-devel/files/softether_trafficserver.in
===================================================================
--- head/security/softether-devel/files/softether_trafficserver.in	(nonexistent)
+++ head/security/softether-devel/files/softether_trafficserver.in	(revision 540774)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# PROVIDE: softether_trafficserver
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable softether_trafficserver:
+#
+# softether_trafficserver_enable (bool):
+#         Set it to "YES" to enable.
+#         (default: NO)
+# softether_trafficserver_user (username):
+#         Username used to run the daemon.
+#         (default: nobody)
+# softether_trafficserver_pid (str):
+#         Path of the pid file.
+#         (default: %%SE_PIDDIR%%/trafficserver.pid)
+# softether_trafficserver_log (str):
+#         Path of the log file.
+#         (default: %%SE_LOGDIR%%/trafficserver/trafficserver.log)
+
+. /etc/rc.subr
+
+name=softether_trafficserver
+rcvar=softether_trafficserver_enable
+load_rc_config ${name}
+
+: ${softether_trafficserver_enable:=NO}
+: ${softether_trafficserver_pid:="%%SE_PIDDIR%%/trafficserver.pid"}
+: ${softether_trafficserver_log:="%%SE_LOGDIR%%/trafficserver/trafficserver.log"}
+: ${softether_trafficserver_user:=nobody}
+
+command="%%PREFIX%%/libexec/softether/vpncmd"
+command_args="/TOOLS /CMD:TrafficServer /NOHUP:yes"
+
+logdir="%%SE_LOGDIR%%"
+
+start_precmd="${name}_precmd"
+start_cmd="${name}_start"
+
+pidfile="${softether_trafficserver_pid}"
+ts_user="${softether_trafficserver_user}"
+logfile="${softether_trafficserver_log}"
+
+softether_trafficserver_precmd()
+{
+	if [ ! -d "${logdir}/trafficserver" ]; then
+	    umask 077
+	    mkdir -p ${logdir}/trafficserver
+	fi
+}
+
+softether_trafficserver_start()
+{
+	/usr/sbin/daemon \
+		-c \
+		-t trafficserver \
+		-o "${logfile}" \
+		-p "${pidfile}" \
+		-u "${ts_user}" \
+		${command} ${command_args}
+}
+
+run_rc_command "$1"

Property changes on: head/security/softether-devel/files/softether_trafficserver.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+ON
\ 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