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

Remko van der Vossen scm at sourcemage.org
Wed Aug 18 12:48:51 EDT 2010


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

 ChangeLog                                                                 |   23 
 antivirus/clamav/DETAILS                                                  |    2 
 antivirus/clamav/HISTORY                                                  |    3 
 archive/rpm/BUILD                                                         |    1 
 archive/rpm/DETAILS                                                       |    4 
 archive/rpm/HISTORY                                                       |    4 
 archive/rpm/rpm-5.1.9.tar.gz.sig                                          |    0 
 archive/rpm/rpm-5.3.2.tar.gz.sig                                          |binary
 audio-creation/ardour2/DETAILS                                            |    4 
 audio-creation/ardour2/HISTORY                                            |    3 
 chat-im/pidgin/BUILD                                                      |    1 
 chat-im/pidgin/DEPENDS                                                    |    5 
 chat-im/pidgin/HISTORY                                                    |    3 
 crypto/beecrypt/BUILD                                                     |    4 
 crypto/beecrypt/HISTORY                                                   |    3 
 crypto/ccid/DETAILS                                                       |    6 
 crypto/ccid/HISTORY                                                       |    3 
 crypto/chntpw/DETAILS                                                     |    8 
 crypto/chntpw/HISTORY                                                     |    3 
 crypto/gnomint/DETAILS                                                    |    4 
 crypto/gnomint/HISTORY                                                    |    2 
 crypto/libassuan/DETAILS                                                  |    2 
 crypto/libassuan/HISTORY                                                  |    3 
 crypto/libssh2/DETAILS                                                    |    4 
 crypto/libssh2/HISTORY                                                    |    3 
 crypto/pcsc-lite/BUILD                                                    |   12 
 crypto/pcsc-lite/CONFIGURE                                                |    3 
 crypto/pcsc-lite/DEPENDS                                                  |   10 
 crypto/pcsc-lite/DETAILS                                                  |    6 
 crypto/pcsc-lite/HISTORY                                                  |    8 
 crypto/pgpdump/DETAILS                                                    |    4 
 crypto/pgpdump/HISTORY                                                    |    3 
 database/dbd-sqlite/DETAILS                                               |    4 
 database/dbd-sqlite/HISTORY                                               |    3 
 dev/null                                                                  |binary
 devel/m4/HISTORY                                                          |    3 
 devel/m4/PRE_BUILD                                                        |    4 
 devel/perl/CONFLICTS                                                      |    4 
 devel/perl/HISTORY                                                        |    4 
 devel/vala/DETAILS                                                        |    4 
 devel/vala/HISTORY                                                        |    3 
 disk/gdisk/DETAILS                                                        |    4 
 disk/gdisk/HISTORY                                                        |    4 
 disk/gdisk/INSTALL                                                        |    5 
 disk/ntfs-3g/DETAILS                                                      |    4 
 disk/ntfs-3g/HISTORY                                                      |    3 
 disk/udev/DETAILS                                                         |    2 
 disk/udev/HISTORY                                                         |    3 
 disk/yaboot/DETAILS                                                       |    4 
 disk/yaboot/HISTORY                                                       |    3 
 e-17/e_module-alarm/DEPENDS                                               |    1 
 e-17/e_module-alarm/HISTORY                                               |    3 
 e-17/e_module-bling/DEPENDS                                               |    1 
 e-17/e_module-bling/HISTORY                                               |    3 
 e-17/e_module-calendar/DEPENDS                                            |    1 
 e-17/e_module-calendar/HISTORY                                            |    3 
 e-17/e_module-cpu/DEPENDS                                                 |    1 
 e-17/e_module-cpu/HISTORY                                                 |    3 
 e-17/e_module-deskshow/DEPENDS                                            |    1 
 e-17/e_module-deskshow/HISTORY                                            |    3 
 e-17/e_module-efm_nav/DEPENDS                                             |    1 
 e-17/e_module-efm_nav/HISTORY                                             |    3 
 e-17/e_module-efm_path/DEPENDS                                            |    1 
 e-17/e_module-efm_path/HISTORY                                            |    3 
 e-17/e_module-eloquence/DEPENDS                                           |    1 
 e-17/e_module-eloquence/HISTORY                                           |    3 
 e-17/e_module-emu/DEPENDS                                                 |    1 
 e-17/e_module-emu/HISTORY                                                 |    3 
 e-17/e_module-execwatch/DEPENDS                                           |    1 
 e-17/e_module-execwatch/HISTORY                                           |    3 
 e-17/e_module-flame/DEPENDS                                               |    1 
 e-17/e_module-flame/HISTORY                                               |    3 
 e-17/e_module-forecasts/DEPENDS                                           |    1 
 e-17/e_module-forecasts/HISTORY                                           |    3 
 e-17/e_module-iiirk/DEPENDS                                               |    1 
 e-17/e_module-iiirk/HISTORY                                               |    3 
 e-17/e_module-language/DEPENDS                                            |    1 
 e-17/e_module-language/HISTORY                                            |    3 
 e-17/e_module-mail/DEPENDS                                                |    1 
 e-17/e_module-mail/HISTORY                                                |    3 
 e-17/e_module-mem/DEPENDS                                                 |    1 
 e-17/e_module-mem/HISTORY                                                 |    3 
 e-17/e_module-moon/DEPENDS                                                |    1 
 e-17/e_module-moon/HISTORY                                                |    3 
 e-17/e_module-mpdule/DEPENDS                                              |    1 
 e-17/e_module-mpdule/HISTORY                                              |    3 
 e-17/e_module-net/DEPENDS                                                 |    1 
 e-17/e_module-net/HISTORY                                                 |    3 
 e-17/e_module-news/DEPENDS                                                |    1 
 e-17/e_module-news/HISTORY                                                |    3 
 e-17/e_module-notification/DEPENDS                                        |    1 
 e-17/e_module-notification/HISTORY                                        |    3 
 e-17/e_module-penguins/DEPENDS                                            |    1 
 e-17/e_module-penguins/HISTORY                                            |    3 
 e-17/e_module-photo/DEPENDS                                               |    1 
 e-17/e_module-photo/HISTORY                                               |    3 
 e-17/e_module-places/DEPENDS                                              |    1 
 e-17/e_module-places/HISTORY                                              |    3 
 e-17/e_module-rain/DEPENDS                                                |    1 
 e-17/e_module-rain/HISTORY                                                |    3 
 e-17/e_module-screenshot/DEPENDS                                          |    1 
 e-17/e_module-screenshot/HISTORY                                          |    3 
 e-17/e_module-slideshow/DEPENDS                                           |    1 
 e-17/e_module-slideshow/HISTORY                                           |    3 
 e-17/e_module-snow/DEPENDS                                                |    1 
 e-17/e_module-snow/HISTORY                                                |    3 
 e-17/e_module-taskbar/DEPENDS                                             |    1 
 e-17/e_module-taskbar/HISTORY                                             |    3 
 e-17/e_module-tclock/DEPENDS                                              |    1 
 e-17/e_module-tclock/HISTORY                                              |    3 
 e-17/e_module-tiling/DEPENDS                                              |    1 
 e-17/e_module-tiling/HISTORY                                              |    3 
 e-17/e_module-uptime/DEPENDS                                              |    1 
 e-17/e_module-uptime/HISTORY                                              |    3 
 e-17/e_module-weather/DEPENDS                                             |    1 
 e-17/e_module-weather/HISTORY                                             |    3 
 e-17/e_module-winselector/DEPENDS                                         |    1 
 e-17/e_module-winselector/HISTORY                                         |    3 
 e-17/e_module-wlan/DEPENDS                                                |    1 
 e-17/e_module-wlan/HISTORY                                                |    3 
 e-17/e_utils/DEPENDS                                                      |    1 
 e-17/e_utils/HISTORY                                                      |    3 
 e-17/eclair/DEPENDS                                                       |    1 
 e-17/eclair/HISTORY                                                       |    3 
 e-17/econf/DEPENDS                                                        |    1 
 e-17/econf/HISTORY                                                        |    3 
 e-17/elapse/DEPENDS                                                       |    1 
 e-17/elapse/HISTORY                                                       |    3 
 e-17/elicit/DEPENDS                                                       |    1 
 e-17/elicit/HISTORY                                                       |    3 
 e-17/embrace/DEPENDS                                                      |    1 
 e-17/embrace/HISTORY                                                      |    3 
 e-17/enscribe/DEPENDS                                                     |    1 
 e-17/enscribe/HISTORY                                                     |    3 
 e-17/entrance/DEPENDS                                                     |    1 
 e-17/entrance/HISTORY                                                     |    3 
 e-17/erss/DEPENDS                                                         |    1 
 e-17/erss/HISTORY                                                         |    3 
 e-17/iconbar/DEPENDS                                                      |    1 
 e-17/iconbar/HISTORY                                                      |    3 
 editors/vim/DETAILS                                                       |   26 
 editors/vim/HISTORY                                                       |    4 
 editors/vim/PRE_BUILD                                                     |   27 
 editors/vim/vim-7.2.tar.bz2.sig                                           |    0 
 editors/vim/vim-7.3.tar.bz2.sig                                           |binary
 ftp/curl/DETAILS                                                          |    2 
 ftp/curl/HISTORY                                                          |    3 
 ftp/filezilla/BUILD                                                       |    2 
 ftp/filezilla/DETAILS                                                     |    4 
 ftp/filezilla/HISTORY                                                     |    4 
 gnome2-apps/epiphany/DEPENDS                                              |    1 
 gnome2-apps/epiphany/DETAILS                                              |    2 
 gnome2-apps/epiphany/HISTORY                                              |    4 
 gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig                          |    0 
 gnome2-apps/epiphany/epiphany-2.30.3.tar.bz2.sig                          |binary
 gnome2-libs/clutter-gtk/DETAILS                                           |    2 
 gnome2-libs/clutter-gtk/HISTORY                                           |    3 
 gnome2-libs/clutter-gtk/clutter-gtk-0.10.4.tar.bz2.sig                    |    0 
 gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig                    |binary
 gnome2-libs/devicekit/DETAILS                                             |    4 
 gnome2-libs/devicekit/DeviceKit-003.tar.bz2.sig                           |    0 
 gnome2-libs/devicekit/DeviceKit-003.tar.gz.sig                            |binary
 gnome2-libs/devicekit/DeviceKit-no-doc.patch                              |   46 -
 gnome2-libs/devicekit/HISTORY                                             |    4 
 gnome2-libs/devicekit/PRE_BUILD                                           |    6 
 gnome2-libs/gdk-pixbuf2/DEPENDS                                           |    6 
 gnome2-libs/gdk-pixbuf2/DETAILS                                           |   22 
 gnome2-libs/gdk-pixbuf2/HISTORY                                           |    2 
 gnome2-libs/glib2/DETAILS                                                 |    2 
 gnome2-libs/glib2/HISTORY                                                 |    3 
 gnome2-libs/glib2/glib-2.25.1.tar.bz2.sig                                 |    0 
 gnome2-libs/glib2/glib-2.25.14.tar.bz2.sig                                |binary
 gnome2-libs/gobject-introspection/DETAILS                                 |    5 
 gnome2-libs/gobject-introspection/HISTORY                                 |    7 
 gnome2-libs/gobject-introspection/PREPARE                                 |    1 
 gnome2-libs/gobject-introspection/PRE_BUILD                               |    4 
 gnome2-libs/gobject-introspection/PRE_SUB_DEPENDS                         |    4 
 gnome2-libs/gobject-introspection/SUB_DEPENDS                             |    5 
 gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig |binary
 gnome2-libs/gtkhtml2/DETAILS                                              |    2 
 gnome2-libs/gtkhtml2/HISTORY                                              |    3 
 gnome2-libs/gtkhtml2/gtkhtml-3.30.2.tar.bz2.sig                           |    0 
 gnome2-libs/gtkhtml2/gtkhtml-3.30.3.tar.bz2.sig                           |binary
 gnome2-libs/libsoup/DETAILS                                               |    2 
 gnome2-libs/libsoup/HISTORY                                               |    3 
 gnome2-libs/libsoup/libsoup-2.31.2.tar.bz2.sig                            |    0 
 gnome2-libs/libsoup/libsoup-2.31.90.tar.bz2.sig                           |binary
 graphics-libs/libcaca/DEPENDS                                             |    2 
 graphics-libs/libcaca/HISTORY                                             |    5 
 graphics-libs/poppler/DETAILS                                             |    8 
 graphics-libs/poppler/HISTORY                                             |    4 
 graphics-libs/poppler/UP_TRIGGERS                                         |    2 
 graphics/bins/22_bins-hash-ref                                            |   17 
 graphics/bins/BUILD                                                       |    1 
 graphics/bins/DEPENDS                                                     |   15 
 graphics/bins/DETAILS                                                     |   20 
 graphics/bins/HISTORY                                                     |    5 
 graphics/bins/INSTALL                                                     |    1 
 graphics/bins/PRE_BUILD                                                   |    4 
 graphics/bins/install.sh.patch                                            |   66 +
 graphics/imagemagick/DETAILS                                              |    4 
 graphics/imagemagick/HISTORY                                              |    6 
 graphics/inkscape/DETAILS                                                 |    2 
 graphics/inkscape/HISTORY                                                 |    4 
 graphics/inkscape/PRE_BUILD                                               |    3 
 graphics/inkscape/inkscape-poppler-0.12.2.patch                           |   89 --
 http/firefox/DETAILS                                                      |    2 
 http/firefox/HISTORY                                                      |    3 
 http/lighttpd/BUILD                                                       |    2 
 http/lighttpd/CONFIGURE                                                   |    2 
 http/lighttpd/DETAILS                                                     |    5 
 http/lighttpd/HISTORY                                                     |    7 
 http/lighttpd/PRE_BUILD                                                   |    4 
 http/lighttpd/network-ssl.patch                                           |   11 
 http/midori/BUILD                                                         |    2 
 http/midori/DEPENDS                                                       |    7 
 http/midori/DETAILS                                                       |    4 
 http/midori/HISTORY                                                       |    6 
 http/webkitgtk/DEPENDS                                                    |   14 
 http/webkitgtk/HISTORY                                                    |    3 
 kde-look/qtcurve-gtk2/DETAILS                                             |    4 
 kde-look/qtcurve-gtk2/HISTORY                                             |    3 
 kde4-apps/k3b4/DETAILS                                                    |    4 
 kde4-apps/k3b4/HISTORY                                                    |    3 
 kde4-apps/konversation4/DETAILS                                           |    4 
 kde4-apps/konversation4/HISTORY                                           |    3 
 kde4-look/qtcurve-kde4/DETAILS                                            |    4 
 kde4-look/qtcurve-kde4/HISTORY                                            |    3 
 kde4/kde4-profile/DEPENDS                                                 |   13 
 kde4/kde4-profile/HISTORY                                                 |    3 
 kde4/kdelibs4/DEPENDS                                                     |    1 
 kde4/kdelibs4/HISTORY                                                     |    3 
 kernels/linux/HISTORY                                                     |    7 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.27.51            |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.32.19            |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.34.4             |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.35.2             |    6 
 kernels/linux/latest.defaults                                             |    2 
 latex/texlive-texmf/DETAILS                                               |    5 
 latex/texlive-texmf/HISTORY                                               |    5 
 latex/texlive-texmf/PREPARE                                               |    8 
 latex/texlive-texmf/PRE_BUILD                                             |   13 
 libs/elfutils/DETAILS                                                     |    4 
 libs/elfutils/DOWNLOAD                                                    |    2 
 libs/elfutils/HISTORY                                                     |    4 
 libs/glibc/BUILD                                                          |    3 
 libs/glibc/HISTORY                                                        |    3 
 libs/libvirt/DETAILS                                                      |    2 
 libs/libvirt/HISTORY                                                      |    3 
 libs/libvirt/libvirt-0.8.2.tar.gz.sig                                     |    0 
 libs/libvirt/libvirt-0.8.3.tar.gz.sig                                     |binary
 mail/alpine/DETAILS                                                       |   59 -
 mail/alpine/HISTORY                                                       |    8 
 mail/alpine/PREPARE                                                       |   10 
 mail/alpine/PRE_BUILD                                                     |   20 
 mail/alpine/maildir.patch.diff                                            |  227 ------
 mail/alpine/outgoing.patch.diff                                           |   11 
 mail/alpine/rules.patch.diff                                              |  372 ----------
 mail/cone/BUILD                                                           |    2 
 mail/cone/DEPENDS                                                         |    4 
 mail/cone/DETAILS                                                         |    2 
 mail/cone/HISTORY                                                         |    5 
 mail/cone/PRE_BUILD                                                       |    5 
 mail/cone/cone-gcc43.patch                                                |  218 -----
 net/ipsec-tools/BUILD                                                     |    4 
 net/ipsec-tools/DETAILS                                                   |    1 
 net/ipsec-tools/HISTORY                                                   |    4 
 net/network-manager-applet/DEPENDS                                        |   11 
 net/network-manager-applet/DETAILS                                        |   33 
 net/network-manager-applet/HISTORY                                        |    3 
 net/network-manager-applet/PREPARE                                        |    7 
 net/network-manager-applet/PRE_BUILD                                      |    7 
 net/network-manager-pptp/DEPENDS                                          |    8 
 net/network-manager-pptp/DETAILS                                          |   23 
 net/network-manager-pptp/HISTORY                                          |    3 
 net/network-manager/BUILD                                                 |    2 
 net/network-manager/DEPENDS                                               |   19 
 net/network-manager/DETAILS                                               |   34 
 net/network-manager/HISTORY                                               |    3 
 net/network-manager/PREPARE                                               |    6 
 net/network-manager/PRE_BUILD                                             |    6 
 net/network-manager/init.d/NetworkManager                                 |    9 
 perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig                               |    0 
 perl-cpan/anyevent/DETAILS                                                |    6 
 perl-cpan/anyevent/HISTORY                                                |    3 
 perl-cpan/berkeleydb/DETAILS                                              |    4 
 perl-cpan/berkeleydb/HISTORY                                              |    3 
 perl-cpan/compress-raw-zlib/DETAILS                                       |    4 
 perl-cpan/compress-raw-zlib/HISTORY                                       |    3 
 perl-cpan/dbd-odbc/DETAILS                                                |    4 
 perl-cpan/dbd-odbc/HISTORY                                                |    3 
 perl-cpan/dbi/DETAILS                                                     |    4 
 perl-cpan/dbi/HISTORY                                                     |    3 
 perl-cpan/digest-md5/DETAILS                                              |    4 
 perl-cpan/digest-md5/HISTORY                                              |    3 
 perl-cpan/digest-sha/DETAILS                                              |    4 
 perl-cpan/digest-sha/HISTORY                                              |    3 
 perl-cpan/event-execflow/DETAILS                                          |    6 
 perl-cpan/event-execflow/HISTORY                                          |    3 
 perl-cpan/event-rpc/DETAILS                                               |    5 
 perl-cpan/event-rpc/HISTORY                                               |    3 
 perl-cpan/event/DETAILS                                                   |    4 
 perl-cpan/event/HISTORY                                                   |    3 
 perl-cpan/file-which/DEPENDS                                              |    3 
 perl-cpan/file-which/DETAILS                                              |    8 
 perl-cpan/file-which/HISTORY                                              |    3 
 perl-cpan/gtk/BUILD                                                       |    4 
 perl-cpan/gtk/HISTORY                                                     |    3 
 perl-cpan/html-clean/BUILD                                                |    1 
 perl-cpan/html-clean/DEPENDS                                              |    1 
 perl-cpan/html-clean/DETAILS                                              |   30 
 perl-cpan/html-clean/HISTORY                                              |    7 
 perl-cpan/html-clean/PRE_BUILD                                            |    3 
 perl-cpan/html-clean/no-use-IO_271346.patch                               |   10 
 perl-cpan/html-parser/DETAILS                                             |    4 
 perl-cpan/html-parser/HISTORY                                             |    5 
 perl-cpan/image-exiftool/DETAILS                                          |    4 
 perl-cpan/image-exiftool/HISTORY                                          |    3 
 perl-cpan/image-info/DETAILS                                              |    6 
 perl-cpan/image-info/HISTORY                                              |    3 
 perl-cpan/image-size/DETAILS                                              |    6 
 perl-cpan/image-size/HISTORY                                              |    3 
 perl-cpan/io-tty/DETAILS                                                  |    4 
 perl-cpan/io-tty/HISTORY                                                  |    3 
 perl-cpan/ipc-run/DETAILS                                                 |    6 
 perl-cpan/ipc-run/HISTORY                                                 |    3 
 perl-cpan/perl-extutils-depends/DETAILS                                   |    4 
 perl-cpan/perl-extutils-depends/HISTORY                                   |    3 
 perl-cpan/perl-glib/DETAILS                                               |    4 
 perl-cpan/perl-glib/HISTORY                                               |    3 
 perl-cpan/perl-gtk2/DETAILS                                               |    4 
 perl-cpan/perl-gtk2/HISTORY                                               |    3 
 perl-cpan/perl-pango/DETAILS                                              |    4 
 perl-cpan/perl-pango/HISTORY                                              |    3 
 perl-cpan/perlmagick/BUILD                                                |    1 
 perl-cpan/perlmagick/DEPENDS                                              |    2 
 perl-cpan/perlmagick/DETAILS                                              |   13 
 perl-cpan/perlmagick/HISTORY                                              |    3 
 perl-cpan/text-unaccent/BUILD                                             |    1 
 perl-cpan/text-unaccent/DEPENDS                                           |    1 
 perl-cpan/text-unaccent/DETAILS                                           |   16 
 perl-cpan/text-unaccent/HISTORY                                           |    3 
 perl-cpan/xml-handler-yawriter/BUILD                                      |    1 
 perl-cpan/xml-handler-yawriter/DEPENDS                                    |    1 
 perl-cpan/xml-handler-yawriter/DETAILS                                    |   15 
 perl-cpan/xml-handler-yawriter/HISTORY                                    |    3 
 perl-cpan/xml-namespacesupport/DETAILS                                    |    6 
 perl-cpan/xml-namespacesupport/HISTORY                                    |    3 
 printer/exaro/BUILD                                                       |   24 
 printer/exaro/DEPENDS                                                     |    2 
 printer/exaro/HISTORY                                                     |    6 
 printer/exaro/PREPARE                                                     |    1 
 printer/exaro/PRE_BUILD                                                   |   12 
 printer/gutenprint/DETAILS                                                |    4 
 printer/gutenprint/HISTORY                                                |    5 
 python-pypi/kinterbasdb/HISTORY                                           |    3 
 python-pypi/kinterbasdb/PRE_BUILD                                         |    5 
 python-pypi/scons/DETAILS                                                 |    4 
 python-pypi/scons/HISTORY                                                 |    3 
 python-pypi/sqlalchemy/DETAILS                                            |    4 
 python-pypi/sqlalchemy/HISTORY                                            |    3 
 python-pypi/sqlobject/DETAILS                                             |    4 
 python-pypi/sqlobject/HISTORY                                             |    3 
 python-pypi/werkzeug/DEPENDS                                              |    1 
 python-pypi/werkzeug/DETAILS                                              |   18 
 python-pypi/werkzeug/HISTORY                                              |    2 
 ruby-raa/ruby-1.9/DETAILS                                                 |    4 
 ruby-raa/ruby-1.9/HISTORY                                                 |    3 
 shell-term-fm/eaglemode/DETAILS                                           |    4 
 shell-term-fm/eaglemode/HISTORY                                           |    3 
 smgl/linux-initramfs/HISTORY                                              |    4 
 smgl/linux-initramfs/mkinitrd                                             |   20 
 telephony/asterisk/DEPENDS                                                |   11 
 telephony/asterisk/DETAILS                                                |    2 
 telephony/asterisk/HISTORY                                                |    6 
 utils/file/DETAILS                                                        |    3 
 utils/file/HISTORY                                                        |    3 
 utils/ntp/PRE_BUILD                                                       |    2 
 utils/openmoko-dfu-util/DETAILS                                           |    8 
 utils/openmoko-dfu-util/HISTORY                                           |    3 
 utils/openmoko-dfu-util/PREPARE                                           |    2 
 utils/usbutils/DETAILS                                                    |    4 
 utils/usbutils/HISTORY                                                    |    3 
 video-libs/gst-plugins-good/DEPENDS                                       |    4 
 video-libs/gst-plugins-good/HISTORY                                       |    3 
 video/dvdrip/DETAILS                                                      |    4 
 video/dvdrip/HISTORY                                                      |    3 
 video/lxdvdrip/DETAILS                                                    |    4 
 video/lxdvdrip/HISTORY                                                    |    6 
 video/lxdvdrip/PRE_BUILD                                                  |    3 
 video/lxdvdrip/lxdvdrip-1.70-makefile.patch                               |   18 
 video/lxdvdrip/lxdvdrip-1.76-makefile.patch                               |   25 
 x11-libs/cairo/DETAILS                                                    |    4 
 x11-libs/cairo/HISTORY                                                    |    5 
 x11-libs/cairo/PRE_SUB_DEPENDS                                            |    1 
 x11-libs/cairo/SUB_DEPENDS                                                |    2 
 x11-toolkits/fltk2/DEPENDS                                                |    2 
 x11-toolkits/fltk2/HISTORY                                                |    5 
 x11-toolkits/gtk+2/DEPENDS                                                |   12 
 x11-toolkits/gtk+2/DETAILS                                                |    2 
 x11-toolkits/gtk+2/HISTORY                                                |    5 
 x11-toolkits/gtk+2/gtk+-2.21.6.tar.bz2.sig                                |binary
 x11-toolkits/gtk+3/BUILD                                                  |    3 
 x11-toolkits/gtk+3/DEPENDS                                                |   45 +
 x11-toolkits/gtk+3/DETAILS                                                |   24 
 x11-toolkits/gtk+3/HISTORY                                                |    7 
 x11-toolkits/gtk+3/INSTALL                                                |    3 
 x11-toolkits/gtk+3/PREPARE                                                |    1 
 x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig                                |binary
 x11-toolkits/wxgtk/DEPENDS                                                |    2 
 x11-toolkits/wxgtk/HISTORY                                                |    5 
 x11/merkaartor/DETAILS                                                    |    6 
 x11/merkaartor/HISTORY                                                    |    3 
 413 files changed, 1439 insertions(+), 1441 deletions(-)

New commits:
commit 5baabea0403c9d39b7442f9eb6b192bd451a35fc
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    glibc: disable stripping, so thread debugging works #15017
    
    no bump since it probably not interesting for many people

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

    libassuan 2.0.1

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

    libssh2 1.2.7

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

    gtk+3: Removed PROVIDES.  It doesn't.

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

    gtk+3: Removed un-needed PRE_SUB_DEPENDS and SUB_DEPENDS

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

    libsoup: Updated devel to version 2.31.90

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

    gtk+3: New spell for the brave.  Installs side by side with the
    devel version of gtk+2 only.  Not sure what else it does, but will
    be useful when branching off new gnome update

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

    cairo: Added sub_depends for devel version

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

    gtk+2: Updated devel to version 2.21.6.  This version splits out
    gdk-pixbuf in preparation for gtk+3. If you want to try this
    recommend dispel gtk+2 first. Requires devel version of
    gobject-introspection so may require a rebuild of atk and pango.

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

    gobject-introspection: Added sub_depends for devel version

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

    gobject-introspection: Added devel version 0.9.3.  Trying to see
    if this will fix problems with webkitgtk and others with
    gobject-introspection

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

    texlive-texmf: added queries for size and time saving

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

    Changelog: This will be for gtk+3.  Going to me a mess I think. :)

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

    gdk-pixbuf2: New spell required for devel version of gtk+2

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

    cairo: Updated devel to version 1.9.14

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

    glib2: Updated devel to version 2.25.14

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

    epiphany: Updated stable to version 2.30.3.  Added depends
    gnome-doc-utils

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

    rpm: Updated to version 5.3.2.  Fixed build errors with sqlite and
    openmp.

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

    perl-cpan/dbd-odbc: version 1.24

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

    database/dbd-sqlite: version 1.29

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

    perl-cpan/dbi: version 1.613

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

    perl-cpan/digest-md5: version 2.40

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

    perl-cpan/digest-sha: versions 5.48

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

    perl-cpan/event-rpc: version 1.01

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

    beecrypt: Added fix from lunar to allow beecrypt to work
    with rpm

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

    perl-cpan/event-execflow: version 0.64

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

    perl-cpan/event: version 1.13

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

    perl-cpan/perl-extutils-depends: version 0.302

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

    perl-cpan/file-which: version 1.09

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

    kdelibs4: remove runtime dependency on virtuoso

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

    perl-cpan/perl-glib: version 1.223

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

    perl-cpan/perl-gtk2: version 1.222

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

    perl-cpan/io-tty: version 1.08

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

    perl-cpan/ipc-run: version 0.89

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

    k3b4: updated spell to 2.0.1

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

    perl-cpan/image-exiftool: version 8.25

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

    perl-cpan/perl-pango: version 1.221

commit 67c02ec233d2a3d41f694d50f88adcd017b6291a
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    elfutils: download using forced SSLv2

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

    video/lxdvdrip: version 1.76

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

    video/dvdrip: version 0.98.11

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

    perl-cpan/compress-raw-zlib: version 2.030

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

    perl-cpan/anyevent: removed obsolete file

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

    perl-cpan/berkeleydb: version 0.43

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

    devel/perl: conflicts archive-zip

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

    devel/perl: conflicts archive-tar

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

    perl-cpan/anyevent: version 5.271

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

    perl-cpan/xml-namespacesupport: version 1.11

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

    imagemagick: Updated to version 6.6.3-7

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

    perl-cpan/image-size: version 3.221

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

    perl-cpan/image-info: version 1.30

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

    perl-cpan/html-parser: version 3.66

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

    crypto/pcsc-lite: version 1.6.4, removed obsolete options, corrected
    dependencies on hal/libusb

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

    Revert "crypto/pcsc-lite: version 1.6.4"
    
    This reverts commit df5b861a3e9c61d7a3009dc49b2467919b644437.

commit 9d0516a3a03590a2e094b4189bb6ba9342b30892
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    file: reverted hash change

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

    iconbar/DEPENDS: esmart removed

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

    erss/DEPENDS: esmart removed

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

    entrance/DEPENDS: esmart removed

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

    enscribe/DEPENDS: esmart removed

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

    embrace/DEPENDS: esmart removed

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

    elicit/DEPENDS: esmart removed

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

    elapse/DEPENDS: esmart removed

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

    econf/DEPENDS: esmart removed

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

    eclair/DEPENDS: esmart removed

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

    e_utils/DEPENDS: esmart removed

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

    e_module-wlan/DEPENDS: esmart removed

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

    e_module-winselector/DEPENDS: esmart removed

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

    e_module-weather/DEPENDS: esmart removed

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

    e_module-uptime/DEPENDS: esmart removed

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

    e_module-tiling/DEPENDS: esmart removed

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

    e_module-tclock/DEPENDS: esmart removed

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

    e_module-taskbar/DEPENDS: esmart removed

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

    e_module-snow/DEPENDS: esmart removed

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

    e_module-slideshow/DEPENDS: esmart removed

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

    e_module-screenshot/DEPENDS: esmart removed

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

    e_module-rain/DEPENDS: esmart removed

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

    e_module-places/DEPENDS: esmart removed

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

    e_module-photo/DEPENDS: esmart removed

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

    e_module-penguins/DEPENDS: esmart removed

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

    e_module-notification/DEPENDS: esmart removed

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

    e_module-news/DEPENDS: esmart removed

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

    e_module-net/DEPENDS: esmart removed

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

    e_module-mpdule/DEPENDS: esmart removed

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

    e_module-moon/DEPENDS: esmart removed

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

    e_module-mem/DEPENDS: esmart removed

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

    e_module-mail/DEPENDS: esmart removed

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

    e_module-language/DEPENDS: esmart removed

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

    e_module-iiirk/DEPENDS: esmart removed

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

    e_module-forecasts/DEPENDS: esmart removed

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

    e_module-flame/DEPENDS: esmart removed

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

    e_module-execwatch/DEPENDS: esmart removed

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

    e_module-emu/DEPENDS: esmart removed

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

    e_module-eloquence/DEPENDS: esmart removed

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

    e_module-efm_path/DEPENDS: esmart removed

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

    e_module-efm_nav/DEPENDS: esmart removed

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

    e_module-deskshow/DEPENDS: esmart removed

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

    e_module-cpu/DEPENDS: esmart removed

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

    e_module-calendar/DEPENDS: esmart removed

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

    e_module-bling/DEPENDS: esmart removed

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

    e_module-alarm/DEPENDS: esmart removed

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

    gdisk 0.6.9

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

    midori: Clean-up DEPENDS. Now depends sqlite and since webkitgtk
    depends libsoup removing that.

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

    midori: Added better description for vala.  Support better built-in
    extensions and also also writing of extensions using vala.

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

    midori: Updated to version 0.2.7.  Added optional_depends vala.
    Will provide a better description once I get info from upstream.

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

    vala: Updated to version 0.9.5

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

    crypto/pcsc-lite: version 1.6.4

commit 9c44243b9b09b06fb288f86567fffdf16f569784
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn at sourcemage.org>

    pidgin: optional support for networkmanager

commit 4b42125d891900c2ec2c3de503e7d7263509949c
Author: Finn Haedicke <finn at sourcemage.org>
Commit: Finn Haedicke <finn at sourcemage.org>

    new spell: network-manager-pptp 0.8.1
    
    network-manager plugin for PPTP VPNs

commit e5965b0f5b4bb53d74219b701f65d208e5120167
Author: Finn Haedicke <finn at sourcemage.org>
Commit: Finn Haedicke <finn at sourcemage.org>

    new spell: network-manager-applet 0.8.1
    
    a GUI applet to control network manager

commit 57125c715f33b23283a4d67f132a69af69495aec
Author: Finn Haedicke <finn at sourcemage.org>
Commit: Finn Haedicke <finn at sourcemage.org>

    new spell: network-manager 0.8.1

commit ed130ca3265b2017c4aa497fc3050b4f3fd2e3d3
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn at sourcemage.org>

    linux-initramfs: respect kernel args root= and init=

commit 35aad6523a4fac5edd0c8020bd61e0dd72e4e7d0
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn at sourcemage.org>

    linux-initramfs: use which to find lvm and cryptsetup binaries

commit e6428d5c6377fb7b5ab3335d00e5340602fb9fdb
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn at sourcemage.org>

    gst-plugins-good: optionally depends on pulseaudio

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

    qtcurve-kde4: updated spell to 1.5.2

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

    qtcurve-gtk2: updated spell to 1.5.2

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

    vim 7.3

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

    poppler 0.14.2
    
    From http://lists.freedesktop.org/archives/poppler/2010-August/006215.html
    "I've also increased the soname of libpoppler core since we added some code ..."
    
    libpoppler.so.6 -> libpoppler.so.7
    UP_TRIGGERS will need better fix, feel free to update :-)

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

    graphics/bins: new spell, a web photo album generator

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

    perl-cpan/html-clean: added patch to fix warning

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

    scons: updated spell to 1.3.1

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

    kde4-profile: added kdeartwork4, kde4-l10n, kdeplasmoids4 and kdeaccessibility4

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

    konversation4: updated spell to 1.3.1

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

    perl-cpan/gtk: force make_single in BUILD

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

    perl-cpan/xml-handler-yawriter: new spell, yet another Perl SAX XML Writer

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

    perl-cpan/text-unaccent: new spell, removes accents from strings

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

    yaboot: Updated to version 1.3.16

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

    perl-cpan/html-clean: new spell, an HTML cleanup tool

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

    eaglemode 0.79.0

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

    perl-cpan/perlmagick: new spell, ImageMagick for perl

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

    chntpw 100627

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

    filezilla 3.3.4

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

    pgpdump 0.27

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

    merkaartor:  updated spell to 0.16.2 (SOURCE_URL changes with new version)

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

    ccid 1.4.0

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

    pcsc-lite 1.6.2

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

    inkscape 0.48.0

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

    exaro - cleanup spell files

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

    usbutils 0.90

commit c3477750c5dec49edc55ae2a230f9519432e6026
Author: George Sherwood <george at beernabeer.com>
Commit: George Sherwood <george at beernabeer.com>

    imagemagick: Updated to version 6.6.3-4

commit 80d058171b6c01c36c7388d0ef9c0d305e1096eb
Author: George Sherwood <george at beernabeer.com>
Commit: George Sherwood <george at beernabeer.com>

    Revert "imagemagick: Updated to version 6.6.3-5"
    Builds on 64 bit, but not 32 bit.
    
    This reverts commit 5a8cde47d2365aa62ad2b6ba99b1b2e2e437df3d.

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

    werkzeug: new spell, wsgi utility collection

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

    imagemagick: Updated to version 6.6.3-5

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

    ardour2: bump to 2.8.11

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

    ipsec-tools: build shared libraries

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

    Revert "ipsec-tools: fixed compilation with GCC 4.4"
    
    This reverts commit 630303cf37b46b50f7778d2c65155ed711741746.
    
    missed the previous commit by myself...

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

    kinterbasdb - fix detection of firebird

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

    devel/m4: added missed header fix

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

    webkitgtk: Removed optional_depends gobject-introspection.  It is broken
    for now.

commit 2208a00084bc35aef0641d38d110345e8c4ad6cc
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.27.51

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

    linux 2.6.32.19

commit 80e869f05f16ff0ce0fc6f62ed12e8dd23908af6
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.34.4

commit 41907b527a8eaf6a3417447defc700f0b834eac7
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.35.2

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

    graphics/xaralx: added fix for libpng 1.4, patch is bzipped and appliable to stable too

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

    firefox: Updated devel to version 4.0b3

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

    x11-toolkits/wxgtk: optional_depends on mesalib instead of OPENGL

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

    graphics-libs/libcaca: optional_depends on mesalib instead of OPENGL

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

    x11-toolkits/fltk2: optional_depends on mesalib instead of OPENGL

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

    ipsec-tools: fixed compilation with GCC 4.4

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

    lighttpd: => 1.4.27

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

    sqlobject: => 0.13.0

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

    clamav: => 0.96.2

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

    sqlalchemy: => 0.6.3

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

    clutter-gtk 0.10.6

commit ff1e9685c552174cdbd784b09f65ef4002e11e33
Author: Martin Spitzbarth <m.spitzbarth at gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth at gmx.de>

    asterisk: Updated to 1.6.2.11

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

    gtkhtml2 3.30.3

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

    utils/openmoko-dfu-util: corrected SOURCE_URL and WEB_SITE

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

    udev 161

commit 28bfe0094f575a91f6312959d2432830ef082677
Author: David Haley <khoralin at gmail.com>
Commit: David Haley <khoralin at gmail.com>

    last line contained '&&' causing casting of ntp spellto fail with an 'unexpected EOF' error. After extra '&&' was removed the spell cast and installed
    without a problem.

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

    curl 7.21.1

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

    devicekit: changed to release version as cgit version no longer works

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

    gnomint 1.2.1

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

    cone: update to 0.84

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

    alpine: removed chappa patches, creates a legally questionable binary

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

    gutenprint: => 5.2.6

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

    ruby-1.9: => 1.9.1-p429

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

    ntfs-3g: => 2010.8.8

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

    libvirtd: Updated to 0.8.3

diff --git a/ChangeLog b/ChangeLog
index a34ab7d..14c7c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* gnome2-libs/gdk-pixbuf2: new spell for devel gtk+3
+	* x11-toolkits/gtk+3: new spell with latest gtk toolkit
+
+2010-08-16 Finn Haedicke <finn at sourcemage.org>
+	* net/network-manager: new spell, network connection daemon
+	* net/network-manager-applet: new spell, gui applet for
+	  network-manager
+	* net/network-manager-pptp: new spell, PPTP VPN plugin for
+	  network-manager
+
+2010-08-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* graphics/bins: new spell, a web photo album generator
+
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* perl-cpan/perlmagick: new spell, ImageMagick for perl
+	* perl-cpan/html-clean: new spell, an HTML cleanup tool
+	* perl-cpan/text-unaccent: new spell, remove accents from a string
+	* perl-cpan/xml-handler-yawriter: new spell, yet another Perl SAX XML Writer
+
+2010-08-15 Vlad Glagolev <stealth at sourcemage.org>
+	* python-pypi/werkzeug: new spell, wsgi utility collection
+
 2010-08-10 Ladislav Hagara <hgr at vabo.cz>
 	* net/wgetpaste: new spell
 	  script that automates pasting to a number of pastebin services
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index cd4e63b..7cf7483 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
             SPELL=clamav
-          VERSION=0.96.1
+          VERSION=0.96.2
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SPELL-$VERSION.tar.gz.sig
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index d09d5c1..3dbd1b6 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.96.2
+
 2010-06-13 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: added SOURCE2_IGNORE for signature
 
diff --git a/archive/rpm/BUILD b/archive/rpm/BUILD
index e832571..c8da141 100755
--- a/archive/rpm/BUILD
+++ b/archive/rpm/BUILD
@@ -1,5 +1,6 @@
 WITH_DB_SUBDIR=/usr/lib  &&
 export LDFLAGS=${LDFLAGS/-z combreloc/} &&
 OPTS="$OPTS $RPM_API $RPM_SELINUX --with-libintl-prefix=/usr"      &&
+OPTS="$OPTS --with-sqlite=external --disable-openmp"
 #export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python| cut -c 1-3)" &&
 default_build
diff --git a/archive/rpm/DETAILS b/archive/rpm/DETAILS
index 73c5ca7..55ca85d 100755
--- a/archive/rpm/DETAILS
+++ b/archive/rpm/DETAILS
@@ -1,10 +1,10 @@
            SPELL=rpm
-         VERSION=5.1.9
+         VERSION=5.3.2
 #     SOURCE_HASH=sha512:5f539fd5f5330b4e0ec21673320e53cdb6bb8231020ca0e8e7f52d15e36f3a70f398392721891461d13012f4028785eb7182f0460f32a53109d33b2006d0853d
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://rpm5.org/files/rpm/rpm-5.1/$SOURCE
+   SOURCE_URL[0]=http://rpm5.org/files/rpm/rpm-5.3/$SOURCE
         WEB_SITE=http://rpm5.org/
          ENTERED=20030123
       LICENSE[0]=GPL
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index a329840..fcb6c14 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,3 +1,7 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 5.3.2. Fixed SOURCE_URL[0]
+	* BUILD: Added options to sqlite and openmp fix build errors
+
 2009-05-29 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Depends on any provider of LIBELF
 
diff --git a/archive/rpm/rpm-5.1.9.tar.gz.sig b/archive/rpm/rpm-5.1.9.tar.gz.sig
deleted file mode 100644
index f95163c..0000000
Binary files a/archive/rpm/rpm-5.1.9.tar.gz.sig and /dev/null differ
diff --git a/archive/rpm/rpm-5.3.2.tar.gz.sig b/archive/rpm/rpm-5.3.2.tar.gz.sig
new file mode 100644
index 0000000..51aa9d2
Binary files /dev/null and b/archive/rpm/rpm-5.3.2.tar.gz.sig differ
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 0eb446d..78aaa28 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ardour2
-         VERSION=2.8.10
-     SOURCE_HASH=sha512:c3a13e6e0458fe21a32b66dcce48ada1844975a070975b3fb0bf5869d8aa53b1b5dc118f6030996532cea3014767b2af6257806f1bb5bc10e5a9108117c248bb
+         VERSION=2.8.11
+     SOURCE_HASH=sha512:0415ab25e3b09e7b9a204d02ebd4417868c4ab24c784a77880ca8806a422cf450f64ff4089cda4ccca41b15c38d3263d8f39a0421d58a62581da9cb3859cfa07
           SOURCE=ardour-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
 # that does not work anymore... they want to force manual downloads:-(
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 63e0cb1..0e1996f 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-12 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: updated spell to 2.8.11
+
 2010-06-22 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: updated spell to 2.8.10
 
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index b0720f5..7a7daaf 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -1,7 +1,6 @@
 ### had to cook up some pkg-config files for nss and nspr 
 CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
 export PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr" &&
-OPTS="--disable-nm $OPTS" &&
 make_single          &&
 default_build        &&
 make_normal          &&
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index 8c06b9a..fafbc95 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -102,6 +102,11 @@ optional_depends  meanwhile                                        \
                   '--disable-meanwhile'                            \
                   'for Lotus Instant Messenger/Sametime protocol'  &&
 
+optional_depends  network-manager                \
+                  '--enable-nm'                  \
+                  '--disable-nm'                 \
+                  'for NetworkManager support'  &&
+
 optional_depends  gettext                        \
                   '--enable-nls'                 \
                   '--disable-nls'                \
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index a4bfc37..5180b4d 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Finn Haedicke <finn at sourcemage.org>
+	* BUILD,DEPENDS: optionally depends on network-manager
+
 2010-08-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.7.3
 
diff --git a/crypto/beecrypt/BUILD b/crypto/beecrypt/BUILD
index 9e3ea26..093e312 100755
--- a/crypto/beecrypt/BUILD
+++ b/crypto/beecrypt/BUILD
@@ -12,4 +12,8 @@ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]] ; then
   export CFLAGS=${CFLAGS/-march=em64t/-march=i686}
 fi  &&
 
+# Fix from lunar that allows beecrypt to work with rpm
+OPTS="$OPTS --disable-openmp" &&
+
+
 default_build
diff --git a/crypto/beecrypt/HISTORY b/crypto/beecrypt/HISTORY
index ed5c9cf..ff9df40 100644
--- a/crypto/beecrypt/HISTORY
+++ b/crypto/beecrypt/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Added fix from lunar to allow rpm to find beecrypt
+
 2009-09-10 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Fix Bug #15293
 	  Fix from http://foo-projects.org/git/?p=lunar/moonbase.git;a=blob;f=crypto/beecrypt/BUILD
diff --git a/crypto/ccid/DETAILS b/crypto/ccid/DETAILS
index cb431ff..2aad884 100755
--- a/crypto/ccid/DETAILS
+++ b/crypto/ccid/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ccid
-         VERSION=1.3.13
-     SOURCE_HASH=sha512:ef29cbab7cb27ac5f14b8fef7fc5a7fbffa2e9c0e3c527a8fb21c19b5cf5fff57b89a4279ff6b68b71586483ebc7a51d1ed2311f6dce677202ee049541749109
+         VERSION=1.4.0
+     SOURCE_HASH=sha512:088591a3e782c613a41b33dc0ff5c2bd1e92cf209c1a9d8e23e8f1ace86aa0524bdc245688df3ffbb06cfae487ea3966741a6a7a694a92f3c30a40f233104503
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3300/$SOURCE
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3333/$SOURCE
         WEB_SITE=http://pcsclite.alioth.debian.org/ccid.html
       LICENSE[0]=LGPL
          ENTERED=20070123
diff --git a/crypto/ccid/HISTORY b/crypto/ccid/HISTORY
index 62c01ce..2668c5f 100644
--- a/crypto/ccid/HISTORY
+++ b/crypto/ccid/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.0
+
 2010-06-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.3.13
 
diff --git a/crypto/chntpw/DETAILS b/crypto/chntpw/DETAILS
index a070e90..3fcd62b 100755
--- a/crypto/chntpw/DETAILS
+++ b/crypto/chntpw/DETAILS
@@ -1,10 +1,10 @@
            SPELL=chntpw
-         VERSION=080526
+         VERSION=100627
           SOURCE=$SPELL-source-$VERSION.zip
-   SOURCE_URL[0]=http://home.eunet.no/pnordahl/ntpasswd/$SOURCE
-     SOURCE_HASH=sha512:8928f9fa538d9d4f5f5bdc915f9c61cd9e71b5c6df4c23ef8274d37a9690f62e22fbf925214bd602f8a032145a8e4543c3e90e74013a61c740ae55c9173c09e5
+   SOURCE_URL[0]=http://pogostick.net/~pnh/ntpasswd/$SOURCE
+     SOURCE_HASH=sha512:43a6dda2da0ddcde59590d169a685e9f0191415d17088a6fea24d3cfa71307fd440041157702aa018aaace2bbf0b80b564ba2c1ec7427708e01b2a6676d6b63c
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://home.eunet.no/pnordahl/ntpasswd/
+        WEB_SITE=http://pogostick.net/~pnh/ntpasswd/
       LICENSE[0]=GPL
          ENTERED=20080503
            SHORT="an offline NT/2k/XP/Vista password recovery & registry editor"
diff --git a/crypto/chntpw/HISTORY b/crypto/chntpw/HISTORY
index f7b6e27..cdd5710 100644
--- a/crypto/chntpw/HISTORY
+++ b/crypto/chntpw/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 100627, new WEB_SITE and SOURCE_URL[0]
+
 2008-06-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 080526
 	* INSTALL: added reged (new tool)
diff --git a/crypto/gnomint/DETAILS b/crypto/gnomint/DETAILS
index 9e4796d..9159a9c 100755
--- a/crypto/gnomint/DETAILS
+++ b/crypto/gnomint/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gnomint
-         VERSION=1.2.0
+         VERSION=1.2.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:b840e182ed190094042385ecae8917002370aa7fbef0040768b70f53528c6778ea75f1dfd1709ffcd5ce7e4700be859e2803e8b5fbd790b060e1f89c22ad92e7
+     SOURCE_HASH=sha512:7f286d92aaa00a8b340f785a21ed3ff322304b8f97b898585814588bc81c968140b7270e1d2c8c3a091b6555d148f63b1cac14de72be336911c00eeb33283a94
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://gnomint.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/crypto/gnomint/HISTORY b/crypto/gnomint/HISTORY
index cdf7ea2..6d8ac1c 100644
--- a/crypto/gnomint/HISTORY
+++ b/crypto/gnomint/HISTORY
@@ -1,5 +1,5 @@
 2010-08-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.2.0
+	* DETAILS: 1.2.0, 1.2.1
 	* DEPENDS: removed libgnomeui
 
 2009-06-03 Ladislav Hagara <hgr at vabo.cz>
diff --git a/crypto/libassuan/DETAILS b/crypto/libassuan/DETAILS
index 446b1fe..58099ca 100755
--- a/crypto/libassuan/DETAILS
+++ b/crypto/libassuan/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libassuan
-         VERSION=2.0.0
+         VERSION=2.0.1
 
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libassuan/$SOURCE
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index cf4755e..40e7558 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.1
+
 2010-03-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.0
 
diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index 200547e..c72aa55 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libssh2
-         VERSION=1.2.6
+         VERSION=1.2.7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.libssh2.org/download/$SOURCE
-     SOURCE_HASH=sha512:c2797f50b72814b6e44835822a08a6c2fe52e90f260a62ab4cccb18098de63013af516a53dbbd25c1eb7d5be37e0b3bf26d582af974e01e4d1e2a843bce5105a
+     SOURCE_HASH=sha512:dcb152f6f82289b89df08b94b56ac3e6632fd3a8063698bb939ef4c67114e684c130a70e48084c06f0fb37924de10ba475b1ca18baa37b0012d213fb0cbb4d16
       LICENSE[0]=BSD
         WEB_SITE=http://www.libssh2.org/
          ENTERED=20070130
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 19e9583..048c5ec 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.7
+
 2010-06-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.6
 
diff --git a/crypto/pcsc-lite/BUILD b/crypto/pcsc-lite/BUILD
index 2955b44..c6fb978 100755
--- a/crypto/pcsc-lite/BUILD
+++ b/crypto/pcsc-lite/BUILD
@@ -1,9 +1,9 @@
-OPTS="$PCSC_MUSCLE                                  \
-      $PCSC_EXADPU                                  \
-      --enable-confdir=$INSTALL_ROOT/etc/pcsc-lite  \
-      --enable-ipcdir=/var/run/ipc                  \
-      --enable-runpid=/var/run                      \
-      $OPTS"                                        &&
+if [[ $PCSC_DEVICE_ACCESS != hal ]]; then
+  OPTS="--disable-libhal $OPTS"
+fi &&
+if [[ $PCSC_DEVICE_ACCESS != libusb ]]; then
+  OPTS="--disable-libusb $OPTS"
+fi &&
 
 make_single    &&
 default_build  &&
diff --git a/crypto/pcsc-lite/CONFIGURE b/crypto/pcsc-lite/CONFIGURE
index 0dd7deb..f6c7ac4 100755
--- a/crypto/pcsc-lite/CONFIGURE
+++ b/crypto/pcsc-lite/CONFIGURE
@@ -1,2 +1 @@
-config_query_option PCSC_MUSCLE "Enable MUSCLE support?" y "--enable-muscledropdir=/usr/lib/pcsc-lite/services" &&
-config_query_option PCSC_EXAPDU "Enable extended APDU support?" n "--enable-extendedapdu"
+config_query_list PCSC_DEVICE_ACCESS "which library do you want to use to access devices?" none libusb hal
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index b7abdd1..7b06d25 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,6 +1,6 @@
 depends g++ &&
-depends libusb &&
-
-optional_depends hal \
-                 "" "--disable-libhal" \
-                 "for HAL support"
+if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
+  depends libusb "--enable-libusb"
+elif [[ $PCSC_DEVICE_ACCESS == hal ]]; then
+  depends hal "--enable-libhal"
+fi
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index bd68a68..aead4f4 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pcsc-lite
-         VERSION=1.6.1
-     SOURCE_HASH=sha512:418065716112b8d87150a72f3aae585d1abb7bb33cd6c1b306d5f98fa08d6ab7cfa662fafb99e518805182dbe63b8c963b429743520a5491b47a9506a0688e7b
+         VERSION=1.6.4
+     SOURCE_HASH=sha512:4f6aaab1fbd1652a8dc84c151ef7d4568c076c2090b4a6059b9362940a8da7a6e50421a0cfb3ff6b2383733385e63686d95884ba4b9ad28f4cbcab2cfac29210
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3298/$SOURCE
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3337/$SOURCE
         WEB_SITE=http://pcsclite.alioth.debian.org/
       LICENSE[0]=BSD
          ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 5717ccc..c3ffdba 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,11 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.6.4
+	* BUILD, DEPENDS, CONFIGURE: removed obsolete options,
+	  made dependency on libusb or hal mutually exclusive
+
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.2
+
 2010-06-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.6.1
 
diff --git a/crypto/pgpdump/DETAILS b/crypto/pgpdump/DETAILS
index a4eccb8..71fdf3b 100755
--- a/crypto/pgpdump/DETAILS
+++ b/crypto/pgpdump/DETAILS
@@ -1,11 +1,11 @@
            SPELL=pgpdump
-         VERSION=0.26
+         VERSION=0.27
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.mew.org/~kazu/proj/pgpdump/$SOURCE
         WEB_SITE=http://www.mew.org/~kazu/proj/pgpdump/
          ENTERED=20050818
-     SOURCE_HASH=sha512:a0c76e68f02ad5d151d998045ed1c4dea376c9079ba6e97c6cee82b2fb5f6512777eb37ba334de0291e91204cf5519fb2eeafc0ca96e7014d9ba21752cc2c7ac
+     SOURCE_HASH=sha512:f4eab4398789696dc356219a97615ac3b0ac7e9d9d7568b58582f8bef7f964c6eed66e60e8ce5a96f5d99912230728bda2462b1d436b9bd7ea1a346d534246e4
         KEYWORDS="crypto"
            SHORT="PGP packet visualizer"
 cat << EOF
diff --git a/crypto/pgpdump/HISTORY b/crypto/pgpdump/HISTORY
index ffdf539..a484e97 100644
--- a/crypto/pgpdump/HISTORY
+++ b/crypto/pgpdump/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.27
+
 2007-09-20 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.26, new WEB_SITE and SOURCE_URL
 
diff --git a/database/dbd-sqlite/DETAILS b/database/dbd-sqlite/DETAILS
index 55cbd6e..2b0e650 100755
--- a/database/dbd-sqlite/DETAILS
+++ b/database/dbd-sqlite/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbd-sqlite
-         VERSION=1.25
-     SOURCE_HASH=sha512:e31b4ed226c0fc985dbbaee91b2b4721d877cccf5535e842c39df10a75cda340a9171393b747e488579241a7343bf98b93b6b5190ad56ae7cd4e44dfa2fcd95a
+         VERSION=1.29
+     SOURCE_HASH=sha512:db9f3e1d1304cf6bb54208c03f68607235ff71b3464d1ecfe9bca67abf88a417b90646b89c40de5720dc70de168f8d3729400003ae101676f509c8af6e50c4cf
           SOURCE=DBD-SQLite-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBD-SQLite-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/modules/by-module/DBD/$SOURCE
diff --git a/database/dbd-sqlite/HISTORY b/database/dbd-sqlite/HISTORY
index 6f15c91..2678397 100644
--- a/database/dbd-sqlite/HISTORY
+++ b/database/dbd-sqlite/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.29
+
 2009-06-10  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.25
 
diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY
index ea46272..92b8aa3 100644
--- a/devel/m4/HISTORY
+++ b/devel/m4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: added missed header fix
+
 2010-02-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.14, SECURITY_PATCH=2
 
diff --git a/devel/m4/PRE_BUILD b/devel/m4/PRE_BUILD
new file mode 100755
index 0000000..b7e085e
--- /dev/null
+++ b/devel/m4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
+
+sed -i '/#include "m4.h"/i#include <sys/stat.h>' src/path.c
diff --git a/devel/perl/CONFLICTS b/devel/perl/CONFLICTS
index dfc9254..ded792b 100755
--- a/devel/perl/CONFLICTS
+++ b/devel/perl/CONFLICTS
@@ -1 +1,3 @@
-conflicts module-build y
+conflicts module-build y &&
+conflicts archive-tar    &&
+conflicts archive-zip
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index 8b544aa..c07edbe 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,7 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* CONFLICTS: conflicts archive-tar, archive-zip since these modules
+	  are part of perl 5.12
+
 2010-05-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.12.1
 
diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 18e786d..5ace7a5 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,6 +1,6 @@
            SPELL=vala
-         VERSION=0.8.1
-     SOURCE_HASH=sha512:b171d2b72897a909fa0f33d50463af3815dd98606bb9eebae0f6a84d11af1ed51ba3fafe56fe2b8542f75717ff9ef9876f708dc2fd45fe3f12cbc7e683463b25
+         VERSION=0.9.5
+     SOURCE_HASH=sha512:0f5b4017bbb46938b61f4f784ca4efbe85f797ff62e157932264ad36f896b5d32d04a16e8b732cb3526d1cdab76e297f3127b6ac37f351f28b2befb78e1399c9
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 5fe112c..ee01bc8 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.9.5
+
 2010-04-21 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 0.8.1
 
diff --git a/disk/gdisk/DETAILS b/disk/gdisk/DETAILS
index 47c148c..1e987a5 100755
--- a/disk/gdisk/DETAILS
+++ b/disk/gdisk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gdisk
-         VERSION=0.6.8
+         VERSION=0.6.9
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.rodsbooks.com/gdisk/$SOURCE
-     SOURCE_HASH=sha512:696fa282cbfb53f59b1664c3f611913254ce8b36c3ec62a673286a705df0aadaeeeecc22a6a7e86e2cce7c298a7168dbff443c377f438132202cca7abdffb931
+     SOURCE_HASH=sha512:1ecbf83fd2907959d1e130399603c9ac039744cd3ff975ebe57ea51f92c0a45c023a09ac4833464467cf38249084bfb3bbc221e26f8e5e5f5e18dfc5e4df9580
         WEB_SITE=http://www.rodsbooks.com/gdisk/
          ENTERED=20091207
       LICENSE[0]=GPL
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index 6b95090..5b0a972 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,7 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.6.9
+	* INSTALL: sgdisk and sgdisk.8 added
+
 2010-06-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.6.8
 
diff --git a/disk/gdisk/INSTALL b/disk/gdisk/INSTALL
index fc416b8..a06399f 100755
--- a/disk/gdisk/INSTALL
+++ b/disk/gdisk/INSTALL
@@ -1,2 +1,5 @@
 install -vm 755 gdisk ${INSTALL_ROOT}/sbin &&
-install -vm 644 gdisk.8 ${INSTALL_ROOT}/usr/share/man/man8
+install -vm 644 gdisk.8 ${INSTALL_ROOT}/usr/share/man/man8 &&
+
+install -vm 755 sgdisk ${INSTALL_ROOT}/sbin &&
+install -vm 644 sgdisk.8 ${INSTALL_ROOT}/usr/share/man/man8
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index d6388e0..772af99 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ntfs-3g
-         VERSION=2010.5.22
-     SOURCE_HASH=sha512:6b0abab8050bcb53cfc99f7e0263fac897c226d05ceae10d9eb3293b7b84141653f3660f33b2e69b2ccb058e90aecf9322ebede75b39105576fddb5199b441ff
+         VERSION=2010.8.8
+     SOURCE_HASH=sha512:e29e9ed0d0512f2a6c487b8f426a32498d1b238601ec1949c212a567175a0f1614886ab4759e54cc4c0592ef81e332e3f285e014e390abad805a80e125e9725f
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.tuxera.com
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index dc4fb23..ebf9fb9 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2010-08-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2010.8.8
+
 2010-06-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2010.5.22
 
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index f669fec..61d6d47 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
            SPELL=udev
-         VERSION=160
+         VERSION=161
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 392e5b7..31872b9 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2010-08-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 161
+
 2010-07-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 160
 
diff --git a/disk/yaboot/DETAILS b/disk/yaboot/DETAILS
index 8077ab3..d4dcf7a 100755
--- a/disk/yaboot/DETAILS
+++ b/disk/yaboot/DETAILS
@@ -1,9 +1,9 @@
            SPELL=yaboot
-         VERSION=1.3.14
+         VERSION=1.3.16
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://yaboot.ozlabs.org/releases/$SOURCE
-  SOURCE_HASH[0]=sha512:7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
+     SOURCE_HASH=sha512:9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
         WEB_SITE=http://yaboot.ozlabs.org/
          ENTERED=20020307
           UPDATE=20050127
diff --git a/disk/yaboot/HISTORY b/disk/yaboot/HISTORY
index e5e6cf4..55f2d24 100644
--- a/disk/yaboot/HISTORY
+++ b/disk/yaboot/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.16
+
 2008-07-16 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* FINAL: Fixed syntax: `&&' before `fi' is an error
 
diff --git a/e-17/e_module-alarm/DEPENDS b/e-17/e_module-alarm/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-alarm/DEPENDS
+++ b/e-17/e_module-alarm/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-alarm/HISTORY b/e-17/e_module-alarm/HISTORY
index 2f33e3c..c029d01 100644
--- a/e-17/e_module-alarm/HISTORY
+++ b/e-17/e_module-alarm/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-bling/DEPENDS b/e-17/e_module-bling/DEPENDS
index a3bc622..9fbc079 100755
--- a/e-17/e_module-bling/DEPENDS
+++ b/e-17/e_module-bling/DEPENDS
@@ -2,7 +2,6 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas     &&
 depends  libxdamage &&
 depends  subversion
diff --git a/e-17/e_module-bling/HISTORY b/e-17/e_module-bling/HISTORY
index dc075be..1797ab9 100644
--- a/e-17/e_module-bling/HISTORY
+++ b/e-17/e_module-bling/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-10-20 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Remove bling.econfig.patch
 	* bling.econfig.patch: Removed, applied upstream
diff --git a/e-17/e_module-calendar/DEPENDS b/e-17/e_module-calendar/DEPENDS
index 9b2931c..c408f5c 100755
--- a/e-17/e_module-calendar/DEPENDS
+++ b/e-17/e_module-calendar/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-calendar/HISTORY b/e-17/e_module-calendar/HISTORY
index 47267ea..62d83b1 100644
--- a/e-17/e_module-calendar/HISTORY
+++ b/e-17/e_module-calendar/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-cpu/DEPENDS b/e-17/e_module-cpu/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-cpu/DEPENDS
+++ b/e-17/e_module-cpu/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-cpu/HISTORY b/e-17/e_module-cpu/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-cpu/HISTORY
+++ b/e-17/e_module-cpu/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-deskshow/DEPENDS b/e-17/e_module-deskshow/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-deskshow/DEPENDS
+++ b/e-17/e_module-deskshow/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-deskshow/HISTORY b/e-17/e_module-deskshow/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-deskshow/HISTORY
+++ b/e-17/e_module-deskshow/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-efm_nav/DEPENDS b/e-17/e_module-efm_nav/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-efm_nav/DEPENDS
+++ b/e-17/e_module-efm_nav/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-efm_nav/HISTORY b/e-17/e_module-efm_nav/HISTORY
index 7345125..b235285 100644
--- a/e-17/e_module-efm_nav/HISTORY
+++ b/e-17/e_module-efm_nav/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-efm_path/DEPENDS b/e-17/e_module-efm_path/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-efm_path/DEPENDS
+++ b/e-17/e_module-efm_path/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-efm_path/HISTORY b/e-17/e_module-efm_path/HISTORY
index a3c55b6..b36e250 100644
--- a/e-17/e_module-efm_path/HISTORY
+++ b/e-17/e_module-efm_path/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-eloquence/DEPENDS b/e-17/e_module-eloquence/DEPENDS
index fe162ed..bfac739 100755
--- a/e-17/e_module-eloquence/DEPENDS
+++ b/e-17/e_module-eloquence/DEPENDS
@@ -9,5 +9,4 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas
diff --git a/e-17/e_module-eloquence/HISTORY b/e-17/e_module-eloquence/HISTORY
index 8302e2b..dc849bd 100644
--- a/e-17/e_module-eloquence/HISTORY
+++ b/e-17/e_module-eloquence/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-02-27 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: E17 modules should not use --prefix in default_build, use
 	  default_build_e17_module instead
diff --git a/e-17/e_module-emu/DEPENDS b/e-17/e_module-emu/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-emu/DEPENDS
+++ b/e-17/e_module-emu/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-emu/HISTORY b/e-17/e_module-emu/HISTORY
index b5dc826..f2a1314 100644
--- a/e-17/e_module-emu/HISTORY
+++ b/e-17/e_module-emu/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-execwatch/DEPENDS b/e-17/e_module-execwatch/DEPENDS
index 0a7abe3..944ccc1 100755
--- a/e-17/e_module-execwatch/DEPENDS
+++ b/e-17/e_module-execwatch/DEPENDS
@@ -2,6 +2,5 @@ depends  e17     &&
 depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-execwatch/HISTORY b/e-17/e_module-execwatch/HISTORY
index 9a15baf..7befbc0 100644
--- a/e-17/e_module-execwatch/HISTORY
+++ b/e-17/e_module-execwatch/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-flame/DEPENDS b/e-17/e_module-flame/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-flame/DEPENDS
+++ b/e-17/e_module-flame/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-flame/HISTORY b/e-17/e_module-flame/HISTORY
index b5dc826..f2a1314 100644
--- a/e-17/e_module-flame/HISTORY
+++ b/e-17/e_module-flame/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-forecasts/DEPENDS b/e-17/e_module-forecasts/DEPENDS
index 0a7abe3..944ccc1 100755
--- a/e-17/e_module-forecasts/DEPENDS
+++ b/e-17/e_module-forecasts/DEPENDS
@@ -2,6 +2,5 @@ depends  e17     &&
 depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-forecasts/HISTORY b/e-17/e_module-forecasts/HISTORY
index 1372eaf..9332e12 100644
--- a/e-17/e_module-forecasts/HISTORY
+++ b/e-17/e_module-forecasts/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-iiirk/DEPENDS b/e-17/e_module-iiirk/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-iiirk/DEPENDS
+++ b/e-17/e_module-iiirk/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-iiirk/HISTORY b/e-17/e_module-iiirk/HISTORY
index 42de54b..22d723f 100644
--- a/e-17/e_module-iiirk/HISTORY
+++ b/e-17/e_module-iiirk/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-language/DEPENDS b/e-17/e_module-language/DEPENDS
index 717359a..16ea7aa 100755
--- a/e-17/e_module-language/DEPENDS
+++ b/e-17/e_module-language/DEPENDS
@@ -2,7 +2,6 @@ depends  ecore       &&
 depends  edje        &&
 depends  eet         &&
 depends  e17         &&
-depends  esmart      &&
 depends  evas        &&
 depends  libxml2     &&
 depends  subversion
diff --git a/e-17/e_module-language/HISTORY b/e-17/e_module-language/HISTORY
index b600662..e65957e 100644
--- a/e-17/e_module-language/HISTORY
+++ b/e-17/e_module-language/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-25-03 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcmage.org>
 	* DEPENDS: Changin dep from exml to libxml2
 
diff --git a/e-17/e_module-mail/DEPENDS b/e-17/e_module-mail/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-mail/DEPENDS
+++ b/e-17/e_module-mail/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-mail/HISTORY b/e-17/e_module-mail/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-mail/HISTORY
+++ b/e-17/e_module-mail/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-mem/DEPENDS b/e-17/e_module-mem/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-mem/DEPENDS
+++ b/e-17/e_module-mem/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-mem/HISTORY b/e-17/e_module-mem/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-mem/HISTORY
+++ b/e-17/e_module-mem/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-moon/DEPENDS b/e-17/e_module-moon/DEPENDS
index 9b2931c..c408f5c 100755
--- a/e-17/e_module-moon/DEPENDS
+++ b/e-17/e_module-moon/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-moon/HISTORY b/e-17/e_module-moon/HISTORY
index c57b694..793fcf7 100644
--- a/e-17/e_module-moon/HISTORY
+++ b/e-17/e_module-moon/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-06-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: tarballs don't use svn (get-e.org is closed but sources 
 	  are on fall-back mirror)
diff --git a/e-17/e_module-mpdule/DEPENDS b/e-17/e_module-mpdule/DEPENDS
index 3952b44..17a2469 100755
--- a/e-17/e_module-mpdule/DEPENDS
+++ b/e-17/e_module-mpdule/DEPENDS
@@ -2,7 +2,6 @@ depends  e17     &&
 depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
-depends  esmart  &&
 depends  evas    &&
 depends  libmpd &&
 depends  subversion
diff --git a/e-17/e_module-mpdule/HISTORY b/e-17/e_module-mpdule/HISTORY
index ed9dea7..fcd4606 100644
--- a/e-17/e_module-mpdule/HISTORY
+++ b/e-17/e_module-mpdule/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-net/DEPENDS b/e-17/e_module-net/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-net/DEPENDS
+++ b/e-17/e_module-net/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-net/HISTORY b/e-17/e_module-net/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-net/HISTORY
+++ b/e-17/e_module-net/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-news/DEPENDS b/e-17/e_module-news/DEPENDS
index 47f0ec3..f473867 100755
--- a/e-17/e_module-news/DEPENDS
+++ b/e-17/e_module-news/DEPENDS
@@ -1,6 +1,5 @@
 depends  ecore     &&
 depends  evas      &&
-depends  esmart    &&
 depends  edje      &&
 depends  eet       &&
 depends  e17       &&
diff --git a/e-17/e_module-news/HISTORY b/e-17/e_module-news/HISTORY
index 7739ef9..7d6441c 100644
--- a/e-17/e_module-news/HISTORY
+++ b/e-17/e_module-news/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-notification/DEPENDS b/e-17/e_module-notification/DEPENDS
index 4f54137..f206d13 100755
--- a/e-17/e_module-notification/DEPENDS
+++ b/e-17/e_module-notification/DEPENDS
@@ -3,6 +3,5 @@ depends  e17     &&
 depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-notification/HISTORY b/e-17/e_module-notification/HISTORY
index 0689d2f..120874b 100644
--- a/e-17/e_module-notification/HISTORY
+++ b/e-17/e_module-notification/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-penguins/DEPENDS b/e-17/e_module-penguins/DEPENDS
index 0afe30e..12ca85f 100755
--- a/e-17/e_module-penguins/DEPENDS
+++ b/e-17/e_module-penguins/DEPENDS
@@ -3,5 +3,4 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas
diff --git a/e-17/e_module-penguins/HISTORY b/e-17/e_module-penguins/HISTORY
index bd2a054..acaf930 100644
--- a/e-17/e_module-penguins/HISTORY
+++ b/e-17/e_module-penguins/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Ladislav Hagara <hgr at vabo.cz>
 	* *: cvs -> svn (subversion)
 
diff --git a/e-17/e_module-photo/DEPENDS b/e-17/e_module-photo/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-photo/DEPENDS
+++ b/e-17/e_module-photo/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-photo/HISTORY b/e-17/e_module-photo/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-photo/HISTORY
+++ b/e-17/e_module-photo/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-places/DEPENDS b/e-17/e_module-places/DEPENDS
index c0ef0b9..0c70831 100755
--- a/e-17/e_module-places/DEPENDS
+++ b/e-17/e_module-places/DEPENDS
@@ -3,6 +3,5 @@ depends  e_dbus      &&
 depends  ecore       &&
 depends  edje        &&
 depends  eet         &&
-depends  esmart      &&
 depends  evas        &&
 depends  subversion
diff --git a/e-17/e_module-places/HISTORY b/e-17/e_module-places/HISTORY
index 5b9da76..043bd75 100644
--- a/e-17/e_module-places/HISTORY
+++ b/e-17/e_module-places/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2009-05-16 Eric Sandall <sandalle at sourcemage.org>
 	* PREPARE, DETAILS, DEPENDS, PRE_BUILD: Created
 
diff --git a/e-17/e_module-rain/DEPENDS b/e-17/e_module-rain/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-rain/DEPENDS
+++ b/e-17/e_module-rain/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-rain/HISTORY b/e-17/e_module-rain/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-rain/HISTORY
+++ b/e-17/e_module-rain/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-screenshot/DEPENDS b/e-17/e_module-screenshot/DEPENDS
index ddd9664..c1431ce 100755
--- a/e-17/e_module-screenshot/DEPENDS
+++ b/e-17/e_module-screenshot/DEPENDS
@@ -2,7 +2,6 @@ depends  e17      &&
 depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
-depends  esmart   &&
 depends  evas     &&
 
 if  [[  "$E_MODULE_SCREENSHOT_CVS" == "y" ]]
diff --git a/e-17/e_module-screenshot/HISTORY b/e-17/e_module-screenshot/HISTORY
index d4d154f..db8ce65 100644
--- a/e-17/e_module-screenshot/HISTORY
+++ b/e-17/e_module-screenshot/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-06-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: tarballs don't use svn (get-e.org is closed but sources 
 	  are on fall-back mirror)
diff --git a/e-17/e_module-slideshow/DEPENDS b/e-17/e_module-slideshow/DEPENDS
index 9b2931c..c408f5c 100755
--- a/e-17/e_module-slideshow/DEPENDS
+++ b/e-17/e_module-slideshow/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-slideshow/HISTORY b/e-17/e_module-slideshow/HISTORY
index 4d81e75..bf9af05 100644
--- a/e-17/e_module-slideshow/HISTORY
+++ b/e-17/e_module-slideshow/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-06-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: tarballs don't use svn (get-e.org is closed but sources 
 	  are on fall-back mirror)
diff --git a/e-17/e_module-snow/DEPENDS b/e-17/e_module-snow/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-snow/DEPENDS
+++ b/e-17/e_module-snow/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-snow/HISTORY b/e-17/e_module-snow/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-snow/HISTORY
+++ b/e-17/e_module-snow/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-taskbar/DEPENDS b/e-17/e_module-taskbar/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-taskbar/DEPENDS
+++ b/e-17/e_module-taskbar/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-taskbar/HISTORY b/e-17/e_module-taskbar/HISTORY
index 65291ef..ea7dbe8 100644
--- a/e-17/e_module-taskbar/HISTORY
+++ b/e-17/e_module-taskbar/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-tclock/DEPENDS b/e-17/e_module-tclock/DEPENDS
index 9b2931c..c408f5c 100755
--- a/e-17/e_module-tclock/DEPENDS
+++ b/e-17/e_module-tclock/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-tclock/HISTORY b/e-17/e_module-tclock/HISTORY
index d448171..8688a83 100644
--- a/e-17/e_module-tclock/HISTORY
+++ b/e-17/e_module-tclock/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-06-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: tarballs don't use svn (get-e.org is closed but sources 
 	  are on fall-back mirror)
diff --git a/e-17/e_module-tiling/DEPENDS b/e-17/e_module-tiling/DEPENDS
index 3728cf2..b27dbdb 100755
--- a/e-17/e_module-tiling/DEPENDS
+++ b/e-17/e_module-tiling/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas    &&
 depends  subversion
diff --git a/e-17/e_module-tiling/HISTORY b/e-17/e_module-tiling/HISTORY
index fc49112..f72d0d3 100644
--- a/e-17/e_module-tiling/HISTORY
+++ b/e-17/e_module-tiling/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* PREPARE, DETAILS, DEPENDS, PRE_BUILD, BUILD: Created
 
diff --git a/e-17/e_module-uptime/DEPENDS b/e-17/e_module-uptime/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-uptime/DEPENDS
+++ b/e-17/e_module-uptime/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-uptime/HISTORY b/e-17/e_module-uptime/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-uptime/HISTORY
+++ b/e-17/e_module-uptime/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-weather/DEPENDS b/e-17/e_module-weather/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-weather/DEPENDS
+++ b/e-17/e_module-weather/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-weather/HISTORY b/e-17/e_module-weather/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-weather/HISTORY
+++ b/e-17/e_module-weather/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-winselector/DEPENDS b/e-17/e_module-winselector/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-winselector/DEPENDS
+++ b/e-17/e_module-winselector/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-winselector/HISTORY b/e-17/e_module-winselector/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-winselector/HISTORY
+++ b/e-17/e_module-winselector/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_module-wlan/DEPENDS b/e-17/e_module-wlan/DEPENDS
index 2adc3c6..f0041fd 100755
--- a/e-17/e_module-wlan/DEPENDS
+++ b/e-17/e_module-wlan/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore    &&
 depends  edje     &&
 depends  eet      &&
 depends  e17      &&
-depends  esmart   &&
 depends  evas &&
 depends  subversion
diff --git a/e-17/e_module-wlan/HISTORY b/e-17/e_module-wlan/HISTORY
index e55febb..52adacf 100644
--- a/e-17/e_module-wlan/HISTORY
+++ b/e-17/e_module-wlan/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	* DEPENDS: Depends on subversion
diff --git a/e-17/e_utils/DEPENDS b/e-17/e_utils/DEPENDS
index ad188d0..a626ae2 100755
--- a/e-17/e_utils/DEPENDS
+++ b/e-17/e_utils/DEPENDS
@@ -4,6 +4,5 @@ depends  edje     &&
 depends  eet      &&
 depends  engrave  &&
 depends  epsilon  &&
-depends  esmart   &&
 depends  imlib2 &&
 depends  subversion
diff --git a/e-17/e_utils/HISTORY b/e-17/e_utils/HISTORY
index 643541b..7325f90 100644
--- a/e-17/e_utils/HISTORY
+++ b/e-17/e_utils/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Remove unneeded modification of SPELL for SOURCE_URL
 
diff --git a/e-17/eclair/DEPENDS b/e-17/eclair/DEPENDS
index 483fb81..46aa9a9 100755
--- a/e-17/eclair/DEPENDS
+++ b/e-17/eclair/DEPENDS
@@ -1,5 +1,4 @@
 depends  e-emotion  &&
-depends  esmart     &&
 depends  gtk+2      &&
 depends  libxml2    &&
 depends  sqlite     &&
diff --git a/e-17/eclair/HISTORY b/e-17/eclair/HISTORY
index 5f17b71..20f48ed 100644
--- a/e-17/eclair/HISTORY
+++ b/e-17/eclair/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Remove unneeded modification of SPELL for SOURCE_URL
 
diff --git a/e-17/econf/DEPENDS b/e-17/econf/DEPENDS
index 5eb5147..66a2ab3 100755
--- a/e-17/econf/DEPENDS
+++ b/e-17/econf/DEPENDS
@@ -2,6 +2,5 @@ depends  ecore   &&
 depends  edje    &&
 depends  eet     &&
 depends  e17     &&
-depends  esmart  &&
 depends  evas    &&
 depends  etk
diff --git a/e-17/econf/HISTORY b/e-17/econf/HISTORY
index a6d23c3..df599c8 100644
--- a/e-17/econf/HISTORY
+++ b/e-17/econf/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2007-12-05 Ethan "eekee" Grammatikidis <eekee57 at fastmail.fm>
 	* DEPENDS: added: depends etk
 
diff --git a/e-17/elapse/DEPENDS b/e-17/elapse/DEPENDS
index 726343b..87c8fe6 100755
--- a/e-17/elapse/DEPENDS
+++ b/e-17/elapse/DEPENDS
@@ -1,4 +1,3 @@
 depends  edje    &&
-depends  esmart  &&
 depends  curl     &&
 depends  subversion
diff --git a/e-17/elapse/HISTORY b/e-17/elapse/HISTORY
index 7ab1cdc..59a4d60 100644
--- a/e-17/elapse/HISTORY
+++ b/e-17/elapse/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	  Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/e-17/elicit/DEPENDS b/e-17/elicit/DEPENDS
index 524e476..cd5c90d 100755
--- a/e-17/elicit/DEPENDS
+++ b/e-17/elicit/DEPENDS
@@ -1,3 +1,2 @@
-depends  esmart  &&
 depends  edje     &&
 depends  subversion
diff --git a/e-17/elicit/HISTORY b/e-17/elicit/HISTORY
index b657a69..3482194 100644
--- a/e-17/elicit/HISTORY
+++ b/e-17/elicit/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2010-04-01 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD: autogen.sh -> bootstrap
 
diff --git a/e-17/embrace/DEPENDS b/e-17/embrace/DEPENDS
index d68bc5d..c8791d9 100755
--- a/e-17/embrace/DEPENDS
+++ b/e-17/embrace/DEPENDS
@@ -3,5 +3,4 @@ depends  ecore  &&
 depends  edb    &&
 depends  edje   &&
 depends  ewl    &&
-depends  esmart   &&
 depends  subversion
diff --git a/e-17/embrace/HISTORY b/e-17/embrace/HISTORY
index a72d0ee..8952b86 100644
--- a/e-17/embrace/HISTORY
+++ b/e-17/embrace/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	  Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/e-17/enscribe/DEPENDS b/e-17/enscribe/DEPENDS
index 4e6e97c..7d9a162 100755
--- a/e-17/enscribe/DEPENDS
+++ b/e-17/enscribe/DEPENDS
@@ -1,3 +1,2 @@
 depends  edje    &&
-depends  esmart &&
 depends  subversion
diff --git a/e-17/enscribe/HISTORY b/e-17/enscribe/HISTORY
index 7ff034a..f4ed27d 100644
--- a/e-17/enscribe/HISTORY
+++ b/e-17/enscribe/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Remove unneeded modification of SPELL for SOURCE_URL
 
diff --git a/e-17/entrance/DEPENDS b/e-17/entrance/DEPENDS
index 7639e79..579c63f 100755
--- a/e-17/entrance/DEPENDS
+++ b/e-17/entrance/DEPENDS
@@ -1,6 +1,5 @@
 depends  edb     &&
 depends  edje    &&
-depends  esmart  &&
 
 if  [  "$ENTRANCE_AUTH"  ==  "shadow"  ];  then
   depends  shadow &&
diff --git a/e-17/entrance/HISTORY b/e-17/entrance/HISTORY
index 92351b0..bd27c4b 100644
--- a/e-17/entrance/HISTORY
+++ b/e-17/entrance/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* init.d/entrance: made it non-sh, bug #13702
 
diff --git a/e-17/erss/DEPENDS b/e-17/erss/DEPENDS
index 1f00a82..d2037af 100755
--- a/e-17/erss/DEPENDS
+++ b/e-17/erss/DEPENDS
@@ -1,4 +1,3 @@
 depends  libxml2  &&
 depends  edje     &&
-depends  esmart    &&
 depends  subversion
diff --git a/e-17/erss/HISTORY b/e-17/erss/HISTORY
index 7c9ae76..f3b9484 100644
--- a/e-17/erss/HISTORY
+++ b/e-17/erss/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: CVS -> SVN
 	  Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/e-17/iconbar/DEPENDS b/e-17/iconbar/DEPENDS
index 4e50124..9e5c033 100755
--- a/e-17/iconbar/DEPENDS
+++ b/e-17/iconbar/DEPENDS
@@ -3,5 +3,4 @@ depends  evas     &&
 depends  imlib2   &&
 depends  ecore    &&
 depends  edje     &&
-depends  esmart    &&
 depends  subversion
diff --git a/e-17/iconbar/HISTORY b/e-17/iconbar/HISTORY
index 5a9a110..3826f94 100644
--- a/e-17/iconbar/HISTORY
+++ b/e-17/iconbar/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ladislav Hagara <hgr at vabo.cz>
+	* DEPENDS: esmart removed
+
 2008-09-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Remove unneeded modification of SPELL for SOURCE_URL
 
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 664f862..5389b8f 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_IGNORE=volatile
 
 else
-         VERSION=7.2
+         VERSION=7.3
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION/\./}
    SOURCE_URL[0]=ftp://ftp.vim.org/pub/vim/unix/${SOURCE}
@@ -23,35 +23,13 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION/\./}
    SOURCE_URL[4]=ftp://ftp.us.vim.org/pub/vim/unix/${SOURCE}
       SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
 
-         SOURCE2=vim-$VERSION-extra.tar.gz
-     SOURCE2_URL=ftp://ftp.vim.org/pub/vim/extra/$SOURCE2
-    SOURCE2_HASH=sha512:bcf5d384002a9e9be6d84f5aeb802c3e16e17806d1c87f6687c52b3ce34684f8ad4c1aa5d67810a3205265dd401a1061ad2d0e2fc095de32391c159f6ba04e1a
-
-         SOURCE3=vim-$VERSION-lang.tar.gz
-     SOURCE3_URL=ftp://ftp.vim.org/pub/vim/extra/$SOURCE3
-    SOURCE3_HASH=sha512:939571d34b941b1394a49515b359a7606adf8051079492f497d4ead64f58e287ea5ed695473db8ec1f90fdfe57b028f574c6541417025b468d1818ce0bfd9f5a
-
-    PATCH_SOURCE=${VERSION}
-PATCH_SOURCE_URL=ftp://ftp.vim.org/pub/vim/patches/${VERSION}
-         SOURCE4=${PATCH_SOURCE}.001-100.gz
-     SOURCE4_URL=${PATCH_SOURCE_URL}/${SOURCE4}
-    SOURCE4_HASH=sha512:539b90737a677dd3a0e5e60ebebcc14588ebffc18bf08c8b108c4a168d197b165b1616adf7ac53d18a5c3913bef31c1be153531afda439d73e4b2d587eebd513
-         SOURCE5=${PATCH_SOURCE}.101-200.gz
-     SOURCE5_URL=${PATCH_SOURCE_URL}/${SOURCE5}
-    SOURCE5_HASH=sha512:c2234b515ad56dd8a1f759fba2bb0d80199ef412fd51091e466fa07c23cd73d6bdc4b6d8b80ad33c8b0c1f960a3c4e648f523a7c399a20beafef621a77e3b60c
-         SOURCE6=${PATCH_SOURCE}.201-300.gz
-     SOURCE6_URL=${PATCH_SOURCE_URL}/${SOURCE6}
-    SOURCE6_HASH=sha512:8df9bf81552ce9d8857ec801990d8d252e2e711004e5211dd26eb89870fb2f6d5b677616bf6cc406825f1ef28782567644368fae568b305961024a3151f4ae95
-         SOURCE7=${PATCH_SOURCE}.301-400.gz
-     SOURCE7_URL=${PATCH_SOURCE_URL}/${SOURCE7}
-    SOURCE7_HASH=sha512:7716107b898f90dff782f3a5984806b5018e94eef3a87a9ea27b267115a711509a9579849d7c375940d12ac102dd475906cc8f18a96b782e8c1ef7bcab092dae
 fi
 
         WEB_SITE=http://vim.sf.net
       LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
          ENTERED=20010922
         KEYWORDS="editors"
-      PATCHLEVEL=411
+      PATCHLEVEL=0
            SHORT="VIM is an improved version of vi."
 cat << EOF
 VIM is an improved version of the editor vi, one of the standard text
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 5f41920..adf3570 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,7 @@
+2010-08-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 7.3, extra and lang now included in main tarball
+	* PRE_BUILD: removed
+
 2010-06-30 Donald Johnson <minozake at codemages.net>
 	* DETAILS: Updated license link.
 
diff --git a/editors/vim/PRE_BUILD b/editors/vim/PRE_BUILD
deleted file mode 100755
index 38eb463..0000000
--- a/editors/vim/PRE_BUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-default_pre_build                      &&
-cd ${SOURCE_DIRECTORY}                 &&
-verify_file 2                          &&
-verify_file 3                          &&
-tar vxf $SOURCE_CACHE/$SOURCE2 --strip-components 1  &&
-tar vxf $SOURCE_CACHE/$SOURCE3 --strip-components 1  &&
-
-message "${MESSAGE_COLOR}patches 001-100${DEFAULT_COLOR}"
-unpack_file 4 &&
-gunzip -c $SOURCE_CACHE/$SOURCE4 | patch -p0 &&
-
-message "${MESSAGE_COLOR}patches 101-200${DEFAULT_COLOR}"
-unpack_file 5 &&
-gunzip -c $SOURCE_CACHE/$SOURCE5 | patch -p0 &&
-
-message "${MESSAGE_COLOR}patches 201-300${DEFAULT_COLOR}"
-unpack_file 6 &&
-gunzip -c $SOURCE_CACHE/$SOURCE6 | patch -p0 &&
-
-message "${MESSAGE_COLOR}patches 301-400${DEFAULT_COLOR}"
-unpack_file 7 &&
-gunzip -c $SOURCE_CACHE/$SOURCE7 | patch -p0 &&
-
-for patch in $(seq 401 411); do
-  message "${MESSAGE_COLOR}patch $patch${DEFAULT_COLOR}" &&
-  zcat "$SPELL_DIRECTORY/patches/$VERSION.$patch.gz" | patch -p0
-done
diff --git a/editors/vim/vim-7.2.tar.bz2.sig b/editors/vim/vim-7.2.tar.bz2.sig
deleted file mode 100644
index fb6584c..0000000
Binary files a/editors/vim/vim-7.2.tar.bz2.sig and /dev/null differ
diff --git a/editors/vim/vim-7.3.tar.bz2.sig b/editors/vim/vim-7.3.tar.bz2.sig
new file mode 100644
index 0000000..a8bd28e
Binary files /dev/null and b/editors/vim/vim-7.3.tar.bz2.sig differ
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 1944e10..cb72592 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=curl
-         VERSION=7.21.0
+         VERSION=7.21.1
   SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index d5499c9..e9cd92b 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2010-08-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 7.21.1
+
 2010-06-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 7.21.0
 	* DEPENDS: added optional_depends rtmpdump
diff --git a/ftp/filezilla/BUILD b/ftp/filezilla/BUILD
new file mode 100755
index 0000000..99be896
--- /dev/null
+++ b/ftp/filezilla/BUILD
@@ -0,0 +1,2 @@
+OPTS="--with-tinyxml=builtin $OPTS" &&
+default_build
diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index 04a5ac3..2a380d0 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,8 +1,8 @@
            SPELL=filezilla
-         VERSION=3.3.3
+         VERSION=3.3.4
           SOURCE="FileZilla_${VERSION}_src.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:107f03b2b0ab6f8e1357fcd29434bdb2fe8fe1be29148f8fd17e5cd24fe87f1cc1b0f0b93b4be83899e40aef6c795585340830642018b4602b67dc6144c39492
+     SOURCE_HASH=sha512:2bc652d1c7b617ae06b6a223adbae423930b53f720dbbc09ae96c73aa84d9c79ce4f3912476e302e1fcddff0d8af49859ff3a4fda3de461e3a902b9caa148e1b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://filezilla-project.org/"
       LICENSE[0]=GPL
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index 7c1f9c4..d320034 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,7 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.3.4
+	* BUILD: added, we don't have tinyxml yet
+
 2010-06-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.3.3
 
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 3073f4f..208ac01 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -6,6 +6,7 @@ depends libgnome-keyring         &&
 depends -sub SOUP_GNOME libsoup  &&
 depends libxslt                  &&
 depends libproxy                 &&
+depends gnome-doc-utils          &&
 
 optional_depends ca-certificates \
                  "" \
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 70d7fb9..1fc7ede 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -2,7 +2,7 @@
 if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
          VERSION=2.31.3
 else
-         VERSION=2.30.2
+         VERSION=2.30.3
 fi
           BRANCH=$(echo $VERSION|cut -d . -f 1,2)
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index bb1e309..ff22174 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 2.30.3
+	* DEPENDS: depends gnome-doc-utils
+
 2010-06-19 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to 2.31.3
 
diff --git a/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig
deleted file mode 100644
index 5b66c2b..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/epiphany/epiphany-2.30.3.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.30.3.tar.bz2.sig
new file mode 100644
index 0000000..75108f5
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.30.3.tar.bz2.sig differ
diff --git a/gnome2-libs/clutter-gtk/DETAILS b/gnome2-libs/clutter-gtk/DETAILS
index 080ac51..bbb6006 100755
--- a/gnome2-libs/clutter-gtk/DETAILS
+++ b/gnome2-libs/clutter-gtk/DETAILS
@@ -1,5 +1,5 @@
            SPELL=clutter-gtk
-         VERSION=0.10.4
+         VERSION=0.10.6
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://www.clutter-project.org/sources/${SPELL}/${VERSION:0:4}/${SOURCE}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/gnome2-libs/clutter-gtk/HISTORY b/gnome2-libs/clutter-gtk/HISTORY
index 4ff23bd..8c06b1a 100644
--- a/gnome2-libs/clutter-gtk/HISTORY
+++ b/gnome2-libs/clutter-gtk/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.10.6
+
 2010-03-31 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 0.10.4
 
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.4.tar.bz2.sig b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.4.tar.bz2.sig
deleted file mode 100644
index cad1947..0000000
Binary files a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig
new file mode 100644
index 0000000..2ca2124
Binary files /dev/null and b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig differ
diff --git a/gnome2-libs/devicekit/DETAILS b/gnome2-libs/devicekit/DETAILS
index 12e3c76..addfd8f 100755
--- a/gnome2-libs/devicekit/DETAILS
+++ b/gnome2-libs/devicekit/DETAILS
@@ -1,8 +1,8 @@
            SPELL=devicekit
          VERSION=003
-          SOURCE=DeviceKit-$VERSION.tar.bz2
+          SOURCE=DeviceKit-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DeviceKit-$VERSION
-   SOURCE_URL[0]=http://cgit.freedesktop.org/DeviceKit/DeviceKit/snapshot/$SOURCE
+   SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=LGPL
         WEB_SITE=http://www.freedesktop.org/wiki/Software/DeviceKit
diff --git a/gnome2-libs/devicekit/DeviceKit-003.tar.bz2.sig b/gnome2-libs/devicekit/DeviceKit-003.tar.bz2.sig
deleted file mode 100644
index a34328f..0000000
Binary files a/gnome2-libs/devicekit/DeviceKit-003.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/devicekit/DeviceKit-003.tar.gz.sig b/gnome2-libs/devicekit/DeviceKit-003.tar.gz.sig
new file mode 100644
index 0000000..a665b7c
Binary files /dev/null and b/gnome2-libs/devicekit/DeviceKit-003.tar.gz.sig differ
diff --git a/gnome2-libs/devicekit/DeviceKit-no-doc.patch b/gnome2-libs/devicekit/DeviceKit-no-doc.patch
deleted file mode 100644
index 2959d82..0000000
--- a/gnome2-libs/devicekit/DeviceKit-no-doc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nuar DeviceKit-003/autogen.sh DeviceKit-003.mod/autogen.sh
---- DeviceKit-003/autogen.sh	2009-03-02 21:01:50.000000000 +0100
-+++ DeviceKit-003.mod/autogen.sh	2009-04-20 07:49:18.000000000 +0200
-@@ -31,13 +31,6 @@
-   }
- }
- 
--(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
--	echo
--	echo "You must have gtk-doc installed to compile $PROJECT."
--	echo "Install the appropriate package for your distribution,"
--	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
--	DIE=1
--}
- 
- (automake --version) < /dev/null > /dev/null 2>&1 || {
-   echo
-@@ -92,7 +85,7 @@
-       echo "Running autoconf ..."
-       autoconf
- 
--conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-+conf_flags="--enable-maintainer-mode"
- 
- if test x$NOCONFIGURE = x; then
-   echo "Running $srcdir/configure $conf_flags $@ ..."
-diff -Nuar DeviceKit-003/doc/Makefile.am DeviceKit-003.mod/doc/Makefile.am
---- DeviceKit-003/doc/Makefile.am	2009-03-02 21:01:50.000000000 +0100
-+++ DeviceKit-003.mod/doc/Makefile.am	2009-04-20 07:41:35.000000000 +0200
-@@ -60,14 +60,8 @@
- 
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=
--
--if ENABLE_GTK_DOC
--include $(top_srcdir)/gtk-doc.make
--else
--EXTRA_DIST =
--CLEANFILES =
--endif
--
-+EXTRA_DIST=
-+CLEANFILES=
- # Version information for marking the documentation
- EXTRA_DIST += version.xml.in
- 
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index eb9d23e..bfaf4cd 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,3 +1,7 @@
+2010-08-11 Robin Cook <rcook at wyrms.net>
+	* DETALS: returned to release version as cgit version no longer works
+	* PRE_BUILD: removed as no autogen.sh in release version
+
 2009-10-08 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* DEPENDS: requires docbook-xsl, not only docbook-dtd
 
diff --git a/gnome2-libs/devicekit/PRE_BUILD b/gnome2-libs/devicekit/PRE_BUILD
deleted file mode 100755
index f4d1a24..0000000
--- a/gnome2-libs/devicekit/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-if ! is_depends_enabled $SPELL gtk-doc ; then
-patch -p1 < $SPELL_DIRECTORY/DeviceKit-no-doc.patch
-fi &&
-NOCONFIGURE=Y ./autogen.sh
diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
new file mode 100755
index 0000000..3954532
--- /dev/null
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -0,0 +1,6 @@
+depends  glib2   &&
+depends  libpng  &&
+depends  zlib    &&
+depends  jpeg    &&
+depends  tiff
+
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
new file mode 100755
index 0000000..caabc69
--- /dev/null
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=gdk-pixbuf2
+         VERSION=2.21.6
+	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
+          SOURCE=gdk-pixbuf-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdk-pixbuf-$VERSION
+   SOURCE_URL[0]=$GNOME_URL/sources/gdk-pixbuf/$BRANCH/$SOURCE
+   SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/$BRANCH/$SOURCE
+     SOURCE_HASH=sha512:19576a8ba89ff8676d9a39351e7f28d7157cfed63c2b54029df3efc7a58e7b7a08123ad37a859c8000d82ba01f03c198a6d6a42b8f89d9ba5be74a2becf76d88
+      LICENSE[0]=GPL
+      LICENSE[1]=LGPL
+        WEB_SITE=http://www.gnome.org
+         ENTERED=20100817
+           SHORT="gdk-pixbuf is a graphics library."
+cat << EOF
+The GdkPixbuf library provides a number of features:
+        - GdkPixbuf structure for representing images.
+        - Image loading facilities, both synchronous and progressive.
+        - Rendering of a GdkPixbuf into various formats:
+          drawables (windows, pixmaps), GdkRGB buffers.
+        - Fast scaling and compositing of pixbufs.
+        - Simple animation loading (ie. animated gifs).
+EOF
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
new file mode 100644
index 0000000..5e2662f
--- /dev/null
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -0,0 +1,2 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* ALL: Created new spell
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 206b9cc..0740a4a 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.25.1
+         VERSION=2.25.14
           SOURCE=glib-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index f017550..929e35f 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.25.14
+
 2010-08-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.24.2
 
diff --git a/gnome2-libs/glib2/glib-2.25.1.tar.bz2.sig b/gnome2-libs/glib2/glib-2.25.1.tar.bz2.sig
deleted file mode 100644
index 0f2dc88..0000000
Binary files a/gnome2-libs/glib2/glib-2.25.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.25.14.tar.bz2.sig b/gnome2-libs/glib2/glib-2.25.14.tar.bz2.sig
new file mode 100644
index 0000000..b9af169
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.25.14.tar.bz2.sig differ
diff --git a/gnome2-libs/gobject-introspection/DETAILS b/gnome2-libs/gobject-introspection/DETAILS
index 4a3ad93..e62a279 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,6 +1,11 @@
            SPELL=gobject-introspection
+if [[ $GOBJ_VER == devel ]]; then
+         VERSION=0.9.3
+          SOURCE=${SPELL}-${VERSION}.tar.bz2
+else
          VERSION=0.6.14
       PATCHLEVEL=1
+fi
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/gobject-introspection/HISTORY b/gnome2-libs/gobject-introspection/HISTORY
index 419baa6..e2a3264 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,10 @@
+
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Added devel version 0.9.3
+	* PRE_BUILD: Only patch stable
+	* CONFIGURE: Added to choose devel or stable
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: Added for devel version
+
 2010-08-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD: added, to apply the patch
diff --git a/gnome2-libs/gobject-introspection/PREPARE b/gnome2-libs/gobject-introspection/PREPARE
new file mode 100755
index 0000000..e3f5b7d
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/PREPARE
@@ -0,0 +1 @@
+config_query_list GOBJ_VER 'which version to build?' stable devel
diff --git a/gnome2-libs/gobject-introspection/PRE_BUILD b/gnome2-libs/gobject-introspection/PRE_BUILD
index 9e42183..29f9657 100755
--- a/gnome2-libs/gobject-introspection/PRE_BUILD
+++ b/gnome2-libs/gobject-introspection/PRE_BUILD
@@ -1,4 +1,8 @@
 default_pre_build &&
+
+if [[ "$GOBJ_DEVEL" == "stable" ]]; then
 cd "$SOURCE_DIRECTORY" &&
 
 patch -p0 < "$SPELL_DIRECTORY/py27.patch"
+
+fi
diff --git a/gnome2-libs/gobject-introspection/PRE_SUB_DEPENDS b/gnome2-libs/gobject-introspection/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..fd4eaae
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+   GOBJ_DEVEL) if [[ "$GOBJ_VER" == "devel" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/gnome2-libs/gobject-introspection/SUB_DEPENDS b/gnome2-libs/gobject-introspection/SUB_DEPENDS
new file mode 100755
index 0000000..422d122
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+   GOBJ_DEVEL) echo "Devel release needed, forcing it."  &&
+             GOBJ_VER="devel"                          ;;
+   *)        echo "unknown sub-depends!"; return 1         ;;
+esac
diff --git a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig
new file mode 100644
index 0000000..da3f2f1
Binary files /dev/null and b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig differ
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index 7b6a58b..6c984d5 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gtkhtml2
-         VERSION=3.30.2
+         VERSION=3.30.3
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gtkhtml-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index 9df72ea..d1ceb14 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.30.3
+
 2010-06-20 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.30.2
 
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.30.2.tar.bz2.sig b/gnome2-libs/gtkhtml2/gtkhtml-3.30.2.tar.bz2.sig
deleted file mode 100644
index 191480a..0000000
Binary files a/gnome2-libs/gtkhtml2/gtkhtml-3.30.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-3.30.3.tar.bz2.sig b/gnome2-libs/gtkhtml2/gtkhtml-3.30.3.tar.bz2.sig
new file mode 100644
index 0000000..a6debd9
Binary files /dev/null and b/gnome2-libs/gtkhtml2/gtkhtml-3.30.3.tar.bz2.sig differ
diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index de717ff..ac0cf34 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libsoup
 if [[ $LIBSOUP_DEVEL == y ]]; then
-         VERSION=2.31.2
+         VERSION=2.31.90
 else
          VERSION=2.30.2
 fi
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 61d3725..4979d26 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.31.90
+
 2010-06-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.2
 
diff --git a/gnome2-libs/libsoup/libsoup-2.31.2.tar.bz2.sig b/gnome2-libs/libsoup/libsoup-2.31.2.tar.bz2.sig
deleted file mode 100644
index 0f61fa7..0000000
Binary files a/gnome2-libs/libsoup/libsoup-2.31.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libsoup/libsoup-2.31.90.tar.bz2.sig b/gnome2-libs/libsoup/libsoup-2.31.90.tar.bz2.sig
new file mode 100644
index 0000000..bc65f6e
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.31.90.tar.bz2.sig differ
diff --git a/graphics-libs/libcaca/DEPENDS b/graphics-libs/libcaca/DEPENDS
index add001c..14e4562 100755
--- a/graphics-libs/libcaca/DEPENDS
+++ b/graphics-libs/libcaca/DEPENDS
@@ -1,7 +1,7 @@
 optional_depends slang "" "--disable-slang" "to build support for slang output"    &&
 optional_depends imlib2 "" "--disable-imlib2" "to open not only BMP files"         &&
 optional_depends doxygen "" "--disable-doc" "to generate documentation"            &&
-optional_depends OPENGL "" "--disable-gl" "for OpenGL support"                     &&
+optional_depends mesalib "" "--disable-gl" "for OpenGL support"                     &&
 optional_depends ncurses "" "--disable-ncurses" "Enable ncurses graphics support?" &&
 optional_depends libx11 "" "--disable-x11" "Enable X11 support?"                   &&
 optional_depends GLUT "" "" "Enable GLUT support?"                                 &&
diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY
index b03b9f5..72f4fe5 100644
--- a/graphics-libs/libcaca/HISTORY
+++ b/graphics-libs/libcaca/HISTORY
@@ -1,3 +1,8 @@
+2010-08-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS: optional_depends on mesalib instead of OPENGL
+	  nvidia_driver is a provider of OPENGL but doesn't install
+	  glu.h which this spell needs.
+
 2010-07-24 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 29beabb..cacc2f9 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
 else
  if [[ $POPPLER_VER == devel ]]; then
-         VERSION=0.14.1
-     SOURCE_HASH=sha512:7579ae939e795ce530d72fa7d6e16015daf98aabd76d4ebbb80db276aae2e3f033187ef86d7fb2965344096800ec343f60dab1881cf4c61cef7b00e8c8bb26d4
+         VERSION=0.14.2
+     SOURCE_HASH=sha512:e002f8cb525612bfde6298f10ad444a289a4cc7358ca152b73d9f42f01a523f402f4526e7b84043352950414ec0f23e5a19f873d4a1cabc4a0a1a8e3b018519b
  else
-         VERSION=0.14.1
-     SOURCE_HASH=sha512:7579ae939e795ce530d72fa7d6e16015daf98aabd76d4ebbb80db276aae2e3f033187ef86d7fb2965344096800ec343f60dab1881cf4c61cef7b00e8c8bb26d4
+         VERSION=0.14.2
+     SOURCE_HASH=sha512:e002f8cb525612bfde6298f10ad444a289a4cc7358ca152b73d9f42f01a523f402f4526e7b84043352950414ec0f23e5a19f873d4a1cabc4a0a1a8e3b018519b
  fi
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index e2f1b4e..3b7bfce 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2010-08-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.14.2
+	* UP_TRIGGERS: libpoppler.so.6 -> libpoppler.so.7 in this version
+
 2010-07-28 Ladislav Hagara <hgr at vabo.cz>
 	* SUB_DEPENDS, PRE_SUB_DEPENDS: XPDF_HEADERS added
 	* REPAIR^all^PRE_SUB_DEPENDS: added
