3 files changed, 54 insertions, 13 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index b59dff03e73a..a642fd34c4ff 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -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 @@ MASTER_SITES=	http://www.sympa.org/distribution/ \
 MAINTAINER=	crees@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 @@ BUILD_DEPENDS+=								\
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-LICENSE=	GPLv2
-
 # Ignore alpha/beta versions
 PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
 
@@ -47,7 +47,6 @@ USERS=		sympa
 GROUPS=		sympa
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_APACHE=	20+
 ICONSDIR?=	www/icons
 CONFIGURE_ARGS+=--bindir=${PREFIX}/libexec/${PORTNAME}	\
 		--libexecdir=${PREFIX}/libexec/${PORTNAME} \
@@ -87,13 +86,16 @@ DB_TYPE=
 USE_MYSQL=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.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 @@ pre-fetch:
 	@${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:
@@ -141,4 +144,4 @@ post-install:
 	@PKG_PREFIX=${PREFIX} DB_TYPE=${DB_TYPE} WITH_FASTCGI=${WITH_FASTCGI} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 8d62aa7192dc..6bd6f103be32 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -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 --git a/mail/sympa/files/patch-src__etc__script__sympa.in b/mail/sympa/files/patch-src__etc__script__sympa.in
new file mode 100644
index 000000000000..31abae057836
--- /dev/null
+++ b/mail/sympa/files/patch-src__etc__script__sympa.in
@@ -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
\ No newline at end of file