Perform all trivial ports to utmpx for usr.bin/.

They were already converted to use libulog, so it's easy to convert them
to utmpx.

10 files changed, 8 insertions, 25 deletions

diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 5ecac6e..bdd41c6 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -16,7 +16,7 @@ CFLAGS+= -DINET6
 
 WARNS?=	0
 
-DPADD=	${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} ${LIBULOG}
-LDADD=	-lcursesw -lm -ldevstat -lkvm -lulog
+DPADD=	${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
+LDADD=	-lcursesw -lm -ldevstat -lkvm
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 742e2f7..1a02197 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -65,9 +65,8 @@ static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
 #include <unistd.h>
+#include <utmpx.h>
 #include <devstat.h>
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index 53274b9..3d6524b 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -3,7 +3,4 @@
 
 PROG=	users
 
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 8000c03..ccf8006 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -51,9 +51,8 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
 #include <unistd.h>
+#include <utmpx.h>
 
 typedef char   namebuf[MAXLOGNAME];
 
diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile
index 5f0230f..c5deb3b 100644
--- a/usr.bin/wall/Makefile
+++ b/usr.bin/wall/Makefile
@@ -6,7 +6,4 @@ SRCS=	ttymsg.c wall.c
 BINGRP=	tty
 BINMODE=2555
 
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 9bf8076..b92edd4 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -64,9 +64,8 @@ static const char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
 #include <unistd.h>
+#include <utmpx.h>
 
 #include "ttymsg.h"
 
diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile
index bec6fca..0478d73 100644
--- a/usr.bin/who/Makefile
+++ b/usr.bin/who/Makefile
@@ -3,7 +3,4 @@
 
 PROG=	who
 
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index bd8b68c..d6f38dd 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -44,9 +44,8 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 #include <timeconv.h>
-#define _ULOG_POSIX_NAMES
-#include <ulog.h>
 #include <unistd.h>
+#include <utmpx.h>
 
 static void	heading(void);
 static void	process_utmp(void);
@@ -109,7 +108,7 @@ main(int argc, char *argv[])
 		usage();
 
 	if (*argv != NULL) {
-		if (ulog_setutxfile(UTXI_TTY, *argv) != 0)
+		if (setutxdb(UTXDB_ACTIVE, *argv) != 0)
 			err(1, "%s", *argv);
 	}
 
diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile
index 31f102a..94345c4 100644
--- a/usr.bin/write/Makefile
+++ b/usr.bin/write/Makefile
@@ -5,7 +5,4 @@ PROG=	write
 BINMODE=2555
 BINGRP=	tty
 
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index ed57cb1..17f6775 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -62,9 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
 #include <unistd.h>
+#include <utmpx.h>
 
 void done(int);
 void do_write(char *, char *, uid_t);