From 7d5a47271bbfeef05b6d25a261e2de0d5240ede3 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 9 May 2008 18:43:07 +0000
Subject: Make this package build on Mac OS X.

---
 x11/eterm/distinfo         |  4 ++--
 x11/eterm/patches/patch-ah | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'x11')

diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 1d8a9beefe4..a7b4c3dbf7c 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2008/04/03 22:42:33 tonnerre Exp $
+$NetBSD: distinfo,v 1.17 2008/05/09 18:43:07 agc Exp $
 
 SHA1 (Eterm-0.9.4.tar.gz) = d63628098b3aa08c8f2bc1bd756683e5fd227995
 RMD160 (Eterm-0.9.4.tar.gz) = ce5d7ba74b19e3c8992d104d00f10302c3e8150e
@@ -16,5 +16,5 @@ SHA1 (patch-aa) = 19da5e05392994a60fdf47e9d52c82fc41cefa4c
 SHA1 (patch-ab) = d019a18bb32f890d6de7c5bb0cdb43e7715a7d4d
 SHA1 (patch-ac) = eaeed9066b546d563f7b0404afbdb9e9737d8f63
 SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
-SHA1 (patch-ah) = e9a924abff857448a6d7c9281915bcf001b7451c
+SHA1 (patch-ah) = 9d2a995fa118e30be20aa3fdc18ffee1eeec1192
 SHA1 (patch-ai) = 94d684a490752831de2fb2aba92c0b9f461ddb5a
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
index 6decf6ec1c1..b641de71287 100644
--- a/x11/eterm/patches/patch-ah
+++ b/x11/eterm/patches/patch-ah
@@ -1,14 +1,21 @@
-$NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $
+$NetBSD: patch-ah,v 1.7 2008/05/09 18:43:07 agc Exp $
 
 --- src/utmp.c.orig	2006-05-11 04:33:40.000000000 +0100
 +++ src/utmp.c	2006-11-25 13:01:25.000000000 +0000
-@@ -47,8 +47,13 @@
+@@ -44,11 +44,20 @@
+ static int utmp_pos;            /* BSD position of utmp-stamp */
+ #  endif
+ 
++
  # ifdef USE_SYSV_UTMP
  
  #  ifdef HAVE_UTMPX_H
 +#   include <utmp.h>
  #   undef WTMP_FILENAME
 -#   define WTMP_FILENAME WTMPX_FILE
++#   ifndef _PATH_WTMPX
++#     define _PATH_WTMPX	"/var/log/wtmp"
++#   endif
 +#   if defined(WTMPX_FILE)
 +#     define WTMP_FILENAME WTMPX_FILE
 +#   else
@@ -17,7 +24,7 @@ $NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $
  #   define update_wtmp updwtmpx
  #  else /* HAVE_UTMPX_H */
  
-@@ -128,9 +133,9 @@
+@@ -128,22 +137,26 @@
      privileges(INVOKE);
  #   ifdef HAVE_UTMPX_H
      getutmp(&utmp, &utmp2);
@@ -29,7 +36,24 @@ $NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $
  #   endif
  
      /* set up the new entry */
-@@ -152,16 +157,15 @@
+     strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
+     strncpy(utmp.ut_line, pty, sizeof(utmp.ut_line));
++#   ifndef __APPLE__
+     strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name));
++#   endif
+     strncpy(utmp.ut_user, pwent->pw_name, sizeof(utmp.ut_user));
+     strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
+     utmp.ut_type = USER_PROCESS;
+     utmp.ut_pid = getpid();
+ #   ifdef HAVE_UTMPX_H
++#     ifndef __APPLE__
+     utmp.ut_session = getsid(0);
+     utmp.ut_xtime = time(NULL);
++#     endif /* __APPLE__ */
+     utmp.ut_tv.tv_usec = 0;
+ #   else
+     utmp.ut_time = time(NULL);
+@@ -152,16 +165,15 @@
      /*
       * write a utmp entry to the utmp file
       */
@@ -48,7 +72,7 @@ $NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $
      privileges(REVERT);
      return;
      fd = 0;
-@@ -177,19 +181,19 @@
+@@ -177,19 +189,19 @@
      if (!ut_id[0])
          return;                 /* entry not made */
  
-- 
cgit v1.2.3