diff options
| author | tron <tron@pkgsrc.org> | 2002-11-10 07:59:02 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2002-11-10 07:59:02 +0000 |
| commit | 047f1d9347a63d73b6f3fd0b547ede915482c59b (patch) | |
| tree | b2e0540bb5a13fe5e66f31dcf5422a8bfe46b04f /sysutils/aperture | |
| parent | 0bf707ed8afff3738f283a63b01c78befde3d241 (diff) | |
| download | pkgsrc-047f1d9347a63d73b6f3fd0b547ede915482c59b.tar.gz | |
Make this LKM load again under NetBSD 1.6K and newer. The patch was
supplied by Stephen Ma in PR pkg/18925. Bump the package revision
to reflect this change.
Diffstat (limited to 'sysutils/aperture')
| -rw-r--r-- | sysutils/aperture/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/aperture/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/aperture/patches/patch-ab | 26 |
3 files changed, 27 insertions, 11 deletions
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile index f56c567ef71..cb2522b033f 100644 --- a/sysutils/aperture/Makefile +++ b/sysutils/aperture/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2002/10/14 18:12:23 tron Exp $ +# $NetBSD: Makefile,v 1.24 2002/11/10 07:59:02 tron Exp $ DISTNAME= apNetBSD PKGNAME= aperture-2.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils x11 EXTRACT_SUFX= .shar diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo index 0d18484594c..9ceecdae541 100644 --- a/sysutils/aperture/distinfo +++ b/sysutils/aperture/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2002/09/15 19:25:38 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/11/10 07:59:02 tron Exp $ -SHA1 (aperture-2.0nb3/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b -Size (aperture-2.0nb3/apNetBSD.shar) = 66731 bytes +SHA1 (aperture-2.0nb4/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b +Size (aperture-2.0nb4/apNetBSD.shar) = 66731 bytes SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe -SHA1 (patch-ab) = 09cd6074c3846e3460679fcc42c61977a735b67f +SHA1 (patch-ab) = 16daeea3a8372df2de8b7502dc9e95ea9e175947 SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362 SHA1 (patch-ad) = 22aa063237f08f38712017f310d535bc3e3ad0c8 SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767 diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab index d4a0db734a5..790df0be3fa 100644 --- a/sysutils/aperture/patches/patch-ab +++ b/sysutils/aperture/patches/patch-ab @@ -1,8 +1,24 @@ -$NetBSD: patch-ab,v 1.5 2002/09/15 19:25:38 tron Exp $ +$NetBSD: patch-ab,v 1.6 2002/11/10 07:59:03 tron Exp $ ---- module/xf86_mod.c.orig Sun Sep 15 21:18:40 2002 -+++ module/xf86_mod.c Sun Sep 15 21:22:02 2002 -@@ -31,7 +31,11 @@ +--- module/xf86_mod.c.orig Fri Jul 5 01:36:35 2002 ++++ module/xf86_mod.c Thu Oct 10 22:37:41 2002 +@@ -17,9 +17,15 @@ + #include "memrange.h" + + /* Pull in the cpuid values from locore.s */ ++#if __NetBSD_Version__ >= 106080000 ++extern struct cpu_info cpu_info_primary; ++#define cpu_vendor ((char *)cpu_info_primary.ci_vendor) ++#define cpu_id cpu_info_primary.ci_signature ++#else + extern int cpu_id; + extern int cpu_feature; + extern char cpu_vendor[]; ++#endif + + extern struct mem_range_ops i686_mrops, k6_mrops; + +@@ -31,7 +37,11 @@ 0, seltrue, xf86mmap, 0}; @@ -14,7 +30,7 @@ $NetBSD: patch-ab,v 1.5 2002/09/15 19:25:38 tron Exp $ char *xf86_major_version = "2"; char *xf86_minor_version = "0"; -@@ -76,7 +80,10 @@ +@@ -76,7 +86,10 @@ case LKM_E_UNLOAD: /* Free allocated memory */ |