Update to 1.5.94.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2745 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 55 insertions, 54 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 46915671b..26dd873a0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.94
+PORTVERSION=	1.5.94.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
@@ -42,8 +42,9 @@ GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
 		apps_evolution_shell-${EVO_VERSION}.schemas \
 		evolution-mail-${EVO_VERSION}.schemas
 
-EVO_VERSION=	1.5
-PLIST_SUB=	VERSION=${EVO_VERSION}
+EVO_VERSION=	2.0
+PLIST_SUB=	VERSION=${EVO_VERSION} \
+		PORTVERSION=1.5
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index e747b807d..c9749e0d7 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.5.94.tar.bz2) = ce59d18b6e40f67077b95fbdec8f12c4
-SIZE (gnome2/evolution-1.5.94.tar.bz2) = 13051025
+MD5 (gnome2/evolution-1.5.94.1.tar.bz2) = 02afa72a16e0308ab610c55ca751e317
+SIZE (gnome2/evolution-1.5.94.1.tar.bz2) = 13051728
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 4d270f0d5..3c17a0a2e 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -395,49 +395,49 @@ share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo.conduit
-share/gnome/help/evolution-%%VERSION%%/C/apx-authors.xml
-share/gnome/help/evolution-%%VERSION%%/C/apx-bugs.xml
-share/gnome/help/evolution-%%VERSION%%/C/apx-fdl.xml
-share/gnome/help/evolution-%%VERSION%%/C/apx-gloss.xml
-share/gnome/help/evolution-%%VERSION%%/C/apx-gpl.xml
-share/gnome/help/evolution-%%VERSION%%/C/config-prefs.xml
-share/gnome/help/evolution-%%VERSION%%/C/config-sync.xml
-share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
-share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/legal.xml
-share/gnome/help/evolution-%%VERSION%%/C/menuref.xml
-share/gnome/help/evolution-%%VERSION%%/C/preface.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-calendar.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-contact.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-exchange.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-mail-org.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-mail.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-mainwindow.xml
-share/gnome/help/evolution-%%VERSION%%/C/usage-sync.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/apx-authors.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/apx-bugs.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/apx-fdl.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/apx-gloss.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/apx-gpl.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/config-prefs.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/config-sync.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/evolution-%%PORTVERSION%%.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/calendar.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-cal.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-mail.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact-editor.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-delegation.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-identity.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive-options.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/filter-new-fig.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-1.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-2.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-3.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-4.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-5.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-6.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-7.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-druid-pic.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-inbox.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-threaded.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mainwindow-pic.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/newmsg.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/replymsg.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/schedule.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution-%%PORTVERSION%%/C/legal.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/menuref.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/preface.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-calendar.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-contact.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-exchange.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-mail-org.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-mail.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-mainwindow.xml
+share/gnome/help/evolution-%%PORTVERSION%%/C/usage-sync.xml
 share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Addressbook-SelectNames.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
@@ -452,8 +452,8 @@ share/gnome/idl/evolution-%%VERSION%%/GNOME_Evolution_Importer.idl
 share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
 share/gnome/mime-info/evolution-%%VERSION%%.keys
 share/gnome/mime-info/evolution-%%VERSION%%.mime
-share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -512,9 +512,9 @@ share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%VERSION%%/C
-@dirrm share/gnome/help/evolution-%%VERSION%%
+@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures
+@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C
+@dirrm share/gnome/help/evolution-%%PORTVERSION%%
 @dirrm share/gnome/evolution/%%VERSION%%/views/tasks
 @dirrm share/gnome/evolution/%%VERSION%%/views/mail
 @dirrm share/gnome/evolution/%%VERSION%%/views/calendar
@@ -551,5 +551,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/camel
 @dirrm include/evolution-%%VERSION%%
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf 2>/dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true