From owner-svn-ports-all@FreeBSD.ORG  Sat Mar 16 15:03:25 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 861F2565;
 Sat, 16 Mar 2013 15:03:25 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 61433175;
 Sat, 16 Mar 2013 15:03:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GF3PaR096777;
 Sat, 16 Mar 2013 15:03:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GF3PKm096776;
 Sat, 16 Mar 2013 15:03:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303161503.r2GF3PKm096776@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 16 Mar 2013 15:03:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314360 - head/mail/vpopmail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Mar 2013 15:03:25 -0000

Author: bdrewery
Date: Sat Mar 16 15:03:24 2013
New Revision: 314360
URL: http://svnweb.freebsd.org/changeset/ports/314360

Log:
  - Fix leftover /var/qmail/control/locals
  
    qmail-send.c:getcontrols() refuses to startup or to process
    the virtualdomains file if locals is missing. However,
    vpopmail's vadddomain is already creating the locals file
    when adding new domains. So creating it when installing is
    not needed.
  
    At the time that this change was added to the port, in
    vpopmail-5.4.13, vadddomain did not automatically create
    the locals file. The current version does in
    vpopmail.c:remove_line()
  
    This reverts the change done in r167787 for ports/99914
  
  PR:		ports/99914 (reverts)

Modified:
  head/mail/vpopmail/Makefile

Modified: head/mail/vpopmail/Makefile
==============================================================================
--- head/mail/vpopmail/Makefile	Sat Mar 16 14:58:33 2013	(r314359)
+++ head/mail/vpopmail/Makefile	Sat Mar 16 15:03:24 2013	(r314360)
@@ -511,7 +511,6 @@ post-install:
 .if ${PORT_OPTIONS:MSUID_VCHKPW}
 	${CHMOD} ug+s ${VPOPMAIL_DIR}/bin/vchkpw
 .endif
-	@${TOUCH} ${QMAIL_PREFIX}/control/locals
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${VPOPMAIL_DIR}/doc/
 .endif