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

add missing conflict markers due to 'bin/stress'

Browse Source
This commit is contained in:
jasper 2015-08-11 20:15:41 +00:00
parent 923672a507
commit 56df3bc1d8
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/go-tools/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2015/06/11 20:02:53 czarkoff Exp $
# $OpenBSD: Makefile,v 1.3 2015/08/11 20:15:41 jasper Exp $
COMMENT = various tools for the Go programming language
GH_ACCOUNT = golang
GH_PROJECT = tools
GH_COMMIT = 27e692e6ec36d8f48be794f32553e1400c70dbf2
DISTNAME = go-tools-1.4.20150206
REVISION = 0
REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://golang.org/

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

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2015/06/11 20:02:53 czarkoff Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/08/11 20:15:41 jasper Exp $
@pkgpath devel/gocover
@pkgpath textproc/godoc
@conflict stress-*
@bin bin/benchcmp
@bin bin/callgraph
@bin bin/digraph

4
sysutils/stress/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2015/01/03 22:22:28 lum Exp $
# $OpenBSD: Makefile,v 1.13 2015/08/11 20:15:41 jasper Exp $
COMMENT= tool to impose configurable amount of load
DISTNAME= stress-1.0.4
REVISION= 0
REVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${HOMEPAGE}

3
sysutils/stress/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2010/05/26 04:51:16 lum Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/08/11 20:15:41 jasper Exp $
@conflict go-tools-*
@bin bin/stress
@info info/stress.info
@man man/man1/stress.1