summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwennmach <wennmach@pkgsrc.org>2003-11-11 13:00:24 +0000
committerwennmach <wennmach@pkgsrc.org>2003-11-11 13:00:24 +0000
commit225d4df044d84b58b04b73f5be27dd5186767235 (patch)
tree25e05df3441190c2b336ee1a116690e88edaae38
parent684554cf0b761bf0d9a13645cc1548733c378261 (diff)
downloadpkgsrc-225d4df044d84b58b04b73f5be27dd5186767235.tar.gz
Do not define cpu_id, cpu_feature, and cpu_vendor directly; leave that
to machine/cpu.h - avoiding conflicts when the definitions in cpu.h change. Fixes PR pkg/23371 by Jukka Salmi < jukka-netbsd AT 2003 DOT salmi DOT ch >
-rw-r--r--sysutils/aperture/Makefile4
-rw-r--r--sysutils/aperture/distinfo8
-rw-r--r--sysutils/aperture/patches/patch-ab34
3 files changed, 28 insertions, 18 deletions
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index 5888b76d415..486572face8 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/08/10 21:47:32 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/11/11 13:00:24 wennmach Exp $
DISTNAME= apNetBSD
PKGNAME= aperture-2.0
-PKGREVISION= 4
+PKGREVISION= 5
WRKSRC= ${WRKDIR}
CATEGORIES= sysutils x11
EXTRACT_SUFX= .shar
diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo
index 1c148d84c97..a8a6043ea6e 100644
--- a/sysutils/aperture/distinfo
+++ b/sysutils/aperture/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/08/10 07:56:54 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/11/11 13:00:24 wennmach Exp $
-SHA1 (aperture-2.0nb4/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
-Size (aperture-2.0nb4/apNetBSD.shar) = 66731 bytes
+SHA1 (aperture-2.0nb5/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
+Size (aperture-2.0nb5/apNetBSD.shar) = 66731 bytes
SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe
-SHA1 (patch-ab) = 16daeea3a8372df2de8b7502dc9e95ea9e175947
+SHA1 (patch-ab) = fc3f65e9b9bc94880dc18e2091d7daccd3d480ad
SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362
SHA1 (patch-ad) = ff298db28cf5d4ca0cfe42f4be28c8b1908c828e
SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767
diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab
index 790df0be3fa..5e8b20e7a53 100644
--- a/sysutils/aperture/patches/patch-ab
+++ b/sysutils/aperture/patches/patch-ab
@@ -1,24 +1,35 @@
-$NetBSD: patch-ab,v 1.6 2002/11/10 07:59:03 tron Exp $
+$NetBSD: patch-ab,v 1.7 2003/11/11 13:00:24 wennmach Exp $
---- 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 @@
+o add support for cpu_info (for recent kernel versions)
+o do not define cpu_id, cpu_feature, cpu_vendor directly; leave that
+ to machine/cpu.h
+
+--- module/xf86_mod.c.orig Fri Nov 7 16:29:19 2003
++++ module/xf86_mod.c Fri Nov 7 16:36:27 2003
+@@ -10,6 +10,7 @@
+ #include <sys/lkm.h>
+ #include <sys/malloc.h>
+
++#include <machine/cpu.h>
+ #include <machine/specialreg.h>
+
+ #include "xf86_reg.h"
+@@ -17,9 +18,11 @@
#include "memrange.h"
/* Pull in the cpuid values from locore.s */
+-extern int cpu_id;
+-extern int cpu_feature;
+-extern char cpu_vendor[];
+#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 @@
+@@ -31,7 +34,11 @@
0,
seltrue, xf86mmap, 0};
@@ -30,13 +41,12 @@ $NetBSD: patch-ab,v 1.6 2002/11/10 07:59:03 tron Exp $
char *xf86_major_version = "2";
char *xf86_minor_version = "0";
-@@ -76,7 +86,10 @@
+@@ -76,7 +83,10 @@
case LKM_E_UNLOAD:
/* Free allocated memory */
-- free(mem_range_softc.mr_desc, M_MEMDESC);
+ if (mem_range_softc.mr_desc != NULL) {
-+ free(mem_range_softc.mr_desc, M_MEMDESC);
+ free(mem_range_softc.mr_desc, M_MEMDESC);
+ mem_range_softc.mr_desc = NULL;
+ }
break;