diff options
5 files changed, 42 insertions, 31 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e7ca47719..c25a3a9ef 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= evolution-data-server -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 @@ -41,7 +41,7 @@ PLIST_SUB= VERSION="1.4" EVO_VERSION="1.2" .include <bsd.port.pre.mk> -.if ${OSVERSION} < 600012 +.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) ) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c .endif diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 273e3c14a..ed13d9536 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.3.1.tar.bz2) = f7246a4ac785f62f153a3ca87707e1e7 -SIZE (gnome2/evolution-data-server-1.3.1.tar.bz2) = 14284107 +MD5 (gnome2/evolution-data-server-1.3.2.tar.bz2) = 75291eedbc146ab388cc55cbcc1741c6 +SIZE (gnome2/evolution-data-server-1.3.2.tar.bz2) = 14510907 diff --git a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c deleted file mode 100644 index 4e1e60e5a..000000000 --- a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c +++ /dev/null @@ -1,18 +0,0 @@ ---- camel/providers/groupwise/camel-groupwise-folder.c.orig Thu Apr 28 23:03:18 2005 -+++ camel/providers/groupwise/camel-groupwise-folder.c Thu Apr 28 23:06:04 2005 -@@ -99,6 +99,7 @@ groupwise_folder_get_message( CamelFolde - char *dtstring = NULL; - CamelStream *stream, *cache_stream; - CamelMultipart *multipart ; -+ CamelMimePart *part ; - int errno; - struct _camel_header_address *ha; - char *subs_email; -@@ -304,7 +305,6 @@ groupwise_folder_get_message( CamelFolde - /*Content and content-type*/ - - body = g_strdup(e_gw_item_get_message(item)); -- CamelMimePart *part ; - part = camel_mime_part_new () ; - camel_multipart_set_boundary (multipart, NULL); - camel_mime_part_set_encoding(part, CAMEL_TRANSFER_ENCODING_8BIT); diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 7bc7a9cdf..1b474c6b8 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Dec 21 13:46:01 2004 -+++ configure Tue Dec 21 13:50:02 2004 -@@ -7894,10 +7894,10 @@ +--- configure.orig Wed May 18 14:34:16 2005 ++++ configure Wed May 18 15:02:20 2005 +@@ -24809,10 +24809,10 @@ Example: --with-nspr-libs=/usr/lib" >&2;} { (exit 1); exit 1; }; } else @@ -13,7 +13,7 @@ fi echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -10011,6 +10011,7 @@ +@@ -26926,6 +26926,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> @@ -21,7 +21,7 @@ int -@@ -10777,7 +10778,7 @@ +@@ -27664,7 +27665,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -30,12 +30,29 @@ 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 -@@ -29833,7 +29834,7 @@ - idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" +@@ -30957,7 +30958,7 @@ + imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION" -serverdir="$libdir/bonobo/servers" +serverdir="$prefix/libdata/bonobo/servers" - extensiondir='${privlibdir}'/extensions + extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions +@@ -31206,7 +31207,7 @@ + subdirs="$subdirs libdb/dist" + + +- ac_config_files="$ac_config_files Makefile evolution-data-server.pc addressbook/Makefile addressbook/idl/Makefile addressbook/libebook/Makefile addressbook/libebook/libebook.pc addressbook/libedata-book/Makefile addressbook/libedata-book/libedata-book.pc addressbook/backends/Makefile addressbook/backends/file/Makefile addressbook/backends/vcf/Makefile addressbook/backends/ldap/Makefile addressbook/backends/groupwise/Makefile addressbook/tests/Makefile addressbook/tests/ebook/Makefile addressbook/tests/vcard/Makefile art/Makefile calendar/Makefile calendar/idl/Makefile calendar/libecal/Makefile calendar/libecal/libecal.pc calendar/libedata-cal/Makefile calendar/libedata-cal/libedata-cal.pc calendar/backends/Makefile calendar/backends/file/Makefile calendar/backends/groupwise/Makefile calendar/backends/http/Makefile calendar/backends/contacts/Makefile calendar/backends/weather/Makefile calendar/tests/Makefile calendar/tests/ecal/Makefile camel/Makefile camel/providers/Makefile camel/providers/groupwise/Makefile camel/providers/imap/Makefile camel/providers/imapp/Makefile camel/providers/imap4/Makefile camel/providers/local/Makefile camel/providers/nntp/Makefile camel/providers/pop3/Makefile camel/providers/sendmail/Makefile camel/providers/smtp/Makefile camel/tests/Makefile camel/tests/folder/Makefile camel/tests/lib/Makefile camel/tests/message/Makefile camel/tests/mime-filter/Makefile camel/tests/misc/Makefile camel/tests/smime/Makefile camel/tests/stream/Makefile camel/camel.pc camel/camel-provider.pc libdb/Makefile libedataserver/Makefile libedataserver/libedataserver.pc libedataserverui/Makefile libedataserverui/libedataserverui.pc servers/Makefile servers/groupwise/Makefile servers/groupwise/libegroupwise.pc src/Makefile docs/Makefile docs/reference/Makefile docs/reference/addressbook/Makefile docs/reference/addressbook/libebook/Makefile docs/reference/calendar/Makefile docs/reference/calendar/libecal/Makefile docs/reference/camel/Makefile docs/reference/calendar/libedata-cal/Makefile docs/reference/libedataserver/Makefile po/Makefile.in" ++ ac_config_files="$ac_config_files Makefile evolution-data-server.pc addressbook/Makefile addressbook/idl/Makefile addressbook/libebook/Makefile addressbook/libebook/libebook.pc addressbook/libedata-book/Makefile addressbook/libedata-book/libedata-book.pc addressbook/backends/Makefile addressbook/backends/file/Makefile addressbook/backends/vcf/Makefile addressbook/backends/ldap/Makefile addressbook/backends/groupwise/Makefile addressbook/tests/Makefile addressbook/tests/ebook/Makefile addressbook/tests/vcard/Makefile art/Makefile calendar/Makefile calendar/idl/Makefile calendar/libecal/Makefile calendar/libecal/libecal.pc calendar/libedata-cal/Makefile calendar/libedata-cal/libedata-cal.pc calendar/backends/Makefile calendar/backends/file/Makefile calendar/backends/groupwise/Makefile calendar/backends/http/Makefile calendar/backends/contacts/Makefile calendar/backends/weather/Makefile calendar/tests/Makefile calendar/tests/ecal/Makefile camel/Makefile camel/providers/Makefile camel/providers/groupwise/Makefile camel/providers/imap/Makefile camel/providers/imapp/Makefile camel/providers/imap4/Makefile camel/providers/local/Makefile camel/providers/nntp/Makefile camel/providers/pop3/Makefile camel/providers/sendmail/Makefile camel/providers/smtp/Makefile camel/tests/Makefile camel/tests/folder/Makefile camel/tests/lib/Makefile camel/tests/message/Makefile camel/tests/mime-filter/Makefile camel/tests/misc/Makefile camel/tests/smime/Makefile camel/tests/stream/Makefile camel/camel.pc camel/camel-provider.pc libdb/Makefile libedataserver/Makefile libedataserver/libedataserver.pc libedataserverui/Makefile libedataserverui/libedataserverui.pc servers/Makefile servers/groupwise/Makefile servers/groupwise/libegroupwise.pc src/Makefile docs/Makefile docs/reference/Makefile docs/reference/addressbook/Makefile docs/reference/addressbook/libebook/Makefile docs/reference/calendar/Makefile docs/reference/calendar/libecal/Makefile docs/reference/calendar/libedata-cal/Makefile docs/reference/libedataserver/Makefile po/Makefile.in" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -31933,7 +31934,6 @@ + "docs/reference/addressbook/libebook/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/addressbook/libebook/Makefile" ;; + "docs/reference/calendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/calendar/Makefile" ;; + "docs/reference/calendar/libecal/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/calendar/libecal/Makefile" ;; +- "docs/reference/camel/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/camel/Makefile" ;; + "docs/reference/calendar/libedata-cal/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/calendar/libedata-cal/Makefile" ;; + "docs/reference/libedataserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/libedataserver/Makefile" ;; + "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index 026a97c94..c7cd05679 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -345,6 +345,19 @@ share/doc/libecal/libecal.devhelp share/doc/libecal/right.png share/doc/libecal/style.css share/doc/libecal/up.png +share/doc/libedata-cal/ECalBackend.html +share/doc/libedata-cal/ECalBackendSExp.html +share/doc/libedata-cal/EDataCal.html +share/doc/libedata-cal/EDataCalView.html +share/doc/libedata-cal/ch01.html +share/doc/libedata-cal/home.png +share/doc/libedata-cal/index.html +share/doc/libedata-cal/index.sgml +share/doc/libedata-cal/left.png +share/doc/libedata-cal/libedata-cal.devhelp +share/doc/libedata-cal/right.png +share/doc/libedata-cal/style.css +share/doc/libedata-cal/up.png share/doc/libedataserver/ch01.html share/doc/libedataserver/home.png share/doc/libedataserver/index.html @@ -356,7 +369,6 @@ share/doc/libedataserver/libedataserver-EXMLHash.html share/doc/libedataserver/libedataserver-Utility-Functions.html share/doc/libedataserver/libedataserver.devhelp share/doc/libedataserver/right.png -share/doc/libedataserver/style.css share/doc/libedataserver/up.png share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade |