aboutsummaryrefslogtreecommitdiff
path: root/mail/evolution
diff options
context:
space:
mode:
Diffstat (limited to 'mail/evolution')
-rw-r--r--mail/evolution/Makefile25
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/patch-aa2
-rw-r--r--mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c34
-rw-r--r--mail/evolution/pkg-plist114
5 files changed, 119 insertions, 62 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index cf052741a8da..f0a9c56e0b18 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.119 2006/10/07 17:10:06 marcus Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.6.3
+PORTVERSION= 2.8.1
PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -18,18 +18,18 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An integrated mail, calendar and address book distributed suite
LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \
gtkhtml3 desktopfileutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
@@ -43,13 +43,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \
apps_evolution_calendar-${EVO_VERSION}.schemas \
- apps-evolution-mail-prompts-checkdefault-2.6.schemas \
+ apps-evolution-mail-prompts-checkdefault-${EVO_VERSION}.schemas \
apps_evolution_shell-${EVO_VERSION}.schemas \
evolution-mail-${EVO_VERSION}.schemas
-EVO_VERSION= 2.6
+EVO_VERSION= 2.8
PLIST_SUB= VERSION=${EVO_VERSION} \
- PORTVERSION=2.6
+ PORTVERSION=2.8
OPTIONS= PILOT "Enable Palm Pilot sync support" off \
LDAP "Enable LDAP support" on \
@@ -69,15 +69,10 @@ WITH_DBUS= yes
WITH_DBUS= yes
.endif
-.if exists(${X11BASE}/lib/libgstreamer-0.8.so)
+.if exists(${LOCALBASE}/lib/libgstreamer-0.8.so)
WITH_GSTREAMER= yes
.endif
-.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
- defined(WITH_NOTIFY)
-LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
-.endif
-
.if defined(WITH_PILOT)
LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \
@@ -106,7 +101,7 @@ PLIST_SUB+= GSTREAMER="@comment "
.endif
.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
PLIST_SUB+= DBUS=""
.else
PLIST_SUB+= DBUS="@comment "
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index d1481bb7857f..079c041953c9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.6.3.tar.bz2) = d7db71aaff2764f03083e6ce74c8ebde
-SHA256 (gnome2/evolution-2.6.3.tar.bz2) = a9bbea60b055ae1be3791101d69d7eef7ddf65d806c24e5a997999573325016d
-SIZE (gnome2/evolution-2.6.3.tar.bz2) = 12440797
+MD5 (gnome2/evolution-2.8.1.tar.bz2) = 6a08d1121bc126c4ed7035ab94a09871
+SHA256 (gnome2/evolution-2.8.1.tar.bz2) = 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b
+SIZE (gnome2/evolution-2.8.1.tar.bz2) = 12873039
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index f09892fc8150..c852e61792ea 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -11,7 +11,7 @@
+ SA_JUNK_PLUGIN=sa-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
-+ HAL_REQUIREMENT=''
++ HAL_REQUIREMENT='hal'
+ ;;
*) os_win32=no
NO_UNDEFINED=''
diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
new file mode 100644
index 000000000000..a6440719257b
--- /dev/null
+++ b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
@@ -0,0 +1,34 @@
+--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig Mon Jul 10 21:50:12 2006
++++ widgets/e-timezone-dialog/e-timezone-dialog.c Mon Jul 10 22:11:54 2006
+@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate {
+
+ #ifndef G_OS_WIN32 /* Declared properly in time.h already */
+ extern char *tzname[2];
++#ifndef __BSD_VISIBLE
+ extern long timezone;
++#endif
+ extern int daylight;
+ #endif
+
+@@ -317,9 +319,20 @@ static const icaltimezone*
+ get_local_timezone()
+ {
+ icaltimezone *zone;
++ long offset;
++#ifdef __BSD_VISIBLE
++ time_t tt;
++ struct tm tm;
++#endif
+
+ tzset();
+- zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
++#ifdef __BSD_VISIBLE
++ localtime_r (&tt, &tm);
++ offset = tm.tm_gmtoff;
++#else
++ offset = -timezone;
++#endif
++ zone = icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
+
+ return zone;
+ }
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 8a034a468bf8..7782d112f7e4 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,25 +1,5 @@
bin/evolution
bin/evolution-%%VERSION%%
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-toggle.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-tree.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-vbox.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-column-header.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree.h
-include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text-factory.h
-include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text.h
-include/evolution-%%VERSION%%/a11y/gal-a11y-factory.h
-include/evolution-%%VERSION%%/a11y/gal-a11y-util.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
@@ -130,6 +110,7 @@ include/evolution-%%VERSION%%/misc/e-dropdown-button.h
include/evolution-%%VERSION%%/misc/e-expander.h
include/evolution-%%VERSION%%/misc/e-gui-utils.h
include/evolution-%%VERSION%%/misc/e-hsv-utils.h
+include/evolution-%%VERSION%%/misc/e-icon-entry.h
include/evolution-%%VERSION%%/misc/e-image-chooser.h
include/evolution-%%VERSION%%/misc/e-info-label.h
include/evolution-%%VERSION%%/misc/e-map.h
@@ -164,6 +145,7 @@ include/evolution-%%VERSION%%/table/e-cell-checkbox.h
include/evolution-%%VERSION%%/table/e-cell-combo.h
include/evolution-%%VERSION%%/table/e-cell-date.h
include/evolution-%%VERSION%%/table/e-cell-float.h
+include/evolution-%%VERSION%%/table/e-cell-hbox.h
include/evolution-%%VERSION%%/table/e-cell-number.h
include/evolution-%%VERSION%%/table/e-cell-pixbuf.h
include/evolution-%%VERSION%%/table/e-cell-popup.h
@@ -424,7 +406,7 @@ libexec/evolution/%%VERSION%%/evolution-addressbook-clean
libexec/evolution/%%VERSION%%/evolution-addressbook-export
libexec/evolution/%%VERSION%%/evolution-alarm-notify
libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution.desktop
+share/gnome/applications/evolution-%%VERSION%%.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/evolution/%%VERSION%%/addresstypes.xml
share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
@@ -449,6 +431,7 @@ share/gnome/evolution/%%VERSION%%/errors/mail.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml
share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
@@ -485,6 +468,7 @@ share/gnome/evolution/%%VERSION%%/glade/event-page.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/filter.glade
@@ -513,12 +497,15 @@ share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
share/gnome/evolution/%%VERSION%%/glade/task-page.glade
share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
+share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
share/gnome/evolution/%%VERSION%%/images/about-box.png
share/gnome/evolution/%%VERSION%%/images/bcg.png
share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
+share/gnome/evolution/%%VERSION%%/images/minus.png
share/gnome/evolution/%%VERSION%%/images/monkey-16.png
share/gnome/evolution/%%VERSION%%/images/offline.png
share/gnome/evolution/%%VERSION%%/images/online.png
+share/gnome/evolution/%%VERSION%%/images/plus.png
share/gnome/evolution/%%VERSION%%/images/query-free-busy.png
share/gnome/evolution/%%VERSION%%/images/world_map-960.png
share/gnome/evolution/%%VERSION%%/searchtypes.xml
@@ -552,6 +539,8 @@ share/gnome/evolution/%%VERSION%%/views/mail/By_Sender.galview
share/gnome/evolution/%%VERSION%%/views/mail/By_Status.galview
share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview
share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview
+share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Normal.galview
+share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Sent.galview
share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
@@ -570,7 +559,6 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
-share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Evolution-mailer-Preferences.png
share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
@@ -626,8 +614,8 @@ share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution.keys
-share/gnome/mime-info/evolution.mime
+share/gnome/mime-info/evolution-%%VERSION%%.keys
+share/gnome/mime-info/evolution-%%VERSION%%.mime
share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
share/gnome/pixmaps/evolution-%%VERSION%%.png
share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -636,7 +624,7 @@ share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -671,13 +659,15 @@ share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -702,20 +692,6 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/evolution
@dirrm share/gnome/idl/evolution-%%VERSION%%
@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
@@ -730,6 +706,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/evolution/%%VERSION%%/views
@dirrm share/gnome/evolution/%%VERSION%%/ui
@dirrm share/gnome/evolution/%%VERSION%%/images
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref
@dirrm share/gnome/evolution/%%VERSION%%/help
@@ -790,8 +767,59 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
@dirrm include/evolution-%%VERSION%%/addressbook/gui
@dirrm include/evolution-%%VERSION%%/addressbook
-@dirrm include/evolution-%%VERSION%%/a11y/e-text
-@dirrm include/evolution-%%VERSION%%/a11y/e-table
-@dirrm include/evolution-%%VERSION%%/a11y
@dirrm include/evolution-%%VERSION%%
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be