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

Add @conflict markers for the following conflicts:

Browse Source 
devtodo-0.1.17p1,openmotif-demos-2.3.0
        /usr/local/bin/todo
gnokii-0.6.14p2,gnokii-0.6.14p2-no_x11,smstools-3.0.9
        /usr/local/bin/sendsms
openmotif-demos-2.3.0,tree-0.61
        /usr/local/bin/tree

ok espie@
This commit is contained in:
bernd 2007-08-03 17:42:45 +00:00
parent 9377c838a8
commit 9b0c253c15
10 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comms/gnokii/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2007/04/13 14:50:06 sturm Exp $
# $OpenBSD: Makefile,v 1.13 2007/08/03 17:42:45 bernd Exp $
COMMENT= "tools to talk to GSM cellular phones"
VERSION= 0.6.14
DISTNAME= gnokii-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= comms x11
SHARED_LIBS += gnokii 2.7 # .3.0

3
comms/gnokii/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2006/10/21 11:29:47 robert Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/08/03 17:42:45 bernd Exp $
@conflict smstools-*
%%SHARED%%
!%%no_x11%%
bin/gnokii

4
comms/smstools/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2007/08/03 17:42:45 bernd Exp $
COMMENT= gateway to send and receive SMS through GSM mobile phones
V= 3.0.9
DISTNAME= smstools3-${V}
PKGNAME= smstools-${V}
PKGNAME= smstools-${V}p0
CATEGORIES= comms

3
comms/smstools/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/08/03 17:42:45 bernd Exp $
@conflict gnokii-*
@newgroup _smsd:590
@newuser _smsd:590:_smsd:daemon:smsd user:/nonexistent:/sbin/nologin
bin/sendsms

4
productivity/devtodo/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2006/11/03 22:18:41 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2007/08/03 17:42:45 bernd Exp $
COMMENT= "reminder/task program aimed at developers"
DISTNAME= devtodo-0.1.17
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= productivity devel
HOMEPAGE= http://swapoff.org/DevTodo/

3
productivity/devtodo/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.6 2005/08/09 18:50:45 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2007/08/03 17:42:45 bernd Exp $
@conflict tdl-*
@conflict openmotif-demos-*
bin/devtodo
bin/tda
bin/tdd

3
sysutils/tree/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2006/06/26 18:09:00 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2007/08/03 17:42:45 bernd Exp $
COMMENT= "print ascii formatted tree of a directory structure"
DISTNAME= tree-0.61
PKGNAME= ${DISTNAME}p0
CATEGORIES= sysutils
HOMEPAGE= http://spootnik.org/tree/

3
sysutils/tree/pkg/PLIST
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/26 18:09:00 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/08/03 17:42:45 bernd Exp $
@conflict openmotif-demos-*
bin/tree
man/man1/tree.0

4
x11/openmotif/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2007/07/18 21:41:05 mbalmer Exp $
# $OpenBSD: Makefile,v 1.30 2007/08/03 17:42:45 bernd Exp $
COMMENT-main= Motif toolkit
COMMENT-demos= Motif toolkit demos
@ -6,7 +6,7 @@ COMMENT-demos= Motif toolkit demos
VERSION= 2.3.0
DISTNAME= openmotif-${VERSION}
PKGNAME-main= openmotif-${VERSION}
PKGNAME-demos= openmotif-demos-${VERSION}
PKGNAME-demos= openmotif-demos-${VERSION}p0
SHARED_LIBS= Mrm 4.0 \
Uil 4.0 \

4
x11/openmotif/pkg/PLIST-demos
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-demos,v 1.4 2007/07/18 21:41:06 mbalmer Exp $
@comment $OpenBSD: PLIST-demos,v 1.5 2007/08/03 17:42:45 bernd Exp $
@conflict devtodo-*
@conflict tree-*
bin/DNDDemo
bin/airport
bin/autopopups