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

22 files changed, 52 insertions, 63 deletions

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index ae7d221336..fb9cee6ad8 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Eric Sandall <sandalle@sourcemage.org>
+	* INSTALL: Fails with multiple make jobs
+
 2010-02-10 Pol Vinogradov <vin.public@gmail.com>
 	* PRE_BUILD: fix for git branch
 
diff --git a/graphics-libs/mesalib/INSTALL b/graphics-libs/mesalib/INSTALL
index c0b08d9416..66e3e2ae7a 100755
--- a/graphics-libs/mesalib/INSTALL
+++ b/graphics-libs/mesalib/INSTALL
@@ -2,4 +2,5 @@ if [[ -h "$INSTALL_ROOT/usr/lib/dri" ]]; then
   rm "$INSTALL_ROOT/usr/lib/dri"
 fi &&
 
+make_single &&
 default_install
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index baf516c87a..82d1812735 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,4 +1,4 @@
-config_query LIBDRM_NV 'enable nouveau KMS api?' n
-config_query LIBDRM_INTEL 'enable intel KMS api?' n
-config_query LIBDRM_RADEON 'enable radeon KMS api?' n
-config_query LIBDRM_LIBS 'install radeon libs?' n
+config_query LIBDRM_NV 'Enable nouveau KMS api?' n
+config_query LIBDRM_INTEL 'Enable intel KMS api?' n
+config_query LIBDRM_RADEON 'Enable radeon KMS api (EXPERIMENTAL, not recommended)?' n
+config_query LIBDRM_LIBS 'Install radeon libs?' n
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index c93e4ba4e6..e271586d7f 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2010-02-26 Eric Sandall <sandalle@sourcemage.org>
+	* CONFIGURE: Mark Radeon KMS as experimental
+	  Upper-case beginning of queries
+
 2010-02-17 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.4.18
 
diff --git a/ruby-raa/fireruby/HISTORY b/ruby-raa/fireruby/HISTORY
index 0cc6bc200d..164ccaf569 100644
--- a/ruby-raa/fireruby/HISTORY
+++ b/ruby-raa/fireruby/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* INSYTALL: deleted
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/fireruby/INSTALL b/ruby-raa/fireruby/INSTALL
deleted file mode 100755
index 925e30168b..0000000000
--- a/ruby-raa/fireruby/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-default_install  &&
-RV=`installed_version ruby` &&
-RV=${RV//-p?} &&
-DEST=$INSTALL_ROOT/usr/lib/ruby/site_ruby/$RV/$SPELL &&
-mkdir -p  $DEST &&
-cp $SOURCE_DIRECTORY/lib/* $DEST  
diff --git a/ruby-raa/ruby-dbi/BUILD b/ruby-raa/ruby-dbi/BUILD
deleted file mode 100755
index 6251bf5510..0000000000
--- a/ruby-raa/ruby-dbi/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-message building $RB_OPT                 &&
-ruby setup.rb config --with=dbi,$RB_OPT  &&
-ruby setup.rb setup
-
diff --git a/ruby-raa/ruby-dbi/CONFIGURE b/ruby-raa/ruby-dbi/CONFIGURE
deleted file mode 100755
index 4da51c7dbc..0000000000
--- a/ruby-raa/ruby-dbi/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-source $GRIMOIRE/FUNCTIONS       &&
-config_query_multi RB_DBI "which databases to support?" firebird mysql odbc postgresql sqlite
diff --git a/ruby-raa/ruby-dbi/DEPENDS b/ruby-raa/ruby-dbi/DEPENDS
index fb573be6c8..257635e6a7 100755
--- a/ruby-raa/ruby-dbi/DEPENDS
+++ b/ruby-raa/ruby-dbi/DEPENDS
@@ -1,35 +1 @@
-depends RUBY           &&
-persistent_add RB_OPT  &&
-RB_OPT=""              &&
-local DB SEP
-for DB in $RB_DBI;do
-  case $DB in
-    firebird)
-      depends FIREBIRD        &&
-      depends ruby-interbase  &&
-      RB_OPT="${RB_OPT}${SEP}dbd_interbase"
-      ;;
-    mysql)
-       depends mysql       &&
-       RB_OPT="${RB_OPT}${SEP}dbd_mysql"
-      ;;
-
-    odbc)
-       depends ruby-odbc   &&
-       RB_OPT="${RB_OPT}${SEP}dbd_odbc"
-      ;;
-
-    postgresql)
-       depends postgresql  &&
-       RB_OPT="${RB_OPT}${SEP}dbd_pg"
-      ;;
-
-    sqlite)
-       depends sqlite2     &&
-       RB_OPT="${RB_OPT}${SEP}dbd_sqlite"
-      ;;
-
-   esac
-  SEP=',' 
-done
-
+depends RUBY
diff --git a/ruby-raa/ruby-dbi/DETAILS b/ruby-raa/ruby-dbi/DETAILS
index 93594e6c71..02c8ea3788 100755
--- a/ruby-raa/ruby-dbi/DETAILS
+++ b/ruby-raa/ruby-dbi/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ruby-dbi
-         VERSION=0.2.0
-     SOURCE_HASH=sha512:bdf436d428bfde2babea112ad9261e8a905b49ca3d92f900e0e934827819233ab297de3ca49c7df41ea4930f46e605d0f574738f38a01bea1c2d671b4f2746b4
+         VERSION=0.4.3
+     SOURCE_HASH=sha512:4f45eccb93e1826232f6f9260dbe81420c6239c64e24f55cd1777404a5869d27a1f4c9b8dd5b8382b0c08904565a8f3cdba60ad60198087111cdcff7635389c0
           SOURCE=dbi-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/dbi-$VERSION
-   SOURCE_URL[0]=http://rubyforge.org/frs/download.php/33959/$SOURCE
+   SOURCE_URL[0]=http://rubyforge.org/frs/download.php/63601/$SOURCE
         WEB_SITE=http://rubyforge.org/projects/ruby-dbi/
       LICENSE[0]=BSD
             DOCS="README"
diff --git a/ruby-raa/ruby-dbi/HISTORY b/ruby-raa/ruby-dbi/HISTORY
index d551a64de1..6f657c6868 100644
--- a/ruby-raa/ruby-dbi/HISTORY
+++ b/ruby-raa/ruby-dbi/HISTORY
@@ -1,3 +1,8 @@
+2010-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.4.3
+	* CONFIGURE, BUILDS: deleted
+	* DEPENDS: remove everything except RUBY
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/ruby-interbase/DEPENDS b/ruby-raa/ruby-interbase/DEPENDS
index c364061d2e..9c76678fdb 100755
--- a/ruby-raa/ruby-interbase/DEPENDS
+++ b/ruby-raa/ruby-interbase/DEPENDS
@@ -1,3 +1,3 @@
 depends RUBY     &&
-depends firebird
+depends FIREBIRD
 
diff --git a/ruby-raa/ruby-interbase/HISTORY b/ruby-raa/ruby-interbase/HISTORY
index c2d9c6050e..44c0f14eb2 100644
--- a/ruby-raa/ruby-interbase/HISTORY
+++ b/ruby-raa/ruby-interbase/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: firebird => FIREBIRD
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/ruby-odbc/BUILD b/ruby-raa/ruby-odbc/BUILD
index 1a91f5b0d4..f86484e631 100755
--- a/ruby-raa/ruby-odbc/BUILD
+++ b/ruby-raa/ruby-odbc/BUILD
@@ -1,3 +1,4 @@
+cd ext &&
 ruby extconf.rb --enable-dlopen    &&
 make
 
diff --git a/ruby-raa/ruby-odbc/DETAILS b/ruby-raa/ruby-odbc/DETAILS
index 4fafa540b7..0fde32e9aa 100755
--- a/ruby-raa/ruby-odbc/DETAILS
+++ b/ruby-raa/ruby-odbc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ruby-odbc
-         VERSION=0.9996
-     SOURCE_HASH=sha512:e8f7f33dd1287970038fe518c2781e66de53c8c92888f0620135df1d43d159a62ae6f5e5c97bbfa079aca5b4589f24f8f80b14331f30e09c72f5b196a251d7e3
+         VERSION=0.9999
+     SOURCE_HASH=sha512:43628486598bcf737fc25326c9abf31d9a63f7e2d81693e9483af4d6fb25b9d8782313ab1d26d4f122fb23435756781944dd1e10951193eb00c5b17d6f8afd54
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.ch-werner.de/rubyodbc/
diff --git a/ruby-raa/ruby-odbc/HISTORY b/ruby-raa/ruby-odbc/HISTORY
index d03c7fca8d..d44a9fb4d6 100644
--- a/ruby-raa/ruby-odbc/HISTORY
+++ b/ruby-raa/ruby-odbc/HISTORY
@@ -1,3 +1,7 @@
+2009-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.9999
+	* BUILD: adjust
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/sqlite3-ruby/DETAILS b/ruby-raa/sqlite3-ruby/DETAILS
index bf7428c14b..c3896cdc69 100755
--- a/ruby-raa/sqlite3-ruby/DETAILS
+++ b/ruby-raa/sqlite3-ruby/DETAILS
@@ -1,8 +1,9 @@
            SPELL=sqlite3-ruby
-         VERSION=1.2.4
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[1]=http://rubyforge.org/frs/download.php/42055/$SOURCE
-     SOURCE_HASH=sha512:1c6585e3da3f81fdfb72d6aa81e397ac23900c357fcf61d227d9847c7e7253e5f8187f97fa621c77800f5c61ebb97f36fc07445b1b3346218add11d177951499
+          SPELLX=dbd-sqlite3
+         VERSION=1.2.5
+     SOURCE_HASH=sha512:fd5fdaf2fedc0e479640bfe335aa803d26c9d9e244ffc962d8c9f02cf88803047c04f09e82b82c85debb0ed4093c1c06497ca8a6657a834268805de1e493d41f
+          SOURCE=$SPELLX-$VERSION.tar.gz
+   SOURCE_URL[0]=http://rubyforge.org/frs/download.php/60205/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://sqlite-ruby.rubyforge.org/
          ENTERED=20070508
diff --git a/ruby-raa/sqlite3-ruby/HISTORY b/ruby-raa/sqlite3-ruby/HISTORY
index 79f43211fa..f2c3279881 100644
--- a/ruby-raa/sqlite3-ruby/HISTORY
+++ b/ruby-raa/sqlite3-ruby/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 1.2.5
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/shell-term-fm/mksh/DETAILS b/shell-term-fm/mksh/DETAILS
index 9ab3d8ef36..f62bd34232 100755
--- a/shell-term-fm/mksh/DETAILS
+++ b/shell-term-fm/mksh/DETAILS
@@ -1,12 +1,12 @@
            SPELL=mksh
-         VERSION=R39b
+         VERSION=R39c
           SOURCE=$SPELL-$VERSION.cpio.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
    SOURCE_URL[0]=http://www.mirbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
    SOURCE_URL[1]=http://pub.allbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
         WEB_SITE=http://www.mirbsd.org/mksh.htm
          ENTERED=20060928
-     SOURCE_HASH=sha512:a106284e45e6aed0a61e9f43a3b77e2c3c1f8ff46828317d10317204a23e51e4c44de9d90d8b41bcbe47816b054c73a8910ee5a4a404bb864d70e3a711247aec
+     SOURCE_HASH=sha512:cbde337055d055f66f9e54e876323e44da867d416ffb5b2a4e8cf51ad9d6ab81cde2ca073f20e2830906a747913ecdd100eee19ae93c65a4f9d2397a7b61c8c7
 # I suggest to add this to the list (shortname MIROS or MIRBSD please)
       LICENSE[0]=http://mirbsd.de/MirOS-Licence
            SHORT="MirBSD Korn Shell"
diff --git a/shell-term-fm/mksh/HISTORY b/shell-term-fm/mksh/HISTORY
index 8a1eec0bc8..3333831794 100644
--- a/shell-term-fm/mksh/HISTORY
+++ b/shell-term-fm/mksh/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to R39c
+
 2010-02-13 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to R39b
 
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index be0a724fd7..1e493696df 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2010-02-26 Eric Sandall <sandalle@sourcemage.org>
+	* INSTALL: Fails with multiple make jobs
+
 2009-10-01 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.7
 
diff --git a/xorg-data/xkeyboard-config/INSTALL b/xorg-data/xkeyboard-config/INSTALL
index 529f26931b..bce9146159 100755
--- a/xorg-data/xkeyboard-config/INSTALL
+++ b/xorg-data/xkeyboard-config/INSTALL
@@ -1,3 +1,4 @@
+make_single &&
 default_install &&
 
 install -vm 755 -d "$INSTALL_ROOT/var/lib/xkb"