Make this package work under NetBSD 1.6H.

Beware: I still see panics when unloading the module, use on your own risk.

Bump package revision to reflect change.

4 files changed, 28 insertions, 13 deletions

diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index b57586fea25..979d0eb6097 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2002/09/13 07:18:42 tron Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/14 08:14:22 tron Exp $
 
 DISTNAME=	apNetBSD
 PKGNAME=	aperture-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils x11
 EXTRACT_SUFX=	.shar
 
@@ -22,8 +22,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL:=${subdir}nb1/}
 MAINTAINER=	jlam@netbsd.org
 COMMENT=	XFree86 Framebuffer "aperture" driver for NetBSD/i386
 
-ONLY_FOR_PLATFORM=	NetBSD-1.[0-5]*-i386 NetBSD-1.6-i386 \
-			NetBSD-1.6.*-i386 NetBSD-1.6[A-G]-i36
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo
index 783edbc2e72..b58d96d9979 100644
--- a/sysutils/aperture/distinfo
+++ b/sysutils/aperture/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/09/13 07:16:44 tron Exp $
+$NetBSD: distinfo,v 1.4 2002/09/14 08:14:22 tron Exp $
 
-SHA1 (aperture-2.0nb1/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
-Size (aperture-2.0nb1/apNetBSD.shar) = 66731 bytes
+SHA1 (aperture-2.0nb2/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
+Size (aperture-2.0nb2/apNetBSD.shar) = 66731 bytes
 SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe
-SHA1 (patch-ab) = abf10211cf19fd56373727c9952062e4cfa51cbc
+SHA1 (patch-ab) = 299cdbd9d2906a77fe4746996a7cf57b663dd07b
+SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362
 SHA1 (patch-ad) = 22aa063237f08f38712017f310d535bc3e3ad0c8
 SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767
 SHA1 (patch-af) = 475c127658ba1050154a7dcabe39482c088e2d02
diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab
index 4c090cbb4d2..5c05857b541 100644
--- a/sysutils/aperture/patches/patch-ab
+++ b/sysutils/aperture/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/09/13 07:16:45 tron Exp $
+$NetBSD: patch-ab,v 1.4 2002/09/14 08:14:22 tron Exp $
 
---- module/xf86_mod.c.orig	Fri Sep 13 08:13:28 2002
-+++ module/xf86_mod.c	Fri Sep 13 08:16:34 2002
+--- module/xf86_mod.c.orig	Mon Sep  9 12:29:28 2002
++++ module/xf86_mod.c	Mon Sep  9 12:30:05 2002
 @@ -31,7 +31,11 @@
  	0,
  	seltrue, xf86mmap, 0};
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 106080000)
-+MOD_DEV("xf86", "xf86", NULL, -1, &newdev, -1)
++#if __NetBSD_Version__ >= 106080000
++MOD_DEV("xf86", "xf86ap", NULL, -1, &newdev, -1)
 +#else
  MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
 +#endif
diff --git a/sysutils/aperture/patches/patch-ac b/sysutils/aperture/patches/patch-ac
new file mode 100644
index 00000000000..5216559ad54
--- /dev/null
+++ b/sysutils/aperture/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2002/09/14 08:14:22 tron Exp $
+
+--- module/xf86_mod_install.orig	Fri Sep 13 18:29:17 2002
++++ module/xf86_mod_install	Fri Sep 13 18:34:52 2002
+@@ -4,8 +4,8 @@
+ # 
+ # Copyright (C) 1994,1999 The XFree86 Project Inc.
+ #
+-if [ $# -ne 3 ]; then
+-    echo "$0: should be called by modload(8) with 3 arguments"
++if [ $# -lt 3 ]; then
++    echo "$0: should be called by modload(8) with at least 3 arguments"
+     exit 1
+ fi
+