From ada2279fa868238eb0f0bf00a0905c759d89eb30 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 13 Nov 2011 11:51:54 +0000
Subject: [PATCH] * don't rely on ancient union wait related internals in
 <sys/wait.h> * fetch missing prototypes

---
 mail/movemail/Makefile                 |  4 ++--
 mail/movemail/patches/patch-freebsd_h  | 12 ++++++++++++
 mail/movemail/patches/patch-movemail_c | 11 +++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 mail/movemail/patches/patch-freebsd_h
 create mode 100644 mail/movemail/patches/patch-movemail_c

diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index 29c91b0a138..0d2cdc3de2d 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2011/06/23 22:50:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2011/11/13 11:51:54 naddy Exp $
 
 COMMENT=	move your mail box to another location
 
 DISTNAME=	movemail-1.0
-REVISION =	1
+REVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://people.freebsd.org/~wosch/src/
 
diff --git a/mail/movemail/patches/patch-freebsd_h b/mail/movemail/patches/patch-freebsd_h
new file mode 100644
index 00000000000..51dbcd5677b
--- /dev/null
+++ b/mail/movemail/patches/patch-freebsd_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-freebsd_h,v 1.1 2011/11/13 11:51:54 naddy Exp $
+--- freebsd.h.orig	Sun Nov 13 04:46:05 2011
++++ freebsd.h	Sun Nov 13 04:46:27 2011
+@@ -96,7 +96,7 @@
+ #ifdef emacs
+ #include <sys/wait.h>
+ #endif
+-#define WRETCODE(w) (_W_INT(w) >> 8)
++#define WRETCODE(w) WEXITSTATUS (w)
+ 
+ /* Needed to avoid hanging when child process writes an error message
+    and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
diff --git a/mail/movemail/patches/patch-movemail_c b/mail/movemail/patches/patch-movemail_c
new file mode 100644
index 00000000000..901f7a540e7
--- /dev/null
+++ b/mail/movemail/patches/patch-movemail_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-movemail_c,v 1.1 2011/11/13 11:51:54 naddy Exp $
+--- movemail.c.orig	Sun Nov 13 04:37:47 2011
++++ movemail.c	Sun Nov 13 04:38:07 2011
+@@ -61,6 +61,7 @@ Boston, MA 02111-1307, USA.  */
+ #include <sys/file.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <errno.h>
+ #include "syswait.h"
+ #ifdef MAIL_USE_POP