8 files changed, 104 insertions, 19 deletions

diff --git a/mail/sympa-elixus/Makefile b/mail/sympa-elixus/Makefile
index dd7a4199511e..3f78f3b40009 100644
--- a/mail/sympa-elixus/Makefile
+++ b/mail/sympa-elixus/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	10527
-PORTREVISION=	0
+PORTVERSION=	20041024
 MASTER_SITES=	http://p4.elixus.org/hist/
 PKGNAMESUFFIX=	-elixus
 
@@ -20,8 +19,5 @@ MD5_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-PKGINSTALL=	${MASTERDIR}/pkg-install
-PKGDEINSTALL=	${MASTERDIR}/pkg-deinstall
-WRKSRC=		${WRKDIR}/sympa
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/sympa-elixus/distinfo b/mail/sympa-elixus/distinfo
index bcaa80df3d18..ae1c95c19e65 100644
--- a/mail/sympa-elixus/distinfo
+++ b/mail/sympa-elixus/distinfo
@@ -1,2 +1,2 @@
-MD5 (sympa-10527.tar.gz) = 3128e2659ca93a2725abd37132336e48
-SIZE (sympa-10527.tar.gz) = 2776152
+MD5 (sympa-20041024.tar.gz) = 2ebc551d587699d3afd31f6f2ad0b02e
+SIZE (sympa-20041024.tar.gz) = 2705072
diff --git a/mail/sympa-elixus/files/patch-Makefile.in b/mail/sympa-elixus/files/patch-Makefile.in
new file mode 100644
index 000000000000..bae9e3a71b53
--- /dev/null
+++ b/mail/sympa-elixus/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in	Sat Oct 23 16:49:11 2004
++++ Makefile.in	Sat Oct 23 16:49:22 2004
+@@ -644,7 +644,7 @@
+ 	fi \
+ 	fi \
+ 	done; \
+-	if [ "$$INITCONF" ] ; then \
++	#if [ "$$INITCONF" ] ; then \
+ 	echo "###############################################"; \
+ 	echo "It seems to be your first installation of Sympa"; \
+ 	echo "The following wizard will help you create your $(CONFDIR)/sympa.conf and $(CONFDIR)/wwsympa.conf :"; \
diff --git a/mail/sympa-elixus/files/patch-src-etc-script-Makefile b/mail/sympa-elixus/files/patch-src-etc-script-Makefile
new file mode 100644
index 000000000000..de885034b7df
--- /dev/null
+++ b/mail/sympa-elixus/files/patch-src-etc-script-Makefile
@@ -0,0 +1,11 @@
+--- src/etc/script/Makefile.orig	Sat Oct 23 16:44:11 2004
++++ src/etc/script/Makefile	Sat Oct 23 16:44:13 2004
+@@ -23,7 +23,7 @@
+ 
+ SUBSTSRC	=	load_subscribers.pl arc2webarc.pl testldap.pl p12topem.pl init_comment.pl crypt_passwd.pl testlogs.pl mod2html.pl
+ 
+-INITSRC		=	sympa
++INITSRC		=	sympa.sh
+ 
+ #SCRIPTDIR	=	../../../script
+ SCRIPTDIR	=	$(SBINDIR)
diff --git a/mail/sympa-elixus/files/patch-src-sympa_wizard.pl b/mail/sympa-elixus/files/patch-src-sympa_wizard.pl
new file mode 100644
index 000000000000..0e10cae3bc16
--- /dev/null
+++ b/mail/sympa-elixus/files/patch-src-sympa_wizard.pl
@@ -0,0 +1,19 @@
+--- src/sympa_wizard.pl	Sat Oct 23 19:50:48 2004
++++ src/sympa_wizard.pl	Sat Oct 23 19:53:21 2004
+@@ -308,14 +308,14 @@
+ 	       'advice' =>''},
+ 
+               {'name' => 'mhonarc',
+-	       'default' => '/usr/bin/mhonarc',
++	       'default' => '/usr/local/bin/mhonarc',
+ 	       'query' => 'Path to MhOnarc mail2html pluggin',
+ 	       'file' => 'wwsympa.conf','edit' => '1',
+ 	       'advice' =>'This is required for HTML mail archiving'},
+ 
+ 	      {'title' => 'S/MIME pluggin'},
+ 	      {'name' => 'openssl',
+-	       'sample' => '/usr/local/bin/openssl',
++	       'sample' => '/usr/bin/openssl',
+ 	       'query' => 'Path to OpenSSL',
+ 	       'file' => 'sympa.conf','edit' => '1',
+ 	       'advice' =>'Sympa knowns S/MIME if openssl is installed'},
diff --git a/mail/sympa-elixus/files/patch-wwsympa-Makefile b/mail/sympa-elixus/files/patch-wwsympa-Makefile
new file mode 100644
index 000000000000..600a9df2876e
--- /dev/null
+++ b/mail/sympa-elixus/files/patch-wwsympa-Makefile
@@ -0,0 +1,24 @@
+--- wwsympa/Makefile	Sat Oct 23 20:37:35 2004
++++ wwsympa/Makefile	Sat Oct 23 20:39:51 2004
+@@ -21,7 +21,7 @@
+ 
+ sbin_SUBST	=	bounced.pl archived.pl
+ 
+-cgi_SUBST	=	wwsympa.fcgi
++cgi_SUBST	=	wwsympa.fcgi wwsympa-wrapper
+ 
+ lib_SUBST	=	wwslib.pm cookielib.pm bounce-lib.pl Marc.pm Auth.pm
+ 
+@@ -50,9 +50,9 @@
+ 	chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
+ 	chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
+ 	done
+-	@echo "Setting SetUID bit on wwsympa.fcgi..."
+-	chmod u+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
+-	chmod g+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
++	@echo "Setting SetUID bit on wwsympa-wrapper..."
++	chmod u+s $(DESTDIR)$(CGIDIR)/wwsympa-wrapper
++	chmod g+s $(DESTDIR)$(CGIDIR)/wwsympa-wrapper
+ 	chmod 755 $(DESTDIR)$(ETCBINDIR)/wws.tt2
+ 	chmod 755 $(DESTDIR)$(ICONSDIR)
+ 	chmod 755 $(DESTDIR)$(LIBDIR)/Marc
diff --git a/mail/sympa-elixus/files/patch-wwsympa-wwsympa-wrapper.c b/mail/sympa-elixus/files/patch-wwsympa-wwsympa-wrapper.c
new file mode 100644
index 000000000000..718cc8334aca
--- /dev/null
+++ b/mail/sympa-elixus/files/patch-wwsympa-wwsympa-wrapper.c
@@ -0,0 +1,11 @@
+--- wwsympa/wwsympa-wrapper.c	Sat Oct 23 20:42:47 2004
++++ wwsympa/wwsympa-wrapper.c	Sat Oct 23 20:42:30 2004
+@@ -0,0 +1,8 @@
++#include <unistd.h>
++
++#define WWSYMPA "/usr/local/sympa/bin/wwsympa.fcgi"
++
++int main(int argn, char **argv, char **envp) {
++    argv[0] = WWSYMPA;
++    execve(WWSYMPA,argv,envp);
++}
diff --git a/mail/sympa-elixus/pkg-plist b/mail/sympa-elixus/pkg-plist
index af4a57b57013..f0b79ea1476f 100644
--- a/mail/sympa-elixus/pkg-plist
+++ b/mail/sympa-elixus/pkg-plist
@@ -1,6 +1,6 @@
+etc/rc.d/sympa.sh
 etc/sympa.conf
 etc/wwsympa.conf
-etc/rc.d/sympa.sh
 sympa/bin/Archive.pm
 sympa/bin/Auth.pm
 sympa/bin/CAS.pm
@@ -78,39 +78,48 @@ sympa/bin/etc/scenari/access_web_archive.private
 sympa/bin/etc/scenari/access_web_archive.public
 sympa/bin/etc/scenari/add.auth
 sympa/bin/etc/scenari/add.closed
+sympa/bin/etc/scenari/add.default
 sympa/bin/etc/scenari/add.owner
 sympa/bin/etc/scenari/add.owner_notify
 sympa/bin/etc/scenari/create_list.intranet
 sympa/bin/etc/scenari/create_list.listmaster
 sympa/bin/etc/scenari/create_list.public_listmaster
+sympa/bin/etc/scenari/d_edit.default
 sympa/bin/etc/scenari/d_edit.owner
 sympa/bin/etc/scenari/d_edit.private
 sympa/bin/etc/scenari/d_edit.public
+sympa/bin/etc/scenari/d_read.default
 sympa/bin/etc/scenari/d_read.owner
 sympa/bin/etc/scenari/d_read.private
 sympa/bin/etc/scenari/d_read.public
 sympa/bin/etc/scenari/del.auth
 sympa/bin/etc/scenari/del.closed
