update to 4.0.2

5 files changed, 9 insertions, 55 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index e427f0334e6f..1c0930ccee07 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.2
 PORTREVISION=	0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -102,8 +102,10 @@ USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-authldap
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+PLIST_SUB+=		LDAPFLAG=""
 .else
 CONFIGURE_ARGS+=	--without-authldap
+PLIST_SUB+=		LDAPFLAG="@comment "
 .endif
 
 .if defined(WITH_VCHKPW)
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index a9aaf0e4b955..0efa2e960068 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (sqwebmail-4.0.1.tar.bz2) = d0312654c89dca924dfc958bce204b5a
-SIZE (sqwebmail-4.0.1.tar.bz2) = 1906325
+MD5 (sqwebmail-4.0.2.tar.bz2) = 1501fd17d61a55af5fc7328c905c09d1
+SIZE (sqwebmail-4.0.2.tar.bz2) = 1907472
diff --git a/mail/sqwebmail/files/patch-ldap b/mail/sqwebmail/files/patch-ldap
index dd788f580a39..df479a4cbbfe 100644
--- a/mail/sqwebmail/files/patch-ldap
+++ b/mail/sqwebmail/files/patch-ldap
@@ -11,11 +11,3 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5088,6 +5092,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#include <sys/types.h>
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
diff --git a/mail/sqwebmail/files/patch-sqwebmail::sv-make_timezonelist.pl b/mail/sqwebmail/files/patch-sqwebmail::sv-make_timezonelist.pl
deleted file mode 100644
index a8ed46163540..000000000000
--- a/mail/sqwebmail/files/patch-sqwebmail::sv-make_timezonelist.pl
+++ /dev/null
@@ -1,44 +0,0 @@
---- sqwebmail/sv-make_timezonelist.pl.orig	Sat Oct 11 15:55:15 2003
-+++ sqwebmail/sv-make_timezonelist.pl	Tue Mar 16 21:39:00 2004
-@@ -50,8 +50,14 @@
-   }
- }
- die "Could not find a zoneinfo directory\n" unless ($zoneinfo_dir);
--
--$iso3166tab = "$zoneinfo_dir/iso3166.tab";
-+if ( $^O eq "freebsd" )
-+{
-+  $iso3166tab = "/usr/share/misc/iso3166";
-+}
-+else
-+{
-+  $iso3166tab = "$zoneinfo_dir/iso3166.tab";
-+}
- $zonetab = "$zoneinfo_dir/zone.tab";
- $etc_dir = "$zoneinfo_dir/Etc";
- 
-@@ -59,6 +65,7 @@
- 
- open(ISO3166, $iso3166tab) ||
-   die "Could not open '$iso3166tab' for reading ($!)\n";
-+
- @lines = <ISO3166>;
- close(ISO3166);
- 
-@@ -68,8 +75,15 @@
-   next unless ($line =~ /\S/);
-     
-   chomp($line);
-+if ( $^O eq "freebsd" )
-+{
-+  ($code, undef, undef, $country) = split(/\t/, $line, 4);
-+}
-+else
-+{
-   ($code, $country) = split(/\t/, $line, 2);
--    
-+}    
-+
-   $countries{$code} = $country;
- }
- 
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index 1fbcae0210f7..63c3ecc0b4cc 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -5,9 +5,12 @@ libexec/sqwebmail/authlib/authcustom
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon.passwd
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond
+%%LDAPFLAG%%libexec/sqwebmail/authlib/authdaemond.ldap
+%%LDAPFLAG%%libexec/sqwebmail/authlib/authldap
 %%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond.plain
 %%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
+%%MYSQLFLAG%%libexec/sqwebmail/authlib/authmysql
 %%VPOPMAILFLAG%%libexec/sqwebmail/authlib/authvchkpw
 libexec/sqwebmail/authlib/authpam
 libexec/sqwebmail/authlib/authsystem.passwd
@@ -22,6 +25,7 @@ libexec/sqwebmail/sqwebmail/reformime
 libexec/sqwebmail/sqwebmail/sqwebmaild
 %%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist
 share/sqwebmail/authmodulelist
+%%LDAPFLAG%%share/sqwebmail/authldaprc.dist
 %%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist
 %%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist
 %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl