Index: head/mail/dbmail/Makefile =================================================================== --- head/mail/dbmail/Makefile (revision 299903) +++ head/mail/dbmail/Makefile (revision 299904) @@ -1,116 +1,118 @@ # New ports collection makefile for: dbmail # Date created: 07/26/2003 # Whom: Clement Laforet # # $FreeBSD$ # PORTNAME= dbmail PORTVERSION= 3.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/3.0/ MAINTAINER= ahicks@p-o.co.uk COMMENT= An SQL database-based mail system (POP3 and IMAP) LICENSE= GPLv2 .if !defined(NOPORTDOCS) BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto .endif LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \ zdb:${PORTSDIR}/databases/libzdb \ mhash:${PORTSDIR}/security/mhash \ event:${PORTSDIR}/devel/libevent CONFLICTS= dbmail-*-2.0.* dbmail-2.* OPTIONS_DEFINE= LDAP SIEVE THREADS OPTIONS_DEFAULT= THREADS SIEVE_DESC= "Build with support for Sieve mail sorting language" +.include + USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved USE_OPENSSL= yes CFLAGS+= -fPIC ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc MAKE_ARGS+= mandir=${MANPREFIX}/man PORTDOCS= AUTHORS BUGS INSTALL THANKS UPGRADING .if !defined(NOPORTDOCS) MAN1= dbmail-deliver.1 dbmail.1 MAN5= dbmail.conf.5 MAN8= dbmail-export.8 dbmail-httpd.8 dbmail-imapd.8 \ dbmail-lmtpd.8 dbmail-pop3d.8 dbmail-sievecmd.8 \ dbmail-timsieved.8 dbmail-users.8 dbmail-util.8 .endif DBMAIL_USER?= mailnull DBMAIL_GROUP?= mail PIDDIR?= /var/run/dbmail PLIST_SUB+= DBMAIL_USER="${DBMAIL_USER}" \ DBMAIL_GROUP="${DBMAIL_GROUP}" \ PIDDIR="${PIDDIR}" .if defined(NOPORTDOCS) PLIST_SUB+= PORTDOCS="@comment " .else PLIST_SUB+= PORTDOCS="" .endif -.include - -.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 .if !defined(NOPORTDOCS) CONFIGURE_ARGS+= --enable-manpages .endif post-install: @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist @if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \ ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \ fi @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${DATADIR} @for f in mysql oracle postgresql sqlite; do \ ${MKDIR} ${DATADIR}/$$f ; \ ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \ done @${MKDIR} ${PIDDIR} @${CHOWN} ${DBMAIL_USER}:${DBMAIL_GROUP} ${PIDDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} * ${DOCSDIR}) .endif @${CAT} ${PKGMESSAGE} -.include +.include Property changes on: head/mail/dbmail/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.50 \ No newline at end of property +1.51 \ No newline at end of property Index: head/mail/dbmail/files/dbmail-timsieved.in =================================================================== --- head/mail/dbmail/files/dbmail-timsieved.in (revision 299903) +++ head/mail/dbmail/files/dbmail-timsieved.in (revision 299904) @@ -1,32 +1,32 @@ #!/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 # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable dbmail-timsieved: # # dbmail_timsieved_enable="YES" # dbmail_timsieved_flags="" # # See dbmail-timsieved(8) for flags # . /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 required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_timsieved_enable="NO"} run_rc_command "$1" Property changes on: head/mail/dbmail/files/dbmail-timsieved.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/dbmail/files/patch-src_clientbase.c =================================================================== --- head/mail/dbmail/files/patch-src_clientbase.c (nonexistent) +++ head/mail/dbmail/files/patch-src_clientbase.c (revision 299904) @@ -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)); + } Property changes on: head/mail/dbmail/files/patch-src_clientbase.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property