diff options
author | taca <taca@pkgsrc.org> | 2010-09-13 14:39:30 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-09-13 14:39:30 +0000 |
commit | 7e2c24acaed581a6a8f562cf3e86b02bf9a74e61 (patch) | |
tree | bfbdc830ee2637706dabc8d80cd3047835c8a956 /www/thin | |
parent | abcb90b1c5bc3399d8562ed0d3213cae488a665c (diff) | |
download | pkgsrc-7e2c24acaed581a6a8f562cf3e86b02bf9a74e61.tar.gz |
* 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.
Diffstat (limited to 'www/thin')
-rw-r--r-- | www/thin/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/www/thin/Makefile b/www/thin/Makefile index 306ec0f6702..a3a5b7c7dfe 100644 --- a/www/thin/Makefile +++ b/www/thin/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2010/09/10 13:22:19 taca Exp $ +# $NetBSD: Makefile,v 1.7 2010/09/13 14:39:31 taca Exp $ DISTNAME= thin-1.2.7 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -12,7 +13,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rack>=1.0.0:../../www/ruby-rack DEPENDS+= ${RUBY_PKGPREFIX}-daemons>=1.0.9:../../misc/ruby-daemons DEPENDS+= ${RUBY_PKGPREFIX}-eventmachine>=0.12.6:../../devel/ruby-eventmachine -CONFLICTS+= ruby[1-9][0-9]-thin-* +CONFLICTS+= ruby[1-9][0-9]-thin-[0-9]* thin-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" |