Fix DEPENDS/WANTLIB after recent gnome-keyring split.

This commit is contained in:
ajacoutot 2010-04-22 14:27:29 +00:00
parent 2a8d72de4f
commit a8c95443e4

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2010/04/20 20:23:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.68 2010/04/22 14:27:29 ajacoutot Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@ -8,7 +8,7 @@ COMMENT-ap2= apache2 subversion modules
VERSION= 1.6.6
DISTNAME= subversion-${VERSION}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-main= ${DISTNAME}p2
FULLPKGNAME-perl= p5-SVN-${VERSION}p0
FULLPKGPATH-perl= devel/subversion,-perl
FULLPKGNAME-python= py-subversion-${VERSION}p0
@ -132,13 +132,14 @@ BUILD_DEPENDS+= :swig->=1.3.36:devel/swig
.if ${FLAVOR:L:Mgnome_keyring}
SHARED_ONLY= Yes
MODULES+= converters/libiconv
LIB_DEPENDS-main+= ${LIB_DEPENDS} \
dbus-1.>=7::x11/dbus \
glib-2.0::devel/glib2 \
glib-2.0,gio-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \
gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
pcre.>=2::devel/pcre \
${MODGETTEXT_LIB_DEPENDS}
zWANTLIB-main+= apr-1 aprutil-1 iconv
WANTLIB-main+= apr-1 aprutil-1 dbus-glib-1 eggdbus-1 gcrypt gpg-error
SHARED_LIBS+= svn_auth_gnome_keyring-1 ${SO_VERSION}
# gnome-keyring depends on dbus depends on pthread, so svn won't be able
# to load libsvn_auth_gnome_keyring without the main executable being compiled