diff options
author | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-11-16 15:22:49 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-11-16 15:22:49 +0000 |
commit | 8059cba5b6c6fc690d61bc82256a9a09aadc8a35 (patch) | |
tree | eba829940c23100aa4993eebf441a155ec45606c /irc | |
parent | 299cd243b6a1fb73e6bb08547de71429c11ceb30 (diff) |
- Record conflict with bitlbee-otr
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=222928
Diffstat (limited to 'irc')
-rw-r--r-- | irc/bitlbee/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index c18cbd80438d..46a5fcab6fd8 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -7,6 +7,7 @@ PORTNAME= bitlbee PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ ${MASTER_SITE_LOCAL} @@ -35,7 +36,6 @@ OPTIONS= DEBUG "Enable debug support" Off \ OSCAR "Enable OSCAR (ICQ, AIM) protocol support" On \ YAHOO "Enable Yahoo! protocol support" On - CONFIGURE_ARGS= --config=/var/db/bitlbee --strip=0 BITLBEEUSER?= bitlbee @@ -56,6 +56,8 @@ SUB_LIST+= BITLBEEUSER=${BITLBEEUSER} \ SUB_FILES+= pkg-install pkg-deinstall +CONFLICTS= bitlbee-otr-[0-9]* + .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) |