Subject: Re: pkg/16637: pksgrc/x11/aterm fails to build on -current
To: None <jschauma@cs.stevens-tech.edu>
From: Rui-Xiang Guo <rxg@ms25.url.com.tw>
List: netbsd-bugs
Date: 05/04/2002 09:06:48
--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,
I think these two patches would help something.
Then you should be able to compile aterm both under 1.5.x and -current.

-rxg

--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ac

$NetBSD$

--- src/utmp.c.orig	Sat May  4 08:40:45 2002
+++ src/utmp.c
@@ -186,7 +186,11 @@
 	}
     }
 
+#ifdef HAVE_UTMPX_H
+    utmpxname(UTMP_FILENAME);
+#else
     utmpname(UTMP_FILENAME);
+#endif
 
     setutent();			/* XXX: should be unnecessaray */
 
@@ -265,7 +269,11 @@
     if (!ut_id[0])
 	return;			/* entry not made */
 
+#ifdef HAVE_UTMPX_H
+    utmpxname(UTMP_FILENAME);
+#else
     utmpname(UTMP_FILENAME);
+#endif
     MEMSET(&utmp, 0, sizeof(UTMP));
     STRNCPY(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
     utmp.ut_type = USER_PROCESS;

--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ad

$NetBSD$

--- src/rxvt.h.orig	Sat May  4 08:47:56 2002
+++ src/rxvt.h
@@ -549,11 +549,13 @@
 #ifdef WTMP_SUPPORT
 # ifdef HAVE_UTMPX_H		/* means we're on Solaris (or Irix?) */
 #  undef WTMP_FILENAME
-#  if  defined(WTMPX_FILE) || defined(_WTMPX_FILE)
+#  if  defined(WTMPX_FILE) || defined(_WTMPX_FILE) || defined(_PATH_WTMPX)
 #    if defined(WTMPX_FILE)
 #    	define WTMP_FILENAME	WTMPX_FILE
-#    else
+#    elif defined(_WTMPX_FILE)
 #    	define WTMP_FILENAME	_WTMPX_FILE
+#    else
+#	define WTMP_FILENAME	_PATH_WTMPX
 #    endif
 #    define update_wtmp		updwtmpx
 #  else

--zhXaljGHf11kAtnf--