update @conflict markers which was forgotten after the switch to ruby 2.2
This commit is contained in:
parent
7998485397
commit
923672a507
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2015/07/18 21:11:18 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2015/08/11 20:15:03 jasper Exp $
|
||||
|
||||
PORTROACH= limit:^1
|
||||
|
||||
@ -6,7 +6,7 @@ COMMENT= simple pluggable hierarchical database
|
||||
|
||||
V= 1.3.4
|
||||
DISTNAME= hiera-${V}
|
||||
REVISION= 2
|
||||
REVISION= 3
|
||||
|
||||
CATEGORIES= databases
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2015/06/12 17:57:55 jasper Exp $
|
||||
@conflict ruby21-hiera->=2.0.0
|
||||
@comment $OpenBSD: PLIST,v 1.9 2015/08/11 20:15:03 jasper Exp $
|
||||
@conflict ruby22-hiera->=2.0.0
|
||||
${GEM_BIN}/hiera${GEM_BIN_SUFFIX}
|
||||
${GEM_LIB}/cache/${DISTNAME}.gem
|
||||
${GEM_LIB}/gems/${DISTNAME}/
|
||||
|
@ -1,10 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2015/07/18 21:11:18 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2015/08/11 20:15:03 jasper Exp $
|
||||
|
||||
COMMENT= simple pluggable hierarchical database
|
||||
|
||||
V= 3.0.1
|
||||
DISTNAME= hiera-${V}
|
||||
PKGNAME= hiera3-${V}
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= databases
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/16 02:43:27 jasper Exp $
|
||||
@conflict ruby21-hiera-<3.0.0
|
||||
@comment $OpenBSD: PLIST,v 1.2 2015/08/11 20:15:03 jasper Exp $
|
||||
@conflict ruby22-hiera-<3.0.0
|
||||
${GEM_BIN}/hiera${GEM_BIN_SUFFIX}
|
||||
${GEM_LIB}/cache/${DISTNAME}.gem
|
||||
${GEM_LIB}/gems/${DISTNAME}/
|
||||
|
Loading…
Reference in New Issue
Block a user