ports/143954: [PATCH]x11/rxvt-devel: unbreak on 9-CURRENT after utmp/utmpx changes

[bf]

>Number:         143954
>Category:       ports
>Synopsis:       [PATCH]x11/rxvt-devel: unbreak on 9-CURRENT after utmp/utmpx changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 15 14:40:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:
Push a patch ed@ made in Jan. for the utmp/utmpx changes into the tree.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -x '3.*' -x '*new.*' -x '*old.*' -ruN rxvt-devel.orig/Makefile rxvt-devel/Makefile
--- rxvt-devel.orig/Makefile	2010-02-15 09:20:25.000000000 -0500
+++ rxvt-devel/Makefile	2010-02-15 09:23:38.000000000 -0500
@@ -39,7 +39,7 @@
 		XIM		"Build with XIM support" off \
 		XTERM		"Build with Xterm scrollbar" off
 
-CONFIGURE_ARGS=	--enable-utmp --enable-wtmp --enable-languages \
+CONFIGURE_ARGS=	--enable-utmp --enable-lastlog \
 		--with-xpm --enable-xpm-background --enable-shared \
 		--enable-mousewheel --disable-languages
 USE_LDCONFIG=	yes
@@ -48,6 +48,12 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 900007
+CONFIGURE_ARGS+=	--disable-wtmp
+.else
+CONFIGURE_ARGS+=	--enable-wtmp
+.endif
+
 # enable 256 color
 .if defined(WITH_256_COLOR)
 CONFIGURE_ARGS+=	--enable-256-color
diff -x '3.*' -x '*new.*' -x '*old.*' -ruN rxvt-devel.orig/files/patch-src::logging.c rxvt-devel/files/patch-src::logging.c
--- rxvt-devel.orig/files/patch-src::logging.c	2010-02-15 09:20:25.000000000 -0500
+++ rxvt-devel/files/patch-src::logging.c	2010-01-15 07:56:01.000000000 -0500
@@ -10,3 +10,41 @@
  	rxvt_print_error("can't parse tty name \"%s\"", pty);
  	return;
      }
+@@ -137,7 +138,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));
++#if 0
+     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;
+@@ -202,7 +205,7 @@
+ 	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
+ #  endif
+ # endif
+-# ifdef HAVE_STRUCT_UTMPX
++# if 0
+ 	updwtmpx(RXVT_WTMPX_FILE, utx);
+ # endif
+     }
+@@ -254,7 +257,9 @@
+     if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
+ 	utx = tmputx;
+     utx->ut_type = DEAD_PROCESS;
++#if 0
+     utx->ut_session = getsid(0);
++#endif
+     utx->ut_tv.tv_sec = time(NULL);
+     utx->ut_tv.tv_usec = 0;
+ #endif
+@@ -274,7 +279,7 @@
+ 	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
+ #  endif
+ # endif
+-# ifdef HAVE_STRUCT_UTMPX
++# if 0
+ 	updwtmpx(RXVT_WTMPX_FILE, utx);
+ # endif
+     }


>Release-Note:
>Audit-Trail:
>Unformatted: