From owner-svn-ports-all@FreeBSD.ORG Tue Jun 24 18:27:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 ESMTPS id B2118B1E; Tue, 24 Jun 2014 18:27:29 +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 9E56929AC; Tue, 24 Jun 2014 18:27:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OIRTwg066133; Tue, 24 Jun 2014 18:27:29 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OIRSDr066128; Tue, 24 Jun 2014 18:27:28 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406241827.s5OIRSDr066128@svn.freebsd.org> From: Bryan Drewery Date: Tue, 24 Jun 2014 18:27:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359119 - in head/mail: qmail qmail-ldap 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 18:27:29 -0000 Author: bdrewery Date: Tue Jun 24 18:27:28 2014 New Revision: 359119 URL: http://svnweb.freebsd.org/changeset/ports/359119 QAT: https://qat.redports.org/buildarchive/r359119/ Log: Fix CONFLICTS after qmail->netqmail rename Modified: head/mail/qmail-ldap/Makefile head/mail/qmail-mysql/Makefile head/mail/qmail-spamcontrol/Makefile head/mail/qmail-tls/Makefile head/mail/qmail/Makefile Modified: head/mail/qmail-ldap/Makefile ============================================================================== --- head/mail/qmail-ldap/Makefile Tue Jun 24 18:15:43 2014 (r359118) +++ head/mail/qmail-ldap/Makefile Tue Jun 24 18:27:28 2014 (r359119) @@ -12,7 +12,7 @@ COMMENT= Secure, reliable, and fast MTA RUN_DEPENDS= ${LOCALBASE}/bin/svscan:${PORTSDIR}/sysutils/daemontools \ ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp -CONFLICTS= emboss-[0-9]* digest-[0-9]* qmail-[0-9]* qmail-mysql-[0-9]* \ +CONFLICTS= emboss-[0-9]* digest-[0-9]* *qmail-[0-9]* *qmail-mysql-[0-9]* \ qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* EXTRA_PATCHES+= ${MASTERDIR}/files/patch-Makefile \ Modified: head/mail/qmail-mysql/Makefile ============================================================================== --- head/mail/qmail-mysql/Makefile Tue Jun 24 18:15:43 2014 (r359118) +++ head/mail/qmail-mysql/Makefile Tue Jun 24 18:27:28 2014 (r359119) @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -mysql COMMENT= Secure, reliable, and fast MTA for UNIX systems with MySQL support -CONFLICTS= qmail-[0-9]* qmail-ldap-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* +CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* MYSQL_PATCH_VERSION= 1.1.15 Modified: head/mail/qmail-spamcontrol/Makefile ============================================================================== --- head/mail/qmail-spamcontrol/Makefile Tue Jun 24 18:15:43 2014 (r359118) +++ head/mail/qmail-spamcontrol/Makefile Tue Jun 24 18:27:28 2014 (r359119) @@ -13,7 +13,7 @@ EXTRACT_ONLY= ${QMAIL_DIST} COMMENT= Qmail MTA with SpamControl patches -CONFLICTS= qmail-[0-9]* qmail-ldap-[0-9]* qmail-mysql-[0-9]* qmail-tls-[0-9]* +CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-tls-[0-9]* EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \ ${MASTERDIR}/files/patch-Makefile \ Modified: head/mail/qmail-tls/Makefile ============================================================================== --- head/mail/qmail-tls/Makefile Tue Jun 24 18:15:43 2014 (r359118) +++ head/mail/qmail-tls/Makefile Tue Jun 24 18:27:28 2014 (r359119) @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -tls COMMENT= Secure, reliable, and fast MTA for UNIX systems with TLS support -CONFLICTS= qmail-[0-9]* qmail-ldap-[0-9]* qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* +CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* SLAVE_TLS= yes Modified: head/mail/qmail/Makefile ============================================================================== --- head/mail/qmail/Makefile Tue Jun 24 18:15:43 2014 (r359118) +++ head/mail/qmail/Makefile Tue Jun 24 18:27:28 2014 (r359119) @@ -15,7 +15,7 @@ COMMENT?= Secure, reliable, efficient, s DIST_SUBDIR= qmail -CONFLICTS?= qmail-ldap-[0-9]* qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* +CONFLICTS?= qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* CONFLICTS+= qmail-vida-[0-9]* USES= qmail:vars