- Replace CONFLICTS with CONFLICTS_BUILD so that the conflict is not

recorded in the resulting package.
- Bump PORTREVISION.

Reported by:	obrien
Feature safe:	yes
This commit is contained in:
Beat Gaetzi 2011-02-06 10:04:30 +00:00
parent 9c4996707c
commit 0956d0a119
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=268716
2 changed files with 4 additions and 2 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= lightning
DISTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source
@ -18,7 +19,7 @@ COMMENT= An integrated calendar for Thunderbird 3.1
RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird
CONFLICTS= spidermonkey-1.[0-7]*
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}

View file

@ -7,6 +7,7 @@
PORTNAME= lightning
DISTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source
@ -18,7 +19,7 @@ COMMENT= An integrated calendar for Thunderbird and SeaMonkey
OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \
SEAMONKEY "Install SeaMonkey 2.0" off
CONFLICTS= spidermonkey-1.[0-7]*
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_AUTOTOOLS= autoconf213 libtool
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}