[pkgsrc/trunk]: pkgsrc/sysutils/radeontool/patches On NetBSD-current (approxi...

[rumble <rumble%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5b857cdde96
branches:  trunk
changeset: 536639:f5b857cdde96
user:      rumble <rumble%pkgsrc.org@localhost>
date:      Tue Dec 18 17:03:35 2007 +0000

description:
On NetBSD-current (approximately >= 4.99.32) <sys/vmparam.h> requires
<sys/mutex.h> rather than <sys/lock.h>. Conditionally include the
appropriate file so this compiles again.

diffstat:

 sysutils/radeontool/patches/patch-aa |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 72c0d5598d4e -r f5b857cdde96 sysutils/radeontool/patches/patch-aa
--- a/sysutils/radeontool/patches/patch-aa      Tue Dec 18 16:07:33 2007 +0000
+++ b/sysutils/radeontool/patches/patch-aa      Tue Dec 18 17:03:35 2007 +0000
@@ -1,20 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/24 15:07:35 jmcneill Exp $
---- radeontool.c.orig  2005-01-24 10:39:22.000000000 -0400
-+++ radeontool.c       2005-01-24 10:41:49.000000000 -0400
-@@ -21,7 +21,12 @@
+$NetBSD: patch-aa,v 1.2 2007/12/18 17:03:35 rumble Exp $
+--- radeontool.c.orig  2007-12-17 21:35:53.000000000 -0500
++++ radeontool.c       2007-12-17 21:42:16.000000000 -0500
+@@ -21,7 +21,17 @@
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <sys/mman.h>
 +#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Prereq__(4,99,32)
++#include <sys/mutex.h>
++#else
 +#include <sys/lock.h>
++#endif
 +#include <machine/vmparam.h>
-+#else
++#else /* ! __NetBSD__ */
  #include <asm/page.h>
 +#endif
  
  #include "radeon_reg.h"
  
-@@ -251,7 +256,6 @@
+@@ -251,7 +261,6 @@
      } else if(forkrc == 0) { /* if child */
          close(pipefd[0]);
          dup2(pipefd[1],1);  /* stdout */
@@ -22,7 +27,7 @@
          execlp("lspci","lspci","-v",NULL);
          fatal("exec lspci failure\n");
      }
-@@ -307,7 +311,13 @@
+@@ -307,7 +316,13 @@
         }
         if(debug) 
            printf("%s",line);