[SM-Commit] GIT changes to master grimoire by Eric Sandall (2cfa94383a96ccb7df0ba5adc16fcc92cb17baa6)

Eric Sandall scm at sourcemage.org
Fri Jan 7 18:34:16 EST 2011


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 crypto/cyrus-sasl/CONFLICTS |    1 +
 crypto/cyrus-sasl/HISTORY   |    4 ++++
 crypto/libsasl/CONFLICTS    |    1 +
 crypto/libsasl/HISTORY      |    4 ++++
 x11/gtk-vnc/DEPENDS         |    2 +-
 x11/gtk-vnc/HISTORY         |    3 ---
 6 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 2cfa94383a96ccb7df0ba5adc16fcc92cb17baa6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libsasl: Conflicts with cyrus-sasl
    e.g. sasl/sasl.h conflicts

commit 24ce2a412d3949c80ff0340e97ade8b4a66798b8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    cyrus-sasl: Conflicts with libsasl
    e.g. sasl/sasl.h conflicts

commit d5411e3aaf5dd11be19a3a0cef265e31ab229e8a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "gtk-vnc: Requires cyrus-sasl specifically, not any LIBSASL"
    
    This reverts commit 6e87971602ca73403c8a88e45a7bbcdaf4994131.
    
    A dispel of cyrus-sasl broke my libsasl. They need to conflict.

diff --git a/crypto/cyrus-sasl/CONFLICTS b/crypto/cyrus-sasl/CONFLICTS
new file mode 100755
index 0000000..0cf0771
--- /dev/null
+++ b/crypto/cyrus-sasl/CONFLICTS
@@ -0,0 +1 @@
+conflicts libsasl
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 258d409..a38f19e 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,7 @@
+2011-01-07 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflicts with libsasl
+	  e.g. sasl/sasl.h conflicts
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster at sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/crypto/libsasl/CONFLICTS b/crypto/libsasl/CONFLICTS
new file mode 100755
index 0000000..32e78b3
--- /dev/null
+++ b/crypto/libsasl/CONFLICTS
@@ -0,0 +1 @@
+conflicts cyrus-sasl
diff --git a/crypto/libsasl/HISTORY b/crypto/libsasl/HISTORY
index acdb6c1..e2aa3e6 100644
--- a/crypto/libsasl/HISTORY
+++ b/crypto/libsasl/HISTORY
@@ -1,2 +1,6 @@
+2011-01-07 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflicts with cyrus-sasl
+      e.g. sasl/sasl.h conflicts
+
 2009-07-22 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS, DEPENDS, BUILD, INSTALL, PROVIDES: created spell
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 8e08ad6..32dea9c 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -11,7 +11,7 @@ optional_depends  python                \
 #                  '--enable-plugin=no'      \
 #                  'for web browser plugin'  &&
 
-optional_depends  cyrus-sasl                \
+optional_depends  LIBSASL                   \
                   '--with-sasl'             \
                   '--without-sasl'          \
                   'for SASL authentication support'
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 3f7f53e..1266107 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,6 +1,3 @@
-2011-01-07 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Requires cyrus-sasl specifically, not any LIBSASL
-
 2010-02-23 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 0.3.10
 



More information about the SM-Commit mailing list