[Lunar-commits] <moonbase> mplayerplug-in, xine-plugin: Add CONFLICTS. Modify BUILD.

[Moritz Heiber]

commit 2f0a6a36b65d4cd57949e1617e95a1a219c4a099
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Sun Apr 27 15:34:33 2008 +0200

    mplayerplug-in, xine-plugin: Add CONFLICTS. Modify BUILD.
    
    If both of these plugins are installed firefox (or any other browser)
    is going to crash hard.
    
    Also, tweak the BUILD file a little.
---
 video/mplayerplug-in/CONFLICTS |    1 +
 video/xine-plugin/BUILD        |    2 +-
 video/xine-plugin/CONFLICTS    |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/video/mplayerplug-in/CONFLICTS b/video/mplayerplug-in/CONFLICTS
new file mode 100644
index 0000000..d53a7a3
--- /dev/null
+++ b/video/mplayerplug-in/CONFLICTS
@@ -0,0 +1 @@
+conflicts xine-plugin
diff --git a/video/xine-plugin/BUILD b/video/xine-plugin/BUILD
index fff24b1..2ff12bc 100644
--- a/video/xine-plugin/BUILD
+++ b/video/xine-plugin/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="--prefix=/usr --with-x --with-plugindir=/opt/lunar/plugins $OPTS"
+  OPTS+=" --with-plugindir=/opt/lunar/plugins"
 
   default_build
 
diff --git a/video/xine-plugin/CONFLICTS b/video/xine-plugin/CONFLICTS
new file mode 100644
index 0000000..8916f58
--- /dev/null
+++ b/video/xine-plugin/CONFLICTS
@@ -0,0 +1 @@
+conflicts mplayerplug-in