Index: branches/2020Q3/net/py-wsdd/Makefile
===================================================================
--- branches/2020Q3/net/py-wsdd/Makefile	(revision 543482)
+++ branches/2020Q3/net/py-wsdd/Makefile	(revision 543483)
@@ -1,35 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	wsdd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6
+DISTVERSION=	0.6.1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hiroo.ono+freebsd@gmail.com
 COMMENT=	Web Service Discovery (WSD) host daemon for Samba
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.5+,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	christgau
 SHEBANG_FILES=	src/${PORTNAME}.py
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/rc.d/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
+
+post-patch:
+	${REINPLACE_CMD} 's|PYTHON|${PYTHON_CMD}|' ${WRKSRC}/etc/rc.d/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME}.py \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>
Index: branches/2020Q3/net/py-wsdd/distinfo
===================================================================
--- branches/2020Q3/net/py-wsdd/distinfo	(revision 543482)
+++ branches/2020Q3/net/py-wsdd/distinfo	(revision 543483)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591589990
-SHA256 (christgau-wsdd-v0.6_GH0.tar.gz) = 9e6caedfa92bc73b3bca2ff22fbb793254160197466a03bc1660fa2bd0bc0b15
-SIZE (christgau-wsdd-v0.6_GH0.tar.gz) = 27067
+TIMESTAMP = 1593428212
+SHA256 (christgau-wsdd-v0.6.1_GH0.tar.gz) = 930dbe2059db29b422a1d433cd4984056064b29fc768ef80cd17dfa69a35c50e
+SIZE (christgau-wsdd-v0.6.1_GH0.tar.gz) = 27254
Index: branches/2020Q3/net/py-wsdd/files/patch-etc_rc.d_wsdd
===================================================================
--- branches/2020Q3/net/py-wsdd/files/patch-etc_rc.d_wsdd	(nonexistent)
+++ branches/2020Q3/net/py-wsdd/files/patch-etc_rc.d_wsdd	(revision 543483)
@@ -0,0 +1,74 @@
+--- etc/rc.d/wsdd.orig	2020-06-28 19:10:44 UTC
++++ etc/rc.d/wsdd
+@@ -5,25 +5,61 @@
+ # BEFORE: login
+ # KEYWORD: shutdown
+ 
++# Add the following line in /etc/rc.conf to enable wsdd:
++#
++# wsdd_enable="YES"
++# wsdd_flags="<set as needed>"
++# wsdd_domain="<set if your host is an AD member>"
++# wsdd_group="<set if you want to set the workgroup manually>"
++#
++# Do not specify -d DOMAIN or -w WORKGROUP in wsdd_flags. Instead, set
++# wsdd_domain="DOMAIN" or wsdd_group="WORKGROUP", otherwise it will be
++# overridden by automatically detected workgroup.
++#
++
+ . /etc/rc.subr
+ 
+ name=wsdd
+ rcvar=wsdd_enable
+-wsdd_group=$(/usr/local/bin/testparm -s --parameter-name workgroup 2>/dev/null)
+ 
+-: ${wsdd_smb_config_file="/usr/local/etc/smb4.conf"}
++load_rc_config ${name}
+ 
+-# try to manually extract workgroup from samba configuration if testparm failed
+-if [ -z "$wsdd_group" ] && [ -r $wsdd_smb_config_file ]; then
+-	wsdd_group="$(grep -i '^[[:space:]]*workgroup[[:space:]]*=' $wsdd_smb_config_file | cut -f2 -d= | tr -d '[:blank:]')"
++: ${wsdd_enable:="NO"}
++: ${wsdd_flags:=""}
++: ${wsdd_domain:=""}
++: ${wsdd_group:=""}
++: ${wsdd_smb_config_file:="/usr/local/etc/smb4.conf"}
++
++if [ -z "${wsdd_group}" ]; then
++	# automatic detection of workgroup
++	wsdd_group=$(/usr/local/bin/testparm -s --parameter-name workgroup 2>/dev/null)
++
++	# try to manually extract workgroup from samba configuration if testparm failed
++	if [ -z "$wsdd_group" ] && [ -r $wsdd_smb_config_file ]; then
++		wsdd_group="$(grep -i '^[[:space:]]*workgroup[[:space:]]*=' $wsdd_smb_config_file | cut -f2 -d= | tr -d '[:blank:]')"
++	fi
+ fi
+ 
+-if [ -n "$wsdd_group" ]; then
+-	wsdd_opts="-w ${wsdd_group}"
++wsdd_opts=""
++if [ -n "${wsdd_suppflags}" ]; then
++	wsdd_opts="${wsdd_flags}"
+ fi
++if [ -n "$wsdd_domain" ]; then
++	wsdd_opts="${wsdd_opts} -d ${wsdd_domain}"
++elif [ -n "$wsdd_group" ]; then
++	wsdd_opts="${wsdd_opts} -w ${wsdd_group}"
++fi
+ 
+-command="/usr/sbin/daemon"
+-command_args="-u daemon -S /usr/local/bin/wsdd $wsdd_opts"
++command="/usr/local/bin/wsdd"
++procname="PYTHON"
++pidfile="/var/run/${name}.pid"
+ 
+-load_rc_config $name
++start_cmd="${name}_start"
++
++wsdd_start()
++{
++	echo -n "Starting ${name}."
++	/usr/sbin/daemon -u daemon -S -p ${pidfile} ${command} ${wsdd_opts}
++}
++
+ run_rc_command "$1"

Property changes on: branches/2020Q3/net/py-wsdd/files/patch-etc_rc.d_wsdd
___________________________________________________________________
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
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 543482)
+++ branches/2020Q3	(revision 543483)

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