diff options
| -rw-r--r-- | mail/dbmail/Makefile | 16 | ||||
| -rw-r--r-- | mail/dbmail/files/dbmail-timsieved.in | 4 | ||||
| -rw-r--r-- | mail/dbmail/files/patch-src_clientbase.c | 20 |
3 files changed, 31 insertions, 9 deletions
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 153efc9a51e4..5c495bc04e91 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -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_DEFINE= LDAP SIEVE THREADS 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="@comment " 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 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/dbmail/files/dbmail-timsieved.in b/mail/dbmail/files/dbmail-timsieved.in index 25b35e19fba1..149d1c4fb70e 100644 --- a/mail/dbmail/files/dbmail-timsieved.in +++ b/mail/dbmail/files/dbmail-timsieved.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-timsieved.in,v 1.1 2012-03-18 19:17:12 rm Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/dbmail/files/dbmail-timsieved.in,v 1.2 2012-06-24 19:19:06 beech Exp $ # # PROVIDE: dbmail-timsieved @@ -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 --git a/mail/dbmail/files/patch-src_clientbase.c b/mail/dbmail/files/patch-src_clientbase.c new file mode 100644 index 000000000000..cfc407937abb --- /dev/null +++ b/mail/dbmail/files/patch-src_clientbase.c @@ -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)); + } |