- update to 3.1.92

This commit is contained in:
jasper 2011-09-21 13:27:59 +00:00
parent aeeb0e483e
commit 8af71809dc
11 changed files with 3708 additions and 1089 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2011/09/20 21:04:25 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2011/09/21 13:30:23 jasper Exp $
# No NTLM support in OpenLDAP; Plaintext password authentication will be
# used when connecting to the Global Catalog server. Consider installing
@ -10,15 +10,14 @@ SHARED_ONLY= Yes
COMMENT= evolution connector for MS Exchange
GNOME_PROJECT= evolution-exchange
GNOME_VERSION= 3.0.3
REVISION= 0
GNOME_VERSION= 3.1.92
SHARED_LIBS += exchange 0.0 # 0.0
SHARED_LIBS += xntlm 0.0 # 0.0
CATEGORIES= mail
EVO_VERSION= 3.0
EVO_VERSION= 3.2
SUBST_VARS= EVO_VERSION
HOMEPAGE= http://projects.gnome.org/evolution/
@ -38,7 +37,7 @@ WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject camel-1.2
WANTLIB += camel-provider-1.2 canberra canberra-gtk3 com_err crypto
WANTLIB += db dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ecal-1.2
WANTLIB += edata-book-1.2 edata-cal-1.2 edataserver-1.2 edataserverui-3.0
WANTLIB += egroupwise-1.2 enchant execinfo expat fontconfig freetype
WANTLIB += enchant execinfo expat fontconfig freetype
WANTLIB += gailutil-3 gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring gobject-2.0
WANTLIB += gpg-error gssapi gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0

View File

@ -1,5 +1,5 @@
MD5 (evolution-exchange-3.0.3.tar.xz) = ks1A1e6v7jHbUioIK7T7hQ==
RMD160 (evolution-exchange-3.0.3.tar.xz) = CnJNvU+ENL9yQ07tUchDp5zPaVk=
SHA1 (evolution-exchange-3.0.3.tar.xz) = K7ZxAuCVnstZPGqTJ23zfFxUbQg=
SHA256 (evolution-exchange-3.0.3.tar.xz) = RXQAF/UJ9FzC66UlAi2ogoAXrZhzcXm0UNMXe0abMNc=
SIZE (evolution-exchange-3.0.3.tar.xz) = 1099668
MD5 (evolution-exchange-3.1.92.tar.xz) = e87FNfIgsQ4ELRB2V592NQ==
RMD160 (evolution-exchange-3.1.92.tar.xz) = 6F33cVm01nL+VV089e0kVGBZxh8=
SHA1 (evolution-exchange-3.1.92.tar.xz) = EE2AfGV+X8kYVRowB2MRYQan8ZQ=
SHA256 (evolution-exchange-3.1.92.tar.xz) = zwht2yQ56k5mtYwo+2XEQbMR38vQEZm88W2Y5CCWEyA=
SIZE (evolution-exchange-3.1.92.tar.xz) = 1120428

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=654540
--- configure.ac.orig Mon Apr 25 09:03:03 2011
+++ configure.ac Wed Jul 13 12:17:29 2011
@@ -94,13 +94,22 @@ dnl ******************************
dnl Check for Win32
dnl ******************************
+AC_CANONICAL_HOST
AC_MSG_CHECKING([for Win32])
+
+dnl This must stay after AC_CANONICAL_HOST, which defines $host.
case "$host" in
*-mingw*)
os_win32=yes
NO_UNDEFINED='-Wl,--no-undefined'
SOCKET_LIBS='-lws2_32'
DNS_LIBS='-ldnsapi'
+ ;;
+*openbsd*|*freebsd*)
+ os_win32=no
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ DNS_LIBS=''
;;
*)
os_win32=no

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2011/09/21 13:30:23 jasper Exp $
@bin bin/exchange-connector-setup-${EVO_VERSION}
@comment lib/evolution-data-server/addressbook-backends/libebookbackendexchange.la
lib/evolution-data-server/addressbook-backends/libebookbackendexchange.so
@ -64,7 +64,6 @@ share/gtk-doc/html/evolution-exchange/evolution-exchange-test-utils.html
share/gtk-doc/html/evolution-exchange/evolution-exchange-xntlm-des.html
share/gtk-doc/html/evolution-exchange/evolution-exchange-xntlm-md4.html
share/gtk-doc/html/evolution-exchange/evolution-exchange-xntlm.html
share/gtk-doc/html/evolution-exchange/evolution-exchange.devhelp
share/gtk-doc/html/evolution-exchange/evolution-exchange.devhelp2
share/gtk-doc/html/evolution-exchange/home.png
share/gtk-doc/html/evolution-exchange/index.html
@ -106,6 +105,7 @@ share/locale/el/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/en@shaw/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/en_CA/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/en_GB/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/eo/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/es/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/et/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo
share/locale/eu/LC_MESSAGES/evolution-exchange-${EVO_VERSION}.mo

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.132 2011/09/21 10:12:41 jasper Exp $
# $OpenBSD: Makefile,v 1.133 2011/09/21 13:27:59 jasper Exp $
COMMENT-main= integrated email and PIM software for GNOME
COMMENT-plugins= additionnal plugins for evolution
GNOME_PROJECT= evolution
GNOME_VERSION= 3.0.3
REVISION = 0
GNOME_VERSION= 3.1.92
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
@ -16,7 +15,8 @@ PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
# mail/evolution-rss
# mail/evolution-exchange
# x11/gnome/tracker
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
#R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
R= 3.2 # XXX
SUBST_VARS= R
CATEGORIES= mail
@ -48,7 +48,7 @@ WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject camel-1.2
WANTLIB += camel-provider-1.2 canberra com_err crypto
WANTLIB += db dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ecal-1.2
WANTLIB += edataserver-1.2 edataserverui-3.0 egroupwise-1.2 enchant
WANTLIB += edataserver-1.2 edataserverui-3.0 enchant
WANTLIB += execinfo expat fontconfig freetype gailutil-3
WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring gobject-2.0
@ -99,12 +99,12 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/libunique3 \
converters/libpst \
databases/evolution-data-server>=2.32.2 \
databases/evolution-data-server>=3.1.91 \
databases/openldap \
devel/libnotify>=0.7.2 \
security/nss \
x11/gnome/desktop \
www/gtkhtml4 \
www/gtkhtml4>=4.1.91 \
audio/libcanberra,-gtk3
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
@ -132,6 +132,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
CONFIGURE_ARGS+= --disable-gtk-doc \
--enable-plugins=all \
--disable-nm \
--disable-goa \
--with-openldap="${LOCALBASE}" \
--with-sub-version=" OpenBSD/Ports" \
--with-krb5=/usr \

View File

@ -1,5 +1,5 @@
MD5 (evolution-3.0.3.tar.xz) = PQ/W7p0g1TrYEGJcOFry1Q==
RMD160 (evolution-3.0.3.tar.xz) = DPBFesRlTid8/w4XTSnMPcluCSQ=
SHA1 (evolution-3.0.3.tar.xz) = wOqKhVHhk39e3mZdCjT/jqdz2Dk=
SHA256 (evolution-3.0.3.tar.xz) = N/rc1Fm3SWD8z4BfYn/4aeMVNnaQr4gJzpVux+IylPc=
SIZE (evolution-3.0.3.tar.xz) = 25755880
MD5 (evolution-3.1.92.tar.xz) = 1M5JIkghxPdYBYIN8l1Tgg==
RMD160 (evolution-3.1.92.tar.xz) = /KGiwLZTiiYEWtpCjIrb72Web1U=
SHA1 (evolution-3.1.92.tar.xz) = EalBD/MULw0afG171Wv7HH2oMAQ=
SHA256 (evolution-3.1.92.tar.xz) = X3x7G+mofDpcFpQyb2X8T1LrTn/vKzarKn4QrPta6HU=
SIZE (evolution-3.1.92.tar.xz) = 11424676

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-addressbook_gui_widgets_eab-gui-util_c,v 1.1 2011/09/21 13:27:59 jasper Exp $
--- addressbook/gui/widgets/eab-gui-util.c.orig Sun Sep 18 22:28:50 2011
+++ addressbook/gui/widgets/eab-gui-util.c Mon Sep 19 23:25:11 2011
@@ -655,7 +655,11 @@ get_locales (void)
gchar *dot;
gchar **split;
+#ifdef LC_ADDRESS
locale = g_strdup (setlocale (LC_ADDRESS, NULL));
+#else
+ locale = NULL;
+#endif
if (!locale)
return NULL;

