CVS commit: pkgsrc

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

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.