Update to 6.1.22. Main changes since 6.1.11:

	[10541] src/lib/List.pm:  [Submitted by S. Shipway, Univ. of Auckland]
	Workaround for aggressive DMARC policy such as yahoo.com.  The patch
	adds option #3 of this DMARC FAQ: http://dmarc.org/faq.html#s_3
	- New list config paragraph "dmarc_protection" to munge "From:" header
	and put original header content erc. into comment.

	[10540] src/lib/Bulk.pm:  New parameters for merged messages.
	"part.description", "part.disposition", "part.encoding" and "part.type"
	may be used for each part of input messages.  These are all-lowercase
	(except "part.description").

*****	[10207] src/etc/script/create_db.Oracle, src/etc/script/create_db.Pg,
*****	src/etc/script/create_db.SQLite, src/etc/script/create_db.Sybase,
*****	src/etc/script/create_db.mysql:  Two new database fields appeared in
*****	this version and a field was modified.
*****	- The new fields are prev_id_session (varchar(30)) and
*****	refresh_date_session (int(11)). they are located in the session_table
*****	table.
*****	- The modified field is dkim_privatekey_bulkspool and is located in the
*****	bulkspool_table table. Its length went from varchar(1000) to
*****	varchar(2000).
*****	Sympa install using MySQL and SQLite backends will have no trouble at
*****	all, as the database structure is updated by Sympa.
*****	However, if you use Postgres, Oracle or Sybase, please have a look
*****	(respectively) at the create_db.Pg, create_db.Oracle or
*****	create_db.Sybase to check the definition of those fields. Please update
*****	your database structure before running Sympa.

	[10206] src/lib/Sympa/DatabaseDescription.pm:  Changing length of DKIM
	private key in database to ensure database creation scripts will be
	updated.

	[10074] mail_tt2/command_report.tt2, mail_tt2/info_report.tt2,
	mail_tt2/review.tt2, src/lib/Commands.pm, src/lib/List.pm,
	src/lib/tt2.pm, web_tt2/edit_list_request.tt2,
	web_tt2/review_family.tt2, web_tt2/search_user.tt2,
	web_tt2/suboptions.tt2, web_tt2/subscriber_table.tt2,
	web_tt2/suspend_request.tt2, wwsympa/wwslib.pm,
	wwsympa/wwsympa.fcgi.in:  i18n of options for list parameters and
	subscriber options.
	- Options on edit_list page are shown by i18n'ed titles.
	- Only listmasters can view real config values.
	- Subscriber options on review pages, command results, subscriber
	option pages and so on are shown by i17n'ed titles (along with real
	option values).

*****	[10051] src/lib/tt2.pm, web_tt2/Makefile.am, web_tt2/css.tt2,
*****	web_tt2/ja_JP, web_tt2/ja_JP/css.tt2, web_tt2/ko_KR,
*****	web_tt2/ko_KR/css.tt2, web_tt2/main.tt2, web_tt2/zh_CN,
*****	web_tt2/zh_CN/css.tt2, web_tt2/zh_TW, web_tt2/zh_TW/css.tt2,
*****	wwsympa/wwsympa.fcgi.in:  Per-language css.tt2 will override any
*****	portion of main css, not fully replacing it.  So they may be used for
*****	locale-specific customization.
*****	Background: Default css.tt2 specifies the font families covering
*****	Western scripts (Latin, Cyrillic, ...).  East Asian users may prefer
*****	consistent font family supporting Western along with Eastern scripts
*****	(Han, Hangul, ...).

	[9966] src/lib/Message.pm, src/lib/confdef.pm:	New site config
	parameter "sender_headers" to specify header fields by which message
	sender is detected.
	This is a enhancement to S. Shipway's improvement.

	[9963] web_tt2/review.tt2, web_tt2/show_exclude.tt2,
	wwsympa/wwsympa.fcgi.in: [Reported by so many listmasters we lost the
	count] Exclusion table was just a display of the users excluded. list
	owners could not do anything to restore subscriptions;
	This page is now a form, similar to the review page, which allows to
	restore users subscriptions.

	[9951] src/lib/List.pm:  Now you can define a "scenari" directory in
	the lists family directory. These scenarii will be available for lists
	instantiated from this family.
	The "scenari" directory must be put directly in the family directory,
	not in the overall "families" directory. For example, if you want to
	define scenarii specific to the "staff" family, you must define a
	scenari directory in the /home/sympa/etc/families/staff/ directory. Not
	in /home/sympa/etc/families/.

*****	[9989] configure.ac, src/Makefile.am, src/alias_manager.pl.in,
*****	src/etc/script/ldap_alias_manager.pl.in,
*****	src/etc/script/mysql_alias_manager.pl.in, src/lib/confdef.pm,
*****	src/sympa_newaliases-wrapper.c, src/sympa_newaliases.pl.in:  Now alias
*****	maintenance utilities other than newaliases may be used without special
*****	configure options nor patch to alias_manager.pl.
*****	Changes:
*****	- aliaswrapper and virtualwrapper were deprecated and replaced with
*****	sympa_newaliases-wrapper.
*****	- New alias management program sympa_newaliases.pl which will typically be
*****	called by alias_manager.pl via sympa_newaliases-wrapper.
*****	- New site configuration parameters aliases_db_type and aliases_program
*****	will control behaviour of alias database maintenance.
*****	- configure script:
*****	- Options --with-sendmail_aliases and --with-virtual_aliases were
*****	deprecated.  Use --with-aliases_file instead.
*****	- New options --with-makemap and --with-postalias, along with
*****	options --with-newaliases and --with-postmap are available.
*****	- Option --with-postmap_arg was removed.
*****	- Alias managers can handle postmap/makemap style maps (delimited by
*****	whitespace), not only newaliases style maps (delimited by colon).

	[9953] wwsympa/wwsympa.fcgi.in: [Submitted by S. Shipway, univ.
	Auckland] several changes in privilegs to ease everyday lists
	moderation:
	- Owners and lismasters can moderate messages and shared repository
	- Editors can moderate subscriptions
	- 'del' and 'add' sceanrios are evaluated to make their result
	available in each page.

	[8451] src/etc/Makefile.am, src/etc/create_list_templates/confidential,
	src/etc/create_list_templates/confidential/comment.tt2,
	src/etc/create_list_templates/confidential/config.tt2,
	src/etc/scenari/send.confidential:  New "confidential" list model.
	These lists are used for groups who don't want any publicity around
	their activities; All possible restrictions are applied to prevent
	unauthorized users to know these lists exist and to learn anything
	about them.

	[8454] web_tt2/footer.tt2, web_tt2/tt2_error.tt2:  Removing references
	to the Sympa version in web pages to avoid pages to be searched by bad
	guys willing to exploit known vulnerabilities on out of date servers.

For complete list of changes, see
http://www.sympa.org/distribution/latest-stable/NEWS

9 files changed, 98 insertions, 57 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 7a4333291b6..e189e2fee12 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2014/05/31 12:22:42 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2014/08/30 20:26:45 bouyer Exp $
 
-DISTNAME=	sympa-6.1.11
-PKGREVISION=	8
+DISTNAME=	sympa-6.1.22
+#PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -136,11 +136,10 @@ 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}/sympa_newaliases-wrapper ${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 \
@@ -180,11 +179,9 @@ post-install:
 	${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
+	    ${DESTDIR}${SYMPA_BIN}/queue
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/sympa/PLIST b/mail/sympa/PLIST
index 601906da3ae..2299734a5d2 100644
--- a/mail/sympa/PLIST
+++ b/mail/sympa/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:05 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/08/30 20:26:45 bouyer Exp $
+man/man1/sympa_newaliases.1
 man/man8/alias_manager.8
 man/man8/archived.8
 man/man8/bounced.8
@@ -22,14 +23,15 @@ 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/ca/LC_MESSAGES/web_help.mo
 share/locale/cs/LC_MESSAGES/sympa.mo
 share/locale/cs/LC_MESSAGES/web_help.mo
 share/locale/de/LC_MESSAGES/sympa.mo
 share/locale/de/LC_MESSAGES/web_help.mo
 share/locale/el/LC_MESSAGES/sympa.mo
 share/locale/el/LC_MESSAGES/web_help.mo
-share/locale/en_US/LC_MESSAGES/sympa.mo
-share/locale/en_US/LC_MESSAGES/web_help.mo
+share/locale/en/LC_MESSAGES/sympa.mo
+share/locale/en/LC_MESSAGES/web_help.mo
 share/locale/es/LC_MESSAGES/sympa.mo
 share/locale/es/LC_MESSAGES/web_help.mo
 share/locale/et/LC_MESSAGES/sympa.mo
@@ -111,7 +113,6 @@ sympa/bin/Upgrade.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/bounced.pl
@@ -135,6 +136,8 @@ sympa/bin/p12topem.pl
 sympa/bin/queue
 sympa/bin/report.pm
 sympa/bin/sympa.pl
+sympa/bin/sympa_newaliases-wrapper
+sympa/bin/sympa_newaliases.pl
 sympa/bin/sympa_soap_client.pl
 sympa/bin/sympa_wizard.pl
 sympa/bin/sympasoap.pm
@@ -145,13 +148,14 @@ sympa/bin/time_utils.pm
 sympa/bin/tools.pm
 sympa/bin/tpl2tt2.pl
 sympa/bin/tt2.pm
-sympa/bin/virtualwrapper
 sympa/bin/wwslib.pm
 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/confidential/comment.tt2
+sympa/default/create_list_templates/confidential/config.tt2
 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
@@ -245,6 +249,7 @@ 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.family_owner
 sympa/default/scenari/automatic_list_creation.listmaster
 sympa/default/scenari/automatic_list_creation.public
 sympa/default/scenari/create_list.intranet
@@ -267,6 +272,7 @@ 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.conceal
 sympa/default/scenari/info.default
 sympa/default/scenari/info.open
 sympa/default/scenari/info.private
@@ -286,6 +292,7 @@ sympa/default/scenari/review.owner
 sympa/default/scenari/review.private
 sympa/default/scenari/review.public
 sympa/default/scenari/send.closed
+sympa/default/scenari/send.confidential
 sympa/default/scenari/send.default
 sympa/default/scenari/send.editorkey
 sympa/default/scenari/send.editorkeyonly
@@ -350,6 +357,9 @@ 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/automatic_lists.tt2
+sympa/default/web_tt2/automatic_lists_management_request.tt2
+sympa/default/web_tt2/automatic_lists_request.tt2
 sympa/default/web_tt2/blacklist.tt2
 sympa/default/web_tt2/button_footer.tt2
 sympa/default/web_tt2/button_header.tt2
@@ -379,6 +389,9 @@ 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/exclusion_table.tt2
+sympa/default/web_tt2/family_signoff.tt2
+sympa/default/web_tt2/family_signoff_request.tt2
 sympa/default/web_tt2/footer.tt2
 sympa/default/web_tt2/get_closed_lists.tt2
 sympa/default/web_tt2/get_inactive_lists.tt2
@@ -396,12 +409,15 @@ 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_suspend.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/ja_JP/css.tt2
 sympa/default/web_tt2/javascript.tt2
+sympa/default/web_tt2/ko_KR/css.tt2
 sympa/default/web_tt2/latest_arc.tt2
 sympa/default/web_tt2/latest_d_read.tt2
 sympa/default/web_tt2/latest_lists.tt2
@@ -464,6 +480,8 @@ 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/default/web_tt2/zh_CN/css.tt2
+sympa/default/web_tt2/zh_TW/css.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
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 200a7bc8c38..b223ae4853c 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.14 2013/06/12 14:37:15 wiz Exp $
+$NetBSD: distinfo,v 1.15 2014/08/30 20:26:45 bouyer Exp $
 
-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 (sympa-6.1.22.tar.gz) = b3187a99874a721531f0b14b8411bd85cdeda251
+RMD160 (sympa-6.1.22.tar.gz) = 224c5cf18e953520ed093a4f2330c3a90f8e151f
+Size (sympa-6.1.22.tar.gz) = 8432112 bytes
+SHA1 (patch-aa) = 7f9da8ae9a11c447cb4dea51e2d80a9eba22f3c7
+SHA1 (patch-ab) = e2e0721dd5cf6c88d84d740df2fa202eaa2daadc
 SHA1 (patch-ac) = 87527936892090b310919ca55576aaeba795cb3b
 SHA1 (patch-af) = 901f6ddf04dffccc3b148c2465a23de6cd57f832
-SHA1 (patch-doc_man8_alias__manager.pod.in) = fa5f5c21ed169e27dbd0adfa695b1942642666cc
-SHA1 (patch-doc_man8_archived.pod.in) = 525a5dc49015c84659c92265d3af970ee8905453
-SHA1 (patch-doc_man8_bounced.pod.in) = 0e54fe7170d4f1db22be24682b03e204a6dc014b
-SHA1 (patch-doc_man8_sympa.pod) = f0d6218e315d29b38fa226b8b10a47efd1a8f182
+SHA1 (patch-doc_man8_alias__manager.pod.in) = 8a712452a53a5d56688a7bd1fd2761bbf355aebf
+SHA1 (patch-doc_man8_archived.pod.in) = 606b0e2be25ddbb07adf7116938f1624f10d65d5
+SHA1 (patch-doc_man8_bounced.pod.in) = 15fc87a7bf8195ba050a36d9f7ec11236d632ec7
+SHA1 (patch-doc_man8_sympa.pod) = 8f86807e32d5896f7b847a95dcdd23a884f32fc2
diff --git a/mail/sympa/patches/patch-aa b/mail/sympa/patches/patch-aa
index 9250ba140ac..c54183d1846 100644
--- a/mail/sympa/patches/patch-aa
+++ b/mail/sympa/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2012/05/16 16:16:46 bouyer Exp $
+$NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
 
---- 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 @@
+--- Makefile.in.orig	2014-06-06 18:09:50.000000000 +0200
++++ Makefile.in	2014-08-30 20:13:04.000000000 +0200
+@@ -643,60 +643,28 @@
  			echo "Creating $(DESTDIR)$$dir"; \
  			install -d -m 755 $(DESTDIR)$$dir; \
  		fi; \
@@ -13,21 +13,28 @@ $NetBSD: patch-aa,v 1.6 2012/05/16 16:16:46 bouyer Exp $
  	done
  
  installconfig: installdir
- 	@echo "Installing basic configuration ..."
- 	export PERL5LIB=$(DESTDIR)$(modulesdir); \
+-	@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 \
+-		$(SED) \
+-			-e 's|--PERL--|$(PERL)|' \
+-			-e 's|--modulesdir--|$(top_srcdir)/src/lib|' \
+-			< $(top_srcdir)/src/sympa_wizard.pl.in > \
+-			$(top_srcdir)/src/sympa_wizard.pl.install; \
+-		chmod +x $(top_srcdir)/src/sympa_wizard.pl.install; \
+-		$(top_srcdir)/src/sympa_wizard.pl.install \
 -			--create sympa.conf \
 -			--target $(DESTDIR)$(confdir)/sympa.conf \
 -			|| /bin/true; \
--		$(DESTDIR)$(sbindir)/sympa_wizard.pl \
+-		$(top_srcdir)/src/sympa_wizard.pl.install \
 -			--create wwsympa.conf \
 -			--target $(DESTDIR)$(confdir)/wwsympa.conf \
 -			|| /bin/true; \
+-		rm -f $(top_srcdir)/src/sympa_wizard.pl.install; \
 +	if [ ! -d $(DESTDIR)$(prefix)/share/examples/sympa ]; then \
 +		$(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/share/examples/sympa; \
  	fi; \
@@ -39,11 +46,29 @@ $NetBSD: patch-aa,v 1.6 2012/05/16 16:16:46 bouyer Exp $
 -		chown $(USER) data_structure.version || /bin/true; \
 -		chgrp $(GROUP) data_structure.version || /bin/true; \
 -	fi
-+	$(DESTDIR)$(sbindir)/sympa_wizard.pl \
+-	@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; \
+-		chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /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
++	env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
 +		--create sympa.conf \
 +		--target $(DESTDIR)$(prefix)/share/examples/sympa/sympa.conf \
 +		|| true; \
-+	$(DESTDIR)$(sbindir)/sympa_wizard.pl \
++	env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
 +		--create wwsympa.conf \
 +		--target $(DESTDIR)$(prefix)/share/examples/sympa/wwsympa.conf \
 +		|| true; \
diff --git a/mail/sympa/patches/patch-ab b/mail/sympa/patches/patch-ab
index a60810634f4..76f5d19681d 100644
--- a/mail/sympa/patches/patch-ab
+++ b/mail/sympa/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.5 2012/05/16 16:16:46 bouyer Exp $
+$NetBSD: patch-ab,v 1.6 2014/08/30 20:26:45 bouyer Exp $
 
---- 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 @@
+--- src/sympa_wizard.pl.in.orig	2014-06-06 17:44:05.000000000 +0200
++++ src/sympa_wizard.pl.in	2014-08-30 20:08:37.000000000 +0200
+@@ -655,73 +655,6 @@
  # Install a CPAN module
  ##----------------------
  sub install_module {
--#    my ($module, $options, $opt_features) = @_;
--  my ($module, $options, $cpan_modules) = @_;
+-    return unless $with_CPAN;
+-
+-    my ($module, $options, $cpan_modules) = @_;
 -
 -    my $default = $options->{'default'};
 -
@@ -73,6 +74,6 @@ $NetBSD: patch-ab,v 1.5 2012/05/16 16:16:46 bouyer Exp $
 -
 -    ## Restore lang
 -    $ENV{'LANG'} = $lang if (defined $lang);
--
-+	1;
++    1;
+ 
  }
diff --git a/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in b/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in
index f1e84eb87a9..88230483f93 100644
--- a/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in
+++ b/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man8_alias__manager.pod.in,v 1.1 2013/06/12 14:37:15 wiz Exp $
+$NetBSD: patch-doc_man8_alias__manager.pod.in,v 1.2 2014/08/30 20:26:45 bouyer Exp $
 
 Set encoding for perl-5.18.
 
---- doc/man8/alias_manager.pod.in.orig	2010-03-30 10:10:09.000000000 +0000
-+++ doc/man8/alias_manager.pod.in
+--- doc/man8/alias_manager.pod.in.orig	2013-04-05 14:39:23.000000000 +0200
++++ doc/man8/alias_manager.pod.in	2014-08-30 20:04:27.000000000 +0200
 @@ -1,3 +1,5 @@
 +=encoding iso-8859-1
 +
  =head1 NAME
  
- alias_manager (or alias_manager.pl) - manage Sympa aliases
+ alias_manager, alias_manager.pl - manage Sympa aliases
diff --git a/mail/sympa/patches/patch-doc_man8_archived.pod.in b/mail/sympa/patches/patch-doc_man8_archived.pod.in
index 5ec3795ccc8..01f2e631633 100644
--- a/mail/sympa/patches/patch-doc_man8_archived.pod.in
+++ b/mail/sympa/patches/patch-doc_man8_archived.pod.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man8_archived.pod.in,v 1.1 2013/06/12 14:37:15 wiz Exp $
+$NetBSD: patch-doc_man8_archived.pod.in,v 1.2 2014/08/30 20:26:45 bouyer Exp $
 
 Set encoding for perl-5.18.
 
---- doc/man8/archived.pod.in.orig	2010-03-30 10:10:09.000000000 +0000
-+++ doc/man8/archived.pod.in
+--- doc/man8/archived.pod.in.orig	2013-04-05 14:39:23.000000000 +0200
++++ doc/man8/archived.pod.in	2014-08-30 20:04:37.000000000 +0200
 @@ -1,3 +1,5 @@
 +=encoding iso-8859-1
 +
  =head1 NAME
  
- archived (or archived.pl) - Mailing List Archiving Daemon for WWSympa
+ archived, archived.pl - Mailing List Archiving Daemon for WWSympa
diff --git a/mail/sympa/patches/patch-doc_man8_bounced.pod.in b/mail/sympa/patches/patch-doc_man8_bounced.pod.in
index b552b4fb966..0190bbc05b8 100644
--- a/mail/sympa/patches/patch-doc_man8_bounced.pod.in
+++ b/mail/sympa/patches/patch-doc_man8_bounced.pod.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man8_bounced.pod.in,v 1.1 2013/06/12 14:37:15 wiz Exp $
+$NetBSD: patch-doc_man8_bounced.pod.in,v 1.2 2014/08/30 20:26:45 bouyer Exp $
 
 Set encoding for perl-5.18.
 
---- doc/man8/bounced.pod.in.orig	2010-03-30 10:10:09.000000000 +0000
-+++ doc/man8/bounced.pod.in
+--- doc/man8/bounced.pod.in.orig	2013-04-05 14:39:23.000000000 +0200
++++ doc/man8/bounced.pod.in	2014-08-30 20:04:39.000000000 +0200
 @@ -1,3 +1,5 @@
 +=encoding iso-8859-1
 +
  =head1 NAME
  
- bounced (or bounced.pl) - Mailing List Bounce Processing Daemon for WWSympa
+ bounced, bounced.pl - Mailing List Bounce Processing Daemon for WWSympa
diff --git a/mail/sympa/patches/patch-doc_man8_sympa.pod b/mail/sympa/patches/patch-doc_man8_sympa.pod
index c47e3ae8392..f06b7499ed8 100644
--- a/mail/sympa/patches/patch-doc_man8_sympa.pod
+++ b/mail/sympa/patches/patch-doc_man8_sympa.pod
@@ -1,12 +1,12 @@
-$NetBSD: patch-doc_man8_sympa.pod,v 1.1 2013/06/12 14:37:15 wiz Exp $
+$NetBSD: patch-doc_man8_sympa.pod,v 1.2 2014/08/30 20:26:45 bouyer Exp $
 
 Set encoding for perl-5.18.
 
---- doc/man8/sympa.pod.orig	2010-03-30 10:10:09.000000000 +0000
-+++ doc/man8/sympa.pod
+--- doc/man8/sympa.pod.in.orig	2014-08-30 20:03:53.000000000 +0200
++++ doc/man8/sympa.pod.in	2014-08-30 20:04:41.000000000 +0200
 @@ -1,3 +1,5 @@
 +=encoding iso-8859-1
 +
  =head1 NAME
  
- sympa (or sympa.pl) - A Modern Mailing List Manager
+ sympa, sympa.pl - A Modern Mailing List Manager