--- Portfile.orig	2007-12-09 04:25:48.000000000 -0700
+++ Portfile	2008-04-02 19:04:15.000000000 -0600
@@ -1,7 +1,9 @@
 # $Id: Portfile 31825 2007-12-09 11:25:48Z rhwood@macports.org $
+
 PortSystem 1.0
+
 name		evolution-data-server
-version		1.10.2
+version		2.22.0
 description	Addressbook and calender libs for GNOME.
 long_description	Evolution Data Server provides a central location for \
 			addressbook and calendar in the GNOME Desktop.
@@ -9,27 +11,31 @@
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites	gnome:sources/evolution-data-server/1.10/
+master_sites	gnome:sources/evolution-data-server/[join [lrange [split ${version} {.}] 0 1] {.}]/
 
-checksums	md5 790dfc97a917dff8384dcb7cad42f87f \
-			sha1 0364dbf18306f9f36cdae37703f47571cb2a93fe \
-			rmd160 1fc5915338427a306e46a1c37bfc913fa05936a3
-
-depends_lib	port:gnome-platform-suite lib:libsoup-2:libsoup \
-	port:libiconv \
-	port:nspr
+checksums	md5 0f29044dc21a4bfb915cafafde8f4d6b \
+			sha1 1d6ad21849c479be56476cc69a43ea1fa30f69bc \
+			rmd160 ab034a6805928509e0fc0bd306caf95392b7f275
+
+depends_lib	port:gnome-platform-suite \
+		port:libsoup \
+		port:libiconv \
+		port:nspr \
+		port:db46 \
+		port:nss
 
 use_bzip2 	yes
 
-patchfiles	patch_os_open.c patch_os_spin.c
+patchfiles	icaltz-util.diff
 
-configure.args	--mandir=${prefix}/share/man --enable-static \
-		--disable-nss \
-		--disable-smime \
-		--with-libiconv=${prefix}
-configure.env	\
-	INTLTOOL_ICONV=${prefix}/bin/iconv
-
-platform darwin 8 i386 {
-	configure.env-append MACOSX_DEPLOYMENT_TARGET="10.3"
-}
+configure.args	--enable-static \
+		--enable-nss \
+		--enable-smime \
+		--enable-gnome-keyring \
+		--enable-ipv6 \
+		--enable-nntp \
+		--enable-gtk-doc \
+		--with-libiconv=${prefix} \
+		--with-nspr-includes=${prefix}/include/nspr  \
+		--with-nss-includes=${prefix}/include/nss \
+		--with-krb5=/usr