add NV_X11_DRV and NV_X11_EXT to deal with different location of files on FreeBSD

Package-Manager: portage-2.1.7.3/cvs/Linux x86_64

3 files changed, 18 insertions, 9 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 347e87a33b67..41c0069b7805 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.196 2009/11/03 16:36:45 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.197 2009/11/06 14:36:52 cardoe Exp $
+
+  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-190.42-r2.ebuild:
+  add NV_X11_DRV and NV_X11_EXT to deal with different location of files on
+  FreeBSD
 
   03 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
   nvidia-drivers-190.42-r2.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 8762deb88887..c5c6b93f539b 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -35,16 +35,16 @@ EBUILD nvidia-drivers-173.14.20.ebuild 14932 RMD160 fc466fc4d664e3ba028c916f83c4
 EBUILD nvidia-drivers-180.60.ebuild 16498 RMD160 350d810e70913d1c29ce527efc18b5cfc79fac10 SHA1 6d28f663441d64fa47b41d63bdf5f46616cb71ef SHA256 a4b527c2831e37d969abaafcc5af7ca5742a298560612ffb3581b1099f16b45b
 EBUILD nvidia-drivers-185.18.36-r1.ebuild 16288 RMD160 18eae7b4dc22ab5c1dd05d9b3d56832ca4b855eb SHA1 54af90a1af63003e0dc8be86b13f37308cbbb2a7 SHA256 49b183d595319696dc51ed805603b5be8d58f76ec795a1f4cfdb3048f870bb0e
 EBUILD nvidia-drivers-185.18.36.ebuild 16618 RMD160 485fcb2bcb54c50677c4876c580799c1245ead8a SHA1 542093c2f97fb0dcc17a5150b3dbe6392dfd0f5d SHA256 ff22712974def26c094959503a8d206e225faf457f91704f587ff72d7661fa53
-EBUILD nvidia-drivers-190.42-r2.ebuild 15552 RMD160 a1f45e24773875e8137892bff7aefc4a18ff0d98 SHA1 5ec172b08c66e2df9d6d54609853deb8dfc03217 SHA256 12ab5ab20645ab235ab34150d970533ad20d2a2cbb59659c71c2dfd6df39e7aa
+EBUILD nvidia-drivers-190.42-r2.ebuild 15660 RMD160 7f29ee6ab980b505fa6f905b103db319caa3ce66 SHA1 341ba0641a909ec9b277472f1a7d527f591cc9ba SHA256 6de69f744ffd6baa4f2ac2fe129e6a044b5eb828547a06a51d4f412a2d9172d3
 EBUILD nvidia-drivers-71.86.09.ebuild 14141 RMD160 2e5f2187b9ed1e187c911ef14d695cbbb57fbb5b SHA1 4c39f467cc23265efebcf021ae5af8a0e5c4bb84 SHA256 87084b0ce8a5ba967bfa73eeaf7fff2ba6e47eb063a723d7486e8643d80cc07a
 EBUILD nvidia-drivers-71.86.11.ebuild 14143 RMD160 82d24dc392482f0c9e9f0c79f03207bbe33b95f2 SHA1 9b71d5f0558bf5b6cb286c703ce1ab6bb1561a83 SHA256 f6ed960f992cef05c6e1ecc9c2f5f6c878a22d24018a5a4c2b16f15fad04f423
 EBUILD nvidia-drivers-96.43.13.ebuild 14468 RMD160 4c0bbeb1f06cb7df7900d2d2d5ac08703345f548 SHA1 375a2babdcd5ace77ac4b436b6591cf9a1a2f66a SHA256 28ad4cf84b0f6e2f9c8b5aa274c90747bfaff6d91a1778e2d6109a3de668e6d3
-MISC ChangeLog 44923 RMD160 991fda679cab48588998efc86632fa5f88173b59 SHA1 ec7dd3e54f3a0211bca3673dce3863a59367f8c2 SHA256 e99beb1b2189435583ce3206d18c32294809cd870aed42d630832018078747a1
+MISC ChangeLog 45095 RMD160 ce3c06ce8e108996d037308e85aaef5795d3a83c SHA1 1c5ef6462852344a36128a33100631965025fc7e SHA256 25b2c253dc866313b2721152912cd4f06478d211f5653fd5e02c83ba20d9cc07
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrwXCcACgkQoeSe8B0zEfybYwCeIx7beS3ZZ74Ofw8UJh9LFecr
-EHUAnjHd6iYWtqQzWnVs10Totrxr4P0d
-=kS31
+iEYEARECAAYFAkr0NJQACgkQoeSe8B0zEfxdSQCffGoNN2+YkERc9IfaXotZo1NM
+57IAn27fVhWKxzSBppFFL9H2wD9vhy1z
+=7LuF
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
index c93bbb07b508..bbdb8a5d1ec7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.5 2009/11/03 16:36:45 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.6 2009/11/06 14:36:52 cardoe Exp $
 
 EAPI="2"
 
@@ -200,6 +200,8 @@ pkg_setup() {
 		NV_SRC="${S}/src"
 		NV_MAN="${S}/x11/man"
 		NV_X11="${S}/obj"
+		NV_X11_DRV="${NV_X11}"
+		NV_X11_EXT="${NV_X11}"
 		NV_SOVER=1
 	elif use kernel_linux; then
 		NV_DOC="${S}/usr/share/doc"
@@ -208,6 +210,8 @@ pkg_setup() {
 		NV_SRC="${S}/usr/src/nv"
 		NV_MAN="${S}/usr/share/man/man1"
 		NV_X11="${S}/usr/X11R6/lib"
+		NV_X11_DRV="${NV_X11}/modules/drivers"
+		NV_X11_EXT="${NV_X11}/modules/extensions"
 		NV_SOVER=${PV}
 	else
 		die "Could not determine proper NVIDIA package"
@@ -303,11 +307,11 @@ src_install() {
 
 	# Xorg DDX driver
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11}/modules/drivers/nvidia_drv.so || die "failed to install nvidia_drv.so"
+	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
 
 	# Xorg GLX driver
 	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11}/modules/extensions/libglx.so.${NV_SOVER} || \
+	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
 		die "failed to install libglx.so"
 	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
 		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \