cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Register conflict on bundle executable

Browse Source 
Both install /usr/local/bin/bundle.
This commit is contained in:
kn 2020-04-19 22:31:30 +00:00
parent 0ae13e3404
commit 2d90f05797
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/go-tools/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2019/07/12 20:44:10 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2020/04/19 22:31:30 kn Exp $
COMMENT = various tools for the Go programming language
GH_ACCOUNT = golang
@ -7,7 +7,7 @@ GH_COMMIT = f727befe758c04ce68d52abc6e69ad111e2c6797
DISTNAME = go-tools-1.12.20190226
CATEGORIES = devel
HOMEPAGE = https://godoc.org/golang.org/x/tools
REVISION = 0
REVISION = 1
# 3-clause BSD
PERMIT_PACKAGE = Yes

3
devel/go-tools/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.12 2019/03/16 13:42:06 jsing Exp $
@comment $OpenBSD: PLIST,v 1.13 2020/04/19 22:31:30 kn Exp $
@conflict ruby-shims-*
@conflict stress-*
@pkgpath textproc/godoc
@rcscript ${RCDIR}/godoc

3
devel/ruby-shims/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2019/10/15 01:29:49 jcs Exp $
# $OpenBSD: Makefile,v 1.3 2020/04/19 22:31:30 kn Exp $
COMMENT= Ruby version redirection shim
DISTNAME= ruby-shims-2
CATEGORIES= devel
REVISION= 0
MAINTAINER= joshua stein <jcs@openbsd.org>

3
devel/ruby-shims/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/09/06 17:02:02 jcs Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/04/19 22:31:30 kn Exp $
@conflict go-tools-*
bin/_rubyshim
bin/bundle
bin/bundler