Replace ee with kilo editor; Change plist construction to group /var

with /etc; Create a set of targets for `update` tarballs without
/etc or /var

Makefile

@@ -19,20 +19,21 @@ dirs          += sys
 ifeq ($(arch),x86_64)
 dirs          += lib64
 endif
-alldirs       += $(dirs)
+basedirs      += $(dirs)
-alldirs       += bin
+basedirs      += bin
-alldirs       += boot
+basedirs      += boot
+basedirs      += home
+basedirs      += lib
+basedirs      += media
+basedirs      += mnt
+basedirs      += opt
+basedirs      += root
+basedirs      += sbin
+basedirs      += srv
+basedirs      += tmp
+basedirs      += usr
+alldirs       += $(basedirs)
 alldirs       += etc
-alldirs       += home
-alldirs       += lib
-alldirs       += media
-alldirs       += mnt
-alldirs       += opt
-alldirs       += root
-alldirs       += sbin
-alldirs       += srv
-alldirs       += tmp
-alldirs       += usr
 alldirs       += var
 
 all: buildworld
@@ -123,6 +124,12 @@ rootfs-tbz: rootfs-hhl-$(os_version)-$(arch).tbz
 
 rootfs-txz: rootfs-hhl-$(os_version)-$(arch).txz
 
+rootfs-updte-tgz: rootfs-hhl-update-$(os_version)-$(arch).tgz
+
+rootfs-updte-tbz: rootfs-hhl-update-$(os_version)-$(arch).tbz
+
+rootfs-updte-txz: rootfs-hhl-update-$(os_version)-$(arch).txz
+
 .PHONY: rootfs-tgz rootfs-tbz rootfs-txz
 
 toolchain-hhl-$(os_version)-$(arch).tgz: $(tooldir)/.built smalltools
@@ -134,6 +141,9 @@ toolchain-hhl-$(os_version)-$(arch).tbz: $(tooldir)/.built smalltools
 toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools
 	cd build && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch)
 
+rootfs-hhl-update-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
+	cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(basedirs)
+
 rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
 	cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(alldirs)
 
@@ -143,6 +153,15 @@ rootfs-hhl-$(os_version)-$(arch).tbz: $(plists) $(build)/.stripped
 rootfs-hhl-$(os_version)-$(arch).txz: $(plists) $(build)/.stripped
 	cd $(build) && paxtar -M uidgid -cJf $(basedir)/$@ $(alldirs)
 
+rootfs-hhl-update-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
+	cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(basedirs)
+
+rootfs-hhl-update-$(os_version)-$(arch).tbz: $(plists) $(build)/.stripped
+	cd $(build) && paxtar -M uidgid -cjf $(basedir)/$@ $(basedirs)
+
+rootfs-hhl-update-$(os_version)-$(arch).txz: $(plists) $(build)/.stripped
+	cd $(build) && paxtar -M uidgid -cJf $(basedir)/$@ $(basedirs)
+
 remove-toolchain:
 	$(MAKE) -C toolchain remove
 

include/mk/create-plist.mk

@@ -21,15 +21,12 @@ srv    \
 sys    \
 sys    \
 tmp    \
-usr    \
+usr
-var
 
 install: ${pkgdbdir}/plist ${pkgdbdir}/etc.plist
 
 ${pkgdbdir}/plist:
 	if [ ! -d ${pkgdbdir} ] ; then install -d ${pkgdbdir} ; fi
-	find usr/src -name '.built' -exec rm -rf {} + || true
-	find usr/src -name '.installed' -exec rm -rf {} + || true
 	find ${dirs} -type f | while read f ; \
 		do echo file\|$$(stat -c %n\|%a\|root:root $${f})\|$$(file -b -e elf $${f}) ; \
 	done > $@.in
@@ -43,10 +40,10 @@ ${pkgdbdir}/plist:
 
 ${pkgdbdir}/etc.plist:
 	if [ ! -d ${pkgdbdir} ] ; then install -d ${pkgdbdir} ; fi
-	find etc -type f | while read f ; \
+	find etc var -type f | while read f ; \
 		do echo file\|$$(stat -c %n\|%a\|root:root $${f})\|$$(file -b -e elf $${f}) ; \
 	done > $@.in
-	find etc -type d | while read d ; \
+	find etc var -type d | while read d ; \
 		do echo directory\|$$(stat -c %n\|%a\|root:root $${d}) ; \
 	done >> $@.in
 	mv -v $@.in $@

world/usr.bin/README

@@ -21,11 +21,6 @@ Imported from ubase(suckless):
 Imported from heirloom:
 	factor,od,pg,sum
 
-Awk is "The One True Awk", descended from NewAwk (nawk)
-
-This version of the ee editor taken from the official sources plus
-	patches inspired by those in NetBSD pkgsrc
-
 This version of less taken from the official sources and adapted
 	for the hhl build tree
 

world/usr.bin/ee/Changes

@@ -1,46 +0,0 @@
-HitchHiker Linux import (06/2020)
-- Imported patches via PKGSRC build to clean up and build against NetBSD
-  curses
-- Build stripped down to essential functions - builds ee binary in place
-  in /usr/bin
-
-version 1.5.0 (2/16/2009)
-- added display of line number, column, and lines from top to separator line 
-  for info window
-- minor changes to reduce number of warnings when using -pedantic option
-
-version 1.4.7 (2/10/2009)
-- changed how strings are terminated from the old usage of NULL to the current 
-  use of character zero, '\0'
-- changed the licensing since the Artistic License is now considered 
-  restrictive
-
-version 1.4.6
-- modified new_curse.c to handle different subdirectory naming in terminfo 
-  directory; first noted on Mac OS 10.2
-
-version 1.4.5a (12/23/2001)
-- modified get_options to be cleaner for arg handling
-
-version 1.4.5 (12/15/2001)
-- made changes to check usage of arguments provided so that if a file is
-  specified options are no longer accepted (that is, they are treated as file
-  names)
-- changed to use ee_version.h to allow changing version number without need
-  to change ee.c directly
-
-version 1.4.4 (8/17/2001)
-- added code to check if the parent process has died, and if so to exit 
-  gracefully
-
-version 1.4.3 (6/25/2001)
-- modified create.make and new_curse.c to allow defining TERMCAP file 
-  location (since some distributions move the file)
-- source directory now has version number attached to directory name
-
-version 1.4.2 (1/19/2001)
-- change to create.make script to add unistd.h to files to search for 
-  select() declaration
-- change to new_curse.c for proper raw mode operation
-
-

world/usr.bin/ee/README

@@ -1,119 +0,0 @@
-Copyright (c) 2009, Hugh Mahon
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-The editor 'ee' (easy editor) is intended to be a simple, easy to use 
-terminal-based screen oriented editor that requires no instruction to 
-use.  Its primary use would be for people who are new to computers, or who 
-use computers only for things like e-mail.
-
-ee's simplified interface is highlighted by the use of pop-up menus which 
-make it possible for users to carry out tasks without the need to 
-remember commands.  An information window at the top of the screen shows 
-the user the operations available with control-keys.
-
-ee allows users to use full eight-bit characters.  If the host system has 
-the capabilities, ee can use message catalogs, which would allow users to 
-translate the message catalog into other languages which use eight-bit 
-characters.  See the file ee.i18n.guide for more details.
-
-ee relies on the virtual memory abilities of the platform it is running on 
-and does not have its own memory management capabilities.
-
-I am releasing ee because I hate to see new users and non-computer types 
-get frustrated by vi, and would like to see more intuitive interfaces for 
-basic tools (both character-based and graphical) become more pervasive.
-Terminal capabilities and communication speeds have evolved considerably 
-since the time in which vi's interface was created, allowing much more 
-intuitive interfaces to be used.  Since character-based I/O won't be 
-completely replaced by graphical user interfaces for at least a few more 
-years, I'd like to do what I can to make using computers with less 
-glamorous interfaces as easy to use as possible.  If terminal interfaces 
-are still used in ten years, I hope neophytes won't still be stuck with 
-only vi.
-
-For a text editor to be easy to use requires a certain set of abilities.  In 
-order for ee to work, a terminal must have the ability to position the cursor 
-on the screen, and should have arrow keys that send unique sequences 
-(multiple characters, the first character is an "escape", octal code 
-'\033').  All of this information needs to be in a database called "terminfo" 
-(System V implementations) or "termcap" (usually used for BSD systems).  In 
-case the arrow keys do not transmit unique sequences, motion operations are 
-mapped to control keys as well, but this at least partially defeats the 
-purpose.  The curses package is used to handle the I/O which deals with the 
-terminal's capabilities.  
-
-While ee is based on curses, I have included here the source code to 
-new_curse, a subset of curses developed for use with ee.  'curses' often  
-will have a defect that reduces the usefulness of the editor relying upon 
-it.  
-
-The file new_curse.c contains a subset of 'curses', a package for 
-applications to use to handle screen output.  Unfortunately, curses 
-varies from system to system, so I developed new_curse to provide 
-consistent behavior across systems.  It works on both SystemV and BSD 
-systems, and while it can sometimes be slower than other curses packages, 
-it will get the information on the screen painted correctly more often 
-than vendor supplied curses.  Unless problems occur during the building 
-of ee, it is recommended that you use new_curse rather than the curses 
-supplied with your system.
-
-If you experience problems with data being displayed improperly, check 
-your terminal configuration, especially if you're using a terminal 
-emulator, and make sure that you are using the right terminfo entry 
-before rummaging through code.  Terminfo entries often contain 
-inaccuracies, or incomplete information, or may not totally match the 
-terminal or emulator the terminal information is being used with.  
-Complaints that ee isn't working quite right often end up being something 
-else (like the terminal emulator being used).  
-
-Both ee and new_curse were developed using K&R C (also known as "classic 
-C"), but it can also be compiled with ANSI C.  You should be able to 
-build ee by simply typing "make".  A make file which takes into account 
-the characteristics of your system will be created, and then ee will be 
-built.  If there are problems encountered, you will be notified about 
-them. 
-
-ee is the result of several conflicting design goals.  While I know that it 
-solves the problems of some users, I also have no doubt that some will decry 
-its lack of more features.  I will settle for knowing that ee does fulfill 
-the needs of a minority (but still large number) of users.  The goals of ee 
-are: 
-
-        1. To be so easy to use as to require no instruction.
-        2. To be easy to compile and, if necessary, port to new platforms 
-           by people with relatively little knowledge of C and UNIX.
-        3. To have a minimum number of files to be dealt with, for compile 
-           and installation.
-        4. To have enough functionality to be useful to a large number of 
-           people.
-
-Hugh Mahon              |___|     
-hugh4242@yahoo.com      |   |     
-                            |\  /|
-                            | \/ |
-

world/usr.bin/ee/man/ee.1

@@ -1,543 +0,0 @@
-.\"
-.\"
-.\"  To format this reference page, use the command:
-.\"
-.\"    nroff -man ee.1
-.\"
-.\"  $Header: /home/hugh/sources/old_ae/RCS/ee.1,v 1.22 2001/12/16 04:49:27 hugh Exp $
-.\"
-.\"
-.TH ee 1 "" "" "" ""
-.SH NAME
-ee \- easy editor
-.SH SYNOPSIS
-.nf
-ee [-e] [-i] [-h] [+#] [\fIfile\fR ...]
-ree [-e] [-i] [-h] [+#] [\fIfile\fR ...]
-.ta
-.fi
-.ad b
-.SH DESCRIPTION
-The command 
-.I ee 
-is a simple screen oriented text editor.  It is always in text insertion 
-mode unless there is a prompt at the bottom of the terminal, or a 
-menu present (in a box in the middle of the terminal).  The command 
-.I ree 
-is the same as 
-.I ee, 
-but restricted to editing the named 
-file (no file operations, or shell escapes are allowed).
-.PP
-An editor with similar user-friendly qualities but more features is available 
-and is called 
-.I aee.
-.PP
-For 
-.I ee
-to work properly, the environment variable 
-.SM TERM 
-must be set to indicate the type of terminal being used.  For 
-example, for an 
-.SM HP 700/92 
-terminal, the 
-.SM TERM 
-variable should be set to "70092".  See your System Administrator if 
-you need more information.
-.\"
-.\"     options
-.\"
-.SS Options
-The following options are available from the command line:
-.PP
-.TP 4
-.B -e
-Turns off expansion of tab character to spaces.
-.TP 
-.B -i
-Turns off display of information window at top of terminal.
-.TP
-.B -h
-Turns off highlighting of borders of windows and menus (improves 
-performance on some terminals).
-.TP
-.B +#
-Moves the cursor to line '#' at startup.
-.br
-.\"
-.\"     control keys
-.\"
-.SS "Control keys"
-To do anything other than insert text, the user must use the control 
-keys (the 
-.B Control 
-key, represented by a "^",  pressed in conjunction with an 
-alphabetic key, e.g., ^a) and function keys available on the keyboard 
-(such as 
-.BR "Next Page" ", " "Prev Page" ,
-arrow keys, etc.).
-.PP
-Since not all terminals have function keys, 
-.I ee
-has the basic cursor movement functions assigned to control keys as 
-well as more intuitive keys on the keyboard when available.  For 
-instance, to move the cursor up, the user can use the up arrow key, 
-or 
-.BR ^u .
-.RS 4
-.nf
-.ta 1.4i
-.sp
-^a 	Prompt for the decimal value of a character to insert.
-^b 	Move to the bottom of the text.
-^c 	Get the prompt for a command.
-^d 	Move the cursor down.
-^e 	Prompt for the string to search for.
-^f 	Undelete the last deleted character.
-^g 	Move to the beginning of the line.
-^h 	Backspace.
-^i 	Tab.
-^j 	Insert a newline.
-^k 	Delete the character the cursor is sitting on.
-^l 	Move the cursor left.
-^m 	Insert a newline.
-^n 	Move to the next page.
-^o 	Move to the end of the line.
-^p 	Move to the previous page.
-^r 	Move the cursor to the right.
-^t 	Move to the top of the text.
-^u 	Move the cursor up.
-^v 	Undelete the last deleted word.
-^w 	Delete the word beginning at the cursor position.
-^x 	Search.
-^y 	Delete from the cursor position to the end of line.
-^z 	Undelete the last deleted line.
-^[ (ESC)	Pop up menu.
-.ta
-.fi
-.RE
-.sp
-.SS "EMACS keys mode"
-.PP
-Since many shells provide an Emacs mode (for cursor movement and other editing 
-operations), some bindings that may be more useful for people familiar with 
-those bindings have been provided.  These are accessible via the 
-.B settings 
-menu, or via the initialization file (see below).  The mappings are as follows:
-.RS
-.nf
-.ta 1.4i
-^a	Move to the beginning of the line.
-^b	Back 1 character.
-^c	Command prompt.
-^d	Delete character the cursor is sitting on.
-^e	End of line.
-^f	Forward 1 character.
-^g	Go back 1 page.
-^h	Backspace.
-^i	Tab.
-^j	Undelete last deleted character.
-^k	Delete line.
-^l	Undelete last deleted line.
-^m	Insert a newline.
-^n	Move to the next line.
-^o	Prompt for the decimal value of a character to insert.
-^p	Previous line.
-^r	Restore last deleted word.
-^t	Move to the top of the text.
-^u	Move to the bottom of the text.
-^v	Move to the next page.
-^w	Delete the word beginning at the cursor position.
-^y	Prompt for the string to search for.
-^z	Next word.
-^[ (ESC)	Pop up menu.
-.ta
-.fi
-.RE
-.sp
-.\"
-.\"     function keys
-.\"
-.SS "Function Keys"
-.RS 4
-.IP "\fBNext Page\fR"
-Move to the next page.
-.IP "\fBPrev Page\fR"
-Move to the previous page.
-.IP "\fBDelete Char\fR"
-Delete the character the cursor is on.
-.IP "\fBDelete Line\fR"
-Delete from the cursor to the end of line.
-.IP "\fBInsert line\fR"
-Insert a newline at the cursor position.
-.IP "\fBArrow keys\fR"
-Move the cursor in the direction indicated.
-.RE
-.\"
-.\"     commands
-.\"
-.SS Commands
-.PP
-Some operations require more information than a single keystroke can 
-provide.  For the most basic operations, there is a menu that can be 
-obtained by pressing the 
-.SM \fBESC\fR
-key.  The same operations, and more can be performed by obtaining the 
-command prompt (^c) and typing in one of the commands below.
-.RS 4
-.IP "!\fBcmd\fR"
-Execute \fBcmd\fR in a shell.
-.IP "\fB0-9\fR"
-Move to the line indicated.
-.IP "\fBcase\fR"
-Make searches case sensitive.
-.IP "\fBcharacter\fR"
-Display the ascii value of the character at the cursor.
-.IP "\fBexit\fR"
-Save the edited text, and leave the editor.
-.IP "\fBexpand\fR"
-Expand tabs to spaces.
-.IP "\fBfile\fR"
-Print the name of the file.
-.IP "\fBhelp\fR"
-Display help screen.
-.IP "\fBline\fR"
-Display the current line number.
-.IP "\fBnocase\fR
-Make searches insensitive to case (the default).
-.IP "\fBnoexpand\fR"
-Don't expand tab to spaces when the TAB key is pressed.
-.IP "\fBquit\fR"
-Leave the editor without saving changes.
-.IP "\fBread\fR \fIfile\fR"
-Read the named \fIfile\fR.
-.IP "\fBwrite\fR \fIfile\fR"
-Write the text to the named \fIfile\fR.
-.RE
-.\"
-.\"     menu operations
-.\"
-.SS "Menu Operations"
-.PP
-Pop-up menus can be obtained by pressing the 
-.B escape 
-key (or 
-.B ^[ 
-if no 
-.B escape 
-key is present).  When in the menu, the escape key can be 
-used to leave the menu without performing any operations.  Use the up and 
-down arrow keys, or 
-.B ^u
-for moving up and 
-.B ^d 
-for moving down to move to the desired items in the menu, then press 
-.B return 
-to perform the indicated task.
-.PP
-To the left of each menu item is a letter, which if the corresponding 
-letter is pressed on the keyboard selects that menu entry.
-.PP
-The main menu in \fIee\fR is as follows:
-.RS 4
-.IP "\fBleave editor\fR" 
-If changes have been made, the user will get a menu prompting whether or 
-not the changes should be saved.
-.IP "\fBhelp\fR"
-Displays a help screen, with all of the keyboard operations and commands.
-.IP "\fBfile operations\fR"
-Pops up a menu for selecting whether to read a file, write to a file, or 
-save the current contents of the editor, as well as send the contents of 
-the editor to a print command (see the section \fBInitializing ee from a 
-file\fR).
-.IP "\fBredraw screen\fR"
-Provides a means to repaint the screen if the screen has been corrupted.
-.IP "\fBsettings\fR"
-Shows the current values of the operating modes, and right margin.  By 
-pressing return when the cursor is on a particular item, the value can be 
-changed.  To leave this menu, press the \fBescape\fR key.  (See \fBModes\fR 
-below.)
-.IP "\fBsearch\fR"
-.br
-Pops up a menu in which the user may choose to enter a string to search 
-for, or search for a string already entered.
-.IP "\fBmiscellaneous\fR"
-Pops up a menu that allows the user to format the current paragraph, 
-execute a shell command, or check the spelling of the text in the editor.
-.RE
-.\"
-.\"     paragraph formatting
-.\"
-.SS "Paragraph Formatting"
-.PP
-Paragraphs are defined for \fIee\fR by a block of text bounded by:
-.sp 
-.RS 8
-.IP \(bu 
-Begin or end of file.
-.IP \(bu
-Line with no characters, or only spaces and/or tabs.
-.IP \(bu
-Line starting with a period ('.') or right angle bracket ('>').
-.RE
-.PP
-A paragraph may be formatted two ways:  explicitly by choosing the 
-\fBformat paragraph\fR menu item, or by setting \fIee\fR to automatically 
-format paragraphs.  The automatic mode may be set via a menu, or via the 
-initialization file.
-.PP
-There are three states for text operation in \fIee\fR: free-form, margins, 
-and automatic formatting.
-.PP
-"Free-form" is best used for things like programming.  There are no 
-restrictions on the length of lines, and no formatting takes place.
-.PP
-"Margins" allows the user to type in text without having to worry about going 
-beyond the right margin (the right margin may be set in the \fBsettings\fR 
-menu, the default is for the margin to be the right edge of the 
-terminal).  This is the mode that allows the \fBformat paragraph\fR menu 
-item to work.
-.PP
-"Automatic formatting" provides word-processor-like behavior.  The user 
-may type in text, while \fIee\fR will make sure the entire paragraph fits 
-within the width of the terminal every time the user inserts a space after 
-typing or deleting text.  Margin observation must also be enabled in order for 
-automatic formatting to occur.
-.\"
-.\"     modes
-.\"
-.SS Modes
-.PP
-Although ee is a 'modeless' editor (it is in text insertion mode all the 
-time), there are modes in some of the things it does.  These include:
-.RS 4
-.IP "\fBtab expansion\fR"
-Tabs may be inserted as a single tab character, or replaced with spaces.
-.IP "\fBcase sensitivity\fR"
-The search operation can be sensitive to whether characters are upper- or 
-lower-case, or ignore case completely.
-.IP "\fBmargins observed\fR"
-Lines can either be truncated at the right margin, or extend on forever.
-.IP "\fBauto paragraph formatting\fR"
-While typing in text, the editor can try to keep it looking reasonably well 
-within the width of the screen.
-.IP "\fBeightbit characters\fR"
-Toggles whether eight bit characters are displayed as their value in angle 
-brackets (e.g. "<220>") or as a character.
-.IP "\fBinfo window\fR"
-A window showing the keyboard operations that can be performed can be 
-displayed or not.
-.IP "\fBemacs keys\fR"
-Control keys may be given bindings similar to emacs, or not.
-.IP "\f16 bit characters\fR"
-Toggles whether sixteen bit characters are handled as one 16-bit quantities or 
-two 8-bit quantities.  This works primarily with the Chinese Big 5 code set.
-.RE
-.PP
-You may set these modes via the initialization file (see below), or with a 
-menu (see above).
-.\"
-.\"     spell checking
-.\"
-.SS "Spell Checking"
-.PP
-There are two ways to have the spelling in the text checked from \fIee\fR.  
-One is by the traditional \fIspell\fR(1) command, the other is with the 
-optional \fIispell\fR(1) command.
-.PP
-Using \fIspell\fR, the words that are not recognized will be placed at the top 
-of the file.  For the \fIispell\fR option, the file is written to disk, 
-then \fIispell\fR run on the file, and the file read back in once 
-\fIispell\fR has completed making changes to the file.
-.\"
-.\"     printing
-.\"
-.SS "Printing the contents of the editor"
-.PP
-The user may select a menu item which prints the contents of the editor.  
-.I ee
-pipes the text in the editor to the command specified by the 
-initialization command 
-.B printcommand
-(see the section 
-.B Initializing ee from a file 
-below).  The default is to send the contents to "lp".  
-.PP
-Whatever the user assigns to 
-.B printcommand 
-must take input from 
-standard input.  See your system administrator for more details.
-.\"
-.\"     shell operations
-.\"
-.SS "Shell operations"
-.PP
-Shell commands can be executed from within 
-.I ee 
-by selecting the 
-.B shell command 
-item in the 
-.B miscellaneous 
-menu, or by placing an exclamation mark ("!") before the command to 
-execute at the 
-.B command: 
-prompt.  Additionally, the user may direct the contents of the edit buffer 
-out to a shell operation (via a pipe) by using the left angle bracket 
-(">"), followed by a "!" and the shell command to execute.  The output of 
-a shell operation can also be directed into the edit buffer by using a 
-right angle bracket ("<") before the exclamation mark.  These can even be 
-used together to send output to a shell operation and read back the 
-results into the editor.  So, if the editor contained a list of words 
-to be sorted, they could be sorted by typing the following at the command 
-prompt:
-.RS 4
-.sp
-><!sort
-.sp
-.RE
-This would send the contents of the editor to be piped into the 
-.I sort 
-utility and the result would be placed into the edit buffer at the current 
-cursor location.  The old information would have to be deleted by the user.
-.\"
-.\"     initializing ee from a file
-.\"
-.SS "Initializing ee from a file"
-.PP
-Since different users have different preferences, \fIee\fR allows some 
-slight configurability.  There are three possible locations for an 
-initialization file for ee:  the file \fI/usr/local/lib/init.ee\fR, the 
-file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR 
-in the current directory (if different from the home 
-directory).  This allows system administrators to set some preferences for 
-the users on a system-wide basis (for example, the \fBprint\fR command), 
-and the user to customize settings for particular directories (like one 
-for correspondence, and a different directory for programming).
-.PP
-The file \fI\/usr/local/lib/init.ee\fR is read first, then 
-\fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the 
-most recent file read taking precedence.
-.PP
-The following items may be entered in the initialization file:
-.RS 4
-.IP \fBcase\fR
-Sets searches to be case sensitive.
-.IP \fBnocase\fR
-Sets searches to be insensitive to case (default).
-.IP \fBexpand\fR
-Causes \fIee\fR to expand tabs to spaces (default).
-.IP \fBnoexpand\fR 
-Causes \fIee\fR to insert tabs as a single character.
-.IP \fBinfo\fR
-A small information window is displayed at the top of the terminal 
-(default).
-.IP \fBnoinfo\fR
-Turns off the display of the information window.
-.IP \fBmargins\fR
-Causes \fIee\fR to truncate lines at the right margin when the 
-cursor passes beyond the right margin as set by the user 
-while text is being inserted 
-(default).
-.IP \fBnomargins\fR
-Allows lines to extend beyond the right margin.
-.IP \fBautoformat\fR
-Causes \fIee\fR to automatically try to format the current paragraph while 
-text insertion is occurring.
-.IP \fBnoautoformat\fR
-Turns off automatic paragraph formatting (default).
-.IP \fBprintcommand\fR
-Allows the setting of the print command (default: "lp").
-.IP \fBrightmargin\fR
-The user can select a value for the right margin (the first column on the 
-screen is zero).
-.IP \fBhighlight\fR
-Turns on highlighting border of information window and menus (default).
-.IP \fBnohighlight\fR
-Turns off highlighting of border of information window and menus.
-.IP \fBeightbit\fR
-Turns on display of eight bit characters.
-.IP \fBnoeightbit\fR
-Turns off display of eight bit characters (they are displayed as their decimal 
-value inside angle brackets, e.g., "<220>").
-.IP \fB16bit\fR
-Turns on handling of 16-bit characters.
-.IP \fbno16bit\fR
-Turns off handling of 16-bit characters.
-.IP \fBemacs\fR
-Turns on emacs key bindings.
-.IP \fBnoemacs\fR
-Turns off emacs key bindings.
-.RE
-.\"
-.\"     save editor configuration
-.\"
-.SS "Save Editor Configuration"
-.PP
-When using this entry from the 
-.B settings 
-menu, the user may choose to save the current configuration of 
-the editor (see \fBInitializing ee from a 
-file\fR above) to a file named 
-.I .init.ee 
-in the current directory or the user's home directory.  If a file named 
-.I .init.ee 
-already exists, it will be renamed 
-.IR .init.ee.old .
-.\"
-.\"     Caveats
-.\"
-.SH CAVEATS
-.PP
-THIS MATERIAL IS PROVIDED "AS IS".  THERE ARE 
-NO WARRANTIES OF ANY KIND WITH REGARD TO THIS 
-MATERIAL, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE.  Neither 
-Hewlett-Packard nor Hugh Mahon shall be liable 
-for errors contained herein, nor for 
-incidental or consequential damages in 
-connection with the furnishing, performance or 
-use of this material.  Neither Hewlett-Packard 
-nor Hugh Mahon assumes any responsibility for 
-the use or reliability of this software or 
-documentation.  This software and 
-documentation is totally UNSUPPORTED.  There 
-is no support contract available.  Hewlett-Packard 
-has done NO Quality Assurance on ANY 
-of the program or documentation.  You may find 
-the quality of the materials inferior to 
-supported materials. 
-.PP
-Always make a copy of files that cannot be easily reproduced before 
-editing.  Save files early, and save often.
-.SS "International Code Set Support"
-.I ee 
-supports single-byte character code sets (eight-bit clean), or the 
-Chinese Big-5 code set.  (Other multi-byte code sets may function, but the 
-reason Big-5 works is that a two-byte character also takes up two columns on 
-the screen.)
-.SH WARNINGS
-The automatic paragraph formatting operation 
-may be too slow for slower systems.
-.SH FILES
-.PP
-.I /usr/local/lib/init.ee
-.br
-.I $HOME/.init.ee
-.br
-.I .init.ee
-.SH AUTHOR
-.PP
-The software 
-.I ee
-was developed by Hugh Mahon.
-.PP
-This software and documentation contains 
-proprietary information which is protected by 
-copyright.  All rights are reserved. 
-.PP
-Copyright (c) 1990, 1991, 1992, 1993, 1995, 1996, 2001 Hugh Mahon.
-.SH "SEE ALSO"
-.PP
-termcap(4), terminfo(4), environ(5), spell(1), ispell(1), lp(1), aee(1)
-

world/usr.bin/ee/src/ee.msg

@@ -1,185 +0,0 @@
-$ This file contains the messages for ee ("easy editor").  See the file 
-$ ee.i18n.guide for more information
-$ 
-$ For ee patchlevel 3
-$ 
-$ $Header: /home/hugh/sources/old_ae/RCS/ee.msg,v 1.8 1996/11/30 03:23:40 hugh Exp $
-$ 
-$ 
-$set 1
-$quote "
-1 "modes menu"
-2 "tabs to spaces       " 
-3 "case sensitive search" 
-4 "margins observed     " 
-5 "auto-paragraph format" 
-6 "eightbit characters  " 
-7 "info window          " 
-8 "right margin         "
-9 "leave menu"
-10 "save changes"
-11 "no save"
-12 "file menu"
-13 "read a file"
-14 "write a file"
-15 "save file"
-16 "print editor contents"
-17 "search menu"
-18 "search for ..."
-19 "search"
-20 "spell menu"
-21 "use 'spell'"
-22 "use 'ispell'"
-23 "miscellaneous menu"
-24 "format paragraph"
-25 "shell command"
-26 "check spelling"
-27 "main menu"
-28 "leave editor"
-29 "help"
-30 "file operations"
-31 "redraw screen"
-32 "settings"
-33 "search"
-34 "miscellaneous"
-35 "Control keys:                                                              " 
-36 "^a ascii code           ^i tab                  ^r right                   "
-37 "^b bottom of text       ^j newline              ^t top of text             "
-38 "^c command              ^k delete char          ^u up                      "
-39 "^d down                 ^l left                 ^v undelete word           "
-40 "^e search prompt        ^m newline              ^w delete word             "
-41 "^f undelete char        ^n next page            ^x search                  "
-42 "^g begin of line        ^o end of line          ^y delete line             "
-43 "^h backspace            ^p prev page            ^z undelete line           "
-44 "^[ (escape) menu                                                           "
-45 "                                                                           "
-46 "Commands:                                                                  "
-47 "help    : get this info                 file    : print file name          "
-48 "read    : read a file                   char    : ascii code of char       "
-49 "write   : write a file                  case    : case sensitive search    "
-50 "exit    : leave and save                nocase  : case insensitive search  "
-51 "quit    : leave, no save                !cmd    : execute \"cmd\" in shell   "
-52 "line    : display line #                0-9     : go to line \"#\"           "
-53 "expand  : expand tabs                   noexpand: do not expand tabs         "
-54 "                                                                             "
-55 "  ee [+#] [-i] [-e] [-h] [file(s)]                                            "
-56 "+# :go to line #  -i :no info window  -e : don't expand tabs  -h :no highlight"
-57 "^[ (escape) menu  ^e search prompt  ^y delete line    ^u up     ^p prev page  "
-58 "^a ascii code     ^x search         ^z undelete line  ^d down   ^n next page  "
-59 "^b bottom of text ^g begin of line  ^w delete word    ^l left                 "
-60 "^t top of text    ^o end of line    ^v undelete word  ^r right                "
-61 "^c command        ^k delete char    ^f undelete char                          "
-62 "help : get help info  |file  : print file name         |line : print line # "
-63 "read : read a file    |char  : ascii code of char      |0-9 : go to line \"#\""
-64 "write: write a file   |case  : case sensitive search   |exit : leave and save "
-65 "!cmd : shell \"cmd\"    |nocase: ignore case in search   |quit : leave, no save"
-66 "expand: expand tabs   |noexpand: do not expand tabs                           "
-67 "    press Escape (^[) for menu"
-68 "no file"
-69 "ascii code: "
-70 "sending contents of buffer to \"%s\" "
-71 "command: "
-72 "name of file to write: "
-73 "name of file to read: "
-74 "character = %d"
-75 "unknown command \"%s\""
-76 "entered command is not unique"
-77 "line %d  "
-78 "length = %d"
-79 "current file is \"%s\" "
-80 "usage: %s [-i] [-e] [-h] [+line_number] [file(s)]\n"
-81 "       -i   turn off info window\n"
-82 "       -e   do not convert tabs to spaces\n"
-83 "       -h   do not use highlighting\n"
-84 "file \"%s\" is a directory"
-85 "new file \"%s\""
-86 "can't open \"%s\""
-87 "file \"%s\", %d lines"
-88 "finished reading file \"%s\""
-89 "reading file \"%s\""
-90 ", read only"
-91 "file \"%s\", %d lines"
-92 "enter name of file: "
-93 "no filename entered: file not saved"
-94 "changes have been made, are you sure? (y/n [n]) "
-95 "y"
-96 "file already exists, overwrite? (y/n) [n] "
-97 "unable to create file \"%s\""
-98 "writing file \"%s\""
-99 "\"%s\" %d lines, %d characters"
-100 "           ...searching"
-101 "string \"%s\" not found"
-102 "search for: "
-103 "could not exec %s\n"
-104 "press return to continue "
-105 "press Esc to cancel"
-106 "menu too large for window"
-107 "press any key to continue "
-108 "shell command: "
-109 "...formatting paragraph..."
-110 "<!echo 'list of unrecognized words'; echo -=-=-=-=-=-"
-111 "sending contents of edit buffer to 'spell'"
-112 "right margin is: "
-113 "restricted mode: unable to perform requested operation"
-114 "ON"
-115 "OFF"
-116 "HELP"
-117 "WRITE"
-118 "READ"
-119 "LINE"
-120 "FILE"
-121 "CHARACTER"
-122 "REDRAW"
-123 "RESEQUENCE"
-124 "AUTHOR"
-125 "VERSION"
-126 "CASE"
-127 "NOCASE"
-128 "EXPAND"
-129 "NOEXPAND"
-130 "EXIT"
-131 "QUIT"
-132 "INFO"
-133 "NOINFO"
-134 "MARGINS"
-135 "NOMARGINS"
-136 "AUTOFORMAT"
-137 "NOAUTOFORMAT"
-138 "ECHO"
-139 "PRINTCOMMAND"
-140 "RIGHTMARGIN"
-141 "HIGHLIGHT"
-142 "NOHIGHLIGHT"
-143 "EIGHTBIT"
-144 "NOEIGHTBIT"
-145 "emacs key bindings   "
-146 "^a beginning of line    ^i tab                  ^r restore word            "
-147 "^b back 1 char          ^j undel char           ^t top of text             "
-148 "^c command              ^k delete line          ^u bottom of text          "
-149 "^d delete char          ^l undelete line        ^v next page               "
-150 "^e end of line          ^m newline              ^w delete word             "
-151 "^f forward 1 char       ^n next line            ^x search                  "
-152 "^g go back 1 page       ^o ascii char insert    ^y search prompt           "
-153 "^h backspace            ^p prev line            ^z next word               "
-154 "^[ (escape) menu  ^y search prompt  ^k delete line   ^p prev li   ^g prev page"
-155 "^o ascii code     ^x search         ^l undelete line ^n next li   ^v next page"
-156 "^u end of file    ^a begin of line  ^w delete word   ^b back 1 char           "
-157 "^t top of text    ^e end of line    ^r restore word  ^f forward 1 char        "
-158 "^c command        ^d delete char    ^j undelete char ^z next word              "
-159 "EMACS"
-160 "NOEMACS"
-161 "       +#   put cursor at line #\n"
-162 "unable to open .init.ee for writing, no configuration saved!"
-163 "ee configuration saved in file %s"
-164 "save editor configuration"
-165 "save ee configuration"
-166 "save in current directory"
-167 "save in home directory"
-168 "ee configuration not saved"
-169 "must specify a file when invoking ree"
-180 "menu too large for window"
-181 "^^more^^"
-182 "VVmoreVV"
-183 "16 bit characters    "
-184 "16BIT"
-185 "NO16BIT"

world/usr.bin/ee/src/ee_version.h

@@ -1,6 +0,0 @@
-/*
- |	provide a version number for ee
- */
-
-#define EE_VERSION "1.5.2"
-#define DATE_STRING "$Date: 2010/06/04 02:35:35 $"

world/usr.bin/ee/src/genstr

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -x
-
-if [ $# -lt 2 ]
-then
-	echo usage $0 source_file dest_file 
-	exit 1
-fi
-
-trap 'rm -f /tmp/$$.out; exit 0' 0           # set up traps to clean up
-trap 'rm -f /tmp/$$.out; exit 1' 1 2 3 15    # on errors AND normal exit
-
-if [ -f $2 ]
-then
-	rm $2
-fi
-
-cat $1 | grep 'catgetlocal.*\"*\"' | 
-	sed -e 's/^.*catgetlocal(//' | 
-	sed -e 's/^[ 	]*//'	|
-	sed -e 's/, \"/ \"/'	|
-	sed -e 's/);//' > /tmp/$$.out
-
-cat > $2 <<EOF
-\$ 
-\$ 
-\$set 1
-\$quote "
-EOF
-
-sort -n < /tmp/$$.out >> $2

world/usr.bin/kilo/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

world/usr.bin/kilo/Makefile

@@ -1,7 +1,6 @@
 #  Makefile - hhl - /usr/src/world/ee
 #  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
 #
-progname = ee
+progname = kilo
 onestage = true
-libs     = -lcurses
 include hhl.cprog.mk