diff options
| author | jlam <jlam@pkgsrc.org> | 2000-07-21 07:45:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-07-21 07:45:49 +0000 |
| commit | 7e3366fd370d00f89b64b1c22082c7752d769acd (patch) | |
| tree | 8e989c0f780e972d1c4c49589b1a183e6f50297a /sysutils/aperture | |
| parent | 738f98133b74218bc5d98375c7b0bd79ae005eaf (diff) | |
| download | pkgsrc-7e3366fd370d00f89b64b1c22082c7752d769acd.tar.gz | |
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.
Diffstat (limited to 'sysutils/aperture')
| -rw-r--r-- | sysutils/aperture/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/aperture/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/aperture/patches/patch-ad | 15 |
3 files changed, 12 insertions, 11 deletions
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile index d4697cd8355..f4d21bea506 100644 --- a/sysutils/aperture/Makefile +++ b/sysutils/aperture/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/15 06:22:16 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/21 07:45:49 jlam Exp $ DISTNAME= apNetBSD PKGNAME= aperture-2.0 @@ -8,7 +8,7 @@ EXTRACT_SUFX= .shar MAINTAINER= packages@netbsd.org -EXTRACT_CMD= ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +EXTRACT_CMD= ${SH} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ALL_TARGET= cleandir depend all INSTALL_TARGET= dirs includes install NO_WRKSUBDIR= yes diff --git a/sysutils/aperture/files/patch-sum b/sysutils/aperture/files/patch-sum index 6f235ff40e6..cbbca44b90c 100644 --- a/sysutils/aperture/files/patch-sum +++ b/sysutils/aperture/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.3 2000/07/15 06:10:26 jlam Exp $ +$NetBSD: patch-sum,v 1.4 2000/07/21 07:45:49 jlam Exp $ MD5 (patch-aa) = 2eff82bf1a230de43a83a4cb4c96eba7 MD5 (patch-ab) = f45a6989db23e6019effe4683898d9c8 MD5 (patch-ac) = bdef667d9a470fa0b1dd02d0098c786f -MD5 (patch-ad) = 0afb58cb173eaf1d7602ef6e4cd2ac48 +MD5 (patch-ad) = 3f848e58516197319e34d0cb997674de MD5 (patch-ae) = 17acb72cf89035ff671af9fcb2f120be diff --git a/sysutils/aperture/patches/patch-ad b/sysutils/aperture/patches/patch-ad index 169c513c26d..a78e623e2fa 100644 --- a/sysutils/aperture/patches/patch-ad +++ b/sysutils/aperture/patches/patch-ad @@ -1,18 +1,19 @@ -$NetBSD: patch-ad,v 1.1 2000/07/15 06:11:20 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2000/07/21 07:45:50 jlam Exp $ ---- 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 @@ +--- 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 @@ * allow only section in the vga framebuffer and above main memory * to be mapped */ -+#if (__NetBSD_Version__ < 105020000) +/* + * Technically, the change to the kernel mmap interface happened + * during 1.5A, but after the interface changed, the kernel version -+ * was inexplicably not bumped. Hence, the test condition is for -+ * 1.5B. ++ * was inexplicably not bumped. Starting with 1.5B _and_ with the ++ * 1.5 release, the change to the kernel mmap interface appears. + */ ++#if (__NetBSD_Version__ < 105000000) || \ ++ ((__NetBSD_Version__ > 105000000) && (__NetBSD_Version__ < 105020000)) int xf86mmap(dev, offset, length) dev_t dev; |