From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 24 18:10:07 2004 Return-Path: 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 2B7D016A4CE for ; Tue, 24 Feb 2004 18:10:07 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2522043D31 for ; Tue, 24 Feb 2004 18:10:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1P2A7bv073664 for ; Tue, 24 Feb 2004 18:10:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1P2A7Qc073663; Tue, 24 Feb 2004 18:10:07 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 24 Feb 2004 18:10:07 -0800 (PST) Resent-Message-Id: <200402250210.i1P2A7Qc073663@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, Alexey Dokuchaev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF53316A4CE for ; Tue, 24 Feb 2004 18:05:59 -0800 (PST) Received: from mx.nsu.ru (mx.nsu.ru [212.192.164.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6363743D2D for ; Tue, 24 Feb 2004 18:05:59 -0800 (PST) (envelope-from danfe@regency.nsu.ru) Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 4.30) id 1AvoRw-0004hL-6N for FreeBSD-gnats-submit@freebsd.org; Wed, 25 Feb 2004 08:07:00 +0600 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.12.10/8.12.10) with ESMTP id i1P275Gx012641 for ; Wed, 25 Feb 2004 08:07:05 +0600 (NOVT) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.12.10/8.12.10/Submit) id i1P275tI012586; Wed, 25 Feb 2004 08:07:05 +0600 (NOVT) (envelope-from danfe) Message-Id: <200402250207.i1P275tI012586@regency.nsu.ru> Date: Wed, 25 Feb 2004 08:07:05 +0600 (NOVT) From: Alexey Dokuchaev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63326: PORT UPDATE: x11/nvidia-driver catchup after __FreeBSD_version bump of 502103 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alexey Dokuchaev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2004 02:10:07 -0000 >Number: 63326 >Category: ports >Synopsis: PORT UPDATE: x11/nvidia-driver catchup after __FreeBSD_version bump of 502103 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 24 18:10:06 PST 2004 >Closed-Date: >Last-Modified: >Originator: Alexey Dokuchaev >Release: FreeBSD 4.9-STABLE i386 >Organization: CNIT NSU >Environment: System: FreeBSD regency.nsu.ru 4.9-STABLE FreeBSD 4.9-STABLE #2: Sat Feb 7 22:10:21 NOVT 2004 root@regency.nsu.ru:/usr/obj/usr/src/sys/REGENCY i386 >Description: These patches required for this port to work with versions after 502103 (inclusive). >How-To-Repeat: N/A >Fix: Please put these 3 patches under files/: %%% patch-src::nv-freebsd.h %%% --- src/nv-freebsd.h.orig Wed May 28 23:51:53 2003 +++ src/nv-freebsd.h Wed Feb 25 07:57:39 2004 @@ -217,7 +217,9 @@ } nvidia_softc_t; +#if __FreeBSD_version < 502103 #define CDEV_MAJOR 180 +#endif #define CDEV_CTL_MINOR 255 extern devclass_t nvidia_devclass; %%% patch-src::nvidia_ctl.c %%% --- src/nvidia_ctl.c.orig Sun Feb 22 13:05:46 2004 +++ src/nvidia_ctl.c Sun Feb 22 13:07:25 2004 @@ -43,7 +43,12 @@ .d_ioctl = nvidia_ctl_ioctl, .d_poll = nvidia_ctl_poll, .d_name = "nvidiactl", +#if __FreeBSD_version < 502103 .d_maj = CDEV_MAJOR, .d_flags = D_TRACKCLOSE +#else + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT +#endif #endif }; %%% patch-src::nvidia_dev.c %%% --- src/nvidia_dev.c.orig Wed May 28 12:51:52 2003 +++ src/nvidia_dev.c Sun Feb 22 13:36:25 2004 @@ -45,7 +45,12 @@ .d_poll = nvidia_dev_poll, .d_mmap = nvidia_dev_mmap, .d_name = "nvidia", +#if __FreeBSD_version < 502103 .d_maj = CDEV_MAJOR, .d_flags = D_MEM|D_TRACKCLOSE +#else + .d_version = D_VERSION, + .d_flags = D_MEM|D_TRACKCLOSE|D_NEEDGIANT +#endif #endif }; >Release-Note: >Audit-Trail: >Unformatted: