Update ee(1) in the base system to version 1.5.0.

This version is now licensed under a 2-clause BSD license, instead of
the Artistic license. I've reverted a lot of local modifications we made
to ee, because they have been integrated upstream as well.

Only local modifications include:

- $FreeBSD$ ID.
- Pathname to init.ee.
- catopen() call, to honor LC_MESSAGES instead of LANG.

To keep SVN happy, I'm putting an application/octet-stream mime type on
the KOI8 translations.

Reviewed by:	current@

6 files changed, 9 insertions, 7 deletions

diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile
index 0a75b5f..554a737 100644
--- a/usr.bin/ee/Makefile
+++ b/usr.bin/ee/Makefile
@@ -2,8 +2,8 @@
 
 .PATH:	${.CURDIR}/../../contrib/ee
 
-CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
-	 -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR
+CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
+	 -DHAS_CTYPE -DHAS_SYS_WAIT
 
 PROG=	ee
 LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
@@ -11,6 +11,8 @@ MLINKS=	ee.1 ree.1 ee.1 edit.1
 DPADD=	${LIBNCURSES}
 LDADD=	-lncurses
 
+WARNS?=	2
+
 NLS=	en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
 	uk_UA.KOI8-U ru_RU.KOI8-R
 
diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
index 80a9961..73aa620 100644
--- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
@@ -110,7 +110,7 @@ $quote "
 100 "           ...Suche läuft"
 101 "Zeichenfolge \"%s\" nicht gefunden"
 102 "Suchen nach: "
-103 "Kann %s nicht ausführen"
+103 "Kann %s nicht ausführen\n"
 104 "Bitte die Eingabetaste drücken "
 105 "Escape zum Beenden"
 106 "Menü ist zu groß für das Fenster"
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index e93ff22..31bfe6e 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -110,7 +110,7 @@ $quote "
 100 "           ...recherche"
 101 "chaîne \"%s\" non trouvée"
 102 "rechercher : "
-103 "impossible d'exécuter %s"
+103 "impossible d'exécuter %s\n"
 104 "tapez entrée pour continuer "
 105 "pressez sur échap. pour annuler"
 106 "menu trop grand pour la fenêtre"
diff --git a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
index 3176f79..94a1eab 100644
--- a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
+++ b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
@@ -110,7 +110,7 @@ $quote "
 100 "           ...szukam"
 101 "napis \"%s\" nie zosta³ znaleziony"
 102 "szukaj: "
-103 "nie mo¿na wykonaæ %s"
+103 "nie mo¿na wykonaæ %s\n"
 104 "naci¶nij Enter ¿eby kontynuowaæ "
 105 "naci¶nij Esc ¿eby anulowaæ"
 106 "menu zbyt du¿e dla tego okna"
diff --git a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
index 99aa343..9067d29 100644
--- a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
+++ b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
@@ -112,7 +112,7 @@ $quote "
 100 "           ...ÉÄ£Ô ÐÏÉÓË"
 101 "ÐÏÄÓÔÒÏËÁ \"%s\" ÎÅ ÎÁÊÄÅÎÁ"
 102 "ÞÔÏ ÉÓËÁÔØ: "
-103 "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ %s"
+103 "ÎÅ ÍÏÇÕ ÚÁÐÕÓÔÉÔØ %s\n"
 104 "ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ Enter"
 105 "ÄÌÑ ÏÔÍÅÎÙ ÎÁÖÍÉÔÅ Esc"
 106 "ÓÌÉÛËÏÍ ÂÏÌØÛÏÅ ÍÅÎÀ - ÎÅ ÐÏÍÅÝÁÅÔÓÑ × ÜËÒÁÎ"
diff --git a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
index 1556d91..a9d7fcf 100644
--- a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
+++ b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
@@ -110,7 +110,7 @@ $quote "
 100 "           ...ÐÏÛÕË"
 101 "ÒÑÄÏË \"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
 102 "ÝÏ ÛÕËÁÔÉ: "
-103 "ÎÅ ÍÏÖÕ ×ÉËÏÎÁÔÉ %s"
+103 "ÎÅ ÍÏÖÕ ×ÉËÏÎÁÔÉ %s\n"
 104 "ÎÁÔÉÓΦÔØ <enter> ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ..."
 105 "Esc - צÄͦÎÁ"
 106 "ÍÅÎÀ ÚÁ×ÅÌÉËÅ ÄÌÑ ÅËÒÁÎÕ"