ports/130976: [PATCH] Upgrade x11/nvidia-driver* to latest

[Garrett Cooper]

>Number:         130976
>Category:       ports
>Synopsis:       [PATCH] Upgrade x11/nvidia-driver* to latest
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 25 09:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        8-CURRENT
>Organization:
n/a
>Environment:
FreeBSD orangebox.gateway.2wire.net 8.0-CURRENT FreeBSD 8.0-CURRENT #6: Mon Jan 12 21:37:37 PST 2009     gcooper at orangebox.gateway.2wire.net:/usr/obj/usr/src/sys/ORANGEBOX  i386
>Description:
This is an upgrade of nvidia-driver to the latest stable upstream copy.

Combined with the new Xorg, I've seen a performance increase with the new driver, where it no longer consumes as many CPU cycles as it used to under certain circumstances; my method of testing was compiling a few apps in ports or doing make buildworld -- it used to eat up ~100% CPU on just displaying the text in a XFCE4's Terminal app.

One thing to note is that the logic in the plist and the Makefile are duplicated in areas -- hence that's why I had to modify both.

Please hand over to danfe@ to review and commit.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.86
diff -r1.86 Makefile
9c9
< DISTVERSION?=	177.80
---
> DISTVERSION?=	180.22
123,124c123,127
< 	@${MV} -f ${PREFIX}/${MODULESDIR}/libwfb.so \
< 		${PREFIX}/${MODULESDIR}/XXX-libwfb.so.%%.${XSERVVERSION}
---
> 	@XORG_OLD_FILE="${PREFIX}/${MODULESDIR}/libwfb.so"; \
> 	if test -f "$$XORG_OLD_FILE"; then \
> 		${MV} -f "$$XORG_OLD_FILE" \
> 		    ${PREFIX}/${MODULESDIR}/XXX-libwfb.so.%%.${XSERVVERSION}; \
> 	fi
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/nvidia-driver/pkg-plist,v
retrieving revision 1.22
diff -r1.22 pkg-plist
38,39c38,39
< @exec mv -f %D/%%MODULESDIR%%/libwfb.so %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so
< @unexec mv -f %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/libwfb.so
---
> @exec export XORG_OLD_FILE="%D/%%MODULESDIR%%/libwfb.so"; test -f "$XORG_OLD_FILE" && mv -f "$XORG_OLD_FILE" "%D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%" && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so
> @unexec export XORG_NEW_FILE="%D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%%"; test -f "$XORG_NEW_FILE" && mv -f "$XORG_NEW_FILE" %D/%%MODULESDIR%%/libwfb.so


>Release-Note:
>Audit-Trail:
>Unformatted: