From f389cc4d863602f4f01d28e233bbc9ea4aaff655 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 22 Apr 2011 03:35:00 +0000 Subject: Add CONFLICTS with the each others. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15848 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/seed/Makefile | 4 +++- devel/seed3/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/devel/seed/Makefile b/devel/seed/Makefile index 880cd664a..6d0333120 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov # # $FreeBSD: ports/devel/seed/Makefile,v 1.11 2010/12/04 07:31:27 ade Exp $ -# $MCom: ports/devel/seed/Makefile,v 1.24 2010/09/19 15:06:42 kwm Exp $ +# $MCom: ports/devel/seed/Makefile,v 1.28 2011/03/06 23:12:37 kwm Exp $ # # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. @@ -27,6 +27,8 @@ LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ mpfr.4:${PORTSDIR}/math/mpfr +CONFLICTS= seed-3.[0-9]* + USE_BZIP2= yes GNU_CONFIGURE= yes USE_GETTEXT= yes diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile index de1ea7285..e47e8197d 100644 --- a/devel/seed3/Makefile +++ b/devel/seed3/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov # # $FreeBSD: ports/devel/seed/Makefile,v 1.11 2010/12/04 07:31:27 ade Exp $ -# $MCom: ports/devel/seed3/Makefile,v 1.4 2011/02/23 17:51:07 kwm Exp $ +# $MCom: ports/devel/seed3/Makefile,v 1.5 2011/04/02 10:56:50 kwm Exp $ # # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release. # To do that, just replace imports.searchPaths with "." and ".." elements. @@ -26,6 +26,8 @@ LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ mpfr.4:${PORTSDIR}/math/mpfr +CONFLICTS= seed-2.[0-9]* + USE_BZIP2= yes GNU_CONFIGURE= yes USE_GETTEXT= yes -- cgit v1.2.3