Upgrade dbmail from 3.1.6 to 3.1.7 Fix: Apply patch Fixes minor bugs including - POP3 sometimes failed due to a missing final line - orphaned rows in the headervalues and headernames tables are now cleaned
Responsible Changed From-To: freebsd-ports-bugs->wg I'll take it.
Author: wg Date: Thu Sep 26 15:59:24 2013 New Revision: 328374 URL: http://svnweb.freebsd.org/changeset/ports/328374 Log: mail/dbmail: update to 3.1.7 - Update to 3.1.7 [1] - Define DOCS option - Allow staging PR: ports/182406 [1] Submitted by: Alan Hicks <ahicks p-o.co.uk> (maintainer) [1] Modified: head/mail/dbmail/Makefile head/mail/dbmail/distinfo head/mail/dbmail/pkg-plist Modified: head/mail/dbmail/Makefile ============================================================================== --- head/mail/dbmail/Makefile Thu Sep 26 15:52:38 2013 (r328373) +++ head/mail/dbmail/Makefile Thu Sep 26 15:59:24 2013 (r328374) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dbmail -PORTVERSION= 3.1.6 +PORTVERSION= 3.1.7 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/3.1/ @@ -22,7 +22,7 @@ BUILD_DEPENDS+= asciidoc:${PORTSDIR}/tex CONFLICTS= dbmail-2.* -OPTIONS_DEFINE= LDAP SIEVE THREADS +OPTIONS_DEFINE= DOCS LDAP SIEVE THREADS OPTIONS_DEFAULT= THREADS SIEVE_DESC= Build with support for Sieve mail sorting language @@ -41,17 +41,8 @@ MAKE_ARGS+= mandir=${MANPREFIX}/man PORTDOCS= AUTHORS BUGS INSTALL THANKS UPGRADING -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -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 @@ -60,12 +51,6 @@ PLIST_SUB+= DBMAIL_USER="${DBMAIL_USER}" DBMAIL_GROUP="${DBMAIL_GROUP}" \ PIDDIR="${PIDDIR}" -.if empty(PORT_OPTIONS:MDOCS) -PLIST_SUB+= PORTDOCS="@comment " -.else -PLIST_SUB+= PORTDOCS="" -.endif - .if ${PORT_OPTIONS:MSIEVE} CONFIGURE_ARGS+=--with-sieve=${LOCALBASE} LIB_DEPENDS+= libsieve.so:${PORTSDIR}/mail/libsieve @@ -93,23 +78,16 @@ 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} + ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR} @for f in mysql oracle postgresql sqlite; do \ - ${MKDIR} ${DATADIR}/$$f ; \ - ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \ + ${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \ + ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \ done - @${MKDIR} ${PIDDIR} - @${CHOWN} ${DBMAIL_USER}:${DBMAIL_GROUP} ${PIDDIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} * ${DOCSDIR}) -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PIDDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} * ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/mail/dbmail/distinfo ============================================================================== --- head/mail/dbmail/distinfo Thu Sep 26 15:52:38 2013 (r328373) +++ head/mail/dbmail/distinfo Thu Sep 26 15:59:24 2013 (r328374) @@ -1,2 +1,2 @@ -SHA256 (dbmail-3.1.6.tar.gz) = 380fc123c8e6cfca7e9c06892d501ddea61c36f88e567d133202c16bf265a71a -SIZE (dbmail-3.1.6.tar.gz) = 2394514 +SHA256 (dbmail-3.1.7.tar.gz) = 657965a87a217495b2bd5f292ef1b4948e85d195e54e9c0e4981d46cf72427aa +SIZE (dbmail-3.1.7.tar.gz) = 2395315 Modified: head/mail/dbmail/pkg-plist ============================================================================== --- head/mail/dbmail/pkg-plist Thu Sep 26 15:52:38 2013 (r328373) +++ head/mail/dbmail/pkg-plist Thu Sep 26 15:59:24 2013 (r328374) @@ -13,6 +13,18 @@ lib/dbmail/libdbmail.so.0 %%SIEVE%%lib/dbmail/libsort_sieve.la %%SIEVE%%lib/dbmail/libsort_sieve.so %%SIEVE%%lib/dbmail/libsort_sieve.so.0 +man/man1/dbmail-deliver.1.gz +man/man1/dbmail.1.gz +man/man5/dbmail.conf.5.gz +man/man8/dbmail-export.8.gz +man/man8/dbmail-httpd.8.gz +man/man8/dbmail-imapd.8.gz +man/man8/dbmail-lmtpd.8.gz +man/man8/dbmail-pop3d.8.gz +man/man8/dbmail-sievecmd.8.gz +man/man8/dbmail-timsieved.8.gz +man/man8/dbmail-users.8.gz +man/man8/dbmail-util.8.gz sbin/dbmail-deliver sbin/dbmail-export sbin/dbmail-httpd _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!