diff options
| author | joerg <joerg> | 2006-08-26 15:30:57 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-08-26 15:30:57 +0000 |
| commit | 0332132d6aad5f5d9b76b06da4669a9ebb5883d4 (patch) | |
| tree | 4d011f0def1eec88a82132c7a8681b3a9dd6782c /sysutils | |
| parent | bb0b04885392c3ba2aebeabbc56a3ac363eda2d8 (diff) | |
| download | pkgsrc-0332132d6aad5f5d9b76b06da4669a9ebb5883d4.tar.gz | |
Use statfs instead of statfs on FreeBSD. Peter Schuller's bulk build
indicates that it is needed.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/fam/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ap | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo index 0501214c825..fb4808ea104 100644 --- a/sysutils/fam/distinfo +++ b/sysutils/fam/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2005/10/10 22:06:51 joerg Exp $ +$NetBSD: distinfo,v 1.24 2006/08/26 15:30:57 joerg 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) = de9e2bf3004556206e53fc60cd8433518a6f774a +SHA1 (patch-ap) = d53d72b082fe057df35a69e09e94706f3d0d020e 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 41ce8781050..d5c8019b5b3 100644 --- a/sysutils/fam/patches/patch-ap +++ b/sysutils/fam/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.10 2005/10/10 22:06:51 joerg Exp $ +$NetBSD: patch-ap,v 1.11 2006/08/26 15:30:57 joerg Exp $ --- src/mntent_compat.c++.orig 2005-07-24 02:27:46.000000000 +0000 +++ src/mntent_compat.c++ @@ -48,7 +48,7 @@ $NetBSD: patch-ap,v 1.10 2005/10/10 22:06:51 joerg Exp $ +#include <sys/param.h> +#include <sys/ucred.h> +#include <sys/mount.h> -+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) ++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) +# include <sys/statvfs.h> +#endif + @@ -144,7 +144,7 @@ $NetBSD: patch-ap,v 1.10 2005/10/10 22:06:51 joerg Exp $ +} + +static struct mntent * -+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) ++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) +statfs_to_mntent (struct statvfs *mntbuf) +#else +statfs_to_mntent (struct statfs *mntbuf) @@ -155,7 +155,7 @@ $NetBSD: patch-ap,v 1.10 2005/10/10 22:06:51 joerg Exp $ + _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__) ++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) + tmp = flags2opts (mntbuf->f_flag); +#else + tmp = flags2opts (mntbuf->f_flags); @@ -175,7 +175,7 @@ $NetBSD: patch-ap,v 1.10 2005/10/10 22:06:51 joerg Exp $ +struct mntent * +getmntent (FILE *fp) +{ -+#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) ++#if defined(HAVE_SYS_STATVFS_H) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD__) + static struct statvfs *mntbuf; +#else + static struct statfs *mntbuf; |