net/tacacs: Update to 202206071936

While here:

- Sort pkg-plist
- Use https MASTER_SITES
- Pet portlint(1), portfmt(1), portclippy(1)

PR:		264845

3 files changed, 137 insertions, 132 deletions

diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile
index 9a80220957a0..a2f97972c620 100644
--- a/net/tacacs/Makefile
+++ b/net/tacacs/Makefile
@@ -1,42 +1,47 @@
 PORTNAME=	tacacs
-PORTVERSION=	202004081858
+PORTVERSION=	202206071936
 CATEGORIES=	net
-MASTER_SITES=	http://www.pro-bono-publico.de/projects/src/
+MASTER_SITES=	https://www.pro-bono-publico.de/projects/src/
 
 MAINTAINER=	akuz84@gmail.com
 COMMENT=	TACACS+ daemon from pro-bono
 
 LICENSE=	BSD3CLAUSE
 
-USES=		gmake perl5 ssl shebangfix
+USES=		gmake perl5 shebangfix ssl tar:bzip2
 
-CONFLICTS=	tac_plus4
+USE_LDCONFIG=	yes
+
+USE_RC_SUBR?=	tac_plus
+
+SHEBANG_FILES=	tac_plus/sample/tac_plus.cfg
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--with-ssl \
-		--with-zlib \
+CONFIGURE_ARGS=	--installroot=${STAGEDIR} \
 		--libdir=${LOCALBASE}/lib \
-		--installroot=${STAGEDIR} mavis spawnd mavisd tac_plus
+		--with-ssl \
+		--with-zlib \
+		mavis \
+		mavisd \
+		spawnd \
+		tac_plus
 
-USE_LDCONFIG=			yes
+MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=			CURL FREERADIUS SCTP PCRE
-OPTIONS_DEFAULT=		SCTP
+CONFLICTS=	tac_plus4
 
-MAKE_JOBS_UNSAFE=yes
+WRKSRC=		${WRKDIR}/PROJECTS
 
-SCTP_DESC=			SCTP support
-SCTP_CONFIGURE_WITH=		sctp
+USERS=		tacacs
+GROUPS=		tacacs
 
-PCRE_DESC=			PCRE support
-PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
-PCRE_CONFIGURE_ON=		--with-pcre-lib=${LOCALBASE}/lib
-PCRE_CONFIGURE_OFF=
+OPTIONS_DEFINE=		CURL FREERADIUS PCRE SCTP
+OPTIONS_DEFAULT=	SCTP
 
-CURL_DESC=			Curl support
-CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_CONFIGURE_ON=		--with-curl-lib=${LOCALBASE}/lib
+CURL_DESC=		Curl support
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_ON=	--with-curl-lib=${LOCALBASE}/lib
 CURL_CONFIGURE_OFF=
 
 FREERADIUS_DESC=		Freeradius support
@@ -44,14 +49,13 @@ FREERADIUS_LIB_DEPENDS=		libfreeradius-radius.so:net/freeradius3
 FREERADIUS_CONFIGURE_ON=	--with-pcre-lib=${LOCALBASE}/lib
 FREERADIUS_CONFIGURE_OFF=
 
-USERS=		tacacs
-GROUPS=		tacacs
-
-WRKSRC=		${WRKDIR}/PROJECTS
-
-SHEBANG_FILES=	tac_plus/sample/tac_plus.cfg
+PCRE_DESC=		PCRE support
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_CONFIGURE_ON=	--with-pcre-lib=${LOCALBASE}/lib
+PCRE_CONFIGURE_OFF=
 
-USE_RC_SUBR?=	tac_plus
+SCTP_DESC=		SCTP support
+SCTP_CONFIGURE_WITH=	sctp
 
 post-build:
 	@${REINPLACE_CMD} -e '1d' ${WRKSRC}/tac_plus/sample/tac_plus.cfg
