misc/screen: DragonFly BSD 2.9+ support

Make screen use utmpx on DragonFly BSD 2.9+ so that it compiles
again.

Patch submitted by Matthias Rampke ( https://gist.github.com/823307 ).

ok@ wiz

4 files changed, 23 insertions, 18 deletions

diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 62526680c2a..c2012383090 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2010/01/01 19:38:44 spz Exp $
+$NetBSD: distinfo,v 1.32 2011/03/14 06:15:23 rumko Exp $
 
 SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
 RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754
@@ -8,9 +8,9 @@ SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5
 SHA1 (patch-ac) = 36a1f3e465b511dc795ee9e7f016416b5312d6f0
 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
 SHA1 (patch-ah) = 10af05907e368af17fa3bb5e24101aa4d260ab8a
-SHA1 (patch-ai) = 6d01c6c5bebfefc5c2cd4d3c642205eedbc6b155
-SHA1 (patch-aj) = 7cb56d912aa40a4840a9a690394dcf50b0dd319d
-SHA1 (patch-ak) = 5b2fe45dc82f9ed36256b06f27bffafe3071769d
+SHA1 (patch-ai) = 0775c95da8bab6d0c9218328aadcd30e3aa81885
+SHA1 (patch-aj) = 220ae716eb7b59dd76c7d7f111cc61cb17d0a414
+SHA1 (patch-ak) = f9029f0f49ea3b2ca8d15dea03b209e4c2fa4ef1
 SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e
 SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
 SHA1 (patch-an) = 44712ae5875c60eac0d4d6ba5cc3731dbfd4458b
diff --git a/misc/screen/patches/patch-ai b/misc/screen/patches/patch-ai
index ae4b7599f37..a2bcc03011d 100644
--- a/misc/screen/patches/patch-ai
+++ b/misc/screen/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2005/11/08 12:58:47 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2011/03/14 06:15:23 rumko Exp $
 
 --- os.h.orig	2002-01-08 15:42:33.000000000 +0000
 +++ os.h
@@ -12,18 +12,21 @@ $NetBSD: patch-ai,v 1.2 2005/11/08 12:58:47 joerg Exp $
  #ifndef HAVE_STRERROR
  /* No macros, please */
  #undef strerror
-@@ -260,9 +257,15 @@ extern int errno;
+@@ -260,9 +257,18 @@
  #endif
  
  #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
 -# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
 +# if (defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)) \
-+  || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000))
++  || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
++  || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
  #  include <utmpx.h>
 -#  define UTMPFILE	UTMPX_FILE
-+#  ifdef __NetBSD__
++#  if defined(__NetBSD__)
 +#   define UTMPFILE	_PATH_UTMPX
 +#   define NetBSD_UTMP
++#  elif defined(__DragonFly__)
++#   define UTMPFILE _PATH_UTMPX
 +#  else
 +#   define UTMPFILE	UTMPX_FILE
 +#  endif
diff --git a/misc/screen/patches/patch-aj b/misc/screen/patches/patch-aj
index c4b5214402d..fd5a59952cb 100644
--- a/misc/screen/patches/patch-aj
+++ b/misc/screen/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.5 2008/04/04 21:09:16 tonnerre Exp $
+$NetBSD: patch-aj,v 1.6 2011/03/14 06:15:23 rumko Exp $
 
 Detect getutent correctly on NetBSD with utmpx.
 Include curses header when testing tgetent in order to prevent
@@ -15,24 +15,25 @@ crash on 64-bit architectures.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -815,9 +817,15 @@
+@@ -815,9 +817,16 @@
  AC_TRY_LINK([
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
 -#if defined(SVR4) && !defined(DGUX)
 +#include <sys/param.h>
 +#if (defined(SVR4) && !defined(DGUX)) \
-+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000))
++ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
++ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
  #include <utmpx.h>
  #define utmp utmpx
-+# ifdef __NetBSD__
++# if defined(__NetBSD__) || defined(__DragonFly__)
 +#  define pututline pututxline
 +#  define getutent  getutxent
 +# endif
  #else
  #include <utmp.h>
  #endif
-@@ -1209,6 +1217,7 @@
+@@ -1209,6 +1218,7 @@
  AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no))
  
  AC_HEADER_DIRENT
diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak
index cb5b24060cb..fde40b46042 100644
--- a/misc/screen/patches/patch-ak
+++ b/misc/screen/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2008/04/04 21:09:16 tonnerre Exp $
+$NetBSD: patch-ak,v 1.5 2011/03/14 06:15:23 rumko Exp $
 
 Include curses header when testing tgetent in order to prevent
 crash on 64-bit architectures.
@@ -14,24 +14,25 @@ crash on 64-bit architectures.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -5572,9 +5574,15 @@
+@@ -5572,9 +5574,16 @@
  
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
 -#if defined(SVR4) && !defined(DGUX)
 +#include <sys/param.h>
 +#if (defined(SVR4) && !defined(DGUX)) \
-+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000))
++ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
++ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
  #include <utmpx.h>
  #define utmp utmpx
-+# ifdef __NetBSD__
++# if defined(__NetBSD__) || defined(__DragonFly__)
 +#  define pututline pututxline
 +#  define getutent  getutxent
 +# endif
  #else
  #include <utmp.h>
  #endif
-@@ -7502,6 +7510,148 @@
+@@ -7502,6 +7511,148 @@
  fi