ports/167121: [PATCH] mail/sympa: update to 6.1.9

[Geoffroy Desvernay]

>Number:         167121
>Category:       ports
>Synopsis:       [PATCH] mail/sympa: update to 6.1.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 20 11:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sun Jan 15 17:00:54 CET 2012
>Description:
- Update to 6.1.9
- Fix init script for FreeBSD
- Allow use without apache (fastcgi/nginx for example) if WITHOUT_APACHE is defined

Added file(s):
- files/patch-src__etc__script__sympa.in

Port maintainer (crees at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_5 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- sympa-6.1.9.patch begins here ---
diff -ruN --exclude=CVS ../sympa.orig/Makefile ./Makefile
--- ../sympa.orig/Makefile	2012-01-01 17:47:34.000000000 +0100
+++ ./Makefile	2012-04-20 12:26:54.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sympa
-PORTVERSION=	6.1.7
+PORTVERSION=	6.1.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -14,6 +14,8 @@
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Sympa is an electronic mailing list manager
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS+=								\
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI	\
@@ -38,8 +40,6 @@
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-LICENSE=	GPLv2
-
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
 
@@ -47,7 +47,6 @@
 GROUPS=		sympa
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_APACHE=	20+
 ICONSDIR?=	www/icons
 CONFIGURE_ARGS+=--bindir=${PREFIX}/libexec/${PORTNAME}	\
 		--libexecdir=${PREFIX}/libexec/${PORTNAME} \
@@ -90,10 +89,13 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FASTCGI)
-BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
-		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
-		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI
+. if !defined(WITHOUT_APACHE)
+USE_APACHE=	20+
+BUILD_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+RUN_DEPENDS+=   ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+. endif
 .endif
 
 .if ${DB_TYPE:L} == "oracle"
@@ -119,7 +121,8 @@
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	DB_TYPE=type	Optional: mysql, Oracle, Pg or Sybase"
-	@${ECHO_MSG} "	WITH_FASTCGI	Use FastCGI instead of plain CGI (Apache only)"
+	@${ECHO_MSG} "	WITH_FASTCGI	Use FastCGI instead of plain CGI"
+	@${ECHO_MSG} "	WITHOUT_APACHE	Use FastCGI without apache (spawn-fcgi or ?)"
 	@${ECHO_MSG} ""
 
 pre-install:
diff -ruN --exclude=CVS ../sympa.orig/distinfo ./distinfo
--- ../sympa.orig/distinfo	2011-09-06 19:02:20.000000000 +0200
+++ ./distinfo	2012-04-20 11:17:47.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (sympa-6.1.7.tar.gz) = 8ca88ceac336fa1e750e52f1be20720ba463cf541bab1da4182297fe35a2b4ac
-SIZE (sympa-6.1.7.tar.gz) = 7398417
+SHA256 (sympa-6.1.9.tar.gz) = 806531d73ac897b6535904d1a1a90792bd7ea4369a61d6901525a423b14d1b64
+SIZE (sympa-6.1.9.tar.gz) = 7431550
diff -ruN --exclude=CVS ../sympa.orig/files/patch-src__etc__script__sympa.in ./files/patch-src__etc__script__sympa.in
--- ../sympa.orig/files/patch-src__etc__script__sympa.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src__etc__script__sympa.in	2012-04-20 12:36:29.000000000 +0200
@@ -0,0 +1,38 @@
+--- src/etc/script/sympa.in.orig	2010-11-17 08:25:42.000000000 +0100
++++ src/etc/script/sympa.in	2012-04-20 12:35:40.000000000 +0200
+@@ -2,6 +2,10 @@
+ #
+ # sympa			Mailing Lists Management System
+ #
++# PROVIDE: sympa
++# REQUIRE: LOGIN cleanvar
++# KEYWORD: shutdown
++#
+ # Written by Michel Bouissou  20/07/2000
+ #
+ # Modified by Olivier Salaun 27/07/2000
+@@ -159,7 +163,7 @@
+ 	if [ "$pids" != "" ]; then
+ 	    for pid in $pids; do
+ 		killcount=0
+-		running=`ps -A | grep "$pid ..* $1\\.pl"`
++		running=`ps -A | grep "$pid .* $1\\.pl"`
+ 		while [ "$running" != "" ]; do
+ 		    if [ $killcount -gt 10 ]; then
+ 			if [ ${use_functions} ]; then
+@@ -171,13 +175,13 @@
+ 		    fi
+ 
+ 		    kill -TERM $pid >/dev/null 2>&1
+-		    running=`ps -A | grep "$pid ..* $1\\.pl"`
++		    running=`ps -A | grep "$pid .* $1\\.pl"`
+ 		    if [ "$running" = "" ]; then
+ 			runcount=`expr $runcount + 1`
+ 			break
+ 		    fi
+ 		    sleep 2
+-		    running=`ps -A | grep "$pid ..* $1\\.pl"`
++		    running=`ps -A | grep "$pid .* $1\\.pl"`
+ 		    if [ "$running" = "" ]; then
+ 			runcount=`expr $runcount + 1`
+ 			break
--- sympa-6.1.9.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: