pkg/26962: x11/rxvt build faild on Interix

[hiramatu%boreas.dti.ne.jp@localhost]

>Number:         26962
>Category:       pkg
>Synopsis:       x11/rxvt build failed on Interix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 15 16:13:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        Services for Unix 3.5
>Organization:
        
>Environment:
        
        
System: Interix nile 3.5 SP-8.0.1969.1 x86 AMD_x86_Family15_Model12_Stepping0
Architecture: i386
Machine: i386
>Description:
x11/rxvt cannot be built on Interix due to the differences of utmp related
library functions.

>How-To-Repeat:
        
>Fix:

diff -buNr rxvt.orig/distinfo rxvt/distinfo
--- rxvt.orig/distinfo  Sat Sep 11 02:18:36 2004
+++ rxvt/distinfo       Mon Sep 13 23:52:21 2004
@@ -5,5 +5,6 @@
 SHA1 (patch-aa) = 11656b4c2d9e22055d203669b588b626079aa320
 SHA1 (patch-ab) = 62ef5b28f8842b769829fed0d217a9c54f48c832
 SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f
-SHA1 (patch-ae) = 76221e9b3cd35a0f40fb6128e0bf9d74d232d907
+SHA1 (patch-ae) = 50acd232c658191d58c20355094e508b36e31a79
 SHA1 (patch-af) = 5bf2e4a2136694f6a11ff95013fc292bc88f3175
+SHA1 (patch-ag) = 0fc1759bd50732ac98073d78d0037b2dfbb90b8f
diff -buNr rxvt.orig/patches/patch-ae rxvt/patches/patch-ae
--- rxvt.orig/patches/patch-ae  Sat Sep 11 02:18:36 2004
+++ rxvt/patches/patch-ae       Mon Sep 13 23:52:21 2004
@@ -1,11 +1,15 @@
-$NetBSD: patch-ae,v 1.6 2003/03/28 10:55:22 wiz Exp $
+$NetBSD$
 
---- src/logging.h.orig Tue Oct  1 06:33:47 2002
-+++ src/logging.h
-@@ -31,4 +31,13 @@
+--- src/logging.h.orig Tue Oct  1 13:33:47 2002
++++ src/logging.h      Sat Sep 11 01:38:22 2004
+@@ -29,6 +29,17 @@
+ #  define ut_name             ut_user
+ # endif
  
++#if defined(HAVE_STRUCT_UTMP)
  #include "logging.intpro"             /* PROTOS for internal routines */
  #endif
++#endif
 +
 +/* lastlogx support is incomplete on the NetBSD 1.6-branch  -- disable it */
 +#ifdef __NetBSD__
diff -buNr rxvt.orig/patches/patch-ag rxvt/patches/patch-ag
--- rxvt.orig/patches/patch-ag  Thu Jan  1 09:00:00 1970
+++ rxvt/patches/patch-ag       Mon Sep 13 23:52:21 2004
@@ -0,0 +1,59 @@
+$NetBSD$
+
+--- src/logging.c.orig Sat Sep 11 01:38:46 2004
++++ src/logging.c      Sat Sep 11 02:00:51 2004
+@@ -137,7 +137,9 @@
+     STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
+           sizeof(utx->ut_user));
+     STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
++#ifndef __INTERIX
+     utx->ut_session = getsid(0);
++#endif
+     utx->ut_tv.tv_sec = time(NULL);
+     utx->ut_tv.tv_usec = 0;
+     utx->ut_pid = r->h->cmd_pid;
+@@ -203,8 +205,12 @@
+ #  endif
+ # endif
+ # ifdef HAVE_STRUCT_UTMPX
++#  ifdef __INTERIX
++      pututxline(utx);
++#  else
+       updwtmpx(RXVT_WTMPX_FILE, utx);
+ # endif
++# endif
+     }
+ #endif
+ #if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
+@@ -254,7 +260,9 @@
+     if ((tmputx = getutxid(utx)))     /* position to entry in utmp file */
+       utx = tmputx;
+     utx->ut_type = DEAD_PROCESS;
++#ifndef __INTERIX
+     utx->ut_session = getsid(0);
++#endif
+     utx->ut_tv.tv_sec = time(NULL);
+     utx->ut_tv.tv_usec = 0;
+ #endif
+@@ -275,8 +283,12 @@
+ #  endif
+ # endif
+ # ifdef HAVE_STRUCT_UTMPX
++#  ifdef __INTERIX
++      pututxline(utx);
++#  else
+       updwtmpx(RXVT_WTMPX_FILE, utx);
+ # endif
++# endif
+     }
+ #endif
+ 
+@@ -327,7 +339,7 @@
+ /*
+  * Update a BSD style wtmp entry
+  */
+-#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
++#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && !defined(__INTERIX)
+ /* INTPROTO */
+ void
+ rxvt_update_wtmp(const char *fname, const struct utmp *putmp)
>Release-Note:
>Audit-Trail:
>Unformatted: