cvscheck conflicts

This commit is contained in:
espie 2014-02-08 14:57:34 +00:00
parent 9efc37aec8
commit a0d28b87ff
4 changed files with 8 additions and 5 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2013/11/09 18:22:02 zhuk Exp $
# $OpenBSD: Makefile,v 1.32 2014/02/08 14:57:35 espie Exp $
COMMENT= graphical frontend to CVS
DISTNAME= tkcvs-6.0
REVISION = 4
REVISION = 5
CATEGORIES= devel
MAINTAINER= Todd T. Fries <todd@openbsd.org>

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2007/01/10 18:02:27 bernd Exp $
@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
@conflict tkdiff-*
@conflict kde-dev-scripts-*
bin/cvscheck
bin/tkcvs
bin/tkdiff

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2014/01/15 19:42:08 zhuk Exp $
# $OpenBSD: Makefile,v 1.5 2014/02/08 14:57:34 espie Exp $
COMMENT = KDE development helper scripts
DISTNAME = kde-dev-scripts-${MODKDE4_VERSION}
@ -10,6 +10,7 @@ MODULES = perl lang/python
MODKDE4_USE = libs
MODKDE4_RESOURCES = Yes
MODPY_BUILD_DEP = No
REVISION = 0
MODPERL_ADJ_FILES = \
colorcvs \

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/12/08 18:01:35 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/02/08 14:57:34 espie Exp $
@conflict kdesdk-<4.11
@conflict tkcvs-*
bin/adddebug
bin/build-progress.sh
bin/cheatmake