Fix build on OS X with patch from Sevan Janiyan in PR pkg/49523.

While here, recenter a couple other patches.

4 files changed, 25 insertions, 9 deletions

diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index 3f95dcac9eb..ba759506487 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2013/09/03 17:50:27 shattered Exp $
+$NetBSD: distinfo,v 1.15 2015/01/02 04:38:20 schmonz Exp $
 
 SHA1 (nullmailer-1.13/nullmailer-1.13.tar.gz) = e1178fff0395abee2bb6e77c3ddb8a0a7efcc791
 RMD160 (nullmailer-1.13/nullmailer-1.13.tar.gz) = d9f4663351122826299b04a46ffbb2bf51f41687
 Size (nullmailer-1.13/nullmailer-1.13.tar.gz) = 205431 bytes
-SHA1 (patch-aa) = eeab7dc23266f74edaa578ca1de9422614d16dab
-SHA1 (patch-ab) = 12e7d0381a9b43888b4809799b7d2c5775bc8b6d
+SHA1 (patch-aa) = 6e8fb0269fcca08fd450b08b865f67ab3bfa1675
+SHA1 (patch-ab) = cb6ed64a5cdf413837710a6f27ea22d1e37fd1b9
 SHA1 (patch-ac) = c542bbf35dfc2148dd133837799b7f4634b66489
+SHA1 (patch-lib_fdbuf_fdobuf.h) = 716854a1421ef2021f5383f3e63bd19ece900a23
diff --git a/mail/nullmailer/patches/patch-aa b/mail/nullmailer/patches/patch-aa
index f48d396d2dc..25f0e3c47a3 100644
--- a/mail/nullmailer/patches/patch-aa
+++ b/mail/nullmailer/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/10/21 15:06:46 schmonz Exp $
+$NetBSD: patch-aa,v 1.6 2015/01/02 04:38:20 schmonz Exp $
 
---- Makefile.in.orig	2009-10-19 13:00:48.000000000 -0400
+--- Makefile.in.orig	2013-04-15 14:48:25.000000000 +0000
 +++ Makefile.in
-@@ -617,10 +617,10 @@ install-data-local:
+@@ -632,10 +632,10 @@ install-data-local:
  	chmod 600 $(DESTDIR)$(localstatedir)/trigger
  
  install-root:
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
index 6be269c6d70..ebe2f883c7b 100644
--- a/mail/nullmailer/patches/patch-ab
+++ b/mail/nullmailer/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2009/10/11 10:25:24 plunky Exp $
+$NetBSD: patch-ab,v 1.8 2015/01/02 04:38:20 schmonz Exp $
 
---- doc/nullmailer-send.8.orig	2007-10-09 17:35:44.000000000 +0100
+--- doc/nullmailer-send.8.orig	2013-03-28 23:08:05.000000000 +0000
 +++ doc/nullmailer-send.8
-@@ -94,16 +94,16 @@ If this is set to
+@@ -115,16 +115,16 @@ If this is set to
  will wait forever for messages to complete sending.
  .SH FILES
  .TP
diff --git a/mail/nullmailer/patches/patch-lib_fdbuf_fdobuf.h b/mail/nullmailer/patches/patch-lib_fdbuf_fdobuf.h
new file mode 100644
index 00000000000..c9020183ed2
--- /dev/null
+++ b/mail/nullmailer/patches/patch-lib_fdbuf_fdobuf.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_fdbuf_fdobuf.h,v 1.1 2015/01/02 04:38:20 schmonz Exp $
+
+Provide uid_t and gid_t definitions.
+
+--- lib/fdbuf/fdobuf.h.orig    2015-01-02 02:59:35.000000000 +0000
++++ lib/fdbuf/fdobuf.h
+@@ -14,6 +14,8 @@
+ // along with this program; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++#include <sys/types.h>
++
+ #ifndef FDBUF__FDOBUF__H__
+ #define FDBUF__FDOBUF__H__
+