head 1.8; access; symbols pkgsrc-2013Q4:1.7.0.86 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.84 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.82 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.80 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.78 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.76 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.74 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.72 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.70 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.68 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.66 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.64 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.62 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.60 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.58 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.56 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.54 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.52 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.50 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.48 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.46 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.44 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.42 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.40 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.38 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 buildlink2-base:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2013.12.31.17.08.10; author wiz; state dead; branches; next 1.7; commitid Vb57LsqOW5rN8jjx; 1.7 date 2003.11.11.13.00.24; author wennmach; state Exp; branches; next 1.6; 1.6 date 2002.11.10.07.59.03; author tron; state Exp; branches; next 1.5; 1.5 date 2002.09.15.19.25.38; author tron; state Exp; branches; next 1.4; 1.4 date 2002.09.14.08.14.22; author tron; state Exp; branches; next 1.3; 1.3 date 2002.09.13.07.16.45; author tron; state Exp; branches; next 1.2; 1.2 date 2001.01.17.23.57.53; author jlam; state dead; branches; next 1.1; 1.1 date 2000.01.05.18.02.20; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.01.05.18.02.20; author jlam; state Exp; branches; next ; desc @@ 1.8 log @Remove packages that were either BROKEN for more than a year or BROKEN and explicitly scheduled to be removed after 2013Q4. @ text @$NetBSD: patch-ab,v 1.7 2003/11/11 13:00:24 wennmach Exp $ 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 #include +#include #include #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 +#endif extern struct mem_range_ops i686_mrops, k6_mrops; @@@@ -31,7 +34,11 @@@@ 0, seltrue, xf86mmap, 0}; +#if __NetBSD_Version__ >= 106080000 +MOD_DEV("xf86", "xf86ap", NULL, -1, &newdev, -1) +#else MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev) +#endif char *xf86_major_version = "2"; char *xf86_minor_version = "0"; @@@@ -76,7 +83,10 @@@@ case LKM_E_UNLOAD: /* Free allocated memory */ + if (mem_range_softc.mr_desc != NULL) { free(mem_range_softc.mr_desc, M_MEMDESC); + mem_range_softc.mr_desc = NULL; + } break; case LKM_E_STAT: @ 1.7 log @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 > @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @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. @ text @d3 15 a17 3 --- 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 @@@@ d21 3 a27 4 +#else extern int cpu_id; extern int cpu_feature; extern char cpu_vendor[]; d32 1 a32 1 @@@@ -31,7 +37,11 @@@@ d44 1 a44 1 @@@@ -76,7 +86,10 @@@@ a47 1 - free(mem_range_softc.mr_desc, M_MEMDESC); d49 1 a49 1 + free(mem_range_softc.mr_desc, M_MEMDESC); @ 1.5 log @Fix a bug in this module which caused a kernel panic when the module was loaded and unloaded without ever being used. The fix is based on an analysis provided by MAEKAWA Masahide in private e-mail. Bump package revision to reflect change. @ text @d3 19 a21 3 --- 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 @@@@ d33 1 a33 1 @@@@ -76,7 +80,10 @@@@ @ 1.4 log @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. @ text @d3 2 a4 2 --- module/xf86_mod.c.orig Mon Sep 9 12:29:28 2002 +++ module/xf86_mod.c Mon Sep 9 12:30:05 2002 d17 12 @ 1.3 log @Make this module compile on NetBSD-current after the "gehenna-devsw" branch has been merged. @ text @d3 2 a4 2 --- module/xf86_mod.c.orig Fri Sep 13 08:13:28 2002 +++ module/xf86_mod.c Fri Sep 13 08:16:34 2002 d9 2 a10 2 +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 106080000) +MOD_DEV("xf86", "xf86", NULL, -1, &newdev, -1) @ 1.2 log @Update aperture to 2.0nb1. This is now taken from the xfree86-4.0.2 sources, but is virtually the same as the xfree86-3.3.6 one except some of the pkgsrc changes were included. * Add a bug fix for MTRR support on K6 processors, taken from OpenBSD. This was apparently fixed in their tree in March 2000. * The package Makefile now uses BSDSRCDIR to find the kernel sources instead of requiring a symlinks /sys --> kernel sources. * Become the maintainer since I originally committed this package, and am upgrading it. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2000/01/05 18:02:20 jlam Exp $ d3 5 a7 3 --- module/xf86_mod.c.orig Wed Jan 5 11:47:26 2000 +++ module/xf86_mod.c Wed Jan 5 11:48:24 2000 @@@@ -33,8 +33,8 @@@@ d9 3 d13 1 d15 2 a16 7 -char *xf86_major_version = "1"; -char *xf86_minor_version = "99b"; +char *xf86_major_version = "2"; +char *xf86_minor_version = "0"; static int xf86action __P((struct lkm_table *lktmp, int cmd)); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @XFree86 Framebuffer "aperture" driver for NetBSD @ text @@