summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2005-05-07 08:31:15 +0000
committerrecht <recht@pkgsrc.org>2005-05-07 08:31:15 +0000
commit5e9d00093cc862c978f0b4d59d4dfd6a2ea3e32f (patch)
treedb6fa10e14c4d46fdca7a9fcd2d8e8631aa5446e
parent8d3dd00c09a5784614711697275e7243ab40ff8b (diff)
downloadpkgsrc-5e9d00093cc862c978f0b4d59d4dfd6a2ea3e32f.tar.gz
Fix the build on MacOS X 10.4 which now has statvfs.
-rw-r--r--sysutils/fam/distinfo4
-rw-r--r--sysutils/fam/patches/patch-ap14
2 files changed, 9 insertions, 9 deletions
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index 53f35c3539c..e59b3dd92fc 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/03/14 22:40:09 tv Exp $
+$NetBSD: distinfo,v 1.22 2005/05/07 08:31:15 recht Exp $
SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
@@ -18,7 +18,7 @@ SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016
SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038
SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81
SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
-SHA1 (patch-ap) = bbb31577e0cc9ffb8ccbce75082ccddd917d7cea
+SHA1 (patch-ap) = a129d1ad687f5690430001276bba9afa721f80d7
SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
SHA1 (patch-as) = ff23d2425587e08cac1344884d3557c7761adcef
diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap
index de75a43b192..5019e31e6d4 100644
--- a/sysutils/fam/patches/patch-ap
+++ b/sysutils/fam/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.8 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-ap,v 1.9 2005/05/07 08:31:16 recht Exp $
---- src/mntent_compat.c++.orig 2004-04-30 14:24:58.000000000 +0200
-+++ src/mntent_compat.c++ 2004-04-30 14:28:45.000000000 +0200
+--- src/mntent_compat.c++.orig 2005-05-07 10:22:00.000000000 +0200
++++ src/mntent_compat.c++ 2005-05-07 10:26:09.000000000 +0200
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 1980, 1989, 1993, 1994
@@ -48,7 +48,7 @@ $NetBSD: patch-ap,v 1.8 2004/11/19 12:35:22 sketch Exp $
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__)
+# include <sys/statvfs.h>
+#endif
+
@@ -144,7 +144,7 @@ $NetBSD: patch-ap,v 1.8 2004/11/19 12:35:22 sketch Exp $
+}
+
+static struct mntent *
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__)
+statfs_to_mntent (struct statvfs *mntbuf)
+#else
+statfs_to_mntent (struct statfs *mntbuf)
@@ -155,7 +155,7 @@ $NetBSD: patch-ap,v 1.8 2004/11/19 12:35:22 sketch Exp $
+ _mntent.mnt_fsname = mntbuf->f_mntfromname;
+ _mntent.mnt_dir = mntbuf->f_mntonname;
+ _mntent.mnt_type = mntbuf->f_fstypename;
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__)
+ tmp = flags2opts (mntbuf->f_flag);
+#else
+ tmp = flags2opts (mntbuf->f_flags);
@@ -175,7 +175,7 @@ $NetBSD: patch-ap,v 1.8 2004/11/19 12:35:22 sketch Exp $
+struct mntent *
+getmntent (FILE *fp)
+{
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__)
+ static struct statvfs *mntbuf;
+#else
+ static struct statfs *mntbuf;