ports/169268: [Maintainer update] Fix for ipv6

[Alan Hicks]

>Number:         169268
>Category:       ports
>Synopsis:       [Maintainer update] Fix for ipv6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 20 15:00:21 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Alan Hicks
>Release:        FreeBSD 9.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:15:25 UTC 2012 root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Fix error connecting from ipv6 address.

Also fix typo in timsieved rc script and updated from
bsd.ports.[pre|post].mk to bsd.ports.mk
	
>How-To-Repeat:
	
>Fix:
Apply patch
	

--- dbmail302r2-r3.patch begins here ---
diff -uNr dbmail.orig/Makefile dbmail/Makefile
--- dbmail.orig/Makefile	2012-06-06 05:14:37.000000000 +0100
+++ dbmail/Makefile	2012-06-20 15:09:24.000000000 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/3.0/
 
@@ -31,6 +31,8 @@
 OPTIONS_DEFAULT=	THREADS
 SIEVE_DESC=	"Build with support for Sieve mail sorting language"
 
+.include <bsd.port.options.mk>
+
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
@@ -66,25 +68,25 @@
 PLIST_SUB+=	PORTDOCS=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SIEVE)
+.if ${PORT_OPTIONS:MSIEVE}
 CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}
 LIB_DEPENDS+=	sieve:${PORTSDIR}/mail/libsieve
 PLIST_SUB+=	SIEVE=""
 .else
+CONFIGURE_ARGS+=--without-sieve
 PLIST_SUB+=	SIEVE="@comment "
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 USE_OPENLDAP=	yes
 PLIST_SUB+=	LDAP=""
 .else
+CONFIGURE_ARGS+=--without-ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
@@ -113,4 +115,4 @@
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -uNr dbmail.orig/files/dbmail-timsieved.in dbmail/files/dbmail-timsieved.in
--- dbmail.orig/files/dbmail-timsieved.in	2012-03-18 19:17:12.000000000 +0000
+++ dbmail/files/dbmail-timsieved.in	2012-06-20 14:42:21.000000000 +0100
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=dbmail-timsieved_enable
+rcvar=dbmail_timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
 pidfile=/var/run/dbmail/dbmail-timsieved.pid
diff -uNr dbmail.orig/files/patch-src_clientbase.c dbmail/files/patch-src_clientbase.c
--- dbmail.orig/files/patch-src_clientbase.c	1970-01-01 01:00:00.000000000 +0100
+++ dbmail/files/patch-src_clientbase.c	2012-06-20 12:30:24.000000000 +0100
@@ -0,0 +1,20 @@
+--- src/clientbase.c.orig	2012-06-19 17:49:50.000000000 +0100
++++ src/clientbase.c	2012-06-19 17:50:29.000000000 +0100
+@@ -160,7 +160,7 @@
+ 	} else {
+ 		/* server-side */
+ 		TRACE(TRACE_DEBUG,"saddr [%p] sa_family [%d] len [%d]", c->saddr, c->saddr->sa_family, c->saddr_len);
+-		if ((serr = getnameinfo(c->saddr, c->saddr_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
++		if ((serr = getnameinfo(c->saddr, c->saddr->sa_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV, 
+ 						NI_NUMERICHOST | NI_NUMERICSERV))) {
+ 			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
+ 		}
+@@ -168,7 +168,7 @@
+ 
+ 		/* client-side */
+ 		TRACE(TRACE_DEBUG,"caddr [%p] sa_family [%d] len [%d]", c->caddr, c->caddr->sa_family, c->caddr_len);
+-		if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
++		if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port, NI_MAXSERV,
+ 						NI_NUMERICHOST | NI_NUMERICSERV))) {
+ 			TRACE(TRACE_EMERG, "getnameinfo:error [%s]", gai_strerror(serr));
+ 		} 
--- dbmail302r2-r3.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: