From 92d66b0e08e35e55f349f068ab3a4d5a12d9659e Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Sun, 8 Nov 2015 20:42:38 +0000
Subject: Remove sys/timeb.h (not used anywhere); fixes openbsd build.

---
 mail/elm-me/distinfo                 |  7 ++++---
 mail/elm-me/patches/patch-bb         | 20 ++++++++++++++++----
 mail/elm-me/patches/patch-ca         | 23 +++++++++++++++++++----
 mail/elm-me/patches/patch-src_date.c | 17 +++++++++++++++++
 4 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 mail/elm-me/patches/patch-src_date.c

(limited to 'mail/elm-me')

diff --git a/mail/elm-me/distinfo b/mail/elm-me/distinfo
index c9ef23f2c3f..605ee27420a 100644
--- a/mail/elm-me/distinfo
+++ b/mail/elm-me/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:04 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/11/08 20:42:38 dholland Exp $
 
 SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
 RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
@@ -9,12 +9,13 @@ SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
 SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
 SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24
 SHA1 (patch-ae) = d8b63984cf2bc367e311904f6d98e2b8790d3592
-SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
+SHA1 (patch-bb) = d85e9625b327b766bcbea2d9063f76a7bc1ddd5d
 SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
-SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
+SHA1 (patch-ca) = 5a395f9f085999ea7b225cf5fc97c4b031218b08
 SHA1 (patch-cb) = ba7c02eb16746f04c2abf264dd73ed73bcdad8ba
 SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
 SHA1 (patch-cd) = f734efccc0f0c99637a3a527a920e6aa5543da48
 SHA1 (patch-ce) = 862968b558af3a30b2a523566f5e327d579e3f87
 SHA1 (patch-cf) = 4a5c2a09d90358bde1697bb79e09944014a3da72
 SHA1 (patch-cg) = 75e26fab55016ccbe6b1c248d7fd31150971f36d
+SHA1 (patch-src_date.c) = da93d6d562f8f78138df927162f696b4e0a2f936
diff --git a/mail/elm-me/patches/patch-bb b/mail/elm-me/patches/patch-bb
index e6c49892cf3..c18c3915f07 100644
--- a/mail/elm-me/patches/patch-bb
+++ b/mail/elm-me/patches/patch-bb
@@ -1,8 +1,12 @@
-$NetBSD: patch-bb,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-bb,v 1.2 2015/11/08 20:42:38 dholland Exp $
 
---- src/elm.c.orig	2006-01-24 17:18:55.000000000 +0000
+- use standard headers
+- avoid obsolete sys/timeb.h
+- don't declare own errno
+
+--- src/elm.c.orig	2001-06-19 17:03:46.000000000 +0000
 +++ src/elm.c
-@@ -15,6 +15,7 @@ static char rcsid[] = "@(#)$Id: elm.c,v 
+@@ -15,14 +15,11 @@ static char rcsid[] = "@(#)$Id: elm.c,v 
  /* Main program of the ELM mail system! 
  */
  
@@ -10,7 +14,15 @@ $NetBSD: patch-bb,v 1.1 2006/01/24 19:01:45 joerg Exp $
  #include "patchlevel.h"
  #include "elm.h"
  #include "s_elm.h"
-@@ -90,7 +91,6 @@ int main(argc, argv)
+ 
+-#ifdef BSD_TYPE
+-#  include <sys/timeb.h>
+-#endif
+-
+ #include "mime.h"
+ #include "me.h"
+ 
+@@ -90,7 +87,6 @@ int main(argc, argv)
  	char **to_whom = NULL;
  	int bytes;
  	int  i,j;      		/** Random counting variables (etc)          **/
diff --git a/mail/elm-me/patches/patch-ca b/mail/elm-me/patches/patch-ca
index d7f8847d20d..aca08f945be 100644
--- a/mail/elm-me/patches/patch-ca
+++ b/mail/elm-me/patches/patch-ca
@@ -1,6 +1,10 @@
-$NetBSD: patch-ca,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-ca,v 1.2 2015/11/08 20:42:38 dholland Exp $
 
---- utils/newmail.c.orig	2006-01-24 17:45:56.000000000 +0000
+- use standard headers
+- avoid obsolete sys/timeb.h
+- don't declare own errno
+
+--- utils/newmail.c.orig	2001-06-19 17:03:48.000000000 +0000
 +++ utils/newmail.c
 @@ -61,6 +61,7 @@ static char rcsid[] = "@(#)$Id: newmail.
  
@@ -10,7 +14,18 @@ $NetBSD: patch-ca,v 1.1 2006/01/24 19:01:45 joerg Exp $
  #ifdef PWDINSYS
  #  include <sys/pwd.h>
  #else
-@@ -141,8 +142,6 @@ int  interval_time,		/* how long to slee
+@@ -68,10 +69,6 @@ DEBUG_VAR(Debug,__FILE__,"util");
+ #endif
+ #include <sys/stat.h>
+ 
+-#ifdef BSD_TYPE
+-#  include <sys/timeb.h>
+-#endif
+-
+ #ifdef I_UTIME
+ #  include <utime.h>
+ #endif
+@@ -141,8 +138,6 @@ int  interval_time,		/* how long to slee
  int  parent_pid;		/* See if sucide should be attempt  */
  #endif /* PIDCHECK */
  
@@ -19,7 +34,7 @@ $NetBSD: patch-ca,v 1.1 2006/01/24 19:01:45 joerg Exp $
  #if defined(BSD_TYPE) && !defined(UTIMBUF)
          time_t utime_buffer[2];         /* utime command */
  
-@@ -780,7 +779,6 @@ static void save_acc(name)
+@@ -780,7 +775,6 @@ static void save_acc(name)
      /** return the number of bytes in the specified file.  This
  	is to check to see if new mail has arrived....  **/
  
diff --git a/mail/elm-me/patches/patch-src_date.c b/mail/elm-me/patches/patch-src_date.c
new file mode 100644
index 00000000000..de20379d6c3
--- /dev/null
+++ b/mail/elm-me/patches/patch-src_date.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_date.c,v 1.1 2015/11/08 20:42:38 dholland Exp $
+
+- avoid obsolete sys/timeb.h
+
+--- src/date.c~	2001-06-19 17:03:18.000000000 +0000
++++ src/date.c
+@@ -18,10 +18,6 @@ static char rcsid[] = "@(#)$Id: date.c,v
+ #include "headers.h"
+ #include "me.h"
+ 
+-#ifdef BSD_TYPE
+-#  include <sys/timeb.h>
+-#endif
+-
+ #ifndef	_POSIX_SOURCE
+ extern struct tm *localtime();
+ extern struct tm *gmtime();
-- 
cgit v1.2.3