Fix with new libnotify.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15373 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 278 insertions, 0 deletions

diff --git a/net/vino/Makefile b/net/vino/Makefile
new file mode 100644
index 000000000..690a55264
--- /dev/null
+++ b/net/vino/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:	vino
+# Date created:				16 July 2004
+# Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
+#
+# $FreeBSD$
+#   $MCom: ports/net/vino/Makefile,v 1.81 2010/09/27 13:51:24 kwm Exp $
+#
+
+PORTNAME=	vino
+PORTVERSION=	2.32.0
+PORTREVISION=	1
+CATEGORIES=	net gnome
+MASTER_SITES=	GNOME
+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 \
+		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack gnomepanel
+USE_XORG=	xtst
+USE_GMAKE=	yes
+GNOME_DESKTOP_VERSION=2
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	vino-server.schemas
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-libnotify=yes
+.else
+CONFIGURE_ARGS+=--enable-libnotify=no
+.endif
+
+.include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
new file mode 100644
index 000000000..008989d14
--- /dev/null
+++ b/net/vino/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/vino-2.32.0.tar.bz2) = e43a40dc3a1ad81ce6d417c237b68875
+SHA256 (gnome2/vino-2.32.0.tar.bz2) = 00446f52eb03893be9d69dadbb3899b58676c122f33db670f46dc19e4a7d3d6d
+SIZE (gnome2/vino-2.32.0.tar.bz2) = 855538
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
new file mode 100644
index 000000000..9d64aa9f6
--- /dev/null
+++ b/net/vino/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2010-04-01 16:50:38.000000000 +0200
++++ configure	2010-04-01 16:50:38.000000000 +0200
+@@ -15991,6 +15991,8 @@ if test "x$ac_cv_header_ifaddrs_h" = "xy
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++          #include <sys/types.h>
++          #include <sys/socket.h>
+           #include <ifaddrs.h>
+           #include <net/if.h>
+ 
diff --git a/net/vino/files/patch-server_libvncserver_sockets.c b/net/vino/files/patch-server_libvncserver_sockets.c
new file mode 100644
index 000000000..348ea91d3
--- /dev/null
+++ b/net/vino/files/patch-server_libvncserver_sockets.c
@@ -0,0 +1,30 @@
+--- 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
+ 
+     if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+       return -1;
+@@ -677,6 +683,15 @@ NewSocketListenTCP(struct sockaddr *addr
+       return -1;
+     }
+ 
++#ifdef  ENABLE_IPV6
++#ifdef IPV6_V6ONLY
++    if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)) < 0) {
++      close(sock);
++      return -1;
++    }
++#endif
++#endif
++
+     if (bind(sock, addr, len) < 0) {
+       close(sock);
+       return -1;
diff --git a/net/vino/files/patch-server_vino-http.c b/net/vino/files/patch-server_vino-http.c
new file mode 100644
index 000000000..d51f95885
--- /dev/null
+++ b/net/vino/files/patch-server_vino-http.c
@@ -0,0 +1,24 @@
+Index: server/vino-http.c
+diff -u -p server/vino-http.c.orig server/vino-http.c
+--- server/vino-http.c.orig	Tue Feb 27 19:47:35 2007
++++ server/vino-http.c	Sun Mar 25 20:56:41 2007
+@@ -595,6 +595,9 @@ vino_http_create_listening_socket (VinoH
+ {
+ #ifdef ENABLE_IPV6
+   struct sockaddr_in6  saddr_in6;
++#ifdef IPV6_V6ONLY
++  int                  off = 0;
++#endif
+ #endif
+   struct sockaddr_in   saddr_in;
+   struct sockaddr     *saddr;
+@@ -621,6 +624,9 @@ vino_http_create_listening_socket (VinoH
+ 
+ #ifdef ENABLE_IPV6
+   sock = socket (AF_INET6, SOCK_STREAM, 0);
++#ifdef IPV6_V6ONLY
++  setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off));
++#endif
+ 
+   memset (&saddr_in6, 0, sizeof (struct sockaddr_in6));
+   saddr_in6.sin6_family = AF_INET6;
diff --git a/net/vino/files/patch-server_vino-status-icon.c b/net/vino/files/patch-server_vino-status-icon.c
new file mode 100644
index 000000000..f32697d7d
--- /dev/null
+++ b/net/vino/files/patch-server_vino-status-icon.c
@@ -0,0 +1,16 @@
+--- server/vino-status-icon.c.orig	2011-03-07 09:37:18.000000000 +0100
++++ server/vino-status-icon.c	2011-03-07 09:45:10.000000000 +0100
+@@ -622,10 +622,9 @@ vino_status_icon_show_new_client_notific
+     }
+ 
+   icon->priv->new_client_notification =
+-    notify_notification_new_with_status_icon (summary,
+-                                              body,
+-                                              "preferences-desktop-remote-desktop",
+-                                              GTK_STATUS_ICON (icon));
++    notify_notification_new (summary,
++                             body,
++                             "preferences-desktop-remote-desktop");
+ 
+   g_free (body);
+ 
diff --git a/net/vino/files/patch-server_vino-status-tube-icon.c b/net/vino/files/patch-server_vino-status-tube-icon.c
new file mode 100644
index 000000000..36ccd04f7
--- /dev/null
+++ b/net/vino/files/patch-server_vino-status-tube-icon.c
@@ -0,0 +1,12 @@
+--- server/vino-status-tube-icon.c.orig	2011-03-07 09:46:02.000000000 +0100
++++ server/vino-status-tube-icon.c	2011-03-07 09:46:32.000000000 +0100
+@@ -405,8 +405,7 @@ vino_status_tube_icon_show_notif (VinoSt
+       filename = "stock_person";
+ 
+   icon->priv->new_client_notification =
+-      notify_notification_new_with_status_icon (summary, body,
+-      filename, GTK_STATUS_ICON (icon));
++      notify_notification_new (summary, body, filename);
+ 
+   notify_notification_set_timeout (icon->priv->new_client_notification,
+       NOTIFICATION_TIMEOUT * 1000);
diff --git a/net/vino/pkg-descr b/net/vino/pkg-descr
new file mode 100644
index 000000000..f56a27700
--- /dev/null
+++ b/net/vino/pkg-descr
@@ -0,0 +1,4 @@
+Vino is a VNC server for GNOME - it allows someone to remotely connect
+to your desktop session using the RFB protocol.
+
+WWW: http://www.gnome.org
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
new file mode 100644
index 000000000..88337ff4a
--- /dev/null
+++ b/net/vino/pkg-plist
@@ -0,0 +1,135 @@
+bin/vino-passwd
+bin/vino-preferences
+etc/xdg/autostart/vino-server.desktop
+libexec/vino-server
+share/applications/vino-preferences.desktop
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
+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
+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/eo/LC_MESSAGES/vino.mo
+share/locale/es/LC_MESSAGES/vino.mo
+share/locale/et/LC_MESSAGES/vino.mo
+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
+share/locale/hi/LC_MESSAGES/vino.mo
+share/locale/hr/LC_MESSAGES/vino.mo
+share/locale/hu/LC_MESSAGES/vino.mo
+share/locale/id/LC_MESSAGES/vino.mo
+share/locale/it/LC_MESSAGES/vino.mo
+share/locale/ja/LC_MESSAGES/vino.mo
+share/locale/ka/LC_MESSAGES/vino.mo
+share/locale/kk/LC_MESSAGES/vino.mo
+share/locale/kn/LC_MESSAGES/vino.mo
+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
+share/locale/mr/LC_MESSAGES/vino.mo
+share/locale/ms/LC_MESSAGES/vino.mo
+share/locale/nb/LC_MESSAGES/vino.mo
+share/locale/ne/LC_MESSAGES/vino.mo
+share/locale/nl/LC_MESSAGES/vino.mo
+share/locale/nn/LC_MESSAGES/vino.mo
+share/locale/oc/LC_MESSAGES/vino.mo
+share/locale/or/LC_MESSAGES/vino.mo
+share/locale/pa/LC_MESSAGES/vino.mo
+share/locale/pl/LC_MESSAGES/vino.mo
+share/locale/pt/LC_MESSAGES/vino.mo
+share/locale/pt_BR/LC_MESSAGES/vino.mo
+share/locale/ro/LC_MESSAGES/vino.mo
+share/locale/ru/LC_MESSAGES/vino.mo
+share/locale/rw/LC_MESSAGES/vino.mo
+share/locale/si/LC_MESSAGES/vino.mo
+share/locale/sk/LC_MESSAGES/vino.mo
+share/locale/sl/LC_MESSAGES/vino.mo
+share/locale/sq/LC_MESSAGES/vino.mo
+share/locale/sr/LC_MESSAGES/vino.mo
+share/locale/sr@latin/LC_MESSAGES/vino.mo
+share/locale/sv/LC_MESSAGES/vino.mo
+share/locale/ta/LC_MESSAGES/vino.mo
+share/locale/te/LC_MESSAGES/vino.mo
+share/locale/th/LC_MESSAGES/vino.mo
+share/locale/tr/LC_MESSAGES/vino.mo
+share/locale/ug/LC_MESSAGES/vino.mo
+share/locale/uk/LC_MESSAGES/vino.mo
+share/locale/vi/LC_MESSAGES/vino.mo
+share/locale/wa/LC_MESSAGES/vino.mo
+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/telepathy/clients/Vino.client
+%%DATADIR%%/vino-preferences.ui
+%%DATADIR%%/vino-prompt.ui
+%%DATADIR%%/webservices
+@dirrm %%DATADIR%%
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@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