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.

9 files changed, 61 insertions, 92 deletions

diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index 2fa663b6b9b..2ecbe37fbcc 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,42 +1,40 @@
-# $NetBSD: Makefile,v 1.8 2000/12/26 17:33:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2001/01/17 23:57:52 jlam Exp $
 
 DISTNAME=	apNetBSD
-PKGNAME=	aperture-2.0
+PKGNAME=	aperture-2.0nb1
 CATEGORIES=	sysutils x11
-MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/xc/programs/Xserver/hw/xfree86/etc/
+MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/xfree/xc/programs/Xserver/hw/xfree86/etc/
 EXTRACT_SUFX=	.shar
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	jlam@netbsd.org
 
-EXTRACT_CMD=	${SH} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PKGNAME}
+NO_WRKSUBDIR=	# defined
+NO_CONFIGURE=	# defined
+
+EXTRACT_CMD=	${SH} ${DOWNLOADED_DISTFILE}
 ALL_TARGET=	cleandir depend all
 INSTALL_TARGET=	dirs includes install
-NO_WRKSUBDIR=	yes
-NO_CONFIGURE=	yes
-DIST_SUBDIR=	${PKGNAME}
 
-OSVERSION_SPECIFIC=	yes
+OSVERSION_SPECIFIC=	# defined
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+BSDSRCDIR?=	/nonexistent	# to override <bsd.own.mk>, MUST be
+                                # set this way BEFORE bsd.prefs.mk
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-pre-fetch:
-	@if [ ! -f /sys/lib/libkern/libkern.h ]; then \
-	    ${ECHO_MSG} "==================================================="; \
-	    ${ECHO_MSG} "    Kernel sources for the version of the kernel"; \
-	    ${ECHO_MSG} "    you are running are required to build LKMs."; \
-	    ${ECHO_MSG} "    Please fetch them and make a link from /sys";  \
-	    ${ECHO_MSG} "    to the kernel source directory (typically"; \
-	    ${ECHO_MSG} "    /usr/src/sys)."; \
-	    ${ECHO_MSG}; \
-	    ${ECHO_MSG} "    Information for fetching kernel sources may be"; \
-	    ${ECHO_MSG} "    found at the following URL:"; \
-	    ${ECHO_MSG}; \
-	    ${ECHO_MSG} "    http://www.netbsd.org/Documentation/"; \
-	    ${ECHO_MSG} "==================================================="; \
-	    ${FALSE}; \
-	fi
+pre-extract:
+.if ${BSDSRCDIR} == "/nonexistent"
+	@${ECHO_MSG} "Please set BSDSRCDIR in /etc/mk.conf, pointing it"
+	@${ECHO_MSG} "to a directory that contains sources that match"
+	@${ECHO_MSG} "your currently running system (esp. kernel), e.g."
+	@${ECHO_MSG} "/usr/src."
+	@${FALSE}
+.endif
+.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
+	@${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
+	@${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
+	@${FALSE}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/aperture/files/md5 b/sysutils/aperture/files/md5
index 1d0ef96e957..9ce5686d6ee 100644
--- a/sysutils/aperture/files/md5
+++ b/sysutils/aperture/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/07/15 06:22:17 jlam Exp $
+$NetBSD: md5,v 1.3 2001/01/17 23:57:52 jlam Exp $
 
-MD5 (aperture-2.0/apNetBSD.shar) = 6babfea61ec565c7357d133395e7e0b8
+MD5 (aperture-2.0nb1/apNetBSD.shar) = bd6de13f74a74e849d6b3caf2e49848f
diff --git a/sysutils/aperture/files/patch-sum b/sysutils/aperture/files/patch-sum
index 67ed18d525e..fdf165a1005 100644
--- a/sysutils/aperture/files/patch-sum
+++ b/sysutils/aperture/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/12/22 20:19:10 jlam Exp $
+$NetBSD: patch-sum,v 1.7 2001/01/17 23:57:53 jlam Exp $
 
-MD5 (patch-aa) = 2eff82bf1a230de43a83a4cb4c96eba7
-MD5 (patch-ab) = f45a6989db23e6019effe4683898d9c8
-MD5 (patch-ac) = bdef667d9a470fa0b1dd02d0098c786f
-MD5 (patch-ad) = 676f3e06b02ab0b60a164c6aede86fbf
+MD5 (patch-aa) = 51d039364b6e8cd77de87b0a7c3a186c
+MD5 (patch-ad) = 407a530950222cc50f3b3ea20ddb967b
 MD5 (patch-ae) = 17acb72cf89035ff671af9fcb2f120be
+MD5 (patch-af) = 3ce12d207be4a8b893b49d97c4e8bfe1
diff --git a/sysutils/aperture/patches/patch-aa b/sysutils/aperture/patches/patch-aa
index 20ea7b6a33f..b68ce31b580 100644
--- a/sysutils/aperture/patches/patch-aa
+++ b/sysutils/aperture/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/01/05 18:02:20 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/17 23:57:53 jlam Exp $
 
---- Makefile.inc.orig	Wed Jan  5 02:34:12 2000
-+++ Makefile.inc	Wed Jan  5 02:34:14 2000
-@@ -3,7 +3,7 @@
+--- Makefile.inc.orig	Fri Jan 12 14:09:51 2001
++++ Makefile.inc
+@@ -3,8 +3,9 @@
  # NetBSDApertureDir variable in xc/config/cf/host.def before rebuilding 
  # the X server
  
 -APDIR=		/usr/local/aperture
 +APDIR=		${PREFIX}
  
++S=		${BSDSRCDIR}/sys
  KMODDIR=	${APDIR}/lkm
  BINDIR=		${APDIR}/bin
+ MANDIR= 	${APDIR}/man
diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab
deleted file mode 100644
index 5e60e48d078..00000000000
--- a/sysutils/aperture/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/01/05 18:02:20 jlam Exp $
-
---- 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 @@
- 
- MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
- 
--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));
- 
diff --git a/sysutils/aperture/patches/patch-ac b/sysutils/aperture/patches/patch-ac
deleted file mode 100644
index 4764083eae7..00000000000
--- a/sysutils/aperture/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/04/26 12:16:00 hubertf Exp $
-
---- module/xf86_reg.h.orig	Wed Apr 26 14:09:20 2000
-+++ module/xf86_reg.h	Wed Apr 26 14:11:27 2000
-@@ -18,6 +18,7 @@
- #define MTRR_N16K		16
- #define MTRR_N4K		64
- 
-+#if (__NetBSD_Version__ < 104240000)
- /*
-  * XXX - These belong to cpufunc.h
-  */
-@@ -41,6 +42,7 @@
- {
- 	__asm __volatile(".byte 0x0f, 0x30" : : "A" (newval), "c" (msr));
- }
-+#endif /* __NetBSD_Version__ */
- 
- #ifndef M_MEMDESC
- #define M_MEMDESC M_TEMP		/* XXX */
diff --git a/sysutils/aperture/patches/patch-ad b/sysutils/aperture/patches/patch-ad
index 625d23a3bad..0cf29cb25db 100644
--- a/sysutils/aperture/patches/patch-ad
+++ b/sysutils/aperture/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2000/12/22 20:19:10 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2001/01/17 23:57:53 jlam Exp $
 
---- 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 @@
+--- module/aperture.c.orig	Fri Jan 12 13:58:55 2001
++++ module/aperture.c
+@@ -117,8 +117,17 @@
   * allow only section in the vga framebuffer and above main memory 
   * to be mapped
   */
@@ -10,22 +10,14 @@ $NetBSD: patch-ad,v 1.4 2000/12/22 20:19:10 jlam Exp $
 + * 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 release, the change to the kernel mmap interface appears.
++ * 1.5-branch releases, the change to the kernel mmap interface
++ * appears.
 + */
-+#if (__NetBSD_Version__ < 105000000) || \
-+    ((__NetBSD_Version__ >= 105010000) && (__NetBSD_Version__ < 105020000))
+ #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;
-+#else
-+paddr_t
-+xf86mmap(dev, offset, length)
-+	dev_t dev;
-+	off_t offset;
-+	int length;
-+#endif /* __NetBSD_Version__ */
- {
- 
- #ifdef XF86_DEBUG
diff --git a/sysutils/aperture/patches/patch-af b/sysutils/aperture/patches/patch-af
new file mode 100644
index 00000000000..5ec70970da1
--- /dev/null
+++ b/sysutils/aperture/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2001/01/17 23:57:53 jlam Exp $
+
+--- module/k6_mem.c.orig	Wed Jan 17 12:36:06 2001
++++ module/k6_mem.c
+@@ -89,7 +89,7 @@
+ 		return EOPNOTSUPP;
+ 
+ 	for (bit = ffs(desc->mr_len >> 17) - 1; bit < 15; bit++)
+-		len |= 1 << (14 - bit);
++		len |= 1 << bit;
+ 	wc = (desc->mr_flags & MDF_WRITECOMBINE) ? 1 : 0;
+ 	uc = (desc->mr_flags & MDF_UNCACHEABLE) ? 1 : 0;
+ 
diff --git a/sysutils/aperture/pkg/PLIST b/sysutils/aperture/pkg/PLIST
index 03a4d4e7bc3..e811fd4e494 100644
--- a/sysutils/aperture/pkg/PLIST
+++ b/sysutils/aperture/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/05 18:02:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/17 23:57:53 jlam Exp $
 bin/memconfig
 bin/xf86test
 include/memrange.h