From ac79a630375a661e549931cc2c326b27625b3eb7 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 26 Aug 2007 03:53:51 +0000 Subject: Sync with FreeBSD ports tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9449 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-volume-manager/Makefile | 4 ++-- sysutils/gnome-volume-manager/files/patch-src_manager.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index 7f5bc117e..c99c2ab6d 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Jean-Yves Lefort # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.16 2007/04/28 23:11:53 marcus Exp $ +# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.17 2007/05/19 21:36:23 marcus Exp $ # PORTNAME= gnome-volume-manager PORTVERSION= 2.17.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c index a847dd404..6f7256d53 100644 --- a/sysutils/gnome-volume-manager/files/patch-src_manager.c +++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c @@ -205,14 +205,14 @@ endutent (); } +#else -+ if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) { ++ if ((fd = open (_PATH_UTMP, 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) { ++ while (!local && len-- > 0) { + if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 || + (bytes = read (fd, buf, sizeof(buf))) == -1) { + close (fd); -- cgit v1.2.3