Pullup ticket #3796 - requested by bouyer

mail/sympa: security update

Revisions pulled up:
- mail/sympa/MESSAGE                                            1.4
- mail/sympa/Makefile                                           1.47
- mail/sympa/PLIST                                              1.10
- mail/sympa/distinfo                                           1.13
- mail/sympa/files/bulk.sh                                      1.1
- mail/sympa/patches/patch-aa                                   1.6
- mail/sympa/patches/patch-ab                                   1.5
- mail/sympa/patches/patch-ac                                   1.3
- mail/sympa/patches/patch-af                                   1.3
- mail/sympa/patches/patch-ag                                   deleted
- mail/sympa/patches/patch-ah                                   deleted
- mail/sympa/patches/patch-ai                                   deleted
- mail/sympa/patches/patch-aj                                   deleted

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Wed May 16 16:16:46 UTC 2012

   Modified Files:
   	pkgsrc/mail/sympa: MESSAGE Makefile PLIST distinfo
   	pkgsrc/mail/sympa/patches: patch-aa patch-ab patch-ac patch-af
   Added Files:
   	pkgsrc/mail/sympa/files: bulk.sh
   Removed Files:
   	pkgsrc/mail/sympa/patches: patch-ag patch-ah patch-ai patch-aj

   Log Message:
   Update sympa to latest stable release 6.1.11. Lots of changes since the 5.4
   series, users are encouraged to read /usr/pkg/share/doc/sympa/NEWS for
   details. Summary of new features:

   ***   New bulk.pl daemon installed with Sympa. This daemon is dedicated to
         mail distribution and allows to parallelize this process on a single
         server as well as on multiple servers.
   ***   [Olivier Lumineau, CRU] Fresh new web CSS for the web interface.
   ***   Replace storage of password with encryption by md5 fingerprint. This
         make remind password impossible. So now a one time ticket table is created
         ticket are  sent by email as an authentication token. Ticket can be used
         for lost password, create account, moderation request . It should be
         generalized to all operation that need a email chalenge.
   ***  New propertie in object message : spam_status .  This feature is used in
        modindex (listing of message waiting for moderation) to show message
        tagued as spam.
        4 new parameters :
   	 - antispam_feature default off
   	 - antispam_tag_header_name default X-Spam-Status
   	 - antispam_tag_header_spam_regexp default ^\s*Yes
   	 - antispam_tag_header_ham_regexp default ^\s*No
   ***  DKIM : Sympa now supports DKIM for message diffusion and control.
   ***  web_tt2/Makefile.am, web_tt2/ca.tt2, web_tt2/lca.tt2,
        wwsympa/wwsympa.fcgi.in:  It is now possible to create Custom actions
        at the list or robot level. These custom actions allow you to create
        new pages in the Sympa web interface. for now, you can only display
        informations using this method. any post treatment (such as form
        submission) must be handled outside of Sympa. See
        https://www.sympa.org/manual_6.1/customizing#custom_actions for more
        details.
   ***  [Submitted by J. jourdan] "suspension of membership." The user can suspend
        his subscription to the lists
        that he subscribes. For a finite length or not. Added a calendar in
        javascript to select a date.

   Also, lots of translastion updates, and bug fixes (including security ones)

13 files changed, 624 insertions, 552 deletions

diff --git a/mail/sympa/MESSAGE b/mail/sympa/MESSAGE
index de4a01269ce..38edb9ac142 100644
--- a/mail/sympa/MESSAGE
+++ b/mail/sympa/MESSAGE
@@ -1,15 +1,24 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2008/04/27 17:06:40 bouyer Exp $
+$NetBSD: MESSAGE,v 1.3.36.1 2012/05/21 15:51:48 tron Exp $
 
-Run ${SYMPA_BIN}/sympa_wizard.pl -c sympa.conf
-and ${SYMPA_BIN}/sympa_wizard.pl -c wwsympa.conf
-to create default configuration files in ${PKG_SYSCONFDIR}.
-
-Then re-run ${SYMPA_BIN}/sympa_wizard.pl
+Run ${SYMPA_BIN}/sympa_wizard.pl
 for interactive configuration.
 
 If you are upgrading from a previous version please consult
 ${PREFIX}/share/doc/sympa/NEWS
-for incompatible changes, and run '${SYMPA_BIN}/sympa.pl --upgrade'
+for incompatible changes, and run:
+${SYMPA_BIN}/sympa.pl --upgrade
+
+If upgrading from sympa 5.4, you need add the necessary scripts and entries
+to /etc/rc.d/ and /etc/rc.conf to start the bulk daemon.
+Also, note that configuration files sympa.conf and wwsympa.conf have
+moved to ${PKG_SYSCONFDIR}. Move these files before running
+'${SYMPA_BIN}/sympa.pl --upgrade'
+You also need to ajust paths in your httpd.conf file:
+/wws is now ${PREFIX}/sympa/libexec/cgi-bin/wwsympa-wrapper.fcgi
+/static-sympa is now ${SYMPA_VARBASE}/list_data/static_content
+Password encoding has changed; run:
+${SYMPA_BIN}/sympa.pl --md5_encode_password
+to reencode them to the new format.
 
 ===========================================================================
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 9b61031995d..1d8226c59fc 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2012/01/03 03:44:39 joerg Exp $
+# $NetBSD: Makefile,v 1.46.4.1 2012/05/21 15:51:48 tron Exp $
 #
 
-DISTNAME=	sympa-5.4.4
-PKGREVISION=	4
+DISTNAME=	sympa-6.1.11
+#PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -10,71 +10,81 @@ MASTER_SITES=	http://www.sympa.org/distribution/ \
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.sympa.org/
 COMMENT=	Mailing list manager
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	destdir
 
+DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
 DEPENDS+=	p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip
-DEPENDS+=	p5-MIME-Base64>=1.0:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-AuthCAS>=1.5:../../security/p5-AuthCAS
+DEPENDS+=	{perl>=5.10,p5-CGI>=2.52}:../../www/p5-CGI
+DEPENDS+=	p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
 DEPENDS+=	p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase
 DEPENDS+=	p5-DBI>=1.06:../../databases/p5-DBI
-DEPENDS+=	p5-perl-ldap>=0.27:../../databases/p5-perl-ldap
+DEPENDS+=	{perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5
+DEPENDS+=	p5-Email-Date-Format>=1.002:../../mail/p5-Email-Date-Format
+DEPENDS+=	p5-FCGI>=0.67:../../www/p5-FCGI
+DEPENDS+=	p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive
+DEPENDS+=	p5-HTML-Format>=2.10:../../www/p5-HTML-Format
+DEPENDS+=	p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
+DEPENDS+=	p5-HTML-Tree>=4.2:../../www/p5-HTML-Tree
+DEPENDS+=	p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
 DEPENDS+=	p5-IO-stringy>=1.0:../../devel/p5-IO-stringy
-DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
+DEPENDS+=	p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
+DEPENDS+=	p5-MIME-Base64>=1.0:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-MIME-EncWords>=1.010.101:../../mail/p5-MIME-EncWords
+DEPENDS+=	p5-MIME-Lite-HTML>=1.23:../../mail/p5-MIME-Lite-HTML
 DEPENDS+=	p5-MIME-tools>=5.209:../../mail/p5-MIME-tools
 DEPENDS+=	p5-MailTools>=1.51:../../mail/p5-MailTools
 DEPENDS+=	{perl>=5.10,p5-Net>=1.0}:../../net/p5-Net
-DEPENDS+=	p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
-DEPENDS+=	p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
-DEPENDS+=	{perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5
-DEPENDS+=	p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
+DEPENDS+=	p5-Net-Netmask>=1.9015:../../devel/p5-Net-Netmask
 DEPENDS+=	p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay
-DEPENDS+=	{perl>=5.10,p5-CGI>=2.52}:../../www/p5-CGI
-DEPENDS+=	p5-FCGI>=0.67:../../www/p5-FCGI
-DEPENDS+=	p5-libwww>=1.09:../../www/p5-libwww
-DEPENDS+=	p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
-DEPENDS+=	p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
 DEPENDS+=	p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common
-DEPENDS+=	p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
-DEPENDS+=	p5-MIME-EncWords>=1.010.101:../../mail/p5-MIME-EncWords
+DEPENDS+=	p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
 DEPENDS+=	p5-Template-Toolkit>=2.20:../../www/p5-Template-Toolkit
+DEPENDS+=	p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar
+DEPENDS+=	p5-Time-HiRes>=1.9724:../../time/p5-Time-HiRes
+DEPENDS+=	p5-Unicode-LineBreak>=2012.02:../../textproc/p5-Unicode-LineBreak
+DEPENDS+=	p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
+DEPENDS+=	p5-libwww>=1.09:../../www/p5-libwww
+DEPENDS+=	p5-perl-ldap>=0.27:../../databases/p5-perl-ldap
 DEPENDS.SunOS+=	{perl>=5.10,p5-DB_File>=1.75}:../../databases/p5-DB_File
 
 OPSYSVARS+=	DEPENDS
 
-USE_TOOLS+=		gmake msgfmt
+USE_TOOLS+=		gmake msgfmt perl:run
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-cgidir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-bindir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-sbindir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-libexecdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-libdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-datadir=${SYMPA_BIN}/etc
-CONFIGURE_ARGS+=	--with-expldir=${SYMPA_VARBASE}/expl
-CONFIGURE_ARGS+=	--with-mandir=${PREFIX}/${PKGMANDIR}
+
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/sympa/bin
+CONFIGURE_ARGS+=	--with-cgidir=${PREFIX}/sympa/libexec/cgi-bin
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/sympa/bin
+CONFIGURE_ARGS+=	--localedir=${PREFIX}/share/locale
+CONFIGURE_ARGS+=	--sbindir=${PREFIX}/sympa/bin
+CONFIGURE_ARGS+=	--with-defaultdir=${PREFIX}/sympa/default
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-expldir=${SYMPA_VARBASE}/list_data
 CONFIGURE_ARGS+=	--with-lockdir=${SYMPA_VARBASE}/lock
+CONFIGURE_ARGS+=	--with-modulesdir=${PREFIX}/sympa/bin
 CONFIGURE_ARGS+=	--with-piddir=${SYMPA_VARBASE}/run
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}/sympa
-CONFIGURE_ARGS+=	--with-nlsdir=${SYMPA_PREFIX}/nls
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sympa
-CONFIGURE_ARGS+=	--with-scriptdir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-sampledir=${PREFIX}/share/examples/sympa
+CONFIGURE_ARGS+=	--with-scriptdir=${PREFIX}/sympa/bin
 CONFIGURE_ARGS+=	--with-spooldir=${SYMPA_SPOOL:Q}
+CONFIGURE_ARGS+=	--mandir=${MAN8PREFIX}/man
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
-CONFIGURE_ARGS+=	--with-mhonarc=${MHONARC_PREFIX}/bin/mhonarc
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}/bin/openssl
+CONFIGURE_ARGS+=	--sharedstatedir=${SYMPA_PREFIX}/libdata
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+CONFIGURE_ARGS+=	--localstatedir=${SYMPA_VARBASE}
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sympa
 CONFIGURE_ARGS+=	--with-user=${SYMPA_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${SYMPA_GROUP:Q}
-CONFIGURE_ARGS+=	--with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
-MHONARC_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		MHONARC_PREFIX=mhonarc
+PKG_SYSCONFSUBDIR?=	sympa
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sympa
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
 
-RCD_SCRIPTS=		archived bounced sympa task_manager
+RCD_SCRIPTS=		archived bounced bulk sympa task_manager
 
 .include "../../mk/bsd.options.mk"
 
@@ -88,7 +98,7 @@ DEPENDS+=	p5-DBD-postgresql>=0.90:../../databases/p5-DBD-postgresql
 
 SYMPA_USER?=	sympa
 SYMPA_GROUP?=	sympa
-SYMPA_VARBASE?=	${HOMEBASE}/sympa
+SYMPA_VARBASE?=	/var/sympa
 
 SYMPA_PREFIX=	${PREFIX}/sympa
 SYMPA_SPOOL=	${SYMPA_VARBASE}/spool
@@ -101,17 +111,22 @@ PKG_HOME.${SYMPA_USER}=		${SYMPA_VARBASE}
 
 PKG_GROUPS_VARS+=	SYMPA_GROUP
 PKG_USERS_VARS+=	SYMPA_USER
-USERGROUP_PHASE=	pre-install
 BUILD_DEFS+=		SYMPA_VARBASE
 
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR} ${SYMPA_USER} ${SYMPA_GROUP} 755
 .for d in sympa sympa/create_list_templates sympa/general_task_models \
 	sympa/scenari sympa/task_models sympa/templates sympa/wws_templates
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/${d} ${SYMPA_USER} ${SYMPA_GROUP} 755
 .endfor
-OWN_DIRS_PERMS+=	${SYMPA_VARBASE} ${SYMPA_USER} ${SYMPA_GROUP} 770
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE} ${SYMPA_USER} ${SYMPA_GROUP} 775
 OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/expl ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/lock ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/run ${SYMPA_USER} ${SYMPA_GROUP} 770
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/arc ${SYMPA_USER} ${SYMPA_GROUP} 770
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/bounce ${SYMPA_USER} ${SYMPA_GROUP} 770
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/list_data ${SYMPA_USER} ${SYMPA_GROUP} 775
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/list_data/static_content ${SYMPA_USER} ${SYMPA_GROUP} 775
+OWN_DIRS_PERMS+=	${SYMPA_VARBASE}/list_data/static_content/icons ${SYMPA_USER} ${SYMPA_GROUP} 775
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL} ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/msg ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/digest ${SYMPA_USER} ${SYMPA_GROUP} 770
@@ -122,28 +137,55 @@ OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/outgoing ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770
 
-SPECIAL_PERMS+=		${SYMPA_BIN}/aliaswrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
-SPECIAL_PERMS+=		${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
-SPECIAL_PERMS+=		${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
-SPECIAL_PERMS+=		${SYMPA_BIN}/virtualwrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
-
-# Which pkgsrc platforms support set-uid scripts?
-#SPECIAL_PERMS+=	${SYMPA_BIN}/sympa_soap_server.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6555
-#SPECIAL_PERMS+=	${SYMPA_BIN}/wwsympa.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6555
+SPECIAL_PERMS+=	 ${SYMPA_BIN}/aliaswrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
+SPECIAL_PERMS+=	 ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=	 ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=	 ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=	 ${SYMPA_BIN}/virtualwrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
+SPECIAL_PERMS+=	 ${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \
+			 ${SYMPA_USER} ${SYMPA_GROUP} 6555
+SPECIAL_PERMS+=	 ${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \
+			 ${SYMPA_USER} ${SYMPA_GROUP} 6555
+
+CONF_FILES=	${PREFIX}/share/examples/sympa/sympa.conf \
+		${PKG_SYSCONFDIR}/sympa.conf
+CONF_FILES+=	${PREFIX}/share/examples/sympa/wwsympa.conf \
+		${PKG_SYSCONFDIR}/wwsympa.conf
+.for f in back.png folder.open.png locked.png sound1.png begin.png folder.png\
+     logo-s-lock.png sv.png binary.png h.png logo-s.png text.png crosshairs.png\
+     image2.png logo_sympa.png top.png down.png junk.png movie.png unknown.png\
+     end.png left.png position.png favicon_sympa.png link.png right.png
+CONF_FILES+=	${PREFIX}/sympa/static_content/icons/${f} \
+		${SYMPA_VARBASE}/list_data/static_content/icons/${f}
+.endfor
 
-MESSAGE_SUBST+=	SYMPA_BIN=${SYMPA_BIN}
+MESSAGE_SUBST+=	SYMPA_BIN=${SYMPA_BIN} SYMPA_VARBASE=${SYMPA_VARBASE}
 
 INSTALLATION_DIRS+=	share/doc/sympa
 
 .include "../../mk/bsd.prefs.mk"
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	configure
+SUBST_SED.paths=	-e "s|localstatedir/lib/sympa|localstatedir|g"
+SUBST_SED.paths+=	-e "s|prefix/static_content|prefix/sympa/static_content|g"
+SUBST_SED.paths+=	-e "s|prefix/default|prefix/sympa/default|g"
+SUBST_SED.paths+=	-e "s|prefix/arc|localstatedir/arc|g"
+SUBST_SED.paths+=	-e "s|prefix/bounce|localstatedir/bounce|g"
+SUBST_MESSAGE.paths=	Fixing configure paths
+
 post-install:
-.if ${OPSYS} == "NetBSD"
-	: We do not support set-uid scripts...
-	${CHMOD} ug-s ${DESTDIR}${SYMPA_BIN}/sympa_soap_server.fcgi
-	${CHMOD} ug-s ${DESTDIR}${SYMPA_BIN}/wwsympa.fcgi
-.endif
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/sympa/NEWS
+	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${SYMPA_PREFIX}/static_content
+	${CHMOD} a-w \
+	    ${DESTDIR}${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \
+	    ${DESTDIR}${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \
+	    ${DESTDIR}${SYMPA_BIN}/aliaswrapper \
+	    ${DESTDIR}${SYMPA_BIN}/bouncequeue \
+	    ${DESTDIR}${SYMPA_BIN}/familyqueue \
+	    ${DESTDIR}${SYMPA_BIN}/queue \
+	    ${DESTDIR}${SYMPA_BIN}/virtualwrapper
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/sympa/PLIST b/mail/sympa/PLIST
index bd9d5f87d24..832b726e798 100644
--- a/mail/sympa/PLIST
+++ b/mail/sympa/PLIST
@@ -1,23 +1,32 @@
-@comment $NetBSD: PLIST,v 1.9 2010/12/02 11:17:43 reed Exp $
+@comment $NetBSD: PLIST,v 1.9.12.1 2012/05/21 15:51:48 tron Exp $
 man/man8/alias_manager.8
 man/man8/archived.8
 man/man8/bounced.8
 man/man8/sympa.8
+share/doc/sympa/sample/README
 share/doc/sympa/NEWS
-share/examples/sympa/README
-share/examples/sympa/employees.ldap
-share/examples/sympa/robot.conf
-share/examples/sympa/sample-list/config
-share/examples/sympa/sample-list/info
-share/examples/sympa/sample-list/message.footer
-share/examples/sympa/sample-list/welcome.tpl
-share/examples/sympa/trusted_applications.conf
+share/doc/sympa/sample/employees.ldap
+share/doc/sympa/sample/robot.conf
+share/doc/sympa/sample/test/config
+share/doc/sympa/sample/test/info
+share/doc/sympa/sample/test/message.footer
+share/doc/sympa/sample/test/web_tt2/welcome.tt2
+share/doc/sympa/sample/trusted_applications.conf
 share/examples/rc.d/archived
 share/examples/rc.d/bounced
+share/examples/rc.d/bulk
 share/examples/rc.d/sympa
 share/examples/rc.d/task_manager
+share/examples/sympa/data_structure.version
+share/examples/sympa/sympa.conf
+share/examples/sympa/wwsympa.conf
 share/locale/ar/LC_MESSAGES/sympa.mo
 share/locale/ar/LC_MESSAGES/web_help.mo
+share/locale/bg/LC_MESSAGES/sympa.mo
+share/locale/bg/LC_MESSAGES/web_help.mo
+share/locale/br/LC_MESSAGES/sympa.mo
+share/locale/br/LC_MESSAGES/web_help.mo
+share/locale/ca/LC_MESSAGES/sympa.mo
 share/locale/cs/LC_MESSAGES/sympa.mo
 share/locale/cs/LC_MESSAGES/web_help.mo
 share/locale/de/LC_MESSAGES/sympa.mo
@@ -30,10 +39,13 @@ share/locale/es/LC_MESSAGES/sympa.mo
 share/locale/es/LC_MESSAGES/web_help.mo
 share/locale/et/LC_MESSAGES/sympa.mo
 share/locale/et/LC_MESSAGES/web_help.mo
+share/locale/eu/LC_MESSAGES/sympa.mo
+share/locale/eu/LC_MESSAGES/web_help.mo
 share/locale/fi/LC_MESSAGES/sympa.mo
 share/locale/fi/LC_MESSAGES/web_help.mo
 share/locale/fr/LC_MESSAGES/sympa.mo
 share/locale/fr/LC_MESSAGES/web_help.mo
+share/locale/gl/LC_MESSAGES/sympa.mo
 share/locale/hu/LC_MESSAGES/sympa.mo
 share/locale/hu/LC_MESSAGES/web_help.mo
 share/locale/id/LC_MESSAGES/sympa.mo
@@ -42,6 +54,9 @@ share/locale/it/LC_MESSAGES/sympa.mo
 share/locale/it/LC_MESSAGES/web_help.mo
 share/locale/ja/LC_MESSAGES/sympa.mo
 share/locale/ja/LC_MESSAGES/web_help.mo
+share/locale/ko/LC_MESSAGES/sympa.mo
+share/locale/la/LC_MESSAGES/sympa.mo
+share/locale/ml/LC_MESSAGES/sympa.mo
 share/locale/nb_NO/LC_MESSAGES/sympa.mo
 share/locale/nb_NO/LC_MESSAGES/web_help.mo
 share/locale/nl/LC_MESSAGES/sympa.mo
@@ -50,25 +65,34 @@ share/locale/oc/LC_MESSAGES/sympa.mo
 share/locale/oc/LC_MESSAGES/web_help.mo
 share/locale/pl/LC_MESSAGES/sympa.mo
 share/locale/pl/LC_MESSAGES/web_help.mo
+share/locale/pt/LC_MESSAGES/sympa.mo
+share/locale/pt/LC_MESSAGES/web_help.mo
 share/locale/pt_BR/LC_MESSAGES/sympa.mo
 share/locale/pt_BR/LC_MESSAGES/web_help.mo
 share/locale/ro/LC_MESSAGES/sympa.mo
 share/locale/ro/LC_MESSAGES/web_help.mo
+share/locale/ru/LC_MESSAGES/sympa.mo
+share/locale/ru/LC_MESSAGES/web_help.mo
 share/locale/sv/LC_MESSAGES/sympa.mo
 share/locale/sv/LC_MESSAGES/web_help.mo
 share/locale/tr/LC_MESSAGES/sympa.mo
 share/locale/tr/LC_MESSAGES/web_help.mo
+share/locale/vi/LC_MESSAGES/sympa.mo
+share/locale/vi/LC_MESSAGES/web_help.mo
 share/locale/zh_CN/LC_MESSAGES/sympa.mo
 share/locale/zh_CN/LC_MESSAGES/web_help.mo
+share/locale/zh_TW/LC_MESSAGES/sympa.mo
 sympa/bin/Archive.pm
 sympa/bin/Auth.pm
-sympa/bin/CAS.pm
+sympa/bin/Bounce.pm
+sympa/bin/Bulk.pm
 sympa/bin/Commands.pm
 sympa/bin/Conf.pm
 sympa/bin/Config_XML.pm
 sympa/bin/Datasource.pm
 sympa/bin/Family.pm
 sympa/bin/Fetch.pm
+sympa/bin/HTML/myFormatText.pm
 sympa/bin/LDAPSource.pm
 sympa/bin/Language.pm
 sympa/bin/Ldap.pm
@@ -79,22 +103,26 @@ sympa/bin/Marc.pm
 sympa/bin/Marc/Search.pm
 sympa/bin/Message.pm
 sympa/bin/PlainDigest.pm
+sympa/bin/Robot.pm
 sympa/bin/SQLSource.pm
 sympa/bin/Scenario.pm
 sympa/bin/SharedDocument.pm
+sympa/bin/Sympa/Constants.pm
+sympa/bin/Sympa/Template/Compat.pm
 sympa/bin/SympaSession.pm
 sympa/bin/SympaTransport.pm
 sympa/bin/Task.pm
 sympa/bin/Upgrade.pm
-sympa/bin/Version.pm
+sympa/bin/WebAgent.pm
 sympa/bin/admin.pm
 sympa/bin/alias_manager.pl
 sympa/bin/aliaswrapper
 sympa/bin/arc2webarc.pl
 sympa/bin/archived.pl
-sympa/bin/bounce-lib.pl
 sympa/bin/bounced.pl
 sympa/bin/bouncequeue
+sympa/bin/bulk.pl
+sympa/bin/confdef.pm
 sympa/bin/cookielib.pm
 sympa/bin/create_db.Oracle
 sympa/bin/create_db.Pg
@@ -102,304 +130,6 @@ sympa/bin/create_db.SQLite
 sympa/bin/create_db.Sybase
 sympa/bin/create_db.mysql
 sympa/bin/crypt_passwd.pl
-sympa/bin/etc/README
-sympa/bin/etc/auth.conf
-sympa/bin/etc/ca-bundle.crt
-sympa/bin/etc/create_list.conf
-sympa/bin/etc/create_list_templates/discussion_list/comment.tt2
-sympa/bin/etc/create_list_templates/discussion_list/config.tt2
-sympa/bin/etc/create_list_templates/hotline/comment.tt2
-sympa/bin/etc/create_list_templates/hotline/config.tt2
-sympa/bin/etc/create_list_templates/html-news-letter/comment.tt2
-sympa/bin/etc/create_list_templates/html-news-letter/config.tt2
-sympa/bin/etc/create_list_templates/intranet_list/comment.tt2
-sympa/bin/etc/create_list_templates/intranet_list/config.tt2
-sympa/bin/etc/create_list_templates/news-letter/comment.tt2
-sympa/bin/etc/create_list_templates/news-letter/config.tt2
-sympa/bin/etc/create_list_templates/private_working_group/comment.tt2
-sympa/bin/etc/create_list_templates/private_working_group/config.tt2
-sympa/bin/etc/create_list_templates/public_web_forum/comment.tt2
-sympa/bin/etc/create_list_templates/public_web_forum/config.tt2
-sympa/bin/etc/edit_list.conf
-sympa/bin/etc/global_task_models/chk_cert_expiration.daily.task
-sympa/bin/etc/global_task_models/crl_update.daily.task
-sympa/bin/etc/global_task_models/eval_bouncers.daily.task
-sympa/bin/etc/global_task_models/expire_bounce.daily.task
-sympa/bin/etc/global_task_models/process_bouncers.weekly.task
-sympa/bin/etc/global_task_models/purge_orphan_bounces.monthly.task
-sympa/bin/etc/global_task_models/purge_user_table.monthly.task
-sympa/bin/etc/global_task_models/purge_session_table.daily.task
-sympa/bin/etc/global_task_models/purge_logs_table.daily.task
-sympa/bin/etc/list_aliases.tt2
-sympa/bin/etc/list_task_models/expire.yearly.task
-sympa/bin/etc/list_task_models/remind.2month.task
-sympa/bin/etc/list_task_models/remind.monthly.task
-sympa/bin/etc/list_task_models/remind.yearly.task
-sympa/bin/etc/list_task_models/sync_include.ttl.task
-sympa/bin/etc/mail_tt2/authorization_reject.tt2
-sympa/bin/etc/mail_tt2/bye.tt2
-sympa/bin/etc/mail_tt2/certif_warning.tt2
-sympa/bin/etc/mail_tt2/command_report.tt2
-sympa/bin/etc/mail_tt2/d_install_shared.tt2
-sympa/bin/etc/mail_tt2/d_reject_shared.tt2
-sympa/bin/etc/mail_tt2/digest.tt2
-sympa/bin/etc/mail_tt2/digest_plain.tt2
-sympa/bin/etc/mail_tt2/expire_deletion.tt2
-sympa/bin/etc/mail_tt2/expire_warning1.tt2
-sympa/bin/etc/mail_tt2/expire_warning2.tt2
-sympa/bin/etc/mail_tt2/get_archive.tt2
-sympa/bin/etc/mail_tt2/global_remind.tt2
-sympa/bin/etc/mail_tt2/helpfile.tt2
-sympa/bin/etc/mail_tt2/index_archive.tt2
-sympa/bin/etc/mail_tt2/info_report.tt2
-sympa/bin/etc/mail_tt2/invite.tt2
-sympa/bin/etc/mail_tt2/list_created.tt2
-sympa/bin/etc/mail_tt2/list_rejected.tt2
-sympa/bin/etc/mail_tt2/list_unknown.tt2
-sympa/bin/etc/mail_tt2/listeditor_notification.tt2
-sympa/bin/etc/mail_tt2/listmaster_notification.tt2
-sympa/bin/etc/mail_tt2/listowner_notification.tt2
-sympa/bin/etc/mail_tt2/lists.tt2
-sympa/bin/etc/mail_tt2/message_report.tt2
-sympa/bin/etc/mail_tt2/moderate.tt2
-sympa/bin/etc/mail_tt2/modindex.tt2
-sympa/bin/etc/mail_tt2/reject.tt2
-sympa/bin/etc/mail_tt2/remind.tt2
-sympa/bin/etc/mail_tt2/removed.tt2
-sympa/bin/etc/mail_tt2/request_auth.tt2
-sympa/bin/etc/mail_tt2/review.tt2
-sympa/bin/etc/mail_tt2/send_auth.tt2
-sympa/bin/etc/mail_tt2/sendpasswd.tt2
-sympa/bin/etc/mail_tt2/sendssopasswd.tt2
-sympa/bin/etc/mail_tt2/stats_report.tt2
-sympa/bin/etc/mail_tt2/summary.tt2
-sympa/bin/etc/mail_tt2/urlized_part.tt2
-sympa/bin/etc/mail_tt2/user_notification.tt2
-sympa/bin/etc/mail_tt2/welcome.tt2
-sympa/bin/etc/mail_tt2/which.tt2
-sympa/bin/etc/mail_tt2/x509-user-cert-missing.tt2
-sympa/bin/etc/mail_tt2/your_infected_msg.tt2
-sympa/bin/etc/mhonarc-ressources.tt2
-sympa/bin/etc/mime.types
-sympa/bin/etc/nrcpt_by_domain.conf
-sympa/bin/etc/scenari/access_web_archive.closed
-sympa/bin/etc/scenari/access_web_archive.intranet
-sympa/bin/etc/scenari/access_web_archive.listmaster
-sympa/bin/etc/scenari/access_web_archive.owner
-sympa/bin/etc/scenari/access_web_archive.private
-sympa/bin/etc/scenari/access_web_archive.public
-sympa/bin/etc/scenari/add.auth
-sympa/bin/etc/scenari/add.closed
-sympa/bin/etc/scenari/add.default
-sympa/bin/etc/scenari/add.owner
-sympa/bin/etc/scenari/add.owner_notify
-sympa/bin/etc/scenari/automatic_list_creation.public
-sympa/bin/etc/scenari/automatic_list_creation.listmaster
-sympa/bin/etc/crawlers_detection.conf
-sympa/bin/etc/scenari/create_list.intranet
-sympa/bin/etc/scenari/create_list.listmaster
-sympa/bin/etc/scenari/create_list.public_listmaster
-sympa/bin/etc/scenari/d_edit.default
-sympa/bin/etc/scenari/d_edit.editor
-sympa/bin/etc/scenari/d_edit.owner
-sympa/bin/etc/scenari/d_edit.private
-sympa/bin/etc/scenari/d_edit.private-https
-sympa/bin/etc/scenari/d_edit.public
-sympa/bin/etc/scenari/d_read.default
-sympa/bin/etc/scenari/d_read.owner
-sympa/bin/etc/scenari/d_read.private
-sympa/bin/etc/scenari/d_read.private-https
-sympa/bin/etc/scenari/d_read.public
-sympa/bin/etc/scenari/del.auth
-sympa/bin/etc/scenari/del.closed
-sympa/bin/etc/scenari/del.default
-sympa/bin/etc/scenari/del.owner
-sympa/bin/etc/scenari/del.owner_notify
-sympa/bin/etc/scenari/global_remind.listmaster
-sympa/bin/etc/scenari/info.default
-sympa/bin/etc/scenari/info.open
-sympa/bin/etc/scenari/info.private
-sympa/bin/etc/scenari/invite.closed
-sympa/bin/etc/scenari/invite.default
-sympa/bin/etc/scenari/invite.owner
-sympa/bin/etc/scenari/invite.private
-sympa/bin/etc/scenari/invite.public
-sympa/bin/etc/ldap_alias_manager.conf
-sympa/bin/etc/scenari/remind.default
-sympa/bin/etc/scenari/remind.listmaster
-sympa/bin/etc/scenari/remind.owner
-sympa/bin/etc/scenari/review.closed
-sympa/bin/etc/scenari/review.default
-sympa/bin/etc/scenari/review.intranet
-sympa/bin/etc/scenari/review.listmaster
-sympa/bin/etc/scenari/review.owner
-sympa/bin/etc/scenari/review.private
-sympa/bin/etc/scenari/review.public
-sympa/bin/etc/scenari/send.closed
-sympa/bin/etc/scenari/send.default
-sympa/bin/etc/scenari/send.editorkey
-sympa/bin/etc/scenari/send.editorkeyonly
-sympa/bin/etc/scenari/send.editorkeyonlyauth
-sympa/bin/etc/scenari/send.intranet
-sympa/bin/etc/scenari/send.intranetorprivate
-sympa/bin/etc/scenari/send.newsletter
-sympa/bin/etc/scenari/send.newsletterkeyonly
-sympa/bin/etc/scenari/send.private
-sympa/bin/etc/scenari/send.private_smime
-sympa/bin/etc/scenari/send.privateandeditorkey
-sympa/bin/etc/scenari/send.privateandnomultipartoreditorkey
-sympa/bin/etc/scenari/send.privatekey
-sympa/bin/etc/scenari/send.privatekeyandeditorkeyonly
-sympa/bin/etc/scenari/send.privateoreditorkey
-sympa/bin/etc/scenari/send.privateorpublickey
-sympa/bin/etc/scenari/send.public
-sympa/bin/etc/scenari/send.public_nobcc
-sympa/bin/etc/scenari/send.publickey
-sympa/bin/etc/scenari/send.publicnoattachment
-sympa/bin/etc/scenari/send.publicnomultipart
-sympa/bin/etc/scenari/subscribe.auth
-sympa/bin/etc/scenari/subscribe.auth_notify
-sympa/bin/etc/scenari/subscribe.auth_owner
-sympa/bin/etc/scenari/subscribe.closed
-sympa/bin/etc/scenari/subscribe.default
-sympa/bin/etc/scenari/subscribe.intranet
-sympa/bin/etc/scenari/subscribe.intranetorowner
-sympa/bin/etc/scenari/subscribe.open
-sympa/bin/etc/scenari/subscribe.open_notify
-sympa/bin/etc/scenari/subscribe.open_quiet
-sympa/bin/etc/scenari/subscribe.owner
-sympa/bin/etc/scenari/subscribe.smime
-sympa/bin/etc/scenari/subscribe.smimeorowner
-sympa/bin/etc/scenari/topics_visibility.conceal
-sympa/bin/etc/scenari/topics_visibility.default
-sympa/bin/etc/scenari/topics_visibility.identified
-sympa/bin/etc/scenari/topics_visibility.noconceal
-sympa/bin/etc/scenari/unsubscribe.auth
-sympa/bin/etc/scenari/unsubscribe.auth_notify
-sympa/bin/etc/scenari/unsubscribe.closed
-sympa/bin/etc/scenari/unsubscribe.default
-sympa/bin/etc/scenari/unsubscribe.open
-sympa/bin/etc/scenari/unsubscribe.open_notify
-sympa/bin/etc/scenari/unsubscribe.owner
-sympa/bin/etc/scenari/visibility.conceal
-sympa/bin/etc/scenari/visibility.default
-sympa/bin/etc/scenari/visibility.intranet
-sympa/bin/etc/scenari/visibility.noconceal
-sympa/bin/etc/scenari/visibility.secret
-sympa/bin/etc/sympa.wsdl
-sympa/bin/etc/topics.conf
-sympa/bin/etc/web_tt2/active_lists.tt2
-sympa/bin/etc/web_tt2/add_request.tt2
-sympa/bin/etc/web_tt2/admin.tt2
-sympa/bin/etc/web_tt2/admin_menu.tt2
-sympa/bin/etc/web_tt2/arc.tt2
-sympa/bin/etc/web_tt2/arc_manage.tt2
-sympa/bin/etc/web_tt2/arc_protect.tt2
-sympa/bin/etc/web_tt2/arcsearch.tt2
-sympa/bin/etc/web_tt2/arcsearch_form.tt2
-sympa/bin/etc/web_tt2/authorization_reject.tt2
-sympa/bin/etc/web_tt2/blacklist.tt2
-sympa/bin/etc/web_tt2/button_footer.tt2
-sympa/bin/etc/web_tt2/button_header.tt2
-sympa/bin/etc/web_tt2/change_email.tt2
-sympa/bin/etc/web_tt2/choosepasswd.tt2
-sympa/bin/etc/web_tt2/close_list.tt2
-sympa/bin/etc/web_tt2/compose_mail.tt2
-sympa/bin/etc/web_tt2/copy_template.tt2
-sympa/bin/etc/web_tt2/create_list.tt2
-sympa/bin/etc/web_tt2/create_list_request.tt2
-sympa/bin/etc/web_tt2/css.tt2
-sympa/bin/etc/web_tt2/d_control.tt2
-sympa/bin/etc/web_tt2/d_editfile.tt2
-sympa/bin/etc/web_tt2/d_install_shared.tt2
-sympa/bin/etc/web_tt2/d_properties.tt2
-sympa/bin/etc/web_tt2/d_read.tt2
-sympa/bin/etc/web_tt2/d_upload.tt2
-sympa/bin/etc/web_tt2/dump_scenario.tt2
-sympa/bin/etc/web_tt2/dumpvars.tt2
-sympa/bin/etc/web_tt2/edit_attributes.tt2
-sympa/bin/etc/web_tt2/edit_list_request.tt2
-sympa/bin/etc/web_tt2/edit_template.tt2
-sympa/bin/etc/web_tt2/editfile.tt2
-sympa/bin/etc/web_tt2/editsubscriber.tt2
-sympa/bin/etc/web_tt2/error.tt2
-sympa/bin/etc/web_tt2/footer.tt2
-sympa/bin/etc/web_tt2/get_closed_lists.tt2
-sympa/bin/etc/web_tt2/get_inactive_lists.tt2
-sympa/bin/etc/web_tt2/get_latest_lists.tt2
-sympa/bin/etc/web_tt2/get_pending_lists.tt2
-sympa/bin/etc/web_tt2/help.tt2
-sympa/bin/etc/web_tt2/help_admin.tt2
-sympa/bin/etc/web_tt2/help_arc.tt2
-sympa/bin/etc/web_tt2/help_editfile.tt2
-sympa/bin/etc/web_tt2/help_editlist.tt2
-sympa/bin/etc/web_tt2/help_faqadmin.tt2
-sympa/bin/etc/web_tt2/help_faquser.tt2
-sympa/bin/etc/web_tt2/help_introduction.tt2
-sympa/bin/etc/web_tt2/help_listconfig.tt2
-sympa/bin/etc/web_tt2/help_mail_commands.tt2
-sympa/bin/etc/web_tt2/help_sendmsg.tt2
-sympa/bin/etc/web_tt2/help_shared.tt2
-sympa/bin/etc/web_tt2/help_user.tt2
-sympa/bin/etc/web_tt2/help_user_options.tt2
-sympa/bin/etc/web_tt2/home.tt2
-sympa/bin/etc/web_tt2/info.tt2
-sympa/bin/etc/web_tt2/install_pending_list.tt2
-sympa/bin/etc/web_tt2/javascript.tt2
-sympa/bin/etc/web_tt2/latest_arc.tt2
-sympa/bin/etc/web_tt2/latest_d_read.tt2
-sympa/bin/etc/web_tt2/latest_lists.tt2
-sympa/bin/etc/web_tt2/list_admin_menu.tt2
-sympa/bin/etc/web_tt2/list_button_footer.tt2
-sympa/bin/etc/web_tt2/list_button_header.tt2
-sympa/bin/etc/web_tt2/list_menu.tt2
-sympa/bin/etc/web_tt2/list_panel.tt2
-sympa/bin/etc/web_tt2/lists.tt2
-sympa/bin/etc/web_tt2/login.tt2
-sympa/bin/etc/web_tt2/login_menu.tt2
-sympa/bin/etc/web_tt2/loginbanner.tt2
-sympa/bin/etc/web_tt2/loginrequest.tt2
-sympa/bin/etc/web_tt2/ls_templates.tt2
-sympa/bin/etc/web_tt2/main.tt2
-sympa/bin/etc/web_tt2/maintenance.tt2
-sympa/bin/etc/web_tt2/menu.tt2
-sympa/bin/etc/web_tt2/modindex.tt2
-sympa/bin/etc/web_tt2/notice.tt2
-sympa/bin/etc/web_tt2/picture_upload.tt2
-sympa/bin/etc/web_tt2/pref.tt2
-sympa/bin/etc/web_tt2/remindpasswd.tt2
-sympa/bin/etc/web_tt2/remove_arc.tt2
-sympa/bin/etc/web_tt2/rename_list_request.tt2
-sympa/bin/etc/web_tt2/request_topic.tt2
-sympa/bin/etc/web_tt2/review.tt2
-sympa/bin/etc/web_tt2/review_family.tt2
-sympa/bin/etc/web_tt2/reviewbouncing.tt2
-sympa/bin/etc/web_tt2/rss.tt2
-sympa/bin/etc/web_tt2/rss_request.tt2
-sympa/bin/etc/web_tt2/scenario_test.tt2
-sympa/bin/etc/web_tt2/search.tt2
-sympa/bin/etc/web_tt2/search_list.tt2
-sympa/bin/etc/web_tt2/search_user.tt2
-sympa/bin/etc/web_tt2/serveradmin.tt2
-sympa/bin/etc/web_tt2/set_pending_list_request.tt2
-sympa/bin/etc/web_tt2/setlang.tt2
-sympa/bin/etc/web_tt2/show_cert.tt2
-sympa/bin/etc/web_tt2/show_sessions.tt2
-sympa/bin/etc/web_tt2/sigrequest.tt2
-sympa/bin/etc/web_tt2/skinsedit.tt2
-sympa/bin/etc/web_tt2/sso_login.tt2
-sympa/bin/etc/web_tt2/stats.tt2
-sympa/bin/etc/web_tt2/subindex.tt2
-sympa/bin/etc/web_tt2/suboptions.tt2
-sympa/bin/etc/web_tt2/subrequest.tt2
-sympa/bin/etc/web_tt2/title.tt2
-sympa/bin/etc/web_tt2/tt2_error.tt2
-sympa/bin/etc/web_tt2/view_template.tt2
-sympa/bin/etc/web_tt2/viewbounce.tt2
-sympa/bin/etc/web_tt2/viewlogs.tt2
-sympa/bin/etc/web_tt2/viewmod.tt2
-sympa/bin/etc/web_tt2/which.tt2
-sympa/bin/etc/web_tt2/your_lists.tt2
 sympa/bin/familyqueue
 sympa/bin/init_comment.pl
 sympa/bin/ldap_alias_manager.pl
@@ -407,42 +137,365 @@ sympa/bin/mail.pm
 sympa/bin/mod2html.pl
 sympa/bin/mysql_alias_manager.pl
 sympa/bin/p12topem.pl
-sympa/bin/parser.pl
 sympa/bin/queue
 sympa/bin/report.pm
 sympa/bin/sympa.pl
 sympa/bin/sympa_soap_client.pl
-sympa/bin/sympa_soap_server.fcgi
-sympa/bin/sympa_soap_server-wrapper.fcgi
 sympa/bin/sympa_wizard.pl
 sympa/bin/sympasoap.pm
 sympa/bin/task_manager.pl
 sympa/bin/testldap.pl
 sympa/bin/testlogs.pl
-sympa/bin/time_utils.pl
-sympa/bin/tools.pl
+sympa/bin/time_utils.pm
+sympa/bin/tools.pm
 sympa/bin/tpl2tt2.pl
-sympa/bin/tt2.pl
+sympa/bin/tt2.pm
 sympa/bin/virtualwrapper
 sympa/bin/wwslib.pm
-sympa/bin/wwsympa.fcgi
-sympa/bin/wwsympa-wrapper.fcgi
-sympa/bin/wwsympa_sudo_wrapper.pl
+sympa/default/auth.conf
+sympa/default/ca-bundle.crt
+sympa/default/charset.conf
+sympa/default/crawlers_detection.conf
+sympa/default/create_list.conf
+sympa/default/create_list_templates/discussion_list/comment.tt2
+sympa/default/create_list_templates/discussion_list/config.tt2
+sympa/default/create_list_templates/hotline/comment.tt2
+sympa/default/create_list_templates/hotline/config.tt2
+sympa/default/create_list_templates/html-news-letter/comment.tt2
+sympa/default/create_list_templates/html-news-letter/config.tt2
+sympa/default/create_list_templates/intranet_list/comment.tt2
+sympa/default/create_list_templates/intranet_list/config.tt2
+sympa/default/create_list_templates/news-letter/comment.tt2
+sympa/default/create_list_templates/news-letter/config.tt2
+sympa/default/create_list_templates/private_working_group/comment.tt2
+sympa/default/create_list_templates/private_working_group/config.tt2
+sympa/default/create_list_templates/public_web_forum/comment.tt2
+sympa/default/create_list_templates/public_web_forum/config.tt2
+sympa/default/edit_list.conf
+sympa/default/families/sample-auto/config.tt2
+sympa/default/families/sample-auto/param_constraint.conf
+sympa/default/global_task_models/chk_cert_expiration.daily.task
+sympa/default/global_task_models/crl_update.daily.task
+sympa/default/global_task_models/eval_bouncers.daily.task
+sympa/default/global_task_models/expire_bounce.daily.task
+sympa/default/global_task_models/process_bouncers.weekly.task
+sympa/default/global_task_models/purge_logs_table.daily.task
+sympa/default/global_task_models/purge_one_time_ticket_table.daily.task
+sympa/default/global_task_models/purge_orphan_bounces.monthly.task
+sympa/default/global_task_models/purge_session_table.daily.task
+sympa/default/global_task_models/purge_tables.daily.task
+sympa/default/global_task_models/purge_user_table.monthly.task
+sympa/default/ldap_alias_entry.tt2
+sympa/default/ldap_alias_manager.conf
+sympa/default/list_aliases.tt2
+sympa/default/list_task_models/expire.yearly.task
+sympa/default/list_task_models/remind.2month.task
+sympa/default/list_task_models/remind.monthly.task
+sympa/default/list_task_models/remind.yearly.task
+sympa/default/list_task_models/sync_include.ttl.task
+sympa/default/mail_tt2/authorization_reject.tt2
+sympa/default/mail_tt2/bye.tt2
+sympa/default/mail_tt2/certif_warning.tt2
+sympa/default/mail_tt2/command_report.tt2
+sympa/default/mail_tt2/d_install_shared.tt2
+sympa/default/mail_tt2/d_reject_shared.tt2
+sympa/default/mail_tt2/digest.tt2
+sympa/default/mail_tt2/digest_plain.tt2
+sympa/default/mail_tt2/expire_deletion.tt2
+sympa/default/mail_tt2/expire_warning1.tt2
+sympa/default/mail_tt2/expire_warning2.tt2
+sympa/default/mail_tt2/get_archive.tt2
+sympa/default/mail_tt2/global_remind.tt2
+sympa/default/mail_tt2/helpfile.tt2
+sympa/default/mail_tt2/index_archive.tt2
+sympa/default/mail_tt2/info_report.tt2
+sympa/default/mail_tt2/invite.tt2
+sympa/default/mail_tt2/list_created.tt2
+sympa/default/mail_tt2/list_rejected.tt2
+sympa/default/mail_tt2/list_unknown.tt2
+sympa/default/mail_tt2/listeditor_notification.tt2
+sympa/default/mail_tt2/listmaster_notification.tt2
+sympa/default/mail_tt2/listowner_notification.tt2
+sympa/default/mail_tt2/lists.tt2
+sympa/default/mail_tt2/message_report.tt2
+sympa/default/mail_tt2/moderate.tt2
+sympa/default/mail_tt2/modindex.tt2
+sympa/default/mail_tt2/reject.tt2
+sympa/default/mail_tt2/remind.tt2
+sympa/default/mail_tt2/removed.tt2
+sympa/default/mail_tt2/request_auth.tt2
+sympa/default/mail_tt2/review.tt2
+sympa/default/mail_tt2/send_auth.tt2
+sympa/default/mail_tt2/sendpasswd.tt2
+sympa/default/mail_tt2/sendssopasswd.tt2
+sympa/default/mail_tt2/stats_report.tt2
+sympa/default/mail_tt2/summary.tt2
+sympa/default/mail_tt2/urlized_part.tt2
+sympa/default/mail_tt2/user_notification.tt2
+sympa/default/mail_tt2/welcome.tt2
+sympa/default/mail_tt2/which.tt2
+sympa/default/mail_tt2/x509-user-cert-missing.tt2
+sympa/default/mail_tt2/your_infected_msg.tt2
+sympa/default/mhonarc-ressources.tt2
+sympa/default/mime.types
+sympa/default/nrcpt_by_domain.conf
+sympa/default/scenari/access_web_archive.closed
+sympa/default/scenari/access_web_archive.intranet
+sympa/default/scenari/access_web_archive.listmaster
+sympa/default/scenari/access_web_archive.owner
+sympa/default/scenari/access_web_archive.private
+sympa/default/scenari/access_web_archive.public
+sympa/default/scenari/add.auth
+sympa/default/scenari/add.closed
+sympa/default/scenari/add.default
+sympa/default/scenari/add.owner
+sympa/default/scenari/add.owner_notify
+sympa/default/scenari/automatic_list_creation.listmaster
+sympa/default/scenari/automatic_list_creation.public
+sympa/default/scenari/create_list.intranet
+sympa/default/scenari/create_list.listmaster
+sympa/default/scenari/create_list.public_listmaster
+sympa/default/scenari/d_edit.default
+sympa/default/scenari/d_edit.editor
+sympa/default/scenari/d_edit.owner
+sympa/default/scenari/d_edit.private
+sympa/default/scenari/d_edit.private-https
+sympa/default/scenari/d_edit.public
+sympa/default/scenari/d_read.default
+sympa/default/scenari/d_read.owner
+sympa/default/scenari/d_read.private
+sympa/default/scenari/d_read.private-https
+sympa/default/scenari/d_read.public
+sympa/default/scenari/del.auth
+sympa/default/scenari/del.closed
+sympa/default/scenari/del.default
+sympa/default/scenari/del.owner
+sympa/default/scenari/del.owner_notify
+sympa/default/scenari/global_remind.listmaster
+sympa/default/scenari/info.default
+sympa/default/scenari/info.open
+sympa/default/scenari/info.private
+sympa/default/scenari/invite.closed
+sympa/default/scenari/invite.default
+sympa/default/scenari/invite.owner
+sympa/default/scenari/invite.private
+sympa/default/scenari/invite.public
+sympa/default/scenari/remind.default
+sympa/default/scenari/remind.listmaster
+sympa/default/scenari/remind.owner
+sympa/default/scenari/review.closed
+sympa/default/scenari/review.default
+sympa/default/scenari/review.intranet
+sympa/default/scenari/review.listmaster
+sympa/default/scenari/review.owner
+sympa/default/scenari/review.private
+sympa/default/scenari/review.public
+sympa/default/scenari/send.closed
+sympa/default/scenari/send.default
+sympa/default/scenari/send.editorkey
+sympa/default/scenari/send.editorkeyonly
+sympa/default/scenari/send.editorkeyonlyauth
+sympa/default/scenari/send.intranet
+sympa/default/scenari/send.intranetorprivate
+sympa/default/scenari/send.newsletter
+sympa/default/scenari/send.newsletterkeyonly
+sympa/default/scenari/send.private
+sympa/default/scenari/send.private_smime
+sympa/default/scenari/send.privateandeditorkey
+sympa/default/scenari/send.privateandnomultipartoreditorkey
+sympa/default/scenari/send.privatekey
+sympa/default/scenari/send.privatekeyandeditorkeyonly
+sympa/default/scenari/send.privateoreditorkey
+sympa/default/scenari/send.privateorpublickey
+sympa/default/scenari/send.public
+sympa/default/scenari/send.public_nobcc
+sympa/default/scenari/send.publickey
+sympa/default/scenari/send.publicnoattachment
+sympa/default/scenari/send.publicnomultipart
+sympa/default/scenari/spam_status.x-spam-status
+sympa/default/scenari/subscribe.auth
+sympa/default/scenari/subscribe.auth_notify
+sympa/default/scenari/subscribe.auth_owner
+sympa/default/scenari/subscribe.closed
+sympa/default/scenari/subscribe.default
+sympa/default/scenari/subscribe.intranet
+sympa/default/scenari/subscribe.intranetorowner
+sympa/default/scenari/subscribe.open
+sympa/default/scenari/subscribe.open_notify
+sympa/default/scenari/subscribe.open_quiet
+sympa/default/scenari/subscribe.owner
+sympa/default/scenari/subscribe.smime
+sympa/default/scenari/subscribe.smimeorowner
+sympa/default/scenari/topics_visibility.conceal
+sympa/default/scenari/topics_visibility.default
+sympa/default/scenari/topics_visibility.identified
+sympa/default/scenari/topics_visibility.noconceal
+sympa/default/scenari/unsubscribe.auth
+sympa/default/scenari/unsubscribe.auth_notify
+sympa/default/scenari/unsubscribe.closed
+sympa/default/scenari/unsubscribe.default
+sympa/default/scenari/unsubscribe.open
+sympa/default/scenari/unsubscribe.open_notify
+sympa/default/scenari/unsubscribe.owner
+sympa/default/scenari/visibility.conceal
+sympa/default/scenari/visibility.default
+sympa/default/scenari/visibility.intranet
+sympa/default/scenari/visibility.noconceal
+sympa/default/scenari/visibility.secret
+sympa/default/sympa.wsdl
+sympa/default/topics.conf
+sympa/default/web_tt2/active_lists.tt2
+sympa/default/web_tt2/add_request.tt2
+sympa/default/web_tt2/admin.tt2
+sympa/default/web_tt2/admin_menu.tt2
+sympa/default/web_tt2/arc.tt2
+sympa/default/web_tt2/arc_manage.tt2
+sympa/default/web_tt2/arc_protect.tt2
+sympa/default/web_tt2/arcsearch.tt2
+sympa/default/web_tt2/arcsearch_form.tt2
+sympa/default/web_tt2/authorization_reject.tt2
+sympa/default/web_tt2/auto_signoff.tt2
+sympa/default/web_tt2/blacklist.tt2
+sympa/default/web_tt2/button_footer.tt2
+sympa/default/web_tt2/button_header.tt2
+sympa/default/web_tt2/ca.tt2
+sympa/default/web_tt2/change_email.tt2
+sympa/default/web_tt2/change_email_request.tt2
+sympa/default/web_tt2/choosepasswd.tt2
+sympa/default/web_tt2/close_list.tt2
+sympa/default/web_tt2/compose_mail.tt2
+sympa/default/web_tt2/copy_template.tt2
+sympa/default/web_tt2/create_list.tt2
+sympa/default/web_tt2/create_list_request.tt2
+sympa/default/web_tt2/css.tt2
+sympa/default/web_tt2/css_ie.tt2
+sympa/default/web_tt2/d_control.tt2
+sympa/default/web_tt2/d_editfile.tt2
+sympa/default/web_tt2/d_install_shared.tt2
+sympa/default/web_tt2/d_properties.tt2
+sympa/default/web_tt2/d_read.tt2
+sympa/default/web_tt2/d_upload.tt2
+sympa/default/web_tt2/dump_scenario.tt2
+sympa/default/web_tt2/dumpvars.tt2
+sympa/default/web_tt2/edit_attributes.tt2
+sympa/default/web_tt2/edit_config.tt2
+sympa/default/web_tt2/edit_list_request.tt2
+sympa/default/web_tt2/edit_template.tt2
+sympa/default/web_tt2/editfile.tt2
+sympa/default/web_tt2/editsubscriber.tt2
+sympa/default/web_tt2/error.tt2
+sympa/default/web_tt2/footer.tt2
+sympa/default/web_tt2/get_closed_lists.tt2
+sympa/default/web_tt2/get_inactive_lists.tt2
+sympa/default/web_tt2/get_latest_lists.tt2
+sympa/default/web_tt2/get_pending_lists.tt2
+sympa/default/web_tt2/help.tt2
+sympa/default/web_tt2/help_admin.tt2
+sympa/default/web_tt2/help_arc.tt2
+sympa/default/web_tt2/help_editfile.tt2
+sympa/default/web_tt2/help_editlist.tt2
+sympa/default/web_tt2/help_faqadmin.tt2
+sympa/default/web_tt2/help_faquser.tt2
+sympa/default/web_tt2/help_introduction.tt2
+sympa/default/web_tt2/help_listconfig.tt2
+sympa/default/web_tt2/help_mail_commands.tt2
+sympa/default/web_tt2/help_sendmsg.tt2
+sympa/default/web_tt2/help_shared.tt2
+sympa/default/web_tt2/help_user.tt2
+sympa/default/web_tt2/help_user_options.tt2
+sympa/default/web_tt2/home.tt2
+sympa/default/web_tt2/info.tt2
+sympa/default/web_tt2/install_pending_list.tt2
+sympa/default/web_tt2/javascript.tt2
+sympa/default/web_tt2/latest_arc.tt2
+sympa/default/web_tt2/latest_d_read.tt2
+sympa/default/web_tt2/latest_lists.tt2
+sympa/default/web_tt2/lca.tt2
+sympa/default/web_tt2/list_button_footer.tt2
+sympa/default/web_tt2/list_button_header.tt2
+sympa/default/web_tt2/list_menu.tt2
+sympa/default/web_tt2/list_panel.tt2
+sympa/default/web_tt2/lists.tt2
+sympa/default/web_tt2/login.tt2
+sympa/default/web_tt2/login_menu.tt2
+sympa/default/web_tt2/loginbanner.tt2
+sympa/default/web_tt2/loginrequest.tt2
+sympa/default/web_tt2/ls_templates.tt2
+sympa/default/web_tt2/main.tt2
+sympa/default/web_tt2/maintenance.tt2
+sympa/default/web_tt2/manage_template.tt2
+sympa/default/web_tt2/menu.tt2
+sympa/default/web_tt2/menu_search.tt2
+sympa/default/web_tt2/modindex.tt2
+sympa/default/web_tt2/nav.tt2
+sympa/default/web_tt2/notice.tt2
+sympa/default/web_tt2/picture_upload.tt2
+sympa/default/web_tt2/pref.tt2
+sympa/default/web_tt2/remove_arc.tt2
+sympa/default/web_tt2/rename_list_request.tt2
+sympa/default/web_tt2/renewpasswd.tt2
+sympa/default/web_tt2/request_topic.tt2
+sympa/default/web_tt2/requestpasswd.tt2
+sympa/default/web_tt2/review.tt2
+sympa/default/web_tt2/review_family.tt2
+sympa/default/web_tt2/reviewbouncing.tt2
+sympa/default/web_tt2/rss.tt2
+sympa/default/web_tt2/rss_request.tt2
+sympa/default/web_tt2/scenario_test.tt2
+sympa/default/web_tt2/search.tt2
+sympa/default/web_tt2/search_list.tt2
+sympa/default/web_tt2/search_user.tt2
+sympa/default/web_tt2/serveradmin.tt2
+sympa/default/web_tt2/set_pending_list_request.tt2
+sympa/default/web_tt2/setlang.tt2
+sympa/default/web_tt2/show_cert.tt2
+sympa/default/web_tt2/show_exclude.tt2
+sympa/default/web_tt2/show_sessions.tt2
+sympa/default/web_tt2/sigrequest.tt2
+sympa/default/web_tt2/skinsedit.tt2
+sympa/default/web_tt2/sso_login.tt2
+sympa/default/web_tt2/stats.tt2
+sympa/default/web_tt2/subindex.tt2
+sympa/default/web_tt2/suboptions.tt2
+sympa/default/web_tt2/subrequest.tt2
+sympa/default/web_tt2/subscriber_table.tt2
+sympa/default/web_tt2/suspend_request.tt2
+sympa/default/web_tt2/ticket.tt2
+sympa/default/web_tt2/title.tt2
+sympa/default/web_tt2/tt2_error.tt2
+sympa/default/web_tt2/view_template.tt2
+sympa/default/web_tt2/viewbounce.tt2
+sympa/default/web_tt2/viewlogs.tt2
+sympa/default/web_tt2/viewmod.tt2
+sympa/default/web_tt2/which.tt2
+sympa/default/web_tt2/your_lists.tt2
+sympa/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi
+sympa/libexec/cgi-bin/sympa_soap_server.fcgi
+sympa/libexec/cgi-bin/wwsympa-wrapper.fcgi
+sympa/libexec/cgi-bin/wwsympa.fcgi
 sympa/static_content/icons/back.png
 sympa/static_content/icons/begin.png
 sympa/static_content/icons/binary.png
+sympa/static_content/icons/crosshairs.png
 sympa/static_content/icons/down.png
 sympa/static_content/icons/end.png
+sympa/static_content/icons/favicon_sympa.png
 sympa/static_content/icons/folder.open.png
 sympa/static_content/icons/folder.png
+sympa/static_content/icons/h.png
 sympa/static_content/icons/image2.png
+sympa/static_content/icons/junk.png
 sympa/static_content/icons/left.png
 sympa/static_content/icons/link.png
 sympa/static_content/icons/locked.png
 sympa/static_content/icons/logo-s-lock.png
 sympa/static_content/icons/logo-s.png
+sympa/static_content/icons/logo_sympa.png
 sympa/static_content/icons/movie.png
+sympa/static_content/icons/position.png
 sympa/static_content/icons/right.png
 sympa/static_content/icons/sound1.png
+sympa/static_content/icons/sv.png
 sympa/static_content/icons/text.png
+sympa/static_content/icons/top.png
 sympa/static_content/icons/unknown.png
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 0ccf738b752..1e9a99bc1ea 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.12 2011/06/19 13:50:57 bouyer Exp $
+$NetBSD: distinfo,v 1.12.8.1 2012/05/21 15:51:48 tron Exp $
 
-SHA1 (sympa-5.4.4.tar.gz) = 673d3a031ef2718ed234ce0814ad1d0083883919
-RMD160 (sympa-5.4.4.tar.gz) = fb0b61ac3a56981ac7f44a1863504be937e4f4b5
-Size (sympa-5.4.4.tar.gz) = 6523229 bytes
-SHA1 (patch-aa) = 8db2096214d667d5bada0ffb97994be9e0891547
-SHA1 (patch-ab) = 404ce642a733ef7922f58613c56f449f75641a9a
-SHA1 (patch-ac) = 77802bab188da024c18810c07bf62064b28e3af1
-SHA1 (patch-af) = ba9888ed1eed387f7758946aaeeaa5f408c2d760
-SHA1 (patch-ag) = 97af077204f004945619d9a457e03430df1e2642
-SHA1 (patch-ah) = 6a0b34ef49a7d68ac996251adee14ef29519f92d
-SHA1 (patch-ai) = 5c209365e8ec7dbd35325507f413aa7660cf47d4
-SHA1 (patch-aj) = 639241f48effabc49d46a23f255a33cb51404d44
+SHA1 (sympa-6.1.11.tar.gz) = c4a175ad4af894262d83d39cfc148e0037d883e9
+RMD160 (sympa-6.1.11.tar.gz) = 4398d67353b2c6460b86892afa0bd417498eff9c
+Size (sympa-6.1.11.tar.gz) = 7547265 bytes
+SHA1 (patch-aa) = c28355fd3fcc0cff74bdbf73859c1b9d0741e8df
+SHA1 (patch-ab) = c13e973fa3bc92f450aee00fad1553e003080c96
+SHA1 (patch-ac) = 87527936892090b310919ca55576aaeba795cb3b
+SHA1 (patch-af) = 901f6ddf04dffccc3b148c2465a23de6cd57f832
diff --git a/mail/sympa/files/bulk.sh b/mail/sympa/files/bulk.sh
new file mode 100644
index 00000000000..eeb648ab2cf
--- /dev/null
+++ b/mail/sympa/files/bulk.sh
@@ -0,0 +1,22 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: bulk.sh,v 1.1.2.2 2012/05/21 15:51:48 tron Exp $
+#
+# PROVIDE: bulk
+# REQUIRE: sympa
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="bulk"
+rcvar=$name
+command="@PREFIX@/sympa/bin/bulk.pl"
+pidfile="/var/sympa/run/bulk.pid"
+command_interpreter="@PREFIX@/bin/perl"
+sympa_user="sympa"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/sympa/patches/patch-aa b/mail/sympa/patches/patch-aa
index aff3cb9df35..9f5a08c81a7 100644
--- a/mail/sympa/patches/patch-aa
+++ b/mail/sympa/patches/patch-aa
@@ -1,58 +1,58 @@
-$NetBSD: patch-aa,v 1.5 2008/04/27 17:06:40 bouyer Exp $
+$NetBSD: patch-aa,v 1.5.36.1 2012/05/21 15:51:48 tron Exp $
 
---- Makefile.in.orig	2007-12-05 16:37:14.000000000 +0100
-+++ Makefile.in	2008-04-27 15:16:02.000000000 +0200
-@@ -508,7 +508,7 @@
- 	@CVS2CL@
- #endif
- 
--all:	warning checkperl checkcpan sources wrapper soap_wrapper man locale
-+all:	sources wrapper soap_wrapper man locale
- 
- rpm: build_rh_rpm build_mdk_rpm
- 
-@@ -612,7 +612,7 @@
- 	$(MAKE) PERL='${PERL}' clean) || exit 1; \
- 	done;
+--- Makefile.in.orig	2011-08-25 16:48:08.000000000 +0200
++++ Makefile.in	2012-02-24 20:06:42.000000000 +0100
+@@ -635,35 +635,30 @@
+ 			echo "Creating $(DESTDIR)$$dir"; \
+ 			install -d -m 755 $(DESTDIR)$$dir; \
+ 		fi; \
+-		chown $(USER) $(DESTDIR)$$dir || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
++		chown $(USER) $(DESTDIR)$$dir || true; \
++		chgrp $(GROUP) $(DESTDIR)$$dir || true; \
+ 	done
  
--install: importantchanges installdir installsrc installwws installwebtt2 installmailtt2 installlocale installman installscript installsample installconfig installdoc installsoap nextstep
-+install: importantchanges installdir installsrc installwws installwebtt2 installmailtt2 installlocale installman installscript installsample installdoc installsoap nextstep
+ installconfig: installdir
+ 	@echo "Installing basic configuration ..."
+ 	export PERL5LIB=$(DESTDIR)$(modulesdir); \
+-	if [ ! -f  $(DESTDIR)$(confdir)/sympa.conf ]; 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; \
+-		$(DESTDIR)$(sbindir)/sympa_wizard.pl \
+-			--create sympa.conf \
+-			--target $(DESTDIR)$(confdir)/sympa.conf \
+-			|| /bin/true; \
+-		$(DESTDIR)$(sbindir)/sympa_wizard.pl \
+-			--create wwsympa.conf \
+-			--target $(DESTDIR)$(confdir)/wwsympa.conf \
+-			|| /bin/true; \
++	if [ ! -d $(DESTDIR)$(prefix)/share/examples/sympa ]; then \
++		$(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/share/examples/sympa; \
+ 	fi; \
+-	if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; 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; \
+-	fi
++	$(DESTDIR)$(sbindir)/sympa_wizard.pl \
++		--create sympa.conf \
++		--target $(DESTDIR)$(prefix)/share/examples/sympa/sympa.conf \
++		|| true; \
++	$(DESTDIR)$(sbindir)/sympa_wizard.pl \
++		--create wwsympa.conf \
++		--target $(DESTDIR)$(prefix)/share/examples/sympa/wwsympa.conf \
++		|| true; \
++	cd $(DESTDIR)$(prefix)/share/examples/sympa; \
++	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 || true; \
++	chgrp $(GROUP) data_structure.version || true;
  
  nextstep: 
  	@echo ""
-@@ -751,7 +751,7 @@
- 
- installdir:
- 	@echo "Creating required directories"
--	@for dir in $(DIR) $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) $(ETCDIR) $(BINDIR) $(LOCALEDIR) $(DOCDIR) $(DIR)/static_content $(DIR)/static_content/icons ; do \
-+	@for dir in $(DIR) $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) $(ETCDIR) $(BINDIR) $(LOCALEDIR) $(DOCDIR) $(DIR)/sympa/static_content $(DIR)/sympa/static_content/icons ; do \
- 		if [ ! -d $(DESTDIR)$$dir ] ; then \
- 			echo "Creating $(DESTDIR)$$dir"; \
- 			mkdir -p $(DESTDIR)$$dir; \
-@@ -760,7 +760,7 @@
- 			chmod 755 $(DESTDIR)$$dir; \
- 		fi \
- 	done
--	@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
-+	@if  false; then \
- 	echo "First installation : installing conf directories..."; \
- 	for dir in create_list_templates mail_tt2 web_tt2 scenari \
- 	task_models general_task_models; do \
-@@ -783,7 +783,7 @@
- 		$(PERL) ./subst.pl src/etc/README_etc \
- 	) \
- 	fi
--	@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
-+	@if false; then \
- 	echo "First installation : installing spool directories..."; \
- 	for dir in $(SPOOLDIR) $(SPOOLDIR)/msg $(SPOOLDIR)/digest $(SPOOLDIR)/moderation \
- 	$(SPOOLDIR)/expire $(SPOOLDIR)/auth $(SPOOLDIR)/outgoing $(SPOOLDIR)/tmp \
-@@ -797,7 +797,7 @@
- 		fi \
- 	done \
- 	fi
--	@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
-+	@if false ; then \
- 	echo "First installation : creating archives and bounce directories..."; \
- 	for dir in bounce arc ; do \
- 		if [ ! -d $(DESTDIR)$(DIR)/$$dir ] ; then \
diff --git a/mail/sympa/patches/patch-ab b/mail/sympa/patches/patch-ab
index b9b54899280..955084e91a6 100644
--- a/mail/sympa/patches/patch-ab
+++ b/mail/sympa/patches/patch-ab
@@ -1,69 +1,74 @@
-$NetBSD: patch-ab,v 1.4 2008/04/27 17:06:40 bouyer Exp $
+$NetBSD: patch-ab,v 1.4.36.1 2012/05/21 15:51:48 tron Exp $
 
---- check_perl_modules.pl.orig	2008-03-27 17:41:49.000000000 +0100
-+++ check_perl_modules.pl	2008-04-27 14:20:25.000000000 +0200
-@@ -180,69 +180,7 @@
+--- src/sympa_wizard.pl.in.orig	2012-02-08 18:02:11.000000000 +0100
++++ src/sympa_wizard.pl.in	2012-02-08 18:02:42.000000000 +0100
+@@ -662,72 +662,5 @@
  # Install a CPAN module
  ##----------------------
  sub install_module {
--    my ($module, $options) = @_;
+-#    my ($module, $options, $opt_features) = @_;
+-  my ($module, $options, $cpan_modules) = @_;
 -
 -    my $default = $options->{'default'};
 -
 -    unless ($ENV{'FTP_PASSIVE'} eq 1) {
--	$ENV{'FTP_PASSIVE'} = 1;
--	print "Setting FTP Passive mode\n";
+-        $ENV{'FTP_PASSIVE'} = 1;
+-        print "Setting FTP Passive mode\n";
 -    }
 -
 -    ## This is required on RedHat 9 for DBD::mysql installation
 -    my $lang = $ENV{'LANG'};
 -    $ENV{'LANG'} = 'C' if ($ENV{'LANG'} =~ /UTF\-8/);
 -
--    unless ($> == 0) {
--	print "\#\# You need root privileges to install $module module. \#\#\n";
--	print "\#\# Press the Enter key to continue checking modules. \#\#\n";
--	my $t = <STDIN>;
--	return undef;
+-    unless ($EUID == 0) {
+-        print "\#\# You need root privileges to install $module module. \#\#\n";
+-        print "\#\# Press the Enter key to continue checking modules. \#\#\n";
+-        my $t = <STDIN>;
+-        return undef;
 -    }
 -
 -    unless ($options->{'force'}) {
--	printf "Description: %s\n", $opt_features{$module};
--	print "Install module $module ? [$default]";
--	my $answer = <STDIN>; chomp $answer;
--	$answer ||= $default;
--	return unless ($answer =~ /^y$/i);
+-        printf "-> Usage of this module: %s\n", $cpan_modules->{$module}{usage} if ($cpan_modules->{$module}{usage});
+-        printf "-> Prerequisites: %s\n", $cpan_modules->{$module}{prerequisites} if ($cpan_modules->{$module}{prerequisites});
+-	printf "-> Install module $module ? [$default]";
+-        my $answer = <STDIN>; chomp $answer;
+-        $answer ||= $default;
+-        return unless ($answer =~ /^y$/i);
 -    }
--    
--    $CPAN::Config->{'inactivity_timeout'} = 4;
--    $CPAN::Config->{'colorize_output'} = 1;
+-
+-  $CPAN::Config->{'inactivity_timeout'} = 0; ## disable timeout to prevent timeout during modules installation 
+-  $CPAN::Config->{'colorize_output'} = 1; 
+-  $CPAN::Config->{'build_requires_install_policy'} = 'yes';  ## automatically installed prerequisites without asking
+-  $CPAN::Config->{'prerequisites_policy'} = 'follow'; ## build prerequisites automatically
+-  $CPAN::Config->{'load_module_verbosity'} = 'none';  ## minimum verbosity during module loading
+-  $CPAN::Config->{'tar_verbosity'} = 'none';  ## minimum verbosity with tar command
 -
 -    #CPAN::Shell->clean($module) if ($options->{'force'});
 -
 -    CPAN::Shell->make($module);
--    
+-
 -    if ($options->{'force'}) {
--	CPAN::Shell->force('test', $module);
--      }else {
--	  CPAN::Shell->test($module);
--      }
--    
+-        CPAN::Shell->force('test', $module);
+-    }else {
+-        CPAN::Shell->test($module);
+-    }
 -
 -    CPAN::Shell->install($module); ## Could use CPAN::Shell->force('install') if make test failed
 -
 -    ## Check if module has been successfuly installed
--    unless (&test_module($module) == 1) {
+-    unless (eval "require $module") {
 -
--	## Prevent recusive calls if already in force mode
--	if ($options->{'force'}) {
--	    print  "Installation of $module still FAILED. You should download the tar.gz from http://search.cpan.org and install it manually.";
--	    my $answer = <STDIN>;
--	}else {
--	    print  "Installation of $module FAILED. Do you want to force the installation of this module? (y/N) ";
--	    my $answer = <STDIN>; chomp $answer;
--	    if ($answer =~ /^y/i) {
--		&install_module($module, {'force' => 1});
--	    }
--	}
+-        ## Prevent recusive calls if already in force mode
+-        if ($options->{'force'}) {
+-            print  "Installation of $module still FAILED. You should download the tar.gz from http://search.cpan.org and install it manually.";
+-            my $answer = <STDIN>;
+-        }else {
+-            print  "Installation of $module FAILED. Do you want to force the installation of this module? (y/N) ";
+-            my $answer = <STDIN>; chomp $answer;
+-            if ($answer =~ /^y/i) {
+-                install_module($module, {'force' => 1}, $cpan_modules);
+-            }
+-        }
 -    }
 -
 -    ## Restore lang
@@ -71,5 +76,3 @@ $NetBSD: patch-ab,v 1.4 2008/04/27 17:06:40 bouyer Exp $
 -
 +	1;
  }
- 
- ###--------------------------
diff --git a/mail/sympa/patches/patch-ac b/mail/sympa/patches/patch-ac
index 60e2ea48a36..071820042bf 100644
--- a/mail/sympa/patches/patch-ac
+++ b/mail/sympa/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2004/09/26 20:13:34 seb Exp $
+$NetBSD: patch-ac,v 1.2.64.1 2012/05/21 15:51:48 tron Exp $
 
---- src/etc/script/Makefile.orig	2003-05-12 09:32:42.000000000 +0000
-+++ src/etc/script/Makefile
-@@ -30,7 +30,7 @@ SCRIPTDIR	=	$(SBINDIR)
+--- src/etc/script/Makefile.in.orig	2012-02-09 16:02:29.000000000 +0100
++++ src/etc/script/Makefile.in	2011-08-25 16:48:08.000000000 +0200
+@@ -355,7 +355,7 @@
  
- all:	
+ info-am:
  
--install: makedir installsrc installsubstsrc installinit
-+install: makedir installsrc installsubstsrc
+-install-data-am: install-initSCRIPTS install-scriptSCRIPTS
++install-data-am: install-scriptSCRIPTS
+ 
+ install-exec-am:
  
- clean:
- 	rm -rf $(DESTDIR)$(SCRIPTDIR)
diff --git a/mail/sympa/patches/patch-af b/mail/sympa/patches/patch-af
index 447d11b5098..bfaed94630f 100644
--- a/mail/sympa/patches/patch-af
+++ b/mail/sympa/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2008/04/27 17:06:40 bouyer Exp $
+$NetBSD: patch-af,v 1.2.36.1 2012/05/21 15:51:48 tron Exp $
 
---- src/Language.pm.orig	2008-04-27 17:43:28.000000000 +0200
-+++ src/Language.pm	2008-04-27 17:43:47.000000000 +0200
-@@ -162,7 +162,7 @@
+--- src/lib/Language.pm.orig	2012-02-08 18:03:43.000000000 +0100
++++ src/lib/Language.pm	2012-02-08 18:04:12.000000000 +0100
+@@ -164,7 +164,7 @@
      ## Set Locale::Messages context
      my $locale_dashless = $locale.'.utf-8';
      $locale_dashless =~ s/-//g;
diff --git a/mail/sympa/patches/patch-ag b/mail/sympa/patches/patch-ag
deleted file mode 100644
index 3eff540eb47..00000000000
--- a/mail/sympa/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/04/27 17:06:40 bouyer Exp $
-
---- src/sympa_wizard.pl.orig	2008-04-27 15:11:31.000000000 +0200
-+++ src/sympa_wizard.pl	2008-04-27 15:11:56.000000000 +0200
-@@ -128,7 +128,7 @@
- 	       'advice' =>''},
- 
- 	      {'name' => 'static_content_path',
--	       'default' => '--DIR--/static_content',
-+	       'default' => '--DIR--/sympa/static_content',
- 	       'query' => 'The directory where Sympa stores static contents (CSS, members pictures, documentation) directly delivered by Apache',
- 	       'file' => 'sympa.conf',
- 	       'advice' =>''},	      
diff --git a/mail/sympa/patches/patch-ah b/mail/sympa/patches/patch-ah
deleted file mode 100644
index a2c33ad8d09..00000000000
--- a/mail/sympa/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/04/27 17:06:40 bouyer Exp $
-
---- src/Conf.pm.orig	2008-04-27 15:12:30.000000000 +0200
-+++ src/Conf.pm	2008-04-27 15:13:05.000000000 +0200
-@@ -267,7 +267,7 @@
-      'pictures_feature' => 'on',
-      'use_blacklist' => 'send,subscribe',
-      'static_content_url' => '/static-sympa',
--     'static_content_path' => '--DIR--/static_content',
-+     'static_content_path' => '--DIR--/sympa/static_content',
-      'filesystem_encoding' => 'utf-8',
-      'cache_list_config' => 'none', ## none | binary_file
-      'lock_method' => 'flock', ## flock | nfs
diff --git a/mail/sympa/patches/patch-ai b/mail/sympa/patches/patch-ai
deleted file mode 100644
index 3af4868a6c9..00000000000
--- a/mail/sympa/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2011/06/19 13:50:57 bouyer Exp $
-
---- wwsympa/Makefile.orig	2008-01-30 18:10:56.000000000 +0100
-+++ wwsympa/Makefile	2011-06-19 15:44:24.000000000 +0200
-@@ -100,8 +100,8 @@
- 
- installicons:
- 	@echo "Installing icons..."
--	@echo $(DIR)/static_content/icons
--	cp icons/*.png $(DIR)/static_content/icons
-+	@echo $(DESTDIR)$(DIR)/sympa/static_content/icons
-+	cp icons/*.png $(DESTDIR)$(DIR)/sympa/static_content/icons
- 
- installwrapper:
- 	@echo "Installing wwsympa-wrapper binary..."
diff --git a/mail/sympa/patches/patch-aj b/mail/sympa/patches/patch-aj
deleted file mode 100644
index 571b48591bb..00000000000
--- a/mail/sympa/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/04/27 17:06:41 bouyer Exp $
-
---- po/Makefile.orig	2008-04-27 16:51:00.000000000 +0200
-+++ po/Makefile	2008-04-27 16:53:44.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- 
--LINGUAS = af ar br bg ca cs de el en_US es et eu fi fr hu id it ja ko ml nb_NO nn_NO nl oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW
-+LINGUAS = ar cs de el en_US es et fi fr hu id it ja nb_NO nl oc pl pt_BR ro sv tr zh_CN 
- SYMPA_LOCALES = af_ZA ar_SY br_FR bg_BG ca_ES cs_CZ de_DE el_GR en_US es_ES et_EE eu_ES fi_FI fr_FR hu_HU id_ID it_IT ja_JP ko_KR ml_IN nb_NO nn_NO nl_NL oc_FR pl_PL pt_BR pt_PT ro_RO ru_RU sv_SE tr_TR vi_VN zh_CN zh_TW
- MOBASICFILES = $(addsuffix .mo, $(LINGUAS))
- MOHELPFILES = $(addprefix web_help_, $(MOBASICFILES))