* Update to 1.4.6

* Use OPTIONS
* Make LDAP the default and PILOT non-default

Release notes for 1.4.6 can be found at:

http://developer.ximian.com/projects/evolution/release_notes/1.4.6.html

7 files changed, 53 insertions, 58 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 6be065fbd56..6000317c9bc 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -20,13 +19,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-.endif
 RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
-.if !defined(WITHOUT_PILOT)
-LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2
-.endif
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -41,25 +34,34 @@ CONFIGURE_ARGS=	--with-db3-libs=${DB3_WRKSRC} \
 		--enable-nss=no \
 		--enable-openssl=yes \
 		--with-krb5=/usr
+CONFIGURE_ENV=	CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \
+		LIBS="${PTHREAD_LIBS}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 EVO_VERSION=	1.4
+PLIST_SUB=	VERSION=${EVO_VERSION}
+PKGINSTALL=	${WRKDIR}/pkg-install
 
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+= --with-openldap=${LOCALBASE}
-.endif
+OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
+		LDAP "Enable LDAP support" on
 
-.if !defined(WITHOUT_PILOT)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PILOT)
+LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
 			--enable-pilot-conduits=yes
-PLIST_SUB=	PILOT:=""
+PLIST_SUB+=	PILOT:=""
 .else
-PLIST_SUB=	PILOT:="@comment "
+PLIST_SUB+=	PILOT:="@comment "
 .endif
-CONFIGURE_ENV=	CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 
-PLIST_SUB+=	VERSION=${EVO_VERSION}
-PKGINSTALL=	${WRKDIR}/pkg-install
+.if !defined(WITHOUT_LDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=--with-openldap=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-openldap=no
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} ${GREP} -l '<db.h>' | \
@@ -95,4 +97,4 @@ post-install:
 	@${FIND} ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default_user \
 		-type f | ${XARGS} ${CHMOD} u+w
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7aefa370f16..946bec833f3 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,4 @@
-MD5 (gnome2/evolution-1.4.5.tar.bz2) = f16a86d6eaa9d9683f215586fcdac374
+MD5 (gnome2/evolution-1.4.6.tar.bz2) = 4138610c027177e6ffe92bdd565128a6
+SIZE (gnome2/evolution-1.4.6.tar.bz2) = 13927597
 MD5 (gnome2/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
+SIZE (gnome2/db-3.1.17.tar.bz2) = 1481866
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 14137baba64..8bd2ee6f707 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,14 @@
---- configure.orig	Sun Feb 22 10:49:35 2004
-+++ configure	Sun Feb 22 10:52:58 2004
-@@ -11724,7 +11724,7 @@
+--- configure.orig	Fri Mar 12 02:06:47 2004
++++ configure	Fri Mar 12 02:28:50 2004
+@@ -10407,6 +10407,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
+ #include <sys/socket.h>
+ socklen_t x;
+ 
+@@ -11519,7 +11520,7 @@
  CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"
  
  
@@ -9,7 +17,7 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -11917,9 +11917,9 @@
+@@ -11712,9 +11713,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22,7 +30,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  
-@@ -13283,7 +13283,7 @@
+@@ -13075,7 +13076,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -31,7 +39,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -14068,10 +14068,10 @@
+@@ -13860,10 +13861,10 @@
  Example: --with-nspr-libs=/usr/lib" >&2;}
     { (exit 1); exit 1; }; }
         				else
@@ -44,7 +52,7 @@
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -17454,7 +17454,7 @@
+@@ -17387,7 +17388,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c
deleted file mode 100644
index 33111196a80..00000000000
--- a/mail/evolution/files/patch-camel_camel-mime-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/camel-mime-utils.c.orig	Fri May  3 15:47:41 2002
-+++ camel/camel-mime-utils.c	Sun May  5 18:09:24 2002
-@@ -3388,6 +3388,8 @@
- 		}
- 		d(printf("named offset = %d\n", offset));
- 	}
-+
-+	tm.tm_isdst = -1;
- 
- 	t = mktime(&tm);
- #if defined(HAVE_TIMEZONE)
diff --git a/mail/evolution/files/patch-camel_camel-vee-folder.c b/mail/evolution/files/patch-camel_camel-vee-folder.c
index 019d60919da..e69de29bb2d 100644
--- a/mail/evolution/files/patch-camel_camel-vee-folder.c
+++ b/mail/evolution/files/patch-camel_camel-vee-folder.c
@@ -1,20 +0,0 @@
---- camel/camel-vee-folder.c.orig	Mon Jun 23 13:59:58 2003
-+++ camel/camel-vee-folder.c	Tue Oct 21 20:04:10 2003
-@@ -969,7 +969,7 @@
- 				}
- 				if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) {
- 					if (still) {
--						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
-+						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n) && n > 0) {
- 							if (n == 1) {
- 								g_hash_table_remove(unmatched_uids, oldkey);
- 								if (vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash))
-@@ -1290,7 +1290,7 @@
- 					camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey);
- 			}
- 		} else {
--			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n)) {
-+			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n) && n > 0) {
- 				g_hash_table_remove(unmatched_uids, oldkey);
- 				g_free(oldkey);
- 			}
diff --git a/mail/evolution/files/patch-tools_Makefile.in b/mail/evolution/files/patch-tools_Makefile.in
new file mode 100644
index 00000000000..36504035fae
--- /dev/null
+++ b/mail/evolution/files/patch-tools_Makefile.in
@@ -0,0 +1,12 @@
+--- tools/Makefile.in.orig	Fri Mar 12 02:59:53 2004
++++ tools/Makefile.in	Fri Mar 12 03:00:37 2004
+@@ -267,7 +267,8 @@
+ 
+ 
+ killev_LDADD = \
+-	$(top_builddir)/e-util/libeutil.la
++	$(top_builddir)/e-util/libeutil.la \
++	$(E_UTIL_LIBS)
+ 
+ 
+ CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 8cfb0d82861..54b2ff5fa67 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1236,6 +1236,7 @@ share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1252,6 +1253,7 @@ share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo