diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2011-02-06 10:04:30 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2011-02-06 10:04:30 +0000 |
| commit | 0956d0a1199c456f056f284e80ef19f564a3d3a9 (patch) | |
| tree | fcadf43a841ba3dead5eee39e30232a98204a1e1 /deskutils | |
| parent | 9c4996707c3586b2c94990c5d3eb62e8fda26ce1 (diff) | |
| download | ports-0956d0a1199c456f056f284e80ef19f564a3d3a9.tar.gz ports-0956d0a1199c456f056f284e80ef19f564a3d3a9.zip | |
- Replace CONFLICTS with CONFLICTS_BUILD so that the conflict is not
recorded in the resulting package.
- Bump PORTREVISION.
Reported by: obrien
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268716
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/lightning-thunderbird/Makefile | 3 | ||||
| -rw-r--r-- | deskutils/lightning/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index 2ef8611376bf..abf49e2349c2 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -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} diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index 16bc408dcc21..6fefcd743fcf 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -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} |