3 files changed, 21 insertions, 11 deletions

diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index 1c69a6246de6..06f47bc271be 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mini_sendmail
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail
 MASTER_SITES=	http://www.acme.com/software/mini_sendmail/
 
diff --git a/mail/mini_sendmail/files/patch-disable-ipv6 b/mail/mini_sendmail/files/patch-disable-ipv6
deleted file mode 100644
index fc15fda6bddf..000000000000
--- a/mail/mini_sendmail/files/patch-disable-ipv6
+++ /dev/null
@@ -1,10 +0,0 @@
---- mini_sendmail.c.orig	Fri Aug 29 11:02:43 2003
-+++ mini_sendmail.c	Fri Aug 29 11:03:03 2003
-@@ -541,6 +541,7 @@ add_recipient( char* recipient, int len 
- #if defined(AF_INET6) && defined(IN6_IS_ADDR_V4MAPPED)
- #define USE_IPV6
- #endif
-+#undef USE_IPV6
- 
- static int
- open_client_socket( void )
diff --git a/mail/mini_sendmail/files/patch-mini_sendmail.c b/mail/mini_sendmail/files/patch-mini_sendmail.c
new file mode 100644
index 000000000000..31dca16a1bfe
--- /dev/null
+++ b/mail/mini_sendmail/files/patch-mini_sendmail.c
@@ -0,0 +1,20 @@
+--- mini_sendmail.c.orig	Thu Nov 21 23:27:55 2002
++++ mini_sendmail.c	Fri Aug 29 17:45:40 2003
+@@ -575,14 +575,15 @@ open_client_socket( void )
+     sock_family = PF_INET6;
+ 
+ #ifdef DO_MINUS_S
+-    if ( inet_pton( PF_INET, server, (void*) &sa4.sin_addr ) == 0 )
++	(void) memset( (void*) &sa4, 0, sizeof(sa4) );
++	if ( inet_pton( AF_INET, server, (void*) &sa4.sin_addr ) == 1 )
+ 	{
+ 	sock_family = PF_INET;
+ 	sa4.sin_port = htons( SMTP_PORT );
+ 	sa_len = sizeof(sa4);
+ 	(void) memmove( &sa, &sa4, sa_len );
+ 	}
+-    else if ( inet_pton( PF_INET6, server, (void*) &sa.sin6_addr ) == -1 )
++	else if ( inet_pton( AF_INET6, server, (void*) &sa.sin6_addr ) != 1 )
+ 	{
+ #ifdef DO_DNS
+ 	(void) memset( &hints, 0, sizeof(hints) );