From 862ae1fbe805183bd9a59748d17c01d3220a76a6 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 19 Jan 2011 21:23:44 +0000 Subject: Fix weather support. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15053 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/evolution-data-server3/Makefile | 19 +++++++++---------- databases/evolution-data-server3/pkg-plist | 8 +++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile index 4b3eb38c0..7fd355108 100644 --- a/databases/evolution-data-server3/Makefile +++ b/databases/evolution-data-server3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.1 2010/07/13 15:25:01 kwm Exp $ +# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.3 2011/01/19 19:02:27 kwm Exp $ # PORTNAME= evolution-data-server @@ -40,7 +40,6 @@ USE_BDB= 41+ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ --enable-gtk3 \ - --enable-gnome-keyring=yes \ --with-openldap=yes \ --with-libdb=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ @@ -49,7 +48,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_C PLIST_SUB= VERSION="2.92" EVO_VERSION="1.2" #OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off -#OPTIONS= WEATHER "Enable weather calendar backend" on +OPTIONS+= WEATHER "Enable weather calendar backend" on .include @@ -71,14 +70,14 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` PLIST_SUB+= IMAP4="@comment " #.endif -#.if defined(WITH_WEATHER) -#LIB_DEPENDS+= gweather.1:${PORTSDIR}/net/libgweather -#CONFIGURE_ARGS+= --with-weather -#PLIST_SUB+= WEATHER="" -#.else -CONFIGURE_ARGS+= --without-weather +.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 +.endif EDS_BDB_MSG= "!!!WARNING!!!: Berkeley Database version is ${BDB_VER}. If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41." diff --git a/databases/evolution-data-server3/pkg-plist b/databases/evolution-data-server3/pkg-plist index a621e6d6f..fe44f5b68 100644 --- a/databases/evolution-data-server3/pkg-plist +++ b/databases/evolution-data-server3/pkg-plist @@ -241,9 +241,9 @@ lib/evolution-data-server/calendar-backends/libecalbackendgroupwise.so lib/evolution-data-server/calendar-backends/libecalbackendhttp.a lib/evolution-data-server/calendar-backends/libecalbackendhttp.la lib/evolution-data-server/calendar-backends/libecalbackendhttp.so -lib/evolution-data-server/calendar-backends/libecalbackendweather.a -lib/evolution-data-server/calendar-backends/libecalbackendweather.la -lib/evolution-data-server/calendar-backends/libecalbackendweather.so +%%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.a +%%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.la +%%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.so lib/evolution-data-server/camel-providers/libcamelgroupwise.a lib/evolution-data-server/camel-providers/libcamelgroupwise.la lib/evolution-data-server/camel-providers/libcamelgroupwise.so @@ -693,7 +693,6 @@ share/doc/libedataserverui/right.png share/doc/libedataserverui/style.css share/doc/libedataserverui/up.png share/evolution-data-server-%%VERSION%%/evolutionperson.schema -%%WEATHER%%share/evolution-data-server-%%VERSION%%/weather/Locations.xml share/gir-1.0/ECalendar-1.2.gir share/gir-1.0/EDataServer-1.2.gir share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -798,7 +797,6 @@ share/pixmaps/evolution-data-server/category_strategies_16.png share/pixmaps/evolution-data-server/category_suppliers_16.png share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm share/pixmaps/evolution-data-server -%%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather @dirrm share/doc/libedataserverui @dirrm share/doc/libedataserver @dirrm share/doc/libedata-cal -- cgit v1.2.3