From 6e6205580957920079e2e7fcac7a119538e1b50c Mon Sep 17 00:00:00 2001
From: ben <ben@pkgsrc.org>
Date: Sun, 1 Jan 2006 17:02:21 +0000
Subject: Interix uses WinSock, which does not provide SO_RCVTIMEO nor
 SO_SNDTIMEO. Skip these options when building on Interix.

---
 mail/msmtp/Makefile         |  7 ++++++-
 mail/msmtp/distinfo         |  3 ++-
 mail/msmtp/patches/patch-aa | 13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 mail/msmtp/patches/patch-aa

(limited to 'mail/msmtp')

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 175ce7977a8..0b912df3821 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/16 10:59:08 adam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/01 17:02:21 ben Exp $
 
 DISTNAME=	msmtp-1.4.4
 CATEGORIES=	mail
@@ -15,6 +15,11 @@ EGDIR=		${PREFIX}/share/examples/msmtp
 
 INFO_FILES=	msmtp.info
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Interix"
+CPPFLAGS+=	-D__WINSOCK
+.endif
+
 .include "options.mk"
 
 post-install:
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index d37922c7c43..bcd402dcd90 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/08/16 10:59:08 adam Exp $
+$NetBSD: distinfo,v 1.10 2006/01/01 17:02:21 ben Exp $
 
 SHA1 (msmtp-1.4.4.tar.bz2) = 2b8437bb613a4054f51e94f4a6a4784b2abe3458
 RMD160 (msmtp-1.4.4.tar.bz2) = c83018a31815e031cd1b34bceb71862fb7a5399f
 Size (msmtp-1.4.4.tar.bz2) = 480904 bytes
+SHA1 (patch-aa) = bd0cb9fe4282b6a8193b38c883d7f7b1b46cd222
diff --git a/mail/msmtp/patches/patch-aa b/mail/msmtp/patches/patch-aa
new file mode 100644
index 00000000000..8e9285b956a
--- /dev/null
+++ b/mail/msmtp/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2006/01/01 17:02:21 ben Exp $
+
+--- src/net.c.orig	Sun Aug 14 13:13:06 2005
++++ src/net.c
+@@ -325,7 +325,7 @@ void net_set_io_timeout(int socket, int 
+      * en-us/winsock/winsock/setsockopt_2.asp
+      * We activate these timeouts only for Windows systems that also have
+      * getaddrinfo(), which means XP or newer, to work around this problem. */
+-#if defined __MINGW32__ && !defined HAVE_GETADDRINFO
++#if (defined __MINGW32__ && !defined HAVE_GETADDRINFO) || defined __WINSOCK
+     /* do nothing */
+ #else
+     struct timeval tv;
-- 
cgit v1.2.3