CVS commit: pkgsrc

[Takahiro Kambe <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Sep 13 14:32:42 UTC 2010

Modified Files:
        pkgsrc/devel/rake: Makefile
        pkgsrc/www/merb: Makefile
        pkgsrc/www/merb-action-args: Makefile
        pkgsrc/www/merb-activerecord: Makefile
        pkgsrc/www/merb-assets: Makefile
        pkgsrc/www/merb-builder: Makefile
        pkgsrc/www/merb-datamapper: Makefile
        pkgsrc/www/merb-haml: Makefile
        pkgsrc/www/merb-has-flash: Makefile
        pkgsrc/www/merb-helpers: Makefile
        pkgsrc/www/merb-mailer: Makefile
        pkgsrc/www/merb-more: Makefile
        pkgsrc/www/merb-param-protection: Makefile
        pkgsrc/www/merb-parts: Makefile
        pkgsrc/www/merb-sequel: Makefile
        pkgsrc/www/merb-stories: Makefile
        pkgsrc/www/merb-test-unit: Makefile

Log Message:
* Add CONFLICTS a pattern matches previous package name
  without "${RUBY_PKGPREFIX}-".


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/rake/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-action-args/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-activerecord/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-assets/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-builder/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-datamapper/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-haml/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-has-flash/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-helpers/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-mailer/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-more/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-param-protection/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-parts/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/merb-sequel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-stories/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/merb-test-unit/Makefile

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