missing an app_conference @conflict

This commit is contained in:
sthen 2009-12-13 12:23:57 +00:00
parent 16b6df18f8
commit 5738d5ec6f
2 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2009/12/13 12:11:29 sthen Exp $
# $OpenBSD: Makefile,v 1.66 2009/12/13 12:23:57 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
@ -6,7 +6,7 @@ COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.6.0.19
# you can set PATCHVER=p0, p1 etc to bump everything,
# this takes care of the subpackage/flavor maze
PATCHVER=
PATCHVER= p0
CORESOUNDS= 1.4.16
DISTNAME= asterisk-${VER:S/rc/-rc/}
FULLPKGNAME-main= asterisk-${VER}${PATCHVER}

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.19 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.20 2009/12/13 12:23:57 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-ogg-*
@conflict app_conference-20070809
@conflict app_conference-20070710
@conflict app_conference-20060201
@conflict app_conference-20051110