Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 .mailmap                                                                 |   
 1 
 ChangeLog                                                                |   
55 +
 audio-creation/audacity/BUILD                                            |   
 5 
 audio-creation/audacity/DETAILS                                          |   
 2 
 audio-creation/audacity/HISTORY                                          |   
 4 
 audio-drivers/oss/DETAILS                                                |   
 8 
 audio-drivers/oss/HISTORY                                                |   
 4 
 audio-drivers/oss/PREPARE                                                |   
 2 
 audio-libs/libgpod/DEPENDS                                               |   
22 
 audio-libs/libgpod/HISTORY                                               |   
 4 
 audio-libs/openal-soft/DEPENDS                                           |   
 2 
 audio-libs/openal-soft/HISTORY                                           |   
 3 
 audio-players/listen/DETAILS                                             |   
 2 
 audio-players/listen/HISTORY                                             |   
 3 
 audio-players/listen/listen-0.6.2.tar.gz.sig                             |   
 0 
 audio-players/listen/listen-0.6.3.tar.gz.sig                             
|binary
 chat-im/ekiga/DEPENDS                                                    |   
61 +
 chat-im/ekiga/HISTORY                                                    |   
 4 
 chat-irc/irssi/DETAILS                                                   |   
 2 
 chat-irc/irssi/HISTORY                                                   |   
 3 
 chat-irc/znc/DEPENDS                                                     |   
 4 
 chat-irc/znc/DETAILS                                                     |   
13 
 chat-irc/znc/HISTORY                                                     |   
 4 
 chat-libs/ptlib/DEPENDS                                                  |   
 2 
 chat-libs/ptlib/HISTORY                                                  |   
 3 
 crypto/botan/DETAILS                                                     |   
 2 
 crypto/botan/HISTORY                                                     |   
 3 
 crypto/cyrus-sasl/HISTORY                                                |   
 3 
 crypto/cyrus-sasl/PROVIDES                                               |   
 1 
 crypto/ecryptfs-utils/DEPENDS                                            |   
 1 
 crypto/ecryptfs-utils/DETAILS                                            |   
 6 
 crypto/ecryptfs-utils/HISTORY                                            |   
 5 
 crypto/ecryptfs-utils/PRE_BUILD                                          |   
 4 
 crypto/libassuan/DEPENDS                                                 |   
 2 
 crypto/libassuan/HISTORY                                                 |   
 3 
 crypto/libsasl/BUILD                                                     |   
10 
 crypto/libsasl/DEPENDS                                                   |   
 3 
 crypto/libsasl/DETAILS                                                   |   
16 
 crypto/libsasl/HISTORY                                                   |   
 2 
 crypto/libsasl/INSTALL                                                   |   
 4 
 crypto/libsasl/PROVIDES                                                  |   
 1 
 crypto/nss/DETAILS                                                       |   
 8 
 crypto/nss/HISTORY                                                       |   
 3 
 crypto/openct/DETAILS                                                    |   
 4 
 crypto/openct/HISTORY                                                    |   
 3 
 crypto/opensc/DETAILS                                                    |   
 4 
 crypto/opensc/HISTORY                                                    |   
 3 
 crypto/openssh/DETAILS                                                   |   
 7 
 crypto/openssh/HISTORY                                                   |   
 5 
 crypto/openssh/PREPARE                                                   |   
 1 
 crypto/openssh/PRE_BUILD                                                 |   
 7 
 crypto/openssl/BUILD                                                     |   
 3 
 crypto/openssl/HISTORY                                                   |   
 4 
 crypto/poldi/DETAILS                                                     |   
 4 
 crypto/poldi/HISTORY                                                     |   
 3 
 database/firebird/DETAILS                                                |   
 4 
 database/firebird/HISTORY                                                |   
 3 
 database/mysql/BUILD                                                     |   
 1 
 database/mysql/DETAILS                                                   |   
 4 
 database/mysql/HISTORY                                                   |   
 6 
 database/postgresql/BUILD                                                |   
 1 
 database/postgresql/HISTORY                                              |   
 5 
 database/sqlite/BUILD                                                    |   
 2 
 database/sqlite/HISTORY                                                  |   
 3 
 database/tokyocabinet/DETAILS                                            |   
 4 
 database/tokyocabinet/HISTORY                                            |   
 3 
 dev/null                                                                 
|binary
 devel/autoconf/DETAILS                                                   |   
 2 
 devel/autoconf/HISTORY                                                   |   
 4 
 devel/bin86/HISTORY                                                      |   
 3 
 devel/bin86/PRE_BUILD                                                    |   
 6 
 devel/bin86/bin86-0.16.17-amd64_build.patch                              |   
13 
 devel/check/DETAILS                                                      |   
 2 
 devel/check/HISTORY                                                      |   
 3 
 devel/check/check-0.9.5.tar.gz.sig                                       |   
 0 
 devel/check/check-0.9.6.tar.gz.sig                                       
|binary
 devel/cvs/HISTORY                                                        |   
 5 
 devel/cvs/PRE_BUILD                                                      |   
 3 
 devel/cvs/glibc-2.10.1.patch                                             |  
359 ++++++++++
 devel/git/DETAILS                                                        |   
 2 
 devel/git/HISTORY                                                        |   
 3 
 devel/mono/DETAILS                                                       |   
 4 
 devel/mono/HISTORY                                                       |   
 3 
 devel/qt-creator/BUILD                                                   |   
 1 
 devel/qt-creator/DEPENDS                                                 |   
 3 
 devel/qt-creator/DETAILS                                                 |   
15 
 devel/qt-creator/HISTORY                                                 |   
14 
 devel/qt-creator/INSTALL                                                 |   
 1 
 devel/valgrind/DETAILS                                                   |   
 4 
 devel/valgrind/HISTORY                                                   |   
 3 
 disk/ccd2iso/BUILD                                                       |   
 4 
 disk/ccd2iso/DETAILS                                                     |   
 6 
 disk/ccd2iso/HISTORY                                                     |   
 4 
 disk/hdparm/DETAILS                                                      |   
 4 
 disk/hdparm/HISTORY                                                      |   
 3 
 disk/lvm/DETAILS                                                         |   
 4 
 disk/lvm/HISTORY                                                         |   
 6 
 disk/parted/DEPENDS                                                      |   
 7 
 disk/parted/DETAILS                                                      |   
 4 
 disk/parted/HISTORY                                                      |   
 7 
 disk/parted/parted.gpg                                                   
|binary
 doc/evince/DEPENDS                                                       |   
 6 
 doc/evince/HISTORY                                                       |   
 3 
 doc/man-pages/DETAILS                                                    |   
 2 
 doc/man-pages/HISTORY                                                    |   
 3 
 doc/t1utils/DETAILS                                                      |   
 4 
 doc/t1utils/HISTORY                                                      |   
 5 
 doc/t1utils/PRE_BUILD                                                    |   
 4 
 editors/elvis/DETAILS                                                    |   
 2 
 editors/elvis/HISTORY                                                    |   
 8 
 editors/elvis/PRE_BUILD                                                  |   
 4 
 editors/elvis/elvis-glibc.patch                                          |   
47 +
 ftp/curl/DETAILS                                                         |   
 1 
 ftp/curl/HISTORY                                                         |   
 3 
 ftp/curl/PRE_SUB_DEPENDS                                                 |   
 6 
 ftp/curl/SUB_DEPENDS                                                     |   
 8 
 ftp/lftp/DETAILS                                                         |   
 2 
 ftp/lftp/HISTORY                                                         |   
 3 
 ftp/ncftp/DETAILS                                                        |   
 9 
 ftp/ncftp/HISTORY                                                        |   
 7 
 ftp/ncftp/PREPARE                                                        |   
 2 
 ftp/ncftp/PRE_BUILD                                                      |   
 4 
 gnome2-apps/epiphany/DEPENDS                                             |   
19 
 gnome2-apps/epiphany/HISTORY                                             |   
 4 
 gnome2-apps/evolution/DEPENDS                                            |   
20 
 gnome2-apps/evolution/HISTORY                                            |   
 4 
 gnome2-apps/file-roller/DEPENDS                                          |   
 7 
 gnome2-apps/file-roller/HISTORY                                          |   
 4 
 gnome2-apps/gnote/DETAILS                                                |   
 4 
 gnome2-apps/gnote/HISTORY                                                |   
 3 
 gnome2-libs/devicekit/DEPENDS                                            |   
 2 
 gnome2-libs/devicekit/HISTORY                                            |   
 3 
 gnome2-libs/evolution-exchange/HISTORY                                   |   
 6 
 gnome2-libs/evolution-exchange/PRE_BUILD                                 |   
 3 
 gnome2-libs/evolution-exchange/eex-gnome522277.patch                     |  
120 +++
 gnome2-libs/gconf-editor/DEPENDS                                         |   
 6 
 gnome2-libs/gconf-editor/HISTORY                                         |   
 3 
 gnome2-libs/glib2/DETAILS                                                |   
10 
 gnome2-libs/glib2/HISTORY                                                |   
 9 
 gnome2-libs/glib2/PREPARE                                                |   
 1 
 gnome2-libs/gnome-common2/DETAILS                                        |   
 2 
 gnome2-libs/gnome-common2/HISTORY                                        |   
 3 
 gnome2-libs/gnome-common2/gnome-common-2.24.0.tar.bz2.sig                |   
 0 
 gnome2-libs/gnome-common2/gnome-common-2.26.0.tar.bz2.sig                
|binary
 gnome2-libs/gnome-desktop/CONFIGURE                                      |   
 1 
 gnome2-libs/gnome-desktop/HISTORY                                        |   
 5 
 gnome2-libs/gnome-desktop/PRE_BUILD                                      |   
 6 
 gnome2-libs/gnome-games2/CONFIGURE                                       |   
 3 
 gnome2-libs/gnome-games2/DEPENDS                                         |   
13 
 gnome2-libs/gnome-games2/DETAILS                                         |   
 2 
 gnome2-libs/gnome-games2/HISTORY                                         |   
12 
 gnome2-libs/gnome-games2/gnome-games-2.26.2.tar.bz2.sig                  |   
 0 
 gnome2-libs/gnome-games2/gnome-games-2.26.3.tar.bz2.sig                  
|binary
 gnome2-libs/gnome-media2/DEPENDS                                         |   
 1 
 gnome2-libs/gnome-media2/HISTORY                                         |   
 3 
 gnome2-libs/gnome-panel/DEPENDS                                          |   
 1 
 gnome2-libs/gnome-panel/HISTORY                                          |   
 3 
 gnome2-libs/gnome-vfsmm/DEPENDS                                          |   
 1 
 gnome2-libs/gnome-vfsmm/DETAILS                                          |   
 2 
 gnome2-libs/gnome-vfsmm/HISTORY                                          |   
 6 
 gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.22.0.tar.bz2.sig                   |   
 0 
 gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.26.0.tar.bz2.sig                   
|binary
 gnome2-libs/gtk-doc/DEPENDS                                              |   
24 
 gnome2-libs/gtk-doc/HISTORY                                              |   
 3 
 gnome2-libs/libglademm/DETAILS                                           |   
 2 
 gnome2-libs/libglademm/HISTORY                                           |   
 3 
 gnome2-libs/libglademm/libglademm-2.6.6.tar.bz2.sig                      |   
 0 
 gnome2-libs/libglademm/libglademm-2.6.7.tar.bz2.sig                      
|binary
 gnome2-libs/libgnomemm/DETAILS                                           |   
 2 
 gnome2-libs/libgnomemm/HISTORY                                           |   
 3 
 gnome2-libs/libgnomemm/libgnomemm-2.22.0.tar.bz2.sig                     |   
 0 
 gnome2-libs/libgnomemm/libgnomemm-2.26.0.tar.bz2.sig                     
|binary
 gnome2-libs/libgnomeuimm/DETAILS                                         |   
 2 
 gnome2-libs/libgnomeuimm/HISTORY                                         |   
 3 
 gnome2-libs/libgnomeuimm/libgnomeuimm-2.22.0.tar.bz2.sig                 |   
 0 
 gnome2-libs/libgnomeuimm/libgnomeuimm-2.26.0.tar.bz2.sig                 
|binary
 gnome2-libs/librep2/DETAILS                                              |   
 2 
 gnome2-libs/librep2/HISTORY                                              |   
 3 
 gnome2-libs/librep2/librep-0.17.3.tar.bz2.sig                            |   
 0 
 gnome2-libs/librep2/librep-0.90.0.tar.bz2.sig                            
|binary
 gnome2-libs/pango/DETAILS                                                |   
 2 
 gnome2-libs/pango/HISTORY                                                |   
 3 
 gnome2-libs/pango/pango-1.24.4.tar.bz2.sig                               |   
 0 
 gnome2-libs/pango/pango-1.24.5.tar.bz2.sig                               
|binary
 gnome2-libs/policykit/DEPENDS                                            |   
 1 
 gnome2-libs/policykit/HISTORY                                            |   
 5 
 gnome2-libs/policykit/PRE_BUILD                                          |   
 4 
 gnome2-libs/startup-notification/DEPENDS                                 |   
 5 
 gnome2-libs/startup-notification/HISTORY                                 |   
 3 
 gnustep-libs/gnustep-make/HISTORY                                        |   
 3 
 gnustep-libs/gnustep-make/UP_TRIGGERS                                    |   
 2 
 graphics-libs/libpano13/DETAILS                                          |   
 4 
 graphics-libs/libpano13/HISTORY                                          |   
 8 
 graphics-libs/libpano13/UP_TRIGGERS                                      |   
 9 
 graphics/f-spot/DEPENDS                                                  |   
 2 
 graphics/f-spot/HISTORY                                                  |   
 3 
 graphics/graphicsmagick/DETAILS                                          |   
 4 
 graphics/graphicsmagick/HISTORY                                          |   
 3 
 graphics/hugin/DEPENDS                                                   |   
 2 
 graphics/hugin/DETAILS                                                   |   
 6 
 graphics/hugin/HISTORY                                                   |   
 5 
 graphics/imagemagick/DETAILS                                             |   
 2 
 graphics/imagemagick/HISTORY                                             |   
 3 
 graphics/imagemagick/ImageMagick-6.5.4-3.tar.bz2.sig                     |   
 0 
 graphics/imagemagick/ImageMagick-6.5.4-6.tar.bz2.sig                     
|binary
 http/apache22/DETAILS                                                    |   
 6 
 http/apache22/HISTORY                                                    |   
 4 
 http/arora/DETAILS                                                       |   
 4 
 http/arora/HISTORY                                                       |   
 3 
 http/midori/DETAILS                                                      |   
 4 
 http/midori/HISTORY                                                      |   
 3 
 http/mod_macro/BUILD                                                     |   
 1 
 http/mod_macro/DEPENDS                                                   |   
 1 
 http/mod_macro/DETAILS                                                   |   
16 
 http/mod_macro/HISTORY                                                   |   
 2 
 http/mod_macro/INSTALL                                                   |   
 1 
 http/mod_wsgi/DETAILS                                                    |   
 4 
 http/mod_wsgi/HISTORY                                                    |   
 3 
 http/surf/BUILD                                                          |   
 1 
 http/surf/DEPENDS                                                        |   
 3 
 http/surf/DETAILS                                                        |   
22 
 http/surf/DOWNLOAD                                                       |   
45 +
 http/surf/HISTORY                                                        |   
 3 
 http/surf/PREPARE                                                        |   
 1 
 http/surf/PRE_BUILD                                                      |   
 3 
 http/uzbl/DEPENDS                                                        |   
 1 
 http/uzbl/HISTORY                                                        |   
 3 
 http/webkitgtk/DETAILS                                                   |   
 4 
 http/webkitgtk/HISTORY                                                   |   
 3 
 i18n/uim/DEPENDS                                                         |   
 4 
 i18n/uim/DETAILS                                                         |   
 4 
 i18n/uim/HISTORY                                                         |   
 4 
 kde4-apps/digikam4/DETAILS                                               |   
 4 
 kde4-apps/digikam4/HISTORY                                               |   
 4 
 kde4-apps/digikam4/PRE_BUILD                                             |   
 4 
 kde4-apps/kile4/CONFIGURE                                                |   
 1 
 kde4-apps/kile4/DEPENDS                                                  |   
18 
 kde4-apps/kile4/DETAILS                                                  |   
33 
 kde4-apps/kile4/HISTORY                                                  |   
 6 
 kde4-apps/kile4/kile-2.1b1.tar.bz2.sig                                   
|binary
 kde4-apps/kipi-plugins4/DETAILS                                          |   
 4 
 kde4-apps/kipi-plugins4/HISTORY                                          |   
 3 
 kde4-apps/skrooge/DEPENDS                                                |   
 4 
 kde4-apps/skrooge/DETAILS                                                |   
18 
 kde4-apps/skrooge/HISTORY                                                |   
 5 
 kde4-apps/skrooge/PREPARE                                                |   
 6 
 kde4-apps/skrooge/PRE_BUILD                                              |   
 2 
 kde4-support/akonadi/DEPENDS                                             |   
 4 
 kde4-support/akonadi/DETAILS                                             |   
 4 
 kde4-support/akonadi/HISTORY                                             |   
 4 
 kde4/kde4-l10n/DETAILS                                                   |   
 2 
 kde4/kde4-l10n/HISTORY                                                   |   
 3 
 kde4/kde4-profile/DETAILS                                                |   
 9 
 kde4/kde4-profile/HISTORY                                                |   
 4 
 kde4/kdeaccessibility4/DETAILS                                           |   
 4 
 kde4/kdeaccessibility4/HISTORY                                           |   
 3 
 kde4/kdeadmin4/DETAILS                                                   |   
 4 
 kde4/kdeadmin4/HISTORY                                                   |   
 3 
 kde4/kdeartwork4/DETAILS                                                 |   
 4 
 kde4/kdeartwork4/HISTORY                                                 |   
 3 
 kde4/kdebase-workspace4/DEPENDS                                          |   
 2 
 kde4/kdebase-workspace4/DETAILS                                          |   
 4 
 kde4/kdebase-workspace4/HISTORY                                          |   
 6 
 kde4/kdebase4-runtime/DETAILS                                            |   
 4 
 kde4/kdebase4-runtime/HISTORY                                            |   
 3 
 kde4/kdebase4/DEPENDS                                                    |   
 2 
 kde4/kdebase4/DETAILS                                                    |   
 4 
 kde4/kdebase4/HISTORY                                                    |   
 6 
 kde4/kdebindings4/DETAILS                                                |   
 4 
 kde4/kdebindings4/HISTORY                                                |   
 3 
 kde4/kdeedu4/DETAILS                                                     |   
 4 
 kde4/kdeedu4/HISTORY                                                     |   
 3 
 kde4/kdegames4/DETAILS                                                   |   
 4 
 kde4/kdegames4/HISTORY                                                   |   
 3 
 kde4/kdegraphics4/DETAILS                                                |   
 4 
 kde4/kdegraphics4/HISTORY                                                |   
 3 
 kde4/kdelibs4-experimental/DETAILS                                       |   
 4 
 kde4/kdelibs4-experimental/HISTORY                                       |   
 3 
 kde4/kdelibs4/DEPENDS                                                    |   
 1 
 kde4/kdelibs4/DETAILS                                                    |   
 4 
 kde4/kdelibs4/HISTORY                                                    |   
 4 
 kde4/kdemultimedia4/DETAILS                                              |   
 4 
 kde4/kdemultimedia4/HISTORY                                              |   
 3 
 kde4/kdenetwork4/DETAILS                                                 |   
 4 
 kde4/kdenetwork4/HISTORY                                                 |   
 3 
 kde4/kdepim4/DEPENDS                                                     |   
 2 
 kde4/kdepim4/DETAILS                                                     |   
 4 
 kde4/kdepim4/HISTORY                                                     |   
 6 
 kde4/kdepimlibs4/DEPENDS                                                 |   
 2 
 kde4/kdepimlibs4/DETAILS                                                 |   
 4 
 kde4/kdepimlibs4/HISTORY                                                 |   
 6 
 kde4/kdeplasmoids4/DETAILS                                               |   
 4 
 kde4/kdeplasmoids4/HISTORY                                               |   
 3 
 kde4/kdesdk4/DETAILS                                                     |   
 4 
 kde4/kdesdk4/HISTORY                                                     |   
 3 
 kde4/kdetoys4/DETAILS                                                    |   
 4 
 kde4/kdetoys4/HISTORY                                                    |   
 3 
 kde4/kdeutils4/DETAILS                                                   |   
 4 
 kde4/kdeutils4/HISTORY                                                   |   
 3 
 kde4/kdewebdev4/DETAILS                                                  |   
 4 
 kde4/kdewebdev4/HISTORY                                                  |   
 3 
 kde4/oxygen-icons/DETAILS                                                |   
 4 
 kde4/oxygen-icons/HISTORY                                                |   
 3 
 kernels/kvm/CONFIGURE                                                    |   
 5 
 kernels/kvm/DEPENDS                                                      |   
12 
 kernels/kvm/HISTORY                                                      |   
 4 
 kernels/linux/BUILD                                                      |   
 6 
 kernels/linux/HISTORY                                                    |   
17 
 kernels/linux/INSTALL                                                    |   
 8 
 kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4                      |   
 6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.27.28           |   
 6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.27.29           |   
 6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3            |   
 6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.30.4            |   
 6 
 kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch                 |   
 6 
 kernels/linux/latest.defaults                                            |   
 5 
 latex/tetex/HISTORY                                                      |   
 6 
 latex/tetex/PRE_BUILD                                                    |   
 5 
 latex/tetex/glibc-2.10.1.patch                                           |   
60 +
 libs/apr/DETAILS                                                         |   
 2 
 libs/apr/HISTORY                                                         |   
 4 
 libs/libedit/DETAILS                                                     |   
 4 
 libs/libedit/HISTORY                                                     |   
 3 
 libs/libtasn1/DETAILS                                                    |   
 2 
 libs/libtasn1/HISTORY                                                    |   
 3 
 libs/libviper/DETAILS                                                    |   
 4 
 libs/libviper/HISTORY                                                    |   
 3 
 libs/pyqt4/DETAILS                                                       |   
 4 
 libs/pyqt4/HISTORY                                                       |   
 3 
 libs/sip/DETAILS                                                         |   
 4 
 libs/sip/HISTORY                                                         |   
 3 
 lua-forge/luasec/DETAILS                                                 |   
 6 
 lua-forge/luasec/HISTORY                                                 |   
 3 
 mail/alpine/BUILD                                                        |   
 2 
 mail/alpine/DETAILS                                                      |   
 6 
 mail/alpine/HISTORY                                                      |   
 7 
 mail/alpine/PREPARE                                                      |   
 2 
 mail/offlineimap/DETAILS                                                 |   
 8 
 mail/offlineimap/HISTORY                                                 |   
 3 
 mail/thunderbird/DETAILS                                                 |   
 4 
 mail/thunderbird/HISTORY                                                 |   
 4 
 mail/thunderbird/PRE_BUILD                                               |   
 3 
 mail/thunderbird/enigmail_visibility.patch                               |   
12 
 net/bind-tools/DETAILS                                                   |   
 4 
 net/bind-tools/HISTORY                                                   |   
 3 
 net/iputils-ping/BUILD                                                   |   
 4 
 net/iputils-ping/DEPENDS                                                 |   
 6 
 net/iputils-ping/HISTORY                                                 |   
 3 
 net/iputils-ping/INSTALL                                                 |   
 6 
 net/iputils-tracepath/BUILD                                              |   
 6 
 net/iputils-tracepath/DEPENDS                                            |   
 3 
 net/iputils-tracepath/HISTORY                                            |   
 3 
 net/iputils-tracepath/INSTALL                                            |   
 5 
 net/openafs/BUILD                                                        |   
 7 
 net/openafs/DEPENDS                                                      |   
 8 
 net/openafs/DETAILS                                                      |   
22 
 net/openafs/HISTORY                                                      |   
 2 
 net/openafs/INSTALL                                                      |   
 3 
 net/shorewall-common/DEPENDS                                             |   
 4 
 net/shorewall-common/HISTORY                                             |   
 3 
 net/shorewall-perl/HISTORY                                               |   
 3 
 net/shorewall-perl/PROVIDES                                              |   
 1 
 net/shorewall-shell/HISTORY                                              |   
 3 
 net/shorewall-shell/PROVIDES                                             |   
 1 
 net/shorewall6/DEPENDS                                                   |   
 3 
 net/shorewall6/HISTORY                                                   |   
 4 
 net/telnet-bsd/BUILD                                                     |   
 7 
 net/telnet-bsd/CONFIGURE                                                 |   
 1 
 net/telnet-bsd/HISTORY                                                   |   
 3 
 net/telnet-bsd/INSTALL                                                   |   
 4 
 net/tor/DETAILS                                                          |   
 2 
 net/tor/HISTORY                                                          |   
 3 
 net/ucarp/DEPENDS                                                        |   
 7 
 net/ucarp/DETAILS                                                        |   
13 
 net/ucarp/HISTORY                                                        |   
 5 
 news/liferea/CONFIGURE                                                   |   
 3 
 news/liferea/DEPENDS                                                     |   
14 
 news/liferea/DETAILS                                                     |   
 4 
 news/liferea/HISTORY                                                     |   
11 
 news/liferea/liferea-1.4.28.tar.gz.sig                                   |   
 0 
 news/liferea/liferea-1.6.0-rc6.tar.gz.sig                                |   
 0 
 news/liferea/liferea-1.6.0.tar.gz.sig                                    
|binary
 perl-cpan/config-crontab/BUILD                                           |   
 3 
 perl-cpan/config-crontab/DETAILS                                         |   
19 
 perl-cpan/config-crontab/HISTORY                                         |   
 3 
 perl-cpan/device-gsm/BUILD                                               |   
 1 
 perl-cpan/device-gsm/DEPENDS                                             |   
 2 
 perl-cpan/device-gsm/DETAILS                                             |   
13 
 perl-cpan/device-gsm/HISTORY                                             |   
 3 
 perl-cpan/device-modem/BUILD                                             |   
 1 
 perl-cpan/device-modem/DEPENDS                                           |   
 2 
 perl-cpan/device-modem/DETAILS                                           |   
13 
 perl-cpan/device-modem/HISTORY                                           |   
 3 
 perl-cpan/device-serialport/BUILD                                        |   
 1 
 perl-cpan/device-serialport/DEPENDS                                      |   
 1 
 perl-cpan/device-serialport/DETAILS                                      |   
13 
 perl-cpan/device-serialport/HISTORY                                      |   
 3 
 php-pear/php/BUILD                                                       |   
20 
 php-pear/php/CONFIGURE                                                   |   
33 
 php-pear/php/DEPENDS                                                     |  
239 ++++--
 php-pear/php/DETAILS                                                     |   
 9 
 php-pear/php/HISTORY                                                     |   
11 
 printer/system-config-printer/DEPENDS                                    |   
 7 
 printer/system-config-printer/DETAILS                                    |   
18 
 printer/system-config-printer/HISTORY                                    |   
41 +
 printer/system-config-printer/tim.gpg                                    
|binary
 python-pypi/bpython/DEPENDS                                              |   
 1 
 python-pypi/bpython/DETAILS                                              |   
18 
 python-pypi/bpython/HISTORY                                              |   
 2 
 python-pypi/chardet/DEPENDS                                              |   
 1 
 python-pypi/chardet/DETAILS                                              |   
14 
 python-pypi/chardet/HISTORY                                              |   
 2 
 python-pypi/mercurial/DETAILS                                            |   
 4 
 python-pypi/mercurial/HISTORY                                            |   
 3 
 python-pypi/pygments/DEPENDS                                             |   
 3 
 python-pypi/pygments/HISTORY                                             |   
 2 
 python-pypi/pyrex/DETAILS                                                |   
 4 
 python-pypi/pyrex/HISTORY                                                |   
 3 
 python-pypi/python-ldap/DETAILS                                          |   
 4 
 python-pypi/python-ldap/HISTORY                                          |   
 3 
 python-pypi/system-config-printer/DEPENDS                                |   
 4 
 python-pypi/system-config-printer/DETAILS                                |   
17 
 python-pypi/system-config-printer/HISTORY                                |   
32 
 python-pypi/system-config-printer/tim.gpg                                |   
 0 
 ruby-raa/ruby/DETAILS                                                    |   
 4 
 ruby-raa/ruby/HISTORY                                                    |   
 3 
 science/wcalc/DETAILS                                                    |   
23 
 science/wcalc/HISTORY                                                    |   
 2 
 science/xaos/DETAILS                                                     |   
10 
 science/xaos/HISTORY                                                     |   
 3 
 security-libs/libfprint/DETAILS                                          |   
 6 
 security-libs/libfprint/HISTORY                                          |   
 7 
 security/fprintd/DEPENDS                                                 |   
 6 
 security/fprintd/DETAILS                                                 |   
 2 
 security/fprintd/HISTORY                                                 |   
 4 
 security/tct/BUILD                                                       |   
 1 
 security/tct/DEPENDS                                                     |   
16 
 security/tct/DETAILS                                                     |   
27 
 security/tct/FINAL                                                       |   
 1 
 security/tct/HISTORY                                                     |   
 2 
 security/tct/INSTALL                                                     |   
 2 
 security/tct/PRE_BUILD                                                   |   
 3 
 security/tct/fstools.patch                                               |   
10 
 security/wireshark/DETAILS                                               |   
 6 
 security/wireshark/HISTORY                                               |   
 4 
 shell-term-fm/bash-completion/DETAILS                                    |   
 2 
 shell-term-fm/bash-completion/HISTORY                                    |   
 4 
 shell-term-fm/bash-completion/smgl_completion                            |   
 2 
 shell-term-fm/bash/DETAILS                                               |   
 2 
 shell-term-fm/bash/HISTORY                                               |   
 5 
 shell-term-fm/bash/PRE_BUILD                                             |   
 7 
 shell-term-fm/bash/patches/bash40-018                                    |   
78 ++
 shell-term-fm/bash/patches/bash40-019                                    |  
125 +++
 shell-term-fm/bash/patches/bash40-020                                    |   
83 ++
 shell-term-fm/bash/patches/bash40-021                                    |   
48 +
 shell-term-fm/bash/patches/bash40-022                                    |   
48 +
 shell-term-fm/bash/patches/bash40-023                                    |   
62 +
 shell-term-fm/bash/patches/bash40-024                                    |  
112 +++
 shell-term-fm/emelfm2/DETAILS                                            |   
 4 
 shell-term-fm/emelfm2/HISTORY                                            |   
 3 
 spelling/pyenchant/BUILD                                                 |   
 1 
 spelling/pyenchant/DEPENDS                                               |   
 3 
 spelling/pyenchant/DETAILS                                               |   
17 
 spelling/pyenchant/HISTORY                                               |   
 2 
 spelling/pyenchant/INSTALL                                               |   
 1 
 telephony/telepathy-mission-control/DEPENDS                              |   
 2 
 telephony/telepathy-mission-control/HISTORY                              |   
 3 
 telephony/twinkle/DETAILS                                                |   
 4 
 telephony/twinkle/HISTORY                                                |   
 3 
 utils/aqemu/BUILD                                                        |   
 5 
 utils/aqemu/DEPENDS                                                      |   
 3 
 utils/aqemu/DETAILS                                                      |   
15 
 utils/aqemu/HISTORY                                                      |   
 4 
 utils/aqemu/PRE_BUILD                                                    |   
 3 
 utils/aqemu/fix_broken_version_check.patch                               |   
14 
 utils/bluez/DETAILS                                                      |   
 4 
 utils/bluez/HISTORY                                                      |   
 5 
 utils/cronie/CONFIGURE                                                   |   
 4 
 utils/cronie/DEPENDS                                                     |   
 3 
 utils/cronie/DETAILS                                                     |   
 5 
 utils/cronie/HISTORY                                                     |   
 6 
 utils/cronie/PRE_BUILD                                                   |   
 4 
 utils/cronie/reboot.patch                                                |   
11 
 utils/less/BUILD                                                         |   
 5 
 utils/less/DEPENDS                                                       |   
 4 
 utils/less/DETAILS                                                       |   
 8 
 utils/less/HISTORY                                                       |   
 4 
 utils/ncdu/DETAILS                                                       |   
12 
 utils/ncdu/HISTORY                                                       |   
 5 
 utils/notification-daemon/CONFLICTS                                      |   
 3 
 utils/notify-osd/CONFLICTS                                               |   
 2 
 utils/notify-osd/DEPENDS                                                 |   
 6 
 utils/notify-osd/DETAILS                                                 |   
27 
 utils/notify-osd/HISTORY                                                 |   
 3 
 utils/notify-osd/PROVIDES                                                |   
 1 
 utils/nss-ldapd/DEPENDS                                                  |   
12 
 utils/nss-ldapd/HISTORY                                                  |   
 3 
 utils/qemu/DETAILS                                                       |   
 2 
 utils/qemu/HISTORY                                                       |   
 3 
 utils/sudo/DETAILS                                                       |   
 2 
 utils/sudo/HISTORY                                                       |   
 3 
 utils/sysstat/DETAILS                                                    |   
 4 
 utils/sysstat/HISTORY                                                    |   
 3 
 utils/util-linux/BUILD                                                   |   
 5 
 utils/util-linux/DETAILS                                                 |   
 4 
 utils/util-linux/HISTORY                                                 |   
 4 
 video/gaupol/BUILD                                                       |   
 1 
 video/gaupol/CONFIGURE                                                   |   
 5 
 video/gaupol/DEPENDS                                                     |   
13 
 video/gaupol/DETAILS                                                     |   
16 
 video/gaupol/FINAL                                                       |   
 1 
 video/gaupol/HISTORY                                                     |   
 3 
 video/gaupol/INSTALL                                                     |   
 1 
 video/lives/DETAILS                                                      |   
 4 
 video/lives/HISTORY                                                      |   
 3 
 video/smplayer/DETAILS                                                   |   
 4 
 video/smplayer/HISTORY                                                   |   
 3 
 video/totem/DEPENDS                                                      |   
 2 
 video/totem/HISTORY                                                      |   
 3 
 video/vlc/DETAILS                                                        |   
 4 
 video/vlc/HISTORY                                                        |   
 3 
 windowmanagers/afterstep/AfterStep-2.2.8.tar.bz2.sig                     |   
 0 
 windowmanagers/afterstep/AfterStep-2.2.9.tar.bz2.sig                     
|binary
 windowmanagers/afterstep/DETAILS                                         |   
 2 
 windowmanagers/afterstep/HISTORY                                         |   
 3 
 windowmanagers/awesome/BUILD                                             |   
 4 
 windowmanagers/awesome/DEPENDS                                           |   
 2 
 windowmanagers/awesome/DETAILS                                           |   
 2 
 windowmanagers/awesome/HISTORY                                           |   
 8 
 windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig                         |   
 0 
 windowmanagers/awesome/awesome-3.3.2.tar.bz2.sig                         
|binary
 windowmanagers/dwm/DETAILS                                               |   
 4 
 windowmanagers/dwm/HISTORY                                               |   
 3 
 windowmanagers/pekwm/DETAILS                                             |   
 4 
 windowmanagers/pekwm/HISTORY                                             |   
 3 
 windowmanagers/sawfish/DETAILS                                           |   
 4 
 windowmanagers/sawfish/HISTORY                                           |   
 3 
 windowmanagers/vwm/DETAILS                                               |   
 4 
 windowmanagers/vwm/HISTORY                                               |   
 3 
 windowmanagers/xmonad/HISTORY                                            |   
 4 
 windowmanagers/xmonad/POST_RESURRECT                                     |   
 4 
 windowmanagers/xmonad/PRE_RESURRECT                                      |   
 4 
 wm-addons/batterymon/BUILD                                               |   
 1 
 wm-addons/batterymon/DEPENDS                                             |   
 4 
 wm-addons/batterymon/DETAILS                                             |   
13 
 wm-addons/batterymon/HISTORY                                             |   
 2 
 wm-addons/batterymon/INSTALL                                             |   
 3 
 wm-addons/ibam/BUILD                                                     |   
 8 
 wm-addons/ibam/DEPENDS                                                   |   
 9 
 wm-addons/ibam/DETAILS                                                   |   
19 
 wm-addons/ibam/HISTORY                                                   |   
 3 
 wm-addons/ibam/INSTALL                                                   |   
 7 
 wm-addons/ibam/PRE_BUILD                                                 |   
 7 
 wm-addons/music-applet/DEPENDS                                           |   
47 +
 wm-addons/music-applet/DETAILS                                           |   
19 
 wm-addons/music-applet/HISTORY                                           |   
 3 
 wm-addons/slock/DETAILS                                                  |   
19 
 wm-addons/slock/HISTORY                                                  |   
 3 
 wm-addons/wbar/DETAILS                                                   |   
 2 
 wm-addons/wbar/HISTORY                                                   |   
 3 
 x11-libs/cairomm/DETAILS                                                 |   
 4 
 x11-libs/cairomm/HISTORY                                                 |   
 3 
 x11-toolkits/gtk+2/DETAILS                                               |   
10 
 x11-toolkits/gtk+2/HISTORY                                               |   
12 
 x11-toolkits/gtk+2/PREPARE                                               |   
 1 
 x11-toolkits/rep-gtk2/DETAILS                                            |   
 3 
 x11-toolkits/rep-gtk2/HISTORY                                            |   
 3 
 x11-toolkits/rep-gtk2/PRE_BUILD                                          |   
 7 
 x11-toolkits/rep-gtk2/rep-gtk-0.18.4.tar.bz2.sig                         |   
 0 
 x11-toolkits/rep-gtk2/rep-gtk-0.18.6.tar.bz2.sig                         
|binary
 x11-toolkits/wxgtk-new/DETAILS                                           |   
 4 
 x11-toolkits/wxgtk-new/HISTORY                                           |   
 3 
 x11/gkrellm2/HISTORY                                                     |   
 4 
 x11/gkrellm2/PRE_BUILD                                                   |   
 4 
 x11/gkrellm2/glibc-2.10.1.patch                                          |   
40 -
 x11/gmrun/HISTORY                                                        |   
 3 
 x11/gmrun/gmrun-0.9.2-gcc43.patch                                        |   
16 
 x11/xscreensaver/BUILD                                                   |   
17 
 x11/xscreensaver/CONFIGURE                                               |   
10 
 x11/xscreensaver/DEPENDS                                                 |   
60 +
 x11/xscreensaver/HISTORY                                                 |   
 9 
 xfce-plugins/xfce4-weather-plugin/DETAILS                                |   
 2 
 xfce-plugins/xfce4-weather-plugin/HISTORY                                |   
 3 
 xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.0.tar.bz2.sig |   
 0 
 xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.1.tar.bz2.sig 
|binary
 xfce/notification-daemon-xfce/CONFLICTS                                  |   
 3 
 xfce/notification-daemon-xfce/HISTORY                                    |   
 3 
 xfce/xfburn/DETAILS                                                      |   
 7 
 xfce/xfburn/HISTORY                                                      |   
 3 
 xorg-lib/pixman/DETAILS                                                  |   
 4 
 xorg-lib/pixman/HISTORY                                                  |   
 3 
 591 files changed, 3724 insertions(+), 711 deletions(-)

New commits:
commit ddf4bc57ed8ad468a34ff62791afc8c53dcd8a35
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    linux: => 2.6.27.29 [uber-stable]

commit 4ca3a387396957b97ccb1547174540ff37affece
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gnome-games2: There is no scalable configure option
    The closest is: --with-card-theme-formats
    which card theme formats to support (svg, fixed,
    kde, pysol, defaults, all)

commit 90656cbc21ab8d811c3472a9a7fb31b885019051
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gnome-games2: gcrypt configure uses --with not --enable

commit 1486701aeb42845d22c4b33dc4e0260e59ce103d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    ecryptfs-utils 78

commit 825d2369cf7ff048257a747befdf386bc53d5413
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    libx11: Typo compase -> compose
    
    (Cherry-picked from 0a3c441e69b2a91ba1d05b7ba8b8e22a08025ddc in
    devel-xorg-modular)

commit 7c248e45a75dd473d61539662972e983d1c107d5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    renderproto: Cleanup whitespace
    (cherry picked from commit cd33fdc1989d837565570ecc5fb5ea30cf352db2)

commit 6157f3842e236093e2fa9bebbb150f0805db345c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    renderproto: Removed XORG_VER
    (cherry picked from commit 3ef4c4a7d31f44ed8dbc013e00fe8ccb2dfcdfc0)

commit cc80073a52e2e83a89b146562f3944af5f9a840f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    renderproto: Updated to 0.11
    SOURCE matches upstream posted MD5
    
    From the release notes:
    0.11 adds some clarifications of the protocol specification, general
    cleanups and support for PDF blend modes.
    Note that this release is a bump from 0.9.3 straight to 0.11.
    (cherry picked from commit 439198c48b7f923e79e2d655af6e9e8f3c50d50c)

commit c0c7f564b058aaf15a454d38b911308324c1648a
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    linux 2.6.30.4

commit 80abdc933479b37b42d732c253346bc765b421be
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    qemu: => 0.10.6

commit 2e816df87ffd70c722cc2876feb261d96119e62b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    nss 3.12.3.1

commit 91eb331a9c05935127701d2a951c2f04a0af120b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-voodoo: Updated to 1.2.3.
    (cherry picked from commit 49dec78a58944a3fb44e13d07ee1323b4a0a3977)

commit 5aa078fd4fedf024523baba945c00dd62e5c936b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-vesa: Removed XORG_VER and PKG
    (cherry picked from commit fe006c607b3eff00d7cc12b3c5687ca708dd0266)

commit 8f348d85ff99b0da84bd40672e20485af2366ae7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-vesa: Updated to 2.2.1
    (cherry picked from commit 5164f75898840c1c9f69517fd8a161b4b2d41395)

commit b07434577f5b7795d37f42b01e310625c4e4aae3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-tdfx: Updated to 1.4.3
    (cherry picked from commit 0168ac0449c2c08ae820eecdf69103d8c9b91484)

commit 04ed8c11995d4ecd16a166be0a8096cb02c21cc4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-sisusb: Updated to 0.9.3
    (cherry picked from commit ecbd2740b59834a090007a362bbba7abfdcd0a9f)

commit e2076ee564a14a1e0a3a328b575554d1fb6ccea4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-sis: Removed extra whitespace
    (cherry picked from commit af2a9daacb91a8f8fce32cbbe9aafd6695b1b303)

commit a6ac35ffb9c32c61ecc67e668aee456cc3a50a59
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-sis: Removed XORG_VER and PKG
    (cherry picked from commit 5f95e331d422f8474b86cd9f04878daae78beec1)

commit a67d0f805fda1691f7c61e4f1aade2b27f071f55
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-sis: Updated to 0.10.2
    (cherry picked from commit e536bd7cdaca1af30cb23fb44402daad7dde20a0)

commit 5bad214312aa27f8f509504d84d94b66f6a9d3d8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-savage: Updated to 2.3.1
    (cherry picked from commit 939ef46308a8909a114537e27a337c484a3c254f)

commit e2fd25814f479ed9f36e173d1d9912429ec7bef6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-s3: Updated to 0.6.3
    (cherry picked from commit 476e4f596bd650dd3eaa269d4313ef6c1dea23d5)

commit 55c457acd3adf36a83841a1684555b64c6f86fa8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-s3virge: Updated to 1.10.4
    (cherry picked from commit 1637c3baddff88f52d86ed5ff3c37627d9e4b8c4)

commit 614f839db14dcef56c7eb6ea25bc528d457fe79b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-r128: Remove XORG_VER and PKG
    (cherry picked from commit 16cdfdb24790949f7d800b3c2b36b9c220f6d196)

commit d7ae178e8d258083c6404b86733ecbebef6883e8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-r128: Updated to 6.8.1
    (cherry picked from commit 6633f9f8d305b275a44877f69e573ca3d711a7eb)

commit 2f55982786c36c1b3dc3d5492e84e771749f83c4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-neomagic: Updated to 1.2.4
    (cherry picked from commit 99dcf89a7dcaa7f5b1cac8532a52fb9bd379b1b1)

commit d06a79ee6cea42481e3b5b9a30b3f6668bcf6934
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-mga: Remove XORG_VER and PKG
    (cherry picked from commit a102499312e6d036880b1b1a97acbadd805cc73c)

commit 5ec80c660286a724b6d606d54572527c36f4ee63
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-mga: Updated to 1.4.11
    (cherry picked from commit d7e050f7afeff284124b570c10986a222b241f47)

commit 206931bc4028929157f3eb557b793582f920315e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-mach64: Removed XORG_VER and PKG
    (cherry picked from commit 797800b494d3637d286fcc970ec4523193e6f325)

commit 00ce214f5ccb8f10bb8cd5989f9b952e2f8c8440
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-mach64: Updated to 6.8.2
    (cherry picked from commit 99b9cd4f7bc7ede7790a527163fc783690ffdf00)

commit ad281a038fb7ce2b5603231f1fb6e451bb75fb0f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-i740: Updated to 1.3.3
    (cherry picked from commit 9589ada609b98ef3b77d1a028df3d41c3008024d)

commit ee45a6bd048b1b346f549fd891a9bb2e6e66a1f6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-i128: That's 1.3.3, not 1.3.2
    (cherry picked from commit 57bb5b0f84aa809797fa42fda4fca8bc54ceac80)

commit b5f48a09ee80914258a0fa083a974998886c3084
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-i128: Updated to 1.3.3
    (cherry picked from commit 23c735a290e982d1d08a5b01fccf63c7cce0e675)

commit 0191e254728af93172e5adf7f273be7bfd38b802
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-glint: Updated to 1.2.4
    (cherry picked from commit 9a25cab59915e156fb97d5bcf5c254928ed031ea)

commit edf612351a49230aa5d58511b33e91f3391d579d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-fbdev: Removed XORG_VER and PKG
    (cherry picked from commit 06dec5c78caf4a5e111cab886143ff65df5a4a97)

commit 60bf8c0c1b0c0e0d6fa1bafd909adf19d656a362
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-fbdev: Updated to 0.4.1
    (cherry picked from commit 76d979bf7db1d53c5e66077ba71751e1fe66046d)

commit ac43830f2498d5a23b973b97578f4eae886be999
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-cirrus: Updated to 1.3.2
    (cherry picked from commit dab2212b011cec6f3d3df83afad60c117b8e2de6)

commit a5d2303eb55aad8ca92cd1950b9a19c8d204294d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-ast: Removed XORG_VER and PKG
    (cherry picked from commit a279016b0c361e31c442e90267692f4065958707)

commit 2b3f7276f244368e3e300ea34ea59f62bfff4c95
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-ast: Updated to 0.89.9
    
    Cherry-picked from 54af42ee30761fbbb53441ffd5f8c0ac69a06cfd in
    devel-xorg-modular

commit c03ae45fb3cbb5962bd702488f085925c50ef879
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-apm: Removed XORG_VER and PKG
    (cherry picked from commit 25d7f96c934e1079a878c808501c78528c8a7dba)

commit 92e660f43150b1a0fcfdf431fe299606d3f3cf36
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-apm: Updated to 1.2.2
    (cherry picked from commit 4be1b98e92195416e9eb54e9d873ce43e1991df0)

commit 304b95d351729b60d88338aa8985a6059d5a9683
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-vmware: Updated to 10.16.7
    (cherry picked from commit e4d78a60996ccb4f0db0dd86beb3e3b8759969c8)

commit e00cb1ecc7575a7e2d8fdacccb422fab98dc230e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    elvis: updated WEB_SITE

commit 7883abb051389cc4f70c0921d06e9363fe6813d3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mod_macro: new spell, Apache module for use macros in config files

commit 2be857e734d9f069d31d62586c7d8770a0b797da
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    check 0.9.6

commit 29081708225be63b388d078ced84743960a00e99
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnome-games2: fixed GGAMES_SNDLIB #15302

commit bc9fb61033f341e25f10d77bce9060c10346668f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mod_wsgi: => 2.5

commit a4d2f6ca5c90bba9a831153808fb809dfef83d4b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    pyqt4: => 4.5.4

commit 69dc619babd2725e91439e0cd18a3f9de1b719a2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    sip: => 4.8.2

commit f3e9c9e4dc7b4805e8844554a15deed068f8f381
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    sudo: => 1.7.2p1

commit 25f1b41f30c932757e137462f09c1af982a25a1f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnome-games2 2.26.3
    
    checking for CHECK... no
    configure: error: check not found; install it or use --disable-tests
     ! Problem Detected !

commit b0f82566a9200a8baecc7ee7918285bd1777fc66
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    hdparm 9.17

commit 22b56087ed435f35d7f2e5c5d06570d6cca435eb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    libtasn1 2.3

commit 4879b6bce9491a6d3ff01364292158cf5a5c4627
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    wm-addons/slock: updated to version 0.9

commit 2891d672370b17f4e6dcf2aac590977c1ee31bbc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnote 0.6.0

commit 384b87a6ca0f83d630c56e670b2c3caf13e0f4f3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    mono 2.4.2.3

commit 838fba0b23cbc3ec7706195e4be59a9a9aa2848e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    listen 0.6.3

commit 78578a2be0e8a82199e7803c41d0f5693fff7f9d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    smplayer 0.6.8

commit 583bba7527da66da79edcdf6a65697bf85f377f6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    kvm: added missing depends and an option not to build the kernel module

commit 49f448dbca0cddfbf44572298df23360018c4ed6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    linux: add the patches for real now

commit 227f2b20f32bd500b1701b59a1f5f391a015880a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    linux: maintenance 2.6.30.3, pre_2_6 2.6.31-rc4, zen 2.6.30-zen1 and
    disabled xen trickery

commit 8c914a6182dc315a32b69b77cad281cb7e9be411
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    php: set alpha to 5.3.0 because that's more recent, set suhosin version
    to 5.2.10 as there is no patch for 5.3.0

commit 0b51e8e59a351a92804b01b0fcdb591d5517fc21
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    ncftp: re-added the previous version when patching for ipv6. there is no
    3.2.3 ipv6 patch yet

commit 6311e9f206362c1ec4bb2a80f53c7058e448e534
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    policykit: removed dependency on libxslt, that's an optional dep of
    gtk-doc, not policykit itself. moved the bash-completion script to
    /etc/bash_completion.d where it belongs.

commit 374120fd3462bf867804ab7ec3f13898af19ba07
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    pyrex 0.9.8.5

commit 0179e5342554d0b50674175da0ce29ccd880b281
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    awesome: version 3.3.2

commit 699f8a73ed86aa5a68cad3e92adf78d8a729726c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    openct 0.6.17

commit 5be595977b48feb94293a388388e6e0a538825bd
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    perl-cpan/config-crontab: updated to version 1.30

commit 7d46e58550ea26b52196cbdba8835185b8ce8a56
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    shorewall6: removed the dependencies for a compiler as that is selected
    in shorewall-common

commit 47bb080a4f5ca84fa2ccc221c0214c63fa418f2b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    opensc 0.11.9

commit c3d1894b787a55af0b25a152f85d0bdd58f9c61b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    php: added sub-depends on curl with c-ares disabled when curl is used
    for url streams in core php functions. fixes bug 14830

commit 30b3801e9f7042ae4de0d23fb5dd39eb071fa1f4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    curl: added sub-depends for with and without c-ares

commit e301a5722e2caf58eebccf320353b9071a242dda
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    botan 1.8.5

commit c8ea72659a1da75bec4ac42b3b9c7c492f045815
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    kile4: Suggest dependency on kdegraphics4 for Okular

commit 2deed809041ec6b6d9a61f3e02763a2272855aa5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    ncftp 3.2.3
    
    none IPv6 patch for this version yet
    if we want ncftp with IPv6 we must update DETAILS to use 3.2.2 with this 
patch

commit 38cf702c0e2ca3549a2b66ba39dfe80e0206913d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    lvm 2.02.50

commit bdb2e15fd01913e87c667074271f755ba6799247
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    php: moved optional configure options from BUILD and CONFIGURE to
    DEPENDS, and remixed DEPENDS to minimize irrelevant questions.

commit bdd6067b8cb1d1cfe904e182201b17f0dfd73b94
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    git: => 1.6.4

commit 625d563b4a9425f0b7ad86d01683812c7f849f25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    tor: => 0.2.1.19

commit 5368d1495c4b07f7a59dff7ed581d92625e43a05
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    akonadi: => 1.2.0

commit fe31d47cddf9d12681ae10f97d3e77a3d0e5d976
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ruby: => 1.9.1-p243

commit 862fc70c8350d8edbdcd4b53f093b075e7a4cd9b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    bind-tools: => 9.6.1-P1

commit de1a6ae923942120d5e14dbd4dbf4d72e632e0e5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    lives 1.0.0

commit 69cc597d78ad62d0f4ae7bb8f028f21a88f4246b
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    irssi 0.8.14

commit 98b53165e1e6881b482807eb9c759bcd9e81e3f4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    xfburn: => 0.4.2

commit 922fa224ff1ff442c91866ec8fe00b8a2cbab62a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    vlc: => 1.0.1

commit 6103c966410971cac94b13e828ecbd910845767f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    valgrind: 3.4.1

commit 21eb223aaf8e5d6f5ca50335f34f07292f8915be
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    t1utils: 1.34

commit 4f2e537694474c2b814593a0be0f929c0a77a97a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    t1utils: added fix for recent glibc incompatibility #15322
      patch by Finn Haedicke

commit de5b66daa1dde79c3b8052718607faa81bb3a45a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    gtk-doc: made rarian, XML and SGML support optional

commit 8738aebcba0494190c62a2be04a6a495b78a5a72
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    fprintd: fixed source url, and gtk-doc is no longer optional

commit c4785166ec0c2e578eb2abfdd452b8b372a22b4d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libfprint: fixed source url

commit a7603b8d036db22d81e65177e22734c64ca2e636
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openssh: added custom support for sftp filecontrol patch located at 
http://sftpfilecontrol.sourceforge.net/
    (allows a SA to set the umask on sftp sessions and to control whether the 
client may issue chown and chmod commands in an sftp session)

commit c0326ade573e640a9e2c5875b3f3a0998f589abe
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    gmrun: patched a function protoype

commit c4f154c1fdea69da7a744e8e2a6888aab8157068
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    uim: => 1.5.6

commit 0a51670b59e668625e4104ce08a5ddc88351db33
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    apache22: => 2.2.12

commit 190fbd960255d7d76033cc5e8e106ff3588ec14a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    apr: => 1.3.7

commit 9ff623a5897e3ca017face45e29a45a9b8e722e4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    new spells: device-serialport, device-modem, device-gsm

commit aa4bfc19bc3df10324c79dc65f5769522dabfb5a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    device-gsm: new spell; Perl module for working with GSM modems.

commit 0c451f7c4962a699c0ad93c082fe8f8b24f340c8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    device-modem: new spell; Perl module for communication with modems.

commit fee6dad95c46143bd4a6a25e4b382ce06e6dd8ee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    device-serialport: new spell; Perl Module for serial port handling.

commit 49fce6781421f74d5c0544b65a0b14c95fbb301c
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

      utils/notification-daemon: added notify-osd to conflicts

commit e4875a16f01dd1c38bd02b1b33932d79818fd468
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

      xfce/notification-daemon-xfce: added notify-osd to conflicts

commit 4f10a19c634e85f142d05fe28088ee28ea47a68e
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

      utils/notify-osd: New spell

commit 9be45e62cb4b66d60dc3104b6bec7ddecc522472
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

      gnome2-libs/gnome-vfsmm: Added doxygen dependency.

commit 29f175d9f3a82f85ad1c08220c940db7bf098889
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

      python-pypi/pygments/DEPENDS: Added setuptools dependency

commit 37244d868a8e52c0f69eee75334ffef4ed198c48
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    utils/ncdu: updated to version 1.5

commit 4b9a8599889a8b05535312407a0540e25e703bcf
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    tct: removed gcc from the deps

commit 789c509370b27c341ac7d4e5a3c9fa93730182d9
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    tct: new spell, the coroner's toolkit. forensics toolkit

commit e2ffb87bf74c8c87cef23e8fa48f16075560d525
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    science/wcalc: new spell, flexible command-line scientific calculator

commit f25aaf0f896ea0e10c0fb4442b55d4f45dc8a71c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    new spell - qt-creator-1.2.1

commit 5433d4ba4bd27f08dd97ec595c5b7aeac625a9b2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    wxgtk-new: => 2.9.0

commit 9a2034a5344baed9d3439daac87a8ca013758233
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    http/surf: DETAILS, corrected SHORT alignment

commit 73176f159549f44c936df49a04d132f95ef9b947
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    video/gaupol: DETAILS, corrected SHORT alignment

commit 1e18c4c694aa4b508ccd1b92c3c66b088cad75bf
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    spelling/pyenchant: DETAILS, corrected SHORT alignment

commit 19aa856c1e3108940eeb061dc7816b4040e1549c
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    python-pypi/chardet: DETAILS, corrected SHORT alignment

commit 3769e99763395fb5030d527e1848e777e5c71b04
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    ChangeLog: updated for new spells: chardet, pyenchant, gaupol, surf

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

    mail/offlineimap: updated to 6.1.2

commit 5f51cd4a72f8a9db8b3b7584786e1d7617dff188
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    autoconf: => 2.64

commit 9d32284a9424b3b1ef0f502c50cf7356f66b6221
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    less: => 436

commit 2f8413ee6c87c9059bdf49e5f82299b106d49844
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    http/surf: new spell, simple webbrowser based on webkit/gtk+

commit 15f5f0ed6ccb6d83453d9d2b9c57db77f4cdd22d
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    video/gaupol: new spell, gtk+ subtitle editor

commit d5e2e58bbb3227c7f69467428588803b0cb0698d
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    spelling/pyenchant: new spell, spellchecking library in python, based on
    the enchant library

commit ccc53a4e7414379d1136bd9124748480042421d5
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    python-pypi/chardet: new spell, character encoding auto-detection tool
    in python

commit 3b42b27392086c8a720d801a5f42e99c46bf8569
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    database/postgresql: fixed year in Treeve's entry in HISTORY for the 
8.4.0 update

commit b671eceff0e36644a457a711b6bdb68def69f051
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    database/mysql: filter -ffast-math from CFLAGS (Bug #15319)

commit 97f29d5c01e570a7c1e61a0a0e47fdcff8bbe0fd
Author: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>
Commit: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>

    database/postgresql: filter -ffast-math from CFLAGS (Bug #15319)

commit 37dcf6e4144d23381c391fb1aa1e9659246dcedb
Author: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>
Commit: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>

    database/sqlite: filter -ffast-math from CFLAGS (Bug #15319)

commit 5c110ffc67ed0277ccd325d11d352bef75845b59
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    imagemagick: Updated to version 6.5.4-6

commit 521d506ab30e0de87590880f759a9ca7c5f68476
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    wbar: fixed a typo in the website url

commit 0e66df572f26ea283af6c00235d8725ed64a15e5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    ibam: CLI apm battery monitor with optional gkrellm(2) plugin

commit c278f97c450c96ab84a4b2b7f901941f8336830a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    batterymon: new spell, battery monitor applet

commit 0e924774d13f30b7db9230499b9ef7d987ea786c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    liferea: With 1.6.x only http backend is webkitgtk. Updated devel to
    current stable until devel cycle begins again.

commit 97326624c73d446a1f75e173c746b756d3ba134e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebase4 - depends LIBSASL

commit aba5b75fcd1f96185455f8c016e003d014c3f9da
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    python-ldap: => 2.3.9

commit 9a912878f5ec4c47a93d0933321138c3c64f59c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebase-workspace4 - depends LIBSASL

commit e764beada71f5b356ed4b0ea486023d0e170aa9e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdepim4 - depends LIBSASL

commit 765a4bbda72dbc22570ed3c75abe0aa3f8f514bd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdepimlibs4 - depends LIBSASL

commit 113f73d9e5373e661a9cb94a5ad386a3486fda2e
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    gnome-deskop: added an option not to build annoying docs

commit d84dd7d9c8438884af83aac9878ac9241cc4968c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    tokyocabinet: => 1.4.30

commit 9a0cd2a8286a5d05d6a1be8d8e58ad7dca322a76
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphicsmagick: => 1.3.6

commit 84b40beadf5525611c5f138cf964b5336c6a7bf3
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    oss: updated stable and test

commit 8262ea6373479621a83d576d8e064811c7a60041
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gtk+2: => 2.17.6

commit 4fc25571e1953a2104902eacec7568675d013b69
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    bash-completion: fixed a typo in smgl_completion, PATCHLEVEL++

commit bc0b1a41bb421579de3d1ada6acf70fc15fd39db
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    poldi: version 0.4.1

commit cecf35d28c32c1b2a87d51b7f4ba431c3db159c9
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libassuan: added missing deps on pth and texinfo

commit 67f455499f139b0f7426822464313c8890a8d1bf
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libgpod: added missing deps on GTK2, libxml2, pygobject, gtk-doc and hal

commit cd03f01cdceebb26c840d361f365700571e3902d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    music-applet: panel applet to control various music players

commit dd0dbfad238389bd5bbb2849b7bef7e68b751302
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    xmonad: PRE_RESURRECT, POST_RESURRECT: check before backup

commit 8967c5c2520fac09c6d0b26ba9a561d9ff3824e7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    util-linux: => 2.16 [aes]

commit e9c00f1fdba976b21d1e5b400999da76e1c7e7ee
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    parted: 1.9.0 now requires lvm by default, make it optional. Bug #15318

commit 1b4477323b61ae9d0a66a169079fcb8892f9c012
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    shorewall-common: depend on SHOREWALL_COMPILER

commit ba5bff7456d20589af5a52a2ab7dce3f475aa626
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    shorewall-shell: provide SHOREWALL_COMPILER

commit 09282bbc2ca46c84bff2b5a8a945e67bdd989e04
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    shorewall-perl: provide SHOREWALL_COMPILER

commit c8a6e7d2e9efd96a6ae845a97092a2eeee226ff8
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    ccd2iso: updated version to 0.3
    updated SOURCE_DIRECTORY
    removed BUILD

commit 15be93a17c3369269605682ff7d175c8b340d826
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    xscreensaver: selectable help browser, option to always accept the rootpw 
to unlock,
    screen locking no optional.
    added optional deps on gdm2, libgnome ,libxpm, libxext, a web-browser, 
libxrandr,
    libxinerama. switched from gdk-pixbuf to gtk+2.
    Also, optionally depend on libgle, not gle (different lib).

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

    alpine: made it single on the ada bit of the build

commit 1640b79495eb4b143cd6eccf02af281e9fa99338
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

    aqemu: new spell, qemu/kvm qt4 frontend

commit ddbdea1f5f91589484c2d8260fa5cbd32011c0c4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    parted: => 1.9.0

commit c0bebf7dff931a817f119b1582d2e71f7f093cda
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    telnet-bsd: optionally only install the client part

commit 106d76a0f75ae9bd80f1647d0d83523eab2fbaff
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    man-pages: => 3.22

commit fdbc5e5794cd9e1f66101e444c7ef87597a664e4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    file-roller: made rarian optional and anned missing dep on gnome-doc-utils

commit 769094cdc1324c70721c91effe88be9eeecddfac
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    evince: made rarian optional

commit abbaec7a59470e792cd9f8ea9afc6f2ff67ddea1
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    iputils-tracepath: made docs and man pages generation optional

commit 16e3e6c8b6f719ad49f9e436d86aea859a3bd17a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    iputils-ping: made docs and manpages optional

commit 615ed8b53c793d78ab97d999f6f583d6d29b4109
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    awesome: add missing deps, fixed BUILD and updated to 3.3.1

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

    news/liferea: updated stable to 1.6.0

commit eeb0d0e50ee736fc33f7ce94a371adbac1dbe77d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libpano13: UP_TRIGGERS: added missing parameter #15317

commit 46fee0537082a3a993dba71b82fbba451cfdde83
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    gnustep-make: UP_TRIGGERS: added missing parameter #15317

commit 83ddbb5a7b5d219057a38dc35e11f9b3268f5ba3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    firebird: => 2.1.3.18185-0.RC2

commit e6c87f69675fe210fef9ce5d4a0c8b847be5fb56
Author: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>
Commit: Elisamuel Resto <ryuji AT ryuji-x86.vm.shlrm.org>

    devel/bin86: Add patch from Gentoo to fix building for x86_64

commit d8fe5c9d3ddf731652d02e7d623b29f276b08b3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    luasec: => 0.3.3

commit 54f8fd8d3d0c4693ea1594b9b03e4aae55d1126a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    linux: => 2.6.27.28 [uber-stable]

commit 886afdd98f7f8206e858401ac70e7f46c8072fe1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libpano13: only run the triggers if the trigerees are installed

commit e25690879a9a424704b9526a22ad0506feb25aaf
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    hugin: deconstified the source dir

commit a4961ffc55f320efe9feced3d9eb92c090094835
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    openal-soft: fixed syntax error

commit b1ffb93a739b4c707afa9e09e0b2de485083aa2f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    hugin: 0.8.0

commit c6790598e26cb916eb79f3e6b5e9d2bbee290883
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libpano13: 2.9.14

commit aa1157beb0988309e2c0c47be3036a1d53236a27
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mysql: => 5.0.84

commit 885e3a9dc2b901f82b2cdd593e35d3c67e43e485
Author: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>
Commit: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>

    f-spot: sqlite 3 is now required so changed "sqlite2" to "sqlite" in 
DEPENDS

commit 1ab4de7f57091d38ba0b8afb937ef558288513eb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    digikam4: => 1.0.0-beta3

commit b648a2742ecb1661bc4418da9f272c7e5b5d7b4a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kipi-plugins4: => 0.5.0

commit b43e8f596d60b8b7620b8f73528118577d1a6439
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    bpython: new spell, fancy interface to the Python interpreter

commit 7d7c4b4d2d33970e9984c90f85efeeeed9c7b898
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    znc: => 0.074

commit 8ada4bc36140ed8e4e6bed7b799e72925ed2634b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mercurial: => 1.3.1

commit 6d70775f96d1b36fa6eff7511d99101f5e7223a5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    system-config-printer: Depends on xmlto
    
    gcc -g -O2 -Wall -march=core2 -fPIC -DPIC -pipe -DPIC -fPIC -O2  -z
    combreloc -s -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o
    udev/udev-configure-printer udev/udev-configure-printer.o -lcups -ludev
    -lusb
    xmlto man -o man man/system-config-printer.xml
    make[1]: Leaving directory `/usr/src/system-config-printer-1.1.10'
    make[1]: xmlto: Command not found
    make[1]: *** [man/system-config-printer.1] Error 127
    make: *** [all-recursive] Error 1

commit 3f2822a910a5e9db9779dfe2a0fdba868363f7a5
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    uzbl: applied a modified patch from bug 15314

commit f6449cfb4af72ed766b3a8580f610fba425a73af
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    gnome-media2: added missing dep on libcanberra

commit 6b505f7f9afcf02c694924f11c787abfc851e0bd
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    startup-notification: Added libice, libx11, and xcb-util to depends
    Patch from Quentin Rameau
    Fixes Bug #15313

commit f70a0a9e7a20049ead09494ff45c9990b128c9b9
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    bluez: updated version to 4.46
    fixed typo in latest history entry

commit 95bae532a92e75fac69929d789e93038880bd34e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    gtk+2: fixed DETAILS so it actually works for the stable version

commit 981741d3d3b358ae54a3299a150c4238dcce0f1b
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    openssl: unset OPTS for the wget build

commit cee59736acdde4f3fe060f26e16d59d5accefdb3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@Kain.(none)>

    twinkle: To latest version 1.4.2

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

    alpine: updated all.patch and topal

commit 521dd346b343fb2f229561681cd06855c9a5b860
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    nss-ldapd: added missing optional dependencies

commit a2af6ed87219ea4b838a7e56db7a6702cda9d2e6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    system-config-printer-1.1.10

commit e8ac92035f83bdb285c649886f5142a98b0cdb52
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    move system-config-printer to printer section

commit 019d600778449028aa8f74423b340402ac60d481
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    system-config-printer: => 1.1.10

commit 23ed3a904b7f76dcb2a72f0063a6b1f65155aa6e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libedit: => 20090722-3.0

commit 049ce6d896247326975aad155c48227c63591dd0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    epiphany: made rarian, enchant, gnome-network and libgnomeprintui optional

commit 93c970cf068abf9fb5f2d657f2139812607257f9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    .mailmap: Adding an Arjan mail map

commit 13709e24314b9ad5df374019343203699844db25
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libviper: version 1.4.2.2

commit 3b18b1b4cf0f9c61c035d6688f779801342bb0fc
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    vwm: version 2.0.2

commit 09648597893d13f9a3151387fca512f60d7dc514
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    afterstep: version 2.2.9

commit e78a76750de05ce7c0dd8390c6c7f91c0c823d51
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    pekwm: version 0.1.11

commit 70a534377178682191d5b02d503569e96c211ebb
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    dwm: version 5.6

commit c0b767fba8de2773c0f62d0fb89682fa3e37788e
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    rep-gtk2: version 0.18.6

commit c8ff2f7d2e869f0bb2d0920219f5cdda1657ade6
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    librep2: version 0.90.0

commit 1211c622d28576d70d0690274f4e429c3d1537e3
Author: arjan <arjan@tonberry.(none)>
Commit: arjan <arjan@tonberry.(none)>

    sawfish: version 1.5.0

commit e6a8e5d6c977648b5712413732204155e11a3cc7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openafs: new spell, open source implementation of the Andrew file system 
(AFS)

commit 367d160bec6777f5efc37f902fb2e8dc089b5051
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    glib2: fixed DETAILS so it actually works for the stable version

commit b0257b910e63489d28bb3037924546cece8b8f33
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    bash: Added upstream patches 017-024.  Been running them for
    a while with no issues. PATCHLEVEL++

commit 6c8ea1ecc0f4705bce8f6086027fb3b298042c41
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    elvis: Added patch for glibc 2.10.x. Bug #15254

commit 501e42c4534dbbdba0b53887800d275b3d53d009
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    webkitgtk: Updated devel to version webkitgtk r46193.

commit 6ced9dd7a064d2469514e8d6c5a7bfead5ca40fd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    oxygen-icons: => 4.2.98

commit 4c73b7ca5bac168e7de4d639d7d71059b7e047da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdewebdev4: => 4.2.98

commit 4afbac125918b1fb42d2c64c5536cf315f896303
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdetoys4: => 4.2.98

commit 25936283f14b411ffbb3f916acafe356ed608238
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdesdk4: => 4.2.98

commit 2535b8484c17703b5419bd916a5732c934577f54
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeedu4: => 4.2.98

commit 1604b80115a29598e48bed6a1f4beed040fb2593
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebindings4: => 4.2.98

commit afac6a3f22feeeac8522bbab803c250bbd8c1131
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeartwork4: => 4.2.98

commit e556b911bef25baf2fb7368c770e18ce5c666e50
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeaccessibility4: => 4.2.98

commit 49de45d9f23043df56955958d807ab18bb27d18d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeutils4: => 4.2.98

commit 3a34ba4cd25fccc3ad546325a1eb0854c44525a5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libsasl: new spell, cyrus-sasl client libs only

commit fe0395cee6e4a20bf97fad66ed3d402edc459571
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    ekiga: lots of dependencies added/fixed/changed

commit f0b5f56aa2233dc6e3ac1133743194ff20786e3e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    libfprint: added (commented out) the latest -pre release to
    track when it's recent enough for fprintd

commit 6c357dca5f4ee3252b87ba47b06f1d8e22343cba
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    ptlib: depends on LIBSASL

commit 30737398766e66a576d5d0faa3e95e0d480f3013
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeplasmoids4: => 4.2.98

commit 3bd30ad9758253ef8a660aad5f1fdeb7da25fa65
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdenetwork4: => 4.2.98

commit e80f5413c159f3817e68f283bd88ee2a30172e7a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    cyrus-sasl: made a LIBSASL provider

commit 8f2a221d03e9f3fab2ec536c1421792a4b3184f1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdemultimedia4: => 4.2.98

commit bc941176f0216685cf79eb3069060f589076ce42
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kde4-l10n: => 4.2.98

commit 9f12e7dd0a87047d9924fb2f384f5a00a64722fe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kde4-profile: => na

commit 2a3ae68a8ec995580d38d74b8184cbfb5fab4c38
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdegraphics4: => 4.2.98

commit 5e49b66ab8cb2c8eaf3217f06e2ac5ed57a23378
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdegames4: => 4.2.98

commit 636dab3a141660e383062ba892400e51ae8725d9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdeadmin4: => 4.2.98

commit 5de785aa24e75e6c105b935db9478359f497a483
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdepim4: => 4.2.98

commit 8a72feb008084d5dcff6dcfa03525d8441e07f75
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebase4: => 4.2.98

commit aede8709cd48fe2b1920a7b67f084dca31f069a3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebase-workspace4: => 4.2.98

commit 90bf9bfdddb0d1a5f76153d5177d38ac1125e2fe
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    evolution: made rarian, gnome-doc-utils, gnome-spell and libgnomeprintui 
optional

commit 4fe5835fad070794002b1a5af550b62c53903bbe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdebase4-runtime: => 4.2.98

commit 5d7f38692eb8782acd5de8cd49430add2b3dd6a2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdelibs4 - add optional depends acl

commit c1d2143cd0bac42a29a431ad1bbd071bd4ed8cef
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdepimlibs4: => 4.2.98

commit 0f03e3c97fc685ab4903e0a6cc24d13228f5b3e8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdelibs4-experimental: => 4.2.98

commit 3c52be3f020798b6e1856cfcc99fd085102fad14
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdelibs4: => 4.2.98

commit 89cf1898127bfdd0ac53b174bc2a75a133818605
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    gconf-editor: made rarian optional

commit c80b96509981f4ffd2b25f2bdecbcd8355b3557b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gtk+2: => 2.17.5

commit bc72596fad34a8eea281e436cad7cb1325740301
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    glib2: => 2.21.4

commit a7e2ae6d8cdc5e88ff596e879dcd722330eb60fb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    lvm 2.02.49

commit c970dbf394b307396cb7b18e698121d71bd15d16
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    lftp 3.7.15

commit ef2624dc372f34d88445235baa7831e06fa3ce71
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    kile4: Remove commented out dependencies

commit 7b8a3aacb0e344fe64b3df5585dc66d07d96ea41
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    cvs: Fix conflicting definition of getline
    Fixes Bug #15262

commit cf36f3d5ca3989c5c152e87ad610ba12aab1955d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    kile4: Added a KDE4 (La)TeX editor and shell

commit 05e12a444bbfa62c06f5d8eb128881866392e066
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    tetex: tangleboot.p fix from
    http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
    Fixes Bug #15261

commit 796055ad7cbc015830a58b34f7d5463d8e98584f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xf86-video-intel: Updated to 2.8.0
    SOURCE matches upstream posted MD5

commit 2bdae543680dec0fff75e0362a51e5e9f681e610
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ucarp: cosmetic fixes

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

    audio-creation/audacity: made it actually use the nyquist option

commit c7cbdf50f38eb9ab6795a9771494f91be32040d1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    arora 0.8.0

commit 46ae58ad2d174e2c0ae32f9a378291bb546c2126
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    sysstat 9.0.4

commit eb69d865185031c27a4d3a5c5a66c33d17dcf440
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    pixman: => 0.15.18

commit 477d1d4364a3bc1a9e434e53c79685c84f211419
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    emelfm2 0.6.2

commit a1218f30de85ae8d4eba0be6a9bc82121419631f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    xfce4-weather-plugin: Updated to version 0.7.1

commit 57538e57224eb66cfd0857f542eac3a726d0e471
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cronie: added the license for included anacron

commit 3063db2d25075173cffd6f640366d4e60a751d08
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    liferea: Updated devel to version 1.6.0-rc7

commit 7061ce81a8f96eab498921c26d562a1ba8e8e799
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    cronie: => 1.4

commit 73e5d17e12235ffc92bd35fd79f3366b042e07f6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    skrooge-0.2.9

commit e3153c9bcea06700d845fe75e99b427a3d1052d3
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    gkrellm2: patch is only applied via PRE_BUILD if client is requested
    fixed tabs in glibc-2.10.1.patch, don't know why it was no longer applying

commit c6330db0c1e7724b96a6c949e71cc513f33c8ad9
Author: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>
Commit: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>

    telepathy-mission-control: fixed a typo in DEPENDS ("depends depends")

commit c1769e065d08e2cf9a0c70d80e694185969ec67a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    pango 1.24.5

commit 6f8e4b264d5b7ec9e9fcc9e833361284adaedad2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    libgnomemm 2.26.0

commit f03c39e4921b28ee6506a1084153ea4b771ae171
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    cairomm 1.8.2

commit 6d9449794c5d6a529e80d8c1e54e80d54acfdde3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnome-common2 2.26.0

commit 0f682a5059dac6c262a43bdd32760afd8f591c49
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    evolution-exchange: Upstream applied patch which fixes:
    http://bugzilla.gnome.org/show_bug.cgi?id=522277
    https://bugs.launchpad.net/ubuntu/+source/evolution-exchange/+bug/34199

commit 8e16b381a4fb79ac02a859140f3c3fc58b774158
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    libglademm 2.6.7

commit 28eff0ee72006b7fff1f2330fa365947c16f0c6a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    libgnomeuimm 2.26.0

commit 91a37f45f5cbc17e3e61ae148acc37b6a6382989
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gnome-vfsmm 2.26.0

commit 0ba9166a4c5da367091bc3fa9667da494306ce24
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    thunderbird ENIGMAIL 0.96.0

commit 9ad86af21820dcf32722799754d140719e0f5d01
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    wireshark 1.2.1, SECURITY_PATCH=17

commit 4a8e3394263a033187edacc489704a1d13123a9d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    midori: Updated to version 0.1.8

commit 98ae9c25e4b324eb3cd89bf08a5c7dffc9e7ffd7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    xaos 3.5

commit 757daadd988feab8e1a3ff20c3539947af81ddcf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    totem: Depends on docbook-dtd and libxslt

commit 047a0b526dd75175c87492d6196abcb7dd7be607
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    devicekit: Depends on docbook-dtd for man pages, not libxslt

commit 1041ff64400619d9afe49ae9eccb985b38a81b39
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gnome-panel: Depends on docbook-dtd

diff --git a/.mailmap b/.mailmap
index 42a07fd..1568334 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,6 +8,7 @@ Andraž Levstik <ruskie+2054d253 AT codemages.net> ruskie 
<ruskie@omega.(none)>
 Andraž Levstik <ruskie+2054d253 AT codemages.net> root <root@omega.(none)>
 Andraž Levstik <ruskie+2054d253 AT codemages.net> Andraž Levstik 
<ruskie AT codemages.net>
 Anton Brondz <dinolinux AT sourcemage.org> Anton Brondz <dinolinux AT gmail.com>
+Arjan Bouter <abouter AT sourcemage.org> arjan <arjan@tonberry.(none)>
 Arwed von Merkatz <v.merkatz AT gmx.net> Arwed v. Merkatz <v.merkatz AT gmx.net>
 Arwed von Merkatz <v.merkatz AT gmx.net> Arwed <arwed@Otherland.(none)>
 Bearcat M. Sandor <bearcat AT linux.feline-soul.net> Bearcat M. Sandor 
<sourcemage AT feline-soul.com>
diff --git a/ChangeLog b/ChangeLog
index 26fdd52..f7d6f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * http/mod_macro: Apache module for use macros in config files
+
+2009-07-28 Thomas Orgis <sobukus AT sourcemage.org>
+       * perl-cpan/device-serialport: new spell; handling of serial ports.
+       * perl-cpan/device-modem: new spell, handling of modems.
+       * perl-cpan/device-gsm: new spell, handling of GSM modems (like, SMS 
read/send).
+
+2009-07-27 Donald Johnson <ltdonny AT gmail.com>
+       * utils/notify-osd: new spell, alternate notification-daemon
+
+2009-07-27  Treeve Jelbert <treeve AT sourcemage.org>
+       * devel/qt-creator: new spell, qt4 developer kit
+
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * python-pypi/chardet: new spell, character encoding auto-detection
+         tool in python
+       * spelling/pyenchant: new spell, spellchecking library in python, 
based
+         on the enchant library
+       * video/gaupol: new spell, gtk+ subtitle editor
+       * http/surf: new spell, simple webbrowser based on webkit/gtk+
+       * science/wcalc: new spell, flexible command-line scientific
+         calculator
+
+2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
+       * security/tct: new spell, the coroner's toolkit, forensics toolkit
+       * wm-addons/batterymon: new spell, battery applet
+       * wm-addons/ibam: new spell, apm battery monitor with optional
+         gkrellm(2) plugin
+
+2009-07-26 Arjan Bouter <abouter AT sourcemage.org>
+       * wm-addons/music-applet: new spell, applet to control
+         various music players
+
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * utils/aqemu: new spell, a qt4 based qemu/kvm frontend
+
+2009-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * python-pypi/bpython: new spell, fancy interface to the Python
+         interpreter
+
+2009-07-23  Treeve Jelbert <treeve AT sourcemage.org>
+       * move system-config-printer to printer section
+         entire build process has changed
+
+2009-07-23 Vlad Glagolev <stealth AT sourcemage.org>
+       * net/openafs: new spell, open source implementation of the Andrew 
file
+         system (AFS)
+
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * crypto/libsasl: new spell, cyrus-sasl client libs only
+
+2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
+       * kde4-apps/kile4: Added a KDE4 (La)TeX editor and shell
+
 2009-07-20  Treeve Jelbert <treeve AT sourcemage.org>
        * kde4-apps/kchmviewer4: new spell, based on kchmviewer
 
diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 3fe6b03..14eab5c 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -6,7 +6,10 @@ if [ "$AUDACITY_REL" == "beta" ]; then
    OPTS="$AUDACITY_SOUNDTOUCH $OPTS"
 fi &&
 
-OPTS="$AUDACITY_LADSPA $AUDACITY_PORTMIXER $AUDACITY_PORTAUDIO $OPTS" &&
+OPTS="$AUDACITY_LADSPA $OPTS"    &&
+OPTS="$AUDACITY_PORTMIXER $OPTS" &&
+OPTS="$AUDACITY_PORTAUDIO $OPTS" &&
+OPTS="$AUDACITY_NYQUIST $OPTS"
 
 ./configure  --prefix=${INSTALL_ROOT}/usr                \
              --sysconfdir=${INSTALL_ROOT}/etc            \
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 8cdd034..77f1602 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -30,7 +30,7 @@ fi
         WEB_SITE=http://audacity.sourceforge.net/
          ENTERED=20011217
       LICENSE[0]=GPL
-      PATCHLEVEL=1
+      PATCHLEVEL=2
         KEYWORDS="editors audio"
            SHORT="Simple soundfile editor"
 cat << EOF
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index ed8cb02..e2257e4 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,7 @@
+2009-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD: actually use the nyquist configure option
+       * DETAILS: PATCHLEVEL++
+
 2009-03-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.3.7 (beta)
 
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index a8511c4..ce84f3f 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -10,16 +10,16 @@ fi
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
 elif [[ $OSS_BRANCH == test ]]; then
-         VERSION=v4.1-buildrc2
+         VERSION=v4.2-buildrc3
           SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2
    
SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/testing/gpl/$SOURCE
-     
SOURCE_HASH=sha512:96b39b3381bb9f68adfc4e3fd0eff4f4dd859a48727f079d52755beba9b6affe59dcc8594bb8e5e748b888db7c6148fbd6b3e8c6c7fa6e42a9f2ded062b76321
+     
SOURCE_HASH=sha512:44dce6c0176c6e7da61a254f526c5e86c7fc731e0b1311df2f6d9cee08a0151d16e51da7f62c3a63462b408ea7f34c646ce152b1fc3829e3f345dbededdd6936
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
 else
-         VERSION=v4.1-build1051
+         VERSION=v4.1-build1052
           SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2
    
SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE
-     
SOURCE_HASH=sha512:98d1c335b25e894449c80d5f3dafd1555e26539006225bdec306bcf9143babff3f85cce5306ad87f5066d0879db0fd78ab78778b96b909e5ee8b7ea099a1be83
+     
SOURCE_HASH=sha512:30918c341ef55d757ad1769fc449a6f7bfb81a1bfe40fa6865744b46fc39832f044c21b438ee6f67be65159833cb4a4ca432e901d41d6a88e1de73dd6e2d7006
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
 fi
         WEB_SITE="http://www.opensound.com "
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index 81a289f..ba8b099 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,7 @@
+2009-07-26 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * PREPARE: added test back
+       * DETAILS: updated both stable and test
+
 2009-06-05 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * PRE_BUILD: changed patch to sed script
        * nowerror.patch: removed
diff --git a/audio-drivers/oss/PREPARE b/audio-drivers/oss/PREPARE
index f19d7bb..8d2c2da 100755
--- a/audio-drivers/oss/PREPARE
+++ b/audio-drivers/oss/PREPARE
@@ -1,6 +1,6 @@
 OSS_BRANCH=${OSS_BRANCH/test/stable}  &&
 config_query_list OSS_BRANCH "Which branch do you want?"  \
-                  stable scm                         &&
+                  stable test scm                         &&
 if [[ $OSS_BRANCH == scm ]]; then
   config_query OSS_SCM_AUTO \
   "Automaticaly update the spell on sorcery queue/system-update?" \
diff --git a/audio-libs/libgpod/DEPENDS b/audio-libs/libgpod/DEPENDS
index fd0c1e9..cb20fc4 100755
--- a/audio-libs/libgpod/DEPENDS
+++ b/audio-libs/libgpod/DEPENDS
@@ -1,2 +1,22 @@
 depends glib2 &&
-depends xml-parser-expat
+depends xml-parser-expat &&
+optional_depends libxml2 \
+                 '--enable-libxml' \
+                 '--disable-libxml' \
+                 'To parse SysInfoExtended' &&
+optional_depends GTK2 \
+                 '--enable-gdk-pixbuf' \
+                 '--disable-gdk-pixbuf' \
+                 'Enable ArtworkDB' &&
+optional_depends pygobject \
+                 '--enable-pygobject' \
+                 '--without-python --disable-pygobject' \
+                 'Enable python bindings?' &&
+optional_depends gtk-doc \
+                 '--enable-gtk-doc' \
+                 '--disable-gtk-doc' \
+                 'Build documentation?' &&
+optional_depends hal \
+                 '--with-hal' \
+                 '--without-hal' \
+                 'Enable hal support'
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index fdcded2..d8e3ef2 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,3 +1,7 @@
+2009-07-26 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added missing optional_depends on
+         GTK2, libxml2, pygobject, gtk-doc and hal
+
 2009-04-04 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: version 0.7.0
        * PRE_BUILD: removed now unnecessary sed fix
diff --git a/audio-libs/openal-soft/DEPENDS b/audio-libs/openal-soft/DEPENDS
index f0b5f32..74b4c42 100755
--- a/audio-libs/openal-soft/DEPENDS
+++ b/audio-libs/openal-soft/DEPENDS
@@ -1,3 +1,3 @@
 depends cmake &&
 optional_depends portaudio19 "" "" "for a portaudio backend" &&
-optional_depends pulseaudio "" "" "for a pulseaudio backend" &&
+optional_depends pulseaudio "" "" "for a pulseaudio backend"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index ccba479..2aba9b5 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * DEPENDS: fixed syntax error
+
 2009-07-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: changed portaudio to optional, added pulseaudio
        * DETAILS: updated spell to 1.8.466
diff --git a/audio-players/listen/DETAILS b/audio-players/listen/DETAILS
index 619c4af..5b61bbb 100755
--- a/audio-players/listen/DETAILS
+++ b/audio-players/listen/DETAILS
@@ -1,5 +1,5 @@
            SPELL=listen
-         VERSION=0.6.2
+         VERSION=0.6.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.listen-project.org/0.6/$SOURCE
diff --git a/audio-players/listen/HISTORY b/audio-players/listen/HISTORY
index 6aaad52..b367186 100644
--- a/audio-players/listen/HISTORY
+++ b/audio-players/listen/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.3
+
 2009-05-13 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.2, new WEB_SITE and SOURCE_URL[0]
        * DEPENDS: added pywebkitgtk, mutagen, pyxdg and pyinotify
diff --git a/audio-players/listen/listen-0.6.2.tar.gz.sig 
b/audio-players/listen/listen-0.6.2.tar.gz.sig
deleted file mode 100644
index d380628..0000000
Binary files a/audio-players/listen/listen-0.6.2.tar.gz.sig and /dev/null 
differ
diff --git a/audio-players/listen/listen-0.6.3.tar.gz.sig 
b/audio-players/listen/listen-0.6.3.tar.gz.sig
new file mode 100644
index 0000000..db5b42a
Binary files /dev/null and b/audio-players/listen/listen-0.6.3.tar.gz.sig 
differ
diff --git a/chat-im/ekiga/DEPENDS b/chat-im/ekiga/DEPENDS
index 180f32e..08c6539 100755
--- a/chat-im/ekiga/DEPENDS
+++ b/chat-im/ekiga/DEPENDS
@@ -1,27 +1,40 @@
-depends rarian &&
-depends  opal                        &&
-if [ "$GTK_ONLY" == "y" ]; then
-   depends gtk+2
-else
-   depends  libgnomeui                   &&
-   depends  evolution-data-server
-fi                                       &&
-depends esound                           &&
+depends opal                             &&
+depends gtk+2                            &&
 depends libsigc++3                       &&
-depends cyrus-sasl                       &&
+depends LIBSASL                          &&
 depends -sub SASL ptlib                  &&
 
+optional_depends "libgnomeui"            \
+                 "--enable-gnome"        \
+                 "--disable-gnome"       \
+                 "Enable gnome support?" &&
+optional_depends "gconf2"                \
+                 "--enable-gconf"        \
+                 "--disable-gconf"       \
+                 "Enable gconf support?" &&
+optional_depends "kdelibs4"                    \
+                 "--enable-kde --enable-kab"   \
+                 "--disable-kde --disable-kab" \
+                 "Enable EXPERIMENTAL kde support?" &&
+optional_depends evolution-data-server \
+                 "--enable-eds"        \
+                 "--disable-eds"       \
+                 "Enable evolution-data-server addressbook support?" &&
+optional_depends rarian \
+                 "--enable-scrollkeeper"       \
+                 "--disable-scrollkeeper"      \
+                 "Register with scrollkeeper?" &&
 optional_depends libnotify               \
-                 ""                      \
+                 "--enable-notify"       \
                  "--disable-notify"      \
                  "For libnotify support" &&
 optional_depends openldap                \
-                 ""                      \
+                 "--enable-ldap"         \
                  "--disable-ldap"        \
                  "for LDAP addressbook support" &&
 optional_depends "gnome-doc-utils"       \
-                 ""                      \
-                 "--disable-doc"         \
+                 "--enable-gdu"          \
+                 "--disable-gdu"         \
                  "To build manual and documentation"     &&
 
 optional_depends "sdl"                   \
@@ -33,11 +46,15 @@ optional_depends "arts"                  \
                  ""                      \
                  ""                      \
                  "For ARTS support"      &&
-optional_depends "howl"                  \
-                 ""                      \
-                 "--disable-howl"        \
-                 "Required to build HOWL component"
-#optional_depends "avahi"                 \
-#                 ""                      \
-#                 "--disable-avahi"       \
-#                 "for avahi support"
+optional_depends "avahi"                 \
+                 "--enable-avahi"        \
+                 "--disable-avahi"       \
+                 "for avahi support"     &&
+optional_depends "gstreamer"             \
+                 "--enable-gstreamer"    \
+                 "--disable-gstreamer"   \
+                 "Enable EXPERIMENTAL gstreamer support?" &&
+optional_depends "dbus"                  \
+                 "--enable-dbus --enable-dbus-service"    \
+                 "--disable-dbus --disable-dbus-service"  \
+                 "for dbus support"
diff --git a/chat-im/ekiga/HISTORY b/chat-im/ekiga/HISTORY
index e37833c..3d0572a 100644
--- a/chat-im/ekiga/HISTORY
+++ b/chat-im/ekiga/HISTORY
@@ -1,3 +1,7 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added lots of missing deps, made some
+         experimental stuff optional and swapped howl for avahi.
+
 2009-05-20 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 3.2.4
 
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index fa1d7e4..4c97e5a 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.8.13
+         VERSION=0.8.14
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 17d2017..5df1b84 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.8.14
+
 2009-04-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.8.13; cleaned up
        * CONFIGURE: unify ftw
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index fd7711a..ce1294d 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -8,6 +8,10 @@ optional_depends cyrus-sasl \
                  "--enable-sasl" "" \
                  "for SASL support" &&
 
+optional_depends c-ares \
+                 "" "--disable-c-ares" \
+                 "for c-ares usage" &&
+
 optional_depends openssl \
                  "" "--disable-openssl" \
                  "to use OpenSSL"
diff --git a/chat-irc/znc/DETAILS b/chat-irc/znc/DETAILS
index 42f4606..c967fc6 100755
--- a/chat-irc/znc/DETAILS
+++ b/chat-irc/znc/DETAILS
@@ -1,14 +1,17 @@
            SPELL=znc
-         VERSION=0.070
-  SECURITY_PATCH=1
+         VERSION=0.074
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:dbac89140d7c2bd41c77689cb28313e9fc8aeb04749255d22e954e234298a792165357ff3a5a3a555526f101d68f9eb8cb363f1e2c1b77ddd738e3b8ef4900be
+     
SOURCE_HASH=sha512:11fcdb3c8d20de5b865d0b4679ce1a9eb4bb92e92a1f9929dbd8771428fe4ac1e04b0d694385d4a99c3f245bd93c37378882694055b54b2079bcf2010f630dce
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://en.znc.in/
       LICENSE[0]=GPL
          ENTERED=20080723
-           SHORT="IRC Bouncer"
+           SHORT="advanced IRC Bouncer"
 cat << EOF
-ZNC, an advanced IRC bouncer.
+ZNC is an advanced IRC bouncer with features that include support for
+multiple users, playback buffers, DCC bouncing, SASL authentication and
+SSL encryption. It can be extended with dynamically loaded modules
+written in C++ or Perl.
 EOF
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index f0c637c..1b6971a 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,7 @@
+2009-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.074; SECURITY_PATCH++; use better desc
+       * DEPENDS: added c-ares optional dependency
+
 2009-05-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.070
 
diff --git a/chat-libs/ptlib/DEPENDS b/chat-libs/ptlib/DEPENDS
index cc76574..c60163c 100755
--- a/chat-libs/ptlib/DEPENDS
+++ b/chat-libs/ptlib/DEPENDS
@@ -11,7 +11,7 @@ optional_depends  "openssl"              \
                   "--disable-openssl"    \
                   "for SSL connections"  &&
 
-optional_depends  "cyrus-sasl"            \
+optional_depends  "LIBSASL"               \
                   "--enable-sasl"         \
                   "--disable-sasl"        \
                   "for SASL connections"  &&
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index bd6fea9..a487f12 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: changed cyrus-sasl to LIBSASL
+
 2009-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: updated spell to 2.6.4
 
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index aa4d904..48dd578 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
            SPELL=botan
-         VERSION=1.8.4
+         VERSION=1.8.5
 
           SOURCE=Botan-$VERSION.tbz
    SOURCE_URL[0]=http://files.randombit.net/botan/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 59b02ce..68b82e6 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.8.5
+
 2009-07-13 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8.4
 
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 5d443ec..cbb9016 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * PROVIDES: added
+
 2009-05-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.1.23, SECURITY_PATCH=1, CERT VU#238019
 
diff --git a/crypto/cyrus-sasl/PROVIDES b/crypto/cyrus-sasl/PROVIDES
new file mode 100755
index 0000000..a56ce58
--- /dev/null
+++ b/crypto/cyrus-sasl/PROVIDES
@@ -0,0 +1 @@
+LIBSASL
diff --git a/crypto/ecryptfs-utils/DEPENDS b/crypto/ecryptfs-utils/DEPENDS
index fafc608..c58b16b 100755
--- a/crypto/ecryptfs-utils/DEPENDS
+++ b/crypto/ecryptfs-utils/DEPENDS
@@ -1,4 +1,3 @@
-depends  autoconf  &&
 depends  libgcrypt  &&
 depends  keyutils  &&
 optional_depends  linux-pam  \
diff --git a/crypto/ecryptfs-utils/DETAILS b/crypto/ecryptfs-utils/DETAILS
index 08a2302..5190b33 100755
--- a/crypto/ecryptfs-utils/DETAILS
+++ b/crypto/ecryptfs-utils/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ecryptfs-utils
-         VERSION=76
+         VERSION=78
   SECURITY_PATCH=1
           SOURCE=${SPELL}_$VERSION.orig.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION.orig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
    
SOURCE_URL[0]=http://launchpad.net/ecryptfs/trunk/$VERSION/+download/$SOURCE
-     
SOURCE_HASH=sha512:af6f4c1fc64b8494f750a1ae1195703c58b61ec2975de251df886b26a11f0dc78eeb6ed9752790ab939225dc69b3d7969fb900c04b519d9e43ded4721412aeae
+     
SOURCE_HASH=sha512:9a5fc9beb1208c16727e91356bc54dce674f6cbac62ea4b6674eba7d8bf17d8e962babeb8879662ed7b600ea05c00cd449085b3b9c683e3fe5939ac6aa5c0804
       LICENSE[0]=GPL
         WEB_SITE=http://launchpad.net/ecryptfs/
          ENTERED=20061130
diff --git a/crypto/ecryptfs-utils/HISTORY b/crypto/ecryptfs-utils/HISTORY
index d90c4b8..d6ea184 100644
--- a/crypto/ecryptfs-utils/HISTORY
+++ b/crypto/ecryptfs-utils/HISTORY
@@ -1,3 +1,8 @@
+2009-07-31 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 78, SOURCE_DIRECTORY updated
+       * DEPENDS: removed autoconf
+       * PRE_BUILD: removed
+
 2009-07-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 76, SOURCE_DIRECTORY updated, SECURITY_PATCH=1
        * PRE_BUILD: added, autoreconf from autoconf is needed now
diff --git a/crypto/ecryptfs-utils/PRE_BUILD b/crypto/ecryptfs-utils/PRE_BUILD
deleted file mode 100755
index 11f62af..0000000
--- a/crypto/ecryptfs-utils/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-autoreconf -i -v -f
diff --git a/crypto/libassuan/DEPENDS b/crypto/libassuan/DEPENDS
new file mode 100755
index 0000000..0046093
--- /dev/null
+++ b/crypto/libassuan/DEPENDS
@@ -0,0 +1,2 @@
+depends texinfo &&
+optional_depends pth '--with-pth-prefix=/usr' '--without-pth' 'Enable pth 
support?'
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index cc60b97..46c8933 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added missing deps on pth and texinfo
+
 2008-05-25 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.5
 
diff --git a/crypto/libsasl/BUILD b/crypto/libsasl/BUILD
new file mode 100755
index 0000000..ef6b5f1
--- /dev/null
+++ b/crypto/libsasl/BUILD
@@ -0,0 +1,10 @@
+cd ${SOURCE_DIRECTORY} &&
+./configure --prefix=/usr \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --mandir=/usr/share/man \
+          --infodir=/usr/share/info \
+          ${OPTS} &&
+pushd lib &&
+make &&
+popd
diff --git a/crypto/libsasl/DEPENDS b/crypto/libsasl/DEPENDS
new file mode 100755
index 0000000..1f7761d
--- /dev/null
+++ b/crypto/libsasl/DEPENDS
@@ -0,0 +1,3 @@
+depends  automake   &&
+depends  autoconf   &&
+depends  groff
diff --git a/crypto/libsasl/DETAILS b/crypto/libsasl/DETAILS
new file mode 100755
index 0000000..f6fc417
--- /dev/null
+++ b/crypto/libsasl/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=libsasl
+         VERSION=2.1.23
+          SOURCE=cyrus-sasl-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/cyrus-sasl-$VERSION
+   SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
+   
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
+     
SOURCE_HASH=sha512:bf72db55fefe9eccfe4a12caf1160efc80aba98f8acc2743af360fda96659a3ee1fc3a5af6104b3dfc8fc4571f4e98526b9719a6cdf0948980cf76a9cb1a2b0e
+      LICENSE[0]=BSD
+        WEB_SITE=http://cyrusimap.web.cmu.edu/
+         ENTERED=20090722
+           SHORT="Cyrus SASL (RFC 2222) Library"
+cat << EOF
+This is the Cyrus SASL API implentation. This spell can only be used on the 
client
+side to provide authentication. Use the cyrus-sasl spell for server side 
authentication.
+See RFC 2222 for more information.
+EOF
diff --git a/crypto/libsasl/HISTORY b/crypto/libsasl/HISTORY
new file mode 100644
index 0000000..acdb6c1
--- /dev/null
+++ b/crypto/libsasl/HISTORY
@@ -0,0 +1,2 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS, DEPENDS, BUILD, INSTALL, PROVIDES: created spell
diff --git a/crypto/libsasl/INSTALL b/crypto/libsasl/INSTALL
new file mode 100755
index 0000000..849e109
--- /dev/null
+++ b/crypto/libsasl/INSTALL
@@ -0,0 +1,4 @@
+cd ${SOURCE_DIRECTORY}/lib &&
+make install &&
+cd ${SOURCE_DIRECTORY}/include &&
+make install
diff --git a/crypto/libsasl/PROVIDES b/crypto/libsasl/PROVIDES
new file mode 100755
index 0000000..a56ce58
--- /dev/null
+++ b/crypto/libsasl/PROVIDES
@@ -0,0 +1 @@
+LIBSASL
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 0209a78..938a8db 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -12,10 +12,10 @@ case $NSS_BRANCH in
       
SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
   ;;
   3.12)
-          VERSION=3.12.3
-           SOURCE=$SPELL-$VERSION.tar.bz2
-    
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/$SOURCE
-      
SOURCE_HASH=sha512:a5c08f131e4b11d007d969af5b5aae5845e3db9b2c0ab7a82a08f8719f9963755e3232765bc522dfa79711fb397b47f1873b0ed8ed3c6c38bdba75ebc0980e3f
+          VERSION=3.12.3.1
+           SOURCE=$SPELL-$VERSION.tar.gz
+    
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_1_RTM/src/$SOURCE
+      
SOURCE_HASH=sha512:6a103fdfe2b3f243ece02de68e2075a034acb80e242e96b6c6f07ef4d88a4b0c69aecaf6d5ce6b84c59ca610c96c70a10af144042723402ca1e19d122ec93e4b
   ;;
 esac
 
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index ee7658e..12b0b19 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.12.3.1, bz2 -> gz
+
 2009-04-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.12.3
 
diff --git a/crypto/openct/DETAILS b/crypto/openct/DETAILS
index 50c4f37..defc8a2 100755
--- a/crypto/openct/DETAILS
+++ b/crypto/openct/DETAILS
@@ -1,10 +1,10 @@
            SPELL=openct
-         VERSION=0.6.16
+         VERSION=0.6.17
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://www.opensc-project.org/files/${SPELL}/${SOURCE}
 
-     
SOURCE_HASH=sha512:fee942f2b7b46589c4e5ec9ee15d0812ce1ee511b98ee8f31a3ffc31919374080cbf4031fa4b88d77d733aefa158643c94a3bee35c27e128755b926e7280c024
+     
SOURCE_HASH=sha512:a5f381f16a4d807312cdb9817160e1073decfd22035a6f44e3668ea6b9b171f3b649f131d3d9282af9eab95f82bb1d5e705cdbff20b127436548dcba4efe5a49
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 
       LICENSE[0]=BSD
diff --git a/crypto/openct/HISTORY b/crypto/openct/HISTORY
index d8eb254..639951d 100644
--- a/crypto/openct/HISTORY
+++ b/crypto/openct/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.17
+
 2009-06-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.16
        * INSTALL: added default_install
diff --git a/crypto/opensc/DETAILS b/crypto/opensc/DETAILS
index 1337ff8..0a19960 100755
--- a/crypto/opensc/DETAILS
+++ b/crypto/opensc/DETAILS
@@ -1,11 +1,11 @@
            SPELL=opensc
-         VERSION=0.11.8
+         VERSION=0.11.9
   SECURITY_PATCH=2
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://www.opensc-project.org/files/opensc/${SOURCE}
 
-     
SOURCE_HASH=sha512:b443e1bd4f2f4c34048a37e0226ce75e0fea028702435390290d97e8c7ffe61159f4ccd27bede7d317dfa9491bb92fdcd5e6766cdd4f3a539118c9dcf8c40531
+     
SOURCE_HASH=sha512:cac650c433502d1b713eca92976549cfa17331edf75da725919c72c12d5eec29facc51d493407899a0271a69b1d3aa95fe7fd830cbead74a89cedeaf83be773d
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 
         WEB_SITE=http://www.opensc-project.org
diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index be94cba..92fba48 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.11.9
+
 2009-05-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.11.8, SECURITY_PATCH=2
 
diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index e5f9963..bec0849 100755
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -3,7 +3,12 @@
   SECURITY_PATCH=4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+if [[ $SFTP_FILECONTROL == y ]]; then
+         SOURCE3=openssh-5.2p1.sftpfilecontrol-v1.3.patch
+    
SOURCE3_HASH=sha512:c0da70abf110c408d72b8386edf6694ae7e1a68007c39dc2163befbd9fad897e29a4d5c6f03969b2ae70135e1f1ff322ed3684735dc41887d0a6445c26bd4098
+  
SOURCE3_URL[0]=http://sftpfilecontrol.sourceforge.net/download/v1.3/$SOURCE3
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
   SOURCE2_IGNORE=signature
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 9e395b6..f33387b 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,7 @@
+2009-07-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * PREPARE, PRE_BUILD, DETAILS: added sftp filecontrol patch from
+         http://sftpfilecontrol.sourceforge.net/; quoting paths
+
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * init.d/sshd: made it non-sh, bug #13702
 
@@ -205,4 +209,3 @@
 2002-03-20 Luis M. Lourenco <aeron AT netcabo.pt>
        * CONFLICTS: Added.
        * BUILD: Added --mandir argument to pass to configure.
-
diff --git a/crypto/openssh/PREPARE b/crypto/openssh/PREPARE
new file mode 100755
index 0000000..794406a
--- /dev/null
+++ b/crypto/openssh/PREPARE
@@ -0,0 +1 @@
+config_query SFTP_FILECONTROL "Do you want to apply sftp filecontrol patch?" 
n
diff --git a/crypto/openssh/PRE_BUILD b/crypto/openssh/PRE_BUILD
new file mode 100755
index 0000000..e1b6829
--- /dev/null
+++ b/crypto/openssh/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $SFTP_FILECONTROL == y ]]; then
+  unpack_file 3 &&
+  patch -p1 < "$SOURCE_CACHE/$SOURCE3"
+fi
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index be76e84..8db61e8 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -32,6 +32,8 @@ make         && {
     summon wget                               &&
     RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
     PATH="${PATH//$RUN_COMPILER_DIR:/}"                            &&
+    (
+    unset OPTS  &&
     delve -c start BUILD wget                 && # this links against old 
libraries still
     local TEMPWGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget |
                         head -n 3 | tail -n 1 | awk '{ print $4 }')" &&
@@ -43,6 +45,7 @@ make         && {
     install -m 755 wget /usr/bin/wget         && # and installed
     cd -                                      &&
     ldconfig
+    )
 fi
 } &&
 
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index b78af56..2b06315 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2009-07-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * BUILD: do wget build in subshell, unsetting OPTS, otherwise the wget
+         build fails due to unrecognized option --openssldir=/etc/ssl
+
 2009-03-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.9.8k, SECURITY_PATCH+=1:
          http://www.openssl.org/news/secadv_20090325.txt
diff --git a/crypto/poldi/DETAILS b/crypto/poldi/DETAILS
index 901a2c8..a59a562 100755
--- a/crypto/poldi/DETAILS
+++ b/crypto/poldi/DETAILS
@@ -1,8 +1,8 @@
            SPELL=poldi
-         VERSION=0.4
+         VERSION=0.4.1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/alpha/poldi/$SOURCE
-     
SOURCE_HASH=sha512:853b9fa3687c5730abeb618b82ba2664bc8187404fc447f63c5394f3db639e614ebaefd0dde1b2ae271f2ad846b205cd3d5c116f32f7e8b5cbfdc9992a533fdd
+     
SOURCE_HASH=sha512:0ef276ee1d480416ebab33d590acecf958e707523afd3cee67c019620515a47c825ed42d8ec6427468aa9218f6db9c670f67ea521a8c3fb32d100593814bf51c
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.gnupg.org/
          ENTERED=20060908
diff --git a/crypto/poldi/HISTORY b/crypto/poldi/HISTORY
index 027d416..d455b14 100644
--- a/crypto/poldi/HISTORY
+++ b/crypto/poldi/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: 0.4.1
+
 2008-08-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.4
        * DEPENDS: added
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index a3a9c11..320b2f7 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -11,8 +11,8 @@ 
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
 ;;
    *)
-         VERSION=2.1.3.18156-0.RC1
-     
SOURCE_HASH=sha512:8a3a780d9e9c8e4d66d85629ca4933c198b42a3e0564648d6d49549e1f3e53a9583cabfd0c9b0d18277d1455935af5ca69ccfd52dccfd27a2eb92a0e81f18512
+         VERSION=2.1.3.18185-0.RC2
+     
SOURCE_HASH=sha512:b1e8b8e5d95b03b4ed2242d9f662f29a328e0bd45917b29840ecc25d5c8b4e7da9708d2e8697e1246be0cc6983fbf1bc13a5fd8328d5033468af3216b2ecb48f
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/\.RC?/}
 ;;
 esac
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index c5fd759..38b1b23 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.1.3.18185-0.RC2
+
 2009-06-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.1.3.18156-0.RC1
 
diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index 088f2c3..03f7e02 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -44,6 +44,7 @@ else
 fi                                                       &&
 
 OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS"                    &&
+CFLAGS="${CFLAGS//-ffast-math}"                          &&
 
 create_account mysql                                     &&
 
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 67bec89..ecbabdd 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mysql
 if [[ $OLD == y ]]; then
-         VERSION=5.0.83
+         VERSION=5.0.84
   SECURITY_PATCH=3
 else
          VERSION=5.1.36
@@ -21,7 +21,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.mysql.com/
         KEYWORDS="sql database"
          ENTERED=20011114
-           SHORT="Widely used and fast SQL database server"
+           SHORT="widely used and fast SQL database server"
 cat << EOF
 MySQL is a widely used and fast SQL database server. It is a
 client/server implementation that consists of a server daemon (mysqld)
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 6a2ec2a..c2b5db3 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2009-07-26 Elisamuel Resto <ryuji AT sourcemage.org>
+       * BUILD: filter -ffast-math from CFLAGS (Bug #15319)
+
+2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 5.0.84 [old]
+
 2009-07-02 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated stable to version 5.1.36
 
diff --git a/database/postgresql/BUILD b/database/postgresql/BUILD
index c94a733..d6d5c80 100755
--- a/database/postgresql/BUILD
+++ b/database/postgresql/BUILD
@@ -2,6 +2,7 @@ create_account postgres &&
 
 OPTS="--with-docdir=$INSTALL_ROOT/usr/share/doc $OPTS" &&
 OPTS="--with-system-tzdata=$INSTALL_ROOT/usr/share/zoneinfo $OPTS"  &&
+CFLAGS="${CFLAGS//-ffast-math}" &&
 
 default_build &&
 
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index a9b9701..593d50c 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,4 +1,7 @@
-2008-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-26 Elisamuel Resto <ryuji AT sourcemage.org>
+       * BUILD: filter -ffast-math from CFLAGS (Bug #15319)
+
+2009-07-19 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: Updated to 8.4.0
        * BUILD: specify --with-system-tzdata; add missing &&
 
diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index eabd594..a13b5ea 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -3,7 +3,7 @@ if [[ $SQLITE_META == y ]]; then
 fi &&
 
 LDFLAGS="-ldl $LDFLAGS" &&
-
+CFLAGS="${CFLAGS//-ffast-math}" &&
 OPTS="--enable-load-extension $SQLITE_TSAFE $OPTS" &&
 
 default_build
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 43b18f4..1c600f8 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Elisamuel Resto <ryuji AT sourcemage.org>
+       * BUILD: filter -ffast-math from CFLAGS (Bug #15319)
+
 2009-06-28 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.6.16
 
diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index b99c746..38c8b1a 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
            SPELL=tokyocabinet
-         VERSION=1.4.29
-     
SOURCE_HASH=sha512:959c7f7706e4108cfdcfa881be9f8bdbcaf31655f2339469f6b32ea8469d1734569cfed9bbec13e238e2d88108ad321816de8a0f922d9fb012f68d364c4b69b1
+         VERSION=1.4.30
+     
SOURCE_HASH=sha512:9851b72dc150bcd0a2e4e35831d9cf43dedb28b2b14a06e99ea7f8501db6af111b2089992827b1df818e02e22221b0d0701840a1d5508be0b090ad5743bbc164
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index 85e9274..f9fd056 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.4.30
+
 2009-07-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.4.29
 
diff --git a/devel/autoconf/DETAILS b/devel/autoconf/DETAILS
index 21abdf5..0ef2fc9 100755
--- a/devel/autoconf/DETAILS
+++ b/devel/autoconf/DETAILS
@@ -1,5 +1,5 @@
            SPELL=autoconf
-         VERSION=2.63
+         VERSION=2.64
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/autoconf/HISTORY b/devel/autoconf/HISTORY
index 30944c9..79c3f9d 100644
--- a/devel/autoconf/HISTORY
+++ b/devel/autoconf/HISTORY
@@ -1,3 +1,6 @@
+2009-07-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.64
+
 2008-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.63; fixed long desc
 
@@ -61,4 +64,3 @@
 
 2002-05-21 Julian v. Bock <julian AT wongr.net>
        * DETAILS: set VERSION to 2.53.
-
diff --git a/devel/bin86/HISTORY b/devel/bin86/HISTORY
index 2664c06..c41c0cb 100644
--- a/devel/bin86/HISTORY
+++ b/devel/bin86/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Elisamuel Resto <ryuji AT sourcemage.org>
+       * PRE_BUILD, bin86-0.16.17-amd64_build.patch: Fix building on x86_64
+
 2008-02-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: SOURCE_URL and WEB_SITE changed to
          http://homepage.ntlworld.com/robert.debath/
diff --git a/devel/bin86/PRE_BUILD b/devel/bin86/PRE_BUILD
new file mode 100755
index 0000000..6303a19
--- /dev/null
+++ b/devel/bin86/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+    patch -p0 -i "$SPELL_DIRECTORY"/"$SPELL"-"$VERSION"-amd64_build.patch
+fi
diff --git a/devel/bin86/bin86-0.16.17-amd64_build.patch 
b/devel/bin86/bin86-0.16.17-amd64_build.patch
new file mode 100644
index 0000000..b939726
--- /dev/null
+++ b/devel/bin86/bin86-0.16.17-amd64_build.patch
@@ -0,0 +1,13 @@
+--- ld/x86_aout.h.orig 2003-01-28 17:17:14.000000000 -0500
++++ ld/x86_aout.h      2005-05-07 22:40:05.000000000 -0400
+@@ -13,7 +13,9 @@
+ typedef long Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include <sys/types.h>
++typedef int32_t Long;
+ #endif
+ 
+ struct        exec {                  /* a.out header */
diff --git a/devel/check/DETAILS b/devel/check/DETAILS
index 7e0b26e..0e42c79 100755
--- a/devel/check/DETAILS
+++ b/devel/check/DETAILS
@@ -1,5 +1,5 @@
            SPELL=check
-         VERSION=0.9.5
+         VERSION=0.9.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/check/$SOURCE
diff --git a/devel/check/HISTORY b/devel/check/HISTORY
index 4ab7789..0e7053d 100644
--- a/devel/check/HISTORY
+++ b/devel/check/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.9.6
+
 2007-03-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: updated spell to 0.9.5
 
diff --git a/devel/check/check-0.9.5.tar.gz.sig 
b/devel/check/check-0.9.5.tar.gz.sig
deleted file mode 100644
index ec542c8..0000000
Binary files a/devel/check/check-0.9.5.tar.gz.sig and /dev/null differ
diff --git a/devel/check/check-0.9.6.tar.gz.sig 
b/devel/check/check-0.9.6.tar.gz.sig
new file mode 100644
index 0000000..8c460c6
Binary files /dev/null and b/devel/check/check-0.9.6.tar.gz.sig differ
diff --git a/devel/cvs/HISTORY b/devel/cvs/HISTORY
index 82ef6dd..db8face 100644
--- a/devel/cvs/HISTORY
+++ b/devel/cvs/HISTORY
@@ -1,3 +1,8 @@
+2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Apply glibc-2.10.1.patch
+       * glibc-2.10.1.patch: Fix conflicting definition of getline
+         Fixes Bug #15262
+
 2009-06-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: use GNU_URL for downloads, much faster
 
diff --git a/devel/cvs/PRE_BUILD b/devel/cvs/PRE_BUILD
index 290939d..d8d53d3 100755
--- a/devel/cvs/PRE_BUILD
+++ b/devel/cvs/PRE_BUILD
@@ -3,4 +3,5 @@ cd ${SOURCE_DIRECTORY} &&
 if [[ $CVS_FEATURES == y ]] && grep -q "# Generated by GNU Autoconf 2.59" 
configure; then
   patch -Np1 < $SCRIPT_DIRECTORY/cvs_autoconf.patch
 fi &&
-patch -p1 < ${SCRIPT_DIRECTORY}/cvs-insecuretemp_file.patch
+patch -p1 < ${SCRIPT_DIRECTORY}/cvs-insecuretemp_file.patch  &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
diff --git a/devel/cvs/glibc-2.10.1.patch b/devel/cvs/glibc-2.10.1.patch
new file mode 100644
index 0000000..4f4c700
--- /dev/null
+++ b/devel/cvs/glibc-2.10.1.patch
@@ -0,0 +1,359 @@
+diff -Naur cvs-1.11.23.orig/lib/getline.c cvs-1.11.23/lib/getline.c
+--- cvs-1.11.23.orig/lib/getline.c     2009-07-21 14:00:37.293591431 -0700
++++ cvs-1.11.23/lib/getline.c  2009-07-21 14:01:21.127614022 -0700
+@@ -155,7 +155,7 @@
+ }
+ 
+ int
+-getline (lineptr, n, stream)
++getline_ (lineptr, n, stream)
+      char **lineptr;
+      size_t *n;
+      FILE *stream;
+diff -Naur cvs-1.11.23.orig/lib/getline.h cvs-1.11.23/lib/getline.h
+--- cvs-1.11.23.orig/lib/getline.h     2009-07-21 14:00:37.294851298 -0700
++++ cvs-1.11.23/lib/getline.h  2009-07-21 14:01:07.562689821 -0700
+@@ -12,7 +12,7 @@
+ #define GETLINE_NO_LIMIT -1
+ 
+ int
+-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++  getline_ __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+ int
+   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                          int limit));
+diff -Naur cvs-1.11.23.orig/lib/getpass.c cvs-1.11.23/lib/getpass.c
+--- cvs-1.11.23.orig/lib/getpass.c     2009-07-21 14:00:37.295845838 -0700
++++ cvs-1.11.23/lib/getpass.c  2009-07-21 14:02:23.393596499 -0700
+@@ -81,7 +81,7 @@
+   fflush (out);
+ 
+   /* Read the password.  */
+-  nread = getline (&buf, &bufsize, in);
++  nread = getline_ (&buf, &bufsize, in);
+   if (buf != NULL)
+     {
+       if (nread < 0)
+diff -Naur cvs-1.11.23.orig/src/client.c cvs-1.11.23/src/client.c
+--- cvs-1.11.23.orig/src/client.c      2009-07-21 14:00:37.307835984 -0700
++++ cvs-1.11.23/src/client.c   2009-07-21 14:03:52.955845745 -0700
+@@ -5781,7 +5781,7 @@
+     char *p;
+ 
+     fp = open_file (CVSADM_NOTIFY, "r");
+-    if (getline (&line, &line_len, fp) < 0)
++    if (getline_ (&line, &line_len, fp) < 0)
+     {
+       if (feof (fp))
+           error (0, 0, "cannot read %s: end of file", CVSADM_NOTIFY);
+@@ -5802,7 +5802,7 @@
+              line + 1);
+     }
+ 
+-    if (getline (&line, &line_len, fp) < 0)
++    if (getline_ (&line, &line_len, fp) < 0)
+     {
+       if (feof (fp))
+       {
+diff -Naur cvs-1.11.23.orig/src/cvsrc.c cvs-1.11.23/src/cvsrc.c
+--- cvs-1.11.23.orig/src/cvsrc.c       2009-07-21 14:00:37.302836324 -0700
++++ cvs-1.11.23/src/cvsrc.c    2009-07-21 14:03:53.043595970 -0700
+@@ -92,7 +92,7 @@
+     line_chars_allocated = 0;
+     command_len = strlen (cmdname);
+     cvsrcfile = open_file (homeinit, "r");
+-    while ((line_length = getline (&line, &line_chars_allocated, cvsrcfile))
++    while ((line_length = getline_ (&line, &line_chars_allocated, 
cvsrcfile))
+          >= 0)
+     {
+       /* skip over comment lines */
+diff -Naur cvs-1.11.23.orig/src/edit.c cvs-1.11.23/src/edit.c
+--- cvs-1.11.23.orig/src/edit.c        2009-07-21 14:00:37.307835984 -0700
++++ cvs-1.11.23/src/edit.c     2009-07-21 14:03:53.106595623 -0700
+@@ -187,7 +187,7 @@
+       return 0;
+     }
+ 
+-    while (getline (&line, &line_len, fp) > 0)
++    while (getline_ (&line, &line_len, fp) > 0)
+     {
+       notif_type = line[0];
+       if (notif_type == '\0')
+@@ -906,7 +906,7 @@
+               error (0, errno, "cannot read %s", usersname);
+           if (fp != NULL)
+           {
+-              while (getline (&line, &line_len, fp) >= 0)
++              while (getline_ (&line, &line_len, fp) >= 0)
+               {
+                   if (strncmp (line, p, len) == 0
+                       && line[len] == ':')
+@@ -1018,7 +1018,7 @@
+           error (0, errno, "cannot open %s", CVSADM_NOTIFY);
+       return;
+     }
+-    while (getline (&line, &line_len, fp) > 0)
++    while (getline_ (&line, &line_len, fp) > 0)
+     {
+       int notif_type;
+       char *filename;
+diff -Naur cvs-1.11.23.orig/src/entries.c cvs-1.11.23/src/entries.c
+--- cvs-1.11.23.orig/src/entries.c     2009-07-21 14:00:37.302836324 -0700
++++ cvs-1.11.23/src/entries.c  2009-07-21 14:03:53.137845837 -0700
+@@ -312,7 +312,7 @@
+     line_chars_allocated = 0;
+ 
+     ent = NULL;
+-    while ((line_length = getline (&line, &line_chars_allocated, fpin)) > 0)
++    while ((line_length = getline_ (&line, &line_chars_allocated, fpin)) > 
0)
+     {
+       l = line;
+ 
+@@ -748,7 +748,7 @@
+       line = NULL;
+       line_chars_allocated = 0;
+ 
+-      if ((line_length = getline (&line, &line_chars_allocated, fp)) > 0)
++      if ((line_length = getline_ (&line, &line_chars_allocated, fp)) > 0)
+       {
+           /* Remove any trailing newline.  */
+           if (line[line_length - 1] == '\n')
+@@ -1084,7 +1084,7 @@
+ 
+     if (fp != NULL)
+     {
+-      while (getline (&line, &line_allocated, fp) >= 0)
++      while (getline_ (&line, &line_allocated, fp) >= 0)
+       {
+           char *linefile;
+           char *p;
+diff -Naur cvs-1.11.23.orig/src/fileattr.c cvs-1.11.23/src/fileattr.c
+--- cvs-1.11.23.orig/src/fileattr.c    2009-07-21 14:00:37.299846139 -0700
++++ cvs-1.11.23/src/fileattr.c 2009-07-21 14:03:53.219864533 -0700
+@@ -101,7 +101,7 @@
+     attrlist = getlist ();
+     while (1) {
+       int nread;
+-      nread = getline (&line, &line_len, fp);
++      nread = getline_ (&line, &line_len, fp);
+       if (nread < 0)
+           break;
+       /* Remove trailing newline.  */
+diff -Naur cvs-1.11.23.orig/src/ignore.c cvs-1.11.23/src/ignore.c
+--- cvs-1.11.23.orig/src/ignore.c      2009-07-21 14:00:37.306836136 -0700
++++ cvs-1.11.23/src/ignore.c   2009-07-21 14:03:53.389864070 -0700
+@@ -159,7 +159,7 @@
+           error (0, errno, "cannot open %s", file);
+       return;
+     }
+-    while (getline (&line, &line_allocated, fp) >= 0)
++    while (getline_ (&line, &line_allocated, fp) >= 0)
+       ign_add (line, hold);
+     if (ferror (fp))
+       error (0, errno, "cannot read %s", file);
+diff -Naur cvs-1.11.23.orig/src/login.c cvs-1.11.23/src/login.c
+--- cvs-1.11.23.orig/src/login.c       2009-07-21 14:00:37.305836009 -0700
++++ cvs-1.11.23/src/login.c    2009-07-21 14:03:53.511863562 -0700
+@@ -321,7 +321,7 @@
+ 
+     /* Check each line to see if we have this entry already. */
+     line = 0;
+-    while ((line_length = getline (&linebuf, &linebuf_len, fp)) >= 0)
++    while ((line_length = getline_ (&linebuf, &linebuf_len, fp)) >= 0)
+     {
+       line++;
+       password = password_entry_parseline (cvsroot_canonical, 1, line,
+@@ -394,7 +394,7 @@
+                  tmp_name ? tmp_name : "(null)");
+ 
+       line = 0;
+-      while ((line_length = getline (&linebuf, &linebuf_len, fp)) >= 0)
++      while ((line_length = getline_ (&linebuf, &linebuf_len, fp)) >= 0)
+       {
+           line++;
+           if (line < found_at
+diff -Naur cvs-1.11.23.orig/src/logmsg.c cvs-1.11.23/src/logmsg.c
+--- cvs-1.11.23.orig/src/logmsg.c      2009-07-21 14:00:37.306836136 -0700
++++ cvs-1.11.23/src/logmsg.c   2009-07-21 14:03:53.540845679 -0700
+@@ -334,7 +334,7 @@
+       size_t offset = 0;
+       while (1)
+       {
+-          line_length = getline (&line, &line_chars_allocated, fp);
++          line_length = getline_ (&line, &line_chars_allocated, fp);
+           if (line_length == -1)
+           {
+               if (ferror (fp))
+@@ -369,7 +369,7 @@
+           (void) printf ("a)bort, c)ontinue, e)dit, !)reuse this message 
unchanged for remaining dirs\n");
+           (void) printf ("Action: (continue) ");
+           (void) fflush (stdout);
+-          line_length = getline (&line, &line_chars_allocated, stdin);
++          line_length = getline_ (&line, &line_chars_allocated, stdin);
+           if (line_length < 0)
+           {
+               error (0, errno, "cannot read from stdin");
+@@ -520,7 +520,7 @@
+ 
+           while (1)
+           {
+-              line_length = getline (&line,
++              line_length = getline_ (&line,
+                                      &line_chars_allocated,
+                                      fp);
+               if (line_length == -1)
+@@ -579,7 +579,7 @@
+       char *line = NULL;
+       size_t line_chars_allocated = 0;
+ 
+-      while (getline (&line, &line_chars_allocated, tfp) >= 0)
++      while (getline_ (&line, &line_chars_allocated, tfp) >= 0)
+           (void) fputs (line, fp);
+       if (ferror (tfp))
+           error (0, errno, "warning: cannot read %s", template);
+diff -Naur cvs-1.11.23.orig/src/mkmodules.c cvs-1.11.23/src/mkmodules.c
+--- cvs-1.11.23.orig/src/mkmodules.c   2009-07-21 14:00:37.298846011 -0700
++++ cvs-1.11.23/src/mkmodules.c        2009-07-21 14:03:53.602845692 -0700
+@@ -482,7 +482,7 @@
+        *
+        * comment lines begin with '#'
+        */
+-      while (getline (&line, &line_allocated, fp) >= 0)
++      while (getline_ (&line, &line_allocated, fp) >= 0)
+       {
+           /* skip lines starting with # */
+           if (line[0] == '#')
+diff -Naur cvs-1.11.23.orig/src/parseinfo.c cvs-1.11.23/src/parseinfo.c
+--- cvs-1.11.23.orig/src/parseinfo.c   2009-07-21 14:00:37.300845568 -0700
++++ cvs-1.11.23/src/parseinfo.c        2009-07-21 14:03:53.711613676 -0700
+@@ -87,7 +87,7 @@
+ 
+     /* search the info file for lines that match */
+     callback_done = line_number = 0;
+-    while (getline (&line, &line_allocated, fp_info) >= 0)
++    while (getline_ (&line, &line_allocated, fp_info) >= 0)
+     {
+       line_number++;
+ 
+@@ -284,7 +284,7 @@
+       goto set_defaults_and_return;
+     }
+ 
+-    while (getline (&line, &line_allocated, fp_info) >= 0)
++    while (getline_ (&line, &line_allocated, fp_info) >= 0)
+     {
+       /* Skip comments.  */
+       if (line[0] == '#')
+diff -Naur cvs-1.11.23.orig/src/patch.c cvs-1.11.23/src/patch.c
+--- cvs-1.11.23.orig/src/patch.c       2009-07-21 14:00:37.298846011 -0700
++++ cvs-1.11.23/src/patch.c    2009-07-21 14:03:53.740845686 -0700
+@@ -628,8 +628,8 @@
+ 
+           /* Now the munging. */
+           fp = open_file (tmpfile3, "r");
+-          if (getline (&line1, &line1_chars_allocated, fp) < 0 ||
+-              getline (&line2, &line2_chars_allocated, fp) < 0)
++          if (getline_ (&line1, &line1_chars_allocated, fp) < 0 ||
++              getline_ (&line2, &line2_chars_allocated, fp) < 0)
+           {
+               if (feof (fp))
+                   error (0, 0, "\
+@@ -736,7 +736,7 @@
+ 
+           /* spew the rest of the diff out */
+           while ((line_length
+-                  = getline (&line1, &line1_chars_allocated, fp))
++                  = getline_ (&line1, &line1_chars_allocated, fp))
+                  >= 0)
+               cvs_output (line1, 0);
+           if (line_length < 0 && !feof (fp))
+diff -Naur cvs-1.11.23.orig/src/release.c cvs-1.11.23/src/release.c
+--- cvs-1.11.23.orig/src/release.c     2009-07-21 14:00:37.301840876 -0700
++++ cvs-1.11.23/src/release.c  2009-07-21 14:03:53.884613662 -0700
+@@ -206,7 +206,7 @@
+ 
+           c = 0;
+ 
+-          while ((line_length = getline (&line, &line_allocated, fp)) >= 0)
++          while ((line_length = getline_ (&line, &line_allocated, fp)) >= 0)
+           {
+               if (strchr ("MARCZ", *line))
+                   c++;
+diff -Naur cvs-1.11.23.orig/src/repos.c cvs-1.11.23/src/repos.c
+--- cvs-1.11.23.orig/src/repos.c       2009-07-21 14:00:37.306836136 -0700
++++ cvs-1.11.23/src/repos.c    2009-07-21 14:03:53.937613647 -0700
+@@ -94,7 +94,7 @@
+       error (1, save_errno, "cannot open %s", tmp);
+     }
+ 
+-    if (getline (&repos, &repos_allocated, fpin) < 0)
++    if (getline_ (&repos, &repos_allocated, fpin) < 0)
+     {
+       /* FIXME: should be checking for end of file separately.  */
+       error (0, 0, "in directory %s:", xupdate_dir);
+diff -Naur cvs-1.11.23.orig/src/root.c cvs-1.11.23/src/root.c
+--- cvs-1.11.23.orig/src/root.c        2009-07-21 14:00:37.303836103 -0700
++++ cvs-1.11.23/src/root.c     2009-07-21 14:03:53.965595566 -0700
+@@ -81,7 +81,7 @@
+      */
+     fpin = open_file (tmp, "r");
+ 
+-    if ((len = getline (&root, &root_allocated, fpin)) < 0)
++    if ((len = getline_ (&root, &root_allocated, fpin)) < 0)
+     {
+       int saved_errno = errno;
+       /* FIXME: should be checking for end of file separately; errno
+diff -Naur cvs-1.11.23.orig/src/server.c cvs-1.11.23/src/server.c
+--- cvs-1.11.23.orig/src/server.c      2009-07-21 14:00:37.299846139 -0700
++++ cvs-1.11.23/src/server.c   2009-07-21 14:03:54.361613312 -0700
+@@ -2599,7 +2599,7 @@
+        }
+        else  /* successfully opened readers file */
+        {
+-           while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
++           while ((num_red = getline_ (&linebuf, &linebuf_len, fp)) >= 0)
+            {
+                /* Hmmm, is it worth importing my own readline
+                   library into CVS?  It takes care of chopping
+@@ -2660,7 +2660,7 @@
+        }
+ 
+        found_it = 0;
+-       while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
++       while ((num_red = getline_ (&linebuf, &linebuf_len, fp)) >= 0)
+        {
+            /* Chop newline by hand, for strcmp()'s sake. */
+            if (num_red > 0 && linebuf[num_red - 1] == '\n')
+@@ -5555,7 +5555,7 @@
+ 
+     /* Look for a relevant line -- one with this user's name. */
+     namelen = strlen (username);
+-    while (getline (&linebuf, &linebuf_len, fp) >= 0)
++    while (getline_ (&linebuf, &linebuf_len, fp) >= 0)
+     {
+       if ((strncmp (linebuf, username, namelen) == 0)
+           && (linebuf[namelen] == ':'))
+diff -Naur cvs-1.11.23.orig/src/subr.c cvs-1.11.23/src/subr.c
+--- cvs-1.11.23.orig/src/subr.c        2009-07-21 14:00:37.305836009 -0700
++++ cvs-1.11.23/src/subr.c     2009-07-21 14:03:54.158863504 -0700
+@@ -668,7 +668,7 @@
+     fp = CVS_FOPEN (finfo->file, "r");
+     if (fp == NULL)
+       error (1, errno, "cannot open %s", finfo->fullname);
+-    while (getline (&line, &line_allocated, fp) > 0)
++    while (getline_ (&line, &line_allocated, fp) > 0)
+     {
+       if (strncmp (line, RCS_MERGE_PAT_1, sizeof RCS_MERGE_PAT_1 - 1) == 0 
||
+           strncmp (line, RCS_MERGE_PAT_2, sizeof RCS_MERGE_PAT_2 - 1) == 0 
||
+diff -Naur cvs-1.11.23.orig/src/wrapper.c cvs-1.11.23/src/wrapper.c
+--- cvs-1.11.23.orig/src/wrapper.c     2009-07-21 14:00:37.298846011 -0700
++++ cvs-1.11.23/src/wrapper.c  2009-07-21 14:03:54.335595818 -0700
+@@ -284,7 +284,7 @@
+           error (0, errno, "cannot open %s", file);
+       return;
+     }
+-    while (getline (&line, &line_allocated, fp) >= 0)
++    while (getline_ (&line, &line_allocated, fp) >= 0)
+       wrap_add (line, temp);
+     if (line)
+         free (line);
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 8a520af..927d298 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
            SPELL=git
-         VERSION=1.6.3.3
+         VERSION=1.6.4
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index a5a1406..5d46992 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.6.4
+
 2009-06-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.6.3.3
 
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index 587fab3..f4be9a8 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -5,11 +5,11 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then
       
SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}
      
SOURCE_HASH=sha512:d9873736067a396acb172ecb35d5c748b49c0fd4a89469f2cf9135bd919c9be4c9656edb1ae7d2783b42c2f87cbdd28042565ee81c9cd2f77616905a74d3d75e
         
 else
-         VERSION=2.4.2.2
+         VERSION=2.4.2.3
   SECURITY_PATCH=1
           SOURCE=${SPELL}-${VERSION}.tar.bz2
       SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:1b050f0558bec2b1f1315bb62a94c7509bc2fd978e994cf7d63201f0ae6f620cfd369039e1694aee7fed16d51d32a26f4237224174c375667a805036813ec253
+     
SOURCE_HASH=sha512:afff31da7595e3c67d1b12d1bc45fe2a0d75bbdc3f79b43e156e1a680decc5284754be5244c1d391a6ee5f447bd2bd7fc163edc5ad1a8e970d55d60a372b79c5
 fi
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 00f102d..7efa2f0 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.4.2.3
+
 2009-07-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.4.2.2, SECURITY_PATCH=1, CVE-2009-0217
 
diff --git a/devel/qt-creator/BUILD b/devel/qt-creator/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/devel/qt-creator/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/devel/qt-creator/DEPENDS b/devel/qt-creator/DEPENDS
new file mode 100755
index 0000000..7341c60
--- /dev/null
+++ b/devel/qt-creator/DEPENDS
@@ -0,0 +1,3 @@
+depends g++  &&
+depends qt4
+
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
new file mode 100755
index 0000000..fe21028
--- /dev/null
+++ b/devel/qt-creator/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=qt-creator
+         VERSION=1.2.1
+     
SOURCE_HASH=sha512:a2904243b4f75a4b1307ae8321f2799fa425fb95b519ce68b12a2316b3edba62a1c9bc5e5191e3ecb1513de1de3cbbe6131f44929a162e42b8e1d16753fa0faf
+          SOURCE=$SPELL-$VERSION-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
+        WEB_SITE=http://www.qtsoftware.com/downloads
+   SOURCE_URL[0]=ftp://ftp.qtsoftware.com/qtcreator/$SOURCE
+   SOURCE_URL[1]=http://download.qtsoftware.com/qtcreator/$SOURCE
+      LICENSE[0]=LGPL
+         ENTERED=20090304
+        KEYWORDS="qt4 ide"
+           SHORT="cross-platform integrated development environment for use 
with Qt"
+cat << EOF
+Qt� Creator is a new cross-platform integrated development environment for 
use with Qt.
+EOF
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
new file mode 100644
index 0000000..2656d0c
--- /dev/null
+++ b/devel/qt-creator/HISTORY
@@ -0,0 +1,14 @@
+2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.2.1
+
+2009-06-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.2.0
+
+2009-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.0
+       * INSTALL: added (their Makefile is bad if qdoc3 is missing)
+
+2009-03-04 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0
+         spell created
+
diff --git a/devel/qt-creator/INSTALL b/devel/qt-creator/INSTALL
new file mode 100755
index 0000000..bb54472
--- /dev/null
+++ b/devel/qt-creator/INSTALL
@@ -0,0 +1 @@
+cp -a bin lib share $INSTALL_ROOT/usr
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index 8bdc52d..5654e25 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -13,8 +13,8 @@ then
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
 else
-         VERSION=3.4.0
-     
SOURCE_HASH=sha512:738ebd6a119857a3fa4f8fd52f8dd933f92b9675af686ded08e91c327f5785b51cb1d3038a041ff36b7a896d02b889b2f50f3257c14e82e350a394b93dee1122
+         VERSION=3.4.1
+     
SOURCE_HASH=sha512:0ae002aca7e4ca829d067d48d2e6b8b5b69517c3636feea5ef30abf6324d077af137b1eba99f58bdfdf33986d372f9e99093070c755bee013c9885ed74b69538
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index c010aaf..1b918dc 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * DETAILS: updated spell to 3.4.1
+
 2009-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: updated spell to 3.4.0
 
diff --git a/disk/ccd2iso/BUILD b/disk/ccd2iso/BUILD
deleted file mode 100755
index deba9a9..0000000
--- a/disk/ccd2iso/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-sedit "s/1.6//" configure &&
-sedit "s/aclocal-/aclocal/" configure &&
-sedit "s/automake-/automake/" configure &&
-default_build
diff --git a/disk/ccd2iso/DETAILS b/disk/ccd2iso/DETAILS
index 1078251..d4fb3e0 100755
--- a/disk/ccd2iso/DETAILS
+++ b/disk/ccd2iso/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ccd2iso
-         VERSION=0.2
+         VERSION=0.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-SOURCE_HASH[0]=sha512:2c68053e2ab5fc50d54e94f92acc4ede6b43ba4e0f7d044636461f89435479d1410d0053fbbab6ce4c8120855bacae4fa9e6eb85b62e1d40f9fce68d15c04d29
+SOURCE_HASH[0]=sha512:40e0e5bd792c851dd0549a08a3a0d7226cc05893316dc9575d4c9131dce758d992081355de569e3e66dca310545bf3a17c1cd6431ab97e790fdbe5b19c09adc1
         WEB_SITE=http://ccd2iso.sf.net
       LICENSE[0]=GPL
          ENTERED=20060325
diff --git a/disk/ccd2iso/HISTORY b/disk/ccd2iso/HISTORY
index 751ae59..7dfdb9f 100644
--- a/disk/ccd2iso/HISTORY
+++ b/disk/ccd2iso/HISTORY
@@ -1,2 +1,6 @@
+2009-07-25 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DETAILS: updated version to 0.3, updated SOURCE_DIRECTORY
+       * BUILD: removed
+
 2006-03-25 Unet <unet AT sourcemage.org>
        * ALL: Created
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index f90f14f..bdf6713 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=hdparm
-         VERSION=9.16
-     
SOURCE_HASH=sha512:e4410737b9823fd6c4febf2e9e61e66efd5b76c9c24e0c6a34f99106f58e688520200dcb15ebe2dd7c8397750474f9956bdca9d3a17676e13a52153de9afeab3
+         VERSION=9.17
+     
SOURCE_HASH=sha512:8d1c2d9cd80896df6ad97613faae52765708e3481daeed70a85644ca10f4b90485e4a30a3cd38f8a369fc3d9da7e430450ac3662ae9e6800e1ee5e4e8573ae7a
           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 ff907a5..bf00f0a 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 9.17
+
 2009-07-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 9.16
 
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 305d6e2..fa24bed 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,9 +1,9 @@
            SPELL=lvm
-         VERSION=2.02.48
+         VERSION=2.02.50
           SOURCE=LVM2.$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
    SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
-     
SOURCE_HASH=sha512:2a431fc3c6be858a2218c9fc054382058c04d09f9a89349f6e23c12eacfef33b553b9970eac017f09c9ec28756a9e5ba224546a53c98d9e3159655d11bbdac2e
+     
SOURCE_HASH=sha512:1a7d5c7d067bfd94ea89cd007258cd05731d19a59d487ed8d3e2dbcc865545ef952094aa2a78cca50386d9c9272971785f8041547a8c1cb4bb2d4d031810e0c0
         WEB_SITE=http://sources.redhat.com/lvm2/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 54280bb..bea2f3a 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,9 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.02.50
+
+2009-07-22 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.02.49
+
 2009-07-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.02.48
 
diff --git a/disk/parted/DEPENDS b/disk/parted/DEPENDS
index e411fd5..74c80f6 100755
--- a/disk/parted/DEPENDS
+++ b/disk/parted/DEPENDS
@@ -10,4 +10,9 @@ optional_depends  readline                          \
 optional_depends  gettext                        \
                   "--enable-nls"                 \
                   "--disable-nls"                \
-                  "for Native Language Support"
+                  "for Native Language Support"  &&
+
+optional_depends  lvm                                      \
+                  "--enable-device-mapper"                 \
+                  "--disable-device-mapper"                \
+                  "for logical volume management support"
diff --git a/disk/parted/DETAILS b/disk/parted/DETAILS
index b2576b2..f869ef5 100755
--- a/disk/parted/DETAILS
+++ b/disk/parted/DETAILS
@@ -1,6 +1,6 @@
            SPELL=parted
-         VERSION=1.8.8
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
+         VERSION=1.9.0
+          SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.sig
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${GNU_URL}/${SPELL}/${SOURCE}
diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index a5b11f8..ea66db9 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,10 @@
+2009-07-25 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: 1.9.0 now requires lvm by default, make it optional. Bug 
#15318
+
+2009-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: Updated to 1.9.0
+       * parted.gpg: add key 9D24D092
+
 2007-09-02 Elisamuel Resto <ryuji AT mages.ath.cx>
        * BUILD: Added. Disabled treating of warnings as errors
 
diff --git a/disk/parted/parted.gpg b/disk/parted/parted.gpg
index e41a1e5..f408ee2 100644
Binary files a/disk/parted/parted.gpg and b/disk/parted/parted.gpg differ
diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index 2d0ad17..74f575e 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -10,7 +10,11 @@ depends libglade2         &&
 depends gnome-icon-theme  &&
 depends gnome-doc-utils   &&
 depends xml-parser-expat  &&
-depends rarian            &&
+
+optional_depends rarian                               \
+                 "--enable-scrollkeeper"              \
+                 "--disable-scrollkeeper"             \
+                 "Register with rarian?"              &&
 
 optional_depends  dbus-glib                           \
                   "--enable-dbus"                     \
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index c52ba8f..31913d4 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian optional
+
 2009-06-19 Eric Sandall <sandalle AT sourcemage.org>
        * CONFIGURE: typo viwer -> viewer
 
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 470af41..3406aa5 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,5 @@
            SPELL=man-pages
-         VERSION=3.21
+         VERSION=3.22
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 74df9ce..8c0086e 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.22
+
 2009-04-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.21
 
diff --git a/doc/t1utils/DETAILS b/doc/t1utils/DETAILS
index fb8196a..21bf0d7 100755
--- a/doc/t1utils/DETAILS
+++ b/doc/t1utils/DETAILS
@@ -1,11 +1,11 @@
            SPELL=t1utils
-         VERSION=1.32
+         VERSION=1.34
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.lcdf.org/~eddietwo/type/$SOURCE
         WEB_SITE=http://www.lcdf.org/~eddietwo/type/
          ENTERED=20041129
-     
SOURCE_HASH=sha512:556a180b5726dcf98660127fb153ea390ac0f1706f5034afbd2356245debdcec2ac8f95ab5787c8a159fc3e5ebabfae76d15d378e71f9869ced2c25bb54f8134
+     
SOURCE_HASH=sha512:49523e32f2f55c71a9415935597142c238120fcd9b3fb6dffb90c84b506087029572dcc2a5c0382a3c439d644c77ee36a6ca84a6b241f2bdbc9266b3d212bebc
       LICENSE[0]="Copyright (c) 1992 by I. Lee Hetherington, all rights 
reserved.  Permission is hereby granted to use, modify, and distribute this 
program for any purpose provided this copyright notice and the one below 
remain intact. Note that these tools should not be used to illegally copy 
type-1 font programs.  Typeface design is an intricate art that should be 
rewarded. I. Lee Hetherington ilh AT lcs.mit.edu"
         KEYWORDS="fonts doc"
            SHORT="Type1 font utilities" 
diff --git a/doc/t1utils/HISTORY b/doc/t1utils/HISTORY
index 8283f28..d7c1405 100644
--- a/doc/t1utils/HISTORY
+++ b/doc/t1utils/HISTORY
@@ -1,3 +1,8 @@
+2009-07-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * DETAILS: updated spell to 1.34
+       * PRE_BUILD: added to fix recent glibc incompatibility #15322
+         patch by Finn Haedicke
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/doc/t1utils/PRE_BUILD b/doc/t1utils/PRE_BUILD
new file mode 100755
index 0000000..21e8b6a
--- /dev/null
+++ b/doc/t1utils/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+sedit 's/getline/local_getline/g' t1asm.c
diff --git a/editors/elvis/DETAILS b/editors/elvis/DETAILS
index 7fb1bf9..d83a395 100755
--- a/editors/elvis/DETAILS
+++ b/editors/elvis/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.cs.pdx.edu/pub/$SPELL/$SOURCE
      
SOURCE_HASH=sha512:847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-        WEB_SITE=ftp://ftp.cs.pdx.edu/pub/elvis
+        WEB_SITE=http://elvis.the-little-red-haired-girl.org/
       LICENSE[0]=GPL
          ENTERED=20010922
          UPDATED=20031120
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index fcadb6f..88ad039 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,11 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: updated WEB_SITE
+
+2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
+       * PRE_BUILD: Added to apply patch
+       * elvis-glibc.patch: Added to fix issue with glibc 2.10.x
+         Bug #15254
+
 2008-11-22 Justin Boffemmyer <flux AT sourcemage.org>
        * CONFIGURE: fixed a typo vim->elvis
 
diff --git a/editors/elvis/PRE_BUILD b/editors/elvis/PRE_BUILD
new file mode 100755
index 0000000..75cb1c8
--- /dev/null
+++ b/editors/elvis/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/elvis-glibc.patch
diff --git a/editors/elvis/elvis-glibc.patch b/editors/elvis/elvis-glibc.patch
new file mode 100644
index 0000000..4b3c497
--- /dev/null
+++ b/editors/elvis/elvis-glibc.patch
@@ -0,0 +1,47 @@
+--- ref.c.orig 2009-06-10 16:15:50.000000000 -0500
++++ ref.c      2009-06-10 16:17:04.000000000 -0500
+@@ -42,7 +42,7 @@
+ 
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *get_line(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline 
with
+  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at 
EOF.
+  */
+-static char *getline(fp)
++static char *get_line(fp)
+       FILE    *fp;
+ {
+       int     ch;
+@@ -348,7 +348,7 @@
+       }
+ 
+       /* for each line... */
+-      for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++      for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; 
lnum++)
+       {
+               /* is this the tag definition? */
+               if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, 
len))
+@@ -377,7 +377,7 @@
+                       {
+                               if (strchr(line, '(') != NULL)
+                               {
+-                                      while ((line = getline(fp)) != NULL
++                                      while ((line = get_line(fp)) != NULL
+                                           && *line
+                                           && ((*line != '#' && *line != '{')
+                                               || line[strlen(line) - 1] == 
'\\'))
+@@ -387,7 +387,7 @@
+                               }
+                               else if ((lc = classify(line, lc)) == 
LC_PARTIAL)
+                               {
+-                                      while ((line = getline(fp)) != NULL
++                                      while ((line = get_line(fp)) != NULL
+                                           && (lc = classify(line, lc)) == 
LC_PARTIAL)
+                                       {
+                                               puts(line);
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 0f64e0f..da4f910 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
   SOURCE2_URL[0]=$SOURCE_URL.asc
       SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+      PATCHLEVEL=1
         WEB_SITE=http://curl.haxx.se/
          ENTERED=20010922
       LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 7aeb4fe..558b8ac 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * PRE_SUB_DEPENDS, SUB_DEPENDS: added c-ares options for php
+
 2009-05-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 7.19.5
 
diff --git a/ftp/curl/PRE_SUB_DEPENDS b/ftp/curl/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4006468
--- /dev/null
+++ b/ftp/curl/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    ARES) is_depends_enabled $SPELL c-ares;;
+    NO_ARES) is_depends_enabled $SPELL c-ares && return 1;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/ftp/curl/SUB_DEPENDS b/ftp/curl/SUB_DEPENDS
new file mode 100755
index 0000000..26976f9
--- /dev/null
+++ b/ftp/curl/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+    ARES) message "Curl with c-ares requested, forcing c-ares dependency" &&
+          depends c-ares "--enable-ares=$INSTALL_ROOT/usr" ;;
+ NO_ARES) message "Curl without c-ares requested, forcing disabled c-ares 
dependency" &&
+          optional_depends c-ares "--disable-ares" ;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1 ;;
+esac
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index ba8b9c1..32692fd 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=lftp
-         VERSION=3.7.14
+         VERSION=3.7.15
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 7045a90..f9df90a 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.7.15
+
 2009-05-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.7.14
 
diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 6e9ee51..1d3ccc6 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -1,11 +1,16 @@
            SPELL=ncftp
-         VERSION=3.2.2
+         VERSION=3.2.3
           SOURCE=$SPELL-$VERSION-src.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
-     
SOURCE_HASH=sha512:7fad4b2234e4f4506c5129cfccba1b4d89172b40e5d611c16d11722a3c1a602b0644ad11784eab2ad412aca245c23dfd471f344ece954b791d7ce9d9404ecfc7
+     
SOURCE_HASH=sha512:f84ffcb615bdd665a1d60e7d7eadaf6df2f5a7eb8dfbb649a40fd4136a4fc27c3b7cf91f722fe208588d6f4048d397319899ef0c55156e05d060aeec8e3d3ed5
 
 if [[ "$NCFTP_IPV6" == "y" ]]; then
+         VERSION=3.2.2
+     
SOURCE_HASH=sha512:7fad4b2234e4f4506c5129cfccba1b4d89172b40e5d611c16d11722a3c1a602b0644ad11784eab2ad412aca245c23dfd471f344ece954b791d7ce9d9404ecfc7
+          SOURCE=$SPELL-$VERSION-src.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
         VERSION2=20080821
          SOURCE2=$SPELL-$(echo $VERSION | sed -e 
's/\.//g')-v6-$VERSION2.diff.gz
   SOURCE2_URL[0]=ftp://ftp.kame.net/pub/kame/misc/$SOURCE2
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index b0bc1be..5bb2c8c 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,10 @@
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS,PRE_BUILD: there is no 3.2.3 patch yet
+
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.2.3
+       * PRE_BUILD: apply patch only if user want it
+
 2008-10-10 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: added IPv6 patch from the KAME project
        * PRE_BUILD, PREPARE: Added IPv6 patch query and application
diff --git a/ftp/ncftp/PREPARE b/ftp/ncftp/PREPARE
index 3da336a..336fa3f 100755
--- a/ftp/ncftp/PREPARE
+++ b/ftp/ncftp/PREPARE
@@ -1 +1 @@
-config_query NCFTP_IPV6 "Do you want to add IPv6 support? (patch)" n
+config_query NCFTP_IPV6 "Do you want to add IPv6 support? (patch and older 
version)" n
diff --git a/ftp/ncftp/PRE_BUILD b/ftp/ncftp/PRE_BUILD
index 4cada26..64ffc4f 100755
--- a/ftp/ncftp/PRE_BUILD
+++ b/ftp/ncftp/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-gzip -cd "$SOURCE_CACHE/$SOURCE2" | patch -p1
+if [[ "$NCFTP_IPV6" == "y" ]]; then
+  gzip -cd "$SOURCE_CACHE/$SOURCE2" | patch -p1
+fi
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index f61a094..6d795fc 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,7 +1,5 @@
 depends libgnomeui      &&
 depends gnome-desktop   &&
-depends libgnomeprint   &&
-depends libgnomeprintui &&
 depends iso-codes       &&
 depends dbus-glib       &&
 
@@ -15,6 +13,23 @@ optional_depends gnome-python2                          \
                  "--disable-python"                     \
                  "Enable Python support"                &&
 
+optional_depends gnome-network                           \
+                 "--enable-network-manager"              \
+                 "--disable-network-manager"             \
+                 "Integrate with gnome network manager?" &&
+
+optional_depends enchant                    \
+                 "--enable-spell-checker"   \
+                 "--disable-spell-checker"  \
+                 "Enable spelling checker?" &&
+
+optional_depends rarian                     \
+                 "--enable-scrollkeeper"    \
+                 "--disable-scrollkeeper"   \
+                 "Register with rarian?"    &&
+
+optional_depends libgnomeprintui '' '' 'Enable printing?' &&
+
 if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
    depends webkitgtk "--with-engine=webkit"
 else
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 63124d9..8efd867 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian, enchant, gnome-network
+         and libgnomeprint(ui) optional
+
 2009-06-30 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated stable to 2.26.3
 
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index b46a2bb..4849a99 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -20,11 +20,16 @@ depends gnome-icon-theme       &&
 depends libnotify              &&
 depends libsoup                &&
 depends gstreamer              &&
-depends rarian                 &&
 depends psmisc                 &&
-depends gnome-doc-utils        &&
-depends gnome-spell            &&
-depends libgnomeprintui        &&
+
+optional_depends gnome-doc-utils        \
+                 '--with-help'          \
+                 '--without-help'       \
+                 'Build documentation?' &&
+
+optional_depends gnome-spell '' '' 'Enable spelling checker?' &&
+
+optional_depends libgnomeprintui '' '' 'Enable printing?' &&
 
 optional_depends  gnupg                                   \
                   ""                                      \
@@ -80,4 +85,9 @@ optional_depends  gtk-doc                                 \
 optional_depends  avahi                    \
                   ""                       \
                   ""                       \
-                  "for service discovery"
+                  "for service discovery"  &&
+
+optional_depends  rarian                   \
+                  "--enable-scrollkeeper"  \
+                  "--disable-scrollkeeper" \
+                  "Register with rarian?"
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index a13a92c..1f65fc6 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,7 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian, gnome-doc-utils, gnome-spell and
+         libgnomeprintui optional
+
 2009-05-22 Eric Sandall <sandalle AT sourcemage.org>
        * CONFLICTS: Remove conflict with evolution2, finally removed
 
diff --git a/gnome2-apps/file-roller/DEPENDS b/gnome2-apps/file-roller/DEPENDS
index 9376745..36b2e0c 100755
--- a/gnome2-apps/file-roller/DEPENDS
+++ b/gnome2-apps/file-roller/DEPENDS
@@ -3,7 +3,12 @@ depends gtk+2       &&
 depends libglade2   &&
 depends libgnome    &&
 depends libgnomeui  &&
-depends rarian      &&
+depends gnome-doc-utils  &&
+
+optional_depends rarian                        \
+                 "--enable-scrollkeeper"       \
+                 "--disable-scrollkeeper"      \
+                 "Register with scrollkeeper"  &&
 
 optional_depends nautilus2                                   \
                  "--enable-nautilus-actions"                 \
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index de7174b..94b2820 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,7 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian optional,
+         added missing dep on gnome-doc-utils
+
 2009-06-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.26.2
 
diff --git a/gnome2-apps/gnote/DETAILS b/gnome2-apps/gnote/DETAILS
index 33f2729..cbcdc7b 100755
--- a/gnome2-apps/gnote/DETAILS
+++ b/gnome2-apps/gnote/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gnote
-         VERSION=0.4.0
+         VERSION=0.6.0
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-     
SOURCE_HASH=sha512:c1a4b42a7fb4066e05eca83ae1ca1890b127881026db606ee75b851c1b396b615276e1e049028de634b5cdfa5e8e1f05f5fc1300880e3938ac6668d1e5f3750b
+     
SOURCE_HASH=sha512:15393bc0e11e1cbd194d2fe943a78e5e35190c4f3d28e07cb273e8e48e93de99a38cb62f923b3672da2128e22e04962904c3c88577efb7854db1f77eed69897b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://live.gnome.org/Gnote";
       LICENSE[0]=GPLv3
diff --git a/gnome2-apps/gnote/HISTORY b/gnome2-apps/gnote/HISTORY
index a33d24c..64249b1 100644
--- a/gnome2-apps/gnote/HISTORY
+++ b/gnome2-apps/gnote/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.0
+
 2009-05-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.4.0, added BRANCH and updated SOURCE_URL[0]
 
diff --git a/gnome2-libs/devicekit/DEPENDS b/gnome2-libs/devicekit/DEPENDS
index 654a636..c200701 100755
--- a/gnome2-libs/devicekit/DEPENDS
+++ b/gnome2-libs/devicekit/DEPENDS
@@ -2,7 +2,7 @@ depends dbus       &&
 depends dbus-glib  &&
 depends pkgconfig  &&
 depends udev       &&
-optional_depends libxslt \
+optional_depends docbook-dtd \
                  "--enable-man-pages" \
                  "--disable-man-pages" \
                  "Build and install man pages?" &&
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index 7535b7f..573ce98 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Requires docbook-dtd not libxslt for man pages
+
 2009-04-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DeviceKit-no-doc.patch: #15189 is optional, just needs some tweaking
        * DEPENDS: gtk-doc(api docs) and libxslt(man pages) are both optional
diff --git a/gnome2-libs/evolution-exchange/HISTORY 
b/gnome2-libs/evolution-exchange/HISTORY
index 53c1291..a3aa1fb 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,9 @@
+2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Apply eex-gnome522277.patch
+       * eex-gnome522277.patch: Upstream applied patch which fixes:
+         http://bugzilla.gnome.org/show_bug.cgi?id=522277
+         
https://bugs.launchpad.net/ubuntu/+source/evolution-exchange/+bug/34199
+
 2009-05-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.26.2
 
diff --git a/gnome2-libs/evolution-exchange/PRE_BUILD 
b/gnome2-libs/evolution-exchange/PRE_BUILD
new file mode 100755
index 0000000..82d8c37
--- /dev/null
+++ b/gnome2-libs/evolution-exchange/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build                                   &&
+patch  $SOURCE_DIRECTORY/mail/mail-stub-exchange.c  \
+       $SCRIPT_DIRECTORY/eex-gnome522277.patch
diff --git a/gnome2-libs/evolution-exchange/eex-gnome522277.patch 
b/gnome2-libs/evolution-exchange/eex-gnome522277.patch
new file mode 100644
index 0000000..5fdb999
--- /dev/null
+++ b/gnome2-libs/evolution-exchange/eex-gnome522277.patch
@@ -0,0 +1,120 @@
+#
+# Copied from http://bugzilla.gnome.org/show_bug.cgi?id=522277 and modified
+# to remove the ChangeLog entry as it does not apply cleanly against
+# evolution-exchange 2.26.2
+#
+Index: mail/mail-stub-exchange.c
+===================================================================
+--- mail/mail-stub-exchange.c  (revision 1843)
++++ mail/mail-stub-exchange.c  (working copy)
+@@ -402,13 +402,17 @@ message_removed (MailStub *stub, MailStu
+       MailStubExchangeMessage *mmsg;
+       guint index;
+ 
++      g_static_rec_mutex_lock (&g_changed_msgs_mutex);
+       mmsg = g_hash_table_lookup (mfld->messages_by_href, href);
+-      if (!mmsg)
++      if (!mmsg) {
++              g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+               return;
++      }
+       index = find_message_index (mfld, mmsg->seq);
+       g_return_if_fail (index != -1);
+ 
+       message_remove_at_index (stub, mfld, index);
++      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+ }
+ 
+ static void
+@@ -1134,12 +1138,16 @@ sync_deletions (MailStubExchange *mse, M
+ 
+       e2k_results_free (results, nresults);
+ 
++      g_static_rec_mutex_lock (&g_changed_msgs_mutex);
+       if (visible_count >= mfld->messages->len) {
+-              if (mfld->deleted_count == deleted_count)
++              if (mfld->deleted_count == deleted_count) {
++                      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+                       return;
++              }
+ 
+               if (mfld->deleted_count == 0) {
+                       mfld->deleted_count = deleted_count;
++                      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+                       return;
+               }
+       }
+@@ -1165,7 +1173,7 @@ sync_deletions (MailStubExchange *mse, M
+       my_i = mfld->messages->len - 1;
+       while ((result = e2k_result_iter_next (iter))) {
+               mmsg = find_message_by_href (mfld, result->href);
+-              if (!mmsg || mmsg->seq >= highest_verified_seq) {
++              if (!mmsg || (mmsg->seq >= highest_verified_seq && 
highest_verified_seq != -1)) {
+                       /* This is a new message or a message we already
+                        * verified. Skip it.
+                        */
+@@ -1193,6 +1201,7 @@ sync_deletions (MailStubExchange *mse, M
+                       message_removed (stub, mfld, my_mmsg->href);
+                       changes = TRUE;
+                       my_i--;
++                      highest_unverified_index--;
+                       my_mmsg = mfld->messages->pdata[my_i];
+               }
+               highest_verified_seq = mmsg->seq;
+@@ -1206,6 +1215,7 @@ sync_deletions (MailStubExchange *mse, M
+               }
+ 
+               my_i--;
++              highest_unverified_index--;
+       }
+       status = e2k_result_iter_free (iter);
+ 
+@@ -1220,6 +1230,8 @@ sync_deletions (MailStubExchange *mse, M
+               changes = TRUE;
+       }
+ 
++      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
++
+       if (changes)
+               mail_stub_push_changes (stub);
+ }
+@@ -1446,6 +1458,7 @@ refresh_folder_internal (MailStub *stub,
+                              CAMEL_STUB_ARG_FOLDER, mfld->name,
+                              CAMEL_STUB_ARG_END);
+ 
++      g_static_rec_mutex_lock (&g_changed_msgs_mutex);
+       qsort (messages->data, messages->len,
+              sizeof (rm), refresh_message_compar);
+       for (i = 0; i < messages->len; i++) {
+@@ -1500,6 +1513,7 @@ refresh_folder_internal (MailStub *stub,
+                              CAMEL_STUB_ARG_END);
+ 
+       mfld->scanned = TRUE;
++      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+       folder_changed (mfld);
+ 
+       if (background)
+@@ -1591,6 +1605,7 @@ expunge_uids (MailStub *stub, const char
+       if (!mfld)
+               return;
+ 
++      g_static_rec_mutex_lock (&g_changed_msgs_mutex);
+       hrefs = g_ptr_array_new ();
+       for (i = 0; i < uids->len; i++) {
+               mmsg = find_message (mfld, uids->pdata[i]);
+@@ -1604,6 +1619,7 @@ expunge_uids (MailStub *stub, const char
+                */
+               g_ptr_array_free (hrefs, TRUE);
+               mail_stub_return_ok (stub);
++              g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+               return;
+       }
+ 
+@@ -1627,6 +1643,7 @@ expunge_uids (MailStub *stub, const char
+               mail_stub_return_progress (stub, ndeleted * 100 / hrefs->len);
+       }
+       status = e2k_result_iter_free (iter);
++      g_static_rec_mutex_unlock (&g_changed_msgs_mutex);
+ 
+       mail_stub_return_data (stub, CAMEL_STUB_RETVAL_THAW_FOLDER,
+                              CAMEL_STUB_ARG_FOLDER, mfld->name,
diff --git a/gnome2-libs/gconf-editor/DEPENDS 
b/gnome2-libs/gconf-editor/DEPENDS
index 2d4bc6c..ab19601 100755
--- a/gnome2-libs/gconf-editor/DEPENDS
+++ b/gnome2-libs/gconf-editor/DEPENDS
@@ -3,4 +3,8 @@ depends  gconf2      &&
 depends  libgnome    &&
 depends  libgnomeui  &&
 depends  intltool    &&
-depends  policykit
+depends  policykit   &&
+optional_depends rarian                   \
+                 '--enable-scrollkeeper'  \
+                 '--disable-scrollkeeper' \
+                 'Register with rarian?'
diff --git a/gnome2-libs/gconf-editor/HISTORY 
b/gnome2-libs/gconf-editor/HISTORY
index f0602f8..86c1eeb 100644
--- a/gnome2-libs/gconf-editor/HISTORY
+++ b/gnome2-libs/gconf-editor/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian optional
+
 2009-03-25 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on policykit
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index bbdb05b..19cf195 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,11 +1,17 @@
            SPELL=glib2 
+if [[ $GLIB_VER == devel ]];then
+         VERSION=2.21.4
+     
SOURCE_HASH=sha512:af451f248b51790e7116c70af5b09001efdca2264a5e1704397f606d78ce45656612d07d8aee92dd85545f9509356b65b8dab9a88522931615e961b3691578f0
+          SOURCE=glib-$VERSION.tar.bz2
+else
          VERSION=2.20.4
   SECURITY_PATCH=1
-          BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=glib-$VERSION.tar.bz2
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+fi
+          BRANCH=`echo $VERSION | cut -d . -f 1,2`
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/glib-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/glib/$BRANCH/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=LGPL
         WEB_SITE=http://www.gtk.org/
          ENTERED=20020314
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 665f7bf..df9e8af 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,12 @@
+2009-07-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DETAILS: moved SOURCE into the branches so the stable version can be
+         cast
+
+2008-09-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * PREPARE: added
+       * DETAILS: version 2.21.4 (devel)
+         add support for devel version
+
 2009-06-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.20.4
 
diff --git a/gnome2-libs/glib2/PREPARE b/gnome2-libs/glib2/PREPARE
new file mode 100755
index 0000000..c69bc66
--- /dev/null
+++ b/gnome2-libs/glib2/PREPARE
@@ -0,0 +1 @@
+config_query_list GLIB_VER 'which  version to build?' stable devel
diff --git a/gnome2-libs/gnome-common2/DETAILS 
b/gnome2-libs/gnome-common2/DETAILS
index 15a9dd0..024e4a7 100755
--- a/gnome2-libs/gnome-common2/DETAILS
+++ b/gnome2-libs/gnome-common2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-common2
-         VERSION=2.24.0
+         VERSION=2.26.0
          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gnome-common-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-common-$VERSION
diff --git a/gnome2-libs/gnome-common2/HISTORY 
b/gnome2-libs/gnome-common2/HISTORY
index fc8099d..6faa274 100644
--- a/gnome2-libs/gnome-common2/HISTORY
+++ b/gnome2-libs/gnome-common2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.26.0
+
 2008-09-28 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.24.0
 
diff --git a/gnome2-libs/gnome-common2/gnome-common-2.24.0.tar.bz2.sig 
b/gnome2-libs/gnome-common2/gnome-common-2.24.0.tar.bz2.sig
deleted file mode 100644
index 1d6c8ce..0000000
Binary files a/gnome2-libs/gnome-common2/gnome-common-2.24.0.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/gnome-common2/gnome-common-2.26.0.tar.bz2.sig 
b/gnome2-libs/gnome-common2/gnome-common-2.26.0.tar.bz2.sig
new file mode 100644
index 0000000..c1a904f
Binary files /dev/null and 
b/gnome2-libs/gnome-common2/gnome-common-2.26.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-desktop/CONFIGURE 
b/gnome2-libs/gnome-desktop/CONFIGURE
new file mode 100755
index 0000000..ea7e2eb
--- /dev/null
+++ b/gnome2-libs/gnome-desktop/CONFIGURE
@@ -0,0 +1 @@
+config_query BUILDDOC "Do you want to build annoy and unnecessary docs?" n
diff --git a/gnome2-libs/gnome-desktop/HISTORY 
b/gnome2-libs/gnome-desktop/HISTORY
index bbe1068..c3a70dd 100644
--- a/gnome2-libs/gnome-desktop/HISTORY
+++ b/gnome2-libs/gnome-desktop/HISTORY
@@ -1,3 +1,8 @@
+2009-07-27 Peng Chang (Charles) <chp AT sourcemage.org>
+       * CONFIGURE, PRE_BUILD: added an option not to build docs in
+         desktop-docs directory, which I find takes extremely long time
+         to build just fdl, gpl, lgpl... and eventually fails.
+
 2009-07-06 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.26.3
 
diff --git a/gnome2-libs/gnome-desktop/PRE_BUILD 
b/gnome2-libs/gnome-desktop/PRE_BUILD
new file mode 100755
index 0000000..1755d75
--- /dev/null
+++ b/gnome2-libs/gnome-desktop/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build  &&
+
+if [ $BUILDDOC == "n" ] ; then
+  cd $SOURCE_DIRECTORY  &&
+  sedit '/desktop-docs/d' Makefile.in
+fi
diff --git a/gnome2-libs/gnome-games2/CONFIGURE 
b/gnome2-libs/gnome-games2/CONFIGURE
index 752692f..d5747d4 100755
--- a/gnome2-libs/gnome-games2/CONFIGURE
+++ b/gnome2-libs/gnome-games2/CONFIGURE
@@ -3,6 +3,9 @@ config_query GGAMES_SOUND "Enable sound?" y                   
            &&
 if [[ "$GGAMES_SOUND" == "y" ]]; then
    if spell_ok gstreamer;  then
       config_query_list GGAMES_SNDLIB "Use which sound library?"          \
+                        gstreamer sdl_mixer
+   else
+      config_query_list GGAMES_SNDLIB "Use which sound library?"          \
                         sdl_mixer gstreamer
    fi
 fi                                                                        &&
diff --git a/gnome2-libs/gnome-games2/DEPENDS 
b/gnome2-libs/gnome-games2/DEPENDS
index f81da24..4870c46 100755
--- a/gnome2-libs/gnome-games2/DEPENDS
+++ b/gnome2-libs/gnome-games2/DEPENDS
@@ -13,14 +13,19 @@ depends  ggz-client-libs "" "" "games"         &&
 depends  $GGAMES_TLS "--with-tls=$GGAMES_TLS"  &&
 depends  guile                                 &&
 
+optional_depends check                               \
+                 ""                                  \
+                 "--disable-tests"                   \
+                 "enable building test apps"         &&
+
 optional_depends librsvg2                            \
-                 "--enable-scalable"                 \
-                 "--disable-scalable"                \
+                 ""                                  \
+                 ""                                  \
                  "Enable scalable graphics?"         &&
 
 optional_depends libgcrypt                           \
-                 "--enable-gcrypt"                   \
-                 "--disable-gcrypt"                  \
+                 "--with-gcrypt"                     \
+                 "--without-gcrypt"                  \
                  "Enable encryption support?"        &&
 
 if [[ "$GGAMES_SOUND" == "y" ]]; then
diff --git a/gnome2-libs/gnome-games2/DETAILS 
b/gnome2-libs/gnome-games2/DETAILS
index 0405272..4fcd1ad 100755
--- a/gnome2-libs/gnome-games2/DETAILS
+++ b/gnome2-libs/gnome-games2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-games2
-         VERSION=2.26.2
+         VERSION=2.26.3
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
          SOURCE=gnome-games-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-games-$VERSION
diff --git a/gnome2-libs/gnome-games2/HISTORY 
b/gnome2-libs/gnome-games2/HISTORY
index 85f03b5..b2c6eca 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,15 @@
+2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: gcrypt configure uses --with not --enable
+         There is no scalable configure option, the closest is:
+         --with-card-theme-formats
+             which card theme formats to support (svg, fixed,
+             kde, pysol, defaults, all)
+
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.26.3
+       * DEPENDS: added optional_depends check
+       * CONFIGURE: fixed GGAMES_SNDLIB #15302
+
 2009-05-26 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.26.2
 
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.26.2.tar.bz2.sig 
b/gnome2-libs/gnome-games2/gnome-games-2.26.2.tar.bz2.sig
deleted file mode 100644
index f6e49f1..0000000
Binary files a/gnome2-libs/gnome-games2/gnome-games-2.26.2.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.26.3.tar.bz2.sig 
b/gnome2-libs/gnome-games2/gnome-games-2.26.3.tar.bz2.sig
new file mode 100644
index 0000000..489d28a
Binary files /dev/null and 
b/gnome2-libs/gnome-games2/gnome-games-2.26.3.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-media2/DEPENDS 
b/gnome2-libs/gnome-media2/DEPENDS
index a837be3..10d0542 100755
--- a/gnome2-libs/gnome-media2/DEPENDS
+++ b/gnome2-libs/gnome-media2/DEPENDS
@@ -11,6 +11,7 @@ depends data-uuid          &&
 depends gstreamer          &&
 depends gst-plugins-base   &&
 depends gst-plugins-good   &&
+depends libcanberra        &&
 
 optional_depends libcddb                                  \
                  "--enable-cddbslave --enable-gnomecd"    \
diff --git a/gnome2-libs/gnome-media2/HISTORY 
b/gnome2-libs/gnome-media2/HISTORY
index b26ab31..56efa5f 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DEPENDS: added required dependency libcanberra
+
 2009-07-18 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: made rarian optional and added pulseaudio unique,
          and data-uuid, disabled nautilus-cd-burner
diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index ecf569a..5b5a8bd 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -1,5 +1,6 @@
 depends  libx11         &&
 depends  dbus-glib      &&
+depends  docbook-dtd    &&
 depends  gconf2         &&
 depends  gnome-desktop  &&
 depends  gnome-menus    &&
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index 632563a..2a0d8a8 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Depends on docbook-dtd
+
 2009-07-18 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: made rarian optional, removed esound
 
diff --git a/gnome2-libs/gnome-vfsmm/DEPENDS b/gnome2-libs/gnome-vfsmm/DEPENDS
index 43db824..d80148b 100755
--- a/gnome2-libs/gnome-vfsmm/DEPENDS
+++ b/gnome2-libs/gnome-vfsmm/DEPENDS
@@ -1,2 +1,3 @@
 depends glibmm     &&
+depends doxygen    &&
 depends gnome-vfs2
diff --git a/gnome2-libs/gnome-vfsmm/DETAILS b/gnome2-libs/gnome-vfsmm/DETAILS
index 153fc5a..a4b5170 100755
--- a/gnome2-libs/gnome-vfsmm/DETAILS
+++ b/gnome2-libs/gnome-vfsmm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-vfsmm
-         VERSION=2.22.0
+         VERSION=2.26.0
          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-vfsmm/HISTORY b/gnome2-libs/gnome-vfsmm/HISTORY
index 987b804..ab44cef 100644
--- a/gnome2-libs/gnome-vfsmm/HISTORY
+++ b/gnome2-libs/gnome-vfsmm/HISTORY
@@ -1,3 +1,9 @@
+2009-07-27 Donald Johnson <ltdonny AT gmail.com>
+       * DEPENDS: Added doxygen dependency.
+
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.26.0
+
 2008-03-12 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.22.0
 
diff --git a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.22.0.tar.bz2.sig 
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.22.0.tar.bz2.sig
deleted file mode 100644
index 68bb44f..0000000
Binary files a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.22.0.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.26.0.tar.bz2.sig 
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.26.0.tar.bz2.sig
new file mode 100644
index 0000000..8da357f
Binary files /dev/null and 
b/gnome2-libs/gnome-vfsmm/gnome-vfsmm-2.26.0.tar.bz2.sig differ
diff --git a/gnome2-libs/gtk-doc/DEPENDS b/gnome2-libs/gtk-doc/DEPENDS
index ce6aeac..3c845e5 100755
--- a/gnome2-libs/gtk-doc/DEPENDS
+++ b/gnome2-libs/gtk-doc/DEPENDS
@@ -1,5 +1,19 @@
-depends perl     &&
-depends openjade &&
-depends libxslt  &&
-depends python   &&
-depends docbook-xsl
+depends perl   &&
+depends python &&
+
+optional_depends rarian                   \
+                 '--enable-scrollkeeper'  \
+                 '--disable-scrollkeeper' \
+                 'register with rarian?'  &&
+
+optional_depends docbook-xsl \
+                 '' ''       \
+                 'for XML support (recommended)' &&
+
+optional_depends libxslt \
+                 '' ''   \
+                 'for XML support (recommended)' &&
+
+optional_depends docbook-sgml-dtd \
+                 '' ''            \
+                 'for SGML support (no longer maintained)'
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index df95b47..66bede7 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: made rarian, XML and SGML support optional
+
 2008-11-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.11, new WEB_SITE
 
diff --git a/gnome2-libs/libglademm/DETAILS b/gnome2-libs/libglademm/DETAILS
index 7410364..be907ec 100755
--- a/gnome2-libs/libglademm/DETAILS
+++ b/gnome2-libs/libglademm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libglademm
-         VERSION=2.6.6
+         VERSION=2.6.7
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libglademm/HISTORY b/gnome2-libs/libglademm/HISTORY
index 89d30ba..79c3a39 100644
--- a/gnome2-libs/libglademm/HISTORY
+++ b/gnome2-libs/libglademm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.6.7
+
 2008-03-12 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.6.6
 
diff --git a/gnome2-libs/libglademm/libglademm-2.6.6.tar.bz2.sig 
b/gnome2-libs/libglademm/libglademm-2.6.6.tar.bz2.sig
deleted file mode 100644
index 75fd58d..0000000
Binary files a/gnome2-libs/libglademm/libglademm-2.6.6.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/libglademm/libglademm-2.6.7.tar.bz2.sig 
b/gnome2-libs/libglademm/libglademm-2.6.7.tar.bz2.sig
new file mode 100644
index 0000000..6702608
Binary files /dev/null and 
b/gnome2-libs/libglademm/libglademm-2.6.7.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomemm/DETAILS b/gnome2-libs/libgnomemm/DETAILS
index 5501353..e894ea6 100755
--- a/gnome2-libs/libgnomemm/DETAILS
+++ b/gnome2-libs/libgnomemm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgnomemm
-         VERSION=2.22.0
+         VERSION=2.26.0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomemm/HISTORY b/gnome2-libs/libgnomemm/HISTORY
index 1725aae..adabdc0 100644
--- a/gnome2-libs/libgnomemm/HISTORY
+++ b/gnome2-libs/libgnomemm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.26.0
+
 2008-03-12 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.22.0
 
diff --git a/gnome2-libs/libgnomemm/libgnomemm-2.22.0.tar.bz2.sig 
b/gnome2-libs/libgnomemm/libgnomemm-2.22.0.tar.bz2.sig
deleted file mode 100644
index 420b8a7..0000000
Binary files a/gnome2-libs/libgnomemm/libgnomemm-2.22.0.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/libgnomemm/libgnomemm-2.26.0.tar.bz2.sig 
b/gnome2-libs/libgnomemm/libgnomemm-2.26.0.tar.bz2.sig
new file mode 100644
index 0000000..294c14b
Binary files /dev/null and 
b/gnome2-libs/libgnomemm/libgnomemm-2.26.0.tar.bz2.sig differ
diff --git a/gnome2-libs/libgnomeuimm/DETAILS 
b/gnome2-libs/libgnomeuimm/DETAILS
index 76a51b7..3cd3283 100755
--- a/gnome2-libs/libgnomeuimm/DETAILS
+++ b/gnome2-libs/libgnomeuimm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgnomeuimm
-         VERSION=2.22.0
+         VERSION=2.26.0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgnomeuimm/HISTORY 
b/gnome2-libs/libgnomeuimm/HISTORY
index f1291ca..361ee7a 100644
--- a/gnome2-libs/libgnomeuimm/HISTORY
+++ b/gnome2-libs/libgnomeuimm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.26.0
+
 2008-03-12 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.22.0
 
diff --git a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.22.0.tar.bz2.sig 
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.22.0.tar.bz2.sig
deleted file mode 100644
index 5204358..0000000
Binary files a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.22.0.tar.bz2.sig and 
/dev/null differ
diff --git a/gnome2-libs/libgnomeuimm/libgnomeuimm-2.26.0.tar.bz2.sig 
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.26.0.tar.bz2.sig
new file mode 100644
index 0000000..33316c1
Binary files /dev/null and 
b/gnome2-libs/libgnomeuimm/libgnomeuimm-2.26.0.tar.bz2.sig differ
diff --git a/gnome2-libs/librep2/DETAILS b/gnome2-libs/librep2/DETAILS
index c3690d2..c0fd0ef 100755
--- a/gnome2-libs/librep2/DETAILS
+++ b/gnome2-libs/librep2/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.17.3
+         VERSION=0.90.0
           SOURCE=librep-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/librep-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/librep/${SOURCE}
diff --git a/gnome2-libs/librep2/HISTORY b/gnome2-libs/librep2/HISTORY
index 5efe86a..cedf67a 100644
--- a/gnome2-libs/librep2/HISTORY
+++ b/gnome2-libs/librep2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.90.0
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.17.3 and switched to bz2
 
diff --git a/gnome2-libs/librep2/librep-0.17.3.tar.bz2.sig 
b/gnome2-libs/librep2/librep-0.17.3.tar.bz2.sig
deleted file mode 100644
index 5b1fb5b..0000000
Binary files a/gnome2-libs/librep2/librep-0.17.3.tar.bz2.sig and /dev/null 
differ
diff --git a/gnome2-libs/librep2/librep-0.90.0.tar.bz2.sig 
b/gnome2-libs/librep2/librep-0.90.0.tar.bz2.sig
new file mode 100644
index 0000000..b8b4ad1
Binary files /dev/null and b/gnome2-libs/librep2/librep-0.90.0.tar.bz2.sig 
differ
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 1f4b9c9..5941153 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pango
-         VERSION=1.24.4
+         VERSION=1.24.5
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index ccf0a96..b65caec 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.24.5
+
 2009-07-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.24.4
 
diff --git a/gnome2-libs/pango/pango-1.24.4.tar.bz2.sig 
b/gnome2-libs/pango/pango-1.24.4.tar.bz2.sig
deleted file mode 100644
index b03c072..0000000
Binary files a/gnome2-libs/pango/pango-1.24.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.24.5.tar.bz2.sig 
b/gnome2-libs/pango/pango-1.24.5.tar.bz2.sig
new file mode 100644
index 0000000..1750d0b
Binary files /dev/null and b/gnome2-libs/pango/pango-1.24.5.tar.bz2.sig differ
diff --git a/gnome2-libs/policykit/DEPENDS b/gnome2-libs/policykit/DEPENDS
index 678d8e6..2631bb0 100755
--- a/gnome2-libs/policykit/DEPENDS
+++ b/gnome2-libs/policykit/DEPENDS
@@ -1,4 +1,3 @@
-depends libxslt    &&
 depends pkgconfig  &&
 depends dbus       &&
 depends dbus-glib  &&
diff --git a/gnome2-libs/policykit/HISTORY b/gnome2-libs/policykit/HISTORY
index 1269075..67506cf 100644
--- a/gnome2-libs/policykit/HISTORY
+++ b/gnome2-libs/policykit/HISTORY
@@ -1,3 +1,8 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: removed libxslt, that belongs to gtk-doc
+       * PRE_BUILD: move the bash-completion script to
+         /etc/bash_completion.d
+
 2009-06-02 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DEPENDS: fixed typo "Enbale" -> "Enable"
 
diff --git a/gnome2-libs/policykit/PRE_BUILD b/gnome2-libs/policykit/PRE_BUILD
index 19a1bda..362f5e8 100755
--- a/gnome2-libs/policykit/PRE_BUILD
+++ b/gnome2-libs/policykit/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/bugs.freedesktop.org-16131.patch
+patch -p1 < $SPELL_DIRECTORY/bugs.freedesktop.org-16131.patch &&
+sedit 's#^profiledir .*#profiledir = $(sysconfdir)/bash_completion.d#' 
tools/Makefile.am &&
+sedit 's#^profiledir .*#profiledir = $(sysconfdir)/bash_completion.d#' 
tools/Makefile.in
diff --git a/gnome2-libs/startup-notification/DEPENDS 
b/gnome2-libs/startup-notification/DEPENDS
index e2c5203..06a2402 100755
--- a/gnome2-libs/startup-notification/DEPENDS
+++ b/gnome2-libs/startup-notification/DEPENDS
@@ -1,2 +1,3 @@
-depends libx11  &&
-depends libice
\ No newline at end of file
+depends  libx11    &&
+depends  libice    &&
+depends  xcb-util
diff --git a/gnome2-libs/startup-notification/HISTORY 
b/gnome2-libs/startup-notification/HISTORY
index 83b30d9..446cdc8 100644
--- a/gnome2-libs/startup-notification/HISTORY
+++ b/gnome2-libs/startup-notification/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Quentin Rameau <quinq AT sourcemage.org>
+       * DEPENDS: added libice and xcb-util
+
 2009-07-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.10, changed source url to
          freedesktop.org
diff --git a/gnustep-libs/gnustep-make/HISTORY 
b/gnustep-libs/gnustep-make/HISTORY
index 39177e7..9068a0d 100644
--- a/gnustep-libs/gnustep-make/HISTORY
+++ b/gnustep-libs/gnustep-make/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * UP_TRIGGERS: added missing parameter #15317
+
 2009-04-29 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: updated to 2.0.8, use upstream key
 
diff --git a/gnustep-libs/gnustep-make/UP_TRIGGERS 
b/gnustep-libs/gnustep-make/UP_TRIGGERS
index 664a08f..481bbb5 100755
--- a/gnustep-libs/gnustep-make/UP_TRIGGERS
+++ b/gnustep-libs/gnustep-make/UP_TRIGGERS
@@ -10,5 +10,5 @@ then
     message "compliant."                                              &&
     message "Going to recast gnustep base and dependants too."        &&
     message "${DEFAULT_COLOR}"                                        &&
-    up_trigger gnustep-base    
+    up_trigger gnustep-base cast_self
 fi
diff --git a/graphics-libs/libpano13/DETAILS b/graphics-libs/libpano13/DETAILS
index 4142191..de0a95f 100755
--- a/graphics-libs/libpano13/DETAILS
+++ b/graphics-libs/libpano13/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libpano13
-         VERSION=2.9.12
+         VERSION=2.9.14
           SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/panotools/$SOURCE
-     
SOURCE_HASH=sha512:0ef066318c1f13ede6fb559907aa4827963bde28d003289578c94aa1bddb77be539645dfb43d7724329b4ee56ecb363d611851d9dfeda3f846a990a7d2517a6a
+     
SOURCE_HASH=sha512:4fac7dabe509ca4edcdba0258e4cb23f81ac6feb7091ad27450c3bef7660504046c56623261891bfb156ad6c593ae6a6deb1bfca432ca0b7228afeaa098cd884
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://panotools.sourceforge.net/";
       LICENSE[0]=GPL
diff --git a/graphics-libs/libpano13/HISTORY b/graphics-libs/libpano13/HISTORY
index b5e1289..5b29b3c 100644
--- a/graphics-libs/libpano13/HISTORY
+++ b/graphics-libs/libpano13/HISTORY
@@ -1,3 +1,11 @@
+2009-07-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * UP_TRIGGERS: added missing parameter #15317
+
+2009-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * DETAILS: updated spell to 2.9.14
+       * UP_TRIGGERS: added, the soname changed
+         only run the triggers if the trigerees are installed
+
 2008-07-18 Jaeic Lee <zeraxeal AT gmail.com>
        * DETAILS: Rewrote long description.
 
diff --git a/graphics-libs/libpano13/UP_TRIGGERS 
b/graphics-libs/libpano13/UP_TRIGGERS
new file mode 100755
index 0000000..9de81b1
--- /dev/null
+++ b/graphics-libs/libpano13/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local old_version=$(installed_version $SPELL) &&
+if [[ $old_version == 2.9.12 ]]; then
+  if spell_installed autopano-sift-c; then
+    up_trigger autopano-sift-c cast_self
+  fi &&
+  if spell_installed hugin; then
+    up_trigger hugin cast_self
+  fi
+fi
diff --git a/graphics/f-spot/DEPENDS b/graphics/f-spot/DEPENDS
index ff636d5..c5d1d3e 100755
--- a/graphics/f-spot/DEPENDS
+++ b/graphics/f-spot/DEPENDS
@@ -3,7 +3,7 @@ depends  libgnome        &&
 depends  libgnomeui      &&
 depends  libgnomecanvas  &&
 depends  libexif         &&
-depends  sqlite2         &&
+depends  sqlite          &&
 depends  lcms            &&
 depends  libgphoto2      &&
 depends  gtk-sharp-2     &&
diff --git a/graphics/f-spot/HISTORY b/graphics/f-spot/HISTORY
index 5638c30..ee234bb 100644
--- a/graphics/f-spot/HISTORY
+++ b/graphics/f-spot/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+       * DEPENDS: changed to sqlite from sqlite2 as sqlite3 is now required
+
 2008-10-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.5.0.3
 
diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index 841e306..4012cea 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -6,8 +6,8 @@
 #          SOURCE=GraphicsMagick-${VERSION}.tar.bz2
 #   
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
 #else
-         VERSION=1.3.5
-     
SOURCE_HASH=sha512:ee99b2e8645908973b3d53a8d39b6d524df748a7ffc22ed4c8345917cf5c442fc945408df4894e949daaa82c4d0cfb015d783eab6217f8563decada32e659d7c
+         VERSION=1.3.6
+     
SOURCE_HASH=sha512:614d875d67be80ae577ee084dd61db668e6ed464ebf5c1ba0266e180c5bc081b8ca1383e4c267bf203f5b71f737fad75a77636ed1d7fd081a6ffce013dcf818c
           SOURCE=GraphicsMagick-${VERSION}.tar.bz2
    SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/${SOURCE}
    SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index a2ad471..2d0727f 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.3.6
+
 2009-01-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.3.5
 
diff --git a/graphics/hugin/DEPENDS b/graphics/hugin/DEPENDS
index 41e0872..b7e3f0e 100755
--- a/graphics/hugin/DEPENDS
+++ b/graphics/hugin/DEPENDS
@@ -8,6 +8,8 @@ depends tiff &&
 depends jpeg &&
 depends libpng &&
 depends cmake &&
+depends glew &&
+
 runtime_depends image-exiftool &&
 suggest_depends autopano-sift-c "" "" "for control point generation"
 
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index a2c6952..6c7dcb1 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,9 +1,9 @@
            SPELL=hugin
-         VERSION=0.7.0
+         VERSION=0.8.0
           SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
-     
SOURCE_HASH=sha512:b86a82fc94df5adfbd6079069dd5f03786c46c27e2cfa91f4c7984f5877f967f38c0742e19e7bea49d8cad82898d5066346975b1f6690362c980bd89d1840ffc
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-0.7.0"
+     
SOURCE_HASH=sha512:6bdbc41cab3de824269a8634d656632089533f454d926c47a6c7df2e169e862c4a3e4ccf1271c081fd21daa0707daf55f2e7b2feffa5ce348cde3277c9cde275
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://hugin.sourceforge.net/";
       LICENSE[0]=GPL
          ENTERED=20080711
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index db32970..9f7941f 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,8 @@
+2009-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * DETAILS: updated spell to 0.8.0
+         deconstified the source dir
+       * DEPENDS: added the new dependency - glew
+
 2008-10-13 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.7.0
 
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 78fdc1c..c528816 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.5.4-3
+         VERSION=6.5.4-6
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 4c61a8c..f95fecd 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 6.5.4-6
+
 2009-07-20 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 6.5.4-3
 
diff --git a/graphics/imagemagick/ImageMagick-6.5.4-3.tar.bz2.sig 
b/graphics/imagemagick/ImageMagick-6.5.4-3.tar.bz2.sig
deleted file mode 100644
index 9b9446d..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.5.4-3.tar.bz2.sig and 
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.5.4-6.tar.bz2.sig 
b/graphics/imagemagick/ImageMagick-6.5.4-6.tar.bz2.sig
new file mode 100644
index 0000000..d6a87f2
Binary files /dev/null and 
b/graphics/imagemagick/ImageMagick-6.5.4-6.tar.bz2.sig differ
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index d7b365f..518b72e 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,10 +1,10 @@
            SPELL=apache22
-         VERSION=2.2.11
-  SECURITY_PATCH=5
+         VERSION=2.2.12
+  SECURITY_PATCH=6
           SOURCE=httpd-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
       SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/httpd-$VERSION"
    SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
    SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
   SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index edac02b..f6c9ac3 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.2.12; SECURITY_PATCH++
+
 2008-12-14 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2.11
 
@@ -318,4 +321,3 @@
 
 2002-04-22 Eric Schabell <eric AT schabell.com>
        * Created spell for version 2.0.35.
-
diff --git a/http/arora/DETAILS b/http/arora/DETAILS
index 8d01977..9fc816b 100755
--- a/http/arora/DETAILS
+++ b/http/arora/DETAILS
@@ -13,10 +13,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
 else
-         VERSION=0.7.1
+         VERSION=0.8.0
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_URL=http://arora.googlecode.com/files/$SOURCE
-     
SOURCE_HASH=sha512:5d0b24c2ac3d9a9a0416766ab13481a9ce518a06cae4bc632c653bc71e98c8c5e3020222bca9198ae45eb52780d24a71a7ddf90bd2b1c52427c62be53b3c7d3c
+     
SOURCE_HASH=sha512:9bc629b0eb8bbca4e3c02f25641d2d93aeca4f77cbfad70e2e0ce7ce7abf3202f9614561c97db89882f3ed2095a0a7caa43d88d9e29b79776a910fb6bfb69979
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
 fi
         WEB_SITE=http://code.google.com/p/arora/
diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index e7cb062..e90d458 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.8.0
+
 2009-06-02 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.7.1
 
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 772b3a9..1367058 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -10,10 +10,10 @@ if [[ $MIDORI_VCS == y ]]; then
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.1.7
+         VERSION=0.1.8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:69376ddf8093014db330ceb0541c13d3b4e869391f1e926bb093e7ea25ddf5b89f7f678ebe8554bdd6926e03f6e056ce305b651652c3d75c1aa7195bcc582ab7
+     
SOURCE_HASH=sha512:8310f12942295bfae8675085f85af812673436a5f967cb55c968ccba96ad81b2a73985ae6b7a153affc7e560d1c9fad5e2a44b42a2cc4969667077f109900b86
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 7aeec26..e9158bb 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 0.1.8
+
 2009-05-28 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.1.7
        * DEPENDS: optional_depends libnotify
diff --git a/http/mod_macro/BUILD b/http/mod_macro/BUILD
new file mode 100755
index 0000000..978bee8
--- /dev/null
+++ b/http/mod_macro/BUILD
@@ -0,0 +1 @@
+apxs -c mod_macro.c
diff --git a/http/mod_macro/DEPENDS b/http/mod_macro/DEPENDS
new file mode 100755
index 0000000..e45c311
--- /dev/null
+++ b/http/mod_macro/DEPENDS
@@ -0,0 +1 @@
+depends apache22
diff --git a/http/mod_macro/DETAILS b/http/mod_macro/DETAILS
new file mode 100755
index 0000000..455818e
--- /dev/null
+++ b/http/mod_macro/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=mod_macro
+         VERSION=1.1.10
+     
SOURCE_HASH=sha512:583881043d190ef6dc61033dd0c4c4d0797414aed5afb5dde00aa56c1d38105a28c4490d48c00ba17b54e47ddbba56698febcc116b48454a7a380cd34fb41bc8
+          SOURCE=$SPELL-$VERSION.tar.gz
+      LICENSE[0]=APACHE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.coelho.net/$SPELL/$SOURCE
+        WEB_SITE=http://www.coelho.net/mod_macro/
+         ENTERED=20090731
+           SHORT="Apache module for use macros in config files"
+cat << EOF
+mod_macro is a third-party module to the Apache Http Server, distributed 
with a
+BSD-style license like Apache. It allows the definition and use of macros 
within
+apache runtime configuration files. The syntax is a natural extension to 
apache
+html-like configuration style.
+EOF
diff --git a/http/mod_macro/HISTORY b/http/mod_macro/HISTORY
new file mode 100644
index 0000000..b8e1610
--- /dev/null
+++ b/http/mod_macro/HISTORY
@@ -0,0 +1,2 @@
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, INSTALL, BUILD: created spell
diff --git a/http/mod_macro/INSTALL b/http/mod_macro/INSTALL
new file mode 100755
index 0000000..dc0974e
--- /dev/null
+++ b/http/mod_macro/INSTALL
@@ -0,0 +1 @@
+apxs -i mod_macro.la
diff --git a/http/mod_wsgi/DETAILS b/http/mod_wsgi/DETAILS
index c43ab95..1808c7e 100755
--- a/http/mod_wsgi/DETAILS
+++ b/http/mod_wsgi/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mod_wsgi
-         VERSION=2.4
-     
SOURCE_HASH=sha512:beb3fae5ebac0d143e51a0078d20cfc0f38cdde15109a5101132c1776369e82242b00f867f265dc23989563925cf892036f8cb3b096331800717cc20501d9e6f
+         VERSION=2.5
+     
SOURCE_HASH=sha512:8fc11b358317d0ecf353bd1d7fb619d55d708fa0ef3bb50419fc1b03f752c109637bb3447b4bfdf74cd912a2b992e2c582227ef7c2143e49bfeaed3161ca362f
           SOURCE=$SPELL-$VERSION.tar.gz
       LICENSE[0]=APACHE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/mod_wsgi/HISTORY b/http/mod_wsgi/HISTORY
index 970e0c4..f959915 100644
--- a/http/mod_wsgi/HISTORY
+++ b/http/mod_wsgi/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.5
+
 2009-04-20 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4; fixed long description wrap; quoting
          paths
diff --git a/http/surf/BUILD b/http/surf/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/http/surf/BUILD
@@ -0,0 +1 @@
+make
diff --git a/http/surf/DEPENDS b/http/surf/DEPENDS
new file mode 100755
index 0000000..2a469bf
--- /dev/null
+++ b/http/surf/DEPENDS
@@ -0,0 +1,3 @@
+depends mercurial &&
+depends webkitgtk &&
+depends dmenu
diff --git a/http/surf/DETAILS b/http/surf/DETAILS
new file mode 100755
index 0000000..544d129
--- /dev/null
+++ b/http/surf/DETAILS
@@ -0,0 +1,22 @@
+           SPELL="surf"
+if [[ "${SURF_AUTOUPDATE}" == "y" ]]
+then
+         VERSION="$(date +%Y%m%d)"
+else
+         VERSION="scm"
+fi
+          SOURCE="${SPELL}-scm.tar.bz2"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+   SOURCE_URL[0]="hg_http://code.suckless.org/hg/${SPELL}:${SPELL}-scm";
+  FORCE_DOWNLOAD="on"
+   SOURCE_IGNORE="volatile"
+        WEB_SITE="http://surf.suckless.org/";
+         ENTERED="20090727"
+      LICENSE[0]="MIT/XCL"
+           SHORT="simple webbrowser based on webkit/gtk+."
+cat << EOF
+Surf is a simple webbrowser which is based on webkit/gtk+. It is able to 
display
+websites and follow links. It supports the Xembedded protocol which makes it
+possible to embed it into another application. Furthermore one can point 
surf to
+another URI by setting it's XProperties.
+EOF
diff --git a/http/surf/DOWNLOAD b/http/surf/DOWNLOAD
new file mode 100755
index 0000000..c6c5535
--- /dev/null
+++ b/http/surf/DOWNLOAD
@@ -0,0 +1,45 @@
+#once the hg download handler hits stable sorcery this DOWNLOAD script would
+#only need to be removed, SOURCE_URL is compatible with the planned hg 
handler
+
+function my_url_hg_http_crack() {
+
+  URL=$(url_strip_prefix "$1" hg_http)
+  HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+  HG_ROOT=http://$HG_ROOT
+  local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+  HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
+  local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
+  HG_TAG=${HG_TAGNAME:=default}
+
+}
+
+if [[ "${VERSION}" != "scm" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
+  default_download &&
+  return $?
+fi &&
+
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+        "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"  &&
+my_url_hg_http_crack $SOURCE_URL &&
+if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
+  message "${MESSAGE_COLOR}Previous source found 
unpacking...${DEFAULT_COLOR}" &&
+  tar -jxf $SOURCE_CACHE/$SOURCE &&
+  message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
+  ( cd $HG_DIRECTORY &&
+    echo hg pull $HG_ROOT &&
+    hg pull $HG_ROOT &&
+    echo hg update $HG_TAG &&
+    hg update $HG_TAG )
+else
+  message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
+  echo hg clone $HG_ROOT $HG_DIRECTORY
+  hg clone $HG_ROOT $HG_DIRECTORY &&
+  ( cd $HG_DIRECTORY &&
+    echo hg update $HG_TAG &&
+    hg update $HG_TAG )
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf $SOURCE $HG_DIRECTORY &&
+cp $SOURCE $SOURCE_CACHE/$SOURCE &&
+rm $SOURCE &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
new file mode 100644
index 0000000..d8cb002
--- /dev/null
+++ b/http/surf/HISTORY
@@ -0,0 +1,3 @@
+2009-07-22 Quentin Rameau <quinq AT sourcemage.org>
+       * PREPARE, DEPENDS, DETAILS,
+          DOWNLOAD, PRE_BUILD, BUILD, HISTORY: created this spell
diff --git a/http/surf/PREPARE b/http/surf/PREPARE
new file mode 100755
index 0000000..e1309e8
--- /dev/null
+++ b/http/surf/PREPARE
@@ -0,0 +1 @@
+config_query SURF_AUTOUPDATE "Update on every system update?" n
diff --git a/http/surf/PRE_BUILD b/http/surf/PRE_BUILD
new file mode 100755
index 0000000..a1a4cfe
--- /dev/null
+++ b/http/surf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:^PREFIX = /usr/local$:PREFIX = /usr:' config.mk
diff --git a/http/uzbl/DEPENDS b/http/uzbl/DEPENDS
index ffe8d6a..57d9a3d 100755
--- a/http/uzbl/DEPENDS
+++ b/http/uzbl/DEPENDS
@@ -2,6 +2,7 @@ depends git &&
 depends pkgconfig &&
 depends webkitgtk &&
 depends gtk+2 &&
+depends libxt &&
 suggest_depends dmenu \
                  "" \
                  "" \
diff --git a/http/uzbl/HISTORY b/http/uzbl/HISTORY
index 6d8774a..138522c 100644
--- a/http/uzbl/HISTORY
+++ b/http/uzbl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Quentin Rameau <quinq AT sourcemage.org>
+       * DEPENDS: added libxt
+
 2009-05-07 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: updated LONG description
 
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index bf29527..eda679b 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=r45330
+         VERSION=r46193
           SOURCE=WebKit-$VERSION.tar.bz2
    SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
-     
SOURCE_HASH=sha512:b62c36a4ca1f6d10320d45bdfe868b381e4509c117e9aa9b9a48b083cc03463444af0bdf2caf3c7435ecd0d6ce2d74760cd761dd698fa04f90fa1e0ee8827663
+     
SOURCE_HASH=sha512:a8f24a65484d46ff20fc45e6a4d057e973d39f2bb26fe2d458e11478543d073c6a761e77fe57e81c68a69267680ca9d52e6ac83a09dff0b4d0ab06f87c28d6dd
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
 else
          VERSION=1.1.11
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 51ab8b1..a561ed1 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated devel to r46193
+
 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
diff --git a/i18n/uim/DEPENDS b/i18n/uim/DEPENDS
index 4ef40b3..bf6b2ec 100755
--- a/i18n/uim/DEPENDS
+++ b/i18n/uim/DEPENDS
@@ -9,7 +9,7 @@ then
 fi &&
 
 optional_depends libedit \
-               "--with-libedit" \
+               "--with-libedit=${INSTALL_ROOT}/usr" \
                "--without-libedit" \
                "libedit support" &&
 
@@ -71,7 +71,7 @@ optional_depends gnome-panel \
 
 optional_depends qt-x11 \
                  "--with-qt --with-qt-immodule" \
-                 "--without-qt --with-qt-immodule" \
+                 "--without-qt --without-qt-immodule" \
                  "qt tools" &&
 
 optional_depends qt4 \
diff --git a/i18n/uim/DETAILS b/i18n/uim/DETAILS
index aab90cd..ba8e3b3 100755
--- a/i18n/uim/DETAILS
+++ b/i18n/uim/DETAILS
@@ -1,8 +1,8 @@
            SPELL=uim
-         VERSION=1.5.5
+         VERSION=1.5.6
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]="http://${SPELL}.googlecode.com/files/${SOURCE}";
-     
SOURCE_HASH=sha512:4f3f13084a5e46cf628122a9ff685128abaa382cce88ac6ca4b06fafd16f0584751bb428ca1ca68d09f79d7ca7581b7c6b1f8628281b29b87a389bf08aa7f88d
+     
SOURCE_HASH=sha512:caa8d988c9979748b5e057ddc43608cc89ce41beec00486fe95642d0042ee4ab3ab53a9b73ce87db307f42c50f23be4816ad91463930a0802a38140ff6d5f19f
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://code.google.com/p/uim/";
       LICENSE[0]=BSD
diff --git a/i18n/uim/HISTORY b/i18n/uim/HISTORY
index 4a3529a..3df751d 100644
--- a/i18n/uim/HISTORY
+++ b/i18n/uim/HISTORY
@@ -1,3 +1,7 @@
+2009-07-28 Peng Chang (Charles) <chp AT sourcemage.org>
+       * DETAILS: updated spell to 1.5.6
+       * DEPENDS: added the path to --with-libedit, and fixed a typo
+
 2009-06-28 Peng Chang (Charles) <chp AT sourcemage.org>
        * DEPENDS: fixed the gnome-applet parameter
 
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index c795d69..6e91eba 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
 else
-         VERSION=1.0.0-beta2
-     
SOURCE_HASH=sha512:05be87f68e9e645234ef7f94ce622d8b2dd067a5f6fcd9d233c8ac1963da7d5b5601255d2206afad358ee55f553efc5a89b7baeb47a136f903bdd14ef22140dc
+         VERSION=1.0.0-beta3
+     
SOURCE_HASH=sha512:32a131cdc614fe64e4de92df0e9ea4d9687536ff3506b224690e694123d2b14c69d2be9b96feddb70e76668baa0dacd0bb75083b198aa58df730249240ebcf75
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
 fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 502b244..66277e3 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2009-07-24 Treeve Jelbert <treevesourcemage.org>
+       * DETAILS: version 1.0.0-beta3
+       * PRE_BUILD: deleted
+
 2009-07-06 Treeve Jelbert <treevesourcemage.org>
        * DETAILS: version 1.0.0-beta2
        * PRE_BUILD: added, to fix broken cmake
diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
deleted file mode 100755
index 52f2270..0000000
--- a/kde4-apps/digikam4/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-# fix broken cmake - beta2
-sed -i '/(tests)/D' CMakeLists.txt
diff --git a/kde4-apps/kile4/CONFIGURE b/kde4-apps/kile4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4-apps/kile4/CONFIGURE
@@ -0,0 +1 @@
+source  $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-apps/kile4/DEPENDS b/kde4-apps/kile4/DEPENDS
new file mode 100755
index 0000000..c5cf51c
--- /dev/null
+++ b/kde4-apps/kile4/DEPENDS
@@ -0,0 +1,18 @@
+source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
+
+depends  tetex        &&
+
+optional_depends  gnuplot                     \
+                  ""                          \
+                  ""                          \
+                  "to use gnuplot front end"  &&
+
+optional_depends  xfig                         \
+                  ""                           \
+                  ""                           \
+                  "for basic vector graphics"  &&
+
+suggest_depends  kdegraphics4          \
+                 ""                    \
+                 ""                    \
+                 "for PDF/DVI viewer"
diff --git a/kde4-apps/kile4/DETAILS b/kde4-apps/kile4/DETAILS
new file mode 100755
index 0000000..534e0f4
--- /dev/null
+++ b/kde4-apps/kile4/DETAILS
@@ -0,0 +1,33 @@
+           SPELL=kile4
+         VERSION=2.1b1
+          SOURCE=${SPELL/4}-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/4}-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL/4}/$SOURCE
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+        WEB_SITE=http://kile.sourceforge.net/
+         ENTERED=20090720
+      LICENSE[0]=GPL
+        KEYWORDS="tex kde"
+           SHORT="KDE4 (La)TeX editor and shell"
+cat << EOF
+Kile is a user friendly TeX/LaTeX editor for the KDE4 desktop environment. 
+
+The main features are:
+ * Compile, convert and view your document with one click.
+ * Auto-completion of (La)TeX commands
+ * Templates and wizards makes starting a new document very little work.
+ * Easy insertion of many standard tags and symbols and the option to 
+   define (an arbitrary number of) user defined tags.
+ * Inverse and forward search: click in the DVI viewer and jump to the 
+   corresponding LaTeX line in the editor, or jump from the editor to the 
+   corresponding page in the viewer.
+ * Finding chapter or sections is very easy, Kile constructs a list of all 
the 
+   chapter etc. in your document. You can use the list to jump to the 
+   corresponding section.
+ * Collect documents that belong together into a project.
+ * Easy insertion of citations and references when using projects.
+ * Flexible and smart build system to compile your LaTeX documents.
+ * QuickPreview, preview a selected part of your document.
+ * Easy access to various help sources.
+ * Advanced editing commands.
+EOF
diff --git a/kde4-apps/kile4/HISTORY b/kde4-apps/kile4/HISTORY
new file mode 100644
index 0000000..5474fec
--- /dev/null
+++ b/kde4-apps/kile4/HISTORY
@@ -0,0 +1,6 @@
+2009-07-29 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Suggest dependency on kdegraphics4 for Okular
+
+2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS, CONFIGURE, DEPENDS: Created
+
diff --git a/kde4-apps/kile4/kile-2.1b1.tar.bz2.sig 
b/kde4-apps/kile4/kile-2.1b1.tar.bz2.sig
new file mode 100644
index 0000000..15d422b
Binary files /dev/null and b/kde4-apps/kile4/kile-2.1b1.tar.bz2.sig differ
diff --git a/kde4-apps/kipi-plugins4/DETAILS b/kde4-apps/kipi-plugins4/DETAILS
index ec3b741..2547822 100755
--- a/kde4-apps/kipi-plugins4/DETAILS
+++ b/kde4-apps/kipi-plugins4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=kipi-plugins4
-         VERSION=0.4.0
-     
SOURCE_HASH=sha512:12c226fc90aff202c403a58b98b645546a167bd86c1cada4c76e89c7c51e18d59e9a866920d29e525d42db7d8bf2d2f294a7d657e614e4d5de54862af762b206
+         VERSION=0.5.0
+     
SOURCE_HASH=sha512:ecfd496cdb12897c7d378d1f9762c49b7d990ebbbce5dd059cd350137b81b1bf64bf690a33a320e32eb17d1d8b0676d369ea5e05797431e1e19eac2ee8dac7ee
           SOURCE=${SPELL//4}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index d4dd814..5aa0ef1 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.5.0
+
 2009-07-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.4.0
 
diff --git a/kde4-apps/skrooge/DEPENDS b/kde4-apps/skrooge/DEPENDS
index f6bce1c..15a9ec9 100755
--- a/kde4-apps/skrooge/DEPENDS
+++ b/kde4-apps/skrooge/DEPENDS
@@ -2,6 +2,6 @@ source  "$SECTION_DIRECTORY/KDE_DEPENDS" &&
 depends libofx  &&
 depends qca2    &&
 depends sqlite  &&
-#if [[ "${SK_VER}" == "devel" ]];then
+if [[ "${SK_VER}" == "devel" ]];then
   depends subversion
-#fi
+fi
diff --git a/kde4-apps/skrooge/DETAILS b/kde4-apps/skrooge/DETAILS
index 2ef3a04..43ebb86 100755
--- a/kde4-apps/skrooge/DETAILS
+++ b/kde4-apps/skrooge/DETAILS
@@ -1,12 +1,12 @@
            SPELL=skrooge
-#if [[ $SK_VER != devel ]]; then
-#         VERSION=na
-#     SOURCE_HASH=sha512:
-#          SOURCE=$SPELL-$VERSION.tar.bz2
+if [[ $SK_VER != devel ]]; then
+         VERSION=0.2.9
+     
SOURCE_HASH=sha512:e71bd9a3b0eabba14cba260ff2c068a9b8787f0f16d142ccbf860c5329fed91e50a6cd1df1392fe6a23239a4fad593525e30d55c53e72e8893471c3e357c9a8c
+          SOURCE=$SPELL-$VERSION.tar.gz
 #   SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VX}/support/$SOURCE
-# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-#else
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+else
   if [[ $SK_VCS_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
@@ -17,8 +17,8 @@
           SOURCE=$SPELL-svn.tar.bz2
    
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/office/$SPELL:$SPELL
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-#fi
-        WEB_SITE=
+fi
+        WEB_SITE=http://sourceforge.net/projects/skrooge/
       LICENSE[0]=LGPL
          ENTERED=20090701
         KEYWORDS="kde4 money"
diff --git a/kde4-apps/skrooge/HISTORY b/kde4-apps/skrooge/HISTORY
index 640a8ae..4aa1427 100644
--- a/kde4-apps/skrooge/HISTORY
+++ b/kde4-apps/skrooge/HISTORY
@@ -1,3 +1,8 @@
+2009-07-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.2.9
+       * PRE_BUILD, DEPENDS: adapt to release tarballs
+       * PRE_BUILD: for to install desktop file
+
 2009-07-06 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: added, prevent update of mime database
        * CONFIGURE: added
diff --git a/kde4-apps/skrooge/PREPARE b/kde4-apps/skrooge/PREPARE
index 636aacc..42ae856 100755
--- a/kde4-apps/skrooge/PREPARE
+++ b/kde4-apps/skrooge/PREPARE
@@ -1,6 +1,6 @@
-#config_query_list SK_VER "which version to build?" stable unstable devel  &&
+config_query_list SK_VER "which version to build?" stable unstable devel  &&
 
-#if [[ $SK_VER == devel ]]; then
+if [[ $SK_VER == devel ]]; then
   config_query  SK_VCS_AUTOUPDATE  \
                 "Update automatically on every system update?"  n
-#fi
+fi
diff --git a/kde4-apps/skrooge/PRE_BUILD b/kde4-apps/skrooge/PRE_BUILD
index 7819d52..724594e 100755
--- a/kde4-apps/skrooge/PRE_BUILD
+++ b/kde4-apps/skrooge/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+# desktofix for 0.2.9
+sed -i 's|${PROJECT_BINARY_DIR}/||' skrooge/CMakeLists.txt  &&
 sed -i '/update_xdg_mimetypes/D' skrooge/CMakeLists.txt
diff --git a/kde4-support/akonadi/DEPENDS b/kde4-support/akonadi/DEPENDS
index 455a44f..643b709 100755
--- a/kde4-support/akonadi/DEPENDS
+++ b/kde4-support/akonadi/DEPENDS
@@ -5,9 +5,7 @@ depends cmake     &&
 depends libxslt   &&
 depends automoc   &&
 depends shared-mime-info  &&
-if [[ "${AK_VER}" != "stable" ]];then
-  depends soprano
-fi &&
+depends soprano   &&
 if [[ "${AK_VER}" == "devel" ]];then
   depends subversion
 fi  &&
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index d0465d3..697ca06 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -15,8 +15,8 @@ else
          VERSION=1.1.95
      
SOURCE_HASH=sha512:efade1cb86908b25f4168e0429de58d2556025020dd3bdb3ca13107dcaa00cd396f6b5f2d2c3ced34b527800de1e20cbda77caedd21cea7e3259ba3422213644
   else
-         VERSION=1.1.2
-     
SOURCE_HASH=sha512:6b268d45dcd95084d72309cb97a437cc05037c25e419738c9ed72b8889f5c738a81026b5efa3e72f783449079680967130231b30c78cdf5c11e69e5fd17ca307
+         VERSION=1.2.0
+     
SOURCE_HASH=sha512:691a3d776495b37ad2645645728908e4487590086d56f3d784f6accc6e67f160913c2f56230059b8898a57a658cbcd70f2c5a6475dbd38c154beff1c6b5c163c
   fi
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index d47022c..a310f3e 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,7 @@
+2009-07-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.2.0 (stable)
+       * DEPENDS: always need soprano
+
 2009-06-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.1.95 (unstable)
 
diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
index 70884cb..721a331 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.96
+         VERSION=4.2.98
 else
          VERSION=4.2.4
 fi
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 8374466..cbaa07c 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.2.96 (unstable)
 
diff --git a/kde4/kde4-profile/DETAILS b/kde4/kde4-profile/DETAILS
index 1da7729..e02fdf3 100755
--- a/kde4/kde4-profile/DETAILS
+++ b/kde4/kde4-profile/DETAILS
@@ -1,12 +1,5 @@
            SPELL=kde4-profile
-persistent_read kdelibs4 KDE_VER KDE_VER
-if [[ $KDE_VER == devel ]]; then
-         VERSION=svn
-elif [[ $KDE_VER == unstable ]]; then
-         VERSION=4.2.96
-else
-         VERSION=4.2.4
-fi
+         VERSION=na
         WEB_SITE=http://www.kde.org/
         KEYWORDS="kde"
          ENTERED=20070307
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index b329b03..3e72580 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,7 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version na
+         profie does not need a version
+
 2009-07-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.2.96 (unstable)
 
diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS
index 1051aa1..a0c701d 100755
--- a/kde4/kdeaccessibility4/DETAILS
+++ b/kde4/kdeaccessibility4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:c821f5c2f9f7dd77c36091a5e38b72b8b1777d1fd1af7d0071bc5b2e090c211f4c107daedc69ef97ab70a283098ee7f7c899f5264c55ea7cf03700ccf403d489
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:3f140e58e4a0045a2ffcfb9c4265b69b83365d1d6e30d5e280e8679762c3b12a99dc893f90ea252662958f984143ee7a77424c7659dc1ccf7433f7540a9daa4f
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:e313da78a828ecbe5f0142714f39efc3a79bef89a1dc59966bdf350933035ea9e999405ce8e657e498e68af9669f3a6a2843b0de1d3eb8ac1064abfb29ed1678
diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY
index cf92f43..ba3291e 100644
--- a/kde4/kdeaccessibility4/HISTORY
+++ b/kde4/kdeaccessibility4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS
index 2c36047..6d8b413 100755
--- a/kde4/kdeadmin4/DETAILS
+++ b/kde4/kdeadmin4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:d994699df40cc5b7c55d7f1b8c1587bdd879d1b42a4fc55c305c8fb6b885fc43b53d87daf43a139d47825b3ff93dbe56ed696a0ec5ca559e109bdb85d0e8cbf4
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:303532c499eeb9651d534ea61da80603794832e101ec34c8a7cb10c74fcaf3874c57840be000aac6d52d20673c1c76b0184759547cd4f60cbb02bbb22fd493d3
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:b97c7553e03b9acfc8ebd94ebb1f435f2b32c69d06c91d35d19d30282038b2bc1c341819f002ac0dec3144cfc870c517760e4fb7d86b21e26c21f1af1f4886c4
diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY
index 061492e..4654379 100644
--- a/kde4/kdeadmin4/HISTORY
+++ b/kde4/kdeadmin4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdeartwork4/DETAILS b/kde4/kdeartwork4/DETAILS
index aab037f..f7abf5e 100755
--- a/kde4/kdeartwork4/DETAILS
+++ b/kde4/kdeartwork4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:0234253e870e93df93731febc67a427411dad412980fbbf1c68dbba13581c8ad42e9402d66e96ac64c0736b871cc319efd1dc620afd38efe169e16f0304db6a7
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:fa6174e39fdcb09d59231e27fd4a2a7c5d0f4c26dac76f1bb440132ab88686d77990a13f484562ef99b4804477b97b48fb93ae81ed7b6edc736832fae2e52931
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:fc790d63be7678d063532d78fdfbaf7cfbc7b26bdab4d7c9704a426a8077a50c6aa6c83788c90260915d9de7db0289b50d5ce2345e40887b9e267083596dbe65
diff --git a/kde4/kdeartwork4/HISTORY b/kde4/kdeartwork4/HISTORY
index 7eefa13..17e2972 100644
--- a/kde4/kdeartwork4/HISTORY
+++ b/kde4/kdeartwork4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index 7029462..2723f67 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -20,7 +20,7 @@ optional_depends  libusb      '' ''   'usb support'         
       &&
 optional_depends  bluez       '' ''   'Bluetooth support '         &&
 optional_depends  gpsd        '' ''   'geolocation support vis GPS' &&
 optional_depends  openldap    '' ''   'LDAP authentication'        &&
-optional_depends  cyrus-sasl  '' ''   'Cyrus SASL authentication'  &&
+optional_depends  LIBSASL     '' ''   'Cyrus SASL authentication'  &&
 optional_depends -sub PYTHON kdebindings4 '' '' 'scripting Python plasmoids' 
&&
 optional_depends  qedje  '' ''   'scripting edje plasmoid' &&
 optional_depends  consolekit  '' ''   'ConsoleKit integration in KDM' &&
diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS
index 9f7982c..87bb20b 100755
--- a/kde4/kdebase-workspace4/DETAILS
+++ b/kde4/kdebase-workspace4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/kdebase-svn/workspace"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:f400589294f30342b92696fda7313aefc116afb16f8115edb677ce236fe0c16df18b7eb8f1c093bb1bc4f421445adfcfd364206cae3b814e1890c32917b9b4de
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:158502dc2e6c12dd479ba88d102ef65b5ace0a44a2ea333ffd7524e358899df46c95b3c25f475bbc0e2c602f8364235a4962ec4c8eff842cdb5d354409c062eb
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:1dfb90c668a390ff1d3bb27826c6f4d6f4842d181c0033623b8f18a534517735c6a308b39902ff23d1a305362c6febfa7e5606b8f680803ca0e517118685d01f
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 4ec9898..527c779 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,9 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: cysrus-sasl -> LIBSASL
+
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdebase4-runtime/DETAILS b/kde4/kdebase4-runtime/DETAILS
index c6d2f2a..1792d6b 100755
--- a/kde4/kdebase4-runtime/DETAILS
+++ b/kde4/kdebase4-runtime/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/kdebase-svn/runtime"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:bc74b4af2922a488824ff209d74a44d1a5f0580dbb7038c3b469ddf519bb65cc005c8a5df5098a1bde5567b344a5d868302f767884c0110dac738b8a938c4892
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:b8494bfa8f5fb5997e977ffd834a1cf8e224b4e86e1c54d1beed31cdfdc2eb43c503f7da5cbe7b26f2cfbebb297e124a594e5a5221bbc362cb29c1dafbb9f13c
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:854d8911fce5b79b3a086556ea174462e15d5d4b4a410b41c4a328d8c1b23097af9c79e4efb6f62028cc0c48ecea76782a61f70508cc4fdc76e57d28e4776e66
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 92bc663..1568d42 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index f69cd5a..07fce6d 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -34,4 +34,4 @@ optional_depends  libusb     '' ''   'usb support'          
      &&
 optional_depends  pciutils     '' '' 'show pci data'              &&
 optional_depends  bluez-libs '' ''   'Bluetooth support '         &&
 optional_depends  openldap   '' ''   'LDAP authentication'        &&
-optional_depends  cyrus-sasl '' ''   'Cyrus SASL authentication'
+optional_depends  LIBSASL    '' ''   'Cyrus SASL authentication'
diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS
index 23b019c..be33052 100755
--- a/kde4/kdebase4/DETAILS
+++ b/kde4/kdebase4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:7f8a2baec6b58fdeb354a230fed5fa550df4ad3fc0d3df7da6f8965307a29fc35bbbceab18974597dd17111c8a9b70ff58e24b8c9dd40ed50014df8d8607df61
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:5e50d0eff04893ccedb279107e42a8229dbd265750f569644c291d931b4f7878beee511a8b0ee8d0f17a6bad4d072bab5c5597de15ae5facdd7f22e7fc03fb98
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:7a2d99faa4ae955db9000f913f8375af58b078e3f78a1ed8a9ae0cda8fffa616ffe605f93ced12d7efad16d35973a09cf4ecad44a38df6aaad7746a51a1b42f5
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 7b16f65..a91cdde 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,9 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: cyrus-sasl -> LIBSASL
+
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
index 36d6f8b..10bc7aa 100755
--- a/kde4/kdebindings4/DETAILS
+++ b/kde4/kdebindings4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:6e337e57c868638be8c036809bad03d51cd1719194e19e42d56a294723e57a3eab191ca140a9ccf298312b54810bdbf79a5acb18e159b590abe6f977fd35fbf6
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:9746201d57ac5f1f6324eca4f60cd34f1d68885078886e74cd8ed7ebed455b747bc12caaa4c3dd5c77c8f74d16c4834eed8d5445e8abd6950821245481420a87
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:650c7315f6b11cfbb1f2efbd7f14086d29a14f09995361d72670a72d8cf3b52c0860d7383b90f8b10957cf3e1128d64cc9b344bff1145d5a0495208d3c5ba35d
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index 1af8974..e7758a9 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS
index edf5b61..b3f0cf4 100755
--- a/kde4/kdeedu4/DETAILS
+++ b/kde4/kdeedu4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:16b9da3caadcb129fd6af227d03c5c2b3b9084e2efed6518fb7e0967e29ae4c857c6e21ed61536e1d771ee892078a2cfcdb0cc19d91d4fb0f1fe4aed680c4af1
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:fe4b026343feb697dfc58ec28dc05b38633aea7d437d579a3d5b53d167b4d352f078d55ab81158aeaf22e96446f37f47b9cea63c35dce996af9f8950b06e811d
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:e6fab9ea884419bc51b6e701f93a72fdb09030c1b73a1553479ad556b37e4e070ca4ce2bdb00d6cfec32c948c3c440be0e881eaf06e108150b2f0074e59e475a
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index f0cffe0..51b8871 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
index 5b12bfd..188e9d0 100755
--- a/kde4/kdegames4/DETAILS
+++ b/kde4/kdegames4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:4c67c99ec215cd28c753379f2d8a02e0305eab1f677bc389b294179660fc9b510f7630bcfab9c0e7873cccc3b9667a52b80fc1ec8da34156b0142d01245ad3aa
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:1f943736dacf9877c7ebfcd5aadabeb107099583f8f8d50f3c128cefa8c41e622b961ffa668bad6ebe37bb256f1e3968d296192dce02dae8798b7366f2ab5306
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:15b9390a23c6d886b8f90f80427ca4a348ca99c05491c33c8f63fe29b59c62bad26bf0d5936a07f48c6e5e55e4e19ec8fddfa3a1205214e36d064a8d61d7e021
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 3b50dd9..46db384 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS
index fa184fd..375ef22 100755
--- a/kde4/kdegraphics4/DETAILS
+++ b/kde4/kdegraphics4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:e0ca280d80000cd73c76ce258057897180bb225a36c5fb3c0061c967f052db86f2611b0333517696cb8c031c4859d4eb371c10272f1a9824ece8b0a8d68588c4
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:3349fbbab4e28702ec140add21c5e04b5b92d37946cf295cc3767c24db5b67876b41f4fda7596632b217e219ae35fa24bc7c915a214f5560d502eddc7d23ed3f
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:30331f2d41210d52b4ebb41d56de1dec63e2d997cdaa55d8e6a29d8911dd0422e05147611b81c2285ce6f4742863c2a2285865e9156f7bd68e70d0f4617540ca
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 9b4a8aa..f09409a 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdelibs4-experimental/DETAILS 
b/kde4/kdelibs4-experimental/DETAILS
index 753c2dd..6e85ec5 100755
--- a/kde4/kdelibs4-experimental/DETAILS
+++ b/kde4/kdelibs4-experimental/DETAILS
@@ -3,8 +3,8 @@
 persistent_read kdelibs4 KDE_VER KDE_VER 
 persistent_read kdelibs4 KDE_VCS_AUTOUPDATE KDE_VCS_AUTOUPDATE
 if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:0524aa590978e40170b511ad1087f03d658e046bfebcdcd2fd222ab729f05833a2d36b15d1e00c721976b20140b1c8b377381a2a9376106c4c938ffd901cc6d0
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:7c49bc768847e3e445e73484129c62d767096c370b9f934cf52086812a5c4a58beb6d51cc21c6cd8f4a7eee6a47f4404413e613e2a708bafa8cb16fb178be53e
 else 
          VERSION=na
      SOURCE_HASH=sha512:na
diff --git a/kde4/kdelibs4-experimental/HISTORY 
b/kde4/kdelibs4-experimental/HISTORY
index b0398c7..3c97c73 100644
--- a/kde4/kdelibs4-experimental/HISTORY
+++ b/kde4/kdelibs4-experimental/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index d1ec4cf..99c0af7 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,5 +1,6 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS                          &&
 optional_depends  FAM         '' '' 'file change notification'  &&
+optional_depends  acl         '' '' 'access control lists support' &&
 optional_depends  soprano     '' '' 'RDF search facilities'     &&
 optional_depends  tiff        '' '' 'to view tiff graphics'     &&
 optional_depends  alsa-lib    '' '' 'for libKMid alsa support'  &&
diff --git a/kde4/kdelibs4/DETAILS b/kde4/kdelibs4/DETAILS
index 200b8c5..1d25466 100755
--- a/kde4/kdelibs4/DETAILS
+++ b/kde4/kdelibs4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:da725dec213868b6d972e41e4f4c49180363fd3f6a797771e4ec27a2dc27ea26c45366e518dbbb9c0e4e4769d7915d001b799cf61f55fdb65bc8ab4629d06e11
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:328b107ba43727e885db6821cda4b66a204cdf44e8326cda5b5a7d6f6fef6ebc9b7b9c89ae886a38c618aef718016a3e96756d93da44f44c5ade918fb442f20b
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:802242c1479bac99233d018b7d2ba28e9dbe36507aa6072290a84dcc5c9e9fed2001b6866c38e08500f2fcd8c405a9a164effd0b7227f409710a82085303b2b8
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 69e9ec5..89ff722 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+       * DEPENDS: add optional acl
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index 8426e84..af815ee 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:2683f868c0fc35f48d84441011061b143dcfb9f7c0f42f9d7ea0530f9a5c4eeb7cbb33ebfc574c65a996034cad6e1933351fd73ffd22d2ff7fef8d8530425583
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:98fd60c6ef2969015a9dba2baf4ea866df0a1e9dd998fe79daf0ac58c11e106e5fcb9a14e2f0de46868e23df974088415517513c47a985e84d9feeaefe182f94
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:29f47fc9da39074cb9067473ea822d159356cb4af18ea8f7a66c4516fded4a61b81aa8c27a4247c4ffd3e28b1db913393949325f0bdb992df3d65e5c07828fba
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index c208e96..48b5389 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index ac2eb3c..a8c0f43 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:efa5053f0af5659d5486cac847aff287e0f1a64e886f828e2ed53e5f3e43fb1da0aeddbe621aef8d9d7124a51b60cfe2c6f335bcadaf7fb17d500e9bb2167f4b
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:1cc6734bb654fbfca8c50c18e14cc28e57aa020ca4ef3972fc102275f9b9ff05b2a407de8ccb237be44092463c83521a7682067d53d2cf1e8300bb3d47aac1d3
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:b7be7ae021c62a8b9daae7d45c07057b1cda674a88460dac040286623a5f5f93db4562fb26b5c6ff72e7f224b9d560bdcfceb4ebf1811d7330b6422b537457d1
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 28a4b66..5842fd4 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdepim4/DEPENDS b/kde4/kdepim4/DEPENDS
index 3c8bd86..beb030c 100755
--- a/kde4/kdepim4/DEPENDS
+++ b/kde4/kdepim4/DEPENDS
@@ -8,7 +8,7 @@ if is_depends_enabled $SPELL soprano;then
 fi &&
 optional_depends qca2          '' '' 'crypto support'                 &&
 optional_depends gpgme         '' '' 'encrypted signatures'           &&
-optional_depends cyrus-sasl    '' '' 'authentication of logins'       &&
+optional_depends LIBSASL       '' '' 'authentication of logins'       &&
 optional_depends libassuan     '' '' 'for kleopatra'                  &&
 optional_depends pilot-link    '' '' 'Palm Pilot support'             &&
 optional_depends libmal        '' '' 'Avantgo support'                &&
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index ea97642..8af8e1d 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:0ed6fcc35e99b4d4ba195044f09e03e71adc445386c07bd1e1bd742fe6e415b88b90877f4167d95bbe9104947eb32a38dcf72c983b9b6b0ebb983f59241624cd
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:f2b96c69dd7879c6412cabf1e075d14aeb931eb98ac3888a7b0fa37fea6094f22678eff29802ea5123e72591163c7839a0dec602192c3cca020d0659fe884d02
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:d4d7090b48ed4be63e509139b101174600123e4e89a0709e2af3ad0930bd0af70869738603b8cb38f882e1bcb2b37679f734126f6052e121f195cd137048d88b
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 15a0b07..0bdb58c 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,9 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: cyrus-sasl -> LIBSASL
+
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdepimlibs4/DEPENDS b/kde4/kdepimlibs4/DEPENDS
index 75e94d8..0467b7b 100755
--- a/kde4/kdepimlibs4/DEPENDS
+++ b/kde4/kdepimlibs4/DEPENDS
@@ -2,4 +2,4 @@ source  $SECTION_DIRECTORY/KDE_DEPENDS &&
 depends akonadi                        &&
 depends libical                        &&
 optional_depends openldap   '' '' 'LDAP functionality'  &&
-optional_depends cyrus-sasl '' '' 'support authentication of logins'
+optional_depends LIBSASL    '' '' 'support authentication of logins'
diff --git a/kde4/kdepimlibs4/DETAILS b/kde4/kdepimlibs4/DETAILS
index 2acd3c3..e8a4bbf 100755
--- a/kde4/kdepimlibs4/DETAILS
+++ b/kde4/kdepimlibs4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:7662c055042dc65b44347600bf056f16ffb7f1911c9884a04689367d95ed9df2ec3d6f2746b4d05392b2d4f2b4a91157609c9cfa4a10a56e70d476cf425ce8ec
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:a659595ec000c27c00825192db7fe8c015498c4fd27a8e778943058b5a6157c4d156722832e14942580aff7dfff300704242b8ae0c639b7671d8c70cec100343
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:aaf95437957a00e83e181c4994f7ee9102531e3816d1f957c75a126362c6c095edd0dca6a71bfe37904396ca2922ca3db2036d28a39d928724266e3ee8026c83
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 8b76656..56632a6 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,9 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: cyrus-sasl -> LIBSASL
+
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdeplasmoids4/DETAILS b/kde4/kdeplasmoids4/DETAILS
index a176ec0..ceca8d6 100755
--- a/kde4/kdeplasmoids4/DETAILS
+++ b/kde4/kdeplasmoids4/DETAILS
@@ -15,8 +15,8 @@ if [[ $KDE_VER == devel ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
 else
   if [[ "${KDE_VER}" == "unstable" ]]; then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:fca579c2656a9d0cff663b71d5e48c5e67ab7662563e29dc14ab0bd2dabcc54c25a1cc9b735ae6f51af703519bddabcb6651897366cfbe67a5f2630dd5952695
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:5e2912dab4e75fac9937a2c40162f4919afa6bcd850478a4bdef3ede9a422d123f0d59f5270e1f1e8dc86e440fe7d8cd4c9aafa719f2d5b47b458aea4c36d92c
   else
          VERSION=4.2.4
      
SOURCE_HASH=sha512:e824b0d7a66b06abc7b6ddc975bf5b23303004da8201f4cca64592d68a4fe1ebe0b9fe739432af5ea0b2715cc1c6a52518eb88ace402c6f42d105a0975a7666b
diff --git a/kde4/kdeplasmoids4/HISTORY b/kde4/kdeplasmoids4/HISTORY
index e4af481..a193d57 100644
--- a/kde4/kdeplasmoids4/HISTORY
+++ b/kde4/kdeplasmoids4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index ce51f88..343d04a 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:b294e1950558450bc4c78b440f5fdbddb99d0182778101f2297cb23d120805c029ea5889b5d654bd100d96b7766164d9350ac6e77d86d16707fde33ebcb37a91
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:537e05b7d605cc7fd2b6c50b1b08f1e8dfceb88b6c3e2bfbd7ef1afecdcfe84dfede1b46da71d60b17f77a31d9cbe81dc1e8cd4040cf1b6ee6392f79446990f5
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:487bfba9fd88e41938c69b22abcb43117eeb448ee330de4ede96645cec1433aff9ece7913fb1b445bf95bdc635d964a8049b9736b317e7e2f27c6158bb7af049
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index ed92e1f..7165d56 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS
index 5d2dad2..6b3880f 100755
--- a/kde4/kdetoys4/DETAILS
+++ b/kde4/kdetoys4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:52ffd49d4fb090bf6c95c14c1881d4d28d979f4860c9deabfbc3fa49f4edd8d9ddf7a2022dd2c8296097a9d4462a6d1d97226bf6b8a1544d4804dcb2bdfaa9b1
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:2d4ad0dfb69b138a6dbb4fa68b98d253124754a3aa7242a6e70a6dba71a795b670bf682e61771e668a842c9b91b1e7d12bca24022d392892462c88b5c7283b7e
   else
          VERSION=4.2.4
      
SOURCE_HASH=sha512:23fead032f45906c5feb8ca0e2b3b4f785047c026af9b731eab19593a7ca546ae3014fdc15102ba4ce397ef1a1b62e44b821c3c50eb281fe72856029859f9f08
diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY
index f902086..a6fd9dc 100644
--- a/kde4/kdetoys4/HISTORY
+++ b/kde4/kdetoys4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS
index 029ddc8..09ff3f3 100755
--- a/kde4/kdeutils4/DETAILS
+++ b/kde4/kdeutils4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ "${KDE_VER}" == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:220cd50eac84db68500ecd587668539a6dfeccfc5c3e73ed1ab2fe76e340af5b02858aa646d9a21b6108e883ecf5f9f536ea7d0e936f6fe0c27dd31d9a4f7185
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:af833c7ff590cd1c951ca9393b793eaf2ab33000621dbd2b20fdb53b22bacc15c0cb0c17f13f39bc8395f6500f057c6218fd60bb01acda7d6365715a88324050
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:e75d9813d64fe6732de131e8931748523edb3627d675f2bfd8d0205f0b4d07f2b4dffcada6985dd37a3c296e84e37edee47d8f8f39557f51a7b21b9e57133b5c
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index dc466e4..277b1aa 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/kdewebdev4/DETAILS b/kde4/kdewebdev4/DETAILS
index 06e6e14..6f21f2f 100755
--- a/kde4/kdewebdev4/DETAILS
+++ b/kde4/kdewebdev4/DETAILS
@@ -15,8 +15,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
   FORCE_DOWNLOAD=on
 else
   if [[ ${KDE_VER} == unstable ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:8d4aef657fa8f53405b4fd341f7f653c8b48fffcff0d002bbecc4419385ec3a612f438a3ce4c336ec5894f36c1533ca00d6a60da777b604246e8176c05bc5580
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:39df2cbaa38afcce7802d85b2aa455394002d7b34d8b03cb9ba02d7942f0386b8f0b52378fdb73e5e2de4d04e372bcf5bfbe5ef828e2de4c75f2893a3701851c
   else 
          VERSION=4.2.4
      
SOURCE_HASH=sha512:39df2cbaa38afcce7802d85b2aa455394002d7b34d8b03cb9ba02d7942f0386b8f0b52378fdb73e5e2de4d04e372bcf5bfbe5ef828e2de4c75f2893a3701851c
diff --git a/kde4/kdewebdev4/HISTORY b/kde4/kdewebdev4/HISTORY
index 88390a3..0b6b560 100644
--- a/kde4/kdewebdev4/HISTORY
+++ b/kde4/kdewebdev4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kde4/oxygen-icons/DETAILS b/kde4/oxygen-icons/DETAILS
index efdf7a0..35c5426 100755
--- a/kde4/oxygen-icons/DETAILS
+++ b/kde4/oxygen-icons/DETAILS
@@ -1,8 +1,8 @@
            SPELL=oxygen-icons
 persistent_read kdelibs4 KDE_VER KDE_VER 
   if [[ "${KDE_VER}" == "unstable" ]];then
-         VERSION=4.3.61svn998540
-     
SOURCE_HASH=sha512:cf768b0fdf8603522fd0b6ec4f86828b3b2576fa16d64a218d41fa8ab25010cc5247fbbea038af6626cfeadcfdee14a20efad8286f713f6cc4c897e6430579c1
+         VERSION=4.2.98
+     
SOURCE_HASH=sha512:56dda2de940107030c2c81fbfdd1c361e909c3ba0d17c389a3e49563bd5e597634abee8a03f77b3da544c3bd4ee073180d3a138a542404d305b2b27bbc2588a0
   else 
          VERSION=na
      SOURCE_HASH=sha512:na
diff --git a/kde4/oxygen-icons/HISTORY b/kde4/oxygen-icons/HISTORY
index 2181edb..89f577a 100644
--- a/kde4/oxygen-icons/HISTORY
+++ b/kde4/oxygen-icons/HISTORY
@@ -1,3 +1,6 @@
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.2.98 (unstable)
+
 2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.3.61svn998540 (unstable)
 
diff --git a/kernels/kvm/CONFIGURE b/kernels/kvm/CONFIGURE
index e697074..62424a3 100755
--- a/kernels/kvm/CONFIGURE
+++ b/kernels/kvm/CONFIGURE
@@ -4,4 +4,7 @@ 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
+                    ac97 es1370 sb16 cs4231a adlib gus        &&
+
+config_query_option KVM_ACCEL "Build kernel module?" y \
+                    "" "--disable-kqemu"
diff --git a/kernels/kvm/DEPENDS b/kernels/kvm/DEPENDS
index 90c784e..4a0b6fd 100755
--- a/kernels/kvm/DEPENDS
+++ b/kernels/kvm/DEPENDS
@@ -31,4 +31,14 @@ suggest_depends  'bridge-utils'                  \
 suggest_depends  'iproute2'                                \
                  ''                                        \
                  ''                                        \
-                 'for routing between TUN/TAP interfaces'
+                 'for routing between TUN/TAP interfaces'  &&
+
+suggest_depends  'gnutls'                                  \
+                 ''                                        \
+                 '--disable-vnc-tls'                       \
+                 'enable TLS encryption for VNC server'   &&
+
+suggest_depends  'LIBSASL'                                 \
+                 ''                                        \
+                 '--disable-vnc-sasl'                      \
+                 'enable SASL encryption for VNC server'
diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY
index 0a44bc9..baea86e 100644
--- a/kernels/kvm/HISTORY
+++ b/kernels/kvm/HISTORY
@@ -1,3 +1,7 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+       * CONFIGURE: added option to disable building the kernel module
+       * DEPENDS: added missing deps on gnutls and LIBSASL
+
 2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 88
        * CONFIGURE: Enable configuring sound drivers and emulated cards
diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index d67267c..1609f08 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -16,12 +16,6 @@ case "${KERNEL_ARCH}" in
     IMAGE_TARGET=zImage
     ;;
   *)
-    if grep CONFIG_XEN=y ./.config
-    then
-      IMAGE_TARGET=vmlinuz
-    else
-      IMAGE_TARGET=bzImage
-    fi
     ;;
 esac &&
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 24ad3e2..709e7e1 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,20 @@
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * info/patches/maintenance_patches/patch-2.6.27.29: added
+
+2009-07-31 Ladislav Hagara <hgr AT vabo.cz>
+       * latest.defaults: updated latest to patch-2.6.30.4
+       * info/patches/maintenance_patches/patch-2.6.30.4: added
+
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, INSTALL: disabled xen trickery
+       * latest.defaults: updated latest maintenance, pre2.6 and zen
+       * info/patches/maintenance_patches/patch-2.6.30.3: added
+       * info/patches/PRE_2_6/patch-2.6.31-rc4: added
+       * info/patches/zen_patches/2.6.30-zen1: added latest zen kernel
+
+2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * info/patches/maintenance_patches/patch-2.6.27.28: added
+
 2009-07-20 Ladislav Hagara <hgr AT vabo.cz>
        * latest.defaults: updated latest to patch-2.6.30.2
        * info/patches/maintenance_patches/patch-2.6.30.2: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index d9fc475..403459b 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -35,13 +35,7 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
                        ${INSTALL_ROOT}/boot/vmlinuz
                        ;;
                *)
-            if grep CONFIG_XEN=y ./.config
-            then
-                               cp 
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/vmlinuz \
-                               ${INSTALL_ROOT}/boot/vmlinuz-$VERSION &&
-                               ln -sf vmlinuz-${VERSION} \
-                               ${INSTALL_ROOT}/boot/vmlinuz
-                       elif [[ -f 
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage ]]
+                       if [[ -f 
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage ]]
                        then
                                cp 
${LINUX_SOURCE_DIRECTORY}/arch/${KERNEL_ARCH}/boot/bzImage \
                                ${INSTALL_ROOT}/boot/vmlinuz-$VERSION &&
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4 
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4
new file mode 100755
index 0000000..636a8ed
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.31-rc4
@@ -0,0 +1,6 @@
+patchversion="2.6.31-rc4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.30"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.28 
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.28
new file mode 100755
index 0000000..a42374f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.28
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.28"
+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/linux/info/patches/maintenance_patches/patch-2.6.27.29 
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.29
new file mode 100755
index 0000000..6d3e0bf
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.29
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.29"
+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/linux/info/patches/maintenance_patches/patch-2.6.30.3 
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3
new file mode 100755
index 0000000..2634318
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.3
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+patchversion="${appliedkernels}.3"
+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/linux/info/patches/maintenance_patches/patch-2.6.30.4 
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.4
new file mode 100755
index 0000000..0f67c9b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.30.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+patchversion="${appliedkernels}.4"
+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/linux/info/patches/zen_patches/2.6.30-zen1.patch 
b/kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch
new file mode 100644
index 0000000..f9ea061
--- /dev/null
+++ b/kernels/linux/info/patches/zen_patches/2.6.30-zen1.patch
@@ -0,0 +1,6 @@
+appliedkernels="2.6.30"
+depends=""
+patchversion="${appliedkernels}-zen1"
+source="${patchversion}.patch.lzma"
+source_url="http://zen-sources.org/files/${source}";
+md5="15f9cb4e0be04825360e04eb7954f1f9"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index d907b6e..e8bdbc1 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
 LATEST_2_6=2.6.30
-LATEST_PRE_2_6=patch-2.6.30
-LATEST_maintenance_patches=patch-2.6.30.2
+LATEST_PRE_2_6=patch-2.6.31-rc4
+LATEST_maintenance_patches=patch-2.6.30.4
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.32
 LATEST_PRE_2_4=patch-2.4.33-pre1
@@ -17,3 +17,4 @@ LATEST_cko_patches=patch-2.6.12-cko3
 LATEST_as_patches=patch-2.6.10-as7
 LATEST_love_patches=2.6.12-love1
 LATEST_realtime_patches=patch-2.6.25.4-rt5
+LATEST_zen_patches=2.6.30-zen1.patch
diff --git a/latex/tetex/HISTORY b/latex/tetex/HISTORY
index 7d527cf..24e2601 100644
--- a/latex/tetex/HISTORY
+++ b/latex/tetex/HISTORY
@@ -1,3 +1,9 @@
+2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_BUILD: Apply glibc-2.10.1.patch
+       * glibc-2.10.1.patch: tangleboot.p fix from
+         http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
+         Fixes Bug #15261
+
 2009-01-26 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * BUILD: Added --without-xdvik to build without libxp
diff --git a/latex/tetex/PRE_BUILD b/latex/tetex/PRE_BUILD
index 2b49460..bf1c0a3 100755
--- a/latex/tetex/PRE_BUILD
+++ b/latex/tetex/PRE_BUILD
@@ -3,4 +3,7 @@ default_pre_build                       &&
 if [ "$CSTEX" = "y" ]; then
     cd  $SOURCE_DIRECTORY/texk/web2c    &&
     unpack_file 2
-fi
+fi  &&
+
+cd  $SOURCE_DIRECTORY                             &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
diff --git a/latex/tetex/glibc-2.10.1.patch b/latex/tetex/glibc-2.10.1.patch
new file mode 100644
index 0000000..e845d1b
--- /dev/null
+++ b/latex/tetex/glibc-2.10.1.patch
@@ -0,0 +1,60 @@
+# tangleboot.p fix from 
http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134
+diff -Naur tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c 
tetex-src-3.0/texk/dvipsk/afm2tfm.c
+--- tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c   2009-07-21 05:59:32.635014710 
-0700
++++ tetex-src-3.0/texk/dvipsk/afm2tfm.c        2009-07-21 13:37:27.978595399 
-0700
+@@ -257,7 +257,7 @@
+ }
+ 
+ int
+-getline P1H(void) {
++tetex_getline P1H(void) {
+    register char *p ;
+    register int c ;
+ 
+@@ -606,7 +606,7 @@
+    ai = newchar() ;
+    ai->adobenum = -1 ;
+    ai->adobename = "||" ; /* boundary character name */
+-   while (getline()) {
++   while (tetex_getline()) {
+       switch(interest(paramstring())) {
+ case FontName:
+          fontname = paramnewstring() ;
+@@ -1882,7 +1882,7 @@
+ 
+    while (1) {
+       while (param == 0 || *param == 0) {
+-         if (getline() == 0)
++         if (tetex_getline() == 0)
+             error("! premature end in encoding file") ;
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+@@ -1973,7 +1973,7 @@
+       p = gettoken() ;
+       if (strcmp(p, "]"))
+          error("! token 258 in encoding must be make-array (])") ;
+-      while (getline()) {
++      while (tetex_getline()) {
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+                if (ignoreligkern == 0)
+diff -Naur tetex-src-3.0.orig/texk/web2c/cpascal.h 
tetex-src-3.0/texk/web2c/cpascal.h
+--- tetex-src-3.0.orig/texk/web2c/cpascal.h    2009-07-21 05:59:32.663015345 
-0700
++++ tetex-src-3.0/texk/web2c/cpascal.h 2009-07-21 13:28:29.754590069 -0700
+@@ -241,6 +241,16 @@
+ #define getname vms_getname
+ #endif
+ 
++
++/* Apparently POSIX 2008 has getline and glibc 2.9.90 exports it.
++ *    tangle, weave, et al. use that symbol; try to define it away so
++ *       something that a standard won't usurp.
++ * From http://tutimura.ath.cx/ptetex/?%C6%B0%BA%EE%CA%F3%B9%F0%2F134 */
++#ifdef getline
++#undef getline
++#endif
++#define getline web2c_getline
++
+ /* Declarations for the routines we provide ourselves in lib/.  */
+ 
+ extern string basenamechangesuffix 
P3H(const_string,const_string,const_string);
diff --git a/libs/apr/DETAILS b/libs/apr/DETAILS
index 1b9a4d3..60de521 100755
--- a/libs/apr/DETAILS
+++ b/libs/apr/DETAILS
@@ -1,5 +1,5 @@
            SPELL=apr
-         VERSION=1.3.6
+         VERSION=1.3.7
        REPOS_URI="branches/${VERSION%.*}.x"
 # APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
 if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY
index 7d7c157..312a0c3 100644
--- a/libs/apr/HISTORY
+++ b/libs/apr/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.3.7
+
 2009-07-07 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.3.6
 
@@ -197,4 +200,3 @@
 
 2003-03-02 Robert Helgesson <rycee AT home.se>
        * Created spell
-
diff --git a/libs/libedit/DETAILS b/libs/libedit/DETAILS
index 296d07b..eb67944 100755
--- a/libs/libedit/DETAILS
+++ b/libs/libedit/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libedit
-         VERSION=20090610-3.0
-     
SOURCE_HASH=sha512:54fbde16723f7e411a847e66fb3b458d2808ee8b87b28d59a9626cf1b118086a7c4db44ba3ab3d62c7c10f5351b7bf0a1125e4e958095e437781ebb74e0310d8
+         VERSION=20090722-3.0
+     
SOURCE_HASH=sha512:55add15c839641dec1124a36b2308af47a95d14d3a71767060a818698c96e5e1f23d86fcabcfad6693e81cee0387cb3450e2740ed7de23a9867ad3c66140f5ac
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.thrysoee.dk/editline/
diff --git a/libs/libedit/HISTORY b/libs/libedit/HISTORY
index ef7693c..8d7f87d 100644
--- a/libs/libedit/HISTORY
+++ b/libs/libedit/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 20090722-3.0
+
 2009-06-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 20090610-3.0
 
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index 5afd4c8..aee95f1 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libtasn1
-         VERSION=2.2
+         VERSION=2.3
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index 92a2ff5..ef4bdff 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.3
+
 2009-06-07 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2
 
diff --git a/libs/libviper/DETAILS b/libs/libviper/DETAILS
index 0c54394..6b1f486 100755
--- a/libs/libviper/DETAILS
+++ b/libs/libviper/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libviper
-         VERSION=1.4.2
+         VERSION=1.4.2.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:2bae3c195423c1a85565aa787fc848fe4ea84513eff9b9b00bec5634e8fab9f969de3ab3ab0dfc6afd94de245246eb4a082b37711094fa11cbdee96d91bea144
+     
SOURCE_HASH=sha512:de8ec1df8e8d1e8797443270c2088c9ff2500e41eb58d3928660e2e1d029aa47a1995a73164121c4632787c71a4c3c57d34f37553e451158cfe49fa2ef0f6d5b
         WEB_SITE=http://www.sourceforge.net/projects/libviper/
          ENTERED=20080117
       LICENSE[0]=GPL
diff --git a/libs/libviper/HISTORY b/libs/libviper/HISTORY
index 6204aa5..83427a5 100644
--- a/libs/libviper/HISTORY
+++ b/libs/libviper/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS" version 1.4.2.2
+
 2009-04-23 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS" version 1.4.2, made gpm optional
 
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index c1fc7d4..ebc9096 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt4
           SPELLX=PyQt-x11-gpl
-         VERSION=4.5.2
-     
SOURCE_HASH=sha512:a5720fdb2369019ef33352ba44724db23bebeb600582369d7d2ecac236a45e851a39438610e6b8a514bf35baf1af3f6ee22e03dabc085956fdb460f4eaedd5ec
+         VERSION=4.5.4
+     
SOURCE_HASH=sha512:1c3313633a86bb265a84f4e8055705246ad294bc8ad484d5b8dd7c5e3065daf515fda5864a0d8dc575f36b3caf3d1abb1a18e08b1ac940d882ea9060ee64c3ed
              URI=PyQt4
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 7c86778..6599c77 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.5.4
+
 2009-07-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.5.2
 
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index c8d10ad..b2886ef 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sip
-         VERSION=4.8.1
-     
SOURCE_HASH=sha512:5ae57a091e8bac649b02f6f938d0954c7e58751a345e31707bce534ad230d7f57779a8a3874b30664e900992a055b1b846c88629ecb8a308712620b3739bbdb1
+         VERSION=4.8.2
+     
SOURCE_HASH=sha512:0aa12b11f6eed62bfcddb234284ba5c1fbffbb60a147dfe5dbcdddbab04b741eccba3e1e540d7cdb7ff64a8722668221587d7a4906c4af0293289415aa434bf5
              URI=sip4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index caf3643..9bee184 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.8.2
+
 2009-06-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.8.1
 
diff --git a/lua-forge/luasec/DETAILS b/lua-forge/luasec/DETAILS
index 699a01c..7b03d7d 100755
--- a/lua-forge/luasec/DETAILS
+++ b/lua-forge/luasec/DETAILS
@@ -1,8 +1,8 @@
            SPELL=luasec
-         VERSION=0.3.2
+         VERSION=0.3.3
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://luaforge.net/frs/download.php/4059/$SOURCE
-     
SOURCE_HASH=sha512:eaa5fd49fd0af329aa85db35b537409832a8e371a603accc34f8dd70fc4f1cd4770acfee9553333bf3b2a3e2efbb3275d8a2f1d25b7ba6f31263c2017102ca9d
+   SOURCE_URL[0]=http://luaforge.net/frs/download.php/4160/$SOURCE
+     
SOURCE_HASH=sha512:fbb82d03371e65b4ba960caa26ed2b945dc5fb251cc71aa9042658a67de392b704a3e4e7e5bcdc1baa417ad784731fc4763ce485c8ef4ea90a0f4dbe743d1197
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://luasec.luaforge.net/
       LICENSE[0]=MIT
diff --git a/lua-forge/luasec/HISTORY b/lua-forge/luasec/HISTORY
index 0927e8c..3df6b58 100644
--- a/lua-forge/luasec/HISTORY
+++ b/lua-forge/luasec/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.3.3
+
 2009-05-11 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.3.2
 
diff --git a/mail/alpine/BUILD b/mail/alpine/BUILD
index 74a07bd..1d8e8d7 100755
--- a/mail/alpine/BUILD
+++ b/mail/alpine/BUILD
@@ -2,6 +2,8 @@ OPTS="--with-system-pinerc=/etc/pinerc 
--with-c-client-target=slx ${ALPINE_OPTS}
 default_build &&
 if [[ $ALPINE_TOPAL == y ]] ; then
 pushd topal-$VERSION3 &&
+make_single &&
 make &&
+make_normal &&
 popd
 fi
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 9f03984..3442948 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -7,13 +7,13 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[1]=ftp://ftp.cac.washington.edu/alpine/old/${SOURCE}
 if [[ $ALPINE_CHAPPA == y ]]; then
          SOURCE2=all.patch.gz
-      PATCHLEVEL=2
+      PATCHLEVEL=3
 FORCE_DOWNLOAD[2]=on
   
SOURCE2_URL[0]=http://staff.washington.edu/chappa/$SPELL/patches/$SPELL-$VERSION/$SOURCE2
-    
SOURCE2_HASH=sha512:21cfa92e702a48eba987d06448d631aea5227fb4bd4ebb42cf6646e5c4b6848f7e3593eaa97c85cfc4bf2080566674671edc8626b561626c754e1bc06e09dbae
+    
SOURCE2_HASH=sha512:6b3375da5be7b4c17ce3a4095aa3f6cd430d57b0de415bc9a23e0ad79242dabb7574e91ebcd0aa645bc8ded4ccf30979ee2161528f421a48fc0908a6bbf7f4c2
 fi
 if [[ $ALPINE_TOPAL == y ]]; then
-        VERSION3=67
+        VERSION3=69
          SOURCE3=topal-package-$VERSION3.tgz
          SOURCE4=topal-package-$VERSION3.tgz.asc
   
SOURCE3_URL[0]=http://homepage.ntlworld.com/phil.brooke/topal/rel-$VERSION3/$SOURCE3
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index d5b5e9a..56e559f 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,10 @@
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: make_single on the ada part of the build
+
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * DETAILS: all.patch.gz updated, new topal version
+       * PREPARE: better link
+
 2009-06-07 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: all.patch.gz updated, new topal version
 
diff --git a/mail/alpine/PREPARE b/mail/alpine/PREPARE
index 7955c91..f47a7bb 100755
--- a/mail/alpine/PREPARE
+++ b/mail/alpine/PREPARE
@@ -1,4 +1,4 @@
 message "To learn more about chappa patches see:"
-message "http://staff.washington.edu/chappa/alpine/info/all.html";
+message "http://staff.washington.edu/chappa/alpine/";
 config_query ALPINE_CHAPPA "Do you want the chappa patches for alpine?" n
 config_query ALPINE_TOPAL "Do you want the Topal GnuPG/Alpine glue?" n
diff --git a/mail/offlineimap/DETAILS b/mail/offlineimap/DETAILS
index 78c3de8..1ef434c 100755
--- a/mail/offlineimap/DETAILS
+++ b/mail/offlineimap/DETAILS
@@ -1,8 +1,8 @@
            SPELL=offlineimap
-         VERSION=6.0.3
-          SOURCE=${SPELL}_${VERSION}.tar.gz
-   
SOURCE_URL[0]=http://www.hawo.stw.uni-erlangen.de/~siflfran/smgl/${SPELL}/${SPELL}_${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:95b4f4667480d3c88553aed8e0bedb978f33db98bc1ca7761c63043731c550c2c6b916342747636d529357cd71d5eb6126166154c7881adb19e8d32b53eaefc0
+         VERSION=6.1.2
+          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+   
SOURCE_URL[0]=http://software.complete.org/software/attachments/download/410/${SOURCE}
+     
SOURCE_HASH=sha512:ff0afd3b413b7c4f273f18e182a4e2d945382012cd0d04bc6ae573acae2442e043e44e096ba182984f98eec607ed9d8abc45ea8d9617fbf65a33a2da836669d5
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
         WEB_SITE=http://software.complete.org/offlineimap
          ENTERED=20060804
diff --git a/mail/offlineimap/HISTORY b/mail/offlineimap/HISTORY
index 5d8e678..2ccb30e 100644
--- a/mail/offlineimap/HISTORY
+++ b/mail/offlineimap/HISTORY
@@ -1,3 +1,6 @@
+2009-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: updated to 6.1.2
+
 2008-08-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: updated to 6.0.3
 
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 0688628..44d1555 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   
SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
   SOURCE2_IGNORE=signature
 if  [ "$BUILD_ENIGMAIL" = "y" ];  then
-ENIGMAIL_VERSION=0.95.7
-      PATCHLEVEL=1
+ENIGMAIL_VERSION=0.96.0
+      PATCHLEVEL=2
          SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
          SOURCE4=${SOURCE3}.asc
   SOURCE4_IGNORE=signature
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 4d48f76..eb90f77 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2009-07-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: ENIGMAIL 0.96.0
+       * PRE_BUILD, enigmail_visibility.patch: removed patch
+
 2009-06-23 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.0.0.22, SECURITY_PATCH=15
 
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index ed5d3b0..9e3013f 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -7,6 +7,5 @@ cp  mail/config/mozconfig  .mozconfig  &&
 
 if  [ "$BUILD_ENIGMAIL" = "y" ];  then
   cd  mailnews/extensions  &&
-  unpack_file  3  &&
-  patch -p0 < ${SPELL_DIRECTORY}/enigmail_visibility.patch
+  unpack_file  3
 fi
diff --git a/mail/thunderbird/enigmail_visibility.patch 
b/mail/thunderbird/enigmail_visibility.patch
deleted file mode 100644
index 1bd5f40..0000000
--- a/mail/thunderbird/enigmail_visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- enigmail/build/nsEnigModule.cpp    2006-05-20 23:47:30.000000000 +0200
-+++ enigmail/build/nsEnigModule.cpp~   2007-09-30 12:35:16.000000000 +0200
-@@ -34,7 +34,9 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#pragma GCC visibility push(default)
- #include "nsIGenericFactory.h"
-+#pragma GCC visibility pop
- #include "nsEnigModule.h"
- 
- #include "nsEnigMsgCompose.h"
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 8662ce5..9429dee 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
            SPELL=bind-tools
-         VERSION=9.6.1
+         VERSION=9.6.1-P1
           SOURCE=bind-$VERSION.tar.gz
          SOURCE2=$SOURCE.sha512.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
    SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
   SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
   SOURCE2_IGNORE=signature
-  SECURITY_PATCH=2
+  SECURITY_PATCH=3
       SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
       LICENSE[0]=ISC
         KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index fda83e0..e67d9de 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 9.6.1-P1; SECURITY_PATCH++
+
 2009-06-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 9.6.1
 
diff --git a/net/iputils-ping/BUILD b/net/iputils-ping/BUILD
index e89d027..d5ccb13 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1,2 +1,4 @@
 make TARGETS="ping ping6" &&
-make -C doc man
+if is_depends_enable $SPELL opensp ; then
+  make -C doc man
+fi
diff --git a/net/iputils-ping/DEPENDS b/net/iputils-ping/DEPENDS
index 9520e12..b78b3c9 100755
--- a/net/iputils-ping/DEPENDS
+++ b/net/iputils-ping/DEPENDS
@@ -1,3 +1,3 @@
-depends opensp &&
-depends sgmlspm &&
-depends docbook-sgml-dtd
+optional_depends opensp '' '' 'for docs and manpages' &&
+optional_depends sgmlspm '' '' 'for docs and manpages' &&
+optional_depends docbook-sgml-dtd '' '' 'for docs and manpages'
diff --git a/net/iputils-ping/HISTORY b/net/iputils-ping/HISTORY
index 84a1782..fdec8f4 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS, BUILD, INSTALL: made docs and manpages optional
+
 2008-04-11 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * DEPENDS: chmod +x
 
diff --git a/net/iputils-ping/INSTALL b/net/iputils-ping/INSTALL
index b0d98ca..85547cb 100755
--- a/net/iputils-ping/INSTALL
+++ b/net/iputils-ping/INSTALL
@@ -1,3 +1,5 @@
 install  -m 4755  ping  ping6  $INSTALL_ROOT/usr/bin  &&
-install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping.8  &&
-install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping6.8
+if is_depends_enabled $SPELL opensp ; then
+  install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping.8  &&
+  install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping6.8
+fi
diff --git a/net/iputils-tracepath/BUILD b/net/iputils-tracepath/BUILD
index 82bc326..3f2a8b5 100755
--- a/net/iputils-tracepath/BUILD
+++ b/net/iputils-tracepath/BUILD
@@ -1,2 +1,4 @@
-make TARGETS="tracepath tracepath6 traceroute6"
-make -C doc man
+make TARGETS="tracepath tracepath6 traceroute6" &&
+if is_depends_enable $SPELL opensp ; then
+  make -C doc man
+fi
diff --git a/net/iputils-tracepath/DEPENDS b/net/iputils-tracepath/DEPENDS
new file mode 100755
index 0000000..b78b3c9
--- /dev/null
+++ b/net/iputils-tracepath/DEPENDS
@@ -0,0 +1,3 @@
+optional_depends opensp '' '' 'for docs and manpages' &&
+optional_depends sgmlspm '' '' 'for docs and manpages' &&
+optional_depends docbook-sgml-dtd '' '' 'for docs and manpages'
diff --git a/net/iputils-tracepath/HISTORY b/net/iputils-tracepath/HISTORY
index 3550075..a25f20f 100644
--- a/net/iputils-tracepath/HISTORY
+++ b/net/iputils-tracepath/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS, BUILD, INSTALL: made manpages and docs optional
+
 2008-02-01 Remko van der Vossen <wich AT sourcemage.org>
         * DETAILS: 20071127-1
         * PRE_BUILD,iputils-glibc-patch.patch: remove glibc patch
diff --git a/net/iputils-tracepath/INSTALL b/net/iputils-tracepath/INSTALL
index d5418ac..94c7de4 100755
--- a/net/iputils-tracepath/INSTALL
+++ b/net/iputils-tracepath/INSTALL
@@ -1,4 +1,7 @@
-  install  tracepath  tracepath6  traceroute6  $INSTALL_ROOT/usr/bin  &&
+install  tracepath  tracepath6  traceroute6  $INSTALL_ROOT/usr/bin  &&
+if is_depends_enabled $SPELL opensp ; then
   install  doc/tracepath.8  $INSTALL_ROOT/usr/share/man/man8/tracepath.8   &&
   install  doc/tracepath.8  $INSTALL_ROOT/usr/share/man/man8/tracepath6.8  &&
   install  doc/traceroute6.8  $INSTALL_ROOT/usr/share/man/man8/traceroute6.8
+fi
+
diff --git a/net/openafs/BUILD b/net/openafs/BUILD
new file mode 100755
index 0000000..6b75f69
--- /dev/null
+++ b/net/openafs/BUILD
@@ -0,0 +1,7 @@
+OPTS="--enable-largefile-fileserver \
+      --enable-supergroups \
+      $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/net/openafs/DEPENDS b/net/openafs/DEPENDS
new file mode 100755
index 0000000..f6c330b
--- /dev/null
+++ b/net/openafs/DEPENDS
@@ -0,0 +1,8 @@
+optional_depends linux-pam \
+                 "--enable-pam" \
+                 "--disable-pam" \
+                 "for PAM support" &&
+
+optional_depends krb5 \
+                 "--with-krb5" "" \
+                 "for Kerberos 5 support"
diff --git a/net/openafs/DETAILS b/net/openafs/DETAILS
new file mode 100755
index 0000000..0aadb0b
--- /dev/null
+++ b/net/openafs/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=openafs
+         VERSION=1.4.11
+          SOURCE=$SPELL-$VERSION-src.tar.bz2
+   SOURCE_URL[0]=http://www.openafs.org/dl/$SPELL/$VERSION/$SOURCE
+     
SOURCE_HASH=sha512:07f26d18921a8913f557fe1a72b715125d36c9a08f790d82b2424391fb05db25a093bb86657abd487413e53eef48b0c516d8b10e09bb041de9a297388dba390b
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE="http://www.openafs.org/";
+      LICENSE[0]=IBM
+         ENTERED=20090722
+           SHORT="open source implementation of the Andrew file system (AFS)"
+cat << EOF
+AFS is a distributed filesystem product, pioneered at Carnegie Mellon 
University
+and supported and developed as a product by Transarc Corporation (now IBM
+Pittsburgh Labs). It offers a client-server architecture for file sharing,
+providing location independence, scalability, security, and transparent
+migration capabilities for data.
+
+IBM branched the source of the AFS product, and made a copy of the source
+available for community development and maintenance.
+
+They called the release OpenAFS.
+EOF
diff --git a/net/openafs/HISTORY b/net/openafs/HISTORY
new file mode 100644
index 0000000..7c4bf57
--- /dev/null
+++ b/net/openafs/HISTORY
@@ -0,0 +1,2 @@
+2009-07-22 Vlad Glagolev <stealth AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/net/openafs/INSTALL b/net/openafs/INSTALL
new file mode 100755
index 0000000..9d9a4c0
--- /dev/null
+++ b/net/openafs/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/net/shorewall-common/DEPENDS b/net/shorewall-common/DEPENDS
index ac5521d..2060a0e 100755
--- a/net/shorewall-common/DEPENDS
+++ b/net/shorewall-common/DEPENDS
@@ -1,6 +1,4 @@
-message "You need one of the compilers" &&
-optional_depends shorewall-perl "" "" "for the perl compiler (reccomended)" 
&&
-optional_depends shorewall-shell "" "" "for the shell compiler" &&
+depends  SHOREWALL_COMPILER  &&
 depends  iproute2       &&
 depends  iptables       &&
 depends  SYSTEM-LOGGER
diff --git a/net/shorewall-common/HISTORY b/net/shorewall-common/HISTORY
index 4a20e51..221efcb 100644
--- a/net/shorewall-common/HISTORY
+++ b/net/shorewall-common/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: use provider for the compiler
+
 2009-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 4.2.9
 
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
index 70e3eb8..17e5830 100644
--- a/net/shorewall-perl/HISTORY
+++ b/net/shorewall-perl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * PROVIDES: added, provide SHOREWALL_COMPILER
+
 2009-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 4.2.9
 
diff --git a/net/shorewall-perl/PROVIDES b/net/shorewall-perl/PROVIDES
new file mode 100755
index 0000000..4733b8e
--- /dev/null
+++ b/net/shorewall-perl/PROVIDES
@@ -0,0 +1 @@
+SHOREWALL_COMPILER
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
index 2c18aa4..bc3c08d 100644
--- a/net/shorewall-shell/HISTORY
+++ b/net/shorewall-shell/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+        * PROVIDES: added, provide SHOREWALL_COMPILER
+
 2009-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 4.2.9
 
diff --git a/net/shorewall-shell/PROVIDES b/net/shorewall-shell/PROVIDES
new file mode 100755
index 0000000..4733b8e
--- /dev/null
+++ b/net/shorewall-shell/PROVIDES
@@ -0,0 +1 @@
+SHOREWALL_COMPILER
diff --git a/net/shorewall6/DEPENDS b/net/shorewall6/DEPENDS
index 3d38422..ee4452b 100755
--- a/net/shorewall6/DEPENDS
+++ b/net/shorewall6/DEPENDS
@@ -1,6 +1,3 @@
-message "You need one of the compilers" &&
-optional_depends shorewall-perl "" "" "for the perl compiler (reccomended)" 
&&
-optional_depends shorewall-shell "" "" "for the shell compiler" &&
 depends  shorewall-common  &&
 depends  iproute2       &&
 depends  iptables       &&
diff --git a/net/shorewall6/HISTORY b/net/shorewall6/HISTORY
index f784bda..92ab98f 100644
--- a/net/shorewall6/HISTORY
+++ b/net/shorewall6/HISTORY
@@ -1,3 +1,7 @@
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: removed shorewall compilers,
+         those are selected in shorewall-common
+
 2009-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 4.2.9
 
diff --git a/net/telnet-bsd/BUILD b/net/telnet-bsd/BUILD
new file mode 100755
index 0000000..a6aa8ed
--- /dev/null
+++ b/net/telnet-bsd/BUILD
@@ -0,0 +1,7 @@
+./configure  -prefix  ${INSTALL_ROOT}/usr            \
+             -mandir  ${INSTALL_ROOT}/usr/share/man  \
+             ${OPTS}                                 &&
+if [[ "${TELNETBSD_CLIENT}" = 'y' ]]; then
+  cd ${SOURCE_DIRECTORY}/telnet
+fi &&
+make
diff --git a/net/telnet-bsd/CONFIGURE b/net/telnet-bsd/CONFIGURE
new file mode 100755
index 0000000..9a5e81a
--- /dev/null
+++ b/net/telnet-bsd/CONFIGURE
@@ -0,0 +1 @@
+config_query TELNETBSD_CLIENT 'Install the client only?' y
diff --git a/net/telnet-bsd/HISTORY b/net/telnet-bsd/HISTORY
index f225067..40e034a 100644
--- a/net/telnet-bsd/HISTORY
+++ b/net/telnet-bsd/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * CONFIGURE, BUILD, INSTALL: telnetd should die ;)
+
 2008-01-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * PRE_BUILD, *patch: removed, no longer applies
        * DETAILS: updated spell to 1.2
diff --git a/net/telnet-bsd/INSTALL b/net/telnet-bsd/INSTALL
new file mode 100755
index 0000000..be3704b
--- /dev/null
+++ b/net/telnet-bsd/INSTALL
@@ -0,0 +1,4 @@
+if [[ "${TELNETBSD_CLIENT}" = 'y' ]]; then
+  cd ${SOURCE_DIRECTORY}/telnet
+fi &&
+make install
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 238bc1a..b549aa2 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,7 +1,7 @@
            SPELL=tor
 
 if [ "$TOR_DEVEL" == "y" ]; then
-         VERSION=0.2.1.16-rc
+         VERSION=0.2.1.19
   SECURITY_PATCH=4
 else
          VERSION=0.2.0.35
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 45275be..b1614f0 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Treeve Jelbert <treeve@sourcemage,org>
+       * DETAILS: versions 0.2.1.19 (devel)
+
 2009-06-26 Treeve Jelbert <treeve@sourcemage,org>
        * DETAILS: versions 0.2.0.35
 
diff --git a/net/ucarp/DEPENDS b/net/ucarp/DEPENDS
index 02ab40a..a19b99b 100755
--- a/net/ucarp/DEPENDS
+++ b/net/ucarp/DEPENDS
@@ -1 +1,6 @@
-depends  libpcap
+depends libpcap &&
+
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "for Native Language Support"
diff --git a/net/ucarp/DETAILS b/net/ucarp/DETAILS
index aa89f9e..570c1de 100755
--- a/net/ucarp/DETAILS
+++ b/net/ucarp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ucarp
          VERSION=1.5.1
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.pureftpd.org/ucarp/${SOURCE}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://download.pureftpd.org/ucarp/$SOURCE
         WEB_SITE=http://www.ucarp.org/
      
SOURCE_HASH=sha512:0243db4226741c9cb39634116e4872ca252709049a4313ca52fe863fec6737194981d4b138ee0aa3a16999cf473908d22139caf93609340c477d61097f8707e2
          ENTERED=20040413
@@ -10,7 +10,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         KEYWORDS="net"
            SHORT="OpenBSD's Common Address Redundancy Protocol"
 cat << EOF
-UCARP allows a pair of hosts to share common virtual IP addresses in order 
to provide automatic failover. It is a portable userland implementation of 
the secure and patent-free Common Address Redundancy Protocol (CARP, 
OpenBSD's alternative to the VRRP).
+UCARP allows a pair of hosts to share common virtual IP addresses in order to
+provide automatic failover. It is a portable userland implementation of the
+secure and patent-free Common Address Redundancy Protocol (CARP, OpenBSD's
+alternative to the VRRP).
 
-Strong points of the CARP protocol are : very low overhead, 
cryptographically signed messages, interoperability between different 
operating systems and no need for any dedicated extra network link between 
redundant hosts. 
+Strong points of the CARP protocol are : very low overhead, cryptographically
+signed messages, interoperability between different operating systems and no
+need for any dedicated extra network link between redundant hosts.
 EOF
diff --git a/net/ucarp/HISTORY b/net/ucarp/HISTORY
index e31d4dd..c9fafc6 100644
--- a/net/ucarp/HISTORY
+++ b/net/ucarp/HISTORY
@@ -1,3 +1,7 @@
+2009-07-21 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: cleaned up, quoting paths, word-wrapped long desc
+       * DEPENDS: added gettext as opt dep for NLS support
+
 2009-06-15 Jeremy Blosser <jblosser-smgl AT firinn.org>
        * DETAILS: Updated to 1.5.1, updated SOURCE_URL.
 
@@ -14,4 +18,3 @@
        * DEPENDS: According to http://www.ucarp.org/README libpcap is needed,
          but I compiled just fine without it...added it anyways.
        * Created
-
diff --git a/news/liferea/CONFIGURE b/news/liferea/CONFIGURE
deleted file mode 100755
index 50fcc8d..0000000
--- a/news/liferea/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ "$LIFEREA_DEVEL" == "n" ]]; then
-  config_query_list LIFEREA_HTTP_BE "Select http backend" gecko webkit 
gtkhtml 
-fi
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index cdf1f39..faf8397 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -3,19 +3,7 @@ depends  gconf2     &&
 depends  libxml2    &&
 depends  sqlite     &&
 depends  libglade2  &&
-
-if [[ "$LIFEREA_DEVEL" == "n" ]]; then
-  if [[ $LIFEREA_HTTP_BE == gecko ]]; then
-     depends GECKO "--disable-gtkhtml2 --disable-webkit"
-  elif [[ $LIFEREA_HTTP_BE == webkit ]]; then
-     depends  webkitgtk "--disable-gecko --disable-gtkhtml2"
-  elif [[ $LIFEREA_HTTP_BE == gtkhtml ]]; then
-     depends libgtkhtml "--disable-webkit --disable-gecko"
-  fi
-else
-  depends webkitgtk &&
-  depends libsoup
-fi &&
+depends  webkitgtk &&
 
 optional_depends  gnutls                              \
                   "--enable-gnutls"                   \
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index f23c909..0d13645 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
            SPELL=liferea
 if [ "$LIFEREA_DEVEL" == "y" ]; then
-         VERSION=1.6.0-rc6
+         VERSION=1.6.0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
-         VERSION=1.4.28
+         VERSION=1.6.0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 0fa2062..1e90231 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,14 @@
+2009-07-26 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Update devel to current stable also.
+       * CONFIGURE: Removed.  No other backends other than webkitgtk
+       * DEPENDS: Only backend is webkitgtk
+
+2009-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * CONFIGURE, DEPENDS, DETAILS: updated stable to 1.6.0
+
+2009-07-21 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated devel to 1.6.0-rc7
+
 2009-06-29 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated devel to 1.6.0-rc6
 
diff --git a/news/liferea/liferea-1.4.28.tar.gz.sig 
b/news/liferea/liferea-1.4.28.tar.gz.sig
deleted file mode 100644
index 77879d5..0000000
Binary files a/news/liferea/liferea-1.4.28.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.6.0-rc6.tar.gz.sig 
b/news/liferea/liferea-1.6.0-rc6.tar.gz.sig
deleted file mode 100644
index 1ccf1f8..0000000
Binary files a/news/liferea/liferea-1.6.0-rc6.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.6.0.tar.gz.sig 
b/news/liferea/liferea-1.6.0.tar.gz.sig
new file mode 100644
index 0000000..e46ec5a
Binary files /dev/null and b/news/liferea/liferea-1.6.0.tar.gz.sig differ
diff --git a/perl-cpan/config-crontab/BUILD b/perl-cpan/config-crontab/BUILD
new file mode 100755
index 0000000..a5fb040
--- /dev/null
+++ b/perl-cpan/config-crontab/BUILD
@@ -0,0 +1,3 @@
+cd ${SOURCE_DIRECTORY} &&
+perl Makefile.PL       &&
+make
diff --git a/perl-cpan/config-crontab/DETAILS 
b/perl-cpan/config-crontab/DETAILS
index 089b321..bbaf621 100755
--- a/perl-cpan/config-crontab/DETAILS
+++ b/perl-cpan/config-crontab/DETAILS
@@ -1,13 +1,12 @@
-           SPELL=config-crontab
-          SPELLX=Config-Crontab
-         VERSION=1.10
-     
SOURCE_HASH=sha512:64ad7053c74746d7f221c5211f2e88b2082c6c0f6cd0efc28704e616470a41028652130da23fb555713a979cfc06c1c9b3a487404418cf7f42d982dd6bf01b3c
-          SOURCE=$SPELLX-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SC/SCOTTW/$SOURCE
-         LICENSE=ART
-        WEB_SITE=http://dbi.perl.org
-         ENTERED=20051210
+           SPELL="config-crontab"
+         VERSION="1.30"
+     
SOURCE_HASH="sha512:3c2d6f6ee3fe742cb97d1c68a59f2629fbc4aa45e212dd6c9ebac193e45337dcbfd24c2a3f872c350d4c48d1b56fe03f1b82f4c74e0e402fa98e7691c5ea8412"
+          SOURCE="${SPELL//c/C}-${VERSION}.tar.gz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL//c/C}-${VERSION}"
+   SOURCE_URL[0]="$PERL_CPAN_URL/authors/id/S/SC/SCOTTW/${SOURCE}"
+         LICENSE="ART"
+        WEB_SITE="http://dbi.perl.org";
+         ENTERED="20051210"
         KEYWORDS="perl"
            SHORT="reads and writes (and pretty-prints) your crontab"
 cat << EOF
diff --git a/perl-cpan/config-crontab/HISTORY 
b/perl-cpan/config-crontab/HISTORY
index 246c8b1..0c21134 100644
--- a/perl-cpan/config-crontab/HISTORY
+++ b/perl-cpan/config-crontab/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Quentin Rameau <quinq AT sourcemage.org>
+       * BUILD, DETAILS: updated to version 1.30
+
 2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: useless
 
diff --git a/perl-cpan/device-gsm/BUILD b/perl-cpan/device-gsm/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/device-gsm/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/device-gsm/DEPENDS b/perl-cpan/device-gsm/DEPENDS
new file mode 100755
index 0000000..fae8a63
--- /dev/null
+++ b/perl-cpan/device-gsm/DEPENDS
@@ -0,0 +1,2 @@
+depends perl &&
+depends device-modem 
diff --git a/perl-cpan/device-gsm/DETAILS b/perl-cpan/device-gsm/DETAILS
new file mode 100755
index 0000000..f8a6a75
--- /dev/null
+++ b/perl-cpan/device-gsm/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=device-gsm
+         VERSION=1.52
+          SOURCE="Device-Gsm-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CO/COSIMO/${SOURCE}
+     
SOURCE_HASH=sha512:81043b558813c22e7b6096171f6e07bf3ecb787fd6ec0d3a5c180357da10f728da7dc1b95c1fcded451990b23cfae4a5a50343336c112a188ce462431a60793c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Device-Gsm-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~COSIMO/Device-Gsm/";
+      LICENSE[0]=ART
+         ENTERED=20090727
+           SHORT="Interface gsm handphones and  modems"
+cat << EOF
+Interface gsm handphones and modems
+EOF
diff --git a/perl-cpan/device-gsm/HISTORY b/perl-cpan/device-gsm/HISTORY
new file mode 100644
index 0000000..3464ee9
--- /dev/null
+++ b/perl-cpan/device-gsm/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/device-modem/BUILD b/perl-cpan/device-modem/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/device-modem/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/device-modem/DEPENDS b/perl-cpan/device-modem/DEPENDS
new file mode 100755
index 0000000..33bb4c6
--- /dev/null
+++ b/perl-cpan/device-modem/DEPENDS
@@ -0,0 +1,2 @@
+depends perl &&
+depends device-serialport
diff --git a/perl-cpan/device-modem/DETAILS b/perl-cpan/device-modem/DETAILS
new file mode 100755
index 0000000..0dab2b0
--- /dev/null
+++ b/perl-cpan/device-modem/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=device-modem
+         VERSION=1.51
+          SOURCE="Device-Modem-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CO/COSIMO/${SOURCE}
+     
SOURCE_HASH=sha512:42f74263a53266981573b922fad3322ba75cd548e4a4c66b203ec08de717a7ddad0e857d4cd2ed5f1600f529f14aa8a6a7bf3e7886f1a7142f581087bcf1a48c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Device-Modem-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~COSIMO/Device-Modem/";
+      LICENSE[0]=ART
+         ENTERED=20090727
+           SHORT="Interface modems and other AT based devices"
+cat << EOF
+Interface modems and other AT based devices
+EOF
diff --git a/perl-cpan/device-modem/HISTORY b/perl-cpan/device-modem/HISTORY
new file mode 100644
index 0000000..3464ee9
--- /dev/null
+++ b/perl-cpan/device-modem/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/device-serialport/BUILD 
b/perl-cpan/device-serialport/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/device-serialport/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/device-serialport/DEPENDS 
b/perl-cpan/device-serialport/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/device-serialport/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/device-serialport/DETAILS 
b/perl-cpan/device-serialport/DETAILS
new file mode 100755
index 0000000..753ee1c
--- /dev/null
+++ b/perl-cpan/device-serialport/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=device-serialport
+         VERSION=1.04
+          SOURCE="Device-SerialPort-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CO/COOK/${SOURCE}
+     
SOURCE_HASH=sha512:4b25a7d29091322d516e0aa20693caabe95a8521b3fdc425d1c03e3312fb59a6883268db7eaf79b32586569502fb656c875dd2b6b1d7a4341d9bd6916e04ee44
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Device-SerialPort-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~COOK/Device-SerialPort/";
+      LICENSE[0]=ART
+         ENTERED=20090727
+           SHORT="POSIX clone of Win32::SerialPort"
+cat << EOF
+POSIX clone of Win32::SerialPort
+EOF
diff --git a/perl-cpan/device-serialport/HISTORY 
b/perl-cpan/device-serialport/HISTORY
new file mode 100644
index 0000000..3464ee9
--- /dev/null
+++ b/perl-cpan/device-serialport/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 9a453e8..9f7d7c5 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -7,19 +7,6 @@ if list_find "${OPTS}" "--enable-cgi" || list_find "${OPTS}" 
"--enable-fastcgi";
     OPTS="--enable-force-cgi-redirect ${OPTS}"
 fi &&
 
-# Setup SSL IMAP if desired
-if list_find "${OPTS}" "--with-imap=${INSTALL_ROOT}/usr"; then
-    # Setup SSL IMAP if desired
-    local CCLIENT=$(get_spell_provider $SPELL C-CLIENT) &&
-
-    if [[ ! -z "${CCLIENT}" ]]; then
-        if is_depends_enabled $CCLIENT openssl; then
-            message "${MESSAGE_COLOR}Enabling SSL for the IMAP 
extension${DEFAULT_COLOR}" &&
-            OPTS="--with-imap-ssl ${OPTS}"
-        fi
-    fi
-fi &&
-
 case "${PHP5_APACHE}" in
     handler)
         if httpd -v | grep -q "Apache/2\."; then
@@ -36,11 +23,6 @@ case "${PHP5_APACHE}" in
     ;;
 esac &&
 
-#Check for xorg or xserver and pass location of xpm
-if [ "$PHP5_X11LIBS" == "y" ]; then
-  OPTS="$OPTS --with-xpm-dir=/usr"
-fi &&
-
 # Check to see if internal GD requested
 if [[ "${PHP5_GD}" == "internal" ]]; then
     OPTS="--with-gd --enable-gd-native-ttf ${OPTS}"
@@ -48,8 +30,6 @@ fi &&
 
 OPTS="   --with-exec-dir=${INSTALL_ROOT}/usr/bin \
  --with-config-file-path=${INSTALL_ROOT}/etc \
-             --with-pear=${INSTALL_ROOT}/usr/share/pear \
-                --enable-cli \
                --disable-rpath \
                 --enable-bcmath \
          --enable-inline-optimization \
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 77af64e..87f57c7 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -1,3 +1,6 @@
+config_query_option PHP5_OPTS "Enable IPv6?" n \
+                    "--enable-ipv6" "--disable-ipv6" &&
+
 config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
                     "--enable-safe-mode" "--disable-safe-mode" &&
 
@@ -10,9 +13,6 @@ config_query_option PHP5_OPTS "Enable FTP support?" y \
 config_query_option PHP5_OPTS "Enable calendar support?" y \
                     "--enable-calendar" "--disable-calendar" &&
 
-config_query_option PHP5_OPTS "Enable perl regular expressions?" y \
-                    "--with-pcre-regex" "--without-pcre-regex" &&
-
 config_query_option PHP5_OPTS "Enable pcntl support (CLI/CGI only)" n \
                     "--enable-pcntl" "--disable-pcntl" &&
 
@@ -24,18 +24,29 @@ config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
 config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
                     "--enable-cgi" "--disable-cgi" &&
 
+config_query_option PHP5_OPTS "Enable CLI version? (needed for PEAR and 
CGI/FastCGI)" y \
+                    "--enable-cli" "--disable-cli" &&
+
 config_query_option PHP5_OPTS "Enable multibyte support?"  n \
-                    "--enable-mbstring" "--disable-mbstring" &&
+                    "--enable-mbstring --enable-mbregex" \
+                    "--disable-mbstring --disable-mbregex" &&
+
+config_query_option PHP5_OPTS "Enable the DBA database drivers? 
(qdbm/gdbm/db/flatfile)" n \
+                    "--enable-dba" "--disable-dba" &&
 
-config_query_option PHP5_OPTS "Enable the PDO driver?" y \
+if list_find "${PHP5_OPTS}" "--enable-dba"; then
+   config_query_option PHP5_OPTS "Enable DBA inifile support?" y \
+                     "--enable-inifile" "--disable-inifile" &&
+   config_query_option PHP5_OPTS "Enable DBA flatfile support?" y \
+                     "--enable-flatfile" "--disable-flatfile"
+fi &&
+
+config_query_option PHP5_OPTS "Enable the PDO database drivers? 
(mysql/postgresql/oracle/*odbc)" y \
                     "--enable-pdo" "--disable-pdo" &&
 
 config_query_option PHP5_OPTS "Enable shmop support?" n \
                     "--enable-shmop" "--disable-shmop" &&
 
-config_query_option PHP5_OPTS "Enable soap support?" n \
-                    "--enable-soap" "--disable-soap" &&
-
 config_query_option PHP5_OPTS "Enable ZIP support?" n \
                     "--enable-zip" "--disable-zip" &&
 
@@ -52,8 +63,4 @@ config_query_list PHP5_APACHE "Which Apache module to 
build?" \
                   none handler filter &&
 
 config_query_list PHP5_GD "Which GD library to use?" \
-                  none internal external &&
-
-if [[ "${PHP5_GD}" != "none" ]]; then
-    config_query PHP5_X11LIBS "Would you like to support XPM image files? 
(requires: X11-LIBS)" n
-fi
+                  none internal external
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 77aa84f..b967707 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,4 +1,4 @@
-. "${GRIMOIRE}/FUNCTIONS" &&
+. ${GRIMOIRE}/FUNCTIONS &&
 
 depends flex &&
 
@@ -7,45 +7,74 @@ depends flex &&
 depends readline "--with-readline" &&
 depends zlib "--with-zlib" &&
 
-# This is required since PHP5
-depends libxml2 "--enable-xml --enable-dom --with-xmlrpc" &&
+optional_depends bzip2 \
+                 "--with-bz2" "--without-bz2" \
+                 "for compression support" &&
+
+optional_depends libxml2 \
+                 '--enable-xml --enable-dom --with-xmlrpc' \
+                 '--disable-xml --disable-dom --without-xmlrpc 
--disable-xmlreader --disable-xmlwriter --disable-simplexml' \
+                 'For XML support (required for SOAP and PEAR)' &&
+
+optional_depends libxslt \
+                 "--with-xsl" "--without-xsl" \
+                 "for XSLT support" &&
+
+if is_depends_enabled $SPELL libxml2 ; then
+  config_query_option PHP5_OPTS "Enable SOAP support?" n \
+                      "--enable-soap" "--disable-soap" &&
+  if list_find "${PHP5_OPTS}" "--enable-cli"; then
+     config_query_option PHP5_OPTS "Enable PEAR support?" y \
+                         "--enable-pear=${INSTALL_ROOT}/usr/share/pear" \
+                         "--without-pear"
+  fi
+else
+  PHP5_OPTS="${PHP5_OPTS} --disable-soap --without-pear"
+fi &&
+
+optional_depends pth \
+                 "--with-tsrm-pth=${INSTALL_ROOT}/usr" 
"--with-tsrm-pthreads" \
+                 "use GNU Portable Threads instead of POSIX threads" &&
 
 case "${PHP5_APACHE}" in
     handler) depends APACHE;;
     filter) depends APACHE2;;
 esac &&
 
-if [[ "${PHP5_GD}" == "external" ]]; then
-    depends gd "--with-gd=${INSTALL_ROOT}/usr --enable-gd-native-ttf" 
-fi &&
-
-# Query for external PCRE library if PCRE support is enabled
-if list_find "${PHP5_OPTS}" "--with-pcre-regex"; then
-    optional_depends pcre \
-                     "--with-pcre-dir=${INSTALL_ROOT}/usr" "" \
-                     "to use an external PCRE library"
-fi &&
+optional_depends pcre \
+                 "--with-pcre-regex=${INSTALL_ROOT}/usr 
--with-pcre=${INSTALL_ROOT}/usr" \
+                 "--without-pcre-regex --without-pcre" \
+                 "for perl regular expressions support (required for PEAR)" 
&&
 
 optional_depends C-CLIENT \
                  "--with-imap=${INSTALL_ROOT}/usr" "--without-imap" \
                  "for IMAP support" &&
 
+if list_find "${OPTS}" "--with-imap"; then
+  optional_depends openssl "--with-imap-ssl" "--without-imap-ssl" \
+                           "for SSL support with IMAP"
+fi &&
+
 optional_depends MAIL-TRANSPORT-AGENT \
                   "" "" \
                   "for SMTP support" &&
 
-optional_depends bzip2 \
-                 "--with-bz2" "--without-bz2" \
-                 "for compression support" &&
+optional_depends enchant \
+                 "--with-enchant" "--without-enchant" \
+                 "use enchant for spelling functions?" &&
 
 optional_depends aspell \
                  "--with-pspell" "--without-pspell" \
-                 "for spelling functions" &&
+                 "use aspell for spelling functions" &&
 
 optional_depends mhash \
                  "--with-mhash" "--without-mhash" \
                  "for hash functions support" &&
 
+optional_depends oniguruma \
+                 "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
+                 "for external oniguruma" &&
+
 optional_depends libmcrypt \
                  "--with-mcrypt" "--without-mcrypt" \
                  "for crypto library" &&
@@ -56,7 +85,8 @@ optional_depends curl \
 
 if is_depends_enabled $SPELL curl; then
     config_query_option PHP5_OPTS "Do you want to use cURL for URL streams 
in core PHP functions?" n \
-                        "--with-curlwrappers" "--without-curlwrappers"
+                        "--with-curlwrappers" "--without-curlwrappers" &&
+    depends -sub NO_ARES curl
 fi &&
 
 optional_depends gmp \
@@ -67,40 +97,27 @@ optional_depends openssl \
                  "--with-openssl" "--without-openssl" \
                  "for OpenSSL support" &&
 
+optional_depends krb5 \
+                 "--with-kerberos" "--without-kerberos" \
+                 "for Kerberos support" &&
+
 optional_depends gettext \
                  "--with-gettext" "--without-gettext" \
                  "for GNU gettext support" &&
 
-optional_depends firebird \
-                 "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird" 
"--without-pdo-firebird" \
-                 "for native Firebird support" &&
-
-optional_depends unixodbc \
-                 "--with-unixODBC=${INSTALL_ROOT}/usr" "--without-unixODBC" \
-                 "for ODBC database support" &&
+optional_depends icu \
+                 "--with-icu-dir=${INSTALL_ROOT}/usr" \
+                 "--without-icu-dir" \
+                 "for ICU unicode support" &&
 
-if is_depends_enabled $SPELL unixodbc && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the unixODBC 
PDO driver?" n \
-                        "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" 
"--without-pdo-odbc"
-fi &&
+optional_depends ODBC-MGR "" "" "for ODBC support" &&
 
-optional_depends libiodbc \
-                 "--with-iodbc" "--without-iodbc" \
-                 "for ODBC database support" &&
-
-optional_depends postgresql \
-                 "--with-pgsql" "--without-pgsql" \
-                 "for native Postgresql support" &&
-
-if is_depends_enabled $SPELL postgresql && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL 
PDO driver?" n \
-                        "--with-pdo-pgsql" "--without-pdo-pgsql"
-fi &&
-
-optional_depends mysql \
-                 "" "" \
-                 "for MySQL support" &&
+case $(get_spell_provider $SPELL ODBC-MGR) in
+  unixodbc) OPTS="${OPTS} --with-unixODBC=${INSTALL_ROOT}/usr 
--without-iodbc" ;;
+  libiodbc) OPTS="${--with-iodbc=${INSTALL_ROOT}}/usr --without-unixODBC" ;;
+esac &&
 
+optional_depends mysql "" "--without-mysql" "for MySQL support" &&
 if is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" == "5.3" ]]; then
     config_query PHP5_MYSQLND "Do you want to use the MySQL Native Driver 
[mysqlnd]? (experimental)" y &&
 
@@ -109,64 +126,90 @@ if is_depends_enabled $SPELL mysql && [[ 
"${VERSION:0:3}" == "5.3" ]]; then
     else
         PHP5_OPTS="${PHP5_OPTS} --with-mysql"
     fi
+    config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
+                        "--with-mysqli" "--without-mysqli"
 elif is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" != "5.3" ]]; then
     PHP5_OPTS="${PHP5_OPTS} --with-mysql"
-else
-    PHP5_OPTS="${PHP5_OPTS} --without-mysql"
 fi &&
 
-if is_depends_enabled $SPELL mysql && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]]; 
then
-        config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
-                            "--with-mysqli=mysqlnd" "--without-mysqli" &&
+optional_depends postgresql \
+                 "--with-pgsql" "--without-pgsql" \
+                 "for native Postgresql support" &&
+
+optional_depends sqlite \
+                 "--with-sqlite3=${INSTALL_ROOT}/usr --enable-sqlite-utf8" 
"--without-sqlite" \
+                 "for SQLite support" &&
+
+if list_find "${PHP5_OPTS}" "--enable-pdo"; then
+
+  if is_depends_enabled $SPELL postgresql ; then
+    config_query_option PHP5_OPTS "Do you want to build the SQLite PDO 
driver?" y \
+                        "--with-pdo-sqlite=${INSTALL_ROOT}/usr" 
"--without-pdo-sqlite"
+  fi &&
+  optional_depends firebird \
+                 "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird" 
"--without-pdo-firebird" \
+                 "for native Firebird support" &&
 
-        config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
-                            "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
+  if is_depends_enabled $SPELL postgresql ; then
+    config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL 
PDO driver?" n \
+                        "--with-pdo-pgsql" "--without-pdo-pgsql"
+  fi &&
+
+  if is_depends_enabled $SPELL mysql ; then
+    if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]]; 
then
+       config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
+                           "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
     else
-        config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
-                            "--with-mysqli" "--without-mysqli" &&
-        config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
-                            "--with-pdo-mysql" "--without-pdo-mysql"
+       config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
+                           "--with-pdo-mysql" "--without-pdo-mysql"
     fi
+  fi &&
+
+  case $(get_spell_provider $SPELL ODBC-MGR) in
+    unixodbc) config_query_option PHP5_OPTS \
+                        "Do you also want to build the unixODBC PDO driver?" 
n \
+                        "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" \
+                        "--without-pdo-odbc" ;;
+    libiodbc) config_query_option PHP5_OPTS \
+                        "Do you also want to build the iODBC PDO driver?" n \
+                        "--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" \
+                        "--without-pdo-odbc" ;;
+  esac
 fi &&
 
-optional_depends gdbm \
-                 "--with-gdbm" "--without-gdbm" \
-                 "database routines that use extensive hashing" &&
+if list_find "${PHP5_OPTS}" "--enable-dba"; then
+  optional_depends qdbm \
+                 "--with-qdbm" "--without-qdbm" \
+                 "qdbm database routines" &&
 
-optional_depends sqlite2 \
-                 "--with-sqlite=${INSTALL_ROOT}/usr --enable-sqlite-utf8" 
"--without-sqlite" \
-                 "for SQLite 2.x support" &&
+  optional_depends db \
+                 "--with-db4" "--without-db4" \
+                 "qdbm database routines" &&
 
-if list_find "${PHP5_OPTS}" "--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the SQLite 3.x 
PDO driver (requires: sqlite)?" y \
-                        "--with-pdo-sqlite=${INSTALL_ROOT}/usr" 
"--without-pdo-sqlite" &&
+  optional_depends gdbm \
+                 "--with-gdbm" "--without-gdbm" \
+                 "database routines that use extensive hashing"
+fi &&
 
-    if ! list_find "${PHP5_OPTS}" "--without-pdo-sqlite"; then
-        depends sqlite
-    fi
+optional_depends openldap \
+                 "--with-ldap" "--without-ldap" \
+                 "for LDAP support" &&
+
+if list_find "${PHP5_OPTS}" "--with-ldap"; then
+  optional_depends LIBSASL \
+                 "--with-ldap-sasl" "--without-ldap-sasl" \
+                 "for LDAP with Cyrus SASL support" &&
+  depends -sub openldap SASL
 fi &&
 
 optional_depends mm \
                  "--with-mm" "--without-mm" \
                  "for sharing memory between related processes" &&
 
-optional_depends openldap \
-                 "--with-ldap" "--without-ldap" \
-                 "for LDAP support" &&
-
 optional_depends tidy \
                  "--with-tidy" "--without-tidy" \
                  "for HTML Tidy support" &&
 
-optional_depends libxslt \
-                 "--with-xsl" "--without-xsl" \
-                 "for XSLT support" &&
-
-optional_depends t1lib \
-                 "--with-t1lib" "--without-t1lib" \
-                 "for T1lib support" &&
-
 optional_depends re2c \
                  "" "" \
                  "to regenerate PHP parsers" &&
@@ -175,21 +218,39 @@ optional_depends libexif \
                  "--enable-exif" "--disable-exif" \
                  "for image metadata support" &&
 
+if [[ "${PHP5_GD}" == "external" ]]; then
+    depends gd "--with-gd=${INSTALL_ROOT}/usr --enable-gd-native-ttf" 
+fi &&
+
 if [[ "${PHP5_GD}" != "none" ]]; then
-    if [[ "${PHP5_X11LIBS}" == "y" ]]; then
-        depends xorg-libs &&
-        depends libxpm "--with-xpm-dir=${INSTALL_ROOT}/usr"
-    fi &&
+
+    optional_depends libxpm \
+                     "--with-xpm-dir=${INSTALL_ROOT}/usr" \
+                     "--without-xpm" \
+                     "for XPM image support" &&
 
     optional_depends jpeg \
-                     "--with-jpeg-dir=${INSTALL_ROOT}/usr" 
"--without-jpeg-dir" \
+                     "--with-jpeg-dir=${INSTALL_ROOT}/usr" \
+                     "--without-jpeg-dir" \
                      "for JPEG support (for GD)" &&
 
     optional_depends libpng \
-                     "--with-png-dir=${INSTALL_ROOT}/usr" 
"--without-png-dir" \
+                     "--with-png-dir=${INSTALL_ROOT}/usr" \
+                     "--without-png-dir" \
                      "for PNG support (for GD)" &&
 
+    optional_depends t1lib \
+                     "--with-t1lib=${INSTALL_ROOT}/usr" \
+                     "--without-t1lib" \
+                     "for t1lib support" &&
+
     optional_depends freetype2 \
-                     "--with-freetype-dir=${INSTALL_ROOT}/usr" 
"--without-freetype-dir" \
-                     "for freetype2 support"
+                     "--with-freetype-dir=${INSTALL_ROOT}/usr" \
+                     "--without-freetype-dir" \
+                     "for freetype2 support" &&
+
+    optional_depends font-jis-misc \
+                     "--enable-gd-jis-conv" \
+                     "--disable-gd-jis-conv" \
+                     "for JIS-mapped Japanese font support"
 fi
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index c90e649..e3ecf50 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -5,8 +5,8 @@ if [[ $PHP5_RC == y ]]; then
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE
 elif [[ $PHP5_ALPHA == y ]]; then
-         VERSION=5.3.0alpha3
-     
SOURCE_HASH=sha512:55e04dc9ce280e53cfbfa49caa1c0b8b1eb6606134b1e6d9022906f593611ad7b24c512fe44576f5a9abcad09f206e5c30a910bdc8d938a736739b65e26063e1
+         VERSION=5.3.0
+     
SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 else
@@ -18,6 +18,11 @@ else
 fi
 
 if [[ $PHP5_SUHOSIN == y ]]; then
+         VERSION=5.2.10
+  SECURITY_PATCH=9
+     
SOURCE_HASH=sha512:df1de653a2cadb335c8cc684baa2ab3cd9614c7d8a2231beed164d9375aa181e94f501ce15267fa9b8c009b106e9797cd30382cde58e1106cd24a30c6203b213
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
         VERSION2=0.9.7
          SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
      SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8f69a2d..3aa2cdc 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,14 @@
+2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: set alpha version to 5.3.0 as that's more recent
+         set suhosin version to 5.2.10 as there's no 5.3.0 patch
+
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, CONFIGURE: moved options to DEPENDS
+         and added some missing options.
+       * DEPENDS: almost rewritten to minimise irrelevant questions,
+         added some missing options.
+         added sub-depends for curl without c-ares (fixes bug 14830)
+
 2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: php.ini-dist -> php.ini-production (Bug #15278)
 
diff --git a/printer/system-config-printer/DEPENDS 
b/printer/system-config-printer/DEPENDS
new file mode 100755
index 0000000..0b2c5b8
--- /dev/null
+++ b/printer/system-config-printer/DEPENDS
@@ -0,0 +1,7 @@
+depends  config         &&
+depends  notify-python  &&
+depends  pycups         &&
+depends  python         &&
+depends  xmlto          &&
+
+optional_depends udev '--with-udev-rules' '' 'use udev for hardware 
detection'
diff --git a/printer/system-config-printer/DETAILS 
b/printer/system-config-printer/DETAILS
new file mode 100755
index 0000000..37286e4
--- /dev/null
+++ b/printer/system-config-printer/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=system-config-printer
+         VERSION=1.1.10
+          SOURCE=$SPELL-$VERSION.tar.bz2
+    
SOURCE_HASH=sha512:e47eafaae4f1ae28e869c7f3b4021c17241d0cfdd80daf56ea4f552c9de1a6613bd1299f206b77b298db1fd17754f4bdfade09c6f10deb56304509289b182e8b
+         SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   
SOURCE_URL[0]=http://cyberelk.net/tim/data/system-config-printer/1.1/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+#      SOURCE_GPG=tim.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+        WEB_SITE=http://cyberelk.net/tim/software/system-config-printer/
+      LICENSE[0]=GPL
+         ENTERED=20081113
+        KEYWORDS="printing"
+           SHORT="CUPS administration tool"
+cat << EOF
+a CUPS administration tool
+EOF
diff --git a/printer/system-config-printer/HISTORY 
b/printer/system-config-printer/HISTORY
new file mode 100644
index 0000000..2cbcc0c
--- /dev/null
+++ b/printer/system-config-printer/HISTORY
@@ -0,0 +1,41 @@
+2009-07-24 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Depends on xmlto
+
+2009-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.10
+         bypass invalid gpg
+       * DEPENDS: add optional udev
+         move entire spell to printer section
+
+2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.8
+
+2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Depends on pycups and notify-python
+         Bug #15190
+
+2009-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.7
+
+2009-03-15 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.6
+
+2009-01-15 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.2
+
+2008-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: add config
+
+2008-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.12
+
+2008-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.11
+
+2008-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: add config
+
+2008-11-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.10
+         spell created
+
diff --git a/printer/system-config-printer/tim.gpg 
b/printer/system-config-printer/tim.gpg
new file mode 100644
index 0000000..ccf19b9
Binary files /dev/null and b/printer/system-config-printer/tim.gpg differ
diff --git a/python-pypi/bpython/DEPENDS b/python-pypi/bpython/DEPENDS
new file mode 100755
index 0000000..a9322be
--- /dev/null
+++ b/python-pypi/bpython/DEPENDS
@@ -0,0 +1 @@
+depends pygments
diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
new file mode 100755
index 0000000..05adb8d
--- /dev/null
+++ b/python-pypi/bpython/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=bpython
+         VERSION=0.9.4
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
+     
SOURCE_HASH=sha512:d0611d0ab648fe4bdc1cb3de4f8a3c333a0d90605b8f3662bbf7187d094981375db95976c4f9516253e9958ea552138e237fbd2ba7762c0275e4d826ed2fa4e9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.bpython-interpreter.org/
+      LICENSE[0]=MIT
+         ENTERED=20090724
+           SHORT="fancy interface to the Python interpreter"
+cat << EOF
+bpython is an enhanced Python interactive interpreter that uses curses and
+provides the following main features: in-line syntax highlighting; 
readline-like
+autocompletion with suggestions displayed as you type; expected argument
+specification for functions; a handy pastebin function to quickly submit your
+code and return a URL. Its goal is to bring together a few handy ideas to
+enhance the standard interpreter without getting carried away.
+EOF
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
new file mode 100644
index 0000000..bdb9b06
--- /dev/null
+++ b/python-pypi/bpython/HISTORY
@@ -0,0 +1,2 @@
+2009-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS, DETAILS: spell created
diff --git a/python-pypi/chardet/DEPENDS b/python-pypi/chardet/DEPENDS
new file mode 100755
index 0000000..a86d429
--- /dev/null
+++ b/python-pypi/chardet/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/chardet/DETAILS b/python-pypi/chardet/DETAILS
new file mode 100755
index 0000000..eec257f
--- /dev/null
+++ b/python-pypi/chardet/DETAILS
@@ -0,0 +1,14 @@
+           SPELL="chardet"
+         VERSION="1.0.1"
+          SOURCE="python2-${SPELL}-${VERSION}.tgz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tgz}"
+   SOURCE_URL[0]="http://${SPELL}.feedparser.org/download/${SOURCE}";
+     
SOURCE_HASH="sha512:efc959fb00c834ca2d8c3ae1d41e6f34bc5d163bb5ff326a4eea17d78327fb62a16e4f23f2392e5210537cf76e099bd132dddd4daa5d7e6e6e3efb7351767bbe"
+        WEB_SITE="http://chardet.feedparser.org/";
+         ENTERED="20090727"
+      LICENSE[0]="LGPL"
+           SHORT="Character encoding auto-detection"
+cat << EOF
+Universal Encoding Detector.
+Character encoding auto-detection in Python 2. As smart as your browser. 
Open source.
+EOF
diff --git a/python-pypi/chardet/HISTORY b/python-pypi/chardet/HISTORY
new file mode 100644
index 0000000..657c76a
--- /dev/null
+++ b/python-pypi/chardet/HISTORY
@@ -0,0 +1,2 @@
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * DEPENDS, DETAILS, HISTORY: created this spell
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 6a58202..bd29993 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mercurial
-         VERSION=1.3
-     
SOURCE_HASH=sha512:e69fa633a9debd527b26448b5928ef341ebea128bcf4753a52c8292ef2b8198821f6ff5ae7fc124968be2f626fa7ad8791313254d8997b159f83137958bb5943
+         VERSION=1.3.1
+     
SOURCE_HASH=sha512:0b94f0439348acb5af318d4cc16514b9a830bfbe779b30bf0538e14b373d0dd9b1f580b9bdc86de6c8c891823fc60f33fef05f82d3c6b3252d800ee7a50e56aa
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 11fd0b4..6a08c6a 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2009-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.3.1
+
 2009-07-02 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: updated to 1.3
 
diff --git a/python-pypi/pygments/DEPENDS b/python-pypi/pygments/DEPENDS
index a86d429..bc66e00 100755
--- a/python-pypi/pygments/DEPENDS
+++ b/python-pypi/pygments/DEPENDS
@@ -1 +1,2 @@
-depends python
+depends python &&
+depends setuptools
diff --git a/python-pypi/pygments/HISTORY b/python-pypi/pygments/HISTORY
index 8d0100b..8a32f48 100644
--- a/python-pypi/pygments/HISTORY
+++ b/python-pypi/pygments/HISTORY
@@ -1,3 +1,5 @@
+2009-07-27 Donald Johnson <ltdonny AT gmail.com>
+       * DEPENDS: Added setuptools as a dependency.
 2008-12-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: VERSION 1.0
 
diff --git a/python-pypi/pyrex/DETAILS b/python-pypi/pyrex/DETAILS
index d06aaa6..bcf64c6 100755
--- a/python-pypi/pyrex/DETAILS
+++ b/python-pypi/pyrex/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pyrex
-         VERSION=0.9.5.1a
-     
SOURCE_HASH=sha512:29e128121ab551b735fd0bc184e30271e5bc5a73dbf4170fd86d34f94a756d27682fd7a1dc03d5830a235d6fc04c1222266e9948a1154d623b4d63b815384781
+         VERSION=0.9.8.5
+     
SOURCE_HASH=sha512:bda0efb92850d04a5475fbef9c93e0a9ff44f905c090b56a73a2956a5894dc5d229492f38ef28e78a903b0f0b650e9d6c2eb1cda99d3c7b9612ec2aa602acc95
           SOURCE=Pyrex-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Pyrex-$VERSION
    SOURCE_URL[0]=http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/$SOURCE
diff --git a/python-pypi/pyrex/HISTORY b/python-pypi/pyrex/HISTORY
index c7ae11b..046ad34 100644
--- a/python-pypi/pyrex/HISTORY
+++ b/python-pypi/pyrex/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.9.8.5
+
 2007-04-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.5.1a
 
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index c3b8ee6..57fd0c4 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,6 +1,6 @@
            SPELL=python-ldap
-         VERSION=2.3.8
-     
SOURCE_HASH=sha512:0c2d210aca9b3dfc1eec8f3e911d22b876ada1e2f2f89131e4981d0d6c8825dd537f3c571de93bf4df4c92336e40750038a9e4967cca2a669869c929d813d971
+         VERSION=2.3.9
+     
SOURCE_HASH=sha512:7470c476c44b0a8ae1498fddac5f0c6ba64bd305742df578ad204f21348dbcec61624b9da15d32c14c9120a2104137d37727e9df5ebf74e380ab607c496bbbe7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 0fc8cff..022607a 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,6 @@
+2009-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.3.9
+
 2009-05-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.3.8
 
diff --git a/python-pypi/system-config-printer/DEPENDS 
b/python-pypi/system-config-printer/DEPENDS
deleted file mode 100755
index e88cbaa..0000000
--- a/python-pypi/system-config-printer/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  config         &&
-depends  notify-python  &&
-depends  pycups         &&
-depends  python
diff --git a/python-pypi/system-config-printer/DETAILS 
b/python-pypi/system-config-printer/DETAILS
deleted file mode 100755
index 5fcfb43..0000000
--- a/python-pypi/system-config-printer/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=system-config-printer
-         VERSION=1.1.8
-          SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=http://cyberelk.net/tim/data/system-config-printer/1.1/$SOURCE
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=tim.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
-        WEB_SITE=http://cyberelk.net/tim/software/system-config-printer/
-      LICENSE[0]=GPL
-         ENTERED=20081113
-        KEYWORDS="printing"
-           SHORT="CUPS administration tool"
-cat << EOF
-a CUPS administration tool
-EOF
diff --git a/python-pypi/system-config-printer/HISTORY 
b/python-pypi/system-config-printer/HISTORY
deleted file mode 100644
index efaacbc..0000000
--- a/python-pypi/system-config-printer/HISTORY
+++ /dev/null
@@ -1,32 +0,0 @@
-2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.1.8
-
-2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
-       * DEPENDS: Depends on pycups and notify-python
-         Bug #15190
-
-2009-04-15 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.1.7
-
-2009-03-15 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.1.6
-
-2009-01-15 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.1.2
-
-2008-12-11 Treeve Jelbert <treeve AT sourcemage.org>
-       * DEPENDS: add config
-
-2008-12-01 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.0.12
-
-2008-11-21 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.0.11
-
-2008-11-14 Treeve Jelbert <treeve AT sourcemage.org>
-       * DEPENDS: add config
-
-2008-11-13 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 1.0.10
-         spell created
-
diff --git a/python-pypi/system-config-printer/tim.gpg 
b/python-pypi/system-config-printer/tim.gpg
deleted file mode 100644
index ccf19b9..0000000
Binary files a/python-pypi/system-config-printer/tim.gpg and /dev/null differ
diff --git a/ruby-raa/ruby/DETAILS b/ruby-raa/ruby/DETAILS
index f7b6ffc..6dfc2c9 100755
--- a/ruby-raa/ruby/DETAILS
+++ b/ruby-raa/ruby/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby
 if [[ "${RUBY_1_9}" == "y" ]]; then
-         VERSION=1.9.1-p129
-     
SOURCE_HASH=sha512:f0c2ec29424235a7f24f335395b3b8cb7f1e2ca40d346ceb99f0eb4cf23cc9dbb423602a4e70251a93fd5d03f816b0eb2195afe6fa0ad0a8bb43d085e2058f64
+         VERSION=1.9.1-p243
+     
SOURCE_HASH=sha512:b7a85f09c5451aa0cf5d8576a0cd13973e58ae1a5d58fd1bdb18cecc8b853f726d3da759aec2e72dca85870dcbdca9cbe8e86615dcda1538dca239d88f3a63dd
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
 else
diff --git a/ruby-raa/ruby/HISTORY b/ruby-raa/ruby/HISTORY
index b8ed748..a1085ac 100644
--- a/ruby-raa/ruby/HISTORY
+++ b/ruby-raa/ruby/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.9.1-p243
+
 2009-07-01 David Kowis <dkowis AT shlrm.org>
        * DETAILS: updated latest stable to -p129 I'm sure there's security 
issues in there
          but I didn't see any listed anywhere. Rails was certainly broken, 
now
diff --git a/science/wcalc/DETAILS b/science/wcalc/DETAILS
new file mode 100755
index 0000000..6125241
--- /dev/null
+++ b/science/wcalc/DETAILS
@@ -0,0 +1,23 @@
+           SPELL="wcalc"
+         VERSION="2.4"
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.bz2}"
+   SOURCE_URL[0]="${SOURCEFORGE_URL}/w-calc/${SOURCE}"
+     
SOURCE_HASH="sha512:167556b8fad4dca504505ff4172fd7f322b005e74e92d9e4aec7ae1cdc17cfa86501f9c5835b1dea6eb2adcd317beda523dfa61f882db895178aaf51c877171d"
+        WEB_SITE="http://w-calc.sourceforge.net/";
+         ENTERED="20090727"
+      LICENSE[0]="GPL"
+           SHORT="Flexible command-line scientific calculator"
+cat << EOF
+Wcalc is a very capable calculator. It supports abitrary precision, has
+standard functions (sin, asin, and sinh for example, in either radians or
+degrees), many pre-defined constants (pi, e, c, etc.), support for using
+variables, "active" variables, a command history, hex/octal/binary input and
+output, unit conversions, embedded comments, and an expandable expression 
entry
+field. It evaluates expressions using the standard order of operations.
+
+Wcalc uses intuitive expressions and implicit multiplication.  For example,
+Wcalc will evaluate: 5sin 4!-7*2(4%6)^2 to be -221.96631678. Wcalc will also
+understand basic UTF-8 entities, and so will evaluate 
√7×2÷π−ε0×σ+α+γ+R∞×Mτ-Φ0
+to be 2.26885.
+EOF
diff --git a/science/wcalc/HISTORY b/science/wcalc/HISTORY
new file mode 100644
index 0000000..47ada67
--- /dev/null
+++ b/science/wcalc/HISTORY
@@ -0,0 +1,2 @@
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * DETAILS, HISTORY: crated this spell
diff --git a/science/xaos/DETAILS b/science/xaos/DETAILS
index ff27ac4..14400a5 100755
--- a/science/xaos/DETAILS
+++ b/science/xaos/DETAILS
@@ -1,14 +1,14 @@
            SPELL=xaos
-         VERSION=3.4
-          SOURCE=XaoS-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/XaoS-$VERSION
+         VERSION=3.5
+          SOURCE=xaos-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/xaos-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/xaos/$SOURCE
         WEB_SITE=http://xaos.sourceforge.net/
-     
SOURCE_HASH=sha512:6644164f321ed12cab6bc48877b2c1e3d0bc6337e36d920ec39bce00ee0cfd2cbca5ab8b85bdef38754b5199e57f7b410ddc890895a7d6b5bbde367e0fa646c1
+     
SOURCE_HASH=sha512:c0d9e88de7767a9c62bf2fe6e49e4115d992882cd0780acf61fc14539364d383b275b7f589de353e0b025f43efc54986f19c0722322aedd992027e788295d1df
       LICENSE[0]=GPL
          ENTERED=20020821
         KEYWORDS="science"
-           SHORT="XaoS is a fractal viewer/zoomer"
+           SHORT="a fractal viewer/zoomer"
 cat << EOF
 XaoS is a fast portable real-time interactive fractal zoomer. 
 It displays the Mandelbrot set (among other escape time
diff --git a/science/xaos/HISTORY b/science/xaos/HISTORY
index b8ee94f..3300874 100644
--- a/science/xaos/HISTORY
+++ b/science/xaos/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.5, XaoS -> xaos, fixed SHORT
+
 2008-06-06 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.4
 
diff --git a/security-libs/libfprint/DETAILS b/security-libs/libfprint/DETAILS
index 92ac15a..2fdc455 100755
--- a/security-libs/libfprint/DETAILS
+++ b/security-libs/libfprint/DETAILS
@@ -1,11 +1,11 @@
            SPELL=libfprint
 if [[ "$LIBFPRINT_DEV" == 'y' ]]; then
 #not recent enough..
-#         VERSION=0.1.0-pre1
-#     
SOURCE_HASH=sha512:7e481ff661ba3fac2b93b6552c2c65244bbe8d62884215eb4cdb2cd585dc308268e9762e251d2330143c56903f55cf339940df6ec03be08cd1fe45a4840665a5
+#         VERSION=0.1.0-pre2
+#     
SOURCE_HASH=sha512:0005eedbd5864b8a758a564c5ffcc146f6a8b56c28abe85956c75ad4d599e58bde7a01e2711a3d4aaec6ea65f949dc2825253ff22025cedc31b4b82a7d8b63f4
          VERSION=scm
    SOURCE_IGNORE=volatile
-      SOURCE_URL=git://projects.reactivated.net/~dsd/libfprint.git
+      SOURCE_URL=git://github.com/dsd/libfprint.git:libfprint
   FORCE_DOWNLOAD=on
 else
          VERSION=0.0.6
diff --git a/security-libs/libfprint/HISTORY b/security-libs/libfprint/HISTORY
index 868c409..2af7dc3 100644
--- a/security-libs/libfprint/HISTORY
+++ b/security-libs/libfprint/HISTORY
@@ -1,3 +1,10 @@
+2009-07-28 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: fixed source url
+
+2009-03-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: added latest unstable release to track when
+         it's recent enough for fprintd
+
 2009-03-19 Ladislav Hagara <hgr AT vabo.cz>
        * BUILD: fixed broken stable version
 
diff --git a/security/fprintd/DEPENDS b/security/fprintd/DEPENDS
index 12e4dff..bbf42d1 100755
--- a/security/fprintd/DEPENDS
+++ b/security/fprintd/DEPENDS
@@ -2,9 +2,7 @@ depends git &&
 depends libusb &&
 depends libfprint &&
 depends dbus &&
+depends gtk-doc &&
 optional_depends linux-pam '--enable-pam'            \
                            '--disable-pam'           \
-                           'build the pam module'    &&
-optional_depends gtk-doc   '--enable-gtk-doc'        \
-                           '--disable-gtk-doc'       \
-                           'build the documentation'
+                           'build the pam module (broken)'
diff --git a/security/fprintd/DETAILS b/security/fprintd/DETAILS
index c0bcf62..1e79987 100755
--- a/security/fprintd/DETAILS
+++ b/security/fprintd/DETAILS
@@ -2,7 +2,7 @@
          VERSION=scm
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=git://projects.reactivated.net/~dsd/fprintd.git:fprintd
+   SOURCE_URL[0]=git://github.com/dsd/fprintd.git:fprintd
   FORCE_DOWNLOAD=on
      SOURCE_IGNORE=volatile
         WEB_SITE=http://reactivated.net/fprint/
diff --git a/security/fprintd/HISTORY b/security/fprintd/HISTORY
index aad0cc1..08a8e8f 100644
--- a/security/fprintd/HISTORY
+++ b/security/fprintd/HISTORY
@@ -1,2 +1,6 @@
+2009-07-28 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: fixed source url
+       * DEPENDS: gtk-doc no longer optional
+
 2009-03-19 Arjan Bouter <abouter AT sourcemage.org>
        * BUILD,DETAILS,DEPENDS,HISTORY: created spell
diff --git a/security/tct/BUILD b/security/tct/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/security/tct/BUILD
@@ -0,0 +1 @@
+make
diff --git a/security/tct/DEPENDS b/security/tct/DEPENDS
new file mode 100755
index 0000000..f5d20ef
--- /dev/null
+++ b/security/tct/DEPENDS
@@ -0,0 +1,16 @@
+depends perl &&
+optional_depends lsof '' '' 'Find open files (highly recommended)' &&
+optional_depends CRON '' '' 'Inspect cron?' &&
+optional_depends rpm '' '' 'use rpm?' &&
+optional_depends yp-tools '' '' 'for ypcat and ypwhich' &&
+optional_depends uudeview '' '' 'for uudecode' &&
+optional_depends bsd-finger '' '' 'for finger' &&
+optional_depends  'nfs-utils' '' 'for nfs support' &&
+optional_depends  at '' '' 'use at?' &&
+optional_depends  'netkit-ftp' '' 'for ftp support'
+optional_depends  nmap '' '' 'use nmap?' &&
+optional_depends  strace '' '' 'use strace?'
+
+#please help complete the list of apps:
+#acctcom, devinfo, eeprom, format, modstat, pkginfo, pstat
+#rusers, showmount, showrev, swap
diff --git a/security/tct/DETAILS b/security/tct/DETAILS
new file mode 100755
index 0000000..149c827
--- /dev/null
+++ b/security/tct/DETAILS
@@ -0,0 +1,27 @@
+           SPELL=tct
+         VERSION=1.18
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://www.porcupine.org/forensics/${SOURCE}
+     
SOURCE_HASH=sha512:aea6e599e4e81cc6d320c36e181ee9478899cb85d13d3ea2a2bd90c223b43b919f8c9ee25826b7aada3fe402204a94a87b7142af97d79570e22cef60f8434a26
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.porcupine.org/forensics/tct.html";
+      LICENSE[0]=IBMPL
+            DOCS="$DOCS CHANGES Beware quick-start help-recovering-file 
help-when-broken-into"
+         ENTERED=20090727
+           SHORT="The coroner's toolkit"
+cat << EOF
+TCT is a collection of programs by Dan Farmer and Wietse Venema for a
+post-mortem analysis of a UNIX system after break-in.
+The programs are all either oriented towards gathering or analyzing
+forensic data on a Unix system.  There is no single task or ultimate
+goal that they are directed to, but if there was a theme it'd be an
+effort towards the reconstruction of the past - determining as much
+as possible what happened with a static snapshot of a system.  Most of
+the tools are oriented towards data collection rather than analysis -
+a good use of the toolkit could be for a relative neophyte in Unix
+forensic security to send the data to someone who does know something and
+can further analyze the output.
+
+Examples of using TCT can be found in the Forensic Discovery book.
+(Last draft available for free in HTML form on the website)
+EOF
diff --git a/security/tct/FINAL b/security/tct/FINAL
new file mode 100755
index 0000000..ff53253
--- /dev/null
+++ b/security/tct/FINAL
@@ -0,0 +1 @@
+message "${PROBLEM_COLOR}Warning, ${SPELL} is installed in /opt and is 
supposed to be run from there${DEFAULT_COLOR}"
diff --git a/security/tct/HISTORY b/security/tct/HISTORY
new file mode 100644
index 0000000..67eb127
--- /dev/null
+++ b/security/tct/HISTORY
@@ -0,0 +1,2 @@
+2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, DETAILS, DEPENDS, INSTALL, FINAL, PRE_BUILD: spell created
diff --git a/security/tct/INSTALL b/security/tct/INSTALL
new file mode 100755
index 0000000..fe1f2d4
--- /dev/null
+++ b/security/tct/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p ${INSTALL_ROOT}/opt/tct &&
+cp -a ${SOURCE_DIRECTORY}/* ${INSTALL_ROOT}/opt/tct/
diff --git a/security/tct/PRE_BUILD b/security/tct/PRE_BUILD
new file mode 100755
index 0000000..30f2e29
--- /dev/null
+++ b/security/tct/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/fstools.patch
diff --git a/security/tct/fstools.patch b/security/tct/fstools.patch
new file mode 100644
index 0000000..758b6c8
--- /dev/null
+++ b/security/tct/fstools.patch
@@ -0,0 +1,10 @@
+--- tct-1.18-orig/src/fstools/fs_tools.h       2007-04-09 15:30:32.000000000 
+0200
++++ tct-1.18-fixed/src/fstools/fs_tools.h      2009-07-27 18:31:01.934766046 
+0200
+@@ -201,6 +201,7 @@
+   */
+ #if defined(LINUX2)
+ #define SUPPORTED
++#include <linux/fs.h>
+ #include <linux/ext2_fs.h>
+ #define HAVE_EXT2FS
+ #define HAVE_DTIME
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index d635086..6645105 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.2.0
-  SECURITY_PATCH=16
+         VERSION=1.2.1
+  SECURITY_PATCH=17
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-     
SOURCE_HASH=sha512:14cd749c163f65b992203e6a827d9a42dc9a14a28d71a8c82fe5aa3703a5ba23e51b1755a8b165a9e007df6a6d9ffe91fb8fef73d67dfd5f8f43c93893d75069
+     
SOURCE_HASH=sha512:772a6a3b457aeac6370ba224447917ccce1b107a38fa9cc6d2f5db4086db15be4dca844e720b942dd04a5b549f7c0a290c2a3ff55372b481d326a34ad6b7bdd7
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index baf5ad3..ca03554 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,7 @@
+2009-07-20 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.2.1, SECURITY_PATCH=17
+         http://www.wireshark.org/security/wnpa-sec-2009-04.html
+
 2009-06-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2.0
 
diff --git a/shell-term-fm/bash-completion/DETAILS 
b/shell-term-fm/bash-completion/DETAILS
index 834c717..a47312c 100755
--- a/shell-term-fm/bash-completion/DETAILS
+++ b/shell-term-fm/bash-completion/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/bash_completion
    SOURCE_URL[0]=http://www.caliban.org/files/bash/$SOURCE
         WEB_SITE=http://www.caliban.org/bash/index.shtml#completion
          ENTERED=20020215
-      PATCHLEVEL=7
+      PATCHLEVEL=8
       LICENSE[0]=GPL
         KEYWORDS="bash console"
            SHORT="bash programmable completion"
diff --git a/shell-term-fm/bash-completion/HISTORY 
b/shell-term-fm/bash-completion/HISTORY
index 3b3ab09..5303eef 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,7 @@
+2009-07-26 Peng Chang (Charles) <chp AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * smgl_completion: fixed typo dependencie => dependencies
+
 2009-04-25 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * smgl_completion: Updated to added confmeld, resurrect
diff --git a/shell-term-fm/bash-completion/smgl_completion 
b/shell-term-fm/bash-completion/smgl_completion
index e94b4c6..8b9525c 100644
--- a/shell-term-fm/bash-completion/smgl_completion
+++ b/shell-term-fm/bash-completion/smgl_completion
@@ -85,7 +85,7 @@ _gaze()
            md5sum export import section maintainer grimoire html newer \
            older prune voyeur pam orphans depends spider time version 
versions \
                        activity install-queue remove-queue show-held 
show-exiled short \
-                       source_urls install-full install-spell license size 
grimoires dependencie \
+                       source_urls install-full install-spell license size 
grimoires dependencies \
                        time time-system \
                        BUILD CONFIGURE CONFLICTS DETAILS DEPENDS DOWNLOAD 
FINAL HISTORY \
                        INSTALL INSTALL_EXTRAS PATCH POST_BUILD POST_INSTALL 
POST_REMOVE \
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index a33f0c6..e6a3807 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
   SOURCE2_IGNORE=signature
   SOURCE4_IGNORE=signature
         WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
-      PATCHLEVEL=2
+      PATCHLEVEL=3
          ENTERED=20010922
       LICENSE[0]=GPL2
         KEYWORDS="console"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index c808fec..194776f 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,8 @@
+2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * PRE_BUILD: Added upstream patches
+       * patchs/bash40-018 to 024: Added upstream patches
+
 2009-04-09 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: Added upstream patches
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index d987a6a..222eb0e 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -19,6 +19,13 @@ patch -p0 < $SPELL_DIRECTORY/patches/bash40-014 &&
 patch -p0 < $SPELL_DIRECTORY/patches/bash40-015 &&
 patch -p0 < $SPELL_DIRECTORY/patches/bash40-016 &&
 patch -p0 < $SPELL_DIRECTORY/patches/bash40-017 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-018 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-019 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-020 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-021 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-022 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-023 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-024 &&
 
 if [[ "$BASH_NI_LOGIN" == y ]]; then
   message "${MESSAGE_COLOR}Defining 
NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
diff --git a/shell-term-fm/bash/patches/bash40-018 
b/shell-term-fm/bash/patches/bash40-018
new file mode 100644
index 0000000..35f33e5
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-018
@@ -0,0 +1,78 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-018
+
+Bug-Reported-by: Dan Price <dp AT eng.sun.com>
+Bug-Reference-ID: <20090324171502.GA20582 AT eng.sun.com>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00184.html
+
+Bug-Description:
+
+A missing include file results in an empty function definition and a no-op
+when checking whether or not the window size has changed.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/sh/winsize.c       2008-08-12 13:53:51.000000000 
-0400
+--- lib/sh/winsize.c   2009-04-06 10:44:20.000000000 -0400
+***************
+*** 31,44 ****
+  #include <sys/ioctl.h>
+  
+! #if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
+! /* For struct winsize on SCO */
+! /*   sys/ptem.h has winsize but needs mblk_t from sys/stream.h */
+! #  if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined 
(SIGWINCH)
+! #    if defined (HAVE_SYS_STREAM_H)
+! #      include <sys/stream.h>
+! #    endif
+  #    include <sys/ptem.h>
+! #  endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */
+! #endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */
+  
+  #include <stdio.h>
+--- 31,57 ----
+  #include <sys/ioctl.h>
+  
+! /* Try to find the definitions of `struct winsize' and TIOGCWINSZ */
+! 
+! #if defined (GWINSZ_IN_SYS_IOCTL) && !defined (TIOCGWINSZ)
+! #  include <sys/ioctl.h>
+! #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */
+! 
+! #if defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined 
(STRUCT_WINSIZE_IN_SYS_IOCTL)
+! #  include <termios.h>
+! #endif /* STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
+! 
+! /* Not in either of the standard places, look around. */
+! #if !defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined 
(STRUCT_WINSIZE_IN_SYS_IOCTL)
+! #  if defined (HAVE_SYS_STREAM_H)
+! #    include <sys/stream.h>
+! #  endif /* HAVE_SYS_STREAM_H */
+! #  if defined (HAVE_SYS_PTEM_H) /* SVR4.2, at least, has it here */
+  #    include <sys/ptem.h>
+! #    define _IO_PTEM_H          /* work around SVR4.2 1.1.4 bug */
+! #  endif /* HAVE_SYS_PTEM_H */
+! #  if defined (HAVE_SYS_PTE_H)  /* ??? */
+! #    include <sys/pte.h>
+! #  endif /* HAVE_SYS_PTE_H */
+! #endif /* !STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
+  
+  #include <stdio.h>
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-019 
b/shell-term-fm/bash/patches/bash40-019
new file mode 100644
index 0000000..30efd68
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-019
@@ -0,0 +1,125 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-019
+
+Bug-Reported-by: Oleksiy Melnyk <lex AT upc.ua>
+Bug-Reference-ID: <20090224142233.D2FEFC004 AT floyd.upc.ua>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00200.html
+
+Bug-Description:
+
+Using an external command as part of the DEBUG trap when job control is
+enabled causes pipelines to misbehave.  The problem has to do with process
+groups assigned to the pipeline and terminal.
+
+Patch:
+
+*** ../bash-4.0-patched/jobs.c 2009-01-29 17:09:49.000000000 -0500
+--- jobs.c     2009-04-17 21:08:20.000000000 -0400
+***************
+*** 443,447 ****
+    the_pipeline = saved_pipeline;
+    already_making_children = saved_already_making_children;
+!   if (discard)
+      discard_pipeline (old_pipeline);
+  }
+--- 443,447 ----
+    the_pipeline = saved_pipeline;
+    already_making_children = saved_already_making_children;
+!   if (discard && old_pipeline)
+      discard_pipeline (old_pipeline);
+  }
+***************
+*** 4203,4205 ****
+--- 4204,4225 ----
+  }
+  
++ void
++ save_pgrp_pipe (p, clear)
++      int *p;
++      int clear;
++ {
++   p[0] = pgrp_pipe[0];
++   p[1] = pgrp_pipe[1];
++   if (clear)
++     pgrp_pipe[0] = pgrp_pipe[1] = -1;
++ }
++ 
++ void
++ restore_pgrp_pipe (p)
++      int *p;
++ {
++   pgrp_pipe[0] = p[0];
++   pgrp_pipe[1] = p[1];
++ }
++ 
+  #endif /* PGRP_PIPE */
+*** ../bash-4.0-patched/jobs.h 2009-01-04 14:32:29.000000000 -0500
+--- jobs.h     2009-04-17 15:07:51.000000000 -0400
+***************
+*** 236,239 ****
+--- 236,241 ----
+  
+  extern void close_pgrp_pipe __P((void));
++ extern void save_pgrp_pipe __P((int *, int));
++ extern void restore_pgrp_pipe __P((int *));
+  
+  #if defined (JOB_CONTROL)
+*** ../bash-4.0-patched/trap.c 2009-01-16 17:07:53.000000000 -0500
+--- trap.c     2009-04-17 22:22:36.000000000 -0400
+***************
+*** 799,802 ****
+--- 799,804 ----
+  {
+    int trap_exit_value;
++   pid_t save_pgrp;
++   int save_pipe[2];
+  
+    /* XXX - question:  should the DEBUG trap inherit the RETURN trap? */
+***************
+*** 804,808 ****
+--- 806,832 ----
+    if ((sigmodes[DEBUG_TRAP] & SIG_TRAPPED) && ((sigmodes[DEBUG_TRAP] & 
SIG_IGNORED) == 0) && ((sigmodes[DEBUG_TRAP] & SIG_INPROGRESS) == 0))
+      {
++ #if defined (JOB_CONTROL)
++       save_pgrp = pipeline_pgrp;
++       pipeline_pgrp = 0;
++       save_pipeline (1);
++ #  if defined (PGRP_PIPE)
++       save_pgrp_pipe (save_pipe, 1);
++ #  endif
++       stop_making_children ();
++ #endif
++ 
+        trap_exit_value = _run_trap_internal (DEBUG_TRAP, "debug trap");
++ 
++ #if defined (JOB_CONTROL)
++       pipeline_pgrp = save_pgrp;
++       restore_pipeline (1);
++ #  if defined (PGRP_PIPE)
++       close_pgrp_pipe ();
++       restore_pgrp_pipe (save_pipe);
++ #  endif
++       if (pipeline_pgrp > 0)
++      give_terminal_to (pipeline_pgrp, 1);
++       notify_and_cleanup ();
++ #endif
+        
+  #if defined (DEBUGGER)
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-020 
b/shell-term-fm/bash/patches/bash40-020
new file mode 100644
index 0000000..885f15e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-020
@@ -0,0 +1,83 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-020
+
+Bug-Reported-by: Nicolai Lissner <nlissne AT linux01.org>
+Bug-Reference-ID: <20090412020510.GA29658@lilith>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00104.html
+
+Bug-Description:
+
+If a SIGWINCH arrives while bash is performing redisplay, multi-line prompts
+are displayed incorrectly due to the display code being called recursively.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/readline/readline.h        2009-01-04 
14:32:33.000000000 -0500
+--- lib/readline/readline.h    2009-04-13 08:47:00.000000000 -0400
+***************
+*** 815,820 ****
+  #define RL_STATE_MULTIKEY    0x200000        /* reading multiple-key 
command */
+  #define RL_STATE_VICMDONCE   0x400000        /* entered vi command mode at 
least once */
+  
+! #define RL_STATE_DONE                0x800000        /* done; accepted 
line */
+  
+  #define RL_SETSTATE(x)               (rl_readline_state |= (x))
+--- 815,821 ----
+  #define RL_STATE_MULTIKEY    0x200000        /* reading multiple-key 
command */
+  #define RL_STATE_VICMDONCE   0x400000        /* entered vi command mode at 
least once */
++ #define RL_STATE_REDISPLAYING        0x800000        /* updating terminal 
display */
+  
+! #define RL_STATE_DONE                0x1000000       /* done; accepted 
line */
+  
+  #define RL_SETSTATE(x)               (rl_readline_state |= (x))
+*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 
-0500
+--- lib/readline/display.c     2009-04-13 08:29:54.000000000 -0400
+***************
+*** 513,516 ****
+--- 513,517 ----
+       data structures. */
+    _rl_block_sigint ();  
++   RL_SETSTATE (RL_STATE_REDISPLAYING);
+  
+    if (!rl_display_prompt)
+***************
+*** 1237,1240 ****
+--- 1238,1242 ----
+    }
+  
++   RL_UNSETSTATE (RL_STATE_REDISPLAYING);
+    _rl_release_sigint ();
+  }
+*** ../bash-4.0-patched/lib/readline/terminal.c        2009-01-04 
14:32:34.000000000 -0500
+--- lib/readline/terminal.c    2009-04-13 08:43:00.000000000 -0400
+***************
+*** 356,360 ****
+        if (CUSTOM_REDISPLAY_FUNC ())
+       rl_forced_update_display ();
+!       else
+       _rl_redisplay_after_sigwinch ();
+      }
+--- 356,360 ----
+        if (CUSTOM_REDISPLAY_FUNC ())
+       rl_forced_update_display ();
+!       else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
+       _rl_redisplay_after_sigwinch ();
+      }
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-021 
b/shell-term-fm/bash/patches/bash40-021
new file mode 100644
index 0000000..cf6ee1f
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-021
@@ -0,0 +1,48 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-021
+
+Bug-Reported-by:  Matt Zyzik <matt.zyzik AT nyu.edu>
+Bug-Reference-ID: <20090319015542.696F62B8E8 AT ice.filescope.com>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00149.html
+
+Bug-Description:
+
+When not in a locale supporting multibyte characters, readline will 
occasionally
+not erase characters between the cursor position and the end of the line
+when killing text backwards.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 
-0500
+--- lib/readline/display.c     2009-04-14 14:00:18.000000000 -0400
+***************
+*** 1775,1779 ****
+            adjust col_lendiff based on the difference between _rl_last_c_pos
+            and _rl_screenwidth */
+!        if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
+  #endif
+           {     
+--- 1775,1779 ----
+            adjust col_lendiff based on the difference between _rl_last_c_pos
+            and _rl_screenwidth */
+!        if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || 
(_rl_last_c_pos < _rl_screenwidth)))
+  #endif
+           {     
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-022 
b/shell-term-fm/bash/patches/bash40-022
new file mode 100644
index 0000000..5b68538
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-022
@@ -0,0 +1,48 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-022
+
+Bug-Reported-by:  Bernd Eggink <monoped AT sudrala.de>
+Bug-Reference-ID: <49E65407.5010206 AT sudrala.de>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00118.html
+
+Bug-Description:
+
+When parsing case statements in command substitutions, the shell did not
+note that a newline is a shell metacharacter and can legally be followed
+by a reserved word (e.g., `esac').
+
+Patch:
+
+*** ../bash-4.0-patched/parse.y        2009-03-08 21:24:47.000000000 -0400
+--- parse.y    2009-04-15 22:27:56.000000000 -0400
+***************
+*** 3355,3359 ****
+  
+        /* Meta-characters that can introduce a reserved word.  Not perfect 
yet. */
+!       if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && 
(tflags & LEX_INCOMMENT) == 0 && shellmeta(ch))
+       {
+         /* Add this character. */
+--- 3375,3379 ----
+  
+        /* Meta-characters that can introduce a reserved word.  Not perfect 
yet. */
+!       if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && 
(tflags & LEX_INCOMMENT) == 0 && (shellmeta(ch) || ch == '\n'))
+       {
+         /* Add this character. */
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-023 
b/shell-term-fm/bash/patches/bash40-023
new file mode 100644
index 0000000..d2376c7
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-023
@@ -0,0 +1,62 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-023
+
+Bug-Reported-by: Andreas Schwab <schwab AT linux-m68k.org>
+Bug-Reference-ID: <m21vrhhx08.fsf AT igel.home>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00160.html
+
+Bug-Description:
+
+If the prompt length exactly matches the screen width, and the prompt ends
+with invisible characters, readline positions the cursor incorrectly.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 
-0500
+--- lib/readline/display.c     2009-04-25 21:42:18.000000000 -0400
+***************
+*** 1895,1898 ****
+--- 1897,1904 ----
+    woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
+    cpos = _rl_last_c_pos;
++ 
++   if (cpos == 0 && cpos == new)
++     return;
++ 
+  #if defined (HANDLE_MULTIBYTE)
+    /* If we have multibyte characters, NEW is indexed by the buffer point in
+***************
+*** 1908,1914 ****
+        desired display position. */
+        if ((new > prompt_last_invisible) ||           /* XXX - don't use 
woff here */
+!        (prompt_physical_chars > _rl_screenwidth &&
+          _rl_last_v_pos == prompt_last_screen_line &&
+!         wrap_offset >= woff &&
+          new > 
(prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
+          /* XXX last comparison might need to be >= */
+--- 1914,1920 ----
+        desired display position. */
+        if ((new > prompt_last_invisible) ||           /* XXX - don't use 
woff here */
+!        (prompt_physical_chars >= _rl_screenwidth &&
+          _rl_last_v_pos == prompt_last_screen_line &&
+!         wrap_offset >= woff && dpos >= woff &&
+          new > 
(prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
+          /* XXX last comparison might need to be >= */
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-024 
b/shell-term-fm/bash/patches/bash40-024
new file mode 100644
index 0000000..ac2058a
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-024
@@ -0,0 +1,112 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-024
+
+Bug-Reported-by:  Matt Zyzik <matt.zyzik AT nyu.edu>
+Bug-Reference-ID:  <20090405205428.4FDEA1C7175 AT ice.filescope.com>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00021.html
+
+Bug-Description:
+
+When using the ** globbing operator, bash will incorrectly add an extra
+directory name when the preceding directory name ends with `*' or an empty
+string when there is no preceding directory name.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/glob/glob.c        2009-01-04 14:32:30.000000000 
-0500
+--- lib/glob/glob.c    2009-04-28 10:22:29.000000000 -0400
+***************
+*** 357,361 ****
+        if (ep)
+          *ep = 0;
+!       if (r)
+       free (r);
+        return (struct globval *)0;
+--- 357,361 ----
+        if (ep)
+          *ep = 0;
+!       if (r && r != &glob_error_return)
+       free (r);
+        return (struct globval *)0;
+***************
+*** 666,671 ****
+      }
+  
+!   /* compat: if GX_ALLDIRS, add the passed directory also */
+!   if (add_current)
+      {
+        sdlen = strlen (dir);
+--- 666,672 ----
+      }
+  
+!   /* compat: if GX_ALLDIRS, add the passed directory also, but don't add an
+!      empty directory name. */
+!   if (add_current && (flags & GX_NULLDIR) == 0)
+      {
+        sdlen = strlen (dir);
+***************
+*** 679,686 ****
+         nextlink->next = lastlink;
+         lastlink = nextlink;
+!        if (flags & GX_NULLDIR)
+!          nextname[0] = '\0';
+!        else
+!          bcopy (dir, nextname, sdlen + 1);
+         ++count;
+       }
+--- 680,684 ----
+         nextlink->next = lastlink;
+         lastlink = nextlink;
+!        bcopy (dir, nextname, sdlen + 1);
+         ++count;
+       }
+***************
+*** 943,947 ****
+             register unsigned int l;
+  
+!            array = glob_dir_to_array (directories[i], temp_results, flags);
+             l = 0;
+             while (array[l] != NULL)
+--- 941,950 ----
+             register unsigned int l;
+  
+!            /* If we're expanding **, we don't need to glue the directory
+!               name to the results; we've already done it in glob_vector */
+!            if ((dflags & GX_ALLDIRS) && filename[0] == '*' && filename[1] 
== '*' && filename[2] == '\0')
+!              array = temp_results;
+!            else
+!              array = glob_dir_to_array (directories[i], temp_results, 
flags);
+             l = 0;
+             while (array[l] != NULL)
+***************
+*** 960,964 ****
+  
+             /* Note that the elements of ARRAY are not freed.  */
+!            free ((char *) array);
+           }
+       }
+--- 963,968 ----
+  
+             /* Note that the elements of ARRAY are not freed.  */
+!            if (array != temp_results)
+!              free ((char *) array);
+           }
+       }
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h       2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 24
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/emelfm2/DETAILS b/shell-term-fm/emelfm2/DETAILS
index 45dec61..a37d60d 100755
--- a/shell-term-fm/emelfm2/DETAILS
+++ b/shell-term-fm/emelfm2/DETAILS
@@ -1,9 +1,9 @@
            SPELL=emelfm2
-         VERSION=0.6.0
+         VERSION=0.6.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://emelfm2.net/rel/$SOURCE
-     
SOURCE_HASH=sha512:74dc5eab1da5a84ed377e6a8daee8599e9e18a34721dd53d89d7f7833f0b40fab87ec2cbd46196a50aae95e624d51490325d6724a88b0b036059947bcecd6f18
+     
SOURCE_HASH=sha512:e03861ccd4a5d19899ae2bb71e3b66321ddbcb8ad63dc9e0778937983d4cc4acbb22f771c54ca74635806d9b3e1c091ec05f9b498aabefb2daa688692471ca3b
         WEB_SITE=http://emelfm2.net/
          ENTERED=20040425
       LICENSE[0]=GPL
diff --git a/shell-term-fm/emelfm2/HISTORY b/shell-term-fm/emelfm2/HISTORY
index 3b88e92..e2985f5 100644
--- a/shell-term-fm/emelfm2/HISTORY
+++ b/shell-term-fm/emelfm2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.2
+
 2009-05-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.0
 
diff --git a/spelling/pyenchant/BUILD b/spelling/pyenchant/BUILD
new file mode 100755
index 0000000..a05d2aa
--- /dev/null
+++ b/spelling/pyenchant/BUILD
@@ -0,0 +1 @@
+default_build_python
diff --git a/spelling/pyenchant/DEPENDS b/spelling/pyenchant/DEPENDS
new file mode 100755
index 0000000..12cf843
--- /dev/null
+++ b/spelling/pyenchant/DEPENDS
@@ -0,0 +1,3 @@
+depends python     &&
+depends setuptools &&
+depends enchant
diff --git a/spelling/pyenchant/DETAILS b/spelling/pyenchant/DETAILS
new file mode 100755
index 0000000..f02696e
--- /dev/null
+++ b/spelling/pyenchant/DETAILS
@@ -0,0 +1,17 @@
+           SPELL="pyenchant"
+         VERSION="1.5.3"
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.gz}"
+   
SOURCE_URL[0]="http://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}";
+     
SOURCE_HASH="sha512:7ce92d5e91bc9a4f2c804748cc36ab912ac26957a4fbb3237f0fbc83e24aacaeda9cac35e864b64f01cd6514c35e86faf7a51cd7386794f89c4974daa94bd4aa"
+        WEB_SITE="http://www.rfk.id.au/software/pyenchant/";
+         ENTERED="20090727"
+      LICENSE[0]="LGPL"
+           SHORT="Spellchecking library for Python, based on the Enchant 
library."
+cat << EOF
+PyEnchant is a set of language bindings and some wrapper classes to make the
+excellent Enchant spellchecker available as a Python module. The bindings are
+created using ctypes. It includes all the functionality of Enchant with the
+flexibility of Python and a nice "Pythonic" object-oriented interface. It 
also
+aims to provide some higher-level functionality than is available in the C 
API.
+EOF
diff --git a/spelling/pyenchant/HISTORY b/spelling/pyenchant/HISTORY
new file mode 100644
index 0000000..dfca9d0
--- /dev/null
+++ b/spelling/pyenchant/HISTORY
@@ -0,0 +1,2 @@
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * DEPENDS, DETAILS, BUILD, INSTALL, HISTORY: created this spell
diff --git a/spelling/pyenchant/INSTALL b/spelling/pyenchant/INSTALL
new file mode 100755
index 0000000..46c6fba
--- /dev/null
+++ b/spelling/pyenchant/INSTALL
@@ -0,0 +1 @@
+default_install_python
diff --git a/telephony/telepathy-mission-control/DEPENDS 
b/telephony/telepathy-mission-control/DEPENDS
index 8e48eca..008a1ad 100755
--- a/telephony/telepathy-mission-control/DEPENDS
+++ b/telephony/telepathy-mission-control/DEPENDS
@@ -1,4 +1,4 @@
 depends pkgconfig      &&
-depends depends python &&
+depends python &&
 depends dbus  &&
 depends telepathy-glib
diff --git a/telephony/telepathy-mission-control/HISTORY 
b/telephony/telepathy-mission-control/HISTORY
index 10a9b5d..249feb0 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+       * DEPENDS: fixed a typo that prevented casting
+
 2009-07-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.1.4
          url  and website now at telepathy.freedesktop.org
diff --git a/telephony/twinkle/DETAILS b/telephony/twinkle/DETAILS
index 36fec1d..01744de 100755
--- a/telephony/twinkle/DETAILS
+++ b/telephony/twinkle/DETAILS
@@ -1,6 +1,6 @@
            SPELL=twinkle
-         VERSION=1.3.2
-     
SOURCE_HASH=sha512:b5e58e173231c050fad08b97250695f449b3f4e8551b0981fa5e8b4a322448be445b640f6d7e6073fcce18a8992295f2d183fc52e41dc485a8eefe655102b81e
+         VERSION=1.4.2
+     
SOURCE_HASH=sha512:3a100e5fc7a7fc39944e5c718e4ea7feac1d3561302ccae0079123c1d0b7f70ba65852eb63b8384958e43533e37138213412bdfc1d33297fb21557947d412cb0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.twinklephone.com/
diff --git a/telephony/twinkle/HISTORY b/telephony/twinkle/HISTORY
index 575dd4f..fba1c36 100644
--- a/telephony/twinkle/HISTORY
+++ b/telephony/twinkle/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 David Kowis <dkowis AT shlrm.org>
+       * DETAILS: 1.4.2
+
 2008-12-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.3.2
        * DEPENDS: added optional_depends libzrtpcpp
diff --git a/utils/aqemu/BUILD b/utils/aqemu/BUILD
new file mode 100755
index 0000000..5e7def2
--- /dev/null
+++ b/utils/aqemu/BUILD
@@ -0,0 +1,5 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
+./configure.sh &&
+make
+
diff --git a/utils/aqemu/DEPENDS b/utils/aqemu/DEPENDS
new file mode 100755
index 0000000..1a0b9f1
--- /dev/null
+++ b/utils/aqemu/DEPENDS
@@ -0,0 +1,3 @@
+depends qt4 &&
+depends qemu &&
+depends libvncserver
diff --git a/utils/aqemu/DETAILS b/utils/aqemu/DETAILS
new file mode 100755
index 0000000..ae617cc
--- /dev/null
+++ b/utils/aqemu/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=aqemu
+         VERSION=0.7.2
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   
SOURCE_URL[0]=${SOURCEFORGE_URL/\/sourceforge/\/project}/${SPELL}/$SPELL/$VERSION/${SOURCE}
+     
SOURCE_HASH=sha512:a3c6b86a148f54a69cb744cd3f697dc16d9e34c56dfb050acd79a12c86ea2aac33c586138abb9821268b0d28cb3d742cef02832f6b3dcf17f1968ce1ea776b08
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://sourceforge.net/projects/aqemu/";
+      LICENSE[0]="GPLv2"
+         ENTERED=20090714
+        KEYWORDS="QEMU, kvm, GUI, virtualization, Emulators"
+           SHORT="A QEMU and KVM GUI."
+cat << EOF
+AQEMU is GUI for QEMU and KVM emulators. It has a user-friendly interface
+and allows you to set up the majority of QEMU and KVM options.
+EOF
diff --git a/utils/aqemu/HISTORY b/utils/aqemu/HISTORY
new file mode 100644
index 0000000..10993ab
--- /dev/null
+++ b/utils/aqemu/HISTORY
@@ -0,0 +1,4 @@
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * DEPENDS, DETAILS, BUILD, PRE_BUILD: spell created
+       * fix_broken_version_check.patch: spell created
+
diff --git a/utils/aqemu/PRE_BUILD b/utils/aqemu/PRE_BUILD
new file mode 100755
index 0000000..171d039
--- /dev/null
+++ b/utils/aqemu/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/fix_broken_version_check.patch
diff --git a/utils/aqemu/fix_broken_version_check.patch 
b/utils/aqemu/fix_broken_version_check.patch
new file mode 100644
index 0000000..6dbf0f7
--- /dev/null
+++ b/utils/aqemu/fix_broken_version_check.patch
@@ -0,0 +1,14 @@
+--- configure.sh.orig  2009-07-25 16:58:00.000000000 +0200
++++ configure.sh       2009-07-25 16:59:10.000000000 +0200
+@@ -30,9 +30,9 @@
+ 
+ # Check qmake version
+ echo "Check Qt version..."
+-QMAKE_VERSION="$($QMAKE_PATH -query QT_VERSION | awk -F "." 
'{print$1"."$2}')"
++QMAKE_VERSION="$($QMAKE_PATH -query QT_VERSION | awk -F "." 
'{print$1""$2}')"
+ 
+-if [ $QMAKE_VERSION = "4.4" ]; then
++if [ "$QMAKE_VERSION" -ge "44" ]; then
+       echo -e "OK. Qt Version is $QMAKE_VERSION.\n"
+ else
+       echo "Error! Your qt version $QMAKE_VERSION is too low install a 
newer one."
diff --git a/utils/bluez/DETAILS b/utils/bluez/DETAILS
index 7d23fda..b609515 100755
--- a/utils/bluez/DETAILS
+++ b/utils/bluez/DETAILS
@@ -1,6 +1,6 @@
            SPELL=bluez
-         VERSION=4.43
-     
SOURCE_HASH=sha512:7ac6a9c99a8ae46f4aff40dd873e9afe4112541a91516ff595ab3dddadebf49903fe53a0cb37904bd67a11c7f481fcbb7f1c8e469fae5524c70f827648ffb0ae
+         VERSION=4.46
+     
SOURCE_HASH=sha512:c1fc67ce10d1c198b340a98032d963bbff16c87e42769d8a8206aa466d31068e02701078cc0a2e3796180230f79801023639610804f3df16c65a030151e534de
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/bluetooth/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/bluez/HISTORY b/utils/bluez/HISTORY
index 44e7c20..f0936d8 100644
--- a/utils/bluez/HISTORY
+++ b/utils/bluez/HISTORY
@@ -1,5 +1,8 @@
+2009-07-23 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DETAILS: updated version to 4.46
+
 2009-07-05 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 0.43
+       * DETAILS: version 4.43
          use generic URL
 
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
diff --git a/utils/cronie/CONFIGURE b/utils/cronie/CONFIGURE
index 0070ecf..da7ffa2 100755
--- a/utils/cronie/CONFIGURE
+++ b/utils/cronie/CONFIGURE
@@ -1,3 +1,7 @@
 config_query_option CRONIE_OPTS "Enable inotify support?" n \
                                 "--with-inotify" \
                                 "--without-inotify"
+
+config_query_option CRONIE_OPTS "Enable Anacron support?" n \
+                                "--enable-anacron" \
+                                "--disable-anacron"
diff --git a/utils/cronie/DEPENDS b/utils/cronie/DEPENDS
index 369ede5..9c22c0f 100755
--- a/utils/cronie/DEPENDS
+++ b/utils/cronie/DEPENDS
@@ -3,7 +3,8 @@ optional_depends MAIL-TRANSPORT-AGENT \
                  "for sending reports" &&
 
 optional_depends linux-pam \
-                 "--with-pam" "" \
+                 "--with-pam" \
+                 "--without-pam" \
                  "for PAM support" &&
 
 optional_depends libselinux \
diff --git a/utils/cronie/DETAILS b/utils/cronie/DETAILS
index b42cb3f..95dfc74 100755
--- a/utils/cronie/DETAILS
+++ b/utils/cronie/DETAILS
@@ -1,13 +1,14 @@
            SPELL=cronie
-         VERSION=1.3
+         VERSION=1.4
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=https://fedorahosted.org/releases/c/r/$SPELL/$SOURCE
     SOURCE_HINTS=no-check-certificate
-     
SOURCE_HASH=sha512:57f5aa2e483848b175325189953c1d520ec86be970bbf1371c3f1ac7b54d22d15d20920e7fd13474dc07db9625a01f732bbf1d32b6556d5303af05a3b02f045f
+     
SOURCE_HASH=sha512:025bfcb848a8aa11d635c775cdf60565f01c25f441b8c4dc6f88ca45258424f295fd0460c6a2cee646ddaa9579060b96b8e1cad9c92ebee8396b59f1be185cf1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=https://fedorahosted.org/cronie/
       LICENSE[0]=ISC
       LICENSE[1]=BSD
+      LICENSE[2]=GPL
          ENTERED=20090425
            SHORT="clone of 'original' vixie-cron"
 cat << EOF
diff --git a/utils/cronie/HISTORY b/utils/cronie/HISTORY
index 79fd712..8879db7 100644
--- a/utils/cronie/HISTORY
+++ b/utils/cronie/HISTORY
@@ -1,3 +1,9 @@
+2009-07-21 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.4, anacron is GPLish
+       * DEPENDS: added "--without-pam" flag for linux-pam dependency
+       * CONFIGURE: added anacron support
+       * PRE_BUILD, reboot.patch: removed
+
 2009-05-14 Vlad Glagolev <stealth AT sourcemage.org>
        * PRE_BUILD: apply patch to make @reboot actually work
        * reboot.patch: added
diff --git a/utils/cronie/PRE_BUILD b/utils/cronie/PRE_BUILD
deleted file mode 100755
index e049157..0000000
--- a/utils/cronie/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/reboot.patch"
diff --git a/utils/cronie/reboot.patch b/utils/cronie/reboot.patch
deleted file mode 100644
index 9bca79d..0000000
--- a/utils/cronie/reboot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cron.c.orig    2009-04-23 13:24:27.000000000 +0400
-+++ src/cron.c 2009-05-14 05:01:15.925392269 +0400
-@@ -399,7 +399,7 @@
-       pid_t pid = getpid();
- 
-       /* lock exist - skip reboot jobs */
--      if (access(REBOOT_LOCK, F_OK)) {
-+      if (access(REBOOT_LOCK, F_OK) == 0) {
-               log_it("CRON", pid, "INFO", "@reboot jobs will be run at 
computer's startup.", 0);
-               return;
-       }
diff --git a/utils/less/BUILD b/utils/less/BUILD
index 0712fc6..5e7b212 100755
--- a/utils/less/BUILD
+++ b/utils/less/BUILD
@@ -1,11 +1,10 @@
 OPTS="$OPTS --build=${BUILD}"
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
 
-./configure  --build=$BUILD                       \
+./configure  --build=$BUILD                     \
              --prefix=${TRACK_ROOT}/usr         \
              --sysconfdir=${TRACK_ROOT}/etc     \
              --localstatedir=${TRACK_ROOT}/var  \
-             $OPTS                                &&
+             $OPTS                              &&
 
 make DESTDIR=$INSTALL_ROOT
-
diff --git a/utils/less/DEPENDS b/utils/less/DEPENDS
index 18594eb..c4b4f1a 100755
--- a/utils/less/DEPENDS
+++ b/utils/less/DEPENDS
@@ -1,2 +1,2 @@
-depends  gnupg     &&
-depends  smgl-fhs
+depends gnupg &&
+depends smgl-fhs
diff --git a/utils/less/DETAILS b/utils/less/DETAILS
index 1f4dd85..b6f5472 100755
--- a/utils/less/DETAILS
+++ b/utils/less/DETAILS
@@ -1,15 +1,15 @@
            SPELL=less
-         VERSION=429
+         VERSION=436
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.greenwoodsoftware.com/$SPELL/$SOURCE
    SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
    SOURCE_URL[2]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
         WEB_SITE=http://www.greenwoodsoftware.com/less
-     
SOURCE_HASH=sha512:94e843676d685cb7f2cb09e18d7ed40f350b06c1dac141483cd2bf952daeb018620acab67749f7588e68712c1ad4d263e27fb6da55952ab237600def60dd88e5
+     
SOURCE_HASH=sha512:947c07d728e697882b82c2d57e66369ab3127f906116a4003b93aab6e29bc537539c96405ce54bb65b89ca07d3e073adc0d98567b71c7c3ce62c475aea8e4084
          ENTERED=20010922
         KEYWORDS="utils"
-           SHORT="less is a paginator that allows backward and forward 
movement."
+           SHORT="paginator that allows backward and forward movement"
 cat << EOF
 less - Display paginator
 'Less' is a paginator file similar to 'more,' but that allows backward
diff --git a/utils/less/HISTORY b/utils/less/HISTORY
index 3f73634..c866b8f 100644
--- a/utils/less/HISTORY
+++ b/utils/less/HISTORY
@@ -1,3 +1,7 @@
+2009-07-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 436; quoting paths
+       * BUILD, DEPENDS: cleaned up
+
 2009-04-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 429
 
diff --git a/utils/ncdu/DETAILS b/utils/ncdu/DETAILS
index 621d8fc..9b15180 100755
--- a/utils/ncdu/DETAILS
+++ b/utils/ncdu/DETAILS
@@ -1,12 +1,12 @@
-           SPELL=ncdu
-         VERSION=1.4
+           SPELL="ncdu"
+         VERSION="1.5"
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://dev.yorhel.nl/download/${SOURCE}
-     
SOURCE_HASH=sha512:d2f7a124befc601d25edcc106f46f00c88de0b4372b3bbe516eef334cdf35173c368629f5d7cdf0de93f89c20873d27c8bb5040758b00bcebb5ec36dee58c142
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+   SOURCE_URL[0]="http://dev.yorhel.nl/download/${SOURCE}";
+     
SOURCE_HASH="sha512:2e17adee4962423646c7f96c045d5044f1ef033a69de55c40e29dfdced6b3d99b50497a14eaac90816383a0447b3b0badce4223b9a1def7a2334f5a36881c23f"
         WEB_SITE="http://dev.yorhel.nl/ncdu/";
-      LICENSE[0]=MIT
-         ENTERED=20081119
+      LICENSE[0]="MIT"
+         ENTERED="20081119"
            SHORT="ncurses version of the famous old 'du' unix command."
 cat << EOF
 ncdu is a ncurses-based du viewer. It provides a fast and easy-to-use 
interface
diff --git a/utils/ncdu/HISTORY b/utils/ncdu/HISTORY
index 344731b..8714442 100644
--- a/utils/ncdu/HISTORY
+++ b/utils/ncdu/HISTORY
@@ -1,3 +1,6 @@
-2008-11-19 Quentin Rameau <quinq.net AT gmail.com>
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * DETAILS: updated to version 1.5
+
+2008-11-19 Quentin Rameau <quinq AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
 
diff --git a/utils/notification-daemon/CONFLICTS 
b/utils/notification-daemon/CONFLICTS
index 05ba1ca..4a1564b 100755
--- a/utils/notification-daemon/CONFLICTS
+++ b/utils/notification-daemon/CONFLICTS
@@ -1 +1,2 @@
-conflicts notification-daemon-xfce
+conflicts notification-daemon-xfce &&
+conflicts notify-osd
diff --git a/utils/notify-osd/CONFLICTS b/utils/notify-osd/CONFLICTS
new file mode 100755
index 0000000..327b526
--- /dev/null
+++ b/utils/notify-osd/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts notification-daemon      &&
+conflicts notification-daemon-xfce
diff --git a/utils/notify-osd/DEPENDS b/utils/notify-osd/DEPENDS
new file mode 100755
index 0000000..55a4531
--- /dev/null
+++ b/utils/notify-osd/DEPENDS
@@ -0,0 +1,6 @@
+depends pkgconfig &&
+depends gtk+2     &&
+depends glib2     && 
+depends gconf2    &&
+depends libwnck   &&
+depends dbus 
diff --git a/utils/notify-osd/DETAILS b/utils/notify-osd/DETAILS
new file mode 100755
index 0000000..8c63393
--- /dev/null
+++ b/utils/notify-osd/DETAILS
@@ -0,0 +1,27 @@
+           SPELL=notify-osd
+         VERSION=0.9.11
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
+     
SOURCE_HASH=sha512:199e683dc8d1889b2c38c7e3b2ff3258b3fde54e9d4e8fbfa4beb9b0b452e454258cec72fca5f26a420b133720cb76c2f2cb3254d845baa6f6718219ca8addbe
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="https://launchpad.net/notify-osd";
+      LICENSE[0]=GPL
+         ENTERED=20090727
+           SHORT="alternative notification daemon"
+cat << EOF
+Canonical's on-screen-display notification agent, implementing the
+freedesktop.org Desktop Notifications Specification with semi-transparent
+click-through bubbles.
+
+The freedesktop.org Desktop Notifications Specification provides a standard
+way for applications to display pop-up notifications. These are designed to
+make you aware of something, without interrupting your work with a window
+you must close.
+
+Notify OSD presents these notifications as ephemeral overlays, which can
+be clicked through so they don't block your work. It queues notifications,
+to prevent them from flooding your screen. And as well as handling standard
+notification updates, Notify OSD introduces the idea of appending -- allowing
+notifications to grow over time, for example in the case of instant messages
+from a particular person.
+EOF
diff --git a/utils/notify-osd/HISTORY b/utils/notify-osd/HISTORY
new file mode 100644
index 0000000..e8f796b
--- /dev/null
+++ b/utils/notify-osd/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Finn Haedicke <finn_haedicke AT gmx.net>
+       * DETAILS: spell created
+
diff --git a/utils/notify-osd/PROVIDES b/utils/notify-osd/PROVIDES
new file mode 100755
index 0000000..3b79695
--- /dev/null
+++ b/utils/notify-osd/PROVIDES
@@ -0,0 +1 @@
+NOTIFICATION_DAEMON
diff --git a/utils/nss-ldapd/DEPENDS b/utils/nss-ldapd/DEPENDS
index 0b1b8b1..5a4eba5 100755
--- a/utils/nss-ldapd/DEPENDS
+++ b/utils/nss-ldapd/DEPENDS
@@ -3,4 +3,14 @@ depends openldap &&
 optional_depends linux-pam \
                  "--enable-pam" \
                  "--disable-pam" \
-                 "for the PAM module"
+                 "for the PAM module" &&
+
+optional_depends cyrus-sasl \
+                 "--enable-sasl" \
+                 "--disable-sasl" \
+                 "for SASL support" &&
+
+optional_depends krb5 \
+                 "--enable-kerberos" \
+                 "--disable-kerberos" \
+                 "for Kerberos support"
diff --git a/utils/nss-ldapd/HISTORY b/utils/nss-ldapd/HISTORY
index c944171..78ec43f 100644
--- a/utils/nss-ldapd/HISTORY
+++ b/utils/nss-ldapd/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: added cyrus-sasl and krb5 optional deps
+
 2009-07-13 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.6.11
 
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 71d907d..5a5f67a 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,5 +1,5 @@
            SPELL=qemu
-         VERSION=0.10.5
+         VERSION=0.10.6
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 0ab1c37..bd7d413 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.10.6
+
 2009-05-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.10.5
 
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 999ec92..5c720e3 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
            SPELL=sudo
-         VERSION=1.7.2
+         VERSION=1.7.2p1
           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 cf8bdd6..c66d158 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.7.2p1
+
 2009-07-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.7.2
 
diff --git a/utils/sysstat/DETAILS b/utils/sysstat/DETAILS
index 05c9039..bbd3b8c 100755
--- a/utils/sysstat/DETAILS
+++ b/utils/sysstat/DETAILS
@@ -1,9 +1,9 @@
            SPELL=sysstat
-         VERSION=9.0.3
+         VERSION=9.0.4
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://perso.wanadoo.fr/sebastien.godard/$SOURCE
-     
SOURCE_HASH=sha512:7b4bf1bc6e77459bc8d44ab4eb9cae557aaf015bbb84e5260d8820c687dc6b43f95f8ead3d024af0dcba4851f2838dc813cc5174687e709311c2cbd14b2e8fc4
+     
SOURCE_HASH=sha512:49ba290ab99a1b63915a8ecb5ea65cc0805ccf9165383b7a611bf9beabd3b9cd95d3a5e58e3e52d73d4d7193c3767e6c5efd16c4f1149f98aa3264764095e7ec
         WEB_SITE=http://perso.wanadoo.fr/sebastien.godard/
          ENTERED=20050506
       LICENSE[0]="GPL"
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index 1cf689c..14fa9ab 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 9.0.4
+
 2009-05-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 9.0.3
 
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 02bc5e4..3a2a606 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -1,5 +1,6 @@
-OPTS="--with-fsprobe=builtin $OPTS" &&
-OPTS="--build=$BUILD $OPTS" &&
+OPTS="--build=$BUILD \
+      --with-fsprobe=builtin \
+      $OPTS" &&
 
 if [[ $CROSS_INSTALL == on ]]; then
   OPTS="--host=$HOST $OPTS"
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 1fc2f56..22611a8 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,7 +1,7 @@
            SPELL=util-linux
 if [[ $UL_VERSION == aes ]]; then
-         VERSION=2.15.1
-         SOURCE3=$SPELL-ng-$VERSION-20090624.diff.bz2
+         VERSION=2.16
+         SOURCE3=$SPELL-ng-$VERSION-20090725.diff.bz2
          SOURCE4=$SOURCE3.sign
   SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
   SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index cb1974d..972fbd9 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,7 @@
+2009-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated aes version to 2.16; updated aes patch to 20090725
+       * BUILD: merged configure options
+
 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
diff --git a/video/gaupol/BUILD b/video/gaupol/BUILD
new file mode 100755
index 0000000..a05d2aa
--- /dev/null
+++ b/video/gaupol/BUILD
@@ -0,0 +1 @@
+default_build_python
diff --git a/video/gaupol/CONFIGURE b/video/gaupol/CONFIGURE
new file mode 100755
index 0000000..a023a1c
--- /dev/null
+++ b/video/gaupol/CONFIGURE
@@ -0,0 +1,5 @@
+. "${GRIMOIRE}/config_query_multi.function"
+config_query_multi GAUPOL_PLAYER "media player to enable preview" \
+                                 none                             \
+                                 mplayer                          \
+                                 vlc
diff --git a/video/gaupol/DEPENDS b/video/gaupol/DEPENDS
new file mode 100755
index 0000000..10987ad
--- /dev/null
+++ b/video/gaupol/DEPENDS
@@ -0,0 +1,13 @@
+depends python    &&
+depends pygtk2    &&
+suggest_depends pyenchant                         \
+                 "" "" "to enable spell-checking" &&
+if is_depends_enabled ${SPELL} pyenchant
+then
+  runtime_depends SPELLING  &&
+  suggest_depends iso-codes \
+                   "" "" "to translate language and country names"
+fi &&
+suggest_depends chardet                                         \
+                 "" "" "for character encoding auto-detection " &&
+[[ "${GAUPOL_PLAYER}" != "none" ]] && runtime_depends "${GAUPOL_PLAYER}"
diff --git a/video/gaupol/DETAILS b/video/gaupol/DETAILS
new file mode 100755
index 0000000..8e92141
--- /dev/null
+++ b/video/gaupol/DETAILS
@@ -0,0 +1,16 @@
+           SPELL="gaupol"
+         VERSION="0.15"
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.gz}"
+   SOURCE_URL[0]="http://download.gna.org/${SPELL}/${VERSION}/${SOURCE}";
+     
SOURCE_HASH="sha512:d392e5723212727d65cf1e2ef72534ee2bd6b3fefc21d1a8d3474397448813cf2cbe28bc4583ca2f61c7ef93f5479478ef8348e47550822d8efe66fbb6a84369"
+        WEB_SITE="http://home.gna.org/gaupol/";
+         ENTERED="20090727"
+      LICENSE[0]="GPL"
+           SHORT="GTK+ subtitle editor"
+cat << EOF
+Gaupol is an editor for text-based subtitle files. It supports multiple 
subtitle
+file formats and provides means of correcting texts and timing subtitles to
+match video. The user interface is designed with attention to batch 
processing
+of multiple documents and convenience of translating.
+EOF
diff --git a/video/gaupol/FINAL b/video/gaupol/FINAL
new file mode 100755
index 0000000..040a984
--- /dev/null
+++ b/video/gaupol/FINAL
@@ -0,0 +1 @@
+sedit 's:usr:/usr:' /usr/lib/python2.6/site-packages/gaupol/paths.py
diff --git a/video/gaupol/HISTORY b/video/gaupol/HISTORY
new file mode 100644
index 0000000..b1e763a
--- /dev/null
+++ b/video/gaupol/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
+       * CONFIGURE, DEPENDS, DETAILS,
+          BUILD, INSTALL, FINAL, HISTORY: created this spell
diff --git a/video/gaupol/INSTALL b/video/gaupol/INSTALL
new file mode 100755
index 0000000..46c6fba
--- /dev/null
+++ b/video/gaupol/INSTALL
@@ -0,0 +1 @@
+default_install_python
diff --git a/video/lives/DETAILS b/video/lives/DETAILS
index e283137..e5c3e7d 100755
--- a/video/lives/DETAILS
+++ b/video/lives/DETAILS
@@ -1,6 +1,6 @@
            SPELL=lives
-         VERSION=0.9.9.9
-     
SOURCE_HASH=sha512:3809de922301c081b2f91ea0f27ff84a6407d363a6c4dfb9308d6417dd9ca730bd5cf9c7939157ce623bb0dfa87adbf891356e57765acb64c7b7818a6d57ff70
+         VERSION=1.0.0
+     
SOURCE_HASH=sha512:ff5149290dea5c6156578c9578540fea1398ae81c60940f4a9fb4ec8787f46ab014b58f9e1a3300337217283b04b7ac6a753370bf8df20366bed7bec57a7b814
           SOURCE=LiVES-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/lives-$VERSION
    SOURCE_URL[0]=http://www.xs4all.nl/%7Esalsaman/lives/current/$SOURCE
diff --git a/video/lives/HISTORY b/video/lives/HISTORY
index a6b1128..12cb5d7 100644
--- a/video/lives/HISTORY
+++ b/video/lives/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.0.0
+
 2009-06-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.9.9.9
 
diff --git a/video/smplayer/DETAILS b/video/smplayer/DETAILS
index 3462dcd..99d48eb 100755
--- a/video/smplayer/DETAILS
+++ b/video/smplayer/DETAILS
@@ -1,8 +1,8 @@
            SPELL=smplayer
-         VERSION=0.6.7
+         VERSION=0.6.8
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:165bd017a09ea8b60c5e67cc003d71f5966bc02dff8f9753fa5925561799d9ac8d409437b3a17d8a02c7e30990112ba2e7182738a89d673a080a12681e38a5a6
+     
SOURCE_HASH=sha512:edbbe0b13ab6f2ec7552dc2e6e6970ee9b0bc415bcb62416b3cfb2996034c16057f8ee70d638d19091a3dbba6ec859411821fc83213522a3bfa8ad2fb486efce
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
       PATCHLEVEL=0
         WEB_SITE=http://smplayer.sourceforge.net/
diff --git a/video/smplayer/HISTORY b/video/smplayer/HISTORY
index 9a8575d..bf5f9ff 100644
--- a/video/smplayer/HISTORY
+++ b/video/smplayer/HISTORY
@@ -1,3 +1,6 @@
+2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.8
+
 2009-03-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.7
        * INSTALL: added QMAKE=...
diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index 08fb022..39fca5c 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -1,7 +1,9 @@
+depends  docbook-dtd       &&
 depends  glib2             &&
 depends  gtk+2             &&
 depends  libgnomeui        &&
 depends  libglade2         &&
+depends  libxslt           &&
 depends  gnome-vfs2        &&
 depends  gnome-desktop     &&
 depends  gnome-icon-theme  &&
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index d986290..ef82745 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Depends on docbook-dtd and libxslt
+
 2009-05-04 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.26.2
 
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index e9b2923..77fb7fd 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,10 +1,10 @@
            SPELL=vlc
-         VERSION=1.0.0
+         VERSION=1.0.1
+     
SOURCE_HASH=sha512:61a23e6722c832965b6bd24e1ab2b20067e894ae15ad186260f7b1b7ff8bb970689ba110593d7e832de0ec72e12abefdfc3ca4551a1a2f33696d3ca3b594c1e2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
         WEB_SITE=http://www.videolan.org
-     
SOURCE_HASH=sha512:809fd339297d080d12f9c4296509ea7ad1a61178bbce1f371f0657cebe2f665a8215860a5cf0b6618a096af41d28ba93e13f8961ef2bf8576fdd684a45153e11
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
       LICENSE[0]=GPL
          ENTERED=20011113
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 8cfb59d..7572c85 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Treeve Jelbert <treev AT sourcemage.org>
+       * DETAILS: version 1.0.1
+
 2009-07-07 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.0
        * DEPENDS: removed obsolete optional_depends esound and arts
diff --git a/windowmanagers/afterstep/AfterStep-2.2.8.tar.bz2.sig 
b/windowmanagers/afterstep/AfterStep-2.2.8.tar.bz2.sig
deleted file mode 100644
index d8350f2..0000000
Binary files a/windowmanagers/afterstep/AfterStep-2.2.8.tar.bz2.sig and 
/dev/null differ
diff --git a/windowmanagers/afterstep/AfterStep-2.2.9.tar.bz2.sig 
b/windowmanagers/afterstep/AfterStep-2.2.9.tar.bz2.sig
new file mode 100644
index 0000000..78f89eb
Binary files /dev/null and 
b/windowmanagers/afterstep/AfterStep-2.2.9.tar.bz2.sig differ
diff --git a/windowmanagers/afterstep/DETAILS 
b/windowmanagers/afterstep/DETAILS
index bf3f725..01f74d1 100755
--- a/windowmanagers/afterstep/DETAILS
+++ b/windowmanagers/afterstep/DETAILS
@@ -1,5 +1,5 @@
            SPELL=afterstep
-         VERSION=2.2.8
+         VERSION=2.2.9
           SOURCE=AfterStep-$VERSION.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/AfterStep-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/windowmanagers/afterstep/HISTORY 
b/windowmanagers/afterstep/HISTORY
index adb6242..4824e20 100644
--- a/windowmanagers/afterstep/HISTORY
+++ b/windowmanagers/afterstep/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 2.2.9
+
 2008-09-17 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: added a LOT of missing dependencies
        * CONFIGURE: added some more options
diff --git a/windowmanagers/awesome/BUILD b/windowmanagers/awesome/BUILD
index 6d3819a..ee02cb9 100755
--- a/windowmanagers/awesome/BUILD
+++ b/windowmanagers/awesome/BUILD
@@ -1,3 +1,3 @@
-sed -i "s|-Werror||;s|-g|${CFLAGS}|" CMakeLists.txt    &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS . &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
+      -DSYSCONFDIR=$INSTALLROOT/etc . &&
 make
diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
index 2a2d311..06a2681 100755
--- a/windowmanagers/awesome/DEPENDS
+++ b/windowmanagers/awesome/DEPENDS
@@ -12,6 +12,8 @@ depends  glib        &&
 #depends  xcb         &&
 depends  xcb-util    &&
 depends  gperf       &&
+depends  imagemagick &&
+depends  startup-notification &&
 depends  imlib2 &&
 
 optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 440385a..143bf17 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,5 +1,5 @@
            SPELL=awesome
-         VERSION=3.2.1
+         VERSION=3.3.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index f38e501..4b3e17c 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,11 @@
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 3.3.2
+
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 3.3.1
+       * DEPENDS: added missing deps on imagemagick and startup-notification
+       * BUILD: no need to sedit anymore
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 3.2.1
 
diff --git a/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig 
b/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig
deleted file mode 100644
index a44cf2b..0000000
Binary files a/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig and /dev/null 
differ
diff --git a/windowmanagers/awesome/awesome-3.3.2.tar.bz2.sig 
b/windowmanagers/awesome/awesome-3.3.2.tar.bz2.sig
new file mode 100644
index 0000000..ac68486
Binary files /dev/null and b/windowmanagers/awesome/awesome-3.3.2.tar.bz2.sig 
differ
diff --git a/windowmanagers/dwm/DETAILS b/windowmanagers/dwm/DETAILS
index 56b219f..ceb9743 100755
--- a/windowmanagers/dwm/DETAILS
+++ b/windowmanagers/dwm/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dwm
-         VERSION=5.5
+         VERSION=5.6
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://code.suckless.org/dl/dwm/${SOURCE}
-     
SOURCE_HASH=sha512:f84f3ed2e25010e1dcfb1ef5fb1dfd3fd7703616f35a3469b89bf4a48b04d8be4e020afebf41f7575409422aaf981023f8d44685301d9a4c51a8803430b5ee92
+     
SOURCE_HASH=sha512:5e8d845c24a1110d569cdceae8e77a2b7f2b23f54defd69c1074c83949da4b4230fd43c6a292184c73efcaf5cfb0cf6945c3a554ded63b70a479a51005af66e4
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://dwm.suckless.org/
          ENTERED=20060923
diff --git a/windowmanagers/dwm/HISTORY b/windowmanagers/dwm/HISTORY
index 1703bfd..655e34f 100644
--- a/windowmanagers/dwm/HISTORY
+++ b/windowmanagers/dwm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 5.6
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 5.5
        * DEPENDS: xorg-libs -> libx11
diff --git a/windowmanagers/pekwm/DETAILS b/windowmanagers/pekwm/DETAILS
index 788da72..0ab89e6 100755
--- a/windowmanagers/pekwm/DETAILS
+++ b/windowmanagers/pekwm/DETAILS
@@ -1,8 +1,8 @@
            SPELL=pekwm
-         VERSION=0.1.10
+         VERSION=0.1.11
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.pekwm.org/projects/pekwm/files/$SOURCE
-     
SOURCE_HASH=sha512:58bcc343d6626b9831c20842f91390bb766237c406eac9729fcc67bd8893359e565365726b8657bf020120684cc66d69d95b2862c919c89bea85a2ebf79b6619
+     
SOURCE_HASH=sha512:adf5858c2e813769d9746e2536dfcf391aac0d0678eed7abddffad88327a6d7d0ecdd2a1bec7bdb2ed0a6f09a9cb5c38ffce4d0abcbecd37891d2884ce6ad249
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION/
         WEB_SITE=http://pekwm.org
          ENTERED=20030808
diff --git a/windowmanagers/pekwm/HISTORY b/windowmanagers/pekwm/HISTORY
index 20e1cc2..485f2f9 100644
--- a/windowmanagers/pekwm/HISTORY
+++ b/windowmanagers/pekwm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.1.11
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.1.10
        * DEPENDS: no longer depends on imlib2 and pcre
diff --git a/windowmanagers/sawfish/DETAILS b/windowmanagers/sawfish/DETAILS
index 1930aa4..021a1c6 100755
--- a/windowmanagers/sawfish/DETAILS
+++ b/windowmanagers/sawfish/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/sawfish-cvs
   FORCE_DOWNLOAD=on
 
 else
-         VERSION=1.3.5.2
+         VERSION=1.5.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/sawmill/${SOURCE}
-     
SOURCE_HASH=sha512:7b4143b1ec0badd1f6b8ccdbd7deb9c60fa38124bcda2b28a9aa1d6f4d01b4ebef390164ca92eb1bfc8aa04276248b522da6ec47689b354c97d0d965c4aa7f15
+     
SOURCE_HASH=sha512:84086c4172ba94ae7b7187fec0cc804562c674c44a964ae21c44483c8645bfb09a2a23e1773d89ab86f18a4616ad84e624e8712caa4c9d5a005e9296b49e2702
 fi
         WEB_SITE=http://sawfish.wikia.com/wiki/Main_Page
       LICENSE[0]=GPL
diff --git a/windowmanagers/sawfish/HISTORY b/windowmanagers/sawfish/HISTORY
index cc4e66f..b1ea6a1 100644
--- a/windowmanagers/sawfish/HISTORY
+++ b/windowmanagers/sawfish/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 1.5.0
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 1.3.5.2 and switched to bz2
 
diff --git a/windowmanagers/vwm/DETAILS b/windowmanagers/vwm/DETAILS
index 7774160..79b09a4 100755
--- a/windowmanagers/vwm/DETAILS
+++ b/windowmanagers/vwm/DETAILS
@@ -1,9 +1,9 @@
            SPELL=vwm
-         VERSION=2.0.1
+         VERSION=2.0.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:a7b4155e79cae046eb9ee7b25fa209684c80e92780421c08322eb914e47a9e068f1c61dc8ca36c49df909ba74d15fde44e58eeef290a3b000ed4c5fa014874a7
+     
SOURCE_HASH=sha512:414b483323990236384788578acd580a758319a5847a4f1974bd92f1241799f8d0b690ac7a1104ac0d0962717d1ea62031a7f62cbdb7ff8abd9b1bb26cbc3bb4
         WEB_SITE=http://vwm.sourceforge.net/
          ENTERED=20080117
       LICENSE[0]=GPL
diff --git a/windowmanagers/vwm/HISTORY b/windowmanagers/vwm/HISTORY
index dd919a8..b01faff 100644
--- a/windowmanagers/vwm/HISTORY
+++ b/windowmanagers/vwm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 2.0.2
+
 2009-04-23 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 2.0.1
 
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 00a1ff9..151d4eb 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,7 @@
+2009-07-26 Peng Chang (Charles) <chp AT sourcemage.org>
+       * PRE_RESURRECT, POST_RESURRECT: check whether
+         package.conf.old exists before backing up
+
 2009-04-22 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.8.1
 
diff --git a/windowmanagers/xmonad/POST_RESURRECT 
b/windowmanagers/xmonad/POST_RESURRECT
index 63946c7..b057515 100755
--- a/windowmanagers/xmonad/POST_RESURRECT
+++ b/windowmanagers/xmonad/POST_RESURRECT
@@ -5,7 +5,9 @@ message "${MESSAGE_COLOR}Restoring package.conf and 
package.conf.old...${DEFAULT
 GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
 GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
 mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+if [ -f ${GHC_DIR}/package.conf.old.bak ] ; then
+  mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+fi
 
 message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
 CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad.cabal
diff --git a/windowmanagers/xmonad/PRE_RESURRECT 
b/windowmanagers/xmonad/PRE_RESURRECT
index 96595c8..9ab1156 100755
--- a/windowmanagers/xmonad/PRE_RESURRECT
+++ b/windowmanagers/xmonad/PRE_RESURRECT
@@ -4,4 +4,6 @@ message "${MESSAGE_COLOR}Backuping package.conf and 
package.conf.old...${DEFAULT
 GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
 GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
 cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
+if [ -f ${GHC_DIR}/package.conf.old ] ; then
+  cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
+fi
diff --git a/wm-addons/batterymon/BUILD b/wm-addons/batterymon/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/wm-addons/batterymon/BUILD
@@ -0,0 +1 @@
+true
diff --git a/wm-addons/batterymon/DEPENDS b/wm-addons/batterymon/DEPENDS
new file mode 100755
index 0000000..774ced8
--- /dev/null
+++ b/wm-addons/batterymon/DEPENDS
@@ -0,0 +1,4 @@
+depends GTK2 &&
+depends dbus-python &&
+depends hal &&
+optional_depends notify-python '' '' 'Enable notifications'
diff --git a/wm-addons/batterymon/DETAILS b/wm-addons/batterymon/DETAILS
new file mode 100755
index 0000000..1766f47
--- /dev/null
+++ b/wm-addons/batterymon/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=batterymon
+         VERSION=1.2.0
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+   SOURCE_URL[0]=http://batterymon.googlecode.com/files/${SOURCE}
+     
SOURCE_HASH=sha512:1d5a8adfba1d1006b162fe1abe2aab409fd47deeb88b030a523214c0e50ea7b120c39747cacdfbe347f174e74f176c6ae7217abee84c1a4f7045968dbd3c3cd0
+      LICENSE[0]=GPL
+        WEB_SITE=http://batterymon.googlecode.com/
+         ENTERED=20090727
+           SHORT="Simple GTK battery monitor"
+cat << EOF
+A simple battery monitor ideal for openbox etc. with no need for all the 
dependancies.
+EOF
diff --git a/wm-addons/batterymon/HISTORY b/wm-addons/batterymon/HISTORY
new file mode 100644
index 0000000..648d683
--- /dev/null
+++ b/wm-addons/batterymon/HISTORY
@@ -0,0 +1,2 @@
+2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS, INSTALL, HISTORY: created spell, version 
1.2.0
diff --git a/wm-addons/batterymon/INSTALL b/wm-addons/batterymon/INSTALL
new file mode 100755
index 0000000..ff79966
--- /dev/null
+++ b/wm-addons/batterymon/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/batterymon &&
+cp -a ${SOURCE_DIRECTORY}/* ${INSTALL_ROOT}/usr/share/batterymon &&
+ln -s ${INSTALL_ROOT}/usr/share/batterymon/batterymon.py 
${INSTALL_ROOT}/usr/bin/batterymon
diff --git a/wm-addons/ibam/BUILD b/wm-addons/ibam/BUILD
new file mode 100755
index 0000000..fd80844
--- /dev/null
+++ b/wm-addons/ibam/BUILD
@@ -0,0 +1,8 @@
+cd ${SOURCE_DIRECTORY} &&
+make &&
+if is_depends_enabled $SPELL gkrellm; then
+  make krell1
+fi &&
+if is_depends_enabled $SPELL gkrellm2; then
+  make krell
+fi
diff --git a/wm-addons/ibam/DEPENDS b/wm-addons/ibam/DEPENDS
new file mode 100755
index 0000000..83cb199
--- /dev/null
+++ b/wm-addons/ibam/DEPENDS
@@ -0,0 +1,9 @@
+optional_depends gkrellm2 \
+                 "" \
+                 "" \
+                 "Build the gkrellm2 plugin?" &&
+
+optional_depends gkrellm \
+                 "" \
+                 "" \
+                 "Build the gkrellm plugin?"
diff --git a/wm-addons/ibam/DETAILS b/wm-addons/ibam/DETAILS
new file mode 100755
index 0000000..5c1f6d5
--- /dev/null
+++ b/wm-addons/ibam/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=ibam
+         VERSION=0.5.2
+          BRANCH="${VERSION/%.?/}"
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://downloads.sourceforge.net/project/${SPELL}/${SPELL}/${BRANCH}/${SOURCE}
+   SOURCE_URL[1]=S{SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://sourceforge.net/projects/ibam/";
+      LICENSE[0]=GPL
+         ENTERED=20090727
+           SHORT="Advanced battery monitor and profiler for laptops"
+cat << EOF
+IBAM is an advanced battery monitor for laptops, which uses statistical
+and adaptive linear methods to provide accurate estimations of minutes
+of battery left or of the time needed until full recharge.
+This software relies on either APM, ACPI, SYSFS or PMU kernel support to
+access the battery status. 
+EOF
diff --git a/wm-addons/ibam/HISTORY b/wm-addons/ibam/HISTORY
new file mode 100644
index 0000000..38bcbde
--- /dev/null
+++ b/wm-addons/ibam/HISTORY
@@ -0,0 +1,3 @@
+2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
+
diff --git a/wm-addons/ibam/INSTALL b/wm-addons/ibam/INSTALL
new file mode 100755
index 0000000..eba8ff8
--- /dev/null
+++ b/wm-addons/ibam/INSTALL
@@ -0,0 +1,7 @@
+if is_depends_enabled $SPELL gkrellm2 ; then
+  mkdir -p ${INSTALL_ROOT}/usr/lib/gkrellm2/plugins
+fi &&
+if is_depends_enabled $SPELL gkrellm ; then
+  mkdir -p ${INSTALL_ROOT}/usr/lib/gkrellm/plugins
+fi &&
+make install
diff --git a/wm-addons/ibam/PRE_BUILD b/wm-addons/ibam/PRE_BUILD
new file mode 100755
index 0000000..768387d
--- /dev/null
+++ b/wm-addons/ibam/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+# setting our CFLAGS seems to upset it...
+#sedit "s/^CFLAGS=.*/CFLAGS=$CFLAGS/" Makefile &&
+sedit "s#/local/#/#g" Makefile &&
+sedit '0,/gkrellm/s//gkrellm2/' Makefile &&
+sedit "s#^PREFIX=.*#PREFIX=${INSTALL_ROOT}/usr#" Makefile
diff --git a/wm-addons/music-applet/DEPENDS b/wm-addons/music-applet/DEPENDS
new file mode 100755
index 0000000..31722b1
--- /dev/null
+++ b/wm-addons/music-applet/DEPENDS
@@ -0,0 +1,47 @@
+depends gnome-panel &&
+depends dbus-python &&
+
+optional_depends amarok2 \
+                 "" \
+                 "" \
+                 "Enable amarok support?" &&
+optional_depends audacious \
+                 "" \
+                 "" \
+                 "Enable audacious support?" &&
+optional_depends banshee \
+                 "" \
+                 "" \
+                 "Enable banshee support?" &&
+optional_depends exaile \
+                 "" \
+                 "" \
+                 "Enable exaile support?" &&
+optional_depends mpd \
+                 "" \
+                 "" \
+                 "Enable MPD support?" &&
+optional_depends muine \
+                 "" \
+                 "" \
+                 "Enable muine support?" &&
+optional_depends quodlibet \
+                 "" \
+                 "" \
+                 "Enable quodlibet support?" &&
+optional_depends rhythmbox \
+                 "" \
+                 "" \
+                 "Enable rhythmbox support?" &&
+optional_depends vlc \
+                 "" \
+                 "" \
+                 "Enable vlc support?" &&
+optional_depends xmms \
+                 "" \
+                 "" \
+                 "Enable XMMS support?" &&
+optional_depends xmms2 \
+                 "" \
+                 "" \
+                 "Enable XMMS2 support?" 
diff --git a/wm-addons/music-applet/DETAILS b/wm-addons/music-applet/DETAILS
new file mode 100755
index 0000000..239c564
--- /dev/null
+++ b/wm-addons/music-applet/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=music-applet
+         VERSION=2.5.1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://www.kuliniewicz.org/${SPELL}/downloads/${SOURCE}
+     
SOURCE_HASH=sha512:c69074a5d60edce9f628d3c3e5639584149d0a660daa9de4eac71fdad8907cc9a969a4043dd9672eb88c7d0a8894f5a40cb56dd57600d9912ad39ccaa34ceee4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.kuliniewicz.org/music-applet/";
+      LICENSE[0]=GPL
+         ENTERED=20090726
+           SHORT="GNOME music applet"
+cat << EOF
+Music Applet is a small, simple GNOME panel applet that lets you control a
+variety of different music players from the panel. Music Applet provides easy
+access to information about the current song and the most important playback
+controls.  Music Applet currently supports the following music players:
+
+* Amarok * Audacious * Banshee * Exaile * MPD * Muine * Quod Libet * 
Rhythmbox
+* VLC * XMMS * XMMS2
+EOF
diff --git a/wm-addons/music-applet/HISTORY b/wm-addons/music-applet/HISTORY
new file mode 100644
index 0000000..9bc6649
--- /dev/null
+++ b/wm-addons/music-applet/HISTORY
@@ -0,0 +1,3 @@
+2009-07-26 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/wm-addons/slock/DETAILS b/wm-addons/slock/DETAILS
index 85525cf..8bf1540 100755
--- a/wm-addons/slock/DETAILS
+++ b/wm-addons/slock/DETAILS
@@ -1,13 +1,16 @@
-           SPELL=slock
-         VERSION=0.6
+           SPELL="slock"
+         VERSION="0.9"
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://www.suckless.org/download/${SOURCE}
-     
SOURCE_HASH=sha512:3f95ae12f1c69985a0bddf296427ba70c8b1570a317968951c6f41834f5f8f6b76ef24c053b541100d209becd7702a449a48b8ebab0e322c7a16f4528d5159be
+   SOURCE_URL[0]="http://code.suckless.org/dl/tools/${SOURCE}";
+     
SOURCE_HASH="sha512:2963ae48949c07acf0ca2678f62892cb7385e805edcc05f4d2cce30587aa015a3cdde03dcdbf7177f6c61ffe94b9efa264d17e841edf4463acfe9a835824a119"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://www.suckless.org/wiki/tools/xlib";
-      LICENSE[0]=MIT
-         ENTERED=20070625
+        WEB_SITE="http://tools.suckless.org/slock";
+      LICENSE[0]="MIT"
+         ENTERED="20070625"
            SHORT="simple X screen locker"
 cat << EOF
-simple X screen locker
+Simple X display locker. Really this is the simplest X screen locker we are
+aware of. It is stable and quite a lot people in this community are using it
+every day when they are out with friends or fetching some food from the local
+pub.
 EOF
diff --git a/wm-addons/slock/HISTORY b/wm-addons/slock/HISTORY
index ecc7bb5..9d08f88 100644
--- a/wm-addons/slock/HISTORY
+++ b/wm-addons/slock/HISTORY
@@ -1,2 +1,5 @@
+2009-07-30 Quentin Rameau <quinq AT sourcemage.org>
+        * DETAILS: updated to version 0.9
+
 2007-06-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, PRE_BUILD, BUILD, HISTORY: created spell
diff --git a/wm-addons/wbar/DETAILS b/wm-addons/wbar/DETAILS
index 6990af3..3f9ec49 100755
--- a/wm-addons/wbar/DETAILS
+++ b/wm-addons/wbar/DETAILS
@@ -4,7 +4,7 @@
    SOURCE_URL[0]=http://www.tecapli.com.ar/warlock/${SOURCE}
      
SOURCE_HASH=sha512:29a0021a27e69f663de942d3b9e9e6714e3ab934b6b1d40bedc0f858d5156a84d0f4c6e7c2949916f0164fc0239f5936aae125ea9541d29a74251460ad940e63
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="=http://www.tecapli.com.ar/warlock/";
+        WEB_SITE="http://www.tecapli.com.ar/warlock/";
       LICENSE[0]=GPL
          ENTERED=20080410
            SHORT="An eye candy quick launch bar."
diff --git a/wm-addons/wbar/HISTORY b/wm-addons/wbar/HISTORY
index 075f554..4b345cc 100644
--- a/wm-addons/wbar/HISTORY
+++ b/wm-addons/wbar/HISTORY
@@ -1,3 +1,6 @@
+2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: fixed typo in website url
+
 2008-04-24 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Apply gcc43.patch
        * gcc43.patch: Fix compilation with gcc 4.3.0
diff --git a/x11-libs/cairomm/DETAILS b/x11-libs/cairomm/DETAILS
index 43f9383..fab3918 100755
--- a/x11-libs/cairomm/DETAILS
+++ b/x11-libs/cairomm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cairomm
-         VERSION=1.8.0
-     
SOURCE_HASH=sha512:5e17f2a5ea776d252dc3b8868062b32ce74c861da41606e51b2c60f3cbb7abe9f5011945117dfeb48e5578f2041a099c84b6062058ad072fc7113cc4a7c7f26b
+         VERSION=1.8.2
+     
SOURCE_HASH=sha512:4da641ff2db155109593011b69bef890d5235c26480934ebb49bd977b9b7caaa76ba9b5ad3244ce8cd04c702ef88f97244e790f8e8a6b0f42556068ca84e8a67
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index 396c295..cb21dd3 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.8.2
+
 2009-02-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.8.0
        * DEPENDS: add libsigc++3 
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index b3e9bae..83474a6 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,10 +1,16 @@
            SPELL=gtk+2
+if [[ $GTK_VER == devel ]];then
+         VERSION=2.17.6
+     
SOURCE_HASH=sha512:e94f56a04c646078dcc0a4b05bdd5abaa8be06dec8d6e20ef456d3d3ab3c1213eea6e942d6a53b4a9294857d447ce0c9ca369f8cdab68273ab0c758e0acbeca3
+          SOURCE=gtk+-$VERSION.tar.bz2
+else
          VERSION=2.16.5
-          BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=gtk+-$VERSION.tar.bz2
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+fi
+          BRANCH=`echo $VERSION | cut -d . -f 1,2`
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$BRANCH/$SOURCE
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=LGPL
   SECURITY_PATCH=2
         KEYWORDS="x11 libs"
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 9fad602..a8ed17e 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,15 @@
+2009-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.17.6 (devel)
+
+2009-07-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DETAILS: moved SOURCE into the branches so the stable version can be
+         cast
+
+2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * PREPARE: added
+       * DETAILS: version 2.17.5 (devel)
+         add support for devel version
+
 2009-07-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.16.5
 
diff --git a/x11-toolkits/gtk+2/PREPARE b/x11-toolkits/gtk+2/PREPARE
new file mode 100755
index 0000000..13c12c7
--- /dev/null
+++ b/x11-toolkits/gtk+2/PREPARE
@@ -0,0 +1 @@
+config_query_list GTK_VER 'dhich gtk version?' stable devel
diff --git a/x11-toolkits/rep-gtk2/DETAILS b/x11-toolkits/rep-gtk2/DETAILS
index bbfb0e8..ad2339a 100755
--- a/x11-toolkits/rep-gtk2/DETAILS
+++ b/x11-toolkits/rep-gtk2/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.18.4
+         VERSION=0.18.6
          BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
           SOURCE=rep-gtk-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/rep-gtk-${VERSION}
@@ -21,7 +21,6 @@ fi
         WEB_SITE=http://sawfish.wikia.com/wiki/Rep-GTK
       LICENSE[0]=GPL
          ENTERED=20020510
-         UPDATED=20030226
         KEYWORDS="x11 libs"
            SHORT="rep-gtk is bindings of GTK+/GDK 2.0 for librep."
 cat << EOF
diff --git a/x11-toolkits/rep-gtk2/HISTORY b/x11-toolkits/rep-gtk2/HISTORY
index 74ba553..1e9ac07 100644
--- a/x11-toolkits/rep-gtk2/HISTORY
+++ b/x11-toolkits/rep-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-23 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.18.6
+
 2009-04-19 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.18.4 and switched to bz2
 
diff --git a/x11-toolkits/rep-gtk2/PRE_BUILD b/x11-toolkits/rep-gtk2/PRE_BUILD
index eb604f3..8f491f8 100755
--- a/x11-toolkits/rep-gtk2/PRE_BUILD
+++ b/x11-toolkits/rep-gtk2/PRE_BUILD
@@ -1,7 +1,4 @@
 default_pre_build       &&
-
-if [ "${REPGTK_CVS}" == "y" ]; then
-   cd ${SOURCE_DIRECTORY}  &&
-   NOCONFIGURE=Y ./autogen.sh
-fi
+cd ${SOURCE_DIRECTORY}  &&
+NOCONFIGURE=Y ./autogen.sh
 
diff --git a/x11-toolkits/rep-gtk2/rep-gtk-0.18.4.tar.bz2.sig 
b/x11-toolkits/rep-gtk2/rep-gtk-0.18.4.tar.bz2.sig
deleted file mode 100644
index 679885b..0000000
Binary files a/x11-toolkits/rep-gtk2/rep-gtk-0.18.4.tar.bz2.sig and /dev/null 
differ
diff --git a/x11-toolkits/rep-gtk2/rep-gtk-0.18.6.tar.bz2.sig 
b/x11-toolkits/rep-gtk2/rep-gtk-0.18.6.tar.bz2.sig
new file mode 100644
index 0000000..f20b528
Binary files /dev/null and b/x11-toolkits/rep-gtk2/rep-gtk-0.18.6.tar.bz2.sig 
differ
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index ecb8d87..1c45d4e 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-RC6
-    
SOURCE_HASH=sha512:e89bc7b110bef1ef67bd78c735cdd29f750a4d5d05bbd18a441cb540e4b1c9aca089d71f3cdc7ab8575a630d76f0f69d084922556fb1f00d88eea3c8c39ac0aa
+         VERSION=2.9.0
+    
SOURCE_HASH=sha512:5b9f83275b547ab8df482fc5e462afe9a15a68b9a614731833138087df49d0a20e8e576ce588158ff7d7b7e150bd0eaa50c21acb8eb9931fca663c30ceef2469
           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 558751a..87ebcbf 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,6 @@
+2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.9.0
+
 2009-07-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.9.0-RC6
        * BUILD: clean up
diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index 9f0995b..a8235a7 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,7 @@
+2009-07-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * PRE_BUILD: patch is only applied if client is requested
+       * glibc-2.10.1.patch: fixed tabs, don't know why it was no longer 
applying
+
 2009-06-02 Julien "_kaze_" ROZO <julien AT rozo.org>
        * PRE_BUILD, glibc-2.10.1.patch: added, fix compilation issue with 
glibc 2.10.1
        * DEPENDS: removed nvidia-settings, it has been deprecated
diff --git a/x11/gkrellm2/PRE_BUILD b/x11/gkrellm2/PRE_BUILD
index 16fab83..13acbd2 100755
--- a/x11/gkrellm2/PRE_BUILD
+++ b/x11/gkrellm2/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
+if [ "$DAEMON_ONLY" = "n" ] ; then
+    patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
+fi
diff --git a/x11/gkrellm2/glibc-2.10.1.patch b/x11/gkrellm2/glibc-2.10.1.patch
index a6c8f19..b86a094 100644
--- a/x11/gkrellm2/glibc-2.10.1.patch
+++ b/x11/gkrellm2/glibc-2.10.1.patch
@@ -1,30 +1,30 @@
-diff -Naur gkrellm-2.3.2.orig/src/client.c gkrellm-2.3.2/src/client.c  
---- gkrellm-2.3.2.orig/src/client.c     2008-10-04 02:33:37.000000000 +0200
-+++ gkrellm-2.3.2/src/client.c  2009-06-02 22:02:47.000000000 +0200
+diff -Naur gkrellm-2.3.2.orig/src/client.c gkrellm-2.3.2/src/client.c
+--- gkrellm-2.3.2.orig/src/client.c    2008-10-04 02:33:37.000000000 +0200
++++ gkrellm-2.3.2/src/client.c 2009-07-21 10:03:07.000000000 +0200
 @@ -1620,7 +1620,7 @@
-
-
+ 
+ 
  static gint
 -getline(gint fd, gchar *buf, gint len)
 +getline_(gint fd, gchar *buf, gint len)
-        {
-        fd_set                  read_fds;
-        struct timeval  tv;
+       {
+       fd_set                  read_fds;
+       struct timeval  tv;
 @@ -1714,7 +1714,7 @@
-
-        while (1)
-                {
--               rs=getline(fd, buf, sizeof(buf));
-+               rs=getline_(fd, buf, sizeof(buf));
+ 
+       while (1)
+               {
+-              rs=getline(fd, buf, sizeof(buf));
++              rs=getline_(fd, buf, sizeof(buf));
          if(rs<0)
              return FALSE;
-                if (!strcmp(buf, "</gkrellmd_setup>"))
+               if (!strcmp(buf, "</gkrellmd_setup>"))
 @@ -1732,7 +1732,7 @@
-        table_size = sizeof(update_table) / sizeof(KeyTable);
-        while (1)
-                {
--               rs=getline(fd, buf, sizeof(buf));
-+               rs=getline_(fd, buf, sizeof(buf));
+       table_size = sizeof(update_table) / sizeof(KeyTable);
+       while (1)
+               {
+-              rs=getline(fd, buf, sizeof(buf));
++              rs=getline_(fd, buf, sizeof(buf));
          if(rs<0)
              return FALSE;
-                if (!strcmp(buf, "</initial_update>"))
+               if (!strcmp(buf, "</initial_update>"))
diff --git a/x11/gmrun/HISTORY b/x11/gmrun/HISTORY
index c929bc4..5652dfd 100644
--- a/x11/gmrun/HISTORY
+++ b/x11/gmrun/HISTORY
@@ -1,3 +1,6 @@
+2009-07-28 Peng Chang (Charles) <chp AT sourcemage.org>
+       * gmrun-0.9.2-gcc43.patch: POSIX-ified a comparison function
+
 2008-11-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.9.2 #14899
        * PRE_BUILD, gmrun-0.9.2-gcc43.patch: added patch from Gentoo
diff --git a/x11/gmrun/gmrun-0.9.2-gcc43.patch 
b/x11/gmrun/gmrun-0.9.2-gcc43.patch
index 5be3922..73c1de4 100644
--- a/x11/gmrun/gmrun-0.9.2-gcc43.patch
+++ b/x11/gmrun/gmrun-0.9.2-gcc43.patch
@@ -38,3 +38,19 @@
  #include <iostream>
  #include <sstream>
  #include <vector>
+
+--- gmrun-0.9.2/src/gtkcompletionline.cc.orig  2009-07-27 12:50:09.000000000 
+0800
++++ gmrun-0.9.2/src/gtkcompletionline.cc       2009-07-27 12:52:01.000000000 
+0800
+@@ -377,9 +377,7 @@
+   return 0;
+ }
+ 
+-int my_alphasort(const void* va, const void* vb) {
+-  const struct dirent** a = (const struct dirent**)va;
+-  const struct dirent** b = (const struct dirent**)vb;
+-
++static int my_alphasort(const struct dirent** a, const struct dirent** b)
++{
+   const char* s1 = (*a)->d_name;
+   const char* s2 = (*b)->d_name;
+
diff --git a/x11/xscreensaver/BUILD b/x11/xscreensaver/BUILD
index 1a307c3..e26658c 100755
--- a/x11/xscreensaver/BUILD
+++ b/x11/xscreensaver/BUILD
@@ -1,18 +1,11 @@
 #sedit  "6690s/Screensaver/Screensaver Properties/"  po/es.po    &&
 
-OPTS="--with-dpms-ext $OPTS"
-OPTS="--with-xinerama-ext $OPTS"
-OPTS="--with-xf86vmode-ext $OPTS"
-OPTS="--with-xf86gamma-ext $OPTS"
-OPTS="--with-randr-ext $OPTS"
 OPTS="--with-proc-interrupts $OPTS"
-OPTS="--with-xshm-ext $OPTS"
-OPTS="--with-xdbe-ext $OPTS"
 OPTS="--with-readdisplay $OPTS"
-OPTS="--enable-locking $OPTS"
 OPTS="--without-motif $OPTS"
-if [ "$XSCSV" == "n" ]; then
-   OPTS="--without-gtk --without-xml $OPTS"
-fi  &&
-
+if ! (is_depends_enabled $SPELL WEB-BROWSER); then
+  OPTS="--without-browser $OPTS"
+else
+  OPTS="--with-browser=$(get_spell_provider $SPELL WEB-BROWSER) $OPTS"
+fi &&
 default_build
diff --git a/x11/xscreensaver/CONFIGURE b/x11/xscreensaver/CONFIGURE
index 745f3de..92bae29 100755
--- a/x11/xscreensaver/CONFIGURE
+++ b/x11/xscreensaver/CONFIGURE
@@ -1,6 +1,4 @@
-message  "${MESSAGE_COLOR}The xscreensaver demo program allows you to"    \
-         "browse among the different effects available in xscreensaver."  \
-         "Enabling this adds dependencies on gtk+2 and"                   \
-         "libglade2${DEFAULT_COLOR}"                                      &&
-
-config_query  XSCSV_GTK  "Enable xscreensaver-demo?"  y
+config_query_option  XSCSV_LOCK  "Enable screen locking?"  y \
+                                 --enable-locking --disable-locking &&
+config_query_option  XSCSV_ROOT  "Enable unlocking with root passwd?"  y \
+                                 --enable-root-passwd --disable-root-passwd
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index 2e600c9..7e5cab3 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -2,11 +2,10 @@ depends  bc        &&
 depends  zlib      &&
 depends  xorg-libs  &&
 
-if  [  "$XSCSV_GTK"  ==  "y"  ];  then
-  depends  gtk+2     '--with-gtk' &&
-  depends  libxml2   '--with-xml' &&
-  depends  libglade2
-fi  &&
+message  "${MESSAGE_COLOR}The xscreensaver demo program allows you to"    \
+         "browse among the different effects available in xscreensaver."  \
+         "${DEFAULT_COLOR}"                                               &&
+optional_depends  libglade2 '' '' 'Enable xscreensaver demo?'             &&
 
 optional_depends  linux-pam                                     \
                   "--with-pam"                                  \
@@ -23,30 +22,66 @@ optional_depends  shadow                                  
      \
                   "--without-shadow"                            \
                   "for shadow password authentication support"  &&
 
+optional_depends  gdm2                                          \
+                  "--with-login-manager"                        \
+                  "--without-login-manager"                     \
+                  "for login manager support"                   &&
+
+optional_depends  libgnome                                      \
+                  ""                                            \
+                  ""                                            \
+                  "use gnome-open to open stuff?"               &&
+
 optional_depends  GLUT                                          \
                   "--with-gl"                                   \
                   "--without-gl"                                \
-                  "for OpenGL demos which require GLUT"         &&
+                  "for OpenGL/GLUT screensavers"                &&
 
-optional_depends  gle                                           \
+optional_depends  libgle                                        \
                   "--with-gle"                                  \
                   "--without-gle"                               \
-                  "Enable GLE extentions"                       &&
+                  "Enable GLE OpenGL tubing and extrusion"      &&
 
 optional_depends  fortune                                       \
                   "--with-fortune"                              \
                   "--without-fortune"                           \
                   "for fortune text messages" "games"           &&
 
+optional_depends  GTK2                                          \
+                  "--with-gtk --with-pixbuf"                    \
+                  "--without-gtk --without-pixbuf"              \
+                  "for GDK-Pixbuf image support and a gtk interface" &&
+
+optional_depends  libxpm                                        \
+                  "--with-xpm"                                  \
+                  "--without-xpm"                               \
+                  "Include support for XPM files? (Not needed if Pixbuf is 
used)?" &&
+
 optional_depends  jpeg                                          \
                   "--with-jpeg"                                 \
                   "--without-jpeg"                              \
                   "for JPEG image support"                      &&
 
-optional_depends  gdk-pixbuf                                    \
-                  "--with-pixbuf"                               \
-                 "--without-pixbuf"                             \
-                  "for GDK-Pixbuf image support"                &&
+optional_depends  WEB-BROWSER                                   \
+                  ""                                            \
+                  ""                                            \
+                  "Which browser to use for help"               &&
+
+optional_depends  libxext                                              \
+                  "--with-dpms-ext --with-xshm-ext --with-xdbe-ext"    \
+                  "--without-dpms-ext --with-xshm-ext --with-xdbe-ext" \
+                  "Enable power mgmt, shared mem and double buffer support?" 
&&
+
+optional_depends  libxrandr                                     \
+                  "--with-randr-ext"                            \
+                  "--without-randr-ext"                         \
+                  "Include support for the X Resize+Rotate extension?" &&
+
+optional_depends  libxinerama                                   \
+                  "--with-xinerama-ext"                         \
+                  "--without-xinerama-ext"                      \
+                  "Enable Xinerama multihead support?"          &&
+
 suggest_depends  xplanet                                        \
                   ""                                            \
                   ""                                            \
@@ -71,3 +106,4 @@ suggest_depends  electricsheep                             
     \
                   ""                                            \
                   ""                                            \
                   "support for ElectricSheep screensaver"
+
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index c0009f4..557e2e3 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,12 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD: added logic to optionally select a help browser
+       * CONFIGURE: moved libglade2, libxml2 and gtk+2 to DEPENDS,
+         compressed to 1 optional_depends on libglade2.
+         Added questions about accepting rootpw and screen locking
+       * DEPENDS: added optional deps on gdm2, libgnome ,libxpm, libxext,
+         a web-browser, libxrandr, libxinerama. switched from gdk-pixbuf to
+         gtk+2. Also, it optionally depends on libgle, not gle (different 
lib).
+
 2009-05-21 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 5.08
 
diff --git a/xfce-plugins/xfce4-weather-plugin/DETAILS 
b/xfce-plugins/xfce4-weather-plugin/DETAILS
index 7e1ebc7..6c54f46 100755
--- a/xfce-plugins/xfce4-weather-plugin/DETAILS
+++ b/xfce-plugins/xfce4-weather-plugin/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfce4-weather-plugin
-         VERSION=0.7.0
+         VERSION=0.7.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
diff --git a/xfce-plugins/xfce4-weather-plugin/HISTORY 
b/xfce-plugins/xfce4-weather-plugin/HISTORY
index 7e47aa7..eec8bcf 100644
--- a/xfce-plugins/xfce4-weather-plugin/HISTORY
+++ b/xfce-plugins/xfce4-weather-plugin/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 0.7.1
+
 2009-06-29 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.7.0
 
diff --git 
a/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.0.tar.bz2.sig 
b/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.0.tar.bz2.sig
deleted file mode 100644
index 8410c47..0000000
Binary files 
a/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.0.tar.bz2.sig 
and /dev/null differ
diff --git 
a/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.1.tar.bz2.sig 
b/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.1.tar.bz2.sig
new file mode 100644
index 0000000..e2268c2
Binary files /dev/null and 
b/xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.1.tar.bz2.sig 
differ
diff --git a/xfce/notification-daemon-xfce/CONFLICTS 
b/xfce/notification-daemon-xfce/CONFLICTS
index 8d6212d..5c98c6e 100755
--- a/xfce/notification-daemon-xfce/CONFLICTS
+++ b/xfce/notification-daemon-xfce/CONFLICTS
@@ -1 +1,2 @@
-conflicts notification-daemon
+conflicts notification-daemon &&
+conflicts notify-osd
diff --git a/xfce/notification-daemon-xfce/HISTORY 
b/xfce/notification-daemon-xfce/HISTORY
index fc99b87..9eabd5d 100644
--- a/xfce/notification-daemon-xfce/HISTORY
+++ b/xfce/notification-daemon-xfce/HISTORY
@@ -1,3 +1,6 @@
+2009-07-27 Donald Johnson <ltdonny AT gmail.com>
+       * CONFLICTS: notify-osd added
+
 2009-01-21 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on libnotify (Bug #14976)
 
diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index be980c3..44b3348 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -11,10 +11,11 @@ if [[ $XFBURN_SVN == y ]]; then
   FORCE_DOWNLOAD=on
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
 else
-         VERSION=0.4.1
+         VERSION=0.4.2
+          BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:bb8bbf3e1477053e7328fdbb0de306acaeae0a1c2bf591d873860aacf3b315506eea238cba0d5c0171c7f8879fd3d3cc28d70702b72f8849d182b9a1dd622b0e
+   SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
+     
SOURCE_HASH=sha512:b4da22fdb9f28bffb18da4f274dbb675ced1e93a53150c0641c0fc4737c2ba3270d89db431d6d1aed3f08f6c488ef3951589938925408c5876b8a99435d33866
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE=http://goodies.xfce.org/projects/applications/xfburn/
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index cffd5db..c03cb3a 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.4.2; fixed SOURCE_URL[0]
+
 2009-02-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.4.1
 
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 5281277..86c064e 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pixman
-         VERSION=0.15.16
-     
SOURCE_HASH=sha512:ef6246b2a8ac121441f96c918e1af00257ddcc549707b03dfd76df81cc1d322f5ecdeabc63eee207c24ea3de8b67372fb471484df6805741891d7e859e945380
+         VERSION=0.15.18
+     
SOURCE_HASH=sha512:353fd45e25c5804bff37260c9a321dfe8d306ef6fefd45557924e20e81c01925ae61d18e7eed42b715bc3b8c02d2325e5042b16b6b2079f6e4ad17f13e246974
           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 bfa8e10..7d5974f 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2009-07-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.15.18
+
 2009-07-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.15.16