Update to 1.1.2.

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

4 files changed, 16 insertions, 10 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 351a08531..cb90e19b3 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
-MASTER_SITE_SUBDIR=	unstable/sources/evolution \
+MASTER_SITE_SUBDIR=	sources/evolution/1.1 \
 			sobomax/:local
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		db-3.1.17${EXTRACT_SUFX}:local
@@ -21,7 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
 		nss3.1:${PORTSDIR}/security/nss \
 		gal.20:${PORTSDIR}/x11-toolkits/gal \
-		gtkhtml-1.1.1:${PORTSDIR}/www/gtkhtml
+		gtkhtml-1.1.2:${PORTSDIR}/www/gtkhtml
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index 0a7f182fb..824940798 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.1.1.tar.bz2) = 3262fd07bdce4d149af3d17702fbb265
+MD5 (gnome/evolution-1.1.2.tar.bz2) = 7d15d3433a2aac7d27361e017be370e1
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution-devel/files/patch-my-evolution::e-summary-preferences.c b/mail/evolution-devel/files/patch-my-evolution::e-summary-preferences.c
index c49057769..aa7befa54 100644
--- a/mail/evolution-devel/files/patch-my-evolution::e-summary-preferences.c
+++ b/mail/evolution-devel/files/patch-my-evolution::e-summary-preferences.c
@@ -1,11 +1,10 @@
---- my-evolution/e-summary-preferences.c.orig	Thu Sep 19 00:43:57 2002
-+++ my-evolution/e-summary-preferences.c	Thu Sep 19 00:43:58 2002
-@@ -574,9 +574,11 @@
+--- my-evolution/e-summary-preferences.c.orig	Thu Sep 26 15:23:36 2002
++++ my-evolution/e-summary-preferences.c	Tue Oct 15 17:22:04 2002
+@@ -581,8 +581,10 @@
+ 	{"http://barrapunto.com/gnome.rdf", "Barrapunto GNOME", FALSE,},
  	{"http://www.bsdtoday.com/backend/bt.rdf", "BSD Today", FALSE},
  	{"http://beyond2000.com/b2k.rdf", "Beyond 2000", FALSE},
-   	{"http://www.cnn.com/cnn.rss", "CNN", FALSE},
 +	{"http://daily.daemonnews.org/ddn.rdf.php3", "Daily Daemon News"},
-         {"http://www.debianplanet.org/debianplanet/backend.php", "Debian Planet", FALSE},
  	{"http://www.dictionary.com/wordoftheday/wotd.rss", N_("Dictionary.com Word of the Day"), FALSE},
  	{"http://www.dvdreview.com/rss/newschannel.rss", "DVD Review", FALSE},
 +	{"http://www.freebsd.org/news/news.rdf", "FreeBSD Newsflash"},
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 7b9f819b0..5aa57e92d 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -301,6 +301,9 @@ lib/evolution/1.1/libversit.a
 lib/evolution_addressbookConf.sh
 lib/evolution_calendarConf.sh
 lib/evolution_shellConf.sh
+%%PILOT:%%lib/gnome-pilot/conduits/libeaddress_conduit.so
+%%PILOT:%%lib/gnome-pilot/conduits/libecalendar_conduit.so
+%%PILOT:%%lib/gnome-pilot/conduits/libetodo_conduit.so
 lib/libcal-client.a
 lib/libcal-client.so
 lib/libcal-client.so.0
@@ -430,6 +433,9 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/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/C/access.html
 share/gnome/help/evolution/C/apx-gloss.html
 share/gnome/help/evolution/C/authors.html
@@ -445,7 +451,6 @@ share/gnome/help/evolution/C/contact-search.html
 share/gnome/help/evolution/C/customizing-summary.html
 share/gnome/help/evolution/C/docbook.css
 share/gnome/help/evolution/C/encryption.html
-share/gnome/help/evolution/C/features.html
 share/gnome/help/evolution/C/figures/calendar.png
 share/gnome/help/evolution/C/figures/config-cal.png
 share/gnome/help/evolution/C/figures/config-mail.png
@@ -695,6 +700,7 @@ share/gnome/idl/Evolution-Wombat.idl
 share/gnome/idl/Evolution-common.idl
 share/gnome/idl/Evolution.idl
 share/gnome/idl/GNOME_Evolution_Importer.idl
+share/gnome/idl/Mailer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
 share/gnome/images/evolution/16_copy.png
@@ -851,6 +857,7 @@ share/gnome/images/evolution/pgp-signature-bad.png
 share/gnome/images/evolution/pgp-signature-nokey.png
 share/gnome/images/evolution/pgp-signature-ok.png
 share/gnome/images/evolution/post-message-16.png
+share/gnome/images/evolution/post-reply-24.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
 share/gnome/images/evolution/priority-high.xpm