6 files changed, 77 insertions, 24 deletions

diff --git a/net/vino/Makefile b/net/vino/Makefile
index 94df0bf63f40..0f1edaa04b55 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.63 2008/10/20 23:08:47 kwm Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.68 2009/03/18 00:27:09 kwm Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.24.1
+PORTVERSION=	2.26.0
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,7 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC server that allows for remote access to your GNOME desktop
 
-LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
+    		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 7abd78a63129..b2e2fc19385f 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.24.1.tar.bz2) = b373292a7a5443d7fad1cce5eb07f37f
-SHA256 (gnome2/vino-2.24.1.tar.bz2) = 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77
-SIZE (gnome2/vino-2.24.1.tar.bz2) = 674201
+MD5 (gnome2/vino-2.26.0.tar.bz2) = 7a10464824d8446411b90c162d34401e
+SHA256 (gnome2/vino-2.26.0.tar.bz2) = 1dfad6b20f99b3f8c79b265c2e71e19ad206317e38b1d167debb41fc9e6d94fb
+SIZE (gnome2/vino-2.26.0.tar.bz2) = 710542
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
new file mode 100644
index 000000000000..c7da75af74e6
--- /dev/null
+++ b/net/vino/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	2009-02-27 20:32:40.000000000 -0500
++++ configure	2009-02-27 20:34:44.000000000 -0500
+@@ -17882,6 +17882,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
+@@ -17896,6 +17898,7 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
++have_getifaddrs=yes
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -17921,7 +17924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $"$have_getifaddrs" = "yes"; then
++ if test x"$have_getifaddrs" = x"yes"; then
+   HAVE_GETIFADDRS_TRUE=
+   HAVE_GETIFADDRS_FALSE='#'
+ else
diff --git a/net/vino/files/patch-server_libvncserver_sockets.c b/net/vino/files/patch-server_libvncserver_sockets.c
index b182a2c4fc91..348ea91d3deb 100644
--- a/net/vino/files/patch-server_libvncserver_sockets.c
+++ b/net/vino/files/patch-server_libvncserver_sockets.c
@@ -1,22 +1,30 @@
-Index: server/libvncserver/sockets.c
-diff -u -p server/libvncserver/sockets.c.orig server/libvncserver/sockets.c
---- server/libvncserver/sockets.c.orig	Tue Jan  2 22:34:50 2007
-+++ server/libvncserver/sockets.c	Sun Mar 25 22:52:02 2007
-@@ -560,6 +560,7 @@ ListenOnTCPPort(port, localOnly)
- 
- #ifdef ENABLE_IPV6
-     struct sockaddr_in6 addr_in6;
+--- server/libvncserver/sockets.c.orig	2009-02-13 08:11:38.000000000 -0500
++++ server/libvncserver/sockets.c	2009-03-07 20:19:28.000000000 -0500
+@@ -668,6 +669,11 @@ NewSocketListenTCP(struct sockaddr *addr
+ {
+     int sock = -1;
+     int one  = 1;
++#ifdef ENABLE_IPV6
++#ifdef IPV6_V6ONLY
 +    int off = 0;
++#endif
++#endif
  
-     memset(&addr_in6, 0, sizeof(addr_in6));
-     addr_in6.sin6_family = AF_INET6;
-@@ -570,6 +571,9 @@ ListenOnTCPPort(port, localOnly)
-     addrlen = sizeof(addr_in6);
+     if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+       return -1;
+@@ -677,6 +683,15 @@ NewSocketListenTCP(struct sockaddr *addr
+       return -1;
+     }
  
-     sock = socket(AF_INET6, SOCK_STREAM, 0);
++#ifdef  ENABLE_IPV6
 +#ifdef IPV6_V6ONLY
-+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off));
++    if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)) < 0) {
++      close(sock);
++      return -1;
++    }
 +#endif
- #endif
- 
-     if (sock < 0) {
++#endif
++
+     if (bind(sock, addr, len) < 0) {
+       close(sock);
+       return -1;
diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c
new file mode 100644
index 000000000000..8057b9410179
--- /dev/null
+++ b/net/vino/files/patch-server_vino-dbus-listener.c
@@ -0,0 +1,12 @@
+--- server/vino-dbus-listener.c.orig	2009-02-27 20:36:08.000000000 -0500
++++ server/vino-dbus-listener.c	2009-02-27 20:36:30.000000000 -0500
+@@ -35,6 +35,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+ 
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 2db9574163d6..1cde6837570c 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,10 +1,11 @@
 bin/vino-passwd
 bin/vino-preferences
+etc/xdg/autostart/vino-server.desktop
 libexec/vino-server
 share/applications/vino-preferences.desktop
-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@latin/LC_MESSAGES/vino.mo
 share/locale/bg/LC_MESSAGES/vino.mo
@@ -80,6 +81,7 @@ share/locale/zh_HK/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
 %%DATADIR%%/vino-preferences.glade
 %%DATADIR%%/vino-prompt.glade
+%%DATADIR%%/webservices
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -108,5 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as