Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11]) by www.NetBSD.org (Postfix) with ESMTP id 388F663BC86 for ; Mon, 13 Sep 2010 14:39:34 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 0) id B36DC63B101; Mon, 13 Sep 2010 14:39:33 +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 7AA9D63B100 for ; Mon, 13 Sep 2010 14:39:32 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 4A0A1175DD; Mon, 13 Sep 2010 14:39:32 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain Date: Mon, 13 Sep 2010 14:39:32 +0000 From: Takahiro Kambe Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20100913143932.4A0A1175DD@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: list Module Name: pkgsrc Committed By: taca Date: Mon Sep 13 14:39:32 UTC 2010 Modified Files: pkgsrc/devel/newfile: Makefile pkgsrc/graphics/x11rec: Makefile pkgsrc/sysutils/pdumpfs: Makefile pkgsrc/sysutils/puppet: Makefile pkgsrc/textproc/xhtmldiff: Makefile pkgsrc/www/merbful-authentication: Makefile pkgsrc/www/mongrel: Makefile pkgsrc/www/mongrel-cluster: Makefile pkgsrc/www/mongrel-config: Makefile pkgsrc/www/mongrel-console: Makefile pkgsrc/www/mongrel-upload-progress: Makefile pkgsrc/www/thin: Makefile Log Message: * Add two CONFLICTS patterns: - matches previous package name without "${RUBY_PKGPREFIX}-" - matches current "ruby18-" and "ruby19-" packages * Since these packages aren't update its version during update of Ruby package's framework, bump PKGREVISION for safe update. Noted by obache@ on tech-pkg. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/newfile/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/x11rec/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/pdumpfs/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/puppet/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/xhtmldiff/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/merbful-authentication/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/mongrel/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/mongrel-cluster/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/mongrel-config/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/mongrel-console/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/mongrel-upload-progress/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/thin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.