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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/sysutils/capistrano/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/sysutils/capistrano/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pkgsrc/sysutils/capistrano/Makefile	2010/09/10 07:50:03	1.4
+++ pkgsrc/sysutils/capistrano/Makefile	2010/09/13 14:49:54	1.5
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/09/10 07:50:03 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/13 14:49:54 taca Exp $
 
 DISTNAME=	capistrano-2.5.19
+PKGREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,5 +17,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-net-sftp>=2.
 DEPENDS+=	${RUBY_PKGPREFIX}-net-scp>=1.0.0:../../security/ruby-net-scp
 DEPENDS+=	${RUBY_PKGPREFIX}-highline>=0:../../devel/ruby-highline
 
+CONFLICTS+=	ruby[1-9][0-9]-capistrano-[0-9]* capistrano-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"