Really fix the build on recent -CURRENT by patching the correct version of

mntent_compat.c++.

2 files changed, 2 insertions, 12 deletions

diff --git a/devel/fam/files/mntent_compat.c++ b/devel/fam/files/mntent_compat.c++
index ae8768030d54..0675cd2ccf7f 100644
--- a/devel/fam/files/mntent_compat.c++
+++ b/devel/fam/files/mntent_compat.c++
@@ -49,7 +49,9 @@ static struct optmap omap[] = {
   { MNT_SYNCHRONOUS,	"sync"		},
   { MNT_NOEXEC,		"noexec"	},
   { MNT_NOSUID,		"nosuid"	},
+#ifdef MNT_NODEV
   { MNT_NODEV,		"nodev"		},
+#endif
   { MNT_UNION,		"union"		},
   { MNT_ASYNC,		"async"		},
   { MNT_NOATIME,	"noatime"	},
diff --git a/devel/fam/files/patch-fam-mntent_compat.c++ b/devel/fam/files/patch-fam-mntent_compat.c++
deleted file mode 100644
index 2df1ba9280f0..000000000000
--- a/devel/fam/files/patch-fam-mntent_compat.c++
+++ /dev/null
@@ -1,12 +0,0 @@
---- fam/mntent_compat.c++.orig	Sun Dec  4 22:43:02 2005
-+++ fam/mntent_compat.c++	Sun Dec  4 22:43:49 2005
-@@ -98,7 +98,9 @@ flags2opts (int flags)
-         if (flags & MNT_SYNCHRONOUS)    res = catopt(res, "sync");
-         if (flags & MNT_NOEXEC)         res = catopt(res, "noexec");
-         if (flags & MNT_NOSUID)         res = catopt(res, "nosuid");
-+#ifdef MNT_NODEV
-         if (flags & MNT_NODEV)          res = catopt(res, "nodev");
-+#endif
-         if (flags & MNT_UNION)          res = catopt(res, "union");
-         if (flags & MNT_ASYNC)          res = catopt(res, "async");
-         if (flags & MNT_NOATIME)        res = catopt(res, "noatime");