Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 ChangeLog                  |    3 +++
 devel/kdiff3/BUILD         |    2 ++
 devel/kdiff3/DEPENDS       |    1 +
 devel/kdiff3/DETAILS       |   22 ++++++++++++++++++++++
 devel/kdiff3/HISTORY       |    3 +++
 devel/kdiff3/PRE_BUILD     |    3 +++
 graphics/darktable/DETAILS |    4 ++--
 graphics/darktable/HISTORY |    3 +++
 8 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 0c7362b46f7a9d94a55d9e239df12c4797fafe2d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/kdiff3: new spell, a diff tool for qt4

commit dc323cae5e69bd3bb25c07acf5a03b789d51515f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/darktable: version 1.6.4

diff --git a/ChangeLog b/ChangeLog
index 9773ab7..d493bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * devel/kdiff3: new spell, a diff tool written in qt4
+
 2015-04-09 Ismael Luceno <ismael AT sourcemage.org>
        * http/rawk: new spell, rage against web frameworks - posix shell
          static site generator
diff --git a/devel/kdiff3/BUILD b/devel/kdiff3/BUILD
new file mode 100755
index 0000000..3b3c6e8
--- /dev/null
+++ b/devel/kdiff3/BUILD
@@ -0,0 +1,2 @@
+cd ${SOURCE_DIRECTORY}/src-QT4 &&
+qt4_build
diff --git a/devel/kdiff3/DEPENDS b/devel/kdiff3/DEPENDS
new file mode 100755
index 0000000..2e4e2ef
--- /dev/null
+++ b/devel/kdiff3/DEPENDS
@@ -0,0 +1 @@
+depends qt4 
diff --git a/devel/kdiff3/DETAILS b/devel/kdiff3/DETAILS
new file mode 100755
index 0000000..015bdab
--- /dev/null
+++ b/devel/kdiff3/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=kdiff3
+         VERSION=0.9.98
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://kdiff3.sourceforge.net";
+      LICENSE[0]=GPL
+         ENTERED=20150409
+           SHORT="a diff and merge program"
+cat << EOF
+KDiff3 is a diff and merge program that
+
+  * compares or merges two or three text input files or directories, * shows
+  the differences line by line and character by character (!), * provides
+  an automatic merge-facility and * an integrated editor for comfortable
+  solving of merge-conflicts, * supports Unicode, UTF-8 and other codecs,
+  autodetection via byte-order-mark "BOM" * supports KIO on KDE (allows
+  accessing ftp, sftp, fish, smb etc.), * Printing of differences, * Manual
+  alignment of lines, * Automatic merging of version control history ($Log$),
+  * and has an intuitive graphical user interface.
+EOF
diff --git a/devel/kdiff3/HISTORY b/devel/kdiff3/HISTORY
new file mode 100644
index 0000000..d42db12
--- /dev/null
+++ b/devel/kdiff3/HISTORY
@@ -0,0 +1,3 @@
+2015-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/devel/kdiff3/PRE_BUILD b/devel/kdiff3/PRE_BUILD
new file mode 100755
index 0000000..3307049
--- /dev/null
+++ b/devel/kdiff3/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:/usr/local:/usr:' src-QT4/kdiff3.pro
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 527a24f..e69e513 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,10 +1,10 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=darktable
 if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
-         VERSION=1.6.3
+         VERSION=1.6.4
           SOURCE="${SPELL}-${VERSION}.tar.xz"
    
SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:a3e94de0ace987b997183e82dadfe75e263bacd04cb948c983026022bb7b751f3fe0967ce004f2bedb24380397ff7c347a8a8ab0179ecfb52108dd1197d0a7fe
+     
SOURCE_HASH=sha512:1527133ec6031431a8b929beaba592b3a99f800e883820a2e46d4e1155b2a32bf5e94ce030ab1942b112f6726592c9d538419887540daba014a9a1ba3100e874
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
 else
          VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index a086c19..bf2b339 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2015-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.6.4
+
 2015-03-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.6.3