diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 05:46:58 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 05:46:58 +0800 |
| commit | 49d197c6b71b2712f18a3f6df4949040f1aeb7f3 (patch) | |
| tree | a8996b874cbe502924c5943690d88f66b27ce6e5 | |
| parent | 30667769b7931c0ecaed2d12ad2f5fa8d21c8421 (diff) | |
| download | marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar.gz marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar.bz2 marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar.lz marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar.xz marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.tar.zst marcuscom-ports-49d197c6b71b2712f18a3f6df4949040f1aeb7f3.zip | |
-Add CONFLICTS with the each others.
-Remove GNOME_DESKTOP_VERSION, because it is only for component in bsd.gnome.mk
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15782 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | mail/evolution/Makefile | 5 | ||||
| -rw-r--r-- | mail/evolution3/Makefile | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 8e93c80ff..fc3910ed9 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD: ports/mail/evolution/Makefile,v 1.188 2011/02/25 01:31:48 delphij Exp $ -# $MCom: ports/mail/evolution/Makefile,v 1.234 2011/03/07 09:05:10 kwm Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.235 2011/03/07 17:30:47 kwm Exp $ # PORTNAME= evolution @@ -21,13 +21,14 @@ LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell +CONFLICTS= evolution-3.[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ desktopfileutils gnomedocutils ltasneededhack gnomedesktop -GNOME_DESKTOP_VERSION=2 USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile index 8ffef1b07..36e494ec0 100644 --- a/mail/evolution3/Makefile +++ b/mail/evolution3/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution3/Makefile,v 1.11 2011/03/21 21:53:11 kwm Exp $ +# $MCom: ports/mail/evolution3/Makefile,v 1.12 2011/04/04 11:48:11 kwm Exp $ # PORTNAME= evolution @@ -18,8 +18,8 @@ COMMENT= An integrated mail, calendar and address book distributed suite LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ unique-3.0.0:${PORTSDIR}/x11-toolkits/libunique3 \ notify.4:${PORTSDIR}/devel/libnotify -# gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview -#RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell + +CONFLICTS= evolution-2.[0-9]* LATEST_LINK= evolution3 USE_BZIP2= yes @@ -28,7 +28,6 @@ USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver3 gtkhtml4 \ desktopfileutils gnomedocutils ltasneededhack gnomedesktop3 -# gnomedesktop USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes |