text_cmds: All done

37 files changed, 226 insertions, 27 deletions

diff --git a/text_cmds/Makefile b/text_cmds/Makefile
new file mode 100644
index 0000000..0303d46
--- /dev/null
+++ b/text_cmds/Makefile
@@ -0,0 +1,37 @@
+SUBDIR=	banner \
+	cat \
+	col \
+	colrm \
+	column \
+	comm \
+	csplit \
+	cut \
+	ed \
+	ee \
+	expand \
+	fmt \
+	fold \
+	grep \
+	head \
+	join \
+	lam \
+	look \
+	md5 \
+	nl \
+	paste \
+	pr \
+	rev \
+	rs \
+	sed \
+	sort \
+	split \
+	tail \
+	tr \
+	ul \
+	unexpand \
+	uniq \
+	unvis \
+	vis \
+	wc
+
+.include <bsd.subdir.mk>
diff --git a/text_cmds/banner/Makefile b/text_cmds/banner/Makefile
new file mode 100644
index 0000000..f3af9a6
--- /dev/null
+++ b/text_cmds/banner/Makefile
@@ -0,0 +1,4 @@
+PROG=	banner
+MAN=	banner.6
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/cat/Makefile b/text_cmds/cat/Makefile
new file mode 100644
index 0000000..934ccfa
--- /dev/null
+++ b/text_cmds/cat/Makefile
@@ -0,0 +1,5 @@
+PROG=	cat
+
+BINDIR=/bin
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/col/Makefile b/text_cmds/col/Makefile
new file mode 100644
index 0000000..33498e2
--- /dev/null
+++ b/text_cmds/col/Makefile
@@ -0,0 +1,3 @@
+PROG=	col
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/colrm/Makefile b/text_cmds/colrm/Makefile
new file mode 100644
index 0000000..0da3b5a
--- /dev/null
+++ b/text_cmds/colrm/Makefile
@@ -0,0 +1,3 @@
+PROG=	colrm
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/column/Makefile b/text_cmds/column/Makefile
new file mode 100644
index 0000000..b0b88c0
--- /dev/null
+++ b/text_cmds/column/Makefile
@@ -0,0 +1,3 @@
+PROG=	column
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/comm/Makefile b/text_cmds/comm/Makefile
new file mode 100644
index 0000000..8bfa67f
--- /dev/null
+++ b/text_cmds/comm/Makefile
@@ -0,0 +1,3 @@
+PROG=	comm
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/csplit/Makefile b/text_cmds/csplit/Makefile
new file mode 100644
index 0000000..b4c7ed9
--- /dev/null
+++ b/text_cmds/csplit/Makefile
@@ -0,0 +1,3 @@
+PROG=	csplit
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/cut/Makefile b/text_cmds/cut/Makefile
new file mode 100644
index 0000000..3f243c6
--- /dev/null
+++ b/text_cmds/cut/Makefile
@@ -0,0 +1,3 @@
+PROG=	cut
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/ed/Makefile b/text_cmds/ed/Makefile
new file mode 100644
index 0000000..c374a39
--- /dev/null
+++ b/text_cmds/ed/Makefile
@@ -0,0 +1,7 @@
+PROG=	ed
+SRCS=	buf.c cbc.c glbl.c io.c \
+	main.c re.c sub.c undo.c
+
+BINDIR=/bin
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/ee/Makefile b/text_cmds/ee/Makefile
index a6525ea..c870b40 100644
--- a/text_cmds/ee/Makefile
+++ b/text_cmds/ee/Makefile
@@ -1,29 +1,11 @@
-# This is the make file for ee, the "easy editor".
-#
-# A file called 'make.local' will be generated which will contain information 
-# specific to the local system, such as if it is a BSD or System V based 
-# version of UNIX, whether or not it has catgets, or select.  
-#
-# The "install" target ("make install") will copy the ee binary to 
-# the /usr/local/bin directory on the local system.  The man page (ee.1) 
-# will be copied into the /usr/local/man/man1 directory.
-#
-# The "clean" target ("make clean") will remove the ee and new_curse.o 
-# object files, and the ee binary.
-#
+# $FreeBSD$
 
-all :	localmake buildee
+CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
+	 -DHAS_SYS_WAIT
 
-buildee :	
-	make -f make.local
-
-localmake:
-	@./create.make
-
-install :
-	cp ee /usr/local/bin/ee
-	cp ee.1 /usr/local/man/man1/ee.1
-
-clean :
-	rm -f ee.o new_curse.o ee 
+PROG=	ee
+LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
+MLINKS=	ee.1 ree.1 ee.1 edit.1
+LDADD+=-lncursesw
 
+.include <bsd.prog.mk>
diff --git a/text_cmds/expand/Makefile b/text_cmds/expand/Makefile
new file mode 100644
index 0000000..bba5bd3
--- /dev/null
+++ b/text_cmds/expand/Makefile
@@ -0,0 +1,4 @@
+PROG=	expand
+MLINKS=	expand.1 unexpand.1
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/fmt/Makefile b/text_cmds/fmt/Makefile
new file mode 100644
index 0000000..48f96db
--- /dev/null
+++ b/text_cmds/fmt/Makefile
@@ -0,0 +1,3 @@
+PROG=	fmt
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/fold/Makefile b/text_cmds/fold/Makefile
new file mode 100644
index 0000000..278a34e
--- /dev/null
+++ b/text_cmds/fold/Makefile
@@ -0,0 +1,3 @@
+PROG=	fold
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/grep/Makefile b/text_cmds/grep/Makefile
new file mode 100644
index 0000000..a54da9f
--- /dev/null
+++ b/text_cmds/grep/Makefile
@@ -0,0 +1,21 @@
+#	$NetBSD: Makefile,v 1.4 2011/02/16 01:31:33 joerg Exp $
+#	$FreeBSD$
+#	$OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
+
+PROG=	grep
+
+SRCS=	file.c grep.c queue.c util.c
+
+LINKS+=		${BINDIR}/grep ${BINDIR}/egrep \
+		${BINDIR}/grep ${BINDIR}/fgrep \
+		${BINDIR}/grep ${BINDIR}/rgrep \
+
+MLINKS+=	grep.1 egrep.1 \
+		grep.1 fgrep.1 \
+		grep.1 rgrep.1
+
+CFLAGS+=-DWITHOUT_FASTMATCH
+
+LDADD+=-llzma -lbz2 -lz
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/head/Makefile b/text_cmds/head/Makefile
new file mode 100644
index 0000000..5ea0c9a
--- /dev/null
+++ b/text_cmds/head/Makefile
@@ -0,0 +1,3 @@
+PROG=	head
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/join/Makefile b/text_cmds/join/Makefile
new file mode 100644
index 0000000..42b5f58
--- /dev/null
+++ b/text_cmds/join/Makefile
@@ -0,0 +1,3 @@
+PROG=	join
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/lam/Makefile b/text_cmds/lam/Makefile
new file mode 100644
index 0000000..e47ea0a
--- /dev/null
+++ b/text_cmds/lam/Makefile
@@ -0,0 +1,3 @@
+PROG=	lam
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/look/Makefile b/text_cmds/look/Makefile
new file mode 100644
index 0000000..e1331bf
--- /dev/null
+++ b/text_cmds/look/Makefile
@@ -0,0 +1,3 @@
+PROG=	look
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/md5/Makefile b/text_cmds/md5/Makefile
new file mode 100644
index 0000000..c152154
--- /dev/null
+++ b/text_cmds/md5/Makefile
@@ -0,0 +1,28 @@
+PROG=	md5
+SRCS=	md5.c commoncrypto.c
+
+LINKS=	${BINDIR}/md5 ${BINDIR}/rmd160 \
+	${BINDIR}/md5 ${BINDIR}/sha1 \
+	${BINDIR}/md5 ${BINDIR}/sha224 \
+	${BINDIR}/md5 ${BINDIR}/sha256 \
+	${BINDIR}/md5 ${BINDIR}/sha384 \
+	${BINDIR}/md5 ${BINDIR}/sha512 \
+	${BINDIR}/md5 ${BINDIR}/sha512t256 \
+	${BINDIR}/md5 ${BINDIR}/skein256 \
+	${BINDIR}/md5 ${BINDIR}/skein512 \
+	${BINDIR}/md5 ${BINDIR}/skein1024
+
+MLINKS=	md5.1 rmd160.1 \
+	md5.1 sha1.1 \
+	md5.1 sha224.1 \
+	md5.1 sha256.1 \
+	md5.1 sha384.1 \
+	md5.1 sha512.1 \
+	md5.1 sha512t256.1 \
+	md5.1 skein256.1 \
+	md5.1 skein512.1 \
+	md5.1 skein1024.1
+
+BINDIR=/sbin
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/nl/Makefile b/text_cmds/nl/Makefile
new file mode 100644
index 0000000..66a1483
--- /dev/null
+++ b/text_cmds/nl/Makefile
@@ -0,0 +1,3 @@
+PROG=	nl
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/paste/Makefile b/text_cmds/paste/Makefile
new file mode 100644
index 0000000..e4f9e6d
--- /dev/null
+++ b/text_cmds/paste/Makefile
@@ -0,0 +1,3 @@
+PROG=	paste
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/pr/Makefile b/text_cmds/pr/Makefile
new file mode 100644
index 0000000..5213e2d
--- /dev/null
+++ b/text_cmds/pr/Makefile
@@ -0,0 +1,4 @@
+PROG=	pr
+SRCS=	egetopt.c pr.c
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/rev/Makefile b/text_cmds/rev/Makefile
new file mode 100644
index 0000000..92540c1
--- /dev/null
+++ b/text_cmds/rev/Makefile
@@ -0,0 +1,3 @@
+PROG=	rev
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/rs/Makefile b/text_cmds/rs/Makefile
new file mode 100644
index 0000000..db1ea14
--- /dev/null
+++ b/text_cmds/rs/Makefile
@@ -0,0 +1,3 @@
+PROG=	rs
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/sed/Makefile b/text_cmds/sed/Makefile
new file mode 100644
index 0000000..e818030
--- /dev/null
+++ b/text_cmds/sed/Makefile
@@ -0,0 +1,7 @@
+PROG=	sed
+SRCS=	compile.c \
+main.c \
+misc.c \
+process.c
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/sort/Makefile b/text_cmds/sort/Makefile
new file mode 100644
index 0000000..64c9ff0
--- /dev/null
+++ b/text_cmds/sort/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PROG=	sort
+
+SRCS=	bwstring.c coll.c commoncrypto.c file.c \
+	mem.c radixsort.c sort.c vsort.c
+
+sort.1: sort.1.in
+	sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}
+
+CLEANFILES+= sort.1
+
+CFLAGS+= -DSORT_THREADS
+MAN_SUB+= -e 's|%%THREADS%%||g'
+
+# Current text_cmds version
+CFLAGS+=-DSORT_VERSION=\"106\"
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/sort/coll.h b/text_cmds/sort/coll.h
index 6e3f9b4..d74460e 100644
--- a/text_cmds/sort/coll.h
+++ b/text_cmds/sort/coll.h
@@ -91,7 +91,7 @@ struct key_value
 {
 	struct bwstring		*k; /* key string */
 	struct key_hint		 hint[0]; /* key sort hint */
-} __packed;
+};
 
 /*
  * Set of keys container object.
diff --git a/text_cmds/split/Makefile b/text_cmds/split/Makefile
new file mode 100644
index 0000000..27270a0
--- /dev/null
+++ b/text_cmds/split/Makefile
@@ -0,0 +1,3 @@
+PROG=	split
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/tail/Makefile b/text_cmds/tail/Makefile
new file mode 100644
index 0000000..bd285e9
--- /dev/null
+++ b/text_cmds/tail/Makefile
@@ -0,0 +1,4 @@
+PROG=	tail
+SRCS=	forward.c misc.c read.c reverse.c tail.c
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/tr/Makefile b/text_cmds/tr/Makefile
new file mode 100644
index 0000000..86980fa
--- /dev/null
+++ b/text_cmds/tr/Makefile
@@ -0,0 +1,4 @@
+PROG=	tr
+SRCS=	cmap.c cset.c str.c tr.c
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/ul/Makefile b/text_cmds/ul/Makefile
new file mode 100644
index 0000000..cf193c3
--- /dev/null
+++ b/text_cmds/ul/Makefile
@@ -0,0 +1,5 @@
+PROG=	ul
+
+LDADD+=-lncursesw
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/unexpand/Makefile b/text_cmds/unexpand/Makefile
new file mode 100644
index 0000000..0d06c9f
--- /dev/null
+++ b/text_cmds/unexpand/Makefile
@@ -0,0 +1,4 @@
+PROG=	unexpand
+MAN=	
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/uniq/Makefile b/text_cmds/uniq/Makefile
new file mode 100644
index 0000000..a62780c
--- /dev/null
+++ b/text_cmds/uniq/Makefile
@@ -0,0 +1,3 @@
+PROG=	uniq
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/unvis/Makefile b/text_cmds/unvis/Makefile
new file mode 100644
index 0000000..cf3c0cb
--- /dev/null
+++ b/text_cmds/unvis/Makefile
@@ -0,0 +1,3 @@
+PROG=	unvis
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/vis/Makefile b/text_cmds/vis/Makefile
new file mode 100644
index 0000000..424b508
--- /dev/null
+++ b/text_cmds/vis/Makefile
@@ -0,0 +1,4 @@
+PROG=	vis
+SRCS=	foldit.c vis.c
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/wc/Makefile b/text_cmds/wc/Makefile
new file mode 100644
index 0000000..4506a3f
--- /dev/null
+++ b/text_cmds/wc/Makefile
@@ -0,0 +1,3 @@
+PROG=	wc
+
+.include <bsd.prog.mk>