Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Oct 2015 14:19:53 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r399341 - in head/mail/sympa: . files
Message-ID:  <201510151419.t9FEJrnp013566@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Oct 15 14:19:52 2015
New Revision: 399341
URL: https://svnweb.freebsd.org/changeset/ports/399341

Log:
  Update to 6.2.8.
  
  PR:		203209
  Submitted by:	maintainer
  Sponsored by:	Absolight

Added:
  head/mail/sympa/files/apache.sample.in   (contents, props changed)
  head/mail/sympa/files/fcgi.sample.in   (contents, props changed)
  head/mail/sympa/files/nginx.sample.in   (contents, props changed)
  head/mail/sympa/files/patch-src_etc_script_Makefile.in   (contents, props changed)
  head/mail/sympa/files/patch-src_lib_Sympa_Spool_Moderation.pm   (contents, props changed)
Deleted:
  head/mail/sympa/files/patch-src-etc-script-Makefile.in
Modified:
  head/mail/sympa/Makefile
  head/mail/sympa/distinfo
  head/mail/sympa/files/patch-Makefile.in
  head/mail/sympa/files/pkg-install.in
  head/mail/sympa/files/pkg-message.in
  head/mail/sympa/files/sympa.in
  head/mail/sympa/pkg-plist

Modified: head/mail/sympa/Makefile
==============================================================================
--- head/mail/sympa/Makefile	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/Makefile	Thu Oct 15 14:19:52 2015	(r399341)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sympa
-PORTVERSION=	6.1.24
-PORTREVISION=	1
+PORTVERSION=	6.2.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -14,57 +13,76 @@ COMMENT=	Sympa is an electronic mailing 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS+=	\
+RUN_DEPENDS=	\
 	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI	\
-	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
+	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton	\
+	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive	\
 	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy	\
-	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
+	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl	\
+	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar	\
 	p5-MIME-EncWords>=0:${PORTSDIR}/mail/p5-MIME-EncWords	\
 	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools	\
 	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools	\
-	p5-Msgcat>=0:${PORTSDIR}/misc/p5-Locale-Msgcat \
-	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap		\
+	p5-Msgcat>=0:${PORTSDIR}/misc/p5-Locale-Msgcat	\
+	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap	\
 	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask	\
-	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-Crypt-CipherSaber>=0:${PORTSDIR}/security/p5-Crypt-CipherSaber \
+	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL	\
+	p5-Crypt-CipherSaber>=0:${PORTSDIR}/security/p5-Crypt-CipherSaber	\
 	p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format	\
-	p5-Unicode-LineBreak>=0:${PORTSDIR}/textproc/p5-Unicode-LineBreak \
-	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-	p5-HTML-StripScripts-Parser>=0:${PORTSDIR}/www/p5-HTML-StripScripts-Parser \
-	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree		\
+	p5-Unicode-LineBreak>=0:${PORTSDIR}/textproc/p5-Unicode-LineBreak	\
+	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML	\
+	p5-HTML-StripScripts-Parser>=0:${PORTSDIR}/www/p5-HTML-StripScripts-Parser	\
+	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree	\
 	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit	\
 	p5-MIME-Lite-HTML>=0:${PORTSDIR}/mail/p5-MIME-Lite-HTML	\
-	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS	\
+	p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail	\
+	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone	\
+	p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple	\
+	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock	\
+	p5-MIME-Charset>=0:${PORTSDIR}/mail/p5-MIME-Charset	\
+	p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR	\
+	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable	\
+	p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes	\
+	p5-Crypt-SMIME>=0:${PORTSDIR}/security/p5-Crypt-SMIME	\
+	p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
+	p5-Data-Password>=0:${PORTSDIR}/security/p5-Data-Password
 
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
 
+PORTDOCS=	NEWS
+
 USERS=		sympa
 GROUPS=		sympa
 # Shebang is corrected by configure script
-USES=		cpe perl5 fakeroot
+USES=		cpe fakeroot perl5
 GNU_CONFIGURE=	yes
 ICONSDIR?=	www/icons
-CONFIGURE_ARGS+=--bindir=${PREFIX}/libexec/${PORTNAME}	\
+CONFIGURE_ARGS+=--bindir=${PREFIX}/bin \
 		--libexecdir=${PREFIX}/libexec/${PORTNAME} \
 		--localedir=${PREFIX}/share/locale	\
 		--sbindir=${PREFIX}/libexec/${PORTNAME}	\
+		--datadir=${DATADIR}	\
 		--sysconfdir=${ETCDIR}			\
-		--with-confdir=${PREFIX}/etc		\
+		--with-confdir=${ETCDIR}		\
 		--with-docdir=${EXAMPLESDIR}		\
 		--with-expldir=${DATADIR}/list_data	\
+		--with-defaultdir=${DATADIR}/defaults	\
 		--with-initdir=${PREFIX}/etc/rc.d	\
 		--with-lockdir=/var/spool/lock		\
 		--with-modulesdir=${PREFIX}/libexec/${PORTNAME} \
 		--with-piddir=/var/run/${PORTNAME} \
 		--with-scriptdir=${PREFIX}/libexec/${PORTNAME} \
-		--with-spooldir=/var/spool/${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}
 MAKE_ENV?=	PERL_EXTUTILS_AUTOINSTALL=--skip
-SUB_FILES=	pkg-install pkg-message
-SUB_LIST=	DB_TYPE=${DB_TYPE}
+SUB_FILES=	pkg-install pkg-message apache.sample nginx.sample fcgi.sample
+SUB_LIST=	DB_TYPE=${DB_TYPE} PERL=${PERL} WRKSRC=${WRKSRC} BINDIR=${STAGEDIR}${PREFIX}
 PORTEXAMPLES=	*
 
 USE_RC_SUBR=	sympa
@@ -75,6 +93,7 @@ OPTIONS_DEFINE=	FASTCGI APACHE NLS
 OPTIONS_DEFAULT=APACHE
 OPTIONS_RADIO=	DATABASE
 OPTIONS_RADIO_DATABASE=	ORACLE PGSQL SYBASE MYSQL
+OPTIONS_SUB=	yes
 
 SYBASE_DESC=	Sybase database
 
@@ -83,74 +102,47 @@ DB_TYPE:=	${DB_TYPE:tu}
 .  for option in ${OPTIONS_RADIO_DATABASE}
 .    if ${DB_TYPE} == ${option:S,PGSQL,PG,}
 OPTIONS_SET+=	${option}
