diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2009-11-06 14:36:52 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2009-11-06 14:36:52 +0000 |
| commit | 694a666f026bf13d7f25b4f1d8c59045c6becbe0 (patch) | |
| tree | 8ebcdfd7601649b6578d750ef77359795b17df46 /x11-drivers | |
| parent | Fix for the null pointer exception in pipe_rdwr_open (CVE-2009-3547). fsnotif... (diff) | |
| download | gentoo-2-694a666f026bf13d7f25b4f1d8c59045c6becbe0.tar.gz gentoo-2-694a666f026bf13d7f25b4f1d8c59045c6becbe0.tar.bz2 gentoo-2-694a666f026bf13d7f25b4f1d8c59045c6becbe0.zip | |
add NV_X11_DRV and NV_X11_EXT to deal with different location of files on FreeBSD
(Portage version: 2.1.7.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild | 10 |
2 files changed, 13 insertions, 4 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/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 || \ |