[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (789872424d13aca9b75f716d480d0667cf3a8b34)

Vlad Glagolev scm at sourcemage.org
Wed Aug 6 23:13:32 EDT 2008


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

 lua-forge/lrexlib/DEPENDS   |    4 +++-
 lua-forge/lrexlib/DETAILS   |   12 ++++++------
 lua-forge/lrexlib/HISTORY   |    5 +++++
 lua-forge/lrexlib/INSTALL   |    6 +++++-
 lua-forge/lrexlib/PRE_BUILD |    6 ++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit 789872424d13aca9b75f716d480d0667cf3a8b34
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    lrexlib: => 2.4.0, new oniguruma opt dep

diff --git a/lua-forge/lrexlib/DEPENDS b/lua-forge/lrexlib/DEPENDS
index 06fa17f..1ee21f8 100755
--- a/lua-forge/lrexlib/DEPENDS
+++ b/lua-forge/lrexlib/DEPENDS
@@ -1,2 +1,4 @@
 depends lua &&
-depends pcre
+depends pcre &&
+
+optional_depends oniguruma "" "" "for Oniguruma library support"
diff --git a/lua-forge/lrexlib/DETAILS b/lua-forge/lrexlib/DETAILS
index eb83fa1..aabf950 100755
--- a/lua-forge/lrexlib/DETAILS
+++ b/lua-forge/lrexlib/DETAILS
@@ -1,14 +1,14 @@
            SPELL=lrexlib
-         VERSION=2.3.0
+         VERSION=2.4.0
           SOURCE=$SPELL-$VERSION.zip
-   SOURCE_URL[0]=http://luaforge.net/frs/download.php/3439/$SOURCE
-     SOURCE_HASH=sha512:c177b21247fa3981c8c473989d8a087e674f589c125662001dbe27f6b10d79eeea67053f0abccb6fae3ecc468e1d028606cd538b5fdfdb5baf6da57a5af1d1b5
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://luaforge.net/frs/download.php/3599/$SOURCE
+     SOURCE_HASH=sha512:7ee57cd7197a2c96fb5b5788aa4b1951f6cfbb5f4d7635d31d3d8a14552c2668a62a323f0ef7ee22d504d20ea45e5e94b86da64b21c867eef7d617cf1d1966c5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://lrexlib.luaforge.net/
       LICENSE[0]=MIT
          ENTERED=20080127
            SHORT="regular expression library for Lua"
 cat << EOF
-Lrexlib provides bindings of the two principal regular
-expression library interfaces (POSIX and PCRE) to Lua.
+Lrexlib provides bindings of the two principal regular expression library
+interfaces (POSIX and PCRE) to Lua.
 EOF
diff --git a/lua-forge/lrexlib/HISTORY b/lua-forge/lrexlib/HISTORY
index cf78559..df351aa 100644
--- a/lua-forge/lrexlib/HISTORY
+++ b/lua-forge/lrexlib/HISTORY
@@ -1,3 +1,8 @@
+2008-08-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.4.0, fixed long desc, quoting paths!
+	* DEPENDS: added Oniguruma library support via opt dep
+	* PRE_BUILD, INSTALL: use oniguruma really optional :)
+
 2008-06-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.3.0
 
diff --git a/lua-forge/lrexlib/INSTALL b/lua-forge/lrexlib/INSTALL
index 82a7e60..1a9a62f 100755
--- a/lua-forge/lrexlib/INSTALL
+++ b/lua-forge/lrexlib/INSTALL
@@ -1,3 +1,7 @@
 local LUA=$(installed_version lua)
 
-install -vm 755 src/*.so* $INSTALL_ROOT/usr/lib/lua/${LUA%.?}
+if is_depends_enabled $SPELL oniguruma; then
+  install -vm 755 src/oniguruma/*.so* "$INSTALL_ROOT/usr/lib/lua/${LUA%.?}"
+fi &&
+
+install -vm 755 src/{pcre,posix}/*.so* "$INSTALL_ROOT/usr/lib/lua/${LUA%.?}"
diff --git a/lua-forge/lrexlib/PRE_BUILD b/lua-forge/lrexlib/PRE_BUILD
new file mode 100755
index 0000000..33d824d
--- /dev/null
+++ b/lua-forge/lrexlib/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if ! is_depends_enabled $SPELL oniguruma; then
+  sed -i "s: build_onig::;s: test_onig::;s: clean_onig::" Makefile
+fi



More information about the SM-Commit mailing list