-.warning You need to replace your DB_TYPE variable in make.conf with OPTIONS_SET+=${option}
+.warning You need to replace your DB_TYPE variable in make.conf with mail_sympa_SET+=${option}
 .    endif
 .  endfor
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFASTCGI}
-RUN_DEPENDS+=	p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
-SUB_LIST+=	FCGI=""
-. if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
-. endif
-.else
-SUB_LIST+=	FCGI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MORACLE}
-RUN_DEPENDS+=	p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle
-DB_TYPE=	oracle
-.elif ${PORT_OPTIONS:MPGSQL}
-SUB_LIST+=	REQ_MYSQL="" REQ_PGSQL=postgresql
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-DB_TYPE=	Pg
-.elif ${PORT_OPTIONS:MSYBASE}
-RUN_DEPENDS+=	p5-DBD-Sybase>=0:${PORTSDIR}/databases/p5-DBD-Sybase
-DB_TYPE=	sybase
-.elif ${PORT_OPTIONS:MMYSQL}
-SUB_LIST+=	REQ_MYSQL=mysql REQ_PGSQL=""
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-DB_TYPE=	mysql
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+FASTCGI_RUN_DEPENDS=	p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
+APACHE_IMPLIES=	FASTCGI
+APACHE_USE=	APACHE_RUN=22+
+APACHE_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+
+ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle
+ORACLE_VARS=	DB_TYPE=oracle
+PGSQL_SUB_LIST=	REQ_PGSQL=postgresql
+PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
+PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_VARS=	DB_TYPE=Pg
+SYBASE_RUN_DEPENDS=	p5-DBD-Sybase>=0:${PORTSDIR}/databases/p5-DBD-Sybase
+SYBASE_VARS=	DB_TYPE=sybase
+MYSQL_SUB_LIST=	REQ_MYSQL=mysql
+MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+MYSQL_VARS=	DB_TYPE=mysql
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\( *staticdir=\).*$$|\1${DATADIR}|'	\
-	    -e 's|^\( *defaultdir=\).*$$|\1${EXAMPLESDIR}|'		\
 	    -e 's|^\( *arcdir=\).*$$|\1${DATADIR}/arc|'			\
 	    -e 's|^\( *bouncedir=\).*$$|\1${DATADIR}/bounce|'		\
+	    -e 's|^\( *defaultdir=\).*$$|\1${DATADIR}/defaults|'		\
 	    -e 's|^\( *execcgidir=\).*$$|\1${PREFIX}/libexec/${PORTNAME}|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\(--target.*sympa.conf\)|\1.sample|'	\
-			  -e 's|data_structure.version|data_structure.version.sample|g' \
-			  -e 's|/bin/true$$|:|'				\
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#\$$(DESTDIR)\$$(sampledir)#${STAGEDIR}\$$(sampledir)#g' \
-		${WRKSRC}/doc/sample/Makefile.in
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
-	${ECHO_CMD} "@owner ${USERS}" >> ${TMPPLIST}
-	${ECHO_CMD} "@group ${GROUPS}" >> ${TMPPLIST}
-	for dir in $$(sort ${WRKSRC}/createddirs | ${SED} 's,^${STAGEDIR},,'); do \
-		${MKDIR} -m755 ${STAGEDIR}$$dir; \
-	done; \
-	for dir in $$(sort -r ${WRKSRC}/createddirs); do \
-		${ECHO_CMD} "@unexec ${RMDIR} $${dir#${STAGEDIR}} || : 2>/dev/null" >> ${TMPPLIST}; \
+	for link in 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
-	${INSTALL_DATA} ${WRKSRC}/etc_README ${STAGEDIR}/${ETCDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/apache.sample ${WRKDIR}/nginx.sample \
+		${WRKDIR}/fcgi.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/sympa/distinfo
==============================================================================
--- head/mail/sympa/distinfo	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/distinfo	Thu Oct 15 14:19:52 2015	(r399341)
@@ -1,2 +1,2 @@
-SHA256 (sympa-6.1.24.tar.gz) = 3b1cde93d26a9b44c98d50b972d74dc58335ec4fbd8c777cba822aafc7b34113
-SIZE (sympa-6.1.24.tar.gz) = 8135217
+SHA256 (sympa-6.2.8.tar.gz) = 17bc4dc8cc6894a9364d83db0db20c84abcda6e3ca19f57b12430a6c8297bb82
+SIZE (sympa-6.2.8.tar.gz) = 11656048

Added: head/mail/sympa/files/apache.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sympa/files/apache.sample.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -0,0 +1,16 @@
+DocumentRoot "%%DATADIR%%"
+AddDefaultCharset UTF-8
+DirectoryIndex wws
+Options +Indexes
+# you may replace 'fcgid' by 'fastcgi'
+LoadModule fcgid_module libexec/apache2/mod_fcgid.so
+<Location /wws>
+    SetHandler fcgid-script
+</Location>
+<Directory %%DATADIR%%>
+    Require all granted
+</Directory>
+<Directory %%PREFIX%%/libexec/sympa>
+    Require all granted
+</Directory>
+ScriptAlias /wws %%PREFIX%%/libexec/sympa/wwsympa-wrapper

Added: head/mail/sympa/files/fcgi.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sympa/files/fcgi.sample.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -0,0 +1,7 @@
+# in rc.conf:
+spawn_fcgi_enable="YES"
+spawn_fcgi_app="%%PREFIX%%/libexec/sympa/wwsympa.fcgi"
+spawn_fcgi_bindsocket="/var/run/sympa/wwsympa.socket"
+spawn_fcgi_bindsocket_mode="0777"
+spawn_fcgi_username="%%USERS%%"
+spawn_fcgi_groupname"%%GROUPS%%"

Added: head/mail/sympa/files/nginx.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sympa/files/nginx.sample.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -0,0 +1,28 @@
+upstream sympafcgi {
+	server unix:/var/run/sympa/wwsympa.socket;
+}
+
+server {
+	server_name_in_redirect off;
+	charset utf-8;
+	gzip off;
+	location / {
+       		fastcgi_param SCRIPT_FILENAME	%%PREFIX%%/libexec/sympa/wwsympa.fcgi;
+       		fastcgi_param PATH_INFO		$fastcgi_script_name;
+
+	        fastcgi_param QUERY_STRING	$query_string;
+       		fastcgi_param REQUEST_METHOD	$request_method;
+       		fastcgi_param CONTENT_TYPE	$content_type;
+       		fastcgi_param CONTENT_LENGTH	$content_length;
+       		fastcgi_param REQUEST_URI	$request_uri;
+       		fastcgi_param REMOTE_ADDR	$remote_addr;
+       		fastcgi_param SERVER_NAME	$host;
+       		fastcgi_param HTTP_HOST		$host;
+       		fastcgi_param SERVER_PORT	$server_port;
+		fastcgi_pass	sympafcgi;
+	}
+	location /static-sympa {
+          alias %%DATADIR%%
+          access_log   off;
+        }
+}

Modified: head/mail/sympa/files/patch-Makefile.in
==============================================================================
--- head/mail/sympa/files/patch-Makefile.in	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/files/patch-Makefile.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -1,49 +1,65 @@
-Avoid chown before install, to avoid using root.
-
-createddirs is read in Makefile and processed there
-
---- Makefile.in.orig	2014-02-05 15:08:23.000000000 +0100
-+++ Makefile.in	2014-03-14 10:42:06.143965800 +0100
-@@ -639,12 +639,7 @@
- 		$(spooldir)/moderation $(spooldir)/expire $(spooldir)/auth \
- 		$(spooldir)/outgoing $(spooldir)/tmp $(spooldir)/task \
- 		$(bouncedir) $(arcdir) $(piddir) $(staticdir) $(sysconfdir); do \
--		if [ ! -d $(DESTDIR)$$dir ] ; then \
--			echo "Creating $(DESTDIR)$$dir"; \
--			install -d -m 755 $(DESTDIR)$$dir; \
--		fi; \
+--- Makefile.in.orig	2015-10-02 21:18:14 UTC
++++ Makefile.in
+@@ -712,8 +712,8 @@ installdir:
+ 			echo "Creating $(DESTDIR)$$dir"; \
+ 			$(INSTALL) -d -m 755 $(DESTDIR)$$dir; \
+ 		fi; \
 -		chown $(USER) $(DESTDIR)$$dir || /bin/true; \
 -		chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
-+		echo "$${dir}" >> createddirs; \
++		chown $(USER) $(DESTDIR)$$dir || /usr/bin/true; \
++		chgrp $(GROUP) $(DESTDIR)$$dir || /usr/bin/true; \
  	done
  
- installconfig: installdir
-@@ -676,27 +671,12 @@
- 		echo "# automatically created file" >> data_structure.version; \
- 		echo "# you should not modify it" >> data_structure.version; \
- 		echo $(VERSION) >> data_structure.version; \
+ sympa_wizard.pl.inst: $(top_srcdir)/src/sbin/sympa_wizard.pl.in Makefile
+@@ -725,27 +725,27 @@ sympa_wizard.pl.inst: $(top_srcdir)/src/
+ installconfig: installdir sympa_wizard.pl.inst
+ 	@echo "Installing basic configuration ..."
+ 	export PERL5LIB=$(DESTDIR)$(modulesdir); \
+-	if [ ! -f  $(DESTDIR)$(confdir)/sympa.conf ]; then \
++	if [ ! -f  $(DESTDIR)$(confdir)/sympa.conf.sample ]; then \
+ 		echo "This looks like your first Sympa installation. The following wizard will assist you to create your first Sympa configuration.";\
+ 		if [ ! -d $(DESTDIR)$(confdir) ]; then \
+ 			$(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \
+ 		fi; \
+-		chown $(USER) $(DESTDIR)$(confdir) || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$(confdir) || /bin/true; \
++		chown $(USER) $(DESTDIR)$(confdir) || /usr/bin/true; \
++		chgrp $(GROUP) $(DESTDIR)$(confdir) || /usr/bin/true; \
+ 		$(PERL) sympa_wizard.pl.inst \
+ 			--create sympa.conf \
+-			--target $(DESTDIR)$(confdir)/sympa.conf \
+-			|| /bin/true; \
+-		chown $(USER) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
++			--target $(DESTDIR)$(confdir)/sympa.conf.sample \
++			|| /usr/bin/true; \
++		chown $(USER) $(DESTDIR)$(confdir)/sympa.conf.sample || /usr/bin/true; \
++		chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf.sample || /usr/bin/true; \
+ 	fi; \
+-	if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
++	if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version.sample ]; then \
+ 		cd $(DESTDIR)$(sysconfdir); \
+-		echo "# automatically created file" >> data_structure.version; \
+-		echo "# you should not modify it" >> data_structure.version; \
+-		echo $(VERSION) >> data_structure.version; \
 -		chown $(USER) data_structure.version || /bin/true; \
 -		chgrp $(GROUP) data_structure.version || /bin/true; \
++		echo "# automatically created file" >> data_structure.version.sample; \
++		echo "# you should not modify it" >> data_structure.version.sample; \
++		echo $(VERSION) >> data_structure.version.sample; \
++		chown $(USER) data_structure.version.sample || /usr/bin/true; \
++		chgrp $(GROUP) data_structure.version.sample || /usr/bin/true; \
  	fi
- 	@for dir in create_list_templates families \
- 		global_task_models list_task_models scenari search_filters \
- 		mail_tt2 web_tt2; do \
--		if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
--			echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
--			install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
--		fi; \
+ 	@for dir in create_list_templates custom_actions custom_conditions \
+ 		data_sources families global_task_models list_task_models \
+@@ -754,8 +754,8 @@ installconfig: installdir sympa_wizard.p
+ 			echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
+ 			$(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
+ 		fi; \
 -		chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
 -		chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
-+		echo "$(DESTDIR)$(sysconfdir)/$${dir}" >> createddirs; \
++		chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /usr/bin/true; \
++		chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /usr/bin/true; \
  	done
--	@if [ ! -e $(DESTDIR)$(sysconfdir)/README ]; then \
--		echo "Creating $(DESTDIR)$(sysconfdir)/README"; \
--		$(SED) \
--			-e 's|--sysconfdir--|$(sysconfdir)|' \
--			-e 's|--defaultdir--|$(defaultdir)|' \
--			etc_README > $(DESTDIR)$(sysconfdir)/README; \
--		chmod 444 $(DESTDIR)$(sysconfdir)/README; \
--	fi
- 
- nextstep: 
- 	@echo ""
+ 	@if [ ! -e $(DESTDIR)$(sysconfdir)/README ]; then \
+ 		echo "Creating $(DESTDIR)$(sysconfdir)/README"; \

Added: head/mail/sympa/files/patch-src_etc_script_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sympa/files/patch-src_etc_script_Makefile.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -0,0 +1,11 @@
+--- src/etc/script/Makefile.in.orig	2015-10-02 21:18:14 UTC
++++ src/etc/script/Makefile.in
+@@ -330,7 +330,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-initSCRIPTS
++install-data-am:
+ 
+ install-exec-am:
+ 

Added: head/mail/sympa/files/patch-src_lib_Sympa_Spool_Moderation.pm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sympa/files/patch-src_lib_Sympa_Spool_Moderation.pm	Thu Oct 15 14:19:52 2015	(r399341)
@@ -0,0 +1,11 @@
+--- src/lib/Sympa/Spool/Moderation.pm.orig	2015-10-03 09:26:05 UTC
++++ src/lib/Sympa/Spool/Moderation.pm
+@@ -223,6 +223,8 @@ None.
+ 
+ =back
+ 
++=back
++
+ =head1 CONFIGURATION PARAMETERS
+ 
+ Following site configuration parameters in sympa.conf will be referred.

Modified: head/mail/sympa/files/pkg-install.in
==============================================================================
--- head/mail/sympa/files/pkg-install.in	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/files/pkg-install.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -2,12 +2,24 @@
 # $FreeBSD$
 #
 
-[ "$2" = "POST_INSTALL" ] || exit 0
-
-for conf in sympa.conf wwsympa.conf
-do	[ ! -f ${PKG_PREFIX}/etc/${conf} ] && \
-	 cp -p ${PKG_PREFIX}/etc/${conf}.sample ${PKG_PREFIX}/etc/${conf} && \
-	 chmod u+w ${PKG_PREFIX}/etc/${conf}
-done
+if [ "$2" = "POST_INSTALL" ]; then
+	if [ ! -f %%ETCDIR%%/sympa.conf -o ! -f %%ETCDIR%%/data_structure.version ]; then
+		cp -p %%ETCDIR%%/sympa.conf.sample %%ETCDIR%%/sympa.conf
+		chmod u+w %%ETCDIR%%/sympa.conf
+	else
+		if [ $(tail -1 %%ETCDIR%%/data_structure.version | cut -d. -f3) -lt 2 ]; then
+			echo "It seems you are upgrading from version <6.2 ($(cat %%ETCDIR%%/data_structure.version))"
+			echo "You'll have to read https://www.sympa.org/faq/upgrade-to-v6.2 and (at least) run:"
+			echo " # %%PREFIX%%/libexec/sympa/sympa.pl --upgrade_config_location"
+			echo " # %%PREFIX%%/libexec/sympa/sympa.pl --upgrade"
+			echo " # %%PREFIX%%/libexec/sympa/upgrade_bulk_spool.pl"
+			echo " # %%PREFIX%%/libexec/sympa/upgrade_send_spool.pl"
+			echo "to update your config files to the new layout"
+		else
+			echo "to upgrade, run:"
+			echo " # %%PREFIX%%/libexec/sympa/sympa.pl --upgrade"
+		fi
+	fi
+fi
 
 exit 0

Modified: head/mail/sympa/files/pkg-message.in
==============================================================================
--- head/mail/sympa/files/pkg-message.in	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/files/pkg-message.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -1,33 +1,13 @@
-If this is your first installation of sympa, please load
-this file with your %%DB_TYPE%% database client:
-    %%PREFIX%%/libexec/sympa/create_db.%%DB_TYPE%%
+If you upgrade from <6.2, read
+https://www.sympa.org/faq/upgrade-to-v6.2
 
-Before configuring sympa, you need to copy the samples:
-    cp /usr/local/etc/sympa.conf.sample /usr/local/etc/sympa.conf
-    cp /usr/local/etc/wwsympa.conf.sample /usr/local/etc/wwsympa.conf
+Else upgrade with:
+  run sympa.pl --upgrade
 
-To configure sympa interactively, please run:
-    perl %%PREFIX%%/libexec/sympa/sympa_wizard.pl
+If this is your first installation of sympa, run
+  create database with this schema:
+    %%LOCALBASE%%/libexec/sympa/create_db.%%DB_TYPE%%
+  run sympa_wizard.pl
+  for wwsympa server, see samples configs in %%EXAMPLESDIR%%
 
-You may also manually edit the two configuration files:
-    %%PREFIX%%/etc/sympa.conf
-    %%PREFIX%%/etc/wwsympa.conf
 
-To set up the wwsympa server, add something like this to
-your Apache configuration file:
-
-    DocumentRoot "%%DATADIR%%"
-    AddDefaultCharset UTF-8
-    DirectoryIndex wws
-    Options +Indexes
-%%FCGI%%    LoadModule fastcgi_module libexec/apache2/mod_fastcgi.so
-%%FCGI%%    <Location /wws>
-%%FCGI%%        SetHandler fastcgi-script
-%%FCGI%%    </Location>
-    <Directory %%DATADIR%%>
-        Allow from all
-    </Directory>
-    <Directory %%PREFIX%%/libexec/sympa>
-        Allow from all
-    </Directory>
-    ScriptAlias /wws %%PREFIX%%/libexec/sympa/wwsympa-wrapper

Modified: head/mail/sympa/files/sympa.in
==============================================================================
--- head/mail/sympa/files/sympa.in	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/files/sympa.in	Thu Oct 15 14:19:52 2015	(r399341)
@@ -37,8 +37,7 @@ extra_commands=status
 
 sympadir=%%PREFIX%%/libexec/sympa
 
-sympaconf=%%PREFIX%%/etc/sympa.conf
-wwsympaconf=%%PREFIX%%/etc/wwsympa.conf
+sympaconf=%%ETCDIR%%/sympa.conf
 
 sub_status()
 {
@@ -155,7 +154,6 @@ sympa_check_config()
 	# Check config files
 	[ -d $sympadir ] || exit 0
 	[ -f $sympaconf ] || exit 0
-	[ -f $wwsympaconf ] || exit 0
 }
 
 sympa_start()
@@ -163,7 +161,7 @@ sympa_start()
 	sympa_check_config
 	if [ ! -f /var/spool/lock/sympa ]; then
 		echo "Starting Sympa subsystem: "
-		sub_start sympa
+		sub_start sympa_msg
 		sub_start bulk
 		sub_start archived
 		sub_start bounced
@@ -183,7 +181,7 @@ sympa_stop()
 	sub_stop bounced
 	sub_stop archived
 	sub_stop bulk
-	sub_stop sympa
+	sub_stop sympa_msg
 	if [ -f /var/run/sympa/sympa-creation.pid ]; then
 		sub_stop sympa-creation
 	fi
@@ -201,7 +199,7 @@ sympa_status()
 	else
 		echo "Status file for subsystem NOT found."
 	fi
-	sub_status sympa
+	sub_status sympa_msg
 	sub_status bulk
 	sub_status archived
 	sub_status bounced

Modified: head/mail/sympa/pkg-plist
==============================================================================
--- head/mail/sympa/pkg-plist	Thu Oct 15 14:14:21 2015	(r399340)
+++ head/mail/sympa/pkg-plist	Thu Oct 15 14:19:52 2015	(r399341)
@@ -1,93 +1,188 @@
-@comment copyover handled in pkg-install
-@unexec cmp -s %D/etc/sympa.conf.sample %D/etc/sympa.conf && rm -f %D/etc/sympa.conf
-etc/sympa.conf.sample
-@unexec cmp -s %D/etc/wwsympa.conf.sample %D/etc/wwsympa.conf && rm -f %D/etc/wwsympa.conf
-etc/wwsympa.conf.sample
-%%ETCDIR%%/etc_README
-@group sympa
-@sample %%ETCDIR%%/data_structure.version.sample
-libexec/sympa/Archive.pm
-libexec/sympa/Auth.pm
-libexec/sympa/Bounce.pm
-libexec/sympa/Bulk.pm
-libexec/sympa/Commands.pm
+@sample %%ETCDIR%%/sympa.conf.sample
+bin/sympa.pl
+bin/sympa_wizard.pl
+bin/upgrade_bulk_spool.pl
+bin/upgrade_send_spool.pl
+%%ETCDIR%%/data_structure.version.sample
+%%ETCDIR%%/README
 libexec/sympa/Conf.pm
-libexec/sympa/Config_XML.pm
-libexec/sympa/Datasource.pm
-libexec/sympa/Family.pm
-libexec/sympa/Fetch.pm
-libexec/sympa/HTML/myFormatText.pm
-libexec/sympa/LDAPSource.pm
-libexec/sympa/Language.pm
-libexec/sympa/Ldap.pm
-libexec/sympa/List.pm
-libexec/sympa/Lock.pm
-libexec/sympa/Log.pm
-libexec/sympa/Marc.pm
-libexec/sympa/Marc/Search.pm
-libexec/sympa/Message.pm
-libexec/sympa/PlainDigest.pm
-libexec/sympa/Robot.pm
-libexec/sympa/SQLSource.pm
-libexec/sympa/Scenario.pm
-libexec/sympa/SharedDocument.pm
+libexec/sympa/SDM.pm
+libexec/sympa/Sympa.pm
+libexec/sympa/Sympa/Admin.pm
+libexec/sympa/Sympa/Alarm.pm
+libexec/sympa/Sympa/Archive.pm
+libexec/sympa/Sympa/Auth.pm
+libexec/sympa/Sympa/Bulk.pm
+libexec/sympa/Sympa/Commands.pm
+libexec/sympa/Sympa/ConfDef.pm
+libexec/sympa/Sympa/Config_XML.pm
 libexec/sympa/Sympa/Constants.pm
-libexec/sympa/Sympa/Template/Compat.pm
-libexec/sympa/SympaSession.pm
-libexec/sympa/SympaTransport.pm
-libexec/sympa/Task.pm
-libexec/sympa/Upgrade.pm
-libexec/sympa/WebAgent.pm
-libexec/sympa/admin.pm
+libexec/sympa/Sympa/Crash.pm
+libexec/sympa/Sympa/Database.pm
+libexec/sympa/Sympa/DatabaseDescription.pm
+libexec/sympa/Sympa/DatabaseDriver.pm
+libexec/sympa/Sympa/DatabaseDriver/CSV.pm
+libexec/sympa/Sympa/DatabaseDriver/LDAP.pm
+libexec/sympa/Sympa/DatabaseDriver/MySQL.pm
+libexec/sympa/Sympa/DatabaseDriver/ODBC.pm
+libexec/sympa/Sympa/DatabaseDriver/Oracle.pm
+libexec/sympa/Sympa/DatabaseDriver/Oracle/St.pm
+libexec/sympa/Sympa/DatabaseDriver/PostgreSQL.pm
+libexec/sympa/Sympa/DatabaseDriver/SQLite.pm
+libexec/sympa/Sympa/DatabaseDriver/Sybase.pm
+libexec/sympa/Sympa/DatabaseManager.pm
+libexec/sympa/Sympa/Datasource.pm
+libexec/sympa/Sympa/Family.pm
+libexec/sympa/Sympa/Fetch.pm
+libexec/sympa/Sympa/HTML/FormatText.pm
+libexec/sympa/Sympa/HTMLSanitizer.pm
+libexec/sympa/Sympa/Internals.pod
+libexec/sympa/Sympa/Language.pm
+libexec/sympa/Sympa/List.pm
+libexec/sympa/Sympa/ListDef.pm
+libexec/sympa/Sympa/LockedFile.pm
+libexec/sympa/Sympa/Log.pm
+libexec/sympa/Sympa/Mailer.pm
+libexec/sympa/Sympa/Marc.pm
+libexec/sympa/Sympa/Marc/Search.pm
+libexec/sympa/Sympa/Message.pm
+libexec/sympa/Sympa/Message/Plugin.pm
+libexec/sympa/Sympa/Message/Plugin/FixEncoding.pm
+libexec/sympa/Sympa/ModDef.pm
+libexec/sympa/Sympa/Regexps.pm
+libexec/sympa/Sympa/Report.pm
+libexec/sympa/Sympa/Robot.pm
+libexec/sympa/Sympa/SOAP.pm
+libexec/sympa/Sympa/SOAP/Transport.pm
+libexec/sympa/Sympa/Scenario.pm
+libexec/sympa/Sympa/Session.pm
+libexec/sympa/Sympa/SharedDocument.pm
+libexec/sympa/Sympa/Spool.pm
+libexec/sympa/Sympa/Spool/Automatic.pm
+libexec/sympa/Sympa/Spool/Archive.pm
+libexec/sympa/Sympa/Spool/Bounce.pm
+libexec/sympa/Sympa/Spool/Digest.pm
+libexec/sympa/Sympa/Spool/Digest/Collection.pm
+libexec/sympa/Sympa/Spool/Held.pm
+libexec/sympa/Sympa/Spool/Incoming.pm
+libexec/sympa/Sympa/Spool/Moderation.pm
+libexec/sympa/Sympa/Task.pm
+libexec/sympa/Sympa/Template.pm
+libexec/sympa/Sympa/Tools/DKIM.pm
+libexec/sympa/Sympa/Tools/Daemon.pm
+libexec/sympa/Sympa/Tools/Data.pm
+libexec/sympa/Sympa/Tools/File.pm
+libexec/sympa/Sympa/Tools/Password.pm
+libexec/sympa/Sympa/Tools/SMIME.pm
+libexec/sympa/Sympa/Tools/Text.pm
+libexec/sympa/Sympa/Tools/Time.pm
+libexec/sympa/Sympa/Tools/WWW.pm
+libexec/sympa/Sympa/Tracking.pm
+libexec/sympa/Sympa/Upgrade.pm
+libexec/sympa/Sympa/User.pm
 libexec/sympa/alias_manager.pl
 libexec/sympa/arc2webarc.pl
 libexec/sympa/archived.pl
 libexec/sympa/bounced.pl
+@(sympa,sympa,4755) libexec/sympa/bouncequeue
 libexec/sympa/bulk.pl
-libexec/sympa/confdef.pm
-libexec/sympa/cookielib.pm
-libexec/sympa/create_db.Oracle
-libexec/sympa/create_db.Pg
-libexec/sympa/create_db.SQLite
 libexec/sympa/create_db.Sybase
-libexec/sympa/create_db.mysql
-libexec/sympa/crypt_passwd.pl
+@(sympa,sympa,4755) libexec/sympa/familyqueue
 libexec/sympa/init_comment.pl
 libexec/sympa/ldap_alias_manager.pl
-libexec/sympa/mail.pm
 libexec/sympa/mod2html.pl
 libexec/sympa/mysql_alias_manager.pl
 libexec/sympa/p12topem.pl
-libexec/sympa/report.pm
-libexec/sympa/sympa_newaliases.pl
+@(sympa,sympa,4755) libexec/sympa/queue
 libexec/sympa/sympa.pl
+libexec/sympa/sympa_automatic.pl
+libexec/sympa/sympa_msg.pl
+@(sympa,sympa,6755) libexec/sympa/sympa_newaliases-wrapper
+libexec/sympa/sympa_newaliases.pl
+libexec/sympa/sympa_smtpc
 libexec/sympa/sympa_soap_client.pl
 libexec/sympa/sympa_soap_server.fcgi
+libexec/sympa/sympa_test_ldap.pl
 libexec/sympa/sympa_wizard.pl
-libexec/sympa/sympasoap.pm
 libexec/sympa/task_manager.pl
-libexec/sympa/testldap.pl
 libexec/sympa/testlogs.pl
-libexec/sympa/time_utils.pm
 libexec/sympa/tools.pm
 libexec/sympa/tpl2tt2.pl
-libexec/sympa/tt2.pm
-libexec/sympa/wwslib.pm
-@owner sympa
-@(,,4755) libexec/sympa/bouncequeue
-@(,,4755) libexec/sympa/familyqueue
-@(,,4755) libexec/sympa/queue
-@(,,4750) libexec/sympa/sympa_newaliases-wrapper
-@(,,6755) libexec/sympa/sympa_soap_server-wrapper.fcgi
-@(,,6755) libexec/sympa/wwsympa-wrapper.fcgi
-@owner
+libexec/sympa/upgrade_bulk_spool.pl
+libexec/sympa/upgrade_send_spool.pl
+libexec/sympa/upgrade_sympa_password.pl
 libexec/sympa/wwsympa.fcgi
-@group
+@(sympa,sympa,6755) libexec/sympa/sympa_soap_server-wrapper.fcgi
+@(sympa,sympa,6755) libexec/sympa/wwsympa-wrapper.fcgi
+man/man1/mod2html.1.gz
+man/man1/sympa.1.gz
 man/man1/sympa_newaliases.1.gz
+man/man1/sympa_smtpc.1.gz
+man/man1/sympa_test_ldap.1.gz
+man/man1/sympa_toc.1.gz
+man/man1/sympa_wizard.1.gz
+man/man1/upgrade_bulk_spool.1.gz
+man/man1/upgrade_send_spool.1.gz
+man/man1/upgrade_sympa_password.1.gz
+man/man3/Sympa.3Sympa.gz
+man/man3/Sympa::Alarm.3Sympa.gz
+man/man3/Sympa::Archive.3Sympa.gz
+man/man3/Sympa::Bulk.3Sympa.gz
+man/man3/Sympa::ConfDef.3Sympa.gz
+man/man3/Sympa::Constants.3Sympa.gz
+man/man3/Sympa::Crash.3Sympa.gz
+man/man3/Sympa::Database.3Sympa.gz
+man/man3/Sympa::DatabaseDescription.3Sympa.gz
+man/man3/Sympa::DatabaseDriver.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::CSV.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::LDAP.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::MySQL.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::ODBC.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::Oracle.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::Oracle::St.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::PostgreSQL.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::SQLite.3Sympa.gz
+man/man3/Sympa::DatabaseDriver::Sybase.3Sympa.gz
+man/man3/Sympa::DatabaseManager.3Sympa.gz
+man/man3/Sympa::HTMLSanitizer.3Sympa.gz
+man/man3/Sympa::Language.3Sympa.gz
+man/man3/Sympa::ListDef.3Sympa.gz
+man/man3/Sympa::LockedFile.3Sympa.gz
+man/man3/Sympa::Log.3Sympa.gz
+man/man3/Sympa::Mailer.3Sympa.gz
+man/man3/Sympa::Marc::Search.3Sympa.gz
+man/man3/Sympa::Message.3Sympa.gz
+man/man3/Sympa::Message::Plugin.3Sympa.gz
+man/man3/Sympa::Message::Plugin::FixEncoding.3Sympa.gz
+man/man3/Sympa::ModDef.3Sympa.gz
+man/man3/Sympa::Regexps.3Sympa.gz
+man/man3/Sympa::Spool.3Sympa.gz
+man/man3/Sympa::Spool::Automatic.3Sympa.gz
+man/man3/Sympa::Spool::Archive.3Sympa.gz
+man/man3/Sympa::Spool::Bounce.3Sympa.gz
+man/man3/Sympa::Spool::Digest.3Sympa.gz
+man/man3/Sympa::Spool::Digest::Collection.3Sympa.gz
+man/man3/Sympa::Spool::Held.3Sympa.gz
+man/man3/Sympa::Spool::Incoming.3Sympa.gz
+man/man3/Sympa::Spool::Moderation.3Sympa.gz
+man/man3/Sympa::Template.3Sympa.gz
+man/man3/Sympa::Tools::Daemon.3Sympa.gz
+man/man3/Sympa::Tools::File.3Sympa.gz
+man/man3/Sympa::Tools::Text.3Sympa.gz
+man/man3/Sympa::Tracking.3Sympa.gz
+man/man3/Sympa::User.3Sympa.gz
+man/man5/charset.conf.5.gz
+man/man5/sympa.conf.5.gz
+man/man5/sympa_database.5.gz
 man/man8/alias_manager.8.gz
 man/man8/archived.8.gz
 man/man8/bounced.8.gz
-man/man8/sympa.8.gz
+man/man8/bulk.8.gz
+man/man8/sympa_automatic.8.gz
+man/man8/sympa_msg.8.gz
+man/man8/sympa_soap_server.8.gz
+man/man8/task_manager.8.gz
+man/man8/wwsympa.8.gz
 %%NLS%%share/locale/ar/LC_MESSAGES/sympa.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/web_help.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/sympa.mo
@@ -104,6 +199,8 @@ man/man8/sympa.8.gz
 %%NLS%%share/locale/el/LC_MESSAGES/web_help.mo
 %%NLS%%share/locale/en/LC_MESSAGES/sympa.mo
 %%NLS%%share/locale/en/LC_MESSAGES/web_help.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/sympa.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/web_help.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sympa.mo
 %%NLS%%share/locale/es/LC_MESSAGES/web_help.mo
 %%NLS%%share/locale/et/LC_MESSAGES/sympa.mo
@@ -151,10 +248,741 @@ man/man8/sympa.8.gz
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sympa.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/web_help.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/sympa.mo
+%%DATADIR%%/defaults/auth.conf
+%%DATADIR%%/defaults/ca-bundle.crt
+%%DATADIR%%/defaults/charset.conf
+%%DATADIR%%/defaults/crawlers_detection.conf
+%%DATADIR%%/defaults/create_list.conf
+%%DATADIR%%/defaults/create_list_templates/confidential/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/confidential/config.tt2
+%%DATADIR%%/defaults/create_list_templates/discussion_list/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/discussion_list/config.tt2
+%%DATADIR%%/defaults/create_list_templates/hotline/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/hotline/config.tt2
+%%DATADIR%%/defaults/create_list_templates/html-news-letter/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/html-news-letter/config.tt2
+%%DATADIR%%/defaults/create_list_templates/intranet_list/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/intranet_list/config.tt2
+%%DATADIR%%/defaults/create_list_templates/news-letter/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/news-letter/config.tt2
+%%DATADIR%%/defaults/create_list_templates/private_working_group/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/private_working_group/config.tt2
+%%DATADIR%%/defaults/create_list_templates/public_web_forum/comment.tt2
+%%DATADIR%%/defaults/create_list_templates/public_web_forum/config.tt2
+%%DATADIR%%/defaults/edit_list.conf
+%%DATADIR%%/defaults/global_task_models/chk_cert_expiration.daily.task
+%%DATADIR%%/defaults/global_task_models/crl_update.daily.task
+%%DATADIR%%/defaults/global_task_models/eval_bouncers.daily.task
+%%DATADIR%%/defaults/global_task_models/expire_bounce.daily.task
+%%DATADIR%%/defaults/global_task_models/process_bouncers.weekly.task
+%%DATADIR%%/defaults/global_task_models/purge_logs_table.daily.task
+%%DATADIR%%/defaults/global_task_models/purge_one_time_ticket_table.daily.task
+%%DATADIR%%/defaults/global_task_models/purge_orphan_bounces.monthly.task
+%%DATADIR%%/defaults/global_task_models/purge_session_table.daily.task
+%%DATADIR%%/defaults/global_task_models/purge_spools.daily.task
+%%DATADIR%%/defaults/global_task_models/purge_tables.daily.task
+%%DATADIR%%/defaults/global_task_models/purge_user_table.monthly.task
+%%DATADIR%%/defaults/ldap_alias_entry.tt2
+%%DATADIR%%/defaults/ldap_alias_manager.conf
+%%DATADIR%%/defaults/list_aliases.tt2
+%%DATADIR%%/defaults/list_task_models/expire.yearly.task
+%%DATADIR%%/defaults/list_task_models/remind.2month.task
+%%DATADIR%%/defaults/list_task_models/remind.monthly.task
+%%DATADIR%%/defaults/list_task_models/remind.yearly.task
+%%DATADIR%%/defaults/list_task_models/sync_include.ttl.task
+%%DATADIR%%/defaults/mail_tt2/authorization_reject.tt2
+%%DATADIR%%/defaults/mail_tt2/automatic_bounce_management.tt2
+%%DATADIR%%/defaults/mail_tt2/bye.tt2
+%%DATADIR%%/defaults/mail_tt2/certif_warning.tt2
+%%DATADIR%%/defaults/mail_tt2/command_report.tt2
+%%DATADIR%%/defaults/mail_tt2/d_install_shared.tt2
+%%DATADIR%%/defaults/mail_tt2/d_reject_shared.tt2
+%%DATADIR%%/defaults/mail_tt2/digest.tt2
+%%DATADIR%%/defaults/mail_tt2/digestplain.tt2
+%%DATADIR%%/defaults/mail_tt2/dsn.tt2
+%%DATADIR%%/defaults/mail_tt2/expire_deletion.tt2
+%%DATADIR%%/defaults/mail_tt2/expire_warning1.tt2
+%%DATADIR%%/defaults/mail_tt2/expire_warning2.tt2
+%%DATADIR%%/defaults/mail_tt2/get_archive.tt2
+%%DATADIR%%/defaults/mail_tt2/global_remind.tt2
+%%DATADIR%%/defaults/mail_tt2/helpfile.tt2
+%%DATADIR%%/defaults/mail_tt2/index_archive.tt2
+%%DATADIR%%/defaults/mail_tt2/info_report.tt2
+%%DATADIR%%/defaults/mail_tt2/invite.tt2
+%%DATADIR%%/defaults/mail_tt2/list_created.tt2
+%%DATADIR%%/defaults/mail_tt2/list_rejected.tt2
+%%DATADIR%%/defaults/mail_tt2/list_unknown.tt2
+%%DATADIR%%/defaults/mail_tt2/listeditor_notification.tt2
+%%DATADIR%%/defaults/mail_tt2/listmaster_groupednotifications.tt2
+%%DATADIR%%/defaults/mail_tt2/listmaster_notification.tt2
+%%DATADIR%%/defaults/mail_tt2/listowner_notification.tt2
+%%DATADIR%%/defaults/mail_tt2/lists.tt2
+%%DATADIR%%/defaults/mail_tt2/message_report.tt2
+%%DATADIR%%/defaults/mail_tt2/moderate.tt2
+%%DATADIR%%/defaults/mail_tt2/modindex.tt2
+%%DATADIR%%/defaults/mail_tt2/reject.tt2
+%%DATADIR%%/defaults/mail_tt2/remind.tt2
+%%DATADIR%%/defaults/mail_tt2/removed.tt2
+%%DATADIR%%/defaults/mail_tt2/request_auth.tt2
+%%DATADIR%%/defaults/mail_tt2/review.tt2
+%%DATADIR%%/defaults/mail_tt2/send_auth.tt2
+%%DATADIR%%/defaults/mail_tt2/sendpasswd.tt2
+%%DATADIR%%/defaults/mail_tt2/sendssopasswd.tt2
+%%DATADIR%%/defaults/mail_tt2/stats_report.tt2
+%%DATADIR%%/defaults/mail_tt2/summary.tt2
+%%DATADIR%%/defaults/mail_tt2/urlized_part.tt2
+%%DATADIR%%/defaults/mail_tt2/user_notification.tt2
+%%DATADIR%%/defaults/mail_tt2/welcome.tt2
+%%DATADIR%%/defaults/mail_tt2/which.tt2
+%%DATADIR%%/defaults/mail_tt2/x509-user-cert-missing.tt2
+%%DATADIR%%/defaults/mail_tt2/your_infected_msg.tt2
+%%DATADIR%%/defaults/mhonarc-ressources.tt2
+%%DATADIR%%/defaults/mime.types
+%%DATADIR%%/defaults/nrcpt_by_domain.conf
+%%DATADIR%%/defaults/scenari/access_web_archive.closed
+%%DATADIR%%/defaults/scenari/access_web_archive.intranet
+%%DATADIR%%/defaults/scenari/access_web_archive.listmaster
+%%DATADIR%%/defaults/scenari/access_web_archive.owner
+%%DATADIR%%/defaults/scenari/access_web_archive.private
+%%DATADIR%%/defaults/scenari/access_web_archive.public
+%%DATADIR%%/defaults/scenari/add.auth
+%%DATADIR%%/defaults/scenari/add.authdkim
+%%DATADIR%%/defaults/scenari/add.closed
+%%DATADIR%%/defaults/scenari/add.default
+%%DATADIR%%/defaults/scenari/add.owner
+%%DATADIR%%/defaults/scenari/add.owner_notify
+%%DATADIR%%/defaults/scenari/add.ownerdkim
+%%DATADIR%%/defaults/scenari/archive_mail_access.closed
+%%DATADIR%%/defaults/scenari/archive_mail_access.default
+%%DATADIR%%/defaults/scenari/archive_mail_access.owner
+%%DATADIR%%/defaults/scenari/archive_mail_access.private
+%%DATADIR%%/defaults/scenari/archive_mail_access.public
+%%DATADIR%%/defaults/scenari/automatic_list_creation.family_owner
+%%DATADIR%%/defaults/scenari/automatic_list_creation.listmaster
+%%DATADIR%%/defaults/scenari/automatic_list_creation.public
+%%DATADIR%%/defaults/scenari/create_list.intranet
+%%DATADIR%%/defaults/scenari/create_list.listmaster
+%%DATADIR%%/defaults/scenari/create_list.public_listmaster
+%%DATADIR%%/defaults/scenari/d_edit.default
+%%DATADIR%%/defaults/scenari/d_edit.editor
+%%DATADIR%%/defaults/scenari/d_edit.owner
+%%DATADIR%%/defaults/scenari/d_edit.private
+%%DATADIR%%/defaults/scenari/d_edit.private-https
+%%DATADIR%%/defaults/scenari/d_edit.public
+%%DATADIR%%/defaults/scenari/d_read.default
+%%DATADIR%%/defaults/scenari/d_read.owner
+%%DATADIR%%/defaults/scenari/d_read.private
+%%DATADIR%%/defaults/scenari/d_read.private-https
+%%DATADIR%%/defaults/scenari/d_read.public
+%%DATADIR%%/defaults/scenari/del.auth
+%%DATADIR%%/defaults/scenari/del.authdkim
+%%DATADIR%%/defaults/scenari/del.closed
+%%DATADIR%%/defaults/scenari/del.default
+%%DATADIR%%/defaults/scenari/del.owner
+%%DATADIR%%/defaults/scenari/del.owner_notify
+%%DATADIR%%/defaults/scenari/del.ownerdkim
+%%DATADIR%%/defaults/scenari/global_remind.listmaster
+%%DATADIR%%/defaults/scenari/info.conceal
+%%DATADIR%%/defaults/scenari/info.default
+%%DATADIR%%/defaults/scenari/info.open
+%%DATADIR%%/defaults/scenari/info.private
+%%DATADIR%%/defaults/scenari/invite.closed
+%%DATADIR%%/defaults/scenari/invite.default
+%%DATADIR%%/defaults/scenari/invite.owner
+%%DATADIR%%/defaults/scenari/invite.private
+%%DATADIR%%/defaults/scenari/invite.public
+%%DATADIR%%/defaults/scenari/remind.default
+%%DATADIR%%/defaults/scenari/remind.listmaster
+%%DATADIR%%/defaults/scenari/remind.listmasterdkim
+%%DATADIR%%/defaults/scenari/remind.owner
+%%DATADIR%%/defaults/scenari/remind.ownerdkim
+%%DATADIR%%/defaults/scenari/review.closed
+%%DATADIR%%/defaults/scenari/review.default
+%%DATADIR%%/defaults/scenari/review.intranet
+%%DATADIR%%/defaults/scenari/review.listmaster
+%%DATADIR%%/defaults/scenari/review.owner
+%%DATADIR%%/defaults/scenari/review.private
+%%DATADIR%%/defaults/scenari/review.public
+%%DATADIR%%/defaults/scenari/send.closed
+%%DATADIR%%/defaults/scenari/send.confidential
+%%DATADIR%%/defaults/scenari/send.default
+%%DATADIR%%/defaults/scenari/send.editordkim
+%%DATADIR%%/defaults/scenari/send.editorkey
+%%DATADIR%%/defaults/scenari/send.editorkeyonly
+%%DATADIR%%/defaults/scenari/send.editorkeyonlyauth
+%%DATADIR%%/defaults/scenari/send.intranet
+%%DATADIR%%/defaults/scenari/send.intranetorprivate
+%%DATADIR%%/defaults/scenari/send.newsletter
+%%DATADIR%%/defaults/scenari/send.newsletterkeyonly
+%%DATADIR%%/defaults/scenari/send.private
+%%DATADIR%%/defaults/scenari/send.private_smime
+%%DATADIR%%/defaults/scenari/send.privateandeditorkey
+%%DATADIR%%/defaults/scenari/send.privateandnomultipartoreditorkey
+%%DATADIR%%/defaults/scenari/send.privatekey
+%%DATADIR%%/defaults/scenari/send.privatekeyandeditorkeyonly
+%%DATADIR%%/defaults/scenari/send.privateoreditorkey
+%%DATADIR%%/defaults/scenari/send.privateorpublickey
+%%DATADIR%%/defaults/scenari/send.public
+%%DATADIR%%/defaults/scenari/send.public_nobcc
+%%DATADIR%%/defaults/scenari/send.publickey
+%%DATADIR%%/defaults/scenari/send.publicnoattachment
+%%DATADIR%%/defaults/scenari/send.publicnomultipart
+%%DATADIR%%/defaults/scenari/spam_status.x-spam-status
+%%DATADIR%%/defaults/scenari/subscribe.auth
+%%DATADIR%%/defaults/scenari/subscribe.auth_notify
+%%DATADIR%%/defaults/scenari/subscribe.auth_notifydkim
+%%DATADIR%%/defaults/scenari/subscribe.auth_owner
+%%DATADIR%%/defaults/scenari/subscribe.auth_ownerdkim

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510151419.t9FEJrnp013566>