From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 29 11:30:18 2006 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43FD916A415 for ; Fri, 29 Dec 2006 11:30:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2635713C468 for ; Fri, 29 Dec 2006 11:30:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBTBUIca011628 for ; Fri, 29 Dec 2006 11:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBTBUHoG011627; Fri, 29 Dec 2006 11:30:18 GMT (envelope-from gnats) Resent-Date: Fri, 29 Dec 2006 11:30:18 GMT Resent-Message-Id: <200612291130.kBTBUHoG011627@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, Eygene Ryabinkin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EEC0D16A40F for ; Fri, 29 Dec 2006 11:22:30 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from pobox.codelabs.ru (pobox.codelabs.ru [144.206.177.45]) by mx1.freebsd.org (Postfix) with ESMTP id A897113C441 for ; Fri, 29 Dec 2006 11:22:30 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from localdomain by pobox.codelabs.ru with local id 1H0EvD-0000yz-Ei; Fri, 29 Dec 2006 13:25:07 +0300 Message-Id: Date: Fri, 29 Dec 2006 13:25:07 +0300 From: Eygene Ryabinkin Sender: rea-fbsd@codelabs.ru To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: danfe@FreeBSD.org Subject: ports/107307: update of x11/nvidia-driver to 97.46 and Makefile fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Eygene Ryabinkin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Dec 2006 11:30:18 -0000 >Number: 107307 >Category: ports >Synopsis: update of x11/nvidia-driver to 97.46 and Makefile fixes >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: Fri Dec 29 11:30:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Eygene Ryabinkin >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: Code Labs >Environment: System: FreeBSD XXX 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #10: Fri Dec 8 14:49:46 MSK 2006 root@XXX:/usr/obj/usr/src/sys/XXX i386 >Description: [1] NVidia drivers for FreeBSS x86 versioned 97.46 were released at 21.10.2006. So FreeBSD port needs updating. [2] Additionally, when we use WITHOUT_LINUX knob one should pass that variable to slave make instances, because at least lib/Makefile uses it (we're adding the recognition of WITHOUT_LINUX in files/7667-patch-lib::Makefile). >How-To-Repeat: [1] http://www.nvidia.com/object/freebsd_1.0-9746.html [2] Define WITHOUT_LINUX and build the port. You will see complaints from 'find' about missing directories: ----- find: /compat/linux/lib: No such file or directory find: /compat/linux/usr/X11R6/lib: No such file or directory ----- >Fix: The patch is attached. It was tested on GeForce 6600: driver works fine. Glexcess produces good picture. Glean does all tests, though not all are passed. At least it does not crashes or produces any weird kernel messages ;)) pkg-plist was changed to assimilate chapter-10.html. May be there are other changes, though I've not catched them. --- to-9746.diff begins here --- diff -urN nvidia-driver.old/Makefile nvidia-driver/Makefile --- nvidia-driver.old/Makefile Fri Dec 29 11:30:02 2006 +++ nvidia-driver/Makefile Fri Dec 29 12:33:03 2006 @@ -24,6 +24,10 @@ INSTALLS_SHLIB= yes SUB_FILES+= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 +# Port makefiles are using WITHOUT_LINUX variable +.if defined(WITHOUT_LINUX) +MAKE_ENV+= WITHOUT_LINUX=yes +.endif OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ VM86_INT10CALL "Use VM86 interface for video BIOS calls" off \ @@ -64,7 +68,7 @@ NVVERSION= 7184 EXTRA_PATCHES+= ${FILESDIR}/6113-patch-lib::Makefile .else -NVVERSION= 9631 +NVVERSION= 9746 PORTREVISION= 1 EXTRA_PATCHES+= ${FILESDIR}/7667-* .endif @@ -120,7 +124,7 @@ ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif - ${REINPLACE_CMD} -E 's/(extension).*/\1/ ; /bin/d ; /man/d' \ + ${REINPLACE_CMD} -E 's/(lib).*/\1/ ; /bin/d ; /man/d' \ ${WRKSRC}/x11/Makefile post-install: diff -urN nvidia-driver.old/distinfo nvidia-driver/distinfo --- nvidia-driver.old/distinfo Fri Dec 29 11:30:02 2006 +++ nvidia-driver/distinfo Fri Dec 29 11:42:06 2006 @@ -1,6 +1,6 @@ MD5 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = ee5907345b9f25527c3ec41f5ac269e3 SHA256 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = f6de6961b540b852e79fb7aa5a95714a13c6984429968448432106d89493e02d SIZE (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = 8441698 -MD5 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = d560b1e7d5b0209da7aa32526cdda921 -SHA256 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550 -SIZE (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 9667093 +MD5 (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = d6dd2fad4f6e05980c2fbb591b06fb99 +SHA256 (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = cf8be89d537423c0acc294e57cb659dae94463f6347f63c32b1de39c8051a5a7 +SIZE (NVIDIA-FreeBSD-x86-1.0-9746.tar.gz) = 11152524 diff -urN nvidia-driver.old/pkg-plist nvidia-driver/pkg-plist --- nvidia-driver.old/pkg-plist Fri Dec 29 11:30:02 2006 +++ nvidia-driver/pkg-plist Fri Dec 29 12:16:23 2006 @@ -65,6 +65,7 @@ %%PORTDOCS%%%%DOCSDIR%%/html/chapter-07.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-08.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-09.html +%%PORTDOCS%%%%DOCSDIR%%/html/chapter-10.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/part-01.html %%PORTDOCS%%%%DOCSDIR%%/html/part-02.html --- to-9746.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: