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                                                                    
    |   16 
 FUNCTIONS                                                                    
    |    3 
 audio-creation/musescore/01-debundle-freetype.patch                          
    |   94 +
 audio-creation/musescore/04-manpage-errors.patch                             
    |   27 
 audio-creation/musescore/BUILD                                               
    |    4 
 audio-creation/musescore/CONFIGURE                                           
    |    9 
 audio-creation/musescore/DEPENDS                                             
    |   38 
 audio-creation/musescore/DETAILS                                             
    |   10 
 audio-creation/musescore/HISTORY                                             
    |   11 
 audio-creation/musescore/INSTALL                                             
    |    2 
 audio-creation/musescore/PRE_BUILD                                           
    |    6 
 audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch               
    |  479 ++++++++++
 audio-libs/lilypond/0001-use-guile-config1.patch                             
    |   33 
 audio-libs/lilypond/BUILD                                                    
    |   13 
 audio-libs/lilypond/CONFIGURE                                                
    |    1 
 audio-libs/lilypond/DEPENDS                                                  
    |   14 
 audio-libs/lilypond/DETAILS                                                  
    |    4 
 audio-libs/lilypond/HISTORY                                                  
    |    6 
 audio-libs/lilypond/INSTALL                                                  
    |    7 
 audio-libs/lilypond/PRE_BUILD                                                
    |    6 
 audio-players/mpd/DETAILS                                                    
    |    4 
 audio-players/mpd/HISTORY                                                    
    |    3 
 crypto/openssl/DETAILS                                                       
    |    4 
 crypto/openssl/HISTORY                                                       
    |    3 
 devel/graphviz/DEPENDS                                                       
    |    2 
 devel/graphviz/DETAILS                                                       
    |    4 
 devel/graphviz/HISTORY                                                       
    |    4 
 devel/guile/DETAILS                                                          
    |    2 
 devel/guile/HISTORY                                                          
    |    4 
 devel/guile/guile-keyring.gpg                                                
    |binary
 devel/guile1/0001-do-not-install-files-also-present-in-guile.patch           
    |  113 ++
 devel/guile1/BUILD                                                           
    |    7 
 devel/guile1/DEPENDS                                                         
    |    5 
 devel/guile1/DETAILS                                                         
    |   21 
 devel/guile1/HISTORY                                                         
    |    4 
 devel/guile1/PRE_BUILD                                                       
    |   11 
 devel/guile1/UP_TRIGGERS                                                     
    |    7 
 devel/llvm/HISTORY                                                           
    |    3 
 devel/llvm/PRE_SUB_DEPENDS                                                   
    |    9 
 devel/llvm/SUB_DEPENDS                                                       
    |   14 
 doc/po4a/DEPENDS                                                             
    |    4 
 doc/po4a/DETAILS                                                             
    |    6 
 doc/po4a/HISTORY                                                             
    |    3 
 editors/ed/DEPENDS                                                           
    |    3 
 editors/ed/DETAILS                                                           
    |    5 
 editors/ed/HISTORY                                                           
    |    5 
 editors/ed/PRE_BUILD                                                         
    |    3 
 editors/vim/DETAILS                                                          
    |    4 
 editors/vim/HISTORY                                                          
    |    9 
 fonts/mftrace/DEPENDS                                                        
    |    3 
 fonts/mftrace/DETAILS                                                        
    |    8 
 fonts/mftrace/HISTORY                                                        
    |    3 
 fonts/mftrace/PRE_BUILD                                                      
    |    4 
 graphics-libs/coin/0001-use-clang.patch                                      
    |   92 +
 graphics-libs/coin/DEPENDS                                                   
    |   14 
 graphics-libs/coin/HISTORY                                                   
    |    5 
 graphics-libs/coin/PRE_BUILD                                                 
    |    1 
 graphics-libs/freeimage/DETAILS                                              
    |    1 
 graphics-libs/freeimage/Fix-CVE-2015-0852.patch                              
    |  127 ++
 graphics-libs/freeimage/Fix-CVE-2016-5684.patch                              
    |   33 
 graphics-libs/freeimage/HISTORY                                              
    |    5 
 graphics-libs/freeimage/PRE_BUILD                                            
    |    5 
 graphics-libs/gd/DETAILS                                                     
    |    6 
 graphics-libs/gd/HISTORY                                                     
    |    5 
 graphics-libs/gd/PRE_BUILD                                                   
    |    1 
 graphics-libs/gd/libgd-fix-build-without-freetype.patch                      
    |   53 -
 graphics-libs/harfbuzz/DETAILS                                               
    |    4 
 graphics-libs/harfbuzz/HISTORY                                               
    |    3 
 graphics-libs/simage/HISTORY                                                 
    |    4 
 graphics-libs/simage/PRE_BUILD                                               
    |    4 
 graphics-libs/simage/simage-1.7.0-libpng15.patch                             
    |   12 
 graphics/imagemagick/DETAILS                                                 
    |    4 
 graphics/imagemagick/HISTORY                                                 
    |    6 
 latex/texinfo/DETAILS                                                        
    |    1 
 latex/texinfo/HISTORY                                                        
    |    4 
 latex/texinfo/INSTALL                                                        
    |    3 
 libs/glm/DETAILS                                                             
    |    4 
 libs/glm/HISTORY                                                             
    |    3 
 
libs/med-fichier/0001-install-docs-to-the-correct-location-do-not-install-.patch
 |   24 
 libs/med-fichier/BUILD                                                       
    |    1 
 libs/med-fichier/DEPENDS                                                     
    |    4 
 libs/med-fichier/DETAILS                                                     
    |   13 
 libs/med-fichier/HISTORY                                                     
    |    4 
 libs/med-fichier/PRE_BUILD                                                   
    |    4 
 perl-cpan/mime-charset/DEPENDS                                               
    |    1 
 perl-cpan/mime-charset/DETAILS                                               
    |   13 
 perl-cpan/mime-charset/HISTORY                                               
    |    3 
 perl-cpan/text-wrapi18n/DEPENDS                                              
    |    1 
 perl-cpan/text-wrapi18n/DETAILS                                              
    |   26 
 perl-cpan/text-wrapi18n/HISTORY                                              
    |    3 
 perl-cpan/unicode-linebreak/DEPENDS                                          
    |    2 
 perl-cpan/unicode-linebreak/DETAILS                                          
    |   17 
 perl-cpan/unicode-linebreak/HISTORY                                          
    |    3 
 python-pypi/cherrypy/DETAILS                                                 
    |    4 
 python-pypi/cherrypy/HISTORY                                                 
    |    3 
 python-pypi/dblatex/DETAILS                                                  
    |    4 
 python-pypi/dblatex/HISTORY                                                  
    |    3 
 python-pypi/matplotlib/DETAILS                                               
    |    4 
 python-pypi/matplotlib/HISTORY                                               
    |    3 
 qt5/qttools/0001-actually-build-tools.patch                                  
    |   83 +
 qt5/qttools/HISTORY                                                          
    |    5 
 qt5/qttools/PRE_BUILD                                                        
    |    4 
 x11-toolkits/togl1/DEPENDS                                                   
    |    2 
 x11-toolkits/togl1/DETAILS                                                   
    |   13 
 x11-toolkits/togl1/HISTORY                                                   
    |    3 
 x11-toolkits/togl1/INSTALL                                                   
    |    2 
 106 files changed, 1573 insertions(+), 146 deletions(-)

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

    devel/graphviz: version 2.40.1

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

    editors/vim: version 8.0.0249

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

    graphics/imagemagick: version 7.0.4-6

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

    editors/ed: version 1.14.1, security update

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

    audio-creation/musescore: version 2.0.3

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

    qt5/qttools: actually build tools

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

    crypto/openssl: version 1.0.2k, security update

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

    doc/po4a: version 0.48

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

    perl-cpan/text-wrapi18n: text wrapping support for i18n

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

    perl-cpan/unicode-linebreak: new spell, linebreak handling for unicode

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

    perl-cpan/mime-charset: new spell, charset information for MIME

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

    graphics-libs/harfbuzz: version 1.4.2

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

    audio-players/mpd: version 0.20.3

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

    editors/vim: version 8.0.0238

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

    audio-libs/lilypond: version 2.18.2

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

    python-pypi/dblatex: version 0.3.9

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

    latex/texinfo: install texi2html

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

    devel/guile1: new spell, version 1.x.x of guile

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

    fonts/mftrace: version 1.2.18

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

    devel/guile: version 2.0.13

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

    python-pypi/matplotlib: version 2.0.0

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

    editors/vim: version 8.0.0217

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

    libs/glm: version 0.9.8.4

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

    python-pypi/cherrypy: version 10.0.0

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

    graphics/imagemagick: version 7.0.4-5

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

    FUNCTIONS: explicitly specify installation paths in cmake_build

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

    graphics-libs/freeimage: fix CVE-2015-0852 and CVE-2016-5684

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

    x11-toolkits/togl1: new spell, a Tk widget for OpenGL rendering

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

    graphics-libs/simage: fix compilation against libpng >= 1.5

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

    graphics-libs/coin: use clang for building as gcc 6.3 generates broken 
code

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

    devel/llvm: add subdependencies for clang and lldb

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

    libs/med-fichier: new spell, a library for processing MED files

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

    graphics-libs/gd: version 2.2.4, security update

diff --git a/ChangeLog b/ChangeLog
index b90cde7..2e82d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2017-01-26  Treeve Jelbert <treeve AT sourcemage.org>
        * xorg.gpg: add 56F8CFAD "Julien Cristau 
<julien.cristau AT ens-lyon.org>"
 
+2016-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * perl-cpan/mime-charset: new spell, charset information for MIME
+       * perl-cpan/unicode-linebreak: new spell, linebreak handling for 
unicode
+       * perl-cpan/text-wrapi18n: new spell, text wrapping for i18n
+
 2017-01-25  Treeve Jelbert <treeve AT sourcemage.org>
        * kde.gpg: add EC949121 "Harald Sitter <sitter.harald AT gmail.com>"
 
@@ -14,6 +19,17 @@
        * kde5-apps/kphotoalbum: added
        * kde4-apps/kphotoalbum4: deleted
 
+2017-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * devel/guile1: new spell, version 1.x.x of guile
+
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * x11-toolkits/togl1: new spell, a Tk widget for OpenGL
+       * science/netgen: new spell, an automatic 3d tetrahedral mesh 
generator
+       * FUNCTIONS: explicitly specify installation paths in cmake_build
+
+2017-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * libs/med-fichier: new spell, a library for processing MED files
+
 2017-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * security-libs/google-authenticator-libpam: new spell, a PAM module 
for
          two-factor authentication
diff --git a/FUNCTIONS b/FUNCTIONS
index 452fcdf..a45e9ef 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -583,6 +583,9 @@ cmake_build() {
   message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
 
   cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
+        -DCMAKE_INSTALL_DATADIR=share \
+        -DCMAKE_INSTALL_DOCDIR=share/doc \
+        -DCMAKE_INSTALL_INCLUDEDIR=include \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_MANDIR=share/man \
         -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
diff --git a/audio-creation/musescore/01-debundle-freetype.patch 
b/audio-creation/musescore/01-debundle-freetype.patch
new file mode 100644
index 0000000..c24ced5
--- /dev/null
+++ b/audio-creation/musescore/01-debundle-freetype.patch
@@ -0,0 +1,94 @@
+Description: Use the system copy of freetype
+Author: James Cowgill <jcowgill AT debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,18 +218,18 @@ SET(QT_USE_QTHELP        TRUE)
+ ## freetype2 >= 2.5.2
+ ##
+ 
+-##if (APPLE)
+-##      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR 
FREETYPE_LIBRARIES FREETYPE_CPP)
+-##      if (FREETYPE_INCLUDE_DIRS)
+-##          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS 
${FREETYPE_INCLUDE_DIRS})
+-##          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR 
${FREETYPE_LIBDIR})
+-##          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} 
${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
+-##      else (FREETYPE_INCLUDE_DIRS)
+-##          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
+-##      endif (FREETYPE_INCLUDE_DIRS)
+-##else (APPLE)
+-##    find_package(Freetype REQUIRED)
+-##endif (APPLE)
++if (APPLE)
++      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR 
FREETYPE_LIBRARIES FREETYPE_CPP)
++      if (FREETYPE_INCLUDE_DIRS)
++          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS 
${FREETYPE_INCLUDE_DIRS})
++          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
++          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} 
${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
++      else (FREETYPE_INCLUDE_DIRS)
++          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
++      endif (FREETYPE_INCLUDE_DIRS)
++else (APPLE)
++    find_package(Freetype REQUIRED)
++endif (APPLE)
+ 
+ ##
+ ## alsa >= 1.0.0
+@@ -606,7 +606,6 @@ if (OSC)
+       subdirs (thirdparty/ofqf)
+ endif (OSC)
+ 
+-subdirs (thirdparty/freetype)
+ 
+ 
+ ##
+@@ -622,8 +621,7 @@ include_directories(
+    ${VORBIS_INCDIR}
+    ${SNDFILE_INCDIR}
+    ${LAME_INCLUDE_DIR}
+-#   ${FREETYPE_INCLUDE_DIRS}
+-   ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
++   ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
+ ##
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -385,7 +385,7 @@ if (MINGW)
+       portaudio
+       portmidi
+       winmm
+-      mscore_freetype
++      freetype
+       z
+       )
+ 
+@@ -477,7 +477,7 @@ else (MINGW)
+    target_link_libraries(mscore
+       ${ALSA_LIB}
+       ${QT_LIBRARIES}
+-      mscore_freetype
++      freetype
+       z
+       dl
+       pthread
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -17,7 +17,6 @@ enable_testing()
+ include_directories(
+       ${PROJECT_BINARY_DIR}
+       ${PROJECT_SOURCE_DIR}
+-      ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
+       )
+ 
+ if (OMR)
+@@ -108,7 +107,7 @@ add_executable(
+ target_link_libraries(
+       mtest
+       ${QT_LIBRARIES}
+-      mscore_freetype
++      freetype
+       )
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} 
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
diff --git a/audio-creation/musescore/04-manpage-errors.patch 
b/audio-creation/musescore/04-manpage-errors.patch
new file mode 100644
index 0000000..2e24e5f
--- /dev/null
+++ b/audio-creation/musescore/04-manpage-errors.patch
@@ -0,0 +1,27 @@
+Description: Fix errors in mscore.1 manpage
+ CMake doesn't support single quotes, so the old value of MAN_PORTABLE was
+ causing errors. Insert manual line break to help groff displaying a long 
line.
+Author: James Cowgill <jcowgill AT debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,7 +478,7 @@ if (NOT MINGW AND NOT APPLE)
+                        build/rm-empty-dirs              DESTINATION bin 
COMPONENT portable ${SCRIPT_PERMS})
+       install(FILES    build/Linux+BSD/portable/qt.conf DESTINATION bin 
COMPONENT portable)
+     else (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+-      set(MAN_PORTABLE '.\"') # comment out lines in man page that are only 
relevent to the portable version
++      set(MAN_PORTABLE .\\\") # comment out lines in man page that are only 
relevent to the portable version
+     endif (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+     # install desktop file (perform variable substitution first)
+     configure_file(build/Linux+BSD/mscore.desktop.in 
mscore${MSCORE_INSTALL_SUFFIX}.desktop)
+--- a/build/Linux+BSD/mscore.1.in
++++ b/build/Linux+BSD/mscore.1.in
+@@ -69,6 +69,7 @@ For help with the full MuseScore program
+ These pages cover the topics in this manual and may be more up-to-date:
+ 
+ <https://musescore.org/handbook/command-line-options-0>
++.br
+ <https://musescore.org/handbook/revert-factory-settings-0>
+ 
+ .SH OPTIONS
diff --git a/audio-creation/musescore/BUILD b/audio-creation/musescore/BUILD
index 92c81f0..af480f4 100755
--- a/audio-creation/musescore/BUILD
+++ b/audio-creation/musescore/BUILD
@@ -1,2 +1,2 @@
-PATH="$QT5DIR/bin:$PATH"
-make PREFIX="$INSTALL_ROOT/usr"
+qt5_cmake_build &&
+make lrelease
diff --git a/audio-creation/musescore/CONFIGURE 
b/audio-creation/musescore/CONFIGURE
new file mode 100755
index 0000000..7eb4bb8
--- /dev/null
+++ b/audio-creation/musescore/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_option  MUSESCORE_AEOLUS                 \
+                     "Enable organ synthesizer?" n    \
+                     "-DAEOLUS=on"                    \
+                     "-DAEOLUS=off"                   &&
+
+config_query_option  MUSESCORE_ZERBERUS                   \
+                     "Enable experimental sfz sampler?" y \
+                     "-DZERBERUS=on"                      \
+                     "-DZERBERUS=off"
diff --git a/audio-creation/musescore/DEPENDS 
b/audio-creation/musescore/DEPENDS
index fd2c800..060429a 100755
--- a/audio-creation/musescore/DEPENDS
+++ b/audio-creation/musescore/DEPENDS
@@ -1,16 +1,42 @@
 depends cmake &&
 depends -sub CXX gcc &&
-depends alsa-lib &&
-depends portaudio19 &&
-depends lame &&
-depends libsndfile &&
+optional_depends alsa-lib \
+                 "-DBUILD_ALSA=on" \
+                 "-DBUILD_ALSA=off" \
+                 "support for the alsa audio backend" &&
+optional_depends portaudio19 \
+                 "-DBUILD_PORTAUDIO=on" \
+                 "-DBUILD_PORTAUDIO=off" \
+                 "support for the portaudio backend" &&
+optional_depends pulseaudio \
+                 "-DBUILD_PULSEAUDIO=on" \
+                 "-DBUILD_PULSEAUDIO=off" \
+                 "support for the pulseaudio backend" &&
+optional_depends JACK-DRIVER \
+                 "-DBUILD_JACK=on" \
+                 "-DBUILD_JACK=off" \
+                 "support for the jack backend" &&
+optional_depends lame \
+                 "-DBUILD_LAME=on" \
+                 "-DBUILD_LAME=off" \
+                 "for mp3 export" &&
+optional_depends libsndfile \
+                 "-DHAS_AUDIOFILE=on" \
+                 "-DHAS_AUDIOFILE=off" \
+                 "for audio export" &&
+optional_depends libvorbis \
+                 "-DSOUNDFONT3=on" \
+                 "-DSOUNDFONT3=off" \
+                 "support for vorbis-compressed sound fonts" &&
+if is_depends_enabled $SPELL libvorbis; then
+  depends libogg
+fi &&
 depends qtbase &&
 depends qttools &&
 depends qtdeclarative &&
-depends qtquick1 &&
 depends qtquickcontrols &&
 depends qtscript &&
 depends qtxmlpatterns &&
 depends qtsvg &&
 depends SSL &&
-depends WEBKIT_QT 
+depends WEBKIT_QT
diff --git a/audio-creation/musescore/DETAILS 
b/audio-creation/musescore/DETAILS
index cee4f77..6ab33c4 100755
--- a/audio-creation/musescore/DETAILS
+++ b/audio-creation/musescore/DETAILS
@@ -1,10 +1,8 @@
            SPELL=musescore
-         VERSION=2.0.2
-          SOURCE="MuseScore-${VERSION}.zip"
-# If you find a more canonical URL, go ahead. The website offers
-# a generic version-less link that resolves to that below (always?).
-   
SOURCE_URL[0]=http://ftp.osuosl.org/pub/${SPELL}/releases/MuseScore-$VERSION/${SOURCE}
-     
SOURCE_HASH=sha512:5302dd4492a86c67c142d687b2122cb59eda0dc0238cf2813c17278bbdd22d65172081576da68e7d25484158c8fea207517a1b2cec5b60a1a3c56869e62f5c19
+         VERSION=2.0.3
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]="https://github.com/musescore/MuseScore/archive/v${VERSION}.tar.gz";
+     
SOURCE_HASH=sha512:4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MuseScore-${VERSION}"
         WEB_SITE="https://musescore.org";
       LICENSE[0]=GPLv2
diff --git a/audio-creation/musescore/HISTORY 
b/audio-creation/musescore/HISTORY
index cd0e785..6e5c69e 100644
--- a/audio-creation/musescore/HISTORY
+++ b/audio-creation/musescore/HISTORY
@@ -1,3 +1,14 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.0.3
+       * BUILD, DEPENDS: use cmake
+       * DEPENDS: make lots of depencies optional
+       * CONFIGURE: add configuration options for synthesizers
+       * INSTALL: removed
+       * DETAILS: pull source from github
+       * PRE_BUILD, 01-debundle-freetype.patch, 04-manpage-errors.patch,
+         musescore-2.0.3-fix-buildsystem.patch: add patches from 
gentoo/debian to
+         fix build errors
+
 2017-01-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: qtwebkit => WEBKIT_QT
 
diff --git a/audio-creation/musescore/INSTALL 
b/audio-creation/musescore/INSTALL
deleted file mode 100755
index b0e7821..0000000
--- a/audio-creation/musescore/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH="$QT5DIR/bin:$PATH" &&
-make PREFIX="$INSTALL_ROOT/usr" install
diff --git a/audio-creation/musescore/PRE_BUILD 
b/audio-creation/musescore/PRE_BUILD
new file mode 100755
index 0000000..bc20e30
--- /dev/null
+++ b/audio-creation/musescore/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/musescore-2.0.3-fix-buildsystem.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/01-debundle-freetype.patch"            &&
+patch -p1 < "$SPELL_DIRECTORY/04-manpage-errors.patch"
diff --git a/audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch 
b/audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch
new file mode 100644
index 0000000..0fb52db
--- /dev/null
+++ b/audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch
@@ -0,0 +1,479 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c4fe57..b7a5cde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -147,23 +147,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+       endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g 
-Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 
-DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 
-DNDEBUG -DQT_NO_DEBUG")
+-      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG 
-DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option 
-DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option 
-DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ 
+ # The Mscore version number.
+@@ -450,7 +440,6 @@ if (NOT MINGW AND NOT APPLE)
+     #     set library search path for runtime linker to load the same
+     #     qt libraries as we used at compile time
+     #
+-    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if 
CMAKE_SKIP_RPATH="TRUE"
+     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # 
Command name shown in uppercase in man pages by convention
+     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: 
"-portable-anything" would match
+       # Build portable AppImage as per 
https://github.com/probonopd/AppImageKit
+@@ -554,11 +543,7 @@ add_custom_command(
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (MINGW)
+-  set(BUILD_PCH false)
+-else (MINGW)
+-  set(BUILD_PCH true)
+-endif(MINGW)
++set(BUILD_PCH false)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e87..a23aef3 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48..0d28df8 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index 9589cce..f4172ed 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake 
b/build/CreatePrecompiledHeader.cmake
+index 6cb671a..3d4aae3 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+             add_custom_command(
+              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+-             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  
${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} 
-o ${header_name}.h.gch ${header_name}.h
+              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+              VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b7794..acec8b5 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g 
-Wall -Wextra -Winvalid-pch"
++            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h 
-Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d..cf94cae 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f..3fede66 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+       fluid
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525b..f318f4c 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+       )
+ 
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS 
"-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS 
"-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+ 
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 446d413..5d871a8 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@ add_library (
+ set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch 
-Woverloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch 
-Woverloaded-virtual"
+       )
+ 
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edca..ceffd73 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83..ea95480 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+       midi
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c4..f8145e0 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+ 
+ set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(smf2xml
+       ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp 
midifile.cpp)
+ 
+ set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(xml2smf
+       ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index 3592012..b50e2bc 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -370,7 +370,7 @@ if (MINGW)
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch 
${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++           COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch 
${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole 
-L ${CROSSQT}/lib"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -493,7 +493,7 @@ else (MINGW)
+    set_target_properties (
+       mscore
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual 
-Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual 
-Winvalid-pch"
+       )
+ 
+    if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index e60d901..d3ba643 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+       mstyle
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index 55072b0..cab1a18 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} 
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g 
-Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 
-DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 
-DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG 
-DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+@@ -134,17 +124,17 @@ if (APPLE)
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else (APPLE)
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+-#      COMPILE_FLAGS "-include all.h -I ${INC} -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++#      COMPILE_FLAGS "-include all.h -I ${INC} -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ 
+ add_custom_target(report
+       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml 
-Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 0fa9aa8..9ef0177 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -57,16 +57,16 @@ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g -stdlib=libc++"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D 
TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
++      LINK_FLAGS    "-stdlib=libc++"
+       )
+ else(APPLE)
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D 
TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++      LINK_FLAGS    ""
+       )
+ endif(APPLE)
+ 
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 88615e5..d719e89 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920..e9bd15b 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+       synthesizer
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt 
b/thirdparty/beatroot/CMakeLists.txt
+index ae905c7..9b039e8 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+ 
+ set_target_properties( beatroot
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b2..35bd6ac 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+       diff_match_patch
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt 
b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1..f7ec1c5 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+       kqoauth
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -I 
${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra 
-Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -I 
${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0a..8c11f07 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b1997..417017e 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt 
b/thirdparty/rtf2html/CMakeLists.txt
+index 230339b..6c94a06 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+ 
+ set_target_properties( rtf2html
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt 
b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b01..936fa3f 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+   qtsingleapp
+   PROPERTIES
+-  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+   )
+ 
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt 
b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09..7f1268e 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+       xmlstream
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db571..58d8ddf 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+       zerberus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(zerberus all)
diff --git a/audio-libs/lilypond/0001-use-guile-config1.patch 
b/audio-libs/lilypond/0001-use-guile-config1.patch
new file mode 100644
index 0000000..cacee35
--- /dev/null
+++ b/audio-libs/lilypond/0001-use-guile-config1.patch
@@ -0,0 +1,33 @@
+From b0b88595db1e8bd44f83dbbdf0a8e0b008ec51d1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Wed, 25 Jan 2017 21:43:01 +0100
+Subject: [PATCH] use guile-config1
+
+---
+ aclocal.m4 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index c9f0093..937916f 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -640,12 +640,12 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [
+ # If missing, add entry to missing-list ($1, one of 'OPTIONAL', 'REQUIRED')
+ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
+     ## First, let's just see if we can find Guile at all.
+-    test -n "$target_alias" && 
target_guile_config=$target_alias-guile-config
+-    test -n "$host_alias" && host_guile_config=$host_alias-guile-config
++    test -n "$target_alias" && 
target_guile_config=$target_alias-guile-config1
++    test -n "$host_alias" && host_guile_config=$host_alias-guile-config1
+     AC_MSG_CHECKING([for guile-config])
+-    guile_config="guile-config"
++    guile_config="guile-config1"
+     found="no"
+-    for r in $GUILE_CONFIG $target_guile_config $host_guile_config 
$build_guile_config guile-config guile2-config guile2.0-config 
guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config 
guile-1.9-config guile-1.8-config; do
++    for r in $GUILE_CONFIG $target_guile_config $host_guile_config 
$build_guile_config guile-config guile2-config guile2.0-config 
guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config 
guile-1.9-config guile-1.8-config guile-config1; do
+       exe=`STEPMAKE_GET_EXECUTABLE($r)`
+       if ! $exe --version > /dev/null 2>&1 ; then
+           continue
+-- 
+2.11.0
+
diff --git a/audio-libs/lilypond/BUILD b/audio-libs/lilypond/BUILD
index 458cd65..8f08c60 100755
--- a/audio-libs/lilypond/BUILD
+++ b/audio-libs/lilypond/BUILD
@@ -1,11 +1,4 @@
-sed -i '7326 s,num=`,ver='$(installed_version guile)'\n&,' configure &&
+sed -i '7326 s,num=`,ver='$(installed_version guile1)'\n&,' configure &&
 OPTS="$OPTS --with-ncsb-dir=/usr/share/ghostscript/fonts" &&
-default_build &&
-
-if [ $HTMLDOC == y ]
-then
-       make web
-fi
-
-# sh ./buildscripts/clean-fonts.sh
-
+OPTS="$OPTS --disable-documentation" &&
+default_build
diff --git a/audio-libs/lilypond/CONFIGURE b/audio-libs/lilypond/CONFIGURE
deleted file mode 100755
index 7621128..0000000
--- a/audio-libs/lilypond/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query HTMLDOC "Use netpbm and imagemagick to build html documentation 
?" y
diff --git a/audio-libs/lilypond/DEPENDS b/audio-libs/lilypond/DEPENDS
index 2b1c098..2206da7 100755
--- a/audio-libs/lilypond/DEPENDS
+++ b/audio-libs/lilypond/DEPENDS
@@ -1,5 +1,8 @@
+depends autoconf &&
+depends automake &&
+
 depends mftrace                        &&
-depends guile                  &&
+depends guile1                 &&
 depends flex                   &&
 depends texlive                        &&
 depends texinfo                        &&
@@ -12,11 +15,4 @@ depends POSTSCRIPT-INTERPRETER       &&
 depends fontforge              &&
 depends pango &&
 depends freetype2 &&
-depends perl &&
-
-if [ $HTMLDOC == y ]
-then
-       depends netpbm          &&
-       depends imagemagick
-fi 
-
+depends perl
diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index f4de9a6..b219351 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -1,11 +1,11 @@
            SPELL=lilypond
-         VERSION=2.10.33
+         VERSION=2.18.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/$SOURCE
         WEB_SITE=http://lilypond.org/web
          ENTERED=20050210
-     
SOURCE_HASH=sha512:b92743c8c1c1d0fd6cc510e4ef14a5c16f4c316147709052f6333318ad265592aa4782ed877e0af0d7f7c0fdeaa4812d37f5851a8e30a80cb2aefc3581724c82
+     
SOURCE_HASH=sha512:0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
       LICENSE[0]=GPL
         KEYWORDS="music audio libs"
            SHORT="Format music notation beautifully"
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index 286c39f..32da159 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,9 @@
+2017-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.18.2
+       * INSTALL, CONFIGURE, DEPENDS, BUILD: remove HTMLDOC configuration 
option
+       * lilypond-2.10.33-gcc43.diff: removed
+       * DEPENDS: depend on automake, autoconf, depend on guile1 instead of 
guile
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/audio-libs/lilypond/INSTALL b/audio-libs/lilypond/INSTALL
deleted file mode 100755
index 6d1585d..0000000
--- a/audio-libs/lilypond/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-
-default_install                                &&
-
-if [ $HTMLDOC == y ]
-then
-       make out=www web-install
-fi                                     
diff --git a/audio-libs/lilypond/PRE_BUILD b/audio-libs/lilypond/PRE_BUILD
index b39adc6..6f242cc 100755
--- a/audio-libs/lilypond/PRE_BUILD
+++ b/audio-libs/lilypond/PRE_BUILD
@@ -1,3 +1,5 @@
-default_pre_build &&
+default_pre_build      &&
 cd "$SOURCE_DIRECTORY" &&
-patch -Np1 < "$SCRIPT_DIRECTORY/lilypond-2.10.33-gcc43.diff"
+patch -Np1 < "$SCRIPT_DIRECTORY/0001-use-guile-config1.patch" &&
+
+./autogen.sh --noconf
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 0f6e0e7..e67b428 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mpd
-         VERSION=0.20.2
+         VERSION=0.20.3
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    
SOURCE_URL[0]=http://www.musicpd.org/download/${SPELL}/${VERSION:0:4}/${SOURCE}
-     
SOURCE_HASH=sha512:d02b916f342c4b9547f32b1c7611a61983f2e11534f0667778e38077066058319a3f2a5aa7ff28e281af1ec01d00d8f2195bb91ca2f5556d3533b387ce857826
+     
SOURCE_HASH=sha512:4474e6e1d3fbe57be935d6a58f9d27e3b7efca95147687412e6b8f83f69b2f3529f659764fc45436fdf7a2542413bdbeac7f0e4b3fc1ca1e46b074a90ae60b82
       LICENSE[0]=GPL
         KEYWORDS="music players audio"
         WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 61ce33a..e1425b3 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.20.3
+
 2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.20.2
 
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index d1c547f..8ce6c88 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=openssl
-         VERSION=1.0.2j
-  SECURITY_PATCH=35
+         VERSION=1.0.2k
+  SECURITY_PATCH=36
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
    SOURCE_URL[1]=ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 4bc02d6..be8be57 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.0.2k, SECURITY_PATCH++
+
 2016-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.0.2j, SECURITY_PATCH++. This fixes CVE-2016-7052
 
diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index 29281e9..2cc3ca7 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -43,7 +43,7 @@ depends zlib &&
 # not listed in 'configure --help' but nevertheless processed
 optional_depends PHP '--enable-php' '--disable-php' 'for PHP bindings' &&
 optional_depends perl '--enable-perl' '--disable-perl' 'for Perl bindings' &&
-optional_depends JAVA '--enable-java' '--disable-java' 'for Java bindings' 
z-rejected &&
+optional_depends JDK '--enable-java' '--disable-java' 'for Java bindings' 
z-rejected &&
 optional_depends RUBY '--enable-ruby' '--disable-ruby' 'for Ruby bindings' &&
 optional_depends python '--enable-python' '--disable-python' 'for Python 
bindings' &&
 optional_depends ocaml '--enable-ocaml' '--disable-ocaml' 'for Ocaml 
bindings' &&
diff --git a/devel/graphviz/DETAILS b/devel/graphviz/DETAILS
index 8879b2f..8b8fd76 100755
--- a/devel/graphviz/DETAILS
+++ b/devel/graphviz/DETAILS
@@ -1,9 +1,9 @@
            SPELL=graphviz
-         VERSION=2.38.0
+         VERSION=2.40.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.graphviz.org/pub/graphviz/ARCHIVE/$SOURCE
-     
SOURCE_HASH=sha512:0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
+     
SOURCE_HASH=sha512:a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
         WEB_SITE=http://www.graphviz.org/
      GATHER_DOCS="off"
         KEYWORDS="graph devel"
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 141fd1d..d40ce73 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,7 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.40.0
+       * DEPENDS: optionally depend on JDK instead of JAVA
+
 2016-04-17 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD: hotfix for build with current ghostscript
 
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 36cf1b1..8e9c1a5 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -1,5 +1,5 @@
            SPELL=guile
-         VERSION=2.0.11
+         VERSION=2.0.13
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 59afb1d..2a8be13 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,7 @@
+2017-01-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.0.13
+       * guile-keyring.gpg: import 3D9AEBB5
+
 2015-01-22 Ladislav Hagara <hgr AT vabo.cz>
        * BUILD: LDFLAGS+=... added
 
diff --git a/devel/guile/guile-keyring.gpg b/devel/guile/guile-keyring.gpg
index da045c1..31700dd 100644
Binary files a/devel/guile/guile-keyring.gpg and 
b/devel/guile/guile-keyring.gpg differ
diff --git 
a/devel/guile1/0001-do-not-install-files-also-present-in-guile.patch 
b/devel/guile1/0001-do-not-install-files-also-present-in-guile.patch
new file mode 100644
index 0000000..2fad800
--- /dev/null
+++ b/devel/guile1/0001-do-not-install-files-also-present-in-guile.patch
@@ -0,0 +1,113 @@
+From 989b50c1d2b19a20fa3295ec6483707e05f085fa Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Wed, 25 Jan 2017 21:07:35 +0100
+Subject: [PATCH] do not install files also present in guile
+
+---
+ doc/Makefile.am                      | 4 ++--
+ doc/Makefile.in                      | 6 +++---
+ doc/{guile.1 => guile1.1}            | 0
+ guile-config/Makefile.am             | 4 ++--
+ guile-config/Makefile.in             | 4 ++--
+ guile-config/guile-config.in         | 2 +-
+ guile-config/{guile.m4 => guile1.m4} | 0
+ 7 files changed, 10 insertions(+), 10 deletions(-)
+ rename doc/{guile.1 => guile1.1} (100%)
+ rename guile-config/{guile.m4 => guile1.m4} (100%)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4581a72..054a5dd 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -21,9 +21,9 @@
+ 
+ AUTOMAKE_OPTIONS = gnu
+ 
+-SUBDIRS = ref tutorial goops r5rs
++SUBDIRS = tutorial goops
+ 
+-dist_man1_MANS = guile.1
++dist_man1_MANS = guile1.1
+ 
+ EXAMPLE_SMOB_FILES = \
+     ChangeLog-2008 Makefile README image-type.c image-type.h myguile.c
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index e22d947..c6918d8 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -88,7 +88,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(EXTRA_DIST)
+ am__relativize = \
+   dir0=`pwd`; \
+   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+@@ -324,8 +324,8 @@ top_builddir_absolute = @top_builddir_absolute@
+ top_srcdir = @top_srcdir@
+ top_srcdir_absolute = @top_srcdir_absolute@
+ AUTOMAKE_OPTIONS = gnu
+-SUBDIRS = ref tutorial goops r5rs
+-dist_man1_MANS = guile.1
++SUBDIRS = tutorial goops
++dist_man1_MANS = guile1.1
+ EXAMPLE_SMOB_FILES = \
+     ChangeLog-2008 Makefile README image-type.c image-type.h myguile.c
+ 
+diff --git a/doc/guile.1 b/doc/guile1.1
+similarity index 100%
+rename from doc/guile.1
+rename to doc/guile1.1
+diff --git a/guile-config/Makefile.am b/guile-config/Makefile.am
+index cedcba9..68794e4 100644
+--- a/guile-config/Makefile.am
++++ b/guile-config/Makefile.am
+@@ -22,12 +22,12 @@
+ 
+ bin_SCRIPTS=guile-config
+ CLEANFILES=guile-config
+-EXTRA_DIST=guile-config.in guile.m4 ChangeLog-2008
++EXTRA_DIST=guile-config.in guile1.m4 ChangeLog-2008
+ 
+ ## FIXME: in the future there will be direct automake support for
+ ## doing this.  When that happens, switch over.
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = guile.m4
++aclocal_DATA = guile1.m4
+ 
+ ## We use @-...-@ as the substitution brackets here, instead of the
+ ## usual @...@, so autoconf doesn't go and substitute the values
+diff --git a/guile-config/Makefile.in b/guile-config/Makefile.in
+index 32132d3..6723c36 100644
+--- a/guile-config/Makefile.in
++++ b/guile-config/Makefile.in
+@@ -284,9 +284,9 @@ top_srcdir = @top_srcdir@
+ top_srcdir_absolute = @top_srcdir_absolute@
+ bin_SCRIPTS = guile-config
+ CLEANFILES = guile-config
+-EXTRA_DIST = guile-config.in guile.m4 ChangeLog-2008
++EXTRA_DIST = guile-config.in guile1.m4 ChangeLog-2008
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = guile.m4
++aclocal_DATA = guile1.m4
+ all: all-am
+ 
+ .SUFFIXES:
+diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in
+index b782292..45234ce 100644
+--- a/guile-config/guile-config.in
++++ b/guile-config/guile-config.in
+@@ -1,4 +1,4 @@
+-#!@-bindir-@/guile \
++#!@-bindir-@/guile1 \
+ -e main -s
+ !#
+ ;;;; guile-config --- utility for linking programs with Guile
+diff --git a/guile-config/guile.m4 b/guile-config/guile1.m4
+similarity index 100%
+rename from guile-config/guile.m4
+rename to guile-config/guile1.m4
+-- 
+2.11.0
+
diff --git a/devel/guile1/BUILD b/devel/guile1/BUILD
new file mode 100755
index 0000000..788a161
--- /dev/null
+++ b/devel/guile1/BUILD
@@ -0,0 +1,7 @@
+OPTS="--disable-error-on-warning $OPTS" &&
+OPTS="--program-suffix=1 $OPTS"         &&
+OPTS="--disable-static $OPTS"           &&
+OPTS="--enable-posix $OPTS"             &&
+CFLAGS="${CFLAGS//-ffast-math }"        &&
+LDFLAGS+=" -L$INSTALL_ROOT/lib"         &&
+default_build
diff --git a/devel/guile1/DEPENDS b/devel/guile1/DEPENDS
new file mode 100755
index 0000000..152ac2a
--- /dev/null
+++ b/devel/guile1/DEPENDS
@@ -0,0 +1,5 @@
+depends gmp          &&
+depends libunistring &&
+depends libgc        &&
+depends libffi       &&
+depends libtool
diff --git a/devel/guile1/DETAILS b/devel/guile1/DETAILS
new file mode 100755
index 0000000..e226b4e
--- /dev/null
+++ b/devel/guile1/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=guile1
+          SPELLX=guile
+         VERSION=1.8.8
+          SOURCE=$SPELLX-$VERSION.tar.gz
+         SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+   SOURCE_URL[0]=$GNU_URL/$SPELLX/$SOURCE
+  SOURCE2_URL[0]=$GNU_URL/$SPELLX/$SOURCE2
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=../guile/guile-keyring.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
+      LICENSE[0]=LGPL
+       PATCHLEVE=0
+        WEB_SITE=http://www.gnu.org/software/guile
+        KEYWORDS="devel"
+         ENTERED=20170125
+           SHORT="Portable, embeddable Scheme implementation"
+cat << EOF
+Guile is a portable, embeddable Scheme implementation written in C.
+Guile provides a machine independent execution platform that can be
+linked in as a library when building extensible programs.
+EOF
diff --git a/devel/guile1/HISTORY b/devel/guile1/HISTORY
new file mode 100644
index 0000000..014717d
--- /dev/null
+++ b/devel/guile1/HISTORY
@@ -0,0 +1,4 @@
+2017-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * 0001-do-not-install-files-also-present-in-guile.patch, BUILD, 
DEPENDS,
+         DETAILS, PRE_BUILD, UP_TRIGGERS: spell created
+
diff --git a/devel/guile1/PRE_BUILD b/devel/guile1/PRE_BUILD
new file mode 100755
index 0000000..41344a2
--- /dev/null
+++ b/devel/guile1/PRE_BUILD
@@ -0,0 +1,11 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < 
"$SPELL_DIRECTORY/0001-do-not-install-files-also-present-in-guile.patch" &&
+
+sed \
+  -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+  -e "/AM_PROG_CC_STDC/d" \
+  -i guile-readline/configure.in &&
+
+autoreconf -fi
diff --git a/devel/guile1/UP_TRIGGERS b/devel/guile1/UP_TRIGGERS
new file mode 100755
index 0000000..c801d2c
--- /dev/null
+++ b/devel/guile1/UP_TRIGGERS
@@ -0,0 +1,7 @@
+local OLD_SPELL_VERSION=$(installed_version $SPELL)  ||  return 0
+if [[ ${OLD_SPELL_VERSION:0:3} != ${VERSION:0:3} ]]
+then
+  for each in $(show_up_depends $SPELL 1); do
+    up_trigger $each cast_self
+  done
+fi
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 84f84ca..7471a58 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,6 @@
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * SUB_DEPENDS, PRE_SUB_DEPENDS: add subdependencies for clang and lldb
+
 2016-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.9.1
 
diff --git a/devel/llvm/PRE_SUB_DEPENDS b/devel/llvm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ce84d09
--- /dev/null
+++ b/devel/llvm/PRE_SUB_DEPENDS
@@ -0,0 +1,9 @@
+case $THIS_SUB_DEPENDS in
+CLANG) [[ "${LLVM_WITH_CLANG}" == "y" ]] ;;
+      *)
+LLDB) [[ "${LLVM_WITH_LLDB}" == "y" ]] ;;
+      *)
+  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+  return 1
+;;
+esac
diff --git a/devel/llvm/SUB_DEPENDS b/devel/llvm/SUB_DEPENDS
new file mode 100755
index 0000000..23f5e1b
--- /dev/null
+++ b/devel/llvm/SUB_DEPENDS
@@ -0,0 +1,14 @@
+case $THIS_SUB_DEPENDS in
+CLANG)
+  message "${MESSAGE_COLOR}Building clang enforced by 
sub-dependency.$DEFAULT_COLOR"
+  LLVM_WITH_CLANG=y
+;;
+LLDB)
+  message "${MESSAGE_COLOR}Building lldb enforced by 
sub-dependency.$DEFAULT_COLOR"
+  LLVM_WITH_LLDB=y
+;;
+      *)
+  message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+  return 1
+;;
+esac
diff --git a/doc/po4a/DEPENDS b/doc/po4a/DEPENDS
index 30add11..9dd84ea 100755
--- a/doc/po4a/DEPENDS
+++ b/doc/po4a/DEPENDS
@@ -4,4 +4,6 @@ depends sgmlspm &&
 # I really don't think they mean J. Clark's SP
 depends opensp &&
 depends locale-gettext &&
-depends module-build
+depends module-build &&
+depends unicode-linebreak &&
+depends text-wrapi18n
diff --git a/doc/po4a/DETAILS b/doc/po4a/DETAILS
index eef156e..42037ed 100755
--- a/doc/po4a/DETAILS
+++ b/doc/po4a/DETAILS
@@ -1,8 +1,8 @@
            SPELL=po4a
-         VERSION=0.45
+         VERSION=0.48
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   
SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/file/3942/${SOURCE}
-     
SOURCE_HASH=sha512:e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f
+   
SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/4176/${SOURCE}
+     
SOURCE_HASH=sha512:aed3203a5030e47af018a46f236001b585673050c9418a7c8d542e6d2426f109c1ecafedce7354c2e538743baa3241653f63c3927b1cdd32500ea00f51ae73cf
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
         WEB_SITE=http://alioth.debian.org/projects/po4a/
       LICENSE[0]=GPL
diff --git a/doc/po4a/HISTORY b/doc/po4a/HISTORY
index 4cf54dc..04899e3 100644
--- a/doc/po4a/HISTORY
+++ b/doc/po4a/HISTORY
@@ -1,3 +1,6 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS: version 0.48
+
 2015-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: add dependency on module-build
 
diff --git a/editors/ed/DEPENDS b/editors/ed/DEPENDS
index 18594eb..0412328 100755
--- a/editors/ed/DEPENDS
+++ b/editors/ed/DEPENDS
@@ -1,2 +1,3 @@
 depends  gnupg     &&
-depends  smgl-fhs
+depends  smgl-fhs  &&
+depends lzip
diff --git a/editors/ed/DETAILS b/editors/ed/DETAILS
index 0b160a0..8f314ba 100755
--- a/editors/ed/DETAILS
+++ b/editors/ed/DETAILS
@@ -1,6 +1,7 @@
            SPELL=ed
-         VERSION=1.8
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=1.14.1
+  SECURITY_PATCH=1
+          SOURCE=$SPELL-$VERSION.tar.lz
          SOURCE2=${SOURCE}.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/editors/ed/HISTORY b/editors/ed/HISTORY
index efd4626..a6ce0f6 100644
--- a/editors/ed/HISTORY
+++ b/editors/ed/HISTORY
@@ -1,3 +1,8 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.14.1, security update
+       * PRE_BUILD: implement tar.lz decompression
+       * DEPENDS: depend on lzip
+
 2013-04-25 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8
 
diff --git a/editors/ed/PRE_BUILD b/editors/ed/PRE_BUILD
new file mode 100755
index 0000000..bf9e261
--- /dev/null
+++ b/editors/ed/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir  &&
+verify_file '' &&
+lzip -cdf "$SOURCE_CACHE/$SOURCE" | tar xf /dev/stdin
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 58c7857..a18cc8d 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
    SOURCE_IGNORE=volatile
 else
-         VERSION=8.0.0197
+         VERSION=8.0.0249
   SECURITY_PATCH=1
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:a72777b1d4895ca77e10a1c24e658b02f53aec13177e60833b735074cf455478548590cf620618f47f2707502268faf3f92f6351bc48fdcc6e64c4a5f066b16a
+     
SOURCE_HASH=sha512:d52564942c6ff37b3f38b5539582265b999864cc4a9e71bd2c65740813631aff6b76561242ebeb6c719c062f2bc90b1e4f423f3d3a9359f5e0986cb0b5ba5309
 fi
         WEB_SITE=http://www.vim.org
       LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index ba2d40e..b770567 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,12 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 8.0.0249
+
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 8.0.0238
+
+2017-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 8.0.0217
+
 2017-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 8.0.0197
 
diff --git a/fonts/mftrace/DEPENDS b/fonts/mftrace/DEPENDS
index 09b235f..f39c424 100755
--- a/fonts/mftrace/DEPENDS
+++ b/fonts/mftrace/DEPENDS
@@ -1,4 +1,5 @@
-depends  texlive         &&
+depends  autoconf      &&
+depends  texlive       &&
 depends  t1utils       &&
 depends  python        &&
 depends  $TRACING_PRG  &&
diff --git a/fonts/mftrace/DETAILS b/fonts/mftrace/DETAILS
index 12acc91..1c9d879 100755
--- a/fonts/mftrace/DETAILS
+++ b/fonts/mftrace/DETAILS
@@ -1,11 +1,11 @@
            SPELL=mftrace
-         VERSION=1.2.14
+         VERSION=1.2.18
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://lilypond.org/download/sources/mftrace/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-release-$VERSION
+   
SOURCE_URL[0]=https://github.com/hanwen/mftrace/archive/release/$VERSION.tar.gz
         WEB_SITE=http://lilypond.org/mftrace
          ENTERED=20041129
-     
SOURCE_HASH=sha512:eb0cb4f011d85ef78293c6e0d34ef1fb1c22334dbf7acf9f8476c0e58ed0061fb77f4664d7d79d80ac6f98eaf2f2995ae4f5415304ee67a218a759a204ccbd42
+     
SOURCE_HASH=sha512:6c5b64a3599f5e2e84b1e17804e34d2e65d0bbc5810bb428e9fcbb4e49d5710272bd9a761968996ab36a519ec3c531efec6702da2d83dd934896c9aa8b904f18
       LICENSE[0]="GPL and http://www.cs.uu.nl/~hanwen/mftrace/";
         KEYWORDS="fonts doc"
            SHORT="bitmap font tracer" 
diff --git a/fonts/mftrace/HISTORY b/fonts/mftrace/HISTORY
index c1c53eb..b87a9b7 100644
--- a/fonts/mftrace/HISTORY
+++ b/fonts/mftrace/HISTORY
@@ -1,3 +1,6 @@
+2017-01-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PRE_BUILD, DEPENDS: version 1.2.18
+
 2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
         * DEPENDS: switch from tetex to texlive [auto]
 
diff --git a/fonts/mftrace/PRE_BUILD b/fonts/mftrace/PRE_BUILD
new file mode 100755
index 0000000..454e979
--- /dev/null
+++ b/fonts/mftrace/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+./autogen.sh
diff --git a/graphics-libs/coin/0001-use-clang.patch 
b/graphics-libs/coin/0001-use-clang.patch
new file mode 100644
index 0000000..fcd3a6b
--- /dev/null
+++ b/graphics-libs/coin/0001-use-clang.patch
@@ -0,0 +1,92 @@
+From f7a217352af5baac49ebae46995d6114cefaf2ec Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Fri, 20 Jan 2017 10:53:37 +0100
+Subject: [PATCH] use clang
+
+---
+ configure | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index ef1131f..02ff22a 100755
+--- a/configure
++++ b/configure
+@@ -3611,7 +3611,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS 
$LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a 
program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
++set dummy ${ac_tool_prefix}clang; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then :
+@@ -3627,7 +3627,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    ac_cv_prog_CC="${ac_tool_prefix}clang"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found 
$as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -3667,7 +3667,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_CC="gcc"
++    ac_cv_prog_ac_ct_CC="clang"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found 
$as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -5229,7 +5229,7 @@ if test -z "$CXX"; then
+     CXX=$CCC
+   else
+     if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++  for ac_prog in clang++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r 
xlC
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a 
program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -5273,7 +5273,7 @@ fi
+ fi
+ if test -z "$CXX"; then
+   ac_ct_CXX=$CXX
+-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++  for ac_prog in clang++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r 
xlC
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+ set dummy $ac_prog; ac_word=$2
+@@ -5316,7 +5316,7 @@ fi
+ done
+ 
+   if test "x$ac_ct_CXX" = x; then
+-    CXX="g++"
++    CXX="clang++"
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+@@ -7039,8 +7039,8 @@ done
+ 
+ 
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
++    ( (test "X$CXX" = "Xclang++" && `clang++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xclang++"))) ; then
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -11834,8 +11834,8 @@ $as_echo "$as_me: WARNING: using \`LTCC=$LTCC', 
extracted from \`$ofile'" >&2;}
+       case $tagname in
+       CXX)
+       if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-          ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-          (test "X$CXX" != "Xg++"))) ; then
++          ( (test "X$CXX" = "Xclang++" && `clang++ -v >/dev/null 2>&1` ) ||
++          (test "X$CXX" != "Xclang++"))) ; then
+         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-- 
+2.11.0
+
diff --git a/graphics-libs/coin/DEPENDS b/graphics-libs/coin/DEPENDS
index 680815a..74aea80 100755
--- a/graphics-libs/coin/DEPENDS
+++ b/graphics-libs/coin/DEPENDS
@@ -1,8 +1,10 @@
-depends  OPENGL  &&
-depends  libx11  &&
+depends -sub CLANG llvm &&
+
+depends  OPENGL "--with-mesa" &&
+depends  libx11   &&
 depends  libxext  &&
-depends  libsm  &&
-depends  libice  &&
+depends  libsm    &&
+depends  libice   &&
 
 optional_depends  spidermonkey  "--enable-javascript-api" \
                   "--disable-javascript-api" \
@@ -10,8 +12,8 @@ optional_depends  spidermonkey  "--enable-javascript-api" \
 optional_depends  simage  ""  "--disable-dl-simage" \
                   "use rutime dynamic linking for libsimage"  &&
 optional_depends  openal  ""  "--disable-dl-openal"  ""  &&
-optional_depends  fontconfig  ""  "--disable-dl-fontconfig"  ""  &&
-optional_depends  freetype2  ""  "--disable-dl-freetype"  ""  &&
+optional_depends  fontconfig  ""  "--with-fontconfig 
--disable-dl-fontconfig"  ""  &&
+optional_depends  freetype2  ""  "--with-freetype --disable-dl-freetype"  "" 
 &&
 optional_depends  zlib  ""  "--disable-dl-zlib"  ""  &&
 optional_depends  bzip2  ""  "--disable-dl-libbzip2"  ""  &&
 optional_depends  expat  "--enable-system-expat"  "" &&
diff --git a/graphics-libs/coin/HISTORY b/graphics-libs/coin/HISTORY
index 9fcebb1..f4239cb 100644
--- a/graphics-libs/coin/HISTORY
+++ b/graphics-libs/coin/HISTORY
@@ -1,3 +1,8 @@
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, PRE_BUILD, 0001-use-clang.patch: build with clang to avoid 
broken
+         code generated by gcc 6.3, cf.
+         
https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate
+
 2016-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, BUILD, 0001-fix-compile-error.patch: fix compile error
        * DEPENDS: add optional dependency on doxygen
diff --git a/graphics-libs/coin/PRE_BUILD b/graphics-libs/coin/PRE_BUILD
index 7c0b291..6fad53b 100755
--- a/graphics-libs/coin/PRE_BUILD
+++ b/graphics-libs/coin/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
+patch -p1 < "${SPELL_DIRECTORY}/0001-use-clang.patch"         &&
 patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error.patch"
diff --git a/graphics-libs/freeimage/DETAILS b/graphics-libs/freeimage/DETAILS
index c29c736..82181cc 100755
--- a/graphics-libs/freeimage/DETAILS
+++ b/graphics-libs/freeimage/DETAILS
@@ -1,6 +1,7 @@
            SPELL=freeimage
           SPELLX=FreeImage
          VERSION=3170
+  SECURITY_PATCH=1
      
SOURCE_HASH=sha512:703c2626c0bcfe73eb40d720f45745208ca9650a7730759680a2b38ad3f6c719a43008477032bc70b76a95761f7d4b6f901b961359d36b54ace906dd78fb391b
           SOURCE=$SPELLX$VERSION.zip
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
diff --git a/graphics-libs/freeimage/Fix-CVE-2015-0852.patch 
b/graphics-libs/freeimage/Fix-CVE-2015-0852.patch
new file mode 100644
index 0000000..f114bf8
--- /dev/null
+++ b/graphics-libs/freeimage/Fix-CVE-2015-0852.patch
@@ -0,0 +1,127 @@
+From: Debian QA Group <packages AT qa.debian.org>
+Date: Fri, 6 Nov 2015 13:51:20 +0000
+Subject: Fix CVE-2015-0852
+
+CVE-2015-0852: multiple integer underflows in PluginPCX.cpp.
+---
+ Source/FreeImage/PluginPCX.cpp | 76 
+++++++++++++++++++++++++++---------------
+ 1 file changed, 50 insertions(+), 26 deletions(-)
+
+diff --git a/Source/FreeImage/PluginPCX.cpp b/Source/FreeImage/PluginPCX.cpp
+index cd75629..dcd9d61 100644
+--- a/Source/FreeImage/PluginPCX.cpp
++++ b/Source/FreeImage/PluginPCX.cpp
+@@ -347,12 +347,14 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+ 
+       try {
+               // check PCX identifier
+-
+-              long start_pos = io->tell_proc(handle);
+-              BOOL validated = pcx_validate(io, handle);              
+-              io->seek_proc(handle, start_pos, SEEK_SET);
+-              if(!validated) {
+-                      throw FI_MSG_ERROR_MAGIC_NUMBER;
++              // (note: should have been already validated using 
FreeImage_GetFileType but check again)
++              {
++                      long start_pos = io->tell_proc(handle);
++                      BOOL validated = pcx_validate(io, handle);
++                      io->seek_proc(handle, start_pos, SEEK_SET);
++                      if(!validated) {
++                              throw FI_MSG_ERROR_MAGIC_NUMBER;
++                      }
+               }
+ 
+               // process the header
+@@ -366,20 +368,38 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+               SwapHeader(&header);
+ #endif
+ 
+-              // allocate a new DIB
++              // process the window
++              const WORD *window = header.window;     // left, upper, 
right,lower pixel coord.
++              const int left          = window[0];
++              const int top           = window[1];
++              const int right         = window[2];
++              const int bottom        = window[3];
++
++              // check image size
++              if((left >= right) || (top >= bottom)) {
++                      throw FI_MSG_ERROR_PARSING;
++              }
+ 
+-              unsigned width = header.window[2] - header.window[0] + 1;
+-              unsigned height = header.window[3] - header.window[1] + 1;
+-              unsigned bitcount = header.bpp * header.planes;
++              const unsigned width = right - left + 1;
++              const unsigned height = bottom - top + 1;
++              const unsigned bitcount = header.bpp * header.planes;
+ 
+-              if (bitcount == 24) {
+-                      dib = FreeImage_AllocateHeader(header_only, width, 
height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
+-              } else {
+-                      dib = FreeImage_AllocateHeader(header_only, width, 
height, bitcount);                   
++              // allocate a new DIB
++              switch(bitcount) {
++                      case 1:
++                      case 4:
++                      case 8:
++                              dib = FreeImage_AllocateHeader(header_only, 
width, height, bitcount);
++                              break;
++                      case 24:
++                              dib = FreeImage_AllocateHeader(header_only, 
width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, 
FI_RGBA_BLUE_MASK);
++                              break;
++                      default:
++                              throw FI_MSG_ERROR_DIB_MEMORY;
++                              break;
+               }
+ 
+               // if the dib couldn't be allocated, throw an error
+-
+               if (!dib) {
+                       throw FI_MSG_ERROR_DIB_MEMORY;
+               }
+@@ -426,19 +446,23 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+ 
+                               if (palette_id == 0x0C) {
+                                       BYTE *cmap = (BYTE*)malloc(768 * 
sizeof(BYTE));
+-                                      io->read_proc(cmap, 768, 1, handle);
+ 
+-                                      pal = FreeImage_GetPalette(dib);
+-                                      BYTE *pColormap = &cmap[0];
++                                      if(cmap) {
++                                              io->read_proc(cmap, 768, 1, 
handle);
+ 
+-                                      for(int i = 0; i < 256; i++) {
+-                                              pal[i].rgbRed   = 
pColormap[0];
+-                                              pal[i].rgbGreen = 
pColormap[1];
+-                                              pal[i].rgbBlue  = 
pColormap[2];
+-                                              pColormap += 3;
++                                              pal = 
FreeImage_GetPalette(dib);
++                                              BYTE *pColormap = &cmap[0];
++
++                                              for(int i = 0; i < 256; i++) {
++                                                      pal[i].rgbRed   = 
pColormap[0];
++                                                      pal[i].rgbGreen = 
pColormap[1];
++                                                      pal[i].rgbBlue  = 
pColormap[2];
++                                                      pColormap += 3;
++                                              }
++
++                                              free(cmap);
+                                       }
+ 
+-                                      free(cmap);
+                               }
+ 
+                               // wrong palette ID, perhaps a gray scale is 
needed ?
+@@ -466,9 +490,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+               // calculate the line length for the PCX and the DIB
+ 
+               // length of raster line in bytes
+-              unsigned linelength = header.bytes_per_line * header.planes;
++              const unsigned linelength = header.bytes_per_line * 
header.planes;
+               // length of DIB line (rounded to DWORD) in bytes
+-              unsigned pitch = FreeImage_GetPitch(dib);
++              const unsigned pitch = FreeImage_GetPitch(dib);
+ 
+               // run-length encoding ?
+ 
diff --git a/graphics-libs/freeimage/Fix-CVE-2016-5684.patch 
b/graphics-libs/freeimage/Fix-CVE-2016-5684.patch
new file mode 100644
index 0000000..9e260be
--- /dev/null
+++ b/graphics-libs/freeimage/Fix-CVE-2016-5684.patch
@@ -0,0 +1,33 @@
+From: Debian Science Maintainers 
<debian-science-maintainers AT lists.alioth.debian.org>
+Date: Mon, 10 Oct 2016 08:22:44 +0100
+Subject: CVE-2016-5684
+
+---
+ Source/FreeImage/PluginXPM.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Source/FreeImage/PluginXPM.cpp b/Source/FreeImage/PluginXPM.cpp
+index a698321..cc7bd07 100644
+--- a/Source/FreeImage/PluginXPM.cpp
++++ b/Source/FreeImage/PluginXPM.cpp
+@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+               }
+               free(str);
+ 
++              // check info string
++              if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 
0)) {
++                      throw "Improperly formed info string";
++              }
++
+         if (colors > 256) {
+                       dib = FreeImage_AllocateHeader(header_only, width, 
height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
+               } else {
+@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int 
flags, void *data) {
+                       FILE_RGBA rgba;
+ 
+                       str = ReadString(io, handle);
+-                      if(!str)
++                      if(!str || (strlen(str) < (size_t)cpp))
+                               throw "Error reading color strings";
+ 
+                       std::string chrs(str,cpp); //create a string for the 
color chars using the first cpp chars
diff --git a/graphics-libs/freeimage/HISTORY b/graphics-libs/freeimage/HISTORY
index 5bf9e04..c17bfae 100644
--- a/graphics-libs/freeimage/HISTORY
+++ b/graphics-libs/freeimage/HISTORY
@@ -1,3 +1,8 @@
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: SECURITY_PATCH++
+       * PRE_BUILD, Fix-CVE-2015-0852.patch, Fix-CVE-2016-5684.patch:
+         fix CVE-2015-0852 and CVE-2016-5684
+
 2016-08-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3170
        * DEPENDS: add missing dependencies
diff --git a/graphics-libs/freeimage/PRE_BUILD 
b/graphics-libs/freeimage/PRE_BUILD
index 0268f56..50bd4e0 100755
--- a/graphics-libs/freeimage/PRE_BUILD
+++ b/graphics-libs/freeimage/PRE_BUILD
@@ -12,4 +12,7 @@ sed -i \
       -e "/OpenEXR/d" \
       -e "/LibRawLite/d" \
       -e "/LibMNG/d" \
-      Makefile.srcs fipMakefile.srcs
+      Makefile.srcs fipMakefile.srcs &&
+
+patch -p1 < "$SPELL_DIRECTORY/Fix-CVE-2015-0852.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/Fix-CVE-2016-5684.patch"
diff --git a/graphics-libs/gd/DETAILS b/graphics-libs/gd/DETAILS
index 98a99a5..73232a9 100755
--- a/graphics-libs/gd/DETAILS
+++ b/graphics-libs/gd/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gd
-         VERSION=2.2.3
-  SECURITY_PATCH=1
-     
SOURCE_HASH=sha512:182756bf7e1597e5fd99323e414b1a65cbb58c2508e5077af5127f435c57a8b7b2bc48f8af9add02bef1e3e51f10385c1ba6bd2d302f29585b7009be7990bfc8
+         VERSION=2.2.4
+  SECURITY_PATCH=2
+     
SOURCE_HASH=sha512:02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/lib$SPELL-$SPELL-$VERSION
    SOURCE_URL[0]=https://github.com/libgd/libgd/archive/$SOURCE
diff --git a/graphics-libs/gd/HISTORY b/graphics-libs/gd/HISTORY
index 3fb9d14..7bc538f 100644
--- a/graphics-libs/gd/HISTORY
+++ b/graphics-libs/gd/HISTORY
@@ -1,3 +1,8 @@
+2017-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.2.4, SECURITY_PATCH++, fixes CVE-2016-9317 and
+         CVE-2016-6912
+       * libgd-fix-build-without-freetype.patch, PRE_BUILD: remove obsolete 
patch
+
 2016-12-30 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD, libgd-fix-build-without-freetype.patch:
          Fix buidling without freetype
diff --git a/graphics-libs/gd/PRE_BUILD b/graphics-libs/gd/PRE_BUILD
index b8c8cea..54f4dbd 100755
--- a/graphics-libs/gd/PRE_BUILD
+++ b/graphics-libs/gd/PRE_BUILD
@@ -1,6 +1,5 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-patch -p1 < "${SPELL_DIRECTORY}/libgd-fix-build-without-freetype.patch" &&
 
 if ! [ -f configure ]; then
   ./bootstrap.sh
diff --git a/graphics-libs/gd/libgd-fix-build-without-freetype.patch 
b/graphics-libs/gd/libgd-fix-build-without-freetype.patch
deleted file mode 100644
index 603e315..0000000
--- a/graphics-libs/gd/libgd-fix-build-without-freetype.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b7a01fe6e3a2b70c4f77f577947d36ae925dad06 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier AT gentoo.org>
-Date: Wed, 10 Aug 2016 13:35:08 +0800
-Subject: [PATCH] gdft: fix build when freetype is disabled
-
-In file included from gdft.c:20:0:
-entities.h:17:4: error: 'entities' defined but not used 
[-Werror=unused-variable]
-
-gdft.c:1741:15: error: 'font_path' defined but not used 
[-Werror=unused-function]
- static char * font_path(char **fontpath, char *name_list)
----
- src/gdft.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/gdft.c b/src/gdft.c
-index 9661f2b..57b3d79 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -17,7 +17,6 @@
- 
- #include "gd.h"
- #include "gdhelpers.h"
--#include "entities.h"
- #include "gd_intern.h"
- 
- /* 2.0.10: WIN32, not MSWIN32 */
-@@ -46,7 +45,10 @@ static int fontConfigFlag = 0;
- static char *font_pattern(char **fontpath, char *fontpattern);
- #endif
- 
-+#ifdef HAVE_LIBFREETYPE
-+#include "entities.h"
- static char *font_path(char **fontpath, char *name_list);
-+#endif
- 
- /* 2.0.30: move these up here so we can build correctly without freetype
-       but with fontconfig */
-@@ -1737,6 +1739,7 @@ static char * font_pattern(char **fontpath, char 
*fontpattern)
- 
- #endif /* HAVE_LIBFONTCONFIG */
- 
-+#ifdef HAVE_LIBFREETYPE
- /* Look up font using font names as file names. */
- static char * font_path(char **fontpath, char *name_list)
- {
-@@ -1855,6 +1858,7 @@ static char * font_path(char **fontpath, char 
*name_list)
-       *fontpath = fullname;
-       return NULL;
- }
-+#endif
- 
- /*
-       Function: gdFTUseFontConfig
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 78df440..b20f725 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=1.4.1
-     
SOURCE_HASH=sha512:f6cafe060e6dad6878b98472be79036ddda86c5ed8e13470f7d53429e584c9e74fe69c46ed5ea2a3f5315dec2fc7669b5437a02a884e8e766cee57fe26a4608b
+         VERSION=1.4.2
+     
SOURCE_HASH=sha512:80c06e17f7e2ca4ac847c77489f02b3b6f7bf6fde54194c5d4a47e893db7d1e75bfb0350ce50829c6ae0520202e35ad1711110c09c8d2a9497c0622f000f3357
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 1327745..69aa527 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.4.2
+
 2017-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.4.1
 
diff --git a/graphics-libs/simage/HISTORY b/graphics-libs/simage/HISTORY
index dfc0681..4d024d1 100644
--- a/graphics-libs/simage/HISTORY
+++ b/graphics-libs/simage/HISTORY
@@ -1,3 +1,7 @@
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, simage-1.7.0-libpng15.patch: add patch from gentoo to fix
+         compilation against libpng >= 1.5
+
 2016-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: fix SOURCE_URL
 
diff --git a/graphics-libs/simage/PRE_BUILD b/graphics-libs/simage/PRE_BUILD
new file mode 100755
index 0000000..8b45893
--- /dev/null
+++ b/graphics-libs/simage/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/simage-1.7.0-libpng15.patch"
diff --git a/graphics-libs/simage/simage-1.7.0-libpng15.patch 
b/graphics-libs/simage/simage-1.7.0-libpng15.patch
new file mode 100644
index 0000000..f99d474
--- /dev/null
+++ b/graphics-libs/simage/simage-1.7.0-libpng15.patch
@@ -0,0 +1,12 @@
+diff -ruN simage-1.7.0/src/simage_png.c new/src/simage_png.c
+--- simage-1.7.0/src/simage_png.c      2010-02-26 16:47:31.000000000 +0100
++++ new/src/simage_png.c       2013-06-06 22:34:23.537331509 +0200
+@@ -323,7 +323,7 @@
+   /* Set error handling.  REQUIRED if you aren't supplying your own
+    * error hadnling functions in the png_create_write_struct() call.
+    */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* If we get here, we had a problem reading the file */
+     fclose(fp);
+     png_destroy_write_struct(&png_ptr,  (png_infopp)info_ptr);
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 5bd3eb5..8d8ba2d 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
            SPELL=imagemagick
           SPELLX=ImageMagick
-         VERSION=7.0.4-4
+         VERSION=7.0.4-6
   SECURITY_PATCH=5
           SOURCE=$SPELLX-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
    SOURCE_URL[0]=http://www.imagemagick.org/download/releases/$SOURCE
-     
SOURCE_HASH=sha512:3dd561c3a816aebf51904bffd680d00cbfb4c36e6f37f078906c404f872c15447c2f14dabff517005a4a6ed260b090b685b7e224cb401565d4c832eb6147e6fe
+     
SOURCE_HASH=sha512:8d5479fe25da6790cc617da0acf9da8e4a499b9b8b4ea372cfafc173307497009c6f01e394b5d2588617edd94b6bd3b4e285696c75a04567bd338513582822ce
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index c7942fa..8d10735 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,9 @@
+2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 7.0.4-6
+
+2017-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 7.0.4-5
+
 2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 7.0.4-4
 
diff --git a/latex/texinfo/DETAILS b/latex/texinfo/DETAILS
index a8dd6eb..7cee8ce 100755
--- a/latex/texinfo/DETAILS
+++ b/latex/texinfo/DETAILS
@@ -1,5 +1,6 @@
            SPELL=texinfo
          VERSION=6.3
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
diff --git a/latex/texinfo/HISTORY b/latex/texinfo/HISTORY
index a6d5c21..bfafc6f 100644
--- a/latex/texinfo/HISTORY
+++ b/latex/texinfo/HISTORY
@@ -1,3 +1,7 @@
+2016-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * INSTALL: install texi2html
+       * DETAILS: bump PATCHLEVEL
+
 2016-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 6.3
 
diff --git a/latex/texinfo/INSTALL b/latex/texinfo/INSTALL
index d49f958..261668f 100755
--- a/latex/texinfo/INSTALL
+++ b/latex/texinfo/INSTALL
@@ -1,2 +1,3 @@
 mkdir -p $INSTALL_ROOT/usr/share/man/man1 &&
-default_install
+default_install &&
+install -m 755 $SOURCE_DIRECTORY/util/texi2html $INSTALL_ROOT/usr/bin/
diff --git a/libs/glm/DETAILS b/libs/glm/DETAILS
index 4280b88..f4b01ca 100755
--- a/libs/glm/DETAILS
+++ b/libs/glm/DETAILS
@@ -1,9 +1,9 @@
            SPELL=glm
-         VERSION=0.9.8.3
+         VERSION=0.9.8.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
    SOURCE_URL[0]=https://github.com/g-truc/glm/archive/${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:708317254941f288449b9abe41b57053d67e689a9a13efcce9d71940ae27fef777a5ffc2e2a33a0142701af78ddc66a17c9f59851e4be8690919fa8e9eeeb2fa
+     
SOURCE_HASH=sha512:ff0e0651a695caebe9235882d14e09546d52b3cdf66cca8e2078f15b02a3fca4e47bd97d2807aa329f76aa633af3b4999501bd4d0b22ad44b00558d4917f39ed
         WEB_SITE=http://glm.g-truc.net/
          ENTERED=20120812
       LICENSE[0]=MIT
diff --git a/libs/glm/HISTORY b/libs/glm/HISTORY
index 0d0c0bf..ce6d5d4 100644
--- a/libs/glm/HISTORY
+++ b/libs/glm/HISTORY
@@ -1,3 +1,6 @@
+2017-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.9.8.4
+
 2016-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.9.8.3
 
diff --git 
a/libs/med-fichier/0001-install-docs-to-the-correct-location-do-not-install-.patch
 
b/libs/med-fichier/0001-install-docs-to-the-correct-location-do-not-install-.patch
new file mode 100644
index 0000000..c6d9e11
--- /dev/null
+++ 
b/libs/med-fichier/0001-install-docs-to-the-correct-location-do-not-install-.patch
@@ -0,0 +1,24 @@
+From 396a1df9c64d94d32561faa4de49429e2f2ce033 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 21 Jan 2017 12:33:15 +0100
+Subject: [PATCH] install docs to the correct location, do not install test
+ cases
+
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0594d93..c13e325 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,6 +64,3 @@ 
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/include/2.3.6/med_config.h.cmake 
${CMAKE_BINA
+ ADD_SUBDIRECTORY(include)
+ ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(tools)
+-ADD_SUBDIRECTORY(tests)
+-
+-INSTALL(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_PREFIX})
+-- 
+2.11.0
+
diff --git a/libs/med-fichier/BUILD b/libs/med-fichier/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/med-fichier/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/med-fichier/DEPENDS b/libs/med-fichier/DEPENDS
new file mode 100755
index 0000000..36103c8
--- /dev/null
+++ b/libs/med-fichier/DEPENDS
@@ -0,0 +1,4 @@
+depends cmake            &&
+depends -sub FORTRAN gcc &&
+depends hdf5             &&
+depends tk
diff --git a/libs/med-fichier/DETAILS b/libs/med-fichier/DETAILS
new file mode 100755
index 0000000..861dfb0
--- /dev/null
+++ b/libs/med-fichier/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=med-fichier
+         VERSION=3.0.6.orig
+          SOURCE="${SPELL}_${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/m/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:b6096d76943bcc67993f5dd341964de5aaa3df1d8b8fbb7d45e583944e4c77351e4316e8e47d4a53cb45868554c842a4b83252a4c687e7a7e6c8a2f78ba25b2a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/med-3.0.6_SRC"
+        WEB_SITE="https://packages.debian.org/en/source/sid/med-fichier";
+      LICENSE[0]=GPL
+         ENTERED=20170119
+           SHORT="a library for processing MED files"
+cat << EOF
+A library for processing MED files.
+EOF
diff --git a/libs/med-fichier/HISTORY b/libs/med-fichier/HISTORY
new file mode 100644
index 0000000..38b0925
--- /dev/null
+++ b/libs/med-fichier/HISTORY
@@ -0,0 +1,4 @@
+2017-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD, DEPENDS, DETAILS, PRE_BUILD,
+         0001-install-docs-to-the-correct-location-do-not-install-.patch: 
spell created
+
diff --git a/libs/med-fichier/PRE_BUILD b/libs/med-fichier/PRE_BUILD
new file mode 100755
index 0000000..f3c6552
--- /dev/null
+++ b/libs/med-fichier/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < 
"$SPELL_DIRECTORY/0001-install-docs-to-the-correct-location-do-not-install-.patch"
diff --git a/perl-cpan/mime-charset/DEPENDS b/perl-cpan/mime-charset/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/mime-charset/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/mime-charset/DETAILS b/perl-cpan/mime-charset/DETAILS
new file mode 100755
index 0000000..1b8715a
--- /dev/null
+++ b/perl-cpan/mime-charset/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=mime-charset
+         VERSION=1.012
+          SOURCE="MIME-Charset-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/N/NE/NEZUMI/${SOURCE}
+     
SOURCE_HASH=sha512:f116deb04912bdccfd98484ef82d643d23b4cb90bfdf88ddc60d0a3f857ac3f084a60681a6fae4f9a2d982d6f470c79f171688e44a4034e9533bb518a914e2fe
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MIME-Charset-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~/MIME-Charset/";
+      LICENSE[0]=ART
+         ENTERED=20170126
+           SHORT="charset Information for MIME"
+cat << EOF
+MIME::Charset - Charset Information for MIME.
+EOF
diff --git a/perl-cpan/mime-charset/HISTORY b/perl-cpan/mime-charset/HISTORY
new file mode 100644
index 0000000..02afaca
--- /dev/null
+++ b/perl-cpan/mime-charset/HISTORY
@@ -0,0 +1,3 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/text-wrapi18n/DEPENDS b/perl-cpan/text-wrapi18n/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/text-wrapi18n/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/text-wrapi18n/DETAILS b/perl-cpan/text-wrapi18n/DETAILS
new file mode 100755
index 0000000..4d405c8
--- /dev/null
+++ b/perl-cpan/text-wrapi18n/DETAILS
@@ -0,0 +1,26 @@
+           SPELL=text-wrapi18n
+         VERSION=0.06
+          SOURCE="Text-WrapI18N-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/K/KU/KUBOTA/${SOURCE}
+     
SOURCE_HASH=sha512:14ff46154f198ae743f1bf354d6bb020968b1e3c3996e882c871e0a0067ad1d6b50911e69aec31380200d64bc4ab46ca1829cce1206ad43406fab89fa7e6c0af
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Text-WrapI18N-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~/Text-WrapI18N/";
+      LICENSE[0]=ART
+         ENTERED=20170126
+           SHORT="line wrapping module with support for multibyte, 
fullwidth, and combining characters"
+cat << EOF
+This module intends to be a better Text::Wrap module. This module is needed 
to
+support multibyte character encodings such as UTF-8, EUC-JP, EUC-KR, GB2312,
+and Big5. This module also supports characters with irregular widths, such as
+combining characters (which occupy zero columns on terminal, like diacritical
+marks in UTF-8) and fullwidth characters (which occupy two columns on 
terminal,
+like most of east Asian characters). Also, minimal handling of languages 
which
+doesn't use whitespaces between words (like Chinese and Japanese) is 
supported.
+
+Like Text::Wrap, hyphenation and "kinsoku" processing are not supported,
+to keep simplicity.
+
+wrap(firstheader, nextheader, texts) is the main subroutine of Text::WrapI18N
+module to execute the line wrapping. Input parameters and output data emulate
+Text::Wrap. The texts have to be written in locale encoding.
+EOF
diff --git a/perl-cpan/text-wrapi18n/HISTORY b/perl-cpan/text-wrapi18n/HISTORY
new file mode 100644
index 0000000..02afaca
--- /dev/null
+++ b/perl-cpan/text-wrapi18n/HISTORY
@@ -0,0 +1,3 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/unicode-linebreak/DEPENDS 
b/perl-cpan/unicode-linebreak/DEPENDS
new file mode 100755
index 0000000..f9f34c3
--- /dev/null
+++ b/perl-cpan/unicode-linebreak/DEPENDS
@@ -0,0 +1,2 @@
+depends perl &&
+depends mime-charset 
diff --git a/perl-cpan/unicode-linebreak/DETAILS 
b/perl-cpan/unicode-linebreak/DETAILS
new file mode 100755
index 0000000..afe4a59
--- /dev/null
+++ b/perl-cpan/unicode-linebreak/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=unicode-linebreak
+         VERSION=2016.003
+          SOURCE="Unicode-LineBreak-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/N/NE/NEZUMI/${SOURCE}
+     
SOURCE_HASH=sha512:c2296ebd87a06c55d95f198ef355566c05257a75a38876c726cebe309f5e6082a7bfd7d86f28505e183e3150313e781a6f1999e8de8b35ee772d94845cd08e2f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Unicode-LineBreak-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~/Unicode-LineBreak/";
+      LICENSE[0]=ART
+         ENTERED=20170126
+           SHORT="support for handling line breaks in unicode"
+cat << EOF
+This package contains the following perl modules:
+
+* Text::LineFold - Line Folding for Plain Text * Unicode::GCString - String
+as Sequence of UAX #29 Grapheme Clusters * Unicode::LineBreak - UAX #14
+Unicode Line Breaking Algorithm
+EOF
diff --git a/perl-cpan/unicode-linebreak/HISTORY 
b/perl-cpan/unicode-linebreak/HISTORY
new file mode 100644
index 0000000..02afaca
--- /dev/null
+++ b/perl-cpan/unicode-linebreak/HISTORY
@@ -0,0 +1,3 @@
+2017-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS
index f3528bc..60d1d14 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,9 +1,9 @@
            SPELL=cherrypy
           SPELLX=CherryPy
-         VERSION=8.9.1
+         VERSION=10.0.0
           SOURCE=$SPELLX-$VERSION.tar.gz
    SOURCE_URL[0]="https://pypi.io/packages/source/C/${SPELLX}/${SOURCE}";
-     
SOURCE_HASH=sha512:9e6d10ee36bee3d78b02e0ce364b062d09987ccf71a8e4ba6ab88377a061f4f39280ee9ae377432cb7c852f4dae22136778388c25ee653bd65bfb6862ca75226
+     
SOURCE_HASH=sha512:0a98fc08cfaa86cfba7dfb36ed073a548e78f00d113989548601d3e86fbe77e89a4617bfe1e47fbef1f901e993591db1fb08dbe7204f8041350d8bafd852c969
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.cherrypy.org/
       LICENSE[0]=BSD
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index 759f480..17a98b9 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2017-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 10.0.0
+
 2017-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 8.9.1
 
diff --git a/python-pypi/dblatex/DETAILS b/python-pypi/dblatex/DETAILS
index 0a81c3c..c327c20 100755
--- a/python-pypi/dblatex/DETAILS
+++ b/python-pypi/dblatex/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dblatex
-         VERSION=0.3.2
+         VERSION=0.3.9
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${SPELL}-${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:af27694b9f2e5e549f1260721c7eeb92cf0a0f8d8a2555cc314fee76af1e9ce29ec4867031790bae1980937bab4cb9879fc8f267a971da25829ed6f7d67e977b
+     
SOURCE_HASH=sha512:b8157fe1da3dee5335c644729a66448652bf124a0aace5de76abc6d33e16a76c79df099e8de88d416951793f040cc7d9070b6f1c61cc46e1fda111656be92808
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://dblatex.sourceforge.net/";
       LICENSE[0]=GPL2
diff --git a/python-pypi/dblatex/HISTORY b/python-pypi/dblatex/HISTORY
index b88c922..4cfa642 100644
--- a/python-pypi/dblatex/HISTORY
+++ b/python-pypi/dblatex/HISTORY
@@ -1,3 +1,6 @@
+2017-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.3.9
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/python-pypi/matplotlib/DETAILS b/python-pypi/matplotlib/DETAILS
index 4a8c354..37b6069 100755
--- a/python-pypi/matplotlib/DETAILS
+++ b/python-pypi/matplotlib/DETAILS
@@ -1,6 +1,6 @@
            SPELL=matplotlib
-         VERSION=1.5.3
-     
SOURCE_HASH=sha512:8b135a93d134646655f1defc0c1a58bee1488435b40643bb96d91724942395c71a41d0c9f77149097c233e3d9a9938d9e332dd21b62089e8932076380d74731b
+         VERSION=2.0.0
+     
SOURCE_HASH=sha512:b0e6d91aee5f91e0155c9e6716eef1a7e1fb907daeb93d603709142b749878fd758e42fe3707ac73c3d87959c6a35126c9e17c08ef78c5734106fafdf198f304
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    
SOURCE_URL[0]="https://github.com/matplotlib/matplotlib/archive/v${VERSION}.tar.gz";
diff --git a/python-pypi/matplotlib/HISTORY b/python-pypi/matplotlib/HISTORY
index a85239d..b43eaef 100644
--- a/python-pypi/matplotlib/HISTORY
+++ b/python-pypi/matplotlib/HISTORY
@@ -1,3 +1,6 @@
+2017-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.0.0
+
 2016-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.5.3
 
diff --git a/qt5/qttools/0001-actually-build-tools.patch 
b/qt5/qttools/0001-actually-build-tools.patch
new file mode 100644
index 0000000..75b50d4
--- /dev/null
+++ b/qt5/qttools/0001-actually-build-tools.patch
@@ -0,0 +1,83 @@
+From 9d8c86894613be5916612ef59fb67aeb88131112 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Fri, 27 Jan 2017 20:58:34 +0100
+Subject: [PATCH] actually build tools
+
+---
+ examples/designer/designer.pro | 4 ----
+ src/assistant/assistant.pro    | 6 ------
+ src/designer/src/src.pro       | 6 ------
+ src/linguist/linguist.pro      | 4 ----
+ src/src.pro                    | 4 ----
+ 5 files changed, 24 deletions(-)
+
+diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
+index 2248d3ec..0e1cbc52 100644
+--- a/examples/designer/designer.pro
++++ b/examples/designer/designer.pro
+@@ -12,7 +12,3 @@ SUBDIRS     = calculatorform
+ solaris-cc*:SUBDIRS -= calculatorbuilder \
+                        worldtimeclockbuilder
+ 
+-qtNomakeTools( \
+-    containerextension \
+-    taskmenuextension \
+-)
+diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
+index 34590d69..b9a56ca8 100644
+--- a/src/assistant/assistant.pro
++++ b/src/assistant/assistant.pro
+@@ -13,9 +13,3 @@ qhelpgenerator.depends = help
+ qcollectiongenerator.depends = help
+ qhelpconverter.depends = help
+ 
+-qtNomakeTools( \
+-    assistant \
+-    qhelpgenerator \
+-    qcollectiongenerator \
+-    qhelpconverter \
+-)
+diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
+index 6915e34e..807987f2 100644
+--- a/src/designer/src/src.pro
++++ b/src/designer/src/src.pro
+@@ -15,9 +15,3 @@ components.depends = lib
+ designer.depends = components
+ plugins.depends = lib
+ 
+-qtNomakeTools( \
+-    lib \
+-    components \
+-    designer \
+-    plugins \
+-)
+diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
+index 3a70580f..57158100 100644
+--- a/src/linguist/linguist.pro
++++ b/src/linguist/linguist.pro
+@@ -5,10 +5,6 @@ SUBDIRS  = \
+     lconvert
+ !no-png:qtHaveModule(widgets): SUBDIRS += linguist
+ 
+-qtNomakeTools( \
+-    linguist \
+-)
+-
+ equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
+ 
+ load(cmake_functions)
+diff --git a/src/src.pro b/src/src.pro
+index db6fe0c3..d2b0a75e 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -34,7 +34,3 @@ win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner
+ qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+ 
+-qtNomakeTools( \
+-    pixeltool \
+-    macdeployqt \
+-)
+-- 
+2.11.0
+
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index cfa19d2..a6f8ba9 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,8 @@
+2017-01-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * 0001-actually-build-tools.patch, PRE_BUILD,: actually build the 
tools
+
+
+nothing added to commit but untracked files present (use "git add" to track)
 2017-01-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.8.0
 
diff --git a/qt5/qttools/PRE_BUILD b/qt5/qttools/PRE_BUILD
new file mode 100755
index 0000000..5043096
--- /dev/null
+++ b/qt5/qttools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-actually-build-tools.patch"
diff --git a/x11-toolkits/togl1/DEPENDS b/x11-toolkits/togl1/DEPENDS
new file mode 100755
index 0000000..fd3a371
--- /dev/null
+++ b/x11-toolkits/togl1/DEPENDS
@@ -0,0 +1,2 @@
+depends tk &&
+depends tcl 
diff --git a/x11-toolkits/togl1/DETAILS b/x11-toolkits/togl1/DETAILS
new file mode 100755
index 0000000..d08cdc6
--- /dev/null
+++ b/x11-toolkits/togl1/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=togl1
+         VERSION=1.7
+          SOURCE="Togl-$VERSION.tar.gz"
+   
SOURCE_URL[0]="https://downloads.sourceforge.net/project/togl/Togl/$VERSION/$SOURCE";
+     
SOURCE_HASH=sha512:86dccaf1585767fc2e217cee3172619fe08b1d054beb679bd1db140195a100ec90daef02ac9b85d3e6c2b805d0a7668a540b80754023aee85138cefa7275e84a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Togl-$VERSION"
+        WEB_SITE="http://togl.sourceforge.net/";
+      LICENSE[0]=GPL
+         ENTERED=20170120
+           SHORT="a Tk widget for OpenGL rendering"
+cat << EOF
+Togl is a Tk widget for OpenGL rendering.
+EOF
diff --git a/x11-toolkits/togl1/HISTORY b/x11-toolkits/togl1/HISTORY
new file mode 100644
index 0000000..2e47ad8
--- /dev/null
+++ b/x11-toolkits/togl1/HISTORY
@@ -0,0 +1,3 @@
+2017-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/x11-toolkits/togl1/INSTALL b/x11-toolkits/togl1/INSTALL
new file mode 100755
index 0000000..72fa5ba
--- /dev/null
+++ b/x11-toolkits/togl1/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -sfn "/usr/lib/Togl$VERSION/libTogl$VERSION.so" 
"$INSTALL_ROOT/usr/lib/libTogl.so"