diff --git a/graphics-libs/poppler/UP_TRIGGERS b/graphics-libs/poppler/UP_TRIGGERS
index cde3e4d..12dcc84 100755
--- a/graphics-libs/poppler/UP_TRIGGERS
+++ b/graphics-libs/poppler/UP_TRIGGERS
@@ -1,6 +1,6 @@
 local OLD_SPELL_VERSION=""
 spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+if [ "$VERSION" == "0.14.2" ] || [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
   message "This is a possibly incompatible update of $SPELL..."
   message "Figuring out what spells need to be recast, this may take a while."
   for each in $(show_up_depends $SPELL 1); do
diff --git a/graphics/bins/22_bins-hash-ref b/graphics/bins/22_bins-hash-ref
new file mode 100644
index 0000000..68a8490
--- /dev/null
+++ b/graphics/bins/22_bins-hash-ref
@@ -0,0 +1,17 @@
+Author: Ludovic Rousseau <rousseau at imac.maison.bogus>
+Description: bins: Crashes mid-album
+Bug-Debian: http://bugs.debian.org/481662
+
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -3750,8 +3750,8 @@
+ 
+     my @descTable;
+     foreach my $tagName (@mainFields) {
+-        if (${%$hashref}{$tagName}) {
+-            my $value=${%$hashref}{$tagName};
++        if (${$hashref}{$tagName}) {
++            my $value=${$hashref}{$tagName};
+             $value =~ s/'/&#39;/g  ; # in case it's used in javascript code
+             push @descTable, {DESC_FIELD_NAME => $fields{$tagName}->{'Name'},
+                               DESC_FIELD_VALUE => $value,
diff --git a/graphics/bins/BUILD b/graphics/bins/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/graphics/bins/BUILD
@@ -0,0 +1 @@
+true
diff --git a/graphics/bins/DEPENDS b/graphics/bins/DEPENDS
new file mode 100755
index 0000000..a714a5d
--- /dev/null
+++ b/graphics/bins/DEPENDS
@@ -0,0 +1,15 @@
+depends html-clean     &&
+depends html-parser    &&
+depends html-template  &&
+depends image-info     &&
+depends image-size     &&
+depends io-string      &&
+depends locale-gettext &&
+depends perl           &&
+depends perlmagick     &&
+depends storable       &&
+depends text-iconv     &&
+depends text-unaccent  &&
+depends uri            &&
+depends xml-grove      &&
+depends xml-parser
diff --git a/graphics/bins/DETAILS b/graphics/bins/DETAILS
new file mode 100755
index 0000000..87afa42
--- /dev/null
+++ b/graphics/bins/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=bins
+         VERSION=1.1.29
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://download.gna.org/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:802089658a8ef1d71155359c2daa807bb98d9be0580c247a1f3796efae29d4f1f1d20ff4b5364af208f8808d3d7ffd076e0235840df65888d855c51c401f91b7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://bins.sautret.org"
+      LICENSE[0]=GPL
+         ENTERED=20100816
+           SHORT="generate static HTML photo albums using XML and EXIF tags"
+cat << EOF
+BINS generates a complete static gallery (images and HTML) with thumbnails and
+image lists, using XML files to hold information about each image.  Includes
+bins_edit tool for adding information to the XML files.  Interprets EXIF and
+JFIF tags (and Canon extensions) in the jpeg directly.  Gallery appearance
+customizable through HTML templates; gallery can be generated in different
+languages.
+
+Based on SWIGS (Structured Web Image Gallery System).
+EOF
diff --git a/graphics/bins/HISTORY b/graphics/bins/HISTORY
new file mode 100644
index 0000000..e2f2b24
--- /dev/null
+++ b/graphics/bins/HISTORY
@@ -0,0 +1,5 @@
+2010-08-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS, INSTALL, install.sh.patch, PRE_BUILD:
+	  spell created
+	  22_bins-hash-ref: patch from Ubuntu to fix runtime error
+
diff --git a/graphics/bins/INSTALL b/graphics/bins/INSTALL
new file mode 100755
index 0000000..0cc050a
--- /dev/null
+++ b/graphics/bins/INSTALL
@@ -0,0 +1 @@
+PREFIX=${INSTALL_ROOT}/usr ./install.sh
diff --git a/graphics/bins/PRE_BUILD b/graphics/bins/PRE_BUILD
new file mode 100755
index 0000000..a458862
--- /dev/null
+++ b/graphics/bins/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/install.sh.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/22_bins-hash-ref
diff --git a/graphics/bins/install.sh.patch b/graphics/bins/install.sh.patch
new file mode 100644
index 0000000..f4e0996
--- /dev/null
+++ b/graphics/bins/install.sh.patch
@@ -0,0 +1,66 @@
+diff -Naupr bins-1.1.29.orig/install.sh bins-1.1.29/install.sh
+--- bins-1.1.29.orig/install.sh	2010-08-16 12:02:34.000000000 +0200
++++ bins-1.1.29/install.sh	2010-08-16 12:03:59.000000000 +0200
+@@ -36,7 +36,7 @@ SHARE="$PREFIX/share"
+ DATA="$SHARE/bins"
+ GLADE="$DATA"
+ LOCALE="$SHARE/locale"
+-MAN="$PREFIX/man/man1"
++MAN="$SHARE/man/man1"
+ 
+ cd `dirname $0`
+ 
+@@ -59,19 +59,16 @@ modified something for personalization.
+ Press Enter to go on or Crtl-C to stop now...
+ !EoF
+ 
+-read dummy
+-
+ install_binaries()
+ {
+   mkdir -p $BIN 2>/dev/null || true
+   if [ -w $BIN ] ; then
+     echo "Installing program files in $BIN"
+     # bins_cleanupgallery anti_bins
+-    cp bins bins_edit bins-edit-gui $BIN
++    cp bins bins_edit $BIN
+     chmod a+rx $BIN/bins
+     chmod a+rx $BIN/bins_edit
+     chmod a+rx $BIN/bins_cleanupgallery
+-    chmod a+rx $BIN/bins-edit-gui
+     chmod a+rx $BIN/anti_bins
+ #    perl -pi -e "s{/usr/local/share}{$SHARE}g" \
+ #     $BIN/bins $BIN/bins_edit $BIN/bins-edit-gui
+@@ -169,13 +166,6 @@ if [ "$?" -eq "1" ] ; then
+ fi
+ set -o errexit
+ 
+-# additionnal files
+-mkdir -p $GLADE 2>/dev/null || true
+-if [ -w $GLADE ] ; then
+-  echo "Installing additionnal files in $GLADE"
+-  cp bins-edit-gui.glade $GLADE
+-fi
+-
+ # man pages
+ mkdir -p $MAN 2>/dev/null || true
+ if [ -w $MAN ] ; then
+@@ -203,9 +193,6 @@ if [ -w $LOCALE ] ; then
+   do
+     mkdir -p $LOCALE/$L/LC_MESSAGES 2>/dev/null || true
+     cp intl/$L.mo $LOCALE/$L/LC_MESSAGES/bins.mo
+-    if [ -f intl/gui-$L.mo ]; then
+-      cp intl/gui-$L.mo $LOCALE/$L/LC_MESSAGES/bins-edit-gui.mo
+-    fi
+   done
+ else
+   cat <<!EoF  
+@@ -223,7 +210,7 @@ fi
+ set +o errexit
+ # set directory paths in source code
+ echo -n "setting directory paths in programs :"
+-for FILE in "$BIN/bins" "$BIN/bins_edit" "$BIN/bins-edit-gui"
++for FILE in "$BIN/bins" "$BIN/bins_edit"
+ do
+   echo -n " $FILE"
+   ed "$FILE" <<EoF 2>/dev/null
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index dc8b7ea..32a4938 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.3-2
+         VERSION=6.6.3-7
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:f1852a81bbca21616e6e8563441a49d9e95bc75528d6752914cd80e61f4cb7cc4ea1520142a311c14036c64083e11e8e60cf4546e0c376e836af0cdabf5da08b
+     SOURCE_HASH=sha512:a852144cf5bfadc722ab8042ecf87421de45202315b0c94dc9fff3230602a4a0aa6787560f85b01782cdc9f7edd382fdb3ea9bc3139ab3787cb8eb125703e7ce
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 8eb862e..4761e91 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,9 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.3-7
+
+2010-08-14 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.3-4
+
 2010-08-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 6.6.3-2
 
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index 18ef49b..02a2e2a 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,5 +1,5 @@
            SPELL=inkscape
-         VERSION=0.47
+         VERSION=0.48.0
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 4db20c4..bdd934a 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,7 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.48.0
+	* PRE_BUILD, inkscape-poppler-0.12.2.patch: removed
+
 2010-07-28 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: poppler -> -sub XPDF_HEADERS poppler #15755
 
diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
deleted file mode 100755
index 2613bdb..0000000
--- a/graphics/inkscape/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch  -Np1 < $SCRIPT_DIRECTORY/inkscape-poppler-0.12.2.patch
diff --git a/graphics/inkscape/inkscape-poppler-0.12.2.patch b/graphics/inkscape/inkscape-poppler-0.12.2.patch
deleted file mode 100644
index 3c1f2a2..0000000
--- a/graphics/inkscape/inkscape-poppler-0.12.2.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp~	2009-11-16 18:29:17.000000000 +0100
-+++ inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp	2009-11-24 19:09:47.000000000 +0100
-@@ -809,7 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this);
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -1009,9 +1009,9 @@
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1032,9 +1032,9 @@
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1101,7 +1101,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1145,7 +1145,7 @@
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1543,7 +1543,7 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--  if (!(shading = res->lookupShading(args[0].getName()))) {
-+  if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) {
-     return;
-   }
- 
-@@ -2507,7 +2507,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--      colorSpace = GfxColorSpace::parse(&obj1);
-+      colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2592,7 +2592,7 @@
- 	  obj2.free();
- 	}
-       }
--      maskColorSpace = GfxColorSpace::parse(&obj1);
-+      maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2767,7 +2767,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this);
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a9c7d47..31d2567 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=4.0b2
+         VERSION=4.0b3
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ae5d229..0add17a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 4.0b3
+
 2010-08-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD: forced optimizations to -O2 to prevent segfault
 
diff --git a/http/lighttpd/BUILD b/http/lighttpd/BUILD
index 44e4f99..1aeaf65 100755
--- a/http/lighttpd/BUILD
+++ b/http/lighttpd/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --libdir=$INSTALL_ROOT/usr/lib/lighttpd $LIGHTTPD_OPTS" &&
+OPTS="--libdir=$INSTALL_ROOT/usr/lib/lighttpd $LIGHTTPD_OPTS $OPTS" &&
 default_build
diff --git a/http/lighttpd/CONFIGURE b/http/lighttpd/CONFIGURE
index 7eb5cbd..841f7f0 100755
--- a/http/lighttpd/CONFIGURE
+++ b/http/lighttpd/CONFIGURE
@@ -1,6 +1,8 @@
 config_query LIGHTTPD_EXTAUTH "Do you want to patch in external authentication program support?" n &&
+
 config_query_option LIGHTTPD_OPTS "Do you want WebDAV support?" n \
                     "--with-webdav-props" "--without-webdav-props" &&
+
 if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
     config_query_option LIGHTTPD_OPTS "Do you want to enable WebDAV locking support?" y \
                         "--with-webdav-locks" "--without-webdav-locks"
diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 6fd7f4f..374603d 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,8 +1,7 @@
            SPELL=lighttpd
-         VERSION=1.4.26
-      PATCHLEVEL=1
+         VERSION=1.4.27
           BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-     SOURCE_HASH=sha512:30e0e48626d6b29406d1efb5ec0efcb7c9a2f803f119c6d2390092e9a8c536c7347c0511db9189cd1149e651ce674a7a72642d1c4d6344450dc1029853ce63bd
+     SOURCE_HASH=sha512:3164eb38c7be7f949e0043e849fb7b3bda6168754d1102c4f6dc93239d57491b30cba56cfcff60e065d9ea47cec45dc640aa1e021e373a23f3e08c5341a71fa0
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.lighttpd.net/lighttpd/releases-$BRANCH.x/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index af3a183..b237ec8 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,10 @@
+2010-08-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.4.27
+	* CONFIGURE: readability++
+	* BUILD: moved OPTS to the end
+	* PRE_BUILD: removed unneeded patch, quoting paths
+	* network-ssl.patch: removed
+
 2010-04-08 Elisamuel Resto <ryuji at sourcemage.org>
 	* BUILD: OPTS was not being populated correctly (webdav support never compiled)
 	* CONFIGURE, DEPENDS: WebDAV locks option added, and sqlite dep made to pull if its enabled (default)
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index 6aa59ba..04e9032 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/network-ssl.patch"
 if [[ $LIGHTTPD_EXTAUTH == y ]]; then
-patch -p0 < $SPELL_DIRECTORY/external_auth_program-1.4.25.patch
+  patch -p0 < "$SPELL_DIRECTORY/external_auth_program-1.4.25.patch"
 fi
-
diff --git a/http/lighttpd/network-ssl.patch b/http/lighttpd/network-ssl.patch
deleted file mode 100644
index 0325c5d..0000000
--- a/http/lighttpd/network-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network.c.orig	2010-02-02 02:28:20.000000000 +0300
-+++ src/network.c	2010-03-27 01:04:58.457237647 +0300
-@@ -525,7 +525,7 @@
- 
- 		if (!s->ssl_use_sslv2) {
- 			/* disable SSLv2 */
--			if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+			if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
- 						ERR_error_string(ERR_get_error(), NULL));
- 				return -1;
diff --git a/http/midori/BUILD b/http/midori/BUILD
index 65c8900..d31f4a9 100755
--- a/http/midori/BUILD
+++ b/http/midori/BUILD
@@ -1,2 +1,2 @@
-./waf --prefix=${INSTALL_ROOT}/usr configure &&
+./waf --prefix=${INSTALL_ROOT}/usr $OPTS configure &&
 ./waf build
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index db9d4e1..8887e6f 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -3,9 +3,12 @@ depends webkitgtk &&
 depends libxml2 &&
 depends python  &&
 depends libnotify &&
+depends sqlite &&
+
 
 optional_depends unique  "" "" "provide libUnique support" &&
-optional_depends sqlite  "" "" "enable save history between sessions" &&
-optional_depends libsoup "" "" "enable icons, save as and view source functions" &&
 optional_depends gnome-icon-theme "" "" "for all the icons" &&
+optional_depends vala "--enable-vala"  \
+                      "--disable-vala" \
+                      "enable vala support for extensions"  &&
 optional_depends docutils "" "" "enable user manual"
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index c1b9acf..37489c5 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -10,11 +10,11 @@ if [[ $MIDORI_VCS == y ]]; then
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.2.6
+         VERSION=0.2.7
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-     SOURCE_HASH=sha512:32ab1ae037814068fc258e6ed29a2cddac654658548ffbbad4dca3634c1d385875434bcf525e76cc9809b08b54ead243fce2a3fe0098e0435b9453f2c409a129
+     SOURCE_HASH=sha512:1ae050fead749e29205c81f56c79f3cc68f3213c674ff92b288c99c844eddc3bf61d743ea9a8ecb07a1fe2aa591937c5105639602381d00aa94ef6d3fb562e61
 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 4bda52f..2cef223 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,9 @@
+2010-08-16 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.2.7
+	* DEPENDS: depends sqlite, 
+	  Removing optional_depends libsoup since webkitgtk depends libsoup 
+	  Added optional_depends on vala
+
 2010-05-26 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.2.6
 
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 46df264..53ac126 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -40,15 +40,15 @@ optional_depends gst-plugins-base  \
                  "--disable-video" \
                  "for HTML5 streaming video support" &&
 
-optional_depends gobject-introspection             \
-                 "--enable-introspection"          \
-                 "--disable-introspection"         \
-                 "to enable introspection"         &&
+#optional_depends gobject-introspection             \
+#                 "--enable-introspection"          \
+#                 "--disable-introspection"         \
+#                 "to enable introspection"         &&
 
 optional_depends geoclue                             \
                  "--enable-geolocation"              \
                  "--disable-geolocation"             \
-                 "to enable geolocation support"   &&
+                 "to enable geolocation support"
 
-if is_depends_enabled $SPELL gobject-introspection; \
-  then depends gir-repository; fi
+#if is_depends_enabled $SPELL gobject-introspection; \
+#  then depends gir-repository; fi
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 7a4786f..4134f5d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Remove optional_depends gobject-introspection for now.
+
 2010-07-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.3
 	* PRE_BUILD, webkit-icu44.patch: removed
diff --git a/kde-look/qtcurve-gtk2/DETAILS b/kde-look/qtcurve-gtk2/DETAILS
index 6b6e8a9..ea5b96c 100755
--- a/kde-look/qtcurve-gtk2/DETAILS
+++ b/kde-look/qtcurve-gtk2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=qtcurve-gtk2
-         VERSION=1.5.0
+         VERSION=1.5.2
           SOURCE=QtCurve-Gtk2-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/QtCurve-Gtk2-$VERSION
    SOURCE_URL[0]=http://craigd.wikispaces.com/file/view/$SOURCE
         WEB_SITE=http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+KDE3%2C+%26+Gtk2+Theme%29?content=40492
          ENTERED=20070805
-     SOURCE_HASH=sha512:a4bbfb1652d9380c183cb4134bf6c1b203ada9fe4f1a3592d9ea2619429adde01da18d27ba4362f9ff0e89b49691053969c487a2781445b801880ece40c2d966
+     SOURCE_HASH=sha512:6e85471397c3ec737eb55c34b57963e3a76322aae49ceb6fb8644b619c5902f1794fb469159847932706a6c52ccd07b8187a345e69fd2f439f66d8e45840dfdd
       LICENSE[0]=GPL
         KEYWORDS="kde style theme qt gtk compatibility widget"
            SHORT="A set of QT widget styles (used to unify look of KDE and GNOME applications)."
diff --git a/kde-look/qtcurve-gtk2/HISTORY b/kde-look/qtcurve-gtk2/HISTORY
index f77a810..40055e6 100644
--- a/kde-look/qtcurve-gtk2/HISTORY
+++ b/kde-look/qtcurve-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.5.2
+
 2010-06-29 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.5.0
 
diff --git a/kde4-apps/k3b4/DETAILS b/kde4-apps/k3b4/DETAILS
index 685ef19..4c8c1ed 100755
--- a/kde4-apps/k3b4/DETAILS
+++ b/kde4-apps/k3b4/DETAILS
@@ -8,8 +8,8 @@ if [[ $K3B_VER == devel ]];then
   FORCE_DOWNLOAD=1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
 else
-         VERSION=2.0.0
-     SOURCE_HASH=sha512:8ac59a08b1598c10b9efbdfc1f2da977a934023c073507575503e148305db75d07e57cbcf2aca05df5adec6dc285c2a5d65c763ef221878881bba5b4822dc04c
+         VERSION=2.0.1
+     SOURCE_HASH=sha512:c9cb3e34e56e9d5124d65fbb65377bb5cbc94346c40b414c18efb6547dc987b049c79298a924da931dbe32e057b285956647f94f9d33ada79cd2072e46c73ac3
           SOURCE=${SPELLX}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/k3b/${SOURCE}
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4-apps/k3b4/HISTORY b/kde4-apps/k3b4/HISTORY
index 63beaad..7f1acec 100644
--- a/kde4-apps/k3b4/HISTORY
+++ b/kde4-apps/k3b4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.0.1
+
 2010-06-29 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.0.0
 	  little cosmetic fixes
diff --git a/kde4-apps/konversation4/DETAILS b/kde4-apps/konversation4/DETAILS
index 0513d36..168e82c 100755
--- a/kde4-apps/konversation4/DETAILS
+++ b/kde4-apps/konversation4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=konversation4
           SPELLX=konversation
-         VERSION=1.3
-     SOURCE_HASH=sha512:5e5bb7626e4817c7c624e7f4a669aafaf83ca38a708b42d6af4fc7454219fd3c9b831b2aa6f77d4f8801f242470889c145329180fff86552fa4613be0d9c1934
+         VERSION=1.3.1
+     SOURCE_HASH=sha512:6b66fb5f1f69f32b62963bae6946ef37363c0e7b6e27a57b4c36941360ec52a55ae1103af2fa9bf0f5bdbd8a61ad7487cc806b922fcabb0145fb2cbd0f956634
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/$SPELLX/$VERSION/src/$SOURCE
diff --git a/kde4-apps/konversation4/HISTORY b/kde4-apps/konversation4/HISTORY
index 948f727..f5809f8 100644
--- a/kde4-apps/konversation4/HISTORY
+++ b/kde4-apps/konversation4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.3.1
+
 2010-06-09 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.3
 
diff --git a/kde4-look/qtcurve-kde4/DETAILS b/kde4-look/qtcurve-kde4/DETAILS
index c42f029..d21d2ab 100755
--- a/kde4-look/qtcurve-kde4/DETAILS
+++ b/kde4-look/qtcurve-kde4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=qtcurve-kde4
-         VERSION=1.5.0
-     SOURCE_HASH=sha512:4e766e4989c8c7dd9b2b84aef25e68b379c4ab99948e108bc5c29d76c70378ce91ac3faec9514550427560c219abb92c24fc6c7d18f98187c7e59a6130540454
+         VERSION=1.5.2
+     SOURCE_HASH=sha512:dc944d77eceab5881f41d687850c9ef3aace89bc2aa89e4bc0ace0c5ce3b3dfbf1e8da725f35c4a7e25e4f30898af9712cf5eefeab36486c261572a1eec41b09
           SOURCE=QtCurve-KDE4-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://craigd.wikispaces.com/file/view/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QtCurve-KDE4-${VERSION}"
diff --git a/kde4-look/qtcurve-kde4/HISTORY b/kde4-look/qtcurve-kde4/HISTORY
index 4031435..6949fda 100644
--- a/kde4-look/qtcurve-kde4/HISTORY
+++ b/kde4-look/qtcurve-kde4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.5.2
+
 2010-06-29 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.5.0
 
diff --git a/kde4/kde4-profile/DEPENDS b/kde4/kde4-profile/DEPENDS
index d2a6ced..8cdf030 100755
--- a/kde4/kde4-profile/DEPENDS
+++ b/kde4/kde4-profile/DEPENDS
@@ -48,6 +48,19 @@ optional_depends  kdetoys4        \
                   ""              \
                   "for KDE toys"  &&
 
+optional_depends kdeartwork4 "" "" \
+                 "for additional themes, sounds, wallpapers, and styles" &&
+
+optional_depends kde4-l10n "" "" \
+                 "for Translated KDE messages" &&
+
+optional_depends kdeplasmoids4 "" "" \
+                 "for themes and applets for KDE4" &&
+
+optional_depends kdeaccessibility4 "" "" \
+                 "for KDE Accessibility Aids" &&
+
+
 optional_depends  kdeutils4                                     \
                   ""                                            \
                   ""                                            \
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index 3e72580..96d676c 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: added kdeartwork4, kde4-l10n, kdeplasmoids4 and kdeaccessibility4
+
 2009-07-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version na
 	  profie does not need a version
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 4e6807c..bede7a6 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -6,7 +6,6 @@ depends shared-desktop-ontologies  &&
 depends soprano  &&
 depends redland  &&
 depends raptor   &&
-runtime_depends virtuoso &&
 optional_depends  libxscrnsaver '' '' 'screen saver support'      &&
 optional_depends  FAM         '' '' 'file change notification'  &&
 optional_depends  acl         '' '' 'access control lists support' &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 4d07e1c..1d3c018 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS: removed runtime dependency on virtuoso
+
 2010-06-30 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.4.5
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 7bcfa34..6eedc9a 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,10 @@
+2010-08-14 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: updated latest to patch-2.6.35.2
+	* info/patches/maintenance_patches/patch-2.6.35.2: added
+	* info/patches/maintenance_patches/patch-2.6.34.4: added
+	* info/patches/maintenance_patches/patch-2.6.32.19: added
+	* info/patches/maintenance_patches/patch-2.6.27.51: added
+
 2010-08-11 Ladislav Hagara <hgr at vabo.cz>
 	* latest.defaults: updated latest to patch-2.6.35.1
 	* info/patches/maintenance_patches/patch-2.6.35.1: added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.51 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.51
new file mode 100755
index 0000000..f9dfbd4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.51
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.51"
+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.32.19 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.19
new file mode 100755
index 0000000..2ffe752
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.19
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.19"
+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.34.4 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.4
new file mode 100755
index 0000000..8f37a8b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.34"
+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/maintenance_patches/patch-2.6.35.2 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.2
new file mode 100755
index 0000000..fa29c27
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.2
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.2"
+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/latest.defaults b/kernels/linux/latest.defaults
index 1b982a7..a6ab130 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
 LATEST_2_6=2.6.35
 LATEST_PRE_2_6=patch-2.6.35
-LATEST_maintenance_patches=patch-2.6.35.1
+LATEST_maintenance_patches=patch-2.6.35.2
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index e366741..7f48359 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -8,6 +8,11 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
       LICENSE[0]="LATER"
          ENTERED=20090729
            TMPFS=off
+if [[ $TTMF_ARCHIVE == y ]]; then
+         ARCHIVE=on
+else
+         ARCHIVE=off
+fi
         KEYWORDS=""
            SHORT="TeX Live Metafont package"
 cat << EOF
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index 9472eee..8bd90b6 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,8 @@
+2010-08-13 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PREPARE: added explanation and queries for size saving
+	* PRE_BUILD: remove the extra pdfs if requested
+	* DETAILS: don't archive if requested
+
 2010-05-01 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS: fix description
 
diff --git a/latex/texlive-texmf/PREPARE b/latex/texlive-texmf/PREPARE
new file mode 100755
index 0000000..13189b7
--- /dev/null
+++ b/latex/texlive-texmf/PREPARE
@@ -0,0 +1,8 @@
+message &&
+message "The texlive-texmf is a very large package including a big chunk of CTAN." &&
+message "A lot of the modules include pdfs, but also their sources in tex format." &&
+config_query TTMF_SMALL "Do you want to remove these excess PDFs? (saves ~350M of 2.2G)" n &&
+
+message "Also, since this spell only copies the files over, the creation of an archive" \
+message "is usually a waste of time and diskspace."
+config_query TTMF_ARCHIVE "Do you want cast to create an archive of the spell? (saves ~1G)" n
diff --git a/latex/texlive-texmf/PRE_BUILD b/latex/texlive-texmf/PRE_BUILD
index f746946..9a93cfa 100755
--- a/latex/texlive-texmf/PRE_BUILD
+++ b/latex/texlive-texmf/PRE_BUILD
@@ -1,4 +1,15 @@
 cd $BUILD_DIRECTORY &&
 mk_source_dir "$SOURCE_DIRECTORY" &&
 verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+
+# find all the pdfs, strip the extension and then check if their source is
+# also present. If it is, remove the pdf.
+if [[ $TTMF_SMALL == y ]]; then
+  find "$SOURCE_DIRECTORY" -type f -iname "*.pdf" | sed 's,....$,,' |
+    while read p; do
+      if [[ -e "$p.pdf" && -e "$p.tex" ]]; then
+        rm "$p.pdf"
+      fi
+    done
+fi
diff --git a/libs/elfutils/DETAILS b/libs/elfutils/DETAILS
index 359f312..0d9aa51 100755
--- a/libs/elfutils/DETAILS
+++ b/libs/elfutils/DETAILS
@@ -5,8 +5,8 @@
       SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=https://fedorahosted.org/releases/e/l/elfutils/$SOURCE
-  SOURCE2_URL[0]=https://fedorahosted.org/releases/e/l/elfutils/$SOURCE2
+   SOURCE_URL[0]=https://fedorahosted.org/releases/e/l/elfutils/$VERSION/$SOURCE
+  SOURCE2_URL[0]=https://fedorahosted.org/releases/e/l/elfutils/$VERSION/$SOURCE2
     SOURCE_HINTS=no-check-certificate
    SOURCE2_HINTS=no-check-certificate
       LICENSE[0]=GPL2
diff --git a/libs/elfutils/DOWNLOAD b/libs/elfutils/DOWNLOAD
new file mode 100755
index 0000000..87e7b3f
--- /dev/null
+++ b/libs/elfutils/DOWNLOAD
@@ -0,0 +1,2 @@
+wget --no-check-certificate --secure-protocol=SSLv2 -O "$SOURCE_CACHE/$SOURCE" "$SOURCE_URL" 2>&1 &&
+wget --no-check-certificate --secure-protocol=SSLv2 -O "$SOURCE_CACHE/$SOURCE2" "$SOURCE2_URL" 2>&1
diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY
index 5f3e684..61ffe41 100644
--- a/libs/elfutils/HISTORY
+++ b/libs/elfutils/HISTORY
@@ -1,3 +1,7 @@
+2010-08-17 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS: Use other download URL
+	* DOWNLOAD: force SSLv2, otherwise download fails
+
 2010-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.148
 
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 71d430b..f23db24 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -60,6 +60,9 @@ fi &&
 export  CFLAGS="${CFLAGS/-ffast-math/}"  &&
 export  CC=gcc                           &&
 
+# don't strip, so thread debugging works #15017
+export LDFLAGS="${LDFLAGS//-s/}"  &&
+
 #
 # LD_LIBRARY_PATH includes $PWD bug
 #
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8b172d2..cdfcf6a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* BUILD: disable stripping, so thread debugging works #15017
+
 2010-08-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
 	* PRE_BUILD, binutils-2.20.patch: removed patch
diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index 789c051..88d2e35 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libvirt
-         VERSION=0.8.2
+         VERSION=0.8.3
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 455f46c..f715af7 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2010-08-11 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.8.3
+
 2010-08-03 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Suggest dependency on any provider of QEMU to actually run the
 	  QEMU VMs
diff --git a/libs/libvirt/libvirt-0.8.2.tar.gz.sig b/libs/libvirt/libvirt-0.8.2.tar.gz.sig
deleted file mode 100644
index 6ce25d6..0000000
Binary files a/libs/libvirt/libvirt-0.8.2.tar.gz.sig and /dev/null differ
diff --git a/libs/libvirt/libvirt-0.8.3.tar.gz.sig b/libs/libvirt/libvirt-0.8.3.tar.gz.sig
new file mode 100644
index 0000000..2a86d9d
Binary files /dev/null and b/libs/libvirt/libvirt-0.8.3.tar.gz.sig differ
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 3e896b5..5fd76f3 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -8,65 +8,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
   SOURCE2_URL[0]=${SOURCEFORGE_URL}/re-alpine/${SOURCE2}
       SOURCE_GPG=re-alpine.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-if [[ $ALPINE_CHAPPA == y ]]; then
-         SOURCE3=unverified.patch.gz
-         SOURCE4=streamlock.patch.gz
-         SOURCE5=unixnullbug.patch.gz
-         SOURCE6=status.patch.gz
-         SOURCE7=circtab.patch.gz
-         SOURCE8=reply.patch.gz
-         SOURCE9=fromheader.patch.gz
-        SOURCE10=colortext.patch.gz
-        SOURCE11=searchheader.patch.gz
-        SOURCE12=delpassword.patch.gz
-        SOURCE13=preservefields.patch.gz
-        SOURCE14=base64errors.patch.gz
-        SOURCE15=streaminfo.patch.gz
-        SOURCE16=colorfolder.patch.gz
-        SOURCE17=tokencolor.patch.gz
-        SOURCE18=rules.patch.gz
-        SOURCE19=outgoing.patch.gz
-        SOURCE20=fillpara.patch.gz
-        SOURCE21=maildir.patch.gz
-    SOURCE3_HASH=sha512:9849b96dc72d420856cebcacb8c08693cc56350bb92adfd32d3838a4b19edd1f517509f3a8653c7cf294ae213967a89f1ffb1bcc8c6beb86f716c475fbb28183
-    SOURCE4_HASH=sha512:9c8a69aae20cb045a29d1c0a05d24b479aa0f7df40dbe41f812052f869d1b1d8490f2517b8d33ca007733a30c4c15c05ae9fd39d1941373baa3a888b9bf2134c
-    SOURCE5_HASH=sha512:e7194c137f648eb71271109d156ce0cb034fc6728c3aa0a1e9d498fa5af547d67f6beb3fe49a320b831e37cc53870c3c00a32887c731def13cd803d313aba1a4
-    SOURCE6_HASH=sha512:cdba9d4faaa00a2de0d29a57ee9de22b953b100781b305a563b10c503838da1b5a0bb3387ae28145a6620cd5b5846a26dc2236debfae10fc2ff9952c8d25ae13
-    SOURCE7_HASH=sha512:751ad62d3e8ebd4671b186fe111e3a1934d6068e611ec6071d7123c1dade8bd20ae8918a15307c130fc8a02a063dff58b865e9d153bba0877c205e8d89c3492b
-    SOURCE8_HASH=sha512:62f1ea73b71dfa1c3ac9f760a3c247d4d7eb09b8b955aa198fc0886c709e17e3988556c5bad2ce9389832bb61698826a61170a75862af3d6bbc958bcf93927c5
-    SOURCE9_HASH=sha512:b6472c6e5189721fd3cc9520edf21b79e91924191329eda560d94f17560cec3cb951c28a9c446b332426c83842f943fec3c443e6646962e51bea89aeef5e4eb0
-   SOURCE10_HASH=sha512:a720bd443498e793cc0acca8994d678f99e225a59a927a2219986317cfe1673245fa00d115608b704685af222c2da6f9668158de69ccc2173c9626d2c1c17b6c
-   SOURCE11_HASH=sha512:bbd3cc488d94400efcaf731bfbacca2953900257c72866259bf6f58cfdb1a0bd73aaedacf95c51a4da5e168eb77b10b974960c082cff8249088bba5ea2ff0a7d
-   SOURCE12_HASH=sha512:62070aa55a2233a8780bfb80227b5635c71e4a1e878e34b0cd384da88193a5638ee5532bd6fbc717f6b5cec610c39a452b4d92f7966f0118d656dc9c9e2960a3
-   SOURCE13_HASH=sha512:4b6728a30661746c09b4c6f00a84a570157c50bc041cca8b301e9add05a78ce16bc49dc0ee291532904ed2ac41f5147d952f50a5fee2df5f15538b3c5672d2d3
-   SOURCE14_HASH=sha512:adc25e5a90006ddbb4db0b13de9dc4f7eaf48f78a6924695d75b0ea2cc848097c9314bac5c06140315a7d2e7a7fe2b226d74abb012e473c133f8e80d85395751
-   SOURCE15_HASH=sha512:2ff2de0a9aca339ef84cd1027dacaf5e300f0da8782df20d23a0aca9bd96c9b7dbc072b559e8a8110c170557fe86f958111368ac4b4042ccdc976011221ad077
-   SOURCE16_HASH=sha512:0613f76a6a5ad5a6f199b1560bf25f26157b445aaff89b8ece2253fded47b38adb663000a8fc40bba446dc566ad1f29c689e21ab2940ddac40f9b44222836826
-   SOURCE17_HASH=sha512:ee9a85cb4da85f7af6c3212ad5de438c07d7b085eb29ec7d014460858b06cfadca12702cd12b040aa4fca818a2567b826aaef92e022680a1200019e4c1cf77a8
-   SOURCE18_HASH=sha512:2e6c0fe92fb99551187a27d957cfa4f612874b8773998becf3c9e3baefc7f7f8017075000ca824987ebaa19473aeb294e545138f019a6c0e4443aae875d0a499
-   SOURCE19_HASH=sha512:e3eadd21e35337e5f0c152119f95339f6a3d0a076eb9e01aa76c86d2268a332eebd918122eeee9c823e532ad123a6f3d4712bae287cb37e2e1283f77c94291e5
-   SOURCE20_HASH=sha512:3da3451e58391dd2ee082952e2d0e461a2111b85bda532586b3ccddc540af6164195eccc71d53ae2212ba50e1a78279aa53a679ea1e94c3cddbf025ef37c83ca
-   SOURCE21_HASH=sha512:7b3bbb80c7e236c373ca90a580052e1316fc668e5055339d3beb471222e4e8f59c41777ff548af01dc8b08dbf251b7a80d5eeea8fce54586ef790ee7403f2914
-  SOURCE3_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/unverified.patch.gz
-  SOURCE4_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/streamlock.patch.gz
-  SOURCE5_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/unixnullbug.patch.gz
-  SOURCE6_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/status.patch.gz
-  SOURCE7_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/circtab.patch.gz
-  SOURCE8_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/reply.patch.gz
-  SOURCE9_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/fromheader.patch.gz
- SOURCE10_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/colortext.patch.gz
- SOURCE11_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/searchheader.patch.gz
- SOURCE12_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/delpassword.patch.gz
- SOURCE13_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/preservefields.patch.gz
- SOURCE14_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/base64errors.patch.gz
- SOURCE15_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/streaminfo.patch.gz
- SOURCE16_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/colorfolder.patch.gz
- SOURCE17_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/tokencolor.patch.gz
- SOURCE18_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/rules.patch.gz
- SOURCE19_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/outgoing.patch.gz
- SOURCE20_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/fillpara.patch.gz
- SOURCE21_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/maildir.patch.gz
-fi
 if [[ $ALPINE_TOPAL == y ]]; then
         VERSION3=72
         SOURCE22=topal-package-$VERSION3.tgz
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index a11c4bc..60508dc 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,11 @@
+2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* maildir.patch.diff: no longer needed
+	* outgoing.patch.diff: no longer needed
+	* rules.patch.diff: no longer needed
+	* DETAILS: removed chappa patches, creates a legally questionable binary
+	* PREPARE: removed chappa patches, creates a legally questionable binary
+	* PRE_BUILD: removed chappa patches, creates a legally questionable binary
+
 2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: topal update to 72, fixes bug 15633
 	* PRE_BUILD: fix to build a native mime-tool
diff --git a/mail/alpine/PREPARE b/mail/alpine/PREPARE
index 85443a6..90ac48b 100755
--- a/mail/alpine/PREPARE
+++ b/mail/alpine/PREPARE
@@ -1,11 +1 @@
-message "To learn more about chappa patches see:"
-message "http://staff.washington.edu/chappa/alpine/"
-message "The ones included with this spell are:"
-message "unverified.patch streamlock.patch unixnullbug.patch"
-message "status.patch circtab.patch reply.patch fromheader.patch"
-message "colortext.patch searchheader.patch delpassword.patch"
-message "preservefields.patch base64errors.patch streaminfo.patch"
-message "colorfolder.patch tokencolor.patch rules.patch outgoing.patch"
-message "fillpara.patch maildir.patch"
-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/alpine/PRE_BUILD b/mail/alpine/PRE_BUILD
index f32158c..a2fc08c 100755
--- a/mail/alpine/PRE_BUILD
+++ b/mail/alpine/PRE_BUILD
@@ -1,25 +1,5 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY  &&
-if [[ $ALPINE_CHAPPA == y ]]; then
-local patchno &&
-local tmpsource &&
-for patchno in $(seq 3 21) ; do
-tmpsource="SOURCE${patchno}" &&
-verify_file $patchno &&
-cp -f $SOURCE_CACHE/${!tmpsource} . &&
-gunzip -f ${!tmpsource} &&
-if [[ ${!tmpsource} == outgoing.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/outgoing.patch.diff
-fi &&
-if [[ ${!tmpsource} == rules.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/rules.patch.diff
-fi &&
-if [[ ${!tmpsource} == maildir.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/maildir.patch.diff
-fi &&
-patch -p1 < ${!tmpsource/.gz}
-done
-fi &&
 if [[ $ALPINE_TOPAL == y ]]; then
 unpack_file 22 &&
 patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-1 &&
diff --git a/mail/alpine/maildir.patch.diff b/mail/alpine/maildir.patch.diff
deleted file mode 100644
index a5536fa..0000000
--- a/mail/alpine/maildir.patch.diff
+++ /dev/null
@@ -1,227 +0,0 @@
---- maildir.patch	2009-08-31 20:01:27.000000000 +0200
-+++ ../maildir.patch	2009-02-24 06:48:08.000000000 +0100
-@@ -1,6 +1,6 @@
- diff -rc alpine-2.00/alpine/alpine.c alpine-2.00.maildir/alpine/alpine.c
- *** alpine-2.00/alpine/alpine.c	2008-06-03 15:31:05.000000000 -0700
----- alpine-2.00.maildir/alpine/alpine.c	2009-08-31 10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/alpine/alpine.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 553,558 ****
- --- 553,563 ----
-@@ -17,7 +17,7 @@
-   	if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF))
- diff -rc alpine-2.00/alpine/confscroll.c alpine-2.00.maildir/alpine/confscroll.c
- *** alpine-2.00/alpine/confscroll.c	2008-08-21 15:14:45.000000000 -0700
----- alpine-2.00.maildir/alpine/confscroll.c	2009-08-31 10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/alpine/confscroll.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 5489,5494 ****
- --- 5489,5500 ----
-@@ -35,7 +35,7 @@
-   	cur_rule_value(var, TRUE, FALSE);
- diff -rc alpine-2.00/imap/src/c-client/mail.c alpine-2.00.maildir/imap/src/c-client/mail.c
- *** alpine-2.00/imap/src/c-client/mail.c	2008-06-04 11:39:54.000000000 -0700
----- alpine-2.00.maildir/imap/src/c-client/mail.c	2009-08-31 10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/c-client/mail.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 991,997 ****
-     MAILSTREAM *ts;
-@@ -82,7 +82,7 @@
-       sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox);
- diff -rc alpine-2.00/imap/src/c-client/mail.h alpine-2.00.maildir/imap/src/c-client/mail.h
- *** alpine-2.00/imap/src/c-client/mail.h	2008-08-08 10:34:22.000000000 -0700
----- alpine-2.00.maildir/imap/src/c-client/mail.h	2009-08-31 10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/c-client/mail.h	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 353,358 ****
- --- 353,362 ----
-@@ -98,7 +98,7 @@
-   
- diff -rc alpine-2.00/imap/src/osdep/unix/dummy.c alpine-2.00.maildir/imap/src/osdep/unix/dummy.c
- *** alpine-2.00/imap/src/osdep/unix/dummy.c	2008-06-04 11:18:34.000000000 -0700
----- alpine-2.00.maildir/imap/src/osdep/unix/dummy.c	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/dummy.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 106,116 ****
-    * Accepts: mailbox name
-@@ -169,16 +169,16 @@
-     if (!dummy_file (oldname,old) || !(s = dummy_file (mbx,newname)) ||
-         stat (oldname,&sbuf) || ((s = strrchr (s,'/')) && !s[1] &&
- diff -rc alpine-2.00/imap/src/osdep/unix/maildir.c alpine-2.00.maildir/imap/src/osdep/unix/maildir.c
--*** alpine-2.00/imap/src/osdep/unix/maildir.c	2009-08-31 11:01:22.000000000 -0700
----- alpine-2.00.maildir/imap/src/osdep/unix/maildir.c	2009-08-31 11:01:17.000000000 -0700
-+*** alpine-2.00/imap/src/osdep/unix/maildir.c	2008-08-26 20:56:05.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/maildir.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 0 ****
----- 1,2579 ----
-+--- 1,2583 ----
- + /*
- +  * Maildir driver for Alpine 2.00
- +  * 
- +  * Written by Eduardo Chappa <chappa at washington.edu>
--+  * Last Update: August 31, 2009
-++  * Last Update: May 16, 2008
- +  *
- +  */
- + 
-@@ -1221,25 +1221,29 @@
- +       return NULL;
- +   }
- + 
--+   if (flags & FT_INTERNAL){
--+      if(elt->private.msg.header.text.size > LOCAL->buflen){
-++   if ((flags & FT_INTERNAL) &&
-++         (elt->private.msg.header.text.size > LOCAL->buflen)){
- +          fs_give ((void **) &LOCAL->buf);
- +          LOCAL->buf = (char *) fs_get ((LOCAL->buflen =
- +                                  elt->private.msg.header.text.size) + 1);
--+      }
--+      read (LOCAL->fd, (void *)LOCAL->buf, elt->private.msg.header.text.size);
--+      LOCAL->buf[*length = elt->private.msg.header.text.size] = '\0';
- +   }
--+   else{
-++   else
- +       s = (char *) fs_get(elt->private.msg.header.text.size+1);
--+       read (LOCAL->fd, (void *)s, elt->private.msg.header.text.size);
--+       s[elt->private.msg.header.text.size] = '\0';
--+       *length = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen,s,
--+                        elt->private.msg.header.text.size);
--+       fs_give ((void **) &s);
-++   if (LOCAL->fd >= 0){
-++      read (LOCAL->fd, ((flags & FT_INTERNAL) ? (void *)LOCAL->buf : (void *)s),
-++                                       elt->private.msg.header.text.size);
-++      if (flags & FT_INTERNAL)
-++         LOCAL->buf[*length = elt->private.msg.header.text.size] = '\0';
-++      else{
-++         s[*length = elt->private.msg.header.text.size] = '\0';
-++         *length = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen,s,
-++                           elt->private.msg.header.text.size);
-++         fs_give ((void **) &s);
-++      }
- +   }
- +   elt->private.msg.text.offset = elt->private.msg.header.text.size;
- +   elt->private.msg.text.text.size = MDSIZE(elt) - elt->private.msg.text.offset;
-++   if(s) fs_give((void **)&s);
- +   close(LOCAL->fd); LOCAL->fd = -1;
- +   return LOCAL->buf;
- + }
-@@ -2568,6 +2572,7 @@
- + 	|| !strncmp(d->d_name, MDUIDTEMP, strlen(MDUIDTEMP)))
- +        break;
- +   }
-++   closedir(dir);
- +   rv = d ? !strncmp(d->d_name, tmp, strlen(tmp)) : 1;
- +   createtemp = d ? 0 : 1;
- +   if (d && rv == 0){	/* is there a temp file that is not ours? */
-@@ -2581,7 +2586,6 @@
- + 	unlink(tmp);
- +      }
- +   }
--+   closedir(dir);
- +   if(createtemp){
- +     FILE *fp;
- +     sprintf(tmp,"%s/%s.%d.%lu", LOCAL->dir, MDUIDTEMP, getpid(), time(0));
-@@ -2754,8 +2758,8 @@
- +   }
- + }
- diff -rc alpine-2.00/imap/src/osdep/unix/maildir.h alpine-2.00.maildir/imap/src/osdep/unix/maildir.h
--*** alpine-2.00/imap/src/osdep/unix/maildir.h	2009-08-31 11:01:22.000000000 -0700
----- alpine-2.00.maildir/imap/src/osdep/unix/maildir.h	2009-08-31 10:59:42.000000000 -0700
-+*** alpine-2.00/imap/src/osdep/unix/maildir.h	2008-08-26 20:56:05.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/maildir.h	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 0 ****
- --- 1,225 ----
-@@ -2986,7 +2990,7 @@
- + 
- diff -rc alpine-2.00/imap/src/osdep/unix/Makefile alpine-2.00.maildir/imap/src/osdep/unix/Makefile
- *** alpine-2.00/imap/src/osdep/unix/Makefile	2008-06-04 11:18:34.000000000 -0700
----- alpine-2.00.maildir/imap/src/osdep/unix/Makefile	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/Makefile	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 144,150 ****
-   # However, mh needs to be before any sysinbox formats (such as mmdf or unix)
-@@ -3057,7 +3061,7 @@
-   
- diff -rc alpine-2.00/imap/src/osdep/unix/os_cyg.h alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h
- *** alpine-2.00/imap/src/osdep/unix/os_cyg.h	2008-06-04 11:18:34.000000000 -0700
----- alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 47,52 ****
- --- 47,53 ----
-@@ -3070,7 +3074,7 @@
-   
- diff -rc alpine-2.00/pith/conf.c alpine-2.00.maildir/pith/conf.c
- *** alpine-2.00/pith/conf.c	2008-08-22 17:07:05.000000000 -0700
----- alpine-2.00.maildir/pith/conf.c	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/conf.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 427,432 ****
- --- 427,435 ----
-@@ -3154,7 +3158,7 @@
-   #if defined(DOS) || defined(OS2)
- diff -rc alpine-2.00/pith/conf.h alpine-2.00.maildir/pith/conf.h
- *** alpine-2.00/pith/conf.h	2008-08-19 17:27:11.000000000 -0700
----- alpine-2.00.maildir/pith/conf.h	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/conf.h	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 249,254 ****
- --- 249,258 ----
-@@ -3170,7 +3174,7 @@
-   #define VAR_REMOTE_ABOOK_METADATA    vars[V_REMOTE_ABOOK_METADATA].current_val.p
- diff -rc alpine-2.00/pith/conftype.h alpine-2.00.maildir/pith/conftype.h
- *** alpine-2.00/pith/conftype.h	2008-08-19 17:27:11.000000000 -0700
----- alpine-2.00.maildir/pith/conftype.h	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/conftype.h	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 114,119 ****
- --- 114,122 ----
-@@ -3197,7 +3201,7 @@
-   	F_VERBOSE_POST,
- diff -rc alpine-2.00/pith/init.c alpine-2.00.maildir/pith/init.c
- *** alpine-2.00/pith/init.c	2007-08-16 15:25:10.000000000 -0700
----- alpine-2.00.maildir/pith/init.c	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/init.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 407,412 ****
- --- 407,415 ----
-@@ -3212,7 +3216,7 @@
-   #endif
- diff -rc alpine-2.00/pith/pattern.c alpine-2.00.maildir/pith/pattern.c
- *** alpine-2.00/pith/pattern.c	2008-07-14 11:01:54.000000000 -0700
----- alpine-2.00.maildir/pith/pattern.c	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/pattern.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 5482,5487 ****
- --- 5482,5495 ----
-@@ -3282,7 +3286,7 @@
-   
- diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.maildir/pith/pine.hlp
- *** alpine-2.00/pith/pine.hlp	2008-08-22 17:07:05.000000000 -0700
----- alpine-2.00.maildir/pith/pine.hlp	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/pine.hlp	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 21253,21258 ****
- --- 21253,21354 ----
-@@ -3442,7 +3446,7 @@
-   <HEAD>
- diff -rc alpine-2.00/pith/send.c alpine-2.00.maildir/pith/send.c
- *** alpine-2.00/pith/send.c	2008-08-06 11:25:58.000000000 -0700
----- alpine-2.00.maildir/pith/send.c	2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/send.c	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 256,261 ****
- --- 256,268 ----
-@@ -3460,8 +3464,8 @@
-   	    /*
-   	     * The mbox is relative to the home directory.
- diff -rc alpine-2.00/README.maildir alpine-2.00.maildir/README.maildir
--*** alpine-2.00/README.maildir	2009-08-31 11:01:22.000000000 -0700
----- alpine-2.00.maildir/README.maildir	2009-08-31 10:59:42.000000000 -0700
-+*** alpine-2.00/README.maildir	2008-08-26 20:56:05.000000000 -0700
-+--- alpine-2.00.maildir/README.maildir	2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 0 ****
- --- 1,153 ----
diff --git a/mail/alpine/outgoing.patch.diff b/mail/alpine/outgoing.patch.diff
deleted file mode 100644
index 43fbc81..0000000
--- a/mail/alpine/outgoing.patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- outgoing.patch	2008-08-27 05:56:19.000000000 +0200
-+++ ../outgoing.patch	2009-08-04 08:49:24.000000000 +0200
-@@ -533,7 +533,7 @@
-       if(!(nonempty_patterns(rflags, &pstate) &&
-            first_pattern(&pstate))){
- +        if (!ps->send_immediately)
--  	q_status_message(SM_ORDER, 0, 3,
-+  	q_status_message(SM_ORDER, 3, 3,
-   			 _("No roles available. Use Setup/Rules to add roles."));
- + 	else{
- + 	   printf(_("No roles available. Use Setup/Rules to add roles."));
diff --git a/mail/alpine/rules.patch.diff b/mail/alpine/rules.patch.diff
deleted file mode 100644
index 70c0586..0000000
--- a/mail/alpine/rules.patch.diff
+++ /dev/null
@@ -1,372 +0,0 @@
---- rules.patch	2008-10-05 06:27:55.000000000 +0200
-+++ ../rules.patch	2009-08-04 09:36:55.000000000 +0200
-@@ -458,223 +458,167 @@
-   	}
-   
-   	return(ret);
--diff -rc alpine-2.00/alpine/reply.c alpine-2.00.rules/alpine/reply.c
--*** alpine-2.00/alpine/reply.c	2008-06-03 08:54:15.000000000 -0700
----- alpine-2.00.rules/alpine/reply.c	2008-10-04 21:26:31.000000000 -0700
--***************
--*** 61,67 ****
--  #include "../pith/tempfile.h"
--  #include "../pith/busy.h"
--  #include "../pith/ablookup.h"
--! 
--  
--  /*
--   * Internal Prototypes
----- 61,68 ----
--  #include "../pith/tempfile.h"
--  #include "../pith/busy.h"
--  #include "../pith/ablookup.h"
--! #include "../pith/copyaddr.h"
--! #include "../pith/rules.h"
--  
--  /*
--   * Internal Prototypes
--***************
--*** 108,118 ****
--      long        msgno, j, totalm, rflags, *seq = NULL;
--      int         i, include_text = 0, times = -1, warned = 0, rv = 0,
--  		flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
--!     int         rolemsg = 0, copytomsg = 0;
--      gf_io_t     pc;
--      PAT_STATE   dummy;
--      REDRAFT_POS_S *redraft_pos = NULL;
--      ACTION_S   *role = NULL, *nrole;
--  #if	defined(DOS) && !defined(_WINDOWS)
--      char *reserve;
--  #endif
----- 109,120 ----
--      long        msgno, j, totalm, rflags, *seq = NULL;
--      int         i, include_text = 0, times = -1, warned = 0, rv = 0,
--  		flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
--!     int         rolemsg = 0, copytomsg = 0, do_role_early = 0;
--      gf_io_t     pc;
--      PAT_STATE   dummy;
--      REDRAFT_POS_S *redraft_pos = NULL;
--      ACTION_S   *role = NULL, *nrole;
--+     RULE_RESULT *rule;
--  #if	defined(DOS) && !defined(_WINDOWS)
--      char *reserve;
--  #endif
--***************
--*** 138,143 ****
----- 140,208 ----
--         && F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
--        reply_raw_body = 1;
--  
-+--- re-alpine-2.01/alpine/reply.c.orig	2009-08-04 09:18:46.000000000 +0200
-++++ re-alpine-2.01/alpine/reply.c	2009-08-04 09:35:27.000000000 +0200
-+@@ -61,6 +61,8 @@
-+ #include "../pith/tempfile.h"
-+ #include "../pith/busy.h"
-+ #include "../pith/ablookup.h"
-++#include "../pith/copyaddr.h"
-++#include "../pith/rules.h"
-+ 
-+ 
-+ /*
-+@@ -107,12 +109,13 @@
-+     char       *tmpfix = NULL, *prefix = NULL, *fcc = NULL, *errmsg = NULL;
-+     long        msgno, j, totalm, rflags, *seq = NULL;
-+     int         i, include_text = 0, times = -1, warned = 0, rv = 0,
-+-		flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
-+-    int         rolemsg = 0, copytomsg = 0;
-++    flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
-++    int         rolemsg = 0, copytomsg = 0, do_role_early = 0;
-+     gf_io_t     pc;
-+     PAT_STATE   dummy;
-+     REDRAFT_POS_S *redraft_pos = NULL;
-+     ACTION_S   *role = NULL, *nrole;
-++    RULE_RESULT *rule;
-+ #if	defined(DOS) && !defined(_WINDOWS)
-+     char *reserve;
-+ #endif
-+@@ -138,7 +141,71 @@
-+        && F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
-+       reply_raw_body = 1;
-+ 
-+-    /*
- +     /* Setup possible role */
- +     if(role_arg)
- +       role = copy_action(role_arg);
- + 
- +     if(!role && F_ON(F_ENABLE_EDIT_REPLY_INDENT, pine_state)){
--+ 	for(msgno = mn_first_cur(pine_state->msgmap);
--+ 	    msgno > 0L;  msgno = mn_next_cur(pine_state->msgmap)){
-++   for(msgno = mn_first_cur(pine_state->msgmap);
-++       msgno > 0L;  msgno = mn_next_cur(pine_state->msgmap)){
- + 
--+ 	    env = pine_mail_fetchstructure(pine_state->mail_stream,
--+ 					   mn_m2raw(pine_state->msgmap, msgno),
--+ 					   NULL);
--+ 	    if(!env) {
--+ 		q_status_message1(SM_ORDER,3,4,
--+ 			    _("Error fetching message %s. Can't reply to it."),
--+ 				long2string(msgno));
--+ 		goto done_early;
--+ 	    }
-++       env = pine_mail_fetchstructure(pine_state->mail_stream,
-++              mn_m2raw(pine_state->msgmap, msgno),
-++              NULL);
-++       if(!env) {
-++     q_status_message1(SM_ORDER,3,4,
-++           _("Error fetching message %s. Can't reply to it."),
-++         long2string(msgno));
-++     goto done_early;
-++       }
- + 
--+ 	    if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env)){
--+ 	        RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
-++       if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env))     {
-++           RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
- +                                                 ps_global->rule_list);
--+ 	        RULE_S *prule = get_rule(list, rule->number);
--+ 		if(condition_contains_token(prule->condition, ROLE_TOKEN))
--+ 		  do_role_early++;
--+ 		if(rule->result)
--+ 		  fs_give((void **)&rule->result);
--+ 		fs_give((void **)&rule);
--+ 	    }
--+ 	}
-++           RULE_S *prule = get_rule(list, rule->number);
-++     if(condition_contains_token(prule->condition, ROLE_TOKEN))
-++       do_role_early++;
-++     if(rule->result)
-++       fs_give((void **)&rule->result);
-++     fs_give((void **)&rule);
-++       }
-++   }
- +     }
- + 
- +     if(do_role_early){
--+ 	rflags = ROLE_REPLY;
--+ 	if(nonempty_patterns(rflags, &dummy)){
--+ 	    /* setup default role */
--+ 	    nrole = NULL;
--+ 	    j = mn_first_cur(pine_state->msgmap);
--+ 	    do {
--+ 		role = nrole;
--+ 		nrole = set_role_from_msg(pine_state, rflags,
--+ 					  mn_m2raw(pine_state->msgmap, j),
--+ 					  NULL);
--+ 	    } while(nrole && (!role || nrole == role)
--+ 		    && (j=mn_next_cur(pine_state->msgmap)) > 0L);
--+ 
--+ 	    if(!role || nrole == role)
--+ 	      role = nrole;
--+ 	    else
--+ 	      role = NULL;
--+ 
--+ 	    if(confirm_role(rflags, &role))
--+ 	      role = combine_inherited_role(role);
--+ 	    else{				/* cancel reply */
--+ 		role = NULL;
--+ 		cmd_cancelled("Reply");
--+ 		goto done_early;
--+ 	    }
--+ 	}
-++   rflags = ROLE_REPLY;
-++   if(nonempty_patterns(rflags, &dummy)){
-++       /* setup default role */
-++       nrole = NULL;
-++       j = mn_first_cur(pine_state->msgmap);
-++       do {
-++     role = nrole;
-++     nrole = set_role_from_msg(pine_state, rflags,
-++             mn_m2raw(pine_state->msgmap, j),
-++             NULL);
-++       } while(nrole && (!role || nrole == role)
-++         && (j=mn_next_cur(pine_state->msgmap)) > 0L);
-++ 
-++       if(!role || nrole == role)
-++         role = nrole;
-++       else
-++         role = NULL;
-++ 
-++       if(confirm_role(rflags, &role))
-++         role = combine_inherited_role(role);
-++       else{       /* cancel reply */
-++     role = NULL;
-++     cmd_cancelled("Reply");
-++     goto done_early;
-++       }
-++   }
- +     }
- + 
- +     if (role)
--+ 	ps_global->role = cpystr(role->nick); /* remember the role */
--+ 
--      /*
--       * We may have to loop through first to figure out what default
--       * reply-indent-string to offer...
--***************
--*** 285,292 ****
--  		outgoing->subject = cpystr("Re: several messages");
--  	    }
--  	}
--! 	else
--! 	  outgoing->subject = reply_subject(env->subject, NULL, 0);
--      }
--  
--      /* fill reply header */
----- 350,367 ----
--  		outgoing->subject = cpystr("Re: several messages");
--  	    }
--  	}
--! 	else{
--! 	   RULE_RESULT *rule;
--! 	   rule = get_result_rule(V_RESUB_RULES,FOR_RESUB|FOR_TRIM , env);
--! 	   if (rule){
--! 	     outgoing->subject = reply_subject(rule->result, NULL, 0);
--! 	     if (rule->result)
--! 	        fs_give((void **)&rule->result);
--! 	     fs_give((void **)&rule);
--! 	   }
--! 	   else
--! 	       outgoing->subject = reply_subject(env->subject, NULL, 0);
--! 	}
--      }
--  
--      /* fill reply header */
--***************
--*** 305,315 ****
--      if(sp_expunge_count(pine_state->mail_stream))	/* cur msg expunged */
--        goto done_early;
--  
--!     /* Setup possible role */
--!     if(role_arg)
--!       role = copy_action(role_arg);
--! 
--!     if(!role){
--  	rflags = ROLE_REPLY;
--  	if(nonempty_patterns(rflags, &dummy)){
--  	    /* setup default role */
----- 380,386 ----
--      if(sp_expunge_count(pine_state->mail_stream))	/* cur msg expunged */
--        goto done_early;
--  
--!     if(!do_role_early){
--  	rflags = ROLE_REPLY;
--  	if(nonempty_patterns(rflags, &dummy)){
--  	    /* setup default role */
--***************
--*** 720,725 ****
----- 791,799 ----
--      if(prefix)
--        fs_give((void **)&prefix);
--  
--+     if (ps_global->role)
--+ 	fs_give((void **)&ps_global->role);
--+ 
--      if(fcc)
--        fs_give((void **) &fcc);
--  
--***************
--*** 1440,1448 ****
--  	}
--      }
--  
--!     if(role)
--        q_status_message1(SM_ORDER, 3, 4,
--  			_("Forwarding using role \"%s\""), role->nick);
--  
--      if(role && role->template){
--  	char *filtered;
----- 1514,1527 ----
--  	}
--      }
--  
--!     if (ps_global->role)
--!       fs_give((void **)&ps_global->role);
--! 
--!     if(role){
--        q_status_message1(SM_ORDER, 3, 4,
--  			_("Forwarding using role \"%s\""), role->nick);
--+       ps_global->role = cpystr(role->nick);
-++   ps_global->role = cpystr(role->nick); /* remember the role */
-++   
-++
-++    /*		
-+      * We may have to loop through first to figure out what default
-+      * reply-indent-string to offer...
-+      */
-+@@ -285,8 +352,18 @@
-+ 		outgoing->subject = cpystr("Re: several messages");
-+ 	    }
-+ 	}
-+-	else
-+-	  outgoing->subject = reply_subject(env->subject, NULL, 0);
-++  else{
-++     RULE_RESULT *rule;
-++     rule = get_result_rule(V_RESUB_RULES,FOR_RESUB|FOR_TRIM , env);
-++     if (rule){
-++       outgoing->subject = reply_subject(rule->result, NULL, 0);
-++       if (rule->result)
-++          fs_give((void **)&rule->result);
-++       fs_give((void **)&rule);
- +     }
--  
--      if(role && role->template){
--  	char *filtered;
--***************
--*** 1674,1679 ****
----- 1753,1759 ----
--  #if	defined(DOS) && !defined(_WINDOWS)
--      free((void *)reserve);
--  #endif
--+     outgoing->sparep = env && env->from ? copyaddr(env->from) : NULL;
--      pine_send(outgoing, &body, "FORWARD MESSAGE",
--  	      role, NULL, &reply, redraft_pos,
--  	      NULL, NULL, 0);
-++     else
-++         outgoing->subject = reply_subject(env->subject, NULL, 0);
-++  }
-+     }
-+ 
-+     /* fill reply header */
-+@@ -305,13 +382,7 @@
-+     if(sp_expunge_count(pine_state->mail_stream))	/* cur msg expunged */
-+       goto done_early;
-+ 
-+-    /* Setup possible role */
-+-     if (ps_global->reply.role_chosen)
-+-	role = ps_global->reply.role_chosen;
-+-     else if(role_arg)
-+-	role = copy_action(role_arg);
-+-
-+-    if(!role){
-++    if(!do_role_early){
-+ 	rflags = ROLE_REPLY;
-+ 	if(!ps_global->reply.role_chosen && nonempty_patterns(rflags, &dummy)){
-+ 	    /* setup default role */
-+@@ -1583,9 +1654,15 @@
-+ 	}
-+     }
-+ 
-+-    if(role)
-++    if (ps_global->role)
-++      fs_give((void **)&ps_global->role);
-++
-++    if(role){
-+       q_status_message1(SM_ORDER, 3, 4,
-+ 			_("Forwarding using role \"%s\""), role->nick);
-++      ps_global->role = cpystr(role->nick);
-++    }
-++
-+ 
-+     if(role && role->template){
-+ 	char *filtered;
-+@@ -1817,6 +1894,7 @@
-+ #if	defined(DOS) && !defined(_WINDOWS)
-+     free((void *)reserve);
-+ #endif
-++    outgoing->sparep = env && env->from ? copyaddr(env->from) : NULL;
-+     pine_send(outgoing, &body, "FORWARD MESSAGE",
-+ 	      role, NULL, &reply, redraft_pos,
-+ 	      NULL, NULL, 0);
- diff -rc alpine-2.00/alpine/roleconf.c alpine-2.00.rules/alpine/roleconf.c
- *** alpine-2.00/alpine/roleconf.c	2008-02-27 17:04:46.000000000 -0800
- --- alpine-2.00.rules/alpine/roleconf.c	2008-10-04 21:26:31.000000000 -0700
diff --git a/mail/cone/BUILD b/mail/cone/BUILD
deleted file mode 100755
index 97d4ec1..0000000
--- a/mail/cone/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="--with-certdb --with-devel" &&
-default_build
diff --git a/mail/cone/DEPENDS b/mail/cone/DEPENDS
index db9b542..e3e8788 100755
--- a/mail/cone/DEPENDS
+++ b/mail/cone/DEPENDS
@@ -5,6 +5,10 @@ optional_depends "aspell" \
                  "" \
                  "" \
                  "Aspell spellchecking support." &&
+optional_depends "ca-certificates" \
+                 "--with-certdb=/etc/ssl/certs" \
+                 "" \
+                 "Certificate support" &&
 optional_depends "openldap" \
                  "" \
                  "" \
diff --git a/mail/cone/DETAILS b/mail/cone/DETAILS
index acaf62d..13879bf 100755
--- a/mail/cone/DETAILS
+++ b/mail/cone/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cone
-         VERSION=0.74
+         VERSION=0.84
           SOURCE="$SPELL-$VERSION.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/courier/$SOURCE
          SOURCE2=$SOURCE.sig
diff --git a/mail/cone/HISTORY b/mail/cone/HISTORY
index 19a15da..511fcc9 100644
--- a/mail/cone/HISTORY
+++ b/mail/cone/HISTORY
@@ -1,3 +1,8 @@
+2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 0.84
+	* BUILD, PRE_BUILD, cone-gcc43.patch: removed
+	* DEPENDS: depend on ca-certificate for certdb
+
 2010-06-15 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: added SOURCE2_IGNORE for signature
 
diff --git a/mail/cone/PRE_BUILD b/mail/cone/PRE_BUILD
deleted file mode 100755
index c3af7d7..0000000
--- a/mail/cone/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/cone-gcc43.patch
diff --git a/mail/cone/cone-gcc43.patch b/mail/cone/cone-gcc43.patch
deleted file mode 100644
index 939e9d1..0000000
--- a/mail/cone/cone-gcc43.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff -up cone-0.74/cone/nntpcommand.C.gcc43 cone-0.74/cone/nntpcommand.C
---- cone-0.74/cone/nntpcommand.C.gcc43	2008-03-28 23:58:51.000000000 -0400
-+++ cone-0.74/cone/nntpcommand.C	2008-03-28 23:59:10.000000000 -0400
-@@ -9,9 +9,10 @@
- #include "nntpcommand.H"
- #include "libmail/addmessage.H"
- #include "gettext.H"
--#include <errno.h>
--#include <stdio.h>
-+#include <cerrno>
-+#include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- 
- #include <sys/types.h>
- #if HAVE_UNISTD_H
-diff -up cone-0.74/cone/tags.C.gcc43 cone-0.74/cone/tags.C
---- cone-0.74/cone/tags.C.gcc43	2008-03-28 23:59:32.000000000 -0400
-+++ cone-0.74/cone/tags.C	2008-03-28 23:59:44.000000000 -0400
-@@ -9,6 +9,7 @@
- #include "tags.H"
- #include "gettext.H"
- #include <sstream>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/cone/spellcheckerAspell.C.gcc43 cone-0.74/cone/spellcheckerAspell.C
---- cone-0.74/cone/spellcheckerAspell.C.gcc43	2008-03-29 00:00:31.000000000 -0400
-+++ cone-0.74/cone/spellcheckerAspell.C	2008-03-29 00:00:49.000000000 -0400
-@@ -9,7 +9,8 @@
- #include "spellcheckerAspell.H"
- #include "libmail/mail.H"
- 
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- #if HAVE_ASPELL_CONFIG_HH
- #include "aspell/suggest.hh"
-diff -up cone-0.74/cone/gettext.C.gcc43 cone-0.74/cone/gettext.C
---- cone-0.74/cone/gettext.C.gcc43	2008-03-28 23:57:20.000000000 -0400
-+++ cone-0.74/cone/gettext.C	2008-03-28 23:57:49.000000000 -0400
-@@ -6,14 +6,15 @@
- */
- 
- #include "gettext.H"
--#include <ctype.h>
--#include <stdlib.h>
-+#include <cctype>
-+#include <cstdlib>
- #include <unistd.h>
- #include <sstream>
- #include <algorithm>
- #include "unicode/unicode.h"
- #include "libmail/mail.H"
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- #if HAVE_LANGINFO_H
- #include <langinfo.h>
-diff -up cone-0.74/cone/spellcheckerPspell.C.gcc43 cone-0.74/cone/spellcheckerPspell.C
---- cone-0.74/cone/spellcheckerPspell.C.gcc43	2008-03-29 00:00:00.000000000 -0400
-+++ cone-0.74/cone/spellcheckerPspell.C	2008-03-29 00:00:15.000000000 -0400
-@@ -9,7 +9,8 @@
- #include "spellcheckerPspell.H"
- #include "libmail/mail.H"
- 
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/attachments.C.gcc43 cone-0.74/libmail/attachments.C
---- cone-0.74/libmail/attachments.C.gcc43	2008-03-28 23:46:09.000000000 -0400
-+++ cone-0.74/libmail/attachments.C	2008-03-29 00:02:57.000000000 -0400
-@@ -11,10 +11,11 @@
- #include "rfc2045/rfc2045charset.h"
- #include <sys/time.h>
- #include "attachments.H"
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cstdio>
- #include <unistd.h>
--#include <errno.h>
-+#include <cerrno>
- #include <sstream>
- #include <iomanip>
- 
-diff -up cone-0.74/libmail/fd.C.gcc43 cone-0.74/libmail/fd.C
---- cone-0.74/libmail/fd.C.gcc43	2008-03-28 23:47:28.000000000 -0400
-+++ cone-0.74/libmail/fd.C	2008-03-28 23:47:57.000000000 -0400
-@@ -21,6 +21,7 @@
- 
- #include	<iostream>
- #include	<sstream>
-+#include	<cstdlib>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/mimetypes.C.gcc43 cone-0.74/libmail/mimetypes.C
---- cone-0.74/libmail/mimetypes.C.gcc43	2008-03-28 23:50:35.000000000 -0400
-+++ cone-0.74/libmail/mimetypes.C	2008-03-28 23:51:28.000000000 -0400
-@@ -8,7 +8,8 @@
- #include "mimetypes.H"
- #include "namespace.H"
- #include <fstream>
--#include <ctype.h>
-+#include <cctype>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/addmessageimport.C.gcc43 cone-0.74/libmail/addmessageimport.C
---- cone-0.74/libmail/addmessageimport.C.gcc43	2008-03-28 23:43:31.000000000 -0400
-+++ cone-0.74/libmail/addmessageimport.C	2008-03-29 00:03:19.000000000 -0400
-@@ -7,7 +7,8 @@
- #include "libmail_config.h"
- #include "addmessage.H"
- #include "attachments.H"
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/addressbookadd.C.gcc43 cone-0.74/libmail/addressbookadd.C
---- cone-0.74/libmail/addressbookadd.C.gcc43	2008-03-28 23:45:33.000000000 -0400
-+++ cone-0.74/libmail/addressbookadd.C	2008-03-29 00:04:00.000000000 -0400
-@@ -13,9 +13,10 @@
- #include "rfcaddr.H"
- #include "misc.H"
- #include "unicode/unicode.h"
--#include <ctype.h>
-+#include <cctype>
- #include <vector>
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/rfc2047decode.C.gcc43 cone-0.74/libmail/rfc2047decode.C
---- cone-0.74/libmail/rfc2047decode.C.gcc43	2008-03-28 23:52:50.000000000 -0400
-+++ cone-0.74/libmail/rfc2047decode.C	2008-03-28 23:53:00.000000000 -0400
-@@ -9,6 +9,7 @@
- #include "rfc2047decode.H"
- #include "rfc822/rfc2047.h"
- #include "mail.H"
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/addmessageremoveattachments.C.gcc43 cone-0.74/libmail/addmessageremoveattachments.C
---- cone-0.74/libmail/addmessageremoveattachments.C.gcc43	2008-03-28 23:44:28.000000000 -0400
-+++ cone-0.74/libmail/addmessageremoveattachments.C	2008-03-29 00:04:43.000000000 -0400
-@@ -8,7 +8,8 @@
- #include "addmessage.H"
- #include "attachments.H"
- #include "headers.H"
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- #include <vector>
- 
- using namespace std;
-diff -up cone-0.74/libmail/sortfolders.C.gcc43 cone-0.74/libmail/sortfolders.C
---- cone-0.74/libmail/sortfolders.C.gcc43	2008-03-28 23:55:00.000000000 -0400
-+++ cone-0.74/libmail/sortfolders.C	2008-03-28 23:55:11.000000000 -0400
-@@ -6,6 +6,7 @@
- */
- #include "libmail_config.h"
- #include "mail.H"
-+#include <cstring>
- 
- mail::folder::sort::sort(bool foldersFirstArg) // TRUE: sort folders first
- 	: foldersFirst(foldersFirstArg)
-diff -up cone-0.74/libmail/addressbook.C.gcc43 cone-0.74/libmail/addressbook.C
---- cone-0.74/libmail/addressbook.C.gcc43	2008-03-28 23:45:00.000000000 -0400
-+++ cone-0.74/libmail/addressbook.C	2008-03-29 00:05:01.000000000 -0400
-@@ -13,7 +13,8 @@
- #include "addressbooksearch.H"
- #include "rfc2047decode.H"
- #include "misc.H"
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -up cone-0.74/libmail/fdtls.C.gcc43 cone-0.74/libmail/fdtls.C
---- cone-0.74/libmail/fdtls.C.gcc43	2008-03-28 23:48:21.000000000 -0400
-+++ cone-0.74/libmail/fdtls.C	2008-03-28 23:48:32.000000000 -0400
-@@ -6,6 +6,7 @@
- */
- #include "libmail_config.h"
- #include "fdtls.H"
-+#include <cstdlib>
- 
- #if HAVE_LIBCOURIERTLS
- 
-diff -up cone-0.74/libmail/addmessage.C.gcc43 cone-0.74/libmail/addmessage.C
---- cone-0.74/libmail/addmessage.C.gcc43	2004-06-22 20:55:25.000000000 -0400
-+++ cone-0.74/libmail/addmessage.C	2008-03-29 00:05:15.000000000 -0400
-@@ -7,7 +7,8 @@
- #include "libmail_config.h"
- #include "addmessage.H"
- #include "attachments.H"
--#include <errno.h>
-+#include <cerrno>
-+#include <cstring>
- 
- // Default method implementation.
- 
diff --git a/net/ipsec-tools/BUILD b/net/ipsec-tools/BUILD
index 560f259..147f5f1 100755
--- a/net/ipsec-tools/BUILD
+++ b/net/ipsec-tools/BUILD
@@ -1,4 +1,6 @@
-OPTS="--with-kernel-headers=$TRACK_ROOT/usr/include $OPTS" &&
+OPTS="--with-kernel-headers=$TRACK_ROOT/usr/include \
+      --enable-shared \
+      $OPTS" &&
 
 # fixes compilation with GCC 4.4
 CFLAGS="-fno-strict-aliasing $CFLAGS" &&
diff --git a/net/ipsec-tools/DETAILS b/net/ipsec-tools/DETAILS
index afe8132..02c61a1 100755
--- a/net/ipsec-tools/DETAILS
+++ b/net/ipsec-tools/DETAILS
@@ -1,6 +1,7 @@
            SPELL=ipsec-tools
          VERSION=0.7.3
   SECURITY_PATCH=1
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index 87157b7..5f9ebed 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,3 +1,7 @@
+2010-08-14 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: build shared libraries
+	* DETAILS: PATCHLEVEL=1
+
 2010-07-08 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: use $TRACK_ROOT; OPTS moved to the end; removed deprecated
 	  hacks; fixed compilation with GCC 4.4
diff --git a/net/network-manager-applet/DEPENDS b/net/network-manager-applet/DEPENDS
new file mode 100755
index 0000000..317d93d
--- /dev/null
+++ b/net/network-manager-applet/DEPENDS
@@ -0,0 +1,11 @@
+depends network-manager &&
+depends gtk+2 &&
+depends gconf2 &&
+depends glib2 &&
+depends libgnomeui &&
+depends gnome-keyring &&
+depends gnome-panel &&
+depends wpa_supplicant &&
+depends policykit &&
+
+optional_depends gnome-bluetooth "" "" "for bluetooth support"
diff --git a/net/network-manager-applet/DETAILS b/net/network-manager-applet/DETAILS
new file mode 100755
index 0000000..8603b17
--- /dev/null
+++ b/net/network-manager-applet/DETAILS
@@ -0,0 +1,33 @@
+           SPELL=network-manager-applet
+if [[ $NETWORK_MANAGER_APPLET_SCM == y ]]; then
+  if [[ $NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE == y ]]; then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=svn
+  fi
+          SOURCE="$SPELL-svn.tar.bz2"
+   SOURCE_URL[0]=svn://svn.gnome.org/svn/$SPELL/trunk:$SPELL-svn
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-svn"
+  FORCE_DOWNLOAD=1
+else
+         VERSION=0.8.1
+	  BRANCH=${VERSION:0:3}
+          SOURCE="$SPELL-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/${BRANCH}/${SOURCE}
+     SOURCE_HASH=sha512:fa199700486d6bd36a20e35fd936b7234dc4c5d459203520157fd0615406d20a245bc8c834a2aa64e7189e2df488c60288b6ac898e217a543d80433fbcfe39c3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+        WEB_SITE="http://www.gnome.org/projects/NetworkManager/ "
+      LICENSE[0]=GNU General Public License v2
+         ENTERED=20080624
+           SHORT="A set of simple network interface control tools."
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+EOF
diff --git a/net/network-manager-applet/HISTORY b/net/network-manager-applet/HISTORY
new file mode 100644
index 0000000..33d855a
--- /dev/null
+++ b/net/network-manager-applet/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn at sourcemage.org>
+	* DEPENDS, DETAILS, DEPENDS, HISTORY, PREPARE: spell created
+
diff --git a/net/network-manager-applet/PREPARE b/net/network-manager-applet/PREPARE
new file mode 100755
index 0000000..29a759b
--- /dev/null
+++ b/net/network-manager-applet/PREPARE
@@ -0,0 +1,7 @@
+
+config_query NETWORK_MANAGER_APPLET_SCM "Build latest version from development tree?" n &&
+
+if [[ $NETWORK_MANAGER_APPLET_SCM == y ]]; then
+  config_query NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE \
+               "Automatically update on every system update?" n
+fi
diff --git a/net/network-manager-applet/PRE_BUILD b/net/network-manager-applet/PRE_BUILD
new file mode 100755
index 0000000..c82c303
--- /dev/null
+++ b/net/network-manager-applet/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ "$NETWORK_MANAGER_APPLET_SCM" == "y" ]]; then
+  sedit 's@^ *\./configure at true@' autogen.sh &&
+  ./autogen.sh
+fi &&
+sed -i 's/-Werror//' configure
diff --git a/net/network-manager-pptp/DEPENDS b/net/network-manager-pptp/DEPENDS
new file mode 100755
index 0000000..c80ff98
--- /dev/null
+++ b/net/network-manager-pptp/DEPENDS
@@ -0,0 +1,8 @@
+depends dbus &&
+depends gconf2 &&
+depends glade3 &&
+depends glib2 &&
+depends gnome-keyring &&
+depends gtk+2 &&
+depends network-manager &&
+depends pptp-linux
diff --git a/net/network-manager-pptp/DETAILS b/net/network-manager-pptp/DETAILS
new file mode 100755
index 0000000..3533cea
--- /dev/null
+++ b/net/network-manager-pptp/DETAILS
@@ -0,0 +1,23 @@
+           SPELL=network-manager-pptp
+         VERSION=0.8.1
+          SOURCE="NetworkManager-pptp-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/${VERSION:0:3}/${SOURCE}
+     SOURCE_HASH=sha512:c0253656b6ab96d250f95c4d3b32c9928352960d77b94d561c1d7e10a1713e92eb7d7654f41006a8b81e913ada1a26fba93f96d8810137a1aef4dd71fd959937
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-pptp-${VERSION}"
+        WEB_SITE="http://projects.gnome.org/NetworkManager/"
+      LICENSE[0]=GPL
+         ENTERED=20100414
+           SHORT="PPTP-VPN extension for NetworkManager"
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+
+This package provides PPTP support for NetworkManager
+
+
+EOF
diff --git a/net/network-manager-pptp/HISTORY b/net/network-manager-pptp/HISTORY
new file mode 100644
index 0000000..aa0bc17
--- /dev/null
+++ b/net/network-manager-pptp/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn at sourcemage.org>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/net/network-manager/BUILD b/net/network-manager/BUILD
new file mode 100755
index 0000000..37c2781
--- /dev/null
+++ b/net/network-manager/BUILD
@@ -0,0 +1,2 @@
+OPTS=" $OPTS --with-distro=debian"
+default_build
diff --git a/net/network-manager/DEPENDS b/net/network-manager/DEPENDS
new file mode 100755
index 0000000..b8218c7
--- /dev/null
+++ b/net/network-manager/DEPENDS
@@ -0,0 +1,19 @@
+depends dhcpcd &&
+depends gconf2 &&
+depends gettext && 
+depends glib2 &&
+depends hal &&
+depends intltool && 
+depends iproute2 && 
+depends libnl &&
+depends nss &&
+depends policykit &&
+depends ppp &&
+depends -sub EXTRAS udev &&
+depends wpa_supplicant &&
+
+optional_depends gtk-doc \
+        "--enable-gtk-doc"  \
+	"--disable-gtk-doc" \
+	"use gtk-doc to build documentation" 
+
diff --git a/net/network-manager/DETAILS b/net/network-manager/DETAILS
new file mode 100755
index 0000000..a8c73d8
--- /dev/null
+++ b/net/network-manager/DETAILS
@@ -0,0 +1,34 @@
+           SPELL=network-manager
+if [[ $NETWORK_MANAGER_SCM == y ]]; then
+  if [[ $NETWORK_MANAGER_SCM_AUTOUPDATE == y ]]; then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=git
+  fi
+          SOURCE="NetworkManager-git.tar.bz2"
+   SOURCE_URL[0]=git://anongit.freedesktop.org/NetworkManager/NetworkManager.git
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-git"
+  FORCE_DOWNLOAD=1
+else
+         VERSION=0.8.1
+	  BRANCH=${VERSION:0:3}
+          SOURCE="NetworkManager-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${BRANCH}/${SOURCE}
+     SOURCE_HASH=sha512:c00831600ab6c1ff2d8150efa41d49015d8756130856d274dde698d4822678bb81371057f14a1e8da8780b0cef1baec9d038a23d25ba8c70e18c896c1597a51e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/NetworkManager-${VERSION}"
+fi
+        WEB_SITE="http://www.gnome.org/projects/NetworkManager/ "
+      LICENSE[0]=GPL
+         ENTERED=20080624
+           SHORT="A set of simple network interface control tools."
+cat << EOF
+The GNOME NetworkManager is a set of co-operative tools that make networking
+simple and straightforward. Whether wireless or wired, NetworkManager allows
+you to quickly move from one network to another: once a network has been
+configured and joined once, it can be detected and re-joined automatically at
+a later date. It was designed to auto-detect as much information as possible,
+seamlessly switches connections when necessary, and provides immediate feedback
+of the network state to users and applications. It utilizes D-Bus and HAL.
+EOF
+
diff --git a/net/network-manager/HISTORY b/net/network-manager/HISTORY
new file mode 100644
index 0000000..ae5ca7d
--- /dev/null
+++ b/net/network-manager/HISTORY
@@ -0,0 +1,3 @@
+2010-08-16 Finn Haedicke <finn at sourcemage.org>
+	* DEPENDS, DETAILS, HISTORY, BUILD, PRE_BUILD, PREPARE: spell created
+
diff --git a/net/network-manager/PREPARE b/net/network-manager/PREPARE
new file mode 100755
index 0000000..3440a6b
--- /dev/null
+++ b/net/network-manager/PREPARE
@@ -0,0 +1,6 @@
+config_query NETWORK_MANAGER_SCM "Build latest version from development tree?" n &&
+
+if [[ $NETWORK_MANAGER_SCM == y ]]; then
+  config_query NETWORK_MANAGER_APPLET_SCM_AUTOUPDATE \
+               "Automatically update on every system update?" n
+fi
diff --git a/net/network-manager/PRE_BUILD b/net/network-manager/PRE_BUILD
new file mode 100755
index 0000000..e838326
--- /dev/null
+++ b/net/network-manager/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+if [[ "$NETWORK_MANAGER_SCM" == "y" ]]; then
+  cd $SOURCE_DIRECTORY &&
+  sedit 's@^ *\./configure at true@' autogen.sh &&
+  ./autogen.sh
+fi
diff --git a/net/network-manager/init.d/NetworkManager b/net/network-manager/init.d/NetworkManager
new file mode 100755
index 0000000..2ee3504
--- /dev/null
+++ b/net/network-manager/init.d/NetworkManager
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/NetworkManager
+RUNLEVEL=3
+NEEDS="smgl-messagebus hald"
+PROVIDES="network"
+
+. /etc/init.d/smgl_init
+
diff --git a/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig b/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig
deleted file mode 100644
index d06e66d..0000000
Binary files a/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig and /dev/null differ
diff --git a/perl-cpan/anyevent/DETAILS b/perl-cpan/anyevent/DETAILS
index 2926401..c9bac09 100755
--- a/perl-cpan/anyevent/DETAILS
+++ b/perl-cpan/anyevent/DETAILS
@@ -1,8 +1,8 @@
            SPELL=anyevent
-         VERSION=5.23
+         VERSION=5.271
           SOURCE=AnyEvent-$VERSION.tar.gz
-      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-#     SOURCE_HASH=sha512:847f689611749404c563a8c3087127da00219fc45b71bc5e01db3813f85eb5131005aff8c78656007e3e9be6460208f0e7c804f09316510bc5518ad1733ae032
+#      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+     SOURCE_HASH=sha512:fb57677b3a296e992c2e8ccee9f18851c597ef849a37c9e597bcfa0ea2eb86ba2e82aff49f1907346673e9285c6a4919faf8544c081d31bef39d2a469904c956
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/AnyEvent-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/ML/MLEHMANN/$SOURCE
          LICENSE=PERL
diff --git a/perl-cpan/anyevent/HISTORY b/perl-cpan/anyevent/HISTORY
index aa582c6..797bec6 100644
--- a/perl-cpan/anyevent/HISTORY
+++ b/perl-cpan/anyevent/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 5.271
+
 2009-12-30 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 5.23
 
diff --git a/perl-cpan/berkeleydb/DETAILS b/perl-cpan/berkeleydb/DETAILS
index 8c42b7a..f215624 100755
--- a/perl-cpan/berkeleydb/DETAILS
+++ b/perl-cpan/berkeleydb/DETAILS
@@ -1,6 +1,6 @@
            SPELL=berkeleydb
-         VERSION=0.39
-     SOURCE_HASH=sha512:e389f2eea63ab86b8b0a78c4bb4f61990dac2d7e828bd2339e167f81139ba9dec965c34607f9950d50036e9fc4c7da7a5cfab7e64bb893932146fdcede6543df
+         VERSION=0.43
+     SOURCE_HASH=sha512:ba50b39c2052f76b6b1c30d44f73853da6bb61f1aa3b06b5ea6b75659b6a0dedeed3ce2c238b06a0eb81e35510936ac6f9d9cb7b0d128eef2f317ee790f52caf
           SOURCE=BerkeleyDB-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/BerkeleyDB-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/P/PM/PMQS/$SOURCE
diff --git a/perl-cpan/berkeleydb/HISTORY b/perl-cpan/berkeleydb/HISTORY
index 14f269e..be855a0 100644
--- a/perl-cpan/berkeleydb/HISTORY
+++ b/perl-cpan/berkeleydb/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.43
+
 2009-08-03 David Kowis <dkowis at shlrm.org>
 	* DETAILS: to version 0.39 (builds now!)
 
diff --git a/perl-cpan/compress-raw-zlib/DETAILS b/perl-cpan/compress-raw-zlib/DETAILS
index 95d1342..01caf71 100755
--- a/perl-cpan/compress-raw-zlib/DETAILS
+++ b/perl-cpan/compress-raw-zlib/DETAILS
@@ -1,6 +1,6 @@
            SPELL=compress-raw-zlib
-         VERSION=2.021
-     SOURCE_HASH=sha512:07cd3e91c7eebd0c3435d2b2551f6e6f81048717d7347fbe236f46d3e8ff7c77fc6dd0a3733765149b0f1a7268a95cb6447e01393b3baa11cc5078887463a34d
+         VERSION=2.030
+     SOURCE_HASH=sha512:031ebb848a9674350e6acf34e86d9ecec6ceab1ae3586a4af031822691614213e0b215addfc56d43a5f5223ce0bc86e57d138bfc7ef358daf16df34d339e8584
           SOURCE=Compress-Raw-Zlib-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Compress-Raw-Zlib-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/P/PM/PMQS/$SOURCE
diff --git a/perl-cpan/compress-raw-zlib/HISTORY b/perl-cpan/compress-raw-zlib/HISTORY
index 9776542..dafbf3e 100644
--- a/perl-cpan/compress-raw-zlib/HISTORY
+++ b/perl-cpan/compress-raw-zlib/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2.030
+
 2009-10-23 Treeve jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.021
 
diff --git a/perl-cpan/dbd-odbc/DETAILS b/perl-cpan/dbd-odbc/DETAILS
index b928d98..276875a 100755
--- a/perl-cpan/dbd-odbc/DETAILS
+++ b/perl-cpan/dbd-odbc/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dbd-odbc
-         VERSION=1.23
+         VERSION=1.24
           SOURCE="DBD-ODBC-${VERSION}.tar.gz"
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MJ/MJEVANS/${SOURCE}
-     SOURCE_HASH=sha512:51eaf5fd1340013da619290a25d6fcb423b6cd2373193ad0ae06ada005001784952eddb09e083ed02d4c13e130443881a531e01cd8168074d0ef47f97f4ff1ec
+     SOURCE_HASH=sha512:900ee360e0b4d24afadd467039ed3f8c200630ad5dc5260c5b0991bfa612cff9b1d9fe721b28a48e5406de528c1b9e79d61d28a0bef448d4d1291de619a26352
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/DBD-ODBC-${VERSION}"
         WEB_SITE="http://search.cpan.org/~mjevans/DBD-ODBC/"
       LICENSE[0]=GPL
diff --git a/perl-cpan/dbd-odbc/HISTORY b/perl-cpan/dbd-odbc/HISTORY
index 1c9f132..c6dd56f 100644
--- a/perl-cpan/dbd-odbc/HISTORY
+++ b/perl-cpan/dbd-odbc/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.24
+
 2010-04-12 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: updated to 1.23; made SOURCE_URL use PERL_CPAN_URL
 
diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index bbdf89e..0c13d8d 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbi
-         VERSION=1.612
-     SOURCE_HASH=sha512:54d7dfa2c59f12fba346db88f0f50deda11c3a25981fd972454eefc3de64bae563228814d98caa0dc6334144c8758a01b8dea2c700abc3642c7ef0782431c849
+         VERSION=1.613
+     SOURCE_HASH=sha512:48124b678954563932a94217b8454983673915905b71a33ea94f2545dc9d5a980ab35bc7c2fd455b2daf77ba92f172fe172697ad9aaf0628d6681e706ae7a880
           SOURCE=DBI-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index e98953b..9c04514 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.613
+
 2010-07-31  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.612
 
diff --git a/perl-cpan/digest-md5/DETAILS b/perl-cpan/digest-md5/DETAILS
index 6284133..e46635e 100755
--- a/perl-cpan/digest-md5/DETAILS
+++ b/perl-cpan/digest-md5/DETAILS
@@ -1,6 +1,6 @@
            SPELL=digest-md5
-         VERSION=2.39
-     SOURCE_HASH=sha512:5602b120fe737a846c318ec422d510713ef810ce7fa980cad3cfc66ed1139d5856b238bb5a6453ca84d4af6cad5f9ce12bd1d17ee9ad363cc15d66ed32b8ea0b
+         VERSION=2.40
+     SOURCE_HASH=sha512:db6a31d45ab03f10060ba0090537ceed0711516232fca1504e4cf31b03df1f56267c529ccf337ced1cc6e80bb67c863d2d7d629d8250926ff6744704013d5d80
           SOURCE=Digest-MD5-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Digest-MD5-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/digest-md5/HISTORY b/perl-cpan/digest-md5/HISTORY
index 8f37cd6..0f7d4f9 100644
--- a/perl-cpan/digest-md5/HISTORY
+++ b/perl-cpan/digest-md5/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2.40
+
 2009-06-22 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.39
 
diff --git a/perl-cpan/digest-sha/DETAILS b/perl-cpan/digest-sha/DETAILS
index 6538a1f..4912f8d 100755
--- a/perl-cpan/digest-sha/DETAILS
+++ b/perl-cpan/digest-sha/DETAILS
@@ -1,8 +1,8 @@
            SPELL=digest-sha
-         VERSION=5.47
+         VERSION=5.48
           SOURCE="Digest-SHA-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/M/MS/MSHELOR/${SOURCE}
-     SOURCE_HASH=sha512:6ab664f085347d4397cbe832f319a0b051f34e60ef30c3999af12371a5f6b9f63651a8fff043b21c8d1087d48e7d93a620ebc527b057a5a5133bcc677ac1ed0f
+     SOURCE_HASH=sha512:63d85bd459deade1f3b4e3704328fe680f161318db7c64991c6f918f0fb8e356ccdda0647df13be06f8e6c49b0a17c678e431af09e430cf56ffabb88f94111d8
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Digest-SHA-${VERSION}"
         WEB_SITE="http://search.cpan.org/dist/Digest-SHA/"
       LICENSE[0]=GPL
diff --git a/perl-cpan/digest-sha/HISTORY b/perl-cpan/digest-sha/HISTORY
index 8ee4150..84ad2ca 100644
--- a/perl-cpan/digest-sha/HISTORY
+++ b/perl-cpan/digest-sha/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 5.48
+
 2008-08-29 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS, DETAILS: spell created
 
diff --git a/perl-cpan/event-execflow/DETAILS b/perl-cpan/event-execflow/DETAILS
index 6272d8f..e23234d 100755
--- a/perl-cpan/event-execflow/DETAILS
+++ b/perl-cpan/event-execflow/DETAILS
@@ -1,10 +1,10 @@
            SPELL=event-execflow
-         VERSION=0.63
+         VERSION=0.64
           SOURCE=Event-ExecFlow-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Event-ExecFlow-$VERSION
-   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JR/JRED/$SOURCE
+   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JR/JRED/${SOURCE}
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:4e489142d8ef4ddec363aef92c4f8975f6b2bb0ffc6c263fc1a5dc7f81064725f5b492e3427695b1a461cec91767e675fbc4a173527cce55fd94676e4513722f
+     SOURCE_HASH=sha512:dab795481e3f85ecde70e330eda10c8d09eb310d3325945364eebc1d70521f094b1f6afc311aff4b662cbefd96e0170bfb72f284296654088b747a139bfe7b5d
          LICENSE=PERL
         WEB_SITE="http://search.cpan.org/search?module=Event-ExecFlow"
          ENTERED=20060716
diff --git a/perl-cpan/event-execflow/HISTORY b/perl-cpan/event-execflow/HISTORY
index ff9bd47..5e84225 100644
--- a/perl-cpan/event-execflow/HISTORY
+++ b/perl-cpan/event-execflow/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.64
+
 2009-02-22 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 0.63
 
diff --git a/perl-cpan/event-rpc/DETAILS b/perl-cpan/event-rpc/DETAILS
index 3b052dd..a1f50ea 100755
--- a/perl-cpan/event-rpc/DETAILS
+++ b/perl-cpan/event-rpc/DETAILS
@@ -1,9 +1,10 @@
            SPELL=event-rpc
