4 files changed, 9 insertions, 302 deletions

diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index e19229fe90fb..5f5d73c8b068 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -6,15 +6,19 @@
 #
 
 PORTNAME=	websieve
-PORTVERSION=	0.61
-PORTREVISION=	1
+PORTVERSION=	0.63.a
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME?=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	eik@FreeBSD.org
 COMMENT=	Web based Cyrus IMAP user admin client
 
+DISTVERSION=	063a
+
+.include "options"
+
 .if defined(WITH_CYRUS_IMAPD_VER)
 .if ${WITH_CYRUS_IMAPD_VER} == 22
 RUN_DEPENDS=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd22
@@ -31,7 +35,6 @@ RUN_DEPENDS=	${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \
 .endif
 RUN_DEPENDS+=	${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_REINPLACE=	yes
@@ -47,18 +50,6 @@ FUNCLIB_PL=	funclib.cyrus
 FUNCLIB_PL=	funclib.pl
 .endif
 
-# We can not test .if exists(${CYRUS_IMAP_PM}) here
-# because SITE_PERL is defined in <bsd.port.post.mk>
-.if !defined(WITH_CYRUS_IMAPD_VER)
-pre-everything::
-	@${ECHO_CMD} "If you want to use the Cyrus IMAP and Sieve perl modules"
-	@${ECHO_CMD} "hit Ctrl-C right now and use WITH_CYRUS_IMAPD_VER=22, 21 or 20"
-	@${ECHO_CMD}
-	@${ECHO_CMD} "The Cyrus perl modules do not support SSL, but better"
-	@${ECHO_CMD} "authentication mechanisms than cleartext PLAIN."
-	@${ECHO_CMD}
-.endif
-
 post-configure:
 	@${REINPLACE_CMD} -e "s,require[ 	]*'\./\([^']*\)',require '${PREFIX}/etc/websieve/\1'," \
 		${WRKSRC}/websieve.pl
diff --git a/mail/websieve/distinfo b/mail/websieve/distinfo
index 28e5bf36ff30..8f53f7f7fda8 100644
--- a/mail/websieve/distinfo
+++ b/mail/websieve/distinfo
@@ -1,2 +1,2 @@
-MD5 (websieve-0.61.tar.gz) = 5f2d01a2479f8cdd8e2ea4fd1a09163e
-SIZE (websieve-0.61.tar.gz) = 72247
+MD5 (websieve-063a.tar.gz) = 1be93527d5f03baed35c8e8fb16eeb0f
+SIZE (websieve-063a.tar.gz) = 101848
diff --git a/mail/websieve/files/patch-websieve.conf b/mail/websieve/files/patch-websieve.conf
deleted file mode 100644
index 13e7ccb3fcf7..000000000000
--- a/mail/websieve/files/patch-websieve.conf
+++ /dev/null
@@ -1,76 +0,0 @@
---- websieve.conf.orig	Fri Apr 25 15:55:52 2003
-+++ websieve.conf	Fri Apr 25 16:02:55 2003
-@@ -1,10 +1,10 @@
- #Websieve configuration file
- 
- #set $useldapextras=1 to use Jules Agee's ldap administration functions
--$useldapextras=1;
-+$useldapextras=0;
- 
- #set $useauth=1 to use ldap (for ldap password changes)
--$useauth=1;
-+$useauth=0;
- $LDAP_SERVER='localhost';
- $LDAP_BASEDN='o=toshiba of canada,c=ca';
- $ENCRYPT_PASS=1;
-@@ -16,17 +16,17 @@
- # You can write you own functions to change passwords on a different auth
- # mechanism such as on a MysSql server, Qualcomm poppassd server, etc.
- 
--require "./custom.pl";
-+#require "/usr/local/etc/websieve/custom.pl";
- 
- #secret key - CHANGE THIS to some random data!!!!
- $skey = "your secret key CEDEFEKJKIIEIOO***#KIKIDKKEUIULJLJKJ";
- #use RC4 algorithm for encryption instead of rot13
- $userc4=1;
- #cyrus admin user id that is used for general mailbox administration
--$cyrusadminuid='admin';
-+$cyrusadminuid='cyrus';
- 
- # default imap server host name 
--$imapserver='imap.toshiba.ca';
-+$imapserver='localhost';
- 
- #make sure you set this to your program virtual name and path
- #$program_url = "/cgi-bin/websieve.pl" ;      # URL for this program
-@@ -36,7 +36,7 @@
- $imapport='143';
- 
- #your mail domain
--$maildomain='test.toshiba.ca' ;
-+$maildomain='example.com' ;
- 
- #default FQHN of the  mail server for use in vacation addresses
- $mailhostappend="imap.$maildomain";
-@@ -60,10 +60,8 @@
- #$sieveport,$imapport,$maildomain, $imapserver and $usexxxSSL will be used instead.
- 
- %server_hosts=(
--"imap.toshiba.ca"=>['Local Server','143','2000','toshiba.ca','imap.toshiba.ca'],
--"otherhost"=>['Some otherhost','993','2000','maildomain2','vacationhost2','ssl_imap'],
--"mtl.toshiba.ca"=>['Mtl Server','143','2000','toshiba.ca','mtl.toshiba.ca'],
--"otherhostname"=>['other Imap Server','143','2000','other.toshiba.ca','vacationhost3']
-+"localhost"=>['Local Server','143','2000','example.com','example.com'],
-+"127.0.0.1"=>['Secure Server','993','2000','example.com','example.com','ssl_imap']
- );
- 
- # show server selection option at login otherwise defaults to $imapserver
-@@ -85,7 +83,7 @@
- $header1="Mail Account Management";
- 
- # This is the address that supports your mail server
--$problem_email="administrator\@$maildomain" ;
-+$problem_email="postmaster\@$maildomain" ;
- 
- # list of additional namespaces on IMAP server
- @namespaces = ("public2");
-@@ -183,7 +181,7 @@
- 
- # Menu selections 
- $LOGOUTURL="<a href=$program_url?op=logout>[LOGOUT]</a>" if !$LOGOUTURL;
--$HOMEURL="<a href=/index.html>[HOME]</a>";
-+$HOMEURL="<a href=/>[HOME]</a>";
- $HELPURL="<a href=/mailhelp.html>[HELP]</a>";
- $VIEWRULESURL="<a href=$program_url?op=viewrules>[View/Edit Rules]</a>";
- $FORWARDALLURL="<a href=$program_url?op=forward>[Forward Mail]</a>";
diff --git a/mail/websieve/files/patch-websieve.pl b/mail/websieve/files/patch-websieve.pl
deleted file mode 100644
index e0c7b5b3b44f..000000000000
--- a/mail/websieve/files/patch-websieve.pl
+++ /dev/null
@@ -1,208 +0,0 @@
---- websieve.pl.orig	Mon Sep 17 01:23:49 2001
-+++ websieve.pl	Fri Apr 25 19:49:30 2003
-@@ -98,7 +98,7 @@
- 	$encode_params=&encode_base64($encode_params) if $userc4;
- 	$auth_cookie=cookie(-name => 'websieve',
- 			-value=>$encode_params,
--			-path=>"$program_url",
-+			-path=>"/",
- 			-expires => 'now');
- 	print header(-cookie=> $auth_cookie);
- 	param('op','');
-@@ -193,7 +193,7 @@
- 	$encode_params=&encode_base64($encode_params) if $userc4;	
- 	$auth_cookie=cookie(-name => 'websieve',
- 			-value=>$encode_params,
--			-path=>"$program_url",
-+			-path=>"/",
- 			-expires => $expires);
- 	if ($uid ne "" && $pass ne "")
- 	{
-@@ -301,7 +301,7 @@
- 	}
- 
- 	print "</TABLE></TD></TABLE>";
--	print "<b>NOTE:&nbspYou will lose ALL changes made to a script in advanced mode if you switch back to basic mode.</b>" if ($mode eq 'advanced' && $op eq 'advanced');
-+	print "<b>NOTE:&nbsp;You will lose ALL changes made to a script in advanced mode if you switch back to basic mode.</b>" if ($mode eq 'advanced' && $op eq 'advanced');
- }
- 
- 
-@@ -405,7 +405,7 @@
- 		else {
- 		    $change=1 ;
- 		    param('mbx',$mbx);
--		    print hidden('mbx');
-+		    #print hidden('mbx');
- 		}
- 	}
- 	if (!$mbx || !(( $acl && $useracl) || $maxquota)) {
-@@ -547,7 +547,7 @@
- 	}
- 	@tmpbox=@mailboxes;
-         print "<TR><TD >",popup_menu('selectedmbx',[@aclview],' ') if ($shortacl);
--	print "&nbsp&nbsp".submit('Select Folder')."&nbsp".submit('Up One Level')."</TD></TR>" if ($shortacl && $ismanager);
-+	print "&nbsp;&nbsp;".submit('Select Folder')."&nbsp;".submit('Up One Level')."</TD></TR>" if ($shortacl && $ismanager);
- 
- 	print "</TABLE>";
- 	print "</TD></TABLE>";
-@@ -567,10 +567,10 @@
- 	if (!$ismanager) {
-                 print popup_menu('mbx',[@tmpbox],' ')."</TD></TR>";
- 	} else {
--		print textfield("mbx","",48)."&nbsp&nbsp&nbsp".submit("Select","Select $subtext")."&nbsp&nbsp(Wildcards allowed [*])</TD></TR>";
-+		print textfield("mbx","",48)."&nbsp;&nbsp;&nbsp;".submit("Select","Select $subtext")."&nbsp;&nbsp;(Wildcards allowed [*])</TD></TR>";
- 	}
- 	print "<TR><TD $cb ><b>Foreign User ID:</b></TD>";
--        print "<TD $cb>".textfield("acluser")."&nbsp(User ID to assign access rights) &nbsp".submit("Set Acl")."</TD></TR>";
-+        print "<TD $cb>".textfield("acluser")."&nbsp;(User ID to assign access rights) &nbsp;".submit("Set Acl")."</TD></TR>";
- 
- 	print "<TD><b> General Rights:</b></TD><TD $cb>".radio_group('rights',[@rights],"-",'',\%rightshash)."</TD></TR>";	
- 	print "<TR><TD $cb><b>Specific Rights:</b></TD><TD $cb>".checkbox_group('acl',[@acls],'','',\%aclhash)."</TD></TR>";
-@@ -580,7 +580,7 @@
- 		param('aclmaxquota',$imapquota[2]);	
- 		print "<TR><TD><$cb><B>Disk Quota Limit (KB):</b></TD><TD $cb>";
- 		print textfield('aclmaxquota',$imapquota[2],20,40);
--	   print "&nbsp&nbsp<b>Disk Quota Used (KB):</b>&nbsp&nbsp".$imapquota[1]."&nbsp&nbsp".submit("Set Quota")."</TD></TR>";
-+	   print "&nbsp;&nbsp;<b>Disk Quota Used (KB):</b>&nbsp;&nbsp;".$imapquota[1]."&nbsp;&nbsp;".submit("Set Quota")."</TD></TR>";
- 	}
- 	print "</TABLE>";
- 	print "</TD></TABLE>",br;
-@@ -592,10 +592,10 @@
- 	param('delmailbox','');
- 	param('newmbx','');
- 	param('partition','');
--	print "<TR><TD $cb ><b>$subtext to Create:</b></TD><TD $cb>".textfield("newmbx")."&nbsp&nbsp";
-+	print "<TR><TD $cb ><b>$subtext to Create:</b></TD><TD $cb>".textfield("newmbx")."&nbsp;&nbsp;";
- 	print "<b>Partition: </b>",textfield("partition") if $ismanager;
--	print"&nbsp&nbsp". submit('Create Mailbox',"Create $subtext")."&nbsp&nbsp</TR>";
--	print "<TR><TD $cb ><b>$subtext to Delete:</b></TD><TD $cb>".textfield("delmailbox")."&nbsp&nbsp&nbsp".submit("Delete This Mailbox","Delete $subtext")."</tr>" if $ismanager;
-+	print"&nbsp;&nbsp;". submit('Create Mailbox',"Create $subtext")."&nbsp;&nbsp;</TR>";
-+	print "<TR><TD $cb ><b>$subtext to Delete:</b></TD><TD $cb>".textfield("delmailbox")."&nbsp;&nbsp;&nbsp;".submit("Delete This Mailbox","Delete $subtext")."</tr>" if $ismanager;
- 
- 	print "</TABLE>";
- 	print "</TD></TABLE>";
-@@ -1046,7 +1046,7 @@
- 	if (!$rulecount) {
- 		print " [No Rules avalailable]<br>";
- 	}
--	print "<hr><center>",submit('Save Changes'),"&nbsp&nbsp",submit("Refresh"),"&nbsp&nbsp",reset("Reset Values"),"</center>";
-+	print "<hr><center>",submit('Save Changes'),"&nbsp;&nbsp;",submit("Refresh"),"&nbsp;&nbsp;",reset("Reset Values"),"</center>";
- 
- 	} # if viewrules
-      if (($op eq 'addrule'  || $modrule) && ($op ne 'forward')) {
-@@ -1057,8 +1057,8 @@
- 	print "<center><b>New Rule Entry for user: </b>$uid</center></TD></TR><TR $cb><TD>";
- 	print "<TABLE >";
- 	print "<TR $cb><TD><b>Rule#: </b>[$rulecount]";
--		print "&nbsp&nbsp<b>Priority: </b>",textfield("rules.priority.$rulecount",$spriority,2);
--		print "&nbsp&nbsp<b>Status: </b>",popup_menu("rules.ruletype.$rulecount",[@ruletype],'ENABLED'),"</TD><TD></TR>";
-+		print "&nbsp;&nbsp;<b>Priority: </b>",textfield("rules.priority.$rulecount",$spriority,2);
-+		print "&nbsp;&nbsp;<b>Status: </b>",popup_menu("rules.ruletype.$rulecount",[@ruletype],'ENABLED'),"</TD><TD></TR>";
- 	my @checked;
- 	my @checkvalues=("copy","keep");
- 	push @checkvalues,"regex" if $useregex;
-@@ -1096,23 +1096,23 @@
- 			param("rules.searchflg.$rulecount","$ssearchflg");
- 			print popup_menu("rules.searchflg.$rulecount",[@flgsts],$ssearchflg,\%searchflghash);	
- 		}	
--		print " field(s):</b></TD><TD $cb>&nbsp 'from' contains ",
-+		print " field(s):</b></TD><TD $cb>&nbsp; 'from' contains ",
- 		"</TD><TD $cb >";
- 		param("rules.from.$rulecount","$sfrom");
- 		print textfield("rules.from.$rulecount","$sfrom",50),"</TD></TR>";
- 		
- ############# TO field
- 		print "<TR>";		
--		print "<TD $cb align=right>&nbsp</TD><TD $cb >";
--		print "&nbsp 'to' contains ",
-+		print "<TD $cb align=right>&nbsp;</TD><TD $cb >";
-+		print "&nbsp; 'to' contains ",
- 		"</TD><TD $cb >";
- 		param("rules.to.$rulecount","$sto");
- 		print textfield("rules.to.$rulecount","$sto",50),"</TD></TR>";
- 
- ########### SUBJECT field
- 		print "<TR></TD>";
--		print "<TD $cb align=right>&nbsp</TD><TD $cb>";
--		print "&nbsp 'subject' contains ",
-+		print "<TD $cb align=right>&nbsp;</TD><TD $cb>";
-+		print "&nbsp; 'subject' contains ",
- 		"</TD><TD $cb>";
- 		param("rules.subject.$rulecount","$ssubject");
- 		print textfield("rules.subject.$rulecount","$ssubject",50),"</TD></TR>";
-@@ -1154,26 +1154,26 @@
- 
- ############## Action REDIRECT 
- 		param("rules.forward.$rulecount","$sdest1");
--		print "<TD $cb>&nbsp</TD><TD $cb><input type=radio $check1 name=rules.desttype.$rulecount value=\"address\"> Forward To </TD><TD $cb>";
-+		print "<TD $cb>&nbsp;</TD><TD $cb><input type=radio $check1 name=rules.desttype.$rulecount value=\"address\"> Forward To </TD><TD $cb>";
- 		print textfield("rules.forward.$rulecount",$sdest1,50)," (Email Address) </TD></TR><TR>";
- 
- ############### Action REPLY WITH	
- 		if ($usereply) {
- 
- 			param("rules.reply.$rulecount","$sdest2") if (defined $sdest2);
--			print "<TD $cb>&nbsp</TD><TD $cb valign=top><input type=radio $check2 name=rules.desttype.$rulecount value=\"reply\"> Reply With  </TD><TD $cb>";
-+			print "<TD $cb>&nbsp;</TD><TD $cb valign=top><input type=radio $check2 name=rules.desttype.$rulecount value=\"reply\"> Reply With  </TD><TD $cb>";
- 			print textarea("rules.reply.$rulecount",$sdest2,2,43)," (Text Message) </TD></TR>";
- 
- 		}
- ############## Action Reject  
- 	     if ($usereject) { 
- 	        	param("rules.reject.$rulecount","$sdest3");
--		        print "<TD $cb>&nbsp</TD><TD $cb valign=top><input type=radio $check3 name=rules.desttype.$rulecount value=\"reject\"> Reject </TD><TD $cb>";
-+		        print "<TD $cb>&nbsp;</TD><TD $cb valign=top><input type=radio $check3 name=rules.desttype.$rulecount value=\"reject\"> Reject </TD><TD $cb>";
- 		        print textarea("rules.reject.$rulecount",$sdest3,2,43)," (Text Message) </TD></TR>";
- 	     }
- ############## Action Discard  
- 	     if ($usediscard) { 
--		        print "<TD $cb>&nbsp</TD><TD $cb valign=top><input type=radio $check4 name=rules.desttype.$rulecount value=\"discard\"> Discard </TD><TD $cb>&nbsp</TD></TR>";
-+		        print "<TD $cb>&nbsp;</TD><TD $cb valign=top><input type=radio $check4 name=rules.desttype.$rulecount value=\"discard\"> Discard </TD><TD $cb>&nbsp;</TD></TR>";
- 	     }
- 
- ############### Action CustomCode	
-@@ -1196,7 +1196,7 @@
- 	print hr,"<TABLE ><TR><TD >$wild</TD></TABLE>";
- 
- 	$rulecount--;
--	print hr,"<center>",submit("Save Rule "),"&nbsp&nbsp",reset('Clear'),"</center>";
-+	print hr,"<center>",submit("Save Rule "),"&nbsp;&nbsp;",reset('Clear'),"</center>";
- 
-       } # if addrule
- 
-@@ -1248,7 +1248,7 @@
- 	print "<TD $cb><b>Server: </b>$imapserver</TD><TD $cb><b>Userid: </b>$uid</TD>"; 
- 	print "<TD $cb><b>Used Quota: </b>";
- 	if ($percent ne "") {
--		print "[<b>$quota[1]</b> kbytes used /<b> $quota[2]</b> kbytes available.($percent\% usage)]</TD>";
-+		print "[<b>$quota[1]</b> kbytes used /<b> $quota[2]</b> kbytes available. ($percent\% usage)]</TD>";
- 	} else {
- 		print "<TD $cb><b>$quota[1]</b> No limits</TD>";
- 	};
-@@ -1387,7 +1387,7 @@
- 	print start_form(-action=>$program_url);
- 	$gomodifyit = 'yes';
- 	 print hidden('s',$sencode_params) if $useservercookie;
--	 print "<center>",submit('Save Changes'),"&nbsp&nbsp",submit("Refresh"),"&nbsp&nbsp",reset('Reset Values'),"</center>" if $op;
-+	 print "<center>",submit('Save Changes'),"&nbsp;&nbsp;",submit("Refresh"),"&nbsp;&nbsp;",reset('Reset Values'),"</center>" if $op;
- 	param('op',$op);
- 	if (param('action') && param('action') eq 'deletembx') {
- 		&deleteimapmailbox;
-@@ -1407,7 +1407,7 @@
- 	&initscripts(%scripts);
- 	if ($op eq 'setacl') {
- 	 	&viewacl if $useacl;
--		print "<hr><center>",submit('Save Changes'),"&nbsp&nbsp",submit("Refresh"),"&nbsp&nbsp",reset('Reset Values'),"</center>";
-+		print "<hr><center>",submit('Save Changes'),"&nbsp;&nbsp;",submit("Refresh"),"&nbsp;&nbsp;",reset('Reset Values'),"</center>";
- 
- 	}
- 	if ($mode =~ /basic/i && $op ne 'setacl') {
-@@ -1420,7 +1420,7 @@
- #		print "printing $op<br>";
- 
- 		&printscript($scripts{'script'}) ;
--	print "<hr><center>",submit('Save Changes'),"&nbsp&nbsp",submit("Refresh"),"&nbsp&nbsp",reset('Reset Values'),"</center>";
-+	print "<hr><center>",submit('Save Changes'),"&nbsp;&nbsp;",submit("Refresh"),"&nbsp;&nbsp;",reset('Reset Values'),"</center>";
- 
- 
- 	}