pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/fam modified patch to apply to OpenBSD, too.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7f495d04945c
branches: trunk
changeset: 549814:7f495d04945c
user: schwarz <schwarz%pkgsrc.org@localhost>
date: Sun Nov 09 14:32:28 2008 +0000
description:
modified patch to apply to OpenBSD, too.
diffstat:
sysutils/fam/distinfo | 4 ++--
sysutils/fam/patches/patch-ap | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (63 lines):
diff -r 1147c6a7742a -r 7f495d04945c sysutils/fam/distinfo
--- a/sysutils/fam/distinfo Sun Nov 09 14:28:31 2008 +0000
+++ b/sysutils/fam/distinfo Sun Nov 09 14:32:28 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2007/12/28 15:00:45 tron Exp $
+$NetBSD: distinfo,v 1.30 2008/11/09 14:32:28 schwarz Exp $
SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
@@ -18,7 +18,7 @@
SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038
SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81
SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
-SHA1 (patch-ap) = 0294142889040d4f39bb94216007e70440835cef
+SHA1 (patch-ap) = c30ed27c038ef23da313df0a45f81401b4b9ae19
SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1
diff -r 1147c6a7742a -r 7f495d04945c sysutils/fam/patches/patch-ap
--- a/sysutils/fam/patches/patch-ap Sun Nov 09 14:28:31 2008 +0000
+++ b/sysutils/fam/patches/patch-ap Sun Nov 09 14:32:28 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.12 2007/07/08 22:22:29 minskim Exp $
+$NetBSD: patch-ap,v 1.13 2008/11/09 14:32:28 schwarz Exp $
--- src/mntent_compat.c++.orig Sun Jul 8 08:16:38 2007
+++ src/mntent_compat.c++
@@ -48,7 +48,7 @@
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+# include <sys/statvfs.h>
+#endif
+
@@ -146,7 +146,7 @@
+}
+
+static struct mntent *
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+statfs_to_mntent (struct statvfs *mntbuf)
+#else
+statfs_to_mntent (struct statfs *mntbuf)
@@ -157,7 +157,7 @@
+ _mntent.mnt_fsname = mntbuf->f_mntfromname;
+ _mntent.mnt_dir = mntbuf->f_mntonname;
+ _mntent.mnt_type = mntbuf->f_fstypename;
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ tmp = flags2opts (mntbuf->f_flag);
+#else
+ tmp = flags2opts (mntbuf->f_flags);
@@ -177,7 +177,7 @@
+struct mntent *
+getmntent (FILE *fp)
+{
-+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ static struct statvfs *mntbuf;
+#else
+ static struct statfs *mntbuf;
Home |
Main Index |
Thread Index |
Old Index