Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 crypto/qca2/BUILD     |    9 ++++++---
 crypto/qca2/DEPENDS   |    4 ++--
 crypto/qca2/DETAILS   |    5 ++---
 crypto/qca2/HISTORY   |    7 +++++++
 crypto/qca2/PRE_BUILD |    4 ----
 5 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 528ffa485919baa63df442cc924af246c8b53a38
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    qca2: Fixed build problem. Added optional_depends ca-certificates
    and removed unused depends cmake.

diff --git a/crypto/qca2/BUILD b/crypto/qca2/BUILD
index e856712..8cacd51 100755
--- a/crypto/qca2/BUILD
+++ b/crypto/qca2/BUILD
@@ -1,3 +1,6 @@
-# add missing subdir
-mkdir -p $SOURCE_DIRECTORY/plugins  &&
-qt4_build
+QTDIR=/usr    &&
+PATH=$QTDIR/bin/qt4:$PATH       &&
+export QTDIR=/usr               &&
+./configure --prefix=/usr $OPTS &&
+qmake qca.pro &&
+make
diff --git a/crypto/qca2/DEPENDS b/crypto/qca2/DEPENDS
index 28414ca..6911742 100755
--- a/crypto/qca2/DEPENDS
+++ b/crypto/qca2/DEPENDS
@@ -1,2 +1,2 @@
-depends  cmake   &&
-depends  qt4
+depends  qt4 &&
+optional_depends ca-certificates
diff --git a/crypto/qca2/DETAILS b/crypto/qca2/DETAILS
index 93315af..f3aa16a 100755
--- a/crypto/qca2/DETAILS
+++ b/crypto/qca2/DETAILS
@@ -1,13 +1,12 @@
            SPELL=qca2
-         VERSION=2.0.0
-     
SOURCE_HASH=sha512:51558a840677a34af4f671785e2a92033193272e6cd4eccb19da499ad69c9f18dc6972de60cdb58cd8c69567685649d09e9490c89e19abf10c8003df1148ee5a
+         VERSION=2.0.1
+     
SOURCE_HASH=sha512:e4cac723ecb292d116648a00184285dcae7094f6c8ae1dbe5470411b69c1731517752e38951fd4c079add7d74ba6cb3bafd90a9cb08b8f115a4d44caa8973ed3
           SOURCE=qca-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
    SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/$SOURCE
       LICENSE[0]=GPL
         WEB_SITE=http://delta.affinix.com/qca
          ENTERED=20050101
-      PATCHLEVEL=1
         KEYWORDS="qt crypto"
            SHORT="Qt Cryptographic Architecture"
 cat << EOF
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 48d79d3..3a31cb0 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,10 @@
+2008-12-31 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 2.0.1
+       * PRE_BUILD: Removed. Installs qca2.pc now
+       * BUILD: Removed qt4_build.  Was causing failures
+       * DEPENDS: Added optional_depends ca-certificates
+         removed depends cmake
+
 2007-12-13 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: added
          patch .pc file to name  it as QCA2.
diff --git a/crypto/qca2/PRE_BUILD b/crypto/qca2/PRE_BUILD
deleted file mode 100755
index 1506920..0000000
--- a/crypto/qca2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build       &&
-cd $SOURCE_DIRECTORY    &&
-sed -i "s/qca\.pc/qca2\.pc/g" CMakeLists.txt     &&
-sed "s/ QCA/ QCA2/" <qca.pc.cmake >qca2.pc.cmake