From owner-svn-src-all@FreeBSD.ORG  Wed Jan 13 18:28:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 537B11065692;
	Wed, 13 Jan 2010 18:28:59 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 298B78FC0A;
	Wed, 13 Jan 2010 18:28:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DISxhM087410;
	Wed, 13 Jan 2010 18:28:59 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DISxPx087405;
	Wed, 13 Jan 2010 18:28:59 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001131828.o0DISxPx087405@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 13 Jan 2010 18:28:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202210 - in head/libexec: rpc.rusersd talkd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 18:28:59 -0000

Author: ed
Date: Wed Jan 13 18:28:58 2010
New Revision: 202210
URL: http://svn.freebsd.org/changeset/base/202210

Log:
  Port all apps in libexec/ from libulog to utmpx.

Modified:
  head/libexec/rpc.rusersd/Makefile
  head/libexec/rpc.rusersd/rusers_proc.c
  head/libexec/talkd/Makefile
  head/libexec/talkd/process.c

Modified: head/libexec/rpc.rusersd/Makefile
==============================================================================
--- head/libexec/rpc.rusersd/Makefile	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/rpc.rusersd/Makefile	Wed Jan 13 18:28:58 2010	(r202210)
@@ -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

Modified: head/libexec/rpc.rusersd/rusers_proc.c
==============================================================================
--- head/libexec/rpc.rusersd/rusers_proc.c	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/rpc.rusersd/rusers_proc.c	Wed Jan 13 18:28:58 2010	(r202210)
@@ -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>

Modified: head/libexec/talkd/Makefile
==============================================================================
--- head/libexec/talkd/Makefile	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/talkd/Makefile	Wed Jan 13 18:28:58 2010	(r202210)
@@ -7,8 +7,4 @@ SRCS=	talkd.c announce.c process.c table
 MAN=	talkd.8
 CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
 
-
-DPADD=	${LIBULOG}
-LDADD=	-lulog
-
 .include <bsd.prog.mk>

Modified: head/libexec/talkd/process.c
==============================================================================
--- head/libexec/talkd/process.c	Wed Jan 13 18:28:41 2010	(r202209)
+++ head/libexec/talkd/process.c	Wed Jan 13 18:28:58 2010	(r202210)
@@ -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"