ports/82554: [PATCH] x11/nvidia-driver: update to 1.0.7667

Sean Farley sean-freebsd at farley.org
Thu Jun 23 00:50:16 UTC 2005


>Number:         82554
>Category:       ports
>Synopsis:       [PATCH] x11/nvidia-driver: update to 1.0.7667
>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:   Thu Jun 23 00:50:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sean Farley
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 5.4-STABLE FreeBSD 5.4-STABLE #2: Fri Jun  3 08:54:24 CDT
>Description:
- Update to 1.0.7667
- Fixed assignment of PORTREVISION.  It needs to be set before including
  bsd.port.pre.mk.
- Disabled exit upon failure to kldunload and kldload of NVidia driver
  for 7667 driver.  This would break an upgrade of an earlier install.

Added file(s):
- files/6113-patch-lib::Makefile
- files/7667-patch-lib::Makefile
- files/7667-patch-scripts::setup.sh

Removed file(s):
- files/patch-lib::Makefile

Port maintainer (danfe at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- nvidia-driver-1.0.7667.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/Makefile /usr/ports/x11/nvidia-driver/Makefile
--- /usr/ports/x11/nvidia-driver.orig/Makefile	Fri Jun 17 17:59:28 2005
+++ /usr/ports/x11/nvidia-driver/Makefile	Wed Jun 22 19:23:12 2005
@@ -29,7 +29,14 @@
 		ACPI		"Enable support for ACPI Power Management" off \
 		LINUX		"Build with support for Linux compatibility" on
 
-.include <bsd.port.pre.mk>
+# Get __FreeBSD_version.  Needed to set PORTREVISION before include bsd.port.mk.
+.if !defined(OSVERSION)
+.if exists(/sbin/sysctl)
+OSVERSION!=	/sbin/sysctl -n kern.osreldate
+.else
+OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
+.endif
+.endif
 
 # Newer releases from NVidia do not play nicely with FreeBSD prior to 5.3.
 # While we support 4.x/5.2.1 releases, stick to 6113 version of driver for
@@ -39,13 +46,14 @@
 .if ${OSVERSION} < 503000
 NVVERSION=	6113
 PORTREVISION=	4
-EXTRA_PATCHES+=	${FILESDIR}/6113-*
 PLIST_SUB+=	DIFFS="" DRVSO="@comment "
 .else
-NVVERSION=	7174
-PORTREVISION=	1
+NVVERSION=	7667
 PLIST_SUB+=	DIFFS="@comment " DRVSO=""
 .endif
+EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
+
+.include <bsd.port.pre.mk>
 
 # XXX Should use ${PKG_INFO} XXX
 #
@@ -75,7 +83,7 @@
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
-.if ${NVVERSION} == 7174
+.if ${NVVERSION} == 7667
 	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
 .endif
 .if defined(WITH_FREEBSD_AGP)
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/distinfo /usr/ports/x11/nvidia-driver/distinfo
--- /usr/ports/x11/nvidia-driver.orig/distinfo	Wed May 11 03:52:36 2005
+++ /usr/ports/x11/nvidia-driver/distinfo	Wed Jun 22 19:23:12 2005
@@ -1,4 +1,4 @@
 MD5 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 1dab16b9ebf3ab4253811b6ba29fc701
 SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565
-MD5 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = b57a03e0325617092016144229ae6114
-SIZE (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 8433799
+MD5 (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = d65d0e882aea8055ed49bf20d8e8d781
+SIZE (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = 8438232
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/files/6113-patch-lib::Makefile /usr/ports/x11/nvidia-driver/files/6113-patch-lib::Makefile
--- /usr/ports/x11/nvidia-driver.orig/files/6113-patch-lib::Makefile	Wed Dec 31 18:00:00 1969
+++ /usr/ports/x11/nvidia-driver/files/6113-patch-lib::Makefile	Wed Jun 22 19:23:12 2005
@@ -0,0 +1,26 @@
+--- lib/Makefile.orig	Mon Aug 16 17:05:30 2004
++++ lib/Makefile	Mon Aug 16 17:07:47 2004
+@@ -1,13 +1,19 @@
+ SUBDIR= libGL		\
+ 	libnvidia-tls	\
+ 	libGLcore	\
+-	libXvMCNVIDIA	\
+-	compat
++	libXvMCNVIDIA
+ 
+-FIND_DIRS=	/usr/lib ${X11BASE}/lib \
+-		/compat/linux/lib \
++.if !defined(WITHOUT_LINUX)
++SUBDIR+=	compat
++.endif
++
++FIND_DIRS=	/usr/lib ${X11BASE}/lib
++
++.if !defined(WITHOUT_LINUX)
++FIND_DIRS+=	/compat/linux/lib \
+ 		/compat/linux/usr/lib \
+ 		/compat/linux/usr/X11R6/lib
++.endif
+ 
+ FIND_FILES!=(find ${FIND_DIRS} \
+ 		-name libGL.a\* -or \
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/files/7667-patch-lib::Makefile /usr/ports/x11/nvidia-driver/files/7667-patch-lib::Makefile
--- /usr/ports/x11/nvidia-driver.orig/files/7667-patch-lib::Makefile	Wed Dec 31 18:00:00 1969
+++ /usr/ports/x11/nvidia-driver/files/7667-patch-lib::Makefile	Wed Jun 22 19:23:12 2005
@@ -0,0 +1,11 @@
+--- lib/Makefile.orig	Fri Jun 17 09:44:23 2005
++++ lib/Makefile	Wed Jun 22 19:12:16 2005
+@@ -6,7 +6,7 @@
+ FIND_DIRS=	/usr/lib	\
+ 		${X11BASE}/lib
+ 
+-.if exists(/compat/linux)
++.if exists(/compat/linux) && !defined(WITHOUT_LINUX)
+ SUBDIR+=	compat
+ FIND_DIRS+=	/compat/linux/lib \
+ 		/compat/linux/usr/lib \
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/files/7667-patch-scripts::setup.sh /usr/ports/x11/nvidia-driver/files/7667-patch-scripts::setup.sh
--- /usr/ports/x11/nvidia-driver.orig/files/7667-patch-scripts::setup.sh	Wed Dec 31 18:00:00 1969
+++ /usr/ports/x11/nvidia-driver/files/7667-patch-scripts::setup.sh	Wed Jun 22 19:23:12 2005
@@ -0,0 +1,23 @@
+--- scripts/setup.sh.orig	Wed Jun 22 16:33:18 2005
++++ scripts/setup.sh	Wed Jun 22 19:18:06 2005
+@@ -4,16 +4,15 @@
+ if [ ${RESULT} -eq 0 ]; then
+ 	kldunload -n nvidia > /dev/null 2>&1; RESULT=$?
+ 	if [ ${RESULT} -ne 0 ]; then
+-		echo 'ERROR: Failed to unload the NVIDIA module!'
+-		echo 'ERROR: Is nvidia.ko in use?'
+-		exit 1;
++		echo 'NOTICE: Failed to unload the NVIDIA module!'
++		echo 'NOTICE: Is nvidia.ko in use?'
+ 	fi
+ fi
+ 
+ kldload nvidia > /dev/null 2>&1 ; RESULT=$?
+ if [ ${RESULT} -ne 0 ]; then
+-	echo 'ERROR: Failed to load the NVIDIA module!'
+-	exit 1;
++	echo 'NOTICE: Failed to load the NVIDIA module!'
++	echo 'NOTICE: Unload and load NVIDIA module manually or reboot.'
+ fi
+ 
+ grep nvidia_load /boot/loader.conf > /dev/null 2>&1; RESULT=$?
diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver.orig/files/patch-lib::Makefile /usr/ports/x11/nvidia-driver/files/patch-lib::Makefile
--- /usr/ports/x11/nvidia-driver.orig/files/patch-lib::Makefile	Fri Aug 27 04:24:05 2004
+++ /usr/ports/x11/nvidia-driver/files/patch-lib::Makefile	Wed Dec 31 18:00:00 1969
@@ -1,26 +0,0 @@
---- lib/Makefile.orig	Mon Aug 16 17:05:30 2004
-+++ lib/Makefile	Mon Aug 16 17:07:47 2004
-@@ -1,13 +1,19 @@
- SUBDIR= libGL		\
- 	libnvidia-tls	\
- 	libGLcore	\
--	libXvMCNVIDIA	\
--	compat
-+	libXvMCNVIDIA
- 
--FIND_DIRS=	/usr/lib ${X11BASE}/lib \
--		/compat/linux/lib \
-+.if !defined(WITHOUT_LINUX)
-+SUBDIR+=	compat
-+.endif
-+
-+FIND_DIRS=	/usr/lib ${X11BASE}/lib
-+
-+.if !defined(WITHOUT_LINUX)
-+FIND_DIRS+=	/compat/linux/lib \
- 		/compat/linux/usr/lib \
- 		/compat/linux/usr/X11R6/lib
-+.endif
- 
- FIND_FILES!=(find ${FIND_DIRS} \
- 		-name libGL.a\* -or \
--- nvidia-driver-1.0.7667.patch ends here ---

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



More information about the freebsd-ports-bugs mailing list