Fix @conflict marker.
This commit is contained in:
parent
5c0536c5d0
commit
a5e800a5c5
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.52 2013/03/29 16:48:27 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.53 2013/03/29 16:53:22 ajacoutot Exp $
|
||||
|
||||
COMMENT= people aggregation library
|
||||
|
||||
@ -7,7 +7,7 @@ GNOME_VERSION= 0.8.0
|
||||
# MODULE_VERSION in config.h
|
||||
API_V= 37
|
||||
|
||||
REVISION= 4
|
||||
REVISION= 5
|
||||
|
||||
SHARED_LIBS += folks-telepathy 5.0 # 37.0
|
||||
SHARED_LIBS += folks 5.1 # 37.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.13 2013/03/29 16:48:27 jasper Exp $
|
||||
@conflict net/telepathy/folks,-tracker
|
||||
@comment $OpenBSD: PLIST,v 1.14 2013/03/29 16:53:22 ajacoutot Exp $
|
||||
@conflict folks-meta-tracker-*
|
||||
@pkgpath net/telepathy/folks,-main
|
||||
@pkgpath net/telepathy/folks,-tracker
|
||||
@bin bin/folks-import
|
||||
|
Loading…
Reference in New Issue
Block a user