Sat Jan 3 16:32:59 2009 UTC ()
ensure that fam compiles on systems that do not define MNT_NODEV such as
FreeBSD 7.1


(schwarz)
diff -r1.30 -r1.31 pkgsrc/sysutils/fam/distinfo
diff -r1.13 -r1.14 pkgsrc/sysutils/fam/patches/patch-ap
cvs diff -r1.30 -r1.31 pkgsrc/sysutils/fam/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/fam/distinfo 2008/11/09 14:32:28 1.30
+++ pkgsrc/sysutils/fam/distinfo 2009/01/03 16:32:59 1.31
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.30 2008/11/09 14:32:28 schwarz Exp $ 1$NetBSD: distinfo,v 1.31 2009/01/03 16:32:59 schwarz Exp $
2 2
3SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 3SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
4RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430 4RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
5Size (fam-2.7.0.tar.gz) = 301974 bytes 5Size (fam-2.7.0.tar.gz) = 301974 bytes
6SHA1 (patch-aa) = d9dd9b6faf4ccd89c41404b74fb577ac327fed05 6SHA1 (patch-aa) = d9dd9b6faf4ccd89c41404b74fb577ac327fed05
7SHA1 (patch-ab) = dcc2820c754a6670c1c6da0380cac79c6b88f280 7SHA1 (patch-ab) = dcc2820c754a6670c1c6da0380cac79c6b88f280
8SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863 8SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863
9SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932 9SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932
10SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9 10SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9
11SHA1 (patch-af) = 5868f44d29c31533bdb012213022e814d3fc3995 11SHA1 (patch-af) = 5868f44d29c31533bdb012213022e814d3fc3995
12SHA1 (patch-ag) = 3300a1cd565f9edaea3c334a9e278185efbcb7a6 12SHA1 (patch-ag) = 3300a1cd565f9edaea3c334a9e278185efbcb7a6
13SHA1 (patch-ah) = dc8ec60631b57668fcef0b296efe3e271cb7fcae 13SHA1 (patch-ah) = dc8ec60631b57668fcef0b296efe3e271cb7fcae
14SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5 14SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5
15SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa 15SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa
16SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1 16SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1
17SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016 17SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016
18SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038 18SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038
19SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81 19SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81
20SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62 20SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
21SHA1 (patch-ap) = c30ed27c038ef23da313df0a45f81401b4b9ae19 21SHA1 (patch-ap) = 07ea3a203943c9340851cc1f09db05a0c66d1eeb
22SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28 22SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
23SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a 23SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
24SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1 24SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1
25SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4 25SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4
26SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b 26SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
27SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a 27SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a
28SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0 28SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0
29SHA1 (patch-ax) = c63bf7f2bff7cb9e3bc4c1c6c474a398b01eafcc 29SHA1 (patch-ax) = c63bf7f2bff7cb9e3bc4c1c6c474a398b01eafcc
30SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86 30SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86
31SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889 31SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889
32SHA1 (patch-ba) = 2f41331994a56eb70364beab70d40ac0bbd1b050 32SHA1 (patch-ba) = 2f41331994a56eb70364beab70d40ac0bbd1b050
33SHA1 (patch-bb) = aef31edd9715c8aa0be2f02ebe663bad30e0791a 33SHA1 (patch-bb) = aef31edd9715c8aa0be2f02ebe663bad30e0791a
34SHA1 (patch-bc) = 6265e9739013a5303aa98173a6792df924c4c964 34SHA1 (patch-bc) = 6265e9739013a5303aa98173a6792df924c4c964
cvs diff -r1.13 -r1.14 pkgsrc/sysutils/fam/patches/patch-ap (expand / switch to unified diff)

--- pkgsrc/sysutils/fam/patches/patch-ap 2008/11/09 14:32:28 1.13
+++ pkgsrc/sysutils/fam/patches/patch-ap 2009/01/03 16:32:59 1.14
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ap,v 1.13 2008/11/09 14:32:28 schwarz Exp $ 1$NetBSD: patch-ap,v 1.14 2009/01/03 16:32:59 schwarz Exp $
2 2
3--- src/mntent_compat.c++.orig Sun Jul 8 08:16:38 2007 3--- src/mntent_compat.c++.orig 2009-01-01 23:13:49.000000000 +0100
4+++ src/mntent_compat.c++ 4+++ src/mntent_compat.c++ 2009-01-01 23:16:01.000000000 +0100
5@@ -0,0 +1,193 @@ 5@@ -0,0 +1,195 @@
6+/* 6+/*
7+ * Copyright (c) 1980, 1989, 1993, 1994 7+ * Copyright (c) 1980, 1989, 1993, 1994
8+ * The Regents of the University of California. All rights reserved. 8+ * The Regents of the University of California. All rights reserved.
9+ * Copyright (c) 2001 9+ * Copyright (c) 2001
10+ * David Rufino <daverufino@btinternet.com> 10+ * David Rufino <daverufino@btinternet.com>
11+ * 11+ *
12+ * Redistribution and use in source and binary forms, with or without 12+ * Redistribution and use in source and binary forms, with or without
13+ * modification, are permitted provided that the following conditions 13+ * modification, are permitted provided that the following conditions
14+ * are met: 14+ * are met:
15+ * 1. Redistributions of source code must retain the above copyright 15+ * 1. Redistributions of source code must retain the above copyright
16+ * notice, this list of conditions and the following disclaimer. 16+ * notice, this list of conditions and the following disclaimer.
17+ * 2. Redistributions in binary form must reproduce the above copyright 17+ * 2. Redistributions in binary form must reproduce the above copyright
18+ * notice, this list of conditions and the following disclaimer in the 18+ * notice, this list of conditions and the following disclaimer in the
@@ -96,27 +96,29 @@ $NetBSD: patch-ap,v 1.13 2008/11/09 14:3 @@ -96,27 +96,29 @@ $NetBSD: patch-ap,v 1.13 2008/11/09 14:3
96+ return (cp); 96+ return (cp);
97+} 97+}
98+ 98+
99+ 99+
100+static char * 100+static char *
101+flags2opts (int flags) 101+flags2opts (int flags)
102+{ 102+{
103+ char *res; 103+ char *res;
104+ res = NULL; 104+ res = NULL;
105+ res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw"); 105+ res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw");
106+ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync"); 106+ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync");
107+ if (flags & MNT_NOEXEC) res = catopt(res, "noexec"); 107+ if (flags & MNT_NOEXEC) res = catopt(res, "noexec");
108+ if (flags & MNT_NOSUID) res = catopt(res, "nosuid"); 108+ if (flags & MNT_NOSUID) res = catopt(res, "nosuid");
 109+#ifdef MNT_NODEV
109+ if (flags & MNT_NODEV) res = catopt(res, "nodev"); 110+ if (flags & MNT_NODEV) res = catopt(res, "nodev");
 111+#endif
110+#ifdef MNT_UNION 112+#ifdef MNT_UNION
111+ if (flags & MNT_UNION) res = catopt(res, "union"); 113+ if (flags & MNT_UNION) res = catopt(res, "union");
112+#endif 114+#endif
113+ if (flags & MNT_ASYNC) res = catopt(res, "async"); 115+ if (flags & MNT_ASYNC) res = catopt(res, "async");
114+#ifdef MNT_NOATIME 116+#ifdef MNT_NOATIME
115+ if (flags & MNT_NOATIME) res = catopt(res, "noatime"); 117+ if (flags & MNT_NOATIME) res = catopt(res, "noatime");
116+#endif 118+#endif
117+#ifdef MNT_NOCLUSTERR 119+#ifdef MNT_NOCLUSTERR
118+ if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr"); 120+ if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr");
119+#endif 121+#endif
120+#ifdef MNT_NOCLUSTERW 122+#ifdef MNT_NOCLUSTERW
121+ if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw"); 123+ if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw");
122+#endif 124+#endif