6 files changed, 28 insertions, 191 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index e9bd5e0387bf..35ea410dff53 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sympa
-PORTVERSION=	6.0.5
+PORTVERSION=	6.1.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -14,8 +14,6 @@ MASTER_SITES=	http://www.sympa.org/distribution/ \
 MAINTAINER=	utisoft@gmail.com
 COMMENT=	Sympa is an electronic mailing list manager
 
-LICENSE=	GPLv2
-
 BUILD_DEPENDS+=	${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
@@ -28,14 +26,18 @@ BUILD_DEPENDS+=	${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+LICENSE=	GPLv2
+
 HAS_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_APACHE=	1.3+
 CONFIGURE_ARGS+=--prefix=${PREFIX}/sympa \
 		--with-confdir=${PREFIX}/etc \
+		--with-docdir=${EXAMPLESDIR} \
 		--with-initdir=${PREFIX}/etc/rc.d \
 		--with-etcdir=${PREFIX}/sympa/bin/etc \
 		--with-iconsdir=${PREFIX}/www/icons \
+		--with-lockdir=/var/spool/lock \
 		--mandir=${PREFIX}/man \
 		${CONFIGURE_TARGET}
 CONFIGURE_ENV+=	lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
@@ -94,6 +96,8 @@ pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-patch:
+	${REINPLACE_CMD} -e 's/\$$(DESTDIR)\$$(sampledir)/\$$(sampledir)/g' \
+		${WRKSRC}/doc/sample/Makefile.in
 	@${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \;
 
 post-install:
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index aa34262a46f4..8e2ed832eeed 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,3 +1,2 @@
-MD5 (sympa-6.0.5.tar.gz) = b39527940f31358090803c677cc31d39
-SHA256 (sympa-6.0.5.tar.gz) = e2dea61f7c7de3300d89b341ebf774655f636134dc022123d93ad268ca40877a
-SIZE (sympa-6.0.5.tar.gz) = 6581038
+SHA256 (sympa-6.1.3.tar.gz) = 1b258588b9076a480966b4d08f463e9a561bfda1d798bb879adbbfe96c95d9fd
+SIZE (sympa-6.1.3.tar.gz) = 6940694
diff --git a/mail/sympa/files/patch-doc-sample-Makefile.am b/mail/sympa/files/patch-doc-sample-Makefile.am
deleted file mode 100644
index a1fdc986a1bb..000000000000
--- a/mail/sympa/files/patch-doc-sample-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/sample/Makefile.am	2009-07-28 12:13:00.000000000 +0000
-+++ doc/sample/Makefile.am-bkp	2010-07-29 07:04:25.000000000 +0000
-@@ -19,7 +19,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
--sampledir = $(docdir)/sample
-+sampledir = /usr/local/share/examples/sympa
- nobase_sample_DATA = README \
- 		     trusted_applications.conf robot.conf employees.ldap \
- 		     test/config test/info test/message.footer test/web_tt2/welcome.tt2
diff --git a/mail/sympa/files/patch-doc-sample-Makefile.in b/mail/sympa/files/patch-doc-sample-Makefile.in
deleted file mode 100644
index 72f6c277bdef..000000000000
--- a/mail/sympa/files/patch-doc-sample-Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/sample/Makefile.in	2010-07-06 14:12:30.000000000 +0000
-+++ doc/sample/Makefile.in-bkp	2010-07-29 01:00:41.000000000 +0000
-@@ -71,7 +71,7 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(sampledir)"
-+am__installdirs = "$(sampledir)"
- nobase_sampleDATA_INSTALL = $(install_sh_DATA)
- DATA = $(nobase_sample_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -177,7 +177,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- webtemplatedir = @webtemplatedir@
--sampledir = $(docdir)/sample
-+sampledir = /usr/local/share/examples/sympa
- nobase_sample_DATA = README \
- 		     trusted_applications.conf robot.conf employees.ldap \
- 		     test/config test/info test/message.footer test/web_tt2/welcome.tt2
-@@ -218,13 +218,13 @@
- uninstall-info-am:
- install-nobase_sampleDATA: $(nobase_sample_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sampledir)" || $(mkdir_p) "$(DESTDIR)$(sampledir)"
-+	test -z "$(sampledir)" || $(mkdir_p) "$(sampledir)"
- 	@$(am__vpath_adj_setup) \
- 	list='$(nobase_sample_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  $(am__vpath_adj) \
--	  echo " $(nobase_sampleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sampledir)/$$f'"; \
--	  $(nobase_sampleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sampledir)/$$f"; \
-+	  echo " $(nobase_sampleDATA_INSTALL) '$$d$$p' '$(sampledir)/$$f'"; \
-+	  $(nobase_sampleDATA_INSTALL) "$$d$$p" "$(sampledir)/$$f"; \
- 	done
- 
- uninstall-nobase_sampleDATA:
-@@ -232,8 +232,8 @@
- 	@$(am__vpath_adj_setup) \
- 	list='$(nobase_sample_DATA)'; for p in $$list; do \
- 	  $(am__vpath_adj) \
--	  echo " rm -f '$(DESTDIR)$(sampledir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(sampledir)/$$f"; \
-+	  echo " rm -f '$(sampledir)/$$f'"; \
-+	  rm -f "$(sampledir)/$$f"; \
- 	done
- tags: TAGS
- TAGS:
-@@ -243,7 +243,7 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/test $(distdir)/test/web_tt2
-+	$(mkdir_p) /$(sampledir)/test $(sampledir)/test/web_tt2
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-@@ -255,18 +255,18 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(sampledir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
- 	  if test -d $$d/$$file; then \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
--	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	      cp -pR $(srcdir)/$$file $(sampledir)$$dir || exit 1; \
- 	    fi; \
--	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	    cp -pR $$d/$$file $(sampledir)$$dir || exit 1; \
- 	  else \
--	    test -f $(distdir)/$$file \
--	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    test -f $(sampledir)/$$file \
-+	    || cp -p $$d/$$file $(sampledir)/$$file \
- 	    || exit 1; \
- 	  fi; \
- 	done
-@@ -274,7 +274,7 @@
- check: check-am
- all-am: Makefile $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(sampledir)"; do \
-+	for dir in "$(sampledir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
diff --git a/mail/sympa/files/patch-src-etc-script-sympa.in b/mail/sympa/files/patch-src-etc-script-sympa.in
deleted file mode 100644
index b17f70e78104..000000000000
--- a/mail/sympa/files/patch-src-etc-script-sympa.in
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/etc/script/sympa.in.bak	2010-07-25 11:53:14.000000000 +0100
-+++ src/etc/script/sympa.in	2010-07-25 11:58:18.000000000 +0100
-@@ -59,6 +59,8 @@
- sympaconf="--CONFIG--"
- wwsympaconf="--WWSCONFIG--"
- 
-+lockdir="--LOCKDIR--"
-+
- ##'echo -n' not supported with SH on Solaris
- if [ ${OSTYPE} = "SunOS" ]; then
-   echo_opt=""
-@@ -66,6 +68,10 @@
-   echo_opt="-n"
- fi
- 
-+if [ ${OSTYPE} = "FreeBSD" ]; then
-+	lockdir="/var/spool/lock"
-+fi
-+
- # End of parameters
- 
- # Current state of the module
-@@ -85,7 +91,7 @@
-        if [ -f --piddir--/$1.pid ] ; then
-              pid=`head -1 --piddir--/$1.pid`
-              if [ "$pid" != "" ] ; then
--                 running=`ps -A | grep "$pid"`
-+                 running=`ps -ax | grep perl | grep "$pid"`
-                  if [ "$running" != "" ]; then
-                      echo "$1 (pid $pid) is active..."
-                      return 0
-@@ -155,7 +161,7 @@
- 	if [ -f --piddir--/$1.pid ]; then
- 		echo $echo_opt "Stopping module $1.pl: "
- 		pid=`head -1 --piddir--/$1.pid`
--		running=`ps -A | grep "$pid"`
-+		running=`ps -ax | grep perl | grep "$pid"`
- 		if [ $1 = 'bulk' ]; then
- 		    if [ ${use_functions} ]; then
- 			kill -TERM $pid && success || failure
-@@ -197,14 +203,14 @@
- # See how we were called.
- case "$1" in
-   start)
--	if [ ! -f --lockdir--/sympa ]; then
-+	if [ ! -f $lockdir/sympa ]; then
- 		echo "Starting Sympa subsystem: "
- 		sympa_start sympa
- 		sympa_start bulk
- 		sympa_start archived
- 		sympa_start bounced
- 		sympa_start task_manager
--		touch --lockdir--/sympa
-+		touch $lockdir/sympa
- 		echo
- 	else
- 
-@@ -226,13 +232,13 @@
- 		sympa_stop sympa-creation
- 	fi
- 	sympa_stop task_manager
--	if [ -f --lockdir--/sympa ]; then
--		rm -f --lockdir--/sympa
-+	if [ -f $lockdir/sympa ]; then
-+		rm -f $lockdir/sympa
- 	fi
- 	;;
-   status)
- 	echo "Status of Sympa subsystem: "
--	if [ -f --lockdir--/sympa ]; then
-+	if [ -f $lockdir/sympa ]; then
- 		echo "Status file for subsystem found."
- 	else
- 		echo "Status file for subsystem NOT found."
diff --git a/mail/sympa/pkg-plist b/mail/sympa/pkg-plist
index 0b521b9ccc1f..97bc29ad32d9 100644
--- a/mail/sympa/pkg-plist
+++ b/mail/sympa/pkg-plist
@@ -236,6 +236,7 @@ sympa/default/scenari/send.public_nobcc
 sympa/default/scenari/send.publickey
 sympa/default/scenari/send.publicnoattachment
 sympa/default/scenari/send.publicnomultipart
+sympa/default/scenari/spam_status.x-spam-status
 sympa/default/scenari/subscribe.auth
 sympa/default/scenari/subscribe.auth_notify
 sympa/default/scenari/subscribe.auth_owner
@@ -277,9 +278,11 @@ sympa/default/web_tt2/arc_protect.tt2
 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/blacklist.tt2
 sympa/default/web_tt2/button_footer.tt2
 sympa/default/web_tt2/button_header.tt2
+sympa/default/web_tt2/ca.tt2
 sympa/default/web_tt2/change_email.tt2
 sympa/default/web_tt2/change_email_request.tt2
 sympa/default/web_tt2/choosepasswd.tt2
@@ -299,6 +302,7 @@ sympa/default/web_tt2/d_upload.tt2
 sympa/default/web_tt2/dump_scenario.tt2
 sympa/default/web_tt2/dumpvars.tt2
 sympa/default/web_tt2/edit_attributes.tt2
+sympa/default/web_tt2/edit_config.tt2
 sympa/default/web_tt2/edit_list_request.tt2
 sympa/default/web_tt2/edit_template.tt2
 sympa/default/web_tt2/editfile.tt2
@@ -330,6 +334,7 @@ sympa/default/web_tt2/javascript.tt2
 sympa/default/web_tt2/latest_arc.tt2
 sympa/default/web_tt2/latest_d_read.tt2
 sympa/default/web_tt2/latest_lists.tt2
+sympa/default/web_tt2/lca.tt2
 sympa/default/web_tt2/list_button_footer.tt2
 sympa/default/web_tt2/list_button_header.tt2
 sympa/default/web_tt2/list_menu.tt2
@@ -368,6 +373,7 @@ sympa/default/web_tt2/serveradmin.tt2
 sympa/default/web_tt2/set_pending_list_request.tt2
 sympa/default/web_tt2/setlang.tt2
 sympa/default/web_tt2/show_cert.tt2
+sympa/default/web_tt2/show_exclude.tt2
 sympa/default/web_tt2/show_sessions.tt2
 sympa/default/web_tt2/sigrequest.tt2
 sympa/default/web_tt2/skinsedit.tt2
@@ -376,6 +382,8 @@ sympa/default/web_tt2/stats.tt2
 sympa/default/web_tt2/subindex.tt2
 sympa/default/web_tt2/suboptions.tt2
 sympa/default/web_tt2/subrequest.tt2
+sympa/default/web_tt2/subscriber_table.tt2
+sympa/default/web_tt2/suspend_request.tt2
 sympa/default/web_tt2/ticket.tt2
 sympa/default/web_tt2/title.tt2
 sympa/default/web_tt2/tt2_error.tt2
@@ -472,16 +480,17 @@ sympa/static_content/icons/sv.png
 sympa/static_content/icons/text.png
 sympa/static_content/icons/top.png
 sympa/static_content/icons/unknown.png
-%%EXAMPLESDIR%%/test/web_tt2/welcome.tt2
-%%EXAMPLESDIR%%/test/config
-%%EXAMPLESDIR%%/test/info
-%%EXAMPLESDIR%%/test/message.footer
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/trusted_applications.conf
-%%EXAMPLESDIR%%/robot.conf
-%%EXAMPLESDIR%%/employees.ldap
-@dirrm %%EXAMPLESDIR%%/test/web_tt2
-@dirrm %%EXAMPLESDIR%%/test
+%%EXAMPLESDIR%%/sample/test/web_tt2/welcome.tt2
+%%EXAMPLESDIR%%/sample/test/config
+%%EXAMPLESDIR%%/sample/test/info
+%%EXAMPLESDIR%%/sample/test/message.footer
+%%EXAMPLESDIR%%/sample/README
+%%EXAMPLESDIR%%/sample/trusted_applications.conf
+%%EXAMPLESDIR%%/sample/robot.conf
+%%EXAMPLESDIR%%/sample/employees.ldap
+@dirrm %%EXAMPLESDIR%%/sample/test/web_tt2
+@dirrm %%EXAMPLESDIR%%/sample/test
+@dirrm %%EXAMPLESDIR%%/sample
 @dirrm %%EXAMPLESDIR%%
 @dirrm sympa/static_content/icons
 @dirrm sympa/static_content