Update to 3.2.1.

Reenable weather calendar support. (on just like in e-d-s).


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

3 files changed, 23 insertions, 8 deletions

diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index a1724bfd2..9c15f01de 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution3/Makefile,v 1.18 2011/09/19 19:34:23 kwm Exp $
+#   $MCom: ports/mail/evolution3/Makefile,v 1.19 2011/09/25 12:29:47 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -39,8 +39,8 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--enable-mono=no \
 		--disable-nm \
 		--with-sub-version=" FreeBSD GNOME Team Port"
-# gweather and gtkimageview needs to get a gtk3 release first.
-CONFIGURE_ARGS+=--disable-weather --disable-image-inline
+# gtkimageview needs to get a gtk3 release first.
+CONFIGURE_ARGS+=--disable-image-inline
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -62,11 +62,12 @@ PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
 OPTIONS=	LDAP "Enable LDAP support" on \
+		WEATHER "Enable weather calendar backend" on \
 		CANBERRA "Enable canberra plugin" on \
 		SPAMASSASSIN "Enable SpamAssassin spam filtering" off
 #		PST "Enable Outlook .pst importer" off \
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
 
@@ -77,6 +78,16 @@ CONFIGURE_ARGS+=--with-openldap=${LOCALBASE}
 CONFIGURE_ARGS+=--with-openldap=no
 .endif
 
+.if defined(WITH_WEATHER)
+LIB_DEPENDS+=	gweather-3.0:${PORTSDIR}/net/libgweather3
+CONFIGURE_ARGS+=--enable-weather
+PLIST_SUB+=	WEATHER=""
+.else
+CONFIGURE_ARGS+=--disable-weather
+PLIST_SUB+=	WEATHER="@comment "
+.endif
+
+
 .if defined(WITH_SPAMASSASSIN)
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
@@ -123,4 +134,4 @@ post-patch:
 		${WRKSRC}/modules/bogofilter/evolution-bogofilter.c
 	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/evolution3/distinfo b/mail/evolution3/distinfo
index 6ce2177d9..f78229310 100644
--- a/mail/evolution3/distinfo
+++ b/mail/evolution3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-3.2.0.tar.xz) = 538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d
-SIZE (gnome3/evolution-3.2.0.tar.xz) = 11412756
+SHA256 (gnome3/evolution-3.2.1.tar.xz) = 244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a
+SIZE (gnome3/evolution-3.2.1.tar.xz) = 11472552
diff --git a/mail/evolution3/pkg-plist b/mail/evolution3/pkg-plist
index 9b4e98788..caf3887e0 100644
--- a/mail/evolution3/pkg-plist
+++ b/mail/evolution3/pkg-plist
@@ -539,6 +539,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
+%%WEATHER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a
+%%WEATHER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
+%%WEATHER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.so
@@ -604,6 +607,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
+%%WEATHER%%lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-dbx-import.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug