Update vino [1] and zenity.

[1] the patch-server_vino-http.c is not needed


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

7 files changed, 12 insertions, 194 deletions

diff --git a/net/vino/Makefile b/net/vino/Makefile
index 4c64cacf9..d45656a8c 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,9 +1,9 @@
 # Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/net/vino/Makefile 19321 2014-03-25 13:15:22Z gusi $
+#   $MCom$
 
 PORTNAME=	vino
-PORTVERSION=	3.12.0
+PORTVERSION=	3.14.0
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+		libnotify.so:${PORTSDIR}/devel/libnotify \
 		libavahi-glib.so:${PORTSDIR}/net/avahi-app
 
 USES=		gettext gmake pathfix pkgconfig tar:xz
@@ -29,15 +30,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include -Wno-format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-.else
-CONFIGURE_ARGS+=--without-libnotify
-.endif
+NOTIFY_LIBS_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_CONFIGURE_WITH=	libnotify	
 
 .include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 9e3cc3879..347e60b25 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vino-3.12.0.tar.xz) = 86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b
-SIZE (gnome3/vino-3.12.0.tar.xz) = 751352
+SHA256 (gnome3/vino-3.14.0.tar.xz) = 8faf864009e697e8652e4833150eaaba3da6c5a85f9f95886a5b76b00e5a9c1b
+SIZE (gnome3/vino-3.14.0.tar.xz) = 749784
diff --git a/net/vino/files/patch-server_vino-http.c b/net/vino/files/patch-server_vino-http.c
deleted file mode 100644
index d51f95885..000000000
--- a/net/vino/files/patch-server_vino-http.c
+++ /dev/null
@@ -1,24 +0,0 @@
-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/pkg-plist b/net/vino/pkg-plist
index 02c0143b3..3f9db0b5a 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,6 +1,6 @@
-etc/xdg/autostart/vino-server.desktop
 libexec/vino-server
 share/GConf/gsettings/org.gnome.Vino.convert
+share/applications/vino-server.desktop
 share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
 share/locale/an/LC_MESSAGES/vino.mo
 share/locale/ar/LC_MESSAGES/vino.mo
@@ -89,45 +89,3 @@ 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
-@dirrmtry share/telepathy/clients
-@dirrmtry share/telepathy
-@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/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@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
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 54314d91e..2db0e6de3 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	zenity
-PORTVERSION=	3.12.1
-PORTREVISION=	1
+PORTVERSION=	3.14.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index b6ad13cc1..190ffd340 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/zenity-3.12.1.tar.xz) = a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11
-SIZE (gnome3/zenity-3.12.1.tar.xz) = 3670368
+SHA256 (gnome3/zenity-3.14.0.tar.xz) = 6b57ec6c456af17714dc366e63dabb8bbe0577878b61907805f0186d4d2b892f
+SIZE (gnome3/zenity-3.14.0.tar.xz) = 3686756
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 8794f4a36..97f81b387 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -874,114 +874,3 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
 %%DATADIR%%/zenity-text.png
 %%DATADIR%%/zenity.png
 %%DATADIR%%/zenity.ui
-@dirrm %%DATADIR%%/clothes
-@dirrm %%DATADIR%%
-@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/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@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
-@dirrm share/help/zh_CN/zenity/figures
-@dirrm share/help/zh_CN/zenity
-@dirrmtry share/help/zh_CN
-@dirrm share/help/uk/zenity/figures
-@dirrm share/help/uk/zenity
-@dirrmtry share/help/uk
-@dirrm share/help/sv/zenity/figures
-@dirrm share/help/sv/zenity
-@dirrmtry share/help/sv
-@dirrm share/help/sl/zenity/figures
-@dirrm share/help/sl/zenity
-@dirrmtry share/help/sl
-@dirrm share/help/ru/zenity/figures
-@dirrm share/help/ru/zenity
-@dirrmtry share/help/ru
-@dirrm share/help/pt_BR/zenity/figures
-@dirrm share/help/pt_BR/zenity
-@dirrmtry share/help/pt_BR
-@dirrm share/help/oc/zenity/figures
-@dirrm share/help/oc/zenity
-@dirrmtry share/help/oc
-@dirrm share/help/ja/zenity/figures
-@dirrm share/help/ja/zenity
-@dirrmtry share/help/ja
-@dirrm share/help/hu/zenity/figures
-@dirrm share/help/hu/zenity
-@dirrmtry share/help/hu
-@dirrm share/help/gl/zenity/figures
-@dirrm share/help/gl/zenity
-@dirrmtry share/help/gl
-@dirrm share/help/fr/zenity/figures
-@dirrm share/help/fr/zenity
-@dirrmtry share/help/fr
-@dirrm share/help/fi/zenity/figures
-@dirrm share/help/fi/zenity
-@dirrmtry share/help/fi
-@dirrm share/help/eu/zenity/figures
-@dirrm share/help/eu/zenity
-@dirrmtry share/help/eu
-@dirrm share/help/es/zenity/figures
-@dirrm share/help/es/zenity
-@dirrmtry share/help/es
-@dirrm share/help/en_GB/zenity/figures
-@dirrm share/help/en_GB/zenity
-@dirrmtry share/help/en_GB
-@dirrm share/help/el/zenity/figures
-@dirrm share/help/el/zenity
-@dirrmtry share/help/el
-@dirrm share/help/de/zenity/figures
-@dirrm share/help/de/zenity
-@dirrmtry share/help/de
-@dirrm share/help/da/zenity/figures
-@dirrm share/help/da/zenity
-@dirrmtry share/help/da
-@dirrm share/help/cs/zenity/figures
-@dirrm share/help/cs/zenity
-@dirrmtry share/help/cs
-@dirrm share/help/ca/zenity/figures
-@dirrm share/help/ca/zenity
-@dirrmtry share/help/ca
-@dirrm share/help/bg/zenity/figures
-@dirrm share/help/bg/zenity
-@dirrmtry share/help/bg
-@dirrm share/help/C/zenity/figures
-@dirrm share/help/C/zenity
-@dirrmtry share/help/C
-@dirrmtry share/help