Update to 2.15.0.

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

4 files changed, 71 insertions, 17 deletions

diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index b8a4b8b1d..0256d270a 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.5 2006/07/15 17:55:01 marcus Exp $
+#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.6 2006/07/21 20:47:00 mezz Exp $
 #
 
 PORTNAME=	gnome-volume-manager
-PORTVERSION=	1.5.15
-PORTREVISION=	4
+PORTVERSION=	2.15.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
index b40857320..9b0f0ca3d 100644
--- a/sysutils/gnome-volume-manager/distinfo
+++ b/sysutils/gnome-volume-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-volume-manager-1.5.15.tar.bz2) = 0bf3ee007c951a5d833a3c17bbe59ec6
-SHA256 (gnome-volume-manager-1.5.15.tar.bz2) = c346d7f47bc3194c96f62376b006e6c111963d3b697f2c92fbd13da34f04f19b
-SIZE (gnome-volume-manager-1.5.15.tar.bz2) = 311956
+MD5 (gnome-volume-manager-2.15.0.tar.bz2) = d723bc2069fd19cf1c31961fbc1cf3c8
+SHA256 (gnome-volume-manager-2.15.0.tar.bz2) = f3d2ce3e2f2a4b757d4688bae7f6b8418d11340618f15d34871a002516ab8e0e
+SIZE (gnome-volume-manager-2.15.0.tar.bz2) = 318479
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
index 661193dcc..ded14abd6 100644
--- a/sysutils/gnome-volume-manager/files/patch-src_manager.c
+++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c
@@ -1,19 +1,63 @@
---- src/manager.c.orig	Tue May  2 22:50:07 2006
-+++ src/manager.c	Tue May  2 22:51:16 2006
-@@ -25,6 +25,8 @@
+--- src/manager.c.orig	Mon Jul 31 16:37:36 2006
++++ src/manager.c	Fri Sep 15 01:32:32 2006
+@@ -23,9 +23,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
  #include <dirent.h>
++#include <fcntl.h>
  #include <signal.h>
  #include <unistd.h>
+ #include <utmp.h>
 +#include <sys/param.h>
 +#include <sys/mount.h>
  
  #include <locale.h>
  
-@@ -33,7 +35,6 @@
- #endif
- 
- #ifdef ENABLE_NOTIFY
--#include <sys/vfs.h>
- #include <libnotify/notify.h>
- #endif
+@@ -3088,10 +3091,17 @@ gvm_local_user (void)
+ 	struct utmp *utmp;
+ 	const char *user;
+ 	size_t ulen;
++#ifndef __linux__
++	int bytes, fd;
++	struct stat sb;
++	struct utmp buf[1024];
++	long len;
++#endif
+ 	
+ 	user = g_get_user_name ();
+ 	ulen = strlen (user);
+ 	
++#ifdef __linux__
+ 	setutent ();
+ 	
+ 	while (!local && (utmp = getutent ())) {
+@@ -3103,7 +3113,28 @@ gvm_local_user (void)
+ 	}
+ 	
+ 	endutent ();
+-	
++#else
++	if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
++		close (fd);
++		return TRUE;
++	}
++	len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
++
++	while (!local && --len >= 0) {
++		if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
++			(bytes = read (fd, buf, sizeof(buf))) == -1) {
++			close (fd);
++			return TRUE;
++		}
++		for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
++			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, ulen) != 0)
++				continue;
++			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
++		}
++	}
++
++	close (fd);
++#endif
+ 	return local;
+ }
  
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
index 4dedacbd9..5523c1c33 100644
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -9,12 +9,14 @@ share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/bs/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/cy/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/da/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/de/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/el/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/en_CA/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/en_GB/LC_MESSAGES/gnome-volume-manager.mo
@@ -34,15 +36,17 @@ share/locale/id/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/is/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/no/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/or/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo
@@ -63,7 +67,14 @@ share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/vi/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrmtry share/gnome/autostart
 @dirrm share/gnome/gnome-volume-manager/icons
 @dirrm share/gnome/gnome-volume-manager