From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 2 13:40:24 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABE8216A420 for ; Tue, 2 Aug 2005 13:40:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2256843D55 for ; Tue, 2 Aug 2005 13:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j72DeLZU020306 for ; Tue, 2 Aug 2005 13:40:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j72DeLNm020305; Tue, 2 Aug 2005 13:40:21 GMT (envelope-from gnats) Resent-Date: Tue, 2 Aug 2005 13:40:21 GMT Resent-Message-Id: <200508021340.j72DeLNm020305@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrej Zverev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA4E316A41F for ; Tue, 2 Aug 2005 13:33:46 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28EA043D46 for ; Tue, 2 Aug 2005 13:33:45 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (root@localhost) by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j72DZP2Q018360 for ; Tue, 2 Aug 2005 17:35:25 +0400 (MSD) Received: from az.inec.ru (msproxyoutif.intermediate.org [10.0.0.2]) by waterwall.inec.ru (8.13.1/8.12.6) with ESMTP id j72DZOXH018354 for ; Tue, 2 Aug 2005 17:35:25 +0400 (MSD) Received: from az by az.inec.ru with local (Exim 4.51 (FreeBSD)) id 1DzwuG-0008qe-U7 for FreeBSD-gnats-submit@freebsd.org; Tue, 02 Aug 2005 17:34:08 +0400 Message-Id: Date: Tue, 02 Aug 2005 17:34:08 +0400 From: Andrej Zverev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/84481: [fix] nvidia-driver on 6.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrej Zverev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2005 13:40:24 -0000 >Number: 84481 >Category: ports >Synopsis: [fix] nvidia-driver on 6.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 02 13:40:21 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrej Zverev >Release: FreeBSD 5.4-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD az.inec.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #2: Wed Jul 6 12:10:32 MSD 2005 root@az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: I wrote about it danfe@ but seems he on vacation. Since >= 6.x don't have (it can be present if you upgraded from 5.x) buld fail. Fix it and close PR: 84473 too. >How-To-Repeat: >Fix: --- nvidia-driver.diff begins here --- diff -Nru nvidia-driver.orig/files/patch-src::nv-freebsd.h nvidia-driver/files/patch-src::nv-freebsd.h --- nvidia-driver.orig/files/patch-src::nv-freebsd.h Wed Feb 25 16:05:12 2004 +++ nvidia-driver/files/patch-src::nv-freebsd.h Tue Aug 2 16:39:25 2005 @@ -1,6 +1,36 @@ ---- src/nv-freebsd.h.orig Wed Feb 25 18:55:35 2004 -+++ src/nv-freebsd.h Wed Feb 25 18:55:49 2004 -@@ -217,7 +217,9 @@ +--- src/nv-freebsd.h.orig Fri Jun 17 18:44:23 2005 ++++ src/nv-freebsd.h Tue Aug 2 16:38:36 2005 +@@ -21,9 +21,6 @@ + + #include + +-#if __FreeBSD_version > 600000 +-#error This driver does not support FreeBSD 6.x/-CURRENT! +-#endif + #if __FreeBSD_version < 503000 + #error This driver requires FreeBSD 5.3 or later! + #endif +@@ -46,8 +43,9 @@ + #include + #include + #include ++#if __FreeBSD_version < 600000 + #include +- ++#endif + #include + #include + #include +@@ -190,7 +188,7 @@ + * thus disabled by default (this is 5.x/-CURRENT only). + */ + +-#undef NV_SUPPORT_ACPI_PM ++#define NV_SUPPORT_ACPI_PM + + + /* +@@ -270,7 +268,9 @@ } nvidia_softc_t; --- nvidia-driver.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: