fix binary installation

4 files changed, 72 insertions, 3 deletions

diff --git a/app-editors/vi/ChangeLog b/app-editors/vi/ChangeLog
index 8f2779dd0c80..5185e8ae5cba 100644
--- a/app-editors/vi/ChangeLog
+++ b/app-editors/vi/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-editors/vi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.15 2003/08/13 07:20:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.16 2003/08/20 15:17:36 agriffis Exp $
 
+*vi-3.7-r4 (20 Aug 2003)
+
+  20 Aug 2003; Aron Griffis <agriffis@gentoo.org> vi-3.7-r4.ebuild:
+  Fix this package to install the binary as /usr/bin/vi instead of /usr/bin/ex
 
 *vi-3.7-r3 (05 Sep 2002)
 
diff --git a/app-editors/vi/Manifest b/app-editors/vi/Manifest
index bb6e24cd9a9a..3fc7808d750f 100644
--- a/app-editors/vi/Manifest
+++ b/app-editors/vi/Manifest
@@ -1,7 +1,7 @@
 MD5 aea29e9ae414c4092290d585505a1b17 vi-3.7-r3.ebuild 1526
 MD5 d184ae0401873a7120f50c3afc10071d vi-3.7-r2.ebuild 1230
-MD5 4ddf6f36330aac7dfa061b71eae003a9 ChangeLog 2234
-MD5 d0dfa3009ea017f56663cb56972e03a2 vi-3.7-r4.ebuild 1809
+MD5 7aa4b2c1035e9e4ca287ba34d253f781 ChangeLog 2237
+MD5 43710dd58f8e7570ed81323dd2347a94 vi-3.7-r4.ebuild 1811
 MD5 ce4d692dfa7de2308c057231387e920c files/digest-vi-3.7-r2 61
 MD5 ce4d692dfa7de2308c057231387e920c files/digest-vi-3.7-r3 61
 MD5 ce4d692dfa7de2308c057231387e920c files/digest-vi-3.7-r4 61
diff --git a/app-editors/vi/files/digest-vi-3.7-r4 b/app-editors/vi/files/digest-vi-3.7-r4
new file mode 100644
index 000000000000..7e51cfd075bf
--- /dev/null
+++ b/app-editors/vi/files/digest-vi-3.7-r4
@@ -0,0 +1 @@
+MD5 544e5014f8fe8674ec3bcedd30815582 ex-020403.tar.gz 216587
diff --git a/app-editors/vi/vi-3.7-r4.ebuild b/app-editors/vi/vi-3.7-r4.ebuild
new file mode 100644
index 000000000000..060213072dc0
--- /dev/null
+++ b/app-editors/vi/vi-3.7-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r4.ebuild,v 1.1 2003/08/20 15:17:36 agriffis Exp $
+
+IUSE=""
+
+MY_P=ex-020403
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The original VI package"
+SRC_URI="http://download.berlios.de/ex-vi/${MY_P}.tar.gz"
+HOMEPAGE="http://ex-vi.berlios.de/"
+LICENSE="Caldera"
+SLOT="0"
+KEYWORDS="x86 ppc sparc arm mips alpha"
+
+# NOTE: vi needs /etc/termcap to function properly with TERM=linux.
+DEPEND="sys-libs/ncurses
+	sys-libs/libtermcap-compat"
+
+PROVIDE="virtual/editor"
+
+src_compile() {
+	addpredict /dev/ptys/*
+
+	# Do not use TERMLIB=ncurses, as it causes vi
+	# to segfault with TERM=linux.
+    # 
+	# WARN is set in the environment in /sbin/functions.sh
+	# (unfortunately generic variable name).  Need to reset on the
+	# make command-line to keep from breaking the build.
+	make DESTDIR=/usr \
+		TERMLIB=termlib \
+		PRESERVEDIR=/var/lib/expreserve \
+		RECOVER="-DEXRECOVER=\\\"/var/lib/exrecover\\\" \
+		         -DEXPRESERVE=\\\"/var/lib/expreserve\\\"" \
+		WARN='' \
+		|| die "failed compilation"
+}
+
+src_install() {
+	local l
+
+	dodir /usr/share/man
+	keepdir /var/lib/{exrecover,expreserve}
+	make INSTALL=/usr/bin/install \
+		DESTDIR=${D}/usr \
+		MANDIR=/share/man \
+		TERMLIB=termlib \
+		PRESERVEDIR=${D}/var/lib/expreserve \
+		RECOVER="-DEXRECOVER=\\\"/var/lib/exrecover\\\" \
+		         -DEXPRESERVE=\\\"/var/lib/expreserve\\\"" \
+		install || die
+
+	dodoc Changes LICENSE README TODO
+
+	# By default this installs as ex with symlinks pointing to ex.
+	# To reduce conflicts with other vi programs, change the master
+	# program to vi, then point the symlinks at it.
+	cd ${D}/usr/bin
+	rm vi
+	mv ex vi
+	for l in *; do [ -L $l ] && ln -sfn vi $l; done
+	ln -s vi ex
+}