diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2004-12-05 00:55:24 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2004-12-05 00:55:24 +0000 |
| commit | c658663247be35aefad380c32bf4c25953981552 (patch) | |
| tree | b5bf9841677dd293b0cd0586e7c6e94663a652b3 /app-misc/screen | |
| parent | removing 0.9.11 (Manifest recommit) (diff) | |
| download | gentoo-2-c658663247be35aefad380c32bf4c25953981552.tar.gz gentoo-2-c658663247be35aefad380c32bf4c25953981552.tar.bz2 gentoo-2-c658663247be35aefad380c32bf4c25953981552.zip | |
Added some more error checking. Some cosmetical rearrangements.
Diffstat (limited to 'app-misc/screen')
| -rw-r--r-- | app-misc/screen/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/screen/screen-4.0.2.ebuild | 30 |
2 files changed, 19 insertions, 16 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 03ec297dc2f2..db007c8f2cba 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/screen # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.77 2004/11/13 19:18:21 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.78 2004/12/05 00:55:24 swegener Exp $ + + 05 Dec 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild: + Added some more error checking. Some cosmetical rearrangements. 13 Nov 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild: Removed large comment section from ebuild. diff --git a/app-misc/screen/screen-4.0.2.ebuild b/app-misc/screen/screen-4.0.2.ebuild index 9192434014b3..11110e464790 100644 --- a/app-misc/screen/screen-4.0.2.ebuild +++ b/app-misc/screen/screen-4.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2.ebuild,v 1.21 2004/11/13 19:18:21 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2.ebuild,v 1.22 2004/12/05 00:55:24 swegener Exp $ inherit eutils flag-o-matic @@ -35,20 +35,19 @@ src_unpack() { # Fix manpage. sed -i \ - -e "s:/usr/local/etc/screenrc:/etc/screenrc:g; - s:/usr/local/screens:/var/run/screen:g; - s:/local/etc/screenrc:/etc/screenrc:g; - s:/etc/utmp:/var/run/utmp:g; - s:/local/screens/S-:/var/run/screen/S-:g" doc/screen.1 || \ - die "sed doc/screen.1 failed" + -e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \ + -e "s:/usr/local/screens:/var/run/screen:g" \ + -e "s:/local/etc/screenrc:/etc/screenrc:g" \ + -e "s:/etc/utmp:/var/run/utmp:g" \ + -e "s:/local/screens/S-:/var/run/screen/S-:g" \ + doc/screen.1 \ + || die "sed doc/screen.1 failed" # configure as delivered with screen is made with autoconf-2.5 - WANT_AUTOCONF=2.5 autoconf + WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" } src_compile() { - local myconf - addpredict "`tty`" addpredict "${SSH_TTY}" @@ -64,7 +63,8 @@ src_compile() { $(use_enable pam) \ --with-socket-dir=/var/run/screen \ --with-sys-screenrc=/etc/screenrc \ - --enable-rxvt_osc ${myconf} || die "econf failed" + --enable-rxvt_osc \ + || die "econf failed" # Second try to fix bug 12683, this time without changing term.h # The last try seemed to break screen at run-time. @@ -76,7 +76,7 @@ src_compile() { src_install() { dobin screen || die "dobin failed" - keepdir /var/run/screen + keepdir /var/run/screen || die "keepdir failed" fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed" fperms 2755 /usr/bin/screen || die "fperms failed" @@ -89,11 +89,11 @@ src_install() { use pam && { insinto /etc/pam.d - newins ${FILESDIR}/screen.pam.system-auth screen \ - || die "newins failed" + newins ${FILESDIR}/screen.pam.system-auth screen || die "newins failed" } - dodoc README ChangeLog INSTALL TODO NEWS* patchlevel.h \ + dodoc \ + README ChangeLog INSTALL TODO NEWS* patchlevel.h \ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \ || die "dodoc failed" |