summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-12-26 19:47:24 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-12-26 19:47:24 +0000
commit828669b15d25ce88aa251a4bf7cc0383530dd603 (patch)
treeec54e5c7393533c2db509967512809042e21e430
parentbug 200508 fixed; thanks to A.Stirling M.Marte T.Kost (diff)
downloadgentoo-2-828669b15d25ce88aa251a4bf7cc0383530dd603.tar.gz
gentoo-2-828669b15d25ce88aa251a4bf7cc0383530dd603.tar.bz2
gentoo-2-828669b15d25ce88aa251a4bf7cc0383530dd603.zip
fix patch to nvidia-xconfig on FreeBSD. bug #199761
(Portage version: 2.1.4_rc11)
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog6
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild8
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild8
3 files changed, 17 insertions, 5 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 8f5039b03a4f..c5ef1e55847d 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.76 2007/12/21 20:34:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.77 2007/12/26 19:47:24 cardoe Exp $
+
+ 26 Dec 2007; Doug Klima <cardoe@gentoo.org>
+ nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
+ fix patch to nvidia-xconfig on FreeBSD. bug #199761
21 Dec 2007; Doug Klima <cardoe@gentoo.org>
-nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild:
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild
index 4f7b4d79cdb9..cb4f764937c4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild,v 1.9 2007/12/21 20:14:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild,v 1.10 2007/12/26 19:47:24 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -278,7 +278,11 @@ src_install() {
fi
# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
- dobin usr/bin/nvidia-xconfig || die
+ if use xf86-fbsd; then
+ dobin obj/nvidia-xconfig || die
+ else
+ dobin usr/bin/nvidia-xconfig || die
+ fi
}
# Install nvidia library:
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild
index 628c65028c5f..8ff2dc542398 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild,v 1.2 2007/12/21 20:14:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild,v 1.3 2007/12/26 19:47:24 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -278,7 +278,11 @@ src_install() {
fi
# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
- dobin usr/bin/nvidia-xconfig || die
+ if use xf86-fbsd; then
+ dobin obj/nvidia-xconfig || die
+ else
+ dobin usr/bin/nvidia-xconfig || die
+ fi
}
# Install nvidia library: