[pkgsrc/trunk]: pkgsrc/mail/msmtp Interix uses WinSock, which does not provid...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/712a7f18c134
branches:  trunk
changeset: 505231:712a7f18c134
user:      ben <ben%pkgsrc.org@localhost>
date:      Sun Jan 01 17:02:21 2006 +0000

description:
Interix uses WinSock, which does not provide SO_RCVTIMEO nor SO_SNDTIMEO.
Skip these options when building on Interix.

diffstat:

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

diffs (49 lines):

diff -r e936f67e9bbb -r 712a7f18c134 mail/msmtp/Makefile
--- a/mail/msmtp/Makefile       Sun Jan 01 16:17:15 2006 +0000
+++ b/mail/msmtp/Makefile       Sun Jan 01 17:02:21 2006 +0000
@@ -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 @@
 
 INFO_FILES=    msmtp.info
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Interix"
+CPPFLAGS+=     -D__WINSOCK
+.endif
+
 .include "options.mk"
 
 post-install:
diff -r e936f67e9bbb -r 712a7f18c134 mail/msmtp/distinfo
--- a/mail/msmtp/distinfo       Sun Jan 01 16:17:15 2006 +0000
+++ b/mail/msmtp/distinfo       Sun Jan 01 17:02:21 2006 +0000
@@ -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 -r e936f67e9bbb -r 712a7f18c134 mail/msmtp/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/msmtp/patches/patch-aa       Sun Jan 01 17:02:21 2006 +0000
@@ -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;