head 1.10; access; symbols pkgsrc-2013Q4:1.9.0.66 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.64 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.62 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.60 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.58 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.56 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.54 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.52 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.50 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.48 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.46 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.44 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.42 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.40 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.38 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.36 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.34 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.32 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.30 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.28 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.26 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.24 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.22 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.20 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.18 pkgsrc-2008Q1:1.9.0.16 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.14 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.12 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.10 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.8 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.6 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.4 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.8.0.4 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.2 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2; locks; strict; comment @# @; 1.10 date 2013.12.31.17.08.10; author wiz; state dead; branches; next 1.9; commitid Vb57LsqOW5rN8jjx; 1.9 date 2006.05.31.02.31.56; author tron; state Exp; branches; next 1.8; 1.8 date 2005.12.14.18.27.59; author christos; state Exp; branches; next 1.7; 1.7 date 2005.12.14.13.42.45; author christos; state Exp; branches; next 1.6; 1.6 date 2003.03.19.17.56.39; author jmmv; state Exp; branches; next 1.5; 1.5 date 2001.01.17.23.57.53; author jlam; state Exp; branches; next 1.4; 1.4 date 2000.12.22.20.19.10; author jlam; state Exp; branches; next 1.3; 1.3 date 2000.12.22.20.18.13; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.07.21.07.45.50; author jlam; state Exp; branches; next 1.1; 1.1 date 2000.07.15.06.11.20; author jlam; state Exp; branches; next ; desc @@ 1.10 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-ad,v 1.9 2006/05/31 02:31:56 tron Exp $ --- module/aperture.c.orig 2006-05-31 03:22:31.000000000 +0100 +++ module/aperture.c 2006-05-31 03:29:49.000000000 +0100 @@@@ -71,6 +71,14 @@@@ /* open counter */ static int xf86_open_count = 0; +#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 399001400 +#define PROC +#endif + +#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 399002000 +#include +#endif + /* mem range descriptors */ struct mem_range_softc mem_range_softc; @@@@ -78,16 +86,28 @@@@ * Open the device */ int -xf86open(dev, oflags, devtype, p) - dev_t dev; - int oflags; - int devtype; - struct proc *p; +xf86open(dev_t dev, int oflags, int devtype, +#ifdef PROC + struct proc *p) { +#else + struct lwp *l) +{ + struct proc *p = l->l_proc; +#endif +#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 399002000 if (suser(p->p_ucred, &p->p_acflag) != 0) { return(EPERM); } +#else + int error; + + error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, + &p->p_acflag); + if (error != 0) + return error; +#endif /* authorize only one simultaneous open() */ if (xf86_open_count > 0) { return(EPERM); @@@@ -101,11 +121,13 @@@@ * Close the device */ int -xf86close(dev, cflags, devtype, p) - dev_t dev; - int cflags; - int devtype; - struct proc *p; +xf86close(dev_t dev, int cflags, int devtype, +#ifdef PROC + struct proc *p +#else + struct lwp *l +#endif +) { xf86_open_count--; return(0); @@@@ -117,19 +139,22 @@@@ * allow only section in the vga framebuffer and above main memory * to be mapped */ +/* + * Technically, the change to the kernel mmap interface happened + * during 1.5A, but after the interface changed, the kernel version + * was inexplicably not bumped. Starting with 1.5B _and_ with the + * 1.5-branch releases, the change to the kernel mmap interface + * appears. + */ #if !defined(__NetBSD_Version__) || \ - (defined(__NetBSD_Version__) && (__NetBSD_Version__ < 105000000)) + (defined(__NetBSD_Version__) && \ + ((__NetBSD_Version__ < 105000000) || \ + (__NetBSD_Version__ >= 105010000) && (__NetBSD_Version__ < 105020000))) int -xf86mmap(dev, offset, length) - dev_t dev; - int offset; - int length; +xf86mmap(dev_t dev, int offset, int length) #else paddr_t -xf86mmap(dev, offset, length) - dev_t dev; - off_t offset; - int length; +xf86mmap(dev_t dev, off_t offset, int length) #endif /* __NetBSD_Version__ */ { @@@@ -144,19 +169,24 @@@@ && (unsigned)offset <= HOLE16M_END) #endif )) { +#if __NetBSD_Version__ >= 106160000 + return x86_btop(offset); +#else return i386_btop(offset); +#endif } else { return(-1); } } int -xf86ioctl(dev, cmd, data, flags, p) - dev_t dev; - u_long cmd; - caddr_t data; - int flags; - struct proc *p; +xf86ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, +#ifdef PROC + struct proc *p +#else + struct lwp *l +#endif +) { int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; @@@@ -212,9 +242,7 @@@@ * memory range attributes. */ int -mem_range_attr_get(mrd, arg) - struct mem_range_desc *mrd; - int *arg; +mem_range_attr_get(struct mem_range_desc *mrd, int *arg) { /* can we handle this? */ if (mem_range_softc.mr_op == NULL) @@@@ -229,9 +257,7 @@@@ } int -mem_range_attr_set(mrd, arg) - struct mem_range_desc *mrd; - int *arg; +mem_range_attr_set(struct mem_range_desc *mrd, int *arg) { /* can we handle this? */ if (mem_range_softc.mr_op == NULL) @ 1.9 log @Make this build and work under NetBSD 3.99.20 and newer. Bump package revision because of this fix. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @fix directory of the patch @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2005/12/14 13:42:45 christos Exp $ d3 3 a5 3 --- module/aperture.c.orig 2005-12-14 08:34:23.000000000 -0500 +++ module/aperture.c 2005-12-14 08:41:10.000000000 -0500 @@@@ -71,6 +71,10 @@@@ d13 4 d20 1 a20 1 @@@@ -78,12 +82,15 @@@@ d32 1 a32 1 +{ d35 1 a35 1 { d39 1 d42 13 a54 1 @@@@ -101,11 +108,13 @@@@ d73 1 a73 1 @@@@ -117,19 +126,22 @@@@ d105 1 a105 1 @@@@ -144,19 +156,24 @@@@ d136 1 a136 1 @@@@ -212,9 +229,7 @@@@ d147 1 a147 1 @@@@ -229,9 +244,7 @@@@ @ 1.7 log @make this work with ktrace-lwp @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2003/03/19 17:56:39 jmmv Exp $ d3 2 a4 2 --- aperture.c.orig 2005-12-14 08:34:23.000000000 -0500 +++ aperture.c 2005-12-14 08:41:10.000000000 -0500 @ 1.6 log @Fix build on NetBSD >= 1.6P. Thanks to atatat. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2001/01/17 23:57:53 jlam Exp $ d3 54 a56 3 --- module/aperture.c.orig 2003-03-19 18:52:51.000000000 +0100 +++ module/aperture.c @@@@ -117,8 +117,17 @@@@ xf86close(dev, cflags, devtype, p) d73 16 a88 3 xf86mmap(dev, offset, length) dev_t dev; @@@@ -144,7 +153,11 @@@@ xf86mmap(dev, offset, length) d100 41 @ 1.5 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$ d3 1 a3 1 --- module/aperture.c.orig Fri Jan 12 13:58:55 2001 d5 1 a5 1 @@@@ -117,8 +117,17 @@@@ d24 12 @ 1.4 log @Okay, _really_ get the version checking done right. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2000/12/22 20:18:13 jlam Exp $ d3 3 a5 3 --- module/aperture.c.orig Fri Jul 21 03:37:57 2000 +++ module/aperture.c Fri Jul 21 03:42:51 2000 @@@@ -118,11 +118,26 @@@@ d13 2 a14 1 + * 1.5 release, the change to the kernel mmap interface appears. d16 5 a20 2 +#if (__NetBSD_Version__ < 105000000) || \ + ((__NetBSD_Version__ >= 105010000) && (__NetBSD_Version__ < 105020000)) a23 12 int offset; int length; +#else +paddr_t +xf86mmap(dev, offset, length) + dev_t dev; + off_t offset; + int length; +#endif /* __NetBSD_Version__ */ { #ifdef XF86_DEBUG @ 1.3 log @The paddr_t mmap interface change is for anything except <1.5 and 1.5A, so make the __NetBSD_Version__ checking reflect this. This should hopefully fix build problems on 1.5.1_ALPHA. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2000/07/21 07:45:50 jlam Exp $ d16 1 a16 1 + ((__NetBSD_Version__ > 105010000) && (__NetBSD_Version__ < 105020000)) @ 1.2 log @Some NetBSD versions have changed their kernel mmap interface. I think that 1.5 and >1.5B have the new interface, so use those version numbers as a test condition. @ text @d1 1 a1 1 $NetBSD$ d16 1 a16 1 + ((__NetBSD_Version__ > 105000000) && (__NetBSD_Version__ < 105020000)) @ 1.1 log @Forgot these patches. These patch sources to work after kernel mmap interface changed. @ text @d3 3 a5 3 --- module/aperture.c.orig Sat Jul 15 01:15:06 2000 +++ module/aperture.c Sat Jul 15 01:32:13 2000 @@@@ -118,11 +118,25 @@@@ a8 1 +#if (__NetBSD_Version__ < 105020000) d12 2 a13 2 + * was inexplicably not bumped. Hence, the test condition is for + * 1.5B. d15 2 @