mail/sympa: Upgrade to 6.2.68

 - Cosmetics changes: pet portclippy and portfmt

ChangeLog: https://github.com/sympa-community/sympa/blob/6.2.68/NEWS.md

PR:		262276

3 files changed, 157 insertions, 97 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 89d0ccac7752..088de85854d7 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,7 +1,7 @@
 # Created by: Autrijus Tang <autrijus@autrijus.org>
 
 PORTNAME=	sympa
-DISTVERSION=	6.2.62
+DISTVERSION=	6.2.68
 CATEGORIES=	mail
 
 MAINTAINER=	dgeo@centrale-marseille.fr
@@ -11,113 +11,113 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-		postfix>=0:mail/postfix
-RUN_DEPENDS=	\
-	p5-App-cpanminus>=0:devel/p5-App-cpanminus	\
-	p5-Archive-Zip>=1.05:archivers/p5-Archive-Zip	\
-	p5-CGI>=3.51:www/p5-CGI	\
-	p5-Class-Singleton>=1.03:devel/p5-Class-Singleton	\
-	p5-Crypt-CipherSaber>=0.50:security/p5-Crypt-CipherSaber	\
-	p5-Crypt-Eksblowfish>=0.009:security/p5-Crypt-Eksblowfish	\
-	p5-Crypt-OpenSSL-X509>=1.800.1:security/p5-Crypt-OpenSSL-X509	\
-	p5-Crypt-SMIME>=0.15:security/p5-Crypt-SMIME	\
-	p5-Data-Password>=1.07:security/p5-Data-Password	\
-	p5-DateTime-Format-Mail>=0.28:devel/p5-DateTime-Format-Mail	\
-	p5-DateTime-TimeZone>=0.59:devel/p5-DateTime-TimeZone	\
-	p5-DBD-CSV>=0.22:databases/p5-DBD-CSV	\
-	p5-DBI>=1.48:databases/p5-DBI	\
-	p5-Encode-Locale>=1.02:converters/p5-Encode-Locale	\
-	p5-File-Copy-Recursive>=0.36:devel/p5-File-Copy-Recursive	\
-	p5-File-NFSLock>=0:devel/p5-File-NFSLock	\
-	p5-HTML-Format>=0:textproc/p5-HTML-Format	\
-	p5-HTML-StripScripts-Parser>=1.03:www/p5-HTML-StripScripts-Parser	\
-	p5-HTML-Tree>=0:www/p5-HTML-Tree	\
-	p5-IO-Socket-SSL>=0.90:security/p5-IO-Socket-SSL	\
-	p5-IO-Stringy>=0:devel/p5-IO-Stringy	\
-	p5-Locale-libintl>=1.22:devel/p5-Locale-libintl	\
-	p5-Mail-Tools>=0:mail/p5-Mail-Tools	\
-	p5-Mail-DKIM>=0.55:mail/p5-Mail-DKIM	\
-	p5-MIME-Charset>=1.011.3:mail/p5-MIME-Charset	\
-	p5-MIME-EncWords>=1.014:mail/p5-MIME-EncWords	\
-	p5-MIME-Lite-HTML>=1.23:mail/p5-MIME-Lite-HTML	\
-	p5-MIME-Tools>=5.423:mail/p5-MIME-Tools	\
-	p5-Net-CIDR>=0.16:net-mgmt/p5-Net-CIDR	\
-	p5-Net-DNS>=0.65:dns/p5-Net-DNS	\
-	p5-perl-ldap>=0.40:net/p5-perl-ldap	\
-	p5-Scalar-List-Utils>=1.20:lang/p5-Scalar-List-Utils	\
-	p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite	\
-	p5-Template-Toolkit>=2.21:www/p5-Template-Toolkit	\
-	p5-Term-ProgressBar>=2.09:devel/p5-Term-ProgressBar	\
-	p5-Time-HiRes>=1.29:devel/p5-Time-HiRes	\
-	p5-Unicode-LineBreak>=2019.001:textproc/p5-Unicode-LineBreak	\
-	p5-URI>=1.35:net/p5-URI	\
-	p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML	\
-	mhonarc>=0:www/mhonarc
+		postfix:mail/postfix
+RUN_DEPENDS=	mhonarc>=0:www/mhonarc \
+		p5-App-cpanminus>=0:devel/p5-App-cpanminus \
+		p5-Archive-Zip>=1.05:archivers/p5-Archive-Zip \
+		p5-CGI>=3.51:www/p5-CGI \
+		p5-Class-Singleton>=1.03:devel/p5-Class-Singleton \
+		p5-Crypt-CipherSaber>=0.50:security/p5-Crypt-CipherSaber \
+		p5-Crypt-Eksblowfish>=0.009:security/p5-Crypt-Eksblowfish \
+		p5-Crypt-OpenSSL-X509>=1.800.1:security/p5-Crypt-OpenSSL-X509 \
+		p5-Crypt-SMIME>=0.15:security/p5-Crypt-SMIME \
+		p5-Data-Password>=1.07:security/p5-Data-Password \
+		p5-DateTime-Format-Mail>=0.28:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-TimeZone>=0.59:devel/p5-DateTime-TimeZone \
+		p5-DBD-CSV>=0.22:databases/p5-DBD-CSV \
+		p5-DBI>=1.48:databases/p5-DBI \
+		p5-Encode-Locale>=1.02:converters/p5-Encode-Locale \
+		p5-File-Copy-Recursive>=0.36:devel/p5-File-Copy-Recursive \
+		p5-File-NFSLock>=0:devel/p5-File-NFSLock \
+		p5-HTML-Format>=0:textproc/p5-HTML-Format \
+		p5-HTML-StripScripts-Parser>=1.03:www/p5-HTML-StripScripts-Parser \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-IO-Socket-SSL>=0.90:security/p5-IO-Socket-SSL \
+		p5-IO-Stringy>=0:devel/p5-IO-Stringy \
+		p5-Locale-libintl>=1.22:devel/p5-Locale-libintl \
+		p5-Mail-DKIM>=0.55:mail/p5-Mail-DKIM \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-MIME-Charset>=1.011.3:mail/p5-MIME-Charset \
+		p5-MIME-EncWords>=1.014:mail/p5-MIME-EncWords \
+		p5-MIME-Lite-HTML>=1.23:mail/p5-MIME-Lite-HTML \
+		p5-MIME-Tools>=5.423:mail/p5-MIME-Tools \
+		p5-Net-CIDR>=0.16:net-mgmt/p5-Net-CIDR \
+		p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		p5-perl-ldap>=0.40:net/p5-perl-ldap \
+		p5-Scalar-List-Utils>=1.20:lang/p5-Scalar-List-Utils \
+		p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite \
+		p5-Template-Toolkit>=2.21:www/p5-Template-Toolkit \
+		p5-Term-ProgressBar>=2.09:devel/p5-Term-ProgressBar \
+		p5-Time-HiRes>=1.29:devel/p5-Time-HiRes \
+		p5-Unicode-LineBreak>=2019.001:textproc/p5-Unicode-LineBreak \
+		p5-URI>=1.35:net/p5-URI \
+		p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 
 # Shebang is corrected by configure script
-USES=		autoreconf cpe fakeroot perl5 shebangfix gettext
+USES=		autoreconf cpe fakeroot gettext gmake perl5 shebangfix
 USE_GITHUB=	YES
 GH_ACCOUNT=	sympa-community
 USE_RC_SUBR=	sympa
 
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin \
+			--datadir=${DATADIR} \
+			--enable-fhs \
+			--libexecdir=${PREFIX}/libexec/${PORTNAME} \
+			--localedir=${PREFIX}/share/locale \
+			--localstatedir=/var/${PORTNAME} \
+			--sbindir=${PREFIX}/libexec/${PORTNAME} \
+			--sysconfdir=${ETCDIR} \
+			--with-cgidir=${PREFIX}/libexec/${PORTNAME} \
+			--with-confdir=${ETCDIR} \
+			--with-cssdir=${DATADIR}/static/css \
+			--with-defaultdir=${DATADIR}/defaults \
+			--with-docdir=${EXAMPLESDIR} \
+			--with-expldir=${DATADIR}/list_data \
+			--with-lockdir=/var/spool/lock \
+			--with-modulesdir=${PREFIX}/libexec/${PORTNAME} \
+			--with-picturesdir=${DATADIR}/static/pictures \
+			--with-piddir=/var/run/${PORTNAME} \
+			--with-scriptdir=${PREFIX}/libexec/${PORTNAME} \
+			--with-spooldir=/var/spool/${PORTNAME} \
+			--with-staticdir=${DATADIR}/static \
+			--without-initdir \
+			--without-smrshdir
+
+CONFIGURE_ENV+=	ac_cv_path_POSTALIAS=${LOCALBASE}/sbin/postalias \
+		lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
+MAKE_ENV?=	PERL_EXTUTILS_AUTOINSTALL=--skip
+
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
+SUB_FILES=	apache.sample fcgi.sample nginx.sample pkg-install pkg-message
 
 USERS=		sympa
 GROUPS=		sympa
-GNU_CONFIGURE=	yes
-ICONSDIR?=	www/icons
-CONFIGURE_ARGS+=--enable-fhs	\
-		--bindir=${PREFIX}/bin	\
-		--libexecdir=${PREFIX}/libexec/${PORTNAME} \
-		--localedir=${PREFIX}/share/locale	\
-		--localstatedir=/var/${PORTNAME}	\
-		--sbindir=${PREFIX}/libexec/${PORTNAME}	\
-		--datadir=${DATADIR}	\
-		--sysconfdir=${ETCDIR}			\
-		--with-confdir=${ETCDIR}		\
-		--with-docdir=${EXAMPLESDIR}		\
-		--with-expldir=${DATADIR}/list_data	\
-		--with-defaultdir=${DATADIR}/defaults	\
-		--without-initdir	\
-		--with-lockdir=/var/spool/lock		\
-		--with-modulesdir=${PREFIX}/libexec/${PORTNAME} \
-		--with-staticdir=${DATADIR}/static \
-		--with-cssdir=${DATADIR}/static/css \
-		--with-picturesdir=${DATADIR}/static/pictures \
-		--with-piddir=/var/run/${PORTNAME} \
-		--with-scriptdir=${PREFIX}/libexec/${PORTNAME} \
-		--with-spooldir=/var/spool/${PORTNAME} \
-		--with-cgidir=${PREFIX}/libexec/${PORTNAME}	\
-		--without-smrshdir
-
-CONFIGURE_ENV+=	lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} \
-		ac_cv_path_POSTALIAS=${LOCALBASE}/sbin/postalias
-MAKE_ENV?=	PERL_EXTUTILS_AUTOINSTALL=--skip
-SUB_FILES=	pkg-install pkg-message apache.sample nginx.sample fcgi.sample
-PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	FASTCGI APACHE DOCS EXAMPLES
-OPTIONS_DEFAULT=FASTCGI MYSQL
-OPTIONS_RADIO=	DATABASE
-OPTIONS_RADIO_DATABASE=	PGSQL MYSQL SQLITE
-OPTIONS_SUB=	yes
+PORTEXAMPLES=	*
 
-FASTCGI_RUN_DEPENDS=	p5-FCGI>=0.67:www/p5-FCGI	\
-	p5-CGI-Fast>=1.08:www/p5-CGI-Fast
+OPTIONS_DEFINE=		APACHE DOCS EXAMPLES FASTCGI
+OPTIONS_DEFAULT=	FASTCGI MYSQL
+OPTIONS_RADIO=		DATABASE
+OPTIONS_RADIO_DATABASE=	MYSQL PGSQL SQLITE
+OPTIONS_SUB=		yes
 
-APACHE_IMPLIES=	FASTCGI
-APACHE_USES=	apache:run
+APACHE_IMPLIES=		FASTCGI
 APACHE_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi
-
-PGSQL_SUB_LIST=	REQ_PGSQL=postgresql
-PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
-PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=2.00:databases/p5-DBD-Pg
-MYSQL_SUB_LIST=	REQ_MYSQL=mysql
-MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
+APACHE_USES=		apache:run
+FASTCGI_RUN_DEPENDS=	p5-CGI-Fast>=1.08:www/p5-CGI-Fast \
+			p5-FCGI>=0.67:www/p5-FCGI
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+MYSQL_SUB_LIST=		REQ_MYSQL=mysql
+MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=2.00:databases/p5-DBD-Pg
+PGSQL_SUB_LIST=		REQ_PGSQL=postgresql
+PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.31:databases/p5-DBD-SQLite
 
+ICONSDIR?=	www/icons
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\( *staticdir=\).*$$|\1${DATADIR}|'	\
 	    -e 's|^\( *arcdir=\).*$$|\1${DATADIR}/arc|'			\
@@ -125,7 +125,7 @@ post-patch:
 		${WRKSRC}/configure.ac
 
 post-install:
