9 files changed, 60 insertions, 179 deletions
diff --git a/mail/sympa/patches/patch-aa b/mail/sympa/patches/patch-aa
index c54183d1846..6df5c40d94e 100644
--- a/mail/sympa/patches/patch-aa
+++ b/mail/sympa/patches/patch-aa
@@ -1,18 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
+$NetBSD: patch-aa,v 1.8 2015/09/26 14:56:10 bouyer Exp $
 
---- 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 @@
+--- Makefile.in.orig	2015-09-25 10:55:02.000000000 +0200
++++ Makefile.in	2015-09-25 16:11:44.000000000 +0200
+@@ -709,8 +709,6 @@
  			echo "Creating $(DESTDIR)$$dir"; \
- 			install -d -m 755 $(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
  
- installconfig: installdir
+ sympa_wizard.pl.inst: $(top_srcdir)/src/sbin/sympa_wizard.pl.in Makefile
+@@ -720,48 +718,17 @@
+ 		< $(top_srcdir)/src/sbin/sympa_wizard.pl.in > $@
+ 
+ installconfig: installdir sympa_wizard.pl.inst
 -	@echo "Installing basic configuration ..."
 -	export PERL5LIB=$(DESTDIR)$(modulesdir); \
 -	if [ ! -f  $(DESTDIR)$(confdir)/sympa.conf ]; then \
@@ -20,24 +22,15 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
 -		if [ ! -d $(DESTDIR)$(confdir) ]; then \
 -			$(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \
 -		fi; \
--		$(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 \
+-		chown $(USER) $(DESTDIR)$(confdir) || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$(confdir) || /bin/true; \
+-		$(PERL) sympa_wizard.pl.inst \
 -			--create sympa.conf \
 -			--target $(DESTDIR)$(confdir)/sympa.conf \
 -			|| /bin/true; \
--		$(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; \
+-		chown $(USER) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
+-		chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
+-	fi; \
 -	if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
 -		cd $(DESTDIR)$(sysconfdir); \
 -		echo "# automatically created file" >> data_structure.version; \
@@ -46,12 +39,12 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
 -		chown $(USER) data_structure.version || /bin/true; \
 -		chgrp $(GROUP) data_structure.version || /bin/true; \
 -	fi
--	@for dir in create_list_templates families \
--		global_task_models list_task_models scenari search_filters \
--		mail_tt2 web_tt2; do \
+-	@for dir in create_list_templates custom_actions custom_conditions \
+-		data_sources families global_task_models list_task_models \
+-		mail_tt2 scenari search_filters web_tt2; do \
 -		if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
 -			echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
--			install -d -m 755 $(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; \
@@ -64,20 +57,17 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
 -			etc_README > $(DESTDIR)$(sysconfdir)/README; \
 -		chmod 444 $(DESTDIR)$(sysconfdir)/README; \
 -	fi
++	if [ ! -d $(DESTDIR)$(prefix)/share/examples/sympa ]; then \
++	       $(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/share/examples/sympa; \
++	fi;\
 +	env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
 +		--create sympa.conf \
 +		--target $(DESTDIR)$(prefix)/share/examples/sympa/sympa.conf \
-+		|| true; \
-+	env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
-+		--create wwsympa.conf \
-+		--target $(DESTDIR)$(prefix)/share/examples/sympa/wwsympa.conf \
-+		|| true; \
++			|| 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;
++	echo $(VERSION) >> data_structure.version
  
  nextstep: 
  	@echo ""
diff --git a/mail/sympa/patches/patch-ab b/mail/sympa/patches/patch-ab
index 76f5d19681d..9850c5c7f67 100644
--- a/mail/sympa/patches/patch-ab
+++ b/mail/sympa/patches/patch-ab
@@ -1,79 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2014/08/30 20:26:45 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2015/09/26 14:56:10 bouyer Exp $
 
---- 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 {
--    return unless $with_CPAN;
--
--    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";
--    }
--
--    ## This is required on RedHat 9 for DBD::mysql installation
--    my $lang = $ENV{'LANG'};
--    $ENV{'LANG'} = 'C' if ($ENV{'LANG'} =~ /UTF\-8/);
--
--    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 "-> 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'} = 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->install($module); ## Could use CPAN::Shell->force('install') if make test failed
--
--    ## Check if module has been successfuly installed
--    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}, $cpan_modules);
--            }
--        }
--    }
--
--    ## Restore lang
--    $ENV{'LANG'} = $lang if (defined $lang);
-+    1;
+--- src/sbin/sympa_wizard.pl.in.orig	2015-09-25 15:37:58.000000000 +0200
++++ src/sbin/sympa_wizard.pl.in	2015-09-25 15:39:07.000000000 +0200
+@@ -35,11 +35,10 @@
+ use Sympa::Constants;
+ use Sympa::ModDef;
  
- }
+-my $with_CPAN;    # check if module "CPAN" installed.
++my $with_CPAN = 0;# check if module "CPAN" installed.
+ my $modfail;      # any of required modules are not installed.
+ 
+ BEGIN {
+-    $with_CPAN = eval { require CPAN; };
+     $modfail = !eval {
+         require Conf;
+         require Sympa::Language;
diff --git a/mail/sympa/patches/patch-ac b/mail/sympa/patches/patch-ac
index 0f0d808fe5e..c16e54fa279 100644
--- a/mail/sympa/patches/patch-ac
+++ b/mail/sympa/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2012/05/16 16:16:46 bouyer Exp $
+$NetBSD: patch-ac,v 1.4 2015/09/26 14:56:10 bouyer Exp $
 
---- 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 @@
+--- src/etc/script/Makefile.in.orig	2015-09-25 10:55:01.000000000 +0200
++++ src/etc/script/Makefile.in	2015-09-25 15:41:23.000000000 +0200
+@@ -330,7 +330,7 @@
  
  info-am:
  
--install-data-am: install-initSCRIPTS install-scriptSCRIPTS
-+install-data-am: install-scriptSCRIPTS
+-install-data-am: install-initSCRIPTS
++install-data-am:
  
  install-exec-am:
  
diff --git a/mail/sympa/patches/patch-af b/mail/sympa/patches/patch-af
deleted file mode 100644
index 5bd0c0833da..00000000000
--- a/mail/sympa/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2012/05/16 16:16:46 bouyer Exp $
-
---- 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;
--    foreach my $type (&POSIX::LC_ALL, &POSIX::LC_TIME) {
-+    foreach my $type (&POSIX::LC_CTYPE) {
- 	my $success;
- 	foreach my $try ($locale.'.utf-8',
- 			 $locale.'.UTF-8',  ## UpperCase required for FreeBSD
diff --git a/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in b/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in
deleted file mode 100644
index 88230483f93..00000000000
--- a/mail/sympa/patches/patch-doc_man8_alias__manager.pod.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$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	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, 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
deleted file mode 100644
index 01f2e631633..00000000000
--- a/mail/sympa/patches/patch-doc_man8_archived.pod.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$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	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, 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
deleted file mode 100644
index 0190bbc05b8..00000000000
--- a/mail/sympa/patches/patch-doc_man8_bounced.pod.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$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	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, 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
deleted file mode 100644
index f06b7499ed8..00000000000
--- a/mail/sympa/patches/patch-doc_man8_sympa.pod
+++ /dev/null
@@ -1,12 +0,0 @@
-$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.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, sympa.pl - A Modern Mailing List Manager
diff --git a/mail/sympa/patches/patch-src_lib_Sympa_Session.pm b/mail/sympa/patches/patch-src_lib_Sympa_Session.pm
new file mode 100644
index 00000000000..eaba6ba3151
--- /dev/null
+++ b/mail/sympa/patches/patch-src_lib_Sympa_Session.pm
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lib_Sympa_Session.pm,v 1.1 2015/09/26 14:56:10 bouyer Exp $
+Fix perl 5.22 waring (which is fatal here)
+
+--- ./src/lib/Sympa/Session.pm.orig	2015-09-25 23:38:08.000000000 +0200
++++ ./src/lib/Sympa/Session.pm	2015-09-25 23:39:03.000000000 +0200
+@@ -132,7 +132,7 @@
+     my $sdm = Sympa::DatabaseManager->instance;
+ 
+     ## Load existing session.
+-    if ($cookie and $cookie =~ /^\d{,16}$/) {
++    if ($cookie and $cookie =~ /^\d{16}$/) {
+         ## Compatibility: session by older releases of Sympa.
+         $id_session     = $cookie;
+         $is_old_session = 1;