diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 57359e4a290..fa2f9e0b281 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,24 +1,21 @@ -# $OpenBSD: Makefile,v 1.134 2011/09/22 10:30:43 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.135 2011/09/25 08:04:45 ajacoutot Exp $ COMMENT-main= integrated email and PIM software for GNOME COMMENT-plugins= additionnal plugins for evolution GNOME_PROJECT= evolution -GNOME_VERSION= 3.1.92 +GNOME_VERSION= 3.2.0 PKGNAME-main= ${DISTNAME} PKGNAME-plugins= evolution-plugins-${GNOME_VERSION} -REVISION-main= 0 - # Only get the first x.y which is needed in the PLIST. # NOTE: when major version changes, increment EVO_VERSION accordingly # and bump: # mail/evolution-rss # mail/evolution-exchange # x11/gnome/tracker -#R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} -R= 3.2 # XXX +R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} SUBST_VARS= R CATEGORIES= mail @@ -49,17 +46,17 @@ WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender WANTLIB += Xxf86vm asn1 atk-1.0 c cairo cairo-gobject camel-1.2 WANTLIB += camel-provider-1.2 canberra com_err crypto -WANTLIB += db dbus-1 dbus-glib-1 drm ebackend-1.2 ebook-1.2 ecal-1.2 +WANTLIB += db dbus-1 drm ebackend-1.2 ebook-1.2 ecal-1.2 WANTLIB += edataserver-1.2 edataserverui-3.0 enchant WANTLIB += execinfo 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 +WANTLIB += ical icalss icalvcal krb5 ffi kvm 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 -WANTLIB += startup-notification-1 stdc++ unique-3.0 +WANTLIB += startup-notification-1 stdc++ WANTLIB += xcb xcb-aux xcb-render xcb-shm xml2 z WANTLIB-main += ${WANTLIB} @@ -99,7 +96,6 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \ x11/gnome/icon-theme \ ${MODGNOME_RUN_DEPENDS_yelp} LIB_DEPENDS-main= ${LIB_DEPENDS} \ - devel/libunique3 \ converters/libpst \ databases/evolution-data-server>=3.1.91 \ databases/openldap \ @@ -117,7 +113,7 @@ RUN_DEPENDS-plugins= ${MODGCONF2_RUN_DEPENDS} \ multimedia/gstreamer-0.10/plugins-good MODGNOME_TOOLS= yelp -MODGNOME_DESKTOP_FILE= Yes +MODGNOME_DESKTOP_FILE= Yes MODGCONF2_SCHEMAS_DIR= evolution YACC= bison @@ -131,10 +127,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \ -Wl,--as-needed" -CONFIGURE_ARGS+= --disable-gtk-doc \ - --enable-plugins=all \ +CONFIGURE_ARGS= --enable-plugins=all \ --disable-nm \ --disable-goa \ + --disable-sens \ + --disable-connman \ + --disable-mono \ + --disable-python \ + --disable-contact-maps \ + --without-clutter \ --with-openldap="${LOCALBASE}" \ --with-sub-version=" OpenBSD/Ports" \ --with-krb5=/usr \ diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 8b18af0c924..297744e61ed 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,5 +1,5 @@ -MD5 (evolution-3.1.92.tar.xz) = 1M5JIkghxPdYBYIN8l1Tgg== -RMD160 (evolution-3.1.92.tar.xz) = /KGiwLZTiiYEWtpCjIrb72Web1U= -SHA1 (evolution-3.1.92.tar.xz) = EalBD/MULw0afG171Wv7HH2oMAQ= -SHA256 (evolution-3.1.92.tar.xz) = X3x7G+mofDpcFpQyb2X8T1LrTn/vKzarKn4QrPta6HU= -SIZE (evolution-3.1.92.tar.xz) = 11424676 +MD5 (evolution-3.2.0.tar.xz) = fCFD/mk0MVjKIgkDtPS1aQ== +RMD160 (evolution-3.2.0.tar.xz) = dTuI4pCuuB2mahWKEGcoxgKGsZg= +SHA1 (evolution-3.2.0.tar.xz) = 5ZXnq0ElG+7VC8srbgk0R659Km8= +SHA256 (evolution-3.2.0.tar.xz) = U4iDUxqmS+wbQ8c9uc8bWVc9EK3E2NymQB5L/6kPJG0= +SIZE (evolution-3.2.0.tar.xz) = 11412756 diff --git a/mail/evolution/pkg/PLIST-main b/mail/evolution/pkg/PLIST-main index 04cfea3611a..b3d9118bc96 100644 --- a/mail/evolution/pkg/PLIST-main +++ b/mail/evolution/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.23 2011/09/22 10:30:43 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.24 2011/09/25 08:04:45 ajacoutot Exp $ @pkgpath mail/evolution %%SHARED%% @bin bin/evolution @@ -418,8 +418,6 @@ include/evolution-${R}/text/gal-a11y-e-text-factory.h include/evolution-${R}/text/gal-a11y-e-text.h lib/evolution/ lib/evolution/${R}/ -@comment lib/evolution/${R}/libart_lgpl.a -@comment lib/evolution/${R}/libart_lgpl.la @comment lib/evolution/${R}/libcomposer.a @comment lib/evolution/${R}/libcomposer.la @comment lib/evolution/${R}/libeabutil.a @@ -490,12 +488,6 @@ lib/evolution/${R}/modules/ @comment lib/evolution/${R}/modules/libevolution-module-startup-wizard.a @comment lib/evolution/${R}/modules/libevolution-module-startup-wizard.la lib/evolution/${R}/plugins/ -@comment lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.a -@comment lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.la -@comment lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.a -@comment lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.la -@comment lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.a -@comment lib/evolution/${R}/plugins/liborg-gnome-sa-junk-plugin.la @comment lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.a @comment lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.la @comment lib/evolution/${R}/plugins/liborg-gnome-calendar-file.a @@ -4871,6 +4863,7 @@ share/gtk-doc/html/eshell/eshell-Shell-Utilities.html share/gtk-doc/html/eshell/eshell-Text-to-HTML-Conversion.html share/gtk-doc/html/eshell/eshell-User-Alert-Handling.html share/gtk-doc/html/eshell/eshell-e-signature-utils.html +share/gtk-doc/html/eshell/eshell.devhelp share/gtk-doc/html/eshell/eshell.devhelp2 share/gtk-doc/html/eshell/home.png share/gtk-doc/html/eshell/index.html