From b57e1c04f82fff010e49b76506d2289eb9f39135 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 30 Aug 2011 06:52:57 +0000 Subject: [PATCH] Fix WANTLIB after gmime/gpgme update. --- audio/rhythmbox/Makefile | 8 ++++---- x11/gnome/py-gnome-desktop/Makefile | 8 ++++---- x11/gnome/totem/Makefile | 8 ++++---- x11/gnome/tracker/Makefile | 8 ++++---- x11/gnome3/audio/rhythmbox/Makefile | 8 +++++--- x11/gnome3/x11/gnome/seahorse-plugins/Makefile | 6 ++++-- x11/gnome3/x11/gnome/seahorse/Makefile | 6 +++--- x11/gnome3/x11/gnome/totem/Makefile | 10 +++++----- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 288233996fd..fc1176b9a3c 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.74 2011/06/15 09:33:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.75 2011/08/30 06:52:57 ajacoutot Exp $ # coherence plugin is installed but not activated by default so we don't # enforce dependency on multimedia/coherence to lower requirements @@ -8,7 +8,7 @@ COMMENT= music management application for GNOME GNOME_PROJECT= rhythmbox GNOME_VERSION= 0.12.8 -REVISION = 14 +REVISION = 15 SHARED_LIBS += rhythmbox-core 0.0 # .0.0 @@ -30,13 +30,13 @@ WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm WANTLIB += atk-1.0 avahi-client avahi-common avahi-glib c cairo WANTLIB += dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmime-2.4 gmodule-2.0 gnome-keyring gnome-media-profiles +WANTLIB += gmime-2.6 gmodule-2.0 gnome-keyring gnome-media-profiles WANTLIB += gobject-2.0 gpg-error gpod gstbase-0.10 gstcontroller-0.10 WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 WANTLIB += gthread-2.0 gtk-x11-2.0 m notify pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 totem-plparser -WANTLIB += util xcb xcb-render xcb-shm xml2 z +WANTLIB += util xcb xcb-render xcb-shm xml2 z assuan gpgme-pthread WANTLIB += ${MODPY_WANTLIB} archive bz2 lzma MODULES= devel/gettext \ diff --git a/x11/gnome/py-gnome-desktop/Makefile b/x11/gnome/py-gnome-desktop/Makefile index a0828b4859e..0da0499ebde 100644 --- a/x11/gnome/py-gnome-desktop/Makefile +++ b/x11/gnome/py-gnome-desktop/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.32 2011/06/08 17:41:57 rpointel Exp $ +# $OpenBSD: Makefile,v 1.33 2011/08/30 06:52:57 ajacoutot Exp $ COMMENT= Python bindings for the GNOME desktop GNOME_PROJECT= gnome-python-desktop GNOME_VERSION= 2.32.0 PKGNAME= py-gnome-desktop-${VERSION} -REVISION= 5 +REVISION= 6 HOMEPAGE= http://www.pygtk.org/ @@ -22,7 +22,7 @@ WANTLIB += bonoboui-2 cairo camel-1.2 canberra canberra-gtk com_err WANTLIB += croco-0.6 crypto dbus-1 dbus-glib-1 drm ebook-1.2 ecal-1.2 WANTLIB += edataserver-1.2 evdocument evview execinfo expat ffi WANTLIB += fontconfig freetype gailutil gconf-2 gcrypt gdata gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmime-2.4 gmodule-2.0 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0 WANTLIB += gnome-2 gnome-desktop-2 gnome-keyring gnome-media-profiles WANTLIB += gnomecanvas-2 gnomeprint-2-2 gnomeprintui-2-2 gnomeui-2 WANTLIB += gnomevfs-2 gnutls gobject-2.0 gpg-error gssapi gstreamer-0.10 @@ -33,7 +33,7 @@ WANTLIB += pcre pixman-1 plc4 plds4 png popt proxy pthread pthread-stubs WANTLIB += rsvg-2 smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl ssl3 WANTLIB += startup-notification-1 tasn1 totem-plparser util vorbis WANTLIB += vorbisfile wnck-1 xcb xcb-atom xcb-aux xcb-event xcb-render -WANTLIB += xcb-shm xml2 z +WANTLIB += xcb-shm xml2 z assuan gpgme-pthread MODULES= devel/gettext \ lang/python \ diff --git a/x11/gnome/totem/Makefile b/x11/gnome/totem/Makefile index c5f087f82fc..efbc084fc3c 100644 --- a/x11/gnome/totem/Makefile +++ b/x11/gnome/totem/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.63 2011/06/08 17:41:57 rpointel Exp $ +# $OpenBSD: Makefile,v 1.64 2011/08/30 06:52:57 ajacoutot Exp $ COMMENT= official media player for GNOME GNOME_PROJECT= totem GNOME_VERSION= 2.32.0 -REVISION= 5 +REVISION= 6 CATEGORIES= multimedia @@ -20,12 +20,12 @@ WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xxf86vm WANTLIB += atk-1.0 c cairo dbus-1 dbus-glib-1 expat ffi fontconfig WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 -WANTLIB += glib-2.0 gmime-2.4 gmodule-2.0 gnome-keyring +WANTLIB += glib-2.0 gmime-2.6 gmodule-2.0 gnome-keyring WANTLIB += gobject-2.0 gpg-error gstbase-0.10 gstreamer-0.10 WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 unique-1.0 -WANTLIB += util xcb xml2 z xcb-render GL drm xcb-shm +WANTLIB += util xcb xml2 z xcb-render GL drm xcb-shm assuan gpgme-pthread WANTLIB += gstaudio-0.10 gstinterfaces-0.10 gstpbutils-0.10 gstvideo-0.10 WANTLIB += gsttag-0.10 totem-plparser nautilus-extension WANTLIB += gmp gnutls hogweed nettle proxy tasn1 ${MODPY_WANTLIB} diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile index 561f496c187..738dd6f7958 100644 --- a/x11/gnome/tracker/Makefile +++ b/x11/gnome/tracker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.63 2011/07/06 14:01:51 jasper Exp $ +# $OpenBSD: Makefile,v 1.64 2011/08/30 06:52:57 ajacoutot Exp $ COMMENT= powerful desktop search tool and indexer @@ -9,7 +9,7 @@ GNOME_VERSION= 0.8.18 # as meta-tracker. PKGNAME= meta-tracker-${VERSION} -REVISION= 4 +REVISION= 5 EVO_VERSION= 2.32 SUBST_VARS= EVO_VERSION @@ -22,13 +22,13 @@ SHARED_LIBS += tracker-miner-0.8 0.0 # .800.0 WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 +WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 assuan gpgme-pthread WANTLIB += bonobo-2 bonobo-activation bonoboui-2 bz2 WANTLIB += c cairo camel-1.2 camel-provider-1.2 com_err crypto WANTLIB += dbus-1 dbus-glib-1 ebook-1.2 edataserver-1.2 edataserverui-1.2 WANTLIB += enchant execinfo exif expat fontconfig freetype WANTLIB += gailutil gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmime-2.4 gmodule-2.0 gnome-2 +WANTLIB += gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0 gnome-2 WANTLIB += gnome-desktop-2 gnome-keyring gnomecanvas-2 gnomevfs-2 WANTLIB += gobject-2.0 gpg-error gsf-1 gssapi gstbase-0.10 WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 gtkhtml-3.14 diff --git a/x11/gnome3/audio/rhythmbox/Makefile b/x11/gnome3/audio/rhythmbox/Makefile index 4b9e2375ae8..4416160f76e 100644 --- a/x11/gnome3/audio/rhythmbox/Makefile +++ b/x11/gnome3/audio/rhythmbox/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/07/27 10:07:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/08/30 06:52:57 ajacoutot Exp $ COMMENT= integrated music management application for GNOME GNOME_PROJECT= rhythmbox GNOME_VERSION= 2.90.1 +REVISION= 0 + SHARED_LIBS += rhythmbox-core 0.0 # .0.0 CATEGORIES= audio @@ -24,7 +26,7 @@ WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm WANTLIB += archive atk-1.0 bz2 c cairo cairo-gobject dbus-1 dbus-glib-1 WANTLIB += drm expat ffi fontconfig freetype gconf-2 gcrypt gdk-3 -WANTLIB += gdk_pixbuf-2.0 gio-2.0 girepository-1.0 glib-2.0 gmime-2.4 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 girepository-1.0 glib-2.0 gmime-2.6 WANTLIB += gmodule-2.0 gnome-keyring gnome-media-profiles-3.0 WANTLIB += gobject-2.0 gpg-error gpod gstbase-0.10 gstcontroller-0.10 WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gsttag-0.10 @@ -32,7 +34,7 @@ WANTLIB += gstvideo-0.10 gthread-2.0 gtk-3 json-glib-1.0 lzma WANTLIB += m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre WANTLIB += peas-1.0 peas-gtk-1.0 pixman-1 png pthread pthread-stubs WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 totem-plparser xcb -WANTLIB += xcb-render xcb-shm xml2 z +WANTLIB += xcb-render xcb-shm xml2 z assuan gpgme-pthread MODULES= devel/gettext \ x11/gnome \ diff --git a/x11/gnome3/x11/gnome/seahorse-plugins/Makefile b/x11/gnome3/x11/gnome/seahorse-plugins/Makefile index c8c9202ccf1..153f9a2b079 100644 --- a/x11/gnome3/x11/gnome/seahorse-plugins/Makefile +++ b/x11/gnome3/x11/gnome/seahorse-plugins/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/07/18 11:27:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/08/30 06:52:57 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,6 +7,8 @@ COMMENT= plugins and utilities for seahorse GNOME_PROJECT= seahorse-plugins GNOME_VERSION= 2.91.6 +REVISION= 0 + # XXX until we have a stable 3.X release MASTER_SITES= http://distfiles.bsdfrog.org/ @@ -27,7 +29,7 @@ WANTLIB += expat fontconfig freetype gcrypt gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0 WANTLIB += gpg-error gpgme gthread-2.0 gtk-3 m nautilus-extension WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z +WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z assuan LIB_DEPENDS= x11/gnome/seahorse>=3.0.0 \ x11/gnome/nautilus diff --git a/x11/gnome3/x11/gnome/seahorse/Makefile b/x11/gnome3/x11/gnome/seahorse/Makefile index e0255e0d81c..430c98daaf9 100644 --- a/x11/gnome3/x11/gnome/seahorse/Makefile +++ b/x11/gnome3/x11/gnome/seahorse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2011/07/18 13:45:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2011/08/30 06:52:57 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= GNOME encryption interface GNOME_PROJECT= seahorse GNOME_VERSION= 3.0.2 -REVISION= 0 +REVISION= 1 SHARED_LIBS += cryptui 1.0 # .0.0 @@ -31,7 +31,7 @@ WANTLIB += gobject-2.0 gpg-error gpgme gssapi gthread-2.0 gtk-3 WANTLIB += krb5 lber-2.4 ldap-2.4 m notify pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs WANTLIB += sasl2 soup-2.4 ssl tasn1 xcb xcb-render xcb-shm xml2 -WANTLIB += z +WANTLIB += z assuan BUILD_DEPENDS= devel/gobject-introspection diff --git a/x11/gnome3/x11/gnome/totem/Makefile b/x11/gnome3/x11/gnome/totem/Makefile index bb282019948..01737f74e0f 100644 --- a/x11/gnome3/x11/gnome/totem/Makefile +++ b/x11/gnome3/x11/gnome/totem/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2011/07/06 21:25:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2011/08/30 06:52:57 ajacoutot Exp $ COMMENT-main= official media player for GNOME COMMENT-nautilus= totem properties plugin for nautilus @@ -9,8 +9,8 @@ GNOME_VERSION= 3.0.1 PKGNAME-main= ${DISTNAME} PKGNAME-nautilus= nautilus-${DISTNAME} -REVISION-main= 4 -REVISION-nautilus= 2 +REVISION-main= 5 +REVISION-nautilus= 3 SHARED_LIBS += totem 0.0 # 0.0 @@ -35,13 +35,13 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm archive atk-1.0 WANTLIB += bz2 cairo cairo-gobject dbus-1 drm expat fontconfig WANTLIB += freetype gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmime-2.4 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error +WANTLIB += gmime-2.6 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error WANTLIB += gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10 WANTLIB += gstreamer-0.10 gsttag-0.10 gstvideo-0.10 gthread-2.0 WANTLIB += gtk-3 lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread-stubs soup-2.4 soup-gnome-2.4 WANTLIB += sqlite3 totem-plparser xcb xcb-render xcb-shm xml2 -WANTLIB += z +WANTLIB += z assuan gpgme-pthread WANTLIB-main += ${WANTLIB} ICE SM Xtst c dbus-glib-1 ffi girepository-1.0 WANTLIB-main += peas-1.0 peas-gtk-1.0 pthread