View File

@ -1,45 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2011/09/12 07:26:19 ajacoutot Exp $
From 1f002e02aaa2bcd0f8128937940b025cf13b0828 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Tue, 12 Jul 2011 21:28:14 +0000
Subject: Fix OpenBSD/FreeBSD support
--- configure.ac.orig Mon Apr 25 09:02:53 2011
+++ configure.ac Wed Jul 13 04:21:18 2011
@@ -99,6 +99,10 @@ dnl -DE_CAL_DISABLE_DEPRECATED
AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
AC_SUBST(AM_CPPFLAGS)
+AC_CANONICAL_HOST
+AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
+
+dnl This must stay after AC_CANONICAL_HOST, which defines $host.
case "$host" in
*openbsd*|*freebsd*)
dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
@@ -108,8 +112,6 @@ case "$host" in
;;
esac
-AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
dnl *************************************
dnl Put the ACLOCAL flags in the Makefile
@@ -200,6 +202,15 @@ case "$host" in
SOFTOKN3_LIB=''
CHAMPLAIN_REQUIREMENT=''
GEOCLUE_REQUIREMENT=''
+ ;;
+*openbsd*|*freebsd*)
+ os_win32=no
+ NO_UNDEFINED=''
+ SOEXT='.so'
+ SA_JUNK_PLUGIN=sa-junk-plugin
+ BF_JUNK_PLUGIN=bogo-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
;;
*)
os_win32=no

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.3 2011/09/12 07:26:19 ajacoutot Exp $
--- m4/evo_krb5_support.m4.orig Tue Jul 12 11:30:13 2011
+++ m4/evo_krb5_support.m4 Tue Jul 12 11:30:19 2011
@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
LIBS_save="$LIBS"
$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.4 2011/09/21 13:27:59 jasper Exp $
--- m4/evo_krb5_support.m4.orig Thu Apr 21 13:18:40 2011
+++ m4/evo_krb5_support.m4 Sun Sep 18 15:05:42 2011
@@ -59,7 +59,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
esac
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.7 2011/09/12 07:26:19 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.8 2011/09/21 13:27:59 jasper Exp $
@lib lib/evolution/${R}/libcomposer.so.${LIBcomposer_VERSION}
@lib lib/evolution/${R}/libeabutil.so.${LIBeabutil_VERSION}
@lib lib/evolution/${R}/libecontacteditor.so.${LIBecontacteditor_VERSION}
@ -23,6 +23,7 @@
@lib lib/evolution/${R}/libgnomecanvas.so.${LIBgnomecanvas_VERSION}
@lib lib/evolution/${R}/libmenus.so.${LIBmenus_VERSION}
lib/evolution/${R}/modules/libevolution-module-addressbook.so
lib/evolution/${R}/modules/libevolution-module-bogofilter.so
lib/evolution/${R}/modules/libevolution-module-calendar.so
lib/evolution/${R}/modules/libevolution-module-composer-autosave.so
lib/evolution/${R}/modules/libevolution-module-mail.so
@ -30,9 +31,9 @@ lib/evolution/${R}/modules/libevolution-module-mailto-handler.so
lib/evolution/${R}/modules/libevolution-module-offline-alert.so
lib/evolution/${R}/modules/libevolution-module-plugin-lib.so
lib/evolution/${R}/modules/libevolution-module-plugin-manager.so
lib/evolution/${R}/modules/libevolution-module-spamassassin.so
lib/evolution/${R}/modules/libevolution-module-startup-wizard.so
lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.so
lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.so
lib/evolution/${R}/plugins/liborg-gnome-calendar-file.so
lib/evolution/${R}/plugins/liborg-gnome-calendar-http.so
lib/evolution/${R}/plugins/liborg-gnome-calendar-weather.so
@ -40,10 +41,8 @@ lib/evolution/${R}/plugins/liborg-gnome-default-source.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-caldav.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-google.so
lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.so
lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.so
lib/evolution/${R}/plugins/liborg-gnome-imap-features.so
lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.so
lib/evolution/${R}/plugins/liborg-gnome-mark-all-read.so
lib/evolution/${R}/plugins/liborg-gnome-pst-import.so
lib/evolution/${R}/plugins/liborg-gnome-publish-calendar.so
lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.so

File diff suppressed because it is too large Load Diff