svn commit: r304131 - in head/x11/nvidia-driver: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Sep 12 05:04:20 2012
New Revision: 304131
URL: http://svn.freebsd.org/changeset/ports/304131

Log:
  Unbreak installation of legacy drivers.

Added:
  head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk   (contents, props changed)
Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed Sep 12 04:34:50 2012	(r304130)
+++ head/x11/nvidia-driver/Makefile	Wed Sep 12 05:04:20 2012	(r304131)
@@ -58,9 +58,13 @@ MASTER_SITE_SUBDIR=	freebsd/${DISTVERSIO
 ONLY_FOR_ARCHS=	i386
 .endif
 
+.if ${NVVERSION} <= 1904200
+EXTRA_PATCHES=	${FILESDIR}/legacy-patch-nvidia.lib.mk
+.endif
+
 # Fix recent arbitrary memory access vulnerability in legacy drivers
 .if ${NVVERSION} <= 1905300
-EXTRA_PATCHES=	${FILESDIR}/security-patch-CVE-2012-0946
+EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-0946
 .endif
 
 OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \

Added: head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk	Wed Sep 12 05:04:20 2012	(r304131)
@@ -0,0 +1,10 @@
+--- mk/nvidia.lib.mk.orig
++++ mk/nvidia.lib.mk
+@@ -17,6 +17,7 @@
+ 
+ install:
+ .if defined(SHLIB_NAME)
++	@mkdir -p ${DESTDIR}${LIBDIR}
+ 	@rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
+ 	@${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 		${NVIDIA_ROOT}/${OBJDIR}/${SHLIB_NAME} \