From d06ef6dfaccf1c81543d69af8d3852f85880244c Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Wed, 4 May 2005 23:58:17 +0000
Subject: - Fix CONFLICTS in totem so slave port totem-gstreamer conflicts with
 totem   and not itself.

---
 multimedia/totem/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'multimedia/totem')

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index de9e85d76fdb..02bf83892380 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -35,7 +35,7 @@ OPTIONS?=	DVDNAV "Enable DVD support" on \
 MAN1=	totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
 		totem.schemas
-CONFLICTS=	totem-gstreamer-[0-9]*
+CONFLICTS?=	totem-gstreamer-[0-9]*
 
 .include <bsd.port.pre.mk>
 
-- 
cgit v1.2.3