Update to evolution-2.0.2nb3:

- Add SSL support when the 'ssl' option is set.
- Use the options framework to handle ipv6 support ('ipv6' option).
- Fix permissions of files copied into the user directory from the data
  directory under /usr/pkg (i.e., give write permissions to them).
  Otherwise, the sample Inbox folder is copied with mode 444 and you get
  multiple warnings from Evolution saying that it can't update the folder.

Evolution 2.x is - at last - usable!

3 files changed, 45 insertions, 13 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 3edd822dd5e..3065a7a2259 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2004/10/20 09:27:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.69 2004/10/29 14:57:15 jmmv Exp $
 
 DISTNAME=		evolution-2.0.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/source/evolution/ \
 			${MASTER_SITE_GNOME:=sources/evolution/2.0/}
@@ -18,15 +18,11 @@ BUILDLINK_DEPENDS.gal2+=	gal2>=2.2.3
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
 BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.2.3
 
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		USE_INET6
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution
+PKG_SUPPORTED_OPTIONS=	ipv6 ssl
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6=yes
-.else
-CONFIGURE_ARGS+=	--enable-ipv6=no
-.endif
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
@@ -46,8 +42,7 @@ CPPFLAGS+=		-I/usr/include/krb5
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-openldap
 CONFIGURE_ARGS+=	--without-static-ldap
-CONFIGURE_ARGS+=	--enable-nss=no
-CONFIGURE_ARGS+=	--enable-openssl=yes
+CONFIGURE_ARGS+=	--enable-openssl=no
 CONFIGURE_ARGS+=	--enable-pilot-conduits=no
 CONFIGURE_ARGS+=	--enable-smime=no
 CONFIGURE_ARGS+=	--with-krb4=/usr
@@ -57,6 +52,29 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--with-sub-version=nb${PKGREVISION}
 .endif
 
+.if !empty(PKG_OPTIONS:Mipv6)
+CONFIGURE_ARGS+=	--enable-ipv6=yes
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-nss=yes
+# XXX We should have a standalone NSS package and use it here, instead of
+# depending on the whole mozilla-gtk2...
+BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.3nb1
+# XXX Workaround for the following problem: addressbook/util/libeabutil.la
+# is compiled as a static library only which uses the NSS stuff.  When other
+# parts of the program use this .la archive, they get the right -L flags
+# (from the dependency_libs variable) but not the rpaths.  buildlink3 should
+# add rpath flags to the dependency_libs, but there is an strange comment
+# in the wrapper saying that it shouldn't.
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mozilla-gtk2}/lib/mozilla-gtk2
+.  include "../../www/mozilla-gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-nss
+.endif
+
 PKGCONFIG_OVERRIDE=	camel.pc.in
 PKGCONFIG_OVERRIDE+=	evolution-shell.pc.in
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index c70f39c1e52..9393cb6080b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.27 2004/10/20 09:27:33 jmmv Exp $
+$NetBSD: distinfo,v 1.28 2004/10/29 14:57:15 jmmv Exp $
 
 SHA1 (evolution-2.0.2.tar.bz2) = cc2c5d4f9547f5b442487605d9addb29baf52866
 Size (evolution-2.0.2.tar.bz2) = 15400311 bytes
 SHA1 (patch-aa) = 736bef73496b360a8b0ce1901c2969c6d5ae29e1
+SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
new file mode 100644
index 00000000000..f3c8eb91643
--- /dev/null
+++ b/mail/evolution/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.9 2004/10/29 14:57:15 jmmv Exp $
+
+--- ./mail/em-migrate.c.orig	2004-10-11 17:24:34.000000000 +0200
++++ ./mail/em-migrate.c
+@@ -1447,7 +1447,7 @@ cp (const char *src, const char *dest, g
+ 	ut.actime = st.st_atime;
+ 	ut.modtime = st.st_mtime;
+ 	utime (dest, &ut);
+-	chmod (dest, st.st_mode);
++	chmod (dest, st.st_mode | S_IWUSR);
+ 	
+ 	return 0;
+