adv_cmds: All but pkill compiling

diff --git a/.gitignore b/.gitignore
index df967b96a579e45a18b8251732d16804b2e56a55..54828a3063d05278ad78515eb43dd6f96180415b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 base
+*.o

diff --git a/adv_cmds/Makefile b/adv_cmds/Makefile
new file mode 100644 (file)
index 0000000..722516e
--- /dev/null
+++ b/adv_cmds/Makefile
@@ -0,0 +1,15 @@
+SUBDIR=        gencat \
+       lsvfs \
+       ps \
+       whois \
+       cap_mkdb \
+       last \
+       stty \
+       colldef \
+       locale \
+       mklocale \
+       tabs \
+       finger \
+       tty
+
+.include <bsd.subdir.mk>

diff --git a/adv_cmds/cap_mkdb/Makefile b/adv_cmds/cap_mkdb/Makefile
new file mode 100644 (file)
index 0000000..4beb70d
--- /dev/null
+++ b/adv_cmds/cap_mkdb/Makefile
@@ -0,0 +1,3 @@
+PROG=  cap_mkdb
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/colldef/Makefile b/adv_cmds/colldef/Makefile
new file mode 100644 (file)
index 0000000..fc11e68
--- /dev/null
+++ b/adv_cmds/colldef/Makefile
@@ -0,0 +1,9 @@
+PROG=  colldef
+SRCS=  parse.y \
+       scan.l
+
+LDADD+=-lfl
+
+CFLAGS+=-Ilocale
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/colldef/scan.l b/adv_cmds/colldef/scan.l
index ce14492646cc9d7624623a3fb0b25a54568e77c5..ee464f0539e3302b367db9a4ff8699024c5b8c18 100644 (file)
--- a/adv_cmds/colldef/scan.l
+++ b/adv_cmds/colldef/scan.l
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD: src/usr.bin/colldef/scan.l,v 1.19 2002/08/23 04:18:26 ache E
 #include <sys/types.h>
 #include "collate.h"
 #include "common.h"
-#include "y.tab.h"
+#include "parse.h"
 
 int line_no = 1, save_no, fromsubs;
 wchar_t buf0[BUFSIZE], *ptr;

diff --git a/adv_cmds/finger/Makefile b/adv_cmds/finger/Makefile
new file mode 100644 (file)
index 0000000..86b9d00
--- /dev/null
+++ b/adv_cmds/finger/Makefile
@@ -0,0 +1,8 @@
+PROG=  finger
+SRCS=  finger.c \
+       lprint.c \
+       net.c \
+       sprint.c \
+       util.c
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/gencat/Makefile b/adv_cmds/gencat/Makefile
new file mode 100644 (file)
index 0000000..c5df80c
--- /dev/null
+++ b/adv_cmds/gencat/Makefile
@@ -0,0 +1,5 @@
+PROG=  gencat
+SRCS=  gencat.c \
+       genlib.c
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/last/Makefile b/adv_cmds/last/Makefile
new file mode 100644 (file)
index 0000000..96e9737
--- /dev/null
+++ b/adv_cmds/last/Makefile
@@ -0,0 +1,3 @@
+PROG=  last
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/locale/Makefile b/adv_cmds/locale/Makefile
new file mode 100644 (file)
index 0000000..535355b
--- /dev/null
+++ b/adv_cmds/locale/Makefile
@@ -0,0 +1,3 @@
+PROG_CXX=      locale
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/lsvfs/Makefile b/adv_cmds/lsvfs/Makefile
new file mode 100644 (file)
index 0000000..70c8f64
--- /dev/null
+++ b/adv_cmds/lsvfs/Makefile
@@ -0,0 +1,3 @@
+PROG=  lsvfs
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/mklocale/Makefile b/adv_cmds/mklocale/Makefile
new file mode 100644 (file)
index 0000000..132ce00
--- /dev/null
+++ b/adv_cmds/mklocale/Makefile
@@ -0,0 +1,5 @@
+PROG=  mklocale
+SRCS=  lex.l \
+       yacc.y
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/mklocale/lex.l b/adv_cmds/mklocale/lex.l
index 9ffbacaa647fd28815e49a80ba3cb510de73d55e..0576f3b85f96f34862c83d94c9f9b05b0c733d11 100644 (file)
--- a/adv_cmds/mklocale/lex.l
+++ b/adv_cmds/mklocale/lex.l
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.9 2005/02/26 21:47:54 ru Exp
 #include <stdlib.h>
 
 #include "ldef.h"
-#include "y.tab.h"
+#include "yacc.h"
 #include "extern.h"
 %}
 

diff --git a/adv_cmds/ps/Makefile b/adv_cmds/ps/Makefile
new file mode 100644 (file)
index 0000000..606ddb7
--- /dev/null
+++ b/adv_cmds/ps/Makefile
@@ -0,0 +1,9 @@
+PROG=  ps
+SRCS=  fmt.c \
+       keyword.c \
+       nlist.c \
+       print.c \
+       ps.c \
+       tasks.c
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/stty/Makefile b/adv_cmds/stty/Makefile
new file mode 100644 (file)
index 0000000..ca4cb9f
--- /dev/null
+++ b/adv_cmds/stty/Makefile
@@ -0,0 +1,10 @@
+PROG=  stty
+SRCS=  cchar.c \
+       gfmt.c \
+       key.c \
+       modes.c \
+       print.c \
+       stty.c \
+       util.c
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/tabs/Makefile b/adv_cmds/tabs/Makefile
new file mode 100644 (file)
index 0000000..2d7391e
--- /dev/null
+++ b/adv_cmds/tabs/Makefile
@@ -0,0 +1,5 @@
+PROG=  tabs
+
+LDADD=-lncursesw
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/tty/Makefile b/adv_cmds/tty/Makefile
new file mode 100644 (file)
index 0000000..e0e4713
--- /dev/null
+++ b/adv_cmds/tty/Makefile
@@ -0,0 +1,3 @@
+PROG=  tty
+
+.include <bsd.prog.mk>

diff --git a/adv_cmds/whois/Makefile b/adv_cmds/whois/Makefile
new file mode 100644 (file)
index 0000000..cd1ebf7
--- /dev/null
+++ b/adv_cmds/whois/Makefile
@@ -0,0 +1,3 @@
+PROG=  whois
+
+.include <bsd.prog.mk>