18 files changed, 242 insertions, 75 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index a5386af8e5e1..fc71986dc938 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net/avahi/Makefile,v 1.15 2006/04/28 01:52:15 marcus Exp $
+#    $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.13
-PORTREVISION?=	3
+PORTVERSION=	0.6.14
+PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 
@@ -16,13 +16,14 @@ COMMENT?=	Service discovery on a local network
 
 LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
 		daemon.2:${PORTSDIR}/devel/libdaemon \
-		dbus-1.2:${PORTSDIR}/devel/dbus \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_GNOME?=	gnomehack ltverhack glib20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-address=unix:path=/var/run/dbus/dbus.pipe \
 		--disable-qt3 \
@@ -34,6 +35,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
 		--disable-doxygen-dot \
 		--localstatedir=/var \
 		--enable-compat-howl \
+		--disable-autoipd \
 		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -56,10 +58,6 @@ OPTIONS=	GTK2 "Build a GTK+ 2 browser utility" off \
 .include <bsd.port.pre.mk>
 
 .if !defined(AVAHI_SLAVE)
-.if ${OSVERSION} < 500000
-IGNORE=	does not work on FreeBSD 4.X
-.endif
-
 .if defined(WITH_LIBDNS)
 CONFIGURE_ARGS+=--enable-compat-libdns_sd
 PLIST_SUB+=	LIBDNS=""
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 3a834eb6a204..8ab897bd5219 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.13.tar.gz) = d1000689979105cc95b9ca102284aae4
-SHA256 (avahi-0.6.13.tar.gz) = 5e10afd1d3e98eac31ac0a4bdab63e6672b66a4bfd192eb700e6d3903be7b4b9
-SIZE (avahi-0.6.13.tar.gz) = 895380
+MD5 (avahi-0.6.14.tar.gz) = 6abad76bbc2ac0f51a8869b3a2e5c238
+SHA256 (avahi-0.6.14.tar.gz) = e599f03b2d493b492fc23f50c5fe7bbf78af90e79a0c6c8c2e6600048e71c2e6
+SIZE (avahi-0.6.14.tar.gz) = 923556
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
index 19d2d7d3487b..18801509241b 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue May 16 11:50:31 2006
-+++ Makefile.in	Tue May 16 11:55:38 2006
-@@ -1043,21 +1043,29 @@
+--- Makefile.in.orig	Wed Oct 11 01:31:58 2006
++++ Makefile.in	Wed Oct 11 01:34:55 2006
+@@ -1057,21 +1056,29 @@ uninstall-info: uninstall-info-recursive
  avahi-core.pc: avahi-core.pc.in
  	sed -e 's,@prefix\@,$(prefix),g' \
  	    -e 's,@libdir\@,$(libdir),g' \
@@ -30,7 +30,7 @@
  @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
  
  @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: avahi-sharp.pc.in
-@@ -1068,6 +1076,8 @@
+@@ -1082,6 +1089,8 @@ avahi-core.pc: avahi-core.pc.in
  @HAVE_GLIB_TRUE@avahi-glib.pc: avahi-glib.pc.in
  @HAVE_GLIB_TRUE@	sed -e 's,@prefix\@,$(prefix),g' \
  @HAVE_GLIB_TRUE@	    -e 's,@libdir\@,$(libdir),g' \
diff --git a/net/avahi/files/patch-avahi-core_dns.c b/net/avahi/files/patch-avahi-core_dns.c
new file mode 100644
index 000000000000..3c24721e58af
--- /dev/null
+++ b/net/avahi/files/patch-avahi-core_dns.c
@@ -0,0 +1,10 @@
+--- avahi-core/dns.c.orig	Thu Oct 12 12:43:19 2006
++++ avahi-core/dns.c	Thu Oct 12 12:43:31 2006
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ #include <avahi-common/defs.h>
diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist
index e82e0f93da1c..242c7b2b83c0 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi/pkg-plist
@@ -11,6 +11,7 @@ bin/avahi-set-host-name
 etc/avahi/avahi-daemon.conf
 etc/avahi/avahi-dnsconfd.action
 etc/avahi/hosts
+etc/avahi/services/sftp-ssh.service
 etc/avahi/services/ssh.service
 etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/avahi-daemon.sh
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 85f1b99aa456..f16cb3270c85 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -18,7 +18,7 @@ COMMENT=	VoIP phone for GNOME
 LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 INSTALLS_OMF=	yes
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--disable-avahi
 .endif
 
 .ifndef (WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	DBUS:=""
 .else
@@ -53,6 +53,8 @@ PLIST_SUB+=	DBUS:="@comment "
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|${PREFIX}/share/gnome|' \
+		${WRKSRC}/*schemas*
 	@${REINPLACE_CMD} -e 's|{datadir}/dbus-1|(prefix)/share/dbus-1|g' \
 		${WRKSRC}/Makefile.in
 
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index e9615d6576be..d47d8cb4eec0 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -201,18 +201,6 @@ share/locale/xh/LC_MESSAGES/ekiga.mo
 share/locale/zh_CN/LC_MESSAGES/ekiga.mo
 share/locale/zh_HK/LC_MESSAGES/ekiga.mo
 share/locale/zh_TW/LC_MESSAGES/ekiga.mo
-@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/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/sounds/ekiga
 @dirrm share/gnome/pixmaps/ekiga
 @dirrm share/gnome/omf/ekiga
@@ -229,3 +217,47 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 @dirrm share/gnome/help/ekiga/C/figures
 @dirrm share/gnome/help/ekiga/C
 @dirrm share/gnome/help/ekiga
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 79c1bf979594..79076bb715fd 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.41 2006/07/23 01:10:49 mezz Exp $
 #
 
 PORTNAME=	gnome-netstatus
 PORTVERSION=	2.12.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.12
@@ -17,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME applet that shows network status
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 266c5b3ad9be..e7d18bad3d1a 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -183,3 +183,41 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index faace0d0fd5d..5dbad65a7eb3 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,10 +3,11 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.32 2006/09/05 07:41:18 marcus Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.14.2
+PORTVERSION=	2.16.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -17,11 +18,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME utility that provides network information statistics
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2
+USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 37c59cd66676..c310ad7944ef 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 0efb13f0145abe46b26a00c75473a00f
-SHA256 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 95f3f298598d8a038a04987d43d9e8e452948e8813a706c31389fd5e30cd1778
-SIZE (gnome2/gnome-nettool-2.14.2.tar.bz2) = 484715
+MD5 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 58d9171efdf368910934fb71194763eb
+SHA256 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 6e3d1f1ff86622ef4e39c99a470e03ab316a76eb0f66f953eebd12c2621f4be7
+SIZE (gnome2/gnome-nettool-2.16.0.tar.bz2) = 501870
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index a2b66ceaf221..468d8c45031c 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -5,16 +5,19 @@ share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm
 share/gnome/gnome-nettool/pixmaps/16_loopback.xpm
 share/gnome/gnome-nettool/pixmaps/16_plip.xpm
 share/gnome/gnome-nettool/pixmaps/16_ppp.xpm
-share/gnome/gnome-nettool/pixmaps/gnome-nettool.png
 share/gnome/gnome-nettool/pixmaps/irda-16.png
 share/gnome/gnome-nettool/pixmaps/network.png
 share/gnome/gnome-nettool/pixmaps/wavelan-16.png
+share/gnome/help/gnome-nettool/C/gnome-nettool.xml
+share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/omf/gnome-nettool/gnome-nettool-C.omf
 share/gnome/pixmaps/gnome-nettool.png
+share/icons/hicolor/48x48/apps/gnome-nettool.png
 share/locale/ar/LC_MESSAGES/gnome-nettool.mo
 share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/bg/LC_MESSAGES/gnome-nettool.mo
 share/locale/bn/LC_MESSAGES/gnome-nettool.mo
-share/locale/br/LC_MESSAGES/gnome-nettool.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-nettool.mo
 share/locale/bs/LC_MESSAGES/gnome-nettool.mo
 share/locale/ca/LC_MESSAGES/gnome-nettool.mo
 share/locale/cs/LC_MESSAGES/gnome-nettool.mo
@@ -44,6 +47,8 @@ share/locale/ja/LC_MESSAGES/gnome-nettool.mo
 share/locale/ka/LC_MESSAGES/gnome-nettool.mo
 share/locale/ko/LC_MESSAGES/gnome-nettool.mo
 share/locale/lt/LC_MESSAGES/gnome-nettool.mo
+share/locale/lv/LC_MESSAGES/gnome-nettool.mo
+share/locale/mg/LC_MESSAGES/gnome-nettool.mo
 share/locale/mk/LC_MESSAGES/gnome-nettool.mo
 share/locale/ml/LC_MESSAGES/gnome-nettool.mo
 share/locale/mn/LC_MESSAGES/gnome-nettool.mo
@@ -51,7 +56,7 @@ share/locale/ms/LC_MESSAGES/gnome-nettool.mo
 share/locale/nb/LC_MESSAGES/gnome-nettool.mo
 share/locale/ne/LC_MESSAGES/gnome-nettool.mo
 share/locale/nl/LC_MESSAGES/gnome-nettool.mo
-share/locale/no/LC_MESSAGES/gnome-nettool.mo
+share/locale/or/LC_MESSAGES/gnome-nettool.mo
 share/locale/pa/LC_MESSAGES/gnome-nettool.mo
 share/locale/pl/LC_MESSAGES/gnome-nettool.mo
 share/locale/pt/LC_MESSAGES/gnome-nettool.mo
@@ -60,6 +65,7 @@ share/locale/ro/LC_MESSAGES/gnome-nettool.mo
 share/locale/ru/LC_MESSAGES/gnome-nettool.mo
 share/locale/rw/LC_MESSAGES/gnome-nettool.mo
 share/locale/sk/LC_MESSAGES/gnome-nettool.mo
+share/locale/sl/LC_MESSAGES/gnome-nettool.mo
 share/locale/sq/LC_MESSAGES/gnome-nettool.mo
 share/locale/sr/LC_MESSAGES/gnome-nettool.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo
@@ -72,9 +78,55 @@ share/locale/vi/LC_MESSAGES/gnome-nettool.mo
 share/locale/wa/LC_MESSAGES/gnome-nettool.mo
 share/locale/xh/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+@dirrm share/gnome/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
 @dirrm share/gnome/gnome-nettool/pixmaps
 @dirrm share/gnome/gnome-nettool/dialogs
 @dirrm share/gnome/gnome-nettool
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 01b4d2b7a99d..0d6480cfaf83 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,10 +13,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
-    		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	avahi-client.3:${PORTSDIR}/net/avahi
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
-    		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
 MASTERDIR=	${.CURDIR}/../avahi
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 9f7c2d214635..4f0b63189eec 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.28 2006/04/13 07:52:37 bland Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.31 2006/10/05 18:17:10 mezz Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.13.5
+PORTVERSION=	2.16.0
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomepanel
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 8a52a9171bea..351477f49a6d 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.13.5.tar.bz2) = 9bc8c3f0e639fdc7b9ed023501308359
-SHA256 (vino-2.13.5.tar.bz2) = 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f
-SIZE (vino-2.13.5.tar.bz2) = 566620
+MD5 (vino-2.16.0.tar.bz2) = 89937e6d6cd8f658d037da0a7cfd3f4e
+SHA256 (vino-2.16.0.tar.bz2) = bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369
+SIZE (vino-2.16.0.tar.bz2) = 593224
diff --git a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h b/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
deleted file mode 100644
index 04d7fa7b588f..000000000000
--- a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/libvncserver/rfb/rfbproto.h.orig	Fri Jul 16 18:16:16 2004
-+++ server/libvncserver/rfb/rfbproto.h	Fri Jul 16 18:16:39 2004
-@@ -60,7 +60,9 @@
- #include <rfb/rfbint.h>
- #else
- #include <config.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #endif
- #endif
- #include <rfb/keysym.h>
diff --git a/net/vino/files/patch-server_vino-fb.c b/net/vino/files/patch-server_vino-fb.c
deleted file mode 100644
index 56dbb89dcd07..000000000000
--- a/net/vino/files/patch-server_vino-fb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- server/vino-fb.c.orig	Mon Jul 12 06:22:08 2004
-+++ server/vino-fb.c	Wed Jul 14 22:15:44 2004
-@@ -37,6 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <gdk/gdkx.h>
- #include <X11/Xlib.h>
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 7138e41d395d..9070a7112028 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -10,12 +10,14 @@ share/locale/ar/LC_MESSAGES/vino.mo
 share/locale/az/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/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_CA/LC_MESSAGES/vino.mo
 share/locale/en_GB/LC_MESSAGES/vino.mo
@@ -33,17 +35,19 @@ 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/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/mk/LC_MESSAGES/vino.mo
+share/locale/ml/LC_MESSAGES/vino.mo
 share/locale/mn/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/no/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
@@ -53,6 +57,7 @@ share/locale/ro/LC_MESSAGES/vino.mo
 share/locale/ru/LC_MESSAGES/vino.mo
 share/locale/rw/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@Latn/LC_MESSAGES/vino.mo
@@ -66,7 +71,54 @@ 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
 @dirrm share/gnome/vino
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN