Index: branches/2014Q2/databases/evolution-data-server/Makefile =================================================================== --- branches/2014Q2/databases/evolution-data-server/Makefile (revision 354879) +++ branches/2014Q2/databases/evolution-data-server/Makefile (revision 354880) @@ -1,78 +1,78 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ # $MCom: ports/databases/evolution-data-server/Makefile,v 1.218 2013/03/09 09:12:37 kwm Exp $ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgdata.so:${PORTSDIR}/devel/libgdata \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libical.so:${PORTSDIR}/devel/libical \ libnss3.so:${PORTSDIR}/security/nss \ libtasn1.so:${PORTSDIR}/security/libtasn1 \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring USE_BZIP2= yes USE_GMAKE= yes USES= bison pathfix gettext pkgconfig USE_GNOME= gnomeprefix intlhack ltverhack ltasneededhack gconf2 \ libxml2 USE_OPENLDAP= yes USE_SQLITE= 3 USE_AUTOTOOLS= libtool USE_BDB= 41+ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ --enable-gnome-keyring=yes \ --with-openldap=yes \ --with-libdb=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2" OPTIONS_DEFINE= WEATHER KERBEROS OPTIONS_DEFAULT=WEATHER KERBEROS WEATHER_DESC= Weather calendar backend .include .if ${PORT_OPTIONS:MKERBEROS} CONFIGURE_ARGS+= --with-krb5=/usr KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif .if ${PORT_OPTIONS:MWEATHER} LIB_DEPENDS+= libgweather.so:${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:: @if [ x"${BDB_VER}" != x"41" ]; then \ ${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \ fi post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \ s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \ s|-DGTK_DISABLE_DEPRECATED||g ; \ s|-DG_DISABLE_DEPRECATED||g ; \ s|-Wl,--no-undefined||g ; \ s|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure .include Index: branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 =================================================================== --- branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 (nonexistent) +++ branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 (revision 354880) @@ -0,0 +1,118 @@ +From 679b10d75730e81fa268e11cfda289a27fd3e306 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 13 Aug 2012 09:50:50 -0400 +Subject: Bug 681321 - Support both old and new-buf libxml2 APIs + +libxml2 changed the API for xmlOutputBuffer incompatibly. +See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html + +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index 0219b34..f96907e 100644 +--- calendar/backends/caldav/e-cal-backend-caldav.c ++++ calendar/backends/caldav/e-cal-backend-caldav.c +@@ -1188,6 +1188,19 @@ caldav_authenticate (ECalBackendCalDAV *cbdav, + return success; + } + ++static gconstpointer ++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, ++ gsize *out_len) ++{ ++#ifdef LIBXML2_NEW_BUFFER ++ *out_len = xmlOutputBufferGetSize (buf); ++ return xmlOutputBufferGetContent (buf); ++#else ++ *out_len = buf->buffer->use; ++ return buf->buffer->content; ++#endif ++} ++ + /* Returns whether calendar changed on the server. This works only when server + * supports 'getctag' extension. */ + static gboolean +@@ -1198,6 +1211,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) + xmlDocPtr doc; + xmlNodePtr root, node; + xmlNsPtr ns, nsdav; ++ gconstpointer buf_content; ++ gsize buf_size; + gboolean result = TRUE; + + g_return_val_if_fail (cbdav != NULL, TRUE); +@@ -1230,11 +1245,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, + "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1299,6 +1314,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + xmlDocPtr doc; + xmlNsPtr nsdav; + xmlNsPtr nscd; ++ gconstpointer buf_content; ++ gsize buf_size; + gboolean result; + + /* Allocate the soup message */ +@@ -1378,11 +1395,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + soup_message_headers_append (message->request_headers, + "Depth", "1"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1795,6 +1812,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + xmlDocPtr doc; + xmlNodePtr root, node; + xmlNsPtr nsdav; ++ gconstpointer buf_content; ++ gsize buf_size; + gchar *owner = NULL; + + g_return_val_if_fail (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE); +@@ -1820,11 +1839,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1870,11 +1889,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, +- "application/xml", +- SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ "application/xml", ++ SOUP_MEMORY_COPY, ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); + Property changes on: branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q2/mail/evolution/Makefile =================================================================== --- branches/2014Q2/mail/evolution/Makefile (revision 354879) +++ branches/2014Q2/mail/evolution/Makefile (revision 354880) @@ -1,117 +1,117 @@ # Created by: Ade Lovett # $FreeBSD$ # $MCom: ports/trunk/mail/evolution/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= evolution PORTVERSION= 2.32.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Integrated mail, calendar and address book distributed suite LIB_DEPENDS= nss3:${PORTSDIR}/security/nss \ unique-1.0:${PORTSDIR}/x11-toolkits/unique \ gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell CONFLICTS= evolution-3.[0-9]* USE_BZIP2= yes USES= bison desktop-file-utils gettext pathfix gmake pkgconfig USE_GNOME= gnomeprefix intlhack evolutiondataserver gtkhtml3 \ gnomedocutils ltasneededhack gnomedesktop USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION} CONFIGURE_ARGS= --enable-nss=yes \ --enable-mono=no \ --disable-nm \ --with-sub-version=" FreeBSD GNOME Team Port" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= apps_evolution_addressbook.schemas \ apps-evolution-attachment-reminder.schemas \ apps_evolution_calendar.schemas \ apps_evolution_email_custom_header.schemas \ apps-evolution-mail-notification.schemas \ apps-evolution-mail-prompts-checkdefault.schemas \ apps_evolution_shell.schemas \ apps-evolution-template-placeholders.schemas \ bogo-junk-plugin.schemas \ evolution-mail.schemas EVO_VERSION= 2.32 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 OPTIONS_DEFINE= LDAP CANBERRA SPAMASSASSIN OPTIONS_DEFAULT=LDAP CANBERRA CANBERRA_DESC= Canberra theme audio plugin SPAMASSASSIN_DESC= SpamAssassin spam filtering NO_STAGE= yes .include .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap=${LOCALBASE} .else CONFIGURE_ARGS+=--with-openldap=no .endif .if ${PORT_OPTIONS:MSPAMASSASSIN} RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/spamassassin .endif .if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS) HEIMDAL_HOME?= ${LOCALBASE} LIB_DEPENDS+= krb5.26:${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` .endif .if ${PORT_OPTIONS:MCANBERRA} LIB_DEPENDS+= canberra-gtk:${PORTSDIR}/audio/libcanberra CONFIGURE_ARGS+=--enable-canberra=yes PLIST_SUB+= CANBERRA="" .else CONFIGURE_ARGS+=--enable-canberra=no PLIST_SUB+= CANBERRA="@comment " .endif # needs newer libpst version 0.6.41 or higher #.if defined (WITH_PST) #CONFIGURE_ARGS+= --enable-pst-import #BUILD_DEPENDS+= lspst:${PORTSDIR}/mail/libpst #RUN_DEPENDS+= lspst:${PORTSDIR}/mail/libpst #PLIST_SUB+= PST="" #.else CONFIGURE_ARGS+= --disable-pst-import PLIST_SUB+= PST="@comment " #.endif post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-Wl,--no-undefined||g' \ -e 's|-DGTK_DISABLE_DEPRECATED||g' \ -e 's|-DG_DISABLE_DEPRECATED||g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c @${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \ ${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c @${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC} .include Index: branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 =================================================================== --- branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 (nonexistent) +++ branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 (revision 354880) @@ -0,0 +1,43 @@ +--- plugins/caldav/caldav-browse-server.c.ori 2013-03-02 12:33:59.220751490 -0300 ++++ plugins/caldav/caldav-browse-server.c 2013-03-02 16:47:55.601296985 -0300 +@@ -63,6 +63,18 @@ + + typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *msg_body, gpointer user_data); + ++static gconstpointer ++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, ++ gsize *out_len) ++{ ++#ifdef LIBXML2_NEW_BUFFER ++ *out_len = xmlOutputBufferGetSize (buf); ++ return xmlOutputBufferGetContent (buf); ++#else ++ *out_len = buf->buffer->use; ++ return buf->buffer->content; ++#endif ++} + static void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info); + + static gchar * +@@ -953,6 +965,8 @@ + SoupSession *session; + SoupMessage *message; + xmlOutputBufferPtr buf; ++ gconstpointer content; ++ gsize length; + guint poll_id; + struct poll_data *pd; + +@@ -977,9 +991,11 @@ + xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL); + xmlOutputBufferFlush (buf); + ++ content = compat_libxml_output_buffer_get_content (buf, &length); ++ + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0"); +- soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use); ++ soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, content, length); + + /* Clean up the memory */ + xmlOutputBufferClose (buf); Property changes on: branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q2/textproc/gdome2/Makefile =================================================================== --- branches/2014Q2/textproc/gdome2/Makefile (revision 354879) +++ branches/2014Q2/textproc/gdome2/Makefile (revision 354880) @@ -1,49 +1,49 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= gdome2 PORTVERSION= 0.8.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= http://gdome2.cs.unibo.it/tarball/ MAINTAINER= ports@FreeBSD.org COMMENT= Gnome DOM Engine USES= pathfix pkgconfig USE_AUTOTOOLS= libtool USE_GNOME= glib20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" CPPFLAGS+= -I${LOCALBASE}/include DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS PORTDOCS= * .include post-patch: .if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -E -e \ 's,^(HTML_DIR *= *).*,\1\$$(DESTDIR)$$(prefix)/share/doc,' \ ${WRKSRC}/gtk-doc/Makefile.in .else @${REINPLACE_CMD} '/gtk-doc/d' ${WRKSRC}/Makefile.in .endif @${FIND} ${WRKSRC} -type f -and \ '(' -name '*.[ch]' -or -name '*.xml' ')' | \ ${XARGS} ${REINPLACE_CMD} -e ' \ s,,,; \ s,,,; \ s,,,; \ s,,,; \ s,,,; \ s,,,; \ s,,,; \ s,,,' .include Index: branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c =================================================================== --- branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c (nonexistent) +++ branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c (revision 354880) @@ -0,0 +1,20 @@ +Patch from Gentoo to fix libxml2 2.9 api change + +Patch by Harris Landgarten. + +The patch was submitted on bug 448236, following the announcement on +https://mail.gnome.org/archives/xml/2012-August/msg00005.html +--- libgdome/gdomecore/gdome-xml-documentt.c.orig 2003-07-13 06:47:54.000000000 -0400 ++++ libgdome/gdomecore/gdome-xml-documentt.c 2012-12-23 08:57:23.000000000 -0500 +@@ -342,7 +342,11 @@ + } + xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); + xmlOutputBufferFlush(out_buff); ++#if LIBXML_VERSION < 20900 + ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); ++#else ++ ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer)); ++#endif + (void)xmlOutputBufferClose(out_buff); + + return gdome_xml_str_mkref_own (ret); Property changes on: branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q2 =================================================================== --- branches/2014Q2 (revision 354879) +++ branches/2014Q2 (revision 354880) Property changes on: branches/2014Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r354374