pkg/40187: [PATCH] sysutils/fam

[rehsack%web.de@localhost]

>Number:         40187
>Category:       pkg
>Synopsis:       [PATCH] sysutils/fam
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 15 23:10:00 +0000 2008
>Originator:     Jens Rehsack
>Release:        none
>Organization:
Bayer Business Services
>Environment:
FreeBSD waldorf.muppets.liwing.de 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sun 
Nov 30 16:24:55 UTC 2008     
root%waldorf.muppets.liwing.de@localhost:/usr/obj/usr/src/sys/WALDORF  amd64
>Description:
sysutils/fam compilation fails on FreeBSD7-STABLE with "unknown identifier" or 
similar. MNT_NODEV is not declared on FreeBSD7.
>How-To-Repeat:

>Fix:
Index: patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/fam/patches/patch-ap,v
retrieving revision 1.13
diff -u -r1.13 patch-ap
--- patches/patch-ap    9 Nov 2008 14:32:28 -0000       1.13
+++ patches/patch-ap    15 Dec 2008 23:04:34 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ap,v 1.13 2008/11/09 14:32:28 schwarz Exp $
 
---- src/mntent_compat.c++.orig Sun Jul  8 08:16:38 2007
-+++ src/mntent_compat.c++
-@@ -0,0 +1,193 @@
+--- src/mntent_compat.c++.orig 2008-12-15 11:55:41.000000000 +0000
++++ src/mntent_compat.c++      2008-12-15 11:59:51.000000000 +0000
+@@ -0,0 +1,195 @@
 +/*
 + * Copyright (c) 1980, 1989, 1993, 1994
 + *      The Regents of the University of California.  All rights reserved.
@@ -106,7 +106,9 @@
 +        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
 +#ifdef MNT_UNION
 +        if (flags & MNT_UNION)          res = catopt(res, "union");
 +#endif