replace the gnome-keyring dependency by one on libgnome-keyring which

is a subset of the former, ride on the libpng update

6 files changed, 18 insertions, 18 deletions

diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk
index a4de49a003d..c9ae4fc4d54 100644
--- a/net/libsoup24/buildlink3.mk
+++ b/net/libsoup24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/14 17:58:44 drochner Exp $
 
 BUILDLINK_TREE+=	libsoup24
 
@@ -27,7 +27,7 @@ pkgbase := libsoup24
 .include "../../mk/pkg-build-options.mk"
 
 .if ${_LIBSOUP24_PRE_GNOME_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.libsoup24:Mgnome)
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .endif
 
diff --git a/net/libsoup24/options.mk b/net/libsoup24/options.mk
index 575d04fb349..c5d2d84cf8b 100644
--- a/net/libsoup24/options.mk
+++ b/net/libsoup24/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2010/02/28 20:49:21 tonio Exp $
+# $NetBSD: options.mk,v 1.2 2010/06/14 17:58:44 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libsoup24
 PKG_SUPPORTED_OPTIONS=	gnome
@@ -10,7 +10,7 @@ PLIST_VARS+= gnome
 
 .if !empty(PKG_OPTIONS:Mgnome)
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in
 PLIST.gnome=	yes
 .else
diff --git a/net/vino/Makefile b/net/vino/Makefile
index fa5f89976d5..3c123cc6bae 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/14 18:00:53 drochner Exp $
 
-DISTNAME=	vino-2.28.1
-PKGREVISION=	1
+DISTNAME=	vino-2.28.2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.28/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,7 +29,7 @@ GCONF_SCHEMAS=		vino-server.schemas
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/vino/PLIST b/net/vino/PLIST
index 430525ba45c..83a40f3b55e 100644
--- a/net/vino/PLIST
+++ b/net/vino/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/01/21 18:20:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/06/14 18:00:53 drochner Exp $
 bin/vino-passwd
 bin/vino-preferences
 libexec/vino-server
@@ -24,6 +24,7 @@ share/locale/da/LC_MESSAGES/vino.mo
 share/locale/de/LC_MESSAGES/vino.mo
 share/locale/dz/LC_MESSAGES/vino.mo
 share/locale/el/LC_MESSAGES/vino.mo
+share/locale/en@shaw/LC_MESSAGES/vino.mo
 share/locale/en_CA/LC_MESSAGES/vino.mo
 share/locale/en_GB/LC_MESSAGES/vino.mo
 share/locale/es/LC_MESSAGES/vino.mo
diff --git a/net/vino/distinfo b/net/vino/distinfo
index f603d2a4c87..b5bcf6a5a80 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/01/21 18:20:43 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/06/14 18:00:53 drochner Exp $
 
-SHA1 (vino-2.28.1.tar.bz2) = 2ef544100c74f3bc7f990fc6d2bc839dad231790
-RMD160 (vino-2.28.1.tar.bz2) = a118ce4ea3d7271f65d231f8786f98b148b5d358
-Size (vino-2.28.1.tar.bz2) = 794178 bytes
-SHA1 (patch-aa) = 96a58b9ed2827260b3b8ab203936df6f6deb1754
+SHA1 (vino-2.28.2.tar.bz2) = 7d6863956356475b8784cdd2017bfbbd0e0ce15e
+RMD160 (vino-2.28.2.tar.bz2) = 541006f8fac7b951bfc236869e52a3b1c02e1ed1
+Size (vino-2.28.2.tar.bz2) = 795208 bytes
+SHA1 (patch-aa) = a79f5d6cae5377c9029e5f1dfaf9b76f6da7e0a2
 SHA1 (patch-ab) = 81efc17f2d1275ea6131ffd44bdb8f50d0cf464e
 SHA1 (patch-ac) = 69bf929df606e106bf9401fc3a5b2a0fc241b8e7
diff --git a/net/vino/patches/patch-aa b/net/vino/patches/patch-aa
index 8a0835fabc3..f0764487e7b 100644
--- a/net/vino/patches/patch-aa
+++ b/net/vino/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2010/01/21 18:20:43 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/14 18:00:54 drochner Exp $
 
---- configure.orig	2009-10-19 12:06:20.000000000 +0000
+--- configure.orig	2010-03-30 13:12:02.000000000 +0000
 +++ configure
-@@ -19017,6 +19017,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -15144,6 +15144,8 @@ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 +#include <sys/types.h>