Cope with recent gnome-keyring changes.

This commit is contained in:
ajacoutot 2010-04-20 20:11:53 +00:00
parent b8a9513aa7
commit b4827dd4b7
9 changed files with 28 additions and 25 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2010/04/03 11:22:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.58 2010/04/20 20:11:53 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= data backends for the Evolution mail/PIM suite
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 2.28.3.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= databases
@ -59,7 +59,7 @@ LIB_DEPENDS= db:db->=4,<5:databases/db/v4 \
gnutls::security/gnutls \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
ical,icalss,icalvcal::textproc/libical \
gnome-keyring::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
bonobo-2,bonobo-activation::x11/gnome/libbonobo \
gweather::x11/gnome/libgweather

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2010/04/20 11:07:07 jasper Exp $
# $OpenBSD: Makefile,v 1.40 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT-main = SOAP implementation in C
COMMENT-gnome = GNOME specific libsoup parts
@ -7,7 +7,7 @@ GNOME_PROJECT = libsoup
GNOME_VERSION = 2.30.0
PKGNAME-main = ${DISTNAME}
PKGNAME-gnome = ${GNOME_PROJECT}-gnome-${GNOME_VERSION}
PKGNAME-gnome = ${GNOME_PROJECT}-gnome-${GNOME_VERSION}p0
SHARED_LIBS += soup-2.4 2.2 # .4.0
SHARED_LIBS += soup-gnome-2.4 1.1 # .4.0
@ -33,7 +33,7 @@ WANTLIB-gnome = ${WANTLIB-main} ORBit-2 dbus-1 dbus-glib-1 sqlite3
LIB_DEPENDS-gnome = ${LIB_DEPENDS-main} \
soup-2.4::${BUILD_PKGPATH},-main \
gnome-keyring::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
gconf-2::devel/gconf2 \
proxy::net/libproxy

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2009/12/22 16:06:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2010/04/20 20:11:53 ajacoutot Exp $
SHARED_ONLY= Yes
@ -12,7 +12,7 @@ GNOME_VERSION= 2.28.2
CATEGORIES= graphics print
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
PKGNAME-djvu= evince-djvu-${GNOME_VERSION}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
@ -51,7 +51,7 @@ WANTLIB-main= ${WANTLIB} ICE ORBit-2 SM c dbus-1 dbus-glib-1 \
jpeg pthread tiff xml2 lcms
LIB_DEPENDS-main= poppler.>=3,poppler-glib.>=3::print/poppler \
spectre::print/libspectre \
gnome-keyring::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
${MODGCONF2_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-main= ${RUN_DEPENDS} \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2009/12/22 11:41:47 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT= Gtk-based GUI client for Twitter
@ -31,7 +31,7 @@ BUILD_DEPENDS= :iso-codes-*:devel/iso-codes
LIB_DEPENDS= soup-2.4::devel/libsoup \
sexy::x11/libsexy \
gnome-keyring::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
notify::devel/libnotify \
canberra,canberra-gtk::audio/libcanberra \
enchant::textproc/enchant

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2009/12/21 18:03:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT-main= GNOME virtual file system
COMMENT-smb= samba module for GVFS
@ -6,8 +6,8 @@ COMMENT-smb= samba module for GVFS
GNOME_PROJECT= gvfs
GNOME_VERSION= 1.4.3
PKGNAME-main= ${DISTNAME}p0
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}p0
SHARED_LIBS += gvfscommon 2.0 # .0.0
SHARED_LIBS += gvfscommon-dnssd 0.0 # .0.0
@ -26,7 +26,7 @@ MODULES= devel/gettext \
WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread util
LIB_DEPENDS= gnome-keyring::x11/gnome/keyring
LIB_DEPENDS= gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring
WANTLIB-main += ${WANTLIB}
WANTLIB-main += bz2 crypto gcrypt gnutls gpg-error lzma m proxy soup-2.4

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2009/02/11 15:47:50 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT= provide limited command-line access to the GNOME keyring
GNOME_PROJECT= gnome-keyring-query
GNOME_VERSION= 0.0.1
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
DISTFILES=
CATEGORIES= sysutils
@ -19,7 +19,7 @@ MODULES= x11/gnome \
WANTLIB= c glib-2.0 pthread
LIB_DEPENDS= gnome-keyring::x11/gnome/keyring
LIB_DEPENDS= gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring
CONFIGURE_STYLE= none

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.36 2010/03/30 14:48:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT= user interface components for GNOME
GNOME_PROJECT= libgnomeui
GNOME_VERSION= 2.24.3
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += gnomeui-2 2400.0 # .2400.2
@ -27,7 +28,7 @@ WANTLIB += z
MODULES= devel/gettext \
x11/gnome
LIB_DEPENDS= gnome-keyring.>=1::x11/gnome/keyring \
LIB_DEPENDS= gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
gnome-2.>=1800::x11/gnome/libgnome \
gnomecanvas-2.>=1400::x11/gnome/libgnomecanvas \
bonoboui-2.>=1::x11/gnome/libbonoboui

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2009/12/21 18:03:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT= manage encryption keys
GNOME_PROJECT= seahorse
GNOME_VERSION= 2.28.1
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
SHARED_LIBS += cryptui 1.0 # .0.0
@ -31,7 +31,8 @@ LIB_DEPENDS= lber,ldap::databases/openldap \
notify::devel/libnotify \
soup-2.4::devel/libsoup \
gpgme::security/gpgme \
gcr,gnome-keyring.>=5,gp11::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
gcr.>=1,gp11:gnome-keyring->=2.30.0:x11/gnome/keyring \
avahi-client,avahi-common,avahi-glib::net/avahi
MODULES= devel/gettext \

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2010/03/30 14:05:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2010/04/20 20:11:53 ajacoutot Exp $
COMMENT= VNC server for remote acces to your GNOME desktop
GNOME_PROJECT= vino
GNOME_VERSION= 2.28.2
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
@ -31,7 +32,7 @@ LIB_DEPENDS= notify::devel/libnotify \
gnutls::security/gnutls \
telepathy-glib.>=4::net/telepathy/telepathy-glib \
soup-2.4.>=2::devel/libsoup \
gnome-keyring.>=5::x11/gnome/keyring \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
avahi-client,avahi-common,avahi-glib::net/avahi
USE_X11= Yes