diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-26 11:53:51 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-26 11:53:51 +0800 |
commit | ac79a630375a661e549931cc2c326b27625b3eb7 (patch) | |
tree | cecf62ffc8024bd171f4ddfb94ff4466c5169157 | |
parent | 26db4c60241e7c32ae13a783ffcb4938915f7295 (diff) | |
download | marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar.gz marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar.bz2 marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar.lz marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar.xz marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.tar.zst marcuscom-ports-ac79a630375a661e549931cc2c326b27625b3eb7.zip |
Sync with FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9449 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | sysutils/gnome-volume-manager/Makefile | 4 | ||||
-rw-r--r-- | 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 <jylefort@FreeBSD.org> # # $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); |