Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 60D0FA642D for ; Thu, 5 Dec 2013 14:20:06 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BE74914A12B; Thu, 5 Dec 2013 14:20:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 892A114A125 for ; Thu, 5 Dec 2013 14:20:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id luPbw6ms63Kq for ; Thu, 5 Dec 2013 14:20:03 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 0F8CC14A101 for ; Thu, 5 Dec 2013 14:20:03 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 099A796; Thu, 5 Dec 2013 14:20:03 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Thu, 5 Dec 2013 14:20:03 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20131205142003.099A796@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: wiz Date: Thu Dec 5 14:20:02 UTC 2013 Modified Files: pkgsrc/databases/mysql51-client: Makefile pkgsrc/databases/mysql51-server: Makefile pkgsrc/databases/mysql55-client: Makefile pkgsrc/databases/mysql55-server: Makefile pkgsrc/databases/mysql56-client: Makefile pkgsrc/databases/mysql56-server: Makefile Log Message: Remove CONFLICTS with ${PKGBASE}, these are automatic. Avoids unnecessary pkgin warning. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mysql51-client/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/mysql51-server/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mysql55-client/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mysql55-server/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mysql56-client/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mysql56-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.