From bfaab446bb975571ce27b5b011aefcf8677a23be Mon Sep 17 00:00:00 2001
From: Martin Cracauer <cracauer@FreeBSD.org>
Date: Tue, 16 Feb 2010 22:04:45 +0000
Subject: [PATCH] Make work with -current's utmpx changes.

I tested on -current/amd64 past the utmpx change and on
8.0-RELEASE-p2/i386 for the old code path.

Reviewed: Giorgos Keramidas (maintainer)
Approved: Pav Lucistnik (for portmgr)
Feature safe: yes
---
 editors/emacs22/files/patch-src-filelock.c | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 editors/emacs22/files/patch-src-filelock.c

diff --git a/editors/emacs22/files/patch-src-filelock.c b/editors/emacs22/files/patch-src-filelock.c
new file mode 100644
index 000000000000..aa91b98f2aeb
--- /dev/null
+++ b/editors/emacs22/files/patch-src-filelock.c
@@ -0,0 +1,34 @@
+--- src/filelock.c.org	2008-01-07 23:30:11.000000000 -0500
++++ src/filelock.c	2010-02-12 17:50:08.000000000 -0500
+@@ -64,7 +64,12 @@
+ 
+ #ifdef CLASH_DETECTION
+ 
++#if __FreeBSD_version >= 900007
++#include <utmpx.h>
++#define ut_time ut_tv.tv_sec
++#else
+ #include <utmp.h>
++#endif
+ 
+ #if !defined (S_ISLNK) && defined (S_IFLNK)
+ #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+@@ -253,13 +258,17 @@
+    the first reboot record otherwise.
+    Ignore all reboot records on or before BOOT_TIME.
+    Success is indicated by setting BOOT_TIME to a larger value.  */
+-
+ void
+ get_boot_time_1 (filename, newest)
+      char *filename;
+      int newest;
+ {
++#if __FreeBSD_version >= 900007
++  struct utmpx ut, *utp;
++#else
+   struct utmp ut, *utp;
++#endif
++
+   int desc;
+ 
+   if (filename)