aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2005-06-15 17:17:40 +0800
committerdanfe <danfe@FreeBSD.org>2005-06-15 17:17:40 +0800
commitc9c5b06d3d7fbe14cbe65c9ec84e62df5282aa28 (patch)
tree832531919d1dc175fc0e0fb773956a5321a77145 /x11
parentcb5582a230f84c0f5c9d155ab5dd67490dbb7037 (diff)
downloadfreebsd-ports-gnome-c9c5b06d3d7fbe14cbe65c9ec84e62df5282aa28.tar.gz
freebsd-ports-gnome-c9c5b06d3d7fbe14cbe65c9ec84e62df5282aa28.tar.zst
freebsd-ports-gnome-c9c5b06d3d7fbe14cbe65c9ec84e62df5282aa28.zip
Stop patching nvidia_subr.c when building version 7174 of driver, correct
locking is already there. Bump PORTREVISION. This should fix recursive panics reported on 5.4-STABLE. Reported by: green Submitted by: sam Reviewed by: alc, dfr
Diffstat (limited to 'x11')
-rw-r--r--x11/nvidia-driver/Makefile3
-rw-r--r--x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c (renamed from x11/nvidia-driver/files/patch-src::nvidia_subr.c)0
2 files changed, 2 insertions, 1 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 6dcb1bd3ea19..ba2f48c63fcc 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -39,10 +39,11 @@ OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \
.if ${OSVERSION} < 503000
NVVERSION= 6113
PORTREVISION= 4
-EXTRA_PATCHES+= ${FILESDIR}/6113-patch-src::nvidia_pci.c
+EXTRA_PATCHES+= ${FILESDIR}/6113-*
PLIST_SUB+= DIFFS="" DRVSO="@comment "
.else
NVVERSION= 7174
+PORTREVISION= 1
PLIST_SUB+= DIFFS="@comment " DRVSO=""
.endif
diff --git a/x11/nvidia-driver/files/patch-src::nvidia_subr.c b/x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c
index 7432e9861e6b..7432e9861e6b 100644
--- a/x11/nvidia-driver/files/patch-src::nvidia_subr.c
+++ b/x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c