From owner-svn-ports-head@FreeBSD.ORG Sat Apr 19 06:24:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD561335; Sat, 19 Apr 2014 06:24:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDC3311F0; Sat, 19 Apr 2014 06:24:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3J6OFJ1089050; Sat, 19 Apr 2014 06:24:15 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3J6OEDj089045; Sat, 19 Apr 2014 06:24:14 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404190624.s3J6OEDj089045@svn.freebsd.org> From: Bryan Drewery Date: Sat, 19 Apr 2014 06:24:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351584 - in head/mail: qmail qmail-mysql qmail-spamcontrol qmail-tls X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2014 06:24:16 -0000 Author: bdrewery Date: Sat Apr 19 06:24:14 2014 New Revision: 351584 URL: http://svnweb.freebsd.org/changeset/ports/351584 QAT: https://qat.redports.org/buildarchive/r351584/ Log: - Don't try removing /var/qmail/queue at all - Remove /var/qmail/queue from STAGEDIR so it's not an orphan Modified: head/mail/qmail-mysql/Makefile head/mail/qmail-spamcontrol/Makefile head/mail/qmail-tls/Makefile head/mail/qmail/Makefile head/mail/qmail/pkg-plist Modified: head/mail/qmail-mysql/Makefile ============================================================================== --- head/mail/qmail-mysql/Makefile Sat Apr 19 06:11:21 2014 (r351583) +++ head/mail/qmail-mysql/Makefile Sat Apr 19 06:24:14 2014 (r351584) @@ -3,7 +3,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${MYSQL_PATCH_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail PKGNAMESUFFIX= -mysql Modified: head/mail/qmail-spamcontrol/Makefile ============================================================================== --- head/mail/qmail-spamcontrol/Makefile Sat Apr 19 06:11:21 2014 (r351583) +++ head/mail/qmail-spamcontrol/Makefile Sat Apr 19 06:24:14 2014 (r351584) @@ -2,7 +2,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \ ${MASTER_SITE_LOCAL:S/$/:spamcontrol/} Modified: head/mail/qmail-tls/Makefile ============================================================================== --- head/mail/qmail-tls/Makefile Sat Apr 19 06:11:21 2014 (r351583) +++ head/mail/qmail-tls/Makefile Sat Apr 19 06:24:14 2014 (r351584) @@ -3,7 +3,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${TLS_PATCH_DATE} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail PKGNAMESUFFIX= -tls Modified: head/mail/qmail/Makefile ============================================================================== --- head/mail/qmail/Makefile Sat Apr 19 06:11:21 2014 (r351583) +++ head/mail/qmail/Makefile Sat Apr 19 06:24:14 2014 (r351584) @@ -3,7 +3,7 @@ PORTNAME= qmail PORTVERSION?= ${QMAIL_VERSION} -PORTREVISION?= 9 +PORTREVISION?= 10 CATEGORIES= mail MASTER_SITES+= ${MASTER_SITE_QMAIL} DISTNAME= ${PORTNAME}-${QMAIL_VERSION} @@ -909,6 +909,8 @@ post-install: ${ECHO_CMD} "@exec install -d -o root -g qmail ${PREFIX}"; \ ${ECHO_CMD} "@unexec rmdir ${QMAIL_PREFIX} 2>/dev/null || :"; \ } >> ${TMPPLIST} +# Stop check-orphans finding the queue dir + ${RM} -rf ${STAGEDIR}${PREFIX}/queue/ certificate: .if defined(SLAVE_TLS) || defined(SLAVE_LDAP) Modified: head/mail/qmail/pkg-plist ============================================================================== --- head/mail/qmail/pkg-plist Sat Apr 19 06:11:21 2014 (r351583) +++ head/mail/qmail/pkg-plist Sat Apr 19 06:24:14 2014 (r351584) @@ -227,7 +227,6 @@ scripts/mkaliasdir @dirrm scripts @dirrmtry control @dirrmtry alias -@dirrmtry queue @dirrmtry users @unexec echo "1) If you are permanently removing qmail, you should also 'rm -rf ${PKG_PREFIX}' and remove the qmail users/groups." | /usr/bin/fmt @unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt