Update to 1.2.1.

6 files changed, 46 insertions, 8 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 00677daaddd..45f2fc92818 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.2.0
-PORTREVISION=	4
+PORTVERSION=	1.2.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,7 +20,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
 		nss3.1:${PORTSDIR}/security/nss \
-		soup.5:${PORTSDIR}/devel/soup
+		soup.6:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index eae12ea0008..d658b6c6533 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.2.0.tar.bz2) = 949c31941e869606ab808ce42f3a8e98
+MD5 (gnome/evolution-1.2.1.tar.bz2) = 51ce3295f280c6533ecbcd9df45c6691
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index fa9d94e8786..5072a21d7e9 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -10,6 +10,7 @@ bin/evolution-calendar-importer
 bin/evolution-elm-importer
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
+bin/evolution-launch-composer
 bin/evolution-ldif-importer
 bin/evolution-mail
 bin/evolution-mail-upgrade
@@ -442,7 +443,9 @@ share/gnome/evolution/views/tasks/galview.xml
 %%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-fdl.html
 share/gnome/help/evolution/C/apx-gloss.html
+share/gnome/help/evolution/C/apx-gpl.html
 share/gnome/help/evolution/C/authors.html
 share/gnome/help/evolution/C/bugs.html
 share/gnome/help/evolution/C/config-prefs-cal.html
@@ -456,6 +459,18 @@ 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/fdl-section1.html
+share/gnome/help/evolution/C/fdl-section10.html
+share/gnome/help/evolution/C/fdl-section2.html
+share/gnome/help/evolution/C/fdl-section3.html
+share/gnome/help/evolution/C/fdl-section4.html
+share/gnome/help/evolution/C/fdl-section5.html
+share/gnome/help/evolution/C/fdl-section6.html
+share/gnome/help/evolution/C/fdl-section7.html
+share/gnome/help/evolution/C/fdl-section8.html
+share/gnome/help/evolution/C/fdl-section9.html
+share/gnome/help/evolution/C/fdl-using.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
@@ -493,6 +508,8 @@ share/gnome/help/evolution/C/install.html
 share/gnome/help/evolution/C/introduction.html
 share/gnome/help/evolution/C/ln20.html
 share/gnome/help/evolution/C/menuref.html
+share/gnome/help/evolution/C/organization.html
+share/gnome/help/evolution/C/other-help.html
 share/gnome/help/evolution/C/print-destination.html
 share/gnome/help/evolution/C/quickref-cal.html
 share/gnome/help/evolution/C/quickref-contact.html
@@ -500,7 +517,9 @@ share/gnome/help/evolution/C/quickref-mail.html
 share/gnome/help/evolution/C/rsvp-stuff.html
 share/gnome/help/evolution/C/sgml/apx-authors.sgml
 share/gnome/help/evolution/C/sgml/apx-bugs.sgml
+share/gnome/help/evolution/C/sgml/apx-fdl.sgml
 share/gnome/help/evolution/C/sgml/apx-gloss.sgml
+share/gnome/help/evolution/C/sgml/apx-gpl.sgml
 share/gnome/help/evolution/C/sgml/config-prefs.sgml
 share/gnome/help/evolution/C/sgml/config-sync.sgml
 share/gnome/help/evolution/C/sgml/evolution.sgml
@@ -527,6 +546,7 @@ share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
 share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
 share/gnome/help/evolution/C/stylesheet-images/up.gif
 share/gnome/help/evolution/C/stylesheet-images/warning.gif
+share/gnome/help/evolution/C/terms.html
 share/gnome/help/evolution/C/topic.dat
 share/gnome/help/evolution/C/typography.html
 share/gnome/help/evolution/C/ui-intro.html
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 00677daaddd..45f2fc92818 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.2.0
-PORTREVISION=	4
+PORTVERSION=	1.2.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,7 +20,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
 		nss3.1:${PORTSDIR}/security/nss \
-		soup.5:${PORTSDIR}/devel/soup
+		soup.6:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index eae12ea0008..d658b6c6533 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome/evolution-1.2.0.tar.bz2) = 949c31941e869606ab808ce42f3a8e98
+MD5 (gnome/evolution-1.2.1.tar.bz2) = 51ce3295f280c6533ecbcd9df45c6691
 MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index fa9d94e8786..5072a21d7e9 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -10,6 +10,7 @@ bin/evolution-calendar-importer
 bin/evolution-elm-importer
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
+bin/evolution-launch-composer
 bin/evolution-ldif-importer
 bin/evolution-mail
 bin/evolution-mail-upgrade
@@ -442,7 +443,9 @@ share/gnome/evolution/views/tasks/galview.xml
 %%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-fdl.html
 share/gnome/help/evolution/C/apx-gloss.html
+share/gnome/help/evolution/C/apx-gpl.html
 share/gnome/help/evolution/C/authors.html
 share/gnome/help/evolution/C/bugs.html
 share/gnome/help/evolution/C/config-prefs-cal.html
@@ -456,6 +459,18 @@ 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/fdl-section1.html
+share/gnome/help/evolution/C/fdl-section10.html
+share/gnome/help/evolution/C/fdl-section2.html
+share/gnome/help/evolution/C/fdl-section3.html
+share/gnome/help/evolution/C/fdl-section4.html
+share/gnome/help/evolution/C/fdl-section5.html
+share/gnome/help/evolution/C/fdl-section6.html
+share/gnome/help/evolution/C/fdl-section7.html
+share/gnome/help/evolution/C/fdl-section8.html
+share/gnome/help/evolution/C/fdl-section9.html
+share/gnome/help/evolution/C/fdl-using.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
@@ -493,6 +508,8 @@ share/gnome/help/evolution/C/install.html
 share/gnome/help/evolution/C/introduction.html
 share/gnome/help/evolution/C/ln20.html
 share/gnome/help/evolution/C/menuref.html
+share/gnome/help/evolution/C/organization.html
+share/gnome/help/evolution/C/other-help.html
 share/gnome/help/evolution/C/print-destination.html
 share/gnome/help/evolution/C/quickref-cal.html
 share/gnome/help/evolution/C/quickref-contact.html
@@ -500,7 +517,9 @@ share/gnome/help/evolution/C/quickref-mail.html
 share/gnome/help/evolution/C/rsvp-stuff.html
 share/gnome/help/evolution/C/sgml/apx-authors.sgml
 share/gnome/help/evolution/C/sgml/apx-bugs.sgml
+share/gnome/help/evolution/C/sgml/apx-fdl.sgml
 share/gnome/help/evolution/C/sgml/apx-gloss.sgml
+share/gnome/help/evolution/C/sgml/apx-gpl.sgml
 share/gnome/help/evolution/C/sgml/config-prefs.sgml
 share/gnome/help/evolution/C/sgml/config-sync.sgml
 share/gnome/help/evolution/C/sgml/evolution.sgml
@@ -527,6 +546,7 @@ share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
 share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
 share/gnome/help/evolution/C/stylesheet-images/up.gif
 share/gnome/help/evolution/C/stylesheet-images/warning.gif
+share/gnome/help/evolution/C/terms.html
 share/gnome/help/evolution/C/topic.dat
 share/gnome/help/evolution/C/typography.html
 share/gnome/help/evolution/C/ui-intro.html