summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index b39dc55130b6..56353dd8d79b 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.61 2004/06/19 23:12:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.62 2004/06/21 05:33:31 spyderous Exp $
+
+ 21 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.7.0-r1.ebuild:
+ Forgot to stop building xterm, somehow (#54051).
19 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index 5383a69c9f85..eeb71335aba7 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.14 2004/06/19 23:12:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.15 2004/06/21 05:33:31 spyderous Exp $
# This is a snapshot of the XORG-RELEASE-1 branch.
@@ -271,6 +271,9 @@ host_def_setup() {
echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \
>> config/cf/host.def
+ # Don't build xterm -- use external (#54051)
+ echo "#define BuildXterm NO" >> config/cf/host.def
+
# Xwrapper has been removed so we now need to use the set uid server
# again, this mustve happened somewhere after 4.3.0 in the development.
echo "#define InstallXserverSetUID YES" >> config/cf/host.def