From alan@p-o.co.uk  Thu Sep 26 11:56:18 2013
Return-Path: <alan@p-o.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 48899ADE
	for <freebsd-gnats-submit@freebsd.org>; Thu, 26 Sep 2013 11:56:18 +0000 (UTC)
	(envelope-from alan@p-o.co.uk)
Received: from avasout05.plus.net (avasout05.plus.net [84.93.230.250])
	by mx1.freebsd.org (Postfix) with ESMTP id AC752253D
	for <freebsd-gnats-submit@freebsd.org>; Thu, 26 Sep 2013 11:56:17 +0000 (UTC)
Received: from mail.p-o.co.uk ([80.229.143.200])
	by avasout05 with smtp
	id Vnt61m0024Ke75s01nt7so; Thu, 26 Sep 2013 12:53:07 +0100
Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <alan@p-o.co.uk>)
	id 1VPA49-000DmG-Om
	for FreeBSD-gnats-submit@freebsd.org; Thu, 26 Sep 2013 12:49:05 +0100
Message-Id: <E1VPA49-000DmG-Om@p-o.co.uk>
Date: Thu, 26 Sep 2013 12:49:05 +0100
From: Alan Hicks <ahicks@p-o.co.uk>
Reply-To: Alan Hicks <ahicks@p-o.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer patch] Upgrade mail/dbmail to 3.1.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         182406
>Category:       ports
>Synopsis:       [Maintainer patch] Upgrade mail/dbmail to 3.1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 26 12:00:01 UTC 2013
>Closed-Date:    Thu Sep 26 15:59:41 UTC 2013
>Last-Modified:  Thu Sep 26 16:00:00 UTC 2013
>Originator:     Alan Hicks
>Release:        FreeBSD 9.1-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD schnittke.p-o.co.uk 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:23:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Upgrade dbmail from 3.1.6 to 3.1.7
	
>How-To-Repeat:
	
>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
	

--- dbmail-316-317.diff begins here ---
diff -ur dbmail/Makefile dbmail/Makefile
--- dbmail/Makefile	2013-09-20 20:59:12.000000000 +0100
+++ dbmail/Makefile	2013-09-26 12:17:21.000000000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: mail/dbmail/Makefile 327742 2013-09-20 19:59:12Z bapt $
 
 PORTNAME=	dbmail
-PORTVERSION=	3.1.6
+PORTVERSION=	3.1.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/3.1/
 
diff -ur dbmail/distinfo dbmail/distinfo
--- dbmail/distinfo	2013-09-14 07:51:08.000000000 +0100
+++ dbmail/distinfo	2013-09-26 12:17:34.000000000 +0100
@@ -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
--- dbmail-316-317.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Thu Sep 26 12:56:16 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182406 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Thu Sep 26 15:59:40 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182406 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182406: commit references a PR
Date: Thu, 26 Sep 2013 15:59:32 +0000 (UTC)

 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"
 
>Unformatted:
