From 2d083dd452c88b84b83fd432977aeb8bd3088276 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 19 Mar 2003 17:56:38 +0000
Subject: Fix build on NetBSD >= 1.6P.  Thanks to atatat.

---
 sysutils/aperture/distinfo         |  4 ++--
 sysutils/aperture/patches/patch-ad | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo
index 9ceecdae541..dbaa596df6a 100644
--- a/sysutils/aperture/distinfo
+++ b/sysutils/aperture/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/11/10 07:59:02 tron Exp $
+$NetBSD: distinfo,v 1.7 2003/03/19 17:56:38 jmmv Exp $
 
 SHA1 (aperture-2.0nb4/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
 Size (aperture-2.0nb4/apNetBSD.shar) = 66731 bytes
 SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe
 SHA1 (patch-ab) = 16daeea3a8372df2de8b7502dc9e95ea9e175947
 SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362
-SHA1 (patch-ad) = 22aa063237f08f38712017f310d535bc3e3ad0c8
+SHA1 (patch-ad) = ff298db28cf5d4ca0cfe42f4be28c8b1908c828e
 SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767
 SHA1 (patch-af) = 475c127658ba1050154a7dcabe39482c088e2d02
diff --git a/sysutils/aperture/patches/patch-ad b/sysutils/aperture/patches/patch-ad
index 0cf29cb25db..a7dec6c5f73 100644
--- a/sysutils/aperture/patches/patch-ad
+++ b/sysutils/aperture/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2001/01/17 23:57:53 jlam Exp $
+$NetBSD: patch-ad,v 1.6 2003/03/19 17:56:39 jmmv Exp $
 
---- module/aperture.c.orig	Fri Jan 12 13:58:55 2001
+--- module/aperture.c.orig	2003-03-19 18:52:51.000000000 +0100
 +++ module/aperture.c
-@@ -117,8 +117,17 @@
+@@ -117,8 +117,17 @@ xf86close(dev, cflags, devtype, p)
   * allow only section in the vga framebuffer and above main memory 
   * to be mapped
   */
@@ -21,3 +21,15 @@ $NetBSD: patch-ad,v 1.5 2001/01/17 23:57:53 jlam Exp $
  int
  xf86mmap(dev, offset, length)
  	dev_t dev;
+@@ -144,7 +153,11 @@ xf86mmap(dev, offset, length)
+ 		     && (unsigned)offset <= HOLE16M_END)
+ #endif
+ 		     )) {
++#if __NetBSD_Version__ >= 106160000
++		return x86_btop(offset);
++#else
+ 		return i386_btop(offset);
++#endif
+ 	} else {
+ 		return(-1);
+ 	}
-- 
cgit v1.2.3