ports/84969: Update port: x11/nvidia-driver (do not install nvidia-settings)

[Jean-Yves Lefort]

>Number:         84969
>Category:       ports
>Synopsis:       Update port: x11/nvidia-driver (do not install nvidia-settings)
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 15 21:50:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Wed Jul 27 11:27:58 CEST 2005 jylefort at jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
Do not install nvidia-settings, since it conflicts with
x11/nvidia-settings. Moreover, the provided binary is linked against
old GLib/GTK+ versions, and will not work on recent systems.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11/nvidia-driver/Makefile nvidia-driver/Makefile
--- /usr/ports/x11/nvidia-driver/Makefile	Tue Aug  2 19:37:55 2005
+++ nvidia-driver/Makefile	Mon Aug 15 23:34:32 2005
@@ -77,12 +77,14 @@
 PLIST_SUB+=	DIFFS="" DRVSO="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
 .else
+EXTRA_PATCHES+=	${FILESDIR}/7xxx-*
 .if defined(WITH_LEGACY_GPU_SUPPORT)
 NVVERSION=	7174
-PORTREVISION=	1
+PORTREVISION=	2
 EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
 NVVERSION=	7667
+PORTREVISION=	1
 EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
 .endif
 PLIST_SUB+=	DIFFS="@comment " DRVSO=""
diff -ruN /usr/ports/x11/nvidia-driver/files/7xxx-patch-x11_bin_Makefile nvidia-driver/files/7xxx-patch-x11_bin_Makefile
--- /usr/ports/x11/nvidia-driver/files/7xxx-patch-x11_bin_Makefile	Thu Jan  1 01:00:00 1970
+++ nvidia-driver/files/7xxx-patch-x11_bin_Makefile	Mon Aug 15 23:32:21 2005
@@ -0,0 +1,11 @@
+--- x11/bin/Makefile.orig	Mon Aug 15 23:31:28 2005
++++ x11/bin/Makefile	Mon Aug 15 23:31:41 2005
+@@ -4,8 +4,5 @@
+ BINDIR=	${X11BASE}/bin
+ 
+ install:
+-	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+-		${NVIDIA_ROOT}/obj/nvidia-settings \
+-		${DESTDIR}${BINDIR}
+ 
+ .include <bsd.prog.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: