[pkgsrc/trunk]: pkgsrc/sysutils/radeontool The mmap error condition is MAP_FA...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24432174d4d8
branches:  trunk
changeset: 536644:24432174d4d8
user:      rumble <rumble%pkgsrc.org@localhost>
date:      Tue Dec 18 20:45:49 2007 +0000

description:
The mmap error condition is MAP_FAILED, not necessarily pointer < 0. Now
it not only builds, but works again on my laptop.

diffstat:

 sysutils/radeontool/Makefile         |   4 ++--
 sysutils/radeontool/distinfo         |   4 ++--
 sysutils/radeontool/patches/patch-aa |  13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 3a2861214b91 -r 24432174d4d8 sysutils/radeontool/Makefile
--- a/sysutils/radeontool/Makefile      Tue Dec 18 20:39:49 2007 +0000
+++ b/sysutils/radeontool/Makefile      Tue Dec 18 20:45:49 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/12/18 17:04:53 rumble Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/18 20:45:49 rumble Exp $
 
 DISTNAME=      radeontool-1.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  http://fdd.com/software/radeon/
 
diff -r 3a2861214b91 -r 24432174d4d8 sysutils/radeontool/distinfo
--- a/sysutils/radeontool/distinfo      Tue Dec 18 20:39:49 2007 +0000
+++ b/sysutils/radeontool/distinfo      Tue Dec 18 20:45:49 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/12/18 17:47:13 rumble Exp $
+$NetBSD: distinfo,v 1.5 2007/12/18 20:45:49 rumble Exp $
 
 SHA1 (radeontool-1.5.tar.gz) = bd9096d5b18b31a1f1addbea80e6debfc707abf6
 RMD160 (radeontool-1.5.tar.gz) = 1cdeeb7ad379afa7bc03e1cd79adbb09f6a9cb85
 Size (radeontool-1.5.tar.gz) = 20869 bytes
-SHA1 (patch-aa) = ef23987185c3a2b0a132c3ec503a3c03603493d1
+SHA1 (patch-aa) = fa7dfa4b6fe9cbf0d4eacce012047ba36b7ca548
diff -r 3a2861214b91 -r 24432174d4d8 sysutils/radeontool/patches/patch-aa
--- a/sysutils/radeontool/patches/patch-aa      Tue Dec 18 20:39:49 2007 +0000
+++ b/sysutils/radeontool/patches/patch-aa      Tue Dec 18 20:45:49 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2007/12/18 17:03:35 rumble Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/18 20:45:49 rumble Exp $
 --- radeontool.c.orig  2007-12-17 21:35:53.000000000 -0500
-+++ radeontool.c       2007-12-17 21:42:16.000000000 -0500
++++ radeontool.c       2007-12-18 15:38:46.000000000 -0500
 @@ -21,7 +21,17 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -19,6 +19,15 @@
  
  #include "radeon_reg.h"
  
+@@ -107,7 +117,7 @@
+         mem_fd, 
+         base
+     );
+-    if ((long)device_mem < 0) {
++    if (device_mem == MAP_FAILED) {
+         if(debug)
+             fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+         fatal("mmap error \n");
 @@ -251,7 +261,6 @@
      } else if(forkrc == 0) { /* if child */
          close(pipefd[0]);