summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2002-11-21 16:18:16 +0000
committertron <tron@pkgsrc.org>2002-11-21 16:18:16 +0000
commit15f9513b31724f6939bf9d1521381850d463ecd0 (patch)
tree8835a8ea61e379fe3b74cbe30ec4b962aedc96bb
parentb9b21e153cf40292d25ff7ac8e090e49096cd388 (diff)
downloadpkgsrc-15f9513b31724f6939bf9d1521381850d463ecd0.tar.gz
Fix scary amount of build warning on NetBSD systems with UTMPX support.
-rw-r--r--x11/wterm/distinfo4
-rw-r--r--x11/wterm/patches/patch-aa20
2 files changed, 17 insertions, 7 deletions
diff --git a/x11/wterm/distinfo b/x11/wterm/distinfo
index 9d15ebceb17..4130b0a4b51 100644
--- a/x11/wterm/distinfo
+++ b/x11/wterm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/10/27 13:44:19 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2002/11/21 16:18:16 tron Exp $
SHA1 (wterm-6.2.9.tar.bz2) = e759dea038d07146d70e9cd88ff4c68e4b0fd5b2
Size (wterm-6.2.9.tar.bz2) = 262049 bytes
-SHA1 (patch-aa) = 8c9df1676f7fd59f0cddfb39cf2a719d58b2dab5
+SHA1 (patch-aa) = f4e3f5cfdeaca21ed4b37df18152066d30f18e62
SHA1 (patch-ab) = b0103999bf2d38e61d46772d0396c45102e8f559
SHA1 (patch-ac) = 5dd3db02b265872c6cfb8dc8e47957c3bdfe8224
SHA1 (patch-ad) = 2f5e03a8f8096358050cf5fb9f27b5e590d77f58
diff --git a/x11/wterm/patches/patch-aa b/x11/wterm/patches/patch-aa
index cd8825b04d9..7e6220fa0e0 100644
--- a/x11/wterm/patches/patch-aa
+++ b/x11/wterm/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2002/03/05 15:23:46 tron Exp $
+$NetBSD: patch-aa,v 1.4 2002/11/21 16:18:16 tron Exp $
--- src/wterm.h.orig Sun Mar 5 12:22:32 2000
-+++ src/wterm.h Tue Mar 5 16:01:19 2002
-@@ -435,10 +435,14 @@
++++ src/wterm.h Thu Nov 21 17:13:53 2002
+@@ -117,6 +117,9 @@
+ #ifdef UTMP_SUPPORT
+ # ifdef HAVE_UTMPX_H
+ # define __USE_GNU
++# ifdef __NetBSD__
++# include <utmp.h>
++# endif
+ # include <utmpx.h>
+ # define USE_SYSV_UTMP
+ # else
+@@ -435,10 +438,14 @@
# ifdef _PATH_UTMP
# define UTMP_FILENAME _PATH_UTMP
# else
@@ -20,7 +30,7 @@ $NetBSD: patch-aa,v 1.3 2002/03/05 15:23:46 tron Exp $
# endif
# endif
# endif
-@@ -458,6 +462,7 @@
+@@ -458,6 +465,7 @@
# define getutid getutxid
# define endutent endutxent
# define pututline pututxline
@@ -28,7 +38,7 @@ $NetBSD: patch-aa,v 1.3 2002/03/05 15:23:46 tron Exp $
# else
# define UTMP struct utmp
# endif
-@@ -466,7 +471,11 @@
+@@ -466,7 +474,11 @@
#ifdef WTMP_SUPPORT
# ifdef HAVE_UTMPX_H /* means we're on Solaris (or Irix?) */
# undef WTMP_FILENAME