[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (1e1369b8da82c28b24e33b54b27496cf6e8804f6)

Eric Sandall scm at sourcemage.org
Sat Jul 18 03:13:49 EDT 2009


GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                                                                  |   11 +++
 accounts                                                                   |    1 
 audio-players/mpd/DETAILS                                                  |    4 -
 audio-players/mpd/HISTORY                                                  |    3 
 collab/openldap/DETAILS                                                    |    4 -
 collab/openldap/HISTORY                                                    |    3 
 crypto/beecrypt/DEPENDS                                                    |    5 +
 crypto/beecrypt/DETAILS                                                    |    4 -
 crypto/beecrypt/HISTORY                                                    |    9 ++
 crypto/beecrypt/PRE_BUILD                                                  |    2 
 crypto/beecrypt/gcc.diff                                                   |   31 ---------
 crypto/botan/DETAILS                                                       |    2 
 crypto/botan/HISTORY                                                       |    3 
 crypto/libssh/DETAILS                                                      |    4 -
 crypto/libssh/HISTORY                                                      |    3 
 crypto/xmlsec/DETAILS                                                      |    4 -
 crypto/xmlsec/HISTORY                                                      |    3 
 dev/null                                                                   |binary
 devel/byacc/DEPENDS                                                        |    3 
 devel/byacc/DETAILS                                                        |   18 +++++
 devel/byacc/HISTORY                                                        |    2 
 devel/byacc/PRE_BUILD                                                      |    6 +
 devel/mono/DETAILS                                                         |    5 -
 devel/mono/HISTORY                                                         |    3 
 disk/acl/DETAILS                                                           |    1 
 disk/acl/HISTORY                                                           |    3 
 disk/brasero/DEPENDS                                                       |    1 
 disk/brasero/HISTORY                                                       |    3 
 disk/ddrescue/DETAILS                                                      |    4 -
 disk/ddrescue/HISTORY                                                      |    3 
 disk/e2fsprogs/BUILD                                                       |    2 
 disk/e2fsprogs/DEPENDS                                                     |    3 
 disk/e2fsprogs/DETAILS                                                     |    5 +
 disk/e2fsprogs/HISTORY                                                     |   19 +++++
 disk/e2fsprogs/INSTALL                                                     |    6 -
 disk/hdparm/DETAILS                                                        |    4 -
 disk/hdparm/HISTORY                                                        |    3 
 disk/libburn/DETAILS                                                       |    4 -
 disk/libburn/HISTORY                                                       |    3 
 disk/mhddfs/DETAILS                                                        |    4 -
 disk/mhddfs/HISTORY                                                        |    3 
 disk/udev/DETAILS                                                          |    2 
 disk/udev/HISTORY                                                          |    3 
 editors/ed/DETAILS                                                         |    2 
 editors/ed/HISTORY                                                         |    3 
 editors/jedit/DETAILS                                                      |    4 -
 editors/jedit/HISTORY                                                      |    6 +
 editors/jedit/build.properties_4.3pre16.patch                              |    8 --
 editors/jedit/build.properties_4.3pre17.patch                              |    8 ++
 gnome2-apps/gnumeric/DETAILS                                               |    3 
 gnome2-apps/gnumeric/HISTORY                                               |    3 
 gnome2-apps/gucharmap/DEPENDS                                              |    4 -
 gnome2-apps/gucharmap/HISTORY                                              |    3 
 gnome2-libs/glibmm/DETAILS                                                 |    2 
 gnome2-libs/glibmm/HISTORY                                                 |    3 
 gnome2-libs/glibmm/glibmm-2.20.0.tar.bz2.sig                               |    0 
 gnome2-libs/glibmm/glibmm-2.20.1.tar.bz2.sig                               |binary
 gnome2-libs/gnome-media2/HISTORY                                           |    4 +
 gnome2-libs/gnome-media2/PRE_BUILD                                         |    5 +
 gnome2-libs/gnome-media2/gnome-media-2.26.0-missing-cddbslave-cflags.patch |   22 ++++++
 gnome2-libs/libpanelappletmm/DETAILS                                       |    3 
 gnome2-libs/libpanelappletmm/HISTORY                                       |    3 
 gnome2-libs/libpanelappletmm/libpanelappletmm-2.26.0.tar.bz2.sig           |binary
 gnome2-libs/libpanelappletmm/libpanelappletmm-2.6.0.tar.bz2.sig            |    0 
 gnome2-libs/libsoup/DETAILS                                                |    2 
 gnome2-libs/libsoup/HISTORY                                                |    5 +
 gnome2-libs/libsoup/PRE_SUB_DEPENDS                                        |    4 +
 gnome2-libs/libsoup/SUB_DEPENDS                                            |    5 +
 gnome2-libs/libsoup/libsoup-2.27.2.tar.bz2.sig                             |    0 
 gnome2-libs/libsoup/libsoup-2.27.4.tar.bz2.sig                             |binary
 graphics-libs/libpng/DETAILS                                               |    4 -
 graphics-libs/libpng/HISTORY                                               |    6 +
 graphics-libs/libpng/PRE_BUILD                                             |    2 
 graphics-libs/libpng/libpng-1.2.37-apng.patch.gz                           |    0 
 graphics-libs/libpng/libpng-1.2.38-apng.patch.gz                           |binary
 groups                                                                     |    1 
 http/firefox/DETAILS                                                       |    6 -
 http/firefox/HISTORY                                                       |    3 
 http/webkitgtk/DEPENDS                                                     |    2 
 http/webkitgtk/DETAILS                                                     |    4 -
 http/webkitgtk/HISTORY                                                     |    4 +
 http/xulrunner/BUILD                                                       |    2 
 http/xulrunner/DETAILS                                                     |    6 -
 http/xulrunner/HISTORY                                                     |    3 
 http/xulrunner/INSTALL                                                     |    2 
 http/xulrunner/PRE_BUILD                                                   |    2 
 kde4-apps/kdesvn4/DETAILS                                                  |    4 -
 kde4-apps/kdesvn4/HISTORY                                                  |    3 
 kde4-support/soprano/DETAILS                                               |    4 -
 kde4-support/soprano/HISTORY                                               |    3 
 kde4/kde4-l10n/DETAILS                                                     |    2 
 kde4/kde4-l10n/HISTORY                                                     |    3 
 kde4/kde4-profile/DETAILS                                                  |    2 
 kde4/kde4-profile/HISTORY                                                  |    3 
 kernels/kvm/BUILD                                                          |    5 +
 kernels/kvm/CONFIGURE                                                      |    7 ++
 kernels/kvm/DEPENDS                                                        |   22 ++++++
 kernels/kvm/DETAILS                                                        |    2 
 kernels/kvm/HISTORY                                                        |    9 ++
 kernels/kvm/kvm-87.tar.gz.sig                                              |    0 
 kernels/kvm/kvm-88.tar.gz.sig                                              |binary
 kernels/linux/HISTORY                                                      |    3 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.27.26             |    6 +
 kernels/module-init-tools/DETAILS                                          |    3 
 kernels/module-init-tools/HISTORY                                          |    3 
 kernels/virtualbox-module/DETAILS                                          |    2 
 kernels/virtualbox-module/HISTORY                                          |    3 
 libs/fftw/DETAILS                                                          |    4 -
 libs/fftw/HISTORY                                                          |    3 
 libs/gavl/DETAILS                                                          |    4 -
 libs/gavl/HISTORY                                                          |    3 
 libs/libusb-compat/DETAILS                                                 |    6 -
 libs/libusb-compat/HISTORY                                                 |    6 +
 libs/openbabel/DETAILS                                                     |   10 +--
 libs/openbabel/HISTORY                                                     |    3 
 libs/pyqt/DETAILS                                                          |    4 -
 libs/pyqt/HISTORY                                                          |    3 
 libs/pyqt4/DETAILS                                                         |    4 -
 libs/pyqt4/HISTORY                                                         |    3 
 mail/dovecot/8f8b5e2f8df7.patch                                            |   20 ------
 mail/dovecot/DETAILS                                                       |    6 -
 mail/dovecot/HISTORY                                                       |   10 +++
 mail/dovecot/PRE_BUILD                                                     |    2 
 mail/dovecot/ee173ea99ea6.patch                                            |   23 ------
 mail/sylpheed/C00C2E26.gpg                                                 |binary
 mail/sylpheed/DETAILS                                                      |    9 +-
 mail/sylpheed/HISTORY                                                      |    6 +
 mail/sylpheed/INSTALL                                                      |    4 -
 net/djm.gpg                                                                |binary
 net/flowd/BUILD                                                            |   13 +++
 net/flowd/DEPENDS                                                          |    4 +
 net/flowd/DETAILS                                                          |   27 ++++++++
 net/flowd/HISTORY                                                          |    2 
 net/flowd/INSTALL                                                          |   15 ++++
 net/flowd/PRE_BUILD                                                        |    5 +
 net/flowd/init.d/flowd                                                     |    9 ++
 net/softflowd/DEPENDS                                                      |    1 
 net/softflowd/DETAILS                                                      |   33 ++++++++++
 net/softflowd/HISTORY                                                      |    3 
 net/softflowd/INSTALL                                                      |    6 +
 net/softflowd/init.d/softflowd                                             |   11 +++
 net/softflowd/init.d/softflowd.conf                                        |    3 
 python-pypi/sqlalchemy/DETAILS                                             |    4 -
 python-pypi/sqlalchemy/HISTORY                                             |    3 
 ruby-raa/rubyripper/DETAILS                                                |    4 -
 ruby-raa/rubyripper/HISTORY                                                |    3 
 science/celestia/DETAILS                                                   |    2 
 science/celestia/HISTORY                                                   |    4 +
 science/celestia/PRE_BUILD                                                 |    4 -
 science/celestia/celestia-1.5.1.tar.gz.sig                                 |    0 
 science/celestia/celestia-1.6.0.tar.gz.sig                                 |binary
 science/celestia/gcc43.patch.bz2                                           |    0 
 security/nmap/DEPENDS                                                      |    4 -
 security/nmap/DETAILS                                                      |    8 +-
 security/nmap/HISTORY                                                      |    5 +
 telephony/telepathy-glib/DETAILS                                           |    2 
 telephony/telepathy-glib/HISTORY                                           |    4 +
 telephony/telepathy-qt/BUILD                                               |    4 -
 telephony/telepathy-qt/DEPENDS                                             |   12 ++-
 telephony/telepathy-qt/DETAILS                                             |   25 ++++---
 telephony/telepathy-qt/HISTORY                                             |   15 ++++
 telephony/telepathy-qt/PREPARE                                             |    2 
 telephony/telepathy-qt/PRE_BUILD                                           |    5 +
 telephony/telepathy.gpg                                                    |binary
 utils/dbus/DETAILS                                                         |    4 -
 utils/dbus/HISTORY                                                         |    3 
 utils/hal-info/DETAILS                                                     |    4 -
 utils/hal-info/HISTORY                                                     |    3 
 utils/hal/DETAILS                                                          |    4 -
 utils/hal/HISTORY                                                          |    4 +
 utils/hal/PRE_BUILD                                                        |    2 
 utils/hal/fstype.patch                                                     |   23 ------
 utils/newsyslog/0AFC7476.gpg                                               |binary
 utils/newsyslog/DEPENDS                                                    |    2 
 utils/newsyslog/DETAILS                                                    |   32 +++++----
 utils/newsyslog/HISTORY                                                    |    6 +
 utils/nss-ldapd/DETAILS                                                    |    2 
 utils/nss-ldapd/HISTORY                                                    |    3 
 utils/sudo/DETAILS                                                         |    2 
 utils/sudo/HISTORY                                                         |    3 
 utils/util-linux/DETAILS                                                   |    4 -
 utils/util-linux/HISTORY                                                   |    9 ++
 utils/virtualbox/DETAILS                                                   |    4 -
 utils/virtualbox/HISTORY                                                   |    3 
 utils/vx32/DETAILS                                                         |    4 -
 utils/vx32/HISTORY                                                         |    3 
 utils/youtube-dl/DETAILS                                                   |    5 -
 utils/youtube-dl/HISTORY                                                   |    4 +
 video-libs/gmerlin-avdecoder/DEPENDS                                       |    4 +
 video-libs/gmerlin-avdecoder/DETAILS                                       |    4 -
 video-libs/gmerlin-avdecoder/HISTORY                                       |    4 +
 video-libs/gmerlin-encoders/DETAILS                                        |    4 -
 video-libs/gmerlin-encoders/HISTORY                                        |    3 
 video-libs/gmerlin/DEPENDS                                                 |    6 +
 video-libs/gmerlin/DETAILS                                                 |    4 -
 video-libs/gmerlin/HISTORY                                                 |    4 +
 video-libs/libquicktime/DETAILS                                            |    6 -
 video-libs/libquicktime/HISTORY                                            |    3 
 video-libs/live/DETAILS                                                    |    4 -
 video-libs/live/HISTORY                                                    |    3 
 x11-libs/wine/DETAILS                                                      |    2 
 x11-libs/wine/HISTORY                                                      |    3 
 x11-toolkits/qt4/DETAILS                                                   |    1 
 x11-toolkits/qt4/HISTORY                                                   |    5 +
 x11-toolkits/qt4/POST_INSTALL                                              |    2 
 x11-toolkits/wxgtk-new/BUILD                                               |    9 --
 x11-toolkits/wxgtk-new/DETAILS                                             |    4 -
 x11-toolkits/wxgtk-new/HISTORY                                             |    4 +
 x11-toolkits/xdialog/DEPENDS                                               |    2 
 x11-toolkits/xdialog/HISTORY                                               |    3 
 x11/x11vnc/DETAILS                                                         |    4 -
 x11/x11vnc/HISTORY                                                         |    3 
 xorg-app/xcb-util/xcb-util-0.3.4.tar.bz2.sig                               |binary
 xorg-lib/pixman/DETAILS                                                    |    4 -
 xorg-lib/pixman/HISTORY                                                    |    3 
 xorg-xserver/xorg-server/DETAILS                                           |    3 
 216 files changed, 760 insertions(+), 296 deletions(-)

New commits:
commit f6c9d70e666680b04d13691d39707be0235422bd
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "xproto: version 7.0.15"
    
    This reverts commit 789e06f6e40692bfcab5b9725c520b853b17bdd3.
    
    This was reverted in test for a reason. Please check `git log` before
    committing and use devel-xorg-modular for new updates (which already had
    this, and another, update).
    
    Also see Bug #15111

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

    xcb-util: Updated to 0.3.4
    (cherry picked from commit 977993d789fcba2a522cc57edcd93583d25ee162)

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

    Revert "xcb-util: version 0.3.4"
    
    This reverts commit 8741bdd78db00def5ad840ae6b3a708cffe141f6.
    
    Pull already commited change from devel-xorg-modular

commit d436140328044b4babd80b916c06cda7e9e412f0
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 at codemages.net>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xorg-server: update to 1.6.2
    
    Cherry-picked commit 816e5d3 from devel-xorg-modular
    Tested and runs okay

commit 4b99721680ec46a1b3d296a68fe68b7fbd643911
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xorg-server: finalized DPMS sub dependency
    (cherry picked from commit 504928cb5620babc72ea76a5e50deca67d1b3d44)

commit df03aa21de5a52275f721c6c04b0c8a15dc25a4e
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xorg-server: added DPMS as a sub dependency - needed by ati-fglrx

commit e048d8870739b55850a0cd41d9e657f50c5f57b5
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 at codemages.net>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xkbcomp: update to 1.1.0
    (cherry picked from commit c962fa641d9c6ab17c6f81756358fe7ee3ac94c7)

commit 51a243e37a107440185a326f3d02c11c467a1f0d
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 at codemages.net>
Commit: Eric Sandall <sandalle at sourcemage.org>

    setxkbmap: update to 1.1.0
    (cherry picked from commit d2e82fc15068e4b9a6b34da9fdec0ec6f9d37bdd)

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

    kvm: Enable configuring sound drivers and emulated cards

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

    kvm: Optionally depends on bluez

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

    kvm: Optionally depends on curl

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

    kvm: Need to pass OPTS to configure for dependency flags

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

    kvm: kvm doesn't have --enable options for most flags

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

    kvm: Optionally depends on ncurses

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

    kvm: sdl is optional and probably has been for a while

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

    kvm: Updated to 88

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

    mpd: => 0.15.1

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

    sylpheed: => 2.7.0; converted to upstream signature checking

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

    util-linux: Disable STAGED_INSTALL (castfs) and TMPFS (Bug #15257) The
    problem with the migration of libraries from e2fsprogs -> util-linux
    stems from the library being removed and breaking mount, which castfs
    and tmpfs use during installation.

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

    e2fsprogs: Disable STAGED_INSTALL (castfs) and TMPFS (Bug #15257)
    The problem with the migration of libraries from e2fsprogs ->
    util-linux stems from the library being removed and breaking mount,
    which castfs and tmpfs use during installation.

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

    brasero: added missing dep on libxml2

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

    gucharmap: addded missing dep on libxml2 and made rarian optional

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

    xproto: version 7.0.15

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

    xcb-util: version 0.3.4

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

    xdialog: added missing gtk2 configure option

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

    mono 2.4.2.2, SECURITY_PATCH=1, CVE-2009-0217

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

    libpanelappletmm: updated to 2.26.0

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

    wine: Updated to 1.1.26

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

    x11vnc: => 0.9.8

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

    glibmm: => 2.20.1

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

    newsyslog: converted to upstream signature checking; small clean up

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

    flowd: new spell, small, fast and secure NetFlow collector

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

    accounts, groups: added flowd

commit 65b9767a2937b21170bf7c46d71b632347851722
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    pyqt: version 3.18.1

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

    net/djm.gpg: really rename the keyfile

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

    net/djm.gpg: moved key to section (required for both softflowd and flowd)

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

    softflowd: new spell, flow-based network traffic analyser

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

    byacc: new spell, Berkeley version of Yet Another Compiler-Compiler

commit 0fe16e9972ed88b35c363f8634e101a625ed7353
Author: lejatorn <lejatorn at smgl-qemu.(none)>
Commit: lejatorn <lejatorn at smgl-qemu.(none)>

    vx32: fixed minor typo in SHORT

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

    linux: => 2.6.27.26 (uber-stable branch)

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

    firefox: Updated to version 3.5.1. SECURITY_PATCH++

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

    xulrunner: Updated to version 1.9.1.1. SECURITY_PATCH++

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

    nmap: tabs -> spaces (in DEPENDS)

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

    nmap: => 5.00

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

    hal-info: => 20090716

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

    module-init-tools: => 3.10

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

    pixman: => 0.15.16

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

    hdparm: => 9.16

commit 2a263cb9eed0546b944e981c7aa8da867ed9d42b
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    libpng 1.2.38

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

    acl PATCHLEVEL=1 to recast acl due to attr's changes
    
    udev tried to get the path to libattr.la from a file from acl spell,
    and the path was /usr/lib/ instead of /lib/
    
    there is a /usr/libexec/libacl.la with dependency_libs=' /lib/libattr.la',
    probably previous acl used /usr/lib/libattr..
    
    attr changed /usr/lib -> /lib on 2009-07-03 but acl was last changed on 2009-05-21
    I just add PATCHLEVEL++ to acl to fix this for all

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

    qt4 - fix bug #15296

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

    telepathy-qt-0.1.8

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

    util-linux 2.16

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

    e2fsprogs: the libuuid library and fsck has been moved from e2fsprogs to
    util-linux-ng

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

    e2fsprogs 1.41.8

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

    gnumeric: SOURCE has to be defined before it's used

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

    soprano: => 2.3.0

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

    telepathy-glib: => 0.7.33

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

    hal 0.5.13

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

    dbus 1.2.16

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

    fftw: => 3.2.2

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

    xmlsec 1.2.12

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

    gmerlin-encoders 0.2.7

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

    gmerlin-avdecoder 1.0.1

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

    mhddfs 0.1.22

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

    openldap 2.4.17

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

    pyqt4: => 4.5.2

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

    libburn: => 0.6.8

commit 1b85eb54aba818bede095c875272ef037e1bfd71
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    youtube-dl: 2009.06.29, integrity checking enabled, force download on.

commit 14db139673ae567c9fd939466f4312a827314ca4
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    libssh 0.3.1

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

    celestia 1.6.0

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

    sqlalchemy: => 0.5.5

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

    beecrypt - updated files which were missing in previous commit

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

    dovecot: really removed the patches, thanks lace

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

    gmerlin 0.4.1

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

    gavl 1.1.1

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

    libquicktime 1.1.3

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

    webkitgtk: Updated stable to version 1.1.11.  Requires
    devel version of libsoup.

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

    libsoup: Added sub_depends due to webkitgtk which requires the devel
    version to do content type detection

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

    botan 1.8.4

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

    ed 1.4

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

    libsoup: Updated devel to version 2.27.4

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

    udev: => 145

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

    wxgtk-new: => 2.9.0-RC6

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

    ddrescue: => 1.11

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

    dovecot: update to 1.2.1

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

    libusb-compat: => 0.1.3

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

    rubyripper: => 0.5.7

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

    gnome-media2 #15288

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

    nss-ldapd: => 0.6.11

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

    e2fsprogs: added pkgconfig required dep

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

    virtualbox-module 3.0.2

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

    virtualbox 3.0.2

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

    sudo 1.7.2

commit bcc50ae25a9b54e11921e6443747d00867ff7348
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kdesvn4: updated version to 1.3.2

commit 884d5bb9be1220aa20e786e5c198e0409778fe92
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    jedit: updated version to 4.3pre17
    removed build.properties_4.3pre16.patch
    added build.properties_4.3pre17.patch from pre16.patch, updated version number in docbook-xsl path

commit 603be731ad36ef163cf395396b3d4fc9ac2788e0
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    live: updated version to 2009.07.09

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

    libusb-compat: SOURCE_IGNORE=signature #15291

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

    openbabel: => 2.2.2

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

    beecrypt: => 4.2.1

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

    kde4-profile: => 4.2.96

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

    kde4-l10n: => 4.2.96

diff --git a/ChangeLog b/ChangeLog
index fffd113..de3835f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* net/flowd: new spell, small, fast and secure NetFlow collector
+
+2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
+	* devel/byacc: new spell, Berkeley version of Yet Another Compiler-Compiler
+	* net/softflowd: new spell, flow-based network traffic analyser
+	* net/djm.gpg: moved key to section (required for both softflowd and flowd)
+	* accounts, groups: added flowd
+
 2009-07-11 Eric Sandall <sandalle at sourcemage.org>
 	* audio-soft/gnaural: Added a GTK+ programmable binaural-beat generator
 
@@ -15,7 +24,7 @@
 	* perl-cpan/perl-pango: new spell, pango bindings for perl
 
 2009-07-07 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
-	* devel/stfl: new spell, a curses based widget set library 
+	* devel/stfl: new spell, a curses based widget set library
 	* http/newsbeuter: new spell, terminal based rss reader
 
 2009-07-05  Treeve Jelbert <treeve at sourcemage.org>
diff --git a/accounts b/accounts
index 94cf3dc..f63372f 100755
--- a/accounts
+++ b/accounts
@@ -77,4 +77,5 @@ pulse:163:167
 nginx:164:170
 halevt:165:172
 oprofile:166:173
+flowd:167:174
 nobody:65534:65534
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index d66a9cd..1f51659 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mpd
-         VERSION=0.15
+         VERSION=0.15.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-     SOURCE_HASH=sha512:299154debb2977c757df35f4e595e114d708d23b40d2cf4fd52fd3d9acd02052e12f365ebfc542266f58d1288e3f557b137e1fb28da1b0ce6819d979c299d2b3
+     SOURCE_HASH=sha512:a8e7a6d494d601f317bd0c7e72bbaea706d2c5866498df39e61f82aecff08a2613ae1509ad7e2cdc36ff186a573cbdb91140546a143d5768f9b2ab3cc7231b1e
       LICENSE[0]=GPL
         KEYWORDS="music players audio"
         WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 144cb95..e648fdd 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.15.1
+
 2009-06-26 Vlad Glagolev <stealth at sourcemage.org>
 	* FINAL: mpd.error isn't used anymore, everything's in mpd.log since now
 
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 786d8a9..93c8a50 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,6 +1,6 @@
            SPELL=openldap
-         VERSION=2.4.16
-     SOURCE_HASH=sha512:8592e1fb753e62ffbb9b31eb3c167c0ffd00a8a4cdc49bec69a18d9d4648997780119e64e81e97ebaf8dce6da802d699efdca2eca7dcf5d6a7424219ce325490
+         VERSION=2.4.17
+     SOURCE_HASH=sha512:2d61c4ae85b5313c30f77dd08f493599448b2198a1e8dfbdf7bc453cbc676e5553a53c36ea4f15312241c5146a80a702635ca355a9351c627ee42aca73d21428
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_URI=$SPELL-release/$SOURCE
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index e91baff..ccdd002 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.17
+
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* init.d/slapd: made it non-sh, bug #13702
 
diff --git a/crypto/beecrypt/DEPENDS b/crypto/beecrypt/DEPENDS
index bcd1eeb..b6da3be 100755
--- a/crypto/beecrypt/DEPENDS
+++ b/crypto/beecrypt/DEPENDS
@@ -1 +1,4 @@
-depends  g++
+depends  g++ &&
+optional_depends icu    '' '' 'unicode support' &&
+optional_depends python '' '' 'extra bindings' &&
+optional_depends JAVA   '' '' 'extra bindings'
diff --git a/crypto/beecrypt/DETAILS b/crypto/beecrypt/DETAILS
index 248825d..fff1824 100755
--- a/crypto/beecrypt/DETAILS
+++ b/crypto/beecrypt/DETAILS
@@ -1,9 +1,9 @@
            SPELL=beecrypt
-         VERSION=4.1.2
+         VERSION=4.2.1
+     SOURCE_HASH=sha512:59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:52f035e531477fde44624216510c737ae0b60159802aae388df6ff988e116f0238a9b2eaa900abae54a7e74e235d4fce2eb8cecafac3a709a10cdc0f18f874f1
         WEB_SITE=http://www.gnu.org/directory/security/crypt/BeeCrypt.html
          ENTERED=20030909
       LICENSE[0]=LGPL
diff --git a/crypto/beecrypt/HISTORY b/crypto/beecrypt/HISTORY
index b217f92..9fb2aec 100644
--- a/crypto/beecrypt/HISTORY
+++ b/crypto/beecrypt/HISTORY
@@ -1,3 +1,12 @@
+2009-07-12 Treeve Jelbert <treeve at pibe>
+	* DETAILS: version 4.2.1
+
+2009-07-05 Treeve Jelbert <treeve at pibe>
+	* DETAILS: version 4.2.0
+	* PRE_BUILD: disable patch
+	* gcc.diff: deleted
+	* DEPENDS: add option python, JAVA, icu
+
 2009-05-29 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Fix installing to $INSTALL_ROOT/usr/lib64 on 64bit
 
diff --git a/crypto/beecrypt/PRE_BUILD b/crypto/beecrypt/PRE_BUILD
index 9f1f7e7..e51dc8e 100755
--- a/crypto/beecrypt/PRE_BUILD
+++ b/crypto/beecrypt/PRE_BUILD
@@ -1,6 +1,6 @@
 default_pre_build                                         &&
 cd $SOURCE_DIRECTORY                                      &&
-patch  -p1 < $SPELL_DIRECTORY/gcc.diff                    &&
+sed -i '/^#include/s|"|"include/|' c++/provider/BaseProvider.cxx &&
 #
 # Fix for installing to /usr/lib64 on 64bit arch
 #
diff --git a/crypto/beecrypt/gcc.diff b/crypto/beecrypt/gcc.diff
deleted file mode 100644
index 0bc78ed..0000000
--- a/crypto/beecrypt/gcc.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -uNr beecrypt-4.1.2/c++/beeyond/BeeCertificate.h beecrypt-4.1.2.cp/c++/beeyond/BeeCertificate.h
---- beecrypt-4.1.2/c++/beeyond/BeeCertificate.h	2004-11-03 10:37:27.000000000 +0100
-+++ beecrypt-4.1.2.cp/c++/beeyond/BeeCertificate.h	2006-07-04 14:16:10.000000000 +0200
-@@ -61,7 +61,7 @@
- 		 */
- 		class BEECRYPTCXXAPI BeeCertificate : public beecrypt::security::cert::Certificate, public beecrypt::lang::Cloneable
- 		{
--			friend class BeeCertificateFactory;
-+			friend class provider::BeeCertificateFactory;
- 
- 		public:
- 			static const Date FOREVER;
-diff -uNr beecrypt-4.1.2/c++/security/Security.h beecrypt-4.1.2.cp/c++/security/Security.h
---- beecrypt-4.1.2/c++/security/Security.h	2004-11-02 08:06:58.000000000 +0100
-+++ beecrypt-4.1.2.cp/c++/security/Security.h	2006-07-04 14:14:46.000000000 +0200
-@@ -76,7 +76,6 @@
- 			typedef vector<const Provider*> provider_vector;
- 			typedef provider_vector::iterator provider_vector_iterator;
- 
--		private:
- 			struct spi
- 			{
- 				Object* cspi;
-@@ -90,6 +89,7 @@
- 			static spi* getSpi(const String& algo, const String& type, const String& provider) throw (NoSuchAlgorithmException, NoSuchProviderException);
- 			static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
- 			static spi* getFirstSpi(const String& type);
-+		private:
- 
- 			static const String& getKeyStoreDefault();
- 
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index 2095f38..aa4d904 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
            SPELL=botan
-         VERSION=1.8.3
+         VERSION=1.8.4
 
           SOURCE=Botan-$VERSION.tbz
    SOURCE_URL[0]=http://files.randombit.net/botan/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 1034577..59b02ce 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.8.4
+
 2009-07-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.8.3
 	* DEPENDS, BUILD: perl -> python
diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index d4ef8cc..13523a0 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,11 +1,11 @@
            SPELL=libssh
-         VERSION=0.3.0
+         VERSION=0.3.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.libssh.org/files/$SOURCE
         WEB_SITE=http://www.libssh.org/
          ENTERED=20041208
-     SOURCE_HASH=sha512:9f83fc84a95f4d79441b3f7b1ba1e1c464947e85080ab70b32dae98f8361b943fa1a45afefd3bad3e146cbd046462d7586f65daccd39b845878b0daa42411689
+     SOURCE_HASH=sha512:b0fef87e87e03c7b3e5c06fe3ffcdb0c9587327629eea94ffdabb19f4f0bb72bc271c2efd5e78cc74d28c2dc1e3309d78237c40bf7cbde222600ddb692a9ecd7
       LICENSE[0]=GPL
         KEYWORDS="ssh crypto"
            SHORT="a library for accessing ssh client services through C libraries calls."
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index 0c0c02f..66f143c 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.3.1
+
 2009-05-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.3.0, tgz -> tar.gz, new WEB_SITE and SOURCE_URL[0]
 	* BUILD, DEPENDS: switched to cmake build system
diff --git a/crypto/xmlsec/DETAILS b/crypto/xmlsec/DETAILS
index 2246c58..02e34b8 100755
--- a/crypto/xmlsec/DETAILS
+++ b/crypto/xmlsec/DETAILS
@@ -1,7 +1,7 @@
            SPELL=xmlsec
-         VERSION=1.2.11
+         VERSION=1.2.12
           SOURCE=$SPELL${VERSION%%\.*}-$VERSION.tar.gz
-     SOURCE_HASH=sha512:d8fb40b05a32c0cd1257539671a57bdad7ce4a7c8d4878a5541293ff109dea6eaf93635592b058edb2aa49ca9ba0475dbccad7c0b41a51c512605492da3db10f
+     SOURCE_HASH=sha512:7c37280ef981acd6ce27d91f9f6cf9f1750f6b7308a5d88f37ab159ea049e35069789a4ed2fe70d3958f652be179ff08c488fa9db19297df6c4b9e96a2b8abdf
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL${VERSION%%\.*}-$VERSION
    SOURCE_URL[0]=http://www.aleksey.com/$SPELL/download/$SOURCE
    SOURCE_URL[1]=ftp://ftp.xmlsoft.org/$SPELL/releases/$SOURCE
diff --git a/crypto/xmlsec/HISTORY b/crypto/xmlsec/HISTORY
index 3cdca35..7396182 100644
--- a/crypto/xmlsec/HISTORY
+++ b/crypto/xmlsec/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.12
+
 2007-12-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.11
 
diff --git a/devel/byacc/DEPENDS b/devel/byacc/DEPENDS
new file mode 100755
index 0000000..458b73d
--- /dev/null
+++ b/devel/byacc/DEPENDS
@@ -0,0 +1,3 @@
+depends gnupg &&
+depends m4 &&
+depends smgl-fhs
diff --git a/devel/byacc/DETAILS b/devel/byacc/DETAILS
new file mode 100755
index 0000000..c477d5e
--- /dev/null
+++ b/devel/byacc/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=byacc
+         VERSION=20090221
+          SOURCE=$SPELL-$VERSION.tgz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=dickey.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://invisible-island.net/byacc
+      LICENSE[0]=PD
+         ENTERED=20090717
+           SHORT="Berkeley version of Yet Another Compiler-Compiler"
+cat << EOF
+Berkeley Yacc (byacc) is generally conceded to be the best yacc variant
+available. In contrast to bison, it is written to avoid dependencies upon
+a particular compiler.
+EOF
diff --git a/devel/byacc/HISTORY b/devel/byacc/HISTORY
new file mode 100644
index 0000000..3aeb287
--- /dev/null
+++ b/devel/byacc/HISTORY
@@ -0,0 +1,2 @@
+2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/devel/byacc/PRE_BUILD b/devel/byacc/PRE_BUILD
new file mode 100755
index 0000000..3070ef5
--- /dev/null
+++ b/devel/byacc/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+mv yacc.1 byacc.1 &&
+
+sed -i "s:yacc:byacc:" makefile.in
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index 35f7896..587fab3 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -5,10 +5,11 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then
       SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}
      SOURCE_HASH=sha512:d9873736067a396acb172ecb35d5c748b49c0fd4a89469f2cf9135bd919c9be4c9656edb1ae7d2783b42c2f87cbdd28042565ee81c9cd2f77616905a74d3d75e         
 else
-         VERSION=2.4.2.1
+         VERSION=2.4.2.2
+  SECURITY_PATCH=1
           SOURCE=${SPELL}-${VERSION}.tar.bz2
       SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:bc3e1bf7ce76f9432568d74921a3e608ecd1cc0fe9a12ed441d01bd43d1d89492c4225c97c14ac4b17fb98aaebc1aba79d14d8b68ac84aa9db2daefdf4f800d9
+     SOURCE_HASH=sha512:1b050f0558bec2b1f1315bb62a94c7509bc2fd978e994cf7d63201f0ae6f620cfd369039e1694aee7fed16d51d32a26f4237224174c375667a805036813ec253
 fi
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 36f717d..00f102d 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.2.2, SECURITY_PATCH=1, CVE-2009-0217
+
 2009-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.2.1
 
diff --git a/disk/acl/DETAILS b/disk/acl/DETAILS
index 6d058fb..5f67e01 100755
--- a/disk/acl/DETAILS
+++ b/disk/acl/DETAILS
@@ -1,5 +1,6 @@
            SPELL=acl
          VERSION=2.2.47
+      PATCHLEVEL=1
           SOURCE=${SPELL}_${VERSION}-1.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/${SOURCE}
diff --git a/disk/acl/HISTORY b/disk/acl/HISTORY
index 106f5f6..fe7cace 100644
--- a/disk/acl/HISTORY
+++ b/disk/acl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: PATCHLEVEL=1 to guarantee acl is re-cast after attr's changes
+
 2009-05-21 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD: corrected include path
 
diff --git a/disk/brasero/DEPENDS b/disk/brasero/DEPENDS
index 68a0e2b..8d7489a 100755
--- a/disk/brasero/DEPENDS
+++ b/disk/brasero/DEPENDS
@@ -1,6 +1,7 @@
 depends gnome-vfs2  &&
 depends gst-plugins-good  &&
 depends hal  &&
+depends libxml2  &&
 optional_depends CD-BURN-UTILITY  ""  ""  "to burn CDs"  &&
 optional_depends dvd+rw-tools  ""  ""  "to burn DVDs"  &&
 optional_depends totem "--enable-playlist" "--disable-playlist" "For playlist pane"  &&
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index b0b6c9b..59bb1cb 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: added missing dep on libmxl2
+
 2009-07-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.3
 
diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index 538e930..2ab4618 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ddrescue
-         VERSION=1.11-rc3
-     SOURCE_HASH=sha512:bc05df9b71f3890bef5e22c42bed418831d3c1e52ee08662d9209f17093c9d74816c6b147aed63ebedfb5a31c8e269127ad0443d4c5965bda591185f25bac989
+         VERSION=1.11
+     SOURCE_HASH=sha512:43c393e0a6bd1e323f9a05491a0f4dee586bc8b18500b338d28e10b5eda7e87f483df290b67e784848755af13a4b73f3a75e77bdcb78baceea88732e5ebc284a
           SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
    SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index 70e22c6..25f6340 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.11
+
 2009-06-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: use generic GNU_URL 
 
diff --git a/disk/e2fsprogs/BUILD b/disk/e2fsprogs/BUILD
index 570a161..9bff768 100755
--- a/disk/e2fsprogs/BUILD
+++ b/disk/e2fsprogs/BUILD
@@ -1,4 +1,6 @@
 OPTS="--disable-libblkid $OPTS" &&
+OPTS="--disable-libuuid --disable-uuidd $OPTS" &&
+OPTS="--disable-fsck $OPTS" &&
 
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=$HOST"
 
diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index 95c4bbf..54438e2 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,4 +1,5 @@
 depends gawk &&
 depends gnupg &&
 depends init.d &&
-depends smgl-fhs
+depends smgl-fhs &&
+depends pkgconfig
diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index 6310b01..616389d 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,6 @@
            SPELL=e2fsprogs
-         VERSION=1.41.7
+         VERSION=1.41.8
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -12,6 +13,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       LICENSE[1]=LGPL
          ENTERED=20010922
         KEYWORDS="disk"
+  STAGED_INSTALL=off
+           TMPFS=off
            SHORT="utilities for the EXT2 file system"
 cat << EOF
 e2fsprogs - The EXT2 file system utilities and libraries. EXT2 stands for
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 137776e..81c38f2 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,22 @@
+2009-07-17 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Disable STAGED_INSTALL (castfs) and TMPFS (Bug #15257)
+	  The problem with the migration of libraries from e2fsprogs -> util-linux
+	  stems from the library being removed and breaking mount, which castfs
+	  and tmpfs use during installation.
+
+2009-07-16 Ladislav Hagara <hgr at vabo.cz>
+	* BUILD: added --disable-libuuid and --disable-uuidd
+	  the libuuid library has been moved from e2fsprogs to util-linux-ng
+	* BUILD: added --disable-fsck, fsck is provided by util-linux from now
+	* INSTALL: removed installation of libuuid.a and uuid.h
+	* DETAILS: PATCHLEVEL=1
+
+2009-07-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.41.8
+
+2009-07-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added missing dependency -- pkgconfig
+
 2009-07-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.41.7
 
diff --git a/disk/e2fsprogs/INSTALL b/disk/e2fsprogs/INSTALL
index a3cab2a..606819e 100755
--- a/disk/e2fsprogs/INSTALL
+++ b/disk/e2fsprogs/INSTALL
@@ -1,6 +1,2 @@
 make install DESTDIR="$INSTALL_ROOT" &&
-make install-libs DESTDIR="$INSTALL_ROOT" &&
-
-install -d "$INSTALL_ROOT/usr/include/uuid" &&
-install -m 644 lib/uuid/libuuid.a "$INSTALL_ROOT/usr/lib" &&
-install -m 644 lib/uuid/uuid.h "$INSTALL_ROOT/usr/include/uuid"
+make install-libs DESTDIR="$INSTALL_ROOT"
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 87b9fae..f90f14f 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=hdparm
-         VERSION=9.15
-     SOURCE_HASH=sha512:588bb09df00cd9a390a86ab074934e1f0800aa9fc7ad8fbd58ad103f3d43eb05a849593ddefc1f29c474eecc7fd15aa0f38603ca82b3c2a1624465de4ffd1306
+         VERSION=9.16
+     SOURCE_HASH=sha512:e4410737b9823fd6c4febf2e9e61e66efd5b76c9c24e0c6a34f99106f58e688520200dcb15ebe2dd7c8397750474f9956bdca9d3a17676e13a52153de9afeab3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index 80595a7..ff907a5 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 9.16
+
 2009-04-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 9.15
 
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 541ea4f..f3e407f 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.6.6
-     SOURCE_HASH=sha512:5da5fcee4a79043fc9ceaa7c514ed4310964fd900af677759340fcc5feadb8f7cc6454273de23e3d6ff912256a0914d09c2beef581e793c00679347747324a4a
+         VERSION=0.6.8
+     SOURCE_HASH=sha512:702d4cef8630663f1ff7d9de6037dce8812f36e00675caa64bde9d3f62143d670dae0669e37a05168e7556e8cb4edb4a9472fb1ae4f1c7bb45fb6a3b77495c9c
           SOURCE=$SPELL-$VERSION.pl00.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 799a43f..262d910 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.8
+
 2009-06-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* UP_TRIGGERS: added to heal dvd-rw-tools after dispelling the conflict -
 	  cdrtools #14420, patches by chp
diff --git a/disk/mhddfs/DETAILS b/disk/mhddfs/DETAILS
index 2c10e99..56cbdb8 100755
--- a/disk/mhddfs/DETAILS
+++ b/disk/mhddfs/DETAILS
@@ -1,8 +1,8 @@
            SPELL=mhddfs
-         VERSION=0.1.10
+         VERSION=0.1.22
           SOURCE=${SPELL}_$VERSION.tar.gz
    SOURCE_URL[0]=http://mhddfs.uvw.ru/downloads/$SOURCE
-     SOURCE_HASH=sha512:899bb8082cf582826920731f555bef686635b42d7031772eb30bec9ef44beff4b45e322d252c60c57e67a40bcb705447526ebdd3714b5959415b3a33cf8031ef
+     SOURCE_HASH=sha512:f74ca60463dfe29e93f2ce7d4df2e773b1b30138255ea6b943262683a116a4af0bd2eae94fcb45b5e42e2bada3c757c837e736cca0d0b8d959b2f032a64b7316
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://mhddfs.uvw.ru/
       LICENSE[0]=GPL
diff --git a/disk/mhddfs/HISTORY b/disk/mhddfs/HISTORY
index d4aa70b..af9cfc4 100644
--- a/disk/mhddfs/HISTORY
+++ b/disk/mhddfs/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.1.22
+
 2008-05-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: spell created, ver. 0.1.10
 
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 8d3928c..57536bc 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
            SPELL=udev
-         VERSION=144
+         VERSION=145
       PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index d09f8ec..486670a 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 145
+
 2009-07-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: lots of extra depends
 	* [PRE_]SUB_DEPENDS: add EXTRAS
diff --git a/editors/ed/DETAILS b/editors/ed/DETAILS
index 1036592..20d11d7 100755
--- a/editors/ed/DETAILS
+++ b/editors/ed/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ed
-         VERSION=1.3
+         VERSION=1.4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=${SOURCE}.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/editors/ed/HISTORY b/editors/ed/HISTORY
index 92e5a5d..a831ea2 100644
--- a/editors/ed/HISTORY
+++ b/editors/ed/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4
+
 2009-05-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.3
 
diff --git a/editors/jedit/DETAILS b/editors/jedit/DETAILS
index 9f756e1..4eaf3e9 100755
--- a/editors/jedit/DETAILS
+++ b/editors/jedit/DETAILS
@@ -1,11 +1,11 @@
            SPELL=jedit
-         VERSION=4.3pre16
+         VERSION=4.3pre17
           SOURCE=jedit${VERSION}source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/jEdit
    SOURCE_URL[0]=${SOURCEFORGE_URL}/jedit/$SOURCE
         WEB_SITE=http://www.jedit.org
          ENTERED=20040608
-     SOURCE_HASH=sha512:39e7839b994fa7b441dcab8044cdc55a582776a40efc91d5e92000a25feff59f1724d43956614d6d76b291451585ae773f37fddf8d5f55b4d8bea5771fcd9ce5
+     SOURCE_HASH=sha512:da89bd54b69d3296f5e8e0f9ae93680eb76bae532f936d234e5c8aa9a757a2c256b922ae4f477bf3be2caef69bcd5894aa693b329e0af335d30353e4e1fd1b49
       LICENSE[0]=GPL
         KEYWORDS="editors"
            SHORT="jEdit is a mature and well-designed programmer's text editor that has been in development for over 5 years."
diff --git a/editors/jedit/HISTORY b/editors/jedit/HISTORY
index 2672347..b012d85 100644
--- a/editors/jedit/HISTORY
+++ b/editors/jedit/HISTORY
@@ -1,3 +1,9 @@
+2009-07-12 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 4.3pre17
+	* build.properties_4.3pre16.patch: removed
+	* build.properties_4.3pre17.patch: added from pre16.patch, updated version
+	  number in docbook-xsl path
+
 2008-12-02 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 4.3pre16
 	* BUILD: added sourcing of ant.sh profile script before calling ant
diff --git a/editors/jedit/build.properties_4.3pre16.patch b/editors/jedit/build.properties_4.3pre16.patch
deleted file mode 100644
index 34ac0b6..0000000
--- a/editors/jedit/build.properties_4.3pre16.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urNp jEdit.orig/build.properties jEdit/build.properties
---- jEdit.orig/build.properties	1970-01-01 01:00:00.000000000 +0100
-+++ jEdit/build.properties	2006-08-08 21:07:34.000000000 +0200
-@@ -0,0 +1,4 @@
-+xsltproc.executable=xsltproc
-+docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.74
-+docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
-+fop.dir=/usr/share/fop-0.20.5
diff --git a/editors/jedit/build.properties_4.3pre17.patch b/editors/jedit/build.properties_4.3pre17.patch
new file mode 100644
index 0000000..c99280c
--- /dev/null
+++ b/editors/jedit/build.properties_4.3pre17.patch
@@ -0,0 +1,8 @@
+diff -urNp jEdit.orig/build.properties jEdit/build.properties
+--- jEdit.orig/build.properties	1970-01-01 01:00:00.000000000 +0100
++++ jEdit/build.properties	2006-08-08 21:07:34.000000000 +0200
+@@ -0,0 +1,4 @@
++xsltproc.executable=xsltproc
++docbook.xsl=/usr/share/xml/docbook/xsl-stylesheets-1.75
++docbook.catalog=/usr/share/xml/docbook/xml-dtd-4.5/catalog.xml
++fop.dir=/usr/share/fop-0.20.5
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index 93d42de..24efdee 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,13 +1,14 @@
            SPELL=gnumeric
 if [[ $GNUMERIC_DEVEL == y ]]; then
          VERSION=1.9.9
+          SOURCE=$SPELL-$VERSION.tar.bz2
      SOURCE_HASH=sha512:194ca0b9a80f4cedfbd708be334918fe553a6f7ba7ddbdf42ea00e8c55afbf1d2c6e7ee556dcb1528dc29dbcefd26b6e06bab70e52e0e80022996438ec541aba
 else
          VERSION=1.8.4
+          SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       LICENSE[0]=GPL
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index d25c18a..caa73d8 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,6 @@
+2009-07-15 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: SOURCE has to be defined before it's used
+
 2009-06-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.9
 
diff --git a/gnome2-apps/gucharmap/DEPENDS b/gnome2-apps/gucharmap/DEPENDS
index 92a63bd..2ba2b3d 100755
--- a/gnome2-apps/gucharmap/DEPENDS
+++ b/gnome2-apps/gucharmap/DEPENDS
@@ -1,2 +1,4 @@
 depends gnome-doc-utils  &&
-depends libgnomeui
+depends libxml2  &&
+depends libgnomeui  &&
+optional_depends rarian '--enable-scrollkeeper' '--disable-scrollkeeper' 'Register with rarian?'
diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY
index 6289e22..3af60e4 100644
--- a/gnome2-apps/gucharmap/HISTORY
+++ b/gnome2-apps/gucharmap/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: added missing dep on libxml2, made rarian optional
+
 2009-07-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.3.1
 
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index 049ece0..41da603 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=glibmm
-         VERSION=2.20.0
+         VERSION=2.20.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/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 400b205..9d52731 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.20.1
+
 2009-03-29 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.20.0
 
diff --git a/gnome2-libs/glibmm/glibmm-2.20.0.tar.bz2.sig b/gnome2-libs/glibmm/glibmm-2.20.0.tar.bz2.sig
deleted file mode 100644
index a11b477..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.20.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glibmm/glibmm-2.20.1.tar.bz2.sig b/gnome2-libs/glibmm/glibmm-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..10f73c5
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-media2/HISTORY b/gnome2-libs/gnome-media2/HISTORY
index 092aa68..07455da 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,7 @@
+2009-07-13 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD, gnome-media-2.26.0-missing-cddbslave-cflags.patch:
+	  added patch from Gentoo #15288
+
 2009-07-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.0
 
diff --git a/gnome2-libs/gnome-media2/PRE_BUILD b/gnome2-libs/gnome-media2/PRE_BUILD
new file mode 100755
index 0000000..3a5d550
--- /dev/null
+++ b/gnome2-libs/gnome-media2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/gnome-media-2.26.0-missing-cddbslave-cflags.patch &&
+
+NOCONFIGURE=ON ./autogen.sh
diff --git a/gnome2-libs/gnome-media2/gnome-media-2.26.0-missing-cddbslave-cflags.patch b/gnome2-libs/gnome-media2/gnome-media-2.26.0-missing-cddbslave-cflags.patch
new file mode 100644
index 0000000..99067a0
--- /dev/null
+++ b/gnome2-libs/gnome-media2/gnome-media-2.26.0-missing-cddbslave-cflags.patch
@@ -0,0 +1,22 @@
+--- ../gnome-media-2.26.0_orig/gnome-cd/access/Makefile.am	2008-09-07 20:54:07.000000000 +0200
++++ gnome-cd/access/Makefile.am	2009-03-23 15:19:45.952339992 +0100
+@@ -3,7 +3,8 @@
+ 	$(MEDIA_CFLAGS)	\
+ 	-I$(top_srcdir)/cddb-slave2	\
+ 	$(GAILUTIL_CFLAGS) \
+-	$(LIBXML2_CFLAGS)
++	$(LIBXML2_CFLAGS)		\
++	$(CDDBSLAVE_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libgnomecdaccess.la
+ 
+--- ../gnome-media-2.26.0_orig/gnome-cd/Makefile.am	2008-09-07 20:54:07.000000000 +0200
++++ gnome-cd/Makefile.am	2009-03-23 15:20:23.923000140 +0100
+@@ -15,6 +15,7 @@
+ 	$(GNOMECD_CFLAGS)			\
+ 	$(GAILUTIL_CFLAGS)			\
+ 	$(GST_CFLAGS)				\
++	$(CDDBSLAVE_CFLAGS)			\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+ 	-DDATADIR=\""$(datadir)"\"		\
+ 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"	\
diff --git a/gnome2-libs/libpanelappletmm/DETAILS b/gnome2-libs/libpanelappletmm/DETAILS
index 58451ac..29db6f9 100755
--- a/gnome2-libs/libpanelappletmm/DETAILS
+++ b/gnome2-libs/libpanelappletmm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libpanelappletmm
-         VERSION=2.6.0
+         VERSION=2.26.0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]="LGPL"
         WEB_SITE=http://gtkmm.sourceforge.net/
          ENTERED=20040410
-         UPDATED=20040516
         KEYWORDS="gnome2 libs"
            SHORT="C++ wrapper for gnome-panel"
 cat << EOF
diff --git a/gnome2-libs/libpanelappletmm/HISTORY b/gnome2-libs/libpanelappletmm/HISTORY
index b065a69..64bf2f9 100644
--- a/gnome2-libs/libpanelappletmm/HISTORY
+++ b/gnome2-libs/libpanelappletmm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-17 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 2.26.0
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/gnome2-libs/libpanelappletmm/libpanelappletmm-2.26.0.tar.bz2.sig b/gnome2-libs/libpanelappletmm/libpanelappletmm-2.26.0.tar.bz2.sig
new file mode 100644
index 0000000..4c0b7df
Binary files /dev/null and b/gnome2-libs/libpanelappletmm/libpanelappletmm-2.26.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libpanelappletmm/libpanelappletmm-2.6.0.tar.bz2.sig b/gnome2-libs/libpanelappletmm/libpanelappletmm-2.6.0.tar.bz2.sig
deleted file mode 100644
index 2089ba2..0000000
Binary files a/gnome2-libs/libpanelappletmm/libpanelappletmm-2.6.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index 78a3e20..569c138 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libsoup
 if [[ $LIBSOUP_DEVEL == y ]]; then
-         VERSION=2.27.2
+         VERSION=2.27.4
 else
          VERSION=2.26.3
 fi
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 6e5bdaa..46742b0 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,8 @@
+2009-07-13 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to 2.27.4
+	* PRE_SUB_DEPENDS: Added for devel version
+	* SUB_DEPENDS: Added for devel version
+
 2009-07-04 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to 2.27.2
 
diff --git a/gnome2-libs/libsoup/PRE_SUB_DEPENDS b/gnome2-libs/libsoup/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6387b95
--- /dev/null
+++ b/gnome2-libs/libsoup/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+   SOUP_DEVEL) if [[ "$LIBSOUP_DEVEL" == "y" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/gnome2-libs/libsoup/SUB_DEPENDS b/gnome2-libs/libsoup/SUB_DEPENDS
new file mode 100755
index 0000000..dab3225
--- /dev/null
+++ b/gnome2-libs/libsoup/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+   SOUP_DEVEL) echo "Devel release needed, forcing it."  &&
+             LIBSOUP_DEVEL="y"                          ;;
+   *)        echo "unknown sub-depends!"; return 1         ;;
+esac
diff --git a/gnome2-libs/libsoup/libsoup-2.27.2.tar.bz2.sig b/gnome2-libs/libsoup/libsoup-2.27.2.tar.bz2.sig
deleted file mode 100644
index 3971c7e..0000000
Binary files a/gnome2-libs/libsoup/libsoup-2.27.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libsoup/libsoup-2.27.4.tar.bz2.sig b/gnome2-libs/libsoup/libsoup-2.27.4.tar.bz2.sig
new file mode 100644
index 0000000..1829fd8
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.27.4.tar.bz2.sig differ
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 27bc269..1885373 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libpng
-         VERSION=1.2.37
-     SOURCE_HASH=sha512:6358dc594e1a29b0c25970c6fec9d4239d29a6f45710c5a620ff203c32a157b5bc2be03120f13c4c8dbde71b8a74713dfc7c1e6d834df349cf753c88693e615e
+         VERSION=1.2.38
+     SOURCE_HASH=sha512:35791954c708d3ecfe45ff1ed01086622ef091fbee3e6042f4ad010e1dedaf478a415da6065d9cb6c39911f376145f19bdce562614ca0e9e5e1266e72c4275ab
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index feba049..569765f 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,9 @@
+2009-07-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.38
+	* PRE_BUILD, libpng-1.2.38-apng.patch.gz: added patch from
+	  http://hp.vector.co.jp/authors/VA013651/freeSoftware/apng.html
+	* libpng-1.2.37-apng.patch.gz: removed
+
 2009-06-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.37
 	* PRE_BUILD, libpng-1.2.37-apng.patch.gz: added patch from
diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD
index c17a473..ac164db 100755
--- a/graphics-libs/libpng/PRE_BUILD
+++ b/graphics-libs/libpng/PRE_BUILD
@@ -2,5 +2,5 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 if [[ $ANI_PNG == y ]]; then
-  zcat "$SPELL_DIRECTORY/libpng-1.2.37-apng.patch.gz" | patch -p1
+  zcat "$SPELL_DIRECTORY/libpng-1.2.38-apng.patch.gz" | patch -p1
 fi
diff --git a/graphics-libs/libpng/libpng-1.2.37-apng.patch.gz b/graphics-libs/libpng/libpng-1.2.37-apng.patch.gz
deleted file mode 100644
index d4623a9..0000000
Binary files a/graphics-libs/libpng/libpng-1.2.37-apng.patch.gz and /dev/null differ
diff --git a/graphics-libs/libpng/libpng-1.2.38-apng.patch.gz b/graphics-libs/libpng/libpng-1.2.38-apng.patch.gz
new file mode 100644
index 0000000..977b84f
Binary files /dev/null and b/graphics-libs/libpng/libpng-1.2.38-apng.patch.gz differ
diff --git a/groups b/groups
index 1b60c56..ca14b4f 100755
--- a/groups
+++ b/groups
@@ -95,5 +95,6 @@ nginx:170:
 dialout:171:
 halevt:172:
 oprofile:173:
+flowd:174:
 users:1000:
 nogroup:65534:
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index cc967e9..657f253 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=3.5
+         VERSION=3.5.1
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
 #     SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=3.5
+         VERSION=3.5.1
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,7 +17,7 @@ else
    SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
-  SECURITY_PATCH=26
+  SECURITY_PATCH=27
 fi
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8a588c4..e815ee0 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.5.1. SECURITY_PATCH++
+
 2009-06-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel and stable to 3.5
 	* INSTALL: Removed hack for 3.5rc's
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index f139549..77e3be9 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -11,7 +11,7 @@ depends bison &&
 depends flex &&
 depends sqlite &&
 depends libxslt &&
-depends libsoup &&
+depends -sub "SOUP_DEVEL" libsoup &&
 depends enchant &&
 
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index e6edf54..bf29527 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -6,10 +6,10 @@ if [[ $WEBKITGTK_NIGHT == "y" ]]; then
      SOURCE_HASH=sha512:b62c36a4ca1f6d10320d45bdfe868b381e4509c117e9aa9b9a48b083cc03463444af0bdf2caf3c7435ecd0d6ce2d74760cd761dd698fa04f90fa1e0ee8827663
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
 else
-         VERSION=1.1.10
+         VERSION=1.1.11
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:24d207ac1ca5025d139bf283122ecccac309e64017fbd14b39a8bb06f8a16ba8adc0b6a5c64c75d8a10867c62d310f70a89c16d6d5a2e375a5270cc12984267e
+     SOURCE_HASH=sha512:04a8a9b2ea41bb4120455f2d0d75d04bdc29e316e1794a60668a636a60bf91c41c6f388338327c45fd80aceea58c1880dcaf2c17933338b169de78bc87212ff0
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 958314f..51ab8b1 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2009-07-13 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Added sub_depends for libsoup on devel version
+	* DETAILS: Updated stable to 1.1.11
+
 2009-06-29 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to r45330
 
diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index f2f8111..0745eea 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla-$VERSION" &&
+cd "$SOURCE_DIRECTORY/mozilla-1.9.1" &&
 
 XULRUNNER_HOME="$INSTALL_ROOT/usr/lib/xulrunner" &&
 export  MOZ_PHOENIX=1 &&
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 986afb5..f9e901d 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xulrunner
-         VERSION=1.9.1
-       FFVERSION=3.5
+         VERSION=1.9.1.1
+       FFVERSION=3.5.1
           SOURCE=firefox-$FFVERSION-source.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc     
         WEB_SITE=http://www.mozilla.org/
-  SECURITY_PATCH=7
+  SECURITY_PATCH=8
          ENTERED=20060829
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 4712336..4cb568e 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.9.1.1. SECURITY_PATCH++
+
 2009-06-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.9.1.
 	* BUILD: Added version to mozilla directory
diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index ead6688..661247f 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla-$VERSION"  &&
+cd "$SOURCE_DIRECTORY/mozilla-1.9.1"  &&
 
 MOZILLA_FIVE_HOME="$INSTALL_ROOT/usr/lib/xulrunner-1.9" &&
 
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 49de1d8..4e74769 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -1,7 +1,7 @@
 mk_source_dir  $SOURCE_DIRECTORY  &&
 cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
-cd  mozilla-$VERSION              &&
+cd  mozilla-1.9.1                 &&
 # fix for gcc-4.4
 sed -i 's/^#elif$/#else/' toolkit/xre/nsAppRunner.cpp  &&
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
diff --git a/kde4-apps/kdesvn4/DETAILS b/kde4-apps/kdesvn4/DETAILS
index eea975b..67aa324 100755
--- a/kde4-apps/kdesvn4/DETAILS
+++ b/kde4-apps/kdesvn4/DETAILS
@@ -1,9 +1,9 @@
            SPELL=kdesvn4
           SPELLX=kdesvn
-         VERSION=1.3.1
+         VERSION=1.3.2
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=http://${SPELLX}.alwins-world.de/downloads/${SOURCE}
-     SOURCE_HASH=sha512:1f5576973d2301e8b7b2a7f5ffa191b48e637c6f506ad0d248b3850dfcd14a965551d6781d3e5c7790e83a75e30211f06f6f84c922654fe696842df1c69d7e8b
+     SOURCE_HASH=sha512:ff29d6983881f52ee87ebafd84c34e152f148644894777d0f324036f5400fbe34c3e7256cfb5ef50a2a866f5c20ba84550281bc6ca712f5e35ff9c64292d6425
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELLX}-$VERSION
         WEB_SITE=http://${SPELLX}.alwins-world.de/
       LICENSE[0]=LGPL
diff --git a/kde4-apps/kdesvn4/HISTORY b/kde4-apps/kdesvn4/HISTORY
index e052020..0509d3c 100644
--- a/kde4-apps/kdesvn4/HISTORY
+++ b/kde4-apps/kdesvn4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-12 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 1.3.2
+
 2009-06-02 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 1.3.1
 
diff --git a/kde4-support/soprano/DETAILS b/kde4-support/soprano/DETAILS
index ad8fb51..4fecd28 100755
--- a/kde4-support/soprano/DETAILS
+++ b/kde4-support/soprano/DETAILS
@@ -11,8 +11,8 @@ else
      SOURCE_HASH=sha512:93fbd277fe76cc94afd443810bcd3e39e0fa8769b8b30af66dad4fd4f298c330ec9e76945c68fcec4e035247727fd21cb6856e36bdb4e8ead050891a3f6e260b
           SOURCE=$SPELL-$VERSION.tar.bz2
  else
-         VERSION=2.2.4
-     SOURCE_HASH=sha512:453dff50090f1a60d791c1af0134c5379c7adba97a8551daa4fc5712347a0cdde05d4aa60b38d61a1fbbad448195f35de3031e85576716b065c0ce58e86121ff
+         VERSION=2.3.0
+     SOURCE_HASH=sha512:92a9e1130a77531e6ce0eb254d7fbf4f367b020bbe46ee13211d98c385c554e78ec4aea947b515f40e0c87cd18b41be5a9f6d874c78c3969837b21d6527a5ad4
           SOURCE=$SPELL-$VERSION.tar.bz2
  fi
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 3d008d1..b83edec 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,6 @@
+2009-07-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.3.0 (stable)
+
 2009-06-24 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.2.4 /2.2.69
 
diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
index 35df301..70884cb 100755
--- a/kde4/kde4-l10n/DETAILS
+++ b/kde4/kde4-l10n/DETAILS
@@ -3,7 +3,7 @@
           SPELLX=kde-l10n
 persistent_read kdelibs4 KDE_VER KDE_VER
 if [[ $KDE_VER != stable ]]; then
-         VERSION=4.2.95
+         VERSION=4.2.96
 else
          VERSION=4.2.4
 fi
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index c4595a4..8374466 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2009-07-10 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.2.96 (unstable)
+
 2009-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.95 (unstable)
 
diff --git a/kde4/kde4-profile/DETAILS b/kde4/kde4-profile/DETAILS
index 0c91e2e..1da7729 100755
--- a/kde4/kde4-profile/DETAILS
+++ b/kde4/kde4-profile/DETAILS
@@ -3,7 +3,7 @@ persistent_read kdelibs4 KDE_VER KDE_VER
 if [[ $KDE_VER == devel ]]; then
          VERSION=svn
 elif [[ $KDE_VER == unstable ]]; then
-         VERSION=4.2.95
+         VERSION=4.2.96
 else
          VERSION=4.2.4
 fi
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index 37ab56e..b329b03 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,6 @@
+2009-07-10 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.2.96 (unstable)
+
 2009-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.2.95 (unstable)
 
diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD
index 5b49fda..88a5d6b 100755
--- a/kernels/kvm/BUILD
+++ b/kernels/kvm/BUILD
@@ -4,5 +4,8 @@ cd "${SOURCE_DIRECTORY}" &&
       --extra-cflags="${CFLAGS}"                                \
      --extra-ldflags="${LDFLAGS}"                               \
          --kerneldir="/lib/modules/$(get_kernel_version)/build" \
-          --disable-werror                                      &&
+          --disable-werror                                      \
+          --audio-drv-list="${KVM_DRV}"                         \
+          --audio-card-list="${KVM_CARD}"                       \
+            $OPTS                                               &&
 make
diff --git a/kernels/kvm/CONFIGURE b/kernels/kvm/CONFIGURE
new file mode 100755
index 0000000..e697074
--- /dev/null
+++ b/kernels/kvm/CONFIGURE
@@ -0,0 +1,7 @@
+.  $GRIMOIRE/config_query_multi.function  &&
+
+config_query_multi  KVM_DRV  "Enable which sound system(s)?"  \
+                    oss alsa sdl esd pa fmod                  &&
+
+config_query_multi  KVM_CARD  "Enable which sound card(s) emulation?"  \
+                    ac97 es1370 sb16 cs4231a adlib gus
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index a380a94..90c784e 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -1,10 +1,28 @@
-depends  sdl    &&
+optional_depends  sdl                                 \
+                  ''                                  \
+                  '--disable-sdl'                     \
+                  'for Simple DirectMedia Layer GUI'  &&
+
+optional_depends  ncurses                      \
+                  ''                           \
+                  '--disable-curses'           \
+                  'for curses text interface'  &&
 
 optional_depends  alsa-lib                                                \
-                  '--enable-alsa'                                         \
+                  ''                                                      \
                   '--disable-alsa'                                        \
                   'for Advanced Linux Sound Architecture driver support'  &&
 
+optional_depends  curl                           \
+                  ''                             \
+                  '--disable-curl'               \
+                  'for curl connection support'  &&
+
+optional_depends  bluez                               \
+                  ''                                  \
+                  '--disable-bluez'                   \
+                  'for bluetooth connection support'  &&
+
 suggest_depends  'bridge-utils'                  \
                  ''                              \
                  ''                              \
diff --git a/kernels/kvm/DETAILS b/kernels/kvm/DETAILS
index b203d25..638cde2 100755
--- a/kernels/kvm/DETAILS
+++ b/kernels/kvm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=kvm
-         VERSION=87
+         VERSION=88
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 58c4dcf..0a44bc9 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,12 @@
+2009-07-17 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 88
+	* CONFIGURE: Enable configuring sound drivers and emulated cards
+	* DEPENDS: sdl is optional and probably has been for a while
+	  Optionall depends on ncurses and curl and bluez
+	  kvm doesn't have --enable options for most flags
+	* BUILD: Need to pass OPTS to configure for dependency flags
+	  Pass KVM_DRV and KVM_CARD from CONFIGURE
+
 2009-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 87
 
diff --git a/kernels/kvm/kvm-87.tar.gz.sig b/kernels/kvm/kvm-87.tar.gz.sig
deleted file mode 100644
index 4d46db3..0000000
Binary files a/kernels/kvm/kvm-87.tar.gz.sig and /dev/null differ
diff --git a/kernels/kvm/kvm-88.tar.gz.sig b/kernels/kvm/kvm-88.tar.gz.sig
new file mode 100644
index 0000000..7081ec2
Binary files /dev/null and b/kernels/kvm/kvm-88.tar.gz.sig differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9f0f3c0..22ba5c4 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
+	* info/patches/maintenance_patches/patch-2.6.27.26: added
+
 2009-07-03 Vlad Glagolev <stealth at sourcemage.org>
 	* info/patches/maintenance_patches/patch-2.6.29.6: added
 
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.26 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.26
new file mode 100755
index 0000000..f77153f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.26
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.26"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/module-init-tools/DETAILS b/kernels/module-init-tools/DETAILS
index f67361c..768b28e 100755
--- a/kernels/module-init-tools/DETAILS
+++ b/kernels/module-init-tools/DETAILS
@@ -15,7 +15,8 @@ fi
 # new module-init-tools data
 
            SPELL=module-init-tools
-         VERSION=3.9
+         VERSION=3.10
+
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.kerneltools.org/
diff --git a/kernels/module-init-tools/HISTORY b/kernels/module-init-tools/HISTORY
index 4a3bab3..cd5d740 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 3.10
+
 2009-05-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.9
 	* INSTALL: removed modprobe.devfs, not provided upstream
diff --git a/kernels/virtualbox-module/DETAILS b/kernels/virtualbox-module/DETAILS
index 0d58fa0..34e449b 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
            SPELL=virtualbox-module
-         VERSION=3.0.0
+         VERSION=3.0.2
           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 fd69799..c3f01ba 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2009-07-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.0.2
+
 2009-06-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.0.0
 
diff --git a/libs/fftw/DETAILS b/libs/fftw/DETAILS
index f968f33..d11a0a2 100755
--- a/libs/fftw/DETAILS
+++ b/libs/fftw/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fftw
-         VERSION=3.2.1
-     SOURCE_HASH=sha512:d8bd676fe94df328591cd89a277ab4ce060fbd6531f9f287ed3e8352fca6dc2d4a95e0f8cf9c73637bb03c1453ce5d35b238cae5e6c89d36de55d50dff92793b
+         VERSION=3.2.2
+     SOURCE_HASH=sha512:0bcb01b2e84102f6d70b0c8dabf8541917f88e249405cad44ab49783513eb6519b2db13ce17c23598c807a14eff02327f59e1853335b85c7ec592e7176038094
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.fftw.org/$SOURCE
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 527dc2b..4b6d34a 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2009-07-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.2.2
+
 2009-02-15 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.2.1
 
diff --git a/libs/gavl/DETAILS b/libs/gavl/DETAILS
index 658f065..a1dce8e 100755
--- a/libs/gavl/DETAILS
+++ b/libs/gavl/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gavl
-         VERSION=1.1.0
+         VERSION=1.1.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://downloads.sourceforge.net/gmerlin/$SOURCE
         WEB_SITE=http://gmerlin.sourceforge.net/
          ENTERED=20080306
-     SOURCE_HASH=sha512:2b7d862d23f1128ee1dd0f61b8d3b81dfd790771724569ccbe5b17b9a957e87eb29baa0e417da5cd8efad207323f08f170cdbd37fcffa71c04e23e75ccb64130
+     SOURCE_HASH=sha512:7b3408e5c93c2d467bff4a714ab5836cd3827d518b71c84c67c91e3f1d6b718d9416e2c45643518bda7d83c6c3503d82cd64a921745a30ecf36316cc911ba030
       LICENSE[0]=GPL
            SHORT="Gmerlin Audio Video Library"
 cat << EOF
diff --git a/libs/gavl/HISTORY b/libs/gavl/HISTORY
index dd4f11e..ea48407 100644
--- a/libs/gavl/HISTORY
+++ b/libs/gavl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.1.1
+
 2009-01-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1.0
 
diff --git a/libs/libusb-compat/DETAILS b/libs/libusb-compat/DETAILS
index 68f686d..fd1d568 100755
--- a/libs/libusb-compat/DETAILS
+++ b/libs/libusb-compat/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libusb-compat
-         VERSION=0.1.2
-     SOURCE_HASH=sha512:dffec6b206a3fc649a07318b88eb638b9015d80ef25fe5bae121ef390ffd9a85e7782bfed707a81f1c90a399a0245775ec57c2a26eeabab37388091674f3bd51
+         VERSION=0.1.3
+#     SOURCE_HASH=sha512:6589523b747a5fd5893840b2d246cf46b64e10997cec2c3116664b8ce7090314bf413ed66049cdfcf68ea4a4ae33468673c897d18254ef52348cd430ffc99c0d
+   SOURCE_IGNORE=signature
 	  SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/libusb/$SOURCE
-#   SOURCE_IGNORE=signature
       LICENSE[0]=LGPL
         WEB_SITE=http://sourceforge.net/projects/libusb/
          ENTERED=20090311
diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index adce7a8..0ed8363 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,3 +1,9 @@
+2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.1.3
+
+2009-07-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: SOURCE_IGNORE=signature #15291
+
 2009-06-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.1.2
 
diff --git a/libs/openbabel/DETAILS b/libs/openbabel/DETAILS
index 2b6958d..f938720 100755
--- a/libs/openbabel/DETAILS
+++ b/libs/openbabel/DETAILS
@@ -1,12 +1,12 @@
            SPELL=openbabel
 if [[ $DEV_VER = y ]];then
-         VERSION=2.2.1
-        VERSIONX=2.2.1
-     SOURCE_HASH=sha512:5a7127c9ff740d6559dc71f42ec43ac90cda3eec9596a1bb1e9b1bc2553f1472baac0ced4275409645431877d9e8dc152c7bdd072a1a631a84ba8a2fb1d263ba
+         VERSION=2.2.2
+        VERSIONX=2.2.2
+     SOURCE_HASH=sha512:6ca08c8adea70f50642368d30c342f824f4a55180a09f29de3ec9b119a06be4b7f212358ddaad42f14671257dd499db2df79761b8500abda4357e8ecd6e22d95
           SOURCE=$SPELL-$VERSIONX.tar.gz
 else
-         VERSION=2.2.1
-     SOURCE_HASH=sha512:5a7127c9ff740d6559dc71f42ec43ac90cda3eec9596a1bb1e9b1bc2553f1472baac0ced4275409645431877d9e8dc152c7bdd072a1a631a84ba8a2fb1d263ba
+         VERSION=2.2.2
+     SOURCE_HASH=sha512:6ca08c8adea70f50642368d30c342f824f4a55180a09f29de3ec9b119a06be4b7f212358ddaad42f14671257dd499db2df79761b8500abda4357e8ecd6e22d95
           SOURCE=$SPELL-$VERSION.tar.gz
 fi
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/libs/openbabel/HISTORY b/libs/openbabel/HISTORY
index 55de38b..fff0790 100644
--- a/libs/openbabel/HISTORY
+++ b/libs/openbabel/HISTORY
@@ -1,3 +1,6 @@
+2008-07-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.2.2 (stable and devel)
+
 2008-03-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.2.1 (stable and devel)
 
diff --git a/libs/pyqt/DETAILS b/libs/pyqt/DETAILS
index 09e1f8d..47e6e96 100755
--- a/libs/pyqt/DETAILS
+++ b/libs/pyqt/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt
           SPELLX=PyQt-x11-gpl
-         VERSION=3.17.6
-     SOURCE_HASH=sha512:35878c1318cb4f3fbd679b427b261405d7de244be1f41fe36a5de2c617e12e9ba1d3cd0d3d995ddeb31e231fd197ac6262bf82da4abb189770ae29ae23a06a30
+         VERSION=3.18.1
+     SOURCE_HASH=sha512:a0d441d3b151c59129f734223e5b2ab6e4c55262f7a99309b9cf48ee27d8ec3c7758359d419b11a29b71dd3c3ea3090215589d38ba467d19b75c87321fc4f4d9
              URI=PyQt3
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt/HISTORY b/libs/pyqt/HISTORY
index 5de2b28..4f3c702 100644
--- a/libs/pyqt/HISTORY
+++ b/libs/pyqt/HISTORY
@@ -1,3 +1,6 @@
+2009-07-17 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS: version 3.18.1
+
 2008-11-19 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 3.17.6
 
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index bb906a5..c1fc7d4 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt4
           SPELLX=PyQt-x11-gpl
-         VERSION=4.5.1
-     SOURCE_HASH=sha512:0bd592dbf7974befe99f805319a558905705521f0f84238cf8faeaa671b2ff11883a38d382d5ce3150cdd5dea7566113ab5e1b8c85a82c2aa8c7367cc8b8e433
+         VERSION=4.5.2
+     SOURCE_HASH=sha512:a5720fdb2369019ef33352ba44724db23bebeb600582369d7d2ecac236a45e851a39438610e6b8a514bf35baf1af3f6ee22e03dabc085956fdb460f4eaedd5ec
              URI=PyQt4
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 0d93b47..7c86778 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.5.2
+
 2009-06-18 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Use --confirm-license rather than echoing "yes"
 
diff --git a/mail/dovecot/8f8b5e2f8df7.patch b/mail/dovecot/8f8b5e2f8df7.patch
deleted file mode 100644
index 6e06f00..0000000
--- a/mail/dovecot/8f8b5e2f8df7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# HG changeset patch
-# User Timo Sirainen <tss at iki.fi>
-# Date 1246987224 14400
-# Node ID 8f8b5e2f8df7dc6e68630bc47df6ac0e27f344d2
-# Parent d6337be8ae305ee5d095b806f10afc3207f3a261
-pop3: Fixed AUTH PLAIN command when SASL initial response wasn't specified.
-
---- a/src/pop3-login/client-authenticate.c	Tue Jul 07 12:40:31 2009 -0400
-+++ b/src/pop3-login/client-authenticate.c	Tue Jul 07 13:20:24 2009 -0400
-@@ -319,7 +319,7 @@ bool cmd_auth(struct pop3_client *client
- 	p = strchr(args, ' ');
- 	if (p == NULL) {
- 		mech_name = args;
--		args = "";
-+		args = NULL;
- 	} else {
- 		mech_name = t_strdup_until(args, p);
- 		args = p+1;
-
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 7f8f130..6438c88 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dovecot
-         VERSION=1.2.0
+         VERSION=1.2.1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
@@ -7,7 +7,7 @@
    SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
   SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
 if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
-        VERSION2=0.1.7
+        VERSION2=0.1.8
       PATHCLEVEL=1
          SOURCE3=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz
          SOURCE4=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz.sig
@@ -16,7 +16,7 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
   SOURCE4_IGNORE=signature
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
   if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-        VERSION3=0.11.6
+        VERSION3=0.11.7
          SOURCE5=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz
   SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE5
          SOURCE6=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz.sig
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 3f82121..db3be38 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,13 @@
+2009-07-14 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* 8f8b5e2f8df7.patch: really removed
+	* ee173ea99ea6.patch: really removed
+
+2009-07-13 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 1.2.1, updated managesieve, sieve
+	* 8f8b5e2f8df7.patch: removed
+	* ee173ea99ea6.patch: removed
+	* PRE_BUILD: removed the patches
+
 2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* 8f8b5e2f8df7.patch: added for PLAIN auth bug
 	* ee173ea99ea6.patch: added for PLAIN auth bog
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index 8c51049..3bcbc45 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build                                   &&
 cd $SOURCE_DIRECTORY                                &&
-patch -p1 < $SPELL_DIRECTORY/ee173ea99ea6.patch     &&
-patch -p1 < $SPELL_DIRECTORY/8f8b5e2f8df7.patch     &&
 if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
 unpack_file 3                                       &&
 if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
diff --git a/mail/dovecot/ee173ea99ea6.patch b/mail/dovecot/ee173ea99ea6.patch
deleted file mode 100644
index 032f566..0000000
--- a/mail/dovecot/ee173ea99ea6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# HG changeset patch
-# User Timo Sirainen <tss at iki.fi>
-# Date 1246987501 14400
-# Node ID ee173ea99ea630f624db378ef518984fa959f3f6
-# Parent 8f8b5e2f8df7dc6e68630bc47df6ac0e27f344d2
-auth: Ignore empty initial response strings.
-
---- a/src/auth/auth-request-handler.c	Tue Jul 07 13:20:24 2009 -0400
-+++ b/src/auth/auth-request-handler.c	Tue Jul 07 13:25:01 2009 -0400
-@@ -364,7 +364,10 @@ bool auth_request_handler_auth_begin(str
- 		return TRUE;
- 	}
- 
--	if (initial_resp == NULL) {
-+	/* Empty initial response is a "=" base64 string. Completely empty
-+	   string shouldn't really be sent, but at least Exim does it,
-+	   so just allow it for backwards compatibility.. */
-+	if (initial_resp == NULL || *initial_resp == '\0') {
- 		initial_resp_data = NULL;
- 		initial_resp_len = 0;
- 	} else {
-
diff --git a/mail/sylpheed/C00C2E26.gpg b/mail/sylpheed/C00C2E26.gpg
new file mode 100644
index 0000000..7366ff3
Binary files /dev/null and b/mail/sylpheed/C00C2E26.gpg differ
diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index be93e69..b6b1724 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,13 +3,16 @@ if [[ $SYLPHEED_GTK2 == n ]]; then
          VERSION=1.0.6
      SOURCE_HASH=sha512:2b94979b671ef63b62040ed6b394368536a4817de910407cdfcdadc891e77a6752a6b547c0c1fdaa5360bd4c3b6c0a497f3d75bb17476a0ee37f7c4b5f18136e
 else
-         VERSION=2.6.0
-     SOURCE_HASH=sha512:b0a64822d82cc2107f4311fdcb75bef9f66e6a58abd46632fd44c187dcf0c3b8748f1e5d763ce5c28e3313efc1dc854dae077ee0df4735754664ee442914f42d
+         VERSION=2.7.0
   SECURITY_PATCH=1
 fi
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://sylpheed.sraoss.jp/$SPELL/v${VERSION%.*}/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=C00C2E26.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://sylpheed.sraoss.jp/en/
          ENTERED=20011031
       LICENSE[0]=GPL
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index c3e510c..19b0f86 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,9 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.7.0; converted to upstream signature
+	  checking
+	* INSTALL: install plugins directory
+	* C00C2E26.gpg: added gpg keyring
+
 2008-12-19 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.6.0; fixed descs; quoting paths
 	* DEPENDS: added missing deps, flags; cleaned up
diff --git a/mail/sylpheed/INSTALL b/mail/sylpheed/INSTALL
index e211d6d..232a66e 100755
--- a/mail/sylpheed/INSTALL
+++ b/mail/sylpheed/INSTALL
@@ -1,3 +1,5 @@
 default_install &&
 
-install -m 644 sylpheed.png "$INSTALL_ROOT/usr/share/pixmaps"
+install -d -vm 755 "$INSTALL_ROOT/usr/lib/sylpheed/plugins" &&
+
+install -vm 644 sylpheed.png "$INSTALL_ROOT/usr/share/pixmaps"
diff --git a/net/djm.gpg b/net/djm.gpg
new file mode 100644
index 0000000..a2839e6
Binary files /dev/null and b/net/djm.gpg differ
diff --git a/net/flowd/BUILD b/net/flowd/BUILD
new file mode 100755
index 0000000..ab051c1
--- /dev/null
+++ b/net/flowd/BUILD
@@ -0,0 +1,13 @@
+create_account flowd &&
+
+default_build &&
+
+if is_depends_enabled $SPELL perl; then
+  cd Flowd-perl &&
+  default_build_perl &&
+  cd ..
+fi &&
+
+if is_depends_enabled $SPELL python; then
+  default_build_python
+fi
diff --git a/net/flowd/DEPENDS b/net/flowd/DEPENDS
new file mode 100755
index 0000000..859b456
--- /dev/null
+++ b/net/flowd/DEPENDS
@@ -0,0 +1,4 @@
+depends byacc &&
+
+optional_depends perl "" "" "for Perl interface support"
+optional_depends python "" "" "for Python interface support"
diff --git a/net/flowd/DETAILS b/net/flowd/DETAILS
new file mode 100755
index 0000000..5b6947f
--- /dev/null
+++ b/net/flowd/DETAILS
@@ -0,0 +1,27 @@
+           SPELL=flowd
+         VERSION=0.9.1
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://www.mindrot.org/files/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=djm.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.mindrot.org/projects/flowd/
+      LICENSE[0]=BSD
+         ENTERED=20090718
+           SHORT="small, fast and secure NetFlow collector"
+cat << EOF
+It offers the following features:
+ * Understands NetFlow protocol v.1, v.5, v.7 and v.9 (including IPv6 flows)
+ * Supports both IPv4 and IPv6 transport of flows
+ * Secure: flowd is privilege separated to limit the impact of any compromise
+ * Supports filtering and tagging of flows, using a packet filter-like syntax
+ * Stores recorded flow data in a compact binary format which supports run-time
+   choice over which flow fields are stored
+ * Ships with both Perl and Python interfaces for reading and parsing the
+   on-disk record format
+ * Supports reception of flow export datagrams sent to multicast groups (IPv4
+   and IPv6), thereby allowing the construction of redundant flow collector
+   systems
+EOF
diff --git a/net/flowd/HISTORY b/net/flowd/HISTORY
new file mode 100644
index 0000000..7331265
--- /dev/null
+++ b/net/flowd/HISTORY
@@ -0,0 +1,2 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS, {PRE_,}BUILD, INSTALL, init.d/flowd: spell created
diff --git a/net/flowd/INSTALL b/net/flowd/INSTALL
new file mode 100755
index 0000000..fed1cce
--- /dev/null
+++ b/net/flowd/INSTALL
@@ -0,0 +1,15 @@
+default_install &&
+
+install_config_file flowd.conf "$INSTALL_ROOT/etc/flowd.conf" &&
+
+install -d -o flowd -g flowd -vm 755 "$INSTALL_ROOT/var/run/flowd" &&
+
+if is_depends_enabled $SPELL perl; then
+  cd Flowd-perl &&
+  default_install &&
+  cd ..
+fi &&
+
+if is_depends_enabled $SPELL python; then
+  default_install_python
+fi
diff --git a/net/flowd/PRE_BUILD b/net/flowd/PRE_BUILD
new file mode 100755
index 0000000..2a49737
--- /dev/null
+++ b/net/flowd/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# rename privilege separation user _flowd -> flowd
+sed -i "s:_flowd:flowd:" flowd.h
diff --git a/net/flowd/init.d/flowd b/net/flowd/init.d/flowd
new file mode 100755
index 0000000..7b7fee4
--- /dev/null
+++ b/net/flowd/init.d/flowd
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/flowd
+ARGS="-f /etc/flowd.conf"
+RUNLEVEL=3
+PIDFILE=/var/run/flowd.pid
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/net/softflowd/DEPENDS b/net/softflowd/DEPENDS
new file mode 100755
index 0000000..a8ec60d
--- /dev/null
+++ b/net/softflowd/DEPENDS
@@ -0,0 +1 @@
+depends libpcap
diff --git a/net/softflowd/DETAILS b/net/softflowd/DETAILS
new file mode 100755
index 0000000..d94141d
--- /dev/null
+++ b/net/softflowd/DETAILS
@@ -0,0 +1,33 @@
+           SPELL=softflowd
+         VERSION=0.9.8
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://www.mindrot.org/files/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=djm.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.mindrot.org/projects/softflowd/
+      LICENSE[0]=BSD
+         ENTERED=20090717
+           SHORT="flow-based network traffic analyser"
+cat << EOF
+Softflowd semi-statefully tracks traffic flows. Upon expiry of a flow, its
+statistics are accumulated and reports them to a designated collector host using
+the standard NetFlow protocol. Currently the statistics collected are summaries
+only: min/max/avg/total bytes, packets on a aggregate or per-protocol basis.
+
+Softflowd can export using NetFlow version 1, 5 or 9 datagrams and it is fully
+IPv6 capable: it can track and report on IPv6 traffic and flow export datagrams
+can be sent to an IPv6 host. Any standard NetFlow collector should be able to
+process the reports from softflowd.
+
+As softflowd watches traffic promiscuously, it is likely to place additional
+load on hosts or gateways on which it is installed. However, this implementation
+has been designed to minimise this load as much as possible. Alternately,
+softflowd can read pcap save files recorded from tcpdump and friends.
+
+Unless reading from a traffic dump, softflowd run as a daemon. A "remote
+control" program (softflowctl) is included which allows runtime control and
+extraction of statistics from a daemonised softflowd.
+EOF
diff --git a/net/softflowd/HISTORY b/net/softflowd/HISTORY
new file mode 100644
index 0000000..326b55f
--- /dev/null
+++ b/net/softflowd/HISTORY
@@ -0,0 +1,3 @@
+2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS, INSTALL, init.d/softflowd{,.conf}, djm.gpg:
+	  spell created
diff --git a/net/softflowd/INSTALL b/net/softflowd/INSTALL
new file mode 100755
index 0000000..efb9c4e
--- /dev/null
+++ b/net/softflowd/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/softflowd.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/softflowd"
+fi
diff --git a/net/softflowd/init.d/softflowd b/net/softflowd/init.d/softflowd
new file mode 100755
index 0000000..108a97d
--- /dev/null
+++ b/net/softflowd/init.d/softflowd
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/softflowd
+
+PROGRAM=/usr/sbin/softflowd
+ARGS="$SOFTFLOWD_ARGS"
+RUNLEVEL=3
+PIDFILE=/var/run/softflowd.pid
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/net/softflowd/init.d/softflowd.conf b/net/softflowd/init.d/softflowd.conf
new file mode 100644
index 0000000..622f6c4
--- /dev/null
+++ b/net/softflowd/init.d/softflowd.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see softflowd(8)
+
+SOFTFLOWD_ARGS="-i eth0"
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index bf21ed5..3c931c1 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlalchemy
   CHEESESHOP_PKG=SQLAlchemy
-         VERSION=0.5.4p2
-     SOURCE_HASH=sha512:5cd6cc9bb95b219a1cf35e39c094871eac32ab0fa35c2882e165c93dfdae1a884ed10d3f6ad1701fd116d29d2b19d0c00449f240b4069117ccc205424a8fd7c6
+         VERSION=0.5.5
+     SOURCE_HASH=sha512:4fc9ce149fc3abdfb0ded5fa416a5307fda7736564d1f18093059b3a3d760e9b3e7ec6744580911e39e0a609c2b3295562da32f68f7f9c82904bb03d9e03360d
           SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
    SOURCE_URL[0]="http://www.python.org/pypi/S/$CHEESESHOP_PKG/$SOURCE"
    SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 8a789ef..99d6062 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.5.5
+
 2009-05-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.5.4p2
 
diff --git a/ruby-raa/rubyripper/DETAILS b/ruby-raa/rubyripper/DETAILS
index 2973615..e51be0d 100755
--- a/ruby-raa/rubyripper/DETAILS
+++ b/ruby-raa/rubyripper/DETAILS
@@ -1,8 +1,8 @@
            SPELL=rubyripper
-         VERSION=0.5.6
+         VERSION=0.5.7
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://rubyripper.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:e8ea01abd21f365890e3bbabbc3cc62ed1a6456cff4d5d95cfe47461b862e44fe6b4f7770a8fca08884e00fce0f1fdb8abeab82568a79ef8de11d0d4ec42f30e
+     SOURCE_HASH=sha512:3f77c171f6d251cbfc2fb36239804c2d18d9edbfe28163919c2ab10ec431daaee88f7f3d2c3828f42f46442f1435c939084ee4030602ceb249cc237367902535
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://code.google.com/p/rubyripper/
       LICENSE[0]=GPL
diff --git a/ruby-raa/rubyripper/HISTORY b/ruby-raa/rubyripper/HISTORY
index 556173f..465562d 100644
--- a/ruby-raa/rubyripper/HISTORY
+++ b/ruby-raa/rubyripper/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.5.7
+
 2009-07-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.5.6
 
diff --git a/science/celestia/DETAILS b/science/celestia/DETAILS
index 6c35ac4..f0c3200 100755
--- a/science/celestia/DETAILS
+++ b/science/celestia/DETAILS
@@ -1,5 +1,5 @@
            SPELL=celestia
-         VERSION=1.5.1
+         VERSION=1.6.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/science/celestia/HISTORY b/science/celestia/HISTORY
index 0b4c27d..9778d4a 100644
--- a/science/celestia/HISTORY
+++ b/science/celestia/HISTORY
@@ -1,3 +1,7 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.0
+	* PRE_BUILD, gcc43.patch.bz2: removed
+
 2008-07-11 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.5.1
 	  Removed UPDATED
diff --git a/science/celestia/PRE_BUILD b/science/celestia/PRE_BUILD
deleted file mode 100755
index 7641546..0000000
--- a/science/celestia/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build      &&
-cd  $SOURCE_DIRECTORY  &&
-
-bzcat $SCRIPT_DIRECTORY/gcc43.patch.bz2  |  patch -p1
diff --git a/science/celestia/celestia-1.5.1.tar.gz.sig b/science/celestia/celestia-1.5.1.tar.gz.sig
deleted file mode 100644
index da9fcca..0000000
Binary files a/science/celestia/celestia-1.5.1.tar.gz.sig and /dev/null differ
diff --git a/science/celestia/celestia-1.6.0.tar.gz.sig b/science/celestia/celestia-1.6.0.tar.gz.sig
new file mode 100644
index 0000000..1c80e76
Binary files /dev/null and b/science/celestia/celestia-1.6.0.tar.gz.sig differ
diff --git a/science/celestia/gcc43.patch.bz2 b/science/celestia/gcc43.patch.bz2
deleted file mode 100644
index 1409f7e..0000000
Binary files a/science/celestia/gcc43.patch.bz2 and /dev/null differ
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index 6dfa322..fc1d3c7 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -11,8 +11,8 @@ esac &&
 
 optional_depends pcre \
                  "" "--with-libpcre=included" \
-		 "use external PCRE lib?" &&
+                 "use external PCRE lib?" &&
 
 optional_depends lua \
                  "" "--with-liblua=included" \
-		 "use external Lua lib?"
+                 "use external Lua lib?"
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index ed26b91..8351071 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,13 +1,13 @@
            SPELL=nmap
-         VERSION=4.85BETA9
+         VERSION=5.00
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SPELL-$VERSION.tar.bz2.gpg.txt
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://nmap.org/dist/$SOURCE
   SOURCE2_URL[0]=http://nmap.org/dist/sigs/$SOURCE2
    SOURCE_URL[1]=http://sectools.org/nmap/$SOURCE
   SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
-      SOURCE_GPG="nmap.gpg:${SOURCE2}"
+      SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
         WEB_SITE=http://nmap.org/
          ENTERED=20010922
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index c6f5e9e..cef1ed5 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,8 @@
+2009-07-17 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.00; quoting paths; cleaned up; fixed
+	  url for the sig
+	* DEPENDS: tabs -> spaces
+
 2009-06-11 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 4.85BETA9
 
diff --git a/telephony/telepathy-glib/DETAILS b/telephony/telepathy-glib/DETAILS
index 737b362..bb9bf7a 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
            SPELL=telepathy-glib
-         VERSION=0.7.26
+         VERSION=0.7.33
           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 007f9ca..0ca4b77 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,7 @@
+2009-07-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.33
+	* ../telepathy.gpg: add key 63C7CC90
+
 2009-02-20 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.7.26
 
diff --git a/telephony/telepathy-qt/BUILD b/telephony/telepathy-qt/BUILD
index 7ed0e9d..23b8f8e 100755
--- a/telephony/telepathy-qt/BUILD
+++ b/telephony/telepathy-qt/BUILD
@@ -1,2 +1,2 @@
-qt4_cmake_build
-
+PATH=/usr/bin/qt4/:$PATH  &&
+default_build
diff --git a/telephony/telepathy-qt/DEPENDS b/telephony/telepathy-qt/DEPENDS
index df6660c..c1b5e03 100755
--- a/telephony/telepathy-qt/DEPENDS
+++ b/telephony/telepathy-qt/DEPENDS
@@ -1,3 +1,9 @@
-depends cmake &&
-depends qt4   &&
-depends openssl
+if [[ $TELQT_SVN == y ]];then
+  depends git  &&
+  depends libtool
+fi &&
+depends pkgconfig &&
+depends -sub DBUS qt4   &&
+depends python &&
+depends openssl &&
+optional_depends telepathy-glib '' '' 'glib integration'
diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index d2ed18f..5efcfab 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -1,19 +1,22 @@
            SPELL=telepathy-qt
+          SPELLX=telepathy-qt4
+        WEB_SITE=http://telepathy.freedesktop.org
 if [[ $TELQT_SVN == y ]];then
-         VERSION=svn
+         VERSION=git
    SOURCE_IGNORE=volatile
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-#   SOURCE_URL[0]=svn_http://svn.sourceforge.net/svnroot/tapioca-voip/trunk/${SPELL}:${SPELL}
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+   SOURCE_URL[0]=git://git.collabora.co.uk/git/$SPELLX.git
    FORCE_DOWNLOAD=on
 else
-         VERSION=0.14.1
-     SOURCE_HASH=sha512:d40787b369255e3d4aa9a979f754edabd9bbbf89f9ed13df7f1bd94c5765122003be228d91d953b9ff138faf361a258e7e908b693a764b2d4e30b34f909a8926
-          SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=$SOURCEFORGE_URL/tapioca-voip/$SOURCE
-fi;
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://tapioca-voip.sourceforge.net
+         VERSION=0.1.8
+          SOURCE=$SPELLX-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=$WEB_SITE/releases/$SPELLX/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
       LICENSE[0]=LGPL
          ENTERED=20070307
         KEYWORDS="telepathy"
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index f6aff08..fe4393d 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,18 @@
+2009-07-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.1.8
+	  new url & website
+	  use upstream key
+	  svn -> git
+	* DEPENDS: add pkgconfig & python, remove cmake
+	  add '-sub DBUS' for qt4
+	  add optional telepathy-glib
+	  svn ->  git
+	  add libtool
+	* BUILD: use default_build
+	* PRE_BUILD: added, for git version
+	* PREPARE: change query text
+	* telepathy.gpg: add key 4F1BF3ED
+
 2009-04-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: svn now at kde
 	* DEPENDS: add cmake, openssl
diff --git a/telephony/telepathy-qt/PREPARE b/telephony/telepathy-qt/PREPARE
index 0d010aa..93dd60b 100755
--- a/telephony/telepathy-qt/PREPARE
+++ b/telephony/telepathy-qt/PREPARE
@@ -1 +1 @@
-config_query TELQT_SVN 'Do you want the SVN version?' n
+config_query TELQT_SVN 'Do you want the GIT version?' n
diff --git a/telephony/telepathy-qt/PRE_BUILD b/telephony/telepathy-qt/PRE_BUILD
new file mode 100755
index 0000000..ab81d6d
--- /dev/null
+++ b/telephony/telepathy-qt/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+if [[ $TELQT_SVN == y ]];then
+./autogen.sh --no-configure
+fi
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index 573cb99..d122022 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index f4d66d1..808c7ee 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbus
-         VERSION=1.2.14
-     SOURCE_HASH=sha512:3180e4ad53ac02a9558ef15740429e0bc2fe98da69110267b72f2072196c27c77b64b78e4f07247d30c7d6668fb3db2b043bec390dd3e1339c7fee05fb5fa2a3
+         VERSION=1.2.16
+     SOURCE_HASH=sha512:088423e330ea6d38b0b6d69a2c82d2c7e9ecc6353c7a8d8d976562b44b2551693a072b2e2176833457b3b59f81e1aea5b400639d822551211d78e21dc635564c
   SECURITY_PATCH=5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 4688b15..4b2d254 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2009-07-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.16
+
 2009-05-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.14, SECURITY_PATCH=5, CVE-2009-1189
 
diff --git a/utils/hal-info/DETAILS b/utils/hal-info/DETAILS
index a75bb16..620b64f 100755
--- a/utils/hal-info/DETAILS
+++ b/utils/hal-info/DETAILS
@@ -1,6 +1,6 @@
            SPELL=hal-info
-         VERSION=20090414
-     SOURCE_HASH=sha512:29c1adf25c2a117bf55b9ff287c607b44f1d5b90ff583321efa61bfc7a85bf8b12e4354274a7e329a22ca0c808d7e08f9b93e371a17c7bb4fffa7f650fadb74c
+         VERSION=20090716
+     SOURCE_HASH=sha512:8178f3fc632994604fc37060f0033f1f8454cff318ae4c1888a184da6a1290dbd6b196a04425aa85844c488aa5d3647cf209fa29aabb7f55050d14e1b4906e90
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index f94fb57..f297cb4 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 20090716
+
 2009-04-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 20090414
 
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index 0e88cce..75636d7 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -6,9 +6,9 @@ if [[ $HAL_VER == devel ]]; then
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.5.12
+         VERSION=0.5.13
       PATCHLEVEL=3
-     SOURCE_HASH=sha512:d450bbcb6f9d8c2b2b6a29324af74cabf2992676c547abce366fe599eb2feb1f3ed65e7eb0b84ad02392ce3b31c5fca6f0b0c6bd0d3db1c0992a52878a5d307f
+     SOURCE_HASH=sha512:4157b225ece19382fd79afd0c1c5972eedc6a3ffff8dda81c72215803fa77abe6040c6c86b3f3a3e2296b6e167697411c92641e654ca2e004e05bac1dd8c2309
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
 fi
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index b5d1634..0e1ef05 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2009-07-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.5.13
+	* PRE_BUILD, fstype.patch: removed patch
+
 2009-05-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL+=1
 	* PRE_BUILD: fixed segfault in hal-storage-mount and don't lose fstype
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 2d7455a..0a2ed38 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/fstype.patch" &&
-
 if [[ $HAL_VER == devel ]]; then
   NOCONFIGURE=1 ./autogen.sh
 fi
diff --git a/utils/hal/fstype.patch b/utils/hal/fstype.patch
deleted file mode 100644
index ff4c94c..0000000
--- a/utils/hal/fstype.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- hald/linux/probing/probe-volume.c
-+++ hald/linux/probing/probe-volume.c
-@@ -97,7 +97,7 @@ set_blkid_values (LibHalChangeSet *cs, blkid_probe pr)
- 
- 	if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL))
- 		type = "";
--	if (libhal_changeset_set_property_string (cs, "volume.fstype", type))
-+	if (!libhal_changeset_set_property_string (cs, "volume.fstype", type))
- 		libhal_changeset_set_property_string (cs, "volume.fstype", "");
- 	HAL_DEBUG(("volume.fstype = '%s'", type));
- 
---- tools/hal-storage-mount.c
-+++ tools/hal-storage-mount.c
-@@ -786,7 +786,8 @@ handle_mount (LibHalContext *hal_ctx,
- 		/* don't consider uid= on vfat, iso9660, hfs and udf change-uid for the purpose of policy
- 		 * (since these doesn't contain uid/gid bits) 
- 		 */
--		if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
-+		if (libhal_volume_get_fstype (volume) != NULL &&
-+		    strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
- 		    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
- 		    strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
- 		    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
diff --git a/utils/newsyslog/0AFC7476.gpg b/utils/newsyslog/0AFC7476.gpg
new file mode 100644
index 0000000..da3d77b
Binary files /dev/null and b/utils/newsyslog/0AFC7476.gpg differ
diff --git a/utils/newsyslog/DEPENDS b/utils/newsyslog/DEPENDS
index 3a913e8..2109f98 100755
--- a/utils/newsyslog/DEPENDS
+++ b/utils/newsyslog/DEPENDS
@@ -1,2 +1,2 @@
 depends zlib &&
-depends bzip2 
+depends bzip2
diff --git a/utils/newsyslog/DETAILS b/utils/newsyslog/DETAILS
index 1568c17..76dafe0 100755
--- a/utils/newsyslog/DETAILS
+++ b/utils/newsyslog/DETAILS
@@ -1,22 +1,24 @@
            SPELL=newsyslog
          VERSION=1.8
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://archives.eyrie.org/software/system/${SOURCE}
-     SOURCE_HASH=sha512:92c46066e1c18717fb57636dde8f64d20c6b03c829fd0e8ad266561cdea6eda1ae98be61c22674f1d630a2d0e7c0eee91a8e6abc17f42715fe24e9b2129c02d2
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://www.eyrie.org/~eagle/software/newsyslog/"
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://archives.eyrie.org/software/system/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=0AFC7476.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.eyrie.org/~eagle/software/newsyslog/
       LICENSE[0]=GPL
          ENTERED=20080309
-           SHORT="a log file rotater"
+           SHORT="log file rotater"
 cat << EOF
 All log files rotated by newsyslog are compressed, with the choice of either
-gzip-style zlib compression or bzip2 compression. newsyslog also has the
-ability to run an analyze program on the log file (usually useful to scan
-the log for anomalous entries and report them, perhaps by sending a report
-in e-mail), and to run a filter program on the log before archiving it and
-only archiving the output from the filter (so that the uninteresting lines
-can be stripped out before archiving). It also has the standard features that
-you'd expect in a log rotation program, such as being able to save a given
-number of old copies of a log and running commands to stop and restart the
-service around the log rotation.
+gzip-style zlib compression or bzip2 compression. newsyslog also has the ability
+to run an analyze program on the log file (usually useful to scan the log for
+anomalous entries and report them, perhaps by sending a report in e-mail), and
+to run a filter program on the log before archiving it and only archiving the
+output from the filter (so that the uninteresting lines can be stripped out
+before archiving). It also has the standard features that you'd expect in a log
+rotation program, such as being able to save a given number of old copies of a
+log and running commands to stop and start the service around the log rotation.
 EOF
diff --git a/utils/newsyslog/HISTORY b/utils/newsyslog/HISTORY
index c265e45..ebcd647 100644
--- a/utils/newsyslog/HISTORY
+++ b/utils/newsyslog/HISTORY
@@ -1,3 +1,7 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: converted to upstream signature checking; cleaned up;
+	  quoting paths
+	* 0AFC7476.gpg: added gpg keyring
+
 2008-03-09 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS, DETAILS, HISTORY: spell created
-
diff --git a/utils/nss-ldapd/DETAILS b/utils/nss-ldapd/DETAILS
index 45bec1e..20fa30d 100755
--- a/utils/nss-ldapd/DETAILS
+++ b/utils/nss-ldapd/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nss-ldapd
-         VERSION=0.6.10
+         VERSION=0.6.11
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/utils/nss-ldapd/HISTORY b/utils/nss-ldapd/HISTORY
index 2a14de1..c944171 100644
--- a/utils/nss-ldapd/HISTORY
+++ b/utils/nss-ldapd/HISTORY
@@ -1,3 +1,6 @@
+2009-07-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.6.11
+
 2009-06-04 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.6.10
 
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 2e99d56..999ec92 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
            SPELL=sudo
-         VERSION=1.7.1
+         VERSION=1.7.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 5c92558..cf8bdd6 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2009-07-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.2
+
 2009-06-14 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: fixed optional deps on openldap/cyrus-sasl
 
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 00dd6e0..1fc2f56 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -10,7 +10,7 @@ if [[ $UL_VERSION == aes ]]; then
      SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
   SOURCE4_IGNORE=signature
 else
-         VERSION=2.15.1
+         VERSION=2.16
 fi
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-ng-$VERSION.tar.bz2
@@ -25,6 +25,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-ng-$VERSION"
       LICENSE[0]=GPL
         KEYWORDS="utils"
   SECURITY_PATCH=1
+  STAGED_INSTALL=off
+           TMPFS=off
            SHORT="essential utilities for any Linux box"
 cat << EOF
 Util-linux is a suite of essential utilities for any Linux system. Its primary
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index d12559b..cb1974d 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,12 @@
+2009-07-17 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Disable STAGED_INSTALL (castfs) and TMPFS (Bug #15257)
+	  The problem with the migration of libraries from e2fsprogs -> util-linux
+	  stems from the library being removed and breaking mount, which castfs
+	  and tmpfs use during installation.
+
+2009-07-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.16
+
 2009-06-26 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated aes version to 2.15.1; updated aes patch to 20090626
 
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index b4a3233..103dfe2 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,10 @@
            SPELL=virtualbox
-         VERSION=3.0.0
+         VERSION=3.0.2
       PATCHLEVEL=0
           SOURCE=VirtualBox-$VERSION-OSE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}_OSE
    SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-     SOURCE_HASH=sha512:945a3e987a325c722427e53324c69a29f185fa8ff0b53d8ca54b1938f1a8a76d7d3b859002eef5c1126d8d3a2fac2c6353ecd1384cddfa583ae192297a1912de
+     SOURCE_HASH=sha512:a51c9e78fa7471010a246f9a02065695085199d8399180dad03efa40a840227661da9cd524c0e6124d0fcb6aa53f2e3d26f3ab4d2d177a9d41b0bd88abaeb34c
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 03c744b..eabcab0 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2009-07-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.0.2
+
 2009-06-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.0.0
 	* PRE_BUILD: updated sedits
diff --git a/utils/vx32/DETAILS b/utils/vx32/DETAILS
index dc3e4b0..ae3e298 100755
--- a/utils/vx32/DETAILS
+++ b/utils/vx32/DETAILS
@@ -16,8 +16,8 @@ fi
         WEB_SITE=http://pdos.csail.mit.edu/~baford/vm/
          ENTERED=20080629
       LICENSE[0]="LGPL"
-           SHORT="Vx32: portable, efficient, safe
-execution of untrusted x86 code"
+           SHORT="Vx32: portable, efficient, safe execution of untrusted \
+x86 code"
 cat << EOF
 Vx32 is a user-mode library that can be linked into arbitrary applications
 that wish to create secure, isolated execution environments in which to run
diff --git a/utils/vx32/HISTORY b/utils/vx32/HISTORY
index c56893f..6ac1c38 100755
--- a/utils/vx32/HISTORY
+++ b/utils/vx32/HISTORY
@@ -1,3 +1,6 @@
+2009-07-17 Mathieu Lonjaret <lejatorn at sourcemage.org>
+	* DETAILS: escaped return in SHORT
+
 2009-01-17 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* DETAILS: wrapped long desc
 
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 9139572..052ac22 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,9 +1,10 @@
            SPELL=youtube-dl
-         VERSION=2009.05.30
+         VERSION=2009.06.29
           SOURCE=$SPELL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://bitbucket.org/rg3/youtube-dl/raw/$VERSION/$SOURCE
-   SOURCE_IGNORE=unversioned
+     SOURCE_HASH=sha256:f051829695152c0c9788f52251d3e44cece1a0bcc6afbe3263211bfdd4ed24d6
+  FORCE_DOWNLOAD=on
       LICENSE[0]=BSD
         KEYWORDS="utils"
         WEB_SITE=http://bitbucket.org/rg3/youtube-dl/wiki/Home
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index 2e2b011..7135ffd 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,7 @@
+2009-07-14 Ethan Grammatikidis <eekee57 at fastmail.fm>
+	* DETAILS: VERSION=2009.06.29
+	* DETAILS: SOURCE_HASH set from website and FORCE_DOWNLOAD enabled
+
 2009-06-03 Robert Figura <template at sourcemage.org>
 	* DETAILS: Updated to 2009.05.30, new urls
 
diff --git a/video-libs/gmerlin-avdecoder/DEPENDS b/video-libs/gmerlin-avdecoder/DEPENDS
new file mode 100755
index 0000000..4bc2511
--- /dev/null
+++ b/video-libs/gmerlin-avdecoder/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends doxygen                          \
+                 "   --with-doxygen"              \
+                 "--without-doxygen"              \
+                 "for documentation generation"
diff --git a/video-libs/gmerlin-avdecoder/DETAILS b/video-libs/gmerlin-avdecoder/DETAILS
index 588606d..a527e07 100755
--- a/video-libs/gmerlin-avdecoder/DETAILS
+++ b/video-libs/gmerlin-avdecoder/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gmerlin-avdecoder
-         VERSION=1.0.0
+         VERSION=1.0.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/gmerlin/$SOURCE
-     SOURCE_HASH=sha512:75365cf4a55f6e0b9c6c57ec2d96ded427cfb9aa9c323b6c50286cec9ce5aab364ae824be086b6106cd04ff74b5d4c8819c6cd0457741501333d387fb92b1578
+     SOURCE_HASH=sha512:f7f922f0a209ef03bff229f8e3c544ea7ad4167534dcbde0f1d686174e6ba3c0a6400919b901c61b3cb12ca2ea4f393dded72a7169b4f7a5988bf83d3d3ff08b
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://gmerlin.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/video-libs/gmerlin-avdecoder/HISTORY b/video-libs/gmerlin-avdecoder/HISTORY
index 9563042..62d587f 100644
--- a/video-libs/gmerlin-avdecoder/HISTORY
+++ b/video-libs/gmerlin-avdecoder/HISTORY
@@ -1,3 +1,7 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.1
+	* DEPENDS: added
+
 2009-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: spell created, version 1.0.0
 
diff --git a/video-libs/gmerlin-encoders/DETAILS b/video-libs/gmerlin-encoders/DETAILS
index 76d91c3..47d71c7 100755
--- a/video-libs/gmerlin-encoders/DETAILS
+++ b/video-libs/gmerlin-encoders/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gmerlin-encoders
-         VERSION=0.2.6
+         VERSION=0.2.7
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/gmerlin/$SOURCE
-     SOURCE_HASH=sha512:11320bc66683587d2538e4ff72a08f66112a0344b35c7b1e3b1af5f017e8dc90c840de87cdd9248bd9af73c148ae74f56927a712bbe0dfc36e3fa4bacf9e0e8c
+     SOURCE_HASH=sha512:cba89a4138386e0f47154d46919bd9e2e0ded514c9944a6286600bb2a5cc6abb78d2c536f5d9b0c16264cfc9cda7cc51a8e85b952e863d138b0b5f7a430eadde
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://gmerlin.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/video-libs/gmerlin-encoders/HISTORY b/video-libs/gmerlin-encoders/HISTORY
index 0384fa8..f1e4f8e 100644
--- a/video-libs/gmerlin-encoders/HISTORY
+++ b/video-libs/gmerlin-encoders/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.2.7
+
 2009-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: spell created, version 0.2.6
 
diff --git a/video-libs/gmerlin/DEPENDS b/video-libs/gmerlin/DEPENDS
new file mode 100755
index 0000000..fafceac
--- /dev/null
+++ b/video-libs/gmerlin/DEPENDS
@@ -0,0 +1,6 @@
+depends gavl &&
+
+optional_depends doxygen                          \
+                 "   --with-doxygen"              \
+                 "--without-doxygen"              \
+                 "for documentation generation"
diff --git a/video-libs/gmerlin/DETAILS b/video-libs/gmerlin/DETAILS
index 5aad453..3a2747d 100755
--- a/video-libs/gmerlin/DETAILS
+++ b/video-libs/gmerlin/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gmerlin
-         VERSION=0.4.0
+         VERSION=0.4.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:fd5382495b5054f6c55ff66b8e5973f506fddfcb276eac94b96ecde40e84737db6794f896af750551b8682ec453369eba0836ae1304f91e58385ff6b1aba70d1
+     SOURCE_HASH=sha512:5b6b4fa0a286ac386c3905646b838a63c3258cb625353bfcf880aa10cc99798a9c5fac82d144396ee6c9d7b0f4a8574a33f6c0c0a6bc0d002c73d911b292918d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://gmerlin.sourceforge.net
       LICENSE[0]=GPL
diff --git a/video-libs/gmerlin/HISTORY b/video-libs/gmerlin/HISTORY
index c64d730..5fc6d5c 100644
--- a/video-libs/gmerlin/HISTORY
+++ b/video-libs/gmerlin/HISTORY
@@ -1,3 +1,7 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.4.1
+	* DEPENDS: added
+
 2009-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: spell created, version 0.4.0
 
diff --git a/video-libs/libquicktime/DETAILS b/video-libs/libquicktime/DETAILS
index ffce245..303d03b 100755
--- a/video-libs/libquicktime/DETAILS
+++ b/video-libs/libquicktime/DETAILS
@@ -1,7 +1,7 @@
            SPELL=libquicktime
-         VERSION=1.1.2
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:40eac3f264f0c213b21a8fb4b036046dee407a4143e5339bddcf9db04271e6ec568b39819efb4d13572c701abadc57b90c8c48861f7cc40c356a2d8bf88a5c34
+         VERSION=1.1.3
+      PATCHLEVEL=0
+     SOURCE_HASH=sha512:a967fba75b6e2003f1530f871a67dd825bfb2e8dd0eb5912cfae3195ac74e45aae9a10c65e1616c271201af2a7aaddf28ac5c8dc876dc91cf715136bc1904f3d
           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 5903209..78d91f6 100644
--- a/video-libs/libquicktime/HISTORY
+++ b/video-libs/libquicktime/HISTORY
@@ -1,3 +1,6 @@
+2009-07-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.1.3
+
 2009-06-17 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.1.2
 
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index a9790e7..b819d3d 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,12 +1,12 @@
            SPELL=live
-         VERSION=2009.06.02
+         VERSION=2009.07.09
           SOURCE=$SPELL.$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
    SOURCE_URL[1]=http://mirror.ovh.net/gentoo-distfiles/distfiles/$SOURCE
         WEB_SITE=http://www.live555.com/liveMedia/
       LICENSE[0]=LGPL
-     SOURCE_HASH=sha512:f6af661796e86d380a3236bbb1f59a827b44db56f73df225ff21880bb3a02848fe9c0211525d756d73e9c89a9f08d8e46fc1033cadf85c712bd504bbec705d88
+     SOURCE_HASH=sha512:97b088a45ea77d2282a7814c24ce84046bed04d7d73c59284a38bca1c2702a9f0088103523af28d09ad626945f6c939b851c8dc1aeb437d6c43511a4be68f8c1
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
          ENTERED=20030301
         KEYWORDS="streaming video libs"
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 0277ce7..d1809c4 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2009-07-12 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 2009.07.09
+
 2009-06-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2009.06.02
 
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 1077ed9..846387d 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.1.25
+         VERSION=1.1.26
   else
          VERSION=1.0.1
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index fa977e5..d01d62e 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2009-07-17 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 1.1.26
+
 2009-07-03 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.1.25
 
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index b0d1e94..e10b49d 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -19,6 +19,7 @@ persistent_remove QT_VER
 #     ;;
 #  *) #stable
          VERSION=4.5.2
+      PATCHLEVEL=1
      SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
           SOURCE=$SPELLX-$VERSION.tar.bz2
              URI=qt/source/$SOURCE
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 9b67c39..164e56a 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2009-07-16 Treeve Jelbert <treeve at sourcemage.org>
+	* POST_INSTALL: added, fix bad pkgconfig files
+	* DETAILS: PATCHLEVEL=1
+	  fixes bug #15296
+
 2009-06-25 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.5.2 (prerelease & stable)
 	* 0279-svg-rendering-regression.diff, odbc.patch: deleted
diff --git a/x11-toolkits/qt4/POST_INSTALL b/x11-toolkits/qt4/POST_INSTALL
new file mode 100755
index 0000000..5248462
--- /dev/null
+++ b/x11-toolkits/qt4/POST_INSTALL
@@ -0,0 +1,2 @@
+sed -i "/location/s|/src/qt-x11-opensource-src-${VERSION}/bin|/bin/qt4|" \
+  ${INSTALL_ROOT}/usr/lib/pkgconfig/Qt*.pc 
diff --git a/x11-toolkits/wxgtk-new/BUILD b/x11-toolkits/wxgtk-new/BUILD
index d4c21fd..9fd93f4 100755
--- a/x11-toolkits/wxgtk-new/BUILD
+++ b/x11-toolkits/wxgtk-new/BUILD
@@ -15,12 +15,3 @@ mkdir -p bld-dir         &&
 cd bld-dir &&
 ln -s ../configure &&
 default_build
-# ../configure --prefix=${INSTALL_ROOT}/usr  \
-#          --sysconfdir=${INSTALL_ROOT}/etc  \
-#       --localstatedir=${INSTALL_ROOT}/var  \
-#              --mandir=${INSTALL_ROOT}/usr/share/man   \
-#             --infodir=${INSTALL_ROOT}/usr/share/info  \
-#                       $OPTS                 &&
-#  make
-
-
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index f77434c..ecb8d87 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,8 +1,8 @@
            SPELL=wxgtk-new
           SPELLX=wxGTK
           SPELLX=wxWidgets
-         VERSION=2.9.0-RC5
-    SOURCE_HASH=sha512:f53b1bddc9f287f3d103b62691b14acb3a6eec243ea5efebd61e902c6eb7a0e915c63a41cd05cb950f0766c6bf9a630f2c9ca81716b762bc994d48467c0c046a
+         VERSION=2.9.0-RC6
+    SOURCE_HASH=sha512:e89bc7b110bef1ef67bd78c735cdd29f750a4d5d05bbd18a441cb540e4b1c9aca089d71f3cdc7ab8575a630d76f0f69d084922556fb1f00d88eea3c8c39ac0aa
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
    SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index d013644..558751a 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,7 @@
+2009-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.9.0-RC6
+	* BUILD: clean up
+
 2009-07-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.9.0-RC5
 
diff --git a/x11-toolkits/xdialog/DEPENDS b/x11-toolkits/xdialog/DEPENDS
index edffa0e..38f76b9 100755
--- a/x11-toolkits/xdialog/DEPENDS
+++ b/x11-toolkits/xdialog/DEPENDS
@@ -1 +1 @@
-depends gtk+2
+depends gtk+2 '--with-gtk2'
diff --git a/x11-toolkits/xdialog/HISTORY b/x11-toolkits/xdialog/HISTORY
index 1a5ed06..0f633a4 100644
--- a/x11-toolkits/xdialog/HISTORY
+++ b/x11-toolkits/xdialog/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: added gtk2 configure option
+
 2007-10-24 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DEPENDS: made gtk+2 required #14043
 	* BUILD: make it api2 and simplify
diff --git a/x11/x11vnc/DETAILS b/x11/x11vnc/DETAILS
index 28d53c7..b8592c0 100755
--- a/x11/x11vnc/DETAILS
+++ b/x11/x11vnc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=x11vnc
-         VERSION=0.9.7
-     SOURCE_HASH=sha512:fc306ff07cd2f6ad308a6eab2ed3922e533bccca379389467b047578dae6cfe6c954952ff1d94f5939d85312ad9b3fd089d103dce2ff9ee6c2f7956cfc3fe2fc
+         VERSION=0.9.8
+     SOURCE_HASH=sha512:1eaeb5276aaf6f94e93ec0a8a656200ed1ea99b46be555804e0ad8c9d3bcb7070d16a11d52f9b882f908983f99c6ecd04c2bd0fbd69d9a8248f21e730a35f6d4
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/libvncserver/$SOURCE
         WEB_SITE=http://www.karlrunge.com/x11vnc/
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index 86382dc..2e3dfaa 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.9.8
+
 2009-04-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.9.7; quoting paths; cleaned up
 
diff --git a/xorg-app/xcb-util/xcb-util-0.3.4.tar.bz2.sig b/xorg-app/xcb-util/xcb-util-0.3.4.tar.bz2.sig
new file mode 100644
index 0000000..5f98809
Binary files /dev/null and b/xorg-app/xcb-util/xcb-util-0.3.4.tar.bz2.sig differ
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 3b27af6..5281277 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pixman
-         VERSION=0.15.14
-     SOURCE_HASH=sha512:6a8c52c9b719e63a0e8e16b6629347bd0e1fcb0a37a487060a626bd89c4ff12aa40f5da9d34f1b408f894e353b44988478d70af20d6518399c80eff3b93985be
+         VERSION=0.15.16
+     SOURCE_HASH=sha512:ef6246b2a8ac121441f96c918e1af00257ddcc549707b03dfd76df81cc1d322f5ecdeabc63eee207c24ea3de8b67372fb471484df6805741891d7e859e945380
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index d216551..bfa8e10 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2009-07-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.15.16
+
 2009-06-24 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.15.14
 
diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index 3deae6f..c2bdd10 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,11 +1,8 @@
             SPELL=xorg-server
           VERSION=1.6.2
-         VERSION2=7.4.4
            SOURCE=$SPELL-$VERSION.tar.bz2
     SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
-   SOURCE2_URL[0]=$SOURCEFORGE_URL/mesa3d/$SOURCE2
       SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
-     SOURCE2_HASH=sha512:cb3a9abba1b4594341ad6e0bd17fbd613913b7348648c2269c855ff9ab10452784f479fdd7368fbdc56460354c3b9d48b6db82c56852b3b761240fe754e49c5f
  SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          WEB_SITE=http://xorg.freedesktop.org/
           ENTERED=20051125



More information about the SM-Commit mailing list