From fe2f63f77b06b31d272726c14aac6805d41b8a24 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@gmail.com>
Date: Sun, 13 Mar 2016 18:43:03 +0000
Subject: [PATCH] mail/opensmtpd

---
 mail/opensmtpd/Makefile                 |  5 +++++
 mail/opensmtpd/PLIST                    | 14 +++++++-------
 mail/opensmtpd/distinfo                 |  3 +++
 mail/opensmtpd/patches/patch-zz-minix-a | 11 +++++++++++
 mail/opensmtpd/patches/patch-zz-minix-b | 11 +++++++++++
 mail/opensmtpd/patches/patch-zz-minix-c | 11 +++++++++++
 6 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 mail/opensmtpd/patches/patch-zz-minix-a
 create mode 100644 mail/opensmtpd/patches/patch-zz-minix-b
 create mode 100644 mail/opensmtpd/patches/patch-zz-minix-c

diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 63739cfcb..f6ce3053e 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -48,6 +48,11 @@ SUBST_MESSAGE.exampledir=	Fixing exampledir path
 SUBST_FILES.exampledir=		smtpd/Makefile.am
 SUBST_SED.exampledir+=		-e 's,@EXAMPLE_DIR@,${EXAMPLEDIR},'
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+CPPFLAGS+= -D_OPENBSD_SOURCE
+.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+
 post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 
diff --git a/mail/opensmtpd/PLIST b/mail/opensmtpd/PLIST
index 290e093c4..a156105bc 100644
--- a/mail/opensmtpd/PLIST
+++ b/mail/opensmtpd/PLIST
@@ -4,13 +4,13 @@ bin/newaliases
 bin/smtpscript
 libexec/mail.local
 libexec/opensmtpd/makemap
-man/man5/aliases.5
-man/man5/forward.5
-man/man5/smtpd.conf.5
-man/man8/makemap.8
-man/man8/newaliases.8
-man/man8/smtpctl.8
-man/man8/smtpd.8
+man/cat5/aliases.5
+man/cat5/forward.5
+man/cat5/smtpd.conf.5
+man/cat8/makemap.8
+man/cat8/newaliases.8
+man/cat8/smtpctl.8
+man/cat8/smtpd.8
 sbin/makemap
 sbin/smtpctl
 sbin/smtpd
diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
index eee1995b5..d874324c4 100644
--- a/mail/opensmtpd/distinfo
+++ b/mail/opensmtpd/distinfo
@@ -6,3 +6,6 @@ Size (opensmtpd-5.3.3p1.tar.gz) = 343733 bytes
 SHA1 (patch-configure.ac) = ed819952951700c057c11200095a72972aafc1f9
 SHA1 (patch-smtpd_Makefile.am) = 4267002ecadceaf68868b9d782d5e6f8571ebc36
 SHA1 (patch-smtpd_queue_fsqueue.c) = 80dae37705378c022c1a76d31ea54a3f907b6c1a
+SHA1 (patch-zz-minix-a) = 3c402b4c78c9d44728cabf2ce9193276b56f2989
+SHA1 (patch-zz-minix-b) = d77fa1c90d95e105a4b5e0d6dba2c387deae2c39
+SHA1 (patch-zz-minix-c) = a5d12cacd94ae8e3a7d62fd843c7884859ebe8b8
diff --git a/mail/opensmtpd/patches/patch-zz-minix-a b/mail/opensmtpd/patches/patch-zz-minix-a
new file mode 100644
index 000000000..e509f7066
--- /dev/null
+++ b/mail/opensmtpd/patches/patch-zz-minix-a
@@ -0,0 +1,11 @@
+--- configure.ac.orig	Sun Mar 13 17:02:45 2016
++++ configure.ac	Sun Mar 13 17:08:12 2016
+@@ -411,7 +411,7 @@
+ 		;;
+ 	esac
+ 	;;
+-*-*-netbsd*)
++	*-*-netbsd*|*-*-minix*)
+ 	check_for_libcrypt_before=1
+ 	if test "x$withval" != "xno" ; then
+ 		need_dash_r=1
diff --git a/mail/opensmtpd/patches/patch-zz-minix-b b/mail/opensmtpd/patches/patch-zz-minix-b
new file mode 100644
index 000000000..4350bad4a
--- /dev/null
+++ b/mail/opensmtpd/patches/patch-zz-minix-b
@@ -0,0 +1,11 @@
+--- smtpd/queue_fsqueue.c.orig	Sun Mar 13 17:55:33 2016
++++ smtpd/queue_fsqueue.c	Sun Mar 13 17:51:46 2016
+@@ -28,7 +28,7 @@
+ #endif
+ #ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__minix)
+ #define statfs statvfs
+ #endif
+ #endif
diff --git a/mail/opensmtpd/patches/patch-zz-minix-c b/mail/opensmtpd/patches/patch-zz-minix-c
new file mode 100644
index 000000000..90584097f
--- /dev/null
+++ b/mail/opensmtpd/patches/patch-zz-minix-c
@@ -0,0 +1,11 @@
+--- smtpd/Makefile.am.orig	Sun Mar 13 18:26:08 2016
++++ smtpd/Makefile.am	Sun Mar 13 18:33:22 2016
+@@ -139,7 +139,7 @@
+ 
+ $(MANPAGES): $(MANPAGES_IN)
+ 	if test "$(MANTYPE)" = "cat"; then \
+-		manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
++		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
+ 	else \
+ 		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
+ 	fi; \