Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id D4B9F63BC86
	for <mhonarc+pkgsrc-changes@mail-index.netbsd.org>; Sun, 12 Sep 2010 02:41:13 +0000 (UTC)
Received: by mail.netbsd.org (Postfix, from userid 0)
	id E28A563B101; Sun, 12 Sep 2010 02:41:12 +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 0027563B100
	for <pkgsrc-changes@NetBSD.org>; Sun, 12 Sep 2010 02:41:11 +0000 (UTC)
Received: by cvs.netbsd.org (Postfix, from userid 500)
	id 6CFFA175DD; Sun, 12 Sep 2010 02:41:11 +0000 (UTC)
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Date: Sun, 12 Sep 2010 02:41:11 +0000
From: Takahiro Kambe <taca@netbsd.org>
Subject: CVS commit: pkgsrc/www/merb-gen
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
X-Mailer: log_accum
Message-Id: <20100912024111.6CFFA175DD@cvs.netbsd.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: list

Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Sep 12 02:41:11 UTC 2010

Modified Files:
	pkgsrc/www/merb-gen: Makefile PLIST distinfo

Log Message:
Update www/merb-gen to 1.1.3.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Add LICENSE.
* Ajust new ruby package's framework.
* Update dependency according to gemspec.
* Add CONFLICTS since it will install the same name commands both
  ruby18 and ruby19 based packages.

Changes are unknown.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/merb-gen/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-gen/PLIST \
    pkgsrc/www/merb-gen/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.