-	for link in sympa.pl sympa_wizard.pl upgrade_bulk_spool.pl upgrade_send_spool.pl; do \
+	for link in sympa sympa.pl sympa_wizard.pl upgrade_bulk_spool.pl upgrade_send_spool.pl; do \
 		(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -f -s ../libexec/sympa/$$link) \
 	done
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index dc07535889aa..93b4d482b944 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619604300
-SHA256 (sympa-community-sympa-6.2.62_GH0.tar.gz) = eb86ceee6a7837386961cb9915d27242900f36c949442fb6e8ed964997060e8c
-SIZE (sympa-community-sympa-6.2.62_GH0.tar.gz) = 10438551
+TIMESTAMP = 1646733590
+SHA256 (sympa-community-sympa-6.2.68_GH0.tar.gz) = 109e31b5d2812a1e2dc7fb831d79b9be66a41df3da5bf99e489e1c3afeb7cea5
+SIZE (sympa-community-sympa-6.2.68_GH0.tar.gz) = 10497703
diff --git a/mail/sympa/pkg-plist b/mail/sympa/pkg-plist
index e6246e70dd18..4d15ed70cbb8 100644
--- a/mail/sympa/pkg-plist
+++ b/mail/sympa/pkg-plist
@@ -1,5 +1,6 @@
 @sample %%ETCDIR%%/sympa.conf.sample
 %%ETCDIR%%/sympa.conf-dist
+bin/sympa
 bin/sympa.pl
 bin/sympa_wizard.pl
 bin/upgrade_bulk_spool.pl
@@ -7,12 +8,43 @@ bin/upgrade_send_spool.pl
 %%ETCDIR%%/data_structure.version.sample
 %%ETCDIR%%/README
 libexec/sympa/Conf.pm
+libexec/sympa/sympa
 libexec/sympa/Sympa.pm
 libexec/sympa/Sympa/Aliases.pm
 libexec/sympa/Sympa/Aliases/CheckSMTP.pm
 libexec/sympa/Sympa/Aliases/External.pm
 libexec/sympa/Sympa/Aliases/Template.pm
 libexec/sympa/Sympa/Archive.pm
+libexec/sympa/Sympa/CLI.pm
+libexec/sympa/Sympa/CLI/add.pm
+libexec/sympa/Sympa/CLI/check.pm
+libexec/sympa/Sympa/CLI/close.pm
+libexec/sympa/Sympa/CLI/conf_2_db.pm
+libexec/sympa/Sympa/CLI/copy.pm
+libexec/sympa/Sympa/CLI/create.pm
+libexec/sympa/Sympa/CLI/del.pm
+libexec/sympa/Sympa/CLI/dump.pm
+libexec/sympa/Sympa/CLI/export_list.pm
+libexec/sympa/Sympa/CLI/help.pm
+libexec/sympa/Sympa/CLI/include.pm
+libexec/sympa/Sympa/CLI/instantiate.pm
+libexec/sympa/Sympa/CLI/lowercase.pm
+libexec/sympa/Sympa/CLI/make_alias_file.pm
+libexec/sympa/Sympa/CLI/md5_digest.pm
+libexec/sympa/Sympa/CLI/move.pm
+libexec/sympa/Sympa/CLI/open.pm
+libexec/sympa/Sympa/CLI/rebuildarc.pm
+libexec/sympa/Sympa/CLI/reload_list_config.pm
+libexec/sympa/Sympa/CLI/restore.pm
+libexec/sympa/Sympa/CLI/send_digest.pm
+libexec/sympa/Sympa/CLI/show_pending_lists.pm
+libexec/sympa/Sympa/CLI/sync_list_db.pm
+libexec/sympa/Sympa/CLI/update.pm
+libexec/sympa/Sympa/CLI/upgrade.pm
+libexec/sympa/Sympa/CLI/upgrade_config_location.pm
+libexec/sympa/Sympa/CLI/user.pm
+libexec/sympa/Sympa/CLI/user/move.pm
+libexec/sympa/Sympa/CLI/version.pm
 libexec/sympa/Sympa/CommandDef.pm
 libexec/sympa/Sympa/ConfDef.pm
 libexec/sympa/Sympa/Config.pm
@@ -80,7 +112,6 @@ libexec/sympa/Sympa/Request/Handler/global_remind.pm
 libexec/sympa/Sympa/Request/Handler/global_set.pm
 libexec/sympa/Sympa/Request/Handler/global_signoff.pm
 libexec/sympa/Sympa/Request/Handler/help.pm
-libexec/sympa/Sympa/Request/Handler/import.pm
 libexec/sympa/Sympa/Request/Handler/include.pm
 libexec/sympa/Sympa/Request/Handler/index.pm
 libexec/sympa/Sympa/Request/Handler/info.pm
@@ -173,7 +204,6 @@ libexec/sympa/Sympa/WWW/Auth.pm
 libexec/sympa/Sympa/WWW/FastCGI.pm
 libexec/sympa/Sympa/WWW/Marc.pm
 libexec/sympa/Sympa/WWW/Marc/Search.pm
-libexec/sympa/Sympa/WWW/Report.pm
 libexec/sympa/Sympa/WWW/SOAP.pm
 libexec/sympa/Sympa/WWW/SOAP/Transport.pm
 libexec/sympa/Sympa/WWW/Session.pm
@@ -214,6 +244,34 @@ libexec/sympa/upgrade_sympa_password.pl
 libexec/sympa/wwsympa.fcgi
 man/man1/mod2html.1.gz
 man/man1/sympa.1.gz
+man/man1/sympa-add.1.gz
+man/man1/sympa-check.1.gz
+man/man1/sympa-close.1.gz
+man/man1/sympa-conf_2_db.1.gz
+man/man1/sympa-copy.1.gz
+man/man1/sympa-create.1.gz
+man/man1/sympa-del.1.gz
+man/man1/sympa-dump.1.gz
+man/man1/sympa-help.1.gz
+man/man1/sympa-include.1.gz
+man/man1/sympa-instantiate.1.gz
+man/man1/sympa-lowercase.1.gz
+man/man1/sympa-make_alias_file.1.gz
+man/man1/sympa-md5_digest.1.gz
+man/man1/sympa-move.1.gz
+man/man1/sympa-open.1.gz
+man/man1/sympa-rebuildarc.1.gz
+man/man1/sympa-reload_list_config.1.gz
+man/man1/sympa-restore.1.gz
+man/man1/sympa-send_digest.1.gz
+man/man1/sympa-show_pending_lists.1.gz
+man/man1/sympa-sync_list_db.1.gz
+man/man1/sympa-update.1.gz
+man/man1/sympa-upgrade.1.gz
+man/man1/sympa-upgrade_config_location.1.gz
+man/man1/sympa-user-move.1.gz
+man/man1/sympa-user.1.gz
+man/man1/sympa-version.1.gz
 man/man1/sympa_newaliases.1.gz
 man/man1/sympa_test_ldap.1.gz
 man/man1/sympa_toc.1.gz
@@ -228,6 +286,7 @@ man/man3/Sympa::Aliases::CheckSMTP.3Sympa.gz
 man/man3/Sympa::Aliases::External.3Sympa.gz
 man/man3/Sympa::Aliases::Template.3Sympa.gz
 man/man3/Sympa::Archive.3Sympa.gz
+man/man3/Sympa::CLI.3Sympa.gz
 man/man3/Sympa::CommandDef.3Sympa.gz
 man/man3/Sympa::ConfDef.3Sympa.gz
 man/man3/Sympa::Config.3Sympa.gz
@@ -257,6 +316,7 @@ man/man3/Sympa::DataSource::SQL.3Sympa.gz
 man/man3/Sympa::Family.3Sympa.gz
 man/man3/Sympa::HTMLDecorator.3Sympa.gz
 man/man3/Sympa::HTMLSanitizer.3Sympa.gz
+man/man3/Sympa::Internals.3Sympa.gz
 man/man3/Sympa::Internals::Workflow.3Sympa.gz
 man/man3/Sympa::Language.3Sympa.gz
 man/man3/Sympa::List.3Sympa.gz
@@ -292,7 +352,6 @@ man/man3/Sympa::Request::Handler::global_remind.3Sympa.gz
 man/man3/Sympa::Request::Handler::global_set.3Sympa.gz
 man/man3/Sympa::Request::Handler::global_signoff.3Sympa.gz
 man/man3/Sympa::Request::Handler::help.3Sympa.gz
-man/man3/Sympa::Request::Handler::import.3Sympa.gz
 man/man3/Sympa::Request::Handler::include.3Sympa.gz
 man/man3/Sympa::Request::Handler::index.3Sympa.gz
 man/man3/Sympa::Request::Handler::info.3Sympa.gz
@@ -371,6 +430,7 @@ man/man3/Sympa::Template.3Sympa.gz
 man/man3/Sympa::Ticket.3Sympa.gz
 man/man3/Sympa::Tools::Domains.3Sympa.gz
 man/man3/Sympa::Tools::File.3Sympa.gz
+man/man3/Sympa::Tools::SMIME.3Sympa.gz
 man/man3/Sympa::Tools::Text.3Sympa.gz
 man/man3/Sympa::Tools::Time.3Sympa.gz
 man/man3/Sympa::Tracking.3Sympa.gz