From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 12:43:59 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 99DD01065693;
	Wed,  6 Jan 2010 12:43: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 706118FC24;
	Wed,  6 Jan 2010 12:43: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 o06Chxvi026716;
	Wed, 6 Jan 2010 12:43:59 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o06Chxqj026713;
	Wed, 6 Jan 2010 12:43:59 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001061243.o06Chxqj026713@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 12:43:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201643 - in user/ed/utmpx: . share/man/man5
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2010 12:43:59 -0000

Author: ed
Date: Wed Jan  6 12:43:59 2010
New Revision: 201643
URL: http://svn.freebsd.org/changeset/base/201643

Log:
  Remove the utmp manpage and add it to ObsoleteFiles.
  
  Also add the libulog manpages to ObsoleteFiles that were missing in one
  of the previous commits.

Deleted:
  user/ed/utmpx/share/man/man5/utmp.5
Modified:
  user/ed/utmpx/ObsoleteFiles.inc
  user/ed/utmpx/share/man/man5/Makefile

Modified: user/ed/utmpx/ObsoleteFiles.inc
==============================================================================
--- user/ed/utmpx/ObsoleteFiles.inc	Wed Jan  6 12:43:19 2010	(r201642)
+++ user/ed/utmpx/ObsoleteFiles.inc	Wed Jan  6 12:43:59 2010	(r201643)
@@ -14,10 +14,25 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
-# 20100104: login(3), logout(3) and logwtmp(3) removed
+# 20100104: utmp and utility functions replaced by utmpx
+OLD_FILES+=usr/share/man/man3/endutxent.3.gz
+OLD_FILES+=usr/share/man/man3/getutxent.3.gz
+OLD_FILES+=usr/share/man/man3/getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
+OLD_FILES+=usr/share/man/man3/pututxline.3.gz
+OLD_FILES+=usr/share/man/man3/setutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
+OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
+OLD_FILES+=usr/share/man/man5/lastlog.5.gz
+OLD_FILES+=usr/share/man/man5/utmp.5.gz
+OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz

Modified: user/ed/utmpx/share/man/man5/Makefile
==============================================================================
--- user/ed/utmpx/share/man/man5/Makefile	Wed Jan  6 12:43:19 2010	(r201642)
+++ user/ed/utmpx/share/man/man5/Makefile	Wed Jan  6 12:43:59 2010	(r201643)
@@ -68,7 +68,6 @@ MAN=	acct.5 \
 	style.Makefile.5 \
 	sysctl.conf.5 \
 	tmpfs.5 \
-	utmp.5 \
 	xfs.5
 
 MLINKS=	dir.5 dirent.5
@@ -79,7 +78,6 @@ MLINKS+=passwd.5 master.passwd.5
 MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
-MLINKS+=utmp.5 lastlog.5 utmp.5 wtmp.5
 
 .if ${MK_HESIOD} != "no"
 MAN+=	hesiod.conf.5