Bump revision since change affects run-time, not compile-time

4 files changed, 125 insertions, 20 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index c0d911ebd152..8fc9f620ec4f 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2003/01/16 15:52:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.24 2003/01/16 15:59:22 agriffis Exp $
+
+*screen-3.9.13-r4 (16 Jan 2003)
+
+  16 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r4.ebuild :
+  Revision bump since the last change affects run-time, not compile-time.
 
   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.
diff --git a/app-misc/screen/files/digest-screen-3.9.13-r4 b/app-misc/screen/files/digest-screen-3.9.13-r4
new file mode 100644
index 000000000000..f5ff73c21202
--- /dev/null
+++ b/app-misc/screen/files/digest-screen-3.9.13-r4
@@ -0,0 +1 @@
+MD5 5a02b4bcd4d7ed64d13da683e03093a9 screen-3.9.13.tar.gz 72803
diff --git a/app-misc/screen/screen-3.9.13-r3.ebuild b/app-misc/screen/screen-3.9.13-r3.ebuild
index ad3fe2931f04..02f79597145b 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.3 2003/01/16 15:52:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-3.9.13-r3.ebuild,v 1.4 2003/01/16 15:59:22 agriffis Exp $
 
 inherit flag-o-matic
 
@@ -44,24 +44,19 @@ 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)
-#	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"
+	# 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"
 
 	emake || die "Failed to compile"
 }
diff --git a/app-misc/screen/screen-3.9.13-r4.ebuild b/app-misc/screen/screen-3.9.13-r4.ebuild
new file mode 100644
index 000000000000..fa748afaec9e
--- /dev/null
+++ b/app-misc/screen/screen-3.9.13-r4.ebuild
@@ -0,0 +1,104 @@
+# 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-r4.ebuild,v 1.1 2003/01/16 15:59:22 agriffis Exp $
+
+inherit flag-o-matic
+
+IUSE="pam"
+DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${P}.tar.gz"
+HOMEPAGE="http://www.math.fu-berlin.de/~guckes/screen/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	pam? ( >=sys-libs/pam-0.75 )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	# Fix manpage.
+	mv doc/screen.1 doc/screen.1.orig
+	sed <doc/screen.1.orig >doc/screen.1 \
+		-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"
+}
+
+src_compile() {
+	local myconf
+
+	addpredict "`tty`"
+	addpredict "${SSH_TTY}"
+
+	# check config.h for other settings such as the 
+	# max-number of windows allowed by screen.
+	append-flags "-DPTYMODE=0620 -DPTYGROUP=5"
+	use pam && myconf="--enable-pam" && append-flags "-DUSE_PAM"
+
+	econf 	--with-socket-dir=/var/run/screen \
+		--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)
+#	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"
+}
+
+src_install () {
+	dobin screen
+	fperms 2755 /usr/bin/screen
+
+	dodir /var/run/screen
+	touch ${D}/var/run/screen/.keep
+
+	# can't use this cause fowners do not support multiple args.
+	# fowners root.utmp /{usr/bin,var/run}/screen
+	chown root.utmp ${D}/{usr/bin,var/run}/screen
+
+	insinto /usr/share/terminfo ; doins terminfo/screencap
+	insinto /usr/share/screen/utf8encodings ; doins utf8encodings/??
+	insopts -m 644 ; insinto /etc ; doins ${FILESDIR}/screenrc
+
+	use pam && { insinto /etc/pam.d ; newins ${FILESDIR}/screen.pam screen ; }
+
+	dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
+	doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+	doman doc/screen.1
+	doinfo doc/screen.info*
+}
+
+pkg_postinst() {
+	chmod 0775 /var/run/screen
+
+	einfo "Some dangerous key bindings have been removed or changed to more safe values."
+	einfo "For more info, please check /etc/screenrc"
+	echo
+	einfo "screen is not installed as setuid root, which effectively disables multi-user"
+	einfo "mode. To enable it, run:"
+	einfo ""
+	einfo "\tchmod u+s /usr/bin/screen"
+	einfo "\tchmod g-w /var/run/screen"
+}