Stop using the daemon class in @newuser.

If we need to make an exception we can do it and properly document the reason but by default we should just use the default login class. rc.d uses daemon or the login class provided in login.conf.d so this has no impact there. discussed with sthen@, tb@ and robert@ praying that my grep/sed skills did not break anything and still believing in portbump :-)
2022-11-08 11:16:56 +00:00 · 2022-11-08 11:16:56 +00:00 · c4096e6659
parent f50fdd748e
commit c4096e6659
307 changed files with 362 additions and 241 deletions
--- a/net/mautrix-whatsapp/Makefile
+++ b/net/mautrix-whatsapp/Makefile
@ -4,6 +4,7 @@ MODGO_VERSION =	v0.6.1
 MODGO_MODNAME =	maunium.net/go/mautrix-whatsapp

 DISTNAME =	mautrix-whatsapp-${MODGO_VERSION}
+REVISION =	0

 EPOCH =		0

--- a/net/mautrix-whatsapp/pkg/PLIST
+++ b/net/mautrix-whatsapp/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _whatsapp:851
-@newuser _whatsapp:851:851:daemon:Matrix.org whatsapp bridge Daemon:${VARBASE}/whatsapp:/sbin/nologin
+@newuser _whatsapp:851:851::Matrix.org whatsapp bridge Daemon:${VARBASE}/whatsapp:/sbin/nologin
@rcscript ${RCDIR}/mautrix_whatsapp
@bin bin/mautrix-whatsapp
 share/doc/pkg-readmes/${PKGSTEM}
--- a/net/mcast-proxy/Makefile
+++ b/net/mcast-proxy/Makefile
@ -3,7 +3,7 @@ COMMENT =		multicast proxy daemon
 GH_ACCOUNT =		Esdenera
 GH_PROJECT =		mcast-proxy
 GH_TAGNAME =		v1.0
-REVISION =		6
+REVISION =		7

 DISTFILES =		mcast-proxy-1.0-0{mcast-proxy-1.0}.tar.gz

--- a/net/mcast-proxy/pkg/PLIST
+++ b/net/mcast-proxy/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mcastproxy:792
-@newuser _mcastproxy:792:792:daemon:Multicast Proxy:/var/empty:/sbin/nologin
+@newuser _mcastproxy:792:792::Multicast Proxy:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/mcastproxy
@man man/man5/mcast-proxy.conf.5
@man man/man8/mcast-proxy.8
--- a/net/mfi/Makefile
+++ b/net/mfi/Makefile
@ -4,7 +4,7 @@ DISTFILES=	mFi-$V{mFi.unix}.zip
 V=		2.1.2
 FW_VER=		2.1.2.1297
 PKGNAME=	mfi-$V
-REVISION=	9
+REVISION=	10

 CATEGORIES=	net

--- a/net/mfi/pkg/PLIST
+++ b/net/mfi/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mfi:747
-@newuser _mfi:747:_mfi:daemon:mfi user:/usr/local/share/mfi:/sbin/nologin
+@newuser _mfi:747:_mfi::mfi user:/usr/local/share/mfi:/sbin/nologin
@ask-update mfi-<2.12 Make sure your existing database is backed up
 bin/mfi
@owner _mfi
--- a/net/minbif/Makefile
+++ b/net/minbif/Makefile
@ -2,7 +2,7 @@ COMMENT =	IRC-friendly instant messaging client

 DISTNAME=	minbif-1.0.5
 CATEGORIES=	net
-REVISION=	5
+REVISION=	6

 HOMEPAGE =	http://minbif.im/
 MASTER_SITES=	${HOMEPAGE}attachments/download/148/
--- a/net/minbif/pkg/PLIST
+++ b/net/minbif/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _minbif:655
-@newuser _minbif:655:_minbif:daemon:Minbif Account:/nonexistent:/sbin/nologin
+@newuser _minbif:655:_minbif::Minbif Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/minbif/*
@bin bin/minbif
@man man/man8/minbif.8
--- a/net/miniflux/Makefile
+++ b/net/miniflux/Makefile
@ -6,6 +6,7 @@ MODGO_VERSION =	v0.0.0-20220813191517-1ca35e9364b1
 DISTNAME =	miniflux.app-${MODGO_VERSION}
 V =		2.0.38.20220813
 PKGNAME =	miniflux-${V}
+REVISION =	0

 CATEGORIES =	net www

--- a/net/miniflux/pkg/PLIST
+++ b/net/miniflux/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _miniflux:859
-@newuser _miniflux:859:_miniflux:daemon:Miniflux user:${VARBASE}/miniflux:/sbin/nologin
+@newuser _miniflux:859:_miniflux::Miniflux user:${VARBASE}/miniflux:/sbin/nologin
@rcscript ${RCDIR}/miniflux
@owner _miniflux
@group _miniflux
--- a/net/minio/server/Makefile
+++ b/net/minio/server/Makefile
@ -9,6 +9,7 @@ MODGO_VERSION =	v0.0.0-${V:C/[-TZ]//g}-${SHORTCID}

 DISTNAME =	minio-${MODGO_VERSION}
 PKGNAME =	minio-0.${V:C/T.*//:S/-//g}
+REVISION =	0

 MODGO_LDFLAGS =	-s -w \
 		-X github.com/minio/minio/cmd.Version=${V:C/T([0-9]+)-([0-9]+)-([0-9]+)/T\1:\2:\3/} \
--- a/net/minio/server/pkg/PLIST
+++ b/net/minio/server/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _minio:796
-@newuser _minio:796:_minio:daemon:Minio user:${VARBASE}/minio:/sbin/nologin
+@newuser _minio:796:_minio::Minio user:${VARBASE}/minio:/sbin/nologin
@bin bin/minio
 share/doc/pkg-readmes/${PKGSTEM}
@rcscript ${RCDIR}/minio
--- a/net/mirmon/Makefile
+++ b/net/mirmon/Makefile
@ -1,7 +1,7 @@
 COMMENT=	monitors the status of mirrors

 DISTNAME=	mirmon-2.11
-REVISION=	0
+REVISION=	1

 CATEGORIES=	net
 HOMEPAGE=	http://people.cs.uu.nl/henkp/mirmon/
--- a/net/mirmon/pkg/PLIST
+++ b/net/mirmon/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mirmon:651
-@newuser _mirmon:651:_mirmon:daemon:mirmon user:/nonexistent:/sbin/nologin
+@newuser _mirmon:651:_mirmon::mirmon user:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/db/mirmon/*
 bin/mirmon
 bin/mirmon-probe
--- a/net/mlvpn/Makefile
+++ b/net/mlvpn/Makefile
@ -2,7 +2,7 @@ COMMENT =		link-aggregation VPN software

 V =			2.3.5
 DISTNAME =		mlvpn-$V
-REVISION =		1
+REVISION =		2

 CATEGORIES =		net

--- a/net/mlvpn/pkg/PLIST
+++ b/net/mlvpn/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mlvpn:758
-@newuser _mlvpn:758:_mlvpn:daemon:mlvpn user:/var/empty:/sbin/nologin
+@newuser _mlvpn:758:_mlvpn::mlvpn user:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/mlvpn
@man man/man1/mlvpn.1
@man man/man5/mlvpn.conf.5
--- a/net/mon/server/Makefile
+++ b/net/mon/server/Makefile
@ -1,7 +1,7 @@
 COMMENT =	service monitoring daemon

 DISTNAME = 	mon-${V}
-REVISION =	11
+REVISION =	12

 WANTLIB = 	c

--- a/net/mon/server/pkg/PLIST
+++ b/net/mon/server/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mon:643
-@newuser _mon:643:_mon:daemon:Mon Server:/var/empty:/bin/sh
+@newuser _mon:643:_mon::Mon Server:/var/empty:/bin/sh
 bin/mon
 lib/mon/
 lib/mon/alert.d/
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@ -2,6 +2,7 @@ COMMENT =		opensource MQTT broker

 V =			2.0.15
 DISTNAME =		mosquitto-$V
+REVISION =		0

 SHARED_LIBS +=  mosquitto                 2.1 # 1.5
 SHARED_LIBS +=  mosquittopp               2.0 # 1.5
--- a/net/mosquitto/pkg/PLIST
+++ b/net/mosquitto/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mosquitto:753
-@newuser _mosquitto:753:753:daemon:Mosquitto MQTT Broker:/var/empty:/sbin/nologin
+@newuser _mosquitto:753:753::Mosquitto MQTT Broker:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/mosquitto
@bin bin/mosquitto_passwd
@bin bin/mosquitto_pub
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@ -1,6 +1,7 @@
 COMMENT=	multi-router traffic grapher

 DISTNAME=	mrtg-2.17.10
+REVISION=	0

 CATEGORIES=	net

--- a/net/mrtg/pkg/PLIST
+++ b/net/mrtg/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mrtg:578
-@newuser _mrtg:578:578:daemon:MRTG account:/var/empty:/sbin/nologin
+@newuser _mrtg:578:578::MRTG account:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/mrtg
 bin/cfgmaker
 bin/indexmaker
--- a/net/munin/Makefile
+++ b/net/munin/Makefile
@ -9,6 +9,8 @@ GH_TAGNAME =	2.0.71
 PKGNAME-main =	munin-node-${GH_TAGNAME}
 PKGNAME-server =munin-server-${GH_TAGNAME}
 CATEGORIES =	net
+REVISION-main =	0
+REVISION-server =	0

 HOMEPAGE =	https://munin-monitoring.org/

--- a/net/munin/pkg/PLIST-main
+++ b/net/munin/pkg/PLIST-main
@ -1,8 +1,8 @@
@conflict munin-server-<2.0.21
@newgroup _munin:644
@newgroup _munin-plugin:645
-@newuser _munin:644:_munin:daemon:munin user:/nonexistent:/sbin/nologin
-@newuser _munin-plugin:645:_munin-plugin:daemon:munin-plugin user:/nonexistent:/sbin/nologin
+@newuser _munin:644:_munin::munin user:/nonexistent:/sbin/nologin
+@newuser _munin-plugin:645:_munin-plugin::munin-plugin user:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${SYSCONFDIR}/munin/plugins/*
@extraunexec rm -rf ${SYSCONFDIR}/munin/plugin-conf.d/*
@extraunexec rm -rf /var/log/munin/*
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@ -4,13 +4,13 @@ COMMENT-main=	host and service monitor
 COMMENT-web=	cgis and webpages for nagios

 V=		4.4.6
-REVISION=	0
+REVISION=	1
 DISTNAME=	nagios-$V
 PKGNAME-main=	nagios-$V
 PKGNAME-web=	nagios-web-$V
 CATEGORIES=	net

-REVISION-web=	0
+REVISION-web=	1

 HOMEPAGE=	https://www.nagios.org/

--- a/net/nagios/nagios/pkg/PLIST-main
+++ b/net/nagios/nagios/pkg/PLIST-main
@ -1,6 +1,6 @@
@pkgpath ${BASE_PKGPATH}
@newgroup _nagios:550
-@newuser _nagios:550:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
+@newuser _nagios:550:_nagios::Nagios user:/var/www/nagios:/sbin/nologin
@extraunexec rm -rf ${CHROOT}${SYSCONFDIR}/nagios/*
@extraunexec rm -f ${CHROOT}/var/log/nagios/archives/*
@rcscript ${RCDIR}/nagios
--- a/net/nagios/nrpe/Makefile
+++ b/net/nagios/nrpe/Makefile
@ -1,7 +1,7 @@
 COMMENT=	Nagios Remote Plugin Executor

 DISTNAME=	nrpe-4.0.3
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net

 HOMEPAGE=	https://github.com/NagiosEnterprises/nrpe
--- a/net/nagios/nrpe/pkg/PLIST
+++ b/net/nagios/nrpe/pkg/PLIST
@ -1,6 +1,6 @@
@pkgpath net/nagios/nrpe,no_ssl
@newgroup _nrpe:556
-@newuser _nrpe:556:_nrpe:daemon:NRPE Account:/nonexistent:/sbin/nologin
+@newuser _nrpe:556:_nrpe::NRPE Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/nrpe
@bin libexec/nagios/check_nrpe
 libexec/nagios/update-cfg.pl
--- a/net/natpmpd/Makefile
+++ b/net/natpmpd/Makefile
@ -1,7 +1,7 @@
 COMMENT=		daemon implementing NAT-PMP protocol for pf(4)

 DISTNAME=		natpmpd-1.4
-REVISION=		5
+REVISION=		6
 CATEGORIES=		net

 HOMEPAGE=		http://bodgitandscarper.co.uk/natpmpd/
--- a/net/natpmpd/pkg/PLIST
+++ b/net/natpmpd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _natpmpd:691
-@newuser _natpmpd:691:691:daemon:NAT-PMP Daemon:/var/empty:/sbin/nologin
+@newuser _natpmpd:691:691::NAT-PMP Daemon:/var/empty:/sbin/nologin
@man man/man5/natpmpd.conf.5
@man man/man8/natpmpd.8
@bin sbin/natpmpd
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@ -6,11 +6,12 @@ DISTNAME=	net-snmp-$V
 MULTI_PACKAGES=	-main -tkmib
 PKGNAME-main=	net-snmp-$V
 PKGNAME-tkmib=	net-snmp-tkmib-$V
-REVISION-main=	2
+REVISION-main=	3

 # tkmib isn't flavoured
 FULLPKGPATH-tkmib= net/net-snmp,-tkmib
 FULLPKGNAME-tkmib= net-snmp-tkmib-$V
+REVISION-tkmib=    0

 # N.B. p5 module picks up installed libs in /usr/local
 # please check sysutils/snmp_exporter "make test" if updating
--- a/net/net-snmp/pkg/PLIST-main
+++ b/net/net-snmp/pkg/PLIST-main
@ -3,7 +3,7 @@
@pkgpath net/net-snmp
@pkgpath net/net-snmp,-perl
@newgroup _netsnmp:760
-@newuser _netsnmp:760:_netsnmp:daemon:Net-SNMP user:/nonexistent:/sbin/nologin
+@newuser _netsnmp:760:_netsnmp::Net-SNMP user:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/net-snmp/*
 !%%readonly%%
@rcscript ${RCDIR}/netsnmpd
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@ -7,6 +7,8 @@ GH_PROJECT =		nfdump
 GH_TAGNAME =		v$V
 FULLPKGNAME-main =	nfdump-$V
 FULLPKGNAME-nfprofile =	nfprofile-$V
+REVISION-main =		0
+REVISION-nfprofile =	0

 SHARED_LIBS +=	nfdump                    1.1

--- a/net/nfdump/pkg/PLIST-main
+++ b/net/nfdump/pkg/PLIST-main
@ -1,5 +1,5 @@
@newgroup _nfcapd:649
-@newuser _nfcapd:649:_nfcapd:daemon:nfcapd user:/nonexistent:/sbin/nologin
+@newuser _nfcapd:649:_nfcapd::nfcapd user:/nonexistent:/sbin/nologin
@bin bin/ft2nfdump
@bin bin/nfanon
@bin bin/nfcapd
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@ -1,6 +1,7 @@
 COMMENT =	lightweight irc server

 DISTNAME =	ngircd-26.1
+REVISION =	0

 CATEGORIES =	net

--- a/net/ngircd/pkg/PLIST
+++ b/net/ngircd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _ngircd:703
-@newuser _ngircd:703:703:daemon:ngircd account:/var/ngircd:/sbin/nologin
+@newuser _ngircd:703:703::ngircd account:/var/ngircd:/sbin/nologin
@mode 700
@owner _ngircd
@group _ngircd
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@ -4,6 +4,7 @@ GH_ACCOUNT=	jpr5
 GH_PROJECT=	ngrep
 GH_COMMIT=	2a9603bc67dface9606a658da45e1f5c65170444
 DISTNAME=	ngrep-1.47.20190128
+REVISION=	0

 CATEGORIES=	net

--- a/net/ngrep/pkg/PLIST
+++ b/net/ngrep/pkg/PLIST
@ -1,4 +1,4 @@
@newgroup _ngrep:622
-@newuser _ngrep:622:_ngrep:daemon:ngrep user:/nonexistent:/sbin/nologin
+@newuser _ngrep:622:_ngrep::ngrep user:/nonexistent:/sbin/nologin
@man man/man8/ngrep.8
@bin sbin/ngrep
--- a/net/no-ip/Makefile
+++ b/net/no-ip/Makefile
@ -3,7 +3,7 @@ COMMENT=		No-IP.com Dynamic DNS client
 V=			2.1.9
 DISTNAME=		noip-${V}
 PKGNAME=		no-ip-${V}
-REVISION=		5
+REVISION=		6
 CATEGORIES=		net

 HOMEPAGE=		http://www.no-ip.com/
--- a/net/no-ip/pkg/PLIST
+++ b/net/no-ip/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _noip:624
-@newuser _noip:624:_noip:daemon:noip user:/nonexistent:/sbin/nologin
+@newuser _noip:624:_noip::noip user:/nonexistent:/sbin/nologin
@bin sbin/noip2
 share/doc/no-ip/
 share/doc/no-ip/README.FIRST
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@ -9,6 +9,7 @@ GH_TAGNAME=	5.2.1
 #GH_COMMIT=	025e96e6cbb61e0f7320acf1d4038fafbbf836fa
 #NTOPNG_D=	20210727
 #DISTNAME=	ntopng-${NTOPNG_V}.${NTOPNG_D}
+REVISION=	0

 NDPI_V=		4.2
 DISTFILES=	${GH_DISTFILE} \
--- a/net/ntopng/pkg/PLIST
+++ b/net/ntopng/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _ntopng:809
-@newuser _ntopng:809:_ntopng:daemon:ntopng user:/nonexistent:/sbin/nologin
+@newuser _ntopng:809:_ntopng::ntopng user:/nonexistent:/sbin/nologin
@owner _ntopng
@sample ${LOCALSTATEDIR}/db/ntopng/
@owner
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@ -2,7 +2,7 @@ COMMENT=	server implementing the AnyConnect SSL VPN protocol

 DISTNAME=	ocserv-1.1.6
 EXTRACT_SUFX=	.tar.xz
-REVISION=	0
+REVISION=	1

 CATEGORIES=	net

--- a/net/ocserv/pkg/PLIST
+++ b/net/ocserv/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _ocserv:749
-@newuser _ocserv:749:_ocserv:daemon:ocserv user:/nonexistent:/sbin/nologin
+@newuser _ocserv:749:_ocserv::ocserv user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/ocserv
@bin bin/occtl
@bin bin/ocpasswd
--- a/net/openfire/Makefile
+++ b/net/openfire/Makefile
@ -1,6 +1,6 @@
 COMMENT=	XMPP real time collaboration server
 V=		4.2.3
-REVISION=	1
+REVISION=	2
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
--- a/net/openfire/pkg/PLIST
+++ b/net/openfire/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _openfire:632
-@newuser _openfire:632:_openfire:daemon:openfire user:/var/empty:/bin/sh
+@newuser _openfire:632:_openfire::openfire user:/var/empty:/bin/sh
@extraunexec rm -rf %D/openfire/conf/*
@extraunexec rm -rf %D/openfire/embedded-db
@extraunexec rm -rf %D/openfire/logs/*
--- a/net/openmdns/Makefile
+++ b/net/openmdns/Makefile
@ -2,7 +2,7 @@ COMMENT =		MDNS/DNS-SD daemon

 DISTNAME =		openmdns-0.7
 CATEGORIES =		net
-REVISION =		2
+REVISION =		3

 MAINTAINER =		Gonzalo L. R. <gonzalo@openbsd.org>

--- a/net/openmdns/pkg/PLIST
+++ b/net/openmdns/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _mdnsd:664
-@newuser _mdnsd:664:_mdnsd:daemon:MDNS Daemon:/var/empty:/sbin/nologin
+@newuser _mdnsd:664:_mdnsd::MDNS Daemon:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/mdnsd
@bin bin/mdnsctl
@bin bin/mdnsd
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@ -1,6 +1,7 @@
 COMMENT=	easy-to-use, robust, and highly configurable VPN

 DISTNAME=	openvpn-2.5.8
+REVISION=	0

 CATEGORIES=	net security

--- a/net/openvpn/pkg/PLIST
+++ b/net/openvpn/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _openvpn:577
-@newuser _openvpn:577:_openvpn:daemon:OpenVPN Daemon:/nonexistent:/sbin/nologin
+@newuser _openvpn:577:_openvpn::OpenVPN Daemon:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/openvpn
 include/openvpn/
 include/openvpn/openvpn-msg.h
--- a/net/owamp/Makefile
+++ b/net/owamp/Makefile
@ -1,7 +1,7 @@
 COMMENT =	rfc4656 one-way active measurement protocol

 DISTNAME =	owamp-3.1
-REVISION =	0
+REVISION =	1

 CATEGORIES =	net

--- a/net/owamp/pkg/PLIST
+++ b/net/owamp/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _owampd:678
-@newuser _owampd:678:_owampd:daemon:owampd user:/nonexistent:/sbin/nologin
+@newuser _owampd:678:_owampd::owampd user:/nonexistent:/sbin/nologin
@bin bin/aespasswd
@bin bin/owampd
 bin/owfetch
--- a/net/pdnsd/Makefile
+++ b/net/pdnsd/Makefile
@ -4,7 +4,7 @@ DISTNAME=		pdnsd-1.2.9a-par
 PKGNAME=		${DISTNAME:S/-par//}
 CATEGORIES=		net
 MASTER_SITES=		${HOMEPAGE}/releases/
-REVISION=		0
+REVISION=		1

 HOMEPAGE=		http://members.home.nl/p.a.rombouts/pdnsd/

--- a/net/pdnsd/pkg/PLIST
+++ b/net/pdnsd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _pdnsd:510
-@newuser _pdnsd:510:_pdnsd:daemon:Proxy DNS Server:/nonexistent:/sbin/nologin
+@newuser _pdnsd:510:_pdnsd::Proxy DNS Server:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/pdnsd/*
@man man/man5/pdnsd.conf.5
@man man/man8/pdnsd-ctl.8
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@ -15,6 +15,10 @@ PKGNAME-ldap=		powerdns-ldap-${V}
 #REVISION-mysql=		0
 #REVISION-pgsql=		0
 #REVISION-ldap=		0
+REVISION-ldap=		0
+REVISION-main=		0
+REVISION-mysql=		0
+REVISION-pgsql=		0

 CATEGORIES=		net

--- a/net/powerdns/pkg/PLIST-main
+++ b/net/powerdns/pkg/PLIST-main
@ -3,7 +3,7 @@
@pkgpath net/powerdns,-sqlite
@pkgpath net/powerdns,-sqlite3
@newgroup _powerdns:609
-@newuser _powerdns:609:_powerdns:daemon:PowerDNS Server:/nonexistent:/sbin/nologin
+@newuser _powerdns:609:_powerdns::PowerDNS Server:/nonexistent:/sbin/nologin
@sample ${SYSCONFDIR}/
@rcscript ${RCDIR}/pdns_server
@bin bin/calidns
--- a/net/powerdns_recursor/Makefile
+++ b/net/powerdns_recursor/Makefile
@ -5,6 +5,7 @@ DISTNAME=		pdns-recursor-${V}
 EXTRACT_SUFX =		.tar.bz2
 PKGNAME=		powerdns-recursor-${V}
 #REVISION=		0
+REVISION=		0

 CATEGORIES=		net

--- a/net/powerdns_recursor/pkg/PLIST
+++ b/net/powerdns_recursor/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _pdns_recursor:830
-@newuser _pdns_recursor:830:_pdns_recursor:daemon:PowerDNS Recursor:/nonexistent:/sbin/nologin
+@newuser _pdns_recursor:830:_pdns_recursor::PowerDNS Recursor:/nonexistent:/sbin/nologin
@sample ${SYSCONFDIR}/
@rcscript ${RCDIR}/pdns_recursor
@bin bin/rec_control
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@ -2,6 +2,7 @@ COMMENT =	communications server for Jabber/XMPP written in Lua
 DISTNAME =	prosody-0.12.1
 CATEGORIES =	net
 HOMEPAGE =	https://prosody.im/
+REVISION =	0

 MAINTAINER =	Lucas <lucas@sexy.is>

--- a/net/prosody/pkg/PLIST
+++ b/net/prosody/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _prosody:638
-@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
+@newuser _prosody:638:_prosody::prosody user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/prosody
 lib/prosody/
 lib/prosody/core/
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@ -9,6 +9,7 @@ MASTER_SITES=	https://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/ \
 		${MASTER_SITE_SOURCEFORGE:=pureftpd/}
 EXTRACT_SUFX=	.tar.bz2
+REVISION=	0

 HOMEPAGE=	https://www.pureftpd.org/project/pure-ftpd/

--- a/net/pure-ftpd/pkg/PLIST
+++ b/net/pure-ftpd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _pure-ftpd:642
-@newuser _pure-ftpd:642:_pure-ftpd:daemon:pure-ftpd user:/nonexistent:/sbin/nologin
+@newuser _pure-ftpd:642:_pure-ftpd::pure-ftpd user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/pure_ftpd
@bin bin/pure-pw
@bin bin/pure-pwconvert
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@ -1,7 +1,7 @@
 COMMENT=	multi-threaded routing daemon

 DISTNAME=	quagga-1.2.4
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net

 .for i in ospf ospfapiclient zebra fpm_pb quagga_pb
--- a/net/quagga/pkg/PLIST
+++ b/net/quagga/pkg/PLIST
@ -1,6 +1,6 @@
@conflict zebra-*
@newgroup _quagga:525
-@newuser _quagga:525:_quagga:daemon:Quagga Account:/nonexistent:/sbin/nologin
+@newuser _quagga:525:_quagga::Quagga Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${LOCALSTATEDIR}/*
@extraunexec rm -rf /var/log/quagga/*
@rcscript ${RCDIR}/quagga_babeld
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@ -4,6 +4,7 @@ V =		3.10.7
 DISTNAME =	rabbitmq-server-$V
 PKGNAME =	rabbitmq-$V
 CATEGORIES =	net
+REVISION =	0

 HOMEPAGE =	https://www.rabbitmq.com/

--- a/net/rabbitmq/pkg/PLIST
+++ b/net/rabbitmq/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _rabbitmq:646
-@newuser _rabbitmq:646:_rabbitmq:daemon:RabbitMQ account:/var/rabbitmq:/sbin/nologin
+@newuser _rabbitmq:646:_rabbitmq::RabbitMQ account:/var/rabbitmq:/sbin/nologin
@rcscript ${RCDIR}/rabbitmq
@mode 700
@owner _rabbitmq
--- a/net/rbldnsd/Makefile
+++ b/net/rbldnsd/Makefile
@ -4,6 +4,7 @@ DISTNAME=	rbldnsd-0.998.20180516
 GH_ACCOUNT=	spamhaus
 GH_PROJECT=	rbldnsd
 GH_COMMIT=	cfb7e80ffa690861b1b79772328aa274d1d5446a
+REVISION=	0

 CATEGORIES=	net

--- a/net/rbldnsd/pkg/PLIST
+++ b/net/rbldnsd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _rbldns:561
-@newuser _rbldns:561:_rbldns:daemon:rbldns Account:/nonexistent:/sbin/nologin
+@newuser _rbldns:561:_rbldns::rbldns Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/rbldnsd
@man man/man8/rbldnsd.8
@bin sbin/rbldnsd
--- a/net/routinator/Makefile
+++ b/net/routinator/Makefile
@ -6,7 +6,7 @@ COMMENT =		RPKI "relying party" software
 GH_ACCOUNT =		NLnetLabs
 GH_PROJECT =		routinator
 GH_TAGNAME =		v0.11.3
-REVISION =		1
+REVISION =		2

 ROUTINATOR_UI_URL =	https://github.com/NLnetLabs/routinator-ui/releases/download/
 ROUTINATOR_UI_VERSION =	0.3.4
--- a/net/routinator/pkg/PLIST
+++ b/net/routinator/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _routinator:844
-@newuser _routinator:844:_routinator:daemon:routinator user:/nonexistent:/sbin/nologin
+@newuser _routinator:844:_routinator::routinator user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/routinator
@bin bin/routinator
@man man/man1/routinator.1
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@ -3,9 +3,9 @@ COMMENT-update=	lightweight update-only tool for rrdtool
 COMMENT-ruby=	ruby interface to librrd

 VERSION=	1.7.2
-REVISION=	1
-REVISION-main=	2
-REVISION-ruby=	3
+REVISION=	2
+REVISION-main=	3
+REVISION-ruby=	4
 DISTNAME=	rrdtool-${VERSION}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-update=	rrdupdate-${VERSION}
--- a/net/rrdtool/pkg/PLIST-main
+++ b/net/rrdtool/pkg/PLIST-main
@ -1,7 +1,7 @@
@conflict p5-RRD-*
@pkgpath net/rrdtool,-perl
@newgroup _rrdcached:726
-@newuser _rrdcached:726:_rrdcached:daemon:rrdcached user:/nonexistent:/sbin/nologin
+@newuser _rrdcached:726:_rrdcached::rrdcached user:/nonexistent:/sbin/nologin
@extraunexec rm -f /var/db/rrd/*.rrd /var/db/rrd/journal/*
@rcscript ${RCDIR}/rrdcached
@bin bin/rrdcached
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@ -6,6 +6,7 @@ DISTNAME =	rsync-3.2.5
 # when updating
 PKGNAME =	rsync-3.2.5pl0
 DISTFILES =	rsync-3.2.5pl0{rsync-3.2.5}${EXTRACT_SUFX}
+REVISION =	0

 CATEGORIES =	net
 HOMEPAGE =	https://rsync.samba.org/
--- a/net/rsync/pkg/PLIST
+++ b/net/rsync/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _rsync:669
-@newuser _rsync:669:_rsync:daemon:rsync Daemon:/var/empty:/sbin/nologin
+@newuser _rsync:669:_rsync::rsync Daemon:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/rsyncd
 bin/rrsync
@bin bin/rsync
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@ -5,6 +5,7 @@ COMMENT =	parallel internet measurement utility
 V =		20211212c
 DISTNAME =	scamper-cvs-$V
 PKGNAME =	scamper-$V
+REVISION =	0

 CATEGORIES =	net benchmarks

--- a/net/scamper/pkg/PLIST
+++ b/net/scamper/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _scamper:677
-@newuser _scamper:677:_scamper:daemon:Scamper Account:/nonexistent:/sbin/nologin
+@newuser _scamper:677:_scamper::Scamper Account:/nonexistent:/sbin/nologin
@bin bin/sc_ally
@bin bin/sc_analysis_dump
@bin bin/sc_attach
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@ -1,7 +1,7 @@
 COMMENT=	Secure Internet Live Conferencing (SILC) server

 DISTNAME=	silc-server-1.1.19
-REVISION=	4
+REVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=silc/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/silc-server/pkg/PLIST
+++ b/net/silc-server/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _silcd:512
-@newuser _silcd:512:_silcd:daemon:Silc-server Account:/nonexistent:/sbin/nologin
+@newuser _silcd:512:_silcd::Silc-server Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/log/silcd/*
@man man/man5/silcd.conf.5
@man man/man8/silcd.8
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@ -2,7 +2,7 @@ COMMENT=	latency logging and graphing system

 V=		2.8.2
 DISTNAME=	smokeping-$V
-REVISION=	1
+REVISION=	2

 CATEGORIES=	net

--- a/net/smokeping/pkg/PLIST
+++ b/net/smokeping/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _smokeping:562
-@newuser _smokeping:562:562:daemon:Smokeping account:/var/empty:/sbin/nologin
+@newuser _smokeping:562:562::Smokeping account:/var/empty:/sbin/nologin
 bin/smokeinfo
 bin/smokeping
 bin/smokeping_cgi
--- a/net/sniproxy/Makefile
+++ b/net/sniproxy/Makefile
@ -3,6 +3,7 @@ COMMENT =	name-based proxying of HTTPS without decrypting traffic
 GH_ACCOUNT =	renaudallard
 GH_PROJECT =	sniproxy
 GH_TAGNAME =	0.6.5
+REVISION =	0

 CATEGORIES =	net

--- a/net/sniproxy/pkg/PLIST
+++ b/net/sniproxy/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _sniproxy:853
-@newuser _sniproxy:853:853:daemon:sniproxy daemon:/var/empty:/sbin/nologin
+@newuser _sniproxy:853:853::sniproxy daemon:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/sniproxy
@man man/man5/sniproxy.conf.5
@man man/man8/sniproxy.8
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@ -1,7 +1,7 @@
 COMMENT =		highly flexible sniffer/NIDS

 DISTNAME =		snort-2.9.20
-REVISION =		0
+REVISION =		1
 RULESV =		29200
 SUBST_VARS =		RULESV APPID_COMMENT

--- a/net/snort/pkg/PLIST
+++ b/net/snort/pkg/PLIST
@ -1,6 +1,6 @@
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
-@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
+@newuser _snort:557:_snort::Snort Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/snort
 ${APPID_COMMENT}bin/appid_detector_builder.sh
@bin bin/snort
--- a/net/synapse/Makefile
+++ b/net/synapse/Makefile
@ -1,6 +1,7 @@
 COMMENT =	open network for secure, decentralized communication

 MODPY_EGG_VERSION =	1.70.1
+REVISION =	0

 GH_ACCOUNT =	matrix-org
 GH_PROJECT =	synapse
--- a/net/synapse/pkg/PLIST
+++ b/net/synapse/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _synapse:849
-@newuser _synapse:849:849:daemon:Matrix.org Daemon:/var/synapse:/sbin/nologin
+@newuser _synapse:849:849::Matrix.org Daemon:/var/synapse:/sbin/nologin
@rcscript ${RCDIR}/synapse
 bin/export_signing_key
 bin/generate_config
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@ -5,6 +5,7 @@ V =		1.21.0-rc.1
 PKGNAME =	syncthing-1.21.0rc1
 DISTNAME =	syncthing-${V}
 DISTFILES =	syncthing-source-v${V}${EXTRACT_SUFX}
+REVISION =	0

 CATEGORIES =	net
 HOMEPAGE =	https://syncthing.net/
--- a/net/syncthing/pkg/PLIST
+++ b/net/syncthing/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _syncthing:768
-@newuser _syncthing:768:_syncthing:daemon:Syncthing user:${VARBASE}/syncthing:/sbin/nologin
+@newuser _syncthing:768:_syncthing::Syncthing user:${VARBASE}/syncthing:/sbin/nologin
@rcscript ${RCDIR}/syncthing
@owner _syncthing
@group _syncthing
--- a/net/tacacs+/Makefile
+++ b/net/tacacs+/Makefile
@ -4,6 +4,7 @@ V =		4.0.4.28
 DISTNAME =	tacacs-F${V}
 PKGNAME =	tacacs+-${V}
 EPOCH =		0
+REVISION =	0

 SHARED_LIBS +=  tacacs                    1.0

--- a/net/tacacs+/pkg/PLIST
+++ b/net/tacacs+/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _tacacs:511
-@newuser _tacacs:511:_tacacs:daemon:TACACS+ user:/nonexistent:/sbin/nologin
+@newuser _tacacs:511:_tacacs::TACACS+ user:/nonexistent:/sbin/nologin
@extraunexec rm -f /var/log/tac_plus/*
@rcscript ${RCDIR}/tac_plus
 include/tacacs.h
--- a/net/thingsd/Makefile
+++ b/net/thingsd/Makefile
@ -4,7 +4,7 @@ CATEGORIES =	net
 GH_ACCOUNT =	basepr1me
 GH_PROJECT =	thingsd
 GH_TAGNAME =	4.0.2
-REVISION =	0
+REVISION =	1

 MAINTAINER =	Tracey Emery <tracey@traceyemery.net>

--- a/net/thingsd/pkg/PLIST
+++ b/net/thingsd/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _thingsd:837
-@newuser _thingsd:837:_thingsd:daemon:Thingsd User:/var/empty:/sbin/nologin
+@newuser _thingsd:837:_thingsd::Thingsd User:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/thingsd
@man man/man5/thingsd.conf.5
@man man/man8/thingsctl.8
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@ -2,6 +2,7 @@ COMMENT =		Virtual Private Network (VPN) daemon
 DISTNAME =		tinc-1.1pre18
 CATEGORIES =		net security
 EPOCH =			0
+REVISION =		0

 HOMEPAGE =		https://www.tinc-vpn.org/

--- a/net/tinc/pkg/PLIST
+++ b/net/tinc/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _tinc:759
-@newuser _tinc:759:_tinc:daemon:tinc user:/var/empty:/sbin/nologin
+@newuser _tinc:759:_tinc::tinc user:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/tincd
@info info/tinc.info
@man man/man5/tinc.conf.5
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@ -3,6 +3,7 @@ COMMENT=	anonymity service using onion routing
 DISTNAME=	tor-0.4.7.10
 CATEGORIES=	net
 HOMEPAGE=	https://www.torproject.org/
+REVISION=	0

 MAINTAINER=	Pascal Stumpf <pascal@stumpf.co>

--- a/net/tor/pkg/PLIST
+++ b/net/tor/pkg/PLIST
@ -1,5 +1,5 @@
@newgroup _tor:566
-@newuser _tor:566:566:daemon:tor:/nonexistent:/sbin/nologin
+@newuser _tor:566:566::tor:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/tor
@bin bin/tor
@bin bin/tor-gencert
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@ -13,9 +13,9 @@ PKGNAME-qt=	transmission-qt-${VER}
 CATEGORIES=	net
 HOMEPAGE=	https://transmissionbt.com/
 MAINTAINER=	Josh Grosse <josh@jggimi.net>
-REVISION-gtk=	1
-REVISION-main=	1
-REVISION-qt=	1
+REVISION-gtk=	2
+REVISION-main=	2
+REVISION-qt=	2

 # GPLv2+
 PERMIT_PACKAGE=	Yes
--- a/net/transmission/pkg/PLIST-main
+++ b/net/transmission/pkg/PLIST-main
@ -1,6 +1,6 @@
@pkgpath net/transmission
@newgroup _transmission:662
-@newuser _transmission:662:662:daemon:Transmission Account:/var/transmission:/sbin/nologin
+@newuser _transmission:662:662::Transmission Account:/var/transmission:/sbin/nologin
@rcscript ${RCDIR}/transmission_daemon
@mode 750
@owner _transmission
--- a/net/unifi/5.14/Makefile
+++ b/net/unifi/5.14/Makefile
@ -1,6 +1,6 @@
 V=		5.14.23
 SNAPPY_V=	1.1.8.4
-REVISION=	17
+REVISION=	18

 REPLACE_LOG4J=	Yes
 REPLACE_COMMONSTEXT= Yes
--- a/net/unifi/5.14/pkg/PLIST
+++ b/net/unifi/5.14/pkg/PLIST
@ -3,7 +3,7 @@
@pkgpath net/unifi/5.7
@pkgpath net/unifi/5.8
@newgroup _unifi:732
-@newuser _unifi:732:_unifi:daemon:unifi user:${PREFIX}/share/unifi:/sbin/nologin
+@newuser _unifi:732:_unifi::unifi user:${PREFIX}/share/unifi:/sbin/nologin
@rcscript ${RCDIR}/unifi
 bin/unifi
 bin/unifi-discover
--- a/Show More
+++ b/Show More