diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2003-01-16 15:52:21 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2003-01-16 15:52:21 +0000 |
| commit | 607b3b3c80b6652c1fe3b6435424b93f2514e2d3 (patch) | |
| tree | b7e3d4c726c02c9fe68ff14b6bea1baec310166c /app-misc | |
| parent | Added some extra info (diff) | |
| download | gentoo-2-607b3b3c80b6652c1fe3b6435424b93f2514e2d3.tar.gz gentoo-2-607b3b3c80b6652c1fe3b6435424b93f2514e2d3.tar.bz2 gentoo-2-607b3b3c80b6652c1fe3b6435424b93f2514e2d3.zip | |
Fix bug 12683 again
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/screen/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/screen/screen-3.9.13-r3.ebuild | 34 |
2 files changed, 23 insertions, 16 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 99216a06b440..c0d911ebd152 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/screen # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.22 2003/01/15 16:18:16 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.23 2003/01/16 15:52:21 agriffis Exp $ + + 16 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r3.ebuild : + Fix bug 12683 again. Last fix broke screen at run-time. 15 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r3.ebuild : Fixup term.h to fix bug 12683. Believe this is an upstream problem in diff --git a/app-misc/screen/screen-3.9.13-r3.ebuild b/app-misc/screen/screen-3.9.13-r3.ebuild index 034d0b7ce14f..ad3fe2931f04 100644 --- a/app-misc/screen/screen-3.9.13-r3.ebuild +++ b/app-misc/screen/screen-3.9.13-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-3.9.13-r3.ebuild,v 1.2 2003/01/15 16:18:16 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-3.9.13-r3.ebuild,v 1.3 2003/01/16 15:52:21 agriffis Exp $ inherit flag-o-matic @@ -44,20 +44,24 @@ src_compile() { --with-sys-screenrc=/etc/screenrc \ --enable-rxvt_osc ${myconf} - # Fix bug 12683 by fixing up term.h (remove dups and add missing). - # This is really an upstream problem in screen, I think. - # (15 Jan 2003 agriffis) - make term.h || die "Failed making term.h" - mv term.h term.h.old - awk '/^#define/ { if (defs[$2]) next; defs[$2] = $3 } - { print } - END { for (d in defs) { - if (d !~ /_C../) continue; - d2 = gensub(/C/, "", 1, d); - if (d2 in defs) continue; - print "#define " d2 " " defs[d] - } - }' term.h.old > term.h || die "Failed to fix term.h" +# # Fix bug 12683 by fixing up term.h (remove dups and add missing). +# # This is really an upstream problem in screen, I think. +# # (15 Jan 2003 agriffis) +# mv term.h term.h.old +# awk '/^#define/ { if (defs[$2]) next; defs[$2] = $3 } +# { print } +# END { for (d in defs) { +# if (d !~ /_C../) continue; +# d2 = gensub(/C/, "", 1, d); +# if (d2 in defs) continue; +# print "#define " d2 " " defs[d] +# } +# }' term.h.old > term.h || die "Failed to fix term.h" + + # Second try to fix bug 12683, this time without changing term.h + # The last try seemed to break screen at run-time. + # (16 Jan 2003 agriffis) + LC_ALL=POSIX make term.h || die "Failed making term.h" emake || die "Failed to compile" } |