pkg/38420: [patch] sysutils/fam does not build on freebsd 7 [resubmit]

[peter.schuller%infidyne.com@localhost]

>Number:         38420
>Category:       pkg
>Synopsis:       [patch] sysutils/fam does not build on freebsd 7 [resubmit]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 13 13:25:00 +0000 2008
>Originator:     Peter Schuller
>Release:        
>Organization:
>Environment:
>Description:
(resubmit since original attempt seems to have been dropped)

sysutils/fam won't build on FreeBSD start at version 700008 due to referencing 
MNT_NODEV which was removed.


>How-To-Repeat:

>Fix:
Patch:

http://distfiles.scode.org/mlref/pkgsrc_sysutils_fam_fbsd7_mntnodev.diff

Inline version, whitespace may be borked:

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/fam/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- distinfo    28 Dec 2007 15:00:45 -0000      1.29
+++ distinfo    12 Apr 2008 13:44:48 -0000
@@ -18,7 +18,7 @@
 SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038
 SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81
 SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
-SHA1 (patch-ap) = 0294142889040d4f39bb94216007e70440835cef
+SHA1 (patch-ap) = 8198a63323fde8d4b87e6a5b312fa4c86f488cbc
 SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
 SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
 SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1
Index: patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/fam/patches/patch-ap,v
retrieving revision 1.12
diff -u -r1.12 patch-ap
--- patches/patch-ap    8 Jul 2007 22:22:29 -0000       1.12
+++ patches/patch-ap    12 Apr 2008 13:44:48 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ap,v 1.12 2007/07/08 22:22:29 minskim Exp $
 
---- src/mntent_compat.c++.orig Sun Jul  8 08:16:38 2007
+--- src/mntent_compat.c++.orig 2008-04-12 15:45:36.708539456 +0200
 +++ src/mntent_compat.c++
-@@ -0,0 +1,193 @@
+@@ -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");
++#if !defined(__FreeBSD__) || __FreeBSD_version < 700008
 +        if (flags & MNT_NODEV)          res = catopt(res, "nodev");
++#endif
 +#ifdef MNT_UNION
 +        if (flags & MNT_UNION)          res = catopt(res, "union");
 +#endif