From 006ab5b3e71ad64133e4cbb87c32551d935055b2 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 13 Jan 2010 18:28:58 +0000
Subject: [PATCH] Port all apps in libexec/ from libulog to utmpx.

---
 libexec/rpc.rusersd/Makefile      | 4 ++--
 libexec/rpc.rusersd/rusers_proc.c | 3 +--
 libexec/talkd/Makefile            | 4 ----
 libexec/talkd/process.c           | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 18918944d9de..6305343ff9f9 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -4,8 +4,8 @@ PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
 MAN =	rpc.rusersd.8
 
-DPADD=	${LIBRPCSVC} ${LIBULOG} ${LIBUTIL}
-LDADD=	-lrpcsvc -lulog -lutil
+DPADD=	${LIBRPCSVC} ${LIBUTIL}
+LDADD=	-lrpcsvc -lutil
 
 #.if exists(/usr/X11R6/include/X11/extensions/xidle.h)
 #CFLAGS+= -DXIDLE
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 9b5486ffef0c..6b34fa72cd28 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -45,8 +45,7 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <syslog.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
+#include <utmpx.h>
 #ifdef XIDLE
 #include <setjmp.h>
 #include <X11/Xlib.h>
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 7f82f1f217d9..cc0c5977fb7d 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -7,8 +7,4 @@ SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
 MAN=	talkd.8
 CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
 
-
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index d796cd59659d..18ddc42aff1f 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -59,8 +59,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
-#define	_ULOG_POSIX_NAMES
-#include <ulog.h>
+#include <utmpx.h>
 
 #include "extern.h"