pkg/36346: OpenBSD patches for sysutills/fam

[alnsn%yandex.ru@localhost]

>Number:         36346
>Category:       pkg
>Synopsis:       OpenBSD patches for sysutills/fam
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue May 15 21:00:00 +0000 2007
>Originator:     Alexander Nasonov
>Release:        
>Organization:
>Environment:
OpenBSD 4.1 i386
>Description:
sysutills/fam doesn't compile on OpenBSD 4.1 i386. Two patches attached. They 
at least solve a compilation problem. Unfortunately, I don't know how to test 
it. I need this package for xfce4-thunar but it doesn't refresh a directory if 
I rm or touch a file. May be I wasn't able to configured fam properly, though.
>How-To-Repeat:
cd sysutils/fam ; bmake
>Fix:
--- src/mntent_compat.c++.pkgsrc        Tue May 15 01:10:25 2007
+++ src/mntent_compat.c++       Tue May 15 01:10:52 2007
@@ -102,7 +102,9 @@
         if (flags & MNT_NOEXEC)         res = catopt(res, "noexec");
         if (flags & MNT_NOSUID)         res = catopt(res, "nosuid");
         if (flags & MNT_NODEV)          res = catopt(res, "nodev");
+#ifndef __OpenBSD__
         if (flags & MNT_UNION)          res = catopt(res, "union");
+#endif
         if (flags & MNT_ASYNC)          res = catopt(res, "async");
 #ifdef MNT_NOATIME
         if (flags & MNT_NOATIME)        res = catopt(res, "noatime");

--- src/IMonKQueue.c++.pkgsrc   Tue May 15 01:13:21 2007
+++ src/IMonKQueue.c++  Tue May 15 01:21:01 2007
@@ -167,7 +167,12 @@
     // Get the maximum number of files we can open and use it to set a
     // limit of the files we can monitor.
     size_t len = sizeof(max_changes);
+#ifdef __OpenBSD__
+    int mib_kern_maxfiles[2] = { CTL_KERN, KERN_MAXFILES };
+    if (sysctl(mib_kern_maxfiles, 2, &max_changes, &len, NULL, 0) == -1)
+#else
     if (sysctlbyname("kern.maxfiles", &max_changes, &len, NULL, 0) == -1)
+#endif
         max_changes = 128;
     else
         max_changes /= 2;