Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

5 files changed, 27 insertions, 93 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e1b229ce08ba..1c90f48bbc35 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.164 2009/01/10 01:59:21 mezz Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.168 2009/03/17 13:17:16 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.24.5
+PORTVERSION=	2.26.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,6 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+		ical.43:${PORTSDIR}/devel/libical \
 		nss3.1:${PORTSDIR}/security/nss \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
@@ -39,9 +40,10 @@ CONFIGURE_ARGS=	--enable-static \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PLIST_SUB=	VERSION="2.24" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="2.26" EVO_VERSION="1.2"
 
 #OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
+OPTIONS=	WEATHER "Enable weather calendar backend" on
 
 .include <bsd.port.pre.mk>
 
@@ -49,7 +51,6 @@ PLIST_SUB=	VERSION="2.24" EVO_VERSION="1.2"
 HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
 .elif !defined(NO_KERBEROS)
 CONFIGURE_ARGS+=        --with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
@@ -62,6 +63,15 @@ KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 PLIST_SUB+=		IMAP4="@comment "
 #.endif
 
+.if defined(WITH_WEATHER)
+LIB_DEPENDS+=		gweather.1:${PORTSDIR}/net/libgweather
+CONFIGURE_ARGS+=	--with-weather
+PLIST_SUB+=		WEATHER=""
+.else
+CONFIGURE_ARGS+=	--without-weather
+PLIST_SUB+=		WEATHER="@comment "
+.endif
+
 EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."
 
 pre-everything::
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 966c8a0f0029..ed4def55e750 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.24.5.tar.bz2) = cf12f02b8cc0a15e046c121e6a7250cb
-SHA256 (gnome2/evolution-data-server-2.24.5.tar.bz2) = c2240b96437f36f3656da538df7631510785664a6e7723cbf75ec0f88c3d38d1
-SIZE (gnome2/evolution-data-server-2.24.5.tar.bz2) = 7857405
+MD5 (gnome2/evolution-data-server-2.26.0.tar.bz2) = d010845a4ee9604f050403b106c2f416
+SHA256 (gnome2/evolution-data-server-2.26.0.tar.bz2) = 1e15e964355de7db63f9ee1480c0882ede0d44252ed5778fe65b4e163f7945f0
+SIZE (gnome2/evolution-data-server-2.26.0.tar.bz2) = 7344309
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
deleted file mode 100644
index 06b6ce249762..000000000000
--- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- calendar/libical/src/libical/icaltz-util.c.orig	2008-12-22 04:49:23.000000000 -0500
-+++ calendar/libical/src/libical/icaltz-util.c	2009-01-12 22:33:53.000000000 -0500
-@@ -23,6 +23,15 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define __BYTE_ORDER            _BYTE_ORDER
-+#define __LITTLE_ENDIAN         _LITTLE_ENDIAN
-+#define __BIG_ENDIAN            _BIG_ENDIAN
-+
-+#define bswap_16                bswap16
-+#define bswap_32                bswap32
-+#define bswap_64                bswap64
- #elif defined(_WIN32)
- #define BIG_ENDIAN 'B'
- #define LITTLE_ENDIAN 'l'
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
index 0c06d57ce33f..f84db6643729 100644
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -1,5 +1,5 @@
---- docs/reference/camel/Makefile.in.orig	2009-02-03 11:31:13.000000000 -0500
-+++ docs/reference/camel/Makefile.in	2009-02-03 11:32:37.000000000 -0500
+--- docs/reference/camel/Makefile.in.orig	2009-01-16 16:16:56.000000000 +0100
++++ docs/reference/camel/Makefile.in	2009-01-16 16:18:31.000000000 +0100
 @@ -130,7 +130,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -9,14 +9,3 @@
  ICONV_CFLAGS = @ICONV_CFLAGS@
  ICONV_LIBS = @ICONV_LIBS@
  IDL_INCLUDES = @IDL_INCLUDES@
-@@ -686,8 +686,8 @@ install-data-local:
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+#	  which gtkdoc-rebase >/dev/null && \
-+#	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- 	fi
- 
- uninstall-local:
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index df48ab873e0c..d8ef379ca612 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -238,6 +238,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/eds-version.h
 include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-category-completion.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-cell-renderer-color.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
@@ -253,51 +254,6 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
-include/evolution-data-server-%%VERSION%%/libical/ical.h
-include/evolution-data-server-%%VERSION%%/libical/icalarray.h
-include/evolution-data-server-%%VERSION%%/libical/icalattach.h
-include/evolution-data-server-%%VERSION%%/libical/icalcalendar.h
-include/evolution-data-server-%%VERSION%%/libical/icalclassify.h
-include/evolution-data-server-%%VERSION%%/libical/icalcluster.h
-include/evolution-data-server-%%VERSION%%/libical/icalcomponent.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedvalue.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirset.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirsetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalduration.h
-include/evolution-data-server-%%VERSION%%/libical/icalenums.h
-include/evolution-data-server-%%VERSION%%/libical/icalerror.h
-include/evolution-data-server-%%VERSION%%/libical/icalfileset.h
-include/evolution-data-server-%%VERSION%%/libical/icalfilesetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalgauge.h
-include/evolution-data-server-%%VERSION%%/libical/icalgaugeimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icallangbind.h
-include/evolution-data-server-%%VERSION%%/libical/icalmemory.h
-include/evolution-data-server-%%VERSION%%/libical/icalmessage.h
-include/evolution-data-server-%%VERSION%%/libical/icalmime.h
-include/evolution-data-server-%%VERSION%%/libical/icalparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalparser.h
-include/evolution-data-server-%%VERSION%%/libical/icalperiod.h
-include/evolution-data-server-%%VERSION%%/libical/icalproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalrecur.h
-include/evolution-data-server-%%VERSION%%/libical/icalrestriction.h
-include/evolution-data-server-%%VERSION%%/libical/icalset.h
-include/evolution-data-server-%%VERSION%%/libical/icalspanlist.h
-include/evolution-data-server-%%VERSION%%/libical/icalss.h
-include/evolution-data-server-%%VERSION%%/libical/icalssyacc.h
-include/evolution-data-server-%%VERSION%%/libical/icaltime.h
-include/evolution-data-server-%%VERSION%%/libical/icaltimezone.h
-include/evolution-data-server-%%VERSION%%/libical/icaltypes.h
-include/evolution-data-server-%%VERSION%%/libical/icaltz-util.h
-include/evolution-data-server-%%VERSION%%/libical/icalvalue.h
-include/evolution-data-server-%%VERSION%%/libical/icalvcal.h
-include/evolution-data-server-%%VERSION%%/libical/port.h
-include/evolution-data-server-%%VERSION%%/libical/pvl.h
-include/evolution-data-server-%%VERSION%%/libical/sspm.h
-include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
-include/evolution-data-server-%%VERSION%%/libical/vcc.h
-include/evolution-data-server-%%VERSION%%/libical/vobject.h
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
@@ -366,9 +322,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
@@ -554,8 +510,8 @@ share/doc/camel/camel-camel-net-utils.html
 share/doc/camel/camel-camel-operation.html
 share/doc/camel/camel-camel-process.html
 share/doc/camel/camel-camel-provider.html
-share/doc/camel/camel-camel-search-sql-sexp.html
 share/doc/camel/camel-camel-search-sql.html
+share/doc/camel/camel-camel-search-sql-sexp.html
 share/doc/camel/camel-camel-string-utils.html
 share/doc/camel/camel-camel-trie.html
 share/doc/camel/camel-camel-uid-cache.html
@@ -727,6 +683,7 @@ share/doc/libedataserverui/index.html
 share/doc/libedataserverui/index.sgml
 share/doc/libedataserverui/ix01.html
 share/doc/libedataserverui/left.png
+share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html
 share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
 share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
 share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
@@ -739,7 +696,7 @@ share/doc/libedataserverui/up.png
 share/evolution-data-server-%%VERSION%%/evolutionperson.schema
 share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
 share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
-share/evolution-data-server-%%VERSION%%/weather/Locations.xml
+%%WEATHER%%share/evolution-data-server-%%VERSION%%/weather/Locations.xml
 share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
 share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
 share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
@@ -783,7 +740,6 @@ share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/la/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -842,7 +798,7 @@ share/pixmaps/evolution-data-server/category_suppliers_16.png
 share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm share/pixmaps/evolution-data-server
 @dirrm share/idl/evolution-data-server-%%EVO_VERSION%%
-@dirrm share/evolution-data-server-%%VERSION%%/weather
+%%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather
 @dirrm share/evolution-data-server-%%VERSION%%/glade
 @dirrm share/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libedataserverui
@@ -856,7 +812,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers
 @dirrm lib/evolution-data-server-%%EVO_VERSION%%
-@dirrm include/evolution-data-server-%%VERSION%%/libical
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserver
 @dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
@@ -887,8 +842,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES