diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-04-06 13:38:59 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-04-06 13:38:59 +0800 |
commit | 426cf597608519ac01e5d5384c212a778c459e35 (patch) | |
tree | 47b85d42bb09999edf483f314c18781c73d28fed /www/libxul/Makefile | |
parent | 06dd884e8550e00c219576d3e2f01008310d1674 (diff) | |
download | marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar.gz marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar.bz2 marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar.lz marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar.xz marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.tar.zst marcuscom-ports-426cf597608519ac01e5d5384c212a778c459e35.zip |
Add a CONFLICTS entry for xulrunner.
Reported by: jsa on #freebsd-gnome
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12214 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/libxul/Makefile')
-rw-r--r-- | www/libxul/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 8f6eedc99..6a9cbc99a 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/libxul/Makefile,v 1.22 2009/03/30 03:07:21 marcus Exp $ +# $MCom: ports/www/libxul/Makefile,v 1.23 2009/04/04 19:56:22 marcus Exp $ # PORTNAME= libxul @@ -17,7 +17,7 @@ DISTNAME= xulrunner-${PORTVERSION}-source MAINTAINER?= gnome@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps -CONFLICTS= mozilla-[0-9]* +CONFLICTS= mozilla-[0-9]* xulrunner-[0-9]* GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib \ lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include |