Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

14 files changed, 111 insertions, 85 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ef208a855..433a45e0c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* database/drizzle: new spell, database engine for cloud
+
 2010-03-31 Ismael Luceno <ismael@sourcemage.org>
 	* kernels/openfwwf: new spell, free software firmware for BCM43xx
 	* devel/b43-tools: new spell, development tools for BCM43xx
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 76f6aecade..0828eed9c7 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
             SPELL=clamav
-          VERSION=0.95.3
+          VERSION=0.96
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SPELL-$VERSION.tar.gz.sig
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index d573545af1..aed5bc2cfd 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.96
+
 2009-10-28 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.95.3
 
diff --git a/database/drizzle/BUILD b/database/drizzle/BUILD
new file mode 100755
index 0000000000..fad6de571d
--- /dev/null
+++ b/database/drizzle/BUILD
@@ -0,0 +1,3 @@
+OPTS="$DRZ_PLUG $OPTS" &&
+default_build
+
diff --git a/database/drizzle/CONFIGURE b/database/drizzle/CONFIGURE
new file mode 100755
index 0000000000..bc687f591b
--- /dev/null
+++ b/database/drizzle/CONFIGURE
@@ -0,0 +1,26 @@
+# storage engines
+config_query_option DRZ_PLUG "build Blackhole plugin?" n \
+                             "--with-blackhole-plugin" \
+                             "--without-blackhole-plugin" &&
+config_query_option DRZ_PLUG "Build CSV Storage Engine?" n\
+                             "--with-csv-plugin" \
+                             "--without-csv-plugin" &&
+config_query_option DRZ_PLUG "Build Memory Storage Engine?" n \
+                             "--with-heap-plugin" \
+                             "--without-heap-plugin" &&
+config_query_option DRZ_PLUG "Build InnoDB Storage Engine?" y \
+                             "--with-innobase-plugin" \
+                             "--without-innobase-plugin" &&
+config_query_option DRZ_PLUG "Build MyISAM Storage Engine?" n \
+                             "--with-myisam-plugin" \
+                             "--without-myisam-plugin" &&
+# other plugins
+config_query_option DRZ_PLUG "Build Default Replicator?" y \
+                             "--with-default-replicator-plugin" \
+                             "--without-default-replicator-plugin" &&
+config_query_option DRZ_PLUG "Build I_S Plugin?" y \
+                             "--with-info-schema-plugin" \
+                             "--without-info-schema-plugin"
+#config_query_option DRZ_PLUG "" y \
+#                             "" \
+#                             "" &&
diff --git a/database/drizzle/DEPENDS b/database/drizzle/DEPENDS
new file mode 100755
index 0000000000..1935877690
--- /dev/null
+++ b/database/drizzle/DEPENDS
@@ -0,0 +1,14 @@
+depends  g++        &&
+depends  protobuf   &&
+depends  libdrizzle &&
+depends  pcre       &&
+depends  curl       &&
+depends  ncurses    &&
+depends  libevent   &&
+depends  gperf      &&
+depends  util-linux &&
+depends  readline   &&
+depends  gnutls     &&
+depends  boost      &&
+optional_depends gearmand  '' '' 'clustered servers' &&
+optional_depends linux-pam '' '' 'PAM support' 
diff --git a/database/drizzle/DETAILS b/database/drizzle/DETAILS
new file mode 100755
index 0000000000..6a626dfbad
--- /dev/null
+++ b/database/drizzle/DETAILS
@@ -0,0 +1,24 @@
+           SPELL=drizzle
+         VERSION=2010.03.1412
+              VD=2010-03-29
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]="http://launchpad.net/drizzle/cherry/$VD/+download/$SOURCE"
+  SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
+      SOURCE_GPG=drizzle.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+        WEB_SITE=https://launchpad.net/drizzle
+      LICENSE[0]=GPL
+         ENTERED=20090819
+        KEYWORDS="database"
+           SHORT="Lightweight SQL Database for Cloud and Web"
+cat << EOF
+The Drizzle project is building a database optimized for Cloud and Net applications. It is being 
+designed for massive concurrency on modern multi-cpu/core architecture. The code is originally 
+derived from MySQL.
+The project is focused on making a database that is:
+ 1) Reliable
+ 2) Fast and scalable on modern architecture
+ 3) Simple design for ease of installation and management
+EOF
diff --git a/database/drizzle/HISTORY b/database/drizzle/HISTORY
new file mode 100644
index 0000000000..c9a3542952
--- /dev/null
+++ b/database/drizzle/HISTORY
@@ -0,0 +1,30 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2010.03.1412
+	* DEPENDS: add boost
+	* PRE_BUILD: deleted
+
+2010-01-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2010.01.1273
+
+2009-12-23 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.12.1251
+
+2009-12-08 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.12.1240
+
+2009-11-12 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.11.1208
+
+2009-10-13 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.10.1178
+
+2009-09-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.09.1144
+
+2009-09-25 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.09.1126
+
+2009-08-19 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2009.08.1117
+	  spell created
+
diff --git a/database/drizzle/drizzle.gpg b/database/drizzle/drizzle.gpg
new file mode 100644
index 0000000000..78f2fd0107
--- /dev/null
+++ b/database/drizzle/drizzle.gpg
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index 340a7d63d3..cc1a490dbf 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Ladislav Hagara <hgr@vabo.cz>
+	* PRE_BUILD, fixxref.patch: removed
+
 2010-03-30 Vasil Yonkov <spirtbrat@sourcemage.org>
 	* DETAILS: updated spell to 1.14
 
diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD
deleted file mode 100755
index 4315ee2d6b..0000000000
--- a/gnome2-libs/gtk-doc/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/fixxref.patch
diff --git a/gnome2-libs/gtk-doc/fixxref.patch b/gnome2-libs/gtk-doc/fixxref.patch
deleted file mode 100644
index 6b5a09b66c..0000000000
--- a/gnome2-libs/gtk-doc/fixxref.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 22 Dec 2009 11:54:31 +0000
-Subject: fixxref: make it work again without --module argument, Fixes #605211
-
-This restores a compatible behavior with previous versions of gtk-doc,
-which is required by many tarballs.
----
-diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
-index 8f166ef..5a703ad 100755
---- a/gtkdoc-fixxref.in
-+++ b/gtkdoc-fixxref.in
-@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
-     }
- }
- 
--open (INPUT, "$MODULE-sections.txt")
--	|| die "Can't open $MODULE-sections.txt: $!";
--my $subsection = "";
--while (<INPUT>) {
--    if (m/^#/) {
--        next;
--
--    } elsif (m/^<SECTION>/) {
--        $subsection = "";
--    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
--        $subsection = $1;
--    } elsif (m/^<SUBSECTION>/) {
--        next;
--    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
--        next;
--    } elsif (m/^<FILE>(.*)<\/FILE>/) {
--        next;
--    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
--        next;
--    } elsif (m/^<\/SECTION>/) {
--        next;
--    } elsif (m/^(\S+)/) {
--        my $symbol=CreateValidSGMLID($1);
--
--        if ($subsection eq "Standard" || $subsection eq "Private") {
--            $NoLinks{$symbol} = 1;
-+if (defined($MODULE)) {
-+    open (INPUT, "$MODULE-sections.txt")
-+            || die "Can't open $MODULE-sections.txt: $!";
-+    my $subsection = "";
-+    while (<INPUT>) {
-+        if (m/^#/) {
-+            next;
-+
-+        } elsif (m/^<SECTION>/) {
-+            $subsection = "";
-+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-+            $subsection = $1;
-+        } elsif (m/^<SUBSECTION>/) {
-+            next;
-+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-+            next;
-+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
-+            next;
-+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-+            next;
-+        } elsif (m/^<\/SECTION>/) {
-+            next;
-+        } elsif (m/^(\S+)/) {
-+            my $symbol=CreateValidSGMLID($1);
-+
-+            if ($subsection eq "Standard" || $subsection eq "Private") {
-+                $NoLinks{$symbol} = 1;
-+            }
-         }
-     }
-+    close (INPUT);
- }
--close (INPUT);
- 
- &FixCrossReferences ($MODULE_DIR);
- 
---
-cgit v0.8.3.1
diff --git a/libs/libdrizzle/DETAILS b/libs/libdrizzle/DETAILS
index a18d31af32..4318dfe94c 100755
--- a/libs/libdrizzle/DETAILS
+++ b/libs/libdrizzle/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libdrizzle
-         VERSION=0.6
+         VERSION=0.8
              VX=`echo $VERSION | cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/libs/libdrizzle/HISTORY b/libs/libdrizzle/HISTORY
index 44324ac3fc..7531de26eb 100644
--- a/libs/libdrizzle/HISTORY
+++ b/libs/libdrizzle/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.8
+
 2009-12-09 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.6