update to 2.28.1

this switches to the Gnome-2.28 branch

7 files changed, 72 insertions, 18 deletions

diff --git a/net/vino/Makefile b/net/vino/Makefile
index 32cffba65bd..8371ba4c11b 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/01/21 18:20:43 drochner Exp $
 
-DISTNAME=	vino-2.24.1
-PKGREVISION=	4
+DISTNAME=	vino-2.28.1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -25,18 +24,19 @@ GCONF_SCHEMAS=		vino-server.schemas
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../security/gnutls/libgnutls-config.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vino/PLIST b/net/vino/PLIST
index 91ea2e14607..430525ba45c 100644
--- a/net/vino/PLIST
+++ b/net/vino/PLIST
@@ -1,19 +1,23 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:09:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/01/21 18:20:43 drochner Exp $
 bin/vino-passwd
 bin/vino-preferences
 libexec/vino-server
 share/applications/vino-preferences.desktop
+share/dbus-1/services/org.gnome.Vino.service
 share/gconf/schemas/vino-server.schemas
 share/gnome/autostart/vino-server.desktop
 share/locale/ar/LC_MESSAGES/vino.mo
 share/locale/as/LC_MESSAGES/vino.mo
+share/locale/ast/LC_MESSAGES/vino.mo
 share/locale/az/LC_MESSAGES/vino.mo
+share/locale/be/LC_MESSAGES/vino.mo
 share/locale/be@latin/LC_MESSAGES/vino.mo
 share/locale/bg/LC_MESSAGES/vino.mo
 share/locale/bn/LC_MESSAGES/vino.mo
 share/locale/bn_IN/LC_MESSAGES/vino.mo
 share/locale/bs/LC_MESSAGES/vino.mo
 share/locale/ca/LC_MESSAGES/vino.mo
+share/locale/ca@valencia/LC_MESSAGES/vino.mo
 share/locale/cs/LC_MESSAGES/vino.mo
 share/locale/cy/LC_MESSAGES/vino.mo
 share/locale/da/LC_MESSAGES/vino.mo
@@ -28,6 +32,7 @@ share/locale/eu/LC_MESSAGES/vino.mo
 share/locale/fa/LC_MESSAGES/vino.mo
 share/locale/fi/LC_MESSAGES/vino.mo
 share/locale/fr/LC_MESSAGES/vino.mo
+share/locale/ga/LC_MESSAGES/vino.mo
 share/locale/gl/LC_MESSAGES/vino.mo
 share/locale/gu/LC_MESSAGES/vino.mo
 share/locale/he/LC_MESSAGES/vino.mo
@@ -43,6 +48,7 @@ share/locale/ko/LC_MESSAGES/vino.mo
 share/locale/ku/LC_MESSAGES/vino.mo
 share/locale/lt/LC_MESSAGES/vino.mo
 share/locale/lv/LC_MESSAGES/vino.mo
+share/locale/mai/LC_MESSAGES/vino.mo
 share/locale/mk/LC_MESSAGES/vino.mo
 share/locale/ml/LC_MESSAGES/vino.mo
 share/locale/mn/LC_MESSAGES/vino.mo
@@ -80,5 +86,6 @@ share/locale/xh/LC_MESSAGES/vino.mo
 share/locale/zh_CN/LC_MESSAGES/vino.mo
 share/locale/zh_HK/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
-share/vino/vino-preferences.glade
-share/vino/vino-prompt.glade
+share/vino/vino-preferences.ui
+share/vino/vino-prompt.ui
+share/vino/webservices
diff --git a/net/vino/distinfo b/net/vino/distinfo
index ba23aa1c96a..f603d2a4c87 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/10/29 14:42:29 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/01/21 18:20:43 drochner Exp $
 
-SHA1 (vino-2.24.1.tar.bz2) = 54aa94364bafcf4d33295b6bdf50e4bcd40c6fe2
-RMD160 (vino-2.24.1.tar.bz2) = f434d1f9259fa9fc1fd66d09e13329d1b47bab52
-Size (vino-2.24.1.tar.bz2) = 674201 bytes
+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 (patch-ab) = 81efc17f2d1275ea6131ffd44bdb8f50d0cf464e
+SHA1 (patch-ac) = 69bf929df606e106bf9401fc3a5b2a0fc241b8e7
diff --git a/net/vino/options.mk b/net/vino/options.mk
index 375db17cd1c..7ccdd7eb621 100644
--- a/net/vino/options.mk
+++ b/net/vino/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2008/12/21 11:00:37 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2010/01/21 18:20:43 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vino
 PKG_SUPPORTED_OPTIONS+=	avahi inet6
-PKG_SUGGESTED_OPTIONS+=	avahi
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/vino/patches/patch-aa b/net/vino/patches/patch-aa
new file mode 100644
index 00000000000..8a0835fabc3
--- /dev/null
+++ b/net/vino/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2010/01/21 18:20:43 drochner Exp $
+
+--- configure.orig	2009-10-19 12:06:20.000000000 +0000
++++ configure
+@@ -19017,6 +19017,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+       #include <ifaddrs.h>
+ 
+ int
diff --git a/net/vino/patches/patch-ab b/net/vino/patches/patch-ab
new file mode 100644
index 00000000000..aa79a2e407f
--- /dev/null
+++ b/net/vino/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/01/21 18:20:43 drochner Exp $
+
+--- server/Makefile.in.orig	2009-10-19 12:06:23.000000000 +0000
++++ server/Makefile.in
+@@ -366,7 +366,7 @@ vino_enum_headers = \
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+ schemas_in_files = vino-server.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(PREFIX)/share/gnome/autostart
+ desktop_in_files = vino-server.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ servicedir = $(datadir)/dbus-1/services
diff --git a/net/vino/patches/patch-ac b/net/vino/patches/patch-ac
new file mode 100644
index 00000000000..d8931b38315
--- /dev/null
+++ b/net/vino/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2010/01/21 18:20:43 drochner Exp $
+
+--- server/libvncserver/sockets.c.orig	2009-05-12 11:39:33.000000000 +0000
++++ server/libvncserver/sockets.c
+@@ -671,6 +671,14 @@ NewSocketListenTCP(struct sockaddr *addr
+     if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+       return -1;
+ 
++#if defined(__NetBSD__) && defined(ENABLE_IPV6)
++	if (addr->sa_family == AF_INET6) {
++		/* NetBSD defaults to V6ONLY */
++		int no = 0;
++		setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
++	}
++#endif
++
+     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)) < 0) {
+       close(sock);
+       return -1;