[SM-Commit] GIT changes to devel-libpng grimoire by Remko van der Vossen (8f90591e413b14f179ad9cb3cb644976cf9a6c0f)

Remko van der Vossen scm at sourcemage.org
Sun Jan 9 14:06:42 EST 2011


GIT changes to devel-libpng grimoire by Remko van der Vossen <wich at sourcemage.org>:

 ChangeLog                                                         |   75 +++
 FUNCTIONS                                                         |    1 
 VERSION                                                           |    2 
 accounts                                                          |    1 
 archive-libs/libarchive/DETAILS                                   |    4 
 archive-libs/libarchive/HISTORY                                   |    3 
 archive-libs/zlib/DETAILS                                         |    2 
 archive-libs/zlib/HISTORY                                         |    7 
 archive-libs/zlib/PRE_BUILD                                       |    2 
 archive-libs/zlib/UP_TRIGGERS                                     |   11 
 archive/makeself/DETAILS                                          |   31 +
 archive/makeself/HISTORY                                          |    4 
 archive/makeself/INSTALL                                          |    6 
 archive/makeself/PRE_BUILD                                        |    5 
 audio-libs/ladspa/BUILD                                           |    2 
 audio-libs/ladspa/HISTORY                                         |    3 
 audio-libs/libkate/DETAILS                                        |    4 
 audio-libs/libkate/HISTORY                                        |    3 
 audio-libs/libogg/DETAILS                                         |    4 
 audio-libs/libogg/HISTORY                                         |    3 
 audio-libs/libsamplerate/DETAILS                                  |    2 
 audio-libs/libsamplerate/HISTORY                                  |    3 
 audio-libs/libtiger/DETAILS                                       |    4 
 audio-libs/libtiger/HISTORY                                       |    3 
 audio-libs/soundtouch/DETAILS                                     |    2 
 audio-libs/soundtouch/HISTORY                                     |    4 
 audio-libs/soundtouch/PRE_BUILD                                   |    6 
 audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig                 |    0 
 audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch    |   11 
 audio-players/audacious/DETAILS                                   |    4 
 audio-players/audacious/HISTORY                                   |    3 
 audio-players/guimup/HISTORY                                      |    3 
 audio-players/guimup/desktop/guimup.desktop                       |    3 
 audio-players/gxmms2/HISTORY                                      |    3 
 audio-players/gxmms2/desktop/gxmms2.desktop                       |    2 
 audio-players/mpg123/BUILD                                        |    3 
 audio-players/mpg123/DETAILS                                      |    2 
 audio-players/mpg123/HISTORY                                      |   10 
 audio-players/qmpdclient/HISTORY                                  |    3 
 audio-players/qmpdclient/desktop/qmpdclient.desktop               |    3 
 audio-players/quimup/HISTORY                                      |    3 
 audio-players/quimup/desktop/quimup.desktop                       |    3 
 audio-plugins/audacious-plugins/DETAILS                           |    4 
 audio-plugins/audacious-plugins/HISTORY                           |    3 
 audio-soft/asunder/DEPENDS                                        |    4 
 audio-soft/asunder/DETAILS                                        |    4 
 audio-soft/asunder/HISTORY                                        |    4 
 bzr_download.function                                             |   23 +
 chat-im/gajim/DEPENDS                                             |    2 
 chat-im/gajim/HISTORY                                             |    3 
 chat-im/pidgin/DETAILS                                            |    4 
 chat-im/pidgin/HISTORY                                            |    6 
 chat-im/pidgin/pidgin-2.7.7.tar.bz2.sig                           |    0 
 chat-im/pidgin/pidgin-2.7.9.tar.bz2.sig                           |binary
 chat-irc/irssi/HISTORY                                            |    3 
 chat-irc/irssi/desktop/irssi.desktop                              |    4 
 chat-irc/znc/DEPENDS                                              |    6 
 chat-irc/znc/HISTORY                                              |    3 
 cluster/lapack/DETAILS                                            |    4 
 cluster/lapack/HISTORY                                            |    3 
 compiz-fusion/emerald/HISTORY                                     |    3 
 compiz-fusion/emerald/gtk2.20.patch                               |   61 ++
 crypto/cyrus-sasl/CONFLICTS                                       |    1 
 crypto/cyrus-sasl/HISTORY                                         |    4 
 crypto/gnupg/CONFIGURE                                            |    2 
 crypto/gnupg/HISTORY                                              |    3 
 crypto/keychain/DETAILS                                           |   17 
 crypto/keychain/HISTORY                                           |    4 
 crypto/keychain/keychain-2.7.1.tar.bz2.sig                        |binary
 crypto/libsasl/CONFLICTS                                          |    1 
 crypto/libsasl/HISTORY                                            |    4 
 crypto/libssh/DETAILS                                             |    4 
 crypto/libssh/HISTORY                                             |    3 
 crypto/pinentry/DETAILS                                           |    4 
 crypto/pinentry/HISTORY                                           |    3 
 database/mongodb/DETAILS                                          |    4 
 database/mongodb/HISTORY                                          |    6 
 database/mongodb/init.d/mongodb                                   |    4 
 database/mysql/DETAILS                                            |    2 
 database/mysql/HISTORY                                            |    3 
 database/pgadmin3/DETAILS                                         |    2 
 database/pgadmin3/HISTORY                                         |    3 
 database/sqlite/DETAILS                                           |    9 
 database/sqlite/HISTORY                                           |    4 
 database/sqlite/PRE_BUILD                                         |    6 
 database/sqlite/no-tcl.patch                                      |   14 
 database/tdb/DEPENDS                                              |    6 
 database/tdb/DETAILS                                              |   20 
 database/tdb/HISTORY                                              |   55 ++
 database/tdb/PRE_BUILD                                            |    4 
 database/tdb/jelmer.gpg                                           |binary
 dev/null                                                          |binary
 devel/apiextractor/DETAILS                                        |    4 
 devel/apiextractor/HISTORY                                        |    6 
 devel/byacc/DETAILS                                               |    2 
 devel/byacc/HISTORY                                               |    3 
 devel/doxygen/DETAILS                                             |    2 
 devel/doxygen/HISTORY                                             |    3 
 devel/doxygen/doxygen-1.7.2.src.tar.gz.sig                        |    0 
 devel/doxygen/doxygen-1.7.3.src.tar.gz.sig                        |binary
 devel/gambit-c/DETAILS                                            |   56 ++
 devel/gambit-c/HISTORY                                            |    3 
 devel/geany/DETAILS                                               |    2 
 devel/geany/HISTORY                                               |    3 
 devel/git/DETAILS                                                 |    3 
 devel/git/HISTORY                                                 |    6 
 devel/gitslave/DETAILS                                            |    4 
 devel/gitslave/HISTORY                                            |    3 
 devel/guile/DETAILS                                               |    2 
 devel/guile/HISTORY                                               |    3 
 devel/mono/DETAILS                                                |    4 
 devel/mono/HISTORY                                                |    3 
 devel/phpmyadmin/DETAILS                                          |    4 
 devel/phpmyadmin/HISTORY                                          |    3 
 devel/pyside-tools/DETAILS                                        |    4 
 devel/pyside-tools/HISTORY                                        |    4 
 devel/pyside-tools/PRE_BUILD                                      |    3 
 devel/pyside/DETAILS                                              |    4 
 devel/pyside/HISTORY                                              |    6 
 devel/sbcl/DETAILS                                                |    4 
 devel/sbcl/HISTORY                                                |    3 
 devel/shiboken/DETAILS                                            |    4 
 devel/shiboken/HISTORY                                            |    6 
 devel/sparse/DETAILS                                              |    2 
 devel/sparse/HISTORY                                              |    3 
 devel/vala/DETAILS                                                |    4 
 devel/vala/HISTORY                                                |    3 
 disk/cdrdao/HISTORY                                               |    6 
 disk/cdrdao/PRE_BUILD                                             |    4 
 disk/cdrdao/stat.patch                                            |   12 
 disk/di/DETAILS                                                   |    4 
 disk/di/HISTORY                                                   |    3 
 disk/e2fsprogs/DETAILS                                            |    2 
 disk/e2fsprogs/HISTORY                                            |    6 
 disk/gparted/DETAILS                                              |    4 
 disk/gparted/HISTORY                                              |    3 
 disk/isomaster/DETAILS                                            |    4 
 disk/isomaster/HISTORY                                            |    3 
 disk/isomaster/isomaster-1.3.7.tar.bz2.sig                        |    0 
 disk/libisoburn/DETAILS                                           |    4 
 disk/libisoburn/HISTORY                                           |    3 
 disk/lvm/DETAILS                                                  |    4 
 disk/lvm/HISTORY                                                  |    3 
 disk/netatalk/DETAILS                                             |    4 
 disk/netatalk/HISTORY                                             |    3 
 disk/partimage-ng/DOWNLOAD                                        |   20 
 disk/partimage-ng/HISTORY                                         |    8 
 disk/udev/DETAILS                                                 |    2 
 disk/udev/HISTORY                                                 |    3 
 doc/epdfview/HISTORY                                              |    3 
 doc/epdfview/PRE_BUILD                                            |    4 
 doc/groff/DETAILS                                                 |    2 
 doc/groff/HISTORY                                                 |    3 
 doc/help2man/DETAILS                                              |    2 
 doc/help2man/HISTORY                                              |    3 
 doc/man/DETAILS                                                   |    3 
 doc/man/HISTORY                                                   |    3 
 doc/podviewer/HISTORY                                             |    3 
 doc/podviewer/podviewer.desktop                                   |    2 
 doc/xpdf/HISTORY                                                  |    3 
 doc/xpdf/desktop/xpdf.desktop                                     |    1 
 e-17/elation/HISTORY                                              |    3 
 e-17/elation/desktop/elation.desktop                              |    2 
 editors/emacs/DOWNLOAD                                            |   22 -
 editors/emacs/HISTORY                                             |    9 
 editors/emacs/desktop/emacs.desktop                               |    2 
 editors/joe/HISTORY                                               |    3 
 editors/joe/desktop/joe.desktop                                   |    2 
 editors/scite/DETAILS                                             |    2 
 editors/scite/HISTORY                                             |    3 
 editors/scite/scite222.tgz.sig                                    |    0 
 editors/scite/scite223.tgz.sig                                    |binary
 editors/texmaker/HISTORY                                          |    3 
 editors/texmaker/desktop/texmaker.desktop                         |    1 
 editors/vim/HISTORY                                               |    3 
 editors/vim/desktop/vim.desktop                                   |    2 
 editors/vim/gvim.desktop                                          |    2 
 enrico.gpg                                                        |binary
 fonts-x11/terminus-font/DETAILS                                   |    7 
 fonts-x11/terminus-font/HISTORY                                   |    3 
 fonts-x11/ubuntu-font-family/BUILD                                |    1 
 fonts-x11/ubuntu-font-family/DEPENDS                              |    1 
 fonts-x11/ubuntu-font-family/DETAILS                              |   21 
 fonts-x11/ubuntu-font-family/HISTORY                              |    3 
 fonts-x11/ubuntu-font-family/INSTALL                              |    3 
 ftp-libs/dclib/DEPENDS                                            |    3 
 ftp-libs/dclib/HISTORY                                            |    4 
 ftp-libs/dclib/PRE_BUILD                                          |    6 
 ftp-libs/dclib/dclib-openssl-1.patch                              |   50 ++
 ftp/aria2/DETAILS                                                 |    4 
 ftp/aria2/HISTORY                                                 |    3 
 ftp/curl/DETAILS                                                  |    2 
 ftp/curl/HISTORY                                                  |    3 
 ftp/lftp/DETAILS                                                  |    2 
 ftp/lftp/HISTORY                                                  |    3 
 ftp/proftpd/DETAILS                                               |    4 
 ftp/proftpd/HISTORY                                               |    3 
 ftp/uget/DETAILS                                                  |    4 
 ftp/uget/HISTORY                                                  |    3 
 gnome1-libs/gtk-theme-switch/BUILD                                |    7 
 gnome1-libs/gtk-theme-switch/DEPENDS                              |    1 
 gnome1-libs/gtk-theme-switch/DETAILS                              |   19 
 gnome1-libs/gtk-theme-switch/HISTORY                              |   27 -
 gnome1-libs/gtk-theme-switch/desktop/gtk-theme-switch.desktop     |    8 
 gnome2-apps/epiphany/DETAILS                                      |    2 
 gnome2-apps/epiphany/HISTORY                                      |    6 
 gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig                |    0 
 gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig                |binary
 gnome2-apps/gnucash/DEPENDS                                       |   14 
 gnome2-apps/gnucash/DETAILS                                       |    4 
 gnome2-apps/gnucash/HISTORY                                       |    5 
 gnome2-apps/gthumb2/HISTORY                                       |    4 
 gnome2-apps/gthumb2/PRE_BUILD                                     |    4 
 gnome2-apps/gthumb2/gthumb-exiv2.patch                            |   45 ++
 gnome2-libs/atkmm/DETAILS                                         |    1 
 gnome2-libs/atkmm/HISTORY                                         |    3 
 gnome2-libs/atkmm/atkmm-2.22.1.tar.bz2.sig                        |binary
 gnome2-libs/glib2/DETAILS                                         |    2 
 gnome2-libs/glib2/HISTORY                                         |    6 
 gnome2-libs/glib2/glib-2.27.3.tar.bz2.sig                         |    0 
 gnome2-libs/glib2/glib-2.27.90.tar.bz2.sig                        |binary
 gnome2-libs/libcanberra/DETAILS                                   |    2 
 gnome2-libs/libcanberra/HISTORY                                   |    4 
 gnome2-libs/libcanberra/PRE_BUILD                                 |    5 
 gnome2-libs/libcanberra/libcanberra-0.23.tar.gz.sig               |    0 
 gnome2-libs/libcanberra/libcanberra-0.26.tar.gz.sig               |binary
 gnome2-libs/libcanberra/make.patch                                |   20 
 gnome2-libs/nautilus2/DETAILS                                     |    2 
 gnome2-libs/nautilus2/HISTORY                                     |    3 
 gnome2-libs/nautilus2/nautilus-2.32.2.1.tar.bz2.sig               |binary
 gnome2-libs/nautilus2/nautilus-2.32.2.tar.bz2.sig                 |    0 
 gnome2-libs/vino/DETAILS                                          |    2 
 gnome2-libs/vino/HISTORY                                          |    3 
 gnome2-libs/vino/vino-2.32.0.tar.bz2.sig                          |    0 
 gnome2-libs/vino/vino-2.32.1.tar.bz2.sig                          |binary
 gnu-verified.gpg                                                  |binary
 gnustep-apps/gnustep-oolite/BUILD                                 |    7 
 gnustep-apps/gnustep-oolite/CONFIGURE                             |    1 
 gnustep-apps/gnustep-oolite/DEPENDS                               |    9 
 gnustep-apps/gnustep-oolite/DETAILS                               |   13 
 gnustep-apps/gnustep-oolite/HISTORY                               |    4 
 gnustep-apps/gnustep-oolite/PRE_BUILD                             |    4 
 graphics-libs/cimg/DETAILS                                        |    4 
 graphics-libs/cimg/HISTORY                                        |    4 
 graphics-libs/cimg/INSTALL                                        |    1 
 graphics-libs/libjpeg-turbo/DEPENDS                               |    1 
 graphics-libs/libjpeg-turbo/DETAILS                               |   10 
 graphics-libs/libjpeg-turbo/HISTORY                               |    4 
 graphics-libs/libjpeg-turbo/PRE_BUILD                             |    4 
 graphics-libs/libraw/BUILD                                        |    2 
 graphics-libs/libraw/DETAILS                                      |   12 
 graphics-libs/libraw/HISTORY                                      |   11 
 graphics-libs/libraw/PRE_BUILD                                    |    7 
 graphics-libs/mesalib/CONFIGURE                                   |   10 
 graphics-libs/mesalib/DETAILS                                     |    4 
 graphics-libs/mesalib/HISTORY                                     |    9 
 graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig                   |    0 
 graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig                   |    0 
 graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig                   |binary
 graphics-libs/mesalib/PRE_BUILD                                   |    2 
 graphics-libs/mesalib/SUB_DEPENDS                                 |    2 
 graphics-libs/mesalib/gl_select.patch                             |   36 -
 graphics-libs/poppler/DETAILS                                     |    8 
 graphics-libs/poppler/HISTORY                                     |    3 
 graphics/blender/HISTORY                                          |    3 
 graphics/blender/desktop/blender.desktop                          |    1 
 graphics/brlcad/DETAILS                                           |    4 
 graphics/brlcad/HISTORY                                           |    5 
 graphics/f-spot/DETAILS                                           |    2 
 graphics/f-spot/HISTORY                                           |    4 
 graphics/f-spot/PRE_BUILD                                         |    4 
 graphics/f-spot/empty-crash.patch                                 |   11 
 graphics/f-spot/f-spot-0.8.0.tar.bz2.sig                          |    0 
 graphics/f-spot/f-spot-0.8.2.tar.bz2.sig                          |binary
 graphics/f-spot/mono-2.8.1-f-stop.patch                           |   30 -
 graphics/feh/DETAILS                                              |    4 
 graphics/feh/HISTORY                                              |    3 
 graphics/fotoxx/DETAILS                                           |    4 
 graphics/fotoxx/HISTORY                                           |    3 
 graphics/gbdfed/HISTORY                                           |    4 
 graphics/gbdfed/PRE_BUILD                                         |    4 
 graphics/gbdfed/deprecated.patch                                  |   13 
 graphics/gexiv2/DETAILS                                           |    4 
 graphics/gexiv2/HISTORY                                           |    3 
 graphics/imagemagick/DETAILS                                      |    4 
 graphics/imagemagick/HISTORY                                      |    9 
 graphics/keyjnote/HISTORY                                         |    3 
 graphics/keyjnote/desktop/keyjnote.desktop                        |    1 
 graphics/shotwell/DETAILS                                         |    6 
 graphics/shotwell/HISTORY                                         |    3 
 graphics/vym/DETAILS                                              |    4 
 graphics/vym/HISTORY                                              |    3 
 graphics/xplab/HISTORY                                            |    3 
 graphics/xplab/desktop/xplab.desktop                              |    1 
 groups                                                            |    1 
 haskell/haskell-utf8-string/DEPENDS                               |    1 
 haskell/haskell-utf8-string/DETAILS                               |   15 
 haskell/haskell-utf8-string/HISTORY                               |    4 
 haskell/haskell-utf8-string/POST_REMOVE                           |    1 
 haskell/haskell-utf8-string/POST_RESURRECT                        |    1 
 haskell/haskell-utf8-string/PRE_RESURRECT                         |    1 
 haskell/haskell-x11-xft/DEPENDS                                   |    5 
 haskell/haskell-x11-xft/DETAILS                                   |   13 
 haskell/haskell-x11-xft/HISTORY                                   |    3 
 haskell/haskell-x11/BUILD                                         |    4 
 haskell/haskell-x11/HISTORY                                       |    3 
 http/dillo/HISTORY                                                |    3 
 http/dillo/desktop/dillo.desktop                                  |    2 
 http/dillo2/HISTORY                                               |    3 
 http/dillo2/desktop/dillo.desktop                                 |    2 
 http/firefox/DETAILS                                              |    2 
 http/firefox/HISTORY                                              |    6 
 http/firefox/desktop/firefox.desktop                              |    2 
 http/icecat/HISTORY                                               |    3 
 http/icecat/desktop/icecat.desktop                                |    2 
 http/links-twibright/HISTORY                                      |    3 
 http/links-twibright/desktop/links-dfb.desktop                    |    2 
 http/links-twibright/desktop/links-fb.desktop                     |    2 
 http/links-twibright/desktop/links-x11.desktop                    |    2 
 http/links-twibright/desktop/links.desktop                        |    2 
 http/nginx/DETAILS                                                |    3 
 http/nginx/HISTORY                                                |    7 
 http/nginx/init.d/nginx                                           |   11 
 http/seamonkey/DEPENDS                                            |    7 
 http/seamonkey/HISTORY                                            |    4 
 http/seamonkey/PRE_BUILD                                          |   16 
 http/seamonkey/blfs-mozconfig                                     |    7 
 http/webkitgtk/BUILD                                              |    4 
 http/webkitgtk/DETAILS                                            |   10 
 http/webkitgtk/HISTORY                                            |   12 
 http/webkitgtk3/DEPENDS                                           |    8 
 http/webkitgtk3/DETAILS                                           |    4 
 http/webkitgtk3/HISTORY                                           |    7 
 kde4-apps/digikam4/DETAILS                                        |    4 
 kde4-apps/digikam4/HISTORY                                        |    3 
 kde4-apps/kipi-plugins4/DETAILS                                   |    4 
 kde4-apps/kipi-plugins4/HISTORY                                   |    3 
 kde4-support/libdbusmenu-qt/DETAILS                               |    9 
 kde4-support/libdbusmenu-qt/HISTORY                               |    4 
 kde4/kde4-l10n/DETAILS                                            |    2 
 kde4/kde4-l10n/HISTORY                                            |    3 
 kde4/kdeaccessibility4/DETAILS                                    |    4 
 kde4/kdeaccessibility4/HISTORY                                    |    3 
 kde4/kdeadmin4/DETAILS                                            |    4 
 kde4/kdeadmin4/HISTORY                                            |    3 
 kde4/kdeartwork4/DETAILS                                          |    4 
 kde4/kdeartwork4/HISTORY                                          |    3 
 kde4/kdebase-workspace4/DETAILS                                   |    4 
 kde4/kdebase-workspace4/HISTORY                                   |    3 
 kde4/kdebase4-runtime/DETAILS                                     |    4 
 kde4/kdebase4-runtime/HISTORY                                     |    3 
 kde4/kdebase4/DETAILS                                             |    4 
 kde4/kdebase4/HISTORY                                             |    3 
 kde4/kdebindings4/DETAILS                                         |    4 
 kde4/kdebindings4/HISTORY                                         |    6 
 kde4/kdebindings4/PRE_BUILD                                       |    3 
 kde4/kdebindings4/sip4.12.patch                                   |   93 ++++
 kde4/kdeedu4/DETAILS                                              |    4 
 kde4/kdeedu4/HISTORY                                              |    3 
 kde4/kdegames4/DETAILS                                            |    4 
 kde4/kdegames4/HISTORY                                            |    3 
 kde4/kdegraphics4/DETAILS                                         |    4 
 kde4/kdegraphics4/HISTORY                                         |    3 
 kde4/kdelibs4/DETAILS                                             |    4 
 kde4/kdelibs4/HISTORY                                             |    3 
 kde4/kdemultimedia4/DETAILS                                       |    4 
 kde4/kdemultimedia4/HISTORY                                       |    3 
 kde4/kdenetwork4/DETAILS                                          |    4 
 kde4/kdenetwork4/HISTORY                                          |    3 
 kde4/kdepimlibs4/DETAILS                                          |    4 
 kde4/kdepimlibs4/HISTORY                                          |    3 
 kde4/kdeplasmoids4/DETAILS                                        |    4 
 kde4/kdeplasmoids4/HISTORY                                        |    3 
 kde4/kdesdk4/DETAILS                                              |    4 
 kde4/kdesdk4/HISTORY                                              |    3 
 kde4/kdetoys4/DETAILS                                             |    4 
 kde4/kdetoys4/HISTORY                                             |    3 
 kde4/kdeutils4/DETAILS                                            |    4 
 kde4/kdeutils4/HISTORY                                            |    3 
 kde4/kdewebdev4/DETAILS                                           |    4 
 kde4/kdewebdev4/HISTORY                                           |    3 
 kde4/oxygen-icons/DETAILS                                         |    4 
 kde4/oxygen-icons/HISTORY                                         |    3 
 kernels/kvm/DETAILS                                               |    2 
 kernels/kvm/HISTORY                                               |    3 
 kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig                            |    0 
 kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig                            |binary
 kernels/linux-firmware/DETAILS                                    |    2 
 kernels/linux-firmware/HISTORY                                    |    3 
 kernels/linux/HISTORY                                             |    6 
 kernels/linux/info/kernels/2.6.37                                 |    3 
 kernels/linux/info/patches/PRE_2_6/patch-2.6.37                   |    5 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.37       |    5 
 kernels/linux/latest.defaults                                     |    6 
 kernels/virtualbox-module/DETAILS                                 |    2 
 kernels/virtualbox-module/HISTORY                                 |    6 
 libs/cwiid/DEPENDS                                                |    1 
 libs/cwiid/DETAILS                                                |   15 
 libs/cwiid/HISTORY                                                |    3 
 libs/glibc/DETAILS                                                |    6 
 libs/glibc/HISTORY                                                |    5 
 libs/glibc/PRE_BUILD                                              |    2 
 libs/glibc/glibc-2.12.1-never-expand-origin-when-privileged.patch |   85 ---
 libs/glibc/glibc-2.12.1-require-suid-on-audit.patch               |  218 ----------
 libs/lasi/BUILD                                                   |    1 
 libs/lasi/DEPENDS                                                 |    2 
 libs/lasi/DETAILS                                                 |   22 +
 libs/lasi/HISTORY                                                 |    3 
 libs/libexif/DETAILS                                              |    4 
 libs/libexif/HISTORY                                              |    3 
 libs/libpqxx/BUILD                                                |    8 
 libs/libpqxx/DETAILS                                              |    8 
 libs/libpqxx/HISTORY                                              |    5 
 libs/libsigsegv/DETAILS                                           |    2 
 libs/libsigsegv/HISTORY                                           |    3 
 libs/pyqt4/DETAILS                                                |    4 
 libs/pyqt4/HISTORY                                                |    3 
 libs/sip/DETAILS                                                  |    4 
 libs/sip/HISTORY                                                  |    3 
 libs/slib/DETAILS                                                 |    2 
 libs/slib/HISTORY                                                 |    3 
 libs/slib/slib-3b2.zip.sig                                        |    0 
 libs/slib/slib-3b3.zip.sig                                        |binary
 libs/tdb/DEPENDS                                                  |    1 
 libs/tdb/DETAILS                                                  |   18 
 libs/tdb/HISTORY                                                  |   48 --
 libs/tdb/PRE_BUILD                                                |    3 
 mail/bsfilter/DETAILS                                             |    8 
 mail/bsfilter/HISTORY                                             |    3 
 mail/clamsmtp/BUILD                                               |    3 
 mail/clamsmtp/DEPENDS                                             |    1 
 mail/clamsmtp/DETAILS                                             |   18 
 mail/clamsmtp/HISTORY                                             |    2 
 mail/clamsmtp/INSTALL                                             |    3 
 mail/clamsmtp/init.d/clamsmtpd                                    |    9 
 mail/dovecot/BUILD                                                |    2 
 mail/dovecot/CONFIGURE                                            |    3 
 mail/dovecot/DETAILS                                              |    6 
 mail/dovecot/HISTORY                                              |   10 
 mail/dovecot/init.d/smgl-dovecot                                  |    1 
 mail/exim/BUILD                                                   |    1 
 mail/exim/HISTORY                                                 |    4 
 mail/exim/init.d/exim                                             |   10 
 mail/mpop/DETAILS                                                 |    4 
 mail/mpop/HISTORY                                                 |    3 
 mail/msmtp/DETAILS                                                |    4 
 mail/msmtp/HISTORY                                                |    3 
 mail/postgrey/BUILD                                               |    1 
 mail/postgrey/DEPENDS                                             |    6 
 mail/postgrey/DETAILS                                             |   14 
 mail/postgrey/HISTORY                                             |    3 
 mail/postgrey/INSTALL                                             |    9 
 mail/postgrey/PRE_BUILD                                           |    5 
 mail/postgrey/init.d/postgrey                                     |   11 
 mail/postgrey/init.d/postgrey.conf                                |    3 
 mail/sylpheed-gtk2/HISTORY                                        |    3 
 mail/sylpheed-gtk2/desktop/sylpheed.desktop                       |    2 
 mail/sylpheed/HISTORY                                             |    3 
 mail/sylpheed/desktop/sylpheed.desktop                            |    2 
 mobile/gammu/DETAILS                                              |    4 
 mobile/gammu/HISTORY                                              |    3 
 mobile/wammu/DETAILS                                              |    4 
 mobile/wammu/HISTORY                                              |    3 
 net/dhcpcd/DETAILS                                                |    4 
 net/dhcpcd/HISTORY                                                |    3 
 net/flow-tools/BUILD                                              |    3 
 net/flow-tools/DEPENDS                                            |   16 
 net/flow-tools/DETAILS                                            |   19 
 net/flow-tools/HISTORY                                            |    3 
 net/flow-tools/INSTALL                                            |    6 
 net/flow-tools/PROVIDES                                           |    1 
 net/flow-tools/init.d/flow-capture                                |   11 
 net/flow-tools/init.d/flow-capture.conf                           |    3 
 net/flowd/HISTORY                                                 |    3 
 net/flowd/PROVIDES                                                |    1 
 net/libasyncns/DETAILS                                            |    2 
 net/libasyncns/HISTORY                                            |    3 
 net/libasyncns/libasyncns-0.7.tar.gz.sig                          |    0 
 net/libasyncns/libasyncns-0.8.tar.gz.sig                          |binary
 net/net-snmp/DETAILS                                              |    3 
 net/net-snmp/HISTORY                                              |    6 
 net/net-snmp/init.d/snmpd                                         |    4 
 net/ppp/BUILD                                                     |   10 
 net/ppp/HISTORY                                                   |    6 
 net/ppp/PRE_BUILD                                                 |   15 
 net/ppp/l2tp.patch                                                |   23 +
 net/softflowd/DEPENDS                                             |    4 
 net/softflowd/HISTORY                                             |    3 
 net/unbound/BUILD                                                 |    2 
 net/unbound/DEPENDS                                               |    5 
 net/unbound/DETAILS                                               |   21 
 net/unbound/HISTORY                                               |    3 
 net/unbound/init.d/unbound                                        |    7 
 perl-cpan/io-multiplex/DEPENDS                                    |    1 
 perl-cpan/io-multiplex/DETAILS                                    |   20 
 perl-cpan/io-multiplex/HISTORY                                    |    2 
 php-pear/mongo/DETAILS                                            |    4 
 php-pear/mongo/HISTORY                                            |    3 
 php-pear/php/DETAILS                                              |   22 -
 php-pear/php/HISTORY                                              |    7 
 printer/cups/DETAILS                                              |    5 
 printer/cups/HISTORY                                              |    3 
 printer/hplip/DETAILS                                             |    1 
 printer/hplip/HISTORY                                             |    5 
 printer/hplip/PRE_BUILD                                           |    7 
 printer/hplip/interactive.patch                                   |   32 +
 python-pypi/bzr/DETAILS                                           |    3 
 python-pypi/bzr/HISTORY                                           |    4 
 python-pypi/bzr/PRE_BUILD                                         |    4 
 python-pypi/bzr/xmlrpclib.diff                                    |   40 -
 python-pypi/bzrtools/DETAILS                                      |    4 
 python-pypi/bzrtools/HISTORY                                      |    3 
 python-pypi/calibre/DETAILS                                       |    4 
 python-pypi/calibre/HISTORY                                       |    3 
 python-pypi/calibre/calibre-0.7.34.tar.gz.sig                     |binary
 python-pypi/mercurial/DETAILS                                     |    4 
 python-pypi/mercurial/HISTORY                                     |    3 
 python-pypi/numpy/BUILD                                           |    5 
 python-pypi/numpy/DEPENDS                                         |    4 
 python-pypi/numpy/HISTORY                                         |    7 
 python-pypi/numpy/PRE_SUB_DEPENDS                                 |    5 
 python-pypi/numpy/SUB_DEPENDS                                     |    5 
 python-pypi/papyon/DETAILS                                        |    4 
 python-pypi/papyon/HISTORY                                        |    3 
 python-pypi/psycopg2/DETAILS                                      |    2 
 python-pypi/psycopg2/HISTORY                                      |    3 
 python-pypi/python-mpd/DETAILS                                    |    8 
 python-pypi/python-mpd/HISTORY                                    |    3 
 python-pypi/sqlkit/DETAILS                                        |    4 
 python-pypi/sqlkit/HISTORY                                        |    3 
 ruby-raa/rcairo/DEPENDS                                           |    3 
 ruby-raa/rcairo/DETAILS                                           |    4 
 ruby-raa/rcairo/HISTORY                                           |    4 
 ruby-raa/ruby-1.8/DETAILS                                         |    4 
 ruby-raa/ruby-1.8/HISTORY                                         |    3 
 ruby-raa/ruby-1.9/DETAILS                                         |    4 
 ruby-raa/ruby-1.9/HISTORY                                         |    3 
 ruby-raa/ruby-pkg-config/DEPENDS                                  |    1 
 ruby-raa/ruby-pkg-config/DETAILS                                  |   14 
 ruby-raa/ruby-pkg-config/HISTORY                                  |    3 
 science/chemtool/DETAILS                                          |    4 
 science/chemtool/HISTORY                                          |    3 
 science/chemtool/chemtool-1.6.11.tar.gz.sig                       |    0 
 science/mathomatic/DETAILS                                        |    4 
 science/mathomatic/HISTORY                                        |    3 
 science/plplot/BUILD                                              |    6 
 science/plplot/DEPENDS                                            |   55 ++
 science/plplot/DETAILS                                            |   28 +
 science/plplot/HISTORY                                            |    6 
 science/qtoctave/HISTORY                                          |    3 
 science/qtoctave/desktop/qtoctave.desktop                         |    1 
 security/phash/DEPENDS                                            |    2 
 security/phash/DETAILS                                            |   20 
 security/phash/HISTORY                                            |    3 
 security/scrub/DETAILS                                            |   20 
 security/scrub/HISTORY                                            |    3 
 security/scrub/scrub-2.4.tar.bz2.sig                              |binary
 security/srm/DETAILS                                              |    2 
 security/srm/HISTORY                                              |    3 
 security/srm/srm-1.2.10.tar.gz.sig                                |    0 
 security/srm/srm-1.2.11.tar.gz.sig                                |binary
 security/ssdeep/DETAILS                                           |   16 
 security/ssdeep/HISTORY                                           |    3 
 shell-term-fm/mc/CONFIGURE                                        |   10 
 shell-term-fm/mc/DEPENDS                                          |   15 
 shell-term-fm/mc/DETAILS                                          |    4 
 shell-term-fm/mc/HISTORY                                          |    8 
 shell-term-fm/remmina/DEPENDS                                     |   14 
 shell-term-fm/remmina/DETAILS                                     |    4 
 shell-term-fm/remmina/HISTORY                                     |    3 
 shell-term-fm/rxvt-unicode/DETAILS                                |    4 
 shell-term-fm/rxvt-unicode/HISTORY                                |    3 
 shell-term-fm/tmux/DETAILS                                        |    4 
 shell-term-fm/tmux/HISTORY                                        |    3 
 smgl/simpleinit-msb/DETAILS                                       |    4 
 smgl/simpleinit-msb/HISTORY                                       |    3 
 spelling/stardict/HISTORY                                         |    4 
 spelling/stardict/stardict-g++-sigc++3-fixes.patch.bz2            |binary
 telephony/ccrtp/DETAILS                                           |    4 
 telephony/ccrtp/HISTORY                                           |    3 
 telephony/telepathy-butterfly/DETAILS                             |    2 
 telephony/telepathy-butterfly/HISTORY                             |    3 
 telephony/telepathy-glib/DETAILS                                  |    2 
 telephony/telepathy-glib/HISTORY                                  |    3 
 telephony/telepathy-logger/DETAILS                                |    2 
 telephony/telepathy-logger/HISTORY                                |    3 
 utils/aqemu/BUILD                                                 |    6 
 utils/aqemu/DEPENDS                                               |    5 
 utils/aqemu/DETAILS                                               |    8 
 utils/aqemu/HISTORY                                               |    9 
 utils/checkinstall/HISTORY                                        |    3 
 utils/checkinstall/PRE_BUILD                                      |    4 
 utils/coreutils/DETAILS                                           |    2 
 utils/coreutils/HISTORY                                           |    6 
 utils/dbus/DETAILS                                                |    6 
 utils/dbus/HISTORY                                                |    3 
 utils/dmenu/DETAILS                                               |    4 
 utils/dmenu/HISTORY                                               |    3 
 utils/fcron/DETAILS                                               |    6 
 utils/fcron/HISTORY                                               |    3 
 utils/hal/DEPENDS                                                 |    1 
 utils/hal/HISTORY                                                 |    3 
 utils/installwatch/BUILD                                          |   16 
 utils/installwatch/DETAILS                                        |   15 
 utils/installwatch/HISTORY                                        |    8 
 utils/installwatch/INSTALL                                        |    4 
 utils/installwatch/PRE_BUILD                                      |    9 
 utils/installwatch/installwatch-buffer.diff                       |   33 -
 utils/installwatch/installwatch-cflags.diff                       |   24 -
 utils/installwatch/installwatch-errno.diff                        |   55 --
 utils/installwatch/installwatch-ld-preload.diff                   |   13 
 utils/installwatch/installwatch-syslog.diff                       |   12 
 utils/installwatch/ld_preload.patch                               |   16 
 utils/installwatch/localdecls.h                                   |    8 
 utils/iotop/DETAILS                                               |    4 
 utils/iotop/HISTORY                                               |    3 
 utils/iso-codes/DETAILS                                           |    2 
 utils/iso-codes/HISTORY                                           |    6 
 utils/nmon/BUILD                                                  |    1 
 utils/nmon/DETAILS                                                |   34 +
 utils/nmon/HISTORY                                                |    9 
 utils/nmon/INSTALL                                                |    1 
 utils/nmon/PRE_BUILD                                              |    3 
 utils/nut-monitor/HISTORY                                         |    3 
 utils/nut-monitor/desktop/nut-monitor.desktop                     |    2 
 utils/openipmi/BUILD                                              |    2 
 utils/openipmi/DETAILS                                            |   10 
 utils/openipmi/HISTORY                                            |    6 
 utils/openipmi/OpenIPMI-2.0.18.tar.gz.sig                         |binary
 utils/procps/DETAILS                                              |    1 
 utils/procps/HISTORY                                              |    8 
 utils/procps/PRE_BUILD                                            |    2 
 utils/procps/version.patch                                        |   11 
 utils/pybackpack/HISTORY                                          |    3 
 utils/pybackpack/desktop/pybackpack.desktop                       |    1 
 utils/qemu/DETAILS                                                |    5 
 utils/qemu/HISTORY                                                |    3 
 utils/qemu/PREPARE                                                |    2 
 utils/syslinux/DETAILS                                            |    2 
 utils/syslinux/HISTORY                                            |    3 
 utils/unetbootin/DETAILS                                          |    4 
 utils/unetbootin/HISTORY                                          |    3 
 utils/unetbootin/unetbootin-source-424.tar.gz.sig                 |    0 
 utils/usbutils/DETAILS                                            |    4 
 utils/usbutils/HISTORY                                            |    3 
 utils/virtualbox/DEPENDS                                          |    6 
 utils/virtualbox/DETAILS                                          |    6 
 utils/virtualbox/HISTORY                                          |    8 
 utils/virtualbox/PRE_BUILD                                        |    6 
 video-libs/libass/DEPENDS                                         |    4 
 video-libs/libass/DETAILS                                         |   14 
 video-libs/libass/HISTORY                                         |    3 
 video-libs/libavc1394/DETAILS                                     |    4 
 video-libs/libavc1394/HISTORY                                     |    3 
 video-libs/libdvbpsi/DETAILS                                      |    8 
 video-libs/libdvbpsi/HISTORY                                      |    3 
 video-libs/libquicktime/DETAILS                                   |    4 
 video-libs/libquicktime/HISTORY                                   |    4 
 video-libs/libquicktime/PRE_BUILD                                 |    3 
 video-libs/libraw1394/DETAILS                                     |    6 
 video-libs/libraw1394/HISTORY                                     |    3 
 video-libs/live/DETAILS                                           |    4 
 video-libs/live/HISTORY                                           |    3 
 video/avidemux2/DEPENDS                                           |    1 
 video/avidemux2/HISTORY                                           |    3 
 video/dvbcut/HISTORY                                              |    5 
 video/dvbcut/desktop/dvbcut.desktop                               |    1 
 video/gopedit/HISTORY                                             |    3 
 video/gopedit/desktop/gopedit.desktop                             |    1 
 video/guvcview/DEPENDS                                            |    1 
 video/guvcview/DETAILS                                            |    4 
 video/guvcview/HISTORY                                            |    4 
 video/kmenc15/HISTORY                                             |    3 
 video/kmenc15/desktop/kmenc15.desktop                             |    1 
 video/miro/DETAILS                                                |    4 
 video/miro/HISTORY                                                |    3 
 video/mplayer/HISTORY                                             |    3 
 video/mplayer/desktop/mplayer.desktop                             |    2 
 video/vlc/DEPENDS                                                 |    6 
 video/vlc/HISTORY                                                 |    3 
 video/wxcam/DETAILS                                               |    4 
 video/wxcam/HISTORY                                               |    3 
 video/xbmc/DEPENDS                                                |  110 +++++
 video/xbmc/DETAILS                                                |   36 +
 video/xbmc/HISTORY                                                |    3 
 video/xbmc/PRE_BUILD                                              |    3 
 video/xine-ui/HISTORY                                             |    3 
 video/xine-ui/desktop/xine.desktop                                |    2 
 windowmanagers/awesome/DETAILS                                    |    4 
 windowmanagers/awesome/HISTORY                                    |    3 
 windowmanagers/xmonad/DETAILS                                     |    4 
 windowmanagers/xmonad/HISTORY                                     |    3 
 wm-addons/iceme/HISTORY                                           |    3 
 wm-addons/iceme/desktop/iceme.desktop                             |    1 
 wm-addons/procmeter/BUILD                                         |   13 
 wm-addons/procmeter/DEPENDS                                       |    3 
 wm-addons/procmeter/DETAILS                                       |   21 
 wm-addons/procmeter/HISTORY                                       |    3 
 wm-addons/procmeter/PRE_BUILD                                     |    3 
 wm-addons/wmforkplop/HISTORY                                      |    3 
 wm-addons/wmforkplop/desktop/wmforkplop.desktop                   |    1 
 wm-addons/wmfsm/HISTORY                                           |    3 
 wm-addons/wmfsm/desktop/wmfsm.desktop                             |    1 
 wm-addons/xmobar/BUILD                                            |    2 
 wm-addons/xmobar/DEPENDS                                          |    4 
 wm-addons/xmobar/DETAILS                                          |    4 
 wm-addons/xmobar/HISTORY                                          |    6 
 wm-addons/xmonad-contrib/DEPENDS                                  |    1 
 wm-addons/xmonad-contrib/DETAILS                                  |    4 
 wm-addons/xmonad-contrib/HISTORY                                  |    4 
 x11-libs/cairo/DETAILS                                            |   12 
 x11-libs/cairo/HISTORY                                            |    8 
 x11-libs/cairo/PRE_SUB_DEPENDS                                    |    2 
 x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS                         |    1 
 x11-libs/cairomm/DETAILS                                          |    4 
 x11-libs/cairomm/HISTORY                                          |    3 
 x11-libs/wine/DETAILS                                             |    2 
 x11-libs/wine/HISTORY                                             |    6 
 x11-toolkits/gtk+2/DETAILS                                        |    4 
 x11-toolkits/gtk+2/HISTORY                                        |    6 
 x11-toolkits/gtk+2/gtk+-2.23.90.tar.bz2.sig                       |binary
 x11-toolkits/gtk+3/DETAILS                                        |    4 
 x11-toolkits/gtk+3/HISTORY                                        |    9 
 x11-toolkits/gtk+3/gtk+-2.91.1.tar.bz2.sig                        |    0 
 x11-toolkits/gtk+3/gtk+-2.99.0.tar.bz2.sig                        |binary
 x11/conky/BUILD                                                   |    2 
 x11/conky/CONFIGURE                                               |   10 
 x11/conky/DETAILS                                                 |    1 
 x11/conky/HISTORY                                                 |    5 
 x11/fbpanel/BUILD                                                 |    8 
 x11/fbpanel/CONFIGURE                                             |    1 
 x11/fbpanel/DETAILS                                               |    7 
 x11/fbpanel/HISTORY                                               |    4 
 x11/fbpanel/fbpanel-4.12.tgz.sig                                  |    0 
 x11/gtk-theme-switch/BUILD                                        |    1 
 x11/gtk-theme-switch/DEPENDS                                      |    1 
 x11/gtk-theme-switch/DETAILS                                      |   16 
 x11/gtk-theme-switch/HISTORY                                      |   33 +
 x11/gtk-theme-switch/INSTALL                                      |    1 
 x11/gtk-theme-switch/PRE_BUILD                                    |    4 
 x11/gtk-theme-switch/desktop/gtk-theme-switch.desktop             |    8 
 x11/merkaartor/DETAILS                                            |    6 
 x11/merkaartor/HISTORY                                            |    3 
 x11/xoverkill/HISTORY                                             |    3 
 x11/xoverkill/desktop/xoverkill.desktop                           |    1 
 xfce-plugins/thunar-media-tags-plugin/DETAILS                     |    7 
 xfce-plugins/thunar-media-tags-plugin/HISTORY                     |    3 
 xorg-app/compiz/HISTORY                                           |    3 
 xorg-app/compiz/PRE_BUILD                                         |    4 
 xorg-lib/libx11/DETAILS                                           |    1 
 xorg-lib/libx11/HISTORY                                           |    5 
 xorg-lib/libx11/PRE_BUILD                                         |    4 
 xorg-lib/libx11/xlibh.patch                                       |   36 +
 753 files changed, 3269 insertions(+), 1319 deletions(-)

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

    znc: corrected deps

commit 591c6443704baece384ec8b96740bd883169f7c9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    zlip: Added sed from LFS to fix zlib.h.  UP_TRIGGERS to ensure system
    is stable.  Should also fix Bug 15927.

commit 902d0545eb36581a17fcbeb5dd64cbdf14fa6694
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    hal: removed not needed dependency

commit 1b49d781071d3ebc31d639d604576432c0de919c
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+3: Updated to version 2.99.0

commit bdab10ea4178150201b4aca996ccde5e89cee80f
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+2: Updated devel to version 2.23.90

commit 04d78a2027bbffa23adcfe0412292f7ece85e3f9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    glib2: Updated devel to version 2.27.90

commit 4d764f111928c71083e03c4db434b11b8c1a1a9a
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    spelling/stardict: more fixes to build with gtk 2.23

commit ef07524019aba26e9f9bab530db5504a3bf5b125
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    php: stable updated to version 5.3.5 and legacy updated to version
    5.2.17. SECURITY_PATCH++

commit fab75b7af60cf4fa4986f006fa44ca7241649197
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    imagemagick: Updated to version 6.6.6-10

commit 41dafa962eb3becc9160612cbac7961ea36c78ba
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pyside-tools: => 0.2.5

commit 95cf37820d5ad31aeca6382d224baaa699e2ca1a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pyside: => qt4.7+1.0.0~beta3

commit 372f77fc9d1fa56288b807897dae38e6a60ab29d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    shiboken: => 1.0.0~beta3

commit a71f0bbd5af9acb77b4a99f60f895505b2d81ab3
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    apiextractor: => 0.9.2

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

    gnustep-apps/gnustep-oolite: added optional support for the developer
    version

commit 006e02b3bf3a2dc939b621140cb01bd5e5083425
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    installwatch: now compatible with stable sorcery #13873
    (cherry picked from commit 3a21cbccf5b171186bf173854841c897d7f4e40a)

commit d0614d826498bce334870e6a98ddca16a732e381
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    installwatch 2010-12-12
    (cherry picked from commit d136f54f6a282547bbad0e0a52133164e1dcd22f)

commit ed9f4faf0d17f1e203649cbed055cba288cdcad9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    coreutils: Updated to version 8.9
    (cherry picked from commit e6a7274afdfc98b80b9d76a13096ef31a3faa66f)

commit b9594c7341b260a37fd586198fb7eccfc7ca9f5a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    coreutils 8.8
    (cherry picked from commit 8ac88c4ae975c2d278cc053ba13b94d6fcfd4d3e)

commit 217eaad26803b5080939d10626a9a1e94a083236
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdebindings4: added patch that fixes compile problem with sip 4.12

commit f6c67ddc13c5865a65c7791e26b6af30b52d97bf
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    gthumb2: PRE_BUILD added to apply exiv2 patch until next release.

commit f13e09ec32efb78a9f7ed158d24f678d64eb2059
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    oxygen-icons: updated spell to 4.5.5

commit 7a1db3a2ea5898c6c2573b0c995963962913ebe6
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdewebdev4: updated spell to 4.5.5

commit 24ff14046a906a29f581191c569f5de04f7d07ce
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeutils4: updated spell to 4.5.5

commit 1d4e224ab5f0350d456b9820b638bbd20138d35a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdetoys4: updated spell to 4.5.5

commit 142fbd9930974a3607b9b2670db8d7b64501e417
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdesdk4: updated spell to 4.5.5

commit 720535e38b9d91b5ddcb6aaf62bfbd0ae643d179
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeplasmoids4: updated spell to 4.5.5

commit b1de9070c58387096b642c049dce426e5f1d1281
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdepimlibs4: updated spell to 4.5.5

commit 13bdd95c63ab9066926336f6e2897370d7d883d6
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdenetwork4: updated spell to 4.5.5

commit ed006469f1d55c010c631e48df1b9f7311c98903
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdemultimedia4: updated spell to 4.5.5

commit 219670a648a42ba82b7d512f57e796d40bee2cfb
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdelibs4: updated spell to 4.5.5

commit 693f5d07bda547ec4e197b817137f3d1d4cf4a1e
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdegraphics4: updated spell to 4.5.5

commit e4d0d80dd6d6ebf75946e9912c010798e179434d
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdegames4: updated spell to 4.5.5

commit ff2b076db40d005ce0fa67af271e6bf60568bb95
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeedu4: updated spell to 4.5.5

commit 5f36726a53a569bb78e18896ad98066f6318179b
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdebindings4: updated spell to 4.5.5

commit 32c2d689d674d23ba87edd8b7b91ff1304f03a3a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdebase4: updated spell to 4.5.5

commit 5429bb20a90102812c63d75d3f80221cb5eb8e1c
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdebase4-runtime: updated spell to 4.5.5

commit a226a7bc6e6a39e54f461d53f823f25f065c356c
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdebase-workspace4: updated spell to 4.5.5

commit 45cb9f4a9c2e2f89299c83cc0674e3e3a73b4d5a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeartwork4: updated spell to 4.5.5

commit d88db01b63a1d89a6cee04fdd1998d3b93553223
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeadmin4: updated spell to 4.5.5

commit 44ab16160a3629d7c0005dbb47858a93d3461e7b
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kdeaccessibility4: updated spell to 4.5.5

commit f6b8e59aee5cbeeb7bbe4f18f3b1185fc1dda4fd
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kde4-l10n: updated spell to 4.5.5

commit 2cfa94383a96ccb7df0ba5adc16fcc92cb17baa6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libsasl: Conflicts with cyrus-sasl
    e.g. sasl/sasl.h conflicts

commit 24ce2a412d3949c80ff0340e97ade8b4a66798b8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    cyrus-sasl: Conflicts with libsasl
    e.g. sasl/sasl.h conflicts

commit d5411e3aaf5dd11be19a3a0cef265e31ab229e8a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "gtk-vnc: Requires cyrus-sasl specifically, not any LIBSASL"
    
    This reverts commit 6e87971602ca73403c8a88e45a7bbcdaf4994131.
    
    A dispel of cyrus-sasl broke my libsasl. They need to conflict.

commit 6e87971602ca73403c8a88e45a7bbcdaf4994131
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtk-vnc: Requires cyrus-sasl specifically, not any LIBSASL
    configure: error: You must install the Cyrus SASL development package in
    order to compile GTK-VNC

commit fcf7883b8049d9c2101d6875f34bc9112138f3e8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated devel to 1.3.11

commit ea4745dcdc6dad2f54e0544489f1979dcddd0f64
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    webkitgtk: fixed multijob build

commit a5fdb97112b5253c16b95fb2256890d5c5e02e52
Author: Philippe Caseiro <puppetmaster at sourcemage.org>
Commit: Puppet_Master <puppetmaster at sourcemage.org>

       video/avidemux2 : Adding missing dep on yasm

commit 934f16c5a640a6e705d86035e03ede317e069af6
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    sparse: update spell to 0.4.2

commit 98d63dc5c6e91c9439b649845bac2a0e5c56c779
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    mpg123: prepare for a world where .la files get purged

commit 40215f6d92152e634d07680012e571893f2f402e
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    fotoxx: version 10.12.1

commit cd255715df67ce47f8db3f9a7dd6238f1b8c9a42
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mono: Updated to version 2.8.2

commit 87fc9362a39bb1b8e0a1785be56d398f7e76484f
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    Missed that an update is ready in -modular branch
    Revert "xorg-server: updated to 1.9.2"
    
    This reverts commit bbdb27f331866b3d6a2a4ce659ec8e41ebca885e.

commit bbdb27f331866b3d6a2a4ce659ec8e41ebca885e
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    xorg-server: updated to 1.9.2

commit b4d712cb550f6cf5ea1fac97cf6ed28a2be58cb8
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mesalib: AVAILABLE_DRIVERS updated, r600 is in stable now
    
    common/ fb/ ffb/ gamma/ glcore/ i810/ i915/ i965/ intel/ mach64/ mga/
    r128/ r200/ r300/ radeon/ s3v/ savage/ sis/ swrast/ tdfx/ trident/
    unichrome/
    
    common/ i810/ i915/ i965/ intel/ mach64/ mga/ nouveau/ r128/ r200/ r300/
    r600/ radeon/ savage/ sis/ swrast/ tdfx/ unichrome/
    
    common/ i810/ i915/ i965/ intel/ mach64/ mga/ nouveau/ r128/ r200/ r300/
    r600/ radeon/ savage/ sis/ swrast/ tdfx/ unichrome/

commit f3b41200e04ed539fc0e5dfce1dd5dba42f1bbf0
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mesalib: config_query_multi MESALIB_GALLIUM updated
    
    7.5.2
    
      --disable-gallium       build gallium [default=enabled]
      --disable-gallium-intel build gallium intel [default=enabled]
      --enable-gallium-radeon build gallium radeon [default=disabled]
      --enable-gallium-nouveau
                              build gallium nouveau [default=disabled]
    
    7.8.2
    
      --disable-gallium       build gallium [default=enabled]
      --enable-gallium-svga   build gallium SVGA [default=disabled]
      --enable-gallium-intel  build gallium intel [default=disabled]
      --enable-gallium-radeon build gallium radeon [default=disabled]
      --enable-gallium-nouveau
                              build gallium nouveau [default=disabled]
      --enable-gallium-swrast build gallium swrast [default=disabled]
    
    7.9
    
      --disable-gallium       build gallium [default=enabled]
      --enable-gallium-llvm   build gallium LLVM support [default=disabled]
      --enable-gallium-svga   build gallium SVGA [default=disabled]
      --enable-gallium-i915   build gallium i915 [default=disabled]
      --enable-gallium-i965   build gallium i965 [default=disabled]
      --enable-gallium-radeon build gallium radeon [default=disabled]
      --enable-gallium-r600   build gallium radeon [default=disabled]
      --enable-gallium-nouveau
                              build gallium nouveau [default=disabled]
      --enable-gallium-swrast build gallium swrast [default=auto]

commit f6e8215d29e81994f63127f717f3f10a85679097
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    doc/epdfview: fix building with poppler 0.16

commit f65d1b699c15502ad17cd6b9247c46a669c54475
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    hplip: fixed bugs related to console tools and udev deprecations

commit 6787125c3cbf77a9f493151f128ddb0844e5bd12
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cups: => 1.4.6

commit 66be0ad94197eba1714f937cda5686174a56fa6c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    geany: => 0.20

commit 299ef1911e50d2226600bbfca196c34e8ae2fa31
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    enrico.gpg: added key D8C850FB Nick Treleaven (ntrel) <nick.treleaven at btinternet.com>

commit ff1031c5ce59d572762229266cf221ca8b2c83b3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    isomaster: => 1.3.8

commit b65479d69846eff4d2d108b928b408a89270b177
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    mpg123: bump to 1.13.1

commit 9779687f9bbeafcfb8e6cb29e9da94f846fdaa45
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    git 1.7.3.5

commit e26dfaa6d70faee83fbff94ff9db1b08452345e7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wxcam 1.0.7

commit 99ff894a6534d6e657db9eb9e45edef1b9edc136
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.37

commit a63c1f2a12667c4f8fed3164e8a812c388cd135f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libjpeg-turbo 1.0.90.1

commit ce4d2a6550b28d8012172d35f42ec65d85f9e579
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libasyncns 0.8

commit 840d51cdd24e58ca1123862b14d9b60c3644b39e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libcanberra 0.26

commit 6c05a042d44f125130f8d9d6a66604aaa876f346
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libraw 0.12.2

commit 67cd37409bc43fdf3dbf608fa7d401b0695dfe5f
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/nmon: removed copy/pasted nonsense from description

commit bcc5997c50c0c8053632ba4348983e557c2f6621
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    procps: fixed bug about some 'Unknown HZ value' warnings in new kernels

commit 95acb1c281c6a52e51dc024e45ba0cf2253d91ea
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ladspa: use correct optimization flags

commit 6719967cad9666b6006e5e4f51fb321d16a5a33b
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    phpmyadmin: Updated to version 3.3.9

commit 25158c5d468a25aedd1ecff20b66ae80de7ba812
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    doxygen: Updated to version 1.7.3

commit 925fad2bf1b4b6787d08b17995e92bd5bf263f1c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mc: readded screen selection option

commit c42a3f5ce9033958d5f5b44896a1e7bb1f8d2314
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gnupg: more specific comment for static build

commit 30ee14bbf389f6aafcc7831aebef3940ad821b50
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    cdrdao: fixed compilation with recent headers

commit a1403a1a52765f7b6500c69ee493509c93688bcb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ppp: fixed compilation with 2.6.35 headers, made use of optimization flags

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

    utils/nmon: added LDFLAGS to BUILD

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

    utils/nmon: new spell a system monitor

commit 4cd2e44e53760a7aca71d8af0102fa70ac57094e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    unbound: init.d/unbound script added

commit 2079a92363ebd86374cc4670c5167fb075f80203
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    unbound: user unbound created
    
    unbound... fatal error: user 'unbound' does not exist.

commit 34b11db322f6903a4f56a946a144ef629257fc4a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    accounts, groups: unbound added

commit d1006cc4aada6287cb4fd9433dc63ee80ace6269
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    net/unbound: new spell, validating, recursive, and caching DNS resolver

commit 9d2e041367bd4aa3c19a35fec79895f44571976c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    iso-codes 3.24

commit 362bf872a7ea20640a7a9485e86b35bbe53e1b4a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    scite 2.23

commit 2517875fc5cf23f2afc376e04ff82e0739678d44
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    atkmm: updated upstream tarball (safe), diff: http://sprunge.us/iXLE

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

    x11/fbpanel: version 6.1

commit 0cec635f1d68bec860862257d9405ee0142c0f15
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    updated upstream tarball (safe), diff: http://bpaste.net/show/12664/

commit 69a917d4230e8dfef1f2d71916e718656e54e6de
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gbdfed: fixed compilation with GTK+ >=2.22

commit 14cba695b390adf0dd21f6626248fac92bcc4a3a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    guvcview: => 1.4.3

commit ecc60583a39a904102d6d07f1d92de99afe010fc
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    poppler: => 0.16.0

commit 0e4b0fe6b9e6687d36f4545b302cfaf406129ba2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    net-snmp: => 5.6.1

commit 630089aa8814edb10197e64660113dacbdbbd627
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    thunar-media-tags-plugin: renewed urls

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

    mobile/wammu: version 0.35

commit 07f77ad98822dc8125ae9aaf47909c12f844ae0b
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    mobile/gammu: version 1.28.0

commit 9d69c55993cca352834ae5110f14a360511c96fa
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    VERSION: 0.53-test

commit 3bf111794985c798f52142579e72d6dc1dd7457a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mesalib 7.8.2 (stable), 7.9 (feature, developement)
    
    cast xorg-server 1.9.3:
    Requested 'dri >= 7.8.0' but version of dri is 7.5.2
    (cherry picked from commit b785b0ca73140622b876d8948dc248d0e2d0e9aa)

commit eb8f7dd3e8b93518bdc256fcc85b59ea35a852f8
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    virtualbox-module 4.0.0

commit fe3a80a273d3c3797ac2b45f64d054bde0635fad
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    virtualbox 4.0.0

commit 42d8f0294184d2820dc6274255aa92dc7bc4cb67
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    archive/makeself: new spell, make self-extractable archives

commit 581db748dd1027db5245f45313756f2fd6332ee0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dhcpcd: => 5.2.10

commit bfceb221a7c334090e6b1388d5fc30f3c2cb68a6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    mercurial: => 1.7.3

commit e58543f92f78d143b547cfe3eeeb33bb0425fb0d
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gnucash: Updated devel to version 2.4.0.  This version is stable, but spell
    still needs clean-up with some CONFIGURE options set. Works great like
    this though.

commit 00493daad5f825341369f5b1d0f48be3d34391f7
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    slib: Updated to version 3b3

commit 99a047641da14803e487eb5350dc710840b94b16
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gtk-theme-switch: moved to x11 from gnome1-libs

commit 360ad37355ff7a41e7472ad3030dbeb80c315609
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gtk-theme-switch: => 2.1.0

commit 0227056275a68bcca6e001aa732fdd93590fadca
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gajim: corrected SQLite dependency

commit b905ebcba21f71a4f752782ee89603fb66c819d2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    seamonkey: adopt dirty hacks

commit cb2b4dcdbbe43dab326203c708bff35db2251fd8
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+2: Updated devel to version 2.23.3

commit 2dab3cb24eeab3b75119e02e94ce81eb005a8918
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    seamonkey: added missing deps, fixed compiling if there's no nss on the system yet

commit d182859e4402908aee11e37677ab57f0019f2fb1
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    cairo: Fix PRE_SUB_DEPENDS to actually evaluate false when devel is not
    used.

commit 96e7241930427b993d3f604e63b264b70da39233
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    cairo: Update REPAIR file to match current PRE_SUB_DEPENDS

commit f2fa993267dffb3e83c8d9de089a36174255c884
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pgadmin3 1.12.2

commit bf70d4fc6c6094fc80ad155d58795950b640a8c8
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    di 4.27

commit 2879d3e983edc7e5d65aeb45c634f266beccf3b3
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    iceme.desktop: add spanish name

commit 3e5f78ad9595c04fb6dbf30195dc8e010d3bbb3b
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    nut-monitor.desktop: add spanish name and comment

commit 67cbd338cd7541c6db7ae26d0cdb4a1f0edf4671
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    podviewer.desktop: add spanish name and comment

commit 69b6dac876ebb1db29683ac4f827e3d754d452b7
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    elation.desktop: add spanish comment and generic name

commit f004ade09304d5b0500dd54a3572494fd1fea97b
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    sylpheed.desktop: add generic name

commit 1f218b6b5192a02f68018f41aee0f33e69d8ee3b
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    {dillo,dillo2,firefox,icecat,links*}.desktop: add generic name

commit 08a39051900676b3ef94a48b6bf816fe7ccce1f1
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gopedit.desktop: add spanish comment

commit 3e4a242200dd7abcf61dd2c5490d66030a7634a4
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    dvbcut.desktop: add spanish comment

commit f33bf62473234f3553a5b3b9e5181ca02f489bc7
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    pybackpack.desktop: add spanish comment

commit 954e77d63790aa89675b195f1d86d2f59853f081
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    qtoctave.desktop: add spanish comment

commit d7dde0ea0d659e45244decbe960402672880dd77
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    xplab.desktop: add spanish comment

commit 1da46264ea56740ce19aec213642f5245e81ac28
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    blender.desktop: add spanish comment

commit 202aeaa724a2d9e5721e0c533f03908a5e5ef4bd
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    texmaker.desktop: add spanish comment

commit 2a50dcf29b44bceb5eb385089963e8eab2edaa6c
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    xpdf.desktop: add spanish comment

commit bd1acf6858213d634baff3877dd173f7d53ef787
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    keyjnote.desktop: add spanish comment

commit 4b487cab60cc9341ce6245d437ae9c5d86e92cb8
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    kmenc15.desktop: add spanish comment

commit b2ab621739db20c622a1981d7cd0555e48894a3a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    wmforkplop.desktop: add spanish comment

commit d6f8db4c8ffb46ad41b95e35c49cf74a80b2504d
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    wmfsm.desktop: add spanish comment

commit 31d39180cf0f1f1ee574009d6c58874fa4c40fae
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    xoverkill.desktop: add spanish comment

commit af99373ea926922b40496389da69aba224680a47
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    {mplayer,xine}.desktop: add generic name

commit 91d2244bd812232942a03f5885c39d2bcedcaf8a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    {emacs,joe,vim,gvim}.desktop: add generic name

commit 9c3cf6537b2429ac0f31ee22deba62d1cb88a572
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    irssi.desktop: add generic name and comment

commit 999f23fbf16e96d293d16e7cc7438db70cda406e
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    quimup.desktop: add generic name and spanish comment

commit d121aaba7ea29714a96079697a3005333966df59
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    qmpdclient.desktop: added generic name and spanish comment

commit f17014c45673379a377641744499f3d6493edfab
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gxmms2.desktop: add spanish generic name and comment

commit 5fa411f5c4ed94d2316344cc15c5169675ccbbf3
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    guimup.desktop: add spanish comment

commit 54df6386340c98a0466cea6a61221b9bc5f5d388
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    man: => 1.6g

commit 6e243528da6b3e605a02b6bb13ddc3e46f8fda16
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    live 2010.12.31

commit 9c2882bada1e4968cba6c892500c82890c49a698
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    srm 1.2.11

commit 4d5fcc191ec686265751fcf29930d4806f26044b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    vino 2.32.1

commit eb126a4d1e956e3f0830e7970b32e50d2e8b3b10
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    nautilus2 2.32.2.1

commit 1e96f7347af86853996827535e7ecb591c865b40
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    help2man 1.38.4

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

    x11/conky: added optional support for METAR and XOAP weather,
    IBM/Lenovo laptops, Eve-Online skill monitor and RSS

commit 142275455642156a341178d005c06ac36ae6939b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    byacc: => 20101229

commit 3457b558e0aea965a6506f44d484b50c4fded348
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    bsfilter 1.0.17

commit 45f2cd395b4c4974ed02b6c2324770ba6a6dafa7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    msmtp 1.4.22

commit 18d874c0719dc8892b8353001043073876595a27
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mpop 1.0.22

commit 877ed8603e29a2507186a75729725fce1fa0d188
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pinentry 0.8.1

commit b87801dc583b6e1d09fbbd1e82de3607befcee44
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mysql: Updated stable to version 5.1.54

commit 54d13e4626613ac4fa3c84017123f4f8336e5ce5
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    imagemagick: Updated to version 6.6.6-8

commit 457fcac5321241ae2e4b5c2a4e78ed999c4e3f8d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    lftp 4.1.2

commit 39ee0d7d706e34f9230e3200e4411a5a1badc58d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    groff 1.21

commit 07a9b009922a1a6412f2af643f6146f90819aa73
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    webkitgtk 1.2.6, SECURITY_PATCH=3, #15926

commit 6c981961a995fce1599b545d32cadacb947a98dc
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    fcron 3.0.6, SECURITY_PATCH=2, #15926

commit 5f48443bcf2544888f8a6813574a1786efe5421f
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libarchive: => 2.8.4

commit 44aa004618f4f332c81e9b46f2d3da5db1b81b0a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libavc1394: => 0.5.4

commit 935ebf842bfe03f5417e2048afe850581f465d2e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libdvbpsi: => 0.1.7

commit 74d9e83fd37e6b2697efe630fc52d36c496b6e02
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnu-verified.gpg: added key 000BEEEE
    http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&search=0x7FD9FCCB000BEEEE

commit 45e15a2ff282972e2b2d8bcd8d7bddc27697dc6a
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    wm-addons/xmobar: added optional dependency on haskell-x11-xft

commit 4bc33f1cc82ba5e43e73c7a04f904dfad6e1783e
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    haskell/haskell-x11-xft: new spell, haskell bindings for libxft and libxrender

commit 187d0725470965bf1cd6b4110b3acdec63f886ac
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    security/scrub: new spell, disk overwrite utility

commit 7a4be57bccb4329ad220eb500b8fcd671861c132
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libssh 0.4.7

commit ab1fe53d477deb6575b43db8cb8f6ab93bb98c2a
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    checkinstall: use the old installwatch log variable #13873
    we currently don't build installwatch from here, but the same sed can be
     applied to fix it

commit dcc76af3d6c33c8da784f17966d3d73d6b6e3de3
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    partimage-ng: DOWNLOAD fixed

commit c5dbdf7e073875a2d70eefc93a79c4ea1616d6b3
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    bzr_download.function fixed

commit 9b61419667ce528fe3a6f88875fb24cdfd4b71cc
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    emacs: DOWNLOAD fixed

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

    wm-addons/procmeter: new spell, a user information display and system status monitor

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

    fonts-x11/ubuntu-font-family: new spell, a free sans-serif font

commit 78fdd854d28aa90d349ae4e04f4b61aca6de0c77
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    simpleinit-msb: use our mirror

commit 8795ab3c8b3bbaad19d2764c86b9892f5deddae4
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    Move bzr_download function to it's own file, so it can be shared
    and fix emacs download for tarball releases

commit 440112bb38fc6017f7ac24c8f9ab92d42316ab3b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    vala 0.10.2

commit d3d862f9e42757bd5b77bf5527804896f7f87478
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mc needs glib2 >= 2.8

commit d17b081a50cec146f4e9c1e89d7a5ed115150aba
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mc: --with-samba -> --enable-vfs-smb

commit 7b3699bdc3248c49ce1e3f1228d9d7af716f7f85
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mc 4.7.5

commit fea1b8b2dac4c11c089f62a61c22b4f9bea396ad
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    postgrey: new spell, Postfix policy server implementing greylisting

commit a38fa3e8466be4387dc499ce66e42238c1fa182c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    io-multiplex: new spell, Perl module to manage IO on many file handles

commit 93cf391936429fe9a43301bec72863a3d8bbbfab
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    clamsmtp: new spell, SMTP virus filter

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

    wm-addons/xmonad-contrib: version 0.9.2

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

    haskell/haskell-utf8-string: new spell, support for reading and writing
    utf8 strings

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

    utils/dmenu: version 4.2.1

commit 09cb794031a6f92209fb3dcc33785277770b7fbb
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    wm-addons/xmobar: version 0.12

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

    windowmanagers/xmonad: version 0.9.2

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

    haskell/haskell-x11: fixed build

commit 60a0a5ef8178a0613d1629620317496476e407f5
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    science/plplot: added optional dependency on numpy

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

    python-pypi/numpy: made the dependency on atlas optional

commit 38bb89c974052fd895501eafdca180e02c800827
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    rxvt-unicode 9.10

commit d2709bde01f3eabe8eba3aa57c2badac0b6116ce
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    tmux 1.4

commit e922474fd02efcc84d1dceaaaff686c8f5796b7d
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    mathomatic: updated spell to 15.3.7

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

    science/plplot: new spell, a plotting library with bindings for many
    programming languages

commit 0798a187711598285356892bf76275c46ba2a7b0
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    python-pypi/numpy: added missing dependency on atlas

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

    cluster/lapack: version 3.3.0

commit 00d734e0453bc67a5cc3c820c2d542937e325797
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dovecot: removed useless ARGS in init script

commit 69d10aaaf1c2a8c54bef2c3dafa24e47d7a23cb1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pidgin 2.7.9

commit 56667fde2426ceacaf1dbd2e23e414a1dcd3683a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    cairomm 1.8.6

commit 6267bd86f74600f8380315909d420b2a8eff1ec1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    rcairo 1.10.0

commit 4518401638c7792a289dbc950bf29ee696497719
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ruby-raa/ruby-pkg-config: new spell, pkg-config by Ruby
     enter the commit message for your changes. Lines starting

commit 5ea451f3452f44c9b74f479c8ccaf51f78b1fd03
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    cairo 1.10.2

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

    video/xbmc: new spell, a media player

commit e54679853a588f6d5d35eec1087b8f22b096edbc
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    merkaartor: updated spell to 0.17.0

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

    video/vlc: added optional dependency on libass

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

    libs/cwiid: new spell, a userspace driver for the wiimote

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

    video-libs/libass: new spell, a subtitle rendering library

commit 4d30d0baea8f64b50ee52e5a169c18412d442b41
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ruby-1.9 1.9.2-p136

commit e81f419b77092085ce7410fad9ba37759b3341e2
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    sbcl: => 1.0.45

commit 9dc7444f871711f3b24fb20f018ccf4890d069c3
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libtiger 0.3.4

commit 3797ffe2ce9077a6b66a4b05cb928b9a446a5296
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    security/ssdeep: new spell, for context triggered piecewise hashes

commit 4f035ded8d045e760ef1560fbbfedce2d821f223
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    security/phash: new spell, perceptual hash library

commit 0242f8d154552ea1ad6bd97c1eeb4300387336c1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    cimg 1.4.6

commit 546b6a618c0a6e8b3327ad1efa086b5e6edc48aa
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libsigsegv 2.9

commit ec4e54023f77eb369fb534b498517ced7591675c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    uget: => 1.6.2

commit a71499a020af04af174877acc502c764af3707f4
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    terminus-font: => 4.32

commit 3e0ee94e94c2c4d6bed17aa84840f791d0efff9d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ruby-1.8: => 1.8.7-p330

commit 844d8aa5347277ae074a71258ea37dc59ef86cf3
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    windowmanagers/awesome: version 3.4.8

commit 96994cd75dded3bb8314198bc75127ca5818f703
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pyqt4: => 4.8.2

commit 5c51af746be5f807c94c7c9ccfd27b6a9372c464
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sip: => 4.12

commit 7b6ecf10094c16a5e444d4e43acd134922bc0ebc
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wine 1.3.10

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

    utils/unetbootin: version 494

commit 78b5af17b37f66718fa7924a417f7b3a4cafd2e7
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/syslinux: version 4.03

commit 10b39a182a6b1b167d759c798096676e9bfdec91
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    epiphany: Updated devel to version 2.91.4.1

commit de3aa1c347c52de4ec0a6bfaf2c1d48769faec8c
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk3: Updated to version 1.3.9

commit 6fbea0ecdb6ef916ac153172313354db051fd179
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+3: Updated to version 2.91.7

commit cfd866d1debc1ab1e4a7bbe64e912cf853d4242c
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    glib2: Updated devel to version 2.27.5

commit 87d0a85de8a4cac269c3864b92c93237373840f2
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk: Updated devel to version 1.3.9

commit b827c7187c793191f91b16d0910902dda10b5356
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    brlcad: update spell to 7.18.0

commit 687a089268be882f555949b3a4e563f8b738bf9b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libraw 0.12.1, added LibRaw-demosaic-pack-GPL{2,3}
    
    seems shotwell need 0.10.0 version during compiling (static lib)

commit 3e58222c7c34114a07af807b244be2efccf87c46
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    shotwell 0.8.0

commit ffd3fa286ab10bd15d766a3f50b2f77c7854795c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gexiv2 0.2.2
    
    seems gexiv2 has problem with new exiv2, exiv2 0.20 is OK
    
    2010-12-01 Treeve Jelbert <treeve at sourcemage.org>
            * DETAILS: version 0.21
            * UP_TRIGGERS: update old .so version

commit 115e67169d155dc0dae393aefe175b2ddd767c35
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    ftp-libs/dclib: added openssl dependency and patch to build with its 1.0 branch

commit f0710315e95c1e93f628ff7e86a12d04d1f06b75
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    compiz-fusion/emerald: more fixes for compiling with gtk

commit 9fc2d80351a13533152d9fd0f8d2ed0258a2fdd7
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    xorg-apps/compiz: added PRE_BUILD to fix compiling with gtk

commit 25f3e6202d771f5bafe1ce03cb4643a12bdd4876
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    e2fsprogs 1.41.14

commit 3f012e6f46b8207840d2d2cc2fa82b6f3df2a2db
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mongo: => 1.1.0

commit 7357905cfe9ba36eb6a4d160a1bd1ee2f74e71a0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dovecot: fixed storage engines

commit ab187067917ed35a6e3d5934418f02c3653ccd58
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    openipmi: Removed UPDATED

commit f5c26c8e22a4678f97f3cc96788c2e9b3fa31c42
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    openipmi: Cleanup formatting

commit e3405c5fb7c9dc17911d8d859d2c813b4633cb5f
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    openipmi: Updated to 2.0.18
    Fails with multiple make jobs

commit 79210f0f6a1fd3f0950e043b74d635b7e1327e2d
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    netatalk: Updated to version 2.1.5

commit bca372ea38757549719e973696c822bc054f0ad1
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    imagemagick: Updated to version 6.6.6-6

commit 955bafd9d651b948c8646f633f37c364eb787f87
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    firefox: Updated devel to version 4.0b8

commit 9f6e00e9f2dd3a398bf541cd0b698272b2499e77
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mongodb: => 1.6.5

commit 96b518a8baa95f772dbca65507d8a2db11ce332d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    dbus 1.4.1, SECURITY_PATCH=6, CVE-2010-4352

commit fe086747258eed05c6241e02b57001efc0ffebb5
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gitslave: => 1.2

commit 08d745c4dd1443016bba9582b2ccd93721c2cb97
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    soundtouch: actually deleting the sig

commit 8b4469225dc541032a58f0bba1bcace2d30ab8cb
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    soundtouch: disable assembly code on x86-64 as it still yields instant segfault

commit 22c7d87c2464a3373b3ba81045767e7db5e0675f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    lvm 2.02.79

commit 2c946f9036918bcb4fea8dff33b9c28d33113840
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    psycopg2: => 2.3.2

commit 3a694a25001026b09aea5317cd0994ec05f4553a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    guile 1.8.8

commit a73ac3ed9d3fcba866a20d3069b26dda29905d40
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    digikam4 1.7.0

commit 9a02500e1be71e22cd3af3fee3e0004bd6bb2987
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    linux-firmware 20101218

commit 999f3aa2e65314aa51999de276be417855f9cbcf
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    kipi-plugins4 1.7.0

commit cbd554b25d3f5a34d766f4c06f5781ae790689e6
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kvm: updated spell to 0.13.0

commit 23df8ae0cb204edf88f921d964245d9294e0ca5c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libkate 0.3.8

commit 7704357e62769278bb9cbcc2ffd18b2159364822
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pidgin 2.7.8

commit 30d86a53e10aca849857b420e474b0bfeda15302
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    calibre: update to 0.7.34

commit 6fd4471ba7aab9c819ea7d72c7ce87d13b098641
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libraw1394 2.0.6

commit 7867aca2b4f454d0db0b16d00de07ed48b8444b6
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    f-spot 0.8.2

commit b7571fbf2f73ff6984e9780ac420a8a119d6e530
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libogg 1.2.2

commit 262ecaa203315aca7980d6a83cfe2bdb992a7e4a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    php 5.2.16, SECURITY_PATCH++

commit e5d84b66896e27acaccaae5300dd64103467caed
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    sqlite 3.7.4 (3070400)

commit 3c5a793989cc28378c60c4a286ccfc9cd590a06d
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk: Updated devel to version 1.3.7

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

    libs/lasi: new spell, a C++ stream library for generating postscript

commit 0fa1321777278c24687a3346ade5126eca59e48a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    libdbusmenu-qt: updated spell to 0.6.6

commit 433b3d2e669dd50875b2063cc793d3817d0a3889
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sqlkit: => 0.9.2

commit 234aec67d55865209103d1e23f83e82c98f38c6b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pyside: => qt4.7+1.0.0~beta2

commit f84d070cb9fae66c31c1f826e3a15e3c9341527a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    shiboken: => 1.0.0~beta2

commit 88c8f94a2c6951f038d2c38d861a4b55849edb8e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    apiextractor: => 0.9.1

commit 744378f18695bd7dc8badb73560a65aaa47a178f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    telepathy-logger 0.1.7

commit 3d4beeac42fc99dcc3934a63362c3cad993a618b
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    proftpd: Updated to version 1.3.3d

commit 10a41f69a9a5acf52b27a80906db61a91f87b97b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    exim: properly handle pidfile

commit a4a365d362e6653c4a042e52a88ebfdf3b34c29a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    tdb: moved from libs to database section

commit ebfab29461b802538594ac8c050c3f9d9280e8eb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    tdb: => 1.2.7

commit bd1246596d59442a8cf4fa69440e84937766f702
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    aria2: updated spell to 1.10.8

commit b16c615068aa38cc6d86f7e0a5384b9dca7c6bb5
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    epiphany: Updated devel to version 2.91.2.1

commit 5d2ce29264bba14d984be5ff9c3f7cf7f6dbeaec
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk3: Added back optional_depends gobject-introspection

commit 452645aab58aeb349805cea484c45b52038aa435
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk3: Updated to version 1.3.7

commit 885976fbd60312f05dcf239e3dc2e80a8ba32458
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+3: Updated to version 2.91.5

commit 69845efc292a0cfd3f5ca8297a6e7a3c2227c847
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    softflowd: added suggest dep NETFLOW-COLLECTOR

commit c820e7188d6baffb5c8ca75634d5eefa2e9bcef4
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    flow-tools: provides NETFLOW-COLLECTOR

commit 0a123934874f5a3010b8239b2f7b1d18becdaddf
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    flowd: provides NETFLOW-COLLECTOR

commit 6a9edfb6e6e5b544759aa86cf99df74fe12a578e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    in wordwrap we trust

commit b972c4c7cf19223dabe572c4d43e3f3f53692de8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    flow-tools: new spell, library and tools to collect and store NetFlow data

commit daa432b4de855f781715850ae60b78f87f287820
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mongodb: use PIDFILE var in the init script

commit 79eec233eb6d10cc9bb12f9fc2ea3fea044bba9e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    snmpd: use PIDFILE var in the init script

commit e88a88a83efef2504f50e224fd37cdccfb98bc08
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    papyon 0.5.4

commit 8288103d6696f445b8d2126b6c9a4b6d499be07f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    telepathy-butterfly 0.5.15

commit 45ecf8fa4dfd6c80e1b69dcdde00adb7efce9387
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    telepathy-glib 0.12.6

commit d0e1b0d1cbe9fe4e47525d3fa5274f9656092f32
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nginx: added graceful reload

commit 09ea3537017ed0a7cd7d2c0405d42e60c4954790
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    qemu: added 0.13 branch

commit 54b1bdebebc5adaca5d62c6ad9d7c99c50fa2ff9
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dovecot: update to 2.0.8

commit f5d516affa1d92519acc374d415861c7871fd164
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    aqemu: depends on QEMU provider

commit 034a64bb4c520499090cd953be874341cbdaebd7
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    chemtool: updated spell to 1.6.12

commit 748346ecb615b884529bbbf74b5e9a48eb7b22c4
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libquicktime 1.2.1

commit 55cf8ea27ed51823b184f2b768b4760d07c9b480
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bzrtools: => 2.2.0

commit a4a6b7f8f04166c31a50034dd39a019448f60236
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    bzr: => 2.2.2

commit d717228e71a607218ae956b7895d1164743ba096
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    usbutils 001

commit 9eef409c7a8d4d038a1813e39bafe2a07dff8d54
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    audacious-plugins 2.4.2

commit 0041a467144848a49eec97e27f3b16d1576f0f33
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    audacious 2.4.2

commit e7135fda8af3b6e3024877c834b6449561bcc9f2
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    iotop 0.4.2

commit 70a154a78335df509cb73a011d0c0aabe28156b0
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    udev 165

commit 26d0bfed28cb4e070f3cb229f5ab3bc8ca1530a1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libx11: Revert header-breaking commit, fixes Bug #15921
    
    Revert this commit to upstream libx11, which at least breaks perl-tk:
    commit d0cbf388919364fe6b5b9127f36426eb744090a0
    Author: Jeremy Huddleston <jeremyhu at apple.com>
    Date:   Sun Sep 26 21:21:16 2010 -0700
    
        Add an "X11_" string to header guards to avoid possible collision
    
        This addresses a build failure which can result from <X11/Xlocale.h> and
        <xlocale.h> being included in the same code since they both used the same
        _XLOCALE_H_ protection.
    
        Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

commit a5584dc6f9dd984e30c5dbb20137cd59954a5a4a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libexif: => 0.6.20

commit 7e84b36927f2e24f940a7787f600da317af6f6a3
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libpqxx: => 3.1

commit 6e7a9a51c3d02cc2aecb6bba1e8a492e4ea65817
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    git 1.7.3.4, SECURITY_PATCH=1

commit 2f7fb13b293a8b17e78461a545e6f909be16394b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    curl 7.21.3

commit e06016854827b0e7291491bea7a77dbfce76c8a7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    python-mpd: => 0.3.0

commit 338b3c9e7178eb2a45e4a9b692c881b35e97dc0c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nginx: => 0.7.68

commit 7d8c6b2d148ca73e4b304c0160e76bb0e5012570
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    vym 1.12.8

commit 3e4ceac69b8c0246a529c00c4a80aff279e9b1a1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    virtualbox-module 3.2.12

commit 677dec663045523ba35dbace086a285e2a4e06aa
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    virtualbox 3.2.12

commit 4ac9fe21aa681a1a2ff92bdcb59f4213c28046a3
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    iso-codes 3.23

commit 705415501cfd1d55a63ec8a78cee778c251f48d6
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    e2fsprogs 1.41.13

commit 054a319a8af39882595dac02a5f1bc9256002fe4
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    keychain: Updated to 2.7.1

commit cc0687affa5cb7308c45a6946df3af0674543ebd
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    keychain: Cleanup formatting

commit b79a6b4e8308a6ce6fa110b33690c7550399e968
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    keychain: Updated WEB_SITE to current official (non-Gentoo) site

commit 17765708fa04f378b284295ed5b9e69c37b42d16
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gambit: new spell, complete, portable, efficient and reliable implementation of the Scheme programming language

commit 00aec6c9aa76b835345b345401cd82b3d6982d61
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    miro 3.5.1

commit be5d615c6fab96255b76fafbdcb8ab741ebe20e7
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    remmina: another version bump, just missed it

commit f73462021d975d1a2cd28312aae8b066167e3291
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    remmina: version 0.9.0 and added missing optional deps

commit f991130f122df9697e3ac87b3435574ed0ca2373
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    asunder: version 2.0 and added optional deps for wavpack and mac

commit b87312f2912e9a817589c06fecd83ee521dcaa02
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    glibc 2.12.2

commit d1c9cadc8696e0744e5e538b4771dd95f864996a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gparted 0.7.1

commit 90760ec8280ae5be86848b9ad87cf940f111e7aa
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libraw 0.12.0

commit bb9277f12db95b48b6f0d5f18c96805ff4937a6e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ccrtp 1.7.2

commit 426b349bbf4be812880ce8dfc85992eb6eed393a
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libisoburn: => 0.6.6.pl00

commit 1b56f6ab28c27b23a6826c201d920a8db93c6214
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    aqemu: updated spell to 0.8.0

commit 0d77c3a6475bed926059d523359b80320990113c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    feh 1.10.1

commit a404e3ae7e5224306fe4a3f7c32e75ba073e4bfb
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    mpg123: bump to 1.13.0

diff --git a/ChangeLog b/ChangeLog
index 02ded03..79911e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+2011-01-06 Vlad Glagolev <stealth at sourcemage.org>
+	* enrico.gpg: added key D8C850FB Nick Treleaven (ntrel)
+	  <nick.treleaven at btinternet.com>), required for geany 0.20
+
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* utils/nmon: new spell, a system monitor
+
+2011-01-04 Ladislav Hagara <hgr at vabo.cz>
+	* net/unbound: new spell, validating, recursive, caching DNS resolver
+	* accounts, groups: unbound added
+
+2011-01-03 Ladislav Hagara <hgr at vabo.cz>
+	* archive/makeself: new spell, make self-extractable archives
+
+2011-01-03 Vlad Glagolev <stealth at sourcemage.org>
+	* x11/gtk-theme-switch: moved from gnome1-libs section
+
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* gnu-verified.gpg: added key 000BEEEE, Jim Meyering's new key,
+	  signed by his key D333CBA1 we have already had in this keyring
+
+2010-12-31 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* haskell/haskell-x11-xft: new spell, haskell bindings for libxft and libxrender
+
+2010-12-30 Ladislav Hagara <hgr at vabo.cz>
+	* security/scrub: new spell, disk overwrite utility
+
+2010-12-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* wm-addons/procmeter: new spell, a user information display and system status monitor
+
+2010-12-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* fonts-x11/ubuntu-font-family: new spell, a free sans-serif font
+
+2010-12-29 Vlad Glagolev <stealth at sourcemage.org>
+	* mail/clamsmtp: new spell, SMTP virus filter
+	* perl-cpan/io-multiplex: new spell, Perl module to manage IO on many
+	  file handles
+	* mail/postgrey: new spell, Postfix policy server implementing
+	  greylisting
+
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* haskell/haskell-utf8-string: new spell, support for reading and writing
+	  utf8 strings
+
+2010-12-27 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* science/plplot: new spell, a plotting library with bindings
+	  for many programming languages
+
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* ruby-raa/ruby-pkg-config: new spell, pkg-config implementation by Ruby
+
+2010-12-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* video-libs/libass: new spell, a subtitle rendering library
+	* libs/cwiid: new spell, a userspace driver for the wiimote
+	* video/xbmc: new spell, a media player and media center
+
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* security/phash: new spell, perceptual hash library
+	* security/ssdeep: new spell, for context triggered piecewise hashes
+
+2010-12-19 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* libs/lasi: new spell, a C++ stream library for generating postscript
+	  documents
+
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* database/tdb: moved from libs
+
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* net/flow-tools: new spell, library and tools to collect and store
+	  NetFlow data
+
+2010-12-14 Ismael Luceno <ismael at sourcemage.org>
+	* devel/gambit: new spell, complete, portable, efficient and reliable
+	  implementation of the Scheme programming language
+
 2010-12-11 Thomas Orgis <sobukus at sourcemage.org>
 	* audio-creation/rakarrack: new spell, guitar amp & effects
 
diff --git a/FUNCTIONS b/FUNCTIONS
index 5f7a089..6e26adc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -719,3 +719,4 @@ fi
 }
 
 . $GRIMOIRE/glselect.function
+. $GRIMOIRE/bzr_download.function
diff --git a/VERSION b/VERSION
index ed9db5f..487f535 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.52-test
+0.53-test
diff --git a/accounts b/accounts
index efcd153..5594424 100755
--- a/accounts
+++ b/accounts
@@ -90,4 +90,5 @@ puppet:181:181
 prosody:182:182
 dovenull:183:183
 mongodb:184:185
+unbound:185:186
 nobody:65534:65534
diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS
index 8e16c85..22abec4 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libarchive
-         VERSION=2.8.3
-     SOURCE_HASH=sha512:2fb6893ee1409f2d47546b2e42d14deb2faadf21d8c180b85065420ca8f86598793291de0843fff57c5410aa1b3077cf5f32a89cd413cd95594c9141db3a8ecd
+         VERSION=2.8.4
+     SOURCE_HASH=sha512:f4248f7b8d93e25e3223afe0c3b19467ab9071f9fd0a341dae0b6da028c13af46b768b95c2a86fba92dda93df5d1b410996978ea9e74f32d6d18a0afb68faa7f
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libarchive.googlecode.com/files/$SOURCE
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index 40f6df8..83bb5c5 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,6 @@
+2010-12-31 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.8.4
+
 2010-06-24 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: added, for optional openssl
 
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index d16c277..7e0729f 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,6 +1,6 @@
            SPELL=zlib
          VERSION=1.2.5
-      PATCHLEVEL=0
+      PATCHLEVEL=1
      SOURCE_HASH=sha512:88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 4c69200..79ad89e 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,10 @@
+2011-01-09 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Add patch from LFS
+	  http://www.linuxfromscratch.org/lfs/view/stable/chapter06/zlib.html
+	* UP_TRIGGERS: Added to rebuild level 1 depends if old header
+	  is installed
+
 2010-04-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.5
 
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 6db4d60..5685f17 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -3,5 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
 
 patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" &&
 
+sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h &&
+
 mk_source_dir "$SOURCE_DIRECTORY.static" &&
 cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
diff --git a/archive-libs/zlib/UP_TRIGGERS b/archive-libs/zlib/UP_TRIGGERS
new file mode 100755
index 0000000..cacaeab
--- /dev/null
+++ b/archive-libs/zlib/UP_TRIGGERS
@@ -0,0 +1,11 @@
+# run if unpatched zlib.h is found
+
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${OLD_SPELL_VERSION}" == "1.2.5" ]; then
+  if grep -q "ifdef _LARGEFILE64_SOURCE" $INSTALL_ROOT/usr/include/zlib.h; then
+     for each in $(show_up_depends $SPELL 1); do
+     up_trigger $each cast_self
+     done
+ fi
+fi
diff --git a/archive/makeself/BUILD b/archive/makeself/BUILD
new file mode 100755
index 0000000..e69de29
diff --git a/archive/makeself/DETAILS b/archive/makeself/DETAILS
new file mode 100755
index 0000000..e8631d2
--- /dev/null
+++ b/archive/makeself/DETAILS
@@ -0,0 +1,31 @@
+           SPELL=makeself
+         VERSION=2.1.5
+          SOURCE=$SPELL-$VERSION.run
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://megastep.org/makeself/$SOURCE
+     SOURCE_HASH=sha512:c556770deea504573c50bc7c15340ed91c65d372e93c47dfc10fd6e8265b2462842da12b36898d4291cbac9e954ec12f2f6972bcf40e97ed82dbd22af21d3a91
+        WEB_SITE=http://megastep.org/makeself/
+         ENTERED=20110103
+      LICENSE[0]=GPL
+           SHORT="make self-extractable archives on Unix"
+cat << EOF
+makeself.sh is a small shell script that generates a self-extractable tar.gz
+archive from a directory. The resulting file appears as a shell script (many of
+those have a .run suffix), and can be launched as is. The archive will then
+uncompress itself to a temporary directory and an optional arbitrary command
+will be executed (for example an installation script). This is pretty similar to
+archives generated with WinZip Self-Extractor in the Windows world. Makeself
+archives also include checksums for integrity self-validation (CRC and/or MD5
+checksums).
+
+The makeself.sh script itself is used only to create the archives from a
+directory of files. The resultant archive is actually a compressed (using gzip,
+bzip2, or compress) TAR archive, with a small shell script stub at the
+beginning. This small stub performs all the steps of extracting the files,
+running the embedded command, and removing the temporary files when it's all
+over. All what the user has to do to install the software contained in such an
+archive is to "run" the archive, i.e sh nice-software.run. I recommend using the
+"run" (which was introduced by some Makeself archives released by Loki Software)
+or "sh" suffix for such archives not to confuse the users, since they know it's
+actually shell scripts (with quite a lot of binary data attached to it though!).
+EOF
diff --git a/archive/makeself/HISTORY b/archive/makeself/HISTORY
new file mode 100644
index 0000000..8b7a8c3
--- /dev/null
+++ b/archive/makeself/HISTORY
@@ -0,0 +1,4 @@
+2011-01-03 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, PRE_BUILD, BUILD, INSTALL: spell created, version 2.1.5
+
+
diff --git a/archive/makeself/INSTALL b/archive/makeself/INSTALL
new file mode 100755
index 0000000..27c7b94
--- /dev/null
+++ b/archive/makeself/INSTALL
@@ -0,0 +1,6 @@
+cd $SPELL-$VERSION &&
+
+install -v -m 755 makeself.sh $INSTALL_ROOT/usr/bin/makeself  &&
+install -v -d -m 755 $INSTALL_ROOT/usr/share/makeself &&
+install -v -m 755 makeself-header.sh $INSTALL_ROOT/usr/share/makeself/makeself-header  &&
+install -v -m 644 makeself.1 $INSTALL_ROOT/usr/share/man/man1
diff --git a/archive/makeself/PRE_BUILD b/archive/makeself/PRE_BUILD
new file mode 100755
index 0000000..e74ab6d
--- /dev/null
+++ b/archive/makeself/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cp $SOURCE_CACHE/$SOURCE . &&
+/bin/bash $SOURCE &&
+sed -i "s:^HEADER=.*:HEADER=$INSTALL_ROOT/usr/share/makeself/makeself-header:" $SPELL-$VERSION/makeself.sh
diff --git a/audio-libs/ladspa/BUILD b/audio-libs/ladspa/BUILD
index c8c2fef..454495e 100755
--- a/audio-libs/ladspa/BUILD
+++ b/audio-libs/ladspa/BUILD
@@ -1,6 +1,6 @@
 if [ "$LADSPA_SDK" == "y" ]; then
   cd $SOURCE_DIRECTORY/src  &&
-  make
+  make CFLAGS="\$(INCLUDES) $CFLAGS"
 else
    true
 fi
diff --git a/audio-libs/ladspa/HISTORY b/audio-libs/ladspa/HISTORY
index f83bbe0..1fb69c9 100644
--- a/audio-libs/ladspa/HISTORY
+++ b/audio-libs/ladspa/HISTORY
@@ -1,3 +1,6 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: use CFLAGS
+
 2010-12-10 Robin Cook <rcook at wyrms.net>
 	* DETAILS: changed SOURCE to actual source file
 	  changed SOURCE_URL to the actual source file
diff --git a/audio-libs/libkate/DETAILS b/audio-libs/libkate/DETAILS
index 1f1a3a0..63b563f 100755
--- a/audio-libs/libkate/DETAILS
+++ b/audio-libs/libkate/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libkate
-         VERSION=0.3.7
+         VERSION=0.3.8
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://libkate.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:4a9f123c271ac8e4df12ea0205160418fb9312a428894f18c8219c1f6569de1bd6ef233972ae3d2ee8ed25bb75a3c8868834ed945b308b0dbf469433c384f16b
+     SOURCE_HASH=sha512:d5bfcfa66423f4859490c7c03f4b40dcc4f092801cc16d586648da8af1e50d3f78e0f2568bb05d335ac33a061a49faa7b930633c84cb5626998855dd6f34f7d8
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://libkate.googlecode.com/
       LICENSE[0]=BSD
diff --git a/audio-libs/libkate/HISTORY b/audio-libs/libkate/HISTORY
index 9381a82..465ce69 100644
--- a/audio-libs/libkate/HISTORY
+++ b/audio-libs/libkate/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.3.8
+
 2009-11-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.3.7
 
diff --git a/audio-libs/libogg/DETAILS b/audio-libs/libogg/DETAILS
index ef63b1a..b6d8779 100755
--- a/audio-libs/libogg/DETAILS
+++ b/audio-libs/libogg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libogg
-         VERSION=1.2.1
-     SOURCE_HASH=sha512:5db9730722a758dd4286bc9ffc4c072acc39a6bcb19c40abb11fc63c86b7b927a5b075070a9e7c6c9ad305386145c55c6548b5b8728eb841011b5a5050ddd355
+         VERSION=1.2.2
+     SOURCE_HASH=sha512:3a342efd05dd0a8c55a149c9de5d8e6327d1e9bc822ab0ccefae05737ddb9a5027bec56487f7fcab935c218c6fb185c6c7c07d15d69f6b098d4d7e43e95085bb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://downloads.xiph.org/releases/ogg/$SOURCE
diff --git a/audio-libs/libogg/HISTORY b/audio-libs/libogg/HISTORY
index 4555488..35872fc 100644
--- a/audio-libs/libogg/HISTORY
+++ b/audio-libs/libogg/HISTORY
@@ -1,3 +1,6 @@
+2010-12-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.2
+
 2010-11-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.1
 
diff --git a/audio-libs/libsamplerate/DETAILS b/audio-libs/libsamplerate/DETAILS
index 449f774..cc2fa03 100755
--- a/audio-libs/libsamplerate/DETAILS
+++ b/audio-libs/libsamplerate/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libsamplerate
          VERSION=0.1.7
-     SOURCE_HASH=sha512:462cf7339fe9907fa3bec49df4fb7edf722bd82dce70c96a61b4ed3837a9b0691ab13dc8c7b98696223d53791cba3642b7fc584923b3dc37e7be83f1159ac074
+     SOURCE_HASH=sha512:3ef59ae55f594e037e26b62d85fe81476122d11fec9c94952ef817dd48192909279c45915ca35350b967ff6b9a8687b4394e070b78d97cd7dfe7181886d8b427
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.mega-nerd.com/SRC/$SOURCE
diff --git a/audio-libs/libsamplerate/HISTORY b/audio-libs/libsamplerate/HISTORY
index b600321..89c1840 100644
--- a/audio-libs/libsamplerate/HISTORY
+++ b/audio-libs/libsamplerate/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated upstream tarball
+
 2009-02-15 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.1.7
 
diff --git a/audio-libs/libtiger/DETAILS b/audio-libs/libtiger/DETAILS
index 1ebcc99..5aafc46 100755
--- a/audio-libs/libtiger/DETAILS
+++ b/audio-libs/libtiger/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libtiger
-         VERSION=0.3.3
+         VERSION=0.3.4
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://libtiger.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:de0ea38e46b32aaf1886efcca67757814832945e8fb08d1f129d1cfaa581c5965a309ad9f69e8e6c7cb6a8e9f84988599fbebd8aa7be28c063d1193b52cf6cc0
+     SOURCE_HASH=sha512:559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://code.google.com/p/libtiger/
       LICENSE[0]=LGPL
diff --git a/audio-libs/libtiger/HISTORY b/audio-libs/libtiger/HISTORY
index 45d74e8..edf6360 100644
--- a/audio-libs/libtiger/HISTORY
+++ b/audio-libs/libtiger/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.3.4
+
 2009-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS: spell created, version 0.3.3
 
diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index b51ebab..28dce2b 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -1,6 +1,6 @@
            SPELL=soundtouch
          VERSION=1.5.0
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=$SPELL-$VERSION.tar.gz
      SOURCE_HASH=sha512:22725c62fd977657392dc9984b064a6d9d027bb3b9a32f3e149a276a08bf27210856ec3d1de13f5795cdf96f80da93b09416082e414ebdd5edc836a440bd1f32
    SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 8431dd0..b396ead 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,7 @@
+2010-12-21 Thomas Orgis <sobukus at sourcemage.org>
+	* soundtouch-1.5.0-x86_64-asm-broken.patch, PRE_BUILD:
+	  disable asm code on x86-64. It just segfaults.
+
 2010-09-12 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: bump to 1.5.0 (needed to make it work on x86-64)
 	* soundtouch-1.4.0.tar.gz.sig: removed, switch to hash sum
diff --git a/audio-libs/soundtouch/PRE_BUILD b/audio-libs/soundtouch/PRE_BUILD
index 4030189..ed29005 100755
--- a/audio-libs/soundtouch/PRE_BUILD
+++ b/audio-libs/soundtouch/PRE_BUILD
@@ -1,5 +1,9 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Assembly code still broken on x86-64 ... instant segfault.
+# Got this patch idea from the ArchLinux folks.
+patch -Np0 < "$SCRIPT_DIRECTORY/soundtouch-1.5.0-x86_64-asm-broken.patch" &&
 
 sed -i "s:COPYING.TXT README.html:README.html\npkgdocdir=\$(datadir)/doc/soundtouch:" \
   Makefile.am &&
diff --git a/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig b/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig
deleted file mode 100644
index df8b1e0..0000000
Binary files a/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig and /dev/null differ
diff --git a/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch b/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch
new file mode 100644
index 0000000..07c6848
--- /dev/null
+++ b/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch
@@ -0,0 +1,11 @@
+--- include/STTypes.h.orig	2010-12-21 09:52:30.000000000 +0100
++++ include/STTypes.h	2010-12-21 09:52:36.000000000 +0100
+@@ -87,7 +87,7 @@ namespace soundtouch
+  
+  #endif
+ 
+-    #if (WIN32 || __i386__ || __x86_64__)
++    #if (WIN32 || __i386__)
+         /// Define this to allow X86-specific assembler/intrinsic optimizations. 
+         /// Notice that library contains also usual C++ versions of each of these
+         /// these routines, so if you're having difficulties getting the optimized 
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index 85aeb01..00057a8 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,8 +1,8 @@
            SPELL=audacious
-         VERSION=2.4.1
+         VERSION=2.4.2
           SOURCE=${SPELL}-${VERSION}.tgz
    SOURCE_URL[0]=http://distfiles.atheme.org/${SOURCE}
-      SOURCE_HASH=sha512:0d33d7b65532d5843c4627159dd5b6511b9a31e6dc1c6ec057bb13c2cbad7bf955e92c9e781a7af0f60aebb5e728bb96a992aef5ca07deee45a3811f1b77127e
+      SOURCE_HASH=sha512:217acab269f5f3e84c322e92bb8d234a316ad90f0e78095e184a4de8f2f8e689d6e9708e6aa62843d999a4d2302b18e0fadcccdee9411cdf581673e6f976f5bb
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE="http://audacious-media-player.org"
       LICENSE[0]=GPL
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index d4fbbef..3514720 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,6 @@
+2010-12-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.2
+
 2010-11-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.1
 
diff --git a/audio-players/guimup/HISTORY b/audio-players/guimup/HISTORY
index 4eb0401..c66efab 100644
--- a/audio-players/guimup/HISTORY
+++ b/audio-players/guimup/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* guimup.desktop: added spanish comment
+
 2010-04-24 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.2.1; fixed website and source url
 	* DEPENDS: added libsoup
diff --git a/audio-players/guimup/desktop/guimup.desktop b/audio-players/guimup/desktop/guimup.desktop
index fd1e01e..c13ad5c 100644
--- a/audio-players/guimup/desktop/guimup.desktop
+++ b/audio-players/guimup/desktop/guimup.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Guimup
-Comment=GTK+ frontend for the mpd daemon
+Comment=GTK+ frontend for mpd
+Comment[es]=Interfaz GTK+ para mpd
 Exec=guimup
 Terminal=false
 Type=Application
diff --git a/audio-players/gxmms2/HISTORY b/audio-players/gxmms2/HISTORY
index 9a3172e..40ee758 100644
--- a/audio-players/gxmms2/HISTORY
+++ b/audio-players/gxmms2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* gxmms2.desktop: added spanish generic name and comment
+
 2007-11-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 0.7.0, fallback is always release
 	* PRE_BUILD: minor cleanup
diff --git a/audio-players/gxmms2/desktop/gxmms2.desktop b/audio-players/gxmms2/desktop/gxmms2.desktop
index e840c46..2ab98f9 100644
--- a/audio-players/gxmms2/desktop/gxmms2.desktop
+++ b/audio-players/gxmms2/desktop/gxmms2.desktop
@@ -2,8 +2,10 @@
 Encoding=UTF-8
 Name=Gxmms2
 GenericName=Music Player
+GenericName[es]=Reproductor de música
 Exec=gxmms2
 Comment=Listen to, browse, or edit your audio collection
+Comment[es]=Escuche, navegue, o edite su colección de audio
 Icon=
 Terminal=false
 Type=Application
diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index 0dc6fef..cc18974 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -4,5 +4,6 @@ fi &&
 if [[ "$MPG123_SEEKTABLE" != "" ]]; then
   OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS" 
 fi &&
-OPTS="$MPG123_MODULES $OPTS" &&
+# Use .so for modules so it is safe to rip out the .la files.
+OPTS="$MPG123_MODULES --with-module-suffix=.so $OPTS" &&
 default_build
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index edea3c3..21233aa 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mpg123
-         VERSION=1.12.5
+         VERSION=1.13.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 369282b..6309fb4 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,13 @@
+2011-01-07 Thomas Orgis <sobukus at sourcemage.org>
+	* BUILD: Use the .so files directly for module loading.
+	  Now, mpg123 will still work if .la files are removed post-install.
+
+2011-01-06 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: Update to 1.13.1
+
+2010-12-13 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: Update to 1.13.0
+
 2010-10-07 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: Update to 1.12.5
 
diff --git a/audio-players/qmpdclient/HISTORY b/audio-players/qmpdclient/HISTORY
index 7100e64..aedea95 100644
--- a/audio-players/qmpdclient/HISTORY
+++ b/audio-players/qmpdclient/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* qmpdclient.desktop: added generic name and spanish comment
+
 2009-12-11 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 1.1.2
 
diff --git a/audio-players/qmpdclient/desktop/qmpdclient.desktop b/audio-players/qmpdclient/desktop/qmpdclient.desktop
index 9a6359e..c9ae7b2 100644
--- a/audio-players/qmpdclient/desktop/qmpdclient.desktop
+++ b/audio-players/qmpdclient/desktop/qmpdclient.desktop
@@ -4,7 +4,10 @@ Version=1.0.7
 Name=qmpdclient
 Type=Application
 Comment=an easy to use MPD client written in Qt 4
+Comment[es]=Un cliente para MPD fácil de usar, escrito en Qt 4
 Exec=qmpdclient
 Icon=qmpdclient128.png
 Categories=Application;Multimedia;Audio;
 Term=
+GenericName=Music player
+GenericName[es]=Reproductor de música
diff --git a/audio-players/quimup/HISTORY b/audio-players/quimup/HISTORY
index 1b53a7d..36dd04d 100644
--- a/audio-players/quimup/HISTORY
+++ b/audio-players/quimup/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* quimup.desktop: added generic name and spanish comment
+
 2010-10-29 Bor Kraljič <pyrobor at ver.si>
 	* DOWNLOAD: removed, no longer needed
 
diff --git a/audio-players/quimup/desktop/quimup.desktop b/audio-players/quimup/desktop/quimup.desktop
index 1601555..d08b801 100644
--- a/audio-players/quimup/desktop/quimup.desktop
+++ b/audio-players/quimup/desktop/quimup.desktop
@@ -1,9 +1,12 @@
 [Desktop Entry]
 Name=Quimup
 Comment=A client for the Music Player Daemon (MPD).
+Comment[es]=Un cliente para el Music Player Daemon (MPD).
 Exec=quimup
 Terminal=false
 Type=Application
 Icon=quimup
 Categories=AudioVideo;Player;
 StartupNotify=true
+GenericName=Music player
+GenericName[es]=Reproductor de música
diff --git a/audio-plugins/audacious-plugins/DETAILS b/audio-plugins/audacious-plugins/DETAILS
index fc54e40..af9dde0 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,8 +1,8 @@
            SPELL=audacious-plugins
-         VERSION=2.4.1
+         VERSION=2.4.2
           SOURCE=${SPELL}-${VERSION}.tgz
    SOURCE_URL[0]=http://distfiles.atheme.org/${SOURCE}
-      SOURCE_HASH=sha512:f828299639a2632e8144f558973c9617d7a72989191a92efc7cb915b30141f94f4b71f0807c5f45e183d48643364fb8fd449eb9b8326ae91b136e1a0222080a2
+      SOURCE_HASH=sha512:69b27ee726cfbc3f89f03b379ad6687e4490e3a860422887270d2b6c6a9847bee5bb5f1e1d8ffdb3ccf306c4db2d1601c47b2f67de3dfeb6c409fcf3bc3f82e6
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE="http://audacious-media-player.org"
       LICENSE[0]=GPL
diff --git a/audio-plugins/audacious-plugins/HISTORY b/audio-plugins/audacious-plugins/HISTORY
index 14c9032..7d78a24 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-12-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.2
+
 2010-11-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.1
 
diff --git a/audio-soft/asunder/DEPENDS b/audio-soft/asunder/DEPENDS
index 2e5964f..42bf89f 100755
--- a/audio-soft/asunder/DEPENDS
+++ b/audio-soft/asunder/DEPENDS
@@ -4,4 +4,6 @@ depends libcddb &&
 
 optional_depends lame "" "" "for mp3 encoding support" &&
 optional_depends flac "" "" "for FLAC encoding support" &&
-optional_depends vorbis-tools "" "" "for Ogg Vorbis encoding support" 
+optional_depends vorbis-tools "" "" "for Ogg Vorbis encoding support" &&
+optional_depends wavpack "" "" "for WavPack encoding support" && 
+optional_depends mac "" "" "for Monkey's Audio encoding support" 
diff --git a/audio-soft/asunder/DETAILS b/audio-soft/asunder/DETAILS
index 35101c9..60a5e63 100755
--- a/audio-soft/asunder/DETAILS
+++ b/audio-soft/asunder/DETAILS
@@ -1,8 +1,8 @@
            SPELL=asunder
-         VERSION=1.9.1
+         VERSION=2.0
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://littlesvr.ca/$SPELL/releases/$SOURCE
-     SOURCE_HASH=sha512:48d383f2ed82390981c06f2fc4a717219990c40b9274bd81d6a01ccb067253b2dea2647b5e091038bbe1ecbb2924dc999540a1d9a7c0421fed4e1abf9750ff0c
+     SOURCE_HASH=sha512:46503e4d1276c973d4d27c7d4017ed86ad13b104f7271ccdb3a1058b567d55d6f0c885eb76e5918ed00f60688181b8f48191b3ac3636fae06561387fcfb1ea2b
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://littlesvr.ca/asunder/
       LICENSE[0]=GPL
diff --git a/audio-soft/asunder/HISTORY b/audio-soft/asunder/HISTORY
index bf32fce..bc6290c 100644
--- a/audio-soft/asunder/HISTORY
+++ b/audio-soft/asunder/HISTORY
@@ -1,3 +1,7 @@
+2010-12-14 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 2.0
+	* DEPENDS: added dependencies on wavpack and mac
+
 2009-12-18 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.9.1
 
diff --git a/bzr_download.function b/bzr_download.function
new file mode 100755
index 0000000..7c528c3
--- /dev/null
+++ b/bzr_download.function
@@ -0,0 +1,23 @@
+#---------------------------------------------------------------------
+## Handler for downloading from bzr URLs
+#---------------------------------------------------------------------
+function bzr_download() {
+  if file_exists $SOURCE_CACHE/$SOURCE
+  then
+    message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" &&
+    tar xjf $SOURCE_CACHE/$SOURCE &&
+    cd $SOURCE_DIRECTORY &&
+    message "${MESSAGE_COLOR}Updating...${DEFAULT_COLOR}" &&
+    echo bzr update &&
+    bzr update &&
+    cd -
+  else
+    message "${MESSAGE_COLOR}Doing a lightweight checkout...${DEFAULT_COLOR}" &&
+    echo bzr checkout --lightweight $SOURCE_URL $SOURCE_DIRECTORY &&
+    bzr checkout --lightweight $SOURCE_URL $SOURCE_DIRECTORY
+  fi &&
+
+  message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" &&
+  tar cjf $SOURCE $SOURCE_DIRECTORY &&
+  mv $SOURCE $SOURCE_CACHE
+}
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index 88b7b4e..b02cb7c 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -1,5 +1,5 @@
 depends pygtk2 &&
-depends pysqlite &&
+depends -sub SQLITE python &&
 depends intltool &&
 
 # TODO: added subdepends according to the spells
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 97e2f43..612f224 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2011-01-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: native sqlite3 module is the only allowed implementation
+
 2010-10-31 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD, py27.patch: removed, not needed anymore
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 784ea24..28cd331 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pidgin
-         VERSION=2.7.7
-  SECURITY_PATCH=6
+         VERSION=2.7.9
+  SECURITY_PATCH=7
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 9973c02..f890c70 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,9 @@
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.7.9, SECURITY_PATCH=7
+
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.7.8
+
 2010-11-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.7.7
 
diff --git a/chat-im/pidgin/pidgin-2.7.7.tar.bz2.sig b/chat-im/pidgin/pidgin-2.7.7.tar.bz2.sig
deleted file mode 100644
index 9d077a0..0000000
Binary files a/chat-im/pidgin/pidgin-2.7.7.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/pidgin/pidgin-2.7.9.tar.bz2.sig b/chat-im/pidgin/pidgin-2.7.9.tar.bz2.sig
new file mode 100644
index 0000000..5ffe2f7
Binary files /dev/null and b/chat-im/pidgin/pidgin-2.7.9.tar.bz2.sig differ
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 1084b6e..966bb90 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* irssi.desktop: added generic name and comment
+
 2010-04-03 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 0.8.15
 	  SECURITY_PATCH++
diff --git a/chat-irc/irssi/desktop/irssi.desktop b/chat-irc/irssi/desktop/irssi.desktop
index 2d51297..e6412ab 100644
--- a/chat-irc/irssi/desktop/irssi.desktop
+++ b/chat-irc/irssi/desktop/irssi.desktop
@@ -3,6 +3,10 @@ Encoding=UTF-8
 Name=Irssi
 Exec=irssi
 Icon=
+GenericName=IRC Client
+GenericName[es]=Cliente de IRC
+Comment=Terminal based IRC client
+Comment[es]=Cliente de IRC basado en terminal
 Terminal=true
 Type=Application
 Categories=Application;Network;
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index b07b6d7..b6c7fe3 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -1,10 +1,16 @@
 depends g++ &&
 
+message "NOTE: ZNC needs swig enabled for modperl support" &&
+
 optional_depends perl \
                  "--enable-perl" \
                  "--disable-perl" \
                  "to use perl" &&
 
+if is_depends_enabled $SPELL perl; then
+  depends swig '--enable-swig'
+fi &&
+
 optional_depends tcl \
                  "--enable-tcl" \
                  "--disable-tcl" \
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index aaa540c..641cc27 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,6 @@
+2011-01-09 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: swig is required for modperl support
+
 2010-11-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.096
 
diff --git a/cluster/lapack/DETAILS b/cluster/lapack/DETAILS
index 2cb8e12..a859a22 100755
--- a/cluster/lapack/DETAILS
+++ b/cluster/lapack/DETAILS
@@ -1,8 +1,8 @@
             SPELL=lapack
-          VERSION=3.2.1
+          VERSION=3.3.0
        VERSIONMAN=3.2.0
            SOURCE=$SPELL-$VERSION.tgz
-      SOURCE_HASH=sha512:a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
+      SOURCE_HASH=sha512:2265be69fd6d46aa52b7738eacc9c55505501141b3b0d1484a3851bcfa0e2b209b132880411e3a37fea2d83b6bf44e9cee65ba99a8cc0b5df285ecd5c4828754
           SOURCE2=manpages-$VERSIONMAN.tgz
      SOURCE2_HASH=sha512:111c33821bcc1158a49e0501e63e867a9c6cdfb0677eba5604e78dee4fe90c509ee447e8665e9b8f25b2e6f63923b8398c4ed8fea16f109ca9c327334e7863ff
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/cluster/lapack/HISTORY b/cluster/lapack/HISTORY
index b8c440a..83a33f7 100644
--- a/cluster/lapack/HISTORY
+++ b/cluster/lapack/HISTORY
@@ -1,3 +1,6 @@
+2010-12-27 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 3.3.0
+
 2009-05-17 Peng Chang (Charles) <chp516 at gmail.com>
 	* DETAILS: lapack 3.2.1
 	* PRE_BUILD: added -fPIC to support shared library in atlas
diff --git a/compiz-fusion/emerald/HISTORY b/compiz-fusion/emerald/HISTORY
index e552974..469381b 100644
--- a/compiz-fusion/emerald/HISTORY
+++ b/compiz-fusion/emerald/HISTORY
@@ -1,3 +1,6 @@
+2010-12-23 Pol Vinogradov <vin.public at gmail.com>
+	* gtk2.20.patch: more fixes for compiling with gtk
+
 2010-04-26 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Apply gtk2.20.patch
 	* gtk2.20.patch: Fix compilation with gtk+2 2.20 (Bug #15693)
diff --git a/compiz-fusion/emerald/gtk2.20.patch b/compiz-fusion/emerald/gtk2.20.patch
index 5da5e12..07ecf6e 100644
--- a/compiz-fusion/emerald/gtk2.20.patch
+++ b/compiz-fusion/emerald/gtk2.20.patch
@@ -20,8 +20,17 @@ diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
           gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
      } 
      else {
---- emerald-0.8.4/src/main.c.old	2010-03-29 19:49:30.420710030 -0700
-+++ emerald-0.8.4/src/main.c	2010-03-29 19:52:33.654024944 -0700
+--- emerald-0.8.4/src/main.c.old	2010-12-23 20:03:51.083703858 -0500
++++ emerald-0.8.4/src/main.c	2010-12-23 19:56:19.657703857 -0500
+@@ -2457,7 +2457,7 @@
+     gdk_error_trap_push();
+ 
+     type = None;
+-    result = XGetWindowProperty(gdk_display,
++    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ 				xwindow,
+ 				atom,
+ 				0, G_MAXLONG,
 @@ -3757,7 +3757,7 @@
  
  static void hide_tooltip(void)
@@ -31,4 +40,50 @@ diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c
  	g_get_current_time(&tooltip_last_popdown);
  
      gtk_widget_hide(tip_window);
-
+@@ -4246,10 +4246,10 @@
+     WnckWindow *win = data;
+ 
+     gdk_error_trap_push();
+-    XSetTransientForHint(gdk_display,
++    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ 			 GDK_WINDOW_XID(dialog->window),
+ 			 wnck_window_get_xid(win));
+-    XSync(gdk_display, FALSE);
++    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+     gdk_error_trap_pop();
+ }
+ 
+@@ -4262,11 +4262,11 @@
+     int format, result;
+     char *retval;
+ 
+-    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
++    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
+ 
+     gdk_error_trap_push();
+ 
+-    result = XGetWindowProperty(gdk_display,
++    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ 				xwindow, atom,
+ 				0, G_MAXLONG,
+ 				FALSE, XA_STRING, &type, &format, &nitems,
+@@ -4318,8 +4318,8 @@
+     }
+ 
+     gdk_error_trap_push();
+-    XKillClient(gdk_display, wnck_window_get_xid(win));
+-    XSync(gdk_display, FALSE);
++    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
++    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+     gdk_error_trap_pop();
+ }
+ 
+@@ -4739,7 +4739,7 @@
+ 
+ static int update_shadow(frame_settings * fs)
+ {
+-    Display *xdisplay = gdk_display;
++    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+     XRenderPictFormat *format;
+     GdkPixmap *pixmap;
+     Picture src, dst, tmp;
diff --git a/crypto/cyrus-sasl/CONFLICTS b/crypto/cyrus-sasl/CONFLICTS
new file mode 100755
index 0000000..0cf0771
--- /dev/null
+++ b/crypto/cyrus-sasl/CONFLICTS
@@ -0,0 +1 @@
+conflicts libsasl
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 258d409..a38f19e 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,7 @@
+2011-01-07 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflicts with libsasl
+	  e.g. sasl/sasl.h conflicts
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster at sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/crypto/gnupg/CONFIGURE b/crypto/gnupg/CONFIGURE
index 405cfad..ff546f6 100755
--- a/crypto/gnupg/CONFIGURE
+++ b/crypto/gnupg/CONFIGURE
@@ -1 +1 @@
-config_query GNUPG_STATIC "Build statically linked binary (required for loop-AES)?" n
+config_query GNUPG_STATIC "Build statically linked binary (required for loop-AES if you plan to encrypt root partition)?" n
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index c2a1388..692bcea 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,6 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFIGURE: more specific comment
+
 2010-10-27 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: changed {dis,en}able-curl -> with{,out}-libcurl
 
diff --git a/crypto/keychain/DETAILS b/crypto/keychain/DETAILS
index 7ef30a2..ea69fe5 100755
--- a/crypto/keychain/DETAILS
+++ b/crypto/keychain/DETAILS
@@ -1,22 +1,23 @@
            SPELL=keychain
-         VERSION=2.6.8
+         VERSION=2.7.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://agriffis.n01se.net/$SPELL/$SOURCE
    SOURCE_URL[1]=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/$SOURCE
    SOURCE_URL[2]=ftp://ftp.li.kernel.org/pub/.5/gentoo/distfiles/$SOURCE
    SOURCE_URL[3]=ftp://ftp.cse.buffalo.edu/mirror/BSD/FreeBSD/ports/distfiles/$SOURCE
-     SOURCE_HASH=sha512:bb84ce62b106c785bab98ab3aa7a0ee9b372d0cca0a32bd59be049d47a5b1188521c31a36b5dfa97c8a3782c9ef6789dc72899a01b056c6e5624215309cd3ea9
-        WEB_SITE=http://www.gentoo.org/proj/en/keychain/
+#     SOURCE_HASH=sha512:bb84ce62b106c785bab98ab3aa7a0ee9b372d0cca0a32bd59be049d47a5b1188521c31a36b5dfa97c8a3782c9ef6789dc72899a01b056c6e5624215309cd3ea9
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+        WEB_SITE=http://www.funtoo.org/en/security/keychain/intro/
          ENTERED=20020310
       LICENSE[0]=GPL
         KEYWORDS="crypto"
            SHORT="keychain - front end to ssh-agent"
 cat << EOF
-The keychain bash script makes handling RSA and DSA keys both convenient and 
-secure. It acts as a front-end to ssh-agent, allowing you to easily have one 
-long-running ssh-agent process per system, rather than per login session. This 
-dramatically reduces the number of times you need to enter your passphrase 
-from once per new login session to once every time your local machine is 
+The keychain bash script makes handling RSA and DSA keys both convenient and
+secure. It acts as a front-end to ssh-agent, allowing you to easily have one
+long-running ssh-agent process per system, rather than per login session. This
+dramatically reduces the number of times you need to enter your passphrase
+from once per new login session to once every time your local machine is
 rebooted.
 EOF
diff --git a/crypto/keychain/HISTORY b/crypto/keychain/HISTORY
index 7214cb7..06b1850 100644
--- a/crypto/keychain/HISTORY
+++ b/crypto/keychain/HISTORY
@@ -1,3 +1,7 @@
+2010-12-14 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated WEB_SITE to current official site (non-Gentoo)
+	  Updated to 2.7.1
+
 2008-07-30 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: WEB_SITE tweaked, changed and added more mirrors
 
diff --git a/crypto/keychain/keychain-2.7.1.tar.bz2.sig b/crypto/keychain/keychain-2.7.1.tar.bz2.sig
new file mode 100644
index 0000000..bd3c179
Binary files /dev/null and b/crypto/keychain/keychain-2.7.1.tar.bz2.sig differ
diff --git a/crypto/libsasl/CONFLICTS b/crypto/libsasl/CONFLICTS
new file mode 100755
index 0000000..32e78b3
--- /dev/null
+++ b/crypto/libsasl/CONFLICTS
@@ -0,0 +1 @@
+conflicts cyrus-sasl
diff --git a/crypto/libsasl/HISTORY b/crypto/libsasl/HISTORY
index acdb6c1..e2aa3e6 100644
--- a/crypto/libsasl/HISTORY
+++ b/crypto/libsasl/HISTORY
@@ -1,2 +1,6 @@
+2011-01-07 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflicts with cyrus-sasl
+      e.g. sasl/sasl.h conflicts
+
 2009-07-22 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS, DEPENDS, BUILD, INSTALL, PROVIDES: created spell
diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index 9211741..08e88da 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libssh
-         VERSION=0.4.6
+         VERSION=0.4.7
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.libssh.org/files/$SOURCE
+   SOURCE_URL[0]=http://www.libssh.org/files/${VERSION::3}/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
         WEB_SITE=http://www.libssh.org/
          ENTERED=20041208
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index 213e8c3..825e7ac 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2010-12-30 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.4.7, SOURCE_URL[0] updated
+
 2010-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.4.6
 
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index 7ae3eaa..b7452bd 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pinentry
-         VERSION=0.8.0
-     SOURCE_HASH=sha512:2c850f060e7d65a7d4cc19d1fb3b0eed97e1e1f091098a1278a66d9338494f15d07c1ef851fbbfa66ec26e0886675af3941b991c926bb23bc7672e440075d568
+         VERSION=0.8.1
+     SOURCE_HASH=sha512:a7f9a582b1d9c347c65f4a842dc4f3270199dc23eab2487e5150e37b71d666628a8a60d44f85d64bba5b1a7018379dd181e810bc373994c9a94fafe706adf76a
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index ed8623d..21e666a 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8.1
+
 2010-03-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.0
 	* DEPENDS: add pkgconfig
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index bb9841f..954554d 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mongodb
-         VERSION=1.6.4
+         VERSION=1.6.5
           SOURCE=$SPELL-src-r$VERSION.tar.gz
    SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-     SOURCE_HASH=sha512:7cc9c40e6bcf0cb8bf185a2c2d52fce9e25475131ca9f5ad755b343d577a772025614705d0f0a575e35783b4fe7d32fd6329641de149650b10168ad43b32f4aa
+     SOURCE_HASH=sha512:eba5135b7ea8c645a7008bee37fd2ada0a3816e05bd34d635c9f207af9e2f053392a864de5231f3038f47b758bf8cecbd14ec4d50fe83b04914cd933fd44ae57
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
       LICENSE[0]=AGPL
       LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index c9c78a7..2e528b4 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,9 @@
+2010-12-22 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.6.5
+
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* init.d/mongodb: use PIDFILE
+
 2010-12-07 Vlad Glagolev <stealth at sourcemage.org>
 	* {PRE_}BUILD, DEPENDS, DETAILS, INSTALL, init.d/mongodb{.conf},
 	  scons.patch: spell created
diff --git a/database/mongodb/init.d/mongodb b/database/mongodb/init.d/mongodb
index 635dd6e..a4c4457 100755
--- a/database/mongodb/init.d/mongodb
+++ b/database/mongodb/init.d/mongodb
@@ -3,9 +3,9 @@
 . /etc/sysconfig/mongodb
 
 PROGRAM=/usr/bin/mongod
-ARGS="-f /etc/mongodb.conf --pidfilepath /var/run/mongod/mongod.pid --fork $MONGOD_ARGS"
-RUNLEVEL=3
 PIDFILE=/var/run/mongod/mongod.pid
+ARGS="-f /etc/mongodb.conf --pidfilepath $PIDFILE --fork $MONGOD_ARGS"
+RUNLEVEL=3
 NEEDS="+network"
 
 start() {
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index fc9ecf3..f207fdb 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -4,7 +4,7 @@ if [[ $OLD == y ]]; then
 
   SECURITY_PATCH=4
 else
-         VERSION=5.1.53
+         VERSION=5.1.54
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 2a7a5fc..33094ef 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-12-31 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 5.1.54
+
 2010-11-20 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to version 5.1.53
 
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 6646b4a..f32dbe5 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pgadmin3
-         VERSION=1.12.1
+         VERSION=1.12.2
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 5bb72a9..f3824cf 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.12.2
+
 2010-10-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.12.1
 
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 2ffc8d3..718a1b5 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,8 +1,9 @@
            SPELL=sqlite
-         VERSION=3.7.3
-     SOURCE_HASH=sha512:21d5ddd31e4e3dddbcbf0e9eed09b03e32f0abbc41b5496877d96a0af877aa2d280c140161c22f4df6bbc264599b204fbc8970c09d7cbc588a324ab789bc3034
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=3.7.4
+        VERSIONX=3070400
+     SOURCE_HASH=sha512:7026450dc4d689ee5587f27159d00fc8ef20b59bb4e36a3879eb1db07a0fc4dbe65b95bfaa764335379266fda26c52293df5dbd3a79abd465137742474663255
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-autoconf-$VERSIONX"
+          SOURCE=$SPELL-autoconf-$VERSIONX.tar.gz
    SOURCE_URL[0]=http://sqlite.org/$SOURCE
       LICENSE[0]=PD
         WEB_SITE=http://www.sqlite.org/
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 6c8d3d9..7d7c694 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2010-12-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.7.4 (3070400), autoconf tarball used
+	* PRE_BUILD, no-tcl.patch: removed
+
 2010-10-08 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.7.3
 	* CONFIGURE: fixed a mistype
diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
deleted file mode 100755
index e4a3975..0000000
--- a/database/sqlite/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/no-tcl.patch" &&
-
-sed -i "s:OPTS:_OPTS:g;s:utf\.o:utf\.lo:" Makefile.in
diff --git a/database/sqlite/no-tcl.patch b/database/sqlite/no-tcl.patch
deleted file mode 100644
index 1ead145..0000000
--- a/database/sqlite/no-tcl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	2009-09-10 23:18:17.000000000 +0400
-+++ Makefile.in	2009-09-12 16:50:04.107891742 +0400
-@@ -684,8 +684,9 @@
- status.lo:	$(TOP)/src/status.c $(HDR)
- 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
- 
--sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
--	tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
-+sqlite3.h:	$(TOP)/src/sqlite.h.in 
-+	sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
-+	sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
- 
- table.lo:	$(TOP)/src/table.c $(HDR)
- 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c
diff --git a/database/tdb/DEPENDS b/database/tdb/DEPENDS
new file mode 100755
index 0000000..391273a
--- /dev/null
+++ b/database/tdb/DEPENDS
@@ -0,0 +1,6 @@
+depends libxslt &&
+
+optional_depends python \
+                 "--enable-python" \
+                 "--disable-python" \
+                 "for Python binding"
diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
new file mode 100755
index 0000000..d85605f
--- /dev/null
+++ b/database/tdb/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=tdb
+         VERSION=1.2.7
+          SOURCE=${SPELL}-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://samba.org/ftp/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=jelmer.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+      LICENSE[0]=GPL
+        WEB_SITE=http://tdb.samba.org/
+         ENTERED=20020210
+        KEYWORDS="database libs"
+           SHORT="Trivial Database"
+cat << EOF
+TDB is a Trivial Database. In concept, it is very much like GDBM,
+and BSD's DB except that it allows multiple simultaneous writers
+and uses locking internally to keep writers from trampling on each
+other. TDB is also extremely small.
+EOF
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
new file mode 100644
index 0000000..28a25fd
--- /dev/null
+++ b/database/tdb/HISTORY
@@ -0,0 +1,55 @@
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.2.7; switched to upstream key management;
+	  updated urls
+	* DEPENDS: added optional python dependency; removed gdbm - not needed;
+	  libxslt is needed to build docs
+	* PRE_BUILD: removed _PUBLIC_ defs (already fixed in git by upstream)
+	* jelmer.gpg: added
+
+2010-10-06 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.2.2
+	  new URL
+	* PRE_BUILD: added
+
+2009-01-23 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to tdb_1.1.2~git20081222
+	  Stable hasn't been updated since 2001
+	* BUILD: Removed, no more patches
+	* config.db.patch, tdb.patch: Removed, applied upstream
+
+2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed BUILD_API=2.
+
+2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2005-11-29 Seth Woolley <seth at tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2005-09-24 George Sherwood <george at beernabeer.com>
+	* DETAILS,BUILD: Update for BUILD_API=2
+
+2005-05-11 Seth Woolley <seth at tautology.org>
+	* BUILD,config.sub.patch: edit/add for x86_64 support
+
+2004-05-24 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: fix man pages
+	  use default_build - clean up script
+
+2003-07-16 Eric Sandall <sandalle at sourcemage.org>
+	* Now compiles (Bug #3762) Thanks to Chris Dennis
+
+2003-05-20 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS to fix my broken SOURCEFORGE_URL fixes
+
+2003-05-18 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS for SOURCEFORGE_URL fix
+
+2002-10-31 Julian v. Bock <julian at wongr.net>
+	* DEPENDS: add; add gdbm dep.
+
+2002-10-14 Julian v. Bock <julian at wongr.net>
+	* DETAILS: add LICENSE and MD5 fields.
diff --git a/database/tdb/PRE_BUILD b/database/tdb/PRE_BUILD
new file mode 100755
index 0000000..cd86e14
--- /dev/null
+++ b/database/tdb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i "s:_PUBLIC_ ::g" include/tdb.h
diff --git a/database/tdb/jelmer.gpg b/database/tdb/jelmer.gpg
new file mode 100644
index 0000000..af7063b
Binary files /dev/null and b/database/tdb/jelmer.gpg differ
diff --git a/devel/apiextractor/DETAILS b/devel/apiextractor/DETAILS
index fded791..b88eb72 100755
--- a/devel/apiextractor/DETAILS
+++ b/devel/apiextractor/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.9.0
-     SOURCE_HASH=sha512:ec7adc34978548d507f9a46634ca7341348a88057800b244f2ecf06a62411eb5421cc98d3a44648beedda0a47fbac388aa955661f636cdec0eacc12bf4bb7daf
+         VERSION=0.9.2
+     SOURCE_HASH=sha512:8f69372547a6e194bb256d96fe99fb689e4170d66b5d8766e4faa2991e3a35e0580dd6fc2eae18dbfe8fa5a76ded87dc0fa16eab28d1115107388586918752a0
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index 80c9a7d..015f059 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,9 @@
+2011-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.2
+
+2010-12-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.1
+
 2010-11-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.0
 
diff --git a/devel/byacc/DETAILS b/devel/byacc/DETAILS
index 936a8c6..e56ab0f 100755
--- a/devel/byacc/DETAILS
+++ b/devel/byacc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=byacc
-         VERSION=20100610
+         VERSION=20101229
           SOURCE=$SPELL-$VERSION.tgz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
diff --git a/devel/byacc/HISTORY b/devel/byacc/HISTORY
index 7d55840..45bf0e1 100644
--- a/devel/byacc/HISTORY
+++ b/devel/byacc/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 20101229
+
 2010-11-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 20100610
 
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index e079d50..2a1d2d3 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,5 +1,5 @@
            SPELL=doxygen
-         VERSION=1.7.2
+         VERSION=1.7.3
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index e325abf..5e40ac0 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.7.3
+
 2010-10-09 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.7.2
 
diff --git a/devel/doxygen/doxygen-1.7.2.src.tar.gz.sig b/devel/doxygen/doxygen-1.7.2.src.tar.gz.sig
deleted file mode 100644
index a65f8f0..0000000
Binary files a/devel/doxygen/doxygen-1.7.2.src.tar.gz.sig and /dev/null differ
diff --git a/devel/doxygen/doxygen-1.7.3.src.tar.gz.sig b/devel/doxygen/doxygen-1.7.3.src.tar.gz.sig
new file mode 100644
index 0000000..e1913a2
Binary files /dev/null and b/devel/doxygen/doxygen-1.7.3.src.tar.gz.sig differ
diff --git a/devel/gambit-c/DETAILS b/devel/gambit-c/DETAILS
new file mode 100755
index 0000000..598a7b6
--- /dev/null
+++ b/devel/gambit-c/DETAILS
@@ -0,0 +1,56 @@
+           SPELL=gambit-c
+         VERSION=4.6.0
+          SOURCE="gambc-v${VERSION//./_}.tgz"
+   SOURCE_URL[0]=http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/${SOURCE}
+     SOURCE_HASH=sha512:f6a157f88f79516c3fe2bf11377c1cdfa040c16fdf4d68ee193bb91a77ea4588da797602d969d876b558eeb19c231387741f6dc3e49f07284ee2d0ff0731a2d1
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/gambc-v${VERSION//./_}"
+        WEB_SITE="http://dynamo.iro.umontreal.ca/~gambit/"
+      LICENSE[0]=lgpl-2.1
+      LICENSE[1]=apache-2.0
+         ENTERED=20101214
+           SHORT="complete, portable, efficient and reliable implementation of the Scheme programming language"
+cat << EOF
+Gambit consists of two main programs: gsi, the Gambit Scheme interpreter,
+and gsc, the Gambit Scheme compiler.
+
+The interpreter contains the complete execution and debugging environment. The
+compiler is the interpreter extended with the capability of generating
+executable files. The compiler can produce standalone executables or compiled
+modules which can be loaded at run time. Interpreted code and compiled code
+can be freely mixed.
+
+Gambit-C is a version of the Gambit programming system in which the compiler
+generates portable C code. The main features of Gambit-C are:
+
+ * Conformance: The Gambit-C system conforms to the R4RS, R5RS and IEEE Scheme
+   standards and implements all optional features. Tail calls and first class
+   continuations conform to the Scheme semantics. The full numeric tower is
+   implemented, including: arbitrary precision integers (bignums), rationals,
+   inexact reals (floating point numbers), and complex numbers. Several
+   extensions to Scheme are provided, including: lightweight threads, a
+   foreign-function interface (FFI), and extended I/O capabilities (Unicode,
+   networking, subprocesses, ...).
+
+ * Portability: Because the system is mostly written in Scheme and the compiler
+   generates portable C code, it is easy to port the system as well as programs
+   compiled with it to any platform with a decent C or C++ compiler. There
+   is no reliance on a particular C compiler, although the system can
+   take advantage of some gcc-specific constructs. The C code generated
+   is oblivious to the endianness and word size of the target environment
+   (32 and 64 bit architectures are currently supported).
+
+ * Performance: The compiler includes several powerful program transformations
+   such as user procedure inlining, partial-evaluation, and
+   lambda-lifting. With appropriate declarations in the source code the
+   executable programs generated by the compiler run roughly as fast as
+   equivalent C programs. Programs containing no declarations are also
+   optimized without compromising the Scheme semantics by speculatively
+   inlining predefined procedures (see the benchmarks page for a comparison
+   with other Scheme implementations and other languages). Thanks to an
+   efficient implementation of continuations, the thread system is very
+   efficient and can support millions of concurrent threads.
+
+ * Reliability: Stable releases typically have very few bugs. Bug tracking is
+   done with bugzilla. Gambit-C has been used to develop large-scale real-world
+   software and services in academic and commercial settings.
+EOF
diff --git a/devel/gambit-c/HISTORY b/devel/gambit-c/HISTORY
new file mode 100644
index 0000000..a83016d
--- /dev/null
+++ b/devel/gambit-c/HISTORY
@@ -0,0 +1,3 @@
+2010-12-14 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: spell created
+
diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index 63b05d7..cff0822 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
            SPELL=geany
-         VERSION=0.19.2
+         VERSION=0.20
           SOURCE=$SPELL-$VERSION.tar.bz2
 	 SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://download.geany.org/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 3546ec2..2af432b 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2011-01-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.20
+
 2010-12-02 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.19.2
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index c3946fc..3cba865 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,6 @@
            SPELL=git
-         VERSION=1.7.3.3
+         VERSION=1.7.3.5
+  SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 56c85fc..501fe0f 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2011-01-06 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.3.5
+
+2010-12-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.3.4, SECURITY_PATCH=1
+
 2010-12-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.7.3.3
 
diff --git a/devel/gitslave/DETAILS b/devel/gitslave/DETAILS
index 4997c53..7700073 100755
--- a/devel/gitslave/DETAILS
+++ b/devel/gitslave/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gitslave
-         VERSION=1.1.1
-     SOURCE_HASH=sha512:1748e1dcb8a6da5a0bf9d36533a7e26186776ab5a8b3fa27e130985c061ae91da2c26ada382557c0212bce1d9500f70bfbf715d47f9227181ffd38370ea9ef2d
+         VERSION=1.2
+     SOURCE_HASH=sha512:55710c6b9a32d5eec5165ffc0afb68ae53517c40f279e9263ddcf235360cd6ee986a818bf8e64d994bfc8c84b9c7b432064cc95f5a3fbce8184687dd36e714ef
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/gitslave/HISTORY b/devel/gitslave/HISTORY
index b9433fd..413e527 100644
--- a/devel/gitslave/HISTORY
+++ b/devel/gitslave/HISTORY
@@ -1,3 +1,6 @@
+2010-12-21 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.2
+
 2010-11-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.1.1
 	  fix typo
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 5d2b1d5..8d2b77e 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -1,5 +1,5 @@
            SPELL=guile
-         VERSION=1.8.7
+         VERSION=1.8.8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index e67d659..c23bcdc 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.8.8
+
 2010-07-19 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* guile-1.8.7-gcc45.patch, PRE_BUILD: fixed build with gcc 4.5
 
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index 8f3494b..18e27b0 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -5,11 +5,11 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then
       SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}
      SOURCE_HASH=sha512:2067ee108f15610ea11c515fba67625995f5136c8888d21a1ef9417320538f5e46cc39c19c351873b5c126170bc23f21f042b544575506ca4c454beda4b8438a
 else
-         VERSION=2.8.1
+         VERSION=2.8.2
   SECURITY_PATCH=1
           SOURCE=${SPELL}-${VERSION}.tar.bz2
       SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:af452ba25146a44f2e2b923149bb4372c392b0c246aad80aa893f48de88598e989222ed59909cc307dbbf9a484e919c6cf47f10f7e183164cae455e6789cb91f
+     SOURCE_HASH=sha512:2e7ae46885e2ac4a6d369f402f591e6d10d3f70a36f554d8766d8ac86c88ecb7dca3db08c38fa953d6a4b6e317366dcc1e8a4b49d42fc78dac7a7401bfd33df5
 fi
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index f4c6b60..5efb96d 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,6 @@
+2011-01-06 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 2.8.2
+
 2010-11-20 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to version 2.8.1
 	* PRE_BUILD: Removed patch
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index c4d03b8..7dd8475 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=phpmyadmin
-         VERSION=3.3.8.1
+         VERSION=3.3.9
   SECURITY_PATCH=17
-     SOURCE_HASH=sha512:e8219f764163cbb92b7888b9a7c9780a99c4dfe5ec4de8f35fac48d8e417b1948bf33b62b952e83f7989b9c4e604abd97b80e914e369dd0091cda448c2015714
+     SOURCE_HASH=sha512:bcedc2c260adc1b68703eb164cba6848f5b789f21a550a63d23d288e453c5ff62452d3dff7c0688f1d24984ded94365a6cba144a55916fa44854c517e0c181f7
           SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 358efb8..d25f717 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.3.9
+
 2010-12-04 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.3.8.1
 
diff --git a/devel/pyside-tools/DETAILS b/devel/pyside-tools/DETAILS
index 18b0ae1..e06e774 100755
--- a/devel/pyside-tools/DETAILS
+++ b/devel/pyside-tools/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.2.2
-     SOURCE_HASH=sha512:2a6db5f21b681902d18b91a8e7e0f9301c858b55660bf700ce7ae673c58bffc7ac02e812e8f6d41d8b9ef3a375982bf1304252b6ff9a2bf9dc493fee8eb0caa1
+         VERSION=0.2.5
+     SOURCE_HASH=sha512:ae0946615b6d15752d3894e685754e8f72ebd7f923a624d31f5708ff4c756bd7ee68f52cf39daac65311dbcc27bea7e4119da7df7525342290fa3d8c27384222
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/pyside-tools/HISTORY b/devel/pyside-tools/HISTORY
index 416a622..b125234 100644
--- a/devel/pyside-tools/HISTORY
+++ b/devel/pyside-tools/HISTORY
@@ -1,3 +1,7 @@
+2011-01-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.2.5
+	* PRE_BUILD: deleted
+
 2010-12-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.2.2
 	* PRE_BUILD: detect correct version of pyside
diff --git a/devel/pyside-tools/PRE_BUILD b/devel/pyside-tools/PRE_BUILD
deleted file mode 100755
index de7325e..0000000
--- a/devel/pyside-tools/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/PySide/s/0.4/1.0/' CMakeLists.txt
diff --git a/devel/pyside/DETAILS b/devel/pyside/DETAILS
index 31a03f6..3f87e44 100755
--- a/devel/pyside/DETAILS
+++ b/devel/pyside/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=qt4.7+1.0.0~beta1
-     SOURCE_HASH=sha512:d4d3cd41f8f945a85dfc023c38371a2d746399712093380a1242d8a98ee67db59ac83e15e9c2f578a9792bd980b1aeacf5c65c87319a712486ccacf3f397e7f7
+         VERSION=qt4.7+1.0.0~beta3
+     SOURCE_HASH=sha512:ba0f20b42078d0fb9c9899e2b6b101898ec943e6cecd75d907e4c7c701e0a8fe3507891089869bf7fef7e02cc16029b36a5025291db17dbf739ac551e39d66ef
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/pyside/HISTORY b/devel/pyside/HISTORY
index d311ac6..0df4a31 100644
--- a/devel/pyside/HISTORY
+++ b/devel/pyside/HISTORY
@@ -1,3 +1,9 @@
+2011-01-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version qt4.7+1.0.0~beta3
+
+2010-12-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version qt4.7+1.0.0~beta2
+
 2010-11-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version qt4.7+1.0.0~beta1
 
diff --git a/devel/sbcl/DETAILS b/devel/sbcl/DETAILS
index ccb9a3b..88b17d5 100755
--- a/devel/sbcl/DETAILS
+++ b/devel/sbcl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=sbcl
-         VERSION=1.0.44
+         VERSION=1.0.45
           SOURCE=$SPELL-$VERSION-source.tar.bz2
 
 if ! spell_ok $SPELL ; then
@@ -24,7 +24,7 @@ fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/sbcl/$SOURCE
         WEB_SITE=http://sbcl.sourceforge.net
-     SOURCE_HASH=sha512:fe3ccc4b0ba49c8d79891d78ce204c9992d6b6073b5fcdbfb1006100f704612eb4005057725d567f079fd62848b12d7cf576e2ad553b22c9b7ffd9a8b21ec8b2
+     SOURCE_HASH=sha512:0e7fdb9f2dc1875b8051286114a211b949901cd85439a69e1151f629076e3d84ecf8e1e68fd5584697512f8f3f88eccd28b9ef8d89534c8aaf914e743d851c4d
       LICENSE[0]=BSD
          ENTERED=20060122
         KEYWORDS="lisp compiler devel"
diff --git a/devel/sbcl/HISTORY b/devel/sbcl/HISTORY
index 003939b..12db9dd 100644
--- a/devel/sbcl/HISTORY
+++ b/devel/sbcl/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Peng Chang (Charles) <chp at sourcemage.org>
+	* DETAILS: updated spell to 1.0.45
+
 2010-11-13 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated x86_64 binaries to 1.0.44
 
diff --git a/devel/shiboken/DETAILS b/devel/shiboken/DETAILS
index 36e1a85..bbb791a 100755
--- a/devel/shiboken/DETAILS
+++ b/devel/shiboken/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=1.0.0~beta1
-     SOURCE_HASH=sha512:fd9753680d404abb9d05042c4e8a45d0e64b93702a9d51cbd17bf492c676573637bc5194de9d2cfc4fcd35df12a97c68989e7f08f7620f67ec09f86cf4751da0
+         VERSION=1.0.0~beta3
+     SOURCE_HASH=sha512:35aee98ad1e53b7f7f346592bcd47d83c2c55480ff7f5d4e7c800ef0540156f15fb3a9bf109c93bb14b5b36d303f667f66548105ea9ffd358bbe16055bdc45de
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/shiboken/HISTORY b/devel/shiboken/HISTORY
index f3ab582..2b58f5c 100644
--- a/devel/shiboken/HISTORY
+++ b/devel/shiboken/HISTORY
@@ -1,3 +1,9 @@
+2011-01-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.0~beta3
+
+2010-12-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.0~beta2
+
 2010-11-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.0~beta1
 
diff --git a/devel/sparse/DETAILS b/devel/sparse/DETAILS
index ac2d613..c809023 100755
--- a/devel/sparse/DETAILS
+++ b/devel/sparse/DETAILS
@@ -1,5 +1,5 @@
            SPELL=sparse
-         VERSION=0.4.1
+         VERSION=0.4.2
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SPELL-$VERSION.tar.bz2.sign
    SOURCE_URL[0]=http://kernel.org/pub/software/devel/sparse/dist/$SOURCE
diff --git a/devel/sparse/HISTORY b/devel/sparse/HISTORY
index 59e3e7e..717e00f 100644
--- a/devel/sparse/HISTORY
+++ b/devel/sparse/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: updated spell to 0.4.2
+
 2010-06-13 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: added SOURCE2_IGNORE for signature
 
diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index f11aca2..bc48c5c 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,6 +1,6 @@
            SPELL=vala
-         VERSION=0.10.1
-     SOURCE_HASH=sha512:c898739f455cf658c402ba83bd6a1ef71f601940e4472d98c84352e8c738f2b8c999782eec208009f5d795a6724fe96283da804b6c4baa5995e18c6d0cb4aa85
+         VERSION=0.10.2
+     SOURCE_HASH=sha512:56edd7b1fb947314e4ed2dc8030fbcbc38c1ace10c09e08bcc4ee2e023ca789fce28ab97b598e179d421a0611cb0f4791ff242230158489f7c989388797a9bcd
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index bb01014..a6f90b2 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2010-12-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.10.2
+
 2010-10-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.10.1
 
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index f8bcaeb..43265af 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,7 +1,11 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: added, to apply the patch
+	* stat.patch: added, to fix compilation with recent headers
+
 2009-10-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.3
 	  url back to soureforge
-	* PRE_BUILD, gcc44.patch: deleteed
+	* PRE_BUILD, gcc44.patch: deleted
 
 2009-07-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.3rc2
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
new file mode 100755
index 0000000..e0a0900
--- /dev/null
+++ b/disk/cdrdao/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/stat.patch"
diff --git a/disk/cdrdao/stat.patch b/disk/cdrdao/stat.patch
new file mode 100644
index 0000000..cc2544a
--- /dev/null
+++ b/disk/cdrdao/stat.patch
@@ -0,0 +1,12 @@
+--- dao/ScsiIf-linux.cc.orig
++++ dao/ScsiIf-linux.cc
+@@ -19,6 +19,9 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/disk/di/DETAILS b/disk/di/DETAILS
index 75462d6..eb7fbc6 100755
--- a/disk/di/DETAILS
+++ b/disk/di/DETAILS
@@ -1,9 +1,9 @@
            SPELL=di
-         VERSION=4.25
+         VERSION=4.27
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.gentoo.com/di/$SOURCE
-     SOURCE_HASH=sha512:ebc830d8fadc0b453ddf5324708c1e1c5114c7535aef10d6ba90629017465a53a2053bfffe150bb9734acf6a8057f1691596976581c5cbab4a5143d5eb38b724
+     SOURCE_HASH=sha512:211b2f411686acd3b357efd3019615fc8b8a21c302aa3cb2e0c9308de23bd168cf2717c23dae48ad9074fd3980d81222fab299675c71ff63e4280319e7c1786f
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
         WEB_SITE=http://www.gentoo.com/di/
          ENTERED=20020527
diff --git a/disk/di/HISTORY b/disk/di/HISTORY
index 46b7189..2bc9c92 100644
--- a/disk/di/HISTORY
+++ b/disk/di/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.27
+
 2010-07-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.25
 
diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index 85af4fb..c7dfd2d 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=e2fsprogs
-         VERSION=1.41.12
+         VERSION=1.41.14
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 19192f2..3941dac 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,9 @@
+2010-12-23 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.41.14
+
+2010-12-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.41.13
+
 2010-05-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.41.12
 
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index 738b0d2..79e0b2b 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gparted
-         VERSION=0.7.0
-     SOURCE_HASH=sha512:acdbcb250e0cd0926f22396cb847d3048c111eced1e6cfaf378d8bdd3cf3883b6472f45cae588f8eb678f3b70647f400bed3a5bed46d789b84d71d04612cf6de
+         VERSION=0.7.1
+     SOURCE_HASH=sha512:28e10003b1283aa6daa592f48f486f9761c5f26ea7d27baa194c58e580962889e886f18e2bc118627865ffbef16e226b795749e6637ce7481612bf9473bac7a0
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 6927b21..46bbf04 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,6 @@
+2010-12-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.7.1
+
 2010-10-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 0.7.0
 
diff --git a/disk/isomaster/DETAILS b/disk/isomaster/DETAILS
index a14f384..095fc3d 100755
--- a/disk/isomaster/DETAILS
+++ b/disk/isomaster/DETAILS
@@ -1,8 +1,8 @@
            SPELL=isomaster
-         VERSION=1.3.7
+         VERSION=1.3.8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://littlesvr.ca/$SPELL/releases/$SOURCE
-     SOURCE_HASH=sha512:b883e98bb2035bcfe47149898bbf5923b805a244c78456a9fc2299bcd92a349811ee952d2c5b46418164b729c6931be96a25d457fc5acfb7dd527d2e30679525
+     SOURCE_HASH=sha512:b33ce6fd3f015f1c5675160f992b30b0e5df597fe53b421c956721ecfafba2e99c9f311b78827ece5abd88e4bcd7bb11e2cb870ff68db7c94f93ff86940da7dc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://littlesvr.ca/isomaster/
       LICENSE[0]=GPL
diff --git a/disk/isomaster/HISTORY b/disk/isomaster/HISTORY
index 1be2ed4..0c0fa55 100644
--- a/disk/isomaster/HISTORY
+++ b/disk/isomaster/HISTORY
@@ -1,3 +1,6 @@
+2011-01-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.3.8
+
 2010-01-06 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 1.3.7
 	* PRE_BUILD, doc.patch: removed
diff --git a/disk/isomaster/isomaster-1.3.7.tar.bz2.sig b/disk/isomaster/isomaster-1.3.7.tar.bz2.sig
deleted file mode 100644
index 9603252..0000000
Binary files a/disk/isomaster/isomaster-1.3.7.tar.bz2.sig and /dev/null differ
diff --git a/disk/libisoburn/DETAILS b/disk/libisoburn/DETAILS
index 8571f79..1b07504 100755
--- a/disk/libisoburn/DETAILS
+++ b/disk/libisoburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBISOBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.6.4.pl00
-     SOURCE_HASH=sha512:c18f2f7e500a1a3ff7ddb584817c1aacea462bd312bf78af1feb5e9c4f72f760630450a76f19e27df7395008a33601c19d16b41546367584f2d208c1df709a54
+         VERSION=0.6.6.pl00
+     SOURCE_HASH=sha512:1b1fc310f94a27005c6513e08f035dda1daae4d41fdd299e7da16c07cf132faebbd494fff83c52fdee79cf6d1fdbc74c5a5ef13e5cade4bb200d3bca8d7b01b2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//.pl??}"
diff --git a/disk/libisoburn/HISTORY b/disk/libisoburn/HISTORY
index 3a7931f..27e4351 100644
--- a/disk/libisoburn/HISTORY
+++ b/disk/libisoburn/HISTORY
@@ -1,3 +1,6 @@
+2010-12-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.6.pl00
+
 2010-10-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.4.pl00
 
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 13bc9d4..d9fac65 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
            SPELL=lvm
-         VERSION=2.02.78
+         VERSION=2.02.79
           SOURCE=LVM2.$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
    SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
    SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-     SOURCE_HASH=sha512:9d45a1d0d6485b8356bcf8d70ec99d7f36a835379c7858e54f56495f0d9a268702b8da4c08a92c5f2a191adfbe40d43900827e1f7893b0b50fc818d644457fac
+     SOURCE_HASH=sha512:fc214c3edbe6b6148c4d9a35d63b72288de8badc50cce8dae9fd50c445507bed7354480e622569f16cdac0ea08d328091c2e3400e6bcc5b53410eb2485348949
         WEB_SITE=http://sources.redhat.com/lvm2/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 70c1e6f..f921788 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2010-12-21 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.02.79
+
 2010-12-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.02.78
 
diff --git a/disk/netatalk/DETAILS b/disk/netatalk/DETAILS
index 67700f0..d73e6bf 100755
--- a/disk/netatalk/DETAILS
+++ b/disk/netatalk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=netatalk
-         VERSION=2.1.4
+         VERSION=2.1.5
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:b214ba36bae6707d22786b5fb9d64ffb0fbcec8ace9f6dac16bb83fa414d32e960e4058acce067392a9725a7c1f47656782eb07da5f1290ca41b4bea32df01e6
+     SOURCE_HASH=sha512:728f5e82bbbcdb50121afb12076e3b3cd0ab3ea720e74511363e5c695b1fb18c1afa74030b16e8cfa2710a7e86237acb5aba4de848603617048544218f576e38
         WEB_SITE=http://netatalk.sourceforge.net/
          ENTERED=20020321
       LICENSE[0]=GPL
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index 57c472d..d2992bf 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,3 +1,6 @@
+2010-12-22 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.1.5
+
 2010-10-16 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 2.1.4
 
diff --git a/disk/partimage-ng/DOWNLOAD b/disk/partimage-ng/DOWNLOAD
index 85e5e94..2bb4b9c 100755
--- a/disk/partimage-ng/DOWNLOAD
+++ b/disk/partimage-ng/DOWNLOAD
@@ -1,21 +1,5 @@
-bzr_download() {
-local OLD
-OLD=$SOURCE_CACHE/$SOURCE
-if [[ -e $OLD ]];then
- echo unpacking old tarball
- tar xjf $OLD
- cd $SPELL
- echo updating source tree
- bzr update
- cd -
-else
-  echo fetching source tree
-  bzr checkout $SOURCE_URL $SPELL
-fi
-echo repacking tarball
-tar cjf $SOURCE $SPELL
-mv $SOURCE $OLD
-}
+. $GRIMOIRE/FUNCTIONS &&
+
 #if [[ $PART_VCS == y ]];then
   bzr_download
 #else
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 48b398a..930faf9 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,9 @@
+2010-12-30 Ismael Luceno <ismael at sourcemage.org>
+	* DOWNLOAD: fixed
+
+2010-12-29 Ismael Luceno <ismael at sourcemage.org>
+	* DOWNLOAD: bzr_download function moved to it's own file
+
 2010-10-11 Bor Kraljič <pyrobor at ver.si>
 	* DOWNLOAD: only PART_VCS can be downloaded
 	  (other version is commented in DETAILS)
@@ -9,7 +15,7 @@
 	* PRE_BUILD, {hal,ntfs}.diff: deleted
 	* DEPENDS: rearrange
 	* PREPARE: give warning message
-	  
+
 2009-11-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* ntfs.diff: added
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 90909b9..5597f44 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
            SPELL=udev
-         VERSION=164
+         VERSION=165
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 95e1358..c95c4ce 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2010-12-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 165
+
 2010-10-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 164
 
diff --git a/doc/epdfview/HISTORY b/doc/epdfview/HISTORY
index ae6100e..1181956 100644
--- a/doc/epdfview/HISTORY
+++ b/doc/epdfview/HISTORY
@@ -1,3 +1,6 @@
+2011-01-06 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: added fix for building with poppler 0.16
+
 2009-03-23 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD, mouse-wheel.patch: added, to fix scrolling bug in 0.1.7
diff --git a/doc/epdfview/PRE_BUILD b/doc/epdfview/PRE_BUILD
index 4c2ae45..d825683 100755
--- a/doc/epdfview/PRE_BUILD
+++ b/doc/epdfview/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/mouse-wheel.patch"
+patch -p0 < "$SPELL_DIRECTORY/mouse-wheel.patch" &&
+sed -e "s:poppler_page_get_text:poppler_page_get_selected_text:" \
+    -e "s:page, &textRect:page, POPPLER_SELECTION_GLYPH, \&textRect:" -i src/PDFDocument.cxx
diff --git a/doc/groff/DETAILS b/doc/groff/DETAILS
index 0047f89..ea3354a 100755
--- a/doc/groff/DETAILS
+++ b/doc/groff/DETAILS
@@ -1,5 +1,5 @@
            SPELL=groff
-         VERSION=1.20.1
+         VERSION=1.21
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/groff/HISTORY b/doc/groff/HISTORY
index bfbdcdd..a75bcdd 100644
--- a/doc/groff/HISTORY
+++ b/doc/groff/HISTORY
@@ -1,3 +1,6 @@
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.21
+
 2009-01-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.20.1
 	* DEPENDS: netpbm is optional again...
diff --git a/doc/help2man/DETAILS b/doc/help2man/DETAILS
index 25444b1..ff9fa93 100755
--- a/doc/help2man/DETAILS
+++ b/doc/help2man/DETAILS
@@ -1,5 +1,5 @@
            SPELL=help2man
-         VERSION=1.36.4
+         VERSION=1.38.4
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2="${SOURCE}.sig"
       SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/doc/help2man/HISTORY b/doc/help2man/HISTORY
index ace6693..ffbc09e 100644
--- a/doc/help2man/HISTORY
+++ b/doc/help2man/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.38.4
+
 2009-12-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed optional dependency from gettext
 	  to locale-gettext
diff --git a/doc/man/DETAILS b/doc/man/DETAILS
index cef0ad1..7407fb3 100755
--- a/doc/man/DETAILS
+++ b/doc/man/DETAILS
@@ -1,10 +1,9 @@
            SPELL=man
-         VERSION=1.6f
+         VERSION=1.6g
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://primates.ximian.com/~flucifredi/$SPELL/$SOURCE
-   SOURCE_URL[1]=http://www.people.fas.harvard.edu/~lucifred/$SPELL/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sig
       SOURCE_GPG=man.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
diff --git a/doc/man/HISTORY b/doc/man/HISTORY
index ea0bd0f..4320fa4 100644
--- a/doc/man/HISTORY
+++ b/doc/man/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.6g; removed broken source url
+
 2008-09-24 Vlad Glagolev <stealth at sourcemage.org>
 	* man.sh: removed unneeded /usr/X11R6/man path
 	* PRE_BUILD: quoting paths; SPELL > SCRIPT; cleaned up
diff --git a/doc/podviewer/HISTORY b/doc/podviewer/HISTORY
index f4f5e7e..5e948b1 100644
--- a/doc/podviewer/HISTORY
+++ b/doc/podviewer/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* podviewer.desktop: added spanish name and comment
+
 2008-10-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.18
 
diff --git a/doc/podviewer/podviewer.desktop b/doc/podviewer/podviewer.desktop
index 70300e9..29d0953 100644
--- a/doc/podviewer/podviewer.desktop
+++ b/doc/podviewer/podviewer.desktop
@@ -2,8 +2,10 @@
 Encoding=UTF-8
 Name=PodViewer Documentation Browser
 Name[cs]=Prohlížeč nápovědy PodViewer
+Name[es]=Navegador de documentación PodViewer
 Comment=Browse Perl's POD documentation
 Comment[cs]=Prohlížet POD dokumentaci Perlu
+Comment[es]=Navegue la documentación POD de Perl
 Exec=podviewer
 Terminal=False
 Type=Application
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index 635908e..5a03a2c 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* xpdf.desktop: added spanish comment
+
 2010-04-25 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Disable building libpaper library (Bug #15066)
 	  See http://www.openoffice.org/issues/show_bug.cgi?id=94981
diff --git a/doc/xpdf/desktop/xpdf.desktop b/doc/xpdf/desktop/xpdf.desktop
index fae196c..2dfcc4b 100644
--- a/doc/xpdf/desktop/xpdf.desktop
+++ b/doc/xpdf/desktop/xpdf.desktop
@@ -4,6 +4,7 @@ Name=Xpdf
 Name[cs]=Xpdf
 Comment=View PDF files
 Comment[cs]=Zobrazit soubory PDF
+Comment[es]=Ver archivos PDF
 Exec=xpdf %f
 Icon=xpdf
 Terminal=false
diff --git a/e-17/elation/HISTORY b/e-17/elation/HISTORY
index df24ffd..ce1adb6 100644
--- a/e-17/elation/HISTORY
+++ b/e-17/elation/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* elation.desktop: add spanish comment and generic name
+
 2010-10-30 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed SOURCE_URL
 
diff --git a/e-17/elation/desktop/elation.desktop b/e-17/elation/desktop/elation.desktop
index 563d59f..94ae53c 100644
--- a/e-17/elation/desktop/elation.desktop
+++ b/e-17/elation/desktop/elation.desktop
@@ -8,6 +8,8 @@ Terminal=false
 Type=Application
 Categories=Application;AudioVideo;AudioPlayer;
 Comment=Listen to your audio collection
+Comment[es]=Escuche su colección de audio
 Comment[nl]=Luister naar je muziekverzameling
 GenericName=Music Player
+GenericName[es]=Reproductor de música
 GenericName[nl]=Muziek speler
diff --git a/editors/emacs/DOWNLOAD b/editors/emacs/DOWNLOAD
index 8de5d43..9875a33 100755
--- a/editors/emacs/DOWNLOAD
+++ b/editors/emacs/DOWNLOAD
@@ -1,18 +1,8 @@
-if [ $SOURCE_CACHE/$SOURCE ]
+. $GRIMOIRE/FUNCTIONS &&
+
+if [ "$VCS" == "y" ]
 then
-  message "${MESSAGE_COLOR}Unpacking the source...${DEFAULT_COLOR}" &&
-  tar xjf $SOURCE_CACHE/$SOURCE &&
-  cd $SOURCE_DIRECTORY &&
-  message "${MESSAGE_COLOR}Updating...${DEFAULT_COLOR}" &&
-  echo bzr update &&
-  bzr update &&
-  cd -
+  bzr_download
 else
-  message "${MESSAGE_COLOR}Doing a lightweight checkout...${DEFAULT_COLOR}" &&
-  echo bzr checkout --lightweight $SOURCE_URL $SOURCE_DIRECTORY &&
-  bzr checkout --lightweight $SOURCE_URL $SOURCE_DIRECTORY
-fi &&
-
-message "${MESSAGE_COLOR}Repacking the source...${DEFAULT_COLOR}" &&
-tar cjf $SOURCE $SOURCE_DIRECTORY &&
-mv $SOURCE $SOURCE_CACHE
+  default_download
+fi
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 7b00bd5..7008e6a 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,12 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* emacs.desktop: added generic name
+
+2010-12-30 Ladislav Hagara <hgr at vabo.cz>
+	* DOWNLOAD: fixed
+
+2010-12-29 Ismael Luceno <ismael at sourcemage.org>
+	* DOWNLOAD: bzr_download function moved to it's own file
+
 2010-12-07 Ismael Luceno <ismael at sourcemage.org>
 	* DOWNLOAD: manually handle, until bzr support finds it's way into sorcery
 
diff --git a/editors/emacs/desktop/emacs.desktop b/editors/emacs/desktop/emacs.desktop
index 347166d..b1274a6 100644
--- a/editors/emacs/desktop/emacs.desktop
+++ b/editors/emacs/desktop/emacs.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Editor
+GenericName=Text editor
+GenericName[es]=Editor de texto
diff --git a/editors/joe/HISTORY b/editors/joe/HISTORY
index b24fb81..e408b06 100644
--- a/editors/joe/HISTORY
+++ b/editors/joe/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* joe.desktop: added generic name
+
 2009-02-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.7, removed UPDATED, updated WEB_SITE
 
diff --git a/editors/joe/desktop/joe.desktop b/editors/joe/desktop/joe.desktop
index 784b21f..b29e3a4 100644
--- a/editors/joe/desktop/joe.desktop
+++ b/editors/joe/desktop/joe.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=true
 Type=Application
 Categories=Application;Editor
+GenericName=Text editor
+GenericName[es]=Editor de texto
diff --git a/editors/scite/DETAILS b/editors/scite/DETAILS
index b3c1933..80726f5 100755
--- a/editors/scite/DETAILS
+++ b/editors/scite/DETAILS
@@ -1,5 +1,5 @@
            SPELL=scite
-         VERSION=2.22
+         VERSION=2.23
           SOURCE=${SPELL}${VERSION/\./}.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/scintilla/$SOURCE
diff --git a/editors/scite/HISTORY b/editors/scite/HISTORY
index b8542a1..113aeaa 100644
--- a/editors/scite/HISTORY
+++ b/editors/scite/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.23
+
 2010-10-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.22
 
diff --git a/editors/scite/scite222.tgz.sig b/editors/scite/scite222.tgz.sig
deleted file mode 100644
index 55b34ee..0000000
Binary files a/editors/scite/scite222.tgz.sig and /dev/null differ
diff --git a/editors/scite/scite223.tgz.sig b/editors/scite/scite223.tgz.sig
new file mode 100644
index 0000000..7bac528
Binary files /dev/null and b/editors/scite/scite223.tgz.sig differ
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index badfdf8..ec361e8 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* texmaker.desktop: added spanish comment
+
 2010-11-14 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 2.1
 
diff --git a/editors/texmaker/desktop/texmaker.desktop b/editors/texmaker/desktop/texmaker.desktop
index eb8e566..54478b4 100644
--- a/editors/texmaker/desktop/texmaker.desktop
+++ b/editors/texmaker/desktop/texmaker.desktop
@@ -4,6 +4,7 @@ Version=1.5
 Name=texmaker
 Type=Application
 Comment=a free LaTeX editor
+Comment[es]=Un editor de LaTeX libre
 Exec=texmaker
 Icon=texmaker128x128.png
 Categories=Application;Editors;LaTeX;
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index adf3570..655ea75 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* vim.desktop, gvim.desktop: added generic name
+
 2010-08-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 7.3, extra and lang now included in main tarball
 	* PRE_BUILD: removed
diff --git a/editors/vim/desktop/vim.desktop b/editors/vim/desktop/vim.desktop
index 4c8e36a..a3ddb0f 100644
--- a/editors/vim/desktop/vim.desktop
+++ b/editors/vim/desktop/vim.desktop
@@ -6,3 +6,5 @@ Icon=/usr/share/icons/hicolor/48x48/apps/gvim.png
 Terminal=true
 Type=Application
 Categories=Application;Editor
+GenericName=Text editor
+GenericName[es]=Editor de texto
diff --git a/editors/vim/gvim.desktop b/editors/vim/gvim.desktop
index 0c7953d..475ac8c 100644
--- a/editors/vim/gvim.desktop
+++ b/editors/vim/gvim.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Editor
+GenericName=Text editor
+GenericName[es]=Editor de texto
diff --git a/enrico.gpg b/enrico.gpg
index 09662fc..049f975 100644
Binary files a/enrico.gpg and b/enrico.gpg differ
diff --git a/fonts-x11/terminus-font/DETAILS b/fonts-x11/terminus-font/DETAILS
index 61237c7..902bfdf 100755
--- a/fonts-x11/terminus-font/DETAILS
+++ b/fonts-x11/terminus-font/DETAILS
@@ -1,12 +1,13 @@
            SPELL=terminus-font
-         VERSION=4.30
+         VERSION=4.32
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:01244305c8f51cb6308285f017b26ff6152a6909464693dfc76315d1ee6aba99b99623efc2e831c698ebf165e333b4cdd713121fa4fdef61f881c388e868cfd5
-        WEB_SITE=http://www.is-vn.bg/hamster/
+     SOURCE_HASH=sha512:4b37e6de28f5a56cdcf0e5d8f11f15dcddaf2b162b56ae4d390e48b316e0d72580dcf1a31d39f0bbaeb71a0dbac5306d4e4c02b1c03770cebc50718a8b09dcdb
+        WEB_SITE=http://terminus-font.sourceforge.net/
          ENTERED=20050720
       LICENSE[0]=GPL
+      LICENSE[1]=SIL
         KEYWORDS="fonts x11 libs"
            SHORT="clean fixed width font"
 cat << EOF
diff --git a/fonts-x11/terminus-font/HISTORY b/fonts-x11/terminus-font/HISTORY
index f4f9ce8..a750217 100644
--- a/fonts-x11/terminus-font/HISTORY
+++ b/fonts-x11/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated to 4.32; renewed WEB_SITE; added SIL OFL license
+
 2010-07-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: terminus-font is moving to SF; updated source url
 
diff --git a/fonts-x11/ubuntu-font-family/BUILD b/fonts-x11/ubuntu-font-family/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ubuntu-font-family/BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ubuntu-font-family/DEPENDS b/fonts-x11/ubuntu-font-family/DEPENDS
new file mode 100755
index 0000000..74ca5e3
--- /dev/null
+++ b/fonts-x11/ubuntu-font-family/DEPENDS
@@ -0,0 +1 @@
+source  $SECTION_DIRECTORY/X11_DEPENDS
diff --git a/fonts-x11/ubuntu-font-family/DETAILS b/fonts-x11/ubuntu-font-family/DETAILS
new file mode 100755
index 0000000..c56e47d
--- /dev/null
+++ b/fonts-x11/ubuntu-font-family/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=ubuntu-font-family
+         VERSION=0.70.1
+          SOURCE="${SPELL}-${VERSION}.zip"
+   SOURCE_URL[0]=http://font.ubuntu.com/download/${SOURCE}
+     SOURCE_HASH=sha512:4c73feb7409c2c8a37f03c209a64acbc863a25ec9e8afea974f1b87f49b13dfd9889056b95f255e1caf964feef332da4fa594938d53ad2902994766604e133d0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://font.ubuntu.com"
+      LICENSE[0]=UBF
+         ENTERED=20101229
+           SHORT="Ubuntu Font Family, sans-serif typeface hinted for clarity"
+cat << EOF
+The Ubuntu Font Family are a set of matching new libre/open fonts in
+development during 2010--2011. The development is being funded by Canonical
+Ltd on behalf the wider Free Software community and the Ubuntu project.
+The technical font design work and implementation is being undertaken by
+Dalton Maag.
+
+Both the final font Truetype/OpenType files and the design files used to
+produce the font family are distributed under an open licence and you are
+expressly encouraged to experiment, modify, share and improve.
+EOF
diff --git a/fonts-x11/ubuntu-font-family/HISTORY b/fonts-x11/ubuntu-font-family/HISTORY
new file mode 100644
index 0000000..15837d5
--- /dev/null
+++ b/fonts-x11/ubuntu-font-family/HISTORY
@@ -0,0 +1,3 @@
+2010-12-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/fonts-x11/ubuntu-font-family/INSTALL b/fonts-x11/ubuntu-font-family/INSTALL
new file mode 100755
index 0000000..7af51a7
--- /dev/null
+++ b/fonts-x11/ubuntu-font-family/INSTALL
@@ -0,0 +1,3 @@
+local FONT_DIR=${INSTALL_ROOT}/usr/share/fonts/TTF                   &&
+mkdir -p ${FONT_DIR}                                                 &&
+install -m 644 -o root -g root ${SOURCE_DIRECTORY}/*.ttf ${FONT_DIR}
diff --git a/ftp-libs/dclib/DEPENDS b/ftp-libs/dclib/DEPENDS
index b431aa4..5be670b 100755
--- a/ftp-libs/dclib/DEPENDS
+++ b/ftp-libs/dclib/DEPENDS
@@ -1 +1,2 @@
-depends  libxml2
+depends  libxml2  &&
+depends  openssl
diff --git a/ftp-libs/dclib/HISTORY b/ftp-libs/dclib/HISTORY
index 03296eb..54f33ce 100644
--- a/ftp-libs/dclib/HISTORY
+++ b/ftp-libs/dclib/HISTORY
@@ -1,3 +1,7 @@
+2010-12-23 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: added openssl
+	* PRE_BUILD, dclib-openssl-1.patch: added to build with openssl 1.0
+
 2010-06-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.3.23
 
diff --git a/ftp-libs/dclib/PRE_BUILD b/ftp-libs/dclib/PRE_BUILD
new file mode 100755
index 0000000..8a864bf
--- /dev/null
+++ b/ftp-libs/dclib/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
+
+if [[ "$(installed_version openssl | cut -d. -f-2)" == "1.0" ]]; then
+  patch -p0 < ${SCRIPT_DIRECTORY}/dclib-openssl-1.patch
+fi
diff --git a/ftp-libs/dclib/dclib-openssl-1.patch b/ftp-libs/dclib/dclib-openssl-1.patch
new file mode 100644
index 0000000..b577d8a
--- /dev/null
+++ b/ftp-libs/dclib/dclib-openssl-1.patch
@@ -0,0 +1,50 @@
+--- dclib/core/cssl.cpp
++++ dclib/core/cssl.cpp
+@@ -86,7 +86,11 @@
+ /** */
+ SSL_CTX * CSSL::InitClientCTX()
+ {
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++	#else
+ 	SSL_METHOD *method;
++	#endif
+ 	SSL_CTX *ctx = NULL;
+ 
+	method = SSLv23_client_method();		/* Create new client-method instance */
+@@ -109,7 +113,11 @@
+ /** */
+ SSL_CTX * CSSL::InitServerCTX()
+ {
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++	#else
+ 	SSL_METHOD *method;
++	#endif
+ 	SSL_CTX *ctx = NULL;
+ 
+	method = SSLv23_server_method();		/* Create new client-method instance */
+@@ -130,7 +138,11 @@
+ /** */
+ SSL_CTX * CSSL::NewTLSv1ClientCTX()
+ {
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD * method = TLSv1_client_method();
++	#else
+ 	SSL_METHOD * method = TLSv1_client_method();
++	#endif
+ 	SSL_CTX * ctx = NULL;
+ 	
+ 	if ( method != NULL )
+@@ -149,7 +161,11 @@
+ /** */
+ SSL_CTX * CSSL::NewTLSv1ServerCTX()
+ {
++	#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD * method = TLSv1_server_method();
++	#else
+ 	SSL_METHOD * method = TLSv1_server_method();
++	#endif
+ 	SSL_CTX * ctx = NULL;
+ 	
+ 	if ( method != NULL )
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index e5c4eb4..179f8dc 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=aria2
-         VERSION=1.10.7
-     SOURCE_HASH=sha512:51885b7126eb2683e9d57728e85f2ecfacbe4201b0c81e9881c9fce9d6d292e4723da59974be8edb6b2151465eb2d7860339993ea2e4ae6b4adb155c00ece210
+         VERSION=1.10.8
+     SOURCE_HASH=sha512:ab3e8f986800523ac7e28db14118d28234d31c02e5a08abbb990d561f3d1293e8e36dd3ac16536677036efafcbe7c1978b6b4ced8ddc72b834fae1981591b813
           SOURCE=${SPELL}-$VERSION.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 0978842..1febad9 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.10.8
+
 2010-12-05 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.10.7
 
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index e22c85c..3d97176 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=curl
-         VERSION=7.21.2
+         VERSION=7.21.3
   SECURITY_PATCH=7
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 7827aa4..1dadc19 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2010-12-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 7.21.3
+
 2010-10-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 7.21.2, SECURITY_PATCH=7
 	  http://curl.haxx.se/docs/adv_20101013.html
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 63c3fdc..f48bebe 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=lftp
-         VERSION=4.1.1
+         VERSION=4.1.2
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 563b323..a0ec656 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.1.2
+
 2010-11-26 Peng Chang (Charles) <chp at sourcemage.org>
 	* DETAILS: updated spell to 4.1.1
 
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 1b5b9cf..3e25cf7 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,7 +1,7 @@
            SPELL=proftpd
-         VERSION=1.3.3c
+         VERSION=1.3.3d
   SECURITY_PATCH=1
-     SOURCE_HASH=sha512:a3f70faf39c2edeae75e56657d4d35633a3c2186bcd82867be1cda39e75377e4672b55af572f4ad2c7f829a27420bac7e9fb561f040129c9065880d27fe06eeb
+     SOURCE_HASH=sha512:d9baa488fb562630687353f1ff62bf164297aff8cbb716c16fce23b051e3a33d4c31f253d3d5778b4ba69648c48c9bbab2f4db2a4c0478c24d9f80ad79450f1b
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 42305e3..19c028f 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.3d
+
 2010-10-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.3.3c. SECURITY_PATCH++
 
diff --git a/ftp/uget/DETAILS b/ftp/uget/DETAILS
index 2922aeb..75cab73 100755
--- a/ftp/uget/DETAILS
+++ b/ftp/uget/DETAILS
@@ -1,8 +1,8 @@
            SPELL=uget
-         VERSION=1.6.1
+         VERSION=1.6.2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/urlget/$SOURCE
-     SOURCE_HASH=sha512:df7c3e15347e28611829e39bb8daa27d3ba4b86a0e06ba77497f3b1a4cc538cc02500111a53cd27d16d1c92ecd93a0ba4fc615bb5a2dbad7d24bb82424de42d8
+     SOURCE_HASH=sha512:572085cb9070023778cb896420efacd529567ed336fe1c0902db30de79e0b84902a43b2583ae95424b5df3f884b5c26496062e092361c00046c20f356c898b81
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://urlget.sourceforge.net/
       LICENSE[0]=LGPL
diff --git a/ftp/uget/HISTORY b/ftp/uget/HISTORY
index f57a467..b99a068 100644
--- a/ftp/uget/HISTORY
+++ b/ftp/uget/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.6.2
+
 2010-10-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.1
 
diff --git a/gnome1-libs/gtk-theme-switch/BUILD b/gnome1-libs/gtk-theme-switch/BUILD
deleted file mode 100755
index 9a47670..0000000
--- a/gnome1-libs/gtk-theme-switch/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  make &&
-  prepare_install &&
-  make PREFIX=/usr install
-
-) > $C_FIFO 2>&1
diff --git a/gnome1-libs/gtk-theme-switch/DEPENDS b/gnome1-libs/gtk-theme-switch/DEPENDS
deleted file mode 100755
index 8ed35fc..0000000
--- a/gnome1-libs/gtk-theme-switch/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gtk+
diff --git a/gnome1-libs/gtk-theme-switch/DETAILS b/gnome1-libs/gtk-theme-switch/DETAILS
deleted file mode 100755
index 4514cb9..0000000
--- a/gnome1-libs/gtk-theme-switch/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=gtk-theme-switch
-         VERSION=1.0.1
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://muhri.net/$SOURCE
-     SOURCE_HASH=sha512:995bf111137b02807b50338b99f28837bdf2a419d6f93b22e10e544adc7b96d65a6c54940d5de91f0c9e0104ee479559e3b1ce929c90f1ee8f4df7c8d6e2ea6d
-        WEB_SITE=http://muhri.net/nav.php3?node=gts
-      LICENSE[0]=GPL
-         ENTERED=20020716
-        KEYWORDS="gnome1 libs"
-       BUILD_API=1
-           SHORT="A GTK theme-switching utility."
-
-cat << EOF
-GTK Theme Switch is a small and fast command line utility to switch GTK themes
-on the fly. It also has an optional GUI to preview the requested theme and
-change the font used with it, an optional GUI dock, and it can install themes
-downloaded from gtk.themes.org, preview them, or switch to them immediately.
-EOF
diff --git a/gnome1-libs/gtk-theme-switch/HISTORY b/gnome1-libs/gtk-theme-switch/HISTORY
deleted file mode 100644
index 20c2421..0000000
--- a/gnome1-libs/gtk-theme-switch/HISTORY
+++ /dev/null
@@ -1,27 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2004-10-13 Arjan Bouter <abouter at sourcemage.org>
-	* added desktop files
-
-2003-06-19 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS to fix md5 for SOURCE.
-
-2003-01-30 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS to correct MD5
-
-2002-07-16 Robert Helgesson <rycee at home.se>
-	* Created spell
-
diff --git a/gnome1-libs/gtk-theme-switch/desktop/gtk-theme-switch.desktop b/gnome1-libs/gtk-theme-switch/desktop/gtk-theme-switch.desktop
deleted file mode 100644
index f042eb3..0000000
--- a/gnome1-libs/gtk-theme-switch/desktop/gtk-theme-switch.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GTK theme switch
-Exec=switch
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Tools;
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 0f46aee..1c20415 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,6 +1,6 @@
            SPELL=epiphany
 if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
-         VERSION=2.91.1.1
+         VERSION=2.91.4.1
 else
          VERSION=2.30.6
 fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index f4e7a4a..04555eb 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,9 @@
+2010-12-24 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.91.4.1
+
+2010-12-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.91.2.1
+
 2010-10-22 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 2.91.1.1
 	* DEPENDS: devel depends webkitgtk3, gsettings-desktop-schemas
diff --git a/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig
deleted file mode 100644
index 4e99517..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig
new file mode 100644
index 0000000..2cb6e4f
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.91.4.1.tar.bz2.sig differ
diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS
index e11da1f..2efb8eb 100755
--- a/gnome2-apps/gnucash/DEPENDS
+++ b/gnome2-apps/gnucash/DEPENDS
@@ -1,7 +1,13 @@
 if [ "$GNUCASH_DEVEL" == "y" ]; then
-  depends  libdbi
-fi  &&
-
+  depends webkitgtk "--with-html-engine=webkit" &&
+  optional_depends  libdbi \
+                    ""     \
+                    "--disable-dbi" \
+                    "to build the libdbi backed"
+else
+depends  -sub "GUILE" swig              &&
+depends  gtkhtml2
+fi &&
 optional_depends  aqbanking                 \
                   '--enable-hbci'           \
                   '--disable-hbci'          \
@@ -17,7 +23,6 @@ depends  libgnomeprint                  &&
 depends  libgnomeui                     &&
 depends  -sub "GTK2" goffice            &&
 depends  libgsf                         &&
-depends  gtkhtml2                       &&
 
 optional_depends  libofx                         \
                   '--enable-ofx'                 \
@@ -26,7 +31,6 @@ optional_depends  libofx                         \
 
 depends  libxml2                        &&
 depends  pango                          &&
-depends  -sub "GUILE" swig              &&
 
 
 ### ALL PAST THIS POINT NOT UPSTREAM DEPENDENCY###
diff --git a/gnome2-apps/gnucash/DETAILS b/gnome2-apps/gnucash/DETAILS
index 091a666..222f611 100755
--- a/gnome2-apps/gnucash/DETAILS
+++ b/gnome2-apps/gnucash/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gnucash
 if [ "$GNUCASH_DEVEL" == "y" ]; then
-         VERSION=2.3.15
-     SOURCE_HASH=sha512:9763903ce46b52b86d7d7e0e790d3049a73eb52a723f82416cc5e99a10cf2d551be6ffb8298983c31d35d86419176c80da0b2bbb8ea8132b70b3a6de92201e5e
+         VERSION=2.4.0
+     SOURCE_HASH=sha512:e33544ce169a4ba856d4dba628c6900ef3480d09967cd36702eda30ef5198d091c8c05b7d95c43078503909d9961b9b28ba05e7fbff2e459f6d5c808259a5457
 else
          VERSION=2.2.9
      SOURCE_HASH=sha512:211082ec4504524456ebc6bad3a0e315201f717827d7eb6a789efea3b1cdf243456f4a08c33590123f80f6e5126002af5c1b7c95b312bc4ea22e2c00a4b17323
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 3c22548..4991376 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,8 @@
+2011-01-11 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: if DEVEL, optional_depends libdbi
+	  if DEVEL, depends webkitgtk
+	  if DEVEL, does not depend on swig
+
 2010-08-26 David C. Haley <khoralin at gmail.com>
 	* DEPENDS: if DEVEL, libdbi needed
 
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index 8340899..eae2f9c 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,7 @@
+2011-01-07 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: added to apply exiv2 patch until next release
+	  http://bugs.gentoo.org/show_bug.cgi?id=349160
+
 2010-11-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.12.1
 
diff --git a/gnome2-apps/gthumb2/PRE_BUILD b/gnome2-apps/gthumb2/PRE_BUILD
new file mode 100755
index 0000000..ea10785
--- /dev/null
+++ b/gnome2-apps/gthumb2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+
+patch -p1 < $SPELL_DIRECTORY/gthumb-exiv2.patch 
diff --git a/gnome2-apps/gthumb2/gthumb-exiv2.patch b/gnome2-apps/gthumb2/gthumb-exiv2.patch
new file mode 100644
index 0000000..5bcb206
--- /dev/null
+++ b/gnome2-apps/gthumb2/gthumb-exiv2.patch
@@ -0,0 +1,45 @@
+diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
+index 780bf29..f24b50d 100644
+--- a/extensions/exiv2_tools/exiv2-utils.cpp
++++ b/extensions/exiv2_tools/exiv2-utils.cpp
+@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
+ static const char *
+ get_exif_default_category (const Exiv2::Exifdatum &md)
+ {
++#if EXIV2_TEST_VERSION(0, 21, 0)
++	if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
++#else
+ 	if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
++#endif
+ 		return "Exif::MakerNotes";
+ 
+-	switch (md.ifdId()) {
+-	case Exiv2::ifd1Id:
++	if (md.groupName().compare("Thumbnail") == 0)
+ 		return "Exif::Thumbnail";
+-	case Exiv2::gpsIfdId:
++	else if (md.groupName().compare("GPSInfo") == 0)
+ 		return "Exif::GPS";
+-	case Exiv2::iopIfdId:
++	else if (md.groupName().compare("Iop") == 0)
+ 		return "Exif::Versions";
+-	default:
+-		break;
+-	}
+ 
+ 	return "Exif::Other";
+ }
+@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr  image,
+ 			stringstream description;
+ 			if (! md->tagLabel().empty())
+ 				description << md->tagLabel();
+-			else if (md->ifdId () > Exiv2::ifd1Id)
++#if EXIV2_TEST_VERSION(0, 21, 0)
++			else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
++#else
++			else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
++#endif
+ 				// Must be a MakerNote - include group name
+ 				description << md->groupName() << "." << md->tagName();
+ 			else
+
diff --git a/gnome2-libs/atkmm/DETAILS b/gnome2-libs/atkmm/DETAILS
index d693a47..9235b0a 100755
--- a/gnome2-libs/atkmm/DETAILS
+++ b/gnome2-libs/atkmm/DETAILS
@@ -1,5 +1,6 @@
            SPELL=atkmm
          VERSION=2.22.1
+      PATCHLEVEL=1
           BRANCH=`echo $VERSION|cut -d . -f 1,2` 
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/atkmm/HISTORY b/gnome2-libs/atkmm/HISTORY
index d667dba..6558b33 100644
--- a/gnome2-libs/atkmm/HISTORY
+++ b/gnome2-libs/atkmm/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1; updated upstream tarball
+
 2010-11-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.22.1
 
diff --git a/gnome2-libs/atkmm/atkmm-2.22.1.tar.bz2.sig b/gnome2-libs/atkmm/atkmm-2.22.1.tar.bz2.sig
index 69aae8a..1aadeca 100644
Binary files a/gnome2-libs/atkmm/atkmm-2.22.1.tar.bz2.sig and b/gnome2-libs/atkmm/atkmm-2.22.1.tar.bz2.sig differ
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index ddb57fd..a02d2c3 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.27.3
+         VERSION=2.27.90
           SOURCE=glib-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 9e49530..b0e8dc1 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,9 @@
+2011-01-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.27.90
+
+2010-12-24 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.27.5
+
 2010-11-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.1
 
diff --git a/gnome2-libs/glib2/glib-2.27.3.tar.bz2.sig b/gnome2-libs/glib2/glib-2.27.3.tar.bz2.sig
deleted file mode 100644
index d4fd989..0000000
Binary files a/gnome2-libs/glib2/glib-2.27.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.27.90.tar.bz2.sig b/gnome2-libs/glib2/glib-2.27.90.tar.bz2.sig
new file mode 100644
index 0000000..6cd7900
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.27.90.tar.bz2.sig differ
diff --git a/gnome2-libs/libcanberra/DETAILS b/gnome2-libs/libcanberra/DETAILS
index 175549e..cb10986 100755
--- a/gnome2-libs/libcanberra/DETAILS
+++ b/gnome2-libs/libcanberra/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libcanberra
-         VERSION=0.23
+         VERSION=0.26
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://0pointer.de/lennart/projects/$SPELL/$SOURCE
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 46ff1cf..11d9d24 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,7 @@
+2011-01-05 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.26
+	* PRE_BUILD, make.patch: patch removed
+
 2010-10-06 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Apply make.patch
 	* make.patch: Fix make 3.82 syntax issues
diff --git a/gnome2-libs/libcanberra/PRE_BUILD b/gnome2-libs/libcanberra/PRE_BUILD
deleted file mode 100755
index 6c90aa8..0000000
--- a/gnome2-libs/libcanberra/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}" &&
-patch "$SOURCE_DIRECTORY"/Makefile.in \
-      "$SPELL_DIRECTORY"/make.patch
diff --git a/gnome2-libs/libcanberra/libcanberra-0.23.tar.gz.sig b/gnome2-libs/libcanberra/libcanberra-0.23.tar.gz.sig
deleted file mode 100644
index b63ac88..0000000
Binary files a/gnome2-libs/libcanberra/libcanberra-0.23.tar.gz.sig and /dev/null differ
diff --git a/gnome2-libs/libcanberra/libcanberra-0.26.tar.gz.sig b/gnome2-libs/libcanberra/libcanberra-0.26.tar.gz.sig
new file mode 100644
index 0000000..cffb3f6
Binary files /dev/null and b/gnome2-libs/libcanberra/libcanberra-0.26.tar.gz.sig differ
diff --git a/gnome2-libs/libcanberra/make.patch b/gnome2-libs/libcanberra/make.patch
deleted file mode 100644
index 6545d0a..0000000
--- a/gnome2-libs/libcanberra/make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libcanberra-0.23.orig/Makefile.in libcanberra-0.23/Makefile.in
---- libcanberra-0.23.orig/Makefile.in	2010-10-06 16:12:23.227000071 -0700
-+++ libcanberra-0.23/Makefile.in	2010-10-06 16:16:31.841999901 -0700
-@@ -936,11 +936,11 @@
- 
- 
- @GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE at install-data-local:
-- at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@                if test -z "$(DESTDIR)" ; then \
-- at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@                        for p in $(schemas_DATA) ; do \
-- at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-- at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@                        done \
-- at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@                fi
-+ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@	if test -z "$(DESTDIR)" ; then \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@		for p in $(schemas_DATA) ; do \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@		done \
-+ at GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GTK_TRUE@	fi
- @GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_GTK_TRUE at install-data-local:
- @HAVE_GTK_FALSE at install-data-local:
- 
diff --git a/gnome2-libs/nautilus2/DETAILS b/gnome2-libs/nautilus2/DETAILS
index 05bf64d..5b73b2e 100755
--- a/gnome2-libs/nautilus2/DETAILS
+++ b/gnome2-libs/nautilus2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nautilus2
-         VERSION=2.32.2
+         VERSION=2.32.2.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=nautilus-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/nautilus-$VERSION
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index 843b583..77891e7 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.32.2.1
+
 2010-12-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.32.2
 
diff --git a/gnome2-libs/nautilus2/nautilus-2.32.2.1.tar.bz2.sig b/gnome2-libs/nautilus2/nautilus-2.32.2.1.tar.bz2.sig
new file mode 100644
index 0000000..0f62205
Binary files /dev/null and b/gnome2-libs/nautilus2/nautilus-2.32.2.1.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus2/nautilus-2.32.2.tar.bz2.sig b/gnome2-libs/nautilus2/nautilus-2.32.2.tar.bz2.sig
deleted file mode 100644
index b5e7630..0000000
Binary files a/gnome2-libs/nautilus2/nautilus-2.32.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/vino/DETAILS b/gnome2-libs/vino/DETAILS
index 69bac5a..4ae6309 100755
--- a/gnome2-libs/vino/DETAILS
+++ b/gnome2-libs/vino/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vino
-         VERSION=2.32.0
+         VERSION=2.32.1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/vino/HISTORY b/gnome2-libs/vino/HISTORY
index 43515f1..c2e6f20 100644
--- a/gnome2-libs/vino/HISTORY
+++ b/gnome2-libs/vino/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.32.1
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/gnome2-libs/vino/vino-2.32.0.tar.bz2.sig b/gnome2-libs/vino/vino-2.32.0.tar.bz2.sig
deleted file mode 100644
index 5888125..0000000
Binary files a/gnome2-libs/vino/vino-2.32.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/vino/vino-2.32.1.tar.bz2.sig b/gnome2-libs/vino/vino-2.32.1.tar.bz2.sig
new file mode 100644
index 0000000..7d144e7
Binary files /dev/null and b/gnome2-libs/vino/vino-2.32.1.tar.bz2.sig differ
diff --git a/gnu-verified.gpg b/gnu-verified.gpg
index e64e4de..86410eb 100644
Binary files a/gnu-verified.gpg and b/gnu-verified.gpg differ
diff --git a/gnustep-apps/gnustep-oolite/BUILD b/gnustep-apps/gnustep-oolite/BUILD
index 51d9513..3cbeadf 100755
--- a/gnustep-apps/gnustep-oolite/BUILD
+++ b/gnustep-apps/gnustep-oolite/BUILD
@@ -1 +1,6 @@
-default_build debug=no
+if [[ $OOLITE_DEVEL == "y" ]]; then
+  . ${INSTALL_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh &&
+  make -f Makefile release || return 1
+else
+  default_build debug=no || return 1
+fi
diff --git a/gnustep-apps/gnustep-oolite/CONFIGURE b/gnustep-apps/gnustep-oolite/CONFIGURE
new file mode 100755
index 0000000..94f1113
--- /dev/null
+++ b/gnustep-apps/gnustep-oolite/CONFIGURE
@@ -0,0 +1 @@
+config_query OOLITE_DEVEL "use development branch?" n
diff --git a/gnustep-apps/gnustep-oolite/DEPENDS b/gnustep-apps/gnustep-oolite/DEPENDS
index 7db3a20..2da08e6 100755
--- a/gnustep-apps/gnustep-oolite/DEPENDS
+++ b/gnustep-apps/gnustep-oolite/DEPENDS
@@ -1,5 +1,10 @@
-depends gnustep-gui &&
 depends sdl         &&
 depends sdl_image   &&
 depends sdl_mixer   &&
-depends sdl_gfx     
+depends sdl_gfx     &&
+if [[ ${OOLITE_DEVEL} == "y" ]]; then
+  depends gnustep-base &&
+  suggest_depends espeak "" "" "support for spoken text" || return 1
+else
+  depends gnustep-gui || return 1
+fi
diff --git a/gnustep-apps/gnustep-oolite/DETAILS b/gnustep-apps/gnustep-oolite/DETAILS
index 90f57d6..461db4f 100755
--- a/gnustep-apps/gnustep-oolite/DETAILS
+++ b/gnustep-apps/gnustep-oolite/DETAILS
@@ -1,4 +1,5 @@
            SPELL=gnustep-oolite
+if [[ ${OOLITE_DEVEL} == "n" ]]; then
          VERSION=1.65
           SOURCE=oolite-$VERSION-src.tar.gz
          SOURCE2=oolite-$VERSION-data.tar.gz
@@ -7,11 +8,19 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-$VERSION-src
    SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
   SOURCE2_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE2}
   SOURCE2_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE2}
-        WEB_SITE=http://oolite.aegidian.org/
      SOURCE_HASH=sha512:d660e36d3679fadd7bcdb862db62c6d8eebd0bf10f68f17a16d2d83bf3570bee0c678fb9c5446158189f66d358e475c5ef1234b3b875a75091b497979c6d0135
     SOURCE2_HASH=sha512:5d3ac8a42b4c0e46cf9a16da1bd8f32ceb730023d3b38fb3830d7031e44dfec92b465e8ae9e5a5815cd86c93540a17fedda324c42a9ebcae402ee412110b072e
+else
+         VERSION=1.74.2
+          SOURCE=oolite-dev-source-$VERSION.tar.bz2
+message "${MESSAGE_COLOR}SOURCE=${SOURCE}${DEFAULT_COLOR}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/oolite-dev-source-$VERSION
+   SOURCE_URL[0]=http://download.berlios.de/oolite-linux/${SOURCE}
+   SOURCE_URL[1]=ftp://ftp.alioth.net/oolite/${SOURCE}
+     SOURCE_HASH=sha512:39a2eeac1bab02c0fd0727d40282dcd0e64bbbaf971c06437b9cdbaa9a2a20498c644a4f59fb8d3d315779bbf55ade1175841179cd7159546302313c84d8ea40
+fi
+        WEB_SITE=http://oolite.aegidian.org/
       LICENSE[0]="Creative Commons"
-      LICENSE[1]="Creative Commons"
          ENTERED=20060118
         KEYWORDS="gnustep"
            SHORT="Oolite is a space sim game."
diff --git a/gnustep-apps/gnustep-oolite/HISTORY b/gnustep-apps/gnustep-oolite/HISTORY
index 366235b..3841590 100644
--- a/gnustep-apps/gnustep-oolite/HISTORY
+++ b/gnustep-apps/gnustep-oolite/HISTORY
@@ -1,3 +1,7 @@
+2011-01-08 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS, CONFIGURE, BUILD, INSTALL, PRE_BUILD:
+	  added optional support for the developer version
+
 2007-04-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: version update
 	* BUILD: added
diff --git a/gnustep-apps/gnustep-oolite/PRE_BUILD b/gnustep-apps/gnustep-oolite/PRE_BUILD
index 0c43d68..0461df4 100755
--- a/gnustep-apps/gnustep-oolite/PRE_BUILD
+++ b/gnustep-apps/gnustep-oolite/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build      &&
-unpack_file 2          &&
+if [[ $OOLITE_DEVEL == "n" ]]; then
+  unpack_file 2 || return 1
+fi &&
 cd $SOURCE_DIRECTORY   &&
 sedit 's/shared_obj/obj/g' GNUmakefile.postamble
diff --git a/graphics-libs/cimg/DETAILS b/graphics-libs/cimg/DETAILS
index dd25801..f031a61 100755
--- a/graphics-libs/cimg/DETAILS
+++ b/graphics-libs/cimg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cimg
-         VERSION=1.3.4
-     SOURCE_HASH=sha512:1a865b91251c6ae87b59007af8f9a78a44bc3203b55be1fc287e482e35bcd4afd91204d2bff5bd26f57fe442560e4271a4efbf9fb4167d236f1bdcda5612b42f
+         VERSION=1.4.6
+     SOURCE_HASH=sha512:ffb8b274d342f6d4bad61dcf8109efce467f5e94953fdb9cd29fa82b0a61a530e417f6555b6df56f2c80ac56a582d2b01e79632163d7e6832a73181436827cbe
           SOURCE=CImg-${VERSION}.zip
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/CImg-${VERSION}
diff --git a/graphics-libs/cimg/HISTORY b/graphics-libs/cimg/HISTORY
index 154c6b5..b67e6e6 100644
--- a/graphics-libs/cimg/HISTORY
+++ b/graphics-libs/cimg/HISTORY
@@ -1,3 +1,7 @@
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.6
+	* INSTALL: added link /usr/include/CImg.h -> /usr/include/cimg/CImg.h
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/graphics-libs/cimg/INSTALL b/graphics-libs/cimg/INSTALL
index bbfcff7..a979a13 100755
--- a/graphics-libs/cimg/INSTALL
+++ b/graphics-libs/cimg/INSTALL
@@ -3,6 +3,7 @@ cd ${SOURCE_DIRECTORY}  &&
 mkdir -p ${INSTALL_ROOT}/usr/include/${SPELL}  &&
 
 install CImg.h ${INSTALL_ROOT}/usr/include/${SPELL}  &&
+ln -sf "$TRACK_ROOT/usr/include/cimg/CImg.h" "$INSTALL_ROOT/usr/include/CImg.h" &&
 
 if [[ "${CIMG_PLUGINS}" == "y" ]]
 then
diff --git a/graphics-libs/libjpeg-turbo/DEPENDS b/graphics-libs/libjpeg-turbo/DEPENDS
new file mode 100755
index 0000000..5584a0a
--- /dev/null
+++ b/graphics-libs/libjpeg-turbo/DEPENDS
@@ -0,0 +1 @@
+depends autoconf
diff --git a/graphics-libs/libjpeg-turbo/DETAILS b/graphics-libs/libjpeg-turbo/DETAILS
index 21cb623..f7060f1 100755
--- a/graphics-libs/libjpeg-turbo/DETAILS
+++ b/graphics-libs/libjpeg-turbo/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libjpeg-turbo
-         VERSION=1.0.90
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:46c5523508d5510b0bef88708ccf378e85cbc40077f657596764460da173bf841bd92c3ba03104cb4b86bda06ffee18e7e4fab9c0c3f1d642a1171bf8e1cd166
-          SOURCE=$SPELL-$VERSION-$PATCHLEVEL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+         VERSION=1.0.90.1
+      PATCHLEVEL=0
+     SOURCE_HASH=sha512:d231aedb53967d03d6db8f573b6b4aef851915fd2ef23edc6a1d7b496bc820a9df43535347735ea759c47084e7630fbb439aa3c221b0a30eecd334d4500897d4
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
 #   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[0]=http://dev.gentoo.org/~anarchy/dist/$SOURCE
         WEB_SITE=http://libjpeg-turbo.virtualgl.org/
diff --git a/graphics-libs/libjpeg-turbo/HISTORY b/graphics-libs/libjpeg-turbo/HISTORY
index bae2ed4..8eee65a 100644
--- a/graphics-libs/libjpeg-turbo/HISTORY
+++ b/graphics-libs/libjpeg-turbo/HISTORY
@@ -1,3 +1,7 @@
+2011-01-05 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.90.1, SOURCE_DIRECTORY updated
+	* DEPENDS, PRE_BUILD: added, autoconf needed now
+
 2010-11-15 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS: update to 1.0.90-1
 
diff --git a/graphics-libs/libjpeg-turbo/PRE_BUILD b/graphics-libs/libjpeg-turbo/PRE_BUILD
new file mode 100755
index 0000000..f790e2e
--- /dev/null
+++ b/graphics-libs/libjpeg-turbo/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+autoreconf -v -i
diff --git a/graphics-libs/libraw/BUILD b/graphics-libs/libraw/BUILD
deleted file mode 100755
index 03348d6..0000000
--- a/graphics-libs/libraw/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-make                   
-
diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 3665b21..e26cc87 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,11 +1,17 @@
            SPELL=libraw
           SPELLX=LibRaw
-         VERSION=0.10.0
-     SOURCE_HASH=sha512:e4ccc8f34fae5d970989e71bec9d58aa91f612746a2c4c1c692f5fd68e19c3d7187a4b3fa33ed3db90cee919c2ecd9d6628bb8095a3aed857a0ef314fcd0a496
+         VERSION=0.12.2
           SOURCE=$SPELLX-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+         SOURCE2=LibRaw-demosaic-pack-GPL2-$VERSION.tar.gz
+         SOURCE3=LibRaw-demosaic-pack-GPL3-$VERSION.tar.gz
+     SOURCE_HASH=sha512:a8293bf0c225b7ccebfc8a6340525275ffc9fc4ac6b498a0c6f71e5957eae78a3705c02f68d64f11d64661b953aff63c15eab5fd0e4e54cedd6e5b57623e493f
+    SOURCE2_HASH=sha512:aee5f28eebfdd1ada8eaad076a0e6683ae4e7093c664f0ecb2d1fe7eec1537a22e67a6398d1faef4792cde946c861393c92f12b8253a56019609806dbe7ec515
+    SOURCE3_HASH=sha512:1b09029556d30c588f16cbde2e48e0edc54c360ec63bcb02e4099d67604c207a7a4c793d0d81e98a21469f885c7d78343dc7f1b9e7269faacaed5e910a75557c
         WEB_SITE=http://www.libraw.org/
    SOURCE_URL[0]=$WEB_SITE/data/$SOURCE
+  SOURCE2_URL[0]=$WEB_SITE/data/$SOURCE2
+  SOURCE3_URL[0]=$WEB_SITE/data/$SOURCE3
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
       LICENSE[0]=GPL
          ENTERED=20080913
         KEYWORDS="graphics photo"
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index c871324..98af787 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,14 @@
+2011-01-05 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.12.2
+
+2010-12-24 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.12.1, added LibRaw-demosaic-pack-GPL{2,3}
+	* PRE_BUILD: added to process LibRaw-demosaic-pack-GPL{2,3}
+
+2010-12-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.12.0
+	* BUILD, PRE_BUILD: removed
+
 2010-09-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.10.0
 
diff --git a/graphics-libs/libraw/PRE_BUILD b/graphics-libs/libraw/PRE_BUILD
index 8f0e210..0aa2c2d 100755
--- a/graphics-libs/libraw/PRE_BUILD
+++ b/graphics-libs/libraw/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-sed -i "s|/local||g;s|/usr|$INSTALL_ROOT/usr|g;s|-O4|$CXXFLAGS|" Makefile
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+unpack_file 2 &&
+unpack_file 3
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index decd7d4..998d6e7 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -34,11 +34,11 @@ config_query_list MESALIB_BUILD                                          \
 
 if [[ $MESALIB_BUILD == dri ]]; then
   if [[ "$MESALIB_VER" == "stable" ]]; then
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-                      savage sis tdfx trident unichrome ffb swrast"
+    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
+                      sis swrast tdfx unichrome"
   else
-    AVAILABLE_DRIVERS="i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
-                      tdfx unichrome swrast"
+    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
+                      sis swrast tdfx unichrome"
   fi &&
 
 config_query_multi MESALIB_DRIVERS                                       \
@@ -54,7 +54,7 @@ if [[ "$MESALIB_VER" == "stable" ]] || \
 
 config_query_multi MESALIB_GALLIUM                                       \
                    "What Gallium3D drivers woulld you like to build?"    \
-                   none intel radeon nouveau
+                   none svga intel radeon nouveau swrast
 
 else
 config_query_multi MESALIB_GALLIUM                                       \
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index f79f3e7..a9d7c92 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -18,10 +18,10 @@ fi
 
 case $MESALIB_VER in 
       stable)
-         VERSION=7.5.2
+         VERSION=7.8.2
   ;;
      feature)
-         VERSION=7.6.1
+         VERSION=7.9
   ;;
 developement)
          VERSION=7.9
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index a484577..b60e60d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,12 @@
+2011-01-07 Ladislav Hagara <hgr at vabo.cz>
+	* CONFIGURE: config_query_multi MESALIB_GALLIUM updated
+	* CONFIGURE: AVAILABLE_DRIVERS updated
+	* SUB_DEPENDS: added r600 to stable's AVAILABLE_DRIVERS
+
+2010-12-22 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 7.8.2 (stable), 7.9 (feature, developement)
+	* PRE_BUILD, gl_select.patch: patch removed
+
 2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* gl_select-scm.patch: fixes for glselect
 	* gl_select.patch: fixes for glselect
diff --git a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
deleted file mode 100644
index a4e40dd..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
deleted file mode 100644
index ff46b02..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
new file mode 100644
index 0000000..38ce699
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 01b02eb..92f6374 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,7 +1,7 @@
 default_pre_build                                            &&
 cd ${SOURCE_DIRECTORY}                                       &&
 if  [[  "$MESALIB_VER"  ==  "stable"  ]];  then
-  patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+  patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
 else
   patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
 
diff --git a/graphics-libs/mesalib/SUB_DEPENDS b/graphics-libs/mesalib/SUB_DEPENDS
index c6e04ca..cb287af 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -21,7 +21,7 @@ case $THIS_SUB_DEPENDS in
     . $GRIMOIRE/config_query_multi.function                              &&
    if [[ $MESALIB_BUILD == dri ]]; then
       if  [[  "$MESALIB_VER"  ==  "stable"  ]];  then
-         AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+         AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
       elif  [[  "$MESALIB_VER"  ==  "feature"  ]];  then
          AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
       else
diff --git a/graphics-libs/mesalib/gl_select.patch b/graphics-libs/mesalib/gl_select.patch
deleted file mode 100644
index c03b041..0000000
--- a/graphics-libs/mesalib/gl_select.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar Mesa-7.3.orig/src/mesa/Makefile Mesa-7.3/src/mesa/Makefile
---- Mesa-7.3.orig/src/mesa/Makefile	2009-02-08 22:21:58.000000000 +0000
-+++ Mesa-7.3/src/mesa/Makefile	2009-02-08 22:26:32.000000000 +0000
-@@ -114,14 +114,30 @@
- 
- install-headers:
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa
-+	$(INSTALL) -m 644  $(TOP)/include/GL/gl.h \
-+		$(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+	$(INSTALL) -m 644  $(TOP)/include/GL/glx.h \
-+		$(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+	$(INSTALL) -m 644  $(TOP)/include/GL/glxext.h \
-+		$(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+	$(INSTALL) -m 644  $(TOP)/include/GL/glext.h \
-+		$(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+	mkdir -p $(TOP)/include/GL/backups
-+	mv $(TOP)/include/GL/gl.h $(TOP)/include/GL/backups/
-+	mv $(TOP)/include/GL/glx.h $(TOP)/include/GL/backups/
-+	mv $(TOP)/include/GL/glxext.h $(TOP)/include/GL/backups/
-+	mv $(TOP)/include/GL/glext.h $(TOP)/include/GL/backups/
- 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
- 		$(DESTDIR)$(INSTALL_INC_DIR)/GL
-+	mv $(TOP)/include/GL/backups/* $(TOP)/include/GL/
- 
- install-libgl: default gl.pc install-headers
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.mesa
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- 	$(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
--		$(DESTDIR)$(INSTALL_LIB_DIR)
-+		$(DESTDIR)$(INSTALL_LIB_DIR)/.mesa/
- 	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- 
- install-osmesa: default osmesa.pc
-
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 2e3a95d..b1fef1d 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
 else
  if [[ $POPPLER_VER == devel ]]; then
-         VERSION=0.14.5
-     SOURCE_HASH=sha512:1267013ed138edb0c5a46c849650d090f433f1e8186e5a95cd6485c82f7321a7b5d3b0e0d6390a8c97f76d1547d151fdb3f89366b1561a954a88e8a72a1bb689
+         VERSION=0.16.0
+     SOURCE_HASH=sha512:6bcfeacc8f02700d13a889401a8f0c7fb9780e8737637d5637f790c810174176f58bcb54dace90fce51271be6fa94348bcc13d98106ecd526d8ad820c2286dea
  else
-         VERSION=0.14.5
-     SOURCE_HASH=sha512:1267013ed138edb0c5a46c849650d090f433f1e8186e5a95cd6485c82f7321a7b5d3b0e0d6390a8c97f76d1547d151fdb3f89366b1561a954a88e8a72a1bb689
+         VERSION=0.16.0
+     SOURCE_HASH=sha512:6bcfeacc8f02700d13a889401a8f0c7fb9780e8737637d5637f790c810174176f58bcb54dace90fce51271be6fa94348bcc13d98106ecd526d8ad820c2286dea
  fi
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 1e42648..caf6204 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.16.0
+
 2010-11-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.14.5
 
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index b292025..dcdca02 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* blender.desktop: added spanish comment
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/blender/desktop/blender.desktop b/graphics/blender/desktop/blender.desktop
index 247a9ad..cd543d8 100644
--- a/graphics/blender/desktop/blender.desktop
+++ b/graphics/blender/desktop/blender.desktop
@@ -5,6 +5,7 @@ Name[en_CA]=Blender
 Name[fr]=Blender
 Comment=3D modeling, animation and rendering
 Comment[en_CA]=3D modeling, animation and rendering
+Comment[es]=Modelado, animación y representación 3D
 Comment[fr]=Modélisation, animation et rendu 3D
 Exec=blender
 Icon=blender48x48.png
diff --git a/graphics/brlcad/DETAILS b/graphics/brlcad/DETAILS
index c2995f6..faf7c4d 100755
--- a/graphics/brlcad/DETAILS
+++ b/graphics/brlcad/DETAILS
@@ -1,9 +1,9 @@
            SPELL=brlcad
-         VERSION=7.12.4
+         VERSION=7.18.0
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:da2c39a64759ee5c5ed3fcc3f48283dac2079575fa4076a8d499369d7f81999fb0ffb5ac1169cf4ea6e367eb27026b1fa23c6761db68888dcc815fe45cdba772          
+     SOURCE_HASH=sha512:218c80c55dc87bfc6f9648f4947e438331144b5754c2d980df6aae6518acd625a1db216e717409ed61c042f5d0dd69f99bbfef4972b4ed47cfba3000595a1669
         WEB_SITE=http://brlcad.org/
          ENTERED=20050109
       LICENSE[0]="GPL"
diff --git a/graphics/brlcad/HISTORY b/graphics/brlcad/HISTORY
index c6b10ba..f422f17 100644
--- a/graphics/brlcad/HISTORY
+++ b/graphics/brlcad/HISTORY
@@ -1,3 +1,6 @@
+2010-12-24 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: updated spell to 7.18.0
+
 2008-09-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 7.12.4. Removed BUILD_API=2.
 	  Switched to SOURCE_HASH. Updated SOURCE_DIRECTORY
@@ -12,7 +15,7 @@
 2005-01-15 Richard Johns <johnsr at lincoln.ac.nz>
 	* DEPENDS: add libpng, zlib as external depends
 	* PRE_BUILD: added, config.patch so config can link to libpng
-	  this prevents png build. 
+	  this prevents png build.
 
 2005-01-09 Richard Johns <johnsr at lincoln.ac.nz>
 	* DETAILS, DEPENDS: created spell
diff --git a/graphics/f-spot/DETAILS b/graphics/f-spot/DETAILS
index c87409a..c3846b3 100755
--- a/graphics/f-spot/DETAILS
+++ b/graphics/f-spot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=f-spot
-         VERSION=0.8.0
+         VERSION=0.8.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/f-spot/HISTORY b/graphics/f-spot/HISTORY
index 6211099..079ddda 100644
--- a/graphics/f-spot/HISTORY
+++ b/graphics/f-spot/HISTORY
@@ -1,3 +1,7 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8.2
+	* PRE_BUILD, {mono-2.8.1-f-stop,empty-crash}.patch: patches removed
+
 2010-11-20 George Sherwood <gsherwood at sourcemage.org>
 	* PRE_BUILD: Added for 3 patches
 	* mono-2.8.1-f-stop.patch: patch for mono 2.8.1
diff --git a/graphics/f-spot/PRE_BUILD b/graphics/f-spot/PRE_BUILD
index b78b0b3..fbd82cc 100755
--- a/graphics/f-spot/PRE_BUILD
+++ b/graphics/f-spot/PRE_BUILD
@@ -1,5 +1,3 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/mono-2.8.1-f-stop.patch &&
-patch -p0 < $SPELL_DIRECTORY/f-stop-PixbufLoader.patch &&
-patch -p0 < $SPELL_DIRECTORY/empty-crash.patch
+patch -p0 < $SPELL_DIRECTORY/f-stop-PixbufLoader.patch
diff --git a/graphics/f-spot/empty-crash.patch b/graphics/f-spot/empty-crash.patch
deleted file mode 100644
index 18b62ca..0000000
--- a/graphics/f-spot/empty-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Clients/MainApp/FSpot/App.cs
-+++ src/Clients/MainApp/FSpot/App.cs
-@@ -223,7 +223,7 @@ namespace FSpot
-         {
-             // Some users get wonky URIs here, trying to work around below.
-             // https://bugzilla.gnome.org/show_bug.cgi?id=629248
--            if (path.StartsWith ("gphoto2:usb:")) {
-+            if (path != null && path.StartsWith ("gphoto2:usb:")) {
-                 path = String.Format ("gphoto2://[{0}]", path.Substring (8));
-             }
- 
diff --git a/graphics/f-spot/f-spot-0.8.0.tar.bz2.sig b/graphics/f-spot/f-spot-0.8.0.tar.bz2.sig
deleted file mode 100644
index 69eb3ea..0000000
Binary files a/graphics/f-spot/f-spot-0.8.0.tar.bz2.sig and /dev/null differ
diff --git a/graphics/f-spot/f-spot-0.8.2.tar.bz2.sig b/graphics/f-spot/f-spot-0.8.2.tar.bz2.sig
new file mode 100644
index 0000000..f7ca909
Binary files /dev/null and b/graphics/f-spot/f-spot-0.8.2.tar.bz2.sig differ
diff --git a/graphics/f-spot/mono-2.8.1-f-stop.patch b/graphics/f-spot/mono-2.8.1-f-stop.patch
deleted file mode 100644
index 63812d1..0000000
--- a/graphics/f-spot/mono-2.8.1-f-stop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs.orig	2010-11-20 19:50:45.520002431 -0600
-+++ lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs	2010-11-20 19:51:47.440002796 -0600
-@@ -62,8 +62,10 @@
- 		/// </param>
- 		public Rational (uint numerator, uint denominator)
- 		{
--			Numerator = numerator;
--			Denominator = denominator;
-+			if (denominator == 0)
-+				throw new ArgumentException ("denominator");
-+			this.numerator = numerator;
-+			this.denominator = denominator;
- 		}
- 
- #endregion
---- lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs.orig	2010-11-20 19:52:11.384002643 -0600
-+++ lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs	2010-11-20 19:52:43.948002767 -0600
-@@ -62,8 +62,10 @@
- 		/// </param>
- 		public SRational (int numerator, int denominator)
- 		{
--			Numerator = numerator;
--			Denominator = denominator;
-+			if (denominator == 0)
-+				throw new ArgumentException ("denominator");
-+			this.numerator = numerator;
-+			this.denominator = denominator;
- 		}
- 
- #endregion
diff --git a/graphics/feh/DETAILS b/graphics/feh/DETAILS
index 9658236..e5426b4 100755
--- a/graphics/feh/DETAILS
+++ b/graphics/feh/DETAILS
@@ -1,5 +1,5 @@
            SPELL=feh
-         VERSION=1.10
+         VERSION=1.10.1
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[1]=http://www.chaosdorf.de/~derf/feh/$SOURCE
         WEB_SITE=http://derf.homelinux.org/~derf/projects/feh/
          ENTERED=20011101
-     SOURCE_HASH=sha512:d8383d367dd32b80b88729cd4a2dd922e446a5dc6b5a22557dc7c2c5685002c40946b8c6d6819f7fcddeab24e91bf3d7987760b4f482aea5a857f5d74c5dd5d9
+     SOURCE_HASH=sha512:0caf2800530b42d05470650051a0f2f4cfcd4a9f455b78691d0e2b21fd28c3a755202374db993baaa3ea75f313071b0e85dd370e766437f717009b5d510be620
       LICENSE[0]=GPL
         KEYWORDS="graphics"
            SHORT="A fast, lightweight image viewer which uses imlib2"
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index 95f6a0d..b0797c5 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,6 @@
+2010-12-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.10.1
+
 2010-11-04 David C. Haley <khoralin at gmail.com>
 	* DEPENDS: added libxinerama
 
diff --git a/graphics/fotoxx/DETAILS b/graphics/fotoxx/DETAILS
index 95a7674..d92da76 100755
--- a/graphics/fotoxx/DETAILS
+++ b/graphics/fotoxx/DETAILS
@@ -1,8 +1,8 @@
            SPELL=fotoxx
-         VERSION=10.10.1
+         VERSION=10.12.1
           SOURCE="${SPELL}-$VERSION.tar.gz"
    SOURCE_URL[0]=http://kornelix.squarespace.com/storage/downloads/${SOURCE}
-     SOURCE_HASH=sha512:063c632917ad6b0ec78c98bc26a03980e8f6817cc3b44c2504c6edc6fd3af5dca9963cd09a6580dbb9efa1117018ec226d085ecdc47affa2dff66d4b1bba0483
+     SOURCE_HASH=sha512:858f99e2425ef6783d6b5d285bca0b3d3386b22bc86923f0d780515aeac4ff2b6d123adc82828cee99bf39651c16e5663fc9ce8a76ecb4bcb51ccba691429db6
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
         WEB_SITE="http://kornelix.squarespace.com/fotoxx"
       LICENSE[0]=GPL
diff --git a/graphics/fotoxx/HISTORY b/graphics/fotoxx/HISTORY
index 4feed96..f50bde4 100644
--- a/graphics/fotoxx/HISTORY
+++ b/graphics/fotoxx/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 10.12.1
+
 2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 10.10.1
diff --git a/graphics/gbdfed/HISTORY b/graphics/gbdfed/HISTORY
index f8f550c..14c38d3 100644
--- a/graphics/gbdfed/HISTORY
+++ b/graphics/gbdfed/HISTORY
@@ -1,3 +1,7 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: added, to apply the patch
+	* deprecated.patch: added, to fix compilation with GTK+ >=2.22
+
 2010-04-24 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.6; changed source ext
 	* PRE_BUILD, Makefile.in.patch, getline.patch: removed
diff --git a/graphics/gbdfed/PRE_BUILD b/graphics/gbdfed/PRE_BUILD
new file mode 100755
index 0000000..aebd0f4
--- /dev/null
+++ b/graphics/gbdfed/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/deprecated.patch"
diff --git a/graphics/gbdfed/deprecated.patch b/graphics/gbdfed/deprecated.patch
new file mode 100644
index 0000000..7343b3e
--- /dev/null
+++ b/graphics/gbdfed/deprecated.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2010-04-16 18:38:59.000000000 +0400
++++ Makefile.in	2011-01-04 15:06:34.227158301 +0300
+@@ -27,9 +27,7 @@
+ CC = @CC@
+ CFLAGS = @XX_CFLAGS@ @CFLAGS@
+ 
+-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED
++DEFINES = @DEFINES@
+ 
+ SRCS = bdf.c \
+        bdfcons.c \
diff --git a/graphics/gexiv2/DETAILS b/graphics/gexiv2/DETAILS
index 95086f1..abcc52d 100755
--- a/graphics/gexiv2/DETAILS
+++ b/graphics/gexiv2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gexiv2
           SPELLX=libgexiv2
-         VERSION=0.2.1
-     SOURCE_HASH=sha512:8906d22ed8cfd08198f9a14b27c94123292f1cc962cb2460a1706eafdcb6ad066e6423c777cf03e0aed429c37d45f3b529a613e74cb84bf13465eeb8550bb634
+         VERSION=0.2.2
+     SOURCE_HASH=sha512:223aec3715e9993b4dc0628ec3b3eebf22bde40defe3dd0deed7f8633a1123795d7ca61e1908d4c13bbce98798d9b3076722f5ad5ced82ace7fc505c4c249092
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://trac.yorba.org/wiki/gexiv2
diff --git a/graphics/gexiv2/HISTORY b/graphics/gexiv2/HISTORY
index b831161..3012cdd 100644
--- a/graphics/gexiv2/HISTORY
+++ b/graphics/gexiv2/HISTORY
@@ -1,3 +1,6 @@
+2010-12-24 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.2.2
+
 2010-09-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.2.1
 
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 3429bc1..d436676 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.6-2
+         VERSION=6.6.6-10
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:637c29c1705df2af649b6d3c8561b0093bcbd20ca6830f2593a2b563791acc287d0141693f510828ddb50126f964fea4271711afe775a473a0ecd8914b52ea79
+     SOURCE_HASH=sha512:a63df8693850ce6ce4420a515ed0da5abb4531ba6fb9d7a3f0d9d3730801c76a369034d9bb76aea56320a6954d0c9076efd071bf8b7ff3bbe313da8b4db36bed
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 19fa4a4..80149b5 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,12 @@
+2011-01-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.6-10
+
+2010-12-31 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.6-8
+
+2010-12-22 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.6-6
+
 2010-12-04 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 6.6.6-2
 
diff --git a/graphics/keyjnote/HISTORY b/graphics/keyjnote/HISTORY
index 84e0d6b..c4ed527 100644
--- a/graphics/keyjnote/HISTORY
+++ b/graphics/keyjnote/HISTORY
@@ -1,2 +1,5 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* keyjnote.desktop: added spanish comment
+
 2007-03-24 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, DEPENDS, BUILD, INSTALL, HISTORYdesktop/keyjnote.desktop, : created spell
diff --git a/graphics/keyjnote/desktop/keyjnote.desktop b/graphics/keyjnote/desktop/keyjnote.desktop
index 8a4b5e6..3a3475a 100644
--- a/graphics/keyjnote/desktop/keyjnote.desktop
+++ b/graphics/keyjnote/desktop/keyjnote.desktop
@@ -4,6 +4,7 @@ Version=0.9.4
 Name=keyjnote
 Type=Application
 Comment=a program that displays presentation slides
+Comment[es]=un programa que muestra diapositivas de presentación
 Exec=keyjnotes.py
 Icon=
 Categories=Application;Office;Presentation;
diff --git a/graphics/shotwell/DETAILS b/graphics/shotwell/DETAILS
index 0a04dd3..6af0fca 100755
--- a/graphics/shotwell/DETAILS
+++ b/graphics/shotwell/DETAILS
@@ -1,11 +1,11 @@
            SPELL=shotwell
-         VERSION=0.7.2
+         VERSION=0.8.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://yorba.org/download/shotwell/0.7/$SOURCE
+   SOURCE_URL[0]=http://yorba.org/download/shotwell/${VERSION::3}/$SOURCE
         WEB_SITE=http://yorba.org/shotwell/
          ENTERED=20100709
-     SOURCE_HASH=sha512:f81f4d420389184c2db784c914cd07fc3168bb5d861e12b48f7d1800d8a1a7f952e7a76455e108bd1c2c3320c49660a498272f53a8cd857889bee4816fe2954c
+     SOURCE_HASH=sha512:f190e47768af938391211c81b9ffc28feaf1dfc8784d762fc76e4a5c2697b169e039559efa1da5c0985d3aff013f6be9af7161bd1c464e7113c588400cfd308c
       LICENSE[0]=GPL
             SHORT="digital photo organizer"
 cat << EOF
diff --git a/graphics/shotwell/HISTORY b/graphics/shotwell/HISTORY
index abe402b..424a6df 100644
--- a/graphics/shotwell/HISTORY
+++ b/graphics/shotwell/HISTORY
@@ -1,3 +1,6 @@
+2010-12-24 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8.0, added ${VERSION::3} into SOURCE_URL[0]
+
 2010-09-21 PHilippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* DEPENDS: Adding libgphoto2 as dep
 
diff --git a/graphics/vym/DETAILS b/graphics/vym/DETAILS
index dbc429d..ddef12c 100755
--- a/graphics/vym/DETAILS
+++ b/graphics/vym/DETAILS
@@ -1,8 +1,8 @@
            SPELL=vym
-         VERSION=1.12.6
+         VERSION=1.12.8
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:37083d5112268a6bfec3577c1d628d02902d48eb3ae632717a80b823ced6bdb042481c38d432568f76c3194c9b1c3e14b5f817d309bbcbe959c49517c192d51a
+     SOURCE_HASH=sha512:517f607005e47a413cd4f48dd6f19e926f4ebf0d6c923403ed8f7c634f77b24620c73c5d66119eaf5c6ffeba7b32f926c4e4eaa7abf58b1afd93364271e914c1
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.insilmaril.de/vym/"
       LICENSE[0]=GPL2
diff --git a/graphics/vym/HISTORY b/graphics/vym/HISTORY
index ccde657..e989145 100644
--- a/graphics/vym/HISTORY
+++ b/graphics/vym/HISTORY
@@ -1,3 +1,6 @@
+2010-12-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.12.8
+
 2010-03-25 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD, DETAILS, DEPENDS, desktop/vym.desktop: spell created
 
diff --git a/graphics/xplab/HISTORY b/graphics/xplab/HISTORY
index 3c52f3a..fd0846b 100644
--- a/graphics/xplab/HISTORY
+++ b/graphics/xplab/HISTORY
@@ -1,2 +1,5 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* xplab.desktop: added spanish comment
+
 2007-02-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, DEPENDS, BUILD, INSTALL, HISTORYdesktop/xplab.desktop, : created spell
diff --git a/graphics/xplab/desktop/xplab.desktop b/graphics/xplab/desktop/xplab.desktop
index ec73602..945a565 100644
--- a/graphics/xplab/desktop/xplab.desktop
+++ b/graphics/xplab/desktop/xplab.desktop
@@ -4,6 +4,7 @@ Version=0.3.1
 Name=xplab
 Type=Application
 Comment=a graphical tool for pattern matching
+Comment[es]=una herramienta gráfica para coincidencia de patrones
 Exec=xplab
 Icon=
 Categories=Applications;Utility
diff --git a/groups b/groups
index c7a708f..7391a26 100755
--- a/groups
+++ b/groups
@@ -109,5 +109,6 @@ prosody:182:
 dovenull:183:
 avahi-autoipd:184:
 mongodb:185:
+unbound:186:
 users:1000:
 nogroup:65534:
diff --git a/haskell/haskell-utf8-string/DEPENDS b/haskell/haskell-utf8-string/DEPENDS
new file mode 100755
index 0000000..8eace53
--- /dev/null
+++ b/haskell/haskell-utf8-string/DEPENDS
@@ -0,0 +1 @@
+depends ghc
diff --git a/haskell/haskell-utf8-string/DETAILS b/haskell/haskell-utf8-string/DETAILS
new file mode 100755
index 0000000..f053027
--- /dev/null
+++ b/haskell/haskell-utf8-string/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=haskell-utf8-string
+         VERSION=0.3.6
+          SOURCE="utf8-string-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/utf8-string/${VERSION}/${SOURCE}
+     SOURCE_HASH=sha512:9a61cabd459da0bd6667d52483a8f19ea72ac7e98618ddccb5f17e995ca7b023935407b7576ff2c88e1ab857fc3ea3b8227464fe459b453d92152451944119c6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/utf8-string-${VERSION}"
+        WEB_SITE="http://github.com/glguy/utf8-string/"
+      LICENSE[0]=BSD3
+         ENTERED=20101228
+           SHORT="Support for reading and writing UTF8 Strings"
+cat << EOF
+Description: A UTF8 layer for IO and Strings. The utf8-string package
+provides operations for encoding UTF8 strings to Word8 lists and back,
+and for reading and writing UTF8 without truncation.
+EOF
diff --git a/haskell/haskell-utf8-string/HISTORY b/haskell/haskell-utf8-string/HISTORY
new file mode 100644
index 0000000..74f3c9a
--- /dev/null
+++ b/haskell/haskell-utf8-string/HISTORY
@@ -0,0 +1,4 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS, POST_REMOVE, POST_RESURRECT,
+	  PRE_RESURRECT: spell created
+
diff --git a/haskell/haskell-utf8-string/POST_REMOVE b/haskell/haskell-utf8-string/POST_REMOVE
new file mode 100755
index 0000000..cebb9b7
--- /dev/null
+++ b/haskell/haskell-utf8-string/POST_REMOVE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_REMOVE
diff --git a/haskell/haskell-utf8-string/POST_RESURRECT b/haskell/haskell-utf8-string/POST_RESURRECT
new file mode 100755
index 0000000..18c6ef5
--- /dev/null
+++ b/haskell/haskell-utf8-string/POST_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_POST_RESURRECT
diff --git a/haskell/haskell-utf8-string/PRE_RESURRECT b/haskell/haskell-utf8-string/PRE_RESURRECT
new file mode 100755
index 0000000..a88ddcb
--- /dev/null
+++ b/haskell/haskell-utf8-string/PRE_RESURRECT
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/HASKELL_PRE_RESURRECT
diff --git a/haskell/haskell-x11-xft/DEPENDS b/haskell/haskell-x11-xft/DEPENDS
new file mode 100755
index 0000000..a6d2e36
--- /dev/null
+++ b/haskell/haskell-x11-xft/DEPENDS
@@ -0,0 +1,5 @@
+depends ghc &&
+depends haskell-x11 &&
+depends haskell-utf8-string &&
+depends libxft &&
+depends libxrender
diff --git a/haskell/haskell-x11-xft/DETAILS b/haskell/haskell-x11-xft/DETAILS
new file mode 100755
index 0000000..9ff7c61
--- /dev/null
+++ b/haskell/haskell-x11-xft/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=haskell-x11-xft
+         VERSION=0.3
+          SOURCE="X11-xft-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11-xft/${VERSION}/${SOURCE}
+     SOURCE_HASH=sha512:f112bdeda3b1dc7ad9ff0229cf844a8a0d7016764874551224750c45ecc3d0b87ded8590368d2c27f7d87c043788b5724582286db28954f4025f56633641d550
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-xft-${VERSION}"
+        WEB_SITE="http://hackage.haskell.org/package/X11-xft"
+      LICENSE[0]=LGPL
+         ENTERED=20101230
+           SHORT="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
+cat << EOF
+Bindings to the Xft, X Free Type interface library, and some Xrender parts
+EOF
diff --git a/haskell/haskell-x11-xft/HISTORY b/haskell/haskell-x11-xft/HISTORY
new file mode 100644
index 0000000..7cb1268
--- /dev/null
+++ b/haskell/haskell-x11-xft/HISTORY
@@ -0,0 +1,3 @@
+2010-12-31 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-x11/BUILD b/haskell/haskell-x11/BUILD
new file mode 100755
index 0000000..23d79fc
--- /dev/null
+++ b/haskell/haskell-x11/BUILD
@@ -0,0 +1,4 @@
+default_build_configure &&
+# run without checking for errors:
+runhaskell Setup.hs configure --prefix=${INSTALL_ROOT}/usr
+runhaskell Setup.hs build
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index fa13ee9..f676bae 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,6 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: added to fix build process
+
 2010-05-23 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.5.0.0
 
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index a9a99fa..bdef95b 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* dillo.desktop: added generic name
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/http/dillo/desktop/dillo.desktop b/http/dillo/desktop/dillo.desktop
index cf5c92a..5dc1e77 100644
--- a/http/dillo/desktop/dillo.desktop
+++ b/http/dillo/desktop/dillo.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
index 1b29063..110e575 100644
--- a/http/dillo2/HISTORY
+++ b/http/dillo2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* dillo2.desktop: added generic name
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/http/dillo2/desktop/dillo.desktop b/http/dillo2/desktop/dillo.desktop
index cf5c92a..5dc1e77 100644
--- a/http/dillo2/desktop/dillo.desktop
+++ b/http/dillo2/desktop/dillo.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c66d003..a41d4b3 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=4.0b7
+         VERSION=4.0b8
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 93db3d4..62f0f9c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* firefox.desktop: added generic name
+
+2010-12-21 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 4.0b8
+
 2010-12-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.6.13, SECURITY_PATCH=38
 
diff --git a/http/firefox/desktop/firefox.desktop b/http/firefox/desktop/firefox.desktop
index 5c9bd1c..da3dc2a 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -6,3 +6,5 @@ Icon=/usr/lib/firefox/icons/mozicon128.png
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY
index ac5b931..8773515 100644
--- a/http/icecat/HISTORY
+++ b/http/icecat/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* icecat.desktop: added generic name
+
 2010-11-09 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 3.6.12, corrected source URL
 	* BUILD, CONFIGURE, DEPENDS: depends on cairo, corrected toolkit options
diff --git a/http/icecat/desktop/icecat.desktop b/http/icecat/desktop/icecat.desktop
index 529236b..dad0078 100644
--- a/http/icecat/desktop/icecat.desktop
+++ b/http/icecat/desktop/icecat.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 52cf3e2..554ecbe 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* links{,-dfb,-fb,-x11}.desktop: added generic name
+
 2010-11-14 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD, CONFIGURE: removed, not needed: js support is built-in now
 	* DEPENDS: added INSTALL_ROOT for ssl dep; removed deprecated sdl dep;
diff --git a/http/links-twibright/desktop/links-dfb.desktop b/http/links-twibright/desktop/links-dfb.desktop
index 14b7c85..17bbcfc 100644
--- a/http/links-twibright/desktop/links-dfb.desktop
+++ b/http/links-twibright/desktop/links-dfb.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/links-twibright/desktop/links-fb.desktop b/http/links-twibright/desktop/links-fb.desktop
index a91cdcd..b618d5c 100644
--- a/http/links-twibright/desktop/links-fb.desktop
+++ b/http/links-twibright/desktop/links-fb.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/links-twibright/desktop/links-x11.desktop b/http/links-twibright/desktop/links-x11.desktop
index e4ea493..50efc19 100644
--- a/http/links-twibright/desktop/links-x11.desktop
+++ b/http/links-twibright/desktop/links-x11.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/links-twibright/desktop/links.desktop b/http/links-twibright/desktop/links.desktop
index 55f0f95..92e6fdb 100644
--- a/http/links-twibright/desktop/links.desktop
+++ b/http/links-twibright/desktop/links.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=true
 Type=Application
 Categories=Application;Network;Browsers;
+GenericName=Web browser
+GenericName[es]=Navegador web
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index 0d892fe..60646e1 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -4,13 +4,14 @@ if [[ $NGINX_RELEASE == legacy ]]; then
   SECURITY_PATCH=1
      SOURCE_HASH=sha512:b8ec805b146eb4050b66987e00d23568cab8dfb620ad021b02e09aac6df37919d17e9ef6102b3b08fbb8b07262da46d595e263b3de62d83f0be624dd8a3822d8
 else
-         VERSION=0.7.67
+         VERSION=0.7.68
   SECURITY_PATCH=2
          SOURCE2=$SPELL-$VERSION.tar.gz.asc
      SOURCE2_URL=http://sysoev.ru/$SPELL/$SOURCE2
       SOURCE_GPG=sysoev.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 fi
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://sysoev.ru/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 2253177..b4e84a2 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,10 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* init.d/nginx: added graceful reload
+
+2010-12-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated stable to 0.7.68
+
 2010-06-22 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated stable to 0.7.67
 
diff --git a/http/nginx/init.d/nginx b/http/nginx/init.d/nginx
index 61b77be..93ec2ac 100644
--- a/http/nginx/init.d/nginx
+++ b/http/nginx/init.d/nginx
@@ -6,4 +6,15 @@ ARGS="-c /etc/nginx/nginx.conf"
 RUNLEVEL=3
 NEEDS="+network +remote_fs"
 
+reload() {
+  echo "Gracefully reloading Nginx web server..."
+
+  if [[ `nginx -v 2>&1 | cut -d. -f2` == 6 ]]; then
+    kill -HUP "$PIDFILE"
+  else
+    $PROGRAM -s reload
+  fi
+  evaluate_retval
+}
+
 . /etc/init.d/smgl_init
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 51f466d..71422ef 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -15,12 +15,17 @@ depends  zip &&
 depends  zlib &&
 
 depends  libxt &&
+depends  dbus-glib &&
 
 if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
    depends pango 
 fi &&
 
-#Not tested
+optional_depends  alsa-lib \
+                  "" "--disable-ogg --disable-wave" \
+                  "for audio support" &&
+
+# not tested
 optional_depends  openldap                         \
                   '--enable-ldap'                  \
                   '--disable-ldap'                 \
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index a2f340c..46704fa 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2011-01-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added missing dependencies
+	* blfs-mozconfig: don't force system nss cause it's checked in DEPENDS
+
 2010-12-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.11, SECURITY_PATCH=29
 
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index d3cf3c6..dea446d 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -8,31 +8,31 @@ cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
 #cp -v $SPELL_DIRECTORY/blfs-mozconfig mozilla/.mozconfig &&
 
 if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
-   sed -i '85iac_add_options --enable-system-cairo' .mozconfig
+   sed -i '78iac_add_options --enable-system-cairo' .mozconfig
 else
-   sed -i '85iac_add_options --disable-system-cairo' .mozconfig
+   sed -i '78iac_add_options --disable-system-cairo' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
-   sed -i '85iac_add_options --disable-mailnews' .mozconfig
+   sed -i '78iac_add_options --disable-mailnews' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
-   sed -i '85iac_add_options --disable-composer' .mozconfig
+   sed -i '78iac_add_options --disable-composer' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_JS" == "y" ]]; then
-   sed -i '85iac_add_options --enable-xpctools' .mozconfig
+   sed -i '78iac_add_options --enable-xpctools' .mozconfig
 else
-   sed -i '85iac_add_options --disable-xpctools' .mozconfig
+   sed -i '78iac_add_options --disable-xpctools' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_XINERAMA" == "y" ]]; then
-   sed -i '85iac_add_options --enable-xinerama' .mozconfig
+   sed -i '78iac_add_options --enable-xinerama' .mozconfig
 fi &&
 
 if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
-   sed -i '85iac_add_options --enable-pango' .mozconfig
+   sed -i '78iac_add_options --enable-pango' .mozconfig
 fi
 
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index 8d9b6d3..5074cd3 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -66,13 +66,6 @@ ac_add_options --enable-svg
 # the SeaMonkey binaries.
 ac_add_options --enable-ldap
 
-# These two options enable support for building SeaMonkey with
-# system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
-# lines to enable support for system-installed NSS/NSPR.
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
 # Uncomment this option if you desire support for dual-monitor
 # display of SeaMonkey using the X-Window Xinerama libraries.
 #ac_add_options --enable-xinerama
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 6ca2c01..d9e499e 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,3 +1,5 @@
 OPTS="$WEBKIT_SVG $OPTS" &&
 
-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 614484c..c031f68 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,16 +1,16 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=1.3.6
+         VERSION=1.3.9
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:3fc5ee5162e81beb2f0e3b7e9cbd327c5139d8d421a8c8ef563a6b0110786e84d5f6055318413d1d23dbfebe32c3c5b02e1953ead6a667e7d10baf688c3a8fda
+     SOURCE_HASH=sha512:fb1062fbe11cd54bd20c13b327e930b2a97fa3c2e418b866b07e0fb46f63759e015e9d2faf71425efbe510ae172a92409f76e8691375e248c0613055a98b621e
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
-         VERSION=1.2.5
-  SECURITY_PATCH=2
+         VERSION=1.2.6
+  SECURITY_PATCH=3
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:70f66b0253b79db0c2b5b8c8b71b70b374926f957b0ab79424993d4ae122602e6f0363c6750cba0655efd67a3ae5e89b5af2231897377c66a5d56bd8a97e695c
+     SOURCE_HASH=sha512:4ccb30e121d9011d82c24eed0c95c8430f79175d48eda0f4e10c3e3c17b5c4d784a637918594b3bb63d05fac4c8e295ffcbc4f8f2ce37885f5d75f2b8f07614c
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 744b756..9ea4619 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,15 @@
+2011-01-07 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: fixed multijob build
+
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.6, SECURITY_PATCH=3, #15926
+
+2010-12-24 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 1.3.9
+
+2010-12-19 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 1.3.7
+
 2010-11-13 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 1.3.6
 
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 71dfb7e..ed50e8d 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -38,10 +38,10 @@ optional_depends gst-plugins-base  \
                  "--disable-video" \
                  "for HTML5 streaming video support" &&
 
-#optional_depends gobject-introspection             \
-#                 "--enable-introspection"          \
-#                 "--disable-introspection"         \
-#                 "to enable introspection"         &&
+optional_depends gobject-introspection             \
+                 "--enable-introspection"          \
+                 "--disable-introspection"         \
+                 "to enable introspection"         &&
 
 optional_depends geoclue                             \
                  "--enable-geolocation"              \
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index a4d7370..ca9389f 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
            SPELL=webkitgtk3
-         VERSION=1.3.5
+         VERSION=1.3.9
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:90b1b3ab39f58c63afbc950d906eadd436d85628d1a84f901bacb60af980c675ca66a34fff0553e2682fa6015d6f5061efba5b680f664f6236b63dfde52dcad0
+     SOURCE_HASH=sha512:fb1062fbe11cd54bd20c13b327e930b2a97fa3c2e418b866b07e0fb46f63759e015e9d2faf71425efbe510ae172a92409f76e8691375e248c0613055a98b621e
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index a560e2e..04aee5d 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,10 @@
+2010-12-24 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.9
+
+2010-12-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.7
+	* DEPENDS: Added back optional_depends gobject-introspection
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index f62f35f..8f39847 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
 else
-         VERSION=1.6.0
-     SOURCE_HASH=sha512:749dcd0c0d1cea3067e013089bce2b71ef8f4aa497de74736ff8b4ccd775e81956f88bff5825b78c14c8f8d8f905597c026b52c2dca6032ff76d121f77c599c7
+         VERSION=1.7.0
+     SOURCE_HASH=sha512:a28f223d6171db47c2654cce3bc1e239b6cacb2bbc54f15b644e5130461039ed8e9ce167016f5cfc129759ae1c36965a37c3265b83ad3de44e81aaa494fc0bc8
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
 fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index afedbfa..e778442 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.0
+
 2010-11-25 Bor Kraljič <pyrobor at ver.si>
 	* PRE_BUILD: removed, #15829 fixed at kdegraphics4
 
diff --git a/kde4-apps/kipi-plugins4/DETAILS b/kde4-apps/kipi-plugins4/DETAILS
index d79167c..56c8983 100755
--- a/kde4-apps/kipi-plugins4/DETAILS
+++ b/kde4-apps/kipi-plugins4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=kipi-plugins4
-         VERSION=1.6.0
-     SOURCE_HASH=sha512:3b2339416e658fa30899b10a604b595aaa3ee999fc2aa95bb3a87f01671d3843ad8569fa38f49999e494902903fe6465702f127ed7db03066cfd3be2759c180c
+         VERSION=1.7.0
+     SOURCE_HASH=sha512:752f66b17031be68c8b4925fc23561108f8423c9bf82fe8084ee2dd35728955ee8d315fa9a643537c714e0665430331f7da7d62ae0200ad17ad6884eb0bd45bd
           SOURCE=${SPELL//4}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index 6565de2..65083f9 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.0
+
 2010-11-25 Bor Kraljič <pyrobor at ver.si>
 	* PRE_BUILD: removed, #15829 fixed at kdegraphics4
 
diff --git a/kde4-support/libdbusmenu-qt/DETAILS b/kde4-support/libdbusmenu-qt/DETAILS
index 22a8f6e..431ec67 100755
--- a/kde4-support/libdbusmenu-qt/DETAILS
+++ b/kde4-support/libdbusmenu-qt/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libdbusmenu-qt
-         VERSION=0.5.0
-     SOURCE_HASH=sha512:4bc28d245979852a5d9b1746f67b4d0b1b51bac9b9f410a8b9ccf81a4cc4c984f568bb896fa9650ab51eb272b4f39e9784aba0dac1a0ee976cdf714dc2081400
+         VERSION=0.6.6
+     SOURCE_HASH=sha512:9e41a8a60f2f7937fa0e26e2b1b430ae46bc4a67432aec715888c99303af61478a591066be9ed7b882e1fc0f109d3981654bec5d31089dcb2c038a1ecbef1075
       SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://people.canonical.com/~agateau/dbusmenu
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         KEYWORDS="dbus qt4"
            SHORT="qt support for DBusMenu protocol"
 cat << EOF
-dbusmenu-qt is a standalone library providing a way to import and export QMenu instances using the 
-DBusMenu protocol. 
+dbusmenu-qt is a standalone library providing a way to import and export
+QMenu instances using the
+DBusMenu protocol.
 EOF
diff --git a/kde4-support/libdbusmenu-qt/HISTORY b/kde4-support/libdbusmenu-qt/HISTORY
index 352cebc..4e1236b 100644
--- a/kde4-support/libdbusmenu-qt/HISTORY
+++ b/kde4-support/libdbusmenu-qt/HISTORY
@@ -1,3 +1,7 @@
+2010-12-19 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.6.6
+	  fixed long description wrap
+
 2010-06-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.5.0
 
diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
index 03b9f64..75cbf2b 100755
--- a/kde4/kde4-l10n/DETAILS
+++ b/kde4/kde4-l10n/DETAILS
@@ -1,7 +1,7 @@
 # the remaining details of this spell are provided by CONFIGURE
            SPELL=kde4-l10n
           SPELLX=kde-l10n
-         VERSION=4.5.4
+         VERSION=4.5.5
             SITE=$KDE_URL/stable/${VERSION}/src/$SPELLX
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
 source $SPELL_CONFIG
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 2753c3c..4a27b13 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS
index 59c1385..30f28c7 100755
--- a/kde4/kdeaccessibility4/DETAILS
+++ b/kde4/kdeaccessibility4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeaccessibility4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:b80ec7ba5bd085a56d006c2874251591c2b0cb2f8da311250358c0290e78460a1645198d4dab41c476e760cf3ead7b74380f215a3ff6b9add755e8fa745dbea5
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:c83f22e6c24db01649cae73d55308456d69aac5fbb2d7453071fbf5a963b28aa23f7c0f13dfbb3a30e924b06077c6a8d1180c2ace8c81cb76adf9d4dcb8fe509
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY
index 5794d84..62921c3 100644
--- a/kde4/kdeaccessibility4/HISTORY
+++ b/kde4/kdeaccessibility4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS
index 743667d..8161b1e 100755
--- a/kde4/kdeadmin4/DETAILS
+++ b/kde4/kdeadmin4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeadmin4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:43dd552afc562f43289f4f6593a5f0bae1d045f10d1bf67cab95d1827c96582e9c12d7a49a9c78012ba83c27f9135106dce5bbb0536dd59619c7786fb222c326
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:b801fb5d3af1e55d5d3d8b8deaea720868eb2f38f74b13ba019156a10b0ba8474097d7dbb99ae8d654cdcf71eb1fe68e5d6a2a031988f4c014bb719e2f9544e4
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY
index 663ddb7..700ea7c 100644
--- a/kde4/kdeadmin4/HISTORY
+++ b/kde4/kdeadmin4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdeartwork4/DETAILS b/kde4/kdeartwork4/DETAILS
index 38e6776..b4664fe 100755
--- a/kde4/kdeartwork4/DETAILS
+++ b/kde4/kdeartwork4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeartwork4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:1a9a6bf64acedd1e74fd8e10be55a27d398ab53eeb6a2e85645f5b2a67e71d70ff3db4d38091e5db3d801a038b3a01cdd3d7120a7a7f32257eebb9c0efc41f86
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:7298d061af52e9fc80d4e04e146b72dd1a9060d6d009cae76ad2768baadd44618de9f3a20d7a184d75411d78dae4c6c7a630b2ea8f26362296e192e3c591d0db
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeartwork4/HISTORY b/kde4/kdeartwork4/HISTORY
index a869b54..f5cea81 100644
--- a/kde4/kdeartwork4/HISTORY
+++ b/kde4/kdeartwork4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS
index e062c23..bc99da7 100755
--- a/kde4/kdebase-workspace4/DETAILS
+++ b/kde4/kdebase-workspace4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdebase-workspace4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:eccb8a5de3d392f7ee9c9aed4634a15f1a3af4e5dd7edd798c683d8828f2fa6346969c97dc7cb6b471dfa89e02ecc91adf0488ac1d686459e13606999c99f96f
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:9d1e70ca7d431703d6a705dab95bcb2b640731075f2e69408a6604a24dcb3fca110aba928e7ecff11d193fdfc967afe24d995fad60d5707798121408513b8c2c
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 0dc154f..78ce6e6 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdebase4-runtime/DETAILS b/kde4/kdebase4-runtime/DETAILS
index 0ec3363..8177db9 100755
--- a/kde4/kdebase4-runtime/DETAILS
+++ b/kde4/kdebase4-runtime/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdebase4-runtime
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:2e628347d59b78afdecc933a67bb5ab5066b464e76c378031fb7eddc37af5b3866c48f01410df8ae19652a89c55da618d6aa805ffa807297c59ebfe21e3a5e52
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:79e5731675d9674e858ceef4746e875a2424ea8d4af6780d04c3a899c7fe26c821535fca9fce4bb97a73a49b95dd9bc1006665b76551c67368da782dec7f584c
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 3ef9b0f..8f21164 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS
index ee8268b..c43f6ed 100755
--- a/kde4/kdebase4/DETAILS
+++ b/kde4/kdebase4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdebase4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:1b21646b5f78b3144cd229aa1d4c3ac14b189173c80f7853a31050125c8810bab3bb2c07bf1d942ab36b5a2cfea4d572acc26b41707ded6dabd57b34c3ff4265
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:0470aeaab0dda42c39847053a426d2b93cc85a3eb47b10209ebad47f16aacf379d4a04d23c0110bb4cebe0b5617574315b729099bada90e84e2136bba5228783
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 3d147d8..f6918c0 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
index 7b8ab57..c2e779d 100755
--- a/kde4/kdebindings4/DETAILS
+++ b/kde4/kdebindings4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdebindings4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:d5d5e39ae40b438ff0f2031355f7da55155e7723e8e4f942965b41506e1978b7ff80a720942b097ff47c3f9df8b30c74d46ede6e19183f74ec03eaf13591e448
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:3bf03394e72dec1829ff8432f6788e3a3869a88addb0137a3da09f8f730d5c76b7d27e82ff6613b99300595a251bc3c6e863e9971a5b17a41aab5426e19ab36e
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index 623b6c9..7318fa1 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,3 +1,9 @@
+2011-01-08 Bor Kraljič <pyrobor at ver.si>
+	* sip4.12.patch: fixes compile problem with sip 4.12
+
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdebindings4/PRE_BUILD b/kde4/kdebindings4/PRE_BUILD
index 948627a..14d11fe 100755
--- a/kde4/kdebindings4/PRE_BUILD
+++ b/kde4/kdebindings4/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-pyqt4-build.patch &&
 sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig:" \
-      ./cmake/modules/CMakeCSharpInformation.cmake
+      ./cmake/modules/CMakeCSharpInformation.cmake &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/sip4.12.patch
diff --git a/kde4/kdebindings4/sip4.12.patch b/kde4/kdebindings4/sip4.12.patch
new file mode 100644
index 0000000..4a5c16e
--- /dev/null
+++ b/kde4/kdebindings4/sip4.12.patch
@@ -0,0 +1,93 @@
+--- pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip	2010-12-26 00:33:58.884995287 +0100
++++ pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip	2010-12-26 00:34:36.146000281 +0100
+@@ -582,90 +582,6 @@ template <TYPE1,TYPE2*>
+ %End
+ };
+ 
+-template <TYPE>
+-%MappedType QSet<TYPE>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    QSet<TYPE> set = *sipCpp;
+-    int i = 0;
+-    foreach (TYPE value, set)
+-    {
+-        PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+-        {
+-            Py_DECREF(l);
+-
+-            if (obj)
+-                Py_DECREF(obj);
+-
+-            return NULL;
+-        }
+-
+-        Py_DECREF(obj);
+-        i++;
+-    }
+-   
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-    }
+-
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-            if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+-                return 0;
+-    }
+-
+-    QSet<TYPE> *qs = new QSet<TYPE>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        int state;
+-
+-        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+- 
+-        if (*sipIsErr)
+-        {
+-            sipReleaseType(t, sipType_TYPE, state);
+-
+-            delete qs;
+-            return 0;
+-        }
+-
+-        *qs << *t;
+-
+-        sipReleaseType(t, sipType_TYPE, state);
+-    }
+- 
+-    *sipCppPtr = qs;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE1,TYPE2>
+ %MappedType QPair<TYPE1,TYPE2>
+ {
diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS
index dd087a0..20238ae 100755
--- a/kde4/kdeedu4/DETAILS
+++ b/kde4/kdeedu4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeedu4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:42ab4cebecc55a58e22a248ccb33447f5cd71bc6dbf321a8ae8b0fb3f4a301a1adacac0f6108e5e9bbec15dc57ac31f2e6e409b268b37e5b1e86d65adb5c023b
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:23a36d204b281f9d5182ef1c9024fddc7fbf1917f06a7a478bba733acfdc00731212895d5a831d1ff4a710c04d28639f8808fe4199c8bf702ed64541968037bf
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index 1576bfc..b6f03ad 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
index 9eb61af..122887e 100755
--- a/kde4/kdegames4/DETAILS
+++ b/kde4/kdegames4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdegames4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:0a7c28b104f37a64d31b9981dfc714f8344c6e184159231fba4109a7d3e1319976cca1d5310fc7798ee0ee83c019b930a68fd1e3f122005d20314339362e941d
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:b26207f83502a7d0fffd067a39600665b3e1a67d92a16a449350f970facad808610a459f995b7fe17e1c3860d40084e7a33f3fb38a49519f5b65b1d5d8738ce0
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 80b12ef..d9e084f 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS
index 8aef70d..5aea023 100755
--- a/kde4/kdegraphics4/DETAILS
+++ b/kde4/kdegraphics4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdegraphics4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:ba037a46975065ef73015089ec431317aff324991b7138f1b3cf11ab41d3bd01ecf196451a85f653e9ece75678f43d603efce6238307151700d5955c6cb77ccb
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:62ce7b816c33dc59179159992d38ef60225ceb5df264bcae84047b810abb66ce424c6174d144b60e990636df4338e6c7bb82ec9ded71557ea9037355e48a0423
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index f029a9b..354dfd6 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdelibs4/DETAILS b/kde4/kdelibs4/DETAILS
index 2dea251..150d9f8 100755
--- a/kde4/kdelibs4/DETAILS
+++ b/kde4/kdelibs4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdelibs4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:535722d463dfa51eb4cf57531f8564815db3853dc576b74e50b0458999c209b52e8235b8e808cc5fe4983398ad3d748c882076485da6ac9eb4cf0a4f2fa21744
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:3a15dbcd04fce8ba53b498c171e75ae5993a0818fe9cf5683845a6cd59011549304246474a4224fea1d45373523999a83a919c9ad181cfa0bca2475fba588d5f
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 2391343..15ce380 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index 06b99a7..1953bf2 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdemultimedia4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:670ae491661b631a8e95ab933fa64e5eee9dfcc7d740c21eff793af0b637a2dace6ac6931e3018466d085f9d0e224d1df1f5d536e8a4f381d6b2f14b42894cf5
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:112eda743deca26e7ec473b1fc4d78ee5b3fab43b1b39c80bb676bee6922694fb44cbb69fb19c5911777a10c78f8f9fd0e64b1f438e2aabdeb838143e1e04992
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index 3de43a6..ee878ee 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index 0ea2ce7..42f6084 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdenetwork4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:7d0c3948f5524228c834e3b2f9188e5ddc4a05b61903fa3b5d13de078f2acc4eb4b583130b7a4d49831b956ed6fbc91f9c964b97c1c9ff6af0a615dd560129e0
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:906fd0e80d683b74f840b1d2bbbfce08abdeca1b2b95208d79cae0f11a29a393351a2d45ef4bfe8e57057a95760848e978020724961ad394f48df126323eaea3
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index cef27c5..5921461 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS
index 6604a21..095f7e8 100755
--- a/kde4/kdepimlibs4/DETAILS
+++ b/kde4/kdepimlibs4/DETAILS
@@ -1,9 +1,9 @@
            SPELL=kdepimlibs4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
+         VERSION=4.5.5
 #     SOURCE_HASH=sha512:b1c2f9f9af8a5d23cb304a3f3a586f8f769707e546446f608e2141077d6cbf63f89e1fe19d7e0c5b143ff2c1da76d37c85c75d4fd33b5e55d0732dc8d1f28e26
           SOURCE=$SPELLX-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:b2b9afd19edde11f005d64e82c3f5d2ecbe4d84e5365ab6434a68dd071ed8f243df6082edaf38e989ffece421772c9d98f3293fcf098193d9ca26790e4d6833b
+     SOURCE_HASH=sha512:6ce7959f709f9b82bbe4ffe7d40883ebf07e5273ca478e426ad217e7ee0a1a141f55899d3151ca8f40096ece66199a29ad2d3ee0be4b09099ad5d8a06cada982
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.kde.org
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index f644af7..3b4adea 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdeplasmoids4/DETAILS b/kde4/kdeplasmoids4/DETAILS
index 30160db..f86ecd0 100755
--- a/kde4/kdeplasmoids4/DETAILS
+++ b/kde4/kdeplasmoids4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeplasmoids4
           SPELLX=kdeplasma-addons
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:eb9b1b903b92976d91323a4c21511cfebaf8f797b1f68c9343654d414158c865c705e32c139788b63a20b6ce86bcdaa7e70952f812a219639702a5e2845c61ce
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:ecff271d3140865c41878cfe01b305d4a43b0a9a957756971edd8c52a1fffef8e55bbd95f19457dfcf6066e23257cfa1cff1f5be834c101e7ea777aae8cd02ea
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeplasmoids4/HISTORY b/kde4/kdeplasmoids4/HISTORY
index 54f83ce..2678d91 100644
--- a/kde4/kdeplasmoids4/HISTORY
+++ b/kde4/kdeplasmoids4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index 87cb828..94abb9b 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdesdk4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:b8a73c87119d59c9095150794e4df4ab8be9c532713af3187df6198e71d6b5a0ed100be64cf602a24425c247ea3867eecdfe4c5048c2e7121f96d8fafa026610
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:32a1775e846dc61d3c0260ef27917b02e6d753ea17abff6b6cbbcc2369fefa8c21ba8f606adc036fa090ac98db3cfb5092a285a5343b36c97fdd0d2e63ae085e
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index e805e02..b444ba1 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS
index 4b24f97..5321594 100755
--- a/kde4/kdetoys4/DETAILS
+++ b/kde4/kdetoys4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdetoys4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:0c687cbc8bacce862a78ea815d278f6dbbd45d7fb20af38b96e34193b7a12c49b703f1374e097d857d07b9af8f369eecf831ebd58b711d215f6cef8d72f05d52
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:413bb7140eb5c28fb8b090d6dd6459608e246ae786b643fdf87e7e3a79e49e2acc9f333002eb3deb9065d5c1522229e3bb2c42d4d38294d7318787e2df75dfd2
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY
index 8b8c216..0e53987 100644
--- a/kde4/kdetoys4/HISTORY
+++ b/kde4/kdetoys4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS
index f7c480e..1b0ba59 100755
--- a/kde4/kdeutils4/DETAILS
+++ b/kde4/kdeutils4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdeutils4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:7a06fcd7ce1c42b1d67c806129cdfd0c6a06693df551afdad581ce46f1cef238b77538ab78f15fbf27ee68cd1c6c653f88ff5902fa70c70058e5027784cdd017
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:ef778167abe9889f4ea31f6d740d3a01c0dfb80ae931fab59dead153c3ca72dd3e6230169ad1284e84bf617cfc691db86b735eb241e43fb842426c35a6e57020
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index 09c2fd3..6158a6f 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/kdewebdev4/DETAILS b/kde4/kdewebdev4/DETAILS
index 79c3bfd..b6ab55f 100755
--- a/kde4/kdewebdev4/DETAILS
+++ b/kde4/kdewebdev4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdewebdev4
           SPELLX=${SPELL//4}
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:472eed36173cbb0db75027b9b5917025d208434cf2559f63a7bcded94e40f05dac3070e89ff84b848271788e25e34a21c8885d10237d76a8a8fb647528b0fa03
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:62ba7e4fa07e9862e50bcac4c0a34c2d860eb28737918ff3292e04c4af6094c65d01aa9c99822b6a861449a5e7024a102f07206954fcb723edd82c7073791e71
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdewebdev4/HISTORY b/kde4/kdewebdev4/HISTORY
index dd76f0c..6557350 100644
--- a/kde4/kdewebdev4/HISTORY
+++ b/kde4/kdewebdev4/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kde4/oxygen-icons/DETAILS b/kde4/oxygen-icons/DETAILS
index fc99bd5..b0bc151 100755
--- a/kde4/oxygen-icons/DETAILS
+++ b/kde4/oxygen-icons/DETAILS
@@ -1,6 +1,6 @@
            SPELL=oxygen-icons
-         VERSION=4.5.4
-     SOURCE_HASH=sha512:cae618bfe855425bbf86ddc6a74732f06433340fa0519e2980946787b3295b80909657e6401671b28bf8d892233e47bc5ede870ba428e33f0894f453db015894
+         VERSION=4.5.5
+     SOURCE_HASH=sha512:a596125a3bd9ced16ccfad0577a1c2230c384ce9e58feb227edaa029e3001befaf521ef5790101fd9ee95f96c5831519f35ddd15a71a671cd927eb136adf6ce9
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
diff --git a/kde4/oxygen-icons/HISTORY b/kde4/oxygen-icons/HISTORY
index 2b248cf..979fa80 100644
--- a/kde4/oxygen-icons/HISTORY
+++ b/kde4/oxygen-icons/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.5.5
+
 2010-12-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.4
 
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index f16a1b6..eaabdd9 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=kvm
-         VERSION=0.12.5
+         VERSION=0.13.0
           SOURCE=qemu-${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qemu-${SPELL}-${VERSION}
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index a6576b3..f67a88a 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.13.0
+
 2010-08-03 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Update to stable qemu-kvm branch, follows qemu with kvm modifications
 	* CONFIGURE: Query if KVM diagnostic/debug tools should be built
diff --git a/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig b/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig
deleted file mode 100644
index 63d0a1b..0000000
Binary files a/kernels/kvm/qemu-kvm-0.12.5.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig b/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig
new file mode 100644
index 0000000..327be7f
Binary files /dev/null and b/kernels/kvm/qemu-kvm-0.13.0.tar.gz.sig differ
diff --git a/kernels/linux-firmware/DETAILS b/kernels/linux-firmware/DETAILS
index d29af76..b56fb3b 100755
--- a/kernels/linux-firmware/DETAILS
+++ b/kernels/linux-firmware/DETAILS
@@ -1,5 +1,5 @@
            SPELL=linux-firmware
-         VERSION=20101103
+         VERSION=20101218
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$SOURCE
          SOURCE2=$SOURCE.sign
diff --git a/kernels/linux-firmware/HISTORY b/kernels/linux-firmware/HISTORY
index 9679bad..66fb880 100644
--- a/kernels/linux-firmware/HISTORY
+++ b/kernels/linux-firmware/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 20101218
+
 2010-11-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, BUILD, INSTALL: spell created, version 20101103
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 6e0caa8..dd6369c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2011-01-06 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: 2.6.37
+	* info/kernels/2.6.37: added
+	* info/patches/PRE_2_6/patch-2.6.37: added
+	* info/patches/maintenance_patches/patch-2.6.37: added
+
 2010-12-10 Ladislav Hagara <hgr at vabo.cz>
 	* latest.defaults: updated latest to patch-2.6.36.2
 	* info/patches/maintenance_patches/patch-2.6.36.2: added
diff --git a/kernels/linux/info/kernels/2.6.37 b/kernels/linux/info/kernels/2.6.37
new file mode 100755
index 0000000..e4e7020
--- /dev/null
+++ b/kernels/linux/info/kernels/2.6.37
@@ -0,0 +1,3 @@
+version="2.6.37"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.37 b/kernels/linux/info/patches/PRE_2_6/patch-2.6.37
new file mode 100755
index 0000000..28630f6
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.37
@@ -0,0 +1,5 @@
+patchversion="2.6.37"
+source=""
+source_url=""
+appliedkernels="2.6.37"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.37 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.37
new file mode 100755
index 0000000..28630f6
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.37
@@ -0,0 +1,5 @@
+patchversion="2.6.37"
+source=""
+source_url=""
+appliedkernels="2.6.37"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index de45d30..5c2d2fa 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
-LATEST_2_6=2.6.36
-LATEST_PRE_2_6=patch-2.6.36
-LATEST_maintenance_patches=patch-2.6.36.2
+LATEST_2_6=2.6.37
+LATEST_PRE_2_6=patch-2.6.37
+LATEST_maintenance_patches=patch-2.6.37
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/virtualbox-module/DETAILS b/kernels/virtualbox-module/DETAILS
index 774e8b1..709bd4a 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
            SPELL=virtualbox-module
-         VERSION=3.2.10
+         VERSION=4.0.0
           SOURCE=virtualbox-module-$VERSION.tar.gz
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY b/kernels/virtualbox-module/HISTORY
index d7c2706..c4406c1 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,9 @@
+2011-01-03 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.0.0
+
+2010-12-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.12
+
 2010-10-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.10
 
diff --git a/libs/cwiid/DEPENDS b/libs/cwiid/DEPENDS
new file mode 100755
index 0000000..68cf484
--- /dev/null
+++ b/libs/cwiid/DEPENDS
@@ -0,0 +1 @@
+depends BLUEZ
diff --git a/libs/cwiid/DETAILS b/libs/cwiid/DETAILS
new file mode 100755
index 0000000..2baea1a
--- /dev/null
+++ b/libs/cwiid/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=cwiid
+         VERSION=0.6.00
+          SOURCE="${SPELL}-${VERSION}.tgz"
+   SOURCE_URL[0]=http://abstrakraft.org/${SPELL}/downloads/${SOURCE}
+     SOURCE_HASH=sha512:a556f1e3ea2bebb54b333b31a0cd7e65ea8909da52af1cb585cf3d6503b7f37ed41f842166f28f1ac59c596f5191af3e114628daee3a84e4ac54cf804a7981de
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://abstrakraft.org/cwiid"
+      LICENSE[0]=GPL
+         ENTERED=20101226
+           SHORT="a userspace driver for the wiimote"
+cat << EOF
+CWiid is a working userspace driver along with various applications
+implementing event drivers, multiple wiimote connectivity, gesture recognition,
+and other Wiimote-based functionality.
+EOF
diff --git a/libs/cwiid/HISTORY b/libs/cwiid/HISTORY
new file mode 100644
index 0000000..4c4f44c
--- /dev/null
+++ b/libs/cwiid/HISTORY
@@ -0,0 +1,3 @@
+2010-12-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index f55cacf..f881333 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
   if [[ "$GLIBC_CVS" == "y" ]]; then
 local GLIBC_VERSION
-   GLIBC_VERSION=2.12.1
+   GLIBC_VERSION=2.12.2
     if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
          VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
     else 
@@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
       SOURCE_URL=cvs://:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
    SOURCE_IGNORE=volatile
   else
-         VERSION=2.12.1
+         VERSION=2.12.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          SOURCE2=$SOURCE.sig
@@ -45,7 +45,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       PATCHLEVEL=0
   fi
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.35
+ HEADERS_VERSION=2.6.36
          SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
          SOURCE6=${SOURCE3}.sign
   SOURCE6_IGNORE=signature
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index c010124..52b096d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2010-12-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.12.2, HEADERS_VERSION=2.6.36
+	* PRE_BUILD, glibc-2.12.1-never-expand-origin-when-privileged.patch,
+	  glibc-2.12.1-require-suid-on-audit.patch: patches removed
+
 2010-10-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: SECURITY_PATCH=1, #15892
 	* PRE_BUILD, glibc-2.12.1-never-expand-origin-when-privileged.patch,
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 197717e..8d99f5d 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -68,8 +68,6 @@ cd  $SOURCE_DIRECTORY                               &&
 patch  -p0  <  $SCRIPT_DIRECTORY/Makefile.patch     &&
 patch  -p1  <  $SCRIPT_DIRECTORY/as-test-x.patch &&
 patch -p1 < $SPELL_DIRECTORY/gcc45.patch &&
-patch -p1 < $SPELL_DIRECTORY/glibc-2.12.1-never-expand-origin-when-privileged.patch &&
-patch -p1 < $SPELL_DIRECTORY/glibc-2.12.1-require-suid-on-audit.patch &&
 
 # disabled libgd detection/building memusagestat for now until a better
 # fix has been found, bug #8277
diff --git a/libs/glibc/glibc-2.12.1-never-expand-origin-when-privileged.patch b/libs/glibc/glibc-2.12.1-never-expand-origin-when-privileged.patch
deleted file mode 100644
index 16c0448..0000000
--- a/libs/glibc/glibc-2.12.1-never-expand-origin-when-privileged.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 2232b90f0bd3a41b4d63cac98a5b60abbfaccd46 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab at redhat.com>
-Date: Mon, 18 Oct 2010 11:46:00 +0200
-Subject: [PATCH] Never expand $ORIGIN in privileged programs
-
----
- ChangeLog     |    6 ++++++
- elf/dl-load.c |   30 +++++++++++++-----------------
- 2 files changed, 19 insertions(+), 17 deletions(-)
-
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 0adddf5..1cc6f25 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -169,8 +169,7 @@ local_strdup (const char *s)
- 
- 
- static size_t
--is_dst (const char *start, const char *name, const char *str,
--	int is_path, int secure)
-+is_dst (const char *start, const char *name, const char *str, int is_path)
- {
-   size_t len;
-   bool is_curly = false;
-@@ -199,11 +198,6 @@ is_dst (const char *start, const char *name, const char *str,
- 	   && (!is_path || name[len] != ':'))
-     return 0;
- 
--  if (__builtin_expect (secure, 0)
--      && ((name[len] != '\0' && (!is_path || name[len] != ':'))
--	  || (name != start + 1 && (!is_path || name[-2] != ':'))))
--    return 0;
--
-   return len;
- }
- 
-@@ -218,13 +212,12 @@ _dl_dst_count (const char *name, int is_path)
-     {
-       size_t len;
- 
--      /* $ORIGIN is not expanded for SUID/GUID programs (except if it
--	 is $ORIGIN alone) and it must always appear first in path.  */
-+      /* $ORIGIN is not expanded for SUID/GUID programs.  */
-       ++name;
--      if ((len = is_dst (start, name, "ORIGIN", is_path,
--			 INTUSE(__libc_enable_secure))) != 0
--	  || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
--	  || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+      if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0
-+	   && !INTUSE(__libc_enable_secure))
-+	  || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
-+	  || (len = is_dst (start, name, "LIB", is_path)) != 0)
- 	++cnt;
- 
-       name = strchr (name + len, '$');
-@@ -256,9 +249,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
- 	  size_t len;
- 
- 	  ++name;
--	  if ((len = is_dst (start, name, "ORIGIN", is_path,
--			     INTUSE(__libc_enable_secure))) != 0)
-+	  if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
- 	    {
-+	      /* Ignore this path element in SUID/SGID programs.  */
-+	      if (INTUSE(__libc_enable_secure))
-+		repl = (const char *) -1;
-+	      else
- #ifndef SHARED
- 	      if (l == NULL)
- 		repl = _dl_get_origin ();
-@@ -266,9 +262,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
- #endif
- 		repl = l->l_origin;
- 	    }
--	  else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
-+	  else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
- 	    repl = GLRO(dl_platform);
--	  else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+	  else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
- 	    repl = DL_DST_LIB;
- 
- 	  if (repl != NULL && repl != (const char *) -1)
--- 
-1.7.2
-
diff --git a/libs/glibc/glibc-2.12.1-require-suid-on-audit.patch b/libs/glibc/glibc-2.12.1-require-suid-on-audit.patch
deleted file mode 100644
index b01dd14..0000000
--- a/libs/glibc/glibc-2.12.1-require-suid-on-audit.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 8e9f92e9d5d7737afdacf79b76d98c4c42980508 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab at redhat.com>
-Date: Sun, 24 Oct 2010 21:43:15 -0400
-Subject: [PATCH 1/1] Require suid bit on audit objects in privileged programs
-
----
- ChangeLog                  |   15 +++++++++++++++
- elf/dl-deps.c              |    2 +-
- elf/dl-load.c              |   20 +++++++++++---------
- elf/dl-open.c              |    2 +-
- elf/rtld.c                 |   16 +++++++---------
- include/dlfcn.h            |    1 +
- sysdeps/generic/ldsodefs.h |    6 ++----
- 7 files changed, 38 insertions(+), 24 deletions(-)
-
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index a58de5c..a51fb6e 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -62,7 +62,7 @@ openaux (void *a)
- {
-   struct openaux_args *args = (struct openaux_args *) a;
- 
--  args->aux = _dl_map_object (args->map, args->name, 0,
-+  args->aux = _dl_map_object (args->map, args->name,
- 			      (args->map->l_type == lt_executable
- 			       ? lt_library : args->map->l_type),
- 			      args->trace_mode, args->open_mode,
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a7162eb..aa8738f 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -1812,7 +1812,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
-    if MAY_FREE_DIRS is true.  */
- 
- static int
--open_path (const char *name, size_t namelen, int preloaded,
-+open_path (const char *name, size_t namelen, int secure,
- 	   struct r_search_path_struct *sps, char **realname,
- 	   struct filebuf *fbp, struct link_map *loader, int whatcode,
- 	   bool *found_other_class)
-@@ -1894,7 +1894,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 	  /* Remember whether we found any existing directory.  */
- 	  here_any |= this_dir->status[cnt] != nonexisting;
- 
--	  if (fd != -1 && __builtin_expect (preloaded, 0)
-+	  if (fd != -1 && __builtin_expect (secure, 0)
- 	      && INTUSE(__libc_enable_secure))
- 	    {
- 	      /* This is an extra security effort to make sure nobody can
-@@ -1963,7 +1963,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 
- struct link_map *
- internal_function
--_dl_map_object (struct link_map *loader, const char *name, int preloaded,
-+_dl_map_object (struct link_map *loader, const char *name,
- 		int type, int trace_mode, int mode, Lmid_t nsid)
- {
-   int fd;
-@@ -2067,7 +2067,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  for (l = loader; l; l = l->l_loader)
- 	    if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH"))
- 	      {
--		fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-+		fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+				&l->l_rpath_dirs,
- 				&realname, &fb, loader, LA_SER_RUNPATH,
- 				&found_other_class);
- 		if (fd != -1)
-@@ -2082,14 +2083,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	      && main_map != NULL && main_map->l_type != lt_loaded
- 	      && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
- 			      "RPATH"))
--	    fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs,
-+	    fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+			    &main_map->l_rpath_dirs,
- 			    &realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
- 			    &found_other_class);
- 	}
- 
-       /* Try the LD_LIBRARY_PATH environment variable.  */
-       if (fd == -1 && env_path_list.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &env_path_list,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list,
- 			&realname, &fb,
- 			loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
- 			LA_SER_LIBPATH, &found_other_class);
-@@ -2098,12 +2100,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
-       if (fd == -1 && loader != NULL
- 	  && cache_rpath (loader, &loader->l_runpath_dirs,
- 			  DT_RUNPATH, "RUNPATH"))
--	fd = open_path (name, namelen, preloaded,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE,
- 			&loader->l_runpath_dirs, &realname, &fb, loader,
- 			LA_SER_RUNPATH, &found_other_class);
- 
-       if (fd == -1
--	  && (__builtin_expect (! preloaded, 1)
-+	  && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
- 	      || ! INTUSE(__libc_enable_secure)))
- 	{
- 	  /* Check the list of libraries in the file /etc/ld.so.cache,
-@@ -2169,7 +2171,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
- 	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
- 	  && rtld_search_dirs.dirs != (void *) -1)
--	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
- 			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
- 
-       /* Add another newline when we are tracing the library loading.  */
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index c394b3f..cf8e8cc 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -223,7 +223,7 @@ dl_open_worker (void *a)
- 
-   /* Load the named object.  */
-   struct link_map *new;
--  args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,
-+  args->map = new = _dl_map_object (call_map, file, lt_loaded, 0,
- 				    mode | __RTLD_CALLMAP, args->nsid);
- 
-   /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 5ecc4fe..06b534a 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -589,7 +589,6 @@ struct map_args
-   /* Argument to map_doit.  */
-   char *str;
-   struct link_map *loader;
--  int is_preloaded;
-   int mode;
-   /* Return value of map_doit.  */
-   struct link_map *map;
-@@ -627,16 +626,17 @@ static void
- map_doit (void *a)
- {
-   struct map_args *args = (struct map_args *) a;
--  args->map = _dl_map_object (args->loader, args->str,
--			      args->is_preloaded, lt_library, 0, args->mode,
--			      LM_ID_BASE);
-+  args->map = _dl_map_object (args->loader, args->str, lt_library, 0,
-+			      args->mode, LM_ID_BASE);
- }
- 
- static void
- dlmopen_doit (void *a)
- {
-   struct dlmopen_args *args = (struct dlmopen_args *) a;
--  args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT,
-+  args->map = _dl_open (args->fname,
-+			(RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT
-+			 | __RTLD_SECURE),
- 			dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv),
- 			__environ);
- }
-@@ -806,8 +806,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where)
- 
-   args.str = fname;
-   args.loader = main_map;
--  args.is_preloaded = 1;
--  args.mode = 0;
-+  args.mode = __RTLD_SECURE;
- 
-   unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
- 
-@@ -1054,7 +1053,6 @@ of this helper program; chances are you did not intend to run this program.\n\
- 
- 	  args.str = rtld_progname;
- 	  args.loader = NULL;
--	  args.is_preloaded = 0;
- 	  args.mode = __RTLD_OPENEXEC;
- 	  (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
- 				  &args);
-@@ -1066,7 +1064,7 @@ of this helper program; chances are you did not intend to run this program.\n\
-       else
- 	{
- 	  HP_TIMING_NOW (start);
--	  _dl_map_object (NULL, rtld_progname, 0, lt_library, 0,
-+	  _dl_map_object (NULL, rtld_progname, lt_library, 0,
- 			  __RTLD_OPENEXEC, LM_ID_BASE);
- 	  HP_TIMING_NOW (stop);
- 
-diff --git a/include/dlfcn.h b/include/dlfcn.h
-index a67426d..af92483 100644
---- a/include/dlfcn.h
-+++ b/include/dlfcn.h
-@@ -9,6 +9,7 @@
- #define __RTLD_OPENEXEC	0x20000000
- #define __RTLD_CALLMAP	0x10000000
- #define __RTLD_AUDIT	0x08000000
-+#define __RTLD_SECURE	0x04000000 /* Apply additional security checks.  */
- 
- #define __LM_ID_CALLER	-2
- 
-diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
-index fcc943b..fa4b6b2 100644
---- a/sysdeps/generic/ldsodefs.h
-+++ b/sysdeps/generic/ldsodefs.h
-@@ -824,11 +824,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
- 
- /* Open the shared object NAME and map in its segments.
-    LOADER's DT_RPATH is used in searching for NAME.
--   If the object is already opened, returns its existing map.
--   For preloaded shared objects PRELOADED is set to a non-zero
--   value to allow additional security checks.  */
-+   If the object is already opened, returns its existing map.  */
- extern struct link_map *_dl_map_object (struct link_map *loader,
--					const char *name, int preloaded,
-+					const char *name,
- 					int type, int trace_mode, int mode,
- 					Lmid_t nsid)
-      internal_function attribute_hidden;
--- 
-1.7.2
-
diff --git a/libs/lasi/BUILD b/libs/lasi/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/lasi/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/lasi/DEPENDS b/libs/lasi/DEPENDS
new file mode 100755
index 0000000..269d060
--- /dev/null
+++ b/libs/lasi/DEPENDS
@@ -0,0 +1,2 @@
+depends pango &&
+depends cmake
diff --git a/libs/lasi/DETAILS b/libs/lasi/DETAILS
new file mode 100755
index 0000000..a5f158c
--- /dev/null
+++ b/libs/lasi/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=lasi
+         VERSION=1.1.0
+          SOURCE="libLASi-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}%20Source/${SOURCE}
+     SOURCE_HASH=sha512:cbd885478c15809834911cea2c0dec2db777a1344f76bf61906a509f4c7aef8c14232830383072e6310ff2a0567320be24f64b7cbb3138906126c40ce3fdd4d6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/libLASi-${VERSION}"
+        WEB_SITE="http://www.unifont.org/lasi"
+      LICENSE[0]=GPL
+         ENTERED=20101219
+           SHORT="a C++ stream output interface for creating Postscript documents"
+cat << EOF
+libLASi is a library written by Larry Siden that provides a C++ stream output
+interface ( with operator << ) for creating Postscript documents that can
+contain characters from any of the scripts and symbol blocks supported in
+Unicode and by Owen Taylor's Pango layout engine. The library accomodates
+right-to-left scripts such as Arabic and Hebrew as easily as left-to-right
+scripts. Indic and Indic-derived Complex Text Layout (CTL) scripts, such as
+Devanagari, Thai, Lao, and Tibetan are supported to the extent provided by
+Pango and by the OpenType fonts installed on your system. All of this is
+provided without need for any special configuration or layout calculation
+on the programmer's part.
+EOF
diff --git a/libs/lasi/HISTORY b/libs/lasi/HISTORY
new file mode 100644
index 0000000..3276cc9
--- /dev/null
+++ b/libs/lasi/HISTORY
@@ -0,0 +1,3 @@
+2010-12-19 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/libs/libexif/DETAILS b/libs/libexif/DETAILS
index 0c04cc8..b9c159f 100755
--- a/libs/libexif/DETAILS
+++ b/libs/libexif/DETAILS
@@ -11,8 +11,8 @@ if [ "$LIBEXIF_CVS" == "y" ]; then
     SOURCE_IGNORE=volatile
    FORCE_DOWNLOAD=on
 else
-          VERSION=0.6.19
-      SOURCE_HASH=sha512:e62c5ca38c9d6ff04f6749c9da300bed2a683122fe4ecb2164fce04755ecb7492218051dcdef8abb677b4a6939cde22d111486e92303afb8fb86e9cab7791e57
+          VERSION=0.6.20
+      SOURCE_HASH=sha512:1578fb160ea926a95bd05e4b356442b569bcbf5543287481c7f87faec0712b17e89335ee9e014f55b1dbec347d1f95cd592931a4bc9c81b65cb60fd18475da5d
            SOURCE=$SPELL-$VERSION.tar.bz2
     SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libexif/HISTORY b/libs/libexif/HISTORY
index d169ea9..494df13 100644
--- a/libs/libexif/HISTORY
+++ b/libs/libexif/HISTORY
@@ -1,3 +1,6 @@
+2010-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.20
+
 2009-11-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.6.19, SECURITY_PATCH=2, a heap buffer overflow
 
diff --git a/libs/libpqxx/BUILD b/libs/libpqxx/BUILD
index a1d8c73..2c1f0f9 100755
--- a/libs/libpqxx/BUILD
+++ b/libs/libpqxx/BUILD
@@ -1,3 +1,5 @@
-  ./configure  --prefix=/usr            \
-               $OPTS                    &&
-  make
+OPTS+="--enable-shared=yes --enable-static=no" &&
+default_build
+#  ./configure  --prefix=/usr            \
+#               $OPTS                    &&
+#  make
diff --git a/libs/libpqxx/DETAILS b/libs/libpqxx/DETAILS
index c7edc26..088acae 100755
--- a/libs/libpqxx/DETAILS
+++ b/libs/libpqxx/DETAILS
@@ -1,17 +1,15 @@
            SPELL=libpqxx
-         VERSION=3.0.2
+         VERSION=3.1
+     SOURCE_HASH=sha512:fad9435fa0e1140c271dedbe52e0103eb69d7d2ca916c05ead6ecc173545594e30bac265c999759e332a919fb9cb28af6f0aa66945cda32811e87440a405eea7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://pqxx.org/download/software/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:06270b8c4d21860e79ac6169a953ff776df0691228692126882146e999c5430a8c00ce30732324e3d9ada6b15006d9fed9ab3f4804e7e5ec1ae05a724881cdc3
       LICENSE[0]=BSD
-        WEB_SITE=http://gborg.postgresql.org/project/libpqxx/projdisplay.php
+        WEB_SITE=http://pqxx.org
          ENTERED=20030223
         KEYWORDS="postgresql libs"
            SHORT="C++ client API for PostgreSQL."
 cat << EOF
 C++ client API for PostgreSQL. The standard front-end (in the sense 
 of "language binding") for writing C++ programs that use PostgreSQL.
-Supersedes older libpq++ interface. Requires an up-to-date 
-C++ compiler, like gcc 2.95 or better.
 EOF
diff --git a/libs/libpqxx/HISTORY b/libs/libpqxx/HISTORY
index 497580a..c21060e 100644
--- a/libs/libpqxx/HISTORY
+++ b/libs/libpqxx/HISTORY
@@ -1,3 +1,8 @@
+2010-12-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.1
+	  new WEB_SITE
+	* BUILD: build shared libraries
+
 2010-01-04 Peng Chang (Charles) <chp at sourcemage.org>
 	* DETAILS: updated spell to 3.0.2
 	* DEPENDS: depends g++
diff --git a/libs/libsigsegv/DETAILS b/libs/libsigsegv/DETAILS
index e4d40ad..4d9bfe3 100755
--- a/libs/libsigsegv/DETAILS
+++ b/libs/libsigsegv/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libsigsegv
-         VERSION=2.6
+         VERSION=2.9
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libsigsegv/HISTORY b/libs/libsigsegv/HISTORY
index 690d8e2..c508f0c 100644
--- a/libs/libsigsegv/HISTORY
+++ b/libs/libsigsegv/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.9
+
 2009-06-12 Peng Chang (Charles) <chp at sourcemage.org>
 	* DETAILS: updated spell to 2.6
 
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 9a3dc1f..d4c2286 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt4
           SPELLX=PyQt-x11-gpl
-         VERSION=4.8.1
-     SOURCE_HASH=sha512:c0a09e07d3b51427129e2dde5d67e5194c1ee185136b2c8955a5be8186ac16fb05432a458a3027c1580aa4d789e4af70634f704c38e6374eaaa9a31c66461a11
+         VERSION=4.8.2
+     SOURCE_HASH=sha512:7100d945f5ebbab866131335ffd34ab1f9c29913a8488cbe6527a2e29dea71d75ac24fd22002c2ba897c98d6edea6be75276a85e1d6f221ae3bafb4a5cf83c41
              URI=PyQt4
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 3b3ea79..fbeafc1 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.8.2
+
 2010-11-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.8.1
 
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 121530d..1eaf5f9 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sip
-         VERSION=4.11.2
-     SOURCE_HASH=sha512:2a5c5164b259e731f4ed44b42c3c9d1aa36baa78842d35491dabda29f286ebf86b842a4f7256cc71560bab6fc2e934ac1a8a21caa93bb4ff898a9f8190f96653
+         VERSION=4.12
+     SOURCE_HASH=sha512:6b9f4cdd4704fcb37f91b4f9347c683670949c491629fd3631bc63ee1b08cbdb5ba00d3c0eed1e59ff03d969930b56e1655e82decb53a1c4d713ac6e34857a57
              URI=sip4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index aa76036..646c0ff 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.12
+
 2010-10-23 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.11.2
 
diff --git a/libs/slib/DETAILS b/libs/slib/DETAILS
index 8cfe017..9b59f1a 100755
--- a/libs/slib/DETAILS
+++ b/libs/slib/DETAILS
@@ -1,5 +1,5 @@
            SPELL=slib
-         VERSION=3b2
+         VERSION=3b3
           SOURCE=$SPELL-$VERSION.zip
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
diff --git a/libs/slib/HISTORY b/libs/slib/HISTORY
index cc67f9f..9950623 100644
--- a/libs/slib/HISTORY
+++ b/libs/slib/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3b3
+
 2009-08-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3b2
 
diff --git a/libs/slib/slib-3b2.zip.sig b/libs/slib/slib-3b2.zip.sig
deleted file mode 100644
index 252134b..0000000
Binary files a/libs/slib/slib-3b2.zip.sig and /dev/null differ
diff --git a/libs/slib/slib-3b3.zip.sig b/libs/slib/slib-3b3.zip.sig
new file mode 100644
index 0000000..46ef511
Binary files /dev/null and b/libs/slib/slib-3b3.zip.sig differ
diff --git a/libs/tdb/DEPENDS b/libs/tdb/DEPENDS
deleted file mode 100755
index d0ce64e..0000000
--- a/libs/tdb/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  gdbm
diff --git a/libs/tdb/DETAILS b/libs/tdb/DETAILS
deleted file mode 100755
index c7a3687..0000000
--- a/libs/tdb/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=tdb
-         VERSION=1.2.2
-     SOURCE_HASH=sha512:65f587e847c9a1f03aafe1cd903fea0a1271460b022ad60cdf24e39b3a9ce681420c872b7c4ab86ed00ffe3d50f14bfcda6fef978c2026d4a7f518117b6848db
-          SOURCE=${SPELL}-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://samba.org/ftp/tdb/$SOURCE
-#      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-      LICENSE[0]=GPL
-        WEB_SITE=http://sourceforge.net/projects/tdb
-         ENTERED=20020210
-        KEYWORDS="database libs"
-           SHORT="Trivial Database"
-cat << EOF
-TDB is a Trivial Database. In concept, it is very much like GDBM,
-and BSD's DB except that it allows multiple simultaneous writers
-and uses locking internally to keep writers from trampling on each
-other. TDB is also extremely small.
-EOF
diff --git a/libs/tdb/HISTORY b/libs/tdb/HISTORY
deleted file mode 100644
index 5a63bb3..0000000
--- a/libs/tdb/HISTORY
+++ /dev/null
@@ -1,48 +0,0 @@
-2010-10-06 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.2.2
-	  new URL
-	* PRE_BUILD: added
-
-2009-01-23 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to tdb_1.1.2~git20081222
-	  Stable hasn't been updated since 2001
-	* BUILD: Removed, no more patches
-	* config.db.patch, tdb.patch: Removed, applied upstream
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-09-24 George Sherwood <george at beernabeer.com>
-	* DETAILS,BUILD: Update for BUILD_API=2
-
-2005-05-11 Seth Woolley <seth at tautology.org>
-	* BUILD,config.sub.patch: edit/add for x86_64 support
-
-2004-05-24 Treeve Jelbert <treeve at sourcemage.org>
-	* BUILD: fix man pages
-	  use default_build - clean up script
-
-2003-07-16 Eric Sandall <sandalle at sourcemage.org>
-	* Now compiles (Bug #3762) Thanks to Chris Dennis
-
-2003-05-20 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS to fix my broken SOURCEFORGE_URL fixes
-
-2003-05-18 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS for SOURCEFORGE_URL fix
-
-2002-10-31 Julian v. Bock <julian at wongr.net>
-	* DEPENDS: add; add gdbm dep.
-
-2002-10-14 Julian v. Bock <julian at wongr.net>
-	* DETAILS: add LICENSE and MD5 fields.
-
diff --git a/libs/tdb/PRE_BUILD b/libs/tdb/PRE_BUILD
deleted file mode 100755
index 821d675..0000000
--- a/libs/tdb/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-./autogen.sh
diff --git a/mail/bsfilter/DETAILS b/mail/bsfilter/DETAILS
index 00b92f9..0c8099a 100755
--- a/mail/bsfilter/DETAILS
+++ b/mail/bsfilter/DETAILS
@@ -1,10 +1,10 @@
            SPELL=bsfilter
-         VERSION=1.0.16
-     SOURCE_HASH=sha512:9abc5a5f9e95b934c6d66241b7e319474f18f6cda3f2f2e3d29b25d8b7968f31ef7490759f471b942a00eae997aa5e5fef246263b3fedd46758b7e9667f616a2
+         VERSION=1.0.17
+     SOURCE_HASH=sha512:6ec27dc580db8e943906d02ba26f3b783e9b838f291285288f40df7c020cb87d8d8bd20e62ad9a81f6f204b35a3fb266c13fb6127abd4667bd9604dee50c10c0
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-      SOURCE_URL=http://iij.dl.sourceforge.jp/bsfilter/29737/$SOURCE
-        WEB_SITE=http://bsfilter.org/index-e.html
+      SOURCE_URL=http://iij.dl.sourceforge.jp/bsfilter/49795/$SOURCE
+        WEB_SITE=http://bsfilter.org/
          ENTERED=20100110
       LICENSE[0]=GPL
            SHORT="bayesian spam filter"
diff --git a/mail/bsfilter/HISTORY b/mail/bsfilter/HISTORY
index 7428d98..92bd8ce 100644
--- a/mail/bsfilter/HISTORY
+++ b/mail/bsfilter/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.17
+
 2010-02-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/mail/clamsmtp/BUILD b/mail/clamsmtp/BUILD
new file mode 100755
index 0000000..fee2d68
--- /dev/null
+++ b/mail/clamsmtp/BUILD
@@ -0,0 +1,3 @@
+create_account clamav &&
+
+default_build
diff --git a/mail/clamsmtp/DEPENDS b/mail/clamsmtp/DEPENDS
new file mode 100755
index 0000000..7dcb369
--- /dev/null
+++ b/mail/clamsmtp/DEPENDS
@@ -0,0 +1 @@
+runtime_depends clamav
diff --git a/mail/clamsmtp/DETAILS b/mail/clamsmtp/DETAILS
new file mode 100755
index 0000000..76450e7
--- /dev/null
+++ b/mail/clamsmtp/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=clamsmtp
+         VERSION=1.10
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://thewalter.net/stef/software/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:f28e2c1d78c965245d8d7a8810fbeb11d41e40383eba2e8fca500f94c2e4b8d9a2c0b9e4e8e967965bf50266968e0b9549fb62369f37724350a20174c89a044b
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://thewalter.net/stef/software/clamsmtp/
+      LICENSE[0]=GPL
+         ENTERED=20101228
+           SHORT="SMTP virus filter"
+cat << EOF
+ClamSMTP is an SMTP filter that allows you to check for viruses using
+the ClamAV anti-virus software. It accepts SMTP connections and forwards
+the SMTP commands and responses to another SMTP server. The 'DATA' email
+body is intercepted and scanned before forwarding. It is written with
+the postfix mailserver in mind but can also be used as a transparent
+proxy to filter all traffic.
+EOF
diff --git a/mail/clamsmtp/HISTORY b/mail/clamsmtp/HISTORY
new file mode 100644
index 0000000..8345929
--- /dev/null
+++ b/mail/clamsmtp/HISTORY
@@ -0,0 +1,2 @@
+2010-12-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS, BUILD, INSTALL, init.d/clamsmtpd: spell created
diff --git a/mail/clamsmtp/INSTALL b/mail/clamsmtp/INSTALL
new file mode 100755
index 0000000..f9d1b61
--- /dev/null
+++ b/mail/clamsmtp/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+install -d -o clamav -g clamav -vm 755 "$INSTALL_ROOT/var/run/clamsmtp"
diff --git a/mail/clamsmtp/init.d/clamsmtpd b/mail/clamsmtp/init.d/clamsmtpd
new file mode 100755
index 0000000..619ff2f
--- /dev/null
+++ b/mail/clamsmtp/init.d/clamsmtpd
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/clamsmtpd
+PIDFILE=/var/run/clamsmtp/clamsmtpd.pid
+ARGS="-p $PIDFILE"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index c4c012f..6293e7d 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -1,5 +1,5 @@
 if list_find "$DOVECOT_MAILSTORE" "all" ; then
-OPTS="--with-storages=maildir,mbox,dbox,cydir $OPTS"
+OPTS="--with-storages=maildir,mbox,sdbox,mdbox,cydir $OPTS"
 else
 OPTS="--with-storages=$(echo $DOVECOT_MAILSTORE | tr " " ",") $OPTS"
 fi                                                  &&
diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index ce7d541..db05b67 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -20,7 +20,8 @@ config_query_multi DOVECOT_MAILSTORE                         \
                   all                                        \
                   maildir                                    \
                   mbox                                       \
-                  dbox                                       \
+                  sdbox                                      \
+                  mdbox                                      \
                   cydir                                      &&
 config_query_list DOVECOT_NOTIFY                             \
                   'What filesystem notification method do you want?' \
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 48c25fe..20e6199 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dovecot
-         VERSION=2.0.7
+         VERSION=2.0.8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
@@ -7,8 +7,8 @@
    SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
   SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
 if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
-        VERSION2=0.2.1
-      PATHCLEVEL=7
+        VERSION2=0.2.2
+      PATHCLEVEL=8
          SOURCE3=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz
          SOURCE4=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz.sig
   SOURCE3_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE3
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 9a19a6a..fed3fa5 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,13 @@
+2010-12-27 Vlad Glagolev <stealth at sourcemage.org>
+	* init.d/smgl-dovecot: removed ARGS, upstream uses
+	  /etc/dovecot/dovecot.conf by default
+
+2010-12-23 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD, CONFIGURE: corrected sdbox storage, added mdbox storage
+
+2010-12-15 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.0.8, updated managesieve
+
 2010-11-14 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 2.0.7
 
diff --git a/mail/dovecot/init.d/smgl-dovecot b/mail/dovecot/init.d/smgl-dovecot
index 7287ab7..ae8c2ee 100644
--- a/mail/dovecot/init.d/smgl-dovecot
+++ b/mail/dovecot/init.d/smgl-dovecot
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 PROGRAM=/usr/sbin/dovecot
-ARGS="-c /etc/dovecot.conf"
 RUNLEVEL=3
 NEEDS="+remote_fs +network"
 
diff --git a/mail/exim/BUILD b/mail/exim/BUILD
index 7effd7e..afbabb3 100755
--- a/mail/exim/BUILD
+++ b/mail/exim/BUILD
@@ -181,6 +181,7 @@ fi  &&
 echo  "BIN_DIRECTORY=/usr/sbin"          >>  Local/Makefile  &&
 echo  "CONFIGURE_FILE=/etc/exim.conf"    >>  Local/Makefile  &&
 echo  "SPOOL_DIRECTORY=/var/spool/mail"  >>  Local/Makefile  &&
+echo  "PID_FILE_PATH=/var/run/exim.pid"  >>  Local/Makefile  &&
 echo  "LOG_FILE_PATH=/var/log/exim_%s:"  >>  Local/Makefile  &&
 echo  "CFLAGS=$CFLAGS"                   >>  Local/Makefile  &&
 echo  "EXIM_UID=`id -u exim`"            >>  Local/Makefile  &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index d3f5b13..7f2c688 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,7 @@
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: use proper pid file path
+	* init.d/exim: use PIDFILE
+
 2010-10-19 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 4.72
 	  SECURITY_PATCH++
diff --git a/mail/exim/init.d/exim b/mail/exim/init.d/exim
index 3bcb41b..386dc48 100644
--- a/mail/exim/init.d/exim
+++ b/mail/exim/init.d/exim
@@ -1,12 +1,14 @@
 #!/bin/bash
-PROGRAM=/usr/sbin/exim
-RUNLEVEL=3
-NEEDS="+network"
 
 #
 # /etc/sysconfig/exim needs to be sourced before ARGS
 #
 . /etc/sysconfig/exim
-. /etc/init.d/smgl_init
 
+PROGRAM=/usr/sbin/exim
 ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/exim.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/mpop/DETAILS b/mail/mpop/DETAILS
index b415b7f..addb6b3 100755
--- a/mail/mpop/DETAILS
+++ b/mail/mpop/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mpop
-         VERSION=1.0.21
-     SOURCE_HASH=sha512:e306c95eacaabaea75b49c7439bd0d445b73698cd4a7a8ee8a375854f6d0264e6e16d949cb8997ceb3c3ca41bbbcbbbd4ba75c4a4689ac7f5f51e1f18746be42
+         VERSION=1.0.22
+     SOURCE_HASH=sha512:f77571138d733b99e0de803a68f559d039031369dba7a41bf94cafbf10b7a4a122486fa6cd5229891bd424abb1b365d670797dc2dd9fe8daac44cd6d8cd64eb8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/mail/mpop/HISTORY b/mail/mpop/HISTORY
index 5806e83..a62d6b0 100644
--- a/mail/mpop/HISTORY
+++ b/mail/mpop/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.22
+
 2010-07-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.21
 
diff --git a/mail/msmtp/DETAILS b/mail/msmtp/DETAILS
index 80cfb90..6322850 100755
--- a/mail/msmtp/DETAILS
+++ b/mail/msmtp/DETAILS
@@ -1,10 +1,10 @@
            SPELL=msmtp
-         VERSION=1.4.21
+         VERSION=1.4.22
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-     SOURCE_HASH=sha512:e76d02fc705b95769b405c6b6803269710bcfc51f5cb08c6c3ed4e2ffd0ec88d39b8ab190c03266403fd97353dafd65aa60b9497b9e644c4304b67bb2504b003
+     SOURCE_HASH=sha512:441d122f28955d258d0d14b7365fe393c38ffd6d09e4a293f34aef57405338773d0b1bb96f61049060dae8a386f1eb17bb92f7b8b636fb413bf5c5ea22372662
         WEB_SITE=http://msmtp.sourceforge.net/
          ENTERED=20040412
       LICENSE[0]=GPL
diff --git a/mail/msmtp/HISTORY b/mail/msmtp/HISTORY
index 243e73a..7e035ab 100644
--- a/mail/msmtp/HISTORY
+++ b/mail/msmtp/HISTORY
@@ -1,3 +1,6 @@
+2011-01-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.22
+
 2010-07-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.21
 
diff --git a/mail/postgrey/BUILD b/mail/postgrey/BUILD
new file mode 100755
index 0000000..a4d6655
--- /dev/null
+++ b/mail/postgrey/BUILD
@@ -0,0 +1 @@
+create_account postgrey
diff --git a/mail/postgrey/DEPENDS b/mail/postgrey/DEPENDS
new file mode 100755
index 0000000..02e90f6
--- /dev/null
+++ b/mail/postgrey/DEPENDS
@@ -0,0 +1,6 @@
+runtime_depends db &&
+runtime_depends berkeleydb &&
+runtime_depends net-server &&
+runtime_depends io-multiplex &&
+
+suggest_depends net-dns "" "" "for DNS resolving in postgreyreport tool"
diff --git a/mail/postgrey/DETAILS b/mail/postgrey/DETAILS
new file mode 100755
index 0000000..a6db5f2
--- /dev/null
+++ b/mail/postgrey/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=postgrey
+         VERSION=1.33
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://postgrey.schweikert.ch/pub/$SOURCE
+   SOURCE_URL[1]=http://postgrey.schweikert.ch/pub/old/$SOURCE
+     SOURCE_HASH=sha512:82fb49283be4912ffffa26e69340c966b3ed378ccd154cdc7e18ecbb39b9f0daca002dbcc475e0cc008b3ff6fe4d313f0b36a515c0b5cd5a8360a51c1a3fcfd8
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://postgrey.schweikert.ch/
+      LICENSE[0]=GPL
+         ENTERED=20101228
+           SHORT="Postfix policy server implementing greylisting"
+cat << EOF
+Postgrey is a Postfix policy server implementing greylisting.
+EOF
diff --git a/mail/postgrey/HISTORY b/mail/postgrey/HISTORY
new file mode 100644
index 0000000..b763e9f
--- /dev/null
+++ b/mail/postgrey/HISTORY
@@ -0,0 +1,3 @@
+2010-12-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS, {PRE_}BUILD, INSTALL,
+	  init.d/postgrey{.conf}: spell created
diff --git a/mail/postgrey/INSTALL b/mail/postgrey/INSTALL
new file mode 100755
index 0000000..c65acb4
--- /dev/null
+++ b/mail/postgrey/INSTALL
@@ -0,0 +1,9 @@
+install -vm 755 postgrey "$INSTALL_ROOT/usr/libexec" &&
+install -vm 755 contrib/postgreyreport "$INSTALL_ROOT/usr/sbin" &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/postgrey.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/postgrey"
+fi &&
+
+install -d -o postgrey -g postgrey -vm 755 "$INSTALL_ROOT/var/spool/postgrey"
diff --git a/mail/postgrey/PRE_BUILD b/mail/postgrey/PRE_BUILD
new file mode 100755
index 0000000..d6c2e40
--- /dev/null
+++ b/mail/postgrey/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i "s:nogroup:postgrey:g" postgrey &&
+sed -i "s:/var/spool/postfix:/var/spool:g" postgrey contrib/postgreyreport
diff --git a/mail/postgrey/init.d/postgrey b/mail/postgrey/init.d/postgrey
new file mode 100755
index 0000000..4af42aa
--- /dev/null
+++ b/mail/postgrey/init.d/postgrey
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/postgrey
+
+PROGRAM=/usr/libexec/postgrey
+PIDFILE=/var/run/postgrey.pid
+ARGS="-d --pidfile=$PIDFILE $POSTGREY_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/postgrey/init.d/postgrey.conf b/mail/postgrey/init.d/postgrey.conf
new file mode 100644
index 0000000..b8861dc
--- /dev/null
+++ b/mail/postgrey/init.d/postgrey.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see ``postgrey --help''
+
+POSTGREY_ARGS="-i 2525"
diff --git a/mail/sylpheed-gtk2/HISTORY b/mail/sylpheed-gtk2/HISTORY
index f3b77bb..4521c9c 100644
--- a/mail/sylpheed-gtk2/HISTORY
+++ b/mail/sylpheed-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* sylpheed.desktop: added generic name
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/mail/sylpheed-gtk2/desktop/sylpheed.desktop b/mail/sylpheed-gtk2/desktop/sylpheed.desktop
index e6ecc8d..e7d04b0 100644
--- a/mail/sylpheed-gtk2/desktop/sylpheed.desktop
+++ b/mail/sylpheed-gtk2/desktop/sylpheed.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;
+GenericName=E-mail client
+GenericName[es]=Cliente de correo electrónico
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 17be224..aa87495 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* sylpheed.desktop: added generic name
+
 2010-06-29 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.0.3
 
diff --git a/mail/sylpheed/desktop/sylpheed.desktop b/mail/sylpheed/desktop/sylpheed.desktop
index e6ecc8d..e7d04b0 100644
--- a/mail/sylpheed/desktop/sylpheed.desktop
+++ b/mail/sylpheed/desktop/sylpheed.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Network;
+GenericName=E-mail client
+GenericName[es]=Cliente de correo electrónico
diff --git a/mobile/gammu/DETAILS b/mobile/gammu/DETAILS
index 03be53d..7363546 100755
--- a/mobile/gammu/DETAILS
+++ b/mobile/gammu/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gammu
-         VERSION=1.26.1
+         VERSION=1.28.0
           SOURCE="$SPELL-$VERSION.tar.bz2"
    SOURCE_URL[0]=http://dl.cihar.com/$SPELL/releases/$SOURCE
-     SOURCE_HASH=sha512:8cb97ad400c5ddfac467c3da872f4dfac84c751b7d0b1a28d14e32d80a49290c4a88ac8a5ef087c0c9a110f12669f6e9510c62ed5b84e4687af13cf631bebe4d
+     SOURCE_HASH=sha512:a183acb6d8120c432630d75cee70e608d3030243084ca1e90c76469d81b358a6e5c16da651a031fb8620410bb131efdaf3926e81662ef3c8356a8631b90f5be7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://cihar.com/gammu/"
       LICENSE[0]=GPL
diff --git a/mobile/gammu/HISTORY b/mobile/gammu/HISTORY
index e56f794..ec3e416 100644
--- a/mobile/gammu/HISTORY
+++ b/mobile/gammu/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.28.0
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster at sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/mobile/wammu/DETAILS b/mobile/wammu/DETAILS
index dc870a3..987cadf 100755
--- a/mobile/wammu/DETAILS
+++ b/mobile/wammu/DETAILS
@@ -1,8 +1,8 @@
            SPELL=wammu
-         VERSION=0.31.1
+         VERSION=0.35
           SOURCE="$SPELL-$VERSION.tar.bz2"
    SOURCE_URL[0]=http://dl.cihar.com/$SPELL/latest/$SOURCE
-     SOURCE_HASH=sha512:68eb3fa064370ef7e3008f54e9f86e094de53eeefb923fa04b2a26852d6c9a403d78acae1e227edb43a2a46d1689e047752ff0ea1af33c910300fde4d39b3096
+     SOURCE_HASH=sha512:c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://wammu.eu/ "
       LICENSE[0]=GPL
diff --git a/mobile/wammu/HISTORY b/mobile/wammu/HISTORY
index 4c70eb7..4461441 100644
--- a/mobile/wammu/HISTORY
+++ b/mobile/wammu/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.35
+
 2009-12-15 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.31.1
 
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 7e7d10d..6c5c4a1 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dhcpcd
-         VERSION=5.2.9
-     SOURCE_HASH=sha512:283b1ebd359e783de4fdf625154d46e13552441cce00c0f200f3daadb7cd6396a0cbbd8e139508d8aeb209abf948e605eddbaeb459d711c1801ef5bdba4c8847
+         VERSION=5.2.10
+     SOURCE_HASH=sha512:61a8e2911ed31a512e543b9fdf9cde0b700a11b28fdbea6cc9affe8bde300b9d5276e95e49f93884579bfcfd696207834369e2c6d134d18062dbf4b99d333471
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 52aaba6..9ec3a3a 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2011-01-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.2.10
+
 2010-12-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 5.2.9
 
diff --git a/net/flow-tools/BUILD b/net/flow-tools/BUILD
new file mode 100755
index 0000000..1446713
--- /dev/null
+++ b/net/flow-tools/BUILD
@@ -0,0 +1,3 @@
+OPTS="--sysconfdir=$INSTALL_ROOT/etc/flow-tools $OPTS" &&
+
+default_build
diff --git a/net/flow-tools/DEPENDS b/net/flow-tools/DEPENDS
new file mode 100755
index 0000000..166c221
--- /dev/null
+++ b/net/flow-tools/DEPENDS
@@ -0,0 +1,16 @@
+depends zlib &&
+
+optional_depends openssl \
+                 "--with-openssl" \
+                 "--without-openssl" \
+                 "for OpenSSL support" &&
+
+optional_depends MYSQL \
+                 "--with-mysql" \
+                 "--without-mysql" \
+                 "for MySQL support" &&
+
+optional_depends postgresql \
+                 "--with-postgresql" \
+                 "--without-postgresql" \
+                 "to use PostgreSQL library"
diff --git a/net/flow-tools/DETAILS b/net/flow-tools/DETAILS
new file mode 100755
index 0000000..46937b2
--- /dev/null
+++ b/net/flow-tools/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=flow-tools
+         VERSION=0.68.5.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://flow-tools.googlecode.com/files/$SOURCE
+     SOURCE_HASH=sha512:ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://code.google.com/p/flow-tools/
+      LICENSE[0]=BSD
+         ENTERED=20101218
+           SHORT="library and tools to collect and store NetFlow data"
+cat << EOF
+flow-tools is library and a collection of programs used to collect, send,
+process, and generate reports from NetFlow data. The tools can be used together
+on a single server or distributed to multiple servers for large deployments.
+
+The flow-tools library provides an API for development of custom applications
+for NetFlow export versions 1,5,6 and the 14 currently defined version 8
+subversions.
+EOF
diff --git a/net/flow-tools/HISTORY b/net/flow-tools/HISTORY
new file mode 100644
index 0000000..b6a8aee
--- /dev/null
+++ b/net/flow-tools/HISTORY
@@ -0,0 +1,3 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, INSTALL, PROVIDES,
+	  init.d/flow-capture{,.conf}: spell created
diff --git a/net/flow-tools/INSTALL b/net/flow-tools/INSTALL
new file mode 100755
index 0000000..791f291
--- /dev/null
+++ b/net/flow-tools/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/flow-capture.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/flow-capture"
+fi
diff --git a/net/flow-tools/PROVIDES b/net/flow-tools/PROVIDES
new file mode 100755
index 0000000..27fc97f
--- /dev/null
+++ b/net/flow-tools/PROVIDES
@@ -0,0 +1 @@
+NETFLOW-COLLECTOR
diff --git a/net/flow-tools/init.d/flow-capture b/net/flow-tools/init.d/flow-capture
new file mode 100755
index 0000000..47784f5
--- /dev/null
+++ b/net/flow-tools/init.d/flow-capture
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/flow-capture
+
+PROGRAM=/usr/bin/flow-capture
+PIDFILE=/var/run/flow-capture.pid
+ARGS="-p $PIDFILE $FLOW_CAPTURE_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/net/flow-tools/init.d/flow-capture.conf b/net/flow-tools/init.d/flow-capture.conf
new file mode 100644
index 0000000..e02c824
--- /dev/null
+++ b/net/flow-tools/init.d/flow-capture.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see flow-capture(1)
+
+FLOW_CAPTURE_ARGS="127.0.0.1"
diff --git a/net/flowd/HISTORY b/net/flowd/HISTORY
index 7331265..61a33ab 100644
--- a/net/flowd/HISTORY
+++ b/net/flowd/HISTORY
@@ -1,2 +1,5 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* PROVIDES: added, to provide NETFLOW-COLLECTOR
+
 2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS, DETAILS, {PRE_,}BUILD, INSTALL, init.d/flowd: spell created
diff --git a/net/flowd/PROVIDES b/net/flowd/PROVIDES
new file mode 100755
index 0000000..27fc97f
--- /dev/null
+++ b/net/flowd/PROVIDES
@@ -0,0 +1 @@
+NETFLOW-COLLECTOR
diff --git a/net/libasyncns/DETAILS b/net/libasyncns/DETAILS
index aa19915..c701fd8 100755
--- a/net/libasyncns/DETAILS
+++ b/net/libasyncns/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libasyncns
-         VERSION=0.7
+         VERSION=0.8
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
diff --git a/net/libasyncns/HISTORY b/net/libasyncns/HISTORY
index a26ae5a..283b103 100644
--- a/net/libasyncns/HISTORY
+++ b/net/libasyncns/HISTORY
@@ -1,3 +1,6 @@
+2011-01-05 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8
+
 2008-10-31 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 0.5
 	  Updated to 0.7
diff --git a/net/libasyncns/libasyncns-0.7.tar.gz.sig b/net/libasyncns/libasyncns-0.7.tar.gz.sig
deleted file mode 100644
index d4e9931..0000000
Binary files a/net/libasyncns/libasyncns-0.7.tar.gz.sig and /dev/null differ
diff --git a/net/libasyncns/libasyncns-0.8.tar.gz.sig b/net/libasyncns/libasyncns-0.8.tar.gz.sig
new file mode 100644
index 0000000..34f1ffe
Binary files /dev/null and b/net/libasyncns/libasyncns-0.8.tar.gz.sig differ
diff --git a/net/net-snmp/DETAILS b/net/net-snmp/DETAILS
index e7c6f31..aab1772 100755
--- a/net/net-snmp/DETAILS
+++ b/net/net-snmp/DETAILS
@@ -1,7 +1,6 @@
            SPELL=net-snmp
-         VERSION=5.6
+         VERSION=5.6.1
   SECURITY_PATCH=1
-      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index c77cabb..c30036a 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,9 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.6.1
+
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* init.d/snmpd: use PIDFILE
+
 2010-11-22 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD: apply the patch
diff --git a/net/net-snmp/init.d/snmpd b/net/net-snmp/init.d/snmpd
index 1782330..c490996 100755
--- a/net/net-snmp/init.d/snmpd
+++ b/net/net-snmp/init.d/snmpd
@@ -3,9 +3,9 @@
 . /etc/sysconfig/snmpd
 
 PROGRAM=/usr/sbin/snmpd
-ARGS="-p /var/run/snmpd.pid $SNMPD_ARGS"
-RUNLEVEL=3
 PIDFILE=/var/run/snmpd.pid
+ARGS="-p $PIDFILE $SNMPD_ARGS"
+RUNLEVEL=3
 NEEDS="+network"
 
 . /etc/init.d/smgl_init
diff --git a/net/ppp/BUILD b/net/ppp/BUILD
index 0fd11ae..a5db5a4 100755
--- a/net/ppp/BUILD
+++ b/net/ppp/BUILD
@@ -1,10 +1,6 @@
 create_group  ppp  &&
 
-sedit  's:net/bpf.h:pcap-bpf.h:'     pppd/demand.c       &&
-sedit  's:net/bpf.h:pcap-bpf.h:'     pppd/sys-linux.c    &&
-sedit  's:/usr/man:/usr/share/man:'  linux/Makefile.top  &&
-if [ "$HAVE_CBCP" == "y" ]; then
-  sedit  's:#CBCP=y:CBCP=y:'         pppd/Makefile.linux
-fi                                                       &&
+./configure --prefix="$INSTALL_ROOT/usr" \
+        --sysconfdir="$INSTALL_ROOT/etc" &&
 
-default_build
+make COPTS="$CFLAGS"
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index 0a5bb19..e88366b 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,9 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: leave group-creation only here; moved all source modifications
+	  to PRE_BUILD; use CFLAGS
+	* PRE_BUILD: apply the patch
+	* l2tp.patch: added, to fix compilation with 2.6.35 headers
+
 2010-02-14 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.4.5; quoting paths
 
diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
index 491b985..56fd526 100755
--- a/net/ppp/PRE_BUILD
+++ b/net/ppp/PRE_BUILD
@@ -1,2 +1,13 @@
-default_pre_build  &&
-create_group  ppp
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# fixes use of 2.6.35 headers
+patch -p0 < "$SPELL_DIRECTORY/l2tp.patch" &&
+
+sedit  's:net/bpf.h:pcap-bpf.h:'     pppd/demand.c       &&
+sedit  's:net/bpf.h:pcap-bpf.h:'     pppd/sys-linux.c    &&
+sedit  's:/usr/man:/usr/share/man:'  linux/Makefile.top  &&
+
+if [ "$HAVE_CBCP" == "y" ]; then
+  sedit  's:#CBCP=y:CBCP=y:'         pppd/Makefile.linux
+fi
diff --git a/net/ppp/l2tp.patch b/net/ppp/l2tp.patch
new file mode 100644
index 0000000..c9b345e
--- /dev/null
+++ b/net/ppp/l2tp.patch
@@ -0,0 +1,23 @@
+--- include/linux/if_pppol2tp.h.orig
++++ include/linux/if_pppol2tp.h
+@@ -32,6 +32,20 @@
+  	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
+ };
+
++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
++ * bits. So we need a different sockaddr structure.
++ */
++struct pppol2tpv3_addr {
++       pid_t   pid;                    /* pid that owns the fd.
++                                        * 0 => current */
++       int     fd;                     /* FD of UDP or IP socket to use */
++
++       struct sockaddr_in addr;        /* IP address and port to send to */
++
++       __u32 s_tunnel, s_session;      /* For matching incoming packets */
++       __u32 d_tunnel, d_session;      /* For sending outgoing packets */
++};
++
+ /* Socket options:
+  * DEBUG	- bitmask of debug message categories
+  * SENDSEQ	- 0 => don't send packets with sequence numbers
diff --git a/net/softflowd/DEPENDS b/net/softflowd/DEPENDS
index a8ec60d..6f65663 100755
--- a/net/softflowd/DEPENDS
+++ b/net/softflowd/DEPENDS
@@ -1 +1,3 @@
-depends libpcap
+depends libpcap &&
+
+suggest_depends NETFLOW-COLLECTOR "" "" "to collect NetFlow data"
diff --git a/net/softflowd/HISTORY b/net/softflowd/HISTORY
index 326b55f..4787976 100644
--- a/net/softflowd/HISTORY
+++ b/net/softflowd/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added NETFLOW-COLLECTOR suggest dep
+
 2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS, DETAILS, INSTALL, init.d/softflowd{,.conf}, djm.gpg:
 	  spell created
diff --git a/net/unbound/BUILD b/net/unbound/BUILD
new file mode 100755
index 0000000..3d2613a
--- /dev/null
+++ b/net/unbound/BUILD
@@ -0,0 +1,2 @@
+create_account unbound  &&
+default_build
diff --git a/net/unbound/DEPENDS b/net/unbound/DEPENDS
new file mode 100755
index 0000000..5d4071e
--- /dev/null
+++ b/net/unbound/DEPENDS
@@ -0,0 +1,5 @@
+optional_depends  ldns                   \
+                  ""                     \
+                  "--with-ldns-builtin"  \
+                  "to use system ldns library, otherwise a builtin version is used"
+
diff --git a/net/unbound/DETAILS b/net/unbound/DETAILS
new file mode 100755
index 0000000..1b5626b
--- /dev/null
+++ b/net/unbound/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=unbound
+         VERSION=1.4.7
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://www.unbound.net/downloads/$SOURCE
+     SOURCE_HASH=sha512:aee8453c71ca0f4c8a1e5ef9fd191906623af709eaa5ecffaa6aad63be366241fa3e42b26f3a2e5b3b062305416a20881a4a59ff8f82b94fbc97d22171ef1b21
+        WEB_SITE=http://www.unbound.net/
+         ENTERED=20110104
+         LICENSE=BSD
+           SHORT="a validating, recursive, and caching DNS resolver"
+cat << EOF
+Unbound is a validating, recursive, and caching DNS resolver.
+
+The C implementation of Unbound is developed and maintained by NLnet Labs.
+It is based on ideas and algorithms taken from a java prototype developed
+by Verisign labs, Nominet, Kirei and ep.net.
+
+Unbound is designed as a set of modular components, so that also DNSSEC
+(secure DNS) validation and stub-resolvers (that do not run as a server,
+but are linked into an application) are easily possible.
+EOF
diff --git a/net/unbound/HISTORY b/net/unbound/HISTORY
new file mode 100644
index 0000000..d843f69
--- /dev/null
+++ b/net/unbound/HISTORY
@@ -0,0 +1,3 @@
+2011-01-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS, BUILD, init.d/unbound: spell created, version 1.4.7
+
diff --git a/net/unbound/init.d/unbound b/net/unbound/init.d/unbound
new file mode 100644
index 0000000..45290d7
--- /dev/null
+++ b/net/unbound/init.d/unbound
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/unbound
+RUNLEVEL=3
+NEEDS="+remote_fs +network"
+
+. /etc/init.d/smgl_init
diff --git a/perl-cpan/io-multiplex/DEPENDS b/perl-cpan/io-multiplex/DEPENDS
new file mode 100755
index 0000000..6826bc7
--- /dev/null
+++ b/perl-cpan/io-multiplex/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/io-multiplex/DETAILS b/perl-cpan/io-multiplex/DETAILS
new file mode 100755
index 0000000..688345a
--- /dev/null
+++ b/perl-cpan/io-multiplex/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=io-multiplex
+         VERSION=1.10
+          SOURCE=IO-Multiplex-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/IO-Multiplex-$VERSION"
+   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/B/BB/BBB/$SOURCE
+     SOURCE_HASH=sha512:c030a4d399c5bcb5ebcc41126a4a76611b5637d9c1b4977e7a4dd27f8c4f3215dac883e806d49b28cbb0f5b3270e07d34f8ddf7258885d83e3f692178eedcbd9
+      LICENSE[0]=GPL
+      LICENSE[1]=ART
+        WEB_SITE=http://search.cpan.org/dist/IO-Multiplex/
+         ENTERED=20101228
+        KEYWORDS="perl"
+           SHORT="Perl module to manage IO on many file handles"
+cat << EOF
+IO::Multiplex is designed to take the effort out of managing multiple file
+handles. It is essentially a really fancy front end to the select system call.
+
+In addition to maintaining the select loop, it buffers all input and output
+to/from the file handles. It can also accept incoming connections on one or
+more listen sockets.
+EOF
diff --git a/perl-cpan/io-multiplex/HISTORY b/perl-cpan/io-multiplex/HISTORY
new file mode 100644
index 0000000..6b0b419
--- /dev/null
+++ b/perl-cpan/io-multiplex/HISTORY
@@ -0,0 +1,2 @@
+2010-12-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS, DEPENDS: spell created
diff --git a/php-pear/mongo/DETAILS b/php-pear/mongo/DETAILS
index f3d238c..202f93f 100755
--- a/php-pear/mongo/DETAILS
+++ b/php-pear/mongo/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mongo
-         VERSION=1.0.11
+         VERSION=1.1.0
           SOURCE=$SPELL-$VERSION.tgz
    SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-     SOURCE_HASH=sha512:4163d6cff2251753d85eda8f9aa3a3ed1418c1ff655be5517fe27e3cfb8756927c91753c96493b93f43b47ce4668cd7275a9099f92506c31105e19dba8da3361
+     SOURCE_HASH=sha512:7457ab211ff304023cfc58143b3f34bc09aa25a7177c62f60a4c55378b22006e5a57aa1798ff7d97772018fecce1a7675cb9206edad0529329fad774d5c5d7a7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.mongodb.org/display/DOCS/PHP+Language+Center
       LICENSE[0]=APACHE
diff --git a/php-pear/mongo/HISTORY b/php-pear/mongo/HISTORY
index fa7b7fd..93429aa 100644
--- a/php-pear/mongo/HISTORY
+++ b/php-pear/mongo/HISTORY
@@ -1,2 +1,5 @@
+2010-12-22 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.1.0
+
 2010-10-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS, DEPENDS, PRE_BUILD, FINAL, TRIGGERS: spell created
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index e1695e1..b6f6e6c 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.3.4
-  SECURITY_PATCH=11
-     SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
+         VERSION=5.3.5
+  SECURITY_PATCH=12
+     SOURCE_HASH=sha512:747762ce1f1ad4aecaa41e56128f69bbc2e5f2878f9b5df2020082a7ac47a7740955614d5dc2e9587b71f1a965f8b8a768146be0444a0d92e75125d5c8663076
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
    if [[ $PHP5_SUHOSIN == y ]]; then
@@ -15,14 +15,14 @@ if [[ $PHP5_BRANCH == stable ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
    fi
 elif [[ $PHP5_BRANCH == alpha ]]; then
-         VERSION=5.3.4
-     SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
+         VERSION=5.3.5
+     SOURCE_HASH=sha512:747762ce1f1ad4aecaa41e56128f69bbc2e5f2878f9b5df2020082a7ac47a7740955614d5dc2e9587b71f1a965f8b8a768146be0444a0d92e75125d5c8663076
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 elif [[ $PHP5_BRANCH == legacy ]]; then
-         VERSION=5.2.15
-  SECURITY_PATCH=13
-     SOURCE_HASH=sha512:84b705b24983bd891c057fe25b7a8c6a7dbf0a0882765be4811599b4b76a43ca339098b312f4f6be16ece5c94038e595217567c69dd1cd6c046801d70703ba78
+         VERSION=5.2.17
+  SECURITY_PATCH=15
+     SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
   if [[ $PHP5_SUHOSIN == y ]]; then
@@ -34,9 +34,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
   fi
 else
-         VERSION=5.3.4
-  SECURITY_PATCH=11
-     SOURCE_HASH=sha512:6b44ec05b44c7c341d70c6ff5352b4c3699aefaae087a786aac71bfd1b5b621e0b8ecf2f35db3a95451b5b54b9f45118a6b075cb1187f246128f38d70802f64a
+         VERSION=5.3.5
+  SECURITY_PATCH=12
+     SOURCE_HASH=sha512:747762ce1f1ad4aecaa41e56128f69bbc2e5f2878f9b5df2020082a7ac47a7740955614d5dc2e9587b71f1a965f8b8a768146be0444a0d92e75125d5c8663076
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 94e6f59..3a1d5b7 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2011-01-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 5.3.5. SECURITY_PATCH++
+	  Updated legacy to version 5.2.17
+
+2010-12-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 5.2.16, SECURITY_PATCH++
+
 2010-12-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 5.3.4 and 5.2.15, SECURITY_PATCH++
 
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index fd98bd9..0f8ef33 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -3,11 +3,10 @@
 #         VERSION=1.4.3
 #     SOURCE_HASH=sha512:
 #else
-         VERSION=1.4.5
-     SOURCE_HASH=sha512:cce4c319ca81c1751bd260192bbffdbe294771151c9d0888ebe0165c898cd7987a4de1a963f3609b13c1c5a541f12b382938c6d318e0e9b40c3552508af754a9
+         VERSION=1.4.6
+     SOURCE_HASH=sha512:78795e071491b8ccbb42b0af482f6509e6c5fb9b4098bf495696d3d67d5c675cc3ede3caa0d112b2ae3c13e61d68eb56f572de6a2ba3aadf3313e1913d7490d2
   SECURITY_PATCH=5
 #fi
-      PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION-source.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 9890415..25cb8e9 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.6
+
 2010-11-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.5, SECURITY_PATCH=5
 
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index 1c3040a..a8c0ffe 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,6 @@
            SPELL=hplip
          VERSION=3.10.9
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 4845753..952ab2f 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,8 @@
+2011-01-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PRE_BUILD: added, to apply the patch and to replace udev deprecations
+	* interactive.patch: added, to fix hp-* scripts working with no gui
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/printer/hplip/PRE_BUILD b/printer/hplip/PRE_BUILD
new file mode 100755
index 0000000..ac93b47
--- /dev/null
+++ b/printer/hplip/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/interactive.patch" &&
+
+sed -i "s:SYSFS:ATTRS:g" data/rules/55-hpmud.rules \
+                         data/rules/56-hpmud_support.rules
diff --git a/printer/hplip/interactive.patch b/printer/hplip/interactive.patch
new file mode 100644
index 0000000..24f2790
--- /dev/null
+++ b/printer/hplip/interactive.patch
@@ -0,0 +1,32 @@
+--- base/module.py.orig
++++ base/module.py
+@@ -263,18 +263,17 @@
+             params = ''.join([params, 'd:p:P:'])
+             long_params.extend(['device=', 'device-uri=', 'printer=', 'printer-name'])
+ 
+-        if self.num_valid_modes > 1:
+-            if GUI_MODE in self.avail_modes and prop.gui_build:
+-                params = ''.join([params, 'u'])
+-                long_params.extend(['gui', 'ui'])
+-
+-            if INTERACTIVE_MODE in self.avail_modes:
+-                params = ''.join([params, 'i'])
+-                long_params.extend(['interactive', 'text'])
+-
+-            if NON_INTERACTIVE_MODE in self.avail_modes:
+-                params = ''.join([params, 'n'])
+-                long_params.extend(['noninteractive', 'non-interactive', 'batch'])
++        if GUI_MODE in self.avail_modes and prop.gui_build:
++            params = ''.join([params, 'u'])
++            long_params.extend(['gui', 'ui'])
++            
++        if INTERACTIVE_MODE in self.avail_modes:
++            params = ''.join([params, 'i'])
++            long_params.extend(['interactive', 'text'])
++    
++        if NON_INTERACTIVE_MODE in self.avail_modes:
++            params = ''.join([params, 'n'])
++            long_params.extend(['noninteractive', 'non-interactive', 'batch'])
+ 
+         if self.supported_ui_toolkits is not None and \
+             self.num_supported_ui_toolkits >= 1 and prop.gui_build and \
diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index 2e93f95..fcb0f9a 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,6 +1,5 @@
            SPELL=bzr
-         VERSION=2.2.0
-      PATCHLEVEL=1
+         VERSION=2.2.2
               VX=`echo $VERSION|cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 95a6441..f01c8c9 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,7 @@
+2010-12-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.2.2
+	* PREBUILD,xmlrpclib.diff: deleted
+
 2010-09-19 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PREBUILD: apply patch
diff --git a/python-pypi/bzr/PRE_BUILD b/python-pypi/bzr/PRE_BUILD
deleted file mode 100755
index 7793b2b..0000000
--- a/python-pypi/bzr/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 <$SPELL_DIRECTORY/xmlrpclib.diff &&
-sedit "s:man/man1:share/man/man1:" setup.py
diff --git a/python-pypi/bzr/xmlrpclib.diff b/python-pypi/bzr/xmlrpclib.diff
deleted file mode 100644
index 88e67e0..0000000
--- a/python-pypi/bzr/xmlrpclib.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
---- bzrlib/transport/http/_urllib2_wrappers.py	2010-05-08 05:56:28 +0000
-+++ bzrlib/transport/http/_urllib2_wrappers.py	2010-09-15 02:43:44 +0000
-@@ -75,6 +75,26 @@
-     )
- 
- 
-+class addinfourl(urllib2.addinfourl):
-+    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
-+
-+    In python-2.7, xmlrpclib expects that the response object that it receives
-+    has a getheader method.  httplib.HTTPResponse provides this but
-+    urllib2.addinfourl does not.  Add the necessary functions here, ported to
-+    use the internal data structures of addinfourl.
-+    '''
-+
-+    def getheader(self, name, default=None):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.getheader(name, default)
-+
-+    def getheaders(self):
-+        if self.headers is None:
-+            raise httplib.ResponseNotReady()
-+        return self.headers.items()
-+
-+
- class _ReportingFileSocket(object):
- 
-     def __init__(self, filesock, report_activity=None):
-@@ -656,7 +676,7 @@
-             r = response
-             r.recv = r.read
-             fp = socket._fileobject(r, bufsize=65536)
--            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
-+            resp = addinfourl(fp, r.msg, req.get_full_url())
-             resp.code = r.status
-             resp.msg = r.reason
-             resp.version = r.version
-
diff --git a/python-pypi/bzrtools/DETAILS b/python-pypi/bzrtools/DETAILS
index 80a3f7f..4225fdf 100755
--- a/python-pypi/bzrtools/DETAILS
+++ b/python-pypi/bzrtools/DETAILS
@@ -1,9 +1,9 @@
            SPELL=bzrtools
-         VERSION=2.1.0
+         VERSION=2.2.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=http://launchpad.net/bzrtools/trunk/$VERSION/+download/$SOURCE
+   SOURCE_URL[0]=http://launchpad.net/bzrtools/stable/$VERSION/+download/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sig
   SOURCE2_IGNORE=signature
       SOURCE_GPG=canonical.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/python-pypi/bzrtools/HISTORY b/python-pypi/bzrtools/HISTORY
index aa1b348..909aa22 100644
--- a/python-pypi/bzrtools/HISTORY
+++ b/python-pypi/bzrtools/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Treeve Jelbert <treeve at souremage.org>
+	* DETAILS: version 2.2.0
+
 2010-02-20 Treeve Jelbert <treeve at souremage.org>
 	* DETAILS: version 2.1.0
 
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index c075cf7..94613c6 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,8 +1,8 @@
            SPELL=calibre
-         VERSION=0.7.20
+         VERSION=0.7.34
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:dde7410d0f47ca92cc69dce3a6eae64579c7643ae79757a8c3dddfbde0731c3842bb1805b7ceac1828365ea9a8475b45267c07716327622f0d86b07b6755dfaf
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
         WEB_SITE="http://calibre.kovidgoyal.net/"
       LICENSE[0]=GPL
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 873bc90..c41f076 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,6 @@
+2010-12-19 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 0.7.34
+
 2010-09-25 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 0.7.20
diff --git a/python-pypi/calibre/calibre-0.7.34.tar.gz.sig b/python-pypi/calibre/calibre-0.7.34.tar.gz.sig
new file mode 100644
index 0000000..f745ac7
Binary files /dev/null and b/python-pypi/calibre/calibre-0.7.34.tar.gz.sig differ
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 59d269f..73d4e9d 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mercurial
-         VERSION=1.7.2
-     SOURCE_HASH=sha512:dcd49cded47934cbb2dc081a68edc60174e081cab25b7ac856f9a6c8947b0f5ac897588c260e1b2ed23e0da87261857e354c2e2962ba9a3164f942b8b7957478
+         VERSION=1.7.3
+     SOURCE_HASH=sha512:babf8b3c28d18000dd93123285832030908274e3bcfe85449fcb443bafe2d79a146f682a2a9ea2c6ea11f3a8ed95ebfd79a571cc2cc5d8f9794d6589b4d8969b
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index c2fd5ce..4f71b4d 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2011-01-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: updated to 1.7.3
+
 2010-12-02 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.7.2
 
diff --git a/python-pypi/numpy/BUILD b/python-pypi/numpy/BUILD
new file mode 100755
index 0000000..efd518c
--- /dev/null
+++ b/python-pypi/numpy/BUILD
@@ -0,0 +1,5 @@
+if is_depends_enabled numpy atlas; then
+    default_build || return 1
+else
+    ATLAS=None PTATLAS=None BLAS=None LAPACK=None MKL=None default_build || return 1
+fi
diff --git a/python-pypi/numpy/DEPENDS b/python-pypi/numpy/DEPENDS
index a86d429..dbcf7d1 100755
--- a/python-pypi/numpy/DEPENDS
+++ b/python-pypi/numpy/DEPENDS
@@ -1 +1,3 @@
-depends python
+depends python &&
+optional_depends atlas \
+    "" "" "use the atlas numerics library"
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index a4621b4..77004fe 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,10 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, BUILD, SUB_DEPENDS, PRE_SUB_DEPENDS: made the
+	  dependency on atlas optional
+
+2010-12-27 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS: added missing dependency on atlas
+
 2010-12-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.5.1 (verified md5sum)
 
diff --git a/python-pypi/numpy/PRE_SUB_DEPENDS b/python-pypi/numpy/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..9d3e71c
--- /dev/null
+++ b/python-pypi/numpy/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+    ATLAS) is_depends_enabled $SPELL atlas;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/python-pypi/numpy/SUB_DEPENDS b/python-pypi/numpy/SUB_DEPENDS
new file mode 100755
index 0000000..df0d3bd
--- /dev/null
+++ b/python-pypi/numpy/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+    ATLAS) depends atlas;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/python-pypi/papyon/DETAILS b/python-pypi/papyon/DETAILS
index 5273895..fae9368 100755
--- a/python-pypi/papyon/DETAILS
+++ b/python-pypi/papyon/DETAILS
@@ -1,8 +1,8 @@
            SPELL=papyon
-         VERSION=0.5.0
+         VERSION=0.5.4
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://www.freedesktop.org/software/${SPELL}/releases/${SOURCE}
-     SOURCE_HASH=sha512:2e3ed831058b2918cfd16d276a39294c7aa0a44777f0a611c693bdffa42da7be9b9147dbc9275b9b073d9c45d262b9373fcb11c5e4e478dae7d69e21b360fe39
+     SOURCE_HASH=sha512:415be422159e3a7022740ddc3a67861800f241ab4277e0a05cd8ca0ecd659a8a3bd01fd3ba43f0bfd2ce5c576fe50ad331e4929839293e324c37b8f228b2f181
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.freedesktop.org/wiki/Software/papyon"
       LICENSE[0]=GPL
diff --git a/python-pypi/papyon/HISTORY b/python-pypi/papyon/HISTORY
index 74683cb..ab3f02f 100644
--- a/python-pypi/papyon/HISTORY
+++ b/python-pypi/papyon/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.5.4
+
 2010-08-26 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.5.0
 
diff --git a/python-pypi/psycopg2/DETAILS b/python-pypi/psycopg2/DETAILS
index a199294..41ca664 100755
--- a/python-pypi/psycopg2/DETAILS
+++ b/python-pypi/psycopg2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=psycopg2
-         VERSION=2.3.1
+         VERSION=2.3.2
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://initd.org/psycopg/tarballs/$SOURCE
diff --git a/python-pypi/psycopg2/HISTORY b/python-pypi/psycopg2/HISTORY
index dde700d..cefc4b5 100644
--- a/python-pypi/psycopg2/HISTORY
+++ b/python-pypi/psycopg2/HISTORY
@@ -1,3 +1,6 @@
+2010-12-21 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.3.2
+
 2010-12-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.3.1
 
diff --git a/python-pypi/python-mpd/DETAILS b/python-pypi/python-mpd/DETAILS
index 1f2509f..6dec636 100755
--- a/python-pypi/python-mpd/DETAILS
+++ b/python-pypi/python-mpd/DETAILS
@@ -1,10 +1,10 @@
            SPELL=python-mpd
-         VERSION=0.2.1
+         VERSION=0.3.0
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:47d255b8f92c79781a6e4e3e19d532c17431d1c81cc63943798ce411148d55cd51facc7be5207d1d4190de20d25d8c678cb5cda74ffda6e5d51e371b3f9cab94
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://www.musicpd.org/~jat/python-mpd/
+     SOURCE_HASH=sha512:d1ee57659ce6d41954beadc10b26de8b3f5e2f8395c4b5ada7c00cbfef20f693de51e41fc3931118cc63eb15195d1701c74e36eabf9f71c3505f97f66587e27a
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://jatreuman.indefero.net/p/python-mpd/
       LICENSE[0]=GPL
          ENTERED=20080404
            SHORT="Python MPD client library"
diff --git a/python-pypi/python-mpd/HISTORY b/python-pypi/python-mpd/HISTORY
index c5ed76b..b208f36 100644
--- a/python-pypi/python-mpd/HISTORY
+++ b/python-pypi/python-mpd/HISTORY
@@ -1,3 +1,6 @@
+2010-12-16 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.3.0; updated WEB_SITE; quoting paths
+
 2008-07-01 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.2.1
 
diff --git a/python-pypi/sqlkit/DETAILS b/python-pypi/sqlkit/DETAILS
index e8bf055..1e4b3f6 100755
--- a/python-pypi/sqlkit/DETAILS
+++ b/python-pypi/sqlkit/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sqlkit
-         VERSION=0.9.1
-     SOURCE_HASH=sha512:5dad6fb962a4c454ec726d927c04ba4c349fb203408be3ecd2d3bd1de19424ff679eb94ba992625a34480a7610891eec13ea48c4707ac156cdb3d06f5b13d687
+         VERSION=0.9.2
+     SOURCE_HASH=sha512:d4ab74e8ef55956c6c07a6ec1f8950e2969ca903bcda9e08634fca0a99b805ec4797d64e1f6c972deb2ad8047fb5c966f4698db28a1d6a588847dbef2496db6a
           SOURCE=$SPELL-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://sqlkit.argolinux.org
diff --git a/python-pypi/sqlkit/HISTORY b/python-pypi/sqlkit/HISTORY
index e6051af..5de0285 100644
--- a/python-pypi/sqlkit/HISTORY
+++ b/python-pypi/sqlkit/HISTORY
@@ -1,3 +1,6 @@
+2010-12-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.2
+
 2010-09-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.1
 
diff --git a/ruby-raa/rcairo/DEPENDS b/ruby-raa/rcairo/DEPENDS
index b681904..31fc83c 100755
--- a/ruby-raa/rcairo/DEPENDS
+++ b/ruby-raa/rcairo/DEPENDS
@@ -1,2 +1,3 @@
 depends cairo &&
-depends RUBY
+depends RUBY &&
+depends ruby-pkg-config
diff --git a/ruby-raa/rcairo/DETAILS b/ruby-raa/rcairo/DETAILS
index 9b40291..659d212 100755
--- a/ruby-raa/rcairo/DETAILS
+++ b/ruby-raa/rcairo/DETAILS
@@ -1,9 +1,9 @@
            SPELL=rcairo
-         VERSION=1.8.0
+         VERSION=1.10.0
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-     SOURCE_HASH=sha512:e87fde3c1f46602f31e2d2c818aeb40d8f9a33cdf80139be84954ea9a5676446809849273ee4db7e6358eae617954f8668d7b7de0282c9fdf588af44787d427c
+     SOURCE_HASH=sha512:0dd73d5cdcc313534b6736cbab25bef546b5f419f9703202dc1a333096d1c38786501e9c2c0b340ad51bc4c8c7232659f7f05d17df373b8ae3fe55c03d4a727b
         WEB_SITE=http://cairographics.org/rcairo/
          ENTERED=20080712
       LICENSE[0]=GPL
diff --git a/ruby-raa/rcairo/HISTORY b/ruby-raa/rcairo/HISTORY
index 6296154..b9cf79c 100644
--- a/ruby-raa/rcairo/HISTORY
+++ b/ruby-raa/rcairo/HISTORY
@@ -1,3 +1,7 @@
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.10.0
+	* DEPENDS: ruby-pkg-config added
+
 2010-02-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/ruby-1.8/DETAILS b/ruby-raa/ruby-1.8/DETAILS
index f4e3f34..536b2de 100755
--- a/ruby-raa/ruby-1.8/DETAILS
+++ b/ruby-raa/ruby-1.8/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ruby-1.8
          PACKAGE=ruby
-         VERSION=1.8.7-p302
+         VERSION=1.8.7-p330
           SOURCE=$PACKAGE-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:53016716c2c4bd68dea6e8ac551b4783550c5dba3830637713e42cf4696bad90c01f1a429a31ba7f1194c44688ef1abe36e1dc21f941973b429f2e4024d7fdaa
+     SOURCE_HASH=sha512:eaf09c9ba92a5e114df16bb8e93800211b5ae88c659486801d599d38d7ba788f848b0019e648a33f772da5af95e2cde8728287914c9409bccc42410b861f1a24
   SECURITY_PATCH=8
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/stable/$SOURCE
    SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index 9c2a370..5a9b1dc 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.8.7-p330
+
 2010-09-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.8.7-p302; SECURITY_PATCH++
 
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index 52fb18c..3e1f367 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby-1.9
          PACKAGE=ruby
-         VERSION=1.9.2-p0
-     SOURCE_HASH=sha512:2ba01f6948e980427c98f144454ff03eff78497a026b5412592d4c3afececcaa852b4764af2387009ec4ad8a01dec2127784952b48af90bf0f108baebd55b88d
+         VERSION=1.9.2-p136
+     SOURCE_HASH=sha512:7af5bbcf204751a53fa90ff9f4292b9c90f588a851cccaf48941a97f3a528f50e3cd8f86e78555f804360fa9c4cbc252051372017933718237ee0fb607007c28
           SOURCE=$PACKAGE-$VERSION.tar.gz
   SECURITY_PATCH=2
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 1a57dde..88ea9db 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.9.2-p136
+
 2010-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.2-p0
 	  fixes CVE-2010-0541
diff --git a/ruby-raa/ruby-pkg-config/DEPENDS b/ruby-raa/ruby-pkg-config/DEPENDS
new file mode 100755
index 0000000..257635e
--- /dev/null
+++ b/ruby-raa/ruby-pkg-config/DEPENDS
@@ -0,0 +1 @@
+depends RUBY
diff --git a/ruby-raa/ruby-pkg-config/DETAILS b/ruby-raa/ruby-pkg-config/DETAILS
new file mode 100755
index 0000000..f3f760e
--- /dev/null
+++ b/ruby-raa/ruby-pkg-config/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=ruby-pkg-config
+          SPELLX=pkg-config
+         VERSION=1.0.7
+     SOURCE_HASH=sha512:768e7f9f5d16977a32d2f58db762a54a5c7743850b262dbfeedc8435d5c2e7d12cff7e747e0c9284417acc6793eb1d4c83a65ef234b5ed2666c961abdf1b6fee
+          SOURCE=$SPELLX-$VERSION.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+   SOURCE_URL[0]=http://rubyforge.org/frs/download.php/72681/$SOURCE
+        WEB_SITE=http://github.com/rcairo/pkg-config
+         ENTERED=20101227
+      LICENSE[0]=LGPL
+           SHORT="a pkg-config implementation by Ruby"
+cat << EOF
+A pkg-config implementation by Ruby. 
+EOF
diff --git a/ruby-raa/ruby-pkg-config/HISTORY b/ruby-raa/ruby-pkg-config/HISTORY
new file mode 100644
index 0000000..3d4d1a1
--- /dev/null
+++ b/ruby-raa/ruby-pkg-config/HISTORY
@@ -0,0 +1,3 @@
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS: spell created, version 1.0.7
+
diff --git a/science/chemtool/DETAILS b/science/chemtool/DETAILS
index 6395aae..7f649be 100755
--- a/science/chemtool/DETAILS
+++ b/science/chemtool/DETAILS
@@ -1,10 +1,10 @@
            SPELL=chemtool
-         VERSION=1.6.11
+         VERSION=1.6.12
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/$SOURCE
 #     SOURCE_HASH=sha512:eb0a27f61cbdef30706ba77c749390aeaf1a45169c627e737321c614c6ef7bbe9c259dc07730892ec2d7daf4e95dc420f91651523e242abc59522ce211d64120
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+     SOURCE_HASH=sha512:1968b8ab7aec21bf75de520ccfb2fd0b379d2730987f38305dfcbb3db0414fb0b1a7323cb0fae8ade3a95f0eb0d3e761ba78f0f540b15dd70817176c15cd7870
       LICENSE[0]=GPL
         KEYWORDS="chemical science editors"
         WEB_SITE=http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html
diff --git a/science/chemtool/HISTORY b/science/chemtool/HISTORY
index e2190da..d7053f3 100644
--- a/science/chemtool/HISTORY
+++ b/science/chemtool/HISTORY
@@ -1,3 +1,6 @@
+2010-12-17 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.6.12
+
 2008-03-11 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.6.11
 
diff --git a/science/chemtool/chemtool-1.6.11.tar.gz.sig b/science/chemtool/chemtool-1.6.11.tar.gz.sig
deleted file mode 100644
index 3531575..0000000
Binary files a/science/chemtool/chemtool-1.6.11.tar.gz.sig and /dev/null differ
diff --git a/science/mathomatic/DETAILS b/science/mathomatic/DETAILS
index f2a7941..a4e486b 100755
--- a/science/mathomatic/DETAILS
+++ b/science/mathomatic/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mathomatic
-         VERSION=15.3.4
+         VERSION=15.3.7
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.panix.com/~gesslein/$SOURCE
-     SOURCE_HASH=sha512:cc8c54f9bf86b38a94aebaf5afc4b2aec2ade52e7ced5b8687511394dc57b1b87771df1934351f366e8fbc8b78f6902cccf4cd633b81b6b657cb98a02e97e4d4
+     SOURCE_HASH=sha512:309a623bdfa8a8b2a0511782832df253487ff204c259bb034aead6abb5e9a4b905b85211dd542db415ea3e59ffbdc8af5b77685c6207cea9e318d594d920322e
         WEB_SITE=http://mathomatic.orgserve.de/math/
          ENTERED=20041204
       LICENSE[0]=LGPL
diff --git a/science/mathomatic/HISTORY b/science/mathomatic/HISTORY
index 2c264bf..febc755 100644
--- a/science/mathomatic/HISTORY
+++ b/science/mathomatic/HISTORY
@@ -1,3 +1,6 @@
+2010-12-27 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 15.3.7
+
 2010-11-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 15.3.4
 
diff --git a/science/plplot/BUILD b/science/plplot/BUILD
new file mode 100755
index 0000000..0003cad
--- /dev/null
+++ b/science/plplot/BUILD
@@ -0,0 +1,6 @@
+OPTS="$OPTS -DCMAKE_BUILD_TYPE=Release" &&
+OPTS="$OPTS -DHAVE_AGG=OFF" &&
+OPTS="$OPTS -DGNAT_LIB=/usr/lib/gcc/${BUILD}/$(installed_version gcc)/adalib/libgnat.so" &&
+OPTS="$OPTS -DHAVE_FREETYPE=OFF" &&
+message "${MESSAGE_COLOR}${OPTS}${DEFAULT_COLOR}" &&
+qt4_cmake_build
diff --git a/science/plplot/DEPENDS b/science/plplot/DEPENDS
new file mode 100755
index 0000000..6a9a6f5
--- /dev/null
+++ b/science/plplot/DEPENDS
@@ -0,0 +1,55 @@
+optional_depends ada \
+    "-DENABLE_ada=ON" \
+    "-DENABLE_ada=OFF" \
+    "Ada bindings" &&
+depends cairo &&
+depends cmake &&
+optional_depends fortran \
+    "-DENABLE_f77=ON -DENABLE_f95=ON" \
+    "-DENABLE_f77=OFF -DENABLE_f95=OFF" \
+    "Fortran bindings" &&
+optional_depends g++ \
+    "-DENABLE_cxx=ON" \
+    "-DENABLE_cxx=OFF" \
+    "C++ bindings" &&
+depends gd &&
+optional_depends JDK \
+    "-DENABLE_java=ON" \
+    "-DENABLE_java=OFF" \
+    "java bindings" &&
+depends libharu &&
+depends libx11 &&
+depends libxext &&
+depends libxi &&
+depends lua &&
+depends m4 &&
+optional_depends octave \
+    "-DENABLE_octave=ON" \
+    "-DENABLE_octave=OFF" \
+    "octave bindings" &&
+depends pango &&
+depends lasi  &&
+optional_depends qhull \
+    "-DHAVE_QHULL=ON" \
+    "-DHAVE_QHULL=OFF" \
+    "build internal csironn library for nearest neighbor interpolation" &&
+optional_depends numpy \
+    "-DENABLE_python=ON" \
+    "-DENABLE_python=OFF" \
+    "python bindings" &&
+optional_depends qt4 \
+    "-DENABLE_qt=ON" \
+    "-DENABLE_qt=OFF" \
+    "Qt4 bindings" &&
+depends swig &&
+depends tcl "-DENABLE_tcl=ON" &&
+depends tk "-DENABLE_tk=ON"   &&
+optional_depends wxgtk \
+    "-DENABLE_wxwidgets=ON" \
+    "-DENABLE_wxwidgets=OFF" \
+    "wxwidgets bindings" &&
+depends xml-dom &&
+optional_depends pdl \
+    "-DENABLE_pdl=ON" \
+    "-DENABLE_pdl=OFF" \
+    "build perl data language bindings examples"
diff --git a/science/plplot/DETAILS b/science/plplot/DETAILS
new file mode 100755
index 0000000..d43af6e
--- /dev/null
+++ b/science/plplot/DETAILS
@@ -0,0 +1,28 @@
+           SPELL=plplot
+         VERSION=5.9.7
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}%20Source/${SOURCE}
+     SOURCE_HASH=sha512:a689c8f6e8f785be4c9afe97ebdd71c0cd451087d77038261b4c86e730a785f84e3b2915e90410f5fbe1fd20584493cfea6a7057330a10b1c51084495b4152a8
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://plplot.sourceforge.net"
+      LICENSE[0]=LGPL
+         ENTERED=20101218
+           SHORT="a cross-platform software package for creating scientific plots"
+cat << EOF
+PLplot is a cross-platform software package for creating scientific plots. To
+help accomplish that task it is organized as a core C library, language
+bindings for that library, and device drivers which control how the plots
+are presented in non-interactive and interactive plotting contexts.
+
+The PLplot core library can be used to create standard x-y plots, semi-log
+plots, log-log plots, contour plots, 3D surface plots, mesh plots, bar
+charts and pie charts. Multiple graphs (of the same or different sizes)
+may be placed on a single page, and multiple pages are allowed for those
+device formats that support them.
+
+PLplot has core support for Unicode. This means for our many Unicode-aware
+devices that plots can be labelled using the enormous selection of Unicode
+mathematical symbols. A large subset of our Unicode-aware devices also
+support complex text layout (CTL) languages such as Arabic, Hebrew, and
+Indic and Indic-derived CTL scripts such as Devanagari, Thai, Lao, and Tibetan.
+EOF
diff --git a/science/plplot/HISTORY b/science/plplot/HISTORY
new file mode 100644
index 0000000..61f779b
--- /dev/null
+++ b/science/plplot/HISTORY
@@ -0,0 +1,6 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS: added optional dependency on numpy
+
+2010-12-18 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/science/qtoctave/HISTORY b/science/qtoctave/HISTORY
index 7221b78..068fecf 100644
--- a/science/qtoctave/HISTORY
+++ b/science/qtoctave/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* qtoctave.desktop: added spanish comment
+
 2010-09-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, gcc-4.5.patch: fixed missing includes
 
diff --git a/science/qtoctave/desktop/qtoctave.desktop b/science/qtoctave/desktop/qtoctave.desktop
index 51c31d6..21f01e5 100644
--- a/science/qtoctave/desktop/qtoctave.desktop
+++ b/science/qtoctave/desktop/qtoctave.desktop
@@ -4,6 +4,7 @@ Version=1.0
 Name=QtOctave
 Type=Application
 Comment=a front-end for Octave
+Comment[es]=una interfaz gráfica para Octave
 Exec=qtoctave
 Icon=
 Categories=Applications;Math;numeric;
diff --git a/security/phash/DEPENDS b/security/phash/DEPENDS
new file mode 100755
index 0000000..88ae4e1
--- /dev/null
+++ b/security/phash/DEPENDS
@@ -0,0 +1,2 @@
+depends LIBAVCODEC &&
+depends cimg
diff --git a/security/phash/DETAILS b/security/phash/DETAILS
new file mode 100755
index 0000000..260260f
--- /dev/null
+++ b/security/phash/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=phash
+         VERSION=0.9.3
+          SOURCE=pHash-$VERSION.tar.gz
+   SOURCE_URL[0]=http://www.phash.org/releases/$SOURCE
+     SOURCE_HASH=sha512:dbc2f6a63474df0dd4ad27eb532be7d30bd94e27cadc3ea695906d169f3650cc354c85c683a6d17dbed528b3074ece034ecc8f96ad03be8d90633cbadcce1834
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/pHash-$VERSION"
+        WEB_SITE=http://www.phash.org/
+      LICENSE[0]=GPL
+         ENTERED=20101226
+           SHORT="perceptual hash library"
+cat << EOF
+pHash is an implementation of various perceptual hashing algorithms. A
+perceptual hash is a fingerprint of an audio, video, or image file that is
+mathematically based on the audio or visual content contained within. Unlike
+cryptographic hash functions that rely on the avalanche effect of small
+changes in input leading to drastic changes in the output, perceptual hashes
+are "close" to one another if the inputs are visually or auditorily
+similar. As a result, perceptual hashes must also be robust enough to take
+into account transformations that could have been performed on the input.
+EOF
diff --git a/security/phash/HISTORY b/security/phash/HISTORY
new file mode 100644
index 0000000..5dc135e
--- /dev/null
+++ b/security/phash/HISTORY
@@ -0,0 +1,3 @@
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS: spell created, version 0.9.3
+
diff --git a/security/scrub/DETAILS b/security/scrub/DETAILS
new file mode 100755
index 0000000..dc497ae
--- /dev/null
+++ b/security/scrub/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=scrub
+         VERSION=2.4
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://diskscrub.googlecode.com/files/$SOURCE
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+      LICENSE[0]=GPL
+        WEB_SITE=http://code.google.com/p/diskscrub/
+         ENTERED=20101230
+           SHORT="disk overwrite utility"
+cat << EOF
+Scrub writes patterns on files or disk devices to make
+retrieving the data more difficult.  It operates in one of three modes:
+1) the special file corresponding to an entire disk is scrubbed
+   and all data on it is destroyed.
+2) a regular file is scrubbed and only the data in the file
+   (and optionally its name in the directory entry) is destroyed.
+3) a regular file is created, expanded until
+   the file system is full, then scrubbed as in 2).
+EOF
diff --git a/security/scrub/HISTORY b/security/scrub/HISTORY
new file mode 100644
index 0000000..a9c938f
--- /dev/null
+++ b/security/scrub/HISTORY
@@ -0,0 +1,3 @@
+2010-12-30 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 2.4
+
diff --git a/security/scrub/scrub-2.4.tar.bz2.sig b/security/scrub/scrub-2.4.tar.bz2.sig
new file mode 100644
index 0000000..a13ae3d
Binary files /dev/null and b/security/scrub/scrub-2.4.tar.bz2.sig differ
diff --git a/security/srm/DETAILS b/security/srm/DETAILS
index 0027c7b..6b49739 100755
--- a/security/srm/DETAILS
+++ b/security/srm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=srm
-         VERSION=1.2.10
+         VERSION=1.2.11
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/security/srm/HISTORY b/security/srm/HISTORY
index 0a81627..72d2718 100644
--- a/security/srm/HISTORY
+++ b/security/srm/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.11
+
 2009-08-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.10
 
diff --git a/security/srm/srm-1.2.10.tar.gz.sig b/security/srm/srm-1.2.10.tar.gz.sig
deleted file mode 100644
index 62d14d6..0000000
Binary files a/security/srm/srm-1.2.10.tar.gz.sig and /dev/null differ
diff --git a/security/srm/srm-1.2.11.tar.gz.sig b/security/srm/srm-1.2.11.tar.gz.sig
new file mode 100644
index 0000000..6ce4d87
Binary files /dev/null and b/security/srm/srm-1.2.11.tar.gz.sig differ
diff --git a/security/ssdeep/DETAILS b/security/ssdeep/DETAILS
new file mode 100755
index 0000000..23cb3c4
--- /dev/null
+++ b/security/ssdeep/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=ssdeep
+         VERSION=2.6
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:96dcc69e9c3094124b3aa5fc076f3460f5e4cc4d30ad643945488db95f27a6c41ea7abe421a023060921409b978e73dae788bd2211c6c76591b16e8a7bd7550d
+        WEB_SITE=http://ssdeep.sourceforge.net
+      LICENSE[0]=GPL
+         ENTERED=20101226
+           SHORT="a program for computing context triggered piecewise hashes (CTPH)"
+cat << EOF
+ssdeep is a program for computing context triggered piecewise hashes (CTPH).
+Also called fuzzy hashes, CTPH can match inputs that have homologies. Such
+inputs have sequences of identical bytes in the same order, although bytes
+in between these sequences may be different in both content and length. 
+EOF
diff --git a/security/ssdeep/HISTORY b/security/ssdeep/HISTORY
new file mode 100644
index 0000000..f2b78d4
--- /dev/null
+++ b/security/ssdeep/HISTORY
@@ -0,0 +1,3 @@
+2010-12-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 2.6
+
diff --git a/shell-term-fm/mc/CONFIGURE b/shell-term-fm/mc/CONFIGURE
index 0c9eb01..0324c87 100755
--- a/shell-term-fm/mc/CONFIGURE
+++ b/shell-term-fm/mc/CONFIGURE
@@ -1,5 +1,7 @@
-config_query_list MC_GLIB "MC depends on either glib or glib2" glib2 glib &&
+config_query_list MC_SCREEN "Which screen library to use?" \
+                            ncurses \
+                            slang &&
 
-config_query_option MC_CHARSET \
-                    "Enable charset selection and conversion?" y \
-                    "--enable-charset" "--disable-charset"
+config_query_option MC_CHARSET "Enable charset selection and conversion?" y \
+                               "--enable-charset" \
+                               "--disable-charset"
diff --git a/shell-term-fm/mc/DEPENDS b/shell-term-fm/mc/DEPENDS
index fa5302c..5595cd6 100755
--- a/shell-term-fm/mc/DEPENDS
+++ b/shell-term-fm/mc/DEPENDS
@@ -1,11 +1,6 @@
-depends automake &&
-depends slang "--with-screen=slang" &&
+depends glib2 &&
 
-if [[ $MC_GLIB == glib ]]; then
-  depends glib "--with-glib12"
-else
-  depends glib2
-fi &&
+depends $MC_SCREEN "--with-screen=$MC_SCREEN" &&
 
 optional_depends gpm \
                  "--with-gpm-mouse" "--without-gpm-mouse" \
@@ -16,9 +11,9 @@ optional_depends libx11 \
                  "for X11 Support"  &&
 
 optional_depends samba \
-                 "--with-samba" "--without-samba" \
-                 "for smb virtual file system support"  &&
+                 "--enable-vfs-smb" "--disable-vfs-smb" \
+                 "for SMB virtual file system support"  &&
 
-if is_depends_enabled $SPELL libx11;then
+if is_depends_enabled $SPELL libx11; then
   optional_depends libxevie '' '' 'X11 event support'
 fi
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index b35e6e4..36fbaff 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,11 +1,11 @@
            SPELL=mc
-         VERSION=4.7.0.10
+         VERSION=4.7.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.midnight-commander.org/downloads/$SOURCE
         WEB_SITE=http://www.midnight-commander.org/
          ENTERED=20010922
-     SOURCE_HASH=sha512:2a716d925db0f68faf150be57dda01f13f2d04ff1f6f2fcec83ac24042edcf53316669fc44a2957890083f0be8d5a6514ba26e03c2f92046783c91ec36bdb4b6
+     SOURCE_HASH=sha512:cc58f5d0db33586bbde97030283ee96b1b9f6730297c2607a71f7d76499de8701c65dbb9630cdb1c5e7fda81152f7c88dd022ea6f05c04ca7ad3a7e4beaef3f4
       LICENSE[0]=GPL
         KEYWORDS="console"
            SHORT="Unix file manager and shell"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 0c3f5b9..9a1463d 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,11 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFIGURE, DEPENDS: readded screen selection option; cleaned up
+
+2010-12-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.7.5
+	* DEPENDS: --with-samba -> --enable-vfs-smb
+	* CONFIGURE, DEPENDS: removed glib, mc needs glib2 >= 2.8
+
 2010-11-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.7.0.10
 
diff --git a/shell-term-fm/remmina/DEPENDS b/shell-term-fm/remmina/DEPENDS
index 650659c..66821aa 100755
--- a/shell-term-fm/remmina/DEPENDS
+++ b/shell-term-fm/remmina/DEPENDS
@@ -4,7 +4,13 @@ depends  libpthread-stubs &&
 depends  zlib             &&
 depends  JPEG             &&
 depends  gnutls           &&
-optional_depends libssh    '' '' 'for SSH support'          &&
-optional_depends vte       '' '' 'for vte terminal support' &&
-optional_depends libgcrypt '' '' 'for password encryption'  
-
+optional_depends libssh  '--enable-ssh' '--disable-ssh' \
+                         'for SSH support' &&
+optional_depends vte       '--enable-vte' '--disable-vte' \
+                           'for vte terminal support' &&
+optional_depends libgcrypt '--enable-gcrypt' '--disable-gcrypt' \
+                           'for password encryption' &&
+optional_depends avahi '--enable-avahi' '--disable-avahi' \
+                       'for avahi support' &&
+optional_depends unique '--enable-unique' '--disable-unique' \
+                        'for managing unique processes'
diff --git a/shell-term-fm/remmina/DETAILS b/shell-term-fm/remmina/DETAILS
index 36c0fb0..edc8c3f 100755
--- a/shell-term-fm/remmina/DETAILS
+++ b/shell-term-fm/remmina/DETAILS
@@ -1,8 +1,8 @@
            SPELL=remmina
-         VERSION=0.7.4
+         VERSION=0.9.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:a7e9ae888b65f64a2dd6e7694eded1afa16b6657e6de8860f353282594c94eecbd1d49a139ef5e796dd7e172f78479930e6df954a42fb6f3de7888608deafade
+     SOURCE_HASH=sha512:38fe18958e2cc032632c31a38e40ae3888c68f8874e7cd46528db11bba1a8c0ee5221e99d10a90ee305cd14306ea20f80c5ae9d937d05faf2bdcd6095ac32053
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://remmina.sourceforge.net/
          ENTERED=20100305
diff --git a/shell-term-fm/remmina/HISTORY b/shell-term-fm/remmina/HISTORY
index be3de50..c3cbfa1 100644
--- a/shell-term-fm/remmina/HISTORY
+++ b/shell-term-fm/remmina/HISTORY
@@ -1,3 +1,6 @@
+2010-12-14 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 0.9.1
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/shell-term-fm/rxvt-unicode/DETAILS b/shell-term-fm/rxvt-unicode/DETAILS
index 5f6ee56..a435a7c 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
            SPELL=rxvt-unicode
-         VERSION=9.09
-     SOURCE_HASH=sha512:80827a77ff8710f85f32adf9749af8e30315406929f95a1892d645371f2520ad5b60c44dd5a10bd18baeed0850b5dcf532007124b8aae60d916f83a0581edc02
+         VERSION=9.10
+     SOURCE_HASH=sha512:e19cb074d5c279858d3bb68930a56d8f4d9c2eb77fa163a4c5609c491965135dee473230823a9823f59a74cbcc2ad2efc9836c26c96bea76778ae6cad281ec50
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://dist.schmorp.de/$SPELL/$SOURCE
diff --git a/shell-term-fm/rxvt-unicode/HISTORY b/shell-term-fm/rxvt-unicode/HISTORY
index d36a010..b3d5a31 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2010-12-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 9.10
+
 2010-11-19 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 9.09
 
diff --git a/shell-term-fm/tmux/DETAILS b/shell-term-fm/tmux/DETAILS
index 2ac640a..9f4c076 100755
--- a/shell-term-fm/tmux/DETAILS
+++ b/shell-term-fm/tmux/DETAILS
@@ -1,8 +1,8 @@
            SPELL=tmux
-         VERSION=1.3
+         VERSION=1.4
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:306fae6239b32a9b0e18329608b18d1170aa81802aee383d1bf88007fbb3a53fc8764e344b8cf5f7e02042db2b37c98a299ded02fef7ba9fcdc7e2ec8b63393d
+     SOURCE_HASH=sha512:75c71da11711a0fed76ff3ebdc109ec6c1474ec79d200cba51a38f1eb85ed903cb27f28a02e1366d83c96eb6e88391989bce835cf56720e9caffe0f2fda0b579
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://tmux.sourceforge.net/
       LICENSE[0]=BSD
diff --git a/shell-term-fm/tmux/HISTORY b/shell-term-fm/tmux/HISTORY
index 1634e66..aebd25d 100644
--- a/shell-term-fm/tmux/HISTORY
+++ b/shell-term-fm/tmux/HISTORY
@@ -1,3 +1,6 @@
+2010-12-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4
+
 2010-07-19 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.3
 
diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS
index fc1a524..1890d64 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -2,9 +2,9 @@
          VERSION=1.3
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.winterdrache.de/linux/newboot/$SOURCE
+   SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
      SOURCE_HASH=sha512:62b32450112e1ef99efbd784931ee0abc4d2a3d4a410adc0d657fde9f14a848a000d185298f35a7fa43367d003ab6ee264d42d3bad1250e2caceb5fe8fa33f03
-        WEB_SITE=http://www.winterdrache.de/linux/newboot/
+        WEB_SITE=http://www.winterdrache.de/freeware/
          ENTERED=20030505
       LICENSE[0]=GPL
         KEYWORDS="smgl"
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 1fa51f5..a02adea 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,6 @@
+2010-12-29 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: changed source url to our mirror and updated website
+
 2009-09-07 Arjan Bouter <abouter at sourcemage.org>
 	* PROVIDES: added, provides INIT
 	* CONFLICTS: conflicts with other init systems
diff --git a/spelling/stardict/HISTORY b/spelling/stardict/HISTORY
index a80eb7a..feaa984 100644
--- a/spelling/stardict/HISTORY
+++ b/spelling/stardict/HISTORY
@@ -1,3 +1,7 @@
+2011-01-08 Pol Vinogradov <vin.public at gmail.com>
+	* stardict-g++-sigc++3-fixes.patch.bz2: more fixes to build with
+	  gtk 2.23
+
 2010-12-05 Pol Vinogradov <vin.public at gmail.com>
 	* PRE_BUILD, stardict-g++-sigc++3-fixes.patch.bz2: fixes for building
 	  with gtk 2.22, compressed the patch
diff --git a/spelling/stardict/stardict-g++-sigc++3-fixes.patch.bz2 b/spelling/stardict/stardict-g++-sigc++3-fixes.patch.bz2
index caa972d..4113ac6 100644
Binary files a/spelling/stardict/stardict-g++-sigc++3-fixes.patch.bz2 and b/spelling/stardict/stardict-g++-sigc++3-fixes.patch.bz2 differ
diff --git a/telephony/ccrtp/DETAILS b/telephony/ccrtp/DETAILS
index 6ddcc42..0dec763 100755
--- a/telephony/ccrtp/DETAILS
+++ b/telephony/ccrtp/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ccrtp
-         VERSION=1.6.2
-     SOURCE_HASH=sha512:8ea71a9c2959a58e3ca5fe3edd17944110ced340e7d3b302925aac0e52c83ab8d1ff579cc1bf8e5145e76bd1db6149ff54089220a7650a73082ad3dd70fd2b5e
+         VERSION=1.7.2
+     SOURCE_HASH=sha512:b5395c9b9390ac15e09db3fa16ada95c1a9af44872466db944419b3b3f7714f8df878e739a205a051a51f213d29b53287b644d58f446081929cf412a311e8664
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNU_URL/ccrtp/$SOURCE
diff --git a/telephony/ccrtp/HISTORY b/telephony/ccrtp/HISTORY
index 58da5b3..b0deab6 100644
--- a/telephony/ccrtp/HISTORY
+++ b/telephony/ccrtp/HISTORY
@@ -1,3 +1,6 @@
+2010-12-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.2
+
 2008-12-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.2
 
diff --git a/telephony/telepathy-butterfly/DETAILS b/telephony/telepathy-butterfly/DETAILS
index 48c9a21..70c548e 100755
--- a/telephony/telepathy-butterfly/DETAILS
+++ b/telephony/telepathy-butterfly/DETAILS
@@ -1,5 +1,5 @@
            SPELL=telepathy-butterfly
-         VERSION=0.5.13
+         VERSION=0.5.15
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}
          SOURCE2="${SOURCE}.asc"
diff --git a/telephony/telepathy-butterfly/HISTORY b/telephony/telepathy-butterfly/HISTORY
index 8cd0bae..8071798 100644
--- a/telephony/telepathy-butterfly/HISTORY
+++ b/telephony/telepathy-butterfly/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.5.15
+
 2010-08-26 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.5.13
 
diff --git a/telephony/telepathy-glib/DETAILS b/telephony/telepathy-glib/DETAILS
index 6411e7c..dbd8a1a 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
            SPELL=telepathy-glib
-         VERSION=0.12.1
+         VERSION=0.12.6
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
         WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY b/telephony/telepathy-glib/HISTORY
index 6dc94ea..4ed6b68 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,6 @@
+2010-12-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.12.6
+
 2010-10-24 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: added optional_depends vala
 
diff --git a/telephony/telepathy-logger/DETAILS b/telephony/telepathy-logger/DETAILS
index d36c4d9..c749816 100755
--- a/telephony/telepathy-logger/DETAILS
+++ b/telephony/telepathy-logger/DETAILS
@@ -1,5 +1,5 @@
            SPELL=telepathy-logger
-         VERSION=0.1.6
+         VERSION=0.1.7
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
         WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-logger/HISTORY b/telephony/telepathy-logger/HISTORY
index 931de57..c2bbaa6 100644
--- a/telephony/telepathy-logger/HISTORY
+++ b/telephony/telepathy-logger/HISTORY
@@ -1,3 +1,6 @@
+2010-12-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.1.7
+
 2010-10-24 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS, DEPENDS: spell created, version 0.1.6
 
diff --git a/utils/aqemu/BUILD b/utils/aqemu/BUILD
index 8ab40d8..2113434 100755
--- a/utils/aqemu/BUILD
+++ b/utils/aqemu/BUILD
@@ -1,5 +1 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
-PATH="$QTDIR/bin/qt4:$PATH"
-./configure.sh $OPTS &&
-make
-
+qt4_cmake_build
diff --git a/utils/aqemu/DEPENDS b/utils/aqemu/DEPENDS
index bf79d31..b70e2a6 100755
--- a/utils/aqemu/DEPENDS
+++ b/utils/aqemu/DEPENDS
@@ -1,7 +1,8 @@
 depends qt4 &&
-depends qemu &&
+depends QEMU &&
+depends cmake &&
 
 optional_depends libvncserver                  \
                  ""                            \
-                 "--disable-embedded-display"  \
+                 "-DWITHOUT_EMBEDDED_DISPLAY=on"  \
                  "for an embedded VNC display"
diff --git a/utils/aqemu/DETAILS b/utils/aqemu/DETAILS
index 91e1028..9db2729 100755
--- a/utils/aqemu/DETAILS
+++ b/utils/aqemu/DETAILS
@@ -1,9 +1,9 @@
            SPELL=aqemu
-         VERSION=0.7.3
+         VERSION=0.8.0
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=${SOURCEFORGE_URL/\/sourceforge/\/project}/${SPELL}/$SPELL/$VERSION/${SOURCE}
-     SOURCE_HASH=sha512:868ee7ddcabe018fe94a116c497d822a78aca4d11e0bbbfbee880640951b814ad09c7500a519bc1133ad68cb67168b6ff5bd2387e14d74e48acba44101e39982
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/${VERSION/.0/}/${SOURCE}
+     SOURCE_HASH=sha512:974612953bd9ecb26259086e820f2edb99c16962e3106af7533d79b96c7dfb55ca8905d15f8264f613a2c7b1b7bbcc760c2adbc0cc077392d5fdefd7e57e36ac
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION/.0/}"
         WEB_SITE="http://sourceforge.net/projects/aqemu/"
       LICENSE[0]="GPLv2"
          ENTERED=20090714
diff --git a/utils/aqemu/HISTORY b/utils/aqemu/HISTORY
index 4d47e67..7a00d16 100644
--- a/utils/aqemu/HISTORY
+++ b/utils/aqemu/HISTORY
@@ -1,3 +1,12 @@
+2010-12-17 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: depends on QEMU provider
+
+2010-12-13 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.8.0
+	  Fixed SOURCE_URL[0]
+	* DEPENDS: fixed dependencies
+	* BUILD: use qt4_cmake_build
+
 2010-03-24 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD: ./configure.sh now takes $OPTS
 	* DEPENDS: made libvncserver optional
diff --git a/utils/checkinstall/HISTORY b/utils/checkinstall/HISTORY
index 0f29c11..2d270d9 100644
--- a/utils/checkinstall/HISTORY
+++ b/utils/checkinstall/HISTORY
@@ -1,3 +1,6 @@
+2010-12-30 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PRE_BUILD: use the old installwatch log variable #13873
+
 2008-08-14 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.6.1
 	* BUILD: added make
diff --git a/utils/checkinstall/PRE_BUILD b/utils/checkinstall/PRE_BUILD
index 198a125..d1d11be 100755
--- a/utils/checkinstall/PRE_BUILD
+++ b/utils/checkinstall/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build        &&
 cd  ${SOURCE_DIRECTORY}  &&
 sedit "s:PREFIX=/usr/local:PREFIX=$INSTALL_ROOT/usr:g" Makefile  &&
-sedit "26 d" Makefile
+sedit "26 d" Makefile &&
+# if installwatch is ever reenabled here (in combo with old sorcery) #13873
+sed -i "s,INSTW_LOGFILE,INSTALLWATCHFILE,g" installwatch-*/installwatch*
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index f6f42be..74e34cb 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
            SPELL=coreutils
-         VERSION=7.6
+         VERSION=8.9
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index a278eef..a62b80b 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,9 @@
+2011-01-04 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 8.9
+
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 8.8
+
 2009-09-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 7.6
 
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 485d413..47262a3 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,7 +1,7 @@
            SPELL=dbus
-         VERSION=1.4.0
-     SOURCE_HASH=sha512:b21bb72621a1f493e1fbe1b45807b36c43f59b260eff81f0c6de55c2787dca052141579fc1965b2bbe273c8a93f9e2009b6148cbe8b813264e85d244e2b517ac
-  SECURITY_PATCH=5
+         VERSION=1.4.1
+     SOURCE_HASH=sha512:ddfe9c641f40ce3bc13fc60bd4163241f837887515c25b2cb0d8497aa41f23724da6b7e265aafe67ffdfd5864ffaabe4b2e3d14dc6fcf2f464903b2b36fe53ba
+  SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index a003d67..1c5cff9 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2010-12-21 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.1, SECURITY_PATCH=6, CVE-2010-4352
+
 2010-09-24 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.4.0
 
diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index cb8b94d..d5bcfbf 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dmenu
-         VERSION=4.0
+         VERSION=4.2.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://dl.suckless.org/tools/${SOURCE}
-     SOURCE_HASH=sha512:c8dd48263f5376b29bd612c922c741c326442bb93d7b3f74534a50771d865ad31d3be29caedb262fa57d66115c56f25c745b2f76b2b7464526516ee110a421a7
+     SOURCE_HASH=sha512:db934678075ebe2e4d9f4bf34ffb8e07a2837885494cd0c6090ed52bd3622883a3585baa3dc7f4d29e91b32c77dab820f6063e25f4b56b769bab7bb9efa8e78d
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://tools.suckless.org/dmenu
          ENTERED=20061230
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index ba4b51e..628611c 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,6 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 4.2.1
+
 2009-09-04 Quentin Rameau <quinq at sourcemage.org>
 	* DETAILS: updated to version 4.0
 
diff --git a/utils/fcron/DETAILS b/utils/fcron/DETAILS
index ff5cc95..a8124fb 100755
--- a/utils/fcron/DETAILS
+++ b/utils/fcron/DETAILS
@@ -1,5 +1,5 @@
            SPELL=fcron
-         VERSION=3.0.4
+         VERSION=3.0.6
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://fcron.free.fr/archives/$SOURCE
@@ -7,8 +7,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_URL[0]=http://fcron.free.fr/archives/$SOURCE2
   SOURCE2_IGNORE=signature
       SOURCE_GPG="Thibault_Godouet.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
-  SECURITY_PATCH=1
-      PATCHLEVEL=1
+  SECURITY_PATCH=2
+      PATCHLEVEL=0
         WEB_SITE=http://fcron.free.fr/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/utils/fcron/HISTORY b/utils/fcron/HISTORY
index ba25d1f..9aebf77 100644
--- a/utils/fcron/HISTORY
+++ b/utils/fcron/HISTORY
@@ -1,3 +1,6 @@
+2010-12-31 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.0.6, SECURITY_PATCH=2, #15926
+
 2008-02-24 Vlad Glagolev <stealth at sourcemage.org>
 	* INSTALL: fixed a bug with multijobs on the SMP machines
 
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 257eb57..9bea5a8 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -2,7 +2,6 @@ depends  dbus-glib          &&
 depends  gawk               &&
 depends  glib2              &&
 depends  intltool           &&
-depends  libcap             &&
 depends  libtool            &&
 depends  udev '--with-udev-prefix=/etc' &&
 depends  xml-parser-expat   &&
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 8e4eb89..4b8867f 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2011-01-09 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: removed libcap as a required dep
+
 2009-12-01 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.5.14; .gz -> .bz2
 
diff --git a/utils/installwatch/BUILD b/utils/installwatch/BUILD
index e6385ef..d7cb532 100755
--- a/utils/installwatch/BUILD
+++ b/utils/installwatch/BUILD
@@ -1,15 +1 @@
-#!/bin/sh
-
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-ld-preload.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-errno.diff"  &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-buffer.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-cflags.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-syslog.diff" &&
-
-# If LIB is not defined, we do not have the bi-arch sorcery, so we
-# define LIB
-
-persistent_add LIB &&
-LIB="${LIB:-/lib}"
-make PREFIX="${TRACK_ROOT}/usr" LIBDIR="${TRACK_ROOT}/usr/${LIB}"
-
+make PREFIX="${TRACK_ROOT}/usr" LIBDIR="${TRACK_ROOT}/usr/lib"
diff --git a/utils/installwatch/DETAILS b/utils/installwatch/DETAILS
index c616a35..09a3776 100755
--- a/utils/installwatch/DETAILS
+++ b/utils/installwatch/DETAILS
@@ -1,14 +1,13 @@
            SPELL=installwatch
-         VERSION=0.6.3
-      PATCHLEVEL=3
-          SOURCE=$SPELL-$VERSION.tar.gz
-     SOURCE_HASH=sha512:cdcf33903fa8b8716b88b1e81808351386b5c63a64f6d859a59cd78961aaa228c79d500e2df35473af0be5cd48b62619c75f399bb0c13d2f1e1a50234f3da70c
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://asic-linux.com.mx/~izto/checkinstall/files/source/$SOURCE
+         VERSION=2010-12-12
+      PATCHLEVEL=1
+          SOURCE=$SPELL-$VERSION.tar.bz2
+     SOURCE_HASH=sha512:eda74e4a8b1707b7b5992e222baa8873b6248c0c9ef4475c521bef4dc3ba5374713ba09fc0acdaa369c67930865924994f4c15deb7b6b0e39cce5eeb6d24e50f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+   SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/$SOURCE
+#   SOURCE_URL[0]=http://asic-linux.com.mx/~izto/checkinstall/files/source/$SOURCE
         WEB_SITE=http://www.asic-linux.com.mx/~izto/checkinstall/installwatch.html
          ENTERED=20011230
-         UPDATED=20050106
-   BI_ARCH_SPELL="yes"
         KEYWORDS="utils"
            SHORT="utility for tracking files during the installation of software"
 cat << EOF
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 232a797..3eab385 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,11 @@
+2011-01-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: PATCHLEVEL=1, #13873
+	* PRE_BUILD: added seds due to the compatibility with stable sorcery
+
+2010-12-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2010-12-12, up-to-date git version from:
+	  http://checkinstall.izto.org/checkinstall.git
+
 2009-08-19 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: fixed source url's extension (.tgz -> .tar.gz); regenerated
 	  tarball; fixed desc; quoting paths
diff --git a/utils/installwatch/INSTALL b/utils/installwatch/INSTALL
index 19ed4a2..00d7ae0 100755
--- a/utils/installwatch/INSTALL
+++ b/utils/installwatch/INSTALL
@@ -1,3 +1 @@
-#!/bin/sh
-
-make BINDIR="${INSTALL_ROOT}/usr/bin" LIBDIR="${INSTALL_ROOT}/usr/${LIB}" install
+make BINDIR="${INSTALL_ROOT}/usr/bin" LIBDIR="${INSTALL_ROOT}/usr/lib" install
diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
new file mode 100755
index 0000000..5b671f9
--- /dev/null
+++ b/utils/installwatch/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch Makefile < $SPELL_DIRECTORY/ld_preload.patch &&
+sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile &&
+
+# due to the compatibility with stable sorcery
+sed -i "s,INSTW_LOGFILE,INSTALLWATCHFILE,g" installwatch* &&
+sed -i "/log.*access/ d" installwatch.c
diff --git a/utils/installwatch/installwatch-buffer.diff b/utils/installwatch/installwatch-buffer.diff
deleted file mode 100644
index c6c8093..0000000
--- a/utils/installwatch/installwatch-buffer.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN installwatch-0.6.3.ori/installwatch.c installwatch-0.6.3/installwatch.c
---- installwatch-0.6.3.ori/installwatch.c	2004-08-30 14:47:35.917768321 +0000
-+++ installwatch-0.6.3/installwatch.c	2004-08-30 14:51:30.568600728 +0000
-@@ -142,11 +142,17 @@
- 	va_start(ap, format);
- 	count = vsnprintf(buffer, BUFSIZE, format, ap);
- 	va_end(ap);
-+
-+    buffer [BUFSIZE - 2] = '\n';
-+    buffer [BUFSIZE - 1] = 0;
-+
- 	if(count == -1) {
- 		/* The buffer was not big enough */
- 		strcpy(&(buffer[BUFSIZE - 5]), "...\n");
- 		count = BUFSIZE - 1;
--	}
-+	} else {
-+        count = strlen(buffer);
-+    }
- 	if((logname = getenv("INSTALLWATCHFILE"))) {
- 		logfd = true_open(logname, O_WRONLY | O_CREAT | O_APPEND, 0666);
- 		if(logfd >= 0) {
-@@ -179,8 +185,9 @@
- 		 * to the current working directory if it was not 
- 		 * an absolute path                               */
- 		getcwd(resolved_path, MAXPATHLEN - 2);
-+        resolved_path[MAXPATHLEN - 2] = 0;
- 		strcat(resolved_path, "/");
--		strncat(resolved_path, path, MAXPATHLEN - 1);
-+		strncat(resolved_path, path, MAXPATHLEN - 1 - strlen(resolved_path));
- 	}
- 
-     errno = s_errno;
diff --git a/utils/installwatch/installwatch-cflags.diff b/utils/installwatch/installwatch-cflags.diff
deleted file mode 100644
index 0078dfa..0000000
--- a/utils/installwatch/installwatch-cflags.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- installwatch-0.6.3/Makefile.ori	2004-09-08 16:05:24.475554253 +0200
-+++ installwatch-0.6.3/Makefile	2004-09-08 16:06:55.238768317 +0200
-@@ -16,10 +16,10 @@
- all: installwatch.so
- 
- installwatch.so: installwatch.o
--	ld -shared -o installwatch.so installwatch.o -ldl -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -nostdlib -o installwatch.so installwatch.o -ldl -lc
- 
- installwatch.o: installwatch.c localdecls.h
--	gcc -Wall -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c
-+	$(CC) $(CFLAGS) -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c
- 
- localdecls.h:
- 	./create-localdecls
-@@ -33,7 +33,7 @@
- uninstall:
- 	rm $(LIBDIR)/installwatch.so
- 	rm $(BINDIR)/installwatch
--	
-+
- clean:
- 	rm -f *~ *.bak *.o installwatch.so core localdecls.h libctest test-installwatch
- 
diff --git a/utils/installwatch/installwatch-errno.diff b/utils/installwatch/installwatch-errno.diff
deleted file mode 100644
index f58ecda..0000000
--- a/utils/installwatch/installwatch-errno.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur installwatch-0.6.3/installwatch.c installwatch-0.6.3-new/installwatch.c
---- installwatch-0.6.3/installwatch.c	2001-12-23 00:37:06.000000000 +0100
-+++ installwatch-0.6.3-new/installwatch.c	2004-01-08 01:58:25.000000000 +0100
-@@ -134,7 +134,10 @@
- static void log(const char *format, ...) {
- 	char buffer[BUFSIZE], *logname;
- 	va_list ap;
--	int count, logfd;
-+	int count, logfd, s_errno;
-+
-+	/* save errno */
-+	s_errno = errno;
- 
- 	va_start(ap, format);
- 	count = vsnprintf(buffer, BUFSIZE, format, ap);
-@@ -156,9 +159,21 @@
- 		
- 	} else
- 		syslog(LOGLEVEL, buffer);
-+
-+	/* restore errno */
-+	errno = s_errno;
- }
- 
- static void canonicalize(const char *path, char *resolved_path) {
-+
-+    /* 2004/01/08 Benoit PAPILLAULT <benoit.papillault at free.fr>
-+       Since this function can change errno, we save and restore it
-+    */
-+
-+    int s_errno;
-+
-+    s_errno = errno;
-+
- 	if(!realpath(path, resolved_path) && (path[0] != '/')) {
- 		/* The path could not be canonicalized, append it
- 		 * to the current working directory if it was not 
-@@ -167,6 +182,8 @@
- 		strcat(resolved_path, "/");
- 		strncat(resolved_path, path, MAXPATHLEN - 1);
- 	}
-+
-+    errno = s_errno;
- } 
- 
- static void make_path (char *path) {
-@@ -532,7 +549,7 @@
- 
- 	backup (canonic);
- 
--	result = true_chown(path, owner, group);
-+	result = true_lchown(path, owner, group);
- 	log("%d\tlchown\t%s\t%d\t%d\t#%s\n", result, canonic, owner, group, error(result));
- 	return result;
- }
diff --git a/utils/installwatch/installwatch-ld-preload.diff b/utils/installwatch/installwatch-ld-preload.diff
deleted file mode 100644
index 966b5b7..0000000
--- a/utils/installwatch/installwatch-ld-preload.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur installwatch-0.6.3.ori/Makefile installwatch-0.6.3/Makefile
---- installwatch-0.6.3.ori/Makefile	2001-12-22 23:37:06.000000000 +0000
-+++ installwatch-0.6.3/Makefile	2003-09-20 20:31:52.000000000 +0000
-@@ -25,8 +25,8 @@
- 	./create-localdecls
- 
- install: all
--	if [ -r $(LIBDIR)/installwatch.so ]; then rm  $(LIBDIR)/installwatch.so; export LD_PRELOAD=""; cp installwatch.so $(LIBDIR); LD_PRELOAD=$(LIBDIR)/installwatch.so; else cp installwatch.so $(LIBDIR); fi
--	
-+	cp installwatch.so $(LIBDIR)/installwatch.so.new
-+	mv $(LIBDIR)/installwatch.so.new $(LIBDIR)/installwatch.so
- 	sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
- 	chmod 755 $(BINDIR)/installwatch
diff --git a/utils/installwatch/installwatch-syslog.diff b/utils/installwatch/installwatch-syslog.diff
deleted file mode 100644
index 8364e45..0000000
--- a/utils/installwatch/installwatch-syslog.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN installwatch-0.6.3/installwatch.c installwatch-0.6.4/installwatch.c
---- installwatch-0.6.3/installwatch.c	2004-11-10 17:34:11.817461389 +0100
-+++ installwatch-0.6.4/installwatch.c	2004-11-10 17:00:42.614038577 +0100
-@@ -164,7 +164,7 @@
- 			syslog(LOGLEVEL, "Could not open `%s' to write `%s': %s\n", logname, buffer, strerror(errno));
- 		
- 	} else
--		syslog(LOGLEVEL, buffer);
-+		syslog(LOGLEVEL, "%s", buffer);
- 
- 	/* restore errno */
- 	errno = s_errno;
diff --git a/utils/installwatch/ld_preload.patch b/utils/installwatch/ld_preload.patch
new file mode 100644
index 0000000..ae706dd
--- /dev/null
+++ b/utils/installwatch/ld_preload.patch
@@ -0,0 +1,16 @@
+--- Makefile.ori	2010-02-03 16:59:10.000000000 +0100
++++ Makefile	2010-02-03 18:02:11.000000000 +0100
+@@ -27,11 +27,8 @@
+ install: all
+ 	mkdir -p $(LIBDIR)
+ 	mkdir -p $(BINDIR)
+-	if [ -r $(LIBDIR)/installwatch.so ]; then \
+-		rm -f  $(LIBDIR)/installwatch.so; \
+-	fi
+-	install installwatch.so $(LIBDIR)
+-	
++	cp installwatch.so $(LIBDIR)/installwatch.so.new
++	mv $(LIBDIR)/installwatch.so.new $(LIBDIR)/installwatch.so
+ 	sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
+ 	chmod 755 $(BINDIR)/installwatch
+ 
diff --git a/utils/installwatch/localdecls.h b/utils/installwatch/localdecls.h
deleted file mode 100755
index 050420e..0000000
--- a/utils/installwatch/localdecls.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __LOCALDECLS_H_
-#define __LOCALDECLS_H_
-
-#define TRUNCATE_T off_t
-#define LIBC_VERSION "libc.so.6"
-#define GLIBC_MINOR 2
-
-#endif
diff --git a/utils/iotop/DETAILS b/utils/iotop/DETAILS
index 33e9fe1..a9610a4 100755
--- a/utils/iotop/DETAILS
+++ b/utils/iotop/DETAILS
@@ -1,8 +1,8 @@
            SPELL=iotop
-         VERSION=0.4.1
+         VERSION=0.4.2
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://guichaz.free.fr/${SPELL}/files/${SOURCE}
-     SOURCE_HASH=sha512:12acb2adfa30a8e3f785d647f8317d60aa27d0ccaf70a387bf122701d1c1c7fe72afe4b59224a247c1696f05407bfb2c604266dbdc64b17c06bf93e8c2373738
+     SOURCE_HASH=sha512:94da0dd548d5721023a0dd4f9ddcacb8caaa3bdd1f3b8ca8a05895b5e69d9dc53d7494ce417701a709df8cb2b935df9dcc19d1c3807a44750e55f22382c0321b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://guichaz.free.fr/iotop/"
       LICENSE[0]=GPL
diff --git a/utils/iotop/HISTORY b/utils/iotop/HISTORY
index 099fed1..65cc117 100644
--- a/utils/iotop/HISTORY
+++ b/utils/iotop/HISTORY
@@ -1,3 +1,6 @@
+2010-12-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.4.2
+
 2010-08-06 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: corrected ENTERED, removed garbage from description
 
diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index 2260780..5f42e0d 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -1,5 +1,5 @@
            SPELL=iso-codes
-         VERSION=3.21
+         VERSION=3.24
           SOURCE=${SPELL}-${VERSION}.tar.bz2
          SOURCE2=${SOURCE}.sig
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index 92e2532..3b060ed 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,9 @@
+2011-01-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.24
+
+2010-12-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.23
+
 2010-10-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.21
 
diff --git a/utils/nmon/BUILD b/utils/nmon/BUILD
new file mode 100755
index 0000000..b7e77ab
--- /dev/null
+++ b/utils/nmon/BUILD
@@ -0,0 +1 @@
+gcc ${CFLAGS} ${LDFLAGS} -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses ${SOURCE} -o nmon
diff --git a/utils/nmon/DETAILS b/utils/nmon/DETAILS
new file mode 100755
index 0000000..646ef79
--- /dev/null
+++ b/utils/nmon/DETAILS
@@ -0,0 +1,34 @@
+           SPELL=nmon
+         VERSION=14f
+          SOURCE="lmon${VERSION}.c"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:99405996c56dd01391cc97cb2e617f8e451321acb172c86ce810fb3271873a9a9106e1c05362d3dc2763231eaff7ac85f9110a4ae2a26f11b2a6ee51bc156d21
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://nmon.sourceforge.net"
+      LICENSE[0]=GPL
+         ENTERED=20110104
+           SHORT="Nigel's performance Monitor for Linux"
+cat << EOF
+This systems administrator, tuner and benchmark tool gives you a huge amount
+of important performance information in one go. It can output the data in
+two ways:
+
+   1. On screen (console, telnet, VNC, putty or X Windows) using curses for low
+      CPU impact which is updated once every two seconds. You hit a single
+      characters on you keyboard to enable/disable the various sorts of data.
+       * You can display the CPU, memory, network, disks (mini graphs or
+         numbers), file systems, NFS, top processes, resources (Linux version &
+         processors) and on Power micro-partition information.
+   2. Save the data to a comma separated file for analysis and longer term
+         data capture.
+       * Use this together with nmon Analyser Excel 2000 spreadsheet, which
+         loads the nmon output file and automatically creates dozens of graphs
+         ready for you to study or write performance reports.
+       * Filter this data, add it to a rrd database (using an excellent freely
+         available utility called rrdtool). This graphs the data to .gif or
+         .png files plus generates the webpage .html file and you can then put
+         the graphs directly on a website automatically on AIX with no need of
+         a Windows based machine.
+       * Directly put the data into a rrd database or other database for your
+         own analysis
+EOF
diff --git a/utils/nmon/HISTORY b/utils/nmon/HISTORY
new file mode 100644
index 0000000..0c67fd1
--- /dev/null
+++ b/utils/nmon/HISTORY
@@ -0,0 +1,9 @@
+2011-01-05 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: removed copy/pasted nonsense from description, reformatted description
+
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: added LDFLAGS to gcc invocation
+
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DETAILS, INSTALL: spell created
+
diff --git a/utils/nmon/INSTALL b/utils/nmon/INSTALL
new file mode 100755
index 0000000..266ffe6
--- /dev/null
+++ b/utils/nmon/INSTALL
@@ -0,0 +1 @@
+install -m755 -o root -g root ${SOURCE_DIRECTORY}/nmon ${INSTALL_ROOT}/usr/bin
diff --git a/utils/nmon/PRE_BUILD b/utils/nmon/PRE_BUILD
new file mode 100755
index 0000000..d0b6307
--- /dev/null
+++ b/utils/nmon/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir ${SOURCE_DIRECTORY} &&
+cd ${SOURCE_DIRECTORY}            &&
+cp ${SOURCE_CACHE}/${SOURCE} .
diff --git a/utils/nut-monitor/HISTORY b/utils/nut-monitor/HISTORY
index 1694397..df8b151 100644
--- a/utils/nut-monitor/HISTORY
+++ b/utils/nut-monitor/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* nut-monitor.desktop: added spanish name and comment
+
 2008-12-21 David Kowis <dkowis at shlrm.org>
 	* DETAILS: Fixed un-begun quotation
 
diff --git a/utils/nut-monitor/desktop/nut-monitor.desktop b/utils/nut-monitor/desktop/nut-monitor.desktop
index b68534b..87d257c 100644
--- a/utils/nut-monitor/desktop/nut-monitor.desktop
+++ b/utils/nut-monitor/desktop/nut-monitor.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=NUT Monitor
+Name[es]=Monitor NUT
 Name[fr]=Moniteur NUT
 Comment=Network UPS Tools GUI client
+Comment[es]=Cliente gráfico para NUT (Network UPS Tools)
 Comment[fr]=Client graphique pour NUT (Network UPS Tools)
 Categories=Application;Network;
 Encoding=UTF-8
diff --git a/utils/openipmi/BUILD b/utils/openipmi/BUILD
new file mode 100755
index 0000000..589720d
--- /dev/null
+++ b/utils/openipmi/BUILD
@@ -0,0 +1,2 @@
+make_single &&
+default_build
diff --git a/utils/openipmi/DETAILS b/utils/openipmi/DETAILS
index 84a6e94..dc1f4cf 100755
--- a/utils/openipmi/DETAILS
+++ b/utils/openipmi/DETAILS
@@ -1,15 +1,17 @@
            SPELL=openipmi
-         VERSION=2.0.6
-     SOURCE_HASH='sha512:d87a63a9fa209476622ebd69bc82e44b6841686a50c7f60165a8f32f77e4634797e5a54cac8d349869ceed40ce6d7f998edf5c55d05d6510dd174482d05d11a8'
+         VERSION=2.0.18
+#     SOURCE_HASH='sha512:d87a63a9fa209476622ebd69bc82e44b6841686a50c7f60165a8f32f77e4634797e5a54cac8d349869ceed40ce6d7f998edf5c55d05d6510dd174482d05d11a8'
           SOURCE="OpenIPMI-$VERSION.tar.gz"
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
    SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/OpenIPMI-$VERSION"
         WEB_SITE="http://$SPELL.sourceforge.net/"
    FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/"
       LICENSE[0]='LGPL'
-         UPDATED=20060117
            SHORT='An IPMI device driver and support library'
 cat << EOF
-OpenIPMI is an effort to create a full-function IPMI system to allow full access to all IPMI information on a server and to abstract it to a level that will make it easy to use.
+OpenIPMI is an effort to create a full-function IPMI system to allow full
+access to all IPMI information on a server and to abstract it to a level that
+will make it easy to use.
 EOF
 ## Auto-generated from Freshmeat.net's project descriptor
diff --git a/utils/openipmi/HISTORY b/utils/openipmi/HISTORY
index d97f61a..cb3299c 100644
--- a/utils/openipmi/HISTORY
+++ b/utils/openipmi/HISTORY
@@ -1,3 +1,8 @@
+2010-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 2.0.18
+	  Removed UPDATED
+	* BUILD: Fails with multiple make jobs
+
 2006-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
@@ -9,3 +14,4 @@
 
 2006-03-06 Sergey Lipnevich <sergey at sourcemage.org>
 	* ALL: spell created.
+
diff --git a/utils/openipmi/OpenIPMI-2.0.18.tar.gz.sig b/utils/openipmi/OpenIPMI-2.0.18.tar.gz.sig
new file mode 100644
index 0000000..7c2f604
Binary files /dev/null and b/utils/openipmi/OpenIPMI-2.0.18.tar.gz.sig differ
diff --git a/utils/procps/DETAILS b/utils/procps/DETAILS
index b96a3b4..543bdf8 100755
--- a/utils/procps/DETAILS
+++ b/utils/procps/DETAILS
@@ -1,5 +1,6 @@
            SPELL=procps
          VERSION=3.2.8
+      PATCHLEVEL=1
      SOURCE_HASH=sha512:00db8da277fec58fa603ff95e3c5a9e4efc6d8d4a705b20f08a08048b213a585197b2cb48ec6a25941c02d54212059bc02e8946d5801c0b9afa83a8bb88ddf64
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/procps/HISTORY b/utils/procps/HISTORY
index 395726e..d964287 100644
--- a/utils/procps/HISTORY
+++ b/utils/procps/HISTORY
@@ -1,3 +1,9 @@
+2011-01-05 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PRE_BUILD: apply the patch
+	* version.patch: added, to fix the warnings on new kernels
+	  ("Unknown HZ value!")
+
 2010-10-06 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Apply make.patch
 	* make.patch: Fix overzealous make 3.82 syntax
@@ -22,7 +28,7 @@
 2006-12-19 David Kowis <dkowis at shlrm.org>
 	* BUILD: removed -ffast-math from the Makefile
 	  Thanks to ruskie, sqweek for their assistance in tracking this down
-      fixes bug 13338
+	  fixes bug 13338
 
 2006-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
diff --git a/utils/procps/PRE_BUILD b/utils/procps/PRE_BUILD
index 5387f93..d9a3547 100755
--- a/utils/procps/PRE_BUILD
+++ b/utils/procps/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
 
+patch -p0 < "$SPELL_DIRECTORY/version.patch" &&
+
 message "${MESSAGE_COLOR}Patching for make 3.82 syntax...${DEFAULT_COLOR}" &&
 patch "$SOURCE_DIRECTORY"/Makefile \
       "$SPELL_DIRECTORY"/make.patch &&
diff --git a/utils/procps/version.patch b/utils/procps/version.patch
new file mode 100644
index 0000000..8a5b450
--- /dev/null
+++ b/utils/procps/version.patch
@@ -0,0 +1,11 @@
+--- proc/version.c.orig
++++ proc/version.c
+@@ -33,7 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
++static void init_Linux_version(void) __attribute__((constructor(100)));
+ static void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
diff --git a/utils/pybackpack/HISTORY b/utils/pybackpack/HISTORY
index 461857a..f4bce5f 100644
--- a/utils/pybackpack/HISTORY
+++ b/utils/pybackpack/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* pybackpack.desktop: added spanish comment
+
 2009-09-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD, DEPENDS, desktop, DETAILS, INSTALL: spell created
 
diff --git a/utils/pybackpack/desktop/pybackpack.desktop b/utils/pybackpack/desktop/pybackpack.desktop
index a21a61b..99953a8 100644
--- a/utils/pybackpack/desktop/pybackpack.desktop
+++ b/utils/pybackpack/desktop/pybackpack.desktop
@@ -4,6 +4,7 @@ Version=1.0
 Name=pybackpack
 Type=Application
 Comment=a user-friendly file backup tool
+Comment[es]=una amigable herramienta de respaldo de ficheros
 Exec=pybackpack
 Icon=
 Categories=Applications;GUI;Backup;
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index c3b0e7b..92606c3 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -14,12 +14,15 @@ case ${QEMU_VER:0:4} in
   0.12)
          VERSION=0.12.5
   ;;
+  0.13)
+         VERSION=0.13.0
+  ;;
 esac
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://mirror.its.uidaho.edu/pub/savannah/$SPELL/$SOURCE
 
-if [[ $QEMU_VER == "0.10" ]]; then
+if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.13" ]]; then
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=$SOURCE_URL.sig
   SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 467f69f..6564462 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2010-12-17 Bor Kraljič <pyrobor at ver.si>
+	* PREPARE,CONFIGURE,DETAILS: added 0.13 branch
+
 2010-08-03 Eric Sandall <sandalle at sourcemage.org>
 	* PROVIDES: qemu and kvm now provide QEMU functionality
 
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index af231fe..cab7c52 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -3,4 +3,4 @@ if [[ ${#QEMU_VER} -eq 6 ]]; then
 fi
 
 config_query_list QEMU_VER "Which branch to build?" \
-                  0.12 0.11 0.10
+                  0.13 0.12 0.11 0.10
diff --git a/utils/syslinux/DETAILS b/utils/syslinux/DETAILS
index 8bb6cf6..2f287c6 100755
--- a/utils/syslinux/DETAILS
+++ b/utils/syslinux/DETAILS
@@ -1,5 +1,5 @@
            SPELL=syslinux
-         VERSION=4.01
+         VERSION=4.03
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/boot/$SPELL/4.xx/$SOURCE
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index 86033c7..5200037 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,6 @@
+2010-12-24 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 4.03
+
 2010-07-03 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.01
 	  changed SOURCE_URL to avoid problem when new version comes out
diff --git a/utils/unetbootin/DETAILS b/utils/unetbootin/DETAILS
index 8f1c17e..e1f3264 100755
--- a/utils/unetbootin/DETAILS
+++ b/utils/unetbootin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=unetbootin
-         VERSION=485
+         VERSION=494
           SOURCE="${SPELL}-source-${VERSION}.tar.gz"
-     SOURCE_HASH=sha512:62986790713f1672f2dbe12659196db346ee57fa32a92e9040b4e084c190b632b07af6ecca5c4d111d2d68a45c33446827359a097043d06365823f46d8a9c703
+     SOURCE_HASH=sha512:098f933a4b80f4386b21a6b40e1bbcd84f32fd43836b68c1e753c23520b2758ea430905079968a9a8062349842169a71a627e76d074f9d860e67e5189bd92f98
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/UNetbootin/${VERSION}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://unetbootin.sourceforge.net/"
diff --git a/utils/unetbootin/HISTORY b/utils/unetbootin/HISTORY
index cbd9cd8..3f45c85 100644
--- a/utils/unetbootin/HISTORY
+++ b/utils/unetbootin/HISTORY
@@ -1,3 +1,6 @@
+2010-12-24 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 494
+
 2010-07-14 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 485
diff --git a/utils/unetbootin/unetbootin-source-424.tar.gz.sig b/utils/unetbootin/unetbootin-source-424.tar.gz.sig
deleted file mode 100644
index 8e23fdd..0000000
Binary files a/utils/unetbootin/unetbootin-source-424.tar.gz.sig and /dev/null differ
diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index 78697d9..a947e0d 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,6 +1,6 @@
            SPELL=usbutils
-         VERSION=0.91
-     SOURCE_HASH=sha512:e301ca763ea7d49532884f59ab9f03986e55a28e673efe1ee7930edbefe26680895337e038af6ea90146ce7bb72ae1963e8bca56eec0fb950c0575f9d872a086
+         VERSION=001
+     SOURCE_HASH=sha512:26e7903c6c31fb7f5ba8719774e830f0ec5a13b2ca5703c58d6202e0d59173fb77d1e4bdb10573e7f5165a3f0ddaa641c7040fe25fd215518777d2ec9dee2832
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index baaf604..8237441 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2010-12-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 001
+
 2010-10-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.91
 
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index 2196b14..b0b8d0b 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -8,6 +8,7 @@ depends  qt4      &&
 depends  sdl      &&
 depends  libidl   &&
 depends  xorg-libs &&
+depends  makeself &&
 
 optional_depends  python                           \
                   ""                               \
@@ -19,6 +20,11 @@ optional_depends  alsa-lib                         \
                   "--disable-alsa"                 \
                   "for alsa output support"  &&
 
+optional_depends  JAVA                             \
+                  ""                               \
+                  "--disable-java"                 \
+                  "for java bindings"              &&
+
 optional_depends  pulseaudio                       \
                   ""                               \
                   "--disable-pulse"                \
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index b16cadd..b31ccd5 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,10 @@
            SPELL=virtualbox
-         VERSION=3.2.10
+         VERSION=4.0.0
       PATCHLEVEL=0
-          SOURCE=VirtualBox-$VERSION-OSE.tar.bz2
+          SOURCE=VirtualBox-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}_OSE
    SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-     SOURCE_HASH=sha512:752f50a8a7deec18ee9e0a0c7d7288c668e981105b112a0c006883e3d52e08cd6e1422db389f2667fc63f1adf19654949e18f42806b08f19f8c05e667872f0b4
+     SOURCE_HASH=sha512:d7e4e08112ae88a31b1d9ebc5950e2369bbb26772c209c892e16aa70913120cb8b1640aa18688818cdb9b139cb55c2057326dc7c6eae00318d66fb9d6fc85aac
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index c0d99a3..81b0e01 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,11 @@
+2011-01-03 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.0.0, SOURCE updated (-OSE --)
+	* DEPENDS: depends makeself and optional_depends JAVA added
+	* PRE_BUILD: updated
+
+2010-12-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.12
+
 2010-10-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.10
 	* PRE_BUILD: removed python2.7 related sed
diff --git a/utils/virtualbox/PRE_BUILD b/utils/virtualbox/PRE_BUILD
index 2d15c15..32353c6 100755
--- a/utils/virtualbox/PRE_BUILD
+++ b/utils/virtualbox/PRE_BUILD
@@ -9,7 +9,7 @@ ln -s $TRACK_ROOT/usr/include     $SOURCE_DIRECTORY/FAKEQT4DIR/include  &&
 ln -s $TRACK_ROOT/usr/bin/qt4     $SOURCE_DIRECTORY/FAKEQT4DIR/bin      &&
 ln -s $TRACK_ROOT/usr/lib/qt4     $SOURCE_DIRECTORY/FAKEQT4DIR/lib      &&
 
-sedit "137d;139d" configure
+sedit "142d;144d" configure
 
-sedit "137iQT4DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
-sedit "139iQT4UIC3DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
+sedit "142iQT4DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
+sedit "144iQT4UIC3DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
diff --git a/video-libs/libass/DEPENDS b/video-libs/libass/DEPENDS
new file mode 100755
index 0000000..99755a4
--- /dev/null
+++ b/video-libs/libass/DEPENDS
@@ -0,0 +1,4 @@
+depends freetype2 &&
+depends fontconfig &&
+depends enca &&
+depends libpng
diff --git a/video-libs/libass/DETAILS b/video-libs/libass/DETAILS
new file mode 100755
index 0000000..5e47e97
--- /dev/null
+++ b/video-libs/libass/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=libass
+         VERSION=0.9.11
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+     SOURCE_HASH=sha512:730ac87779c316b33a92ee2ad8b7b4cfe5a76e765fbdb190d151b7fb1bde661b877e3809b94f4a876a123c8bf4fd9b9457ae2fe1d6586502752019c100796cbd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://code.google.com/p/libass"
+      LICENSE[0]=GPL
+         ENTERED=20101226
+           SHORT="a portable library for SSA/ASS subtitles rendering"
+cat << EOF
+libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation
+Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter.
+EOF
diff --git a/video-libs/libass/HISTORY b/video-libs/libass/HISTORY
new file mode 100644
index 0000000..4c4f44c
--- /dev/null
+++ b/video-libs/libass/HISTORY
@@ -0,0 +1,3 @@
+2010-12-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/video-libs/libavc1394/DETAILS b/video-libs/libavc1394/DETAILS
index d0a4ea3..9f62420 100755
--- a/video-libs/libavc1394/DETAILS
+++ b/video-libs/libavc1394/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libavc1394
-         VERSION=0.5.3
-     SOURCE_HASH=sha512:36761830082c0040708074eea8124c2eb027e3bb80fdbb8978af5eabe655afd2e6c9d7fc2aa9d4aba4d4d218cba9fa41fa6079119a9e460900b1e17effb4c145
+         VERSION=0.5.4
+     SOURCE_HASH=sha512:ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/video-libs/libavc1394/HISTORY b/video-libs/libavc1394/HISTORY
index 9b0b243..2da85d4 100644
--- a/video-libs/libavc1394/HISTORY
+++ b/video-libs/libavc1394/HISTORY
@@ -1,3 +1,6 @@
+2010-12-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: updated to 0.5.4
+
 2009-08-19 Treeve Jelbert <treeve at sourcemage.org>
 	* TRIGGERS: added
 
diff --git a/video-libs/libdvbpsi/DETAILS b/video-libs/libdvbpsi/DETAILS
index baac7d0..92bb2bc 100755
--- a/video-libs/libdvbpsi/DETAILS
+++ b/video-libs/libdvbpsi/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libdvbpsi
-         VERSION=0.1.6
-          SOURCE=${SPELL}5-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}5-$VERSION
+         VERSION=0.1.7
+     SOURCE_HASH=sha512:336e46b410e672232b56dc95c788d98ebebe9a635ccaadcb3e52428a1551b8a44d8609ce60e9cc19cfac617a4f4558dd6d9d578f524cb9cc395785657ca74b87
+          SOURCE=${SPELL}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
    SOURCE_URL[0]=http://download.videolan.org/pub/$SPELL/$VERSION/$SOURCE
         WEB_SITE=http://developers.videolan.org/libdvbpsi/
-     SOURCE_HASH=sha512:2d30a5e71dd1aab41eda02a0b455a2f8287925e740320d01bbb20801c43a231c4240bad18078cfa7c047e8b69d2adb529477208488adf1630259d5b6f79bc542
       LICENSE[0]=GPL
          ENTERED=20040219
         KEYWORDS="video libs"
diff --git a/video-libs/libdvbpsi/HISTORY b/video-libs/libdvbpsi/HISTORY
index cf8fdaf..abab92c 100644
--- a/video-libs/libdvbpsi/HISTORY
+++ b/video-libs/libdvbpsi/HISTORY
@@ -1,3 +1,6 @@
+2010-12-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.1.7
+
 2008-08-26 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 0.1.6
 
diff --git a/video-libs/libquicktime/DETAILS b/video-libs/libquicktime/DETAILS
index 1011a81..0bdc81e 100755
--- a/video-libs/libquicktime/DETAILS
+++ b/video-libs/libquicktime/DETAILS
@@ -1,7 +1,7 @@
            SPELL=libquicktime
-         VERSION=1.1.5
+         VERSION=1.2.1
       PATCHLEVEL=0
-     SOURCE_HASH=sha512:41cd278c4abb24910a2f32c673d7f9c67f2aa5415e0eea94f931d41834acee911753b8b3814c5c10cdddc8d0e3a557b53607b3bf26f3134edd395b5a4909bf41
+     SOURCE_HASH=sha512:c8ff75ce994ac67462ea71e97c974f2edd07ddd4ab3f94894a8efb14a6aac61a1a48449db837d573205cf4b00676baae8e6c7b156e566b1ec600ec02db89902f
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/libquicktime/${SOURCE}
diff --git a/video-libs/libquicktime/HISTORY b/video-libs/libquicktime/HISTORY
index d339722..8bad157 100644
--- a/video-libs/libquicktime/HISTORY
+++ b/video-libs/libquicktime/HISTORY
@@ -1,3 +1,7 @@
+2010-12-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.1
+	* PRE_BUILD: added, DGTK_DISABLE_DEPRECATED--
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/video-libs/libquicktime/PRE_BUILD b/video-libs/libquicktime/PRE_BUILD
new file mode 100755
index 0000000..06d3881
--- /dev/null
+++ b/video-libs/libquicktime/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sed -i "s:-DGTK_DISABLE_DEPRECATED::g" ./configure
diff --git a/video-libs/libraw1394/DETAILS b/video-libs/libraw1394/DETAILS
index 54054b3..e2ad807 100755
--- a/video-libs/libraw1394/DETAILS
+++ b/video-libs/libraw1394/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libraw1394
-         VERSION=2.0.5
-     SOURCE_HASH=sha512:602b1e0280323683c88b7176a3228ca72c65de3eecdeee394a606cbe1d074921498ea088366f0a15644f70cdab5140d227f501f7689c722fe6c6ffa7e5b82144
+         VERSION=2.0.6
+     SOURCE_HASH=sha512:b81bf7fff685b52d4b25732ecba80236604c958a358c90c5e0e391991ee61f464f7e9b61846689acc8abd4260d1ece72cea3076707eaff027fd70d1b1ef59eb9
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=LGPL
-        WEB_SITE=http://sourceforge.net/projects/libraw1394/
+        WEB_SITE=https://ieee1394.wiki.kernel.org/index.php/Release_Notes_-_Libraries
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
    SOURCE_URL[1]=$KERNEL_URL/pub/linux/libs/ieee1394/$SOURCE
          ENTERED=20020125
diff --git a/video-libs/libraw1394/HISTORY b/video-libs/libraw1394/HISTORY
index a6d1caa..cf92226 100644
--- a/video-libs/libraw1394/HISTORY
+++ b/video-libs/libraw1394/HISTORY
@@ -1,3 +1,6 @@
+2010-12-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.6, WEB_SITE updated
+
 2010-04-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: updated to 2.0.5
 
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index f79fc4b..bc5ebe9 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
            SPELL=live
-         VERSION=2010.11.17
+         VERSION=2010.12.31
           SOURCE=$SPELL.$VERSION.tar.gz
-     SOURCE_HASH=sha512:c17ef6ceb3b832fc8a666823e019aad02f3186ebf33f89c29e4fec20062821eb03398d7a215748775ba64cffdec7661479d6fa91bbf0a81a3767af3b56a7798c
+     SOURCE_HASH=sha512:8d331a7c54d39f580b697bddf208fa1b964115cfc1ca4415d58a2c4b4bc03062adcb1ace57ee34980d2d905c33a5764b33ee05a662c8bd730cd1e84e09c37ee6
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
    SOURCE_URL[1]=http://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/nork/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 419379f..30fe488 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2010.12.31
+
 2010-11-19 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2010.11.17
 
diff --git a/video/avidemux2/DEPENDS b/video/avidemux2/DEPENDS
index b25cb7e..58d3e61 100755
--- a/video/avidemux2/DEPENDS
+++ b/video/avidemux2/DEPENDS
@@ -1,6 +1,7 @@
 depends  cmake    &&
 depends  g++      &&
 depends  libxml2  &&
+depends  yasm     &&
 
 optional_depends  gtk+2 "" "-DNO_GTK=1" "for gtk+2 gui"  &&
 optional_depends  qt4   "" "-DNO_QT4=1" "for Qt gui"     &&
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index 43438e2..7ea0c0a 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,6 @@
+2011-01-07 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
+	* DEPENDS : Adding missing dep on yasm
+
 2010-10-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.5.4
 
diff --git a/video/dvbcut/HISTORY b/video/dvbcut/HISTORY
index 96d9695..8880d8c 100644
--- a/video/dvbcut/HISTORY
+++ b/video/dvbcut/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* dvbcut.desktop: added spanish comment
+
 2010-04-14 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, gcc-4.4.diff: added patch to make the spell build
 	  with gcc 4.4
@@ -8,7 +11,7 @@
 	  dvbcut-SConstruct.diff: removed
 
 2009-01-04 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD, DEPENDS, PRE_BUILD: removed usage of system ffmpeg as it's 
+	* BUILD, DEPENDS, PRE_BUILD: removed usage of system ffmpeg as it's
 	  incompatible
 	* dvbcut-0.5.3-ffmpeg-compat.patch,
 	  dvbcut-0.5.4-ffmpeg-compat2.patch,
diff --git a/video/dvbcut/desktop/dvbcut.desktop b/video/dvbcut/desktop/dvbcut.desktop
index 676685a..fc8a5ae 100644
--- a/video/dvbcut/desktop/dvbcut.desktop
+++ b/video/dvbcut/desktop/dvbcut.desktop
@@ -4,6 +4,7 @@ Version=
 Name=dvbcut
 Type=Application
 Comment=a Qt application that allows you to select certain parts of an MPEG transport stream and save these parts into a single MPEG output file
+Comment[es]=una aplicación Qt que le permite seleccionar ciertas partes de un flujo MPEG y guardarlas en un sola archivo MPEG
 Exec=dvbcut
 Icon=
 Categories=Application;Multimedia;Video;
diff --git a/video/gopedit/HISTORY b/video/gopedit/HISTORY
index 390b9db..a92d812 100644
--- a/video/gopedit/HISTORY
+++ b/video/gopedit/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* gopedit.desktop: added spanish comment
+
 2008-09-16 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: mpeg2dec -> libmpeg2
 	* PRE_BUILD, includes.patch.gz: added patch due to gcc 4.3 from
diff --git a/video/gopedit/desktop/gopedit.desktop b/video/gopedit/desktop/gopedit.desktop
index b98e5a7..58e1eb1 100644
--- a/video/gopedit/desktop/gopedit.desktop
+++ b/video/gopedit/desktop/gopedit.desktop
@@ -4,6 +4,7 @@ Version=0.2.9
 Name=gopedit
 Type=Application
 Comment=a simple program that lets you cut and merge MPEG2-PS files at GOP boundaries without reencoding
+Comment[es]=un programa simple que permite cortar y unir ficheros MPEG2-PS en límites GOP sin recodificar
 Exec=gopedit
 Icon=
 Categories=Applications;Multimedia;Video;
diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index 8e9cb64..6c19a1d 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -1,5 +1,6 @@
 depends gtk+2 &&
 depends sdl &&
+depends udev &&
 depends libpng &&
 depends libv4l &&
 depends portaudio19 &&
diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index 8466295..3adb089 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,8 +1,8 @@
            SPELL=guvcview
-         VERSION=1.4.2
+         VERSION=1.4.3
           SOURCE=${SPELL}-src-${VERSION}.tar.gz
    SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:36c3eae2f8138bc56ef3b0cda9fd57310e9626f132d5de88688ef0e1d93e1b43a731d35a74f933e93e5011ddd292ca79ca44d93fae8b799a0b36b36640567c93
+     SOURCE_HASH=sha512:d7a0d36ac2377281d7a4c0e5a7280a69709d3135ac8a9ad0f6d7547e5d942726f2fec01d5bd4a9c003a6351546cfafe2a6447dd16f03db47042ae72770bdf29d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
         WEB_SITE=http://guvcview.berlios.de/
       LICENSE[0]=GPL
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index b9c26f3..335c068 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,7 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.3
+	* DEPENDS: added udev as required dependency
+
 2010-10-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.2
 
diff --git a/video/kmenc15/HISTORY b/video/kmenc15/HISTORY
index bead5a4..405118c 100644
--- a/video/kmenc15/HISTORY
+++ b/video/kmenc15/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* kmenc15.desktop: added spanish comment
+
 2007-04-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, DEPENDS, BUILD, HISTORY, 
 	  desktop/kmenc15.desktop, PRE_BUILD: created spell
diff --git a/video/kmenc15/desktop/kmenc15.desktop b/video/kmenc15/desktop/kmenc15.desktop
index 9e2c1e6..5fedc0e 100644
--- a/video/kmenc15/desktop/kmenc15.desktop
+++ b/video/kmenc15/desktop/kmenc15.desktop
@@ -4,6 +4,7 @@ Version=0.04
 Name=kmenc15
 Type=Application
 Comment=an advanced Qt/KDE MEncoder frontend, generally designed to be a VirtualDub replacement for Linux
+Comment[es]=una interfaz Qt/KDE avanzada para MEncoder, generalmente diseñada para ser un remplazo a VirtualDub para Linux
 Exec=kmenc15
 Icon=
 Categories=Application;Multimedia;Video;
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index c8dcbdb..eeb9ba9 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
            SPELL=miro
-         VERSION=3.5
+         VERSION=3.5.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-     SOURCE_HASH=sha512:155709e694738831949a7cbf131a967090e5c09b8b262b09e1afff15e1fe6edc1d2adea94ad0fa109ee08a6449e01006ffcd53ec32c9fa76ccca4894bb04d93f
+     SOURCE_HASH=sha512:d02e75e878eb7a04a142e0f81460ebfd9abb43de1d605b9900a15fe9f7913c4cbd3b5df96d5d0f63ec3d098c64c5eac2d48527e010e12ea479447e7ce6fa1054
         WEB_SITE=http://www.getmiro.com/
          ENTERED=20090804
       LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index fdaa1c1..42b4c14 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,6 @@
+2010-12-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.5.1
+
 2010-10-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.5
 	* BUILD, INSTALL: platform/gtk-x11 -> linux
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index da9db9a..1fda1d4 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* mplayer.desktop: added generic name
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/video/mplayer/desktop/mplayer.desktop b/video/mplayer/desktop/mplayer.desktop
index 2a4bc51..a084013 100644
--- a/video/mplayer/desktop/mplayer.desktop
+++ b/video/mplayer/desktop/mplayer.desktop
@@ -7,3 +7,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;Video;
+GenericName=Video player
+GenericName[es]=Reproductor de video
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 321a743..3edaaaf 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -270,4 +270,8 @@ optional_depends  "libnotify"                          \
 optional_depends  "libv4l"                             \
                   "--enable-libv4l2"                   \
                   "--disable-libv4l2"                  \
-		  "for libv4l2 Video4Linux2 support"
+                  "for libv4l2 Video4Linux2 support" &&
+optional_depends  "libass"                             \
+                  "--enable-libass" \
+                  "--disable-libass" \
+                  "for subtitle rendering"
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index e985890..bf16b39 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS: added optional dependency on libass
+
 2010-11-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1.5
 
diff --git a/video/wxcam/DETAILS b/video/wxcam/DETAILS
index cf0d7e5..a20d5c1 100755
--- a/video/wxcam/DETAILS
+++ b/video/wxcam/DETAILS
@@ -1,8 +1,8 @@
            SPELL=wxcam
-         VERSION=1.0.6
+         VERSION=1.0.7
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:4a6c8e4fe9c81a2c399f975d9197f80338c10d8cdabcdafb1fff713555ed6dc17081ae6dbfbb5be769fc47855330dd5d461cbd666bf9335f901c0c144187c0fa
+     SOURCE_HASH=sha512:fd5df3137faa990ebf8927bb0e8449a80c569bf5ab3fa4361436b1897f95ab59cf9f84c14540eced9160806677496d91f8b7e3e36bcb8c8cffd9e26286873406
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://wxcam.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/video/wxcam/HISTORY b/video/wxcam/HISTORY
index 30978f6..25202e0 100644
--- a/video/wxcam/HISTORY
+++ b/video/wxcam/HISTORY
@@ -1,3 +1,6 @@
+2011-01-06 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.7
+
 2010-05-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.6
 
diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
new file mode 100755
index 0000000..fb0d92d
--- /dev/null
+++ b/video/xbmc/DEPENDS
@@ -0,0 +1,110 @@
+depends subversion &&
+depends g++ &&
+depends automake &&
+depends autoconf &&
+depends unzip &&
+depends boost &&
+depends cmake &&
+optional_depends glew \
+                 "--enable-gl" \
+                 "--disable-gl" \
+                 "for OpenGL rendering" &&
+optional_depends libvdpau \
+                 "--enable-vdpau" \
+                 "--disable-vdpau" \
+                 "for VDPAU decoding" &&
+depends libmad &&
+depends JPEG &&
+depends libsamplerate &&
+depends libogg &&
+depends libvorbis &&
+depends freetype2 &&
+depends fontconfig &&
+depends bzip2 &&
+depends sqlite &&
+depends alsa-lib &&
+depends libpng &&
+depends pcre &&
+depends lzo &&
+depends libcdio &&
+depends sdl &&
+depends sdl_image &&
+depends sdl_mixer &&
+depends enca &&
+depends jasper &&
+depends libxt &&
+depends libxtst &&
+depends libxmu &&
+depends libxinerama &&
+depends curl &&
+depends dbus &&
+depends fribidi &&
+depends mysql &&
+optional_depends hal \
+                 "--enable-hal" \
+                 "--disable-hal" \
+                 "for HAL support" &&
+optional_depends pulseaudio \
+                 "--enable-pulse" \
+                 "--disable-pulse" \
+                 "for PulseAudio support" &&
+optional_depends avahi \
+                 "--enable-avahi" \
+                 "--disable-avahi" \
+                 "for Avahi support" &&
+optional_depends libxrandr \
+                 "--enable-xrandr" \
+                 "--disable-xrandr" \
+                 "for XRandR support" &&
+optional_depends ffmpeg \
+                 "--enable-external-ffmpeg" \
+                 "--disable-external-ffmpeg" \
+                 "use system ffmpeg" &&
+optional_depends goom \
+                 "--enable-goom" \
+                 "--disable-goom" \
+                 "for GOOM visualization" &&
+optional_depends rtmpdump \
+                 "--enable-rtmp" \
+                 "--disable-rtmp" \
+                 "RTMP support via librtmp" &&
+optional_depends faac \
+                 "--enable-faac" \
+                 "--disable-faac" \
+                 "for faac support" &&
+optional_depends libdvdcss \
+                 "--enable-dvdcss" \
+                 "--disable-dvdcss" \
+                 "for DVDCSS support" &&
+optional_depends a52dec \
+                 "--enable-external-liba52" \
+                 "--disable-external-liba52" \
+                 "use system liba52" &&
+optional_depends libdts \
+                 "--enable-external-libdts" \
+                 "--disable-external-libdts" \
+                 "use system libdts" &&
+depends faad2 &&
+depends libmpeg2 &&
+depends libass &&
+depends flac &&
+depends wavpack &&
+depends gawk &&
+depends gperf &&
+depends nasm &&
+depends cwiid &&
+depends BLUEZ &&
+depends zlib &&
+depends libmms &&
+depends samba &&
+depends tiff &&
+depends openssl &&
+optional_depends libmicrohttpd \
+                 "--enable-webserver" \
+                 "--disable-webserver" \
+                 "for webserver support" &&
+depends libmodplug &&
+depends libssh &&
+depends gettext &&
+depends cvs &&
+depends libtool
diff --git a/video/xbmc/DETAILS b/video/xbmc/DETAILS
new file mode 100755
index 0000000..179e711
--- /dev/null
+++ b/video/xbmc/DETAILS
@@ -0,0 +1,36 @@
+           SPELL=xbmc
+         VERSION=10.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://mirrors.${SPELL}.org/releases/source/${SOURCE}
+     SOURCE_HASH=sha512:b08b13088fe72546589ca1b3f1fdc0b7f0551782b85f1c74f117d683ca516588254b57cd3bf168b4770445b954655eee0bd757ed698f2c7e9bbd81804627ca97
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://xbmc.org"
+      LICENSE[0]=GPL
+         ENTERED=20101225
+           SHORT="a software media player and entertainment hub"
+cat << EOF
+XBMC is an award-winning free and open source (GPL) software media player
+and entertainment hub for digital media. XBMC is available for Linux, OSX,
+Windows, and the original Xbox. Created in 2003 by a group of like minded
+programmers, XBMC is a non-profit project run and developed by volunteers
+located around the world. More than 50 software developers have contributed
+to XBMC, and 100-plus translators have worked to expand its reach, making
+it available in more than 30 languages.
+
+While XBMC functions very well as a standard media player application for
+your computer, it has been designed to be the perfect companion for your HTPC.
+Supporting an almost endless range of remote controls, and combined with its
+beautiful interface and powerful skinning engine, XBMC feels very natural
+to use from the couch and is the ideal solution for your home theater.
+
+Currently XBMC can be used to play almost all popular audio and video formats
+around. It was designed for network playback, so you can stream your multimedia
+from anywhere in the house or directly from the internet using practically any
+protocol available. Use your media as-is: XBMC can play CDs and DVDs directly
+from the disk or image file, almost all popular archive formats from your
+hard drive, and even files inside ZIP and RAR archives. It will even scan
+all of your media and automatically create a personalized library complete
+with box covers, descriptions, and fanart. There are playlist and slideshow
+functions, a weather forecast feature and many audio visualizations. Once
+installed, your computer will become a fully functional multimedia jukebox.
+EOF
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
new file mode 100644
index 0000000..18ef427
--- /dev/null
+++ b/video/xbmc/HISTORY
@@ -0,0 +1,3 @@
+2010-12-26 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/video/xbmc/PRE_BUILD b/video/xbmc/PRE_BUILD
new file mode 100755
index 0000000..2be2900
--- /dev/null
+++ b/video/xbmc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+./bootstrap
diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index 6e2aac3..5e48d25 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* xine.desktop: added generic name
+
 2010-07-20 Vlad Glagolev <stealth at sourcemage.org>
 	* FINAL: execute only if shared-mime-info is installed
 
diff --git a/video/xine-ui/desktop/xine.desktop b/video/xine-ui/desktop/xine.desktop
index 71e79d7..82fedeb 100644
--- a/video/xine-ui/desktop/xine.desktop
+++ b/video/xine-ui/desktop/xine.desktop
@@ -6,3 +6,5 @@ Icon=
 Terminal=false
 Type=Application
 Categories=Application;Multimedia;Video;
+GenericName=Video player
+GenericName[es]=Reproductor de video
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 289a948..7aac08d 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,9 +1,9 @@
            SPELL=awesome
-         VERSION=3.4.7
+         VERSION=3.4.8
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
-     SOURCE_HASH=sha512:b965ce394e17715aceff5b476ae776a03cdcf906cd2480979cfad57b600b7470bd5e384746204acbd75ede28d0fc9dc4322bd758082eb4eefd2c7cc08c0f7cd2
+     SOURCE_HASH=sha512:aa2dbc6cdb0aa879c2d2ba1ab93fe3014b202022cdc986a845845a9e603405039055724c9d442deb1d2463a93cbdaa97c69fe8647ac950ae2428a47300b9dbc7
       LICENSE[0]=MIT
         KEYWORDS="windowmanagers"
         WEB_SITE=http://awesome.naquadah.org/
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 215ea87..ef884dc 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2010-12-25 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 3.4.8
+
 2010-09-08 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* awesome.desktop: removed
 	* PRE_BUILD: sedit awesome's awesome.desktop to use our
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index 3cbf008..ad7d83e 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xmonad
-         VERSION=0.9
+         VERSION=0.9.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:7fe25a206f5a0cc12f1e35b3e0507310bdf5836137e2885359fd30e518359b69c21eebfdff1423d85c4f686e8d51f66c9158f629291c367e48ff8d0eeca3024b
+     SOURCE_HASH=sha512:8ea378fe73d8314992b52ce282c6cdf040b92dd1714ed210c498343a75639d86578f30e4911a6bc435ca2763f9d750b4993e5f9553bef5d85d4915c9eda95b6f
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://xmonad.org"
       LICENSE[0]=BSD3
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 2c051d3..c05aefa 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,6 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.9.2
+
 2009-10-31 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.9
 
diff --git a/wm-addons/iceme/HISTORY b/wm-addons/iceme/HISTORY
index f8da6d8..7e39c8e 100644
--- a/wm-addons/iceme/HISTORY
+++ b/wm-addons/iceme/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* iceme.desktop: added spanish name
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/wm-addons/iceme/desktop/iceme.desktop b/wm-addons/iceme/desktop/iceme.desktop
index c7e2933..e823481 100644
--- a/wm-addons/iceme/desktop/iceme.desktop
+++ b/wm-addons/iceme/desktop/iceme.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=IceWM Menu Editor
+Name[es]=Editor de menú de IceWM
 Exec=iceme
 Icon=
 Terminal=false
diff --git a/wm-addons/procmeter/BUILD b/wm-addons/procmeter/BUILD
new file mode 100755
index 0000000..c47b47e
--- /dev/null
+++ b/wm-addons/procmeter/BUILD
@@ -0,0 +1,13 @@
+make_single &&
+make procmeter3-lcd &&
+make procmeter3-log &&
+if is_depends_enabled $SPELL libxaw; then
+    make procmeter3-xaw || return 1
+fi &&
+if is_depends_enabled $SPELL gtk+; then
+    make procmeter3-gtk1 || return 1
+fi &&
+if is_depends_enabled $SPELL gtk+2; then
+    make procmeter3-gtk2 || return 1
+fi &&
+make_normal
diff --git a/wm-addons/procmeter/DEPENDS b/wm-addons/procmeter/DEPENDS
new file mode 100755
index 0000000..86ead34
--- /dev/null
+++ b/wm-addons/procmeter/DEPENDS
@@ -0,0 +1,3 @@
+optional_depends libxaw "" "" "build the xaw frontend?" &&
+optional_depends gtk+ "" "" "build the gtk+ frontend?" &&
+optional_depends gtk+2 "" "" "build the gtk+2 frontend?"
diff --git a/wm-addons/procmeter/DETAILS b/wm-addons/procmeter/DETAILS
new file mode 100755
index 0000000..9c69b45
--- /dev/null
+++ b/wm-addons/procmeter/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=procmeter
+         VERSION=3.5c
+          SOURCE="${SPELL}3-${VERSION}.tgz"
+   SOURCE_URL[0]=http://www.gedanken.demon.co.uk/download-${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:46217c1286c37b36af052fc87bb0db3ef2cccf436c24a918f9ba34ddcca4c2b0231ee4068cc51a33915ebbcc41bb2be451f0c8c26c4edac37c8b8ca4a04dba86
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}3-${VERSION}"
+        WEB_SITE="http://www.gedanken.demon.co.uk/download-procmeter/procmeter3-3.5c.tgz"
+      LICENSE[0]=GPL
+         ENTERED=20101229
+           SHORT="a user information display and system status monitor"
+cat << EOF
+The ProcMeter program itself is a framework on which a number of modules
+(plugins) are loaded. More modules can be written as required to perform
+more monitoring and informational functions.
+
+The statistics that are displayed are grouped by module, with a menu allowing
+selection of module and a sub-menu for each output available for that module.
+
+There are modules for APM, disk usage, memory, log files, network, sensors
+and many other data sources.
+EOF
diff --git a/wm-addons/procmeter/HISTORY b/wm-addons/procmeter/HISTORY
new file mode 100644
index 0000000..b1d524a
--- /dev/null
+++ b/wm-addons/procmeter/HISTORY
@@ -0,0 +1,3 @@
+2010-12-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: spell created
+
diff --git a/wm-addons/procmeter/PRE_BUILD b/wm-addons/procmeter/PRE_BUILD
new file mode 100755
index 0000000..775e51e
--- /dev/null
+++ b/wm-addons/procmeter/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+sedit "s:^CFLAGS=.*:CFLAGS=${CFLAGS}:" Makefile
diff --git a/wm-addons/wmforkplop/HISTORY b/wm-addons/wmforkplop/HISTORY
index 36c5bd6..7e5f33e 100644
--- a/wm-addons/wmforkplop/HISTORY
+++ b/wm-addons/wmforkplop/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* wmforkplop.desktop: added spanish comment
+
 2007-08-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, DEPENDS, HISTORY,
 	  desktop/wmforkplop.desktop, : created spell
diff --git a/wm-addons/wmforkplop/desktop/wmforkplop.desktop b/wm-addons/wmforkplop/desktop/wmforkplop.desktop
index d55f4fd..a6914bb 100644
--- a/wm-addons/wmforkplop/desktop/wmforkplop.desktop
+++ b/wm-addons/wmforkplop/desktop/wmforkplop.desktop
@@ -4,6 +4,7 @@ Version=0.9.3
 Name=wmforkplop
 Type=Application
 Comment=monitors your processes by sending visual stimuli to your cortex each time your kernel forks or kills a process
+Comment[es]=monitorea sus procesos enviando estímulo visual a su córtex cada vez que su kernel mata o crea un proceso
 Exec=wmforkplop
 Icon=
 Categories=Application;WMTools;
diff --git a/wm-addons/wmfsm/HISTORY b/wm-addons/wmfsm/HISTORY
index dba76c2..332f4fb 100644
--- a/wm-addons/wmfsm/HISTORY
+++ b/wm-addons/wmfsm/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* wmfsm.desktop: added spanish comment
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/wm-addons/wmfsm/desktop/wmfsm.desktop b/wm-addons/wmfsm/desktop/wmfsm.desktop
index 9e13ccc..0b673ed 100644
--- a/wm-addons/wmfsm/desktop/wmfsm.desktop
+++ b/wm-addons/wmfsm/desktop/wmfsm.desktop
@@ -4,6 +4,7 @@ Version=0.34
 Name=wmfsm
 Type=Application
 Comment=a filesystem usage monitor
+Comment[es]=un monitor de uso de sistema de archivos
 Exec=wmfsm
 Icon=
 Categories=Applications;System;Monitor;
diff --git a/wm-addons/xmobar/BUILD b/wm-addons/xmobar/BUILD
index de96a0c..2c313c5 100755
--- a/wm-addons/xmobar/BUILD
+++ b/wm-addons/xmobar/BUILD
@@ -1,2 +1,2 @@
-runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr &&
+runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr ${OPTS} &&
 runhaskell Setup.lhs build
diff --git a/wm-addons/xmobar/DEPENDS b/wm-addons/xmobar/DEPENDS
index faf52a1..eeea750 100755
--- a/wm-addons/xmobar/DEPENDS
+++ b/wm-addons/xmobar/DEPENDS
@@ -2,4 +2,6 @@ depends ghc &&
 depends haskell-x11 &&
 depends haskell-mtl &&
 depends haskell-parsec &&
-depends haskell-stm
+depends haskell-stm &&
+optional_depends haskell-x11-xft \
+    "--flags=with_xft" "" "for xft font rendering support"
diff --git a/wm-addons/xmobar/DETAILS b/wm-addons/xmobar/DETAILS
index e7f5d18..61dfa0a 100755
--- a/wm-addons/xmobar/DETAILS
+++ b/wm-addons/xmobar/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xmobar
-         VERSION=0.11.1
+         VERSION=0.12
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:291804ed6ff770a14630143d9927b659440cd7619047677ebef7058a8187f022fa0f2a02e4a89cc087ac8bb459965490c68e11a6c4c02ce180f54071277f84c2
+     SOURCE_HASH=sha512:bcdbbdae17d0e07f63e3c2dc2dd22fe381f6456f6327ac51c93de8ddf6863db31ba6c2a2deed2b8a6048c22eaf19152aad3c08c35c7ac0430b5ae1c3df1d8cec
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://gorgias.mine.nu/xmobar/"
       LICENSE[0]=BSD3
diff --git a/wm-addons/xmobar/HISTORY b/wm-addons/xmobar/HISTORY
index e7c80ba..bce403b 100644
--- a/wm-addons/xmobar/HISTORY
+++ b/wm-addons/xmobar/HISTORY
@@ -1,3 +1,9 @@
+2010-12-31 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, BUILD: added optional dependency on haskell-x11-xft
+
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.12
+
 2010-05-23 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.11.1
 
diff --git a/wm-addons/xmonad-contrib/DEPENDS b/wm-addons/xmonad-contrib/DEPENDS
index 96c60fc..5e87fb3 100755
--- a/wm-addons/xmonad-contrib/DEPENDS
+++ b/wm-addons/xmonad-contrib/DEPENDS
@@ -1,4 +1,5 @@
 depends ghc &&
 depends haskell-x11 &&
 depends haskell-mtl &&
+depends haskell-utf8-string &&
 depends xmonad
diff --git a/wm-addons/xmonad-contrib/DETAILS b/wm-addons/xmonad-contrib/DETAILS
index cc61bba..87608c0 100755
--- a/wm-addons/xmonad-contrib/DETAILS
+++ b/wm-addons/xmonad-contrib/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xmonad-contrib
-         VERSION=0.7
+         VERSION=0.9.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:7b65b3a32fba43e96607a44cdec96cb1444c473fe510f618d66ebc8791442520a4227619483b620222d3e6099ff45ad5289388364ea499232b6c4503b452a1ab
+     SOURCE_HASH=sha512:a99b0a8465e59e9357b8e42ccda3cc39ce1ff8580b133de2d9f97d6e7f5216072d2bd41f07298ed1f9a65ec92741901d21f0770fece8ba0788736b474e59d396
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://xmonad.org"
       LICENSE[0]=BSD3
diff --git a/wm-addons/xmonad-contrib/HISTORY b/wm-addons/xmonad-contrib/HISTORY
index c4af1a7..fed47d1 100644
--- a/wm-addons/xmonad-contrib/HISTORY
+++ b/wm-addons/xmonad-contrib/HISTORY
@@ -1,3 +1,7 @@
+2010-12-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.9.2
+	* DEPENDS: added dependency on haskell-utf8-string
+
 2008-03-30 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS: updated spell to 0.7
 
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index f35970f..df2d3fb 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,15 +1,15 @@
            SPELL=cairo
 if [[ $CAIRO_DEVEL == y ]]; then
-         VERSION=1.10.0
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6
+         VERSION=1.10.2
+      PATCHLEVEL=0
+     SOURCE_HASH=sha512:8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
 else
-         VERSION=1.10.0
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6
+         VERSION=1.10.2
+      PATCHLEVEL=0
+     SOURCE_HASH=sha512:8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
 fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f4ea246..5cc8fbe 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,11 @@
+2011-01-02 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_SUB_DEPENDS: Fix to work correctly
+	* REPAIR^all^PRE_SUB_DEPENDS: Updated to be current with
+	  PRE_SUB_DEPENDS.
+
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.10.2
+
 2010-09-15 Bor Kraljič <pyrobor at ver.si>
 	* cairo-1.10.0-buggy_gradients.patch: patch for gentoo bug #336696
 	* PRE_BUILD: apply the patch
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 75946d1..b0ffc2e 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-  CAIRO_DEVEL) if [[ "$CAIRO_DEVEL" == "y" ]]; then return 0; fi;;
+  CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
   XCB) is_depends_enabled $SPELL xcb-util;;
   PNG) is_depends_enabled $SPELL libpng;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 969c351..b0ffc2e 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
 case $THIS_SUB_DEPENDS in
+  CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
   XCB) is_depends_enabled $SPELL xcb-util;;
   PNG) is_depends_enabled $SPELL libpng;;
diff --git a/x11-libs/cairomm/DETAILS b/x11-libs/cairomm/DETAILS
index ee721e7..d7df838 100755
--- a/x11-libs/cairomm/DETAILS
+++ b/x11-libs/cairomm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cairomm
-         VERSION=1.8.4
-     SOURCE_HASH=sha512:58868ede4665be27e7ffd6620e970acd5cbad2e1e27ca347c5a36f857299cf25b9183375de13eb967a41e0f50bc042046dc85f580a99c8ba1b4c4289b73cd41f
+         VERSION=1.8.6
+     SOURCE_HASH=sha512:3847f1904838f9342489ae53a71af8cb5c2d8ed9d1356658d0fc642952cfe6884a79980f950833642d2b82858585e49e006f05a00edd5b18fd137aafd4caf064
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index 643a4d5..fbe4d66 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2010-12-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.8.6
+
 2010-04-04 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DEPENDS: fixed documentation build option
 
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index d54418c..2d40dd4 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_DEVEL == y ]]; then
-         VERSION=1.3.9
+         VERSION=1.3.11
   else
          VERSION=1.2.2
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index b0ab557..8e8c9e0 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2011-01-07 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: 1.3.11
+
+2010-12-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.3.10
+
 2010-12-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.3.9 and 1.2.2
 
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index bb9da28..30428ca 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gtk+2
 if [[ $GTK_VER == devel ]];then
-         VERSION=2.22.1
-#     SOURCE_HASH=sha512:a6c45ab25a5cf07c665f808a96b83a91bf0e8218f793806f1e05d664aeea4838957868ccbc13b45e9be1fdbadc6a7f294ec111f7d6d00bb09cf59fa4fe4eecc3
+         VERSION=2.23.90
+#     SOURCE_HASH=sha512:b27b34eddf0f1881f7b326702675bba10d2b3958b87842dc04c1797c67b1db341d768f1c960a9dba57867ec9b74a7f7392a10d56068148a52254195da0245754
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 else
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 1950471..3f1c76f 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,9 @@
+2011-01-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to verison 2.23.90
+
+2011-01-02 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.23.3
+
 2010-11-21 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Make gobject-introspection optional
 
diff --git a/x11-toolkits/gtk+2/gtk+-2.23.90.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.23.90.tar.bz2.sig
new file mode 100644
index 0000000..576a17f
Binary files /dev/null and b/x11-toolkits/gtk+2/gtk+-2.23.90.tar.bz2.sig differ
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index b7fb9ff..19e0643 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gtk+3
 if [[ $GTK_VER == devel ]];then
-         VERSION=2.91.1
+         VERSION=2.99.0
 #     SOURCE_HASH=sha512:a6c45ab25a5cf07c665f808a96b83a91bf0e8218f793806f1e05d664aeea4838957868ccbc13b45e9be1fdbadc6a7f294ec111f7d6d00bb09cf59fa4fe4eecc3
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 else
-         VERSION=2.91.1
+         VERSION=2.99.0
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 50bf5c7..469ced7 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,12 @@
+2011-01-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.99.0
+
+2010-12-24 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.91.7
+
+2010-12-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.91.5
+
 2010-10-17 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 2.91.1
 
diff --git a/x11-toolkits/gtk+3/gtk+-2.91.1.tar.bz2.sig b/x11-toolkits/gtk+3/gtk+-2.91.1.tar.bz2.sig
deleted file mode 100644
index fa0b23c..0000000
Binary files a/x11-toolkits/gtk+3/gtk+-2.91.1.tar.bz2.sig and /dev/null differ
diff --git a/x11-toolkits/gtk+3/gtk+-2.99.0.tar.bz2.sig b/x11-toolkits/gtk+3/gtk+-2.99.0.tar.bz2.sig
new file mode 100644
index 0000000..dcfcc52
Binary files /dev/null and b/x11-toolkits/gtk+3/gtk+-2.99.0.tar.bz2.sig differ
diff --git a/x11/conky/BUILD b/x11/conky/BUILD
new file mode 100755
index 0000000..2e70ddf
--- /dev/null
+++ b/x11/conky/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS $CONKY_OPTS" &&
+default_build
diff --git a/x11/conky/CONFIGURE b/x11/conky/CONFIGURE
new file mode 100755
index 0000000..1e3d6c8
--- /dev/null
+++ b/x11/conky/CONFIGURE
@@ -0,0 +1,10 @@
+config_query_option CONKY_OPTS 'enable METAR weather support?' n \
+    '--enable-weather-metar' '--disable-weather-metar' &&
+config_query_option CONKY_OPTS 'enable XOAP weather support?' n \
+    '--enable-weather-xoap' '--disable-weather-xoap' &&
+config_query_option CONKY_OPTS 'enable support for IBM/Lenovo laptops?' n \
+    '--enable-ibm' '--disable-ibm' &&
+config_query_option CONKY_OPTS 'enable support for Eve-Online skill monitor?' n \
+    '--enable-eve' '--disable-eve' &&
+config_query_option CONKY_OPTS 'enable support for RSS?' n \
+    '--enable-rss' '--disable-rss'
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 2b7720b..2212da6 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,5 +1,6 @@
            SPELL=conky
          VERSION=1.8.1
+     PATCH_LEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index 1c82ff2..6148758 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,8 @@
+2011-01-01 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* CONFIGURE, BUILD: added optional support for METAR and XOAP weather,
+	  IBM/Lenovo laptops, Eve-Online skill monitor and RSS
+	* DETAILS: PATCH_LEVEL=1
+
 2010-10-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.8.1
 
diff --git a/x11/fbpanel/BUILD b/x11/fbpanel/BUILD
deleted file mode 100755
index 68acc5f..0000000
--- a/x11/fbpanel/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-if  [  "$FBPANEL_CPUMON"  =  "y"  ];  then
-  OPTS="$OPTS  --cpu=on"
-else
-  OPTS="$OPTS  --cpu=off"
-fi  &&
-./configure  --prefix=/usr  \
-             $OPTS          &&
-make
diff --git a/x11/fbpanel/CONFIGURE b/x11/fbpanel/CONFIGURE
deleted file mode 100755
index 449666c..0000000
--- a/x11/fbpanel/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  FBPANEL_CPUMON  "Enable linux cpu monitor plugin?"  n
diff --git a/x11/fbpanel/DETAILS b/x11/fbpanel/DETAILS
index ea28834..5e9db8c 100755
--- a/x11/fbpanel/DETAILS
+++ b/x11/fbpanel/DETAILS
@@ -1,9 +1,10 @@
            SPELL=fbpanel
-         VERSION=4.12
-          SOURCE=$SPELL-$VERSION.tgz
+         VERSION=6.1
+          SOURCE=$SPELL-$VERSION.tbz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
+     SOURCE_HASH=sha512:10ffa422d811725dff68f43af9735d79c7859114bdf06f49b05e0bc4b0fd5eb8a3ea196cd07753f261d60c0bd0716baa6d5a22c860dde6597c70bfcfb0f7078e
+#SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
         WEB_SITE=http://$SPELL.sourceforge.net
          ENTERED=20040811
       LICENSE[0]=GPL
diff --git a/x11/fbpanel/HISTORY b/x11/fbpanel/HISTORY
index 5dbd2a5..a4b070c 100644
--- a/x11/fbpanel/HISTORY
+++ b/x11/fbpanel/HISTORY
@@ -1,3 +1,7 @@
+2011-01-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 6.1
+	* CONFIGURE, BUILD: removed
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11/fbpanel/fbpanel-4.12.tgz.sig b/x11/fbpanel/fbpanel-4.12.tgz.sig
deleted file mode 100644
index 7ca9235..0000000
Binary files a/x11/fbpanel/fbpanel-4.12.tgz.sig and /dev/null differ
diff --git a/x11/gtk-theme-switch/BUILD b/x11/gtk-theme-switch/BUILD
new file mode 100755
index 0000000..429933c
--- /dev/null
+++ b/x11/gtk-theme-switch/BUILD
@@ -0,0 +1 @@
+make CFLAGS="$CFLAGS"
diff --git a/x11/gtk-theme-switch/DEPENDS b/x11/gtk-theme-switch/DEPENDS
new file mode 100755
index 0000000..edffa0e
--- /dev/null
+++ b/x11/gtk-theme-switch/DEPENDS
@@ -0,0 +1 @@
+depends gtk+2
diff --git a/x11/gtk-theme-switch/DETAILS b/x11/gtk-theme-switch/DETAILS
new file mode 100755
index 0000000..f917d9a
--- /dev/null
+++ b/x11/gtk-theme-switch/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=gtk-theme-switch
+         VERSION=2.1.0
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://download.gna.org/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:ccf3876ab764f0a6a5d764aac9912ecf1bf7c92eddf8d38ab153c4ac2772151c67af59762e2cfb6aeb33baf33a141824e0825be0f3a8de4675c577198cfacf2f
+        WEB_SITE=http://gna.org/projects/gtk-theme-switch/
+      LICENSE[0]=GPL
+         ENTERED=20020716
+           SHORT="GTK+ theme-switching utility"
+cat << EOF
+GTK Theme Switch is a small and fast command line utility to switch GTK themes
+on the fly. It also has an optional GUI to preview the requested theme and
+change the font used with it, an optional GUI dock, and it can install themes
+downloaded from gtk.themes.org, preview them, or switch to them immediately.
+EOF
diff --git a/x11/gtk-theme-switch/HISTORY b/x11/gtk-theme-switch/HISTORY
new file mode 100644
index 0000000..545f0f7
--- /dev/null
+++ b/x11/gtk-theme-switch/HISTORY
@@ -0,0 +1,33 @@
+2011-12-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2nd generation
+	* DEPENDS: gtk+ -> gtk+2
+	* BUILD: use BUILD_API=2
+	* INSTALL: added, to install to /usr
+	* PRE_BUILD: added, to fix man pages path
+
+2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed MAINTAINER.
+
+2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: inserted BUILD_API=1 line
+
+2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2005-11-29 Seth Woolley <seth at tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2004-10-13 Arjan Bouter <abouter at sourcemage.org>
+	* added desktop files
+
+2003-06-19 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS to fix md5 for SOURCE.
+
+2003-01-30 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS to correct MD5
+
+2002-07-16 Robert Helgesson <rycee at home.se>
+	* Created spell
diff --git a/x11/gtk-theme-switch/INSTALL b/x11/gtk-theme-switch/INSTALL
new file mode 100755
index 0000000..7bf1215
--- /dev/null
+++ b/x11/gtk-theme-switch/INSTALL
@@ -0,0 +1 @@
+make PREFIX="$INSTALL_ROOT/usr" install
diff --git a/x11/gtk-theme-switch/PRE_BUILD b/x11/gtk-theme-switch/PRE_BUILD
new file mode 100755
index 0000000..3aa010e
--- /dev/null
+++ b/x11/gtk-theme-switch/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i "s:/man:/share/man/man1:g" Makefile
diff --git a/x11/gtk-theme-switch/desktop/gtk-theme-switch.desktop b/x11/gtk-theme-switch/desktop/gtk-theme-switch.desktop
new file mode 100644
index 0000000..f042eb3
--- /dev/null
+++ b/x11/gtk-theme-switch/desktop/gtk-theme-switch.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GTK theme switch
+Exec=switch
+Icon=
+Terminal=false
+Type=Application
+Categories=Application;Tools;
diff --git a/x11/merkaartor/DETAILS b/x11/merkaartor/DETAILS
index 7255f1e..24dcb70 100755
--- a/x11/merkaartor/DETAILS
+++ b/x11/merkaartor/DETAILS
@@ -1,8 +1,8 @@
            SPELL=merkaartor
-         VERSION=0.16.3
-     SOURCE_HASH=sha512:ab27532ed197dda50ba23e3c33a3f592824f70a098ccc0cdbfb0be927b331ad04b5284731f6efed729ff71285323a65fcd885d527dad1ee47d7e715773f5b49a
+         VERSION=0.17.0
+     SOURCE_HASH=sha512:9e3cbe2b1db72125b32ae9b916b7a43511cc2847b87084490ce579270407acf6263dd1ce3ec68803897207a329129fc31a3101d796078107dd1d39318ea720b0
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://www.merkaartor.be/attachments/download/29/${SOURCE}
+   SOURCE_URL[0]=http://www.merkaartor.be/attachments/download/192/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.merkaartor.be"
       LICENSE[0]=GPL
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index 345b8c6..189a8e5 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,6 @@
+2010-12-26 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.17.0
+
 2010-08-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.16.3
 
diff --git a/x11/xoverkill/HISTORY b/x11/xoverkill/HISTORY
index c695e34..ddd075d 100644
--- a/x11/xoverkill/HISTORY
+++ b/x11/xoverkill/HISTORY
@@ -1,3 +1,6 @@
+2011-01-02 Ismael Luceno <ismael at sourcemage.org>
+	* xoverkill.desktop: added spanish comment
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11/xoverkill/desktop/xoverkill.desktop b/x11/xoverkill/desktop/xoverkill.desktop
index 2f7e2fe..dbd1105 100644
--- a/x11/xoverkill/desktop/xoverkill.desktop
+++ b/x11/xoverkill/desktop/xoverkill.desktop
@@ -4,6 +4,7 @@ Version=
 Name=XOverKill
 Type=Application
 Comment=xkill on steroids
+Comment[es]=xkill en esteroides
 Exec=xoverkill
 Icon=
 Categories=Applications;System;
diff --git a/xfce-plugins/thunar-media-tags-plugin/DETAILS b/xfce-plugins/thunar-media-tags-plugin/DETAILS
index 7d5a231..91a0ef8 100755
--- a/xfce-plugins/thunar-media-tags-plugin/DETAILS
+++ b/xfce-plugins/thunar-media-tags-plugin/DETAILS
@@ -1,9 +1,10 @@
            SPELL=thunar-media-tags-plugin
          VERSION=0.1.2
+          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-        WEB_SITE=http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://archive.xfce.org/src/thunar-plugins/$SPELL/$BRANCH/$SOURCE
+        WEB_SITE=http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
       SOURCE_GPG="gurus.gpg:$SOURCE.sig"
       LICENSE[0]=GPL
          ENTERED=20070217
diff --git a/xfce-plugins/thunar-media-tags-plugin/HISTORY b/xfce-plugins/thunar-media-tags-plugin/HISTORY
index e0f5be3..b23547b 100644
--- a/xfce-plugins/thunar-media-tags-plugin/HISTORY
+++ b/xfce-plugins/thunar-media-tags-plugin/HISTORY
@@ -1,3 +1,6 @@
+2011-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: renewed urls
+
 2007-02-18 George Sherwood <george at beernabeer.com>
 	* DEPENDS, DETAILS, HISTORY: created the spell
 
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index 1e4fef4..18a1d4b 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,6 @@
+2010-12-23 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: added to fix compiling with gtk
+
 2010-04-19 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.8.6
 
diff --git a/xorg-app/compiz/PRE_BUILD b/xorg-app/compiz/PRE_BUILD
new file mode 100755
index 0000000..872625e
--- /dev/null
+++ b/xorg-app/compiz/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
+
+sed -i 's/gdk_display\([,;]\)/GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())\1/g' gtk/window-decorator/gtk-window-decorator.c
diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 3b5c641..191b8e9 100755
--- a/xorg-lib/libx11/DETAILS
+++ b/xorg-lib/libx11/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org/wiki
          ENTERED=20051125
   SECURITY_PATCH=2
+      PATCHLEVEL=1
       LICENSE[0]=XCL
            SHORT="Module libx11 for xorg"
 cat << EOF
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index 2cb1612..e6e44b5 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,8 @@
+2010-12-16 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply xlibh.patch
+	* xlibh.patch: Revert header-breaking commit, fixes Bug #15921
+
 2010-11-30 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: libxcb isn't optional anymore
 
diff --git a/xorg-lib/libx11/PRE_BUILD b/xorg-lib/libx11/PRE_BUILD
new file mode 100755
index 0000000..ee58e93
--- /dev/null
+++ b/xorg-lib/libx11/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Applying Xlib.h header fix${DEFAULT_COLOR}" &&
+patch "$SOURCE_DIRECTORY"/include/X11/Xlib.h \
+      "$SPELL_DIRECTORY"/xlibh.patch
diff --git a/xorg-lib/libx11/xlibh.patch b/xorg-lib/libx11/xlibh.patch
new file mode 100755
index 0000000..237184e
--- /dev/null
+++ b/xorg-lib/libx11/xlibh.patch
@@ -0,0 +1,36 @@
+#
+# Rollback this offending patch, see
+# http://bugs.sourcemage.org/show_bug.cgi?id=15921
+#
+commit d0cbf388919364fe6b5b9127f36426eb744090a0
+Author: Jeremy Huddleston <jeremyhu at apple.com>
+Date:   Sun Sep 26 21:21:16 2010 -0700
+
+    Add an "X11_" string to header guards to avoid possible collision
+
+    This addresses a build failure which can result from <X11/Xlocale.h> and
+    <xlocale.h> being included in the same code since they both used the same
+    _XLOCALE_H_ protection.
+
+    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+
+diff -Naur libX11-1.4.0.orig/include/X11/Xlib.h libX11-1.4.0/include/X11/Xlib.h
+--- libX11-1.4.0.orig/include/X11/Xlib.h	2010-12-16 14:19:08.398837832 -0800
++++ libX11-1.4.0/include/X11/Xlib.h	2010-12-16 14:20:17.853837890 -0800
+@@ -30,8 +30,8 @@
+  *	interface library (Xlib) to the X Window System Protocol (V11).
+  *	Structures and symbols starting with "_" are private to the library.
+  */
+-#ifndef _X11_XLIB_H_
+-#define _X11_XLIB_H_
++#ifndef _XLIB_H_
++#define _XLIB_H_
+ 
+ #define XlibSpecificationRelease 6
+ 
+@@ -4020,4 +4020,4 @@
+ 
+ _XFUNCPROTOEND
+ 
+-#endif /* _X11_XLIB_H_ */
++#endif /* _XLIB_H_ */



More information about the SM-Commit mailing list