diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 69d6572427a..996d8195872 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.97 2011/09/25 06:41:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.98 2011/09/26 17:03:27 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= unified backend for PIM programs GNOME_PROJECT= evolution-data-server GNOME_VERSION= 3.2.0 +REVISION= 0 # Only get the first x.y which is needed in the PLIST. R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -45,7 +46,7 @@ WANTLIB += nss3 nssutil3 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs WANTLIB += sasl2 smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl ssl3 WANTLIB += xcb xcb-render xcb-shm xml2 z curl idn oauth ffi -WANTLIB += kvm softokn3 +WANTLIB += kvm softokn3 goa-1.0 MODULES= devel/gettext \ lang/python \ @@ -56,10 +57,10 @@ BUILD_DEPENDS= devel/bison \ LIB_DEPENDS= databases/db/v4 \ databases/openldap \ net/liboauth \ - security/nss>=3.11.4p1 \ textproc/libical \ x11/gnome/libgweather \ - devel/libgdata>=0.10.1 + devel/libgdata>=0.10.1 \ + x11/gnome/online-accounts YACC= bison @@ -77,7 +78,6 @@ CONFIGURE_ARGS= --enable-ssl \ --enable-ipv6 \ --enable-weather \ --enable-nntp \ - --disable-goa \ --with-nss-libs="${LOCALBASE}/lib" \ --with-nss-includes="${LOCALBASE}/include/nss" \ --with-nspr-libs=${LOCALBASE}/lib \ diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 62f73591cf9..fdffe502755 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.137 2011/09/26 13:30:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.138 2011/09/26 17:05:04 ajacoutot Exp $ COMMENT-main= integrated email and PIM software for GNOME COMMENT-plugins= additionnal plugins for evolution @@ -9,8 +9,8 @@ GNOME_VERSION= 3.2.0 PKGNAME-main= ${DISTNAME} PKGNAME-plugins= evolution-plugins-${GNOME_VERSION} -REVISION-main= 1 -REVISION-plugins= 1 +REVISION-main= 2 +REVISION-plugins= 2 # Only get the first x.y which is needed in the PLIST. # NOTE: when major version changes, increment EVO_VERSION accordingly @@ -55,7 +55,7 @@ WANTLIB += expat fontconfig freetype gailutil-3 WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring gobject-2.0 WANTLIB += gpg-error gssapi gthread-2.0 gtk-3 gtkhtml-4.0 gtkhtml-editor-4.0 -WANTLIB += ical icalss icalvcal krb5 ffi kvm +WANTLIB += ical icalss icalvcal krb5 ffi kvm dbus-glib-1 WANTLIB += m notify nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread WANTLIB += pthread-stubs smime3 softokn3 soup-2.4 sqlite3 ssl3 @@ -63,7 +63,7 @@ WANTLIB += xcb xcb-render xcb-shm xml2 z stdc++ WANTLIB-main += ${WANTLIB} WANTLIB-main += canberra-gtk3 gdata gweather-3 ldap-2.4 ltdl ogg pst -WANTLIB-main += vorbis vorbisfile +WANTLIB-main += vorbis vorbisfile goa-1.0 WANTLIB-plugins += ${WANTLIB} WANTLIB-plugins += gstreamer-0.10 @@ -133,7 +133,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ CONFIGURE_ARGS= --enable-plugins=all \ --disable-nm \ - --disable-goa \ --disable-sens \ --disable-connman \ --disable-mono \ diff --git a/mail/evolution/pkg/PFRAG.shared-main b/mail/evolution/pkg/PFRAG.shared-main index 19bf44d4c79..a2df73dc7db 100644 --- a/mail/evolution/pkg/PFRAG.shared-main +++ b/mail/evolution/pkg/PFRAG.shared-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.8 2011/09/21 13:27:59 jasper Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.9 2011/09/26 17:05:04 ajacoutot Exp $ @lib lib/evolution/${R}/libcomposer.so.${LIBcomposer_VERSION} @lib lib/evolution/${R}/libeabutil.so.${LIBeabutil_VERSION} @lib lib/evolution/${R}/libecontacteditor.so.${LIBecontacteditor_VERSION} @@ -29,6 +29,7 @@ lib/evolution/${R}/modules/libevolution-module-composer-autosave.so lib/evolution/${R}/modules/libevolution-module-mail.so lib/evolution/${R}/modules/libevolution-module-mailto-handler.so lib/evolution/${R}/modules/libevolution-module-offline-alert.so +lib/evolution/${R}/modules/libevolution-module-online-accounts.so lib/evolution/${R}/modules/libevolution-module-plugin-lib.so lib/evolution/${R}/modules/libevolution-module-plugin-manager.so lib/evolution/${R}/modules/libevolution-module-spamassassin.so diff --git a/mail/evolution/pkg/PLIST-main b/mail/evolution/pkg/PLIST-main index b3d9118bc96..7a49f289768 100644 --- a/mail/evolution/pkg/PLIST-main +++ b/mail/evolution/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.24 2011/09/25 08:04:45 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.25 2011/09/26 17:05:04 ajacoutot Exp $ @pkgpath mail/evolution %%SHARED%% @bin bin/evolution @@ -479,6 +479,8 @@ lib/evolution/${R}/modules/ @comment lib/evolution/${R}/modules/libevolution-module-mailto-handler.la @comment lib/evolution/${R}/modules/libevolution-module-offline-alert.a @comment lib/evolution/${R}/modules/libevolution-module-offline-alert.la +@comment lib/evolution/${R}/modules/libevolution-module-online-accounts.a +@comment lib/evolution/${R}/modules/libevolution-module-online-accounts.la @comment lib/evolution/${R}/modules/libevolution-module-plugin-lib.a @comment lib/evolution/${R}/modules/libevolution-module-plugin-lib.la @comment lib/evolution/${R}/modules/libevolution-module-plugin-manager.a