[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (81f2ba63e7eb99a372367eae8b0039bed60a8a32)

Vlad Glagolev scm at sourcemage.org
Sat Jul 30 11:53:07 EDT 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 lua-forge/luadbi/BUILD   |    6 +++++-
 lua-forge/luadbi/DEPENDS |    4 ++--
 lua-forge/luadbi/DETAILS |    3 ++-
 lua-forge/luadbi/HISTORY |    6 +++++-
 lua-forge/luadbi/INSTALL |   18 +++++++++---------
 lua-forge/luasec/DETAILS |    6 +++---
 lua-forge/luasec/HISTORY |    3 +++
 7 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 81f2ba63e7eb99a372367eae8b0039bed60a8a32
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    luadbi: added mysql support, fixed library path

commit 38f34e056b3910482a0b3326ff15e8b4dd404be1
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    luasec: => 0.4.1

diff --git a/lua-forge/luadbi/BUILD b/lua-forge/luadbi/BUILD
index 1e32713..e5f22d5 100755
--- a/lua-forge/luadbi/BUILD
+++ b/lua-forge/luadbi/BUILD
@@ -1,7 +1,11 @@
-cd "${SOURCE_DIRECTORY}" &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+  make mysql
+fi &&
+
 if is_depends_enabled $SPELL postgresql; then
   make psql
 fi &&
+
 if is_depends_enabled $SPELL sqlite; then
   make sqlite3
 fi
diff --git a/lua-forge/luadbi/DEPENDS b/lua-forge/luadbi/DEPENDS
index f9043bf..2454f4f 100755
--- a/lua-forge/luadbi/DEPENDS
+++ b/lua-forge/luadbi/DEPENDS
@@ -1,6 +1,6 @@
+optional_depends MYSQL '' '' 'for mariadb/mysql support' &&
 optional_depends postgresql '' '' 'for postgresql support' &&
 optional_depends sqlite '' '' 'for sqlite support'
-# the next 3 are supported, feel free to test/enable them
-#optional_depends MYSQL '' '' 'for mariadb/mysql support'
+# the next 2 are supported, feel free to test/enable them
 #optional_depends something '' '' 'for oracle support'
 #optional_depends something '' '' 'for db2 support'
diff --git a/lua-forge/luadbi/DETAILS b/lua-forge/luadbi/DETAILS
index d16a3ef..897f6c3 100755
--- a/lua-forge/luadbi/DETAILS
+++ b/lua-forge/luadbi/DETAILS
@@ -1,9 +1,10 @@
            SPELL=luadbi
          VERSION=0.5
+      PATCHLEVEL=1
           SOURCE="${SPELL}.${VERSION}.tar.gz"
    SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
      SOURCE_HASH=sha512:4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://code.google.com/p/luadbi/"
       LICENSE[0]=MIT
          ENTERED=20110408
diff --git a/lua-forge/luadbi/HISTORY b/lua-forge/luadbi/HISTORY
index 8470e2b..94f006d 100644
--- a/lua-forge/luadbi/HISTORY
+++ b/lua-forge/luadbi/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* DEPENDS: added mysql support; readability++
+	* INSTALL: simplicity++, verbosity++; corrected library path
+
 2011-04-08 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
-
diff --git a/lua-forge/luadbi/INSTALL b/lua-forge/luadbi/INSTALL
index b04091e..ec436f0 100755
--- a/lua-forge/luadbi/INSTALL
+++ b/lua-forge/luadbi/INSTALL
@@ -1,10 +1,10 @@
-cd "${SOURCE_DIRECTORY}" &&
 LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)" &&
-LUADBI_INSTALL="${INSTALL_ROOT}/${LUA_LIB}/DBI" &&
-mkdir -p "${LUADBI_INSTALL}" &&
-install -m0755 DBI.lua "${LUADBI_INSTALL}/" &&
-if [ -e ./dbdpostgresql.so ]; then
-  install -m0755 dbdpostgresql.so "${LUADBI_INSTALL}/"
-elif [ -e ./dbdsqlite3.so ]; then
-  install -m0755 dbdsqlite3.so "${LUADBI_INSTALL}/"
-fi
+LUADBI_INSTALL="${INSTALL_ROOT}/${LUA_LIB}" &&
+
+install -vm 0755 -d "${LUADBI_INSTALL}" &&
+
+install -vm 0644 DBI.lua "${LUADBI_INSTALL}" &&
+
+for so in *.so; do
+  install -vm 0755 "$so" "${LUADBI_INSTALL}/$so"
+done
diff --git a/lua-forge/luasec/DETAILS b/lua-forge/luasec/DETAILS
index 3e621a3..27c38b1 100755
--- a/lua-forge/luasec/DETAILS
+++ b/lua-forge/luasec/DETAILS
@@ -1,8 +1,8 @@
            SPELL=luasec
-         VERSION=0.4
+         VERSION=0.4.1
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://luaforge.net/frs/download.php/4255/$SOURCE
-     SOURCE_HASH=sha512:dfd1b7427ffbd0537707885cdf3ef0d453c745d0c37f682cae71c47374aff6a935d1687ffc8252cc25d5dec174644e962fbcac0e735ba3f07d633c432ecd08bc
+   SOURCE_URL[0]=http://www.inf.puc-rio.br/~brunoos/luasec/download/$SOURCE
+     SOURCE_HASH=sha512:bc934e952294ec45c9c8cfb70f68ebcd415b241d4af8dbf649016a7d14d7da5380d12cbf490560425235168f2c5abbbcd48192068a4e8e6bf523c92cfbf604d9
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://luasec.luaforge.net/
       LICENSE[0]=MIT
diff --git a/lua-forge/luasec/HISTORY b/lua-forge/luasec/HISTORY
index 01ceec4..b1020ad 100644
--- a/lua-forge/luasec/HISTORY
+++ b/lua-forge/luasec/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.4.1; renewed source url
+
 2009-10-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.4
 


More information about the SM-Commit mailing list