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

18 files changed, 80 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d1a21edc6..77aa6041e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* http/uzbl: new spell, A browser that adheres to the unix philosophy
+
 2009-04-28  Treeve Jelbert <treeve@sourcemage.org>
 	* printer/exaro-libs: spell deprecated [replaced by exaro]
 
diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index ebac0579c1..a9ae0aad9f 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
            SPELL=geany
-         VERSION=0.16
+         VERSION=0.17
           SOURCE=$SPELL-$VERSION.tar.bz2
 	 SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://files.uvena.de/$SPELL/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 592eb80952..e4cefcfd04 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2009-05-02 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.17
+
 2009-02-15 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.16; quoting paths
 
diff --git a/devel/lemon/DETAILS b/devel/lemon/DETAILS
index 9a83eb103c..448c670a81 100755
--- a/devel/lemon/DETAILS
+++ b/devel/lemon/DETAILS
@@ -3,6 +3,9 @@
           SOURCE="${SPELL}.c"
    SOURCE_URL[0]=http://www.sqlite.org/cvstrac/getfile/sqlite/tool/${SOURCE}
      SOURCE_HASH=sha512:8773ac025dc3813da0ef3444f4ec9820343f2c07e663f162767617a8f2955a1539e61e726b552b36528b37578f187901897f1a37857a8e410cc6bc7be223f0f5
+         SOURCE2="lempar.c"
+  SOURCE2_URL[0]=http://www.sqlite.org/cvstrac/getfile/sqlite/tool/${SOURCE2}
+    SOURCE2_HASH=sha512:0584f3b8e26b9b99b76b06d282d3bfe96be771307be1bd04f0e024e6db8cd4a8041b42245c7c0eed2405c3f8dd469a7d6ee8eb13aec82abe80e2e2f4479d3a74
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
         WEB_SITE=http://www.hwaci.com/sw/lemon/
       LICENSE[0]=PD
diff --git a/devel/lemon/HISTORY b/devel/lemon/HISTORY
index acee92f65c..dff799e1b9 100644
--- a/devel/lemon/HISTORY
+++ b/devel/lemon/HISTORY
@@ -1,3 +1,9 @@
+2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* DETAILS: added lempar.c which lemon needs to function properly
+	* INSTALL: added lempar.c which lemon needs to function properly
+	* PRE_BUILD: patch lemon.c to point to the right spot for lempar.c
+	* lempar.c.path.fix.patch:  patch for lemon.c to point to the right spot
+
 2009-04-25 Arjan Bouter <abouter@sourcemage.org>
 	* BUILD, DETAILS, HISTORY, INSTALL,
 	  PRE_BUILD: created spell
diff --git a/devel/lemon/INSTALL b/devel/lemon/INSTALL
index 663ac33916..4067cf777e 100755
--- a/devel/lemon/INSTALL
+++ b/devel/lemon/INSTALL
@@ -1 +1,3 @@
-install -m 0755 lemon ${INSTALL_ROOT}/usr/bin
+install -v -m 0755 lemon ${INSTALL_ROOT}/usr/bin &&
+mkdir -vp ${INSTALL_ROOT}/usr/share/lemon/ &&
+cp -v lempar.c ${INSTALL_ROOT}/usr/share/lemon/
diff --git a/devel/lemon/PRE_BUILD b/devel/lemon/PRE_BUILD
index 1251b6ab39..51f6549e76 100755
--- a/devel/lemon/PRE_BUILD
+++ b/devel/lemon/PRE_BUILD
@@ -1,3 +1,9 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-cp ${SOURCE_CACHE}/${SOURCE} ./
+verify_file '' &&
+verify_file 2 &&
+cp ${SOURCE_CACHE}/${SOURCE} . &&
+cp ${SOURCE_CACHE}/${SOURCE2} . &&
+cp $SPELL_DIRECTORY/lempar.c.path.fix.patch . &&
+sed -i -e "s:INSTALL_ROOT:$INSTALL_ROOT:g" lempar.c.path.fix.patch &&
+patch -p0 < lempar.c.path.fix.patch
diff --git a/devel/lemon/lempar.c.path.fix.patch b/devel/lemon/lempar.c.path.fix.patch
new file mode 100644
index 0000000000..1ef4f173d4
--- /dev/null
+++ b/devel/lemon/lempar.c.path.fix.patch
@@ -0,0 +1,11 @@
+--- lemon.c.orig	2009-04-29 13:05:36.000000000 +0200
++++ lemon.c	2009-04-29 13:07:11.000000000 +0200
+@@ -3082,6 +3082,8 @@
+     tpltname = buf;
+   }else if( access(templatename,004)==0 ){
+     tpltname = templatename;
++  }else if( access("INSTALL_ROOT/usr/share/lemon/lempar.c",004)==0 ){
++    tpltname = "INSTALL_ROOT/usr/share/lemon/lempar.c";
+   }else{
+     tpltname = pathsearch(lemp->argv0,templatename,0);
+   }
diff --git a/http/uzbl/BUILD b/http/uzbl/BUILD
new file mode 100755
index 0000000000..b0d5d857e3
--- /dev/null
+++ b/http/uzbl/BUILD
@@ -0,0 +1 @@
+make DESTDIR=${INSTALL_ROOT}
diff --git a/http/uzbl/DEPENDS b/http/uzbl/DEPENDS
new file mode 100755
index 0000000000..ffe8d6acd6
--- /dev/null
+++ b/http/uzbl/DEPENDS
@@ -0,0 +1,12 @@
+depends git &&
+depends pkgconfig &&
+depends webkitgtk &&
+depends gtk+2 &&
+suggest_depends dmenu \
+                 "" \
+                 "" \
+                 "For some support scripts" &&
+suggest_depends zenity \
+                 "" \
+                 "" \
+                 "For some support scripts" 
diff --git a/http/uzbl/DETAILS b/http/uzbl/DETAILS
new file mode 100755
index 0000000000..865fda0aae
--- /dev/null
+++ b/http/uzbl/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=uzbl
+if [[ $UZBL_AUTO == y ]]; then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=scm
+fi
+          SOURCE="${SPELL}-scm.tar.bz2"
+   SOURCE_URL[0]=git://github.com/Dieterbe/${SPELL}.git:${SPELL}-scm
+  FORCE_DOWNLOAD=on
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+        WEB_SITE="http://www.uzbl.org/"
+      LICENSE[0]=GPLv3
+         ENTERED=20090502
+           SHORT="A browser that adheres to the unix philosophy."
+cat << EOF
+A browser that adheres to the unix philosophy.
+EOF
diff --git a/http/uzbl/HISTORY b/http/uzbl/HISTORY
new file mode 100644
index 0000000000..16a24eb323
--- /dev/null
+++ b/http/uzbl/HISTORY
@@ -0,0 +1,4 @@
+2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* PREPARE, BUILD, DEPENDS, DETAILS, INSTALL: spell created
+	* PREPARE: fixup the var name
+
diff --git a/http/uzbl/INSTALL b/http/uzbl/INSTALL
new file mode 100755
index 0000000000..67186dc4a8
--- /dev/null
+++ b/http/uzbl/INSTALL
@@ -0,0 +1 @@
+make DESTDIR=${INSTALL_ROOT} install
diff --git a/http/uzbl/PREPARE b/http/uzbl/PREPARE
new file mode 100755
index 0000000000..58397cb0ae
--- /dev/null
+++ b/http/uzbl/PREPARE
@@ -0,0 +1,3 @@
+config_query UZBL_AUTO \
+          "Automaticaly update the spell on sorcery queue/system-update?" \
+          "n"
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 46a5bced7b..0fa1165e19 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,5 +1,5 @@
            SPELL=conky
-         VERSION=1.6.1
+         VERSION=1.7.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index d458372fcd..59c51a6160 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2009-05-02 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.7.0
+
 2008-08-17 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.6.1, fixed SOURCE_URL[0], quoting paths!
 	* PRE_BUILD: removed, useless: bug fixed by upstream
diff --git a/x11/conky/conky-1.6.1.tar.bz2.sig b/x11/conky/conky-1.6.1.tar.bz2.sig
deleted file mode 100644
index 27e5ce3eb9..0000000000
--- a/x11/conky/conky-1.6.1.tar.bz2.sig
+++ /dev/null
diff --git a/x11/conky/conky-1.7.0.tar.bz2.sig b/x11/conky/conky-1.7.0.tar.bz2.sig
new file mode 100644
index 0000000000..b4d5d0ec55
--- /dev/null
+++ b/x11/conky/conky-1.7.0.tar.bz2.sig