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 | |
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.
-rw-r--r-- | devel/newfile/Makefile | 6 | ||||
-rw-r--r-- | graphics/x11rec/Makefile | 6 | ||||
-rw-r--r-- | sysutils/pdumpfs/Makefile | 6 | ||||
-rw-r--r-- | sysutils/puppet/Makefile | 5 | ||||
-rw-r--r-- | textproc/xhtmldiff/Makefile | 6 | ||||
-rw-r--r-- | www/merbful-authentication/Makefile | 6 | ||||
-rw-r--r-- | www/mongrel-cluster/Makefile | 5 | ||||
-rw-r--r-- | www/mongrel-config/Makefile | 5 | ||||
-rw-r--r-- | www/mongrel-console/Makefile | 5 | ||||
-rw-r--r-- | www/mongrel-upload-progress/Makefile | 6 | ||||
-rw-r--r-- | www/mongrel/Makefile | 5 | ||||
-rw-r--r-- | www/thin/Makefile | 5 |
12 files changed, 49 insertions, 17 deletions
diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile index 64e02ea45b1..e81b335c66c 100644 --- a/devel/newfile/Makefile +++ b/devel/newfile/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2010/09/10 05:03:12 taca Exp $ +# $NetBSD: Makefile,v 1.20 2010/09/13 14:39:30 taca Exp $ # DISTNAME= newfile-1.0.14 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newfile/} @@ -13,6 +13,8 @@ LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS+= ruby[1-9][0-9]-newfile-* newfile-* + NO_BUILD= yes GNU_CONFIGURE= yes REPLACE_RUBY= src/newfile.rb.in diff --git a/graphics/x11rec/Makefile b/graphics/x11rec/Makefile index c892e7ffe6f..6d1278a3ea1 100644 --- a/graphics/x11rec/Makefile +++ b/graphics/x11rec/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2009/08/11 15:40:18 drochner Exp $ +# $NetBSD: Makefile,v 1.17 2010/09/13 14:39:30 taca Exp $ # DISTNAME= x11rec-0.3 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics ruby MASTER_SITES= http://0xcc.net/x11rec/ @@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= gifsicle-[0-9]*:../../graphics/gifsicle DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick +CONFLICTS+= ruby[1-9][0-9]-x11rec-[0-9]* x11rec-[0-9]* + NO_BUILD= yes REPLACE_RUBY= x11rec diff --git a/sysutils/pdumpfs/Makefile b/sysutils/pdumpfs/Makefile index b4dfde6a06a..b215cbd249c 100644 --- a/sysutils/pdumpfs/Makefile +++ b/sysutils/pdumpfs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2009/07/10 09:00:41 obache Exp $ +# $NetBSD: Makefile,v 1.10 2010/09/13 14:39:30 taca Exp $ # DISTNAME= pdumpfs-${VER} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://0xcc.net/pdumpfs/ @@ -13,6 +13,8 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS+= ruby[1-9][0-9]-pdumpfs-[0-9]* pdumpfs-[0-9]* + USE_TOOLS+= pax VER= 1.3 diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 10f4653d5f4..094c0382933 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2010/09/10 07:52:13 taca Exp $ +# $NetBSD: Makefile,v 1.12 2010/09/13 14:39:30 taca Exp $ DISTNAME= puppet-0.25.5 +PKGREVISION= 1 CATEGORIES= sysutils #MASTER_SITES= http://puppetlabs.com/downloads/puppet/ @@ -13,6 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.3.8:../../sysutils/ruby-facter +CONFLICTS+= ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]* + PKG_SYSCONFSUBDIR= puppet RCD_SCRIPTS= puppetd puppetmasterd diff --git a/textproc/xhtmldiff/Makefile b/textproc/xhtmldiff/Makefile index 494a4542316..15e9d530958 100644 --- a/textproc/xhtmldiff/Makefile +++ b/textproc/xhtmldiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/09/10 08:52:04 taca Exp $ +# $NetBSD: Makefile,v 1.5 2010/09/13 14:39:30 taca Exp $ DISTNAME= xhtmldiff-1.2.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://theinternetco.net/projects/ruby/ EXTRACT_SUFX= .tar.gz @@ -13,6 +13,8 @@ LICENSE= # unknown DEPENDS+= ${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs +CONFLICTS+= ruby[1-9][0-9]-xhtmldiff-[0-9]* xhtmldiff-[0-9]* + RUBY_VERSION_SUPPORTED= 18 post-extract: diff --git a/www/merbful-authentication/Makefile b/www/merbful-authentication/Makefile index 9f2e6bfbfdc..a5a4b903266 100644 --- a/www/merbful-authentication/Makefile +++ b/www/merbful-authentication/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/09/12 03:22:00 taca Exp $ +# $NetBSD: Makefile,v 1.5 2010/09/13 14:39:31 taca Exp $ DISTNAME= merbful_authentication-0.9.3 +PKGREVISION= 1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} CATEGORIES= www @@ -12,5 +13,8 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core DEPENDS+= ${RUBY_PKGPREFIX}-merb-gen>=0.9.2:../../www/merb-gen +CONFLICTS+= ruby[1-9][0-9]-merbful-authentication-[0-9]* \ + merbful-authentication-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mongrel-cluster/Makefile b/www/mongrel-cluster/Makefile index 71869562c7e..6bcbafc1bce 100644 --- a/www/mongrel-cluster/Makefile +++ b/www/mongrel-cluster/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 12:28:30 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:39:31 taca Exp $ DISTNAME= mongrel_cluster-1.0.5 +PKGREVISION= 1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} CATEGORIES= www @@ -12,5 +13,7 @@ LICENSE= gnu-gpl-v2 OR ruby-license DEPENDS+= ${RUBY_PKGPREFIX}-gem_plugin>=0.2.3:../../misc/ruby-gem_plugin DEPENDS+= ${RUBY_PKGPREFIX}-mongrel>=1.0.2:../../www/mongrel +CONFLICTS+= ruby[1-9][0-9]-mongrel-cluster-[0-9]* mongrel-cluster-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mongrel-config/Makefile b/www/mongrel-config/Makefile index 41140571b57..de2bfeb8dda 100644 --- a/www/mongrel-config/Makefile +++ b/www/mongrel-config/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 12:29:43 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:39:31 taca Exp $ DISTNAME= mongrel_config-0.3.1 +PKGREVISION= 1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} CATEGORIES= www @@ -13,5 +14,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-mongrel>=1.0.2:../../www/mongrel DEPENDS+= ${RUBY_PKGPREFIX}-gem_plugin>=0.2.3:../../misc/ruby-gem_plugin DEPENDS+= ${RUBY_PKGPREFIX}-camping>=1.5:../../www/camping +CONFLICTS+= ruby[1-9][0-9]-mongrel-config-[0-9]* mongrel-config-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mongrel-console/Makefile b/www/mongrel-console/Makefile index de309b2083b..82a8e3951ce 100644 --- a/www/mongrel-console/Makefile +++ b/www/mongrel-console/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 12:30:39 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:39:31 taca Exp $ DISTNAME= mongrel_console-0.2.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,5 +12,7 @@ LICENSE= # unknown DEPENDS+= ${RUBY_PKGPREFIX}-mongrel>=1.0.2:../../www/mongrel +CONFLICTS+= ruby[1-9][0-9]-mongrel-console-[0-9]* mongrel-console-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mongrel-upload-progress/Makefile b/www/mongrel-upload-progress/Makefile index 656d3fa5bbf..02ab6d03a85 100644 --- a/www/mongrel-upload-progress/Makefile +++ b/www/mongrel-upload-progress/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 12:31:33 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:39:31 taca Exp $ DISTNAME= mongrel_upload_progress-0.2.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,5 +12,8 @@ LICENSE= # unknown DEPENDS+= ${RUBY_PKGPREFIX}-mongrel>=0.3.13.3:../../www/mongrel +CONFLICTS+= ruby[1-9][0-9]-mongrel-upload-progress-[0-9]* \ + mongrel-upload-progress-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mongrel/Makefile b/www/mongrel/Makefile index 2ea7fd3f9e3..ff5ffc3df0e 100644 --- a/www/mongrel/Makefile +++ b/www/mongrel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/09/10 12:27:34 taca Exp $ +# $NetBSD: Makefile,v 1.11 2010/09/13 14:39:31 taca Exp $ DISTNAME= mongrel-1.1.5 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= minskim@NetBSD.org @@ -11,6 +12,8 @@ LICENSE= gnu-gpl-v2 OR ruby-license DEPENDS+= ${RUBY_PKGPREFIX}-daemons>=1.0.3:../../misc/ruby-daemons DEPENDS+= ${RUBY_PKGPREFIX}-gem_plugin>=0.2.3:../../misc/ruby-gem_plugin +CONFLICTS+= ruby[1-9][0-9]-mongrel-[0-9]* mongrel-[0-9]* + RUBY_REQD= 1.8.6.110 .include "../../lang/ruby/gem.mk" 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" |