diff --git a/net/tacacs/distinfo b/net/tacacs/distinfo
index b70ef86dc830..4a7bed0a75fb 100644
--- a/net/tacacs/distinfo
+++ b/net/tacacs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587236714
-SHA256 (tacacs-202004081858.tar.gz) = c9f20fff9b68144035830b95a59943bbaa10730acb039ad301a591a8fb44624e
-SIZE (tacacs-202004081858.tar.gz) = 3115737
+TIMESTAMP = 1655999189
+SHA256 (tacacs-202206071936.tar.bz2) = 41b0806dad79a4617d3464e107cc9306c66ece12d42c06130e9dd7d09c609d71
+SIZE (tacacs-202206071936.tar.bz2) = 2719184
diff --git a/net/tacacs/pkg-plist b/net/tacacs/pkg-plist
index c3a96127a1e3..15b6d4005690 100644
--- a/net/tacacs/pkg-plist
+++ b/net/tacacs/pkg-plist
@@ -8,122 +8,123 @@
 @dir share/mavis/railroad/tac_plus
 @dir share/mavis/railroad/spawnd
 @dir share/mavis/railroad/mavisd
-etc/mavis/sample/tac_plus.cfg
 bin/mavistest
-lib/libmavis.so.0.1
-lib/libmavis.so.0
+etc/mavis/sample/tac_plus.cfg
 lib/libmavis.so
-lib/mavis/libmavis_userdb.so
-lib/mavis/libmavis_remote.so
-lib/mavis/libmavis_system.so
-lib/mavis/mavis_tacplus_ldap.pl
-lib/mavis/mavis_tacplus_ldap_authonly.pl
-lib/mavis/Mavis.pm
-lib/mavis/mavis_tacplus_sms.pl
-lib/mavis/mavis_tacplus_radius.pl
-lib/mavis/mavis_tacplus_opie.pl
+lib/libmavis.so.0
+lib/libmavis.so.0.1
+lib/mavis/extra/tacacs_schema.ldif
+lib/mavis/extra/tacacs.schema
+lib/mavis/extra/tacacs.schema-fedora-ds
+lib/mavis/libmavis_anonftp.so
 lib/mavis/libmavis_asciiftp.so
-lib/mavis/libmavis_pam.so
 lib/mavis/libmavis_auth.so
-lib/mavis/libmavis_tee.so
-lib/mavis/libmavis_groups.so
+lib/mavis/libmavis_cache.so
 lib/mavis/libmavis_external.so
-lib/mavis/libmavis_anonftp.so
-lib/mavis/extra/tacacs.schema
-lib/mavis/extra/tacacs_schema.ldif
-lib/mavis/extra/tacacs.schema-fedora-ds
-lib/mavis/libmavis_null.so
+lib/mavis/libmavis_groups.so
 lib/mavis/libmavis_limit.so
-lib/mavis/mavis_tacplus_shadow.pl
-lib/mavis/libmavis_cache.so
-lib/mavis/mavis_ldap_authonly.pl
 lib/mavis/libmavis_log.so
+lib/mavis/libmavis_null.so
+lib/mavis/libmavis_pam.so
+lib/mavis/libmavis_remote.so
+lib/mavis/libmavis_system.so
+lib/mavis/libmavis_tacinfo_cache.so
+lib/mavis/libmavis_tee.so
+lib/mavis/libmavis_userdb.so
+lib/mavis/mavis_ftp_passwd.pl
+lib/mavis/mavis_ldap_authonly.pl
 lib/mavis/mavis_tacplus_ads.pl
+lib/mavis/mavis_tacplus_ldap_authonly.pl
+lib/mavis/mavis_tacplus_ldap.pl
+lib/mavis/mavis_tacplus_opie.pl
 lib/mavis/mavis_tacplus_passwd.pl
-lib/mavis/mavis_ftp_passwd.pl
+lib/mavis/mavis_tacplus_radius.pl
+lib/mavis/mavis_tacplus_shadow.pl
+lib/mavis/mavis_tacplus_sms.pl
+lib/mavis/Mavis.pm
 sbin/mavisd
+sbin/pammavis
 sbin/spawnd
 sbin/tac_plus
-sbin/pammavis
+share/mavis/ftpd.html
+share/mavis/ftpd.pdf
 share/mavis/ftpd.txt
-share/mavis/tac_plus.pdf
-share/mavis/tac_plus.html
-share/mavis/railroad/mavis/TimespecDecl.gif
-share/mavis/railroad/mavis/AuthConf.gif
-share/mavis/railroad/mavis/LimitConf.gif
-share/mavis/railroad/mavis/ASCIIftpConf.gif
-share/mavis/railroad/mavis/UserDBConf.gif
-share/mavis/railroad/mavis/CIDR.gif
-share/mavis/railroad/mavis/CacheConf.gif
-share/mavis/railroad/mavis/PAMConf.gif
-share/mavis/railroad/mavis/SystemConf.gif
-share/mavis/railroad/mavis/AnonftpConf.gif
-share/mavis/railroad/mavis/MavisScript.gif
-share/mavis/railroad/mavis/MavisDecl.gif
-share/mavis/railroad/mavis/MavisAction.gif
-share/mavis/railroad/mavis/ExternalConf.gif
-share/mavis/railroad/mavis/TeeConf.gif
-share/mavis/railroad/mavis/MavisCond.gif
-share/mavis/railroad/mavis/RemoteConf.gif
-share/mavis/railroad/tac_plus/GroupAttr.gif
-share/mavis/railroad/tac_plus/TacAction.gif
-share/mavis/railroad/tac_plus/ShellCommandDecl.gif
-share/mavis/railroad/tac_plus/TacScript.gif
-share/mavis/railroad/tac_plus/PasswordExpr.gif
-share/mavis/railroad/tac_plus/PasswordExprHash.gif
-share/mavis/railroad/tac_plus/TacCond.gif
-share/mavis/railroad/tac_plus/GroupOnlyAttr.gif
-share/mavis/railroad/tac_plus/Acl.gif
-share/mavis/railroad/tac_plus/ACLDecl.gif
-share/mavis/railroad/tac_plus/TimespecDecl.gif
-share/mavis/railroad/tac_plus/GroupDecl.gif
-share/mavis/railroad/tac_plus/Debug.gif
-share/mavis/railroad/tac_plus/ACLExpr.gif
-share/mavis/railroad/tac_plus/UserMessage.gif
-share/mavis/railroad/tac_plus/AVPair.gif
-share/mavis/railroad/tac_plus/GlobalDecl.gif
-share/mavis/railroad/tac_plus/ProtoDefault.gif
-share/mavis/railroad/tac_plus/ServiceDecl.gif
-share/mavis/railroad/tac_plus/ShellDecl.gif
-share/mavis/railroad/tac_plus/HostAttr.gif
-share/mavis/railroad/tac_plus/UserAttr.gif
-share/mavis/railroad/tac_plus/CmdDefault.gif
-share/mavis/railroad/tac_plus/RealmAttr.gif
-share/mavis/railroad/tac_plus/UserDecl.gif
-share/mavis/railroad/tac_plus/AttrDefault.gif
-share/mavis/railroad/tac_plus/RealmAttrAuthen.gif
-share/mavis/railroad/tac_plus/EnableExpr.gif
-share/mavis/railroad/tac_plus/RealmDecl.gif
-share/mavis/railroad/tac_plus/CIDR.gif
-share/mavis/railroad/tac_plus/ShellAttr.gif
-share/mavis/railroad/tac_plus/ServiceAttr.gif
-share/mavis/railroad/tac_plus/ProtoDecl.gif
-share/mavis/railroad/tac_plus/TacplusConfig.gif
-share/mavis/railroad/tac_plus/HostDecl.gif
-share/mavis/railroad/spawnd/AclDecl.gif
-share/mavis/railroad/spawnd/Debug.gif
-share/mavis/railroad/spawnd/MiscDecl.gif
-share/mavis/railroad/spawnd/ChildDecl.gif
-share/mavis/railroad/spawnd/ListenDecl.gif
-share/mavis/railroad/spawnd/Config.gif
-share/mavis/railroad/spawnd/SpawndConfig.gif
-share/mavis/railroad/spawnd/CIDR.gif
-share/mavis/railroad/spawnd/SyslogDecl.gif
-share/mavis/railroad/mavisd/SyslogDecl.gif
-share/mavis/railroad/mavisd/CIDR.gif
-share/mavis/railroad/mavisd/Config.gif
-share/mavis/spawnd.pdf
-share/mavis/tcprelay.html
-share/mavis/spawnd.html
-share/mavis/tcprelay.pdf
 share/mavis/mavis.html
-share/mavis/ftpd.html
-share/mavis/mavisd.txt
 share/mavis/mavis.pdf
-share/mavis/tac_plus.txt
-share/mavis/ftpd.pdf
-share/mavis/spawnd.txt
-share/mavis/tcprelay.txt
+share/mavis/mavis.txt
 share/mavis/mavisd.html
 share/mavis/mavisd.pdf
-share/mavis/mavis.txt
+share/mavis/mavisd.txt
+share/mavis/railroad/mavis/AnonftpConf.svg
+share/mavis/railroad/mavis/ASCIIftpConf.svg
+share/mavis/railroad/mavis/AuthConf.svg
+share/mavis/railroad/mavis/CacheConf.svg
+share/mavis/railroad/mavis/CIDR.svg
+share/mavis/railroad/mavis/ExternalConf.svg
+share/mavis/railroad/mavis/LimitConf.svg
+share/mavis/railroad/mavis/MavisAction.svg
+share/mavis/railroad/mavis/MavisCond.svg
+share/mavis/railroad/mavis/MavisDecl.svg
+share/mavis/railroad/mavis/MavisScript.svg
+share/mavis/railroad/mavis/PAMConf.svg
+share/mavis/railroad/mavis/RemoteConf.svg
+share/mavis/railroad/mavis/SystemConf.svg
+share/mavis/railroad/mavis/TeeConf.svg
+share/mavis/railroad/mavis/TimespecDecl.svg
+share/mavis/railroad/mavis/UserDBConf.svg
+share/mavis/railroad/mavisd/CIDR.svg
+share/mavis/railroad/mavisd/Config.svg
+share/mavis/railroad/mavisd/SyslogDecl.svg
+share/mavis/railroad/spawnd/AclDecl.svg
+share/mavis/railroad/spawnd/ChildDecl.svg
+share/mavis/railroad/spawnd/CIDR.svg
+share/mavis/railroad/spawnd/Config.svg
+share/mavis/railroad/spawnd/Debug.svg
+share/mavis/railroad/spawnd/ListenDecl.svg
+share/mavis/railroad/spawnd/MiscDecl.svg
+share/mavis/railroad/spawnd/SpawndConfig.svg
+share/mavis/railroad/spawnd/SyslogDecl.svg
+share/mavis/railroad/tac_plus/Acl.svg
+share/mavis/railroad/tac_plus/ACLDecl.svg
+share/mavis/railroad/tac_plus/ACLExpr.svg
+share/mavis/railroad/tac_plus/AttrDefault.svg
+share/mavis/railroad/tac_plus/AVPair.svg
+share/mavis/railroad/tac_plus/CIDR.svg
+share/mavis/railroad/tac_plus/CmdDefault.svg
+share/mavis/railroad/tac_plus/Debug.svg
+share/mavis/railroad/tac_plus/EnableExpr.svg
+share/mavis/railroad/tac_plus/GlobalDecl.svg
+share/mavis/railroad/tac_plus/GroupAttr.svg
+share/mavis/railroad/tac_plus/GroupDecl.svg
+share/mavis/railroad/tac_plus/GroupOnlyAttr.svg
+share/mavis/railroad/tac_plus/HostAttr.svg
+share/mavis/railroad/tac_plus/HostDecl.svg
+share/mavis/railroad/tac_plus/PasswordExpr.svg
+share/mavis/railroad/tac_plus/PasswordExprHash.svg
+share/mavis/railroad/tac_plus/ProtoDecl.svg
+share/mavis/railroad/tac_plus/ProtoDefault.svg
+share/mavis/railroad/tac_plus/RealmAttr.svg
+share/mavis/railroad/tac_plus/RealmAttrAuthen.svg
+share/mavis/railroad/tac_plus/RealmDecl.svg
+share/mavis/railroad/tac_plus/ServiceAttr.svg
+share/mavis/railroad/tac_plus/ServiceDecl.svg
+share/mavis/railroad/tac_plus/ShellAttr.svg
+share/mavis/railroad/tac_plus/ShellCommandDecl.svg
+share/mavis/railroad/tac_plus/ShellDecl.svg
+share/mavis/railroad/tac_plus/TacAction.svg
+share/mavis/railroad/tac_plus/TacCond.svg
+share/mavis/railroad/tac_plus/TacplusConfig.svg
+share/mavis/railroad/tac_plus/TacScript.svg
+share/mavis/railroad/tac_plus/TimespecDecl.svg
+share/mavis/railroad/tac_plus/UserAttr.svg
+share/mavis/railroad/tac_plus/UserDecl.svg
+share/mavis/railroad/tac_plus/UserMessage.svg
+share/mavis/spawnd.html
+share/mavis/spawnd.pdf
+share/mavis/spawnd.txt
+share/mavis/tac_plus.html
+share/mavis/tac_plus.pdf
+share/mavis/tac_plus.txt
+share/mavis/tcprelay.html
+share/mavis/tcprelay.pdf
+share/mavis/tcprelay.txt