summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2005-05-04 23:58:17 +0000
committerMichael Johnson <ahze@FreeBSD.org>2005-05-04 23:58:17 +0000
commitd06ef6dfaccf1c81543d69af8d3852f85880244c (patch)
tree9e2a3a3b96f6c3cf327b67234bca8618c329f6f4 /multimedia
parent. share/afterstep -> %%DATADIR%%. (diff)
- Fix CONFLICTS in totem so slave port totem-gstreamer conflicts with totem
and not itself.
Notes
Notes: svn path=/head/; revision=134629
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/totem/Makefile2
1 files changed, 1 insertions, 1 deletions
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>