Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 http/midori/DETAILS      |   14 +++++++-------
 http/midori/HISTORY      |    4 +++-
 http/webkitgtk/BUILD     |   11 +----------
 http/webkitgtk/DEPENDS   |   14 ++++++--------
 http/webkitgtk/DETAILS   |   12 ++++++------
 http/webkitgtk/HISTORY   |    5 ++++-
 http/webkitgtk/INSTALL   |    2 --
 http/webkitgtk/PRE_BUILD |    3 +++
 8 files changed, 30 insertions(+), 35 deletions(-)

New commits:
commit 34036b5306f50567c53d862950391fb806dc1fc2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    webkitgtk: => r29037, no more stupid qmake from qt4 .)

commit d6d70a5eb30a9814c3281fb6752e1abf95f4faf1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    midori: => 0.0.16

diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 23f1c65..312b711 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -1,13 +1,13 @@
            SPELL=midori
-         VERSION=0.0.15
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://software.twotoasts.de/media/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:29357dad774b35f3f7f394161806880fde7ad63876631978ebfbe96ec95d9073babd00f7b603feadcbabd7e82afefbe7e097c74a8c63e1d0e9b1434941f9f418
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://software.twotoasts.de/?page=midori";
+         VERSION=0.0.16
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://software.twotoasts.de/media/$SPELL/$SOURCE
+     
SOURCE_HASH=sha512:db72725f2fae650c143b171e408b43491ab0fcb070bd7c7ff01e5e7b592bd9aff24d813bac41a1d781091946dd98a0c95e4fe63b58b006583ea23fcbeac5a4be
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=http://software.twotoasts.de/?page=midori
       LICENSE[0]=GPL
          ENTERED=20071209
-           SHORT="Midori is a lightweight web browser."
+           SHORT="Midori is a lightweight web browser"
 cat << EOF
 Midori is a lightweight web browser.
 * Full integration with GTK+2.  
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 16a8ed1..297994d 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2008-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.0.16, cleaned up
+
 2007-12-20 George Sherwood <geroge AT beernabeer.com>
        * DEPENDS: optional_depends gnome-icon-theme to have all icons present
 
@@ -6,4 +9,3 @@
 
 2007-12-09 George Sherwood <george AT beernabeer.com>
        * DEPENDS, DETAILS: spell created
-
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index c3b369d..8f58e6d 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,10 +1 @@
-PREFIX=/usr    &&
-PATH=$PREFIX/bin/qt4:$PATH  &&
-QMAKE_CFLAGS_RELEASE=$CFLAGS  &&
-QMAKE_CXXFLAGS_RELEASE=$CXXFLAGS  &&
-QMAKE_LFLAGS_RELEASE=$LDFLAGS  &&
-cd $SOURCE_DIRECTORY &&
-./WebKitTools/Scripts/build-webkit \
-  --qmakearg=WEBKIT_INC_DIR=$PREFIX/include/WebKit \
-  --qmakearg=WEBKIT_LIB_DIR=$PREFIX/lib --gtk
-
+make
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 58ae641..ca2f51e 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -1,13 +1,11 @@
-depends g++  &&
-depends gtk+2  &&
-depends qt4    &&
-depends icu  &&
+depends g++ &&
+depends gtk+2 &&
+depends icu &&
 depends gperf &&
 depends libpng &&
-depends curl  &&
-depends jpeg  &&
+depends curl &&
+depends jpeg &&
 depends bison &&
-depends flex  &&
+depends flex &&
 depends sqlite &&
 depends libxslt
-
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 0a54399..0c3eb5d 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,13 +1,13 @@
            SPELL=webkitgtk
-         VERSION=r28711
-          SOURCE="WebKit-$VERSION.tar.bz2"
-   SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/${SOURCE}
-     
SOURCE_HASH=sha512:a4f576f5993d946f7344606f5442ad5cadad54e2a5bc1630264d5c580f838769afb3c14acf50ccef7b6c69e41b0722cd1c8d737b73be8fba84f6fae7dee91cfd
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/WebKit-$VERSION"
+         VERSION=r29037
+          SOURCE=WebKit-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
+     
SOURCE_HASH=sha512:727f32b2f6d3b99062daa88dc3a578806ba720a2e3a1fda960a8dfa239207b95434ffcb7e59a17dac673ca94c45c0ac3ddd66b24a668a4fc740dd69b3acd2787
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/WebKit-$VERSION
         WEB_SITE=http://webkit.org/
       LICENSE[0]=GPL
          ENTERED=20071208
-           SHORT="an open source web browser engine."
+           SHORT="an open source web browser engine"
 cat << EOF
 WebKit is an open source web browser engine. WebKit is also the name of 
 the Mac OS X system framework version of the engine that's used by 
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 57006d9..28147ae 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,6 +1,9 @@
+2008-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated to build 29037, cleaned up
+       * DEPENDS, BUILD, PRE_BUILD: qmake => autotools
+
 2007-12-14 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to build 28711
 
 2007-12-08 George Sherwood <george AT beernabeer.com>
        * DETAILS, DEPENDS, BUILD, INSTALL: spell created
-
diff --git a/http/webkitgtk/INSTALL b/http/webkitgtk/INSTALL
deleted file mode 100755
index ffd4b18..0000000
--- a/http/webkitgtk/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/WebKitBuild/Release  &&
-make install
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..d033b66
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+./autogen.sh --prefix=$INSTALL_ROOT/usr