From 673d08e1956b1f239cafaa331432f15a30939091 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Sun, 26 Sep 2010 21:39:09 +0000 Subject: [PATCH] Mark as conflicting with www/opera, as it removes the files installed by the native opera version on `make install`. Tested by: Eitan Adler --- www/linux-opera-devel/Makefile | 2 ++ www/linux-opera/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 0cf47aeeb3e9..0a4657197f9c 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -25,6 +25,8 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux MAINTAINER= mezz@FreeBSD.org COMMENT= A blazingly fast, full-featured, standards-compliant browser +CONFLICTS= opera-[0-9]* # removes installed www/opera's file on make install + RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 0cf47aeeb3e9..0a4657197f9c 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -25,6 +25,8 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux MAINTAINER= mezz@FreeBSD.org COMMENT= A blazingly fast, full-featured, standards-compliant browser +CONFLICTS= opera-[0-9]* # removes installed www/opera's file on make install + RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes