CVS commit: pkgsrc/devel/ruby-thor

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jan 13 15:11:03 UTC 2021

Modified Files:
        pkgsrc/devel/ruby-thor: Makefile

Log Message:
devel/ruby-thor: remove CONFLICTS

Remove CONFLICTS since add pkg_alternatives support.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-thor/Makefile

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

Modified files:

Index: pkgsrc/devel/ruby-thor/Makefile
diff -u pkgsrc/devel/ruby-thor/Makefile:1.11 pkgsrc/devel/ruby-thor/Makefile:1.12
--- pkgsrc/devel/ruby-thor/Makefile:1.11        Tue Mar 24 18:30:19 2020
+++ pkgsrc/devel/ruby-thor/Makefile     Wed Jan 13 15:11:02 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2020/03/24 18:30:19 taca Exp $
+# $NetBSD: Makefile,v 1.12 2021/01/13 15:11:02 taca Exp $
 
 DISTNAME=      thor-1.0.1
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -8,8 +9,6 @@ HOMEPAGE=       http://whatisthor.com/
 COMMENT=       Scripting framework that replaces rake, sake and rubigen
 LICENSE=       mit
 
-CONFLICTS+=    ruby[1-9][0-9]-thor-[0-9]*
-
 RUBYGEM_OPTIONS+=      --format-executable
 
 USE_LANGUAGES= # none