upgrade to version 1.65

mail/openwebmail/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2002/03/28 11:45:28 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2002/06/28 01:11:45 kevlo Exp $
 
 COMMENT=	"highly configurable webmail client"
 
-DISTNAME=	openwebmail-1.63
+DISTNAME=	openwebmail-1.65
 CATEGORIES=	mail
 NEED_VERSION=	1.504
 
@@ -25,8 +25,7 @@ RUN_DEPENDS=	::net/p5-libnet \
 		::www/p5-CGI \
 		::converters/p5-MIME-Base64 \
 		::databases/p5-ldap \
-		::textproc/ispell \
-		::chinese/hc
+		::textproc/ispell
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes

mail/openwebmail/distinfo

@@ -1,3 +1,3 @@
-MD5 (openwebmail-1.63.tgz) = 260d2930aa6fe271f09e2ed4eeabc67c
-RMD160 (openwebmail-1.63.tgz) = c3808c0cf73ec69087c142ab4ea6b753ee267aeb
-SHA1 (openwebmail-1.63.tgz) = 100628a375d2adcaa56dce284b3697a0b69ec738
+MD5 (openwebmail-1.65.tgz) = 9b432995eaa5364673ef8305f58824c6
+RMD160 (openwebmail-1.65.tgz) = 50f755da86a0f0cbe34675bd822cb828b8c9a971
+SHA1 (openwebmail-1.65.tgz) = 69793d7465a6b164e5e81ae047846103e1c8a41e

mail/openwebmail/patches/patch-checkmail.pl

@@ -1,9 +1,9 @@
---- cgi-bin/openwebmail/checkmail.pl.orig	Fri Mar 22 14:50:44 2002
-+++ cgi-bin/openwebmail/checkmail.pl	Fri Mar 22 14:51:49 2002
-@@ -31,8 +31,8 @@
+--- cgi-bin/openwebmail/checkmail.pl.orig	Thu Jun 27 17:16:18 2002
++++ cgi-bin/openwebmail/checkmail.pl	Thu Jun 27 17:17:34 2002
+@@ -26,8 +26,8 @@
  require "pop3mail.pl";
  
- local (%config, %config_raw);
+ use vars qw(%config %config_raw);
 -readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf.default");
 -readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
 +readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");

mail/openwebmail/patches/patch-openwebmail-shared.pl

@@ -1,6 +1,6 @@
---- cgi-bin/openwebmail/openwebmail-shared.pl.orig	Fri Mar 22 14:58:41 2002
-+++ cgi-bin/openwebmail/openwebmail-shared.pl	Fri Mar 22 15:00:27 2002
-@@ -35,8 +35,8 @@
+--- cgi-bin/openwebmail/openwebmail-shared.pl.orig	Thu Jun 27 17:21:07 2002
++++ cgi-bin/openwebmail/openwebmail-shared.pl	Thu Jun 27 17:23:21 2002
+@@ -50,8 +50,8 @@
  ###################### OPENWEBMAIL_INIT ###################
  # init routine to set globals, switch euid
  sub openwebmail_init {
@@ -8,10 +8,10 @@
 -   readconf(\%config, \%config_raw, "$SCRIPT_DIR/etc/openwebmail.conf") if (-f "$SCRIPT_DIR/etc/openwebmail.conf");
 +   readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf.default");
 +   readconf(\%config, \%config_raw, "%%SYSCONFDIR%%/openwebmail/openwebmail.conf") if (-f "%%SYSCONFDIR%%/openwebmail/openwebmail.conf");
- 
     # setuid is required if mails is located in user's dir
     if ( $>!=0 && ($config{'use_homedirspools'}||$config{'use_homedirfolders'}) ) {
-@@ -100,7 +100,8 @@
+       print "Content-type: text/html\n\n'$0' must setuid to root"; exit 0;
+@@ -127,7 +127,8 @@
     %style = %{&readstyle};
  
     ($prefs{'language'} =~ /^([\w\d\._]+)$/) && ($prefs{'language'} = $1);

mail/openwebmail/patches/patch-openwebmail_conf_default

@@ -1,49 +1,22 @@
---- cgi-bin/openwebmail/etc/openwebmail.conf.default.orig	Fri Mar 22 15:21:21 2002
-+++ cgi-bin/openwebmail/etc/openwebmail.conf.default	Fri Mar 22 15:23:30 2002
-@@ -161,7 +161,7 @@
- #
- # ow_cgidir : the directory for openwebmail cgi programs
- #
+--- cgi-bin/openwebmail/etc/openwebmail.conf.default.orig	Thu Jun 27 17:25:52 2002
++++ cgi-bin/openwebmail/etc/openwebmail.conf.default	Thu Jun 27 17:30:33 2002
+@@ -41,15 +41,15 @@
+ # openwebmail system configuration
+ ##############################################################################
+ http_protocol		auto
 -ow_cgidir		/usr/local/www/cgi-bin/openwebmail
 +ow_cgidir		/var/www/cgi-bin/openwebmail
- 
- #
- # ow_cgiurl : the url for ow_cgidir
-@@ -171,7 +171,7 @@
- #
- # ow_htmldir : the directory for openwebmail webpage/image/sound files
- #
+ ow_cgiurl		/cgi-bin/openwebmail
 -ow_htmldir		/usr/local/www/data/openwebmail
 +ow_htmldir		/var/www/htdocs/openwebmail
- 
- #
- # ow_htmlurl : the url for ow_htmldir
-@@ -194,7 +194,7 @@
- #     user that openwebmail script will be running as (root in many cases) for
- #     better security.
- #
+ ow_htmlurl		/openwebmail
 -ow_etcdir		%ow_cgidir%/etc
 +ow_etcdir		/var/www/conf/openwebmail
- 
- #
- # logo_url : This graphic that appears at the top of openwebmail login pages.
-@@ -226,7 +226,7 @@
- # logfile : This should be set either to 'no' or the filename of a file
- # you'd like to log actions to.
- #
+ logo_url		%ow_htmlurl%/images/openwebmail.gif
+ logo_link		http://openwebmail.org/
+ sound_url		%ow_htmlurl%/yougotmail.wav
 -logfile			%ow_cgidir%/openwebmail.log
 +logfile			/var/log/openwebmail.log
- 
- #
- # global_addressbook : addressbook shared by all user
-@@ -274,8 +274,8 @@
- #
- # these 2 converter will be required only if lang is 'tw' or 'cn'
- #
--g2b_converter		%ow_cgidir%/hc -mode g2b -t %ow_cgidir%/hc.tab
--b2g_converter		%ow_cgidir%/hc -mode b2g -t %ow_cgidir%/hc.tab
-+g2b_converter		/usr/local/bin/hc -mode g2b -t /usr/local/share/hc/hc.tab
-+b2g_converter		/usr/local/bin/hc -mode b2g -t /usr/local/share/hc/hc.tab
- 
- #
- # allowed_clientip : This limits the clients that can access the openwebmail
+ global_addressbook	%ow_etcdir%/address.book
+ global_filterbook	%ow_etcdir%/filter.book
+ g2b_map			%ow_etcdir%/g2b.map

mail/openwebmail/pkg/INSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.4 2002/04/26 03:35:34 pvalchev Exp $
+# $OpenBSD: INSTALL,v 1.5 2002/06/28 01:11:53 kevlo Exp $
 #
 # Pre/post-installation setup of openwebmail
 
@@ -13,7 +13,8 @@ CGI_DIR=${PREFIX}/cgi-bin/openwebmail
 SAMPLE_CONFIG_FILE=$CONFIG_FILE.default
 SCRIPTFILES="checkmail.pl openwebmail-main.pl openwebmail-prefs.pl \
 	    openwebmail-read.pl openwebmail-send.pl openwebmail-viewatt.pl \
-	    openwebmail.pl openwebmail-spell.pl openwebmail-folder.pl"
+	    openwebmail.pl openwebmail-spell.pl openwebmail-folder.pl \
+	    openwebmail-abook.pl"
 
 # Function: set up mail group 
 #