+sympa/bin/etc/scenari/del.default
 sympa/bin/etc/scenari/del.owner
 sympa/bin/etc/scenari/del.owner_notify
 sympa/bin/etc/scenari/edit_list.closed
 sympa/bin/etc/scenari/edit_list.owner
 sympa/bin/etc/scenari/global_remind.listmaster
+sympa/bin/etc/scenari/info.default
 sympa/bin/etc/scenari/info.open
 sympa/bin/etc/scenari/info.private
 sympa/bin/etc/scenari/invite.closed
+sympa/bin/etc/scenari/invite.default
 sympa/bin/etc/scenari/invite.owner
 sympa/bin/etc/scenari/invite.private
 sympa/bin/etc/scenari/invite.public
+sympa/bin/etc/scenari/remind.default
 sympa/bin/etc/scenari/remind.listmaster
 sympa/bin/etc/scenari/remind.owner
 sympa/bin/etc/scenari/review.closed
+sympa/bin/etc/scenari/review.default
 sympa/bin/etc/scenari/review.intranet
 sympa/bin/etc/scenari/review.listmaster
 sympa/bin/etc/scenari/review.owner
 sympa/bin/etc/scenari/review.private
 sympa/bin/etc/scenari/review.public
 sympa/bin/etc/scenari/send.closed
+sympa/bin/etc/scenari/send.default
 sympa/bin/etc/scenari/send.editor
 sympa/bin/etc/scenari/send.editorkey
 sympa/bin/etc/scenari/send.editorkeyonly
@@ -136,6 +145,7 @@ sympa/bin/etc/scenari/subscribe.auth
 sympa/bin/etc/scenari/subscribe.auth_notify
 sympa/bin/etc/scenari/subscribe.auth_owner
 sympa/bin/etc/scenari/subscribe.closed
+sympa/bin/etc/scenari/subscribe.default
 sympa/bin/etc/scenari/subscribe.intranet
 sympa/bin/etc/scenari/subscribe.intranetorowner
 sympa/bin/etc/scenari/subscribe.open
@@ -145,15 +155,18 @@ sympa/bin/etc/scenari/subscribe.owner
 sympa/bin/etc/scenari/subscribe.smime
 sympa/bin/etc/scenari/subscribe.smimeorowner
 sympa/bin/etc/scenari/topics_visibility.conceal
+sympa/bin/etc/scenari/topics_visibility.default
 sympa/bin/etc/scenari/topics_visibility.identified
 sympa/bin/etc/scenari/topics_visibility.noconceal
 sympa/bin/etc/scenari/unsubscribe.auth
 sympa/bin/etc/scenari/unsubscribe.auth_notify
 sympa/bin/etc/scenari/unsubscribe.closed
+sympa/bin/etc/scenari/unsubscribe.default
 sympa/bin/etc/scenari/unsubscribe.open
 sympa/bin/etc/scenari/unsubscribe.open_notify
 sympa/bin/etc/scenari/unsubscribe.owner
 sympa/bin/etc/scenari/visibility.conceal
+sympa/bin/etc/scenari/visibility.default
 sympa/bin/etc/scenari/visibility.intranet
 sympa/bin/etc/scenari/visibility.noconceal
 sympa/bin/etc/scenari/visibility.secret
@@ -183,6 +196,7 @@ sympa/bin/etc/tt2/removed.tt2
 sympa/bin/etc/tt2/review.tt2
 sympa/bin/etc/tt2/sendpasswd.tt2
 sympa/bin/etc/tt2/stats_report.tt2
+sympa/bin/etc/tt2/subscriber_notification.tt2
 sympa/bin/etc/tt2/summary.tt2
 sympa/bin/etc/tt2/welcome.tt2
 sympa/bin/etc/tt2/x509-user-cert-missing.tt2
@@ -276,6 +290,7 @@ sympa/bin/tt2native.pl
 sympa/bin/virtualwrapper
 sympa/bin/wwslib.pm
 sympa/bin/wwsympa.fcgi
+sympa/bin/wwsympa-wrapper
 sympa/doc/contents.png
 sympa/doc/crossref.png
 sympa/doc/img1.old
@@ -358,18 +373,19 @@ sympa/sample/sample-list/config
 sympa/sample/sample-list/info
 sympa/sample/sample-list/message.footer
 sympa/sample/sample-list/welcome.tpl
+sympa/sample/sample-list/welcome.tt2
 sympa/sample/sympa.conf
 sympa/sample/topics.fr.conf
 sympa/sample/topics.hu.conf
 sympa/sample/wwsympa.conf
+@dirrm sympa/spool/tmp
+@dirrm sympa/spool/task
+@dirrm sympa/spool/outgoing
 @dirrm sympa/spool/msg
-@dirrm sympa/spool/digest
 @dirrm sympa/spool/moderation
 @dirrm sympa/spool/expire
+@dirrm sympa/spool/digest
 @dirrm sympa/spool/auth
-@dirrm sympa/spool/outgoing
-@dirrm sympa/spool/tmp
-@dirrm sympa/spool/task
 @dirrm sympa/spool
 @dirrm sympa/sample/sample-list
 @dirrm sympa/sample
@@ -377,11 +393,15 @@ sympa/sample/wwsympa.conf
 @dirrm sympa/nls
 @dirrm sympa/expl
 @dirrm sympa/doc
+@dirrm sympa/bin/etc/wws_templates
 @dirrm sympa/bin/etc/wws.tt2
 @dirrm sympa/bin/etc/tt2
+@dirrm sympa/bin/etc/templates
+@dirrm sympa/bin/etc/task_models
 @dirrm sympa/bin/etc/scenari
 @dirrm sympa/bin/etc/list_task_models
 @dirrm sympa/bin/etc/global_task_models
+@dirrm sympa/bin/etc/general_task_models
 @dirrm sympa/bin/etc/create_list_templates/public_web_forum
 @dirrm sympa/bin/etc/create_list_templates/private_working_group
 @dirrm sympa/bin/etc/create_list_templates/news-letter
@@ -390,13 +410,6 @@ sympa/sample/wwsympa.conf
 @dirrm sympa/bin/etc/create_list_templates/hotline
 @dirrm sympa/bin/etc/create_list_templates/discussion_list
 @dirrm sympa/bin/etc/create_list_templates
-@dirrm sympa/etc/create_list_templates
-@dirrm sympa/etc/templates
-@dirrm sympa/etc/wws_templates
-@dirrm sympa/etc/scenari
-@dirrm sympa/etc/task_models
-@dirrm sympa/etc/general_task_models
-@dirrm sympa/etc
 @dirrm sympa/bin/etc
 @dirrm sympa/bin/Marc
 @dirrm sympa/bin