-         VERSION=0.90
+         VERSION=1.01
           SOURCE=Event-RPC-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Event-RPC-$VERSION
    SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JR/JRED/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+      SOURCE_HASH=sha512:0aa7232feefbade7f64e288947b1bd0e26cd26483a9aa7b24f06046286a02e3eade3e13f2ae251e8e12a403a866f8ce386f9c9bc974d74465a2db9bac86e6304
          LICENSE=PERL
         WEB_SITE="http://search.cpan.org/search?module=Event-RPC"
          ENTERED=20060716
diff --git a/perl-cpan/event-rpc/HISTORY b/perl-cpan/event-rpc/HISTORY
index 14043cc..6d1a94e 100644
--- a/perl-cpan/event-rpc/HISTORY
+++ b/perl-cpan/event-rpc/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.01
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/event/DETAILS b/perl-cpan/event/DETAILS
index 103dae5..34b0d0f 100755
--- a/perl-cpan/event/DETAILS
+++ b/perl-cpan/event/DETAILS
@@ -1,7 +1,7 @@
            SPELL=event
-         VERSION=1.08
+         VERSION=1.13
           SOURCE=Event-$VERSION.tar.gz
-     SOURCE_HASH=sha512:2d3e93f20bce6a86328743c837377ab331af4b87c6141b0ef119aaec50fa4a8b77df22584e65e8b1b104c5b93891b821ecd0cb50f6dfdf8c94df7270be33e77f
+     SOURCE_HASH=sha512:e1f18d6484baadd162035e9a59a3424d9ffce110df8411e7a3350fe1da78c86c0acee43605d8a42a63c31361c34036b991bac300648905a74c8065d684e86450
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Event-$VERSION
    SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/$SOURCE
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/perl-cpan/event/HISTORY b/perl-cpan/event/HISTORY
index 3737f35..0e222f7 100644
--- a/perl-cpan/event/HISTORY
+++ b/perl-cpan/event/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.13
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/file-which/DEPENDS b/perl-cpan/file-which/DEPENDS
index 6826bc7..d6c43a7 100755
--- a/perl-cpan/file-which/DEPENDS
+++ b/perl-cpan/file-which/DEPENDS
@@ -1 +1,2 @@
-depends perl
+depends perl &&
+depends getopt-long
diff --git a/perl-cpan/file-which/DETAILS b/perl-cpan/file-which/DETAILS
index 4447a28..ed24e2e 100755
--- a/perl-cpan/file-which/DETAILS
+++ b/perl-cpan/file-which/DETAILS
@@ -1,10 +1,10 @@
            SPELL=file-which
-         VERSION=0.05
+         VERSION=1.09
           SOURCE="File-Which-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/P/PE/PEREINAR/${SOURCE}
-     SOURCE_HASH=sha512:40222433739522f21923895111b301d05d1d37b9f3aca38e06565453ebcead54d92012dbf5f39a2b3c3739ee377636862589e872351fdbde0f33381204493858
+   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${SOURCE}
+     SOURCE_HASH=sha512:baa6c2a294d0186387ebc0e3ffe7587e11357c2bcab98a0ba8db63e80482db707e26518e654f67e8199450766866f74b16eb55a3c0aa241f69aac262c780aecd
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/File-Which-${VERSION}"
-        WEB_SITE="http://search.cpan.org/~pereinar/File-Which-0.05/"
+        WEB_SITE="http://search.cpan.org/~adamk/File-Which-${VERSION}/lib/File/Which.pm"
       LICENSE[0]=ART
          ENTERED=20070510
            SHORT="Portable implementation of the 'which' utility"
diff --git a/perl-cpan/file-which/HISTORY b/perl-cpan/file-which/HISTORY
index 656cdb3..12e3a94 100644
--- a/perl-cpan/file-which/HISTORY
+++ b/perl-cpan/file-which/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.09
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/gtk/BUILD b/perl-cpan/gtk/BUILD
index cc5eabe..18bb8a7 100755
--- a/perl-cpan/gtk/BUILD
+++ b/perl-cpan/gtk/BUILD
@@ -1,2 +1,4 @@
 patch  -p1  <  $SCRIPT_DIRECTORY/Makefile.diff &&
-default_build_perl
+make_single        &&
+default_build_perl &&
+make_normal
diff --git a/perl-cpan/gtk/HISTORY b/perl-cpan/gtk/HISTORY
index 5c8e514..c81960d 100644
--- a/perl-cpan/gtk/HISTORY
+++ b/perl-cpan/gtk/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: make_single
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: cleaned up
 
diff --git a/perl-cpan/html-clean/BUILD b/perl-cpan/html-clean/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/html-clean/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/html-clean/DEPENDS b/perl-cpan/html-clean/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/html-clean/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/html-clean/DETAILS b/perl-cpan/html-clean/DETAILS
new file mode 100755
index 0000000..8686a16
--- /dev/null
+++ b/perl-cpan/html-clean/DETAILS
@@ -0,0 +1,30 @@
+           SPELL=html-clean
+         VERSION=0.8
+          SOURCE="HTML-Clean-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/L/LI/LINDNER/${SOURCE}
+     SOURCE_HASH=sha512:5e9fdf49c1fccbb35c769394dac2013972bea070579983c5c2e99105b2f9a4ca6594966ae88770fc6ae1ee6b9388a07d61830d0451d6957197114d35dc5cc1e4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/HTML-Clean-${VERSION}"
+        WEB_SITE="http://search.cpan.org/dist/HTML-Clean/"
+      LICENSE[0]=ART
+         ENTERED=20100815
+           SHORT="Cleans up HTML code for web browsers, not humans"
+cat << EOF
+The majority of the web pages of the internet today are much larger than
+they need to be.  The reason for this is that HTML tends to be stored in a
+human readable format, with indenting, newlines and comments.
+
+However, all of these comments, whitespace etc. are ignored by the browser,
+and needlessly lengthen download times.
+
+Second, many people are using WYSIWYG HTML editors these days.  This makes
+creating content easy.  However these editors can cause a number of
+compatibility problems by tying themselves to a particular browser or
+operating system.
+
+Enter HTML::Clean.
+
+The HTML::Clean module encapsulates a number of HTML optimizations and
+cleanups.  The end result is HTML that loads faster, displays properly in
+more browsers.  Think of it as a compiler that translates HTML input into
+optimized machine readable code.
+EOF
diff --git a/perl-cpan/html-clean/HISTORY b/perl-cpan/html-clean/HISTORY
new file mode 100644
index 0000000..98d190d
--- /dev/null
+++ b/perl-cpan/html-clean/HISTORY
@@ -0,0 +1,7 @@
+2010-08-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* PRE_BUILD, no-use-IO_271346.patch: added patch from Ubuntu
+	  to fix warning
+
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/html-clean/PRE_BUILD b/perl-cpan/html-clean/PRE_BUILD
new file mode 100755
index 0000000..6b68336
--- /dev/null
+++ b/perl-cpan/html-clean/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/no-use-IO_271346.patch
diff --git a/perl-cpan/html-clean/no-use-IO_271346.patch b/perl-cpan/html-clean/no-use-IO_271346.patch
new file mode 100644
index 0000000..c384874
--- /dev/null
+++ b/perl-cpan/html-clean/no-use-IO_271346.patch
@@ -0,0 +1,10 @@
+--- libhtml-clean-perl-0.8.orig/lib/HTML/Clean.pm
++++ libhtml-clean-perl-0.8/lib/HTML/Clean.pm
+@@ -1,7 +1,6 @@
+ package HTML::Clean;
+ 
+ use Carp;
+-use IO;
+ use Fcntl;
+ use strict;
+ require 5.004;
diff --git a/perl-cpan/html-parser/DETAILS b/perl-cpan/html-parser/DETAILS
index f0499f9..b0cd22c 100755
--- a/perl-cpan/html-parser/DETAILS
+++ b/perl-cpan/html-parser/DETAILS
@@ -1,6 +1,6 @@
            SPELL=html-parser
-         VERSION=3.65
-     SOURCE_HASH=sha512:873f36abee1c16827de9ad5904e4e3f4e6d7f739a1e69345deb4ea8fcc1cd32e8a706db13e3c51fa2ca1869ec295dd981e524f671ea4e4f547795d1fb74d8623
+         VERSION=3.66
+     SOURCE_HASH=sha512:473ff2590936c2ddf736f563c58b2b82b165ca3156af7dd13a9274b81e46714d6d377c6577129708523b1248be860b5282a2e0f86ba96864da9f32d86314fc18
           SOURCE=HTML-Parser-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/HTML-Parser-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/html-parser/HISTORY b/perl-cpan/html-parser/HISTORY
index 8bd56ce..cb4ac48 100644
--- a/perl-cpan/html-parser/HISTORY
+++ b/perl-cpan/html-parser/HISTORY
@@ -1,4 +1,7 @@
-2010-06=18 Treeve Jelbert <treeve at sourcemage.org>
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 3.66
+
+2010-06-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.65
 
 2010-03-29 Treeve Jelbert <treeve at sourcemage.org>
diff --git a/perl-cpan/image-exiftool/DETAILS b/perl-cpan/image-exiftool/DETAILS
index b716d3e..795def7 100755
--- a/perl-cpan/image-exiftool/DETAILS
+++ b/perl-cpan/image-exiftool/DETAILS
@@ -1,8 +1,8 @@
            SPELL=image-exiftool
-         VERSION=7.37
+         VERSION=8.25
           SOURCE="Image-ExifTool-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://www.sno.phy.queensu.ca/~phil/exiftool/${SOURCE}
-     SOURCE_HASH=sha512:108f8849cdb2fb655999bba0c5425825225b3c0593eba7bf7eab09881e3600c874ebc2bfa2d03fec8551dc035023fdeccddafabfee7bce5c6b1d348316ea50d6
+     SOURCE_HASH=sha512:8d86b039047a890effffabf23f84ed9700142aff32dc4510a211f21b92a6ef68d2a8f211308771269c08e4980a12754f7129adff9a074d98837f7947255d112a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Image-ExifTool-${VERSION}"
         WEB_SITE="http://www.sno.phy.queensu.ca/~phil/exiftool/"
       LICENSE[0]=PERL
diff --git a/perl-cpan/image-exiftool/HISTORY b/perl-cpan/image-exiftool/HISTORY
index 53ae74d..5f57f04 100644
--- a/perl-cpan/image-exiftool/HISTORY
+++ b/perl-cpan/image-exiftool/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 8.25
+
 2008-07-23 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* BUILD: not needed default_build in perl_cpan section does it all
 	  make test breaks badly along the way
diff --git a/perl-cpan/image-info/DETAILS b/perl-cpan/image-info/DETAILS
index 2d8ce93..38374b4 100755
--- a/perl-cpan/image-info/DETAILS
+++ b/perl-cpan/image-info/DETAILS
@@ -1,12 +1,12 @@
            SPELL=image-info
           SPELLX=Image-Info
-         VERSION=1.16
-     SOURCE_HASH=sha512:4581f0ddb003598a4a3d47f59e2996a68b8a055aaee7ee7c6c992789a876d64b6fa07cfd19a68817d2030503726eea5c7001283de0ecc596f364d7f3cda82f91
+         VERSION=1.30
+     SOURCE_HASH=sha512:d217c18ecad1f3900d4e2432e8e595573fe297715bfae476ef34676a20c0e7df0967d2c04317418b1eb92536955060f56dc5ad0f1f1a36cb1c3fcded4ecc888c
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/modules/by-module/Image/$SOURCE
          LICENSE=ART
-        WEB_SITE="http://search.cpan.org/search?dist=${VERSION//-/::}"
+        WEB_SITE="http://search.cpan.org/~srezic/Image-Info-${VERSION}/lib/Image/Info.pm"
          ENTERED=20050708
         KEYWORDS="perl"
            SHORT="${VERSION//-/::} - Extract meta information from image files"
diff --git a/perl-cpan/image-info/HISTORY b/perl-cpan/image-info/HISTORY
index 9032195..aa6d988 100644
--- a/perl-cpan/image-info/HISTORY
+++ b/perl-cpan/image-info/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.30, corrected WEB_SITE
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/image-size/DETAILS b/perl-cpan/image-size/DETAILS
index 9f8eea9..7f2694c 100755
--- a/perl-cpan/image-size/DETAILS
+++ b/perl-cpan/image-size/DETAILS
@@ -1,12 +1,12 @@
            SPELL=image-size
           SPELLX=Image-Size
-         VERSION=2.992
+         VERSION=3.221
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/modules/by-module/Image/$SOURCE
-     SOURCE_HASH=sha512:8a879b94973c8b76099bd66f0093edb27bac0dfebde2df47479bbb13209919223271531f34cdaa8c80057b7b4ed0ee6449ad42465c78b2dcfa9ba34f78cc40c4
+     SOURCE_HASH=sha512:05b5e4539f0ec4700eaa2e1937bfbfde0752f56395a7951c43f8d28ce55baac1d68f27753330e3ffb0605a20e9a46239ea9f1e372918adbeff49e2753819d266
          LICENSE=ART
-        WEB_SITE="http://search.cpan.org/search?dist=${VERSION//-/::}"
+        WEB_SITE="http://search.cpan.org/~rjray/Image-Size-${VERSION}/lib/Image/Size.pm"
          ENTERED=20020724
         KEYWORDS="images perl"
            SHORT="Reads the sizes of images in several formats"
diff --git a/perl-cpan/image-size/HISTORY b/perl-cpan/image-size/HISTORY
index 4e5d836..3493aed 100644
--- a/perl-cpan/image-size/HISTORY
+++ b/perl-cpan/image-size/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 3.221, corrected WEB_SITE
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/io-tty/DETAILS b/perl-cpan/io-tty/DETAILS
index 24e41d0..ef3fe81 100755
--- a/perl-cpan/io-tty/DETAILS
+++ b/perl-cpan/io-tty/DETAILS
@@ -1,8 +1,8 @@
            SPELL=io-tty
-         VERSION=1.02
+         VERSION=1.08
           SOURCE=IO-Tty-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/IO-Tty-$VERSION
-     SOURCE_HASH=sha512:03a1418efbd792b21dc455a0c9b44132750cee98d746fdff0a8bffc76453942a718006821f54394490b358ae6c5907a7d70025c3bd5e7f927a9e5688f7623ab4
+     SOURCE_HASH=sha512:3dbc42691c746128771e3c296dda44cc68a9ef4cfbe137a3a70d3436f70cc849855ad30c18f7d9d0328667c76fe81fee89ea79a312c701bae61cb73d8e9e8ab8
    SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RG/RGIERSIG/$SOURCE
          LICENSE=ART
         WEB_SITE=http://search.cpan.org/search?dist=IO-Tty
diff --git a/perl-cpan/io-tty/HISTORY b/perl-cpan/io-tty/HISTORY
index 3f1414d..e20e024 100644
--- a/perl-cpan/io-tty/HISTORY
+++ b/perl-cpan/io-tty/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.08
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/ipc-run/DETAILS b/perl-cpan/ipc-run/DETAILS
index cc13938..e0bcc9b 100755
--- a/perl-cpan/ipc-run/DETAILS
+++ b/perl-cpan/ipc-run/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ipc-run
-         VERSION=0.80
+         VERSION=0.89
           SOURCE=IPC-Run-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/IPC-Run-$VERSION
-   SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RS/RSOD/$SOURCE
-     SOURCE_HASH=sha512:e11a4b4b362d3fe304c22eedc82bc897036717d6437e0f6e6668d66ff42c72de5e1c9554393d5bdb8ab1f9f4716c6dedd47db39a4c52e13e2cf99be194148fe2
+   SOURCE_URL[0]=http://www.cpan.org/authors/id/T/TO/TODDR/$SOURCE
+     SOURCE_HASH=sha512:434bc000d82e03f94ccaf3ee3d1d1e0725690d8ee78849ab1e4d4b12cd29a5e7aca251dc1171b0c0df33b940a1a47638595265576fba89d42f3546c77ed97613
          LICENSE=ART
         WEB_SITE=http://search.cpan.org/search?dist=IPC-Run
          ENTERED=20020731
diff --git a/perl-cpan/ipc-run/HISTORY b/perl-cpan/ipc-run/HISTORY
index 9d37da7..2394187 100644
--- a/perl-cpan/ipc-run/HISTORY
+++ b/perl-cpan/ipc-run/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.89
+
 2008-05-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 0.80
 
diff --git a/perl-cpan/perl-extutils-depends/DETAILS b/perl-cpan/perl-extutils-depends/DETAILS
index 6132fae..b6e74fe 100755
--- a/perl-cpan/perl-extutils-depends/DETAILS
+++ b/perl-cpan/perl-extutils-depends/DETAILS
@@ -1,7 +1,7 @@
            SPELL=perl-extutils-depends
            SNAME=ExtUtils-Depends
-         VERSION=0.301
-     SOURCE_HASH=sha512:48a48ad1d24de404a217c08bc18527fb81796ac016d90dfde16fffed98b9503af2c60f25ef249e4282e700bed62257d8c191f0d050784b5ef2a9b3cbe0ba2db3
+         VERSION=0.302
+     SOURCE_HASH=sha512:056cbd44df9e85d52c9d7f3c5919b8574934d850f1a6efbff4a174bc5da2be5e728c69b6460220eba4ccc09f1903d57047d6feb0be333eb322dba5efd2839207
           SOURCE=$SNAME-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-extutils-depends/HISTORY b/perl-cpan/perl-extutils-depends/HISTORY
index 7de92aa..a664a71 100644
--- a/perl-cpan/perl-extutils-depends/HISTORY
+++ b/perl-cpan/perl-extutils-depends/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.302
+
 2008-10-27 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.301
 
diff --git a/perl-cpan/perl-glib/DETAILS b/perl-cpan/perl-glib/DETAILS
index 5c37a03..f4326b4 100755
--- a/perl-cpan/perl-glib/DETAILS
+++ b/perl-cpan/perl-glib/DETAILS
@@ -1,7 +1,7 @@
            SPELL=perl-glib
            SNAME=Glib
-         VERSION=1.222
-     SOURCE_HASH=sha512:187bddd0be84194631b10d168d012602bb24a557a17fbd5b8a529b21e3280036cdd8d08b9e84a171c18ba9bb0ef7c2b188ca5bbbdd4e27660efd11a8be52b936
+         VERSION=1.223
+     SOURCE_HASH=sha512:a8e4183ba88d1834286964538e075e11f86f9c8d586ef6b45a2fa95dc5c193747e2dc7cb1b24f06674282596e490b65c9aed8d42c8de8e65f45e012b7cb63be5
           SOURCE=$SNAME-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-glib/HISTORY b/perl-cpan/perl-glib/HISTORY
index 3e3deb7..0aebefd 100644
--- a/perl-cpan/perl-glib/HISTORY
+++ b/perl-cpan/perl-glib/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.223
+
 2009-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.222
 
diff --git a/perl-cpan/perl-gtk2/DETAILS b/perl-cpan/perl-gtk2/DETAILS
index 027705e..6b5c6f7 100755
--- a/perl-cpan/perl-gtk2/DETAILS
+++ b/perl-cpan/perl-gtk2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=perl-gtk2
            SNAME=Gtk2
-         VERSION=1.221
-     SOURCE_HASH=sha512:b0cbf87af8980f5e60ed104ba308da04df2c92c9d7492bf08ad3fac7c707edd1bd9516eef04d55dbfcfdc6152348d91aaa304ff4bb5819605278f6eb69c3a17a
+         VERSION=1.222
+     SOURCE_HASH=sha512:1caaebe34bcc8cabd973bc1286ccad0b09293df288ab47635d04eb035c546e6ab53b87f54eb1d3ada0c589743eaeadabfb0f30f84e4478cf8003203db25cc00d
           SOURCE=$SNAME-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-gtk2/HISTORY b/perl-cpan/perl-gtk2/HISTORY
index b96add9..66f99b6 100644
--- a/perl-cpan/perl-gtk2/HISTORY
+++ b/perl-cpan/perl-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.222
+
 2009-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.221
 	* DEPENDS: added perl-pango
diff --git a/perl-cpan/perl-pango/DETAILS b/perl-cpan/perl-pango/DETAILS
index ef84674..623b40d 100755
--- a/perl-cpan/perl-pango/DETAILS
+++ b/perl-cpan/perl-pango/DETAILS
@@ -1,7 +1,7 @@
            SPELL=perl-pango
            SNAME=Pango
-         VERSION=1.220
-     SOURCE_HASH=sha512:54886a98536ee77fd55a7e0a1c62f27f8f3141c103bdc46684f9b165c541fd392c3c95c22ef4f9422d8007f8a67b1e7a2a5628cbeb3c95addd1a057422142efe
+         VERSION=1.221
+     SOURCE_HASH=sha512:a403b37c003fb957c2d419019e5ef520df8921984b3c47f6fa63ccb75b9e5721cfb4297f33d8d839ff68ecb2e0552e276253ec4e5026f9656a2f5f327762924e
           SOURCE=$SNAME-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-pango/HISTORY b/perl-cpan/perl-pango/HISTORY
index 801669b..4f5dc05 100644
--- a/perl-cpan/perl-pango/HISTORY
+++ b/perl-cpan/perl-pango/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.221
+
 2009-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS, DEPENDS: spell created, version 1.220
 
diff --git a/perl-cpan/perlmagick/BUILD b/perl-cpan/perlmagick/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/perlmagick/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/perlmagick/DEPENDS b/perl-cpan/perlmagick/DEPENDS
new file mode 100755
index 0000000..f2224af
--- /dev/null
+++ b/perl-cpan/perlmagick/DEPENDS
@@ -0,0 +1,2 @@
+depends perl &&
+depends imagemagick
diff --git a/perl-cpan/perlmagick/DETAILS b/perl-cpan/perlmagick/DETAILS
new file mode 100755
index 0000000..99d78be
--- /dev/null
+++ b/perl-cpan/perlmagick/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=perlmagick
+         VERSION=6.59
+          SOURCE="PerlMagick-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/J/JC/JCRISTY/${SOURCE}
+     SOURCE_HASH=sha512:731c49e25c99160f3e5e70ca957f4ddf264780c7adc327c1725f9c9e471fbe0576e22ab5938743b76ce6a472f40bce01472555abfad3b00a49feab7c3e162333
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/PerlMagick-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~JCRISTY/Image-Magick/"
+      LICENSE[0]=ART
+         ENTERED=20100815
+           SHORT="Read, query, transform, and write images"
+cat << EOF
+Read, query, transform, and write images
+EOF
diff --git a/perl-cpan/perlmagick/HISTORY b/perl-cpan/perlmagick/HISTORY
new file mode 100644
index 0000000..674f560
--- /dev/null
+++ b/perl-cpan/perlmagick/HISTORY
@@ -0,0 +1,3 @@
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/text-unaccent/BUILD b/perl-cpan/text-unaccent/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/text-unaccent/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/text-unaccent/DEPENDS b/perl-cpan/text-unaccent/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/text-unaccent/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/text-unaccent/DETAILS b/perl-cpan/text-unaccent/DETAILS
new file mode 100755
index 0000000..2be80d7
--- /dev/null
+++ b/perl-cpan/text-unaccent/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=text-unaccent
+         VERSION=1.08
+          SOURCE="Text-Unaccent-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/L/LD/LDACHARY/${SOURCE}
+     SOURCE_HASH=sha512:d2c6a308904d0f1d5cd05a9fd29436f54292ea537f2ad8f44b4ebc0523302db64bb087aeac1f8e51c093e71b205c6c4fd9649cf2c8cbf8b50266c0aa200917c8
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Text-Unaccent-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~ldachary/Text-Unaccent-1.08/"
+      LICENSE[0]=ART
+         ENTERED=20100815
+           SHORT="remove accents from a string"
+cat << EOF
+Text::Unaccent is a module that remove accents from a string. unac_string
+converts the input string from the specified charset to UTF-16 and call
+unac_string_utf16 to return the unaccented equivalent. The conversion from
+and to UTF-16 is done with iconv(1).
+EOF
diff --git a/perl-cpan/text-unaccent/HISTORY b/perl-cpan/text-unaccent/HISTORY
new file mode 100644
index 0000000..674f560
--- /dev/null
+++ b/perl-cpan/text-unaccent/HISTORY
@@ -0,0 +1,3 @@
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/xml-handler-yawriter/BUILD b/perl-cpan/xml-handler-yawriter/BUILD
new file mode 100755
index 0000000..2de29cd
--- /dev/null
+++ b/perl-cpan/xml-handler-yawriter/BUILD
@@ -0,0 +1 @@
+default_build_perl
diff --git a/perl-cpan/xml-handler-yawriter/DEPENDS b/perl-cpan/xml-handler-yawriter/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/xml-handler-yawriter/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/xml-handler-yawriter/DETAILS b/perl-cpan/xml-handler-yawriter/DETAILS
new file mode 100755
index 0000000..8af27e3
--- /dev/null
+++ b/perl-cpan/xml-handler-yawriter/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=xml-handler-yawriter
+         VERSION=0.23
+          SOURCE="XML-Handler-YAWriter-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/K/KR/KRAEHE/${SOURCE}
+     SOURCE_HASH=sha512:3d41bfa4a33296ae1556b269b0c6ecd732a809fa517805de37aa452aff8394cdf639a68a7a3248e5457297dae4bedf22ea73407de0dbf25ea6a9facccbd4098f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/XML-Handler-YAWriter-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~kraehe/XML-Handler-YAWriter-0.23/YAWriter.pm"
+      LICENSE[0]=ART
+         ENTERED=20100815
+           SHORT="yet another Perl SAX XML Writer"
+cat << EOF
+Writer implements Yet Another XML::Handler::Writer. The reasons for this
+one are that I needed a flexible escaping technique, and want some kind of
+pretty printing.
+EOF
diff --git a/perl-cpan/xml-handler-yawriter/HISTORY b/perl-cpan/xml-handler-yawriter/HISTORY
new file mode 100644
index 0000000..674f560
--- /dev/null
+++ b/perl-cpan/xml-handler-yawriter/HISTORY
@@ -0,0 +1,3 @@
+2010-08-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/xml-namespacesupport/DETAILS b/perl-cpan/xml-namespacesupport/DETAILS
index b5bb511..ce7e4d5 100755
--- a/perl-cpan/xml-namespacesupport/DETAILS
+++ b/perl-cpan/xml-namespacesupport/DETAILS
@@ -1,9 +1,9 @@
            SPELL=xml-namespacesupport
-         VERSION=1.09
+         VERSION=1.11
           SOURCE=XML-NamespaceSupport-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-NamespaceSupport-$VERSION
-   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/R/RB/RBERJON/$SOURCE
-     SOURCE_HASH=sha512:96765b3c53a8d63e6a55c2c5afed315b80b8049ab445d4e07b90dc9c9fdd8e859fd13058232a46fbda6a5800c759860f7e15d43fc293df0d415692816e5627b8
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/P/PE/PERIGRIN/$SOURCE
+     SOURCE_HASH=sha512:cc1bd5f457dc80e46fb9904fb9dfe2bdf8bffdad8f436f0e8f5977dbc6924ef9eeceac61d8ab80df1bfcb5e14fe2476421831f47f9354726dd3b536beade0381
          LICENSE=ART
         WEB_SITE=http://search.cpan.org/~rberjon/XML-NamespaceSupport/
          ENTERED=20020722
diff --git a/perl-cpan/xml-namespacesupport/HISTORY b/perl-cpan/xml-namespacesupport/HISTORY
index 554c76d..ebe19fe 100644
--- a/perl-cpan/xml-namespacesupport/HISTORY
+++ b/perl-cpan/xml-namespacesupport/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.11
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: cleaned up
 	* BUILD: useless
diff --git a/printer/exaro/BUILD b/printer/exaro/BUILD
index 700e2aa..2113434 100755
--- a/printer/exaro/BUILD
+++ b/printer/exaro/BUILD
@@ -1,25 +1 @@
-if [[ $EX_VER == y ]];then
 qt4_cmake_build
-else
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
-PATH="$QTDIR/bin/qt4:$PATH" &&
-qmake -set ZINT_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib
-qmake -set ZINT_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include
-
-qmake -set QUAZIP_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib  &&
-qmake -set QUAZIP_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-
-qmake -set EXARO_INSTALL_BINS ${INSTALL_ROOT}/usr/bin &&
-qmake -set EXARO_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib &&
-qmake -set EXARO_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-qmake -set EXARO_INSTALL_PLUGINS ${INSTALL_ROOT}/usr/lib &&
-
-qmake -set EXARO_INSTALL_MIMELNKS ${INSTALL_ROOT}/usr/share/mimelnk/application &&
-qmake -set EXARO_INSTALL_MIMES ${INSTALL_ROOT}/usr/share/mime &&
-qmake -set EXARO_INSTALL_MENUS ${INSTALL_ROOT}/usr/share/applications &&
-qmake -set EXARO_INSTALL_ICONS ${INSTALL_ROOT}/usr/share/icons &&
-
-qmake -set EXARO_INSTALL_TRANSLATIONS ${INSTALL_ROOT}/usr/share/eXaro/translations &&
-qmake &&
-make
-fi
diff --git a/printer/exaro/DEPENDS b/printer/exaro/DEPENDS
index bbdd5a0..fd514e7 100755
--- a/printer/exaro/DEPENDS
+++ b/printer/exaro/DEPENDS
@@ -1,9 +1,9 @@
 depends g++  &&
 depends qt4  &&
-depends zint &&
 depends shared-mime-info &&
 depends cmake &&
 depends xz-utils &&
+optional_depends zint           '' '' 'barcode support' &&
 optional_depends quazip         '' '' 'ods export' &&
 optional_depends propertyeditor '' '' 'build eXaro designer'
 
diff --git a/printer/exaro/HISTORY b/printer/exaro/HISTORY
index 6ced758..f7acfcf 100644
--- a/printer/exaro/HISTORY
+++ b/printer/exaro/HISTORY
@@ -1,3 +1,9 @@
+2010-08-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: zint is now optional
+	* PREPARE: deleted
+	* BUILD: only qt4_cmake_build is relevant now
+	* PRE_BUILD: simplify
+
 2009-09-26 Treeve Jelbert <treeve at sourcemage.org>
 	* TRIGGERS: added, for zint
 
diff --git a/printer/exaro/PREPARE b/printer/exaro/PREPARE
deleted file mode 100755
index e37bbfa..0000000
--- a/printer/exaro/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query EX_VER 'build devel version?' n
diff --git a/printer/exaro/PRE_BUILD b/printer/exaro/PRE_BUILD
index 7f5da36..127b750 100755
--- a/printer/exaro/PRE_BUILD
+++ b/printer/exaro/PRE_BUILD
@@ -1,14 +1,2 @@
-if [[ $EX_VER == y ]];then
   cd $BUILD_DIRECTORY &&
   unlzma -c -d $SOURCE_CACHE/$SOURCE | tar x
-else
-default_pre_build
-fi
-cd $SOURCE_DIRECTORY &&
-if [[ $EX_VER == n ]];then
-sed -i 's/libs//' exaro.pro &&
-# adapt to zint-2.0
-sed -i 's/barcoderender/qzint/;s/BareCode/QZint/;s/setBorder(/setBorderType(/' \
-plugins/report/items/barcode/barcode.cpp &&
-sed -i 's/QtZ/QZ/' plugins/report/items/barcode/barcode.pro
-fi
diff --git a/printer/gutenprint/DETAILS b/printer/gutenprint/DETAILS
index e9f172c..37c0c36 100755
--- a/printer/gutenprint/DETAILS
+++ b/printer/gutenprint/DETAILS
@@ -5,8 +5,8 @@
 #          SOURCE=$SPELL$VERSION.tar.bz2
 #SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL$VERSION"
 #else
-         VERSION=5.2.5
-     SOURCE_HASH=sha512:53ade3ec986ad651a542954ca181ab207ba88ee535161b6c4be2031567ec33d95e0d34b93dbba9905bebac98a3d33f47e8f434260a8ac1f21d780d1e18aea2a8
+         VERSION=5.2.6
+     SOURCE_HASH=sha512:b0545d9885a3eaa2dceaf5f545d51f69003d33154badf56fa67cad656b05c170071b1d62d3f0823668ec1879660f39d788cd5ac838198bffc6512106cb8eee1a
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 #fi
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index b9525a7..30f1dfa 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,4 +1,7 @@
-2010-022222-12 Treeve Jelbert <treeve at sourcemage.org>
+2010-08-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 5.2.6
+
+2010-02-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 5.2.5
 
 2010-01-20 Treeve Jelbert <treeve at sourcemage.org>
diff --git a/python-pypi/kinterbasdb/HISTORY b/python-pypi/kinterbasdb/HISTORY
index b7e9f8e..892fdc6 100755
--- a/python-pypi/kinterbasdb/HISTORY
+++ b/python-pypi/kinterbasdb/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added, fix detection of recent firebird
+
 2010-01-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: firebird => FIREBIRD
 
diff --git a/python-pypi/kinterbasdb/PRE_BUILD b/python-pypi/kinterbasdb/PRE_BUILD
new file mode 100755
index 0000000..0e51305
--- /dev/null
+++ b/python-pypi/kinterbasdb/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY &&
+sed -i "/lib.*fbclient$/s/#//;/^\[manual_config\]/ a\
+database_home_dir=$INSTALL_ROOT/opt/firebird
+" setup.cfg
diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index b20e4c1..78a276b 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
            SPELL=scons
-         VERSION=1.3.0
-     SOURCE_HASH=sha512:a2bf51e95f17bab64f75d645e5f391eefad6cac6b01edf07447da8b45aa1c9a8b5e9cebf70a236274ca02b3e124afebf3d1de8e5bfb41b4c4c150fc9730d4409
+         VERSION=1.3.1
+     SOURCE_HASH=sha512:2107de6974893ad668344a5f4481984a77f5fed1f72fc02212e3525dda30104770f3ad1da0702240837b777f6b993dd913a2922dabe849d84a91d5036916c207
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index 65ebb5b..4b1ecb3 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,6 @@
+2010-08-16 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.3.1
+
 2010-04-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.3.0
 
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index d337ef8..98d7d1e 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlalchemy
   CHEESESHOP_PKG=SQLAlchemy
-         VERSION=0.6.2
-     SOURCE_HASH=sha512:cb74c2d0e6e6cd4ceb6a00b737d786e05ab1f7a6720ca6e39341af192719c4a5717045f2dc408a2efb969a3bbc275d39b9e0090536228f6b8233bbec5ed7495a
+         VERSION=0.6.3
+     SOURCE_HASH=sha512:e4a95fccf44df1a55f9ed8ac2b0cc908fd297788881bcb78be64374f45729c43a6f6eb58d370f67ff494e79783fbdb20ec8ea1601e4b0dab3d8ac8749779d652
           SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
    SOURCE_URL[0]="http://www.python.org/pypi/S/$CHEESESHOP_PKG/$SOURCE"
    SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index ffd2af3..57bfdac 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2010-08-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.3
+
 2010-07-10 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.2
 
diff --git a/python-pypi/sqlobject/DETAILS b/python-pypi/sqlobject/DETAILS
index 0d82221..24cea17 100755
--- a/python-pypi/sqlobject/DETAILS
+++ b/python-pypi/sqlobject/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlobject
   CHEESESHOP_PKG=SQLObject
-         VERSION=0.12.4
-     SOURCE_HASH=sha512:a320874a647d6ee5d2900be373b4b05ff8211f874f23a8d7c0e953e76e6a2898695ba2cbea922a5d365c63817789f3f3a49a166603c84ac4c3e99bb940da794e
+         VERSION=0.13.0
+     SOURCE_HASH=sha512:b0d1f7c91ec06e8c5e50de14fce47e26cdfb330e3bd4abb678d19d86a340763fc3da0451a2e286d2443d05ea0e70198016d31460b6e0fdcdfad75f8f248523b6
           SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
    SOURCE_URL[0]="http://pypi.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
diff --git a/python-pypi/sqlobject/HISTORY b/python-pypi/sqlobject/HISTORY
index 972178e..5ea09bf 100644
--- a/python-pypi/sqlobject/HISTORY
+++ b/python-pypi/sqlobject/HISTORY
@@ -1,3 +1,6 @@
+2010-08013 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.13.0
+
 2010-05-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.12.4
 
diff --git a/python-pypi/werkzeug/DEPENDS b/python-pypi/werkzeug/DEPENDS
new file mode 100755
index 0000000..a86d429
--- /dev/null
+++ b/python-pypi/werkzeug/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/werkzeug/DETAILS b/python-pypi/werkzeug/DETAILS
new file mode 100755
index 0000000..cc57362
--- /dev/null
+++ b/python-pypi/werkzeug/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=werkzeug
+         VERSION=0.6.2
+          SOURCE=Werkzeug-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://pypi.python.org/packages/source/W/Werkzeug/${SOURCE}
+     SOURCE_HASH=sha512:1c16a71ac38f016b974437d4b3ff1fc1caceb7b3c2a07bb87425875c255e074d51c41f83081eef0b90d2d00f9ed64e0bf967a880a723bcf9ab0f506319ec37ef
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Werkzeug-${VERSION}"
+        WEB_SITE=http://werkzeug.pocoo.org/
+      LICENSE[0]=BSD
+         ENTERED=20100815
+           SHORT="wsgi utility collection"
+cat << EOF
+Werkzeug started as a simple collection of various utilities for WSGI
+applications and has become one of the most advanced WSGI utility modules. It
+includes a powerful debugger, fully featured request and response objects,
+HTTP utilities to handle entity tags, cache control headers, HTTP dates,
+cookie handling, file uploads, a powerful URL routing system and a bunch of
+community contributed addon modules.
+EOF
diff --git a/python-pypi/werkzeug/HISTORY b/python-pypi/werkzeug/HISTORY
new file mode 100644
index 0000000..2485c90
--- /dev/null
+++ b/python-pypi/werkzeug/HISTORY
@@ -0,0 +1,2 @@
+2010-08-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS: spell created
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index e8f5b14..3cb06f8 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby-1.9
          PACKAGE=ruby
-         VERSION=1.9.1-p378
-     SOURCE_HASH=sha512:bf63563dd810a35ff2603d8000eacd70fe7b684a697e6b6ce8768f3e3c62bfb5c00b0dd674672b2dad9f9bb6c3807efb6035fc39c41d7f9b08418ebbb903972a
+         VERSION=1.9.1-p429
+     SOURCE_HASH=sha512:40bb204c46597edd0fae5b9c3efe189edfafb16095a85d79f5026d825e045d0a19ae893e55f3f3d11cd669185912a78676a7598f400a5b70335bea5660d4fe7b
           SOURCE=$PACKAGE-$VERSION.tar.gz
   SECURITY_PATCH=1
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 847f7e1..65c6be5 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2010-08-11 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.9.1-p429
+
 2010-05-08 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.9.1-p378
 
diff --git a/shell-term-fm/eaglemode/DETAILS b/shell-term-fm/eaglemode/DETAILS
index e1f26bd..7e0f9c9 100755
--- a/shell-term-fm/eaglemode/DETAILS
+++ b/shell-term-fm/eaglemode/DETAILS
@@ -1,8 +1,8 @@
            SPELL=eaglemode
-         VERSION=0.78.0
+         VERSION=0.79.0
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:04cdf5fb2f13a559bb09cc567804dd2144d3092d4ff5b001833549322eaeb6b3c91d09d879159e5d1fb36e84d249aa624b910f424bb4d6ebed25bcb5aafc7eab
+     SOURCE_HASH=sha512:f30f49148e17e92d8ce4c24a966ebb39a803e80e39e3746426c012212a46b4f1917fc995c5dc6b141fd71731a17f76cbb8818757d369ce0cd21fece427263164
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://eaglemode.sourceforge.net/"
       LICENSE[0]=GPLv3
diff --git a/shell-term-fm/eaglemode/HISTORY b/shell-term-fm/eaglemode/HISTORY
index 64e03e1..f40bcc6 100644
--- a/shell-term-fm/eaglemode/HISTORY
+++ b/shell-term-fm/eaglemode/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.79.0
+
 2010-06-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.78.0
 
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 964226b..84dda13 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2010-07-28 Finn Haedicke <finn at sourcemage.org>
+	* mkinitrd: use which to find static dmsetup, lvm, cryptsetup
+	* mkinitrd: read /proc/cmdline for root= and init=
+
 2010-06-20 Finn Haedicke <finn at sourcemage.org>
 	* DEPENDS: depends on busybox instead of klibc
 	* mkinitrd: use busybox_parts instead of klibc_parts
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index dfcaaaf..75ce834 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -110,8 +110,10 @@ function linuxrc_post()
 local rootdev;
 rootdev=$(awk '$2=="/" {print $1}' /etc/fstab)
 	cat <<-EOF
-/bin/mount $rootdev /root
-exec /bin/switch_root /root /sbin/init
+ROOTDEV=\$(busybox sed -n 's:^.*root=\([^ ]*\).*$:\1:p' /proc/cmdline )
+/bin/mount \${ROOTDEV:-$rootdev} /root
+INIT=\$(busybox sed -n 's:^.*init=\([^ ]*\).*$:\1:p' /proc/cmdline )
+exec /bin/switch_root /root \${INIT:-/sbin/init}
 EOF
 }
 
@@ -1107,7 +1109,7 @@ function lvm_parts()
 	cat <<-EOF
 dir /etc/lvm 0755 0 0
 file /etc/lvm/lvm.conf /etc/lvm/lvm.conf 0644 0 0
-file /bin/lvm /usr/sbin/lvm.static 0755 0 0
+file /bin/lvm $(which lvm.static) 0755 0 0
 EOF
 	local link
 	for link in lvs pvs vgs vgck lvconvert lvdisplay pvchange pvcreate \
@@ -1120,7 +1122,7 @@ EOF
 	do
 		echo "link /bin/$link /bin/lvm 0755 0 0"
 	done
-	echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
+	echo "file /bin/dmsetup $(which dmsetup.static 2>/dev/null) 0755 0 0"
 	fi
 }
 
@@ -1130,7 +1132,7 @@ function crypto_parts()
 	then
 	echo "file /crypttab /etc/crypttab 0644 0 0"
 	echo "file /bin/cryptsetup /usr/sbin/cryptsetup.static 0755 0 0"
-	echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
+	echo "file /bin/dmsetup $(which dmsetup.static 2>/dev/null) 0755 0 0"
 	fi
 }
 
@@ -1258,7 +1260,9 @@ function check_raid()
 
 function check_lvm()
 {
-	if [[ -f /etc/lvm/lvm.conf && -x /usr/sbin/lvm.static && -x /sbin/dmsetup.static ]]
+	LVM_STATIC=$(which lvm.static 2>/dev/null)
+	DMSETUP_STATIC=$(which dmsetup.static 2>/dev/null)
+	if [[ -f /etc/lvm/lvm.conf && -x $LVM_STATIC && -x $DMSETUP_STATIC ]]
 	then
 		USE_LVM=true
 	else
@@ -1268,7 +1272,9 @@ function check_lvm()
 
 function check_crypto()
 {
-	if [[ -f /etc/crypttab && -x /usr/sbin/cryptsetup.static && -x /sbin/dmsetup.static ]]
+	LVM_STATIC=$(which lvm.static 2>/dev/null)
+	DMSETUP_STATIC=$(which dmsetup.static 2>/dev/null)
+	if [[ -f /etc/crypttab && -x $LVM_STATIC && -x $DMSETUP_STATIC ]]
 	then
 		USE_CRYPTO=true
 	else
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index c04e00d..a8fa158 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -8,8 +8,8 @@ then
 fi                                                                 &&
 
 optional_depends  "curl"                                            \
-                  "--with-curl"                                     \
-                  "--without-curl"                                  \
+                  "--with-libcurl"                                  \
+                  "--without-libcurl"                               \
                   "enable curl support"                            &&
 
 optional_depends  "lua"                                             \
@@ -87,9 +87,14 @@ optional_depends  "postgresql"                                      \
                   "for postgresql as database backend"             &&
 
 optional_depends  "sqlite"                                          \
+                  "--with-sqlite3"                                  \
+                  "--without-sqlite3"                               \
+                  "for sqlite 3.x as database backend"             &&
+
+optional_depends  "sqlite2"                                         \
                   "--with-sqlite"                                   \
                   "--without-sqlite"                                \
-                  "for sqlite as database backend"                 &&
+                  "for sqlite 2.x as database backend"             &&
 
 optional_depends  "openldap"                                        \
                   "--with-ldap"                                     \
diff --git a/telephony/asterisk/DETAILS b/telephony/asterisk/DETAILS
index 0c2735d..e8f6d7f 100755
--- a/telephony/asterisk/DETAILS
+++ b/telephony/asterisk/DETAILS
@@ -1,5 +1,5 @@
            SPELL=asterisk
-         VERSION=1.6.1.11
+         VERSION=1.6.2.11
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 4031265..a6b6b0d 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,9 @@
+2010-08-12 Martin Spitzbarth <m.spitzbarth at gmx.de>
+	* DETAILS: updated spell to 1.6.2.11
+	* DEPENDS: adjusted the configure switch for curl,
+	  adjusted the configure switch for sqlite,
+	  added sqlite2 as an optional dependency
+
 2009-12-21 Justin Boffemmyer <flux at sourcemage.org>
 	* DETAILS: updated spell to 1.6.1.11, updated source urls
 	* DEPENDS: removed mpg123 (support for it was dropped upstream) and
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index d5480f0..9d51e48 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,7 @@
            SPELL=file
          VERSION=5.04
-     SOURCE_HASH=sha512:b480e2857691f2628024ae4b8d114d1da26b9af26d1fef01a3f5927dd569dc3ab35f559c37fa3d2957d629d393e30e444b07d9f59fb57527f812461d2de27113
+     
+SOURCE_HASH=sha512:e5ad098204746d68ae237913286c9d811cb0b67f3640846669cfde398818e0efdb6165a31b2b27bec314be1fb0ad504968979acd45f8fe7c04f8700c8b995ce8
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 77c5069..c59b2d7 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS: reverted source hash change fixes #15795
+
 2010-08-09 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: fixed source hash and turned staged install off
 
diff --git a/utils/ntp/PRE_BUILD b/utils/ntp/PRE_BUILD
index 7918e5b..528884b 100755
--- a/utils/ntp/PRE_BUILD
+++ b/utils/ntp/PRE_BUILD
@@ -1,5 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p1 -i "$SCRIPT_DIRECTORY/glibc-2.10.patch" &&
+patch -p1 -i "$SCRIPT_DIRECTORY/glibc-2.10.patch"
 
diff --git a/utils/openmoko-dfu-util/DETAILS b/utils/openmoko-dfu-util/DETAILS
index 3bd8fd6..ad58c7d 100755
--- a/utils/openmoko-dfu-util/DETAILS
+++ b/utils/openmoko-dfu-util/DETAILS
@@ -1,15 +1,15 @@
            SPELL=openmoko-dfu-util
-if [[ "$DFU_UTIL_SVN_AUTOUPDATE" == "y" ]]; then
+if [[ "$DFU_UTIL_GIT_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
 else
-         VERSION=svn
+         VERSION=git
 fi
           SOURCE="dfu-util-${VERSION}.tar.bz2"
     SOURCE_HINTS=no-check-certificate
-   SOURCE_URL[0]=svn_https://svn.openmoko.org/trunk/src/host/dfu-util:dfu-util
+   SOURCE_URL[0]=git://git.openezx.org/dfu-util.git:$SPELL
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/dfu-util-${VERSION}"
-        WEB_SITE="http://wiki.openmoko.org/wiki/Dfu-util"
+        WEB_SITE="http://dfu-util.gnumonks.org/"
       LICENSE[0]=GPL
          ENTERED=20100403
            SHORT="a program that implements the Host (PC) side of the USB DFU"
diff --git a/utils/openmoko-dfu-util/HISTORY b/utils/openmoko-dfu-util/HISTORY
index 5b026b4..1cd31af 100644
--- a/utils/openmoko-dfu-util/HISTORY
+++ b/utils/openmoko-dfu-util/HISTORY
@@ -1,3 +1,6 @@
+2010-08-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS, PREPARE: corrected SOURCE_URL and WEB_SITE
+
 2010-04-03 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS, DETAILS, PRE_BUILD, PREPARE: spell created
 
diff --git a/utils/openmoko-dfu-util/PREPARE b/utils/openmoko-dfu-util/PREPARE
index c111d07..06e0270 100755
--- a/utils/openmoko-dfu-util/PREPARE
+++ b/utils/openmoko-dfu-util/PREPARE
@@ -1 +1 @@
-config_query DFU_UTIL_SVN_AUTOUPDATE "Update to the latest SVN automatically on every cast?" ${DFU_UTIL_SVN_AUTOUPDATE:-n}
+config_query DFU_UTIL_GIT_AUTOUPDATE "Update to the latest git automatically on every cast?" ${DFU_UTIL_GIT_AUTOUPDATE:-n}
diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index cb70fc1..e270fbf 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,6 +1,6 @@
            SPELL=usbutils
-         VERSION=0.87
-     SOURCE_HASH=sha512:a8579758d9794f6f74dc877d8241a635ea0447e284dc84de63e5cc075bf030c298395422c3a81b0c15404a3c7fe44555a1a43a64f71ffa72b9ab0ea571ab3948
+         VERSION=0.90
+     SOURCE_HASH=sha512:cfa00c77f8a69612f3855e43969bd67e73752d29001ada15e884b94b00c1334ac60e384fa81aeafe8236fbed250db9416a80525f24d348b5d6e5afccca5b1766
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 6ce768d..36bceb6 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.90
+
 2010-03-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.87, SOURCEFORGE_URL -> KERNEL_URL, gz -> bz2
 
diff --git a/video-libs/gst-plugins-good/DEPENDS b/video-libs/gst-plugins-good/DEPENDS
index b79afb6..5a32496 100755
--- a/video-libs/gst-plugins-good/DEPENDS
+++ b/video-libs/gst-plugins-good/DEPENDS
@@ -74,6 +74,10 @@ optional_depends  wavpack                       \
                   "--enable-wavpack"            \
                   "--disable-wavpack"           \
                   "for wavpack audio decoding"  &&
+optional_depends  pulseaudio                    \
+                  "--enable-pulse"              \
+                  "--disable-pulse"             \
+                  "for pulseaudio plugin"       &&
 
 if is_depends_enabled $SPELL gtk-doc; then
   depends  pyxml
diff --git a/video-libs/gst-plugins-good/HISTORY b/video-libs/gst-plugins-good/HISTORY
index e72f929..7c34cbe 100644
--- a/video-libs/gst-plugins-good/HISTORY
+++ b/video-libs/gst-plugins-good/HISTORY
@@ -1,3 +1,6 @@
+2010-07-18 Finn Haedicke <finn at sourcemage.org>
+	* DEPENDS: optionally depends on pulseaudio
+
 2010-07-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.10.24
 	* DEPENDS: liboil -> orc
diff --git a/video/dvdrip/DETAILS b/video/dvdrip/DETAILS
index ffa9cc0..314d04e 100755
--- a/video/dvdrip/DETAILS
+++ b/video/dvdrip/DETAILS
@@ -1,7 +1,7 @@
            SPELL=dvdrip
-         VERSION=0.98.10
+         VERSION=0.98.11
           SOURCE=$SPELL-$VERSION.tar.gz
-     SOURCE_HASH=sha512:b5771086b2e99df8412889a74bb344cfc4b4d4577efbcce5f0a482b8f7f7060c55c25a69ded2a16d6ac6b0c441f646ec20bf8555dfb10c02522c674298960942
+     SOURCE_HASH=sha512:8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/J/JR/JRED/$SOURCE
    SOURCE_URL[1]=http://www.exit1.org/dvdrip/dist/$SOURCE
diff --git a/video/dvdrip/HISTORY b/video/dvdrip/HISTORY
index e2e0041..75399ee 100644
--- a/video/dvdrip/HISTORY
+++ b/video/dvdrip/HISTORY
@@ -1,3 +1,6 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.98.11
+
 2009-03-07 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: 0.98.10
 
diff --git a/video/lxdvdrip/DETAILS b/video/lxdvdrip/DETAILS
index a47b447..01201c0 100755
--- a/video/lxdvdrip/DETAILS
+++ b/video/lxdvdrip/DETAILS
@@ -1,8 +1,8 @@
            SPELL=lxdvdrip
-         VERSION=1.70
+         VERSION=1.76
           SOURCE="$SPELL-$VERSION.tgz"
    SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:a8f52e319246da8c15fdd780d93622e8ccfccbfce6aa9ed87393ea78c7f414e172fcd07693fbf1be1c020fd020eb75513fbee4c5e92f473e87f983f7f49a7987
+     SOURCE_HASH=sha512:577dd0d2c5291a57fc09b355b1c839e9172ac3898ef2905d0c9b3527f0a91c577699f1f087fe00a58db9e4b1901f240ee40ee1ac88a246d250b07f55a9d4e0e6
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL"
         WEB_SITE=http://openfacts.berlios.de/index-en.phtml?title=lxdvdrip
       LICENSE[0]=GPL
diff --git a/video/lxdvdrip/HISTORY b/video/lxdvdrip/HISTORY
index 1708889..1ded6cf 100644
--- a/video/lxdvdrip/HISTORY
+++ b/video/lxdvdrip/HISTORY
@@ -1,5 +1,9 @@
+2010-08-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS, PRE_BUILD, lxdvdrip-1.76-makefile.patch,
+	  lxdvdrip-1.70-makefile.patch: version 1.76
+
 2010-04-04 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BULD: run make in the subdirectories too, so the spell doesn't
+	* BUILD: run make in the subdirectories too, so the spell doesn't
 	  compile anything during INSTALL phase
 	* PRE_BUILD: fix up Makefiles to not install anything to /usr/man or
 	  /usr/local
diff --git a/video/lxdvdrip/PRE_BUILD b/video/lxdvdrip/PRE_BUILD
index ddc0540..a0b1a74 100755
--- a/video/lxdvdrip/PRE_BUILD
+++ b/video/lxdvdrip/PRE_BUILD
@@ -1,11 +1,10 @@
 default_pre_build                            &&
 cd $SOURCE_DIRECTORY                         &&
+patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.76-makefile.patch       &&
 sedit "s:INSTALLDIR = /usr/local:INSTALLDIR = $INSTALL_ROOT/usr:" \
 		     $SOURCE_DIRECTORY/Makefile &&
-sedit "s:/man/man1:/share/man/man1:"  Makefile &&
 sedit "s:/usr/local:/usr:" vamps/Makefile &&
 sedit "s:/usr/local:/usr:" dvdbackup/Makefile &&
 sedit "s:/usr/local:/usr:" buffer/Makefile &&
-patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-makefile.patch &&
 patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-vamps-makefile.patch &&
 patch -p0 < $SCRIPT_DIRECTORY/systools.c.patch
diff --git a/video/lxdvdrip/lxdvdrip-1.70-makefile.patch b/video/lxdvdrip/lxdvdrip-1.70-makefile.patch
deleted file mode 100644
index af2bb7f..0000000
--- a/video/lxdvdrip/lxdvdrip-1.70-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: lxdvdrip/Makefile
-===================================================================
---- lxdvdrip.orig/Makefile
-+++ lxdvdrip/Makefile
-@@ -4,11 +4,8 @@ HINWEIS1 = 'Check the configuration file
- HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
- 
- all:
--	gcc -g -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c
--	gcc -g -lm -o lxac3scan lxac3scan.c
--	cd vamps && make && cd ..
--	cd dvdbackup && make && cd ..
--	cd buffer && make && cd ..
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c -lm -ldvdread -ldvdnav -lpthread 
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o lxac3scan lxac3scan.c -lm
- 
- clean: 
- 	rm -f lxdvdrip lxac3scan *.o
diff --git a/video/lxdvdrip/lxdvdrip-1.76-makefile.patch b/video/lxdvdrip/lxdvdrip-1.76-makefile.patch
new file mode 100644
index 0000000..7291a16
--- /dev/null
+++ b/video/lxdvdrip/lxdvdrip-1.76-makefile.patch
@@ -0,0 +1,25 @@
+--- lxdvdrip/Makefile.orig	2010-08-17 15:22:25.000000000 +0200
++++ lxdvdrip/Makefile	2010-08-17 15:24:55.000000000 +0200
+@@ -4,8 +4,8 @@
+ HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
+ 
+ all:
+-	gcc -g -lm -ldvdread -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c dvdformat.c badsect.c mpeg2dec.c
+-	gcc -g -lm -o lxac3scan lxac3scan.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -lm -ldvdread -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c dvdformat.c badsect.c mpeg2dec.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -lm -o lxac3scan lxac3scan.c
+ 	cd vamps && make && cd ..
+ 	cd dvdbackup && make && cd ..
+ 	cd requant && make && cd ..
+@@ -21,8 +21,9 @@
+ install:
+ 	cp lxdvdrip $(INSTALLDIR)/bin
+ 	cp lxac3scan $(INSTALLDIR)/bin
+-	cp lxdvdrip.1 $(INSTALLDIR)/man/man1
+-	cp lxdvdrip.wav $(INSTALLDIR)/share
++	cp lxdvdrip.1 $(INSTALLDIR)/share/man/man1
++	mkdir $(INSTALLDIR)/share/lxdvdrip
++	cp lxdvdrip.wav $(INSTALLDIR)/share/lxdvdrip
+ 	cd vamps && make install && cd ..
+ 	cd dvdbackup && make install && cd ..
+ 	cd requant && make install && cd ..
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 0877bfc..76c3153 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,7 +1,7 @@
            SPELL=cairo
 if [[ $CAIRO_DEVEL == y ]]; then
-         VERSION=1.9.6
-     SOURCE_HASH=sha512:9029d1637760126bece7dc8023ac00572c44fe5794d2b2fc5a2f2706b0061ebede9c7b5ddb7560527a7d9ac8c7e4ab0265f4165ce60e60ada647756070019873
+         VERSION=1.9.14
+     SOURCE_HASH=sha512:c38556c9ad0e2db9e627a40a02050ad6d459b5d53ea8b827304a3898623215d0c65bcfab94b5eef13d8acc20d041e4d708a04c13a9936111577954b0ce626d73
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://cairographics.org/snapshots/$SOURCE
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 6db5175..ab51ff5 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 1.9.14
+	* PRE_SUB_DEPENDS: Added option for devel version
+	* SUB_DEPENDS: Added option for devel version
+
 2010-08-10 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS: updated stable to 1.8.10, 1.8.8 doesn't build with libpng 1.4
 
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 969c351..75946d1 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
 case $THIS_SUB_DEPENDS in
+  CAIRO_DEVEL) if [[ "$CAIRO_DEVEL" == "y" ]]; then return 0; fi;;
   PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
   XCB) is_depends_enabled $SPELL xcb-util;;
   PNG) is_depends_enabled $SPELL libpng;;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 322a4dd..c592450 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,4 +1,6 @@
 case $THIS_SUB_DEPENDS in
+  CAIRO_DEVEL) echo "Devel release needed, forcing it."  &&
+       CAIRO_DEVEL="y"                          ;;
   PDF) return 0;;
   XCB) message "Cairo with XCB support requested, forcing xcb-util dependency" &&
        depends xcb-util "--enable-xcb";;
diff --git a/x11-toolkits/fltk2/DEPENDS b/x11-toolkits/fltk2/DEPENDS
index 6a2e8e4..a003ff7 100755
--- a/x11-toolkits/fltk2/DEPENDS
+++ b/x11-toolkits/fltk2/DEPENDS
@@ -1,7 +1,7 @@
 depends  g++       &&
 depends  libx11    &&
 
-optional_depends  OPENGL  "--enable-gl"  "--disable-gl"  \
+optional_depends  mesalib  "--enable-gl=yes"  "--enable-gl=no"  \
                   "for OpenGL support"                   &&
 optional_depends  jpeg  "--enable-jpeg"  "--disable-jpeg"  \
                   "to use the system JPEG library"                   &&
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 9e87114..1038b9b 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,8 @@
+2010-08-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS: optional_depends mesalib instead of optional_depends OPENGL
+	  nvidia_driver is a provider of OPENGL but doesn't ship glu.h
+	  which fltk2 needs if opengl support is enabled
+
 2010-02-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.x-r6970
 	* PRE_BUILD, fltk2-gcc44.patch: removed patch
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index fa78872..335ed6b 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,4 +1,10 @@
-depends glib2 &&
+if [[ "$GTK_VER" == "devel" ]]; then
+   depends -sub GLIB_DEVEL glib2 &&
+   depends gdk-pixbuf2
+   depends -sub GOBJ_DEVEL gobject-introspection
+else
+   depends glib2
+fi
 depends atk &&
 depends pango &&
 depends -sub "PDF PS SVG X" cairo &&
@@ -7,6 +13,7 @@ depends libxext &&
 depends libxcursor &&
 depends libxrender &&
 
+if [[ "$GTK_VER" == "stable" ]]; then
 optional_depends libpng \
                  "--with-libpng" \
                  "--without-libpng" \
@@ -25,7 +32,8 @@ optional_depends tiff \
 optional_depends jasper \
                  "--with-libjasper" \
                  "--without-libjasper" \
-                 "for JPEG-2000 support" &&
+                 "for JPEG-2000 support"
+fi
 
 optional_depends libxinerama \
                  "--enable-xinerama" \
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 5b3fd14..c8a2602 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gtk+2
 if [[ $GTK_VER == devel ]];then
-         VERSION=2.20.1
+         VERSION=2.21.6
 #     SOURCE_HASH=sha512:a6c45ab25a5cf07c665f808a96b83a91bf0e8218f793806f1e05d664aeea4838957868ccbc13b45e9be1fdbadc6a7f294ec111f7d6d00bb09cf59fa4fe4eecc3
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index c20db53..1ce194f 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,8 @@
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.21.6
+	* DEPENDS: Added new depends for devel version
+	  Many of the image libs are now in gdk-pixbuf2
+
 2010-05-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.20.1
 
diff --git a/x11-toolkits/gtk+2/gtk+-2.21.6.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.21.6.tar.bz2.sig
new file mode 100644
index 0000000..7ddc066
Binary files /dev/null and b/x11-toolkits/gtk+2/gtk+-2.21.6.tar.bz2.sig differ
diff --git a/x11-toolkits/gtk+3/BUILD b/x11-toolkits/gtk+3/BUILD
new file mode 100755
index 0000000..02c1e81
--- /dev/null
+++ b/x11-toolkits/gtk+3/BUILD
@@ -0,0 +1,3 @@
+# bug #12668
+export CFLAGS="${CFLAGS/-O3/-Os}"                    &&
+default_build
diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
new file mode 100755
index 0000000..79bcc47
--- /dev/null
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -0,0 +1,45 @@
+depends -sub GLIB_DEVEL glib2 &&
+depends gdk-pixbuf2
+depends -sub GOBJ_DEVEL gobject-introspection
+depends atk &&
+depends pango &&
+depends -sub "CAIRO_DEVEL PDF PS SVG X" cairo &&
+depends libsm &&
+depends libxext &&
+depends libxcursor &&
+depends libxrender &&
+
+optional_depends libxinerama \
+                 "--enable-xinerama" \
+                 "--disable-xinerama" \
+                 "for X11 Xinerama extension support" &&
+
+optional_depends libxrandr                            \
+                 ""                                   \
+                 ""                                   \
+                 "for X11 Resize and Rotate support"  &&
+
+optional_depends libxcomposite                  \
+                 ""                             \
+                 ""                             \
+                 "for X11 Compositing support"  &&
+
+optional_depends libxdamage                                  \
+                 ""                                          \
+                 ""                                          \
+                 "for X11 Damaged region extension support"  &&
+
+optional_depends libxfixes                                      \
+                 ""                                             \
+                 ""                                             \
+                 "for X11 workarounds for various limitations"  &&
+
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "Build documentation with gtk-doc" &&
+
+optional_depends cups \
+                 "--enable-cups" \
+                 "--disable-cups" \
+                 "Enable CUPS print backend support?"
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
new file mode 100755
index 0000000..f0889e6
--- /dev/null
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -0,0 +1,24 @@
+           SPELL=gtk+3
+if [[ $GTK_VER == devel ]];then
+         VERSION=2.90.6
+#     SOURCE_HASH=sha512:a6c45ab25a5cf07c665f808a96b83a91bf0e8218f793806f1e05d664aeea4838957868ccbc13b45e9be1fdbadc6a7f294ec111f7d6d00bb09cf59fa4fe4eecc3
+          SOURCE=gtk+-$VERSION.tar.bz2
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+else
+         VERSION=2.90.6
+          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
+      LICENSE[0]=LGPL
+        KEYWORDS="x11 libs"
+           DOCS="ChangeLog COPYING NEW README* docs/*.txt docs/faq docs/tutorial"
+        WEB_SITE=http://www.gtk.org/
+         ENTERED=20100817
+           SHORT="highly usable, feature rich toolkit for creating GUIs"
+cat << EOF
+GTK+ is a widget toolkit for X and other windowing systems. It is used in such
+projects as the GIMP and GNOME.
+EOF
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
new file mode 100644
index 0000000..bad738f
--- /dev/null
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -0,0 +1,7 @@
+2010-08-18 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_SUB_DEPENDS: Removed.  libpng not used.
+	* SUB_DEPENDS: Removed. libpng not used.
+	* PROVIDES: Removed.  Doesn't provide gtk+2
+
+2010-08-17 George Sherwood <gsherwood at sourcemage.org>
+	* ALL: Created spell
diff --git a/x11-toolkits/gtk+3/INSTALL b/x11-toolkits/gtk+3/INSTALL
new file mode 100755
index 0000000..4ee9c45
--- /dev/null
+++ b/x11-toolkits/gtk+3/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+install -vm 755 -d "$INSTALL_ROOT/etc/gtk-3.0" &&
+gdk-pixbuf-query-loaders > "$INSTALL_ROOT/etc/gtk-3.0/gdk-pixbuf.loaders"
diff --git a/x11-toolkits/gtk+3/PREPARE b/x11-toolkits/gtk+3/PREPARE
new file mode 100755
index 0000000..03347b9
--- /dev/null
+++ b/x11-toolkits/gtk+3/PREPARE
@@ -0,0 +1 @@
+config_query_list GTK_VER 'which gtk version?' stable devel
diff --git a/x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig b/x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig
new file mode 100644
index 0000000..4a0a5eb
Binary files /dev/null and b/x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig differ
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 1317a0e..8522af8 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -13,7 +13,7 @@ depends  jpeg    '--with-libjpeg'  &&
 depends  tiff    '--with-libtiff'  &&
 depends  pcre    '--with-regex=sys'    &&
 
-optional_depends  OPENGL             \
+optional_depends  mesalib            \
                   '--with-opengl'    \
                   '--without-opengl' \
                   'for OpenGL support'  &&
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 1044668..cd01f25 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,8 @@
+2010-08-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DEPENDS: optional_depends mesalib instead of optional_depends OPENGL
+	  nvidia_driver is a provider of OPENGL but doesn't ship glu.h
+	  which fltk2 needs if opengl support is enabled
+
 2010-05-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.8.11
 	* PRE_BUILD: don't patch this version
diff --git a/x11/merkaartor/DETAILS b/x11/merkaartor/DETAILS
index 5702e42..aff15ce 100755
--- a/x11/merkaartor/DETAILS
+++ b/x11/merkaartor/DETAILS
@@ -1,8 +1,8 @@
            SPELL=merkaartor
-         VERSION=0.16.1
-     SOURCE_HASH=sha512:698fbf7facab11d4a220adaa78431032126911eb244f007776fe3ed38d9d9c8fc4e1dbe63eb370de826b6c7891ad2ad7f7efc23cae0366023caf506737fa1184
+         VERSION=0.16.2
+     SOURCE_HASH=sha512:79fe65865e483e9ed2b8d6fa0819be61a6190979179cd688f90f170d0a822b3fb7450cea1dd1a5a23559f35603ad59e4a194543f85339aa0d6069682bfe97daa
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://www.merkaartor.be/attachments/download/2/${SOURCE}
+   SOURCE_URL[0]=http://www.merkaartor.be/attachments/download/26/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.merkaartor.be"
       LICENSE[0]=GPL
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index 15e9112..8aec1ef 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,6 @@
+2010-08-15 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS:  updated spell to 0.16.2 (SOURCE_URL changes with new version)
+
 2010-08-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed WEB_SITE & SOURCE_URL (ugly but only working atm)
 



More information about the SM-Commit mailing list