svn commit: r324337 - head/x11/nvidia-driver

[Alexey Dokuchaev]

Author: danfe
Date: Wed Aug  7 09:35:04 2013
New Revision: 324337
URL: http://svnweb.freebsd.org/changeset/ports/324337

Log:
  - Update NVidia driver to the latest LTS stable version, 319.32
  - Only offer FREEBSD_AGP option when it is actually supported
  - Use new syntax for specifying LIB_DEPENDS
  - Buffer overflow in nvidia_sysctl_bus_type() was fixed in 319.23

Modified:
  head/x11/nvidia-driver/Makefile
  head/x11/nvidia-driver/distinfo

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed Aug  7 08:41:51 2013	(r324336)
+++ head/x11/nvidia-driver/Makefile	Wed Aug  7 09:35:04 2013	(r324337)
@@ -11,9 +11,9 @@
 # or `x11/nvidia-driver-304' slave ports.
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	310.44
+DISTVERSION?=	319.32
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION
@@ -70,13 +70,17 @@ EXTRA_PATCHES+=	${FILESDIR}/security-pat
 EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-4225
 .endif
 
-OPTIONS_DEFINE=	FREEBSD_AGP ACPI_PM LINUX DOCS
+OPTIONS_DEFINE=	ACPI_PM LINUX DOCS
 OPTIONS_DEFAULT=	LINUX
 
-FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
 ACPI_PM_DESC=		ACPI Power Management support
 LINUX_DESC=		Linux compatibility support
 
+.if ${NVVERSION} < 3101400
+OPTIONS_DEFINE+=	FREEBSD_AGP
+FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
+.endif
+
 .if ${NVVERSION} >= 1952200
 OPTIONS_DEFINE+=	WBINVD
 WBINVD_DESC=		Flush CPU caches directly with WBINVD
@@ -103,7 +107,7 @@ IGNORE=		requires fairly recent FreeBSD-
 
 .if ${NVVERSION} < 1952200
 # ABI version is hardcoded inside the binary, so better be explicit here
-LIB_DEPENDS=	m.3:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libm.so.3:${PORTSDIR}/misc/compat5x
 .endif
 
 post-patch: .SILENT
@@ -145,10 +149,12 @@ post-patch: .SILENT
 		${WRKSRC}/src/nvidia_subr.c
 .endif
 # Fix stack buffer overflow in nvidia_sysctl_bus_type()
+.if ${NVVERSION} < 3192300
 	${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \
 		s/sprintf\(bus_type, (".+")/return SYSCTL_OUT(req, \1, sizeof(\1)/ ; \
 		/return SYSCTL_OUT\(req, bus_type/d' \
 			${WRKSRC}/src/nvidia_sysctl.c
+.endif
 # Process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \

Modified: head/x11/nvidia-driver/distinfo
==============================================================================
--- head/x11/nvidia-driver/distinfo	Wed Aug  7 08:41:51 2013	(r324336)
+++ head/x11/nvidia-driver/distinfo	Wed Aug  7 09:35:04 2013	(r324337)
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
-SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
-SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
-SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
+SHA256 (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = d434055e1c11e5d091054531049d2fcaecdc4856756ce5998fe70130c542426f
+SIZE (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = 34441850
+SHA256 (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 7aa65881e014a001a2b19b17f3ff8a510c306062466cdf1acb1a4c993466487e
+SIZE (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 34048762
 SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
 SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
 SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d