- Update to 5.2.4

PR:             110268
Submitted by:   Olivier Girard <Olivier.Girard@univ-angers.fr> (maintainer)

6 files changed, 129 insertions, 19 deletions

diff --git a/mail/sympa5/Makefile b/mail/sympa5/Makefile
index 6c53d5e734fc..7d746802964d 100644
--- a/mail/sympa5/Makefile
+++ b/mail/sympa5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sympa
-PORTVERSION=	5.2.2
+PORTVERSION=	5.2.4
 CATEGORIES=	mail
 MASTER_SITES?=	http://www.sympa.org/distribution/
 
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	sympa5
 USE_APACHE=	1.3+
-CONFLICTS=	sympa-4* sympa-5.[0-1]* sympa-5.2.1*
+CONFLICTS=	sympa-4* sympa-5.[0-1]* sympa-5.2.[0-3]*
 
 DB_TYPE?=mysql
 
@@ -46,7 +46,7 @@ PLIST_SUB+=	NLS=""
 IGNORE=		needs Perl 5.8.6 or above (lang/perl5.8)
 .endif
 
-.if defined(WITH_FASTCGI)
+.if !defined(WITHOUT_FASTCGI)
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
 .endif
@@ -97,7 +97,7 @@ pre-fetch:
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "      DB_TYPE=type                    Optional: mysql, Oracle, Pg or Sybase"
-	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of plain CGI"
+	@${ECHO} "      WITHOUT_FASTCGI                 Use plain CGI instead of FastCGI"
 	@${ECHO} ""
 
 post-patch:
diff --git a/mail/sympa5/distinfo b/mail/sympa5/distinfo
index 81608850b337..4679cea6661f 100644
--- a/mail/sympa5/distinfo
+++ b/mail/sympa5/distinfo
@@ -1,3 +1,3 @@
-MD5 (sympa-5.2.2.tar.gz) = b6a68edd21481e26b14a1222e1824e64
-SHA256 (sympa-5.2.2.tar.gz) = afce0b8d7c2ca33bd354f10ffaca443580e356a1d4a791eb869cf2a5c398e131
-SIZE (sympa-5.2.2.tar.gz) = 5138132
+MD5 (sympa-5.2.4.tar.gz) = 480813ba3cb0713a39d2e60c1ae4f2da
+SHA256 (sympa-5.2.4.tar.gz) = de42917180818f4b922bee0c70c5e131a7af776649c9f7c0e23495f1b60ae767
+SIZE (sympa-5.2.4.tar.gz) = 5140447
diff --git a/mail/sympa5/files/patch-src_alias_manager.pl b/mail/sympa5/files/patch-src-alias_manager.pl
index 4a17cd75b407..4a17cd75b407 100644
--- a/mail/sympa5/files/patch-src_alias_manager.pl
+++ b/mail/sympa5/files/patch-src-alias_manager.pl
diff --git a/mail/sympa5/files/patch-src-etc-scripts-sympa b/mail/sympa5/files/patch-src-etc-scripts-sympa
new file mode 100644
index 000000000000..82eb91b530c0
--- /dev/null
+++ b/mail/sympa5/files/patch-src-etc-scripts-sympa
@@ -0,0 +1,120 @@
+--- src/etc/script/sympa.old	Mon Nov 21 14:49:13 2005
++++ src/etc/script/sympa	Tue Mar 13 14:43:46 2007
+@@ -1,4 +1,4 @@
+-#! --SH--
++#! /bin/sh
+ #
+ # sympa			Mailing Lists Management System
+ #
+@@ -7,7 +7,7 @@
+ # Modified by Olivier Salaun 27/07/2000
+ #    - translations
+ #    - lang parameter deleted (defined in sympa.conf)
+-#    - introduced --VARS-- parsed by Makefile
++#    - introduced  parsed by Makefile
+ #    - no more sympauser since sympa sets its UID
+ # Modified by Michel Bouissou  27/07/2000
+ #
+@@ -29,19 +29,24 @@
+ 
+ if [ ${OSTYPE} != "FreeBSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "darwin7.0" -a ${OSTYPE} != "Debian" -a ${OSTYPE} != "Suse" ]; then
+     # Source function library.
+-    . --INITDIR--/functions
++    . /usr/local/etc/rc.d/functions
+ 
+     # Get config.
+     . /etc/sysconfig/network
+ fi
+ 
++if [ ${OSTYPE} = "FreeBSD" ]; then
++    # Source function library.
++    . /etc/rc.subr
++fi
++
+ # Sympa parameters
+ # Sympa binaries directory
+-sympadir="--SBINDIR--"
++sympadir="/usr/local/sbin"
+ 
+ # Sympa config files directory
+-sympaconf="--CONFIG--"
+-wwsympaconf="--WWSCONFIG--"
++sympaconf="/usr/local/etc/sympa/sympa.conf"
++wwsympaconf="/usr/local/etc/sympa/wwsympa.conf"
+ 
+ ##'echo -n' not supported with SH on Solaris
+ if [ ${OSTYPE} = "SunOS" ]; then
+@@ -65,8 +70,8 @@
+ 
+     else
+        # First try "/u1/home/sympa/*.pid" files
+-       if [ -f --PIDDIR--/$1.pid ] ; then
+-             pid=`head -1 --PIDDIR--/$1.pid`
++       if [ -f /var/run/$1.pid ] ; then
++             pid=`head -1 /var/run/$1.pid`
+              if [ "$pid" != "" ] ; then
+                  running=`ps -A | grep "$pid"`
+                  if [ "$running" != "" ]; then
+@@ -96,7 +101,7 @@
+ #		startparam=""
+ #	fi
+  
+-	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "Debian" -o ${OSTYPE} = "Suse" ]; then
++	if [ ${OSTYPE} = "FreeBSD" -o ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "Debian" -o ${OSTYPE} = "Suse" ]; then
+ 		$sympadir/$1.pl $startparam && echo "success" || echo "failure"
+ 	else
+ 		$sympadir/$1.pl $startparam && success || failure
+@@ -149,12 +154,12 @@
+         return 1
+     fi
+  
+-	if [ -f --PIDDIR--/$1.pid ]; then
++	if [ -f /var/run/$1.pid ]; then
+ 		echo $echo_opt "Stopping module $1.pl: "
+-		pid=`head -1 --PIDDIR--/$1.pid`
++		pid=`head -1 /var/run/$1.pid`
+ 		running=`ps -A | grep "$pid"`
+ 		if [ "$running" != "" ]; then
+-		if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "Debian" -o ${OSTYPE} = "Suse" ]; then
++		if [ ${OSTYPE} = "FreeBSD" -o ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "Debian" -o ${OSTYPE} = "Suse" ]; then
+ 			kill -TERM $pid && echo "success" || echo "failure"
+ 		    else
+ 			kill -TERM $pid && success || failure
+@@ -185,13 +190,13 @@
+ # See how we were called.
+ case "$1" in
+   start)
+-	if [ ! -f --LOCKDIR--/sympa ]; then
++	if [ ! -f /var/spool/lock/sympa ]; then
+ 		echo "Starting Sympa subsystem: "
+ 		sympa_start sympa
+ 		sympa_start archived
+ 		sympa_start bounced
+ 		sympa_start task_manager
+-		touch --LOCKDIR--/sympa
++		touch /var/spool/lock/sympa
+ 		echo
+ 	else
+ 
+@@ -205,17 +210,17 @@
+ 	sympa_stop bounced
+ 	sympa_stop archived
+ 	sympa_stop sympa
+-	if [ -f --PIDDIR--/sympa-distribute.pid ]; then
++	if [ -f /var/run/sympa-distribute.pid ]; then
+ 		sympa_stop sympa-distribute
+ 	fi
+ 	sympa_stop task_manager
+-	if [ -f --LOCKDIR--/sympa ]; then
+-		rm -f --LOCKDIR--/sympa
++	if [ -f /var/spool/lock/sympa ]; then
++		rm -f /var/spool/lock/sympa
+ 	fi
+ 	;;
+   status)
+ 	echo "Status of Sympa subsystem: "
+-	if [ -f --LOCKDIR--/sympa ]; then
++	if [ -f /var/spool/lock/sympa ]; then
+ 		echo "Status file for subsystem found."
+ 	else
+ 		echo "Status file for subsystem NOT found."
diff --git a/mail/sympa5/files/patch-src-sympa_wizard.pl b/mail/sympa5/files/patch-src-sympa_wizard.pl
index 80bd27db5bc3..ff07f3e575eb 100644
--- a/mail/sympa5/files/patch-src-sympa_wizard.pl
+++ b/mail/sympa5/files/patch-src-sympa_wizard.pl
@@ -1,5 +1,5 @@
---- src/sympa_wizard.pl.orig	Thu Aug 24 17:05:36 2006
-+++ src/sympa_wizard.pl	Wed Sep 27 10:53:39 2006
+--- src/sympa_wizard.pl.orig	Mon Oct 16 16:24:39 2006
++++ src/sympa_wizard.pl	Tue Mar 13 10:48:40 2007
 @@ -92,13 +92,13 @@
                 'advice' =>''},
  
@@ -16,15 +16,6 @@
  	       'query' => 'Where to store bounces',
  	       'file' => 'wwsympa.conf',
                 'advice' =>'Better if not in a critical partition'},
-@@ -186,7 +186,7 @@
- 	      {'title' => 'Tuning'},
- 	      	      
- 
--	      {'name' => 'cache\_list\_config',
-+	      {'name' => 'cache_list_config',
- 	       'default' => 'none',
- 	       'query' => 'Use of binary version of the list config structure on disk: none | binary_file',
- 	       'file' => 'sympa.conf','edit' => '1',
 @@ -316,14 +316,14 @@
  	       'advice' =>''},
  
diff --git a/mail/sympa5/pkg-plist b/mail/sympa5/pkg-plist
index d24aa591e0cf..c0064e34b833 100644
--- a/mail/sympa5/pkg-plist
+++ b/mail/sympa5/pkg-plist
@@ -8,7 +8,6 @@ bin/create_db.mysql
 bin/crypt_passwd.pl
 bin/init_comment.pl
 bin/ldap_alias_manager.pl
-bin/load_subscribers.pl
 bin/mod2html.pl
 bin/p12topem.pl
 bin/queue