Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 ChangeLog                                                     |   15 ++
 antivirus/clamav/DEPENDS                                      |    3 
 antivirus/clamav/DETAILS                                      |    2 
 antivirus/clamav/HISTORY                                      |    4 
 archive-libs/libarchive/DEPENDS                               |    4 
 archive-libs/libarchive/HISTORY                               |    6 
 archive/bacula/DEPENDS                                        |    6 
 archive/bacula/HISTORY                                        |    6 
 archive/burp/DEPENDS                                          |    6 
 archive/burp/HISTORY                                          |    6 
 archive/dar/DEPENDS                                           |    2 
 archive/dar/HISTORY                                           |    3 
 archive/dar22/DEPENDS                                         |    2 
 archive/dar22/HISTORY                                         |    3 
 audio-creation/klick/BUILD                                    |    2 
 audio-creation/klick/DEPENDS                                  |    6 
 audio-creation/klick/DETAILS                                  |    4 
 audio-creation/klick/HISTORY                                  |    4 
 audio-drivers/pulseaudio/DEPENDS                              |    2 
 audio-drivers/pulseaudio/HISTORY                              |    2 
 audio-players/deadbeef/DETAILS                                |    4 
 audio-players/deadbeef/HISTORY                                |    4 
 audio-players/deadbeef/PRE_BUILD                              |    3 
 audio-players/deadbeef/libzip.patch                           |   11 -
 audio-players/qmmp-plugin-pack/BUILD                          |    1 
 audio-players/qmmp-plugin-pack/DEPENDS                        |    1 
 audio-players/qmmp-plugin-pack/DETAILS                        |   14 +
 audio-players/qmmp-plugin-pack/HISTORY                        |    2 
 audio-players/qmmp/CONFLICTS                                  |    1 
 audio-players/qmmp/DETAILS                                    |    4 
 audio-players/qmmp/HISTORY                                    |    7 
 audio-soft/wavegain/BUILD                                     |    4 
 audio-soft/wavegain/DEPENDS                                   |    1 
 audio-soft/wavegain/DETAILS                                   |   29 +++
 audio-soft/wavegain/HISTORY                                   |    2 
 audio-soft/wavegain/INSTALL                                   |    1 
 chat-im/centerim/DEPENDS                                      |    2 
 chat-im/centerim/HISTORY                                      |    3 
 chat-im/ejabberd/DEPENDS                                      |    8 -
 chat-im/ejabberd/HISTORY                                      |    3 
 chat-im/gajim/DEPENDS                                         |    4 
 chat-im/gajim/HISTORY                                         |    3 
 chat-im/jabberd/DEPENDS                                       |    2 
 chat-im/jabberd/HISTORY                                       |    3 
 chat-im/licq/DEPENDS                                          |    4 
 chat-im/licq/HISTORY                                          |    3 
 chat-im/profanity/DEPENDS                                     |    2 
 chat-im/profanity/HISTORY                                     |    3 
 chat-im/prosody/DEPENDS                                       |    2 
 chat-im/prosody/HISTORY                                       |    3 
 chat-im/psi/DEPENDS                                           |    2 
 chat-im/psi/HISTORY                                           |    3 
 chat-im/qutecom/DEPENDS                                       |    2 
 chat-im/qutecom/HISTORY                                       |    3 
 chat-im/qutim/DEPENDS                                         |    2 
 chat-im/qutim/HISTORY                                         |    3 
 chat-im/tmsnc/DEPENDS                                         |    2 
 chat-im/tmsnc/HISTORY                                         |    3 
 chat-im/vacuum/DEPENDS                                        |    2 
 chat-im/vacuum/HISTORY                                        |    3 
 chat-irc/hexchat/DEPENDS                                      |    4 
 chat-irc/hexchat/HISTORY                                      |    3 
 chat-irc/ircd-ratbox/DEPENDS                                  |    6 
 chat-irc/ircd-ratbox/HISTORY                                  |    3 
 chat-irc/irssi/DEPENDS                                        |    2 
 chat-irc/irssi/HISTORY                                        |    3 
 chat-irc/xchat-gnome/DEPENDS                                  |    4 
 chat-irc/xchat-gnome/HISTORY                                  |    3 
 chat-irc/xchat/DEPENDS                                        |    4 
 chat-irc/xchat/HISTORY                                        |    3 
 chat-irc/znc/DEPENDS                                          |    6 
 chat-irc/znc/HISTORY                                          |    3 
 chat-libs/gloox/DEPENDS                                       |    2 
 chat-libs/gloox/HISTORY                                       |    3 
 chat-libs/libmsn/DEPENDS                                      |    2 
 chat-libs/libmsn/HISTORY                                      |    3 
 chat-libs/libstrophe/DEPENDS                                  |    2 
 chat-libs/libstrophe/HISTORY                                  |    3 
 chat-libs/loudmouth/DEPENDS                                   |    2 
 chat-libs/loudmouth/HISTORY                                   |    3 
 chat-libs/ptlib/DEPENDS                                       |    6 
 chat-libs/ptlib/HISTORY                                       |    5 
 chat-libs/pwlib/DEPENDS                                       |    6 
 chat-libs/pwlib/HISTORY                                       |    3 
 chat-libs/tls/DEPENDS                                         |    2 
 chat-libs/tls/HISTORY                                         |    3 
 collab/openca/DEPENDS                                         |    2 
 collab/openca/HISTORY                                         |    3 
 collab/openldap/CONFIGURE                                     |    1 
 collab/openldap/DEPENDS                                       |    4 
 collab/openldap/HISTORY                                       |    5 
 collab/rapidsvn/DEPENDS                                       |    2 
 collab/rapidsvn/HISTORY                                       |    3 
 crypto/chntpw/DEPENDS                                         |    2 
 crypto/chntpw/HISTORY                                         |    3 
 crypto/cyrus-sasl/DEPENDS                                     |    6 
 crypto/cyrus-sasl/HISTORY                                     |    6 
 crypto/encfs/DEPENDS                                          |    2 
 crypto/encfs/HISTORY                                          |    3 
 crypto/engine_pkcs11/DEPENDS                                  |    2 
 crypto/engine_pkcs11/HISTORY                                  |    3 
 crypto/gnupg-exp/DETAILS                                      |    2 
 crypto/gnupg-exp/HISTORY                                      |    3 
 crypto/gpgme/DEPENDS                                          |   14 +
 crypto/gpgme/DETAILS                                          |    5 
 crypto/gpgme/HISTORY                                          |    5 
 crypto/hydan/DEPENDS                                          |    2 
 crypto/hydan/HISTORY                                          |    3 
 crypto/krb5/DEPENDS                                           |    1 
 crypto/krb5/DETAILS                                           |    6 
 crypto/krb5/HISTORY                                           |    9 +
 crypto/libgcrypt/DETAILS                                      |    2 
 crypto/libgcrypt/HISTORY                                      |    3 
 crypto/libp11/DEPENDS                                         |    2 
 crypto/libp11/HISTORY                                         |    3 
 crypto/libressl/CONFLICTS                                     |    1 
 crypto/libressl/DEPENDS                                       |    2 
 crypto/libressl/DETAILS                                       |   14 +
 crypto/libressl/HISTORY                                       |    4 
 crypto/libressl/PREPARE                                       |    5 
 crypto/libressl/PROVIDES                                      |    1 
 crypto/libressl/UP_TRIGGERS                                   |   10 +
 crypto/libssh/CONFIGURE                                       |    2 
 crypto/libssh/HISTORY                                         |    3 
 crypto/libssh2/CONFIGURE                                      |    2 
 crypto/libssh2/DEPENDS                                        |    6 
 crypto/libssh2/HISTORY                                        |    5 
 crypto/lsh/DEPENDS                                            |    2 
 crypto/lsh/HISTORY                                            |    3 
 crypto/mosh/DEPENDS                                           |    2 
 crypto/mosh/HISTORY                                           |    3 
 crypto/opensc/DEPENDS                                         |    2 
 crypto/opensc/HISTORY                                         |    3 
 crypto/openssh/DEPENDS                                        |    2 
 crypto/openssh/HISTORY                                        |    3 
 crypto/openssl/CONFLICTS                                      |    1 
 crypto/openssl/DETAILS                                        |    8 -
 crypto/openssl/HISTORY                                        |   11 +
 crypto/openssl/PREPARE                                        |    5 
 crypto/openssl/PROVIDES                                       |    1 
 crypto/openssl/openssl.gpg                                    |binary
 crypto/pad/DEPENDS                                            |    2 
 crypto/pad/HISTORY                                            |    3 
 crypto/qca-openssl/DEPENDS                                    |    2 
 crypto/qca-openssl/HISTORY                                    |    3 
 crypto/ssldump/DEPENDS                                        |    2 
 crypto/ssldump/HISTORY                                        |    3 
 crypto/unhash/DEPENDS                                         |    2 
 crypto/unhash/HISTORY                                         |    3 
 crypto/xca/DEPENDS                                            |    2 
 crypto/xca/HISTORY                                            |    3 
 crypto/xmlsec/DEPENDS                                         |    7 
 crypto/xmlsec/HISTORY                                         |    3 
 database/couchdb/DEPENDS                                      |    2 
 database/couchdb/HISTORY                                      |    3 
 database/firebird/DEPENDS                                     |    2 
 database/firebird/HISTORY                                     |    3 
 database/firebird25/DEPENDS                                   |    2 
 database/firebird25/HISTORY                                   |    3 
 database/libzdb/DEPENDS                                       |    4 
 database/libzdb/HISTORY                                       |    3 
 database/mariadb/DEPENDS                                      |    4 
 database/mariadb/HISTORY                                      |    5 
 database/mongodb/DEPENDS                                      |    2 
 database/mongodb/HISTORY                                      |    3 
 database/mysql-workbench/DEPENDS                              |    2 
 database/mysql-workbench/HISTORY                              |    3 
 database/mysql/DEPENDS                                        |    8 -
 database/mysql/HISTORY                                        |    8 +
 database/pgadmin3/DEPENDS                                     |    2 
 database/pgadmin3/HISTORY                                     |    3 
 database/postgresql/DEPENDS                                   |    6 
 database/postgresql/HISTORY                                   |    6 
 database/sqlite/DETAILS                                       |    6 
 database/sqlite/HISTORY                                       |    3 
 database/virtuoso/DEPENDS                                     |    2 
 database/virtuoso/HISTORY                                     |    3 
 dev/null                                                      |binary
 devel/android-tools/DEPENDS                                   |    2 
 devel/android-tools/HISTORY                                   |    3 
 devel/cmake/DETAILS                                           |    4 
 devel/cmake/HISTORY                                           |    3 
 devel/extra-cmake-modules/DETAILS                             |    6 
 devel/extra-cmake-modules/HISTORY                             |    3 
 devel/git/DEPENDS                                             |    4 
 devel/git/DETAILS                                             |    8 -
 devel/git/HISTORY                                             |   11 +
 devel/libgc/DETAILS                                           |    6 
 devel/libgc/HISTORY                                           |    3 
 devel/polyorb/DEPENDS                                         |    6 
 devel/polyorb/HISTORY                                         |    6 
 devel/pyside-tools/DEPENDS                                    |    2 
 devel/pyside-tools/HISTORY                                    |    3 
 devel/python/DEPENDS                                          |    2 
 devel/python/HISTORY                                          |    5 
 devel/python3/DEPENDS                                         |    1 
 devel/python3/HISTORY                                         |    3 
 devel/radare2/DEPENDS                                         |    2 
 devel/radare2/HISTORY                                         |    3 
 devel/swiprolog/DEPENDS                                       |    2 
 devel/swiprolog/HISTORY                                       |    3 
 devel/yaz/DEPENDS                                             |    2 
 devel/yaz/HISTORY                                             |    3 
 disk/avfs/DEPENDS                                             |    2 
 disk/avfs/HISTORY                                             |    3 
 disk/boxbackup/DEPENDS                                        |    2 
 disk/boxbackup/HISTORY                                        |    3 
 disk/dmg2img/DEPENDS                                          |    2 
 disk/dmg2img/HISTORY                                          |    3 
 disk/dump/DEPENDS                                             |    2 
 disk/dump/HISTORY                                             |    3 
 disk/libewf/DEPENDS                                           |    2 
 disk/libewf/HISTORY                                           |    3 
 disk/netatalk/DEPENDS                                         |    2 
 disk/netatalk/HISTORY                                         |    3 
 disk/partclone/DETAILS                                        |    4 
 disk/partclone/HISTORY                                        |    3 
 disk/partimage/DEPENDS                                        |    2 
 disk/partimage/HISTORY                                        |    3 
 disk/testdisk/DEPENDS                                         |    2 
 disk/testdisk/HISTORY                                         |    3 
 disk/uif2iso/DEPENDS                                          |    2 
 disk/uif2iso/HISTORY                                          |    3 
 disk/whdd/BUILD                                               |    1 
 disk/whdd/DEPENDS                                             |    9 +
 disk/whdd/DETAILS                                             |   16 ++
 disk/whdd/HISTORY                                             |    2 
 disk/whdd/PREPARE                                             |    2 
 display/qingy/DEPENDS                                         |    4 
 display/qingy/HISTORY                                         |    3 
 doc/htmldoc/DEPENDS                                           |    2 
 doc/htmldoc/HISTORY                                           |    3 
 e-17/ecore/DEPENDS                                            |    6 
 e-17/ecore/HISTORY                                            |    5 
 e-17/eet/DEPENDS                                              |    6 
 e-17/eet/HISTORY                                              |    3 
 editors/openoffice/DEPENDS                                    |    2 
 editors/openoffice/HISTORY                                    |    3 
 ftp-libs/dclib/DEPENDS                                        |    2 
 ftp-libs/dclib/HISTORY                                        |    3 
 ftp-libs/libtorrent/DEPENDS                                   |    2 
 ftp-libs/libtorrent/HISTORY                                   |    3 
 ftp-libs/rb-libtorrent/DEPENDS                                |    2 
 ftp-libs/rb-libtorrent/HISTORY                                |    5 
 ftp/aria2/DEPENDS                                             |    6 
 ftp/aria2/HISTORY                                             |    6 
 ftp/btpd/DEPENDS                                              |    2 
 ftp/btpd/HISTORY                                              |    3 
 ftp/createtorrent/DEPENDS                                     |    2 
 ftp/createtorrent/HISTORY                                     |    3 
 ftp/ctorrent/DEPENDS                                          |    2 
 ftp/ctorrent/HISTORY                                          |    3 
 ftp/curl/BUILD                                                |    4 
 ftp/curl/CONFIGURE                                            |    2 
 ftp/curl/DEPENDS                                              |   41 +++--
 ftp/curl/HISTORY                                              |    8 +
 ftp/dctc/DEPENDS                                              |    6 
 ftp/dctc/HISTORY                                              |    3 
 ftp/deluge/DEPENDS                                            |    2 
 ftp/deluge/HISTORY                                            |    3 
 ftp/gftp/DEPENDS                                              |    6 
 ftp/gftp/HISTORY                                              |    3 
 ftp/lftp/DEPENDS                                              |    6 
 ftp/lftp/HISTORY                                              |    6 
 ftp/proftpd/DEPENDS                                           |    8 -
 ftp/proftpd/HISTORY                                           |    3 
 ftp/pure-ftpd/DEPENDS                                         |    2 
 ftp/pure-ftpd/HISTORY                                         |    3 
 ftp/tnftp/DEPENDS                                             |    2 
 ftp/tnftp/HISTORY                                             |    3 
 ftp/transmission/DEPENDS                                      |    2 
 ftp/transmission/HISTORY                                      |    3 
 ftp/vsftpd/DEPENDS                                            |    2 
 ftp/vsftpd/HISTORY                                            |    3 
 ftp/wget/CONFIGURE                                            |    2 
 ftp/wget/DEPENDS                                              |   13 -
 ftp/wget/HISTORY                                              |    9 +
 ftp/wget/PRE_SUB_DEPENDS                                      |    2 
 ftp/wget/SUB_DEPENDS                                          |    4 
 gnome2-apps/balsa/DEPENDS                                     |    2 
 gnome2-apps/balsa/HISTORY                                     |    3 
 gnome2-apps/homebank/DETAILS                                  |    5 
 gnome2-apps/homebank/HISTORY                                  |    3 
 gnome2-apps/mail-notification/DEPENDS                         |    2 
 gnome2-apps/mail-notification/HISTORY                         |    3 
 gnome2-libs/evolution-webcal/DEPENDS                          |    2 
 gnome2-libs/evolution-webcal/HISTORY                          |    3 
 gnome2-libs/glib2/DETAILS                                     |    8 -
 gnome2-libs/glib2/HISTORY                                     |    3 
 gnome2-libs/gnome-python2/DEPENDS                             |    2 
 gnome2-libs/gnome-python2/HISTORY                             |    3 
 gnome2-libs/gnome-vfs2/DEPENDS                                |    6 
 gnome2-libs/gnome-vfs2/HISTORY                                |    3 
 gnome2-libs/libgnomecups/DEPENDS                              |    2 
 gnome2-libs/libgnomecups/HISTORY                              |    3 
 gnome2-libs/pango/DETAILS                                     |    4 
 gnome2-libs/pango/HISTORY                                     |    3 
 gnome3-libs/libgda5/DEPENDS                                   |    2 
 gnome3-libs/libgda5/HISTORY                                   |    3 
 gnustep-libs/gnustep-base/DEPENDS                             |    6 
 gnustep-libs/gnustep-base/HISTORY                             |    3 
 graphics-libs/harfbuzz/DETAILS                                |    4 
 graphics-libs/harfbuzz/HISTORY                                |    3 
 graphics/graphicsmagick/BUILD                                 |    3 
 graphics/graphicsmagick/CONFIGURE                             |    3 
 graphics/graphicsmagick/DETAILS                               |    4 
 graphics/graphicsmagick/HISTORY                               |    5 
 graphics/graphicsmagick/PRE_SUB_DEPENDS                       |    5 
 graphics/graphicsmagick/SUB_DEPENDS                           |    6 
 graphics/inkscape/DETAILS                                     |   10 -
 graphics/inkscape/HISTORY                                     |    3 
 graphics/lensfun/DETAILS                                      |    8 -
 graphics/lensfun/HISTORY                                      |    3 
 http/apache-mod_ssl/DEPENDS                                   |    2 
 http/apache-mod_ssl/HISTORY                                   |    3 
 http/apache2/DEPENDS                                          |    2 
 http/apache2/HISTORY                                          |    5 
 http/apache22/DEPENDS                                         |    2 
 http/apache22/HISTORY                                         |    5 
 http/cadaver/DEPENDS                                          |    4 
 http/cadaver/HISTORY                                          |    3 
 http/cherokee/DEPENDS                                         |    2 
 http/cherokee/HISTORY                                         |    3 
 http/dillo/DEPENDS                                            |    2 
 http/dillo/HISTORY                                            |    3 
 http/dillo2/DEPENDS                                           |    4 
 http/dillo2/HISTORY                                           |    3 
 http/elinks/DEPENDS                                           |    6 
 http/elinks/HISTORY                                           |    6 
 http/elog/DEPENDS                                             |    2 
 http/elog/HISTORY                                             |    3 
 http/esehttpd/DEPENDS                                         |    2 
 http/esehttpd/HISTORY                                         |    3 
 http/gnash/DEPENDS                                            |    2 
 http/gnash/HISTORY                                            |    3 
 http/httpd-dev/DEPENDS                                        |    2 
 http/httpd-dev/HISTORY                                        |    3 
 http/lighttpd/DEPENDS                                         |    6 
 http/lighttpd/HISTORY                                         |   11 +
 http/lighttpd/PRE_BUILD                                       |    2 
 http/lighttpd/lua52.patch                                     |   75 
++++++++++
 http/links-twibright/DEPENDS                                  |    2 
 http/links-twibright/HISTORY                                  |    3 
 http/links/DEPENDS                                            |    6 
 http/links/HISTORY                                            |    6 
 http/lynx/DEPENDS                                             |    2 
 http/lynx/HISTORY                                             |    3 
 http/middleman/DEPENDS                                        |    2 
 http/middleman/HISTORY                                        |    3 
 http/netsurf/DEPENDS                                          |    2 
 http/netsurf/HISTORY                                          |    3 
 http/nginx/DEPENDS                                            |    2 
 http/nginx/HISTORY                                            |    3 
 http/pavuk/DEPENDS                                            |    2 
 http/pavuk/HISTORY                                            |    3 
 http/serf/DEPENDS                                             |    2 
 http/serf/HISTORY                                             |    3 
 http/siege/DEPENDS                                            |    2 
 http/siege/HISTORY                                            |    3 
 http/squid/DEPENDS                                            |    2 
 http/squid/HISTORY                                            |    3 
 http/w3c-libwww/DEPENDS                                       |    2 
 http/w3c-libwww/HISTORY                                       |    3 
 http/w3m/DEPENDS                                              |    2 
 http/w3m/HISTORY                                              |    3 
 http/webcleaner/DEPENDS                                       |    2 
 http/webcleaner/HISTORY                                       |    3 
 http/wt/DEPENDS                                               |    2 
 http/wt/HISTORY                                               |    3 
 http/xshttpd/DEPENDS                                          |    2 
 http/xshttpd/HISTORY                                          |    3 
 java/icedtea7/DEPENDS                                         |    2 
 java/icedtea7/HISTORY                                         |    3 
 kde4-apps/digikam4/DETAILS                                    |    4 
 kde4-apps/digikam4/HISTORY                                    |    3 
 kde4-support/phonon-backend-gstreamer/DETAILS                 |    4 
 kde4-support/phonon-backend-gstreamer/HISTORY                 |    3 
 kde4-support/phonon-backend-vlc/DETAILS                       |    6 
 kde4-support/phonon-backend-vlc/HISTORY                       |    3 
 kde4-support/phonon/DETAILS                                   |    6 
 kde4-support/phonon/HISTORY                                   |    3 
 kde4/kdelibs4/DEPENDS                                         |    2 
 kde4/kdelibs4/HISTORY                                         |    5 
 kernels/linux/HISTORY                                         |    9 +
 kernels/linux/info/kernels/3.16                               |    5 
 kernels/linux/info/patches/maintenance_patches_3/patch-3.16   |    5 
 kernels/linux/info/patches/maintenance_patches_3/patch-3.16.1 |    5 
 kernels/linux/latest.defaults                                 |    4 
 libs/asio/DEPENDS                                             |    2 
 libs/asio/HISTORY                                             |    3 
 libs/boost/CONFIGURE                                          |    6 
 libs/boost/DETAILS                                            |    4 
 libs/boost/HISTORY                                            |    6 
 libs/boost/PRE_BUILD                                          |    4 
 libs/boost/PRE_SUB_DEPENDS                                    |   16 +-
 libs/boost/SUB_DEPENDS                                        |   16 +-
 libs/boost/boost-use-cxxflags.patch                           |   17 --
 libs/gwenhywfar/DEPENDS                                       |    2 
 libs/gwenhywfar/HISTORY                                       |    3 
 libs/gwenhywfar2/DEPENDS                                      |    2 
 libs/gwenhywfar2/HISTORY                                      |    3 
 libs/ldns/DEPENDS                                             |    8 -
 libs/ldns/HISTORY                                             |    3 
 libs/libchipcard/DEPENDS                                      |    2 
 libs/libchipcard/HISTORY                                      |    3 
 libs/libesmtp/DEPENDS                                         |    6 
 libs/libesmtp/HISTORY                                         |    6 
 libs/libevent/DEPENDS                                         |    4 
 libs/libevent/HISTORY                                         |    6 
 libs/libircclient/DEPENDS                                     |    6 
 libs/libircclient/HISTORY                                     |    3 
 libs/libnl/DETAILS                                            |    4 
 libs/libnl/HISTORY                                            |    3 
 libs/mico/DEPENDS                                             |    2 
 libs/mico/HISTORY                                             |    3 
 libs/neon/DEPENDS                                             |    2 
 libs/neon/HISTORY                                             |    5 
 libs/neon/PRE_SUB_DEPENDS                                     |    2 
 libs/neon/SUB_DEPENDS                                         |    2 
 libs/omniorb/DEPENDS                                          |    4 
 libs/omniorb/HISTORY                                          |    6 
 libs/omniorbpy/DEPENDS                                        |    4 
 libs/omniorbpy/HISTORY                                        |    6 
 libs/poco/DEPENDS                                             |    4 
 libs/poco/HISTORY                                             |    3 
 libs/podofo/DEPENDS                                           |    2 
 libs/podofo/DETAILS                                           |    4 
 libs/podofo/HISTORY                                           |    4 
 libs/redland/DEPENDS                                          |    2 
 libs/redland/HISTORY                                          |    3 
 libs/sip/DETAILS                                              |    4 
 libs/sip/HISTORY                                              |    3 
 libs/soup/DEPENDS                                             |    2 
 libs/soup/HISTORY                                             |    3 
 libs/tc2-modules/DEPENDS                                      |    2 
 libs/tc2-modules/HISTORY                                      |    3 
 libs/upower/DETAILS                                           |    4 
 libs/upower/HISTORY                                           |    3 
 lua-forge/luacrypto/DEPENDS                                   |    2 
 lua-forge/luacrypto/HISTORY                                   |    3 
 lua-forge/luasec/DEPENDS                                      |    2 
 lua-forge/luasec/HISTORY                                      |    3 
 mail/alpine/DEPENDS                                           |    4 
 mail/alpine/HISTORY                                           |    3 
 mail/althea/DEPENDS                                           |    2 
 mail/althea/HISTORY                                           |    3 
 mail/anubis/DEPENDS                                           |    6 
 mail/anubis/HISTORY                                           |    6 
 mail/c-client/DEPENDS                                         |    2 
 mail/c-client/HISTORY                                         |    3 
 mail/claws-mail/DEPENDS                                       |    2 
 mail/claws-mail/HISTORY                                       |    3 
 mail/cone/DEPENDS                                             |    2 
 mail/cone/HISTORY                                             |    3 
 mail/courier-imap/DEPENDS                                     |    2 
 mail/courier-imap/HISTORY                                     |    3 
 mail/courier/DEPENDS                                          |    4 
 mail/courier/HISTORY                                          |    3 
 mail/cyrus-imapd/DEPENDS                                      |    6 
 mail/cyrus-imapd/HISTORY                                      |    6 
 mail/dk-milter/DEPENDS                                        |    2 
 mail/dk-milter/HISTORY                                        |    3 
 mail/dovecot/DEPENDS                                          |    8 -
 mail/dovecot/HISTORY                                          |    3 
 mail/exim/DEPENDS                                             |    4 
 mail/exim/DETAILS                                             |    2 
 mail/exim/HISTORY                                             |    6 
 mail/fetchmail/DEPENDS                                        |    2 
 mail/fetchmail/HISTORY                                        |    3 
 mail/gotmail/DEPENDS                                          |    2 
 mail/gotmail/HISTORY                                          |    3 
 mail/greylist/CONFIGURE                                       |    1 
 mail/greylist/HISTORY                                         |    5 
 mail/greylist/PRE_BUILD                                       |    5 
 mail/greylist/timeout.patch                                   |   44 +++++
 mail/imap/DEPENDS                                             |    4 
 mail/imap/HISTORY                                             |    3 
 mail/isync/DEPENDS                                            |    2 
 mail/isync/HISTORY                                            |    3 
 mail/libetpan/DEPENDS                                         |    6 
 mail/libetpan/HISTORY                                         |    6 
 mail/mailx/DEPENDS                                            |    2 
 mail/mailx/HISTORY                                            |    3 
 mail/mpop/DEPENDS                                             |    4 
 mail/mpop/HISTORY                                             |    3 
 mail/msmtp/DEPENDS                                            |    2 
 mail/msmtp/HISTORY                                            |    3 
 mail/mutt/DEPENDS                                             |    8 -
 mail/mutt/HISTORY                                             |    3 
 mail/nbsmtp/DEPENDS                                           |    2 
 mail/nbsmtp/HISTORY                                           |    3 
 mail/opendkim/DEPENDS                                         |    2 
 mail/opendkim/HISTORY                                         |    3 
 mail/openwebmail/DEPENDS                                      |    2 
 mail/openwebmail/HISTORY                                      |    3 
 mail/postfix/DEPENDS                                          |    2 
 mail/postfix/HISTORY                                          |    3 
 mail/smtpc/DEPENDS                                            |    2 
 mail/smtpc/HISTORY                                            |    3 
 mail/spamassassin/DEPENDS                                     |    2 
 mail/spamassassin/HISTORY                                     |    3 
 mail/ssmtp/DEPENDS                                            |    2 
 mail/ssmtp/HISTORY                                            |    3 
 mail/sylpheed-gtk2/DEPENDS                                    |    2 
 mail/sylpheed-gtk2/HISTORY                                    |    3 
 mail/sylpheed/DEPENDS                                         |    2 
 mail/sylpheed/HISTORY                                         |    3 
 mobile/barry/DEPENDS                                          |    2 
 mobile/barry/HISTORY                                          |    3 
 mobile/xsupplicant/DEPENDS                                    |    2 
 mobile/xsupplicant/HISTORY                                    |    3 
 net/accel-ppp/BUILD                                           |    4 
 net/accel-ppp/CONFIGURE                                       |   25 ++-
 net/accel-ppp/DEPENDS                                         |    2 
 net/accel-ppp/DETAILS                                         |    4 
 net/accel-ppp/HISTORY                                         |   11 +
 net/accel-ppp/PRE_BUILD                                       |    1 
 net/accel-ppp/extra.patch                                     |   13 -
 net/accel-ppp/ipoe.patch                                      |   22 ++
 net/bind-tools/DEPENDS                                        |    6 
 net/bind-tools/HISTORY                                        |    6 
 net/bind/DEPENDS                                              |    6 
 net/bind/HISTORY                                              |    6 
 net/bitcoin/DEPENDS                                           |    2 
 net/bitcoin/HISTORY                                           |    3 
 net/dhcpcd/DETAILS                                            |    4 
 net/dhcpcd/HISTORY                                            |    3 
 net/envbot/DEPENDS                                            |    4 
 net/envbot/HISTORY                                            |    3 
 net/flow-tools/DEPENDS                                        |    6 
 net/flow-tools/HISTORY                                        |    6 
 net/freeradius/DEPENDS                                        |    2 
 net/freeradius/HISTORY                                        |    3 
 net/fwbuilder/DEPENDS                                         |    2 
 net/fwbuilder/HISTORY                                         |    3 
 net/iproute2/DETAILS                                          |    4 
 net/iproute2/HISTORY                                          |    3 
 net/ipsec-tools/DEPENDS                                       |    2 
 net/ipsec-tools/HISTORY                                       |    3 
 net/iscsitarget/DEPENDS                                       |    2 
 net/iscsitarget/HISTORY                                       |    3 
 net/monit/DEPENDS                                             |    2 
 net/monit/HISTORY                                             |    3 
 net/nagios-plugins/DEPENDS                                    |    8 -
 net/nagios-plugins/HISTORY                                    |    6 
 net/net-snmp/DEPENDS                                          |    2 
 net/net-snmp/HISTORY                                          |    3 
 net/netembryo/DEPENDS                                         |    6 
 net/netembryo/HISTORY                                         |    6 
 net/nsd/DEPENDS                                               |    2 
 net/nsd/HISTORY                                               |    3 
 net/ntop/DEPENDS                                              |    2 
 net/ntop/HISTORY                                              |    3 
 net/openntpd/DEPENDS                                          |    2 
 net/openntpd/HISTORY                                          |    3 
 net/openvpn/DEPENDS                                           |    2 
 net/openvpn/HISTORY                                           |    3 
 net/openwbem/DEPENDS                                          |    2 
 net/openwbem/HISTORY                                          |    3 
 net/ppp/DEPENDS                                               |    2 
 net/ppp/HISTORY                                               |    3 
 net/pppd-chldap/DEPENDS                                       |    2 
 net/pppd-chldap/HISTORY                                       |    3 
 net/proxychains-ng/DETAILS                                    |    4 
 net/proxychains-ng/HISTORY                                    |    3 
 net/slowhttptest/DEPENDS                                      |    2 
 net/slowhttptest/HISTORY                                      |    3 
 net/socat/DEPENDS                                             |    4 
 net/socat/HISTORY                                             |    3 
 net/ssocks/DEPENDS                                            |    2 
 net/ssocks/HISTORY                                            |    3 
 net/strongswan/DEPENDS                                        |    2 
 net/strongswan/HISTORY                                        |    3 
 net/stunnel/DEPENDS                                           |    2 
 net/stunnel/HISTORY                                           |    3 
 net/tcpdump/DEPENDS                                           |    2 
 net/tcpdump/HISTORY                                           |    3 
 net/tinc/DEPENDS                                              |    2 
 net/tinc/HISTORY                                              |    3 
 net/tor/DEPENDS                                               |    2 
 net/tor/HISTORY                                               |    3 
 net/unbound/DEPENDS                                           |    4 
 net/unbound/HISTORY                                           |    3 
 net/vtun/DEPENDS                                              |    2 
 net/vtun/HISTORY                                              |    3 
 net/wvstreams/DEPENDS                                         |    8 -
 net/wvstreams/HISTORY                                         |    6 
 perl-cpan/crypt-ssleay/DEPENDS                                |    2 
 perl-cpan/crypt-ssleay/HISTORY                                |    3 
 perl-cpan/net-ssleay/DEPENDS                                  |    2 
 perl-cpan/net-ssleay/HISTORY                                  |    3 
 perl-cpan/parrot/DEPENDS                                      |    2 
 perl-cpan/parrot/HISTORY                                      |    3 
 php-pear/php-dev/DEPENDS                                      |    6 
 php-pear/php-dev/HISTORY                                      |    6 
 php-pear/php/DEPENDS                                          |    8 -
 php-pear/php/DETAILS                                          |   12 -
 php-pear/php/HISTORY                                          |   15 ++
 php-pear/php4/DEPENDS                                         |    6 
 php-pear/php4/HISTORY                                         |    6 
 printer/cups-filters/DETAILS                                  |    4 
 printer/cups-filters/HISTORY                                  |    3 
 printer/cups-old/DEPENDS                                      |    2 
 printer/cups-old/HISTORY                                      |    3 
 printer/cups/CONFIGURE                                        |    7 
 printer/cups/DEPENDS                                          |   14 -
 printer/cups/HISTORY                                          |    7 
 printer/gtklp/DEPENDS                                         |    2 
 printer/gtklp/HISTORY                                         |    3 
 printer/gutenprint/BUILD                                      |    1 
 printer/gutenprint/DEPENDS                                    |    8 -
 printer/gutenprint/HISTORY                                    |    5 
 printer/hplip/DEPENDS                                         |    2 
 printer/hplip/HISTORY                                         |    3 
 printer/pt/DEPENDS                                            |    2 
 printer/pt/HISTORY                                            |    3 
 printer/zint/DEPENDS                                          |    2 
 printer/zint/HISTORY                                          |    3 
 python-pypi/arandr/DEPENDS                                    |    1 
 python-pypi/arandr/DETAILS                                    |    4 
 python-pypi/arandr/HISTORY                                    |    4 
 python-pypi/attic/DEPENDS                                     |    2 
 python-pypi/attic/HISTORY                                     |    3 
 python-pypi/cherrypy/DEPENDS                                  |    2 
 python-pypi/cherrypy/HISTORY                                  |    3 
 python-pypi/formalchemy/DEPENDS                               |    3 
 python-pypi/formalchemy/DETAILS                               |    4 
 python-pypi/formalchemy/HISTORY                               |    4 
 python-pypi/gtklick/DETAILS                                   |    4 
 python-pypi/gtklick/HISTORY                                   |    3 
 python-pypi/hatta/DEPENDS                                     |    2 
 python-pypi/hatta/HISTORY                                     |    3 
 python-pypi/m2crypto/DEPENDS                                  |    2 
 python-pypi/m2crypto/HISTORY                                  |    3 
 python-pypi/mercurial/DETAILS                                 |    4 
 python-pypi/mercurial/HISTORY                                 |    3 
 python-pypi/papyon/DEPENDS                                    |    2 
 python-pypi/papyon/HISTORY                                    |    3 
 python-pypi/pyicqt/DEPENDS                                    |    2 
 python-pypi/pyicqt/HISTORY                                    |    3 
 python-pypi/pymsn/DEPENDS                                     |    2 
 python-pypi/pymsn/HISTORY                                     |    3 
 python-pypi/pymsnt/DEPENDS                                    |    2 
 python-pypi/pymsnt/HISTORY                                    |    3 
 python-pypi/pyopenssl/DEPENDS                                 |    2 
 python-pypi/pyopenssl/HISTORY                                 |    3 
 python-pypi/pypdf2/DETAILS                                    |    4 
 python-pypi/pypdf2/HISTORY                                    |    3 
 python-pypi/python-ldap/DEPENDS                               |    2 
 python-pypi/python-ldap/DETAILS                               |    7 
 python-pypi/python-ldap/HISTORY                               |    7 
 python-pypi/roundup/DEPENDS                                   |    3 
 python-pypi/roundup/DETAILS                                   |    7 
 python-pypi/roundup/HISTORY                                   |    9 +
 python-pypi/roundup/roundup.gpg                               |binary
 python-pypi/scons/DETAILS                                     |    4 
 python-pypi/scons/HISTORY                                     |    3 
 python-pypi/scrapely/DEPENDS                                  |    2 
 python-pypi/scrapely/HISTORY                                  |    3 
 python-pypi/scrapy/DEPENDS                                    |    2 
 python-pypi/scrapy/HISTORY                                    |    3 
 python-pypi/setuptools/DETAILS                                |    4 
 python-pypi/setuptools/HISTORY                                |    3 
 python-pypi/trac-ldapplugin/12.patch                          |   11 -
 python-pypi/trac-ldapplugin/DETAILS                           |    7 
 python-pypi/trac-ldapplugin/HISTORY                           |    3 
 python-pypi/trac-ldapplugin/PRE_BUILD                         |    5 
 python-pypi/trac-ldapplugin/perm.patch                        |   20 --
 python-pypi/twisted/DEPENDS                                   |    2 
 python-pypi/twisted/HISTORY                                   |    3 
 qt5/qtbase/DEPENDS                                            |    2 
 qt5/qtbase/HISTORY                                            |    5 
 qt5/qtbase/PRE_SUB_DEPENDS                                    |    2 
 qt5/qtbase/SUB_DEPENDS                                        |    2 
 ruby-raa/ruby-1.8/DEPENDS                                     |    2 
 ruby-raa/ruby-1.8/HISTORY                                     |    3 
 ruby-raa/ruby-1.9/DEPENDS                                     |    2 
 ruby-raa/ruby-1.9/HISTORY                                     |    3 
 ruby-raa/ruby-2.0/DEPENDS                                     |    2 
 ruby-raa/ruby-2.0/HISTORY                                     |    3 
 ruby-raa/ruby-2.1/DEPENDS                                     |    2 
 ruby-raa/ruby-2.1/HISTORY                                     |    3 
 ruby-raa/ruby-enterprise-edition/DEPENDS                      |    2 
 ruby-raa/ruby-enterprise-edition/HISTORY                      |    3 
 science-libs/glpk/DEPENDS                                     |    4 
 science-libs/glpk/DETAILS                                     |    2 
 science-libs/glpk/HISTORY                                     |    4 
 science/boinc/DEPENDS                                         |    2 
 science/boinc/HISTORY                                         |    3 
 science/cern_root/DEPENDS                                     |    2 
 science/cern_root/HISTORY                                     |    3 
 security-libs/nessus-libraries/DEPENDS                        |    2 
 security-libs/nessus-libraries/HISTORY                        |    3 
 security-libs/opencryptoki/DEPENDS                            |    4 
 security-libs/opencryptoki/HISTORY                            |    6 
 security-libs/openssl_tpm_engine/DEPENDS                      |    2 
 security-libs/openssl_tpm_engine/HISTORY                      |    3 
 security-libs/trousers/DEPENDS                                |    2 
 security-libs/trousers/HISTORY                                |    3 
 security/ettercap/DEPENDS                                     |    2 
 security/ettercap/HISTORY                                     |    3 
 security/fingerprint/DEPENDS                                  |    2 
 security/fingerprint/HISTORY                                  |    3 
 security/hashkill/DEPENDS                                     |    2 
 security/hashkill/HISTORY                                     |    3 
 security/nmap/DEPENDS                                         |    6 
 security/nmap/HISTORY                                         |    6 
 security/pam-imap/DEPENDS                                     |    2 
 security/pam-imap/HISTORY                                     |    3 
 security/pwsafe/DEPENDS                                       |    2 
 security/pwsafe/HISTORY                                       |    3 
 security/snort/DEPENDS                                        |    6 
 security/snort/HISTORY                                        |    6 
 security/thc-hydra/DEPENDS                                    |    2 
 security/thc-hydra/HISTORY                                    |    3 
 security/thc-pptp-bruter/DEPENDS                              |    2 
 security/thc-pptp-bruter/HISTORY                              |    3 
 security/tpm-tools/DEPENDS                                    |    2 
 security/tpm-tools/HISTORY                                    |    3 
 security/wireshark/DEPENDS                                    |    2 
 security/wireshark/HISTORY                                    |    3 
 shell-term-fm/c3270/DEPENDS                                   |    2 
 shell-term-fm/c3270/HISTORY                                   |    3 
 shell-term-fm/freerdp/DEPENDS                                 |    2 
 shell-term-fm/freerdp/HISTORY                                 |    3 
 shell-term-fm/rdesktop/DEPENDS                                |    2 
 shell-term-fm/rdesktop/HISTORY                                |    3 
 shell-term-fm/tn5250/DEPENDS                                  |    2 
 shell-term-fm/tn5250/HISTORY                                  |    3 
 shell-term-fm/x3270/DEPENDS                                   |    2 
 shell-term-fm/x3270/HISTORY                                   |    3 
 telephony/asterisk/DEPENDS                                    |    2 
 telephony/asterisk/HISTORY                                    |    3 
 telephony/decibel/DEPENDS                                     |    2 
 telephony/decibel/HISTORY                                     |    3 
 telephony/libexosip2/DEPENDS                                  |    2 
 telephony/libexosip2/HISTORY                                  |    3 
 telephony/libjingle-tapioca/DEPENDS                           |    2 
 telephony/libjingle-tapioca/HISTORY                           |    3 
 telephony/ortp/DEPENDS                                        |    2 
 telephony/ortp/HISTORY                                        |    3 
 telephony/sofia-sip/DEPENDS                                   |    2 
 telephony/sofia-sip/HISTORY                                   |    3 
 telephony/telepathy-idle/DEPENDS                              |    2 
 telephony/telepathy-idle/HISTORY                              |    3 
 telephony/telepathy-qt/DEPENDS                                |    2 
 telephony/telepathy-qt/HISTORY                                |    3 
 utils/acpid2/DETAILS                                          |    4 
 utils/acpid2/HISTORY                                          |    4 
 utils/deltup/DEPENDS                                          |    2 
 utils/deltup/HISTORY                                          |    3 
 utils/dialog/BUILD                                            |    2 
 utils/dialog/CONFIGURE                                        |    2 
 utils/dialog/HISTORY                                          |    4 
 utils/dialog/INSTALL                                          |    6 
 utils/dialog/PRE_SUB_DEPENDS                                  |    5 
 utils/dialog/REPAIR^all^PRE_SUB_DEPENDS                       |    5 
 utils/dialog/SUB_DEPENDS                                      |    5 
 utils/ghasher/DEPENDS                                         |    2 
 utils/ghasher/HISTORY                                         |    3 
 utils/ipmitool/DEPENDS                                        |    2 
 utils/ipmitool/HISTORY                                        |    3 
 utils/mnogosearch/DEPENDS                                     |    4 
 utils/mnogosearch/HISTORY                                     |    6 
 utils/ntp/DEPENDS                                             |    2 
 utils/ntp/HISTORY                                             |    3 
 utils/openipmi/DEPENDS                                        |    6 
 utils/openipmi/HISTORY                                        |    6 
 utils/spice-gtk/DEPENDS                                       |    2 
 utils/spice-gtk/HISTORY                                       |    5 
 utils/spice/DEPENDS                                           |    2 
 utils/spice/HISTORY                                           |    3 
 utils/strigi/DEPENDS                                          |    2 
 utils/strigi/HISTORY                                          |    5 
 utils/syslog-ng/DEPENDS                                       |    2 
 utils/syslog-ng/HISTORY                                       |    3 
 utils/uptimec/DEPENDS                                         |    2 
 utils/uptimec/HISTORY                                         |    3 
 utils/xen/DEPENDS                                             |    2 
 utils/xen/HISTORY                                             |    3 
 video-libs/xine-lib/DETAILS                                   |    6 
 video-libs/xine-lib/HISTORY                                   |    3 
 video/ffmpeg/DEPENDS                                          |    4 
 video/ffmpeg/DETAILS                                          |    2 
 video/ffmpeg/HISTORY                                          |   11 +
 video/gpac/DEPENDS                                            |    2 
 video/gpac/HISTORY                                            |    3 
 video/mpv/DEPENDS                                             |    2 
 video/mpv/HISTORY                                             |    3 
 video/mythtv/DEPENDS                                          |    2 
 video/mythtv/HISTORY                                          |    3 
 video/tcvp/DEPENDS                                            |    2 
 video/tcvp/HISTORY                                            |    3 
 video/xbmc/DEPENDS                                            |    2 
 video/xbmc/HISTORY                                            |    3 
 video/xine-ui/DETAILS                                         |    6 
 video/xine-ui/HISTORY                                         |    3 
 video/xine-ui/PRE_BUILD                                       |    3 
 x11-libs/wine/DETAILS                                         |    2 
 x11-libs/wine/HISTORY                                         |    6 
 x11-toolkits/gtk+3/DETAILS                                    |    8 -
 x11-toolkits/gtk+3/HISTORY                                    |    3 
 x11-toolkits/qt4/DEPENDS                                      |    2 
 x11-toolkits/qt4/HISTORY                                      |    5 
 x11-toolkits/qt4/PRE_SUB_DEPENDS                              |    2 
 x11-toolkits/qt4/SUB_DEPENDS                                  |    4 
 x11-toolkits/sptk/DEPENDS                                     |    2 
 x11-toolkits/sptk/HISTORY                                     |    3 
 x11/gkrellm2/DEPENDS                                          |    2 
 x11/gkrellm2/HISTORY                                          |    3 
 x11/x11vnc/DEPENDS                                            |    4 
 x11/x11vnc/HISTORY                                            |    3 
 xorg-app/appres/DETAILS                                       |    4 
 xorg-app/appres/HISTORY                                       |    3 
 xorg-util/zarfy/DEPENDS                                       |    5 
 xorg-util/zarfy/DETAILS                                       |   17 ++
 xorg-util/zarfy/HISTORY                                       |    3 
 xorg-util/zarfy/PRE_BUILD                                     |    4 
 xorg-xserver/xorg-server/DEPENDS                              |    2 
 xorg-xserver/xorg-server/HISTORY                              |    5 
 820 files changed, 2418 insertions(+), 743 deletions(-)

New commits:
commit 3e6fb29dc15d57d4588601a7e6ddfd838503c652
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    opencryptoki: fix bad with-SSL usage

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

    snort: fix bad with-SSL usage

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

    nmap: fix bad with-SSL usage

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

    php-dev: fix bad with-SSL usage

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

    php4: fix bad with-SSL usage

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

    php: fix bad with-SSL usage

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

    wvstreams: fix bad with-SSL usage

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

    netembryo: fix bad with-SSL usage

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

    nagios-plugins: fix bad with-SSL usage

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

    flow-tools: fix bad with-SSL usage

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

    bind-tools: fix bad with-SSL usage

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

    bind: fix bad with-SSL usage

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

    libetpan: fix bad with-SSL usage

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

    cyrus-imapd: fix bad with-SSL usage

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

    anubis: fix bad with-SSL usage

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

    omniorbpy: fix bad with-SSL usage

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

    omniorb: fix bad with-SSL usage

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

    libesmtp: fix bad with-SSL usage

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

    links: fix bad with-SSL usage

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

    lighttpd: fix bad with-SSL usage

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

    elinks: fix bad with-SSL usage

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

    polyorb: fix bad with-SSL usage

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

    lftp: fix bad with-SSL usage

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

    aria2: fix bad with-SSL usage

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

    postgresql: fix bad with-SSL usage

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

    mysql: fix bad with-SSL usage

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

    cyrus-sasl: fix bad with-SSL usage

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

    burp: fix bad with-SSL usage

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

    bacula: fix bad with-SSL usage

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

    openipmi: fix bad with-SSL usage

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

    mnogosearch: fix bad with-SSL usage

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

    gutenprint - fix spurious dependencies

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

    tweak ssl choices

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

    wget - imporve libressl detection

commit eb3e9456215be62805afd666ac033ddf032ba49c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    acpid2: => 2.0.23

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

    curl - support libressl

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

    upower: => 0.99.1

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

    glpk: => 4.55

commit f6b8ce370439c2dd873262aa0c3af4b3773f352a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libssh2: Allow the use of libressl

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

    libarchive - fix typo

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

    libevent - fix typo

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

    wine: => 1.7.25

commit 3c6b730df79f36b30291c19da7ca27af611147c6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    php: => 5.4.32 (stable) [security]

commit 46d1e1932ff2b66b7d3e9fc9dab7cd1bdd667852
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    wavegain: new spell, wav files loudness normalizer

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

    cups-filters: => 1.0.58

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

    setuptools: => 5.7

commit 5c2882ed3183e1d357e61841c8309c1ad416d614
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libgcrypt 1.6.2

commit b12c32b776669d6e0ce89e85c5eed26b740179e5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    zarfy: new spell, A gui to libxrandr

commit 2401ed97e48f913a39c9d9cafdc85cd5b418d755
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    arandr 0.1.7.1

commit 117771ed186c37d70922a39fb88e3a87bb490c01
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    appres 1.0.4

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

    krb5 deepnds SSL

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

    krb5-1.12.2 SECURITY fix

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

    gpgme-1.5.1 - SECURITY fix

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

    python3 - depends SSL

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

    clamav: => 0.98.4

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

    qtbase - fix SSL

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

    cupos - fix SSL

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

    podofo: => 0.9.3

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

    pulseaudio - openssl => SSL

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

    libssh - fix build with libressl

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

    qt4 - fix ssl gflags

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

    openss - check for libressl

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

    libressl-2.0.5 new spell

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

    xorg-server: depends SSL

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

    sptk: depends SSL

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

    qt4: depends SSL

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

    x11vnc: depends SSL

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

    gkrellm2: depends SSL

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

    xbmc: depends SSL

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

    tcvp: depends SSL

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

    mythtv: depends SSL

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

    mpv: depends SSL

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

    gpac: depends SSL

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

    ffmpeg: depends SSL

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

    xen: depends SSL

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

    uptimec: depends SSL

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

    syslog-ng: depends SSL

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

    strigi: depends SSL

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

    spice-gtk: depends SSL

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

    spice: depends SSL

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

    openipmi: depends SSL

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

    ntp: depends SSL

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

    mnogosearch: depends SSL

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

    ipmitool: depends SSL

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

    ghasher: depends SSL

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

    deltup: depends SSL

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

    telepathy-qt: depends SSL

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

    telepathy-idle: depends SSL

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

    sofia-sip: depends SSL

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

    ortp: depends SSL

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

    libjingle-tapioca: depends SSL

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

    libexosip2: depends SSL

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

    decibel: depends SSL

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

    asterisk: depends SSL

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

    x3270: depends SSL

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

    tn5250: depends SSL

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

    rdesktop: depends SSL

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

    freerdp: depends SSL

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

    c3270: depends SSL

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

    trousers: depends SSL

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

    openssl_tpm_engine: depends SSL

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

    opencryptoki: depends SSL

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

    nessus-libraries: depends SSL

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

    wireshark: depends SSL

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

    tpm-tools: depends SSL

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

    thc-pptp-bruter: depends SSL

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

    thc-hydra: depends SSL

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

    snort: depends SSL

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

    pwsafe: depends SSL

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

    pam-imap: depends SSL

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

    nmap: depends SSL

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

    hashkill: depends SSL

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

    fingerprint: depends SSL

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

    ettercap: depends SSL

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

    cern_root: depends SSL

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

    boinc: depends SSL

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

    ruby-enterprise-edition: depends SSL

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

    ruby-2.1: depends SSL

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

    ruby-2.0: depends SSL

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

    ruby-1.9: depends SSL

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

    ruby-1.8: depends SSL

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

    qtbase: depends SSL

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

    twisted: depends SSL

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

    scrapy: depends SSL

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

    scrapely: depends SSL

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

    roundup: depends SSL

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

    python-ldap: depends SSL

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

    pyopenssl: depends SSL

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

    pymsnt: depends SSL

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

    pymsn: depends SSL

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

    pyicqt: depends SSL

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

    papyon: depends SSL

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

    m2crypto: depends SSL

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

    cherrypy: depends SSL

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

    attic: depends SSL

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

    zint: depends SSL

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

    pt: depends SSL

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

    hplip: depends SSL

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

    gtklp: depends SSL

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

    cups-old: depends SSL

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

    cups: depends SSL

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

    php-dev: depends SSL

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

    php4: depends SSL

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

    php: depends SSL

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

    parrot: depends SSL

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

    net-ssleay: depends SSL

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

    crypt-ssleay: depends SSL

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

    wvstreams: depends SSL

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

    vtun: depends SSL

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

    unbound: depends SSL

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

    tor: depends SSL

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

    tinc: depends SSL

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

    tcpdump: depends SSL

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

    stunnel: depends SSL

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

    strongswan: depends SSL

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

    ssocks: depends SSL

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

    socat: depends SSL

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

    slowhttptest: depends SSL

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

    pppd-chldap: depends SSL

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

    ppp: depends SSL

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

    openwbem: depends SSL

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

    openvpn: depends SSL

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

    openntpd: depends SSL

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

    ntop: depends SSL

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

    nsd: depends SSL

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

    net-snmp: depends SSL

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

    netembryo: depends SSL

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

    nagios-plugins: depends SSL

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

    monit: depends SSL

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

    iscsitarget: depends SSL

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

    ipsec-tools: depends SSL

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

    fwbuilder: depends SSL

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

    freeradius: depends SSL

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

    flow-tools: depends SSL

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

    envbot: depends SSL

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

    bitcoin: depends SSL

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

    bind-tools: depends SSL

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

    bind: depends SSL

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

    accel-ppp: depends SSL

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

    xsupplicant: depends SSL

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

    barry: depends SSL

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

    sylpheed-gtk2: depends SSL

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

    sylpheed: depends SSL

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

    ssmtp: depends SSL

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

    spamassassin: depends SSL

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

    smtpc: depends SSL

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

    postfix: depends SSL

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

    openwebmail: depends SSL

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

    opendkim: depends SSL

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

    nbsmtp: depends SSL

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

    mutt: depends SSL

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

    msmtp: depends SSL

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

    mpop: depends SSL

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

    mailx: depends SSL

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

    libetpan: depends SSL

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

    isync: depends SSL

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

    imap: depends SSL

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

    gotmail: depends SSL

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

    fetchmail: depends SSL

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

    exim: depends SSL

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

    dovecot: depends SSL

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

    dk-milter: depends SSL

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

    cyrus-imapd: depends SSL

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

    courier-imap: depends SSL

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

    courier: depends SSL

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

    cone: depends SSL

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

    claws-mail: depends SSL

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

    c-client: depends SSL

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

    anubis: depends SSL

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

    althea: depends SSL

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

    alpine: depends SSL

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

    luasec: depends SSL

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

    luacrypto: depends SSL

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

    tc2-modules: depends SSL

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

    soup: depends SSL

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

    redland: depends SSL

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

    podofo: depends SSL

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

    poco: depends SSL

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

    omniorbpy: depends SSL

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

    omniorb: depends SSL

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

    neon: depends SSL

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

    mico: depends SSL

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

    libircclient: depends SSL

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

    libevent: depends SSL

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

    libesmtp: depends SSL

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

    libchipcard: depends SSL

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

    ldns: depends SSL

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

    gwenhywfar2: depends SSL

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

    gwenhywfar: depends SSL

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

    asio: depends SSL

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

    kdelibs4: depends SSL

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

    icedtea7: depends SSL

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

    xshttpd: depends SSL

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

    wt: depends SSL

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

    webcleaner: depends SSL

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

    w3m: depends SSL

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

    w3c-libwww: depends SSL

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

    squid: depends SSL

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

    siege: depends SSL

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

    serf: depends SSL

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

    pavuk: depends SSL

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

    nginx: depends SSL

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

    netsurf: depends SSL

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

    middleman: depends SSL

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

    lynx: depends SSL

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

    links-twibright: depends SSL

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

    links: depends SSL

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

    lighttpd: depends SSL

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

    httpd-dev: depends SSL

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

    gnash: depends SSL

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

    esehttpd: depends SSL

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

    elog: depends SSL

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

    elinks: depends SSL

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

    dillo2: depends SSL

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

    dillo: depends SSL

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

    cherokee: depends SSL

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

    cadaver: depends SSL

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

    apache-mod_ssl: depends SSL

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

    apache22: depends SSL

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

    apache2: depends SSL

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

    gnustep-base: depends SSL

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

    libgda5: depends SSL

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

    libgnomecups: depends SSL

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

    gnome-vfs2: depends SSL

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

    gnome-python2: depends SSL

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

    evolution-webcal: depends SSL

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

    mail-notification: depends SSL

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

    balsa: depends SSL

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

    rb-libtorrent: depends SSL

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

    libtorrent: depends SSL

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

    dclib: depends SSL

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

    wget: depends SSL

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

    vsftpd: depends SSL

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

    transmission: depends SSL

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

    tnftp: depends SSL

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

    pure-ftpd: depends SSL

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

    proftpd: depends SSL

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

    lftp: depends SSL

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

    gftp: depends SSL

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

    deluge: depends SSL

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

    dctc: depends SSL

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

    curl: depends SSL

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

    ctorrent: depends SSL

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

    createtorrent: depends SSL

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

    btpd: depends SSL

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

    aria2: depends SSL

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

    openoffice: depends SSL

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

    eet: depends SSL

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

    ecore: depends SSL

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

    htmldoc: depends SSL

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

    uif2iso: depends SSL

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

    testdisk: depends SSL

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

    partimage: depends SSL

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

    netatalk: depends SSL

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

    libewf: depends SSL

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

    dump: depends SSL

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

    dmg2img: depends SSL

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

    boxbackup: depends SSL

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

    avfs: depends SSL

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

    qingy: depends SSL

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

    yaz: depends SSL

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

    swiprolog: depends SSL

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

    radare2: depends SSL

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

    python: depends SSL

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

    pyside-tools: depends SSL

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

    polyorb: depends SSL

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

    git: depends SSL

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

    android-tools: depends SSL

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

    virtuoso: depends SSL

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

    postgresql: depends SSL

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

    pgadmin3: depends SSL

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

    mysql-workbench: depends SSL

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

    mysql: depends SSL

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

    mongodb: depends SSL

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

    mariadb: depends SSL

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

    libzdb: depends SSL

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

    firebird25: depends SSL

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

    firebird: depends SSL

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

    couchdb: depends SSL

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

    rapidsvn: depends SSL

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

    openldap: depends SSL

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

    openca: depends SSL

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

    tls: depends SSL

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

    pwlib: depends SSL

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

    ptlib: depends SSL

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

    loudmouth: depends SSL

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

    libstrophe: depends SSL

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

    libmsn: depends SSL

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

    gloox: depends SSL

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

    znc: depends SSL

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

    xchat-gnome: depends SSL

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

    xchat: depends SSL

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

    irssi: depends SSL

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

    ircd-ratbox: depends SSL

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

    hexchat: depends SSL

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

    vacuum: depends SSL

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

    tmsnc: depends SSL

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

    qutim: depends SSL

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

    qutecom: depends SSL

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

    psi: depends SSL

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

    prosody: depends SSL

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

    profanity: depends SSL

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

    licq: depends SSL

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

    jabberd: depends SSL

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

    gajim: depends SSL

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

    ejabberd: depends SSL

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

    centerim: depends SSL

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

    libarchive: depends SSL

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

    dar22: depends SSL

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

    dar: depends SSL

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

    burp: depends SSL

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

    bacula: depends SSL

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

    xmlsec: depends SSL

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

    xca: depends SSL

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

    unhash: depends SSL

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

    ssldump: depends SSL

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

    qca-openssl: depends SSL

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

    pad: depends SSL

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

    openssh: depends SSL

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

    opensc: depends SSL

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

    mosh: depends SSL

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

    lsh: depends SSL

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

    libp11: depends SSL

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

    hydan: depends SSL

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

    engine_pkcs11: depends SSL

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

    encfs: depends SSL

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

    cyrus-sasl: depends SSL

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

    chntpw: depends SSL

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

    openssl update UP_TRIGGERS

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

    openssl - provides SSL

commit 0d2856fd9ce241d52d114e4a6cd617b86cf4f58c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    sqlite: => 3.8.6

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

    pango: => 1.36.6

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

    harfbuzz: => 0.9.35

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

    iproute2: => 3.16.0

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

    libnl: => 3.2.25

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

    scons: => 2.3.2

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

    pypdf2: => 1.23

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

    gtk+3: => 3.13.6

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

    glib2: => 2.41.2

commit da9907f850a9e3e25bc4e1bbafc169ee8aa283e6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    devel/git: version 2.1.0

commit 702955e2b9c47413c590414479caf5ec196f5ea9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    video/xine-ui: version 0.99.8

commit edacda24f7542eba0c71407335de936ec8b51a95
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    video-libs/xine-lib: version 1.2.6

commit 8486319961880e5a7e8ce51fd73f05f1be88b4b5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics/graphicsmagick: version 1.3.19

commit f45b2c9e61f130bc87b966e6d798a00a73638d2d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gtklick: bump to 0.6.4

commit ff4d32a5be381ad42db1bbeb73027d349cac9a00
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    klick: bump to 0.12.2

commit 74259ca06b117db64b6f0702317e205f5da33fa6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    roundup: => 1.5.0

commit 8a7f5f3b672e7cb14e637e859f7379280bc0e1ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics/lensfun: version 0.2.8

commit 55fa0e3d2a29f674dde086eff0f73a9f15d698c6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    php: => 5.3.29 (previous) [security]

commit bc92596d7466470ba1af68b729d3ca9dabbc3e28
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    linux 3.16.1

commit 41331eb3d47b2aeb44a418df6e2ebb8018118fd8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    graphics/inkscape: version 0.48.5

commit 63659cca386459a241ba0e188f31586f41087827
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    devel/libgc: fix urls

commit 878cb99c3c7879ef36c6df6e06083658d001745c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ffmpeg 2.3.2

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

    gnupg-exp: => 2.0.26

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

    partclone: => 0.2.72

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

    sip: => 4.16.2

commit e8e85a877ad55d48b02fd05c68851352e8c88d6c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    python-ldap: => 2.4.15

commit 4ac4c40dff8c4263c4a1581bdc1aff8cda94a126
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    trac-ldapplugin: => 0.7.0

commit d1fa48bedb81115b77b8225cfc412d832908e1e7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    greylist: added ability to show configured timeout value in defer message

commit 62c23e378cdf6037c03704b3194ff41f284f37b2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    accel-ppp: => 1.8.0

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

    krb5: => 1.12.1

commit 1390518210b43f682699fd1a11160b7ab72c7da9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    homebank: => 4.6.3

commit c9535e74a6588f048f6484de6ee18ae0ae79dd20
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    disk/whdd: new spell, a HDD diagnostic and recovery tool for Linux

commit 294dc9244c1d2b8f8bc3d644c37e2d4147aa3145
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    utils/dialog: added option for shared library

commit 8b873a93481517edc0b4c74c9a19bda97dd1e694
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    exim: => 4.84

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

    boost: => 1_56_0

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

    formalchemy: => 1.5.1

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

    extra-cmake-modules: => 1.1.0

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

    cmake: => 3.0.1

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

    wine: => 1.7.24

commit 69caaeb85e1c63e6cd3a85c7d62e1b9a4a7d4785
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    openssl: => 1.0.1i (1.0), 0.9.8zb (0.9) [security]

commit d78ceb5bfe7c2ada6272ea2a29b9748d29fa715f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    deadbeef 0.6.2

commit c47ad3594a67307308fd78124426e7725213f39c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ChangeLog: qmmp-plugin-pack added

commit 33cfc73001edf7569990386177d68f84711ac7a1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qmmp-plugin-pack: new plugin, set of extra plugins for qmmp

commit ca8e0aaeabcd17dc048190439f3e4cb52ba65b45
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qmmp 0.8.1

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

    dhcpcd: => 6.4.3

commit 520ab3da006c8a9c130ea829c3ed20c2a41daa9f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qmmp 0.8.0

commit b41e31140fdb412295c068f66b3318176c89883d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    proxychains-ng: => 4.8.1

commit c876cb33b8a32b370d8c7bd84a3f8de7a7bf9ee3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    digikam4 4.2.0

commit 0afd508a0992ee448820fd9280cc0058feeceeac
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    phonon-backend-vlc 0.7.2

commit da48bec4b65e14744974a45ed5ac21dc4dac3411
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    phonon-backend-gstreamer 4.7.2

commit f9b916e55ccda2f5f25442f88a02be063e642a8e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    phonon 4.7.2

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

    mercurial: => 3.1

commit b9cb335ccf28521307014662e54c57c83f52bd49
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ffmpeg 2.3.1

commit 50d8b5de88d90e0b1d49a6cbbd33d48b9fd48d36
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    linux 3.16

commit e4d87358434fda860a88020f02437de171555370
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    git 2.0.4

commit 1705cd1862459afd1077b237f67ca7c19aff1ab8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    hatta: added pygments suggest dep

commit 378e2d10134a2c18cf8644231c3f817a1b78d7f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    lighttpd: added Lua 5.2 support

diff --git a/ChangeLog b/ChangeLog
index b3edac6..06c173a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2014-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+       * audio-soft/wavegain: new spell, wav files loudness normalizer
+
+2014-08-22  Ismael Luceno <ismael AT sourcemage.org>
+       * xorg-util/zarfy: new spell, A gui to libxrandr
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+       * crypto/libressl: added SSL/TLS library
+
+2014-08-11 Pol Vinogradov <vin.public AT gmail.com>
+       * disk/whdd: new spell, a HDD diagnostic and recovery tool for Linux
+
+2014-08-06 Ladislav Hagara <hgr AT vabo.cz>
+       * audio-players/qmmp-plugin-pack: new spell, extra plugins for qmmp
+
 2014-07-28  Treeve Jelbert <treeve AT sourcemage.org>
        * python-pypi/meson: new spell, advanced build system
 
diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index 2b5862c..d12b079 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -13,4 +13,5 @@ optional_depends ncurses '--enable-clamdtop' \
                          '--disable-clamdtop' \
                          'build clamdtop' &&
 optional_depends llvm  '' '' 'JIT support in engine' &&
-optional_depends SYSTEM-LOGGER "" "" "to log activity"
+optional_depends SYSTEM-LOGGER "" "" "to log activity" &&
+optional_depends SSL   '' '' 'SSL crypto support'
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index e313dc0..0e0065b 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
             SPELL=clamav
-          VERSION=0.98.3
+          VERSION=0.98.4
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SOURCE.sig
  SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 6803d92..d232973 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,7 @@
+2014-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.98.3
+       * DEPENDS: add SSL
+
 2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.98.3
 
diff --git a/archive-libs/libarchive/DEPENDS b/archive-libs/libarchive/DEPENDS
index 2e97ae8..0f35957 100755
--- a/archive-libs/libarchive/DEPENDS
+++ b/archive-libs/libarchive/DEPENDS
@@ -33,10 +33,10 @@ optional_depends nettle \
                  "--without-nettle" \
                  "for crypto support from Nettle" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-openssl" \
                  "--without-openssl" \
-                 "for mtree and xar hashes support through openssl" &&
+                 "for mtree and xar hashes support through SSL" &&
 
 optional_depends libxml2 \
                  "--with-xml2" \
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index f68808c..33e77f3 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,9 @@
+2014-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: fix typo
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-04-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.1.2
          new url & website
diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index 1bfa85d..66df841 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -29,9 +29,9 @@ if [[ -z "$BACULA_CLIENT" ]]; then
                    '--disable-tray-monitor' \
                    'for tray monitor' &&
 
-  optional_depends openssl \
-                   '--with-openssl' \
-                   '--without-openssl' \
+  optional_depends SSL \
+                   '--with-opennssl' \
+                   '--without-opennssl' \
                    'for encrypted communication' &&
 
   optional_depends tcp_wrappers \
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index 3187107..e7947dc 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/archive/burp/DEPENDS b/archive/burp/DEPENDS
index 1c2d215..65e0a09 100755
--- a/archive/burp/DEPENDS
+++ b/archive/burp/DEPENDS
@@ -15,9 +15,9 @@ else
   optional_depends ncurses "" "" "to support live monitor on the server"
 fi &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "for encrypted communication" &&
 
 optional_depends openafs \
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
index 036501c..4d5e8f2 100644
--- a/archive/burp/HISTORY
+++ b/archive/burp/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.4.18 (devel); readability++
 
diff --git a/archive/dar/DEPENDS b/archive/dar/DEPENDS
index 0b40b81..3325811 100755
--- a/archive/dar/DEPENDS
+++ b/archive/dar/DEPENDS
@@ -3,6 +3,6 @@ depends -sub CXX gcc &&
 optional_depends zlib "" "--disable-libz-linking" "for gzip compression" &&
 optional_depends bzip2 "" "--disable-libbz2-linking" "for bzip2 compression" 
&&
 optional_depends lzo "" "--disable-liblzo2-linking" "for lzo compression" &&
-optional_depends openssl "" "--disable-libcrypto-linking" "for strong 
encrytion" &&
+optional_depends SSL "" "--disable-libcrypto-linking" "for strong encrytion" 
&&
 optional_depends upx "" "--disable-upx" "to compress dar's executables" &&
 optional_depends doxygen "" "--disable-build-html" "to build libdar's html 
documentation"
diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index e1430ac..56e3089 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 2.4.5
 
diff --git a/archive/dar22/DEPENDS b/archive/dar22/DEPENDS
index 58bab3b..4ef0022 100755
--- a/archive/dar22/DEPENDS
+++ b/archive/dar22/DEPENDS
@@ -2,6 +2,6 @@ depends -sub CXX gcc &&
 
 optional_depends zlib "" "--disable-libz-linking" "for gzip compression" &&
 optional_depends bzip2 "" "--disable-libbz2-linking" "for bzip2 compression" 
&&
-optional_depends openssl "" "--disable-libcrypto-linking" "for strong 
encrytion" &&
+optional_depends SSL "" "--disable-libcrypto-linking" "for strong encrytion" 
&&
 optional_depends upx "" "--disable-upx" "to compress dar's executables" &&
 optional_depends doxygen "" "--disable-build-html" "to build libdar's html 
documentation"
diff --git a/archive/dar22/HISTORY b/archive/dar22/HISTORY
index a0bcfba..af9dce0 100644
--- a/archive/dar22/HISTORY
+++ b/archive/dar22/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/audio-creation/klick/BUILD b/audio-creation/klick/BUILD
index be90a2e..a2ccc66 100755
--- a/audio-creation/klick/BUILD
+++ b/audio-creation/klick/BUILD
@@ -1 +1 @@
-scons  "PREFIX=$INSTALL_ROOT/usr"
+scons  "PREFIX=$INSTALL_ROOT/usr" $OPTS
diff --git a/audio-creation/klick/DEPENDS b/audio-creation/klick/DEPENDS
index 72d27a6..5d7302f 100755
--- a/audio-creation/klick/DEPENDS
+++ b/audio-creation/klick/DEPENDS
@@ -4,4 +4,8 @@ depends  boost           &&
 depends  libsamplerate   &&
 depends  libsndfile      &&
 depends  liblo           &&
-depends  JACK-DRIVER
+depends  JACK-DRIVER     &&
+optional_depends rubberband \
+                 "RUBBERBAND=true" \
+                 "RUBBERBAND=false" \
+                 "for pitch change"
diff --git a/audio-creation/klick/DETAILS b/audio-creation/klick/DETAILS
index 1e79ec6..80943bb 100755
--- a/audio-creation/klick/DETAILS
+++ b/audio-creation/klick/DETAILS
@@ -1,6 +1,6 @@
            SPELL=klick
-         VERSION=0.10.0
-     
SOURCE_HASH=sha512:4f381dbe91558df58397da0acdae44b57c44ebfb381163a0236ddee440f1814e1147459d097f398e3e52b369c9aec5e8bc76d373c167142bce12a966f8fcdac4
+         VERSION=0.12.2
+     
SOURCE_HASH=sha512:e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
           SOURCE=klick-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://das.nasophon.de/download/$SPELL-$VERSION.tar.gz
diff --git a/audio-creation/klick/HISTORY b/audio-creation/klick/HISTORY
index f901209..1e491f5 100644
--- a/audio-creation/klick/HISTORY
+++ b/audio-creation/klick/HISTORY
@@ -1,3 +1,7 @@
+2014-08-15 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: bump to 0.12.2
+       * DEPENDS: rubberband
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/audio-drivers/pulseaudio/DEPENDS 
b/audio-drivers/pulseaudio/DEPENDS
index 81ad267..356aa0b 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -90,7 +90,7 @@ else
                    "for D-BUS system messaging" 
 fi &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-openssl" \
                  "--disable-openssl" \
                  "for SSL support (Airtunes/RAOP)" &&
diff --git a/audio-drivers/pulseaudio/HISTORY 
b/audio-drivers/pulseaudio/HISTORY
index f355a6a..052330a 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,5 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org> 
+       * DEPENDS: openssl => SSL
 2014-06-09 Treeve Jelbert <treeve AT sourcemage.org> 
        * DETAILS: 5.0
        * DEPENDS: fix UDEV, gtk+2 => gtk+3, add fftw, remove hal, add orc
diff --git a/audio-players/deadbeef/DETAILS b/audio-players/deadbeef/DETAILS
index fbf810b..d84a664 100755
--- a/audio-players/deadbeef/DETAILS
+++ b/audio-players/deadbeef/DETAILS
@@ -1,8 +1,8 @@
            SPELL=deadbeef
-         VERSION=0.6.1
+         VERSION=0.6.2
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:0812f2d6b2ebc2ef1e65af9912546fa769e0e6d090f15cf3f2c4170bfa5aab03545cd63f26dcdcde905416801c0b56bd190cd1792f29eabaa318db212db99f90
+     
SOURCE_HASH=sha512:7caee245d7fa68e98ce5edc6aa6acc829d62c963f523c81e0406182a1aa36759219a8c0a2bdf010ac810f22b15acc81d06e8cab4ab820956c96cbc0a94423b7b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://deadbeef.sourceforge.net/";
       LICENSE[0]="GPLv2"
diff --git a/audio-players/deadbeef/HISTORY b/audio-players/deadbeef/HISTORY
index bf8eaac..5045677 100644
--- a/audio-players/deadbeef/HISTORY
+++ b/audio-players/deadbeef/HISTORY
@@ -1,3 +1,7 @@
+2014-08-06 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.6.2
+       * PRE_BUILD, libzip.patch: removed
+
 2014-04-05 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.6.1; updated descriptions
 
diff --git a/audio-players/deadbeef/PRE_BUILD 
b/audio-players/deadbeef/PRE_BUILD
deleted file mode 100755
index c1bd1a5..0000000
--- a/audio-players/deadbeef/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-#include proper path for zipconf.h
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libzip.patch
diff --git a/audio-players/deadbeef/libzip.patch 
b/audio-players/deadbeef/libzip.patch
deleted file mode 100644
index 933fc21..0000000
--- a/audio-players/deadbeef/libzip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/vfs_zip/Makefile.in.o      2012-04-09 22:06:09.071334093 -0400
-+++ plugins/vfs_zip/Makefile.in        2012-04-09 22:00:05.525321540 -0400
-@@ -105,7 +105,7 @@
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(vfs_zip_la_LDFLAGS) $(LDFLAGS) -o $@
- @HAVE_VFS_ZIP_TRUE@am_vfs_zip_la_rpath = -rpath $(pkglibdir)
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I/usr/lib/libzip/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
diff --git a/audio-players/qmmp-plugin-pack/BUILD 
b/audio-players/qmmp-plugin-pack/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/audio-players/qmmp-plugin-pack/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/audio-players/qmmp-plugin-pack/DEPENDS 
b/audio-players/qmmp-plugin-pack/DEPENDS
new file mode 100755
index 0000000..4b08158
--- /dev/null
+++ b/audio-players/qmmp-plugin-pack/DEPENDS
@@ -0,0 +1 @@
+depends qmmp
diff --git a/audio-players/qmmp-plugin-pack/DETAILS 
b/audio-players/qmmp-plugin-pack/DETAILS
new file mode 100755
index 0000000..a6e7179
--- /dev/null
+++ b/audio-players/qmmp-plugin-pack/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=qmmp-plugin-pack
+         VERSION=0.8.1
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://qmmp.ylsoftware.com/files/plugins/$SOURCE
+     
SOURCE_HASH=sha512:8fcd447664235b057396b7757dedeefe32c7572a07140a54916eed42b747a4961d6b89c570ea4b92f567b67dca79fe9c1cca4ec0b4983ec45e976288437f5e19
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://qmmp.ylsoftware.com/";
+      LICENSE[0]="GPL"
+         ENTERED=20110913
+        KEYWORDS=""
+           SHORT="set of extra plugins for qmmp"
+cat << EOF
+A set of extra plugins for Qmmp.
+EOF
diff --git a/audio-players/qmmp-plugin-pack/HISTORY 
b/audio-players/qmmp-plugin-pack/HISTORY
new file mode 100644
index 0000000..7d74b40
--- /dev/null
+++ b/audio-players/qmmp-plugin-pack/HISTORY
@@ -0,0 +1,2 @@
+2014-08-06 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS, DEPENDS, BUILD: spell created, version 0.8.1
diff --git a/audio-players/qmmp/CONFLICTS b/audio-players/qmmp/CONFLICTS
new file mode 100755
index 0000000..c7285e8
--- /dev/null
+++ b/audio-players/qmmp/CONFLICTS
@@ -0,0 +1 @@
+conflicts qmmp
diff --git a/audio-players/qmmp/DETAILS b/audio-players/qmmp/DETAILS
index be9ed10..0ab7627 100755
--- a/audio-players/qmmp/DETAILS
+++ b/audio-players/qmmp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=qmmp
-         VERSION=0.6.3
+         VERSION=0.8.1
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://${SPELL}.ylsoftware.com/files/${SOURCE}
-     
SOURCE_HASH=sha512:2e38a8cd4346af6b3cc4f6cefe4c78dc9a2f32e648b0f9e6b9d058a302787317744f5fa251c6572777851690c28825508291e45416e3cf7395350fd85f099258
+     
SOURCE_HASH=sha512:7f114253902c981abb0f41001d26d725ec636ba1965f3efc234e9cbedb4ecea0e25180112b27548eaf46e14919421f703b77bcb4b5204c531b4b910d606b5121
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://qmmp.ylsoftware.com/";
       LICENSE[0]="GPL"
diff --git a/audio-players/qmmp/HISTORY b/audio-players/qmmp/HISTORY
index 480c1ae..2d57854 100644
--- a/audio-players/qmmp/HISTORY
+++ b/audio-players/qmmp/HISTORY
@@ -1,3 +1,10 @@
+2014-08-06 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.8.1
+
+2014-08-05 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.8.0
+       * CONFLICTS: added, 
https://code.google.com/p/qmmp/issues/detail?id=585
+
 2012-08-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.3
 
diff --git a/audio-soft/wavegain/BUILD b/audio-soft/wavegain/BUILD
new file mode 100755
index 0000000..8db66ef
--- /dev/null
+++ b/audio-soft/wavegain/BUILD
@@ -0,0 +1,4 @@
+CFLAGS+=" -DHAVE_CONFIG_H" &&
+LDFLAGS+=" -lm" &&
+
+gcc -v ${LDFLAGS} ${CFLAGS} *.c -o wavegain
diff --git a/audio-soft/wavegain/DEPENDS b/audio-soft/wavegain/DEPENDS
new file mode 100755
index 0000000..ec358ce
--- /dev/null
+++ b/audio-soft/wavegain/DEPENDS
@@ -0,0 +1 @@
+depends libsndfile
diff --git a/audio-soft/wavegain/DETAILS b/audio-soft/wavegain/DETAILS
new file mode 100755
index 0000000..2a81d52
--- /dev/null
+++ b/audio-soft/wavegain/DETAILS
@@ -0,0 +1,29 @@
+           SPELL=wavegain
+          SPELLX=WaveGain
+         VERSION=1.3.1
+          SOURCE=${SPELL}-${VERSION}srcs.zip
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+   SOURCE_URL[0]=http://www.rarewares.org/files/others/${SOURCE}
+     
SOURCE_HASH=sha512:5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054
+        WEB_SITE=http://rarewares.org/others.php
+         ENTERED=20140822
+      LICENSE[0]=GPL
+      LICENSE[1]=LGPL
+        KEYWORDS="audio normalize replaygain"
+           SHORT="wav files loudness normalizer"
+cat << EOF
+WaveGain is an application of the ReplayGain algorithms to standard PCM wave
+files. Where it differs from the other applications of this principle is that
+the gain adjustments are applied directly to adjusting the scaling of the
+samples. In other words, the option to write tags that can be read by other
+applications to apply the gain adjustment does not exist, so the adjustments 
are
+made directly to the data within the file.
+
+Therefore, in the strictest meaning of the word, this process is NOT 
lossless.
+However, with the application of dithering to the output, the losses can be
+minimized and are, in any event, unlikely to be audible to the human ear.
+
+So in simple terms, the program reads in wave files, analyses them, 
calculates
+and displays recommended gain adjustments (track and album), and then applies
+the adjustments directly to the wave data, if requested.
+EOF
diff --git a/audio-soft/wavegain/HISTORY b/audio-soft/wavegain/HISTORY
new file mode 100644
index 0000000..513a57b
--- /dev/null
+++ b/audio-soft/wavegain/HISTORY
@@ -0,0 +1,2 @@
+2014-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, BUILD, INSTALL: spell created
diff --git a/audio-soft/wavegain/INSTALL b/audio-soft/wavegain/INSTALL
new file mode 100755
index 0000000..bbf7e52
--- /dev/null
+++ b/audio-soft/wavegain/INSTALL
@@ -0,0 +1 @@
+install -v wavegain "${INSTALL_ROOT}/usr/bin"
diff --git a/chat-im/centerim/DEPENDS b/chat-im/centerim/DEPENDS
index 9e670fc..d66f67e 100755
--- a/chat-im/centerim/DEPENDS
+++ b/chat-im/centerim/DEPENDS
@@ -3,7 +3,7 @@ depends -sub CXX gcc &&
 
 if [[ $LIBDRM_BRANCH == stable ]]; then
   depends  autoconf &&
-  optional_depends  openssl       \
+  optional_depends  SSL       \
            "--with-ssl"           \
            "--without-ssl"        \
            "for ssl support in Jabber"   &&
diff --git a/chat-im/centerim/HISTORY b/chat-im/centerim/HISTORY
index b1b4e28..bb86781 100644
--- a/chat-im/centerim/HISTORY
+++ b/chat-im/centerim/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-01-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS, PREPARE, PRE_BUILD: add option for installing
          the beta branch
diff --git a/chat-im/ejabberd/DEPENDS b/chat-im/ejabberd/DEPENDS
index 5662ad5..ae9f0f3 100755
--- a/chat-im/ejabberd/DEPENDS
+++ b/chat-im/ejabberd/DEPENDS
@@ -2,10 +2,10 @@ depends erlang &&
 
 depends expat &&
 
-optional_depends openssl \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
-                 "openssl support (recommended)" &&
+optional_depends SSL \
+                 "--enable-SSL" \
+                 "--disable-SSL" \
+                 "SSL support (recommended)" &&
 
 optional_depends zlib \
                  "--enable-zlib" \
diff --git a/chat-im/ejabberd/HISTORY b/chat-im/ejabberd/HISTORY
index b19642e..fce7b53 100644
--- a/chat-im/ejabberd/HISTORY
+++ b/chat-im/ejabberd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * ejabberd-2.0.5-erlang-13.patch: make it usable with erlang r13
        * DETAILS: updated spell to 2.0.5
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index 341f108..678533d 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -12,9 +12,9 @@ if is_depends_enabled $SPELL farstream; then
   depends gst-plugins-bad # required for rtp muxer
 fi &&
 
-suggest_depends pyopenssl "" "" "for secure connections support" &&
+suggest_depends pySSL "" "" "for secure connections support" &&
 
-if is_depends_enabled $SPELL pyopenssl; then
+if is_depends_enabled $SPELL pySSL; then
   depends pyasn1
 fi &&
 
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 8619b4c..c18cff3 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-05-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.15.4
 
diff --git a/chat-im/jabberd/DEPENDS b/chat-im/jabberd/DEPENDS
index 43d1df2..3093126 100755
--- a/chat-im/jabberd/DEPENDS
+++ b/chat-im/jabberd/DEPENDS
@@ -3,7 +3,7 @@ depends udns  &&
 depends zlib  &&
 depends $JABBERD_SASL &&
 
-optional_depends openssl \
+optional_depends SSL \
                  '--enable-ssl' \
                  '--disable-ssl' \
                  'Needed for SSL/TLS support' &&
diff --git a/chat-im/jabberd/HISTORY b/chat-im/jabberd/HISTORY
index 420aef4..d03bffc 100644
--- a/chat-im/jabberd/HISTORY
+++ b/chat-im/jabberd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-30 Robert Figura <template AT sourcemage.org>
        * DETAILS: updated spell to 2.2.14
 
diff --git a/chat-im/licq/DEPENDS b/chat-im/licq/DEPENDS
index e4d99a0..a6b231f 100755
--- a/chat-im/licq/DEPENDS
+++ b/chat-im/licq/DEPENDS
@@ -15,7 +15,7 @@ if [ "$LICQ_AOSD" == "y" ]; then
 fi &&
 depends cmake           &&
 depends boost           &&
-optional_depends  "openssl"     \
+optional_depends  "SSL"     \
                   ""            \
-                  "--disable-openssl"            \
+                  "--disable-SSL"            \
                   "for secure communication between clients"
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index ac4968a..7feeab2 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/chat-im/profanity/DEPENDS b/chat-im/profanity/DEPENDS
index ef01f5b..6e10443 100755
--- a/chat-im/profanity/DEPENDS
+++ b/chat-im/profanity/DEPENDS
@@ -13,7 +13,7 @@ optional_depends libxml2                     \
                  ""                          \
                  "for XML parsing"           &&
 
-optional_depends openssl                     \
+optional_depends SSL                     \
                  ""                          \
                  ""                          \
                  "for TLS connections"       &&
diff --git a/chat-im/profanity/HISTORY b/chat-im/profanity/HISTORY
index 00e824b..bd15642 100644
--- a/chat-im/profanity/HISTORY
+++ b/chat-im/profanity/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/chat-im/prosody/DEPENDS b/chat-im/prosody/DEPENDS
index fef2097..bc4fdb1 100755
--- a/chat-im/prosody/DEPENDS
+++ b/chat-im/prosody/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 depends luasocket &&
 depends luaexpat &&
 depends luafilesystem &&
diff --git a/chat-im/prosody/HISTORY b/chat-im/prosody/HISTORY
index b8938c7..dc2023c 100644
--- a/chat-im/prosody/HISTORY
+++ b/chat-im/prosody/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-31 Justin Boffemmyer <flux AT sourcemage.org>
        * DETAILS: version 0.9.4
 
diff --git a/chat-im/psi/DEPENDS b/chat-im/psi/DEPENDS
index 241762c..7d634db 100755
--- a/chat-im/psi/DEPENDS
+++ b/chat-im/psi/DEPENDS
@@ -4,4 +4,4 @@ depends qca2 &&
 optional_depends aspell        '' '--disable-aspell'  'spell checking'  &&
 optional_depends enchant       '' '--disable-enchant' 'spell checking' &&
 optional_depends libxscrnsaver '' '--disable-xss'     'screen saver' &&
-optional_depends qca-openssl   '' ''                  'voice support'
+optional_depends qca-SSL   '' ''                  'voice support'
diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY
index 1a00262..f247888 100644
--- a/chat-im/psi/HISTORY
+++ b/chat-im/psi/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-01-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.15
        * DEPENDS: no longer needs QT3 support
diff --git a/chat-im/qutecom/DEPENDS b/chat-im/qutecom/DEPENDS
index 12d2f35..1310157 100755
--- a/chat-im/qutecom/DEPENDS
+++ b/chat-im/qutecom/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 depends glib2 &&
 depends gnutls &&
 depends libxml2 &&
diff --git a/chat-im/qutecom/HISTORY b/chat-im/qutecom/HISTORY
index c1c2be6..167c19d 100644
--- a/chat-im/qutecom/HISTORY
+++ b/chat-im/qutecom/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-01-28 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: depend on LIBAVCODEC instead of ffmpeg
 
diff --git a/chat-im/qutim/DEPENDS b/chat-im/qutim/DEPENDS
index a32e790..3800855 100755
--- a/chat-im/qutim/DEPENDS
+++ b/chat-im/qutim/DEPENDS
@@ -12,7 +12,7 @@ then
                    "for encryption in jabber plugin"  &&
   if ! is_depends_enabled $SPELL gnutls
   then
-    optional_depends openssl  \
+    optional_depends SSL  \
                      "-DOpenSSL%BOOL=1"  \
                      "-DOpenSSL%BOOL=0"  \
                      "for SSL support in jabber"
diff --git a/chat-im/qutim/HISTORY b/chat-im/qutim/HISTORY
index a1eb1d8..5458e25 100644
--- a/chat-im/qutim/HISTORY
+++ b/chat-im/qutim/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-07-08 Donald Johnson <minozake AT codemage.net>
        * Removed prepare_cmake_flags() as cmake_build() now calls it.
 
diff --git a/chat-im/tmsnc/DEPENDS b/chat-im/tmsnc/DEPENDS
index ed472ed..09706da 100755
--- a/chat-im/tmsnc/DEPENDS
+++ b/chat-im/tmsnc/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/chat-im/tmsnc/HISTORY b/chat-im/tmsnc/HISTORY
index 6b74b2b..89e6aaf 100644
--- a/chat-im/tmsnc/HISTORY
+++ b/chat-im/tmsnc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2007-10-30 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to version 0.3.2
 
diff --git a/chat-im/vacuum/DEPENDS b/chat-im/vacuum/DEPENDS
index 5342c99..395e480 100755
--- a/chat-im/vacuum/DEPENDS
+++ b/chat-im/vacuum/DEPENDS
@@ -1,4 +1,4 @@
 depends cmake &&
 depends qt4 &&
-depends openssl &&
+depends SSL &&
 depends subversion
diff --git a/chat-im/vacuum/HISTORY b/chat-im/vacuum/HISTORY
index 329f961..7001cab 100644
--- a/chat-im/vacuum/HISTORY
+++ b/chat-im/vacuum/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS
index e10f03d..949d713 100755
--- a/chat-irc/hexchat/DEPENDS
+++ b/chat-irc/hexchat/DEPENDS
@@ -5,8 +5,8 @@ optional_depends  gettext                              \
                   "--disable-nls"                      \
                   "Enable gettext for i18n?"           &&
 
-optional_depends  openssl                              \
-                  "--enable-openssl=/usr/bin/openssl"  \
+optional_depends  SSL                              \
+                  "--enable-SSL=/usr/bin/openssl"  \
                   ""                                   \
                   "Enable use of openSSL?"             &&
 
diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY
index 898621b..670910e 100644
--- a/chat-irc/hexchat/HISTORY
+++ b/chat-irc/hexchat/HISTORY
@@ -1,2 +1,5 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-09-09 Robin Cook <rcook AT wyrms.net>
        * New Spell: DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD, INSTALL
diff --git a/chat-irc/ircd-ratbox/DEPENDS b/chat-irc/ircd-ratbox/DEPENDS
index 25f8c57..4799acb 100755
--- a/chat-irc/ircd-ratbox/DEPENDS
+++ b/chat-irc/ircd-ratbox/DEPENDS
@@ -5,9 +5,9 @@ optional_depends zlib \
                  "--disable-zlib" \
                  "for ziplinks support" &&
 
-optional_depends openssl \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
+optional_depends SSL \
+                 "--enable-SSL" \
+                 "--disable-SSL" \
                  "for OpenSSL support" &&
 
 optional_depends sqlite \
diff --git a/chat-irc/ircd-ratbox/HISTORY b/chat-irc/ircd-ratbox/HISTORY
index 41bfaf0..e7d5d1b 100644
--- a/chat-irc/ircd-ratbox/HISTORY
+++ b/chat-irc/ircd-ratbox/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-01-28 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: SECURITY_PATCH=1 (CVE-2012-6084)
 
diff --git a/chat-irc/irssi/DEPENDS b/chat-irc/irssi/DEPENDS
index 41b2b8e..2f58a47 100755
--- a/chat-irc/irssi/DEPENDS
+++ b/chat-irc/irssi/DEPENDS
@@ -2,7 +2,7 @@ depends  glib2    &&
 depends  ncurses  &&
 depends -sub CXX gcc      &&
 
-optional_depends  "openssl"          \
+optional_depends  "SSL"          \
                   ""                 \
                   "--disable-ssl"    \
                   "for SSL support"  &&
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index c9ce0f3..5101f76 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/chat-irc/xchat-gnome/DEPENDS b/chat-irc/xchat-gnome/DEPENDS
index cde60d6..06d7b8d 100755
--- a/chat-irc/xchat-gnome/DEPENDS
+++ b/chat-irc/xchat-gnome/DEPENDS
@@ -22,8 +22,8 @@ optional_depends  python                          \
                   "--disable-python"              \
                   "for Python scripting support"  &&
 
-optional_depends  openssl                              \
-                  "--enable-openssl=/usr/bin/openssl"  \
+optional_depends  SSL                              \
+                  "--enable-SSL=/usr/bin/openssl"  \
                   ""                                   \
                   "enable use of openSSL" &&
 
diff --git a/chat-irc/xchat-gnome/HISTORY b/chat-irc/xchat-gnome/HISTORY
index 20ce45e..0526244 100644
--- a/chat-irc/xchat-gnome/HISTORY
+++ b/chat-irc/xchat-gnome/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-04-16 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 2.26.1. Updated SOURCE_URL
          Added BRANCH
diff --git a/chat-irc/xchat/DEPENDS b/chat-irc/xchat/DEPENDS
index 2e79cda..7ea50d9 100755
--- a/chat-irc/xchat/DEPENDS
+++ b/chat-irc/xchat/DEPENDS
@@ -35,7 +35,7 @@ optional_depends  python                          \
                   "--disable-python"              \
                   "for Python scripting support"  &&
 
-optional_depends  openssl                              \
-                  "--enable-openssl=/usr/bin/openssl"  \
+optional_depends  SSL                              \
+                  "--enable-SSL=/usr/bin/openssl"  \
                   ""                                   \
                   "enable use of openSSL"
diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index 7b1876b..637a5dd 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
        * 0001-fix-build-with-glib-version-2.32.patch: corrected the patch
          to fix compilation with static spelling support
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index 5074274..7e8ed47 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -51,7 +51,7 @@ optional_depends LIBSASL \
                  "--disable-cyrus" \
                  "for SASL support via cyrus" &&
 
-optional_depends openssl \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
+optional_depends SSL \
+                 "--enable-SSL" \
+                 "--disable-SSL" \
                  "to use OpenSSL"
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 3885711..56d1c73 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.4
 
diff --git a/chat-libs/gloox/DEPENDS b/chat-libs/gloox/DEPENDS
index d9c8c77..3b7f2aa 100755
--- a/chat-libs/gloox/DEPENDS
+++ b/chat-libs/gloox/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub CXX gcc     &&
 depends gnutls  &&
-depends openssl &&
+depends SSL &&
 depends libidn  &&
 optional_depends zlib \
                  "--with-zlib" \
diff --git a/chat-libs/gloox/HISTORY b/chat-libs/gloox/HISTORY
index d805679..ad3d7f1 100644
--- a/chat-libs/gloox/HISTORY
+++ b/chat-libs/gloox/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/chat-libs/libmsn/DEPENDS b/chat-libs/libmsn/DEPENDS
index 38d1195..22316c5 100755
--- a/chat-libs/libmsn/DEPENDS
+++ b/chat-libs/libmsn/DEPENDS
@@ -1,3 +1,3 @@
 depends -sub CXX gcc     &&
 depends cmake   &&
-depends openssl
+depends SSL
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 77601d4..e228fea 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-06-23 Sukneet Basuta <sukneet AT sourcemage.org>
        * PRE_BUILD: added, apply gcc-4.7 patch
        * gcc-4.7.patch: added, fix compilation on gcc 4.7
diff --git a/chat-libs/libstrophe/DEPENDS b/chat-libs/libstrophe/DEPENDS
index 3a26b06..43c4f1a 100755
--- a/chat-libs/libstrophe/DEPENDS
+++ b/chat-libs/libstrophe/DEPENDS
@@ -1,3 +1,3 @@
 optional_depends expat   ""               "" "for XML parsing"     &&
 optional_depends libxml2 "--with-libxml2" "" "for XML parsing"     &&
-optional_depends openssl ""               "" "for TLS connections" 
+optional_depends SSL ""               "" "for TLS connections" 
diff --git a/chat-libs/libstrophe/HISTORY b/chat-libs/libstrophe/HISTORY
index 014b66b..3d728cb 100644
--- a/chat-libs/libstrophe/HISTORY
+++ b/chat-libs/libstrophe/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-10-13 Jeremy Blosser <jblosser AT sourcemage.org>
        * DETAILS, DEPENDS, PRE_BUILD: spell created
 
diff --git a/chat-libs/loudmouth/DEPENDS b/chat-libs/loudmouth/DEPENDS
index 14a4b75..10c7db7 100755
--- a/chat-libs/loudmouth/DEPENDS
+++ b/chat-libs/loudmouth/DEPENDS
@@ -14,7 +14,7 @@ optional_depends libasyncns \
 case $LOUDMOUTH_SSL in
   gnutls) depends gnutls "--with-ssl=gnutls"
   ;;
-  openssl) depends openssl "--with-ssl=openssl"
+  SSL) depends openssl "--with-ssl=openssl"
   ;;
   none) OPTS="--without-ssl $OPTS"
   ;;
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index 5b1c506..ab93fdc 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD: disable compiler error
 
diff --git a/chat-libs/ptlib/DEPENDS b/chat-libs/ptlib/DEPENDS
index 82d89ae..4c37f86 100755
--- a/chat-libs/ptlib/DEPENDS
+++ b/chat-libs/ptlib/DEPENDS
@@ -6,9 +6,9 @@ optional_depends  "openldap"            \
                   "--disable-openldap"  \
                   "for LDAP lookups"    &&
 
-optional_depends  "openssl"              \
-                  "--enable-openssl"     \
-                  "--disable-openssl"    \
+optional_depends  "SSL"              \
+                  "--enable-SSL"     \
+                  "--disable-SSL"    \
                   "for SSL connections"  &&
 
 optional_depends  "LIBSASL"               \
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index 5d5d879..66423dd 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/chat-libs/pwlib/DEPENDS b/chat-libs/pwlib/DEPENDS
index dfc5bb0..4a53ae0 100755
--- a/chat-libs/pwlib/DEPENDS
+++ b/chat-libs/pwlib/DEPENDS
@@ -6,9 +6,9 @@ optional_depends  "openldap"            \
                   "--disable-openldap"  \
                   "for LDAP lookups"    &&
 
-#optional_depends  "openssl"              \
-#                  "--enable-openssl"     \
-#                  "--disable-openssl"    \
+#optional_depends  "SSL"              \
+#                  "--enable-SSL"     \
+#                  "--disable-SSL"    \
 #                  "for SSL connections"  &&
 
 optional_depends  "cyrus-sasl"            \
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index e83e3c7..2aaa36c 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/chat-libs/tls/DEPENDS b/chat-libs/tls/DEPENDS
index a70b5cf..2ed1572 100755
--- a/chat-libs/tls/DEPENDS
+++ b/chat-libs/tls/DEPENDS
@@ -1 +1 @@
-depends  openssl
+depends  SSL
diff --git a/chat-libs/tls/HISTORY b/chat-libs/tls/HISTORY
index a682ccb..32bed87 100644
--- a/chat-libs/tls/HISTORY
+++ b/chat-libs/tls/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-07-07 Alexander Tsamutali <astsmtl AT gmail.com>
        * DETAILS: Updated to 1.6
        * PRE_BUILD: Removed
diff --git a/collab/openca/DEPENDS b/collab/openca/DEPENDS
index 7269cd6..1cde9cd 100755
--- a/collab/openca/DEPENDS
+++ b/collab/openca/DEPENDS
@@ -1,5 +1,5 @@
 depends  APACHE     &&
-depends  openssl    &&
+depends  SSL    &&
 depends  perl       &&
 
 optional_depends  db                         \
diff --git a/collab/openca/HISTORY b/collab/openca/HISTORY
index e619cb6..b3bcee4 100644
--- a/collab/openca/HISTORY
+++ b/collab/openca/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-30-10 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed MD5[0] to SOURCE_HASH
 
diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE
index 8ea1eb8..4fc53e5 100755
--- a/collab/openldap/CONFIGURE
+++ b/collab/openldap/CONFIGURE
@@ -25,6 +25,7 @@ fi &&
 config_query_list OPENLDAP_TLS "Which backend do you want for TLS/SSL 
support?" \
                                none \
                                openssl \
+                               libressl \
                                gnutls \
                                moznss &&
 
diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index 84213db..78f421e 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -9,7 +9,7 @@ optional_depends  SYSTEM-LOGGER         \
 case $OPENLDAP_TLS in
   none) OPTS="--without-tls $OPTS"
   ;;
-  openssl) depends openssl "--with-tls=openssl"
+  SSL) depends SSL "--with-tls=openssl"
   ;;
   gnutls) depends gnutls "--with-tls=gnutls"
   ;;
@@ -27,7 +27,7 @@ if list_find "$OPENLDAP_OPTS" "--enable-slapd"; then
   case OPENLDAP_MP in
     auto) OPTS="--with-mp=auto $OPTS"
     ;;
-    bignum) depends openssl "--with-mp=bignum"
+    bignum) depends SSL "--with-mp=bignum"
     ;;
     gmp) depends gmp "--with-mp=gmp"
     ;;
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 951af63..9f3472a 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+       * CONFIGURE: fix
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-01-30 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4.39
 
diff --git a/collab/rapidsvn/DEPENDS b/collab/rapidsvn/DEPENDS
index d5cec4f..aad76b4 100755
--- a/collab/rapidsvn/DEPENDS
+++ b/collab/rapidsvn/DEPENDS
@@ -38,7 +38,7 @@ optional_depends db \
                 "" \
                 "for DBD repository access" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "" \
                 "" \
                 "for OpenSSL support"
diff --git a/collab/rapidsvn/HISTORY b/collab/rapidsvn/HISTORY
index 0d7c5a0..9d36a91 100644
--- a/collab/rapidsvn/HISTORY
+++ b/collab/rapidsvn/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.12.0-1
 
diff --git a/crypto/chntpw/DEPENDS b/crypto/chntpw/DEPENDS
index ed472ed..09706da 100755
--- a/crypto/chntpw/DEPENDS
+++ b/crypto/chntpw/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/crypto/chntpw/HISTORY b/crypto/chntpw/HISTORY
index cdd5710..693845a 100644
--- a/crypto/chntpw/HISTORY
+++ b/crypto/chntpw/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-08-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 100627, new WEB_SITE and SOURCE_URL[0]
 
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 60ea88e..31256f9 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -4,9 +4,9 @@ depends  e2fsprogs  &&
 depends  groff      &&
 depends  libmcrypt  &&
 
-optional_depends openssl                             \
-                 "--with-openssl=$INSTALL_ROOT/usr"  \
-                 '--without-openssl'                 \
+optional_depends SSL                             \
+                 "--with-opennssl=$INSTALL_ROOT/usr"  \
+                 '--without-opennssl'                 \
                  'for OpenSSL'                       &&
 
 if [[ "$CS_KERBEROS" == 'y' ]]; then
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 2a66b60..4969b43 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-28 Sukneet Basuta <sukneet AT sourcemage.org>
        * DEPENDS: added sqlite optional_depends
        * PRE_BUILD: patch to fix compilation with sqlite
diff --git a/crypto/encfs/DEPENDS b/crypto/encfs/DEPENDS
index 2335de0..47f2107 100755
--- a/crypto/encfs/DEPENDS
+++ b/crypto/encfs/DEPENDS
@@ -1,4 +1,4 @@
 depends  fuse     &&
-depends  openssl  &&
+depends  SSL  &&
 depends  rlog     &&
 depends  boost
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 67de97f..bdcad4b 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/crypto/engine_pkcs11/DEPENDS b/crypto/engine_pkcs11/DEPENDS
index 7dc6dad..5e5feb0 100755
--- a/crypto/engine_pkcs11/DEPENDS
+++ b/crypto/engine_pkcs11/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl  &&
+depends SSL  &&
 depends libp11   &&
 depends libtool  &&
 depends pkgconfig
diff --git a/crypto/engine_pkcs11/HISTORY b/crypto/engine_pkcs11/HISTORY
index fdb927d..98b9b30 100644
--- a/crypto/engine_pkcs11/HISTORY
+++ b/crypto/engine_pkcs11/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 1cde996..dbf9424 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnupg-exp
-         VERSION=2.0.25
+         VERSION=2.0.26
   SECURITY_PATCH=8
       PATCHLEVEL=0
 
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index aa56ef6..7488387 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-12 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: 2.0.26
+
 2014-06-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.0.25
 
diff --git a/crypto/gpgme/DEPENDS b/crypto/gpgme/DEPENDS
index a321cd5..e923af2 100755
--- a/crypto/gpgme/DEPENDS
+++ b/crypto/gpgme/DEPENDS
@@ -1,8 +1,12 @@
-depends gnupg &&
 depends libgpg-error &&
 
-if [[ $GPGME_BRANCH == 1.3 ]]; then
-  depends libassuan
-fi &&
+case $GPGME_BRANCH in
+ 1.3 | 1.4 | 1.5)
+   depends libassuan &&
+   depends gnupg-exp
+   ;;
+ *)
+   depends gnupg
+   ;;
+esac
 
-optional_depends gnupg-exp "" "" "to support the S/MIME variant of gpg - 
GpgSM"
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index 0cec404..c53ce9b 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -33,8 +33,9 @@ case $GPGME_BRANCH in
           SOURCE=$SPELL-$VERSION.tar.bz2
   ;;
   1.5)
-         VERSION=1.5.0
-     
SOURCE_HASH=sha512:c1f167388f23fccb5acdd7fa1b2e4faba21dff0079df77e598a5ec633b5788bc3f92a4f193991d396371560d066303d5bdaf1e5974742a738a47d9978f5caaab
+         VERSION=1.5.1
+     
SOURCE_HASH=sha512:66162d8baf8ce3d7eeaba5aa9cd4efb2704a7a00ce3e0e08a78bdf29ce812e00240a373e7e134825326117fab5495fe42cdf3944eb76f89048e045bcc6e114ff
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.bz2
   ;;
 esac
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index eb0113e..17a3700 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,8 @@
+2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.5.1
+          SECURITY_PATCH++,, fixs CVE-2014-3564
+       * DEPENDS: fix libassuan dependency
+
 2014-06-03 Treeve Jelbert <treeve AT sourcemage.org>
        * PREPARE: add 1.5 branch
        *DETAILS: version 1.5.0
diff --git a/crypto/hydan/DEPENDS b/crypto/hydan/DEPENDS
index a70b5cf..2ed1572 100755
--- a/crypto/hydan/DEPENDS
+++ b/crypto/hydan/DEPENDS
@@ -1 +1 @@
-depends  openssl
+depends  SSL
diff --git a/crypto/hydan/HISTORY b/crypto/hydan/HISTORY
index afcab0d..9a7c8fb 100644
--- a/crypto/hydan/HISTORY
+++ b/crypto/hydan/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/crypto/krb5/DEPENDS b/crypto/krb5/DEPENDS
index 365375f..81dd1ee 100755
--- a/crypto/krb5/DEPENDS
+++ b/crypto/krb5/DEPENDS
@@ -3,6 +3,7 @@ suggest_depends krb5-appl "" "" "for krb5 applications 
(telnet/telnetd, ftp/ftpd
 depends  bison                                           &&
 depends  e2fsprogs  '--with-system-et --with-system-ss'  &&
 depends  perl                                            &&
+depends  SSL  &&
 
 optional_depends  "linux-pam"        \
                   ""                 \
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index c8964bd..b8d2e99 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,6 +1,7 @@
            SPELL=krb5
-         VERSION=1.11.3
-     
SOURCE_HASH=sha512:4d4c5d5c3a495da141bca40fe73378db190ace8ed397b7bb8e38c53757e6df3ec55fa0eb5628f7c6204d1265f8451535e65c4ebd844821c64cdfd0c6e32468a5
+         VERSION=1.12.2
+  SECURITY_PATCH=13
+     
SOURCE_HASH=sha512:27ea2e4810e3770695865aa2bbc9d39793fe3eba82ff1ca85ccbcfa0272a3fe13de21bfff15dc5eef6b7c9d91f7f8d1c42fa4b85fa71958d2b38f867d55c5dff
             VX=${VERSION%.?}
           SOURCE=$SPELL-$VERSION-signed.tar
       SOURCE_RAW=$SPELL-$VERSION.tar.gz
@@ -9,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://web.mit.edu/kerberos/www/
          ENTERED=20020215
       
LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
-  SECURITY_PATCH=12
         KEYWORDS="security crypto"
            SHORT="Kerberos 5 network security protocol"
 cat << EOF
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index 42a2869..2fd7b0d 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,12 @@
+2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.12.2
+         SECURITY_PATCH++
+         fixes CVE-2014-4342 CVE-2014-4341 CVE-2014-4343 CVE-2014-4344 
CVE-2014-4345
+       * DEPENDS: openssl => SSL
+
+2014-08-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.12.1
+
 2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.11.3; SECURITY_PATCH++ (CVE-2002-2443)
 
diff --git a/crypto/libgcrypt/DETAILS b/crypto/libgcrypt/DETAILS
index 69955e0..cbdcb8c 100755
--- a/crypto/libgcrypt/DETAILS
+++ b/crypto/libgcrypt/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgcrypt
-         VERSION=1.6.1
+         VERSION=1.6.2
   SECURITY_PATCH=2
 
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index 9d8c558..e9c6d28 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-22 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.6.2
+
 2014-02-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.6.1
          SECURITY_PATCH++ fixes CVE-2013-4242
diff --git a/crypto/libp11/DEPENDS b/crypto/libp11/DEPENDS
index d1ba3ea..09a449e 100755
--- a/crypto/libp11/DEPENDS
+++ b/crypto/libp11/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl  &&
+depends SSL  &&
 depends libtool  &&
 depends libxslt  &&
 depends  pkgconfig &&
diff --git a/crypto/libp11/HISTORY b/crypto/libp11/HISTORY
index fbca505..bcf0b9b 100644
--- a/crypto/libp11/HISTORY
+++ b/crypto/libp11/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/crypto/libressl/CONFLICTS b/crypto/libressl/CONFLICTS
new file mode 100755
index 0000000..f76cdec
--- /dev/null
+++ b/crypto/libressl/CONFLICTS
@@ -0,0 +1 @@
+conflicts openssl
diff --git a/crypto/libressl/DEPENDS b/crypto/libressl/DEPENDS
new file mode 100755
index 0000000..3ec296e
--- /dev/null
+++ b/crypto/libressl/DEPENDS
@@ -0,0 +1,2 @@
+suggest_depends   ca-certificates '' '' 'adds root certificates'
+
diff --git a/crypto/libressl/DETAILS b/crypto/libressl/DETAILS
new file mode 100755
index 0000000..4b44dfc
--- /dev/null
+++ b/crypto/libressl/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=libressl
+         VERSION=2.0.5
+     
SOURCE_HASH=sha512:b795835eda11781666312151904f6e8b7b444cf99ff4f6d7d3fe659869257e1fee5d2883b747071aecf7c7ccb8f2268e348567a84c9a67efdb2602c744d26177
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+        WEB_SITE=http://www.libressl.org/
+   SOURCE_URL[0]=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$SOURCE
+      LICENSE[0]=BSD
+         ENTERED=20140819
+        KEYWORDS=""
+           SHORT="SSL/TLS protocol"
+cat << EOF
+LibreSSL is a FREE version of the SSL/TLS protocol forked from OpenSSL
+EOF
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
new file mode 100644
index 0000000..6460a20
--- /dev/null
+++ b/crypto/libressl/HISTORY
@@ -0,0 +1,4 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.0.5
+         spell created
+
diff --git a/crypto/libressl/PREPARE b/crypto/libressl/PREPARE
new file mode 100755
index 0000000..c9924b3
--- /dev/null
+++ b/crypto/libressl/PREPARE
@@ -0,0 +1,5 @@
+if spell_ok openssl;then
+  for each in $(show_up_depends openssl 1); do
+    up_trigger $each cast_self
+  done
+fi
diff --git a/crypto/libressl/PROVIDES b/crypto/libressl/PROVIDES
new file mode 100644
index 0000000..fe0d4a2
--- /dev/null
+++ b/crypto/libressl/PROVIDES
@@ -0,0 +1 @@
+SSL
diff --git a/crypto/libressl/UP_TRIGGERS b/crypto/libressl/UP_TRIGGERS
new file mode 100755
index 0000000..5e5a48a
--- /dev/null
+++ b/crypto/libressl/UP_TRIGGERS
@@ -0,0 +1,10 @@
+# this makes ABI changes automatically cast those that depend on libressl 
via an up_trigger
+
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" || 
return 0
+
+if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ] || \
+   [ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]; then
+  for each in $(show_up_depends $SPELL 1); do
+    up_trigger $each cast_self
+  done
+fi
diff --git a/crypto/libssh/CONFIGURE b/crypto/libssh/CONFIGURE
index ed632b2..5ec87e7 100755
--- a/crypto/libssh/CONFIGURE
+++ b/crypto/libssh/CONFIGURE
@@ -1 +1 @@
-config_query_list SSH_CRYPTO "which crypto library" libgcrypt openssl
+config_query_list SSH_CRYPTO "which crypto library" libgcrypt SSL
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index 44dd80c..216bc8e 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * CONFIGURE: openssl => SSL
+
 2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.6.3
 
diff --git a/crypto/libssh2/CONFIGURE b/crypto/libssh2/CONFIGURE
index 6f4c50b..f5187f5 100755
--- a/crypto/libssh2/CONFIGURE
+++ b/crypto/libssh2/CONFIGURE
@@ -1 +1 @@
-config_query_list SSH2_CRYPTO "which crypto library" libgcrypt openssl
+config_query_list SSH2_CRYPTO "which crypto library" libgcrypt 
openssl/libressl
diff --git a/crypto/libssh2/DEPENDS b/crypto/libssh2/DEPENDS
index cd5d2b0..a0115e1 100755
--- a/crypto/libssh2/DEPENDS
+++ b/crypto/libssh2/DEPENDS
@@ -1,2 +1,6 @@
-depends $SSH2_CRYPTO "--with-$SSH2_CRYPTO" &&
+if [ "$SSH2_CRYPTO" = libgcrypt ]; then
+  depends libgcrypt --with-libgcrypt
+else
+  depends SSL --with-openssl
+fi &&
 depends  zlib
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index c44650b..08bd800 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,7 +1,10 @@
+2014-08-23 Ismael Luceno <ismael AT sourcemage.org>
+       * CONFIGURE, DEPENDS: Allow the use of libressl
+
 2013-01-20 Treeve Jelbert <treeve AT sourcemage.org>
        * CONFIGURE: added, allow choice of openssl, libgcrypt
        * DEPENDS: use chosen crypto library
-       
+
 2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.3
 
diff --git a/crypto/lsh/DEPENDS b/crypto/lsh/DEPENDS
index cdc1c7a..99f1df2 100755
--- a/crypto/lsh/DEPENDS
+++ b/crypto/lsh/DEPENDS
@@ -1,3 +1,3 @@
-depends  openssl  &&
+depends  SSL  &&
 depends  liboop   &&
 depends  gmp
diff --git a/crypto/lsh/HISTORY b/crypto/lsh/HISTORY
index db37089..e817a56 100644
--- a/crypto/lsh/HISTORY
+++ b/crypto/lsh/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-09-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: converted to upstream signature checking
          fixed long description wrap
diff --git a/crypto/mosh/DEPENDS b/crypto/mosh/DEPENDS
index e574018..26d3718 100755
--- a/crypto/mosh/DEPENDS
+++ b/crypto/mosh/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
 depends protobuf &&
 depends ncurses  &&
 depends zlib     &&
-depends openssl  &&
+depends SSL  &&
 
 optional_depends libutempter \
                  "--with-utempter" \
diff --git a/crypto/mosh/HISTORY b/crypto/mosh/HISTORY
index 8e5811f..0c634fd 100644
--- a/crypto/mosh/HISTORY
+++ b/crypto/mosh/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.2.4
 
diff --git a/crypto/opensc/DEPENDS b/crypto/opensc/DEPENDS
index 14b953c..3ebdb43 100755
--- a/crypto/opensc/DEPENDS
+++ b/crypto/opensc/DEPENDS
@@ -1,6 +1,6 @@
 depends pkgconfig                             &&
 
-optional_depends openssl                      \
+optional_depends SSL                      \
                  ""                           \
                  ""                           \
                  "Enable OpenSSL support?"    &&
diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index 94931b4..fe5452c 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-08-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.12.2
 
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 7d8aeb4..c441d6a 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -1,6 +1,6 @@
 depends  e2fsprogs  &&
 depends  gnupg      &&
-depends  openssl    &&
+depends  SSL    &&
 depends  smgl-fhs   &&
 depends  zlib       &&
 
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index e1f07fe..025489f 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-05-12 Jeremy Blosser <jblosser-smgl AT firinn.org>
        * PRE_BUILD, openssh-lpk-6.5p1-0.3.14.patch.gz: Update the LPK patch.
 
diff --git a/crypto/openssl/CONFLICTS b/crypto/openssl/CONFLICTS
new file mode 100644
index 0000000..4ac1907
--- /dev/null
+++ b/crypto/openssl/CONFLICTS
@@ -0,0 +1 @@
+conflicts libressl
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index a109087..0fafa67 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
 
 case $OPENSSL_BRANCH in
   0.9)
-         VERSION=0.9.8za
-  SECURITY_PATCH=21
+         VERSION=0.9.8zb
+  SECURITY_PATCH=22
   ;;
   1.0)
-         VERSION=1.0.1h
-  SECURITY_PATCH=23
+         VERSION=1.0.1i
+  SECURITY_PATCH=24
   ;;
 esac
 
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 783822d..2767afc 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,14 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * PROVIDES, CONFLICTS: added, to allow libressl as na alternative
+       * UP_TRIGGERS: test for libressl as well
+       * PREPARE: check for libressl
+
+2014-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.0.1i (branch 1.0), 0.9.8zb (branch 0.9);
+         SECURITY_PATCH++ (9 CVEs)
+       * openssl.gpg: imported 0E604491 public key (Matt Caswell
+         <matt AT openssl.org>)
+
 2014-06-05 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell (branch 1.0) to 1.0.1h, (branch 0.9) to
          0.9.8za; SECURITY_PATCH++ (7 CVEs)
diff --git a/crypto/openssl/PREPARE b/crypto/openssl/PREPARE
index 60fb53b..e142d81 100755
--- a/crypto/openssl/PREPARE
+++ b/crypto/openssl/PREPARE
@@ -1 +1,6 @@
 config_query_list OPENSSL_BRANCH "Which branch of OpenSSL do you want to 
build?" DEFAULT 0.9 1.0
+if spell_ok libressl;then
+  for each in $(show_up_depends libressl 1); do
+    up_trigger $each cast_self
+  done
+fi
diff --git a/crypto/openssl/PROVIDES b/crypto/openssl/PROVIDES
new file mode 100644
index 0000000..fe0d4a2
--- /dev/null
+++ b/crypto/openssl/PROVIDES
@@ -0,0 +1 @@
+SSL
diff --git a/crypto/openssl/openssl.gpg b/crypto/openssl/openssl.gpg
index 5b26b13..d90e7db 100644
Binary files a/crypto/openssl/openssl.gpg and b/crypto/openssl/openssl.gpg 
differ
diff --git a/crypto/pad/DEPENDS b/crypto/pad/DEPENDS
index ed472ed..09706da 100755
--- a/crypto/pad/DEPENDS
+++ b/crypto/pad/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/crypto/pad/HISTORY b/crypto/pad/HISTORY
index 5a8d92f..fe03ca2 100644
--- a/crypto/pad/HISTORY
+++ b/crypto/pad/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-01-17 Martin Spitzbarth <m.spitzbarth AT gmx.de>
        * DEPENDS: created, added openssl as dependency
 
diff --git a/crypto/qca-openssl/DEPENDS b/crypto/qca-openssl/DEPENDS
index d312916..b5a469d 100755
--- a/crypto/qca-openssl/DEPENDS
+++ b/crypto/qca-openssl/DEPENDS
@@ -1,2 +1,2 @@
 depends  qca2  &&
-depends openssl
+depends SSL
diff --git a/crypto/qca-openssl/HISTORY b/crypto/qca-openssl/HISTORY
index 0742369..92fb13f 100644
--- a/crypto/qca-openssl/HISTORY
+++ b/crypto/qca-openssl/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-01-04 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to version 2.0.0-beta3
        * PRE_BUILD: Updated patch name
diff --git a/crypto/ssldump/DEPENDS b/crypto/ssldump/DEPENDS
index ed02b6d..49d4e4f 100755
--- a/crypto/ssldump/DEPENDS
+++ b/crypto/ssldump/DEPENDS
@@ -1,2 +1,2 @@
 depends  libpcap  &&
-depends  openssl
+depends  SSL
diff --git a/crypto/ssldump/HISTORY b/crypto/ssldump/HISTORY
index 785ddd8..147859e 100644
--- a/crypto/ssldump/HISTORY
+++ b/crypto/ssldump/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-06-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: PATCHLEVEL=1, removed BUILD_API=1 and UPDATED
        * PRE_BUILD, *.patch: added patches from Gentoo
diff --git a/crypto/unhash/DEPENDS b/crypto/unhash/DEPENDS
index ed472ed..09706da 100755
--- a/crypto/unhash/DEPENDS
+++ b/crypto/unhash/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/crypto/unhash/HISTORY b/crypto/unhash/HISTORY
index 045355a..c43f4d7 100644
--- a/crypto/unhash/HISTORY
+++ b/crypto/unhash/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-02-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.1, tgz -> tar.bz2, updated WEB_SITE and SOURCE_URL[0]
 
diff --git a/crypto/xca/DEPENDS b/crypto/xca/DEPENDS
index 30ef175..c8f9570 100755
--- a/crypto/xca/DEPENDS
+++ b/crypto/xca/DEPENDS
@@ -1,4 +1,4 @@
-depends  openssl  &&
+depends  SSL  &&
 depends  qt4      &&
 
 optional_depends linuxdoc-tools "" "" "for SGML and HTML documentation"
diff --git a/crypto/xca/HISTORY b/crypto/xca/HISTORY
index ee20074..d05ba0c 100644
--- a/crypto/xca/HISTORY
+++ b/crypto/xca/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-20 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.9.1
 
diff --git a/crypto/xmlsec/DEPENDS b/crypto/xmlsec/DEPENDS
index 0479086..1e23556 100755
--- a/crypto/xmlsec/DEPENDS
+++ b/crypto/xmlsec/DEPENDS
@@ -6,12 +6,13 @@ echo &&
 message "You have to pick at least one of the following dependencies!" &&
 optional_depends gnutls  '--with-gnutls=/usr'  '--without-gnutls'  'for 
encrypted communications' &&
 optional_depends nss     '--with-nss=/usr'     '--without-nss'     'for 
encrypted communications' &&
-optional_depends openssl '--with-openssl=/usr' '--without-openssl' 'for 
encrypted communications' &&
+optional_depends SSL '--with-openssl=/usr' '--without-openssl' 'for 
encrypted communications' &&
 
 if ! is_depends_enabled $SPELL gnutls &&
    ! is_depends_enabled $SPELL nss &&
+   ! is_depends_enabled $SPELL libressl &&
    ! is_depends_enabled $SPELL openssl; then
 
-  message "${PROBLEM_COLOR}No backend was chosen, forcing 
openssl!$DEFAULT_COLOR"
-  depends openssl
+  message "${PROBLEM_COLOR}No backend was chosen, forcing SSL!$DEFAULT_COLOR"
+  depends SSL
 fi
diff --git a/crypto/xmlsec/HISTORY b/crypto/xmlsec/HISTORY
index 3718497..d2aacaa 100644
--- a/crypto/xmlsec/HISTORY
+++ b/crypto/xmlsec/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-05-15 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.2.18
 
diff --git a/database/couchdb/DEPENDS b/database/couchdb/DEPENDS
index dda692f..dc8c616 100755
--- a/database/couchdb/DEPENDS
+++ b/database/couchdb/DEPENDS
@@ -1,5 +1,5 @@
 depends erlang &&
 depends icu &&
-depends openssl &&
+depends SSL &&
 depends spidermonkey &&
 depends curl
diff --git a/database/couchdb/HISTORY b/database/couchdb/HISTORY
index ff2df27..3f6c542 100644
--- a/database/couchdb/HISTORY
+++ b/database/couchdb/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-07-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Add http:// to WEB_SITE
 
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index b2ae8be..fa6cba0 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub CXX gcc             &&
 depends libtool                &&
-depends openssl                &&
+depends SSL            &&
 depends libmcrypt      &&
 depends ncurses                &&
 case $FB_VER in
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 2edaea3..63627eb 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/database/firebird25/DEPENDS b/database/firebird25/DEPENDS
index c083810..f8dba23 100755
--- a/database/firebird25/DEPENDS
+++ b/database/firebird25/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub CXX gcc             &&
 depends libtool                &&
-depends openssl                &&
+depends SSL            &&
 depends libmcrypt      &&
 depends ncurses                &&
 depends btyacc          &&
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index a01d82e..1761911 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-03-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.5.2.26540-0
          SECURITY_PATCH++  - fixes CVE-2013-2492
diff --git a/database/libzdb/DEPENDS b/database/libzdb/DEPENDS
index a147fa3..80fc31d 100755
--- a/database/libzdb/DEPENDS
+++ b/database/libzdb/DEPENDS
@@ -1,6 +1,6 @@
 depends flex &&
-optional_depends openssl    '--enable-openssl' \
-                            '--disable-openssl' \
+optional_depends SSL    '--enable-openssl' \
+                            '--disable-SSL' \
                             'crypto and ssl functionality' &&
 optional_depends sqlite     '--with-sqlite=/usr' \
                             '--without-sqlite' \
diff --git a/database/libzdb/HISTORY b/database/libzdb/HISTORY
index 80b0990..28832e1 100644
--- a/database/libzdb/HISTORY
+++ b/database/libzdb/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-10-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.10.6
 
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 8f8e628..ccabcec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -16,7 +16,7 @@ if [[ $MARIADB_BRANCH == 5.5 ]]; then
                    "-DWITH_ZLIB=bundled" \
                    "to use system zlib instead of bundled" &&
 
-  optional_depends openssl \
+  optional_depends SSL \
                    "-DWITH_SSL=system" \
                    "-DWITH_SSL=bundled" \
                    "to use system SSL instead of bundled" &&
@@ -53,7 +53,7 @@ else
                    "" \
                    "to use system libedit instead of bundled" &&
 
-  optional_depends openssl \
+  optional_depends SSL \
                    "--with-ssl" \
                    "--without-ssl" \
                    "for OpenSSL support" &&
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 2bbe891..0afe937 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-06-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.5.38 (5.5 branch)
 
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index fcbdf9f..e3f34c7 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -19,6 +19,6 @@ optional_depends LIBSASL \
                  "" \
                  "for SASL authentication in the client library" &&
 
-optional_depends openssl "--ssl" "" "for OpenSSL support" &&
+optional_depends SSL "--ssl" "" "for OpenSSL support" &&
 optional_depends libpcap "" "" "to build mongosniff utility" &&
 optional_depends distcc "--distcc" "" "to use distcc for distributing builds"
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 2565e94..17b8400 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4.10
        * DEPENDS: added missing dependencies
diff --git a/database/mysql-workbench/DEPENDS 
b/database/mysql-workbench/DEPENDS
index 1c3b7e4..14b7c6b 100755
--- a/database/mysql-workbench/DEPENDS
+++ b/database/mysql-workbench/DEPENDS
@@ -34,7 +34,7 @@ depends libzip           &&
 depends lua51              &&
 depends MYSQL            &&
 depends OPENGL           &&
-depends openssl          &&
+depends SSL          &&
 depends orbit2           &&
 depends pango            &&
 depends pangomm          &&
diff --git a/database/mysql-workbench/HISTORY 
b/database/mysql-workbench/HISTORY
index 5686f18..3f07ab8 100644
--- a/database/mysql-workbench/HISTORY
+++ b/database/mysql-workbench/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
        * DEPENDS: howl -> -sub COMPAT_HOWL avahi
 
diff --git a/database/mysql/DEPENDS b/database/mysql/DEPENDS
index 08b626d..d5a2c6f 100755
--- a/database/mysql/DEPENDS
+++ b/database/mysql/DEPENDS
@@ -4,12 +4,12 @@ depends  procps  &&
 depends -sub CXX gcc     &&
 
 if [[ $OLD == y ]]; then
-  optional_depends openssl \
-                   "--with-openssl" \
-                   "--without-openssl" \
+  optional_depends SSL \
+                   "--with-opennssl" \
+                   "--without-opennssl" \
                    "for OpenSSL support"
 else
-  optional_depends openssl \
+  optional_depends SSL \
                    "--with-ssl" \
                    "--without-ssl" \
                    "for OpenSSL support"
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 21e33a1..b0cc4a7 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,11 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2013-03-22 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD) for
          extra/yassl/taocrypt/src/Makefile.in
diff --git a/database/pgadmin3/DEPENDS b/database/pgadmin3/DEPENDS
index a5aa0c8..c9154fb 100755
--- a/database/pgadmin3/DEPENDS
+++ b/database/pgadmin3/DEPENDS
@@ -2,5 +2,5 @@ depends -sub CXX gcc        &&
 depends libxml2    &&
 depends libxslt    &&
 depends postgresql &&
-depends openssl    &&
+depends SSL    &&
 depends -sub "OGL STC XRC" wxgtk
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 04fbb5b..257ea3d 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.16.1
 
diff --git a/database/postgresql/DEPENDS b/database/postgresql/DEPENDS
index 7ddacb7..7f0ac69 100755
--- a/database/postgresql/DEPENDS
+++ b/database/postgresql/DEPENDS
@@ -43,9 +43,9 @@ optional_depends  readline \
                   "--without-readline" \
                   "for Readline support in psql, the command line interface" 
&&
 
-optional_depends  openssl \
-                  "--with-openssl" \
-                  "--without-openssl" \
+optional_depends  SSL \
+                  "--with-opennssl" \
+                  "--without-opennssl" \
                   "for SSL (encrypted) connection support" &&
 
 optional_depends  libxml2 \
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 19d1648..50a6faf 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-21 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 9.3.4
 
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index dbb12d0..c30f9ac 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlite
-         VERSION=3.8.5
-        VERSIONX=autoconf-3080500
-     
SOURCE_HASH=sha512:e1bb9148070dab712f305f3c1fd18419499199a77bb7b769e4f60f86c0a90e0d554fa878c161d22c2df58e7fefac5ac29b82ee0da972177f9581d296d973d7c3
+         VERSION=3.8.6
+        VERSIONX=autoconf-3080600
+     
SOURCE_HASH=sha512:71cb9427c7d05bcd33b7585824bbcfe6b15b379b6c914eba1ec33c7517be158ee43a7f890db55463b811ec90d8a6b15f12336acba70ba01b39b33ff11a411890
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
           SOURCE=${SPELL}-${VERSIONX}.tar.gz
    SOURCE_URL[0]=http://www.sqlite.org/2014/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index e72650e..2e4fdd4 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2014-08-18 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.8.6
+
 2014-06-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.8.5
 
diff --git a/database/virtuoso/DEPENDS b/database/virtuoso/DEPENDS
index 200b57d..d755e9a 100755
--- a/database/virtuoso/DEPENDS
+++ b/database/virtuoso/DEPENDS
@@ -2,7 +2,7 @@ depends bison    &&
 depends flex     &&
 depends libtool  &&
 depends libgc    '--with-pthreads' &&
-optional_depends openssl     '--enable-openssl'     '--disable-openssl'     
'SSL encryption' &&
+optional_depends SSL     '--enable-openssl'     '--disable-openssl'     'SSL 
encryption' &&
 optional_depends openldap    '--enable-openldap'    '--disable-openldap'    
'LDAP support' &&
 optional_depends LIBSASL     '--enable-krb'         '--disable-krb'         
'Kerberos support' &&
 optional_depends libxml2     '--enable-xml'         '--disable-xml'         
'XML support' &&
diff --git a/database/virtuoso/HISTORY b/database/virtuoso/HISTORY
index 8ba7cc0..5bf1df0 100644
--- a/database/virtuoso/HISTORY
+++ b/database/virtuoso/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 6.1.8
 
diff --git a/devel/android-tools/DEPENDS b/devel/android-tools/DEPENDS
index bb86743..715416f 100755
--- a/devel/android-tools/DEPENDS
+++ b/devel/android-tools/DEPENDS
@@ -1,3 +1,3 @@
 depends zlib &&
-depends openssl &&
+depends SSL &&
 depends libarchive
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index a0e21ae..84053cc 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, init.d/adb, DEPENDS, INSTALL, PRE_BUILD: spell created
        * PRE_BUILD: if systemd is not installed, explicitly set permissions
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index c550596..750be47 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cmake
-         VERSION=3.0.0
-     
SOURCE_HASH=sha512:e8b8098fda7d9db239df0a0151e34eb11f40aa0265386684acfb1aff93b401ad86163c1e13a3197700cf26ab7d284cf0a21caa2e2bfb07a62e9816ba4c15ae90
+         VERSION=3.0.1
+     
SOURCE_HASH=sha512:2ac7f0f37664f851fa440af05ea070a606a6f994bda3d977d3881dee207ba7ccbd3c9f296db7cfff492d3a7b5a6694c91e56896114f622305e8bdb6dbbff6407
               VX=v`echo $VERSION|cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index f3c896a..f7ea97a 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2014-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.0.1
+
 2014-06-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.0.0
 
diff --git a/devel/extra-cmake-modules/DETAILS 
b/devel/extra-cmake-modules/DETAILS
index 229384e..2abdfde 100755
--- a/devel/extra-cmake-modules/DETAILS
+++ b/devel/extra-cmake-modules/DETAILS
@@ -1,7 +1,7 @@
            SPELL=extra-cmake-modules
-         VERSION=1.0.0
-              VX=5.0.0
-     
SOURCE_HASH=sha512:13d07ac94a07b4d2c8c6622b50dc877c7ddf341be91ebd7fa7da34229c8e1b6f54a858040586fa1d3ddd7fa9b7665c530b9ae5da4d7ab62184e880d0c55eef62
+         VERSION=1.1.0
+              VX=5.1.0
+     
SOURCE_HASH=sha512:76947a9ea76611e5f3593b5e60d0f2e102459d6fa85c8e7e21371bcc6d513372dfccd01c9eb021d75f9782942612d27c7ebc97c978838329c1505e2792794353
           SOURCE=$SPELL-$VERSION.tar.xz
       SOURCE_URL=$KDE_URL/stable/frameworks/$VX/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/extra-cmake-modules/HISTORY 
b/devel/extra-cmake-modules/HISTORY
index c6acc95..09f6ce3 100644
--- a/devel/extra-cmake-modules/HISTORY
+++ b/devel/extra-cmake-modules/HISTORY
@@ -1,3 +1,6 @@
+2014-08-10  Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.1.0
+
 2014-07-10  Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.0
 
diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index de40845..30d57a0 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -1,8 +1,8 @@
 depends perl &&
 depends perl-error &&
 
-if [[ $GIT_SHA_OPT == openssl ]]; then
-  depends openssl "--with-openssl"
+if [[ $GIT_SHA_OPT == SSL ]]; then
+  depends SSL "--with-openssl"
 fi &&
 
 if [[ $GIT_SVN == y ]]; then
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index f88e5f8..9c5b680 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,6 +1,6 @@
            SPELL=git
-         VERSION=2.0.2
-     
SOURCE_HASH=sha512:a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2
+         VERSION=2.1.0
+     
SOURCE_HASH=sha512:c6cd5b7ac37d231321160047133d526133a2eeb115acf5ca2041e1970622a838da631a07439a07564c9f2f34a74975daf62b45ed0184e493715e8d4f16c2187e
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.xz
 #         SOURCE2=$SOURCE.sign
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
          SOURCE3=$SPELL-manpages-$VERSION.tar.xz
 #         SOURCE4=$SOURCE3.sign
 #     SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-    
SOURCE3_HASH=sha512:36347ce921d781c230dc1a3e050eda72bc1d9e12177bbc68190b5014ac3ca77828534a930665bb4aa2c3988fff04dcd114a80da54075b150790f702648b99fff
+    
SOURCE3_HASH=sha512:ad5ba305aa464452f424cfda58ed4df63dcd181501a74368f4bfbf8c9d7691775b314922b427daa998ad067fc824665f9d7095a6ace67a4a552f50ca3faeb178
      SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
 #     SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
 #  SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
          SOURCE5=$SPELL-htmldocs-$VERSION.tar.xz
 #         SOURCE6=$SOURCE5.sign
 #     SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-    
SOURCE5_HASH=sha512:c1be70fb78b2c5a95fcf63132e4b5b1a319b3e8373a1291b9d0eea5d19ce16e8691e1ed75a254e535c0093b8b02f3906c6616d5909eb3800b94f00084d4962b0
+    
SOURCE5_HASH=sha512:48b39b7379ea822cdc16e17925885cad230d89df8e74dd67f139ab194f82c6fec8dd45afcfd7875e19f71e837fcdda3ff425881ae5455ddd1a4f3068d324d596
      SOURCE5_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE5
 #     SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
 #  SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index d651d9d..36eae11 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,4 +1,13 @@
-2014-7-18 Treeve Jelbert <treeve AT sourcemage.org>
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.1.0
+
+2014-08-04 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.0.4
+
+2014-07-18 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.2
 
 2014-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/devel/libgc/DETAILS b/devel/libgc/DETAILS
index f833ba2..fd43228 100755
--- a/devel/libgc/DETAILS
+++ b/devel/libgc/DETAILS
@@ -4,9 +4,9 @@
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
           SOURCE=${SPELL/\lib/}-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/\lib/}-$VERSION
-   
SOURCE_URL[0]=http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$SOURCE
-      LICENSE[0]=http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt
-        WEB_SITE=http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+   SOURCE_URL[0]=http://www.hboehm.info/gc/gc_source/${SOURCE}
+      LICENSE[0]=http://www.hboehm.info/gc/license.txt
+        WEB_SITE=http://www.hboehm.info/gc/
         KEYWORDS="devel"
          ENTERED=20030625
            SHORT="A garbage collector for C and C++"
diff --git a/devel/libgc/HISTORY b/devel/libgc/HISTORY
index 9280a25..b19e2a4 100644
--- a/devel/libgc/HISTORY
+++ b/devel/libgc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: fix urls
+
 2012-05-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 7.2
 
diff --git a/devel/polyorb/DEPENDS b/devel/polyorb/DEPENDS
index 84049ed..4d05b45 100755
--- a/devel/polyorb/DEPENDS
+++ b/devel/polyorb/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub ADA gcc    &&
 depends xmlada &&
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "build SSL support and SSL dependent features"
diff --git a/devel/polyorb/HISTORY b/devel/polyorb/HISTORY
index 7885c24..4326c23 100644
--- a/devel/polyorb/HISTORY
+++ b/devel/polyorb/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: versions 2011
 
diff --git a/devel/pyside-tools/DEPENDS b/devel/pyside-tools/DEPENDS
index b6af8cf..9e9537b 100755
--- a/devel/pyside-tools/DEPENDS
+++ b/devel/pyside-tools/DEPENDS
@@ -1,6 +1,6 @@
 depends  cmake    &&
 depends  qt4      &&
-depends  openssl  &&
+depends  SSL  &&
 depends  python   &&
 depends  boost    &&
 depends  pyside   &&
diff --git a/devel/pyside-tools/HISTORY b/devel/pyside-tools/HISTORY
index a72bf04..02f9b40 100644
--- a/devel/pyside-tools/HISTORY
+++ b/devel/pyside-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-09-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.2.13
 
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 25f191e..b8edce6 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -4,7 +4,7 @@ optional_depends sqlite "" "" "for SQLite db support" &&
 optional_depends tk "" "" "for Tk support" &&
 optional_depends ncurses "" "" "for Ncurses support" &&
 optional_depends readline "" "" "for Readline support" &&
-optional_depends openssl "" "" "for SSL support" &&
+optional_depends SSL "" "" "for SSL support" &&
 
 optional_depends libffi "--with-system-ffi" "" "for _ctypes module" &&
 optional_depends expat "--with-system-expat" "" "for XML parser module" &&
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index ad17692..df556e4 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: python website always forwards to https now and the
                   certificate doesn't seem to verify
diff --git a/devel/python3/DEPENDS b/devel/python3/DEPENDS
index 2a5f8a2..b71034f 100755
--- a/devel/python3/DEPENDS
+++ b/devel/python3/DEPENDS
@@ -1,5 +1,6 @@
 depends libffi '--with-system-ffi' &&
 #depends expat "--with-system-expat" &&
+optional_depends SSL  '' '' 'SSL crypto extension' &&
 optional_depends gdbm '' '' 'database support' &&
 optional_depends db "" "" "for Sleepycat db support" &&
 optional_depends sqlite "" "" "for SQLite db support" &&
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 043618f..67be9cc 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,6 @@
+2014-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: add SSL
+
 2014-05-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.4.1
 
diff --git a/devel/radare2/DEPENDS b/devel/radare2/DEPENDS
index b72cf18..740e1b7 100755
--- a/devel/radare2/DEPENDS
+++ b/devel/radare2/DEPENDS
@@ -13,7 +13,7 @@ optional_depends file \
                  "--without-magic" \
                  "for filetype determination support" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "" \
                  "--without-ssl" \
                  "for SSL support" &&
diff --git a/devel/radare2/HISTORY b/devel/radare2/HISTORY
index 5a5cef1..133cb6b 100644
--- a/devel/radare2/HISTORY
+++ b/devel/radare2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51
 
diff --git a/devel/swiprolog/DEPENDS b/devel/swiprolog/DEPENDS
index b003fab..04d9563 100755
--- a/devel/swiprolog/DEPENDS
+++ b/devel/swiprolog/DEPENDS
@@ -12,7 +12,7 @@ optional_depends texlive '' --without-sgml 'for sgml 
package (also depends on ct
 if is_depends_enabled $SPELL texlive; then
        depends ctags
 fi &&
-optional_depends openssl '' --without-ssl 'for ssl package' &&
+optional_depends SSL '' --without-ssl 'for ssl package' &&
 
 # Strictly speaking I'm not sure this depends on JDK - JRE might be 
sufficient, except that my sedit in PRE_BUILD guarentees we need javac anyway
 optional_depends JDK '' --without-jpl 'for jpl package' z-rejected &&
diff --git a/devel/swiprolog/HISTORY b/devel/swiprolog/HISTORY
index 15aca56..fc55a72 100644
--- a/devel/swiprolog/HISTORY
+++ b/devel/swiprolog/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 5.10.5
 
diff --git a/devel/yaz/DEPENDS b/devel/yaz/DEPENDS
index 0c20274..24afec4 100755
--- a/devel/yaz/DEPENDS
+++ b/devel/yaz/DEPENDS
@@ -4,4 +4,4 @@ depends libxml2 &&
 depends libxslt &&
 depends icu     &&
 optional_depends gnutls  '--with-gnutls'  '' 'https support' &&
-optional_depends openssl '--with-openssl' '' 'https support'
+optional_depends SSL '--with-openssl' '' 'https support'
diff --git a/devel/yaz/HISTORY b/devel/yaz/HISTORY
index 1812a81..0cc5645 100644
--- a/devel/yaz/HISTORY
+++ b/devel/yaz/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.0.12
          adjust website & url
diff --git a/disk/avfs/DEPENDS b/disk/avfs/DEPENDS
index d25e86d..e4e5473 100755
--- a/disk/avfs/DEPENDS
+++ b/disk/avfs/DEPENDS
@@ -27,7 +27,7 @@ if list_find "$AVFS_OPTS" "--enable-dav"; then
                    "to use system neon library" &&
 
   if ! is_depends_enabled $SPELL neon; then
-    optional_depends openssl \
+    optional_depends SSL \
                      "--with-ssl=$INSTALL_ROOT/usr" \
                      "--without-ssl" \
                      "for OpenSSL support in dav module" &&
diff --git a/disk/avfs/HISTORY b/disk/avfs/HISTORY
index ee12568..d786615 100644
--- a/disk/avfs/HISTORY
+++ b/disk/avfs/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-07-15 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.1; quoting paths
        * BUILD: added, to use AVFS_OPTS
diff --git a/disk/boxbackup/DEPENDS b/disk/boxbackup/DEPENDS
index a057b7c..657706e 100755
--- a/disk/boxbackup/DEPENDS
+++ b/disk/boxbackup/DEPENDS
@@ -4,4 +4,4 @@ optional_depends "readline" \
                  "--enable-gnu-readline" \
                  "" \
                  "support for line editing" &&
-runtime_depends openssl
+runtime_depends SSL
diff --git a/disk/boxbackup/HISTORY b/disk/boxbackup/HISTORY
index 278deca..90805f0 100644
--- a/disk/boxbackup/HISTORY
+++ b/disk/boxbackup/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-08-25 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.11rc8
          converted to upstream signature checking
diff --git a/disk/dmg2img/DEPENDS b/disk/dmg2img/DEPENDS
index 4081b5b..90bd385 100755
--- a/disk/dmg2img/DEPENDS
+++ b/disk/dmg2img/DEPENDS
@@ -1,3 +1,3 @@
 depends bzip2 &&
 depends zlib &&
-depends openssl
+depends SSL
diff --git a/disk/dmg2img/HISTORY b/disk/dmg2img/HISTORY
index 1d043b4..af9d768 100644
--- a/disk/dmg2img/HISTORY
+++ b/disk/dmg2img/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-02-17 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/disk/dump/DEPENDS b/disk/dump/DEPENDS
index 3172baa..3a31008 100755
--- a/disk/dump/DEPENDS
+++ b/disk/dump/DEPENDS
@@ -4,6 +4,6 @@ optional_depends  readline  "--enable-readline"  
"--disable-readline"  \
                   "for better command-line functionality in restore"   &&
 
 if [[ "$DUMP_RMT" == "--enable-rmt" ]]; then
-  optional_depends  openssl "--enable-ermt"  "--disable-ermt"      \
+  optional_depends  SSL "--enable-ermt"  "--disable-ermt"      \
                     "to build ermt, an encrypting version of rmt"
 fi
diff --git a/disk/dump/HISTORY b/disk/dump/HISTORY
index f1b491b..b99b1f3 100644
--- a/disk/dump/HISTORY
+++ b/disk/dump/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * INSTALL: removed is_depends_enabled.function reference
 
diff --git a/disk/libewf/DEPENDS b/disk/libewf/DEPENDS
index 9418a0d..4194ada 100755
--- a/disk/libewf/DEPENDS
+++ b/disk/libewf/DEPENDS
@@ -1,2 +1,2 @@
-depends  openssl  &&
+depends  SSL  &&
 depends  zlib
diff --git a/disk/libewf/HISTORY b/disk/libewf/HISTORY
index 953fb87..28e3645 100644
--- a/disk/libewf/HISTORY
+++ b/disk/libewf/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 20111015, SOURCE, SOURCE_URL[0] and WEB_SITE updated,
          SOURCE_HINTS[0] removed
diff --git a/disk/netatalk/DEPENDS b/disk/netatalk/DEPENDS
index f5a667d..a47073b 100755
--- a/disk/netatalk/DEPENDS
+++ b/disk/netatalk/DEPENDS
@@ -1,5 +1,5 @@
 depends  db       &&
-depends  openssl  &&
+depends  SSL  &&
 
 optional_depends  tcp_wrappers                                    \
                   "--enable-tcp-wrappers"                         \
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index d2992bf..14846c5 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-12-22 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 2.1.5
 
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 0c79211..fecc6c9 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
            SPELL=partclone
-         VERSION=0.2.71
-     
SOURCE_HASH=sha512:d8ef49e54e14d0f9582d7c7fa5107a47115e07467ac8a3b6dcc97ba07cbb1bfad4c6b3b6a9a8f4ceb9ea6cc48a17f42cd04899709ae2641f3eebac4ba480f8e0
+         VERSION=0.2.72
+     
SOURCE_HASH=sha512:7770e82f7908d632c04f61164631de9a0e3ea42eaf1a7596f5e1a775bb18e8efe669d1b8534089d82c1c83b0086dac5d773cf5b4c46a9186d3123fb0fa99eb42
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 82b241a..ca33cf5 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2014-08-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.2.72
+
 2014-07-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.2.71
 
diff --git a/disk/partimage/DEPENDS b/disk/partimage/DEPENDS
index 28e79ba..c87dc3d 100755
--- a/disk/partimage/DEPENDS
+++ b/disk/partimage/DEPENDS
@@ -8,7 +8,7 @@ optional_depends  gettext                        \
                   "--disable-nls"                \
                   "NLS support"                  &&
 
-optional_depends  openssl                        \
+optional_depends  SSL                        \
                   "--enable-ssl"                 \
                   "--disable-ssl"                \
                   "SSL support for server"       
diff --git a/disk/partimage/HISTORY b/disk/partimage/HISTORY
index 231e0c0..1531d36 100644
--- a/disk/partimage/HISTORY
+++ b/disk/partimage/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/disk/testdisk/DEPENDS b/disk/testdisk/DEPENDS
index 451fa80..b486a8e 100755
--- a/disk/testdisk/DEPENDS
+++ b/disk/testdisk/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends  openssl          '' ''  'encryption support' &&
+optional_depends  SSL          '' ''  'encryption support' &&
 optional_depends  "progsreiserfs"  "" ""  "to list files from ReiserFS 
partition"  &&
 optional_depends  "ntfs-3g"        "" ""  "to list files from NTFS 
partition"      &&
 optional_depends  "JPEG"           "" ""  "to improved JPEG recovery rate"   
      &&
diff --git a/disk/testdisk/HISTORY b/disk/testdisk/HISTORY
index 965fb2a..427b0ba 100644
--- a/disk/testdisk/HISTORY
+++ b/disk/testdisk/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 6.14
 
diff --git a/disk/uif2iso/DEPENDS b/disk/uif2iso/DEPENDS
index c5aa888..3a1abf7 100755
--- a/disk/uif2iso/DEPENDS
+++ b/disk/uif2iso/DEPENDS
@@ -1,3 +1,3 @@
 depends unzip &&
 depends zlib &&
-depends openssl
+depends SSL
diff --git a/disk/uif2iso/HISTORY b/disk/uif2iso/HISTORY
index 0d6f999..85c87d2 100644
--- a/disk/uif2iso/HISTORY
+++ b/disk/uif2iso/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-06-21 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.1.7c
 
diff --git a/disk/whdd/BUILD b/disk/whdd/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/disk/whdd/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/disk/whdd/DEPENDS b/disk/whdd/DEPENDS
new file mode 100755
index 0000000..52c9637
--- /dev/null
+++ b/disk/whdd/DEPENDS
@@ -0,0 +1,9 @@
+depends -sub CXX gcc &&
+depends -sub SHARED dialog &&
+depends ncurses &&
+depends git &&
+depends cmake &&
+optional_depends smartmontools \
+                 "" \
+                 "" \
+                 "to display S.M.A.R.T. information"
diff --git a/disk/whdd/DETAILS b/disk/whdd/DETAILS
new file mode 100755
index 0000000..4120452
--- /dev/null
+++ b/disk/whdd/DETAILS
@@ -0,0 +1,16 @@
+. "$GRIMOIRE/FUNCTIONS"
+           SPELL=whdd
+         VERSION=$(get_scm_version)
+          SOURCE=$SPELL-git.tar.bz2
+   SOURCE_URL[0]=git://github.com/krieger-od/whdd:whdd-git
+  FORCE_DOWNLOAD=on
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+        WEB_SITE=http://whdd.org
+         ENTERED=20140811
+      LICENSE[0]=GPL
+        KEYWORDS="disk"
+           SHORT="WHDD is HDD diagnostic and recovery tool for Linux"
+cat << EOF
+A HDD diagnostic and recovery tool for Linux
+EOF
diff --git a/disk/whdd/HISTORY b/disk/whdd/HISTORY
new file mode 100644
index 0000000..6aa9016
--- /dev/null
+++ b/disk/whdd/HISTORY
@@ -0,0 +1,2 @@
+2014-08-11 Pol Vinogradov <vin.public AT gmail.com>
+       * BUILD, DETAILS, DEPENDS, PREPARE: created spell
diff --git a/disk/whdd/PREPARE b/disk/whdd/PREPARE
new file mode 100755
index 0000000..a68f274
--- /dev/null
+++ b/disk/whdd/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm
diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS
index 1ba7101..6b4741d 100755
--- a/display/qingy/DEPENDS
+++ b/display/qingy/DEPENDS
@@ -1,5 +1,5 @@
-if [[ "$QINGY_CRYPTO" == 'openssl' ]]; then
-  depends openssl
+if [[ "$QINGY_CRYPTO" == 'SSL' ]]; then
+  depends SSL
 elif  [[ "QINGY_CRYPTO" == 'libgcrypt' ]]; then
   depends libgcrypt
 fi  &&
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 105dac4..b690499 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.0.0
 
diff --git a/doc/htmldoc/DEPENDS b/doc/htmldoc/DEPENDS
index 3749447..142579d 100755
--- a/doc/htmldoc/DEPENDS
+++ b/doc/htmldoc/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl                                     &&
+depends SSL                                     &&
 
 optional_depends    "fltk"                          \
                     "--with-gui=yes"                \
diff --git a/doc/htmldoc/HISTORY b/doc/htmldoc/HISTORY
index 7895a39..0ddf5a9 100644
--- a/doc/htmldoc/HISTORY
+++ b/doc/htmldoc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index 638a0e1..dc5db30 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -108,7 +108,7 @@ optional_depends  sdl                                     
                  \
                   "Enable SDL ecore_sdl module?"                            
&&
 
 if [ "$ECORE_CRYPTO" == "gnutls" ]; then
-   depends gnutls "--enable-gnutls --disable-openssl"
-elif [ "$ECORE_CRYPTO" == "openssl" ]; then
-   depends openssl "--enable-openssl --disable-gnutls"
+   depends gnutls "--enable-gnutls --disable-SSL"
+elif [ "$ECORE_CRYPTO" == "SSL" ]; then
+   depends SSL "--enable-openssl --disable-gnutls"
 fi
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index 554b75b..2144f09 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.7.8
 
diff --git a/e-17/eet/DEPENDS b/e-17/eet/DEPENDS
index c5afa2c..d155ca7 100755
--- a/e-17/eet/DEPENDS
+++ b/e-17/eet/DEPENDS
@@ -4,8 +4,8 @@ depends  zlib      &&
 depends  libgcrypt &&
 
 if [ "$EET_CRYPTO" == "gnutls" ]; then
-   depends gnutls "--enable-gnutls --disable-openssl --enable-cipher 
--enable-signature"
-elif [ "$EET_CRYPTO" == "openssl" ]; then
-   depends openssl "--enable-openssl --disable-gnutls --enable-cipher 
--enable-signature"
+   depends gnutls "--enable-gnutls --disable-SSL --enable-cipher 
--enable-signature"
+elif [ "$EET_CRYPTO" == "SSL" ]; then
+   depends SSL "--enable-openssl --disable-gnutls --enable-cipher 
--enable-signature"
 fi
 
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 274abae..219c1c3 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.7.8
 
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 4737789..1f24aaa 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -15,7 +15,7 @@ depends  expat '--with-system-expat'  &&
 depends  libxml2 '--with-system-libxml' &&
 depends  libxslt '--with-system-libxslt' &&
 depends  JPEG  '--with-system-jpeg' &&
-depends  openssl  '--with-system-openssl' &&
+depends  SSL  '--with-system-openssl' &&
 depends  zlib  '--with-system-zlib' &&
 depends  poppler '--with-system-poppler' &&
 depends  curl '--with-system-curl' &&
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 0fadeb4..c2fa4b7 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-08-15 Bor Kraljič <pyrobor AT ver.si>
        * CONFLICTS: it conflicts with libreoffice-bin
 
diff --git a/ftp-libs/dclib/DEPENDS b/ftp-libs/dclib/DEPENDS
index 5be670b..5358441 100755
--- a/ftp-libs/dclib/DEPENDS
+++ b/ftp-libs/dclib/DEPENDS
@@ -1,2 +1,2 @@
 depends  libxml2  &&
-depends  openssl
+depends  SSL
diff --git a/ftp-libs/dclib/HISTORY b/ftp-libs/dclib/HISTORY
index 54f33ce..69ea66b 100644
--- a/ftp-libs/dclib/HISTORY
+++ b/ftp-libs/dclib/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-12-23 Pol Vinogradov <vin.public AT gmail.com>
        * DEPENDS: added openssl
        * PRE_BUILD, dclib-openssl-1.patch: added to build with openssl 1.0
diff --git a/ftp-libs/libtorrent/DEPENDS b/ftp-libs/libtorrent/DEPENDS
index 83a1965..1c5ef73 100755
--- a/ftp-libs/libtorrent/DEPENDS
+++ b/ftp-libs/libtorrent/DEPENDS
@@ -2,4 +2,4 @@ depends  libsigc++3  &&
 depends  automake    &&
 depends  libtool     &&
 
-optional_depends "openssl" "" "--disable-openssl" "Needed for encryption"
+optional_depends "SSL" "" "--disable-openssl" "Needed for encryption"
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index e7fea57..84fd63a 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-06-20 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: version 0.13.3
 
diff --git a/ftp-libs/rb-libtorrent/DEPENDS b/ftp-libs/rb-libtorrent/DEPENDS
index a21b62a..19978a9 100755
--- a/ftp-libs/rb-libtorrent/DEPENDS
+++ b/ftp-libs/rb-libtorrent/DEPENDS
@@ -10,7 +10,7 @@ if list_find "$RB_LIBTORRENT_OPTS" 
"--enable-python-binding"; then
   sub_depends boost PYTHON
 fi &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "" \
                  "" \
                  "for SSL support" &&
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index 30efb63..ec576ab 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2012-06-25 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.16.1
 
diff --git a/ftp/aria2/DEPENDS b/ftp/aria2/DEPENDS
index 75a7626..a295999 100755
--- a/ftp/aria2/DEPENDS
+++ b/ftp/aria2/DEPENDS
@@ -1,10 +1,10 @@
 depends libxml2  &&
 if [[ "$ARIA2_TLS" == "gnutls" ]]
 then
-depends gnutls "--with-gnutls --without-openssl"
-elif [[ "$ARIA2_TLS" == "openssl" ]]
+depends gnutls "--with-gnutls --without-opennssl"
+elif [[ "$ARIA2_TLS" == "SSL" ]]
 then
-depends openssl "--without-gnutls --with-openssl"
+depends SSL "--without-gnutls --with-openssl"
 fi                                                  &&
 optional_depends libgcrypt                          \
                  ""                                 \
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 5b47c45..c253e20 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-02-24 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 1.18.3
          Switched to .xz
diff --git a/ftp/btpd/DEPENDS b/ftp/btpd/DEPENDS
index ed472ed..09706da 100755
--- a/ftp/btpd/DEPENDS
+++ b/ftp/btpd/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/ftp/btpd/HISTORY b/ftp/btpd/HISTORY
index 5a17124..30b5ef5 100644
--- a/ftp/btpd/HISTORY
+++ b/ftp/btpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-08-05 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.16; renewed source url
 
diff --git a/ftp/createtorrent/DEPENDS b/ftp/createtorrent/DEPENDS
index 15601af..c435daa 100755
--- a/ftp/createtorrent/DEPENDS
+++ b/ftp/createtorrent/DEPENDS
@@ -1,2 +1,2 @@
 depends autoconf &&
-depends openssl 
+depends SSL 
diff --git a/ftp/createtorrent/HISTORY b/ftp/createtorrent/HISTORY
index 7bee25e..e190a23 100644
--- a/ftp/createtorrent/HISTORY
+++ b/ftp/createtorrent/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-09-06 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 1.1.4
        * DEPENDS, PRE_BUILD: fix building with openssl (needs autoreconf)
diff --git a/ftp/ctorrent/DEPENDS b/ftp/ctorrent/DEPENDS
index a70b5cf..2ed1572 100755
--- a/ftp/ctorrent/DEPENDS
+++ b/ftp/ctorrent/DEPENDS
@@ -1 +1 @@
-depends  openssl
+depends  SSL
diff --git a/ftp/ctorrent/HISTORY b/ftp/ctorrent/HISTORY
index 977a24c..0803f0e 100644
--- a/ftp/ctorrent/HISTORY
+++ b/ftp/ctorrent/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-05-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Switched to Enhanced CTorrent, mentioned by CTorrent's 
current
          non-maintainer
diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
index 5c046dd..95f5f02 100755
--- a/ftp/curl/BUILD
+++ b/ftp/curl/BUILD
@@ -1,7 +1,3 @@
-if [[ "$CURL_SSL" == "none" ]]; then
-   OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
-fi &&
-
 if [[ "$CFLAGS" != "${CFLAGS//-DPIC/}" ]]; then
   CFLAGS="${CFLAGS//-DPIC/}" &&
   CPPFLAGS="$CPPFLAGS -DPIC "
diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE
index b865856..308a954 100755
--- a/ftp/curl/CONFIGURE
+++ b/ftp/curl/CONFIGURE
@@ -1 +1 @@
-config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls 
nss polarssl
+config_query_list CURL_SSL "Which SSL lib do you want?" none libressl 
openssl gnutls nss polarssl
diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index c7be810..db721df 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -1,30 +1,35 @@
 depends  zlib  &&
 
-if [[ "$CURL_SSL" == "gnutls" ]]; then
+case $CURL_SSL in
+ gnutls)
      depends  gnutls     \
      "--with-gnutls \
-      --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
-      --without-ssl --without-nss --without-polarssl" &&
-     depends ca-certificates
-elif [[ "$CURL_SSL" == "openssl" ]]; then
-     depends  openssl         \
+      --without-ssl --without-nss --without-polarssl"
+     ;;
+ libressl | openssl)
+     depends  SSL         \
      "--with-ssl \
-      --without-ca-bundle \
-      --with-ca-path=$INSTALL_ROOT/etc/ssl/certs \
-      --without-gnutls --without-nss --without-polarssl"  &&
-      depends ca-certificates
-elif [[ "$CURL_SSL" == "nss" ]]; then
+      --without-gnutls --without-nss --without-polarssl"
+     ;;
+ nss) 
      depends  -sub PEM nss         \
      "--with-nss \
-      --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
-      --without-gnutls --without-ssl --without-polarssl"  &&
-     depends ca-certificates
-elif [[ "$CURL_SSL" == "polarssl" ]]; then
+      --without-gnutls --without-ssl --without-polarssl"
+     ;;
+ polarssl)
      depends  polarssl     \
      "--with-polarssl \
-      --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
-      --without-ssl --without-nss --without-gnutls" &&
-     depends ca-certificates
+      --without-ssl --without-nss --without-gnutls"
+     ;;
+ none)
+   OPTS+=" --without-gnutls --without-nss --without-ssl"
+    ;;
+esac &&
+
+if [[ "$CURL_SSL" == "none" ]]; then
+   OPTS+="  --without-ca-bundle"
+else
+  depends ca-certificates 
"--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt"
 fi &&
 
 optional_depends  krb5   \
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index e9d27e8..0838d6c 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,11 @@
+2014-08-23  Treeve Jelbert <treeve AT sourcemage.org>
+        * CONFIGURE, DEPENDS, BUILD: also support libressl, cleanup
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2013-12-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 7.34.0
         SECURITY_PATCH++, fix CVE-2013-4545
diff --git a/ftp/dctc/DEPENDS b/ftp/dctc/DEPENDS
index ea21df6..68f2385 100755
--- a/ftp/dctc/DEPENDS
+++ b/ftp/dctc/DEPENDS
@@ -1,9 +1,9 @@
-if [[ "x${DCTC_MD4}" == "xopenssl" ]]; then
-   depends openssl 
+if [[ "x${DCTC_MD4}" == "xSSL" ]]; then
+   depends SSL 
 elif [[ "x${DCTC_MD4}" == "xlibgcrypt" ]]; then
    depends libgcrypt 
 else
-   depends openssl &&
+   depends SSL &&
    depends libgcrypt 
 fi &&
 depends  gcc34 &&
diff --git a/ftp/dctc/HISTORY b/ftp/dctc/HISTORY
index c8c58a9..4b4001a 100644
--- a/ftp/dctc/HISTORY
+++ b/ftp/dctc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-11-20 Mathieu Lonjaret <lejatorn AT sourcemage.org>
        * DEPENDS, CONFIGURE: fixed bug 12219: depend on openssl or
        * libgcrypt for md4.
diff --git a/ftp/deluge/DEPENDS b/ftp/deluge/DEPENDS
index 818eff0..0e57fcd 100755
--- a/ftp/deluge/DEPENDS
+++ b/ftp/deluge/DEPENDS
@@ -1,5 +1,5 @@
 depends dbus-python &&
-depends openssl &&
+depends SSL &&
 depends pyxdg &&
 depends zlib &&
 depends boost &&
diff --git a/ftp/deluge/HISTORY b/ftp/deluge/HISTORY
index a7aa453..75bafdd 100644
--- a/ftp/deluge/HISTORY
+++ b/ftp/deluge/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 1.3.5
        * DEPENDS: pygtk2 & librsvg2 should really be optional
diff --git a/ftp/gftp/DEPENDS b/ftp/gftp/DEPENDS
index cd203a5..4a9da07 100755
--- a/ftp/gftp/DEPENDS
+++ b/ftp/gftp/DEPENDS
@@ -1,6 +1,6 @@
 depends gtk+2 &&
 
-optional_depends openssl \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
+optional_depends SSL \
+                 "--enable-SSL" \
+                 "--disable-SSL" \
                  "for SSL support"
diff --git a/ftp/gftp/HISTORY b/ftp/gftp/HISTORY
index 0cf9ab1..e49825b 100644
--- a/ftp/gftp/HISTORY
+++ b/ftp/gftp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added openssl as opt dep
 
diff --git a/ftp/lftp/DEPENDS b/ftp/lftp/DEPENDS
index 494c47b..fe7b97b 100755
--- a/ftp/lftp/DEPENDS
+++ b/ftp/lftp/DEPENDS
@@ -5,9 +5,9 @@ optional_depends  gnutls               \
                   '--with-gnutls'      \
                   '--without-gnutls'   \
                   'for encrypted communications support using GNUTLS' &&
-optional_depends  openssl              \
-                  '--with-openssl'     \
-                  '--without-openssl'  \
+optional_depends  SSL              \
+                  '--with-opennssl'     \
+                  '--without-opennssl'  \
                   'for encrypted communications support using OpenSSL' &&
 optional_depends  expat  \
                   ''     \
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 53f6572..23891e2 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4.4.15
 
diff --git a/ftp/proftpd/DEPENDS b/ftp/proftpd/DEPENDS
index 0d30e92..203f7bb 100755
--- a/ftp/proftpd/DEPENDS
+++ b/ftp/proftpd/DEPENDS
@@ -40,11 +40,11 @@ if list_find "$PROFTPD_MODS" "mod_wrap" || list_find 
"$PROFTPD_MODS" "mod_wrap2"
 fi &&
 
 if list_find "$PROFTPD_MODS" "mod_tls" || list_find "$PROFTPD_MODS" 
"mod_sftp" || list_find "$PROFTPD_MODS" "mod_sql_passwd"; then
-  depends openssl '--enable-openssl'
+  depends SSL '--enable-openssl'
 else
-  optional_depends openssl \
-                   "--enable-openssl" \
-                   "--disable-openssl" \
+  optional_depends SSL \
+                   "--enable-SSL" \
+                   "--disable-SSL" \
                    "for OpenSSL support"
 fi &&
 
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index f506e2d..c023499 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.3.5
        * CONFIGURE: added new modules, moved mod_deflate to DEPENDS
diff --git a/ftp/pure-ftpd/DEPENDS b/ftp/pure-ftpd/DEPENDS
index 8f93cfd..808fdc4 100755
--- a/ftp/pure-ftpd/DEPENDS
+++ b/ftp/pure-ftpd/DEPENDS
@@ -18,7 +18,7 @@ optional_depends  openldap                    \
                   "--without-ldap"            \
                   "for openldap user accounts"  &&
 
-optional_depends  openssl                \
+optional_depends  SSL                \
                   "--with-tls"           \
                   "--without-tls"        \
                   "for SSL/TLS support"
diff --git a/ftp/pure-ftpd/HISTORY b/ftp/pure-ftpd/HISTORY
index c66e72a..c0d1453 100644
--- a/ftp/pure-ftpd/HISTORY
+++ b/ftp/pure-ftpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.0.32
 
diff --git a/ftp/tnftp/DEPENDS b/ftp/tnftp/DEPENDS
index c2c2bc6..6a5d03f 100755
--- a/ftp/tnftp/DEPENDS
+++ b/ftp/tnftp/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-ssl" \
                  "--disable-ssl" \
                  "for SSL support" &&
diff --git a/ftp/tnftp/HISTORY b/ftp/tnftp/HISTORY
index 57a51b2..bc11e2a 100644
--- a/ftp/tnftp/HISTORY
+++ b/ftp/tnftp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 20130505
        * DEPENDS: added openssl optional dependency
diff --git a/ftp/transmission/DEPENDS b/ftp/transmission/DEPENDS
index 07057b8..8cb62ae 100755
--- a/ftp/transmission/DEPENDS
+++ b/ftp/transmission/DEPENDS
@@ -1,6 +1,6 @@
 . "$GRIMOIRE/FUNCTIONS" &&
 
-depends openssl  &&
+depends SSL  &&
 depends intltool &&
 depends curl     &&
 depends libevent &&
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 3037940..37e8574 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.84; SECURITY_PATCH++
 
diff --git a/ftp/vsftpd/DEPENDS b/ftp/vsftpd/DEPENDS
index 4e2d82c..41f6be7 100755
--- a/ftp/vsftpd/DEPENDS
+++ b/ftp/vsftpd/DEPENDS
@@ -1,6 +1,6 @@
 depends libcap &&
 
 optional_depends  tcp_wrappers  ""  ""  "for filtering network services"  &&
-optional_depends  openssl       ""  ""  "for SSL encryption"              &&
+optional_depends  SSL       ""  ""  "for SSL encryption"              &&
 optional_depends  linux-pam     ""  ""  "for security"
 
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index b49d466..3a3228d 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-02-27 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 2.3.4
 
diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE
index 98c06e0..834161a 100755
--- a/ftp/wget/CONFIGURE
+++ b/ftp/wget/CONFIGURE
@@ -1,4 +1,4 @@
-config_query_list WGET_SSL "Which SSL backend do you want for https and 
ftps?" none gnutls openssl &&
+config_query_list WGET_SSL "Which SSL backend do you want for https and 
ftps?" none gnutls SSL &&
 
 config_query_option WGET_OPTS "Enable IPv6 support?" y \
                     "--enable-ipv6" "--disable-ipv6"
diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index fefc43b..a8512ee 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -19,15 +19,10 @@ optional_depends  "texinfo"             \
 case $WGET_SSL in
   none)
   ;;
-  gnutls) depends gnutls "--with-ssl=gnutls"
+    gnutls) depends gnutls "--with-ssl=gnutls"
   ;;
-  openssl) depends openssl "--with-ssl=openssl"
+  SSL)
+    depends SSL "--with-ssl=openssl" &&
+    optional_depends  ca-certificates '' ''  'provides security certificates'
   ;;
 esac
-
-if is_depends_enabled $SPELL openssl ; then
-optional_depends  ca-certificates       \
-                  ""                    \
-                  ""                    \
-                  "provides security certificates"
-fi
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index e14aa28..e5277f0 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,12 @@
+2014-08-23  Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS, CONFIGURE: fix libressl support
+       * SUB_DEPENDS, PRE_SUB_DEPENDS: tweak
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.15
        * PRE_BUILD, wget-1.14-perl-5.18-pod-fixes.diff: deleted
diff --git a/ftp/wget/PRE_SUB_DEPENDS b/ftp/wget/PRE_SUB_DEPENDS
index be2be9d..6988cdb 100755
--- a/ftp/wget/PRE_SUB_DEPENDS
+++ b/ftp/wget/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-    SSL) if is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL 
gnutls; then
+    SSL) if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) || 
is_depends_enabled $SPELL gnutls; then
          return 0
          fi
          ;;
diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS
index 0c45289..a086a33 100755
--- a/ftp/wget/SUB_DEPENDS
+++ b/ftp/wget/SUB_DEPENDS
@@ -1,11 +1,11 @@
 case $THIS_SUB_DEPENDS in
     SSL) message "wget with SSL backend is requested, forcing it" &&
          persistent_remove WGET_SSL &&
-         config_query_list WGET_SSL "Which SSL backend do you want for https 
and ftps?" gnutls openssl &&
+         config_query_list WGET_SSL "Which SSL backend do you want for https 
and ftps?" gnutls SSL &&
          case $WGET_SSL in
            gnutls)  depends gnutls "--with-ssl=gnutls"
            ;;
-           openssl) depends openssl "--with-ssl=openssl"
+           SSL) depends SSL "--with-ssl=openssl"
            ;;
          esac
          ;;
diff --git a/gnome2-apps/balsa/DEPENDS b/gnome2-apps/balsa/DEPENDS
index b855176..d7d5f1e 100755
--- a/gnome2-apps/balsa/DEPENDS
+++ b/gnome2-apps/balsa/DEPENDS
@@ -15,7 +15,7 @@ optional_depends pcre                                       
      \
                  "--disable-pcre"                                 \
                  "to enable perl compatible regular expressions"  &&
 
-optional_depends openssl                                          \
+optional_depends SSL                                          \
                  "--with-ssl"                                     \
                  "--without-ssl"                                  \
                  "to enable opensasl authentication for POP/IMAP" &&
diff --git a/gnome2-apps/balsa/HISTORY b/gnome2-apps/balsa/HISTORY
index 5c25718..4aec774 100644
--- a/gnome2-apps/balsa/HISTORY
+++ b/gnome2-apps/balsa/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-03-03 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 2.5.0
        * CONFIGURE: added to select html renderer
diff --git a/gnome2-apps/homebank/DETAILS b/gnome2-apps/homebank/DETAILS
index 9156087..00e858c 100755
--- a/gnome2-apps/homebank/DETAILS
+++ b/gnome2-apps/homebank/DETAILS
@@ -1,9 +1,10 @@
            SPELL=homebank
-         VERSION=4.6.2
+         VERSION=4.6.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=http://homebank.free.fr/public/${SOURCE}
-     
SOURCE_HASH=sha512:1628926871d6289e8e6460cbdf72037f6d9984f599c3946b465f2c5bf67d5e40065ffb9b2dfda77c50a4a21b264ac1438bc644ea653d77f7a0bf75cc76e764e1
+     
SOURCE_HASH=sha512:aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        DOC_DIRS=""
         WEB_SITE=http://homebank.free.fr/
          ENTERED=20060624
       LICENSE[0]=GPL
diff --git a/gnome2-apps/homebank/HISTORY b/gnome2-apps/homebank/HISTORY
index 62e4b7b..7264f19 100644
--- a/gnome2-apps/homebank/HISTORY
+++ b/gnome2-apps/homebank/HISTORY
@@ -1,3 +1,6 @@
+2014-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.6.3; don't duplicate docs
+
 2014-08-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.6.2
 
diff --git a/gnome2-apps/mail-notification/DEPENDS 
b/gnome2-apps/mail-notification/DEPENDS
index 8e27e1a..bffb749 100755
--- a/gnome2-apps/mail-notification/DEPENDS
+++ b/gnome2-apps/mail-notification/DEPENDS
@@ -5,7 +5,7 @@ optional_depends "gmime" \
                  "" \
                  "" \
                  "for gmime support" &&
-optional_depends "openssl" \
+optional_depends "SSL" \
                  "" \
                  "" \
                  "for ssl support" &&
diff --git a/gnome2-apps/mail-notification/HISTORY 
b/gnome2-apps/mail-notification/HISTORY
index ddbca12..2c94d34 100644
--- a/gnome2-apps/mail-notification/HISTORY
+++ b/gnome2-apps/mail-notification/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: updated to 5.3
        * BUILD, INSTALL: added for new build system
diff --git a/gnome2-libs/evolution-webcal/DEPENDS 
b/gnome2-libs/evolution-webcal/DEPENDS
index 0e4a525..329154c 100755
--- a/gnome2-libs/evolution-webcal/DEPENDS
+++ b/gnome2-libs/evolution-webcal/DEPENDS
@@ -5,6 +5,6 @@ depends libgnomeui            &&
 depends gnome-keyring         &&
 depends libsoup               &&
 depends evolution-data-server &&
-depends openssl               &&
+depends SSL               &&
 depends expat
 
diff --git a/gnome2-libs/evolution-webcal/HISTORY 
b/gnome2-libs/evolution-webcal/HISTORY
index 119d7aa..d7a347e 100644
--- a/gnome2-libs/evolution-webcal/HISTORY
+++ b/gnome2-libs/evolution-webcal/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
        * DETAILS: updated spell to 2.32.0
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 3222ed1..943f247 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,12 +1,12 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.41.1
-     
SOURCE_HASH=sha512:992b01416f712efc9e851ffa1341a829aa38be73da656e1b17371e59b8310e4b90eafa2da1ca7a1d5911f5ef74ee972a1db436c854b8c101bdf13b22067b3770
+         VERSION=2.41.2
+     
SOURCE_HASH=sha512:2247a7074a4bcd7100e84ee4d392be4487d06de5da8fc5c8bd4a8a278449986558c34a9deb383b489b82f2cc000b89067460a0191fcf45a73509a49a3f25eacd
           SOURCE=glib-$VERSION.tar.xz
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
-         VERSION=2.41.1
-     
SOURCE_HASH=sha512:992b01416f712efc9e851ffa1341a829aa38be73da656e1b17371e59b8310e4b90eafa2da1ca7a1d5911f5ef74ee972a1db436c854b8c101bdf13b22067b3770
+         VERSION=2.41.2
+     
SOURCE_HASH=sha512:2247a7074a4bcd7100e84ee4d392be4487d06de5da8fc5c8bd4a8a278449986558c34a9deb383b489b82f2cc000b89067460a0191fcf45a73509a49a3f25eacd
   SECURITY_PATCH=1
           SOURCE=glib-$VERSION.tar.xz
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 39b6879..1212d78 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: 2.41.2
+
 2014-07-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.41.1
 
diff --git a/gnome2-libs/gnome-python2/DEPENDS 
b/gnome2-libs/gnome-python2/DEPENDS
index b249b63..52641d4 100755
--- a/gnome2-libs/gnome-python2/DEPENDS
+++ b/gnome2-libs/gnome-python2/DEPENDS
@@ -91,7 +91,7 @@ depends libxinerama &&
 depends libxml2 &&
 depends libxrandr &&
 depends libxrender &&
-depends openssl &&
+depends SSL &&
 depends orbit2 &&
 depends pango &&
 depends pcre &&
diff --git a/gnome2-libs/gnome-python2/HISTORY 
b/gnome2-libs/gnome-python2/HISTORY
index e217730..ba7dfd9 100644
--- a/gnome2-libs/gnome-python2/HISTORY
+++ b/gnome2-libs/gnome-python2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: added dependencies on atk, bzip2, cairo, dbus, dbus-glib, 
expat,
          fontconfig, freetype2, gdk-pixbuf2, glib2, gtk+2, harfbuzz, icu,
diff --git a/gnome2-libs/gnome-vfs2/DEPENDS b/gnome2-libs/gnome-vfs2/DEPENDS
index 9c807fd..0eb467f 100755
--- a/gnome2-libs/gnome-vfs2/DEPENDS
+++ b/gnome2-libs/gnome-vfs2/DEPENDS
@@ -5,10 +5,10 @@ depends  shared-mime-info    &&
 depends  desktop-file-utils  &&
 depends  dbus-glib           &&
 
-if    [  "$GNOME_VFS_CRYPTO"  ==  "openssl"  ];  then
-  depends  openssl  '--enable-openssl  --disable-gnutls'
+if    [  "$GNOME_VFS_CRYPTO"  ==  "SSL"  ];  then
+  depends  SSL  '--enable-openssl  --disable-gnutls'
 elif  [  "$GNOME_VFS_CRYPTO"  ==  "gnutls"   ];  then
-  depends  gnutls  '--disable-openssl  --enable-gnutls'
+  depends  gnutls  '--disable-SSL  --enable-gnutls'
 fi  &&
 
 optional_depends  neon \
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index ec478b0..c073d27 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Fix compilation with newer glib2
 
diff --git a/gnome2-libs/libgnomecups/DEPENDS 
b/gnome2-libs/libgnomecups/DEPENDS
index 8bb4a36..fc2c245 100755
--- a/gnome2-libs/libgnomecups/DEPENDS
+++ b/gnome2-libs/libgnomecups/DEPENDS
@@ -1,4 +1,4 @@
 depends glib2 &&
 depends CUPS  &&
-depends openssl 
+depends SSL 
 
diff --git a/gnome2-libs/libgnomecups/HISTORY 
b/gnome2-libs/libgnomecups/HISTORY
index 1f1ead6..c7bb14f 100644
--- a/gnome2-libs/libgnomecups/HISTORY
+++ b/gnome2-libs/libgnomecups/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-07-08 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 0.2.3
          fixed WEB_SITE
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 2d09026..cb614d3 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pango
-         VERSION=1.36.5
-     
SOURCE_HASH=sha512:d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c
+         VERSION=1.36.6
+     
SOURCE_HASH=sha512:1345e236059f03cc110adc8a3d6a0fc5565d6fed5f90463f18a672ed82826941fa2dac3a9e9c7d24676e03ff5fcfef091696fbef683c51560989b8224e7637a2
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 9a9fc24..48c2f83 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2014-08-17 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.36.6
+
 2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.36.5
 
diff --git a/gnome3-libs/libgda5/DEPENDS b/gnome3-libs/libgda5/DEPENDS
index 8ad7501..8e61442 100755
--- a/gnome3-libs/libgda5/DEPENDS
+++ b/gnome3-libs/libgda5/DEPENDS
@@ -105,7 +105,7 @@ optional_depends JAVA \
                  "--without-java --without-jni" \
                  "Locate Java's client libraries?" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-crypto" \
                  "--disable-crypto" \
                  "Enable SQLCipher database provider?" &&
diff --git a/gnome3-libs/libgda5/HISTORY b/gnome3-libs/libgda5/HISTORY
index a7594d7..735921e 100644
--- a/gnome3-libs/libgda5/HISTORY
+++ b/gnome3-libs/libgda5/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-01-25 Robin Cook <rcook AT wyrms.net>
        * DEPENDS: change gtksourceview to gtksourceview3
          changed goocanvas to goocanvas2; added mdbtools, vala, java, 
openssl,
diff --git a/gnustep-libs/gnustep-base/DEPENDS 
b/gnustep-libs/gnustep-base/DEPENDS
index 66e8458..24237ce 100755
--- a/gnustep-libs/gnustep-base/DEPENDS
+++ b/gnustep-libs/gnustep-base/DEPENDS
@@ -6,9 +6,9 @@ optional_depends icu \
                  "--enable-icu"                \
                  "--disable-icu"               \
                  "Enable utf-8 support."       &&
-optional_depends openssl                       \
-                 "--enable-openssl"            \
-                 "--disable-openssl"           \
+optional_depends SSL                       \
+                 "--enable-SSL"            \
+                 "--disable-SSL"           \
                  "Enable ssl crypto support."  &&
 optional_depends gmp                           \
                  ""                            \
diff --git a/gnustep-libs/gnustep-base/HISTORY 
b/gnustep-libs/gnustep-base/HISTORY
index 6859721..1ba022b 100644
--- a/gnustep-libs/gnustep-base/HISTORY
+++ b/gnustep-libs/gnustep-base/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.24.6
 
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index c27f5ee..89abce2 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    
SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.9.33
-     
SOURCE_HASH=sha512:00f6f59edf15342ea29e789c7d40e6d398915b6cd072bd78b088c030b95c75bc58e3ed5ae2f60911632169dcba0b303e5ea01816185f506d6db2485069800443
+         VERSION=0.9.35
+     
SOURCE_HASH=sha512:843555b33a5cfb96a909f14a558818a10fa59b70e5284e749c96ec0273fc17b59d535fba314992e8b6713fddfcf3cb96826e5420e88a251e5d39802fd07aadc1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index dca6584..6bb1f5b 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2014-08-17 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.9.35
+
 2014-07-31 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.33
 
diff --git a/graphics/graphicsmagick/BUILD b/graphics/graphicsmagick/BUILD
index 112d93c..828939f 100755
--- a/graphics/graphicsmagick/BUILD
+++ b/graphics/graphicsmagick/BUILD
@@ -1,4 +1,5 @@
-OPTS="--enable-shared ${OPTS}"  &&
+OPTS="--enable-shared ${OPTS}"       &&
+OPTS="$GRAPHICSMAGICK_16BIT ${OPTS}" &&
 
 if [[ $GM_SNAP != y ]]
 then
diff --git a/graphics/graphicsmagick/CONFIGURE 
b/graphics/graphicsmagick/CONFIGURE
new file mode 100755
index 0000000..aef77d0
--- /dev/null
+++ b/graphics/graphicsmagick/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option GRAPHICSMAGICK_16BIT "Enable 16 bit pixel pipeline?" y \
+                    "--with-quantum-depth=16" "--with-quantum-depth=8"
+
diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index 277d6e5..c9e1f6b 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -6,8 +6,8 @@
 #          SOURCE=GraphicsMagick-${VERSION}.tar.bz2
 #   
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
 #else
-         VERSION=1.3.18
-     
SOURCE_HASH=sha512:c04dbca467d2ac94d9c47818c7087954ceb54a736fdd062be6d499319037f4bbca3a779542d8acad262b59cb599521f895177574a21975f496ba57061b64b960
+         VERSION=1.3.19
+     
SOURCE_HASH=sha512:cdfbdc75356ade5037eab836739e7e59156d8b3555112d350f25e47072142e19d47ea9da718d93e40fd864c5bb88810737c078d6fbee9950b964f49519881f6e
           SOURCE=GraphicsMagick-${VERSION}.tar.xz
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
 #fi
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 48db7d8..4f0c60b 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,8 @@
+2013-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.3.19
+       * CONFIGURE, BUILD, SUB_DEPENDS, PRE_SUB_DEPENDS: add option for
+         building graphicsmagick with 16 bit pipeline
+
 2013-06-14 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: fix X11 dependency (missing space), remove
          --disable-ltdl-install, which is not recognized
diff --git a/graphics/graphicsmagick/PRE_SUB_DEPENDS 
b/graphics/graphicsmagick/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..afaf962
--- /dev/null
+++ b/graphics/graphicsmagick/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+   16BIT) if [ $GRAPHICSMAGICK_16BIT == "--with-quantum-depth=16" ]; then 
return 0; fi;;
+esac
+return 1
+
diff --git a/graphics/graphicsmagick/SUB_DEPENDS 
b/graphics/graphicsmagick/SUB_DEPENDS
new file mode 100755
index 0000000..b3c60c6
--- /dev/null
+++ b/graphics/graphicsmagick/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+   16BIT) echo "16 bit pipeline required, forcing it."      &&
+             GRAPHICSMAGICK_16BIT="--with-quantum-depth=16" ;;
+   *) echo "unknown sub-depends!"; return 1         ;;
+esac
+
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index 90e6b70..fcd68a1 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,13 +1,9 @@
            SPELL=inkscape
-         VERSION=0.48.4
+         VERSION=0.48.5
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
-     
SOURCE_HASH=sha512:55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be
-#      SOURCE_GPG=Ted_Gould.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+   
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418
         WEB_SITE=http://www.inkscape.org/
          ENTERED=20031207
   SECURITY_PATCH=2
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index c0d81e5..b6cd58b 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2014-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.48.5
+
 2013-09-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: depends only on specific boost lib and headers (iostreams)
        * INSTALL: added, to fix multijob install
diff --git a/graphics/inkscape/Ted_Gould.gpg b/graphics/inkscape/Ted_Gould.gpg
deleted file mode 100644
index 3698ee9..0000000
Binary files a/graphics/inkscape/Ted_Gould.gpg and /dev/null differ
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index dec3143..73e7143 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -9,13 +9,13 @@ if [[ $LENSFUN_BRANCH == scm ]]; then
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
 else
-         VERSION=0.2.7
-     
SOURCE_HASH=sha512:0df48ef824bd562065cc1eaf611870ab526cd64a32f99947f1f1c0c633280f4fc2f248d38da65dc0627d399085da4c35c938a42a64753976c8dfb5fbd97c96f2
+         VERSION=0.2.8
+     
SOURCE_HASH=sha512:46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${VERSION}/${SOURCE}
 fi
-        WEB_SITE=http://lensfun.berlios.de/
+        WEB_SITE=http://lensfun.sourceforge.net/
       LICENSE[0]=GPL
          ENTERED=20080607
         KEYWORDS="photo"
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index 0db8d3a..fa633d1 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,6 @@
+2014-08-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.2.8, fix WEB_SITE
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/http/apache-mod_ssl/DEPENDS b/http/apache-mod_ssl/DEPENDS
index f133f0b..15e8e11 100755
--- a/http/apache-mod_ssl/DEPENDS
+++ b/http/apache-mod_ssl/DEPENDS
@@ -1,5 +1,5 @@
 depends  mm                              &&
-depends  openssl  '--enable-module=ssl'  &&
+depends  SSL  '--enable-module=ssl'  &&
 
 optional_depends  db                          \
                   "--enable-module=auth_db"   \
diff --git a/http/apache-mod_ssl/HISTORY b/http/apache-mod_ssl/HISTORY
index f40cf52..7f623b9 100644
--- a/http/apache-mod_ssl/HISTORY
+++ b/http/apache-mod_ssl/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
        * CONFLICTS: check spell_ok before persistent_read
                     correct conflicts to apache1 and httpd-dev
diff --git a/http/apache2/DEPENDS b/http/apache2/DEPENDS
index 96dfd65..2a562dd 100755
--- a/http/apache2/DEPENDS
+++ b/http/apache2/DEPENDS
@@ -1,7 +1,7 @@
 depends  apr0       "--with-apr=${INSTALL_ROOT}/usr"       &&
 depends  apr-util0  "--with-apr-util=${INSTALL_ROOT}/usr"  &&
 
-optional_depends  openssl                \
+optional_depends  SSL                \
                   '--enable-ssl'         \
                   '--disable-ssl'        \
                   'for SSL/TLS support'
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 8974576..e2ef5dd 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
        * CONFLICTS: check spell_ok before persistent_read
                     correct conflicts to apache1 and httpd-dev
diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index 4bcae3c..588737c 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -5,7 +5,7 @@ if echo "$OPTS" | grep -Eq "enable-(authnz-)?ldap"; then
   depends -sub LDAP apr-util
 fi &&
 
-optional_depends  openssl                \
+optional_depends  SSL                \
                   '--enable-ssl'         \
                   '--disable-ssl'        \
                   'for SSL/TLS support'  &&
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index ec5b87c..f750e10 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-03-28 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.2.27; SECURITY_PATCH++ (CVE-2013-6438,
          CVE-2014-0098)
diff --git a/http/cadaver/DEPENDS b/http/cadaver/DEPENDS
index 3d764ba..a0cef80 100755
--- a/http/cadaver/DEPENDS
+++ b/http/cadaver/DEPENDS
@@ -6,13 +6,13 @@ optional_depends -sub DAV neon \
 if ! is_depends_enabled $SPELL neon; then
   config_query_list CADAVER_SSL "Which SSL backend do you want for SSL 
support?" \
                                 none \
-                                openssl \
+                                SSL \
                                 gnutls &&
 
   case $CADAVER_SSL in
     none) OPTS="--without-ssl $OPTS"
     ;;
-    openssl) depends openssl "--with-ssl=openssl"
+    SSL) depends openssl "--with-ssl=openssl"
     ;;
     gnutls) depends gnutls "--with-ssl=gnutls"
     ;;
diff --git a/http/cadaver/HISTORY b/http/cadaver/HISTORY
index 1ef7e1c..d354f5e 100644
--- a/http/cadaver/HISTORY
+++ b/http/cadaver/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: use DAV subdependency from neon
        * CONFIGURE: ssl & xml options don't make any sense when system neon
diff --git a/http/cherokee/DEPENDS b/http/cherokee/DEPENDS
index 1200073..c112785 100755
--- a/http/cherokee/DEPENDS
+++ b/http/cherokee/DEPENDS
@@ -1,7 +1,7 @@
 optional_depends LIBAVCODEC '' '' 'video codec' &&
 optional_depends pcre "" "" "regular expression support" &&
 optional_depends spawn-fcgi "" "" "Ruby On Rails Wizard support" &&
-optional_depends openssl \
+optional_depends SSL \
                  "--without-libssl" \
                  "--with-libssl" \
                  "support secure connections"
diff --git a/http/cherokee/HISTORY b/http/cherokee/HISTORY
index 32f74fd..b1a5c50 100644
--- a/http/cherokee/HISTORY
+++ b/http/cherokee/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-01-16 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 1.0.16
 
diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index 07697ef..1761065 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -7,7 +7,7 @@ fi &&
 
 depends  fltk      &&
 depends  wget      &&
-optional_depends  "openssl"                 \
+optional_depends  "SSL"                 \
                   "--enable-ssl"            \
                   "--disable-ssl"           \
                   "for SSL support"  &&
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 71e580d..9541a9b 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/http/dillo2/DEPENDS b/http/dillo2/DEPENDS
index f7694de..de4eace 100755
--- a/http/dillo2/DEPENDS
+++ b/http/dillo2/DEPENDS
@@ -8,11 +8,11 @@ depends  fltk2     &&
 depends  wget      &&
 
 if [[ "$DILLO2_SSL" == "y" && "$DILLO2_CVS" == "n" ]]; then
-    depends  "openssl"
+    depends  "SSL"
 fi &&
 
 if [[ "$DILLO2_CVS" == "y" ]]; then
-    optional_depends  "openssl"                 \
+    optional_depends  "SSL"                 \
                   "--enable-ssl"            \
                   "--disable-ssl"           \
                   "for SSL support"
diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
index acc4eab..3911f3a 100644
--- a/http/dillo2/HISTORY
+++ b/http/dillo2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/http/elinks/DEPENDS b/http/elinks/DEPENDS
index 4b7aea5..dc260ca 100755
--- a/http/elinks/DEPENDS
+++ b/http/elinks/DEPENDS
@@ -8,9 +8,9 @@ optional_depends bzip2 \
                  "--without-bzlib" \
                  "for BZIP2 compression support" &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "encryption for HTTPS" &&
 
 optional_depends libx11 \
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index e85d260..2f42d6c 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/http/elog/DEPENDS b/http/elog/DEPENDS
index 6147863..8d51a59 100755
--- a/http/elog/DEPENDS
+++ b/http/elog/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "USE_SSL=1" \
                  "USE_SSL=" \
                  "HTTPS support"
diff --git a/http/elog/HISTORY b/http/elog/HISTORY
index f529cce..b3554ba 100644
--- a/http/elog/HISTORY
+++ b/http/elog/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-04-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: updated spell to 2.7.6-1
        * Makefile.diff: removed, upstream accepted modifications
diff --git a/http/esehttpd/DEPENDS b/http/esehttpd/DEPENDS
index 5807d41..ec5d0bf 100755
--- a/http/esehttpd/DEPENDS
+++ b/http/esehttpd/DEPENDS
@@ -1,2 +1,2 @@
-depends  openssl  &&
+depends  SSL  &&
 optional_depends  RUBY  "--with-ruby"  "--without-ruby"  "Enables builtin 
ruby enterpreter"
diff --git a/http/esehttpd/HISTORY b/http/esehttpd/HISTORY
index 088c50e..4ddb4f0 100644
--- a/http/esehttpd/HISTORY
+++ b/http/esehttpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 44e5860..f336165 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -101,7 +101,7 @@ optional_depends libssh                                   
  \
                  "--disable-ssh"                            \
                  "Enable using SSH for network communication"  &&
 
-optional_depends openssl                                    \
+optional_depends SSL                                    \
                  "--enable-ssl"                             \
                  "--disable-ssl"                            \
                  "Enable using OpenSSL directly"            &&
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 6044ba4..40ff85e 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: giflib => GIFLIB
 
diff --git a/http/httpd-dev/DEPENDS b/http/httpd-dev/DEPENDS
index ab7168b..34bfbee 100755
--- a/http/httpd-dev/DEPENDS
+++ b/http/httpd-dev/DEPENDS
@@ -10,7 +10,7 @@ optional_depends db                                         
         \
                  '   --with-berkeley-db'                             \
                  '--without-berkeley-db'                             \
                  'for Berkeley DB database as authentication source' &&
-optional_depends openssl                        \
+optional_depends SSL                        \
                  ' --enable-ssl'                \
                  '--disable-ssl'                \
                  'for SSL-enabled HTTP serving' &&
diff --git a/http/httpd-dev/HISTORY b/http/httpd-dev/HISTORY
index 1a3c215..8d262d9 100644
--- a/http/httpd-dev/HISTORY
+++ b/http/httpd-dev/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
        CONFLICTS: added apache22 and xshttpd
 
diff --git a/http/lighttpd/DEPENDS b/http/lighttpd/DEPENDS
index 89e7abd..37856d3 100755
--- a/http/lighttpd/DEPENDS
+++ b/http/lighttpd/DEPENDS
@@ -10,8 +10,8 @@ optional_depends bzip2 \
 optional_depends openldap \
                  '--with-ldap' '--without-ldap' \
                  'for OpenLDAP support' &&
-optional_depends openssl \
-                 '--with-openssl' '--without-openssl' \
+optional_depends SSL \
+                 '--with-opennssl' '--without-openssl' \
                  'for OpenSSL support' &&
 optional_depends MYSQL \
                  '--with-mysql' '--without-mysql' \
@@ -22,7 +22,7 @@ optional_depends gdbm \
 optional_depends FAM \
                  '--with-fam' '--without-fam' \
                  'to reduce number of stat() calls' &&
-optional_depends lua51 \
+optional_depends LUA \
                  '--with-lua' '--without-lua' \
                  'lua engine for mod_cml'  &&
 optional_depends libmemcache \
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index fba5fd5..68a0383 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,14 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-03 Vlad Glagolev <stealth AT sourcemage.org>
+       * PRE_BUILD: apply patch
+       * DEPENDS: lua51 -> LUA
+       * lua52.patch: added, to support both lua 5.1 and 5.2
+
 2014-07-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added libev optional dependency
 
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
index 264cfb4..829cec6 100755
--- a/http/lighttpd/PRE_BUILD
+++ b/http/lighttpd/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p0 < "$SPELL_DIRECTORY/lua52.patch" &&
+
 if [[ $LIGHTTPD_EXTAUTH == y ]]; then
   patch -p0 < "$SPELL_DIRECTORY/external_auth_program-1.4.25.patch"
 fi &&
diff --git a/http/lighttpd/lua52.patch b/http/lighttpd/lua52.patch
new file mode 100644
index 0000000..7d4913e
--- /dev/null
+++ b/http/lighttpd/lua52.patch
@@ -0,0 +1,75 @@
+--- src/mod_cml_lua.c.orig     2012-10-22 06:17:17.418886286 -0700
++++ src/mod_cml_lua.c  2012-10-22 06:25:50.289753316 -0700
+@@ -28,6 +28,10 @@
+ #include <lualib.h>
+ #include <lauxlib.h>
+ 
++#if LUA_VERSION_NUM >= 502
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
++#endif
++
+ typedef struct {
+       stream st;
+       int done;
+@@ -285,7 +285,11 @@
+       lua_settable(L, LUA_GLOBALSINDEX);
+ 
+       /* load lua program */
++#if LUA_VERSION_NUM >= 502
++      if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) 
{
++#else
+       if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
++#endif
+               log_error_write(srv, __FILE__, __LINE__, "s",
+                               lua_tostring(L,-1));
+
+--- src/mod_magnet.c.orig      2014-03-06 18:08:00.000000000 +0400
++++ src/mod_magnet.c   2014-08-04 00:28:43.515720829 +0400
+@@ -24,6 +24,10 @@
+ #define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
+ #define MAGNET_RESTART_REQUEST      99
+ 
++#if LUA_VERSION_NUM >= 502
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
++#endif
++
+ /* plugin config for all request/connections */
+ 
+ static jmp_buf exceptionjmp;
+@@ -691,7 +695,11 @@
+        * get the environment of the function
+        */
+ 
++#if LUA_VERSION_NUM >= 502
++      lua_getupvalue(L, -1, 1); /* -1 is the function, _ENV is the first 
upvalue of a chunk */
++#else
+       lua_getfenv(L, -1); /* -1 is the function */
++#endif
+ 
+       /* lighty.header */
+ 
+@@ -741,7 +749,11 @@
+        */
+ 
+       force_assert(lua_isfunction(L, -1));
++#if LUA_VERSION_NUM >= 502
++      lua_getupvalue(L, -1, 1); /* -1 is the function, _ENV is the first 
upvalue of a chunk */
++#else
+       lua_getfenv(L, -1); /* -1 is the function */
++#endif
+ 
+       lua_getfield(L, -1, "lighty"); /* lighty.* from the env  */
+       force_assert(lua_istable(L, -1));
+@@ -990,8 +1002,11 @@
+       lua_setfield(L, -2, "__index"); /* { __index = _G }          (sp -= 
1) */
+       lua_setmetatable(L, -2); /* setmetatable({}, {__index = _G}) (sp -= 
1) */
+ 
+-
++#if LUA_VERSION_NUM >= 502
++      lua_setupvalue(L, -2, 1); /* on the stack should be a modified env 
(sp -= 1), _ENV is the first upvalue of a chunk */
++#else
+       lua_setfenv(L, -2); /* on the stack should be a modified env (sp -= 
1) */
++#endif
+ 
+       errfunc = push_traceback(L, 0);
+       if (lua_pcall(L, 0, 1, errfunc)) {
diff --git a/http/links-twibright/DEPENDS b/http/links-twibright/DEPENDS
index ff7a585..c63dd1c 100755
--- a/http/links-twibright/DEPENDS
+++ b/http/links-twibright/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends  openssl \
+optional_depends  SSL \
                   "--with-ssl=$INSTALL_ROOT/usr" \
                   "--without-ssl" \
                   "to support secure HTTP (https://)" &&
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 94fd3ec..368a64b 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-29 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.8
 
diff --git a/http/links/DEPENDS b/http/links/DEPENDS
index 1be1b52..735f282 100755
--- a/http/links/DEPENDS
+++ b/http/links/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "encryption for HTTPS"
diff --git a/http/links/HISTORY b/http/links/HISTORY
index b7d4aa9..0d7a8de 100644
--- a/http/links/HISTORY
+++ b/http/links/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-06-28 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.00, fixed short desc, website, added kw
        * DEPENDS: cleaned up
diff --git a/http/lynx/DEPENDS b/http/lynx/DEPENDS
index 1d0f864..c21449d 100755
--- a/http/lynx/DEPENDS
+++ b/http/lynx/DEPENDS
@@ -5,7 +5,7 @@ optional_depends gettext \
                  "--disable-nls" \
                  "for Native Language Support" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-ssl" \
                  "--without-ssl" \
                  "for HTTPS support via OpenSSL" &&
diff --git a/http/lynx/HISTORY b/http/lynx/HISTORY
index 2d8b721..cbeaa22 100644
--- a/http/lynx/HISTORY
+++ b/http/lynx/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.8.8rel1
 
diff --git a/http/middleman/DEPENDS b/http/middleman/DEPENDS
index 71f187d..c748ccc 100755
--- a/http/middleman/DEPENDS
+++ b/http/middleman/DEPENDS
@@ -6,7 +6,7 @@ optional_depends  zlib                             \
                   '--disable-zlib'                 \
                   'for GZip and Deflate encoding'  &&
 
-optional_depends  openssl            \
+optional_depends  SSL            \
                   '--enable-ssl'     \
                   '--disable-ssl'    \
                   'for SSL support'  &&
diff --git a/http/middleman/HISTORY b/http/middleman/HISTORY
index f399e3c..878ae02 100644
--- a/http/middleman/HISTORY
+++ b/http/middleman/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/http/netsurf/DEPENDS b/http/netsurf/DEPENDS
index 788f1e5..47f48b7 100755
--- a/http/netsurf/DEPENDS
+++ b/http/netsurf/DEPENDS
@@ -6,7 +6,7 @@ depends freetype2 &&
 depends curl &&
 depends re2c &&
 depends lemon &&
-depends openssl &&
+depends SSL &&
 depends hubbub &&
 #optional
 optional_depends libnsbmp \
diff --git a/http/netsurf/HISTORY b/http/netsurf/HISTORY
index 3a563fc..080f538 100644
--- a/http/netsurf/HISTORY
+++ b/http/netsurf/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/http/nginx/DEPENDS b/http/nginx/DEPENDS
index 5bcac0c..5065f49 100755
--- a/http/nginx/DEPENDS
+++ b/http/nginx/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl "--with-http_ssl_module" &&
+depends SSL "--with-http_ssl_module" &&
 
 optional_depends pcre \
                  "--with-pcre" \
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 18a681d..0a19720 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * init.d/nginx: fixed logic bug
diff --git a/http/pavuk/DEPENDS b/http/pavuk/DEPENDS
index ecf9c3b..fda1dfa 100755
--- a/http/pavuk/DEPENDS
+++ b/http/pavuk/DEPENDS
@@ -1,7 +1,7 @@
 depends  db       &&
 depends  gettext  &&
 depends  zlib     &&
-optional_depends  "openssl"  ""  ""  "for https connections"  &&
+optional_depends  "SSL"  ""  ""  "for https connections"  &&
 
 optional_depends  gtk+                           \
                   "--enable-gtk --disable-gtk2"  \
diff --git a/http/pavuk/HISTORY b/http/pavuk/HISTORY
index fb876b2..1194188 100644
--- a/http/pavuk/HISTORY
+++ b/http/pavuk/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2007-02-22 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.9.35
 
diff --git a/http/serf/DEPENDS b/http/serf/DEPENDS
index 81751bd..ec2ab96b 100755
--- a/http/serf/DEPENDS
+++ b/http/serf/DEPENDS
@@ -1,6 +1,6 @@
 depends  scons    &&
 depends  apr      &&
 depends  apr-util &&
-depends  openssl  &&
+depends  SSL  &&
 depends  zlib
 
diff --git a/http/serf/HISTORY b/http/serf/HISTORY
index 1b5a94b..6fd433c 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.3.6
 
diff --git a/http/siege/DEPENDS b/http/siege/DEPENDS
index 0777c28..3409aec 100755
--- a/http/siege/DEPENDS
+++ b/http/siege/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "--with-ssl" \
                  "--without-ssl" \
                  "for HTTPS support"
diff --git a/http/siege/HISTORY b/http/siege/HISTORY
index ae3400d..415ed3e 100644
--- a/http/siege/HISTORY
+++ b/http/siege/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-03-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.78
 
diff --git a/http/squid/DEPENDS b/http/squid/DEPENDS
index ae4d476..44dd6c6 100755
--- a/http/squid/DEPENDS
+++ b/http/squid/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends  openssl                                        \
+optional_depends  SSL                                        \
                   "--enable-ssl"                                 \
                   ""                                             \
                   "Enable ssl gatewaying support using OpenSSL"  &&
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 9c87922..952450b 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-02-10 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 3.1.19
 
diff --git a/http/w3c-libwww/DEPENDS b/http/w3c-libwww/DEPENDS
index 41c8205..efaf1c8 100755
--- a/http/w3c-libwww/DEPENDS
+++ b/http/w3c-libwww/DEPENDS
@@ -1,6 +1,6 @@
 optional_depends  "zlib"       "--with-zlib=z" "--without-zlib"   "for zlib 
compression"  &&
 optional_depends  "MYSQL"      "--with-mysql"  "--without-mysql"  "for mysql 
access"      &&
-optional_depends  "openssl"    "--with-ssl"    "--without-ssl"    "for SSL 
support"
+optional_depends  "SSL"    "--with-ssl"    "--without-ssl"    "for SSL 
support"
 
 # expat breaks liboop
 #optional_depends  "expat"      "--with-expat"  "--without-expat"  "for 
expat XML parsing support"
diff --git a/http/w3c-libwww/HISTORY b/http/w3c-libwww/HISTORY
index d5f9354..3fba7fb 100644
--- a/http/w3c-libwww/HISTORY
+++ b/http/w3c-libwww/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/http/w3m/DEPENDS b/http/w3m/DEPENDS
index 7c2f541..cc0dc38 100755
--- a/http/w3m/DEPENDS
+++ b/http/w3m/DEPENDS
@@ -13,7 +13,7 @@ optional_depends  compface                              \
                   "--enable-xface"                      \
                   "--disable-xface"                     \
                   "Enable XFace support?"               &&
-optional_depends  openssl                               \
+optional_depends  SSL                               \
                   "--with-ssl=/usr"                     \
                   "--without-ssl"                       \
                   "Enable HTTPS support?"
diff --git a/http/w3m/HISTORY b/http/w3m/HISTORY
index af9dab5..9cee52b 100644
--- a/http/w3m/HISTORY
+++ b/http/w3m/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD: fix build failure with recent libgc
 
diff --git a/http/webcleaner/DEPENDS b/http/webcleaner/DEPENDS
index 6ad542f..c6e7981 100755
--- a/http/webcleaner/DEPENDS
+++ b/http/webcleaner/DEPENDS
@@ -3,7 +3,7 @@ optional_depends  pillow     "" "" "to process images"        
&&
 optional_depends  pycrypto   "" "" "for NTLM authentication"  &&
 optional_depends  docutils   "" "" "to build documentation"   &&
 #depends  simpletal  &&
-optional_depends  pyopenssl  "" "" "for SSL connections"      &&
+optional_depends  pySSL  "" "" "for SSL connections"      &&
 #depends  MOZILLA-BROWSER  &&
 
 optional_depends  clamav     "" "" "for antivirus support"
diff --git a/http/webcleaner/HISTORY b/http/webcleaner/HISTORY
index 8f67947..f4687af 100644
--- a/http/webcleaner/HISTORY
+++ b/http/webcleaner/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: pil -> pillow
 
diff --git a/http/wt/DEPENDS b/http/wt/DEPENDS
index a0637ec..9120a6e 100755
--- a/http/wt/DEPENDS
+++ b/http/wt/DEPENDS
@@ -17,7 +17,7 @@ optional_depends zlib \
        "" \
        "for compression over HTTP in wthttpd" &&
 
-optional_depends openssl \
+optional_depends SSL \
        "" \
        "" \
        "HTTPS support in wthttpd" &&
diff --git a/http/wt/HISTORY b/http/wt/HISTORY
index 49bec47..101bfd6 100644
--- a/http/wt/HISTORY
+++ b/http/wt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/http/xshttpd/DEPENDS b/http/xshttpd/DEPENDS
index fb393b1..e853a84 100755
--- a/http/xshttpd/DEPENDS
+++ b/http/xshttpd/DEPENDS
@@ -1,5 +1,5 @@
 if [[ $XSHTTPD_BRANCH == "devel" || $XSHTTPD_SSL == "--with-ssl" ]]; then
-  depends openssl
+  depends SSL
 fi &&
 
 optional_depends pcre \
diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 5017731..b01d783 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-10-10 Bor Kraljič <pyrobor AT ver.si>
        * johnas.gpg: added key 355F8408 from subkeys.pgp.net
 
diff --git a/java/icedtea7/DEPENDS b/java/icedtea7/DEPENDS
index 429a14d..b461241 100755
--- a/java/icedtea7/DEPENDS
+++ b/java/icedtea7/DEPENDS
@@ -13,7 +13,7 @@ depends ca-certificates  &&
 depends ant              &&
 depends perl             &&
 depends libxslt          &&
-depends openssl          &&
+depends SSL          &&
 depends attr             &&
 depends cpio             &&
 depends alsa-lib         &&
diff --git a/java/icedtea7/HISTORY b/java/icedtea7/HISTORY
index 5d11aa1..bd2304b 100644
--- a/java/icedtea7/HISTORY
+++ b/java/icedtea7/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: giflib => GIFLIB
 
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index ee9d9b0..f16d10a 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=digikam4
           SPELLX=${SPELL//4}
-         VERSION=3.3.0
-     
SOURCE_HASH=sha512:1044540fb7059586a1638a7076df4b740e3166651cdc692541d3023fc44d5719b0354bd9e13dfc18f38215e7849855c3a814dc65ce48a633a780409eef34d5ba
+         VERSION=4.2.0
+     
SOURCE_HASH=sha512:ff9442360a343beff1643ef95f4dcff81e764a03cf18d8de800b45ca19b0a3727e59916ca0613cf4977c8e19ebc87f3f6682a48d5ab78b313b1d0189fbaa1169
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/digikam/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index ab98a0b..a2642aa 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 4.2.0
+
 2013-08-07 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.3.0
 
diff --git a/kde4-support/phonon-backend-gstreamer/DETAILS 
b/kde4-support/phonon-backend-gstreamer/DETAILS
index 3a3939b..9bd801b 100755
--- a/kde4-support/phonon-backend-gstreamer/DETAILS
+++ b/kde4-support/phonon-backend-gstreamer/DETAILS
@@ -1,6 +1,6 @@
            SPELL=phonon-backend-gstreamer
-         VERSION=4.6.3
-     
SOURCE_HASH=sha512:819b4ac7b2193f4d32f160ffb1fb22f702e66ed9de3d6bdf818e238dfcdf88fbf974abc85f9d65c5da589bf413a525a1cd8131097b49354ebc255e90a813dbbc
+         VERSION=4.7.2
+     
SOURCE_HASH=sha512:d8cf408261f80de7ac29101c3613002a0e838f07e6c8dad2d3922a522a27be167ef8f17a8ab0c99c06c1b75cb4d9d68acee03cb60cf4a44dc2248b7b0dafae08
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY 
b/kde4-support/phonon-backend-gstreamer/HISTORY
index 044c3cd..3267b39 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 4.7.2
+
 2013-02-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.6.3
 
diff --git a/kde4-support/phonon-backend-vlc/DETAILS 
b/kde4-support/phonon-backend-vlc/DETAILS
index c370db8..a317376 100755
--- a/kde4-support/phonon-backend-vlc/DETAILS
+++ b/kde4-support/phonon-backend-vlc/DETAILS
@@ -1,8 +1,8 @@
            SPELL=phonon-backend-vlc
-         VERSION=0.6.2
-     
SOURCE_HASH=sha512:1ae699b5b912ef2f76803c389858ab8b22ff7896912c5b859b0e77bc87eba9a4b79dcd5e20291ae161a0834683dedd3b39bd47db9788ef790a9ba5b4a3fe52f2
+         VERSION=0.7.2
+     
SOURCE_HASH=sha512:9a2b45d02ed958f82ff4fb8d3e9233eeb35047670061b59266fa7504855a149de1a401cad34871083e42c8d05620ff0e3df9f1a7a3e1f9b82ddac886c50adfce
           SOURCE=$SPELL-$VERSION.tar.xz
-   SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://phonon.kde.org/
       LICENSE[0]=LGPL
diff --git a/kde4-support/phonon-backend-vlc/HISTORY 
b/kde4-support/phonon-backend-vlc/HISTORY
index 36de0ee..90e13cc 100644
--- a/kde4-support/phonon-backend-vlc/HISTORY
+++ b/kde4-support/phonon-backend-vlc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.7.2, SOURCE_URL[0] updated
+
 2013-02-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.2, SOURCE_URL[0] updated
 
diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS
index e2ce503..6cddfb3 100755
--- a/kde4-support/phonon/DETAILS
+++ b/kde4-support/phonon/DETAILS
@@ -11,10 +11,10 @@ fi
    SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
 else
-         VERSION=4.6.0
-     
SOURCE_HASH=sha512:d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d
+         VERSION=4.7.2
+     
SOURCE_HASH=sha512:b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5
           SOURCE=$SPELL-$VERSION.tar.xz
-   SOURCE_URL[0]=$KDE_URL/stable/phonon/$VERSION/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/stable/phonon/$VERSION/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
         WEB_SITE=http://phonon.kde.org/
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index e42d35f..b6cc17e 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 4.7.2, SOURCE_URL[0] updated
+
 2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * INSTALL: create symlink so backends are found
 
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 53269f3..c005d77 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -8,7 +8,7 @@ depends phonon        &&
 depends desktop-file-utils  &&
 depends dbus             &&
 depends pkgconfig        &&
-depends openssl          &&
+depends SSL          &&
 depends pcre             &&
 depends strigi           &&
 depends -sub "QT4" strigi &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 37fbd55..b8d5a12 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-10-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: giflib =>  GIFLIB
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index f959998..0651168 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,12 @@
+2014-08-14 Ladislav Hagara <hgr AT vabo.cz>
+       * latest.defaults: LATEST_maintenance_patches_3=patch-3.16.1
+       * info/patches/maintenance_patches_3/patch-3.16.1: added
+
+2014-08-04 Ladislav Hagara <hgr AT vabo.cz>
+       * latest.defaults: LATEST_maintenance_patches_3=3.16, LATEST_3=3.16
+       * info/kernels/3.16: added
+       * info/patches/maintenance_patches_3/patch-3.16: added
+
 2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
        * latest.defaults: LATEST_maintenance_patches_3=patch-3.15.8
        * info/patches/maintenance_patches_3/patch-3.15.8: added
diff --git a/kernels/linux/info/kernels/3.16 b/kernels/linux/info/kernels/3.16
new file mode 100755
index 0000000..23accc3
--- /dev/null
+++ b/kernels/linux/info/kernels/3.16
@@ -0,0 +1,5 @@
+version="3.16"
+source="linux-${version}.tar.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.16 
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16
new file mode 100755
index 0000000..43b4dc9
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16
@@ -0,0 +1,5 @@
+patchversion="3.16.0"
+source=""
+source_url=""
+appliedkernels="3.16"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.1 
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.1
new file mode 100755
index 0000000..c61250c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.1
@@ -0,0 +1,5 @@
+appliedkernels="3.16"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3760cd4a0fc0692ecc2c44367344d2b37f2ebfbb"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 591c5ba..46988c8 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.15
+LATEST_3=3.16
 LATEST_2_6=2.6.39
 LATEST_PRE_2_6=patch-2.6.39
 LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.15.8
+LATEST_maintenance_patches_3=patch-3.16.1
 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/libs/asio/DEPENDS b/libs/asio/DEPENDS
index 3540721..8b89ca8 100755
--- a/libs/asio/DEPENDS
+++ b/libs/asio/DEPENDS
@@ -1,2 +1,2 @@
 depends -sub CXX gcc     &&
-depends openssl
+depends SSL
diff --git a/libs/asio/HISTORY b/libs/asio/HISTORY
index dcf4237..9e10483 100644
--- a/libs/asio/HISTORY
+++ b/libs/asio/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.10.1
 
diff --git a/libs/boost/CONFIGURE b/libs/boost/CONFIGURE
index 17954e5..155edce 100755
--- a/libs/boost/CONFIGURE
+++ b/libs/boost/CONFIGURE
@@ -3,9 +3,12 @@ config_query BOOST_SELECT_LIBS "Select individual boost 
libraries to build?" n &
 if [[ "${BOOST_SELECT_LIBS}" == "y" ]]; then
 config_query_multi BOOST_LIBS_AL "Which boost libraries would you like to 
install?" \
                               none \
+                              align \
+                              assert \
                               atomic \
                               chrono \
                               context \
+                              core \
                               coroutine \
                               date_time \
                               exception \
@@ -13,6 +16,7 @@ config_query_multi BOOST_LIBS_AL "Which boost libraries 
would you like to instal
                               graph \
                               graph_parallel \
                               iostreams \
+                              lexical_cast \
                               locale \
                               log &&
 config_query_multi BOOST_LIBS_MZ "Which additional boost libraries would you 
like to install?"   \
@@ -28,7 +32,9 @@ config_query_multi BOOST_LIBS_MZ "Which additional boost 
libraries would you lik
                               system \
                               test \
                               thread \
+                              throw_exception \
                               timer \
+                              type_index \
                               wave 
 fi &&
 config_query_list BOOST_VARIANT "What variant of boost do you want?"         
\
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 558e4cd..4f12a11 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
            SPELL=boost
-         VERSION=1_55_0
-     
SOURCE_HASH=sha512:dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041
+         VERSION=1_56_0
+     
SOURCE_HASH=sha512:1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e
   SECURITY_PATCH=1
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=${SPELL}_${VERSION}.tar.bz2
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 27af465..2a5c4f7 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,9 @@
+2014-07-10 Treeeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1_56_0
+       * SUB_DEPENDS, PRE_SUB_DEPENDS, CONFIGURE: add new libraries
+       * PRE_BUILD: do not apply patch
+       * boost-use-cxxflags.patch: deleted
+
 2013-11-14 Treeeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1_55_0
        * PRE_BUILD: do not apply atomic patch
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index bfcc95a..7052fb6 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -1,8 +1,4 @@
 default_pre_build &&
-message "${MESSAGE_COLOR}Allow providing our own 
CXXFLAGS...${DEFAULT_COLOR}" &&
-patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
-      $SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
-
 cd $SOURCE_DIRECTORY &&
 if is_depends_enabled $SPELL python3;then
   sed -i 's/python$/&3/;s/sys.prefix/(&)/' bootstrap.sh
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index 631c798..87b424c 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -16,19 +16,29 @@ case $THIS_SUB_DEPENDS in
                     is_depends_enabled $SPELL python3 ;;
             SYSTEM) list_find "$BOOST_LIBS_MZ" system           ;;
             THREAD) list_find "$BOOST_LIBS_MZ" thread           ;;
-            ATOMIC) list_find "$BOOST_LIBS_AL" atomic           ;;
             CHRONO) list_find "$BOOST_LIBS_AL" chrono           ;;
            CONTEXT) list_find "$BOOST_LIBS_AL" context          ;;
-         COROUTINE) list_find "$BOOST_LIBS_AL" coroutine        ;;
              GRAPH) list_find "$BOOST_LIBS_AL" graph            ;;
              REGEX) list_find "$BOOST_LIBS_MZ" regex            ;;
               TEST) list_find "$BOOST_LIBS_MZ" test             ;;
               WAVE) list_find "$BOOST_LIBS_MZ" wave             ;;
                MPI) list_find "$BOOST_LIBS_MZ" mpi              ;;
             LOCALE) list_find "$BOOST_LIBS_AL" locale           ;;
-               LOG) list_find "$BOOST_LIBS_AL" log              ;;
              TIMER) list_find "$BOOST_LIBS_MZ" timer            ;;
               MATH) list_find "$BOOST_LIBS_MZ" math             ;;
+# boost-1.53
+            ATOMIC) list_find "$BOOST_LIBS_AL" atomic           ;;
+         COROUTINE) list_find "$BOOST_LIBS_AL" coroutine        ;;
+# boost-1.54
+               LOG) list_find "$BOOST_LIBS_AL" log              ;;
+# boost-1.55
+# boost-1.56
+            ALIGN)  list_find "$BOOST_LIBS_AL" align           ;;
+            ASSERT) list_find "$BOOST_LIBS_AL" assert          ;;
+            CORE)   list_find "$BOOST_LIBS_AL" core            ;;
+            LEXICAL_CAST)    list_find "$BOOST_LIBS_AL" lexical_cast ;;
+            THROW_EXCEPTION) list_find "$BOOST_LIBS_MZ" throw_exception  ;;
+            TYPE_INDEX)      list_find "$BOOST_LIBS_MZ" type_index  ;;
 *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index a1574b0..6d5fd3d 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -14,19 +14,29 @@ case $THIS_SUB_DEPENDS in
                     depends PYTHON                       ;;
             SYSTEM) list_add BOOST_LIBS_MZ system           ;;
             THREAD) list_add BOOST_LIBS_MZ thread           ;;
-            ATOMIC) list_add BOOST_LIBS_AL atomic           ;;
             CHRONO) list_add BOOST_LIBS_AL chrono           ;;
            CONTEXT) list_add BOOST_LIBS_AL context          ;;
-         COROUTINE) list_add BOOST_LIBS_AL coroutine        ;;
              GRAPH) list_add BOOST_LIBS_AL graph            ;;
              REGEX) list_add BOOST_LIBS_MZ regex            ;;
               TEST) list_add BOOST_LIBS_MZ test             ;;
               WAVE) list_add BOOST_LIBS_MZ wave             ;;
                MPI) list_add BOOST_LIBS_MZ mpi              ;;
             LOCALE) list_add BOOST_LIBS_AL locale           ;;
-               LOG) list_add BOOST_LIBS_AL log              ;;
              TIMER) list_add BOOST_LIBS_MZ timer            ;;
               MATH) list_add BOOST_LIBS_MZ math             ;;
+# boost-1.53
+            ATOMIC) list_add BOOST_LIBS_AL atomic           ;;
+         COROUTINE) list_add BOOST_LIBS_AL coroutine        ;;
+# boost-1.54
+               LOG) list_add BOOST_LIBS_AL log              ;;
+# boost-1.55
+# boost-1.56
+            ALIGN)  list_add BOOST_LIBS_AL align           ;;
+            ASSERT) list_add BOOST_LIBS_AL assert          ;;
+            CORE)   list_add BOOST_LIBS_AL core            ;;
+            LEXICAL_CAST)    list_add BOOST_LIBS_AL lexical_cast ;;
+            THROW_EXCEPTION) list_add BOOST_LIBS_MZ throw_exception  ;;
+            TYPE_INDEX)      list_add BOOST_LIBS_MZ type_index  ;;
 *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/libs/boost/boost-use-cxxflags.patch 
b/libs/boost/boost-use-cxxflags.patch
deleted file mode 100644
index 5da4d25..0000000
--- a/libs/boost/boost-use-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# From 
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
-#
-diff -p -up boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~ 
boost_1_39_0/tools/build/v2/tools/gcc.jam
---- boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~        2009-01-14 
15:31:12.000000000 +0100
-+++ boost_1_39_0/tools/build/v2/tools/gcc.jam  2009-07-17 18:12:20.000000000 
+0200
-@@ -298,8 +298,9 @@ generators.override gcc.compile.c++.pch 
- toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
- 
- # Declare flags and action for compilation.
-+local CXXFLAGS = [ os.environ BOOST_BUILD_PATH ] ;
- toolset.flags gcc.compile OPTIONS <optimization>off   : -O0 ;
--toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
-+toolset.flags gcc.compile OPTIONS <optimization>speed : [ modules.peek : 
CXXFLAGS ] ;
- toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
- 
- toolset.flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
diff --git a/libs/gwenhywfar/DEPENDS b/libs/gwenhywfar/DEPENDS
index 2f49571..3b60e0d 100755
--- a/libs/gwenhywfar/DEPENDS
+++ b/libs/gwenhywfar/DEPENDS
@@ -1,5 +1,5 @@
 depends  libtool    &&
-depends  openssl    &&
+depends  SSL    &&
 depends  libgcrypt  &&
 depends  gnutls     &&
 
diff --git a/libs/gwenhywfar/HISTORY b/libs/gwenhywfar/HISTORY
index c39aa4a..68a7f60 100644
--- a/libs/gwenhywfar/HISTORY
+++ b/libs/gwenhywfar/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-12-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.11.1
 
diff --git a/libs/gwenhywfar2/DEPENDS b/libs/gwenhywfar2/DEPENDS
index 2f49571..3b60e0d 100755
--- a/libs/gwenhywfar2/DEPENDS
+++ b/libs/gwenhywfar2/DEPENDS
@@ -1,5 +1,5 @@
 depends  libtool    &&
-depends  openssl    &&
+depends  SSL    &&
 depends  libgcrypt  &&
 depends  gnutls     &&
 
diff --git a/libs/gwenhywfar2/HISTORY b/libs/gwenhywfar2/HISTORY
index e7315f8..ccbe264 100644
--- a/libs/gwenhywfar2/HISTORY
+++ b/libs/gwenhywfar2/HISTORY
@@ -1,2 +1,5 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-01-20 George Sherwood <george AT beernabeer.com>
        * DETAILS, DEPENDS, HISTORY, CONFLICTS: Created from gwenhywfar
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index f463248..6c552da 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -2,14 +2,14 @@
 
 depends make &&
 depends libtool &&
-depends openssl &&
+depends SSL &&
 
-if spell_ok openssl && is_version_less $(installed_version openssl) 1.0; then
+if spell_ok SSL && is_version_less $(installed_version openssl) 1.0; then
   message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which 
is not installed."
-  message "Answer 'y' to replace current version $(installed_version 
openssl) with one from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
+  message "Answer 'y' to replace current version $(installed_version SSL) 
with one from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
 fi &&
 
-optional_depends -sub "1.0" openssl \
+optional_depends -sub "1.0" SSL \
                             "--enable-gost" \
                             "--disable-gost" \
                             "for GOST support" &&
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 9b86960..8a4b125 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.6.17
        * DEPENDS: added warning on switching openssl branches; added perl
diff --git a/libs/libchipcard/DEPENDS b/libs/libchipcard/DEPENDS
index a760b7d..a992bf5 100755
--- a/libs/libchipcard/DEPENDS
+++ b/libs/libchipcard/DEPENDS
@@ -16,7 +16,7 @@ optional_depends sysfsutils                    \
                  ""                            \
                  "sysfs support"               &&
 
-optional_depends openssl                       \
+optional_depends SSL                       \
                  "--enable-ssl"                \
                  "--disable-ssl"               \
                  "Enable SSL features"            
diff --git a/libs/libchipcard/HISTORY b/libs/libchipcard/HISTORY
index 26b0ad9..327c6bb 100644
--- a/libs/libchipcard/HISTORY
+++ b/libs/libchipcard/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-09 Treeve Jelbert <treeve AT sourcemage.org> 
        * DEPENDS: libusb => LIBUSB
 
diff --git a/libs/libesmtp/DEPENDS b/libs/libesmtp/DEPENDS
index bc7bba7..9995da5 100755
--- a/libs/libesmtp/DEPENDS
+++ b/libs/libesmtp/DEPENDS
@@ -1,5 +1,5 @@
 depends libtool &&
-optional_depends openssl               \
-                 "--with-openssl"      \
-                 "--without-openssl"   \
+optional_depends SSL               \
+                 "--with-opennssl"      \
+                 "--without-opennssl"   \
                  "for SSL/TLS support"
diff --git a/libs/libesmtp/HISTORY b/libs/libesmtp/HISTORY
index 54859a4..316fb3a 100644
--- a/libs/libesmtp/HISTORY
+++ b/libs/libesmtp/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.6
        * BUILD: removed, not required anymore
diff --git a/libs/libevent/DEPENDS b/libs/libevent/DEPENDS
index d2edc67..44031a5e 100755
--- a/libs/libevent/DEPENDS
+++ b/libs/libevent/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-openssl" \
                  "--disable-openssl" \
-                 "for openssl encryption support"
+                 "for SSL encryption support"
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index 5aa0e4d..e486154 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,9 @@
+2014-08-229  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix typo
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.21
 
diff --git a/libs/libircclient/DEPENDS b/libs/libircclient/DEPENDS
index 292834a..b733410 100755
--- a/libs/libircclient/DEPENDS
+++ b/libs/libircclient/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
+optional_depends SSL \
+                 "--enable-SSL" \
+                 "--disable-SSL" \
                  "compile with OpenSSL support" 
diff --git a/libs/libircclient/HISTORY b/libs/libircclient/HISTORY
index 59632d5..5cbdee4 100644
--- a/libs/libircclient/HISTORY
+++ b/libs/libircclient/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS: spell created
        * DETAILS: fixed messed up VERSION, SOURCE, SOURCE_URL and 
SOURCE_DIRECTORY
diff --git a/libs/libnl/DETAILS b/libs/libnl/DETAILS
index a1b8f12..27df22e 100755
--- a/libs/libnl/DETAILS
+++ b/libs/libnl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libnl
-         VERSION=3.2.23
-     
SOURCE_HASH=sha512:b56dde135bf8e2a48bb7bb885351cf557b6a88c67dbc012c3c3f4008b8c6066f18442de772e7f8a41d6da8c80d4a38664393f131732870deae9da090b53045d8
+         VERSION=3.2.25
+     
SOURCE_HASH=sha512:3f9649577e9282cf41d2d4894aaecb2d53b4a1c51f9e674a6fb73393e9482f9f45e6f0ffa5815e606f972916e369774bfd85141a96c0e3d9d4ead3adea796286
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libnl/HISTORY b/libs/libnl/HISTORY
index 66ef37d..ca40d71 100644
--- a/libs/libnl/HISTORY
+++ b/libs/libnl/HISTORY
@@ -1,3 +1,6 @@
+2014-08-15 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.2.25
+
 2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.2.23
 
diff --git a/libs/mico/DEPENDS b/libs/mico/DEPENDS
index 8ca08f4..51ddc55 100755
--- a/libs/mico/DEPENDS
+++ b/libs/mico/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl "--with-ssl=/usr" "--without-ssl" "for ssl 
communication" &&
+optional_depends SSL "--with-ssl=/usr" "--without-ssl" "for ssl 
communication" &&
 optional_depends gtk+ "--with-gtk=/usr" "--without-gtk" "for gtk support of 
some kind" &&
 optional_depends xorg-server "--with-x" "--without-x" "for x support of some 
kind"
 optional_depends java-cup "" "" "for java support" z-rejected
diff --git a/libs/mico/HISTORY b/libs/mico/HISTORY
index a5a9d01..790619f 100644
--- a/libs/mico/HISTORY
+++ b/libs/mico/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-10 Bor Kraljič <pyrobor AT ver.si>
        * DEPENDS: removed optional dependency on qt-x11
 
diff --git a/libs/neon/DEPENDS b/libs/neon/DEPENDS
index 53680a9..48f7586 100755
--- a/libs/neon/DEPENDS
+++ b/libs/neon/DEPENDS
@@ -15,7 +15,7 @@ optional_depends gettext \
 case $NEON_SSL in
   none) OPTS="--without-ssl $OPTS"
   ;;
-  openssl) depends openssl "--with-ssl=openssl"
+  SSL) depends openssl "--with-ssl=openssl"
   ;;
   gnutls) depends gnutls "--with-ssl=gnutls"
   ;;
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index ab23d36..4bb4d8b 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-04-28 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1; don't duplicate manuals
        * PRE_BUILD: added, to apply the patch
diff --git a/libs/neon/PRE_SUB_DEPENDS b/libs/neon/PRE_SUB_DEPENDS
index 0a4cde4..3af2a25 100755
--- a/libs/neon/PRE_SUB_DEPENDS
+++ b/libs/neon/PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
-  SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls 
;;
+  SSL) is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) || 
is_depends_enabled $SPELL gnutls ;;
     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
        return 1;;
 esac
diff --git a/libs/neon/SUB_DEPENDS b/libs/neon/SUB_DEPENDS
index f03e46b..ddaac5b 100755
--- a/libs/neon/SUB_DEPENDS
+++ b/libs/neon/SUB_DEPENDS
@@ -15,7 +15,7 @@ case $THIS_SUB_DEPENDS in
 
        # Re-query with only the SSL options
        config_query_list NEON_SSL "Which SSL backend do you want for SSL 
support?" \
-         openssl gnutls  &&
+         SSL gnutls  &&
 
        config_query_option NEON_OPTS "Enable SSL library thread-safety using 
POSIX threads?" y \
          "--enable-threadsafe-ssl=posix" \
diff --git a/libs/omniorb/DEPENDS b/libs/omniorb/DEPENDS
index fb9be72..97b978e 100755
--- a/libs/omniorb/DEPENDS
+++ b/libs/omniorb/DEPENDS
@@ -1,6 +1,6 @@
 depends  python  &&
 
-optional_depends  openssl            \
-                  "--with-openssl"   \
+optional_depends  SSL            \
+                  "--with-opennssl"   \
                   ""                 \
                   "for SSL support"
diff --git a/libs/omniorb/HISTORY b/libs/omniorb/HISTORY
index b835efb..03b6aa7 100644
--- a/libs/omniorb/HISTORY
+++ b/libs/omniorb/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/omniorbpy/DEPENDS b/libs/omniorbpy/DEPENDS
index 8d3ecd7..e1e07ff 100755
--- a/libs/omniorbpy/DEPENDS
+++ b/libs/omniorbpy/DEPENDS
@@ -1,6 +1,6 @@
 depends  omniorb  &&
 
-optional_depends  openssl            \
-                  "--with-openssl"   \
+optional_depends  SSL            \
+                  "--with-opennssl"   \
                   ""                 \
                   "for SSL support"
diff --git a/libs/omniorbpy/HISTORY b/libs/omniorbpy/HISTORY
index 6ffeeac..94a52a7 100644
--- a/libs/omniorbpy/HISTORY
+++ b/libs/omniorbpy/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/poco/DEPENDS b/libs/poco/DEPENDS
index a8c65a6..855f93e 100755
--- a/libs/poco/DEPENDS
+++ b/libs/poco/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "" \
                  "" \
                  "to build NetSSL_OpenSSL and Crypt support" &&
@@ -11,7 +11,7 @@ optional_depends MYSQL \
                  "" \
                  "to build Data/MySQL support" &&
 
-if ! is_depends_enabled $SPELL openssl; then
+if ! is_depends_enabled $SPELL SSL; then
     OMIT="NetSSL_OpenSSL,Crypto"
 fi &&
 
diff --git a/libs/poco/HISTORY b/libs/poco/HISTORY
index b6c425f..f22cf25 100644
--- a/libs/poco/HISTORY
+++ b/libs/poco/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-08-05 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 1.4.1p1
 
diff --git a/libs/podofo/DEPENDS b/libs/podofo/DEPENDS
index b85b85a..0c90305 100755
--- a/libs/podofo/DEPENDS
+++ b/libs/podofo/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake     &&
-depends openssl   &&
+depends SSL   &&
 depends freetype2 &&
 depends zlib &&
 depends fontconfig &&
diff --git a/libs/podofo/DETAILS b/libs/podofo/DETAILS
index c84d81a..344ac00 100755
--- a/libs/podofo/DETAILS
+++ b/libs/podofo/DETAILS
@@ -1,6 +1,6 @@
            SPELL=podofo
-         VERSION=0.9.2
-     
SOURCE_HASH=sha512:e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21
+         VERSION=0.9.3
+     
SOURCE_HASH=sha512:c9a8076821502225d3ecf5a7e79ef2ebd7b9cc3e7d0902eabff33325b124109a1f5038f57b83e3fad0d82cff9cd557a9ed177adc7c176064085070aebcd7602d
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/libs/podofo/HISTORY b/libs/podofo/HISTORY
index 6fc98a5..4f4f5e7 100644
--- a/libs/podofo/HISTORY
+++ b/libs/podofo/HISTORY
@@ -1,3 +1,7 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+       * DETAILS: version 0.9.3
+
 2013-06-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: lua is optional
 
diff --git a/libs/redland/DEPENDS b/libs/redland/DEPENDS
index d4b5b30..5880447 100755
--- a/libs/redland/DEPENDS
+++ b/libs/redland/DEPENDS
@@ -1,7 +1,7 @@
 depends  raptor   "--with-raptor=system"      &&
 depends  rasqal   "--with-rasqal=system"      &&
 depends  libxml2  "--with-xml-parser=libxml"  &&
-depends  openssl  "--with-openssl-digests"    &&
+depends  SSL  "--with-openssl-digests"    &&
 
 optional_depends  db                          \
                   "--with-bdb=/usr"           \
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index d5681e3..b7079ee 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.17
 
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 995217f..daeb808 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sip
-         VERSION=4.16.1
-     
SOURCE_HASH=sha512:1746087be7cd8c11a8eab122476aabfe2c8167cda4856e30b30fd20e55dd2b7eabd99e831239b8ac7827d67ca1d00b1766034fe62fa76ef732abce603ef00074
+         VERSION=4.16.2
+     
SOURCE_HASH=sha512:07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/pyqt/$SPELL/$SPELL-$VERSION/$SOURCE
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index 9dd07b3..618f80e 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2014-08-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.16.2
+
 2014-06-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.16.1
 
diff --git a/libs/soup/DEPENDS b/libs/soup/DEPENDS
index 75c9a96..16f59ba 100755
--- a/libs/soup/DEPENDS
+++ b/libs/soup/DEPENDS
@@ -3,7 +3,7 @@ depends  glib    &&
 depends  gtk+    &&
 depends  popt    &&
 
-optional_depends  "openssl"                                  \
+optional_depends  "SSL"                                  \
                   "--enable-ssl"                             \
                   "--disable-ssl"                            \
                   "to turn on Secure Sockets Layer support"
diff --git a/libs/soup/HISTORY b/libs/soup/HISTORY
index 101f336..31dd1df 100644
--- a/libs/soup/HISTORY
+++ b/libs/soup/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/tc2-modules/DEPENDS b/libs/tc2-modules/DEPENDS
index 8db1573..86afa12 100755
--- a/libs/tc2-modules/DEPENDS
+++ b/libs/tc2-modules/DEPENDS
@@ -19,7 +19,7 @@ optional_depends  "curl"            \
                   "--enable-http"   \
                   "--disable-http"  \
                   "for a HTTP file reader module"  &&
-optional_depends  "openssl"         \
+optional_depends  "SSL"         \
                   "--enable-netq"   \
                   "--disable-netq"  \
                   "for a networking module"
diff --git a/libs/tc2-modules/HISTORY b/libs/tc2-modules/HISTORY
index 019bc44..775d774 100644
--- a/libs/tc2-modules/HISTORY
+++ b/libs/tc2-modules/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: giflib => GIFLIB
 
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 43d6498..106c5f0 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
            SPELL=upower
-         VERSION=0.9.23
-     
SOURCE_HASH=sha512:526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d
+         VERSION=0.99.1
+     
SOURCE_HASH=sha512:3a413234226a957e8dcb60a1b8a73a4d1b9eb34705b01b404580a34c2a9e61a30b20e8ccefe72dc3457ea305beb910fc02ce76469982c95cbf0ed6bc785b7783
           SOURCE=$SPELL-$VERSION.tar.xz
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index c8a2d28..fbe61e2 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2014-08-22  Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.99.1
+
 2013-10-19  Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.23
 
diff --git a/lua-forge/luacrypto/DEPENDS b/lua-forge/luacrypto/DEPENDS
index 55c18cb..4069e08 100755
--- a/lua-forge/luacrypto/DEPENDS
+++ b/lua-forge/luacrypto/DEPENDS
@@ -1,2 +1,2 @@
 depends lua51 &&
-depends openssl
+depends SSL
diff --git a/lua-forge/luacrypto/HISTORY b/lua-forge/luacrypto/HISTORY
index 0784933..e1eaa29 100644
--- a/lua-forge/luacrypto/HISTORY
+++ b/lua-forge/luacrypto/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51
 
diff --git a/lua-forge/luasec/DEPENDS b/lua-forge/luasec/DEPENDS
index 65eeef3..5e58d00 100755
--- a/lua-forge/luasec/DEPENDS
+++ b/lua-forge/luasec/DEPENDS
@@ -1,3 +1,3 @@
 depends lua51 &&
-depends openssl &&
+depends SSL &&
 depends luasocket
diff --git a/lua-forge/luasec/HISTORY b/lua-forge/luasec/HISTORY
index aa5a7b3..a8ff797 100644
--- a/lua-forge/luasec/HISTORY
+++ b/lua-forge/luasec/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: lua -> lua51
 
diff --git a/mail/alpine/DEPENDS b/mail/alpine/DEPENDS
index ee78aad..627a1ca 100755
--- a/mail/alpine/DEPENDS
+++ b/mail/alpine/DEPENDS
@@ -2,10 +2,10 @@ if [[ $ALPINE_TOPAL == y ]]; then
   depends ada  &&
   depends gnupg
 fi  &&
-optional_depends openssl                                                  \
+optional_depends SSL                                                  \
                  "--with-ssl-dir=$INSTALL_ROOT/usr                        \
                  --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs         \
-                 --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl \
+                 --with-ssl-include-dir=$INSTALL_ROOT/usr/include/SSL \
                  --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib"                \
                  "--without-ssl"                                          \
                  "for SSL/TLS support"                                   &&
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index b9b430d..3021da8 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: update topal to 74
 
diff --git a/mail/althea/DEPENDS b/mail/althea/DEPENDS
index d4aa2d5..5657ea8 100755
--- a/mail/althea/DEPENDS
+++ b/mail/althea/DEPENDS
@@ -1,2 +1,2 @@
 depends  "gtk+"  &&
-depends  "openssl"
+depends  "SSL"
diff --git a/mail/althea/HISTORY b/mail/althea/HISTORY
index 2727441..cca7522 100644
--- a/mail/althea/HISTORY
+++ b/mail/althea/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/mail/anubis/DEPENDS b/mail/anubis/DEPENDS
index 95df8a8..78ccebb 100755
--- a/mail/anubis/DEPENDS
+++ b/mail/anubis/DEPENDS
@@ -24,10 +24,10 @@ optional_depends tcp_wrappers                    \
                  "tcp-wrappers support"          &&
 if [[ ${ANUBIS_TLS} == "gnutls" ]]
 then
-  depends  gnutls  "--without-openssl --with-gnutls"
-elif [[ ${ANUBIS_TLS} == "openssl" ]]
+  depends  gnutls  "--without-opennssl --with-gnutls"
+elif [[ ${ANUBIS_TLS} == "SSL" ]]
 then
-  depends  openssl  "--with-openssl --without-gnutls"
+  depends  SSL  "--with-openssl --without-gnutls"
 fi                                               &&
 
 if [[ ${ANUBIS_DB} == "mysql" ]]
diff --git a/mail/anubis/HISTORY b/mail/anubis/HISTORY
index a2c9dec..17108c4 100644
--- a/mail/anubis/HISTORY
+++ b/mail/anubis/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/mail/c-client/DEPENDS b/mail/c-client/DEPENDS
index 5773acb..1922e6f 100755
--- a/mail/c-client/DEPENDS
+++ b/mail/c-client/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends openssl "" "" "for SSL/TLS support" &&
+optional_depends SSL "" "" "for SSL/TLS support" &&
 optional_depends linux-pam "" "" "for PAM support"
diff --git a/mail/c-client/HISTORY b/mail/c-client/HISTORY
index 2b51a70..87ab142 100644
--- a/mail/c-client/HISTORY
+++ b/mail/c-client/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-08-12 Elisamuel Resto <ryuji AT sourcemage.org>
        * DEPENDS: remove unused enable/disable flags; PATCHLEVEL++
        * BUILD: use is_depends_enabled instead of the grep; quoted paths,
diff --git a/mail/claws-mail/DEPENDS b/mail/claws-mail/DEPENDS
index d6c1198..19ca863 100755
--- a/mail/claws-mail/DEPENDS
+++ b/mail/claws-mail/DEPENDS
@@ -160,6 +160,6 @@ depends libsm &&
 depends libice &&
 
 depends libx11 &&
-depends openssl &&
+depends SSL &&
 depends pango &&
 depends pixman
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 6c49923..29125f4 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.10.1
 
diff --git a/mail/cone/DEPENDS b/mail/cone/DEPENDS
index e3e8788..e10e13e 100755
--- a/mail/cone/DEPENDS
+++ b/mail/cone/DEPENDS
@@ -1,6 +1,6 @@
 depends ncurses &&
 depends libxml2 &&
-depends openssl &&
+depends SSL &&
 optional_depends "aspell" \
                  "" \
                  "" \
diff --git a/mail/cone/HISTORY b/mail/cone/HISTORY
index 6be8ebc..5e6b1b7 100644
--- a/mail/cone/HISTORY
+++ b/mail/cone/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.90
 
diff --git a/mail/courier-imap/DEPENDS b/mail/courier-imap/DEPENDS
index b9144c6..b17ee0c 100755
--- a/mail/courier-imap/DEPENDS
+++ b/mail/courier-imap/DEPENDS
@@ -1,4 +1,4 @@
-depends  openssl                                                &&
+depends  SSL                                                &&
 depends  perl                                                   &&
 depends  courier-authlib                                        &&
 
diff --git a/mail/courier-imap/HISTORY b/mail/courier-imap/HISTORY
index 5b26d4f..1d09833 100644
--- a/mail/courier-imap/HISTORY
+++ b/mail/courier-imap/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-06-15 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: added SOURCE2_IGNORE for signature
 
diff --git a/mail/courier/DEPENDS b/mail/courier/DEPENDS
index 64ce682..ddb7c06 100755
--- a/mail/courier/DEPENDS
+++ b/mail/courier/DEPENDS
@@ -15,7 +15,7 @@ optional_depends "fam"   \
                  ""      \
                  "for enhanced IMAP idle implementation" &&
 
-optional_depends "openssl" \
+optional_depends "SSL" \
                  "" \
                  "" \
                  "for SSL/TLS encrypted mail delivery support" &&
@@ -29,7 +29,7 @@ if [ "${COURIER_WEBMAIL}" == "y" ]; then
   depends WEBSERVER &&
 
   if [ "${COURIER_SSLWEBMAIL}" != "no" ]; then
-    depends openssl
+    depends SSL
   fi &&
 
   if [ "${COURIER_SPELLCHECKER}" != "" ]; then
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index b59422b..62eada0 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
        * CONFLICTS: added msmtp
 
diff --git a/mail/cyrus-imapd/DEPENDS b/mail/cyrus-imapd/DEPENDS
index a8b1bfb..6619bc4 100755
--- a/mail/cyrus-imapd/DEPENDS
+++ b/mail/cyrus-imapd/DEPENDS
@@ -9,9 +9,9 @@ optional_depends  openldap                  \
                   "--without-ldap"          \
                   "to enable LDAP support"  &&
 
-optional_depends  openssl                      \
-                  "--with-openssl"             \
-                  "--without-openssl"          \
+optional_depends  SSL                      \
+                  "--with-opennssl"             \
+                  "--without-opennssl"          \
                   "to enable openSSL support"  &&
 
 optional_depends  tcp_wrappers                 \
diff --git a/mail/cyrus-imapd/HISTORY b/mail/cyrus-imapd/HISTORY
index 79d2f2f..db1a81a 100644
--- a/mail/cyrus-imapd/HISTORY
+++ b/mail/cyrus-imapd/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * PROVIDES: [automated] Fixed invalid entries.
 
diff --git a/mail/dk-milter/DEPENDS b/mail/dk-milter/DEPENDS
index 1e6e7bf..991b4c8 100755
--- a/mail/dk-milter/DEPENDS
+++ b/mail/dk-milter/DEPENDS
@@ -1,3 +1,3 @@
 depends m4 &&
-depends openssl &&
+depends SSL &&
 depends libmilter
diff --git a/mail/dk-milter/HISTORY b/mail/dk-milter/HISTORY
index 76eaecd..2e97b39 100644
--- a/mail/dk-milter/HISTORY
+++ b/mail/dk-milter/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-13 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS, DETAILS, {PRE_}BUILD, CONFIGURE, INSTALL,
          init.d/dk-filter{,.conf}: spell created
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index 9a398a8..d85b7fe 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -2,12 +2,12 @@ depends libtool                                  &&
 
 #if [[ $DOVECOT_SSL == gnutls ]]; then
 #depends gnutls "--with-ssl=gnutls"
-#elif [[ $DOVECOT_SSL == openssl ]]; then
-#depends openssl "--with-ssl=openssl"
+#elif [[ $DOVECOT_SSL == SSL ]]; then
+#depends SSL "--with-ssl=openssl"
 #fi                                                &&
 
-optional_depends openssl                          \
-                 '--with-ssl=openssl'             \
+optional_depends SSL                          \
+                 '--with-ssl=SSL'             \
                  '--without-ssl'                  \
                  'Enable SSL support'             &&
 optional_depends zlib                             \
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index bd39a09..0ad7de7 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.21; SECURITY_PATCH++ (fixes several
          crashes not reported via CVEs)
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 5498658..8cae3ee 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -18,8 +18,8 @@ if    [[  "$EXIM_TLS"  ==  "gnutls"   ]]; then
   depends  gnutls     &&
   depends  libgcrypt  &&
   depends  libtasn1
-elif  [[  "$EXIM_TLS"  ==  "openssl"  ]];  then
-  depends  openssl
+elif  [[  "$EXIM_TLS"  ==  "SSL"  ]];  then
+  depends  SSL
 fi  &&
 
 optional_depends  cyrus-sasl                       \
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 0aafa40..59d2996 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,5 +1,5 @@
            SPELL=exim
-         VERSION=4.83
+         VERSION=4.84
   SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index abd6d09..71120d7 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,9 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.84
+
 2014-07-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.83; SECURITY_PATCH++
        * exim.gpg: added 04D29EBA public key (Todd Lyons (Exim Maintainer)
diff --git a/mail/fetchmail/DEPENDS b/mail/fetchmail/DEPENDS
index 9c1589f..3b300ab 100755
--- a/mail/fetchmail/DEPENDS
+++ b/mail/fetchmail/DEPENDS
@@ -1,6 +1,6 @@
 depends  bison  &&
 
-optional_depends  openssl                               \
+optional_depends  SSL                               \
                   "--with-ssl"                          \
                   ""                                    \
                   "to enable ssl support for pop/imap"  &&
diff --git a/mail/fetchmail/HISTORY b/mail/fetchmail/HISTORY
index 83d7a6c..348a5b0 100644
--- a/mail/fetchmail/HISTORY
+++ b/mail/fetchmail/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 6.3.26
 
diff --git a/mail/gotmail/DEPENDS b/mail/gotmail/DEPENDS
index 77c9b2d..1a76990 100755
--- a/mail/gotmail/DEPENDS
+++ b/mail/gotmail/DEPENDS
@@ -1,4 +1,4 @@
 depends uri &&
-depends openssl &&
+depends SSL &&
 depends bundle-libnet &&
 depends curl
diff --git a/mail/gotmail/HISTORY b/mail/gotmail/HISTORY
index 79d2fa4..962319c 100644
--- a/mail/gotmail/HISTORY
+++ b/mail/gotmail/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 0.9.0; removed UPDATED
 
diff --git a/mail/greylist/CONFIGURE b/mail/greylist/CONFIGURE
new file mode 100755
index 0000000..9ca641a
--- /dev/null
+++ b/mail/greylist/CONFIGURE
@@ -0,0 +1 @@
+config_query GREYLIST_TIMEOUT "Display configured timeout value in defer 
message?" n
diff --git a/mail/greylist/HISTORY b/mail/greylist/HISTORY
index 0388899..1c22c6e 100644
--- a/mail/greylist/HISTORY
+++ b/mail/greylist/HISTORY
@@ -1,3 +1,8 @@
+2014-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFIGURE: added, to configure timeout patch applying
+       * PRE_BUILD: apply patch
+       * timeout.patch: added, to show configured timeout value
+
 2013-06-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * PRE_BUILD: apply patch
diff --git a/mail/greylist/PRE_BUILD b/mail/greylist/PRE_BUILD
index 458066b..d79af79 100755
--- a/mail/greylist/PRE_BUILD
+++ b/mail/greylist/PRE_BUILD
@@ -10,6 +10,11 @@ patch -p0 < "$SPELL_DIRECTORY/dbi.patch" &&
 # fix build with new Boost >= 1.49
 patch -p0 < "$SPELL_DIRECTORY/boost-149.patch" &&
 
+# optional: display threshold in timeout defer message
+if [[ $GREYLIST_TIMEOUT == y ]]; then
+  patch -p0 < "$SPELL_DIRECTORY/timeout.patch"
+fi &&
+
 # fix collecting triplets (timeout=0)
 patch -p0 < "$SPELL_DIRECTORY/collect.patch" &&
 
diff --git a/mail/greylist/timeout.patch b/mail/greylist/timeout.patch
new file mode 100644
index 0000000..ff6918a
--- /dev/null
+++ b/mail/greylist/timeout.patch
@@ -0,0 +1,44 @@
+--- src/greylist.h.orig        2010-09-07 01:55:58.000000000 +0400
++++ src/greylist.h     2014-08-12 20:02:35.947227577 +0400
+@@ -30,6 +30,8 @@
+   Greylist(boost::shared_ptr<DataSource> ds, ModeType m, bool v, unsigned 
t, unsigned w) 
+     : _ds(ds), _mode(m), _verbose(v), _timeout(t), _weakbytes(w) { }
+   Core::ActionType decide(Triplet& triplet, Core::Extra& extra) {
++    extra.setTimeOut(_timeout);
++
+     unsigned long long id;
+     unsigned long count, uts;
+     if (!findTriplet(triplet, id, count, uts)) {
+--- src/core.h.orig    2010-09-07 01:55:58.000000000 +0400
++++ src/core.h 2014-08-12 20:01:51.536118878 +0400
+@@ -33,7 +33,7 @@
+ public:
+   class Extra {
+     std::string _comment, _prefix;
+-    unsigned long _diff, _count;
++    unsigned long _diff, _count, _timeout;
+   public:
+     Extra() : _comment(), _prefix(), _diff(0), _count(0) { }
+     void setComment(const std::string& c) { _comment = c; }
+@@ -42,6 +42,10 @@
+     const std::string& getPrefix() const { return _prefix; }
+     unsigned long getDiff() const { return _diff; }
+     unsigned long getCount() const { return _count; }
++    unsigned long getTimeOut() const { return _timeout; }
++    void setTimeOut(unsigned long t) {
++      _timeout = t;
++    }
+     void set(const std::string & p, unsigned long c, unsigned long t) {
+       _prefix = p;
+       _count = c;
+--- src/action.h.orig  2010-09-07 01:55:58.000000000 +0400
++++ src/action.h       2014-08-12 20:03:20.548341018 +0400
+@@ -70,7 +70,7 @@
+     if (_deferwithstatus && ((*_deferMap.find(action)).second == true)) {
+       std::stringstream stm;
+       stm << extra.getPrefix() << ": (" << extra.getCount() << ", " 
+-      << extra.getDiff() << " secs)";
++      << extra.getDiff() << "/" << extra.getTimeOut() << " secs)";
+       str += " " + stm.str(); 
+     }
+     str += "\n\n";
diff --git a/mail/imap/DEPENDS b/mail/imap/DEPENDS
index 98d08fc..d0c600b 100755
--- a/mail/imap/DEPENDS
+++ b/mail/imap/DEPENDS
@@ -1,6 +1,6 @@
-optional_depends openssl "" "" "Use openssl (for stunnel) for imapds?" &&
+optional_depends SSL "" "" "Use openssl (for stunnel) for imapds?" &&
 optional_depends linux-pam "" "" "for PAM authentication?" &&
 
-if is_depends_enabled $SPELL openssl; then
+if is_depends_enabled $SPELL SSL; then
     depends stunnel
 fi
diff --git a/mail/imap/HISTORY b/mail/imap/HISTORY
index f3d59c0..36b74d3 100644
--- a/mail/imap/HISTORY
+++ b/mail/imap/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-08-13 Elisamuel Resto <ryuji AT sourcemage.org>
        * CONFIGURE: Only the patch query needs to be here
        * CONFLICTS: Padding removed; quoting
diff --git a/mail/isync/DEPENDS b/mail/isync/DEPENDS
index ed472ed..09706da 100755
--- a/mail/isync/DEPENDS
+++ b/mail/isync/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/mail/isync/HISTORY b/mail/isync/HISTORY
index a421732..7716c69 100644
--- a/mail/isync/HISTORY
+++ b/mail/isync/HISTORY
@@ -1,2 +1,5 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
diff --git a/mail/libetpan/DEPENDS b/mail/libetpan/DEPENDS
index 576dded..366d024 100755
--- a/mail/libetpan/DEPENDS
+++ b/mail/libetpan/DEPENDS
@@ -2,10 +2,10 @@ optional_depends  db  "--enable-db"  "--disable-db"  
"Berkeley DB support"     &
 optional_depends  LIBSASL "--with-sasl"  "--without-sasl"  "Sasl support"  &&
 if [[ ${LIBETPAN_TLS} == "gnutls" ]]
 then
-  depends  gnutls  "--without-openssl --with-gnutls"
-elif [[ ${LIBETPAN_TLS} == "openssl" ]]
+  depends  gnutls  "--without-opennssl --with-gnutls"
+elif [[ ${LIBETPAN_TLS} == "SSL" ]]
 then
-  depends  openssl  "--with-openssl --without-gnutls"
+  depends  SSL  "--with-openssl --without-gnutls"
 fi                                                                           
  &&
 if [ "$CVS" = "y" ]; then
   depends  CVS
diff --git a/mail/libetpan/HISTORY b/mail/libetpan/HISTORY
index d7c54f1..fcc980d 100644
--- a/mail/libetpan/HISTORY
+++ b/mail/libetpan/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-10-14 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Uses any provider of LIBSASL
 
diff --git a/mail/mailx/DEPENDS b/mail/mailx/DEPENDS
index ed472ed..09706da 100755
--- a/mail/mailx/DEPENDS
+++ b/mail/mailx/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/mail/mailx/HISTORY b/mail/mailx/HISTORY
index 14fe434..01c20f2 100644
--- a/mail/mailx/HISTORY
+++ b/mail/mailx/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added, for openssl required dependency
        * BUILD: fixed multijob build
diff --git a/mail/mpop/DEPENDS b/mail/mpop/DEPENDS
index 67a4cac..160bf5d 100755
--- a/mail/mpop/DEPENDS
+++ b/mail/mpop/DEPENDS
@@ -1,9 +1,9 @@
 if [[ "$MPOP_TLS" == "gnutls" ]]
 then
 depends "gnutls" "--with-ssl=gnutls"
-elif [[ "$MPOP_TLS" == "openssl" ]]
+elif [[ "$MPOP_TLS" == "SSL" ]]
 then
-depends "openssl" "--with-ssl=openssl"
+depends "SSL" "--with-ssl=openssl"
 fi                                                       &&
 optional_depends "libidn"                                \
                  "--with-libidn"                         \
diff --git a/mail/mpop/HISTORY b/mail/mpop/HISTORY
index a62d6b0..2472be4 100644
--- a/mail/mpop/HISTORY
+++ b/mail/mpop/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-01-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.22
 
diff --git a/mail/msmtp/DEPENDS b/mail/msmtp/DEPENDS
index 8f7706c..1100f28 100755
--- a/mail/msmtp/DEPENDS
+++ b/mail/msmtp/DEPENDS
@@ -1,7 +1,7 @@
 case $MSMTP_SSL in
   gnutls) depends gnutls "--with-ssl=gnutls"
   ;;
-  openssl) depends openssl "--with-ssl=openssl"
+  SSL) depends openssl "--with-ssl=openssl"
   ;;
   none)
   ;;
diff --git a/mail/msmtp/HISTORY b/mail/msmtp/HISTORY
index e21fd31..977946b 100644
--- a/mail/msmtp/HISTORY
+++ b/mail/msmtp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.4.31
 
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index e0433b0..efd9c94 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -34,9 +34,9 @@ optional_depends   "ispell"                                 
    \
 
 if [[ "$MUTT_BRANCH" != "stable" ]]; then
   # Do NOT add --with-ssl here, that only works if POP/IMAP are used.  This 
is
-  # mostly just here to prompt for openssl if they don't have it and want
+  # mostly just here to prompt for SSL if they don't have it and want
   # S/MIME.
-  optional_depends "openssl"                                    \
+  optional_depends "SSL"                                    \
                    ""                                           \
                    ""                                           \
                    "to support S/MIME signing and encrypting messages" &&
@@ -63,8 +63,8 @@ if [[ "$MUTT_BRANCH" != "stable" ]]; then
 fi &&
 
 if list_find "${MUTT_OPTS}" "--enable-pop" || list_find "${MUTT_OPTS}" 
"--enable-imap"; then
-  # If they have POP/IMAP then prompt again for openssl to get --with-ssl.
-  optional_depends "openssl"                                    \
+  # If they have POP/IMAP then prompt again for SSL to get --with-ssl.
+  optional_depends "SSL"                                    \
                    "--with-ssl"                                 \
                    ""                                           \
                    "to enable SSL support for POP/IMAP"         &&
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index d282b0b..378c7e7 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/mail/nbsmtp/DEPENDS b/mail/nbsmtp/DEPENDS
index 4bd5ecb..43adb36 100755
--- a/mail/nbsmtp/DEPENDS
+++ b/mail/nbsmtp/DEPENDS
@@ -1 +1 @@
-optional_depends    "openssl" "--enable-ssl" "--disable-ssl" "for SSL 
support"
+optional_depends    "SSL" "--enable-ssl" "--disable-ssl" "for SSL support"
diff --git a/mail/nbsmtp/HISTORY b/mail/nbsmtp/HISTORY
index 1bf5bf0..f643e03 100644
--- a/mail/nbsmtp/HISTORY
+++ b/mail/nbsmtp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated SOURCE_URL to Debian's (gentoo-es.org is dead)
          updated SHORT and LONG descriptions
diff --git a/mail/opendkim/DEPENDS b/mail/opendkim/DEPENDS
index 9ddf8bd..e321106 100755
--- a/mail/opendkim/DEPENDS
+++ b/mail/opendkim/DEPENDS
@@ -9,7 +9,7 @@ optional_depends gnutls \
                  "use GNUTLS instead of OpenSSL?" &&
 
 if ! is_depends_enabled $SPELL gnutls; then
-  depends openssl
+  depends SSL
 fi &&
 
 if list_find "$OPENDKIM_OPTS" "--enable-poll" || list_find "$OPENDKIM_OPTS" 
"--enable-live-testing"; then
diff --git a/mail/opendkim/HISTORY b/mail/opendkim/HISTORY
index d3e53b7..090078f 100644
--- a/mail/opendkim/HISTORY
+++ b/mail/opendkim/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-07-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS, DETAILS, BUILD, CONFIGURE, INSTALL, opendkim.gpg,
          init.d/opendkim{,.conf}: spell created
diff --git a/mail/openwebmail/DEPENDS b/mail/openwebmail/DEPENDS
index b54d57f..9381356 100755
--- a/mail/openwebmail/DEPENDS
+++ b/mail/openwebmail/DEPENDS
@@ -7,7 +7,7 @@ depends  mime-base64    &&
 depends  text-iconv     &&
 
 if [[ "$OW_POP3SSL" == "y" ]]; then
-  depends openssl       &&
+  depends SSL       &&
   depends net-ssleay    &&
   depends io-socket-ssl
 fi &&
diff --git a/mail/openwebmail/HISTORY b/mail/openwebmail/HISTORY
index 9cc8457..a13fd25 100644
--- a/mail/openwebmail/HISTORY
+++ b/mail/openwebmail/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-10-12 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed SOURCE_URL, removed not working SOURCE_URLs
          fixed long description wrap
diff --git a/mail/postfix/DEPENDS b/mail/postfix/DEPENDS
index 130702d..912ce5f 100755
--- a/mail/postfix/DEPENDS
+++ b/mail/postfix/DEPENDS
@@ -26,7 +26,7 @@ optional_depends linux-pam \
                  "" "" \
                  "for PAM support" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "" "" \
                  "for SSL/TLS support" &&
 
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 3806fdb..f90e316 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.9.9
 
diff --git a/mail/smtpc/DEPENDS b/mail/smtpc/DEPENDS
index ed472ed..09706da 100755
--- a/mail/smtpc/DEPENDS
+++ b/mail/smtpc/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/mail/smtpc/HISTORY b/mail/smtpc/HISTORY
index 4cc9e25..97ea510 100644
--- a/mail/smtpc/HISTORY
+++ b/mail/smtpc/HISTORY
@@ -1,2 +1,5 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, {PRE,}BUILD, INSTALL: created spell
diff --git a/mail/spamassassin/DEPENDS b/mail/spamassassin/DEPENDS
index 016b29f..7b72db1 100755
--- a/mail/spamassassin/DEPENDS
+++ b/mail/spamassassin/DEPENDS
@@ -4,7 +4,7 @@ depends  digest-sha1  &&
 depends  net-dns      &&
 
 if  [  "$MAILSPAM_SSL"  =  "y"  ];  then
-       depends  openssl        &&
+       depends  SSL    &&
        depends  io-socket-ssl
 fi  &&
 
diff --git a/mail/spamassassin/HISTORY b/mail/spamassassin/HISTORY
index 43a73e3..0db103b 100644
--- a/mail/spamassassin/HISTORY
+++ b/mail/spamassassin/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-06-13 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 3.2.5
 
diff --git a/mail/ssmtp/DEPENDS b/mail/ssmtp/DEPENDS
index 65e81a1..c757787 100755
--- a/mail/ssmtp/DEPENDS
+++ b/mail/ssmtp/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends  openssl  "--enable-ssl" "--disable-ssl" \
+optional_depends  SSL  "--enable-ssl" "--disable-ssl" \
                            "Enable SSL/TLS support?"
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index 44eabf3..792e194 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD: add libcrypt to LIBS
        * PRE_BUILD, 0020_all_from-format-fix.patch,
diff --git a/mail/sylpheed-gtk2/DEPENDS b/mail/sylpheed-gtk2/DEPENDS
index ab93ba8..6c5b8f7 100755
--- a/mail/sylpheed-gtk2/DEPENDS
+++ b/mail/sylpheed-gtk2/DEPENDS
@@ -3,7 +3,7 @@ depends GTK2  &&
 optional_depends  "compface"    ""  ""  "for X-Face support"               &&
 optional_depends  "gdk-pixbuf"  ""  ""  "for built-in image view support"  &&
 
-optional_depends  "openssl"              \
+optional_depends  "SSL"              \
                   "--enable-ssl"         \
                   ""                     \
                   "for pop3s and imaps"  &&
diff --git a/mail/sylpheed-gtk2/HISTORY b/mail/sylpheed-gtk2/HISTORY
index 6d3729f..0b90ac5 100644
--- a/mail/sylpheed-gtk2/HISTORY
+++ b/mail/sylpheed-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/mail/sylpheed/DEPENDS b/mail/sylpheed/DEPENDS
index fe703ec..685f500 100755
--- a/mail/sylpheed/DEPENDS
+++ b/mail/sylpheed/DEPENDS
@@ -25,7 +25,7 @@ optional_depends gpgme \
                  "--disable-gpgme" \
                  "for encrypted email" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-ssl" \
                  "--disable-ssl" \
                  "for SSL support" &&
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 802f3fc..21d37d8 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-06-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.4.2
 
diff --git a/mobile/barry/DEPENDS b/mobile/barry/DEPENDS
index 2b360a5..e30516a 100755
--- a/mobile/barry/DEPENDS
+++ b/mobile/barry/DEPENDS
@@ -1,6 +1,6 @@
 depends pkgconfig &&
 depends LIBUSB &&
-depends openssl &&
+depends SSL &&
 optional_depends boost "" "" "needed if you want to save downloads for later 
upload to your device" &&
 optional_depends libopensync "--enable-opensync-plugin" 
"--disable-opensync-plugin" "For an opensync plugin" &&
 if [[ "$BARRY_GUI" == "y" ]]; then
diff --git a/mobile/barry/HISTORY b/mobile/barry/HISTORY
index 57d2a7a..d4704fc 100644
--- a/mobile/barry/HISTORY
+++ b/mobile/barry/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-09 Treeve Jelbert <treeve AT sourcemage.org> 
        * DEPENDS: libusb => LIBUSB
 
diff --git a/mobile/xsupplicant/DEPENDS b/mobile/xsupplicant/DEPENDS
index f66e66e..ecf30b5 100755
--- a/mobile/xsupplicant/DEPENDS
+++ b/mobile/xsupplicant/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl   &&
+depends SSL   &&
 depends pcsc-lite &&
 depends libpcap   &&
 depends libxml2   &&
diff --git a/mobile/xsupplicant/HISTORY b/mobile/xsupplicant/HISTORY
index 3e4c3c4..f888524 100644
--- a/mobile/xsupplicant/HISTORY
+++ b/mobile/xsupplicant/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/net/accel-ppp/BUILD b/net/accel-ppp/BUILD
index 66407d6..95f0b44 100755
--- a/net/accel-ppp/BUILD
+++ b/net/accel-ppp/BUILD
@@ -1,3 +1,5 @@
-OPTS="$ACCEL_PPP_OPTS $OPTS" &&
+OPTS="-DLIB_SUFFIX=$INSTALL_ROOT \
+                   $ACCEL_PPP_OPTS \
+                   $OPTS" &&
 
 cmake_build
diff --git a/net/accel-ppp/CONFIGURE b/net/accel-ppp/CONFIGURE
index 560278f..fa2a971 100755
--- a/net/accel-ppp/CONFIGURE
+++ b/net/accel-ppp/CONFIGURE
@@ -4,12 +4,27 @@ config_query_option ACCEL_PPP_OPTS "Build version with 
debug information?" n \
                                    "-DCMAKE_BUILD_TYPE=Debug" \
                                    "-DCMAKE_BUILD_TYPE=Release" &&
 
+# backport old driver config options
+if list_find "$ACCEL_PPP_OPTS" "-DBUILD_DRIVER=TRUE"; then
+  list_remove "ACCEL_PPP_OPTS" "-DBUILD_DRIVER=TRUE" &&
+  list_add "ACCEL_PPP_OPTS" "-DBUILD_PPTP_DRIVER=TRUE"
+fi &&
+
+if list_find "$ACCEL_PPP_OPTS" "-DBUILD_DRIVER=FALSE"; then
+  list_remove "ACCEL_PPP_OPTS" "-DBUILD_DRIVER=FALSE" &&
+  list_add "ACCEL_PPP_OPTS" "-DBUILD_PPTP_DRIVER=FALSE"
+fi &&
+
 if is_version_less $(get_kernel_version) 2.6.37; then
-  message "${MESSAGE_COLOR}Kernel version lower than 2.6.37 detected,"
+  message "${MESSAGE_COLOR}Kernel version lower than 2.6.37 detected," &&
   message "forcing build of non-native pptp module...${DEFAULT_COLOR}" &&
-  list_add ACCEL_PPP_OPTS "-DBUILD_DRIVER=TRUE"
+  list_add ACCEL_PPP_OPTS "-DBUILD_PPTP_DRIVER=TRUE"
 else
   config_query_option ACCEL_PPP_OPTS "Build pptp kernel module (replaced by 
native in new kernels)?" n \
-                                     "-DBUILD_DRIVER=TRUE" \
-                                     "-DBUILD_DRIVER=FALSE"
-fi
+                                     "-DBUILD_PPTP_DRIVER=TRUE" \
+                                     "-DBUILD_PPTP_DRIVER=FALSE"
+fi &&
+
+config_query_option ACCEL_PPP_OPTS "Build ipoe (IP over Ethernet) kernel 
module?" n \
+                                   "-DBUILD_IPOE_DRIVER=TRUE" \
+                                   "-DBUILD_IPOE_DRIVER=FALSE"
diff --git a/net/accel-ppp/DEPENDS b/net/accel-ppp/DEPENDS
index a4f117c..d278793 100755
--- a/net/accel-ppp/DEPENDS
+++ b/net/accel-ppp/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake &&
-depends openssl &&
+depends SSL &&
 depends pcre &&
 
 optional_depends postgresql \
diff --git a/net/accel-ppp/DETAILS b/net/accel-ppp/DETAILS
index 4348c3b..6fc11eb 100755
--- a/net/accel-ppp/DETAILS
+++ b/net/accel-ppp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=accel-ppp
-         VERSION=1.7.3
+         VERSION=1.8.0
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:d15e1adc8cecab92a6259901d960e6e23bb7be0be257609b2e2bdeb69e3a0ea925d33c161afff1557fb0955928501c64eb0d5db4d4f744364979eef650b6fe56
+     
SOURCE_HASH=sha512:d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://accel-ppp.sourceforge.net/
          ENTERED=20130521
diff --git a/net/accel-ppp/HISTORY b/net/accel-ppp/HISTORY
index 7ac0727..50f1395 100644
--- a/net/accel-ppp/HISTORY
+++ b/net/accel-ppp/HISTORY
@@ -1,3 +1,14 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.8.0
+       * CONFIGURE: added ipoe configuration; backported old driver config 
opt
+       * BUILD: use proper lib suffix
+       * PRE_BUILD: apply patch
+       * extra.patch: updated for new version
+       * ipoe.patch: added, to fix build of ipoe kernel module
+
 2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFIGURE,
          init.d/accel-ppp, extra.patch: spell created
diff --git a/net/accel-ppp/PRE_BUILD b/net/accel-ppp/PRE_BUILD
index 66fece5..76095fd 100755
--- a/net/accel-ppp/PRE_BUILD
+++ b/net/accel-ppp/PRE_BUILD
@@ -3,4 +3,5 @@ cd "$SOURCE_DIRECTORY" &&
 
 sedit "s:/usr/local:$INSTALL_ROOT/usr:g" accel-pppd/accel-ppp.conf &&
 
+patch -p0 < "$SPELL_DIRECTORY/ipoe.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/extra.patch"
diff --git a/net/accel-ppp/extra.patch b/net/accel-ppp/extra.patch
index 842567b..f1988e2 100644
--- a/net/accel-ppp/extra.patch
+++ b/net/accel-ppp/extra.patch
@@ -1,15 +1,14 @@
---- accel-pppd/CMakeLists.txt.orig     2012-12-07 18:08:24.000000000 +0400
-+++ accel-pppd/CMakeLists.txt  2013-05-21 12:14:23.441874735 +0400
-@@ -100,12 +100,3 @@
+--- accel-pppd/CMakeLists.txt.orig     2014-08-12 12:07:10.582491202 +0400
++++ accel-pppd/CMakeLists.txt  2014-08-12 12:08:49.832174757 +0400
+@@ -107,11 +107,3 @@
  )
  
  INSTALL(FILES accel-ppp.conf.5 DESTINATION share/man/man5)
 -
 -IF (NOT DEFINED CPACK_TYPE)
--      INSTALL(FILES accel-ppp.conf DESTINATION /etc RENAME 
accel-ppp.conf.dist)
+-      INSTALL(FILES accel-ppp.conf DESTINATION ${CMAKE_FIND_ROOT_PATH}/etc 
RENAME accel-ppp.conf.dist)
 -
--      INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-ppp)")
--      INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/run/accel-ppp)")
--      INSTALL(CODE "EXECUTE_PROCESS(COMMAND 'echo 0 > 
/var/run/accel-ppp/seq')")
+-      INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p 
${CMAKE_FIND_ROOT_PATH}/var/log/accel-ppp)")
+-      INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p 
${CMAKE_FIND_ROOT_PATH}/var/lib/accel-ppp)")
 -ENDIF (NOT DEFINED CPACK_TYPE)
 -
diff --git a/net/accel-ppp/ipoe.patch b/net/accel-ppp/ipoe.patch
new file mode 100644
index 0000000..05b298d
--- /dev/null
+++ b/net/accel-ppp/ipoe.patch
@@ -0,0 +1,22 @@
+--- drivers/ipoe/ipoe.c.orig   2014-05-08 14:41:12.000000000 +0400
++++ drivers/ipoe/ipoe.c        2014-08-12 12:40:34.776058280 +0400
+@@ -395,7 +395,9 @@
+       if (!ses->peer_addr)
+               goto drop;
+       
++#ifdef CONFIG_NET_CLS_ACT
+       skb->tc_verd = SET_TC_NCLS(0);
++#endif
+       
+       noff = skb_network_offset(skb);
+ 
+--- drivers/ipoe/CMakeLists.txt.orig   2014-05-08 14:41:12.000000000 +0400
++++ drivers/ipoe/CMakeLists.txt        2014-08-12 13:36:56.475218335 +0400
+@@ -14,6 +14,4 @@
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/driver/ipoe.ko
+ )
+ 
+-
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR} 
M=${CMAKE_CURRENT_BINARY_DIR}/drivers/ipoe modules_install)")
+-
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR} 
M=${CMAKE_CURRENT_BINARY_DIR}/driver modules_install)")
diff --git a/net/bind-tools/DEPENDS b/net/bind-tools/DEPENDS
index 73c443f..d6a4717 100755
--- a/net/bind-tools/DEPENDS
+++ b/net/bind-tools/DEPENDS
@@ -3,7 +3,7 @@ optional_depends libcap \
                  "--disable-linux-caps" \
                  "for linux capabilities support" &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "to build with OpenSSL, required for DNSSEC"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 9941e6d..0f7f013 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 9.9.2-P1; SECURITY_PATCH++
 
diff --git a/net/bind/DEPENDS b/net/bind/DEPENDS
index 73c443f..d6a4717 100755
--- a/net/bind/DEPENDS
+++ b/net/bind/DEPENDS
@@ -3,7 +3,7 @@ optional_depends libcap \
                  "--disable-linux-caps" \
                  "for linux capabilities support" &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "to build with OpenSSL, required for DNSSEC"
diff --git a/net/bind/HISTORY b/net/bind/HISTORY
index 8333caf..bbbd4af 100644
--- a/net/bind/HISTORY
+++ b/net/bind/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 9.8.4-P1; SECURITY_PATCH++
 
diff --git a/net/bitcoin/DEPENDS b/net/bitcoin/DEPENDS
index 9e66132..f7bef0b 100755
--- a/net/bitcoin/DEPENDS
+++ b/net/bitcoin/DEPENDS
@@ -2,4 +2,4 @@ depends -sub CXX gcc &&
 depends wxgtk-new &&
 depends boost &&
 depends db &&
-depends openssl
+depends SSL
diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index 656d1d2..1338ca4 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 8e5a3ea..8e576da 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dhcpcd
-         VERSION=6.4.2
-     
SOURCE_HASH=sha512:079b5ad8559b8ee995e5fda12769bd9176253d4963b7904868a1ecea3dcd4759453882bdc57236e765ef53807a42d687c3ee4c727c33ed86e42e94d5bc0135cc
+         VERSION=6.4.3
+     
SOURCE_HASH=sha512:1dbc57b3fba001f7ed1d36a4efb611178db02aa2b83999b82de1a9c6fef62bc81d55dade83582fe2442469948a88f47e39edc0350f97866d5a8c6f468ae8d70d
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 7ada0a8..9561633 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 6.4.3
+
 2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 6.4.2
 
diff --git a/net/envbot/DEPENDS b/net/envbot/DEPENDS
index 58933bd..6fbcfa3 100755
--- a/net/envbot/DEPENDS
+++ b/net/envbot/DEPENDS
@@ -13,10 +13,10 @@ suggest_depends gnutls \
                  "" \
                  "support for gnutls transport" &&
 
-suggest_depends openssl \
+suggest_depends SSL \
                  "" \
                  "" \
-                 "support for openssl transport" &&
+                 "support for SSL transport" &&
 
 suggest_depends socat \
                  "" \
diff --git a/net/envbot/HISTORY b/net/envbot/HISTORY
index 5368b40..7511003 100644
--- a/net/envbot/HISTORY
+++ b/net/envbot/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2007-11-13 Arvid Norlander <anmaster AT envbot DOT org>
        * DETAILS: updated spell to 0.0.1
 
diff --git a/net/flow-tools/DEPENDS b/net/flow-tools/DEPENDS
index 166c221..e7dcba3 100755
--- a/net/flow-tools/DEPENDS
+++ b/net/flow-tools/DEPENDS
@@ -1,8 +1,8 @@
 depends zlib &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "for OpenSSL support" &&
 
 optional_depends MYSQL \
diff --git a/net/flow-tools/HISTORY b/net/flow-tools/HISTORY
index b6a8aee..7d9aca5 100644
--- a/net/flow-tools/HISTORY
+++ b/net/flow-tools/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-12-18 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, INSTALL, PROVIDES,
          init.d/flow-capture{,.conf}: spell created
diff --git a/net/freeradius/DEPENDS b/net/freeradius/DEPENDS
index b59b327..c674aaa 100755
--- a/net/freeradius/DEPENDS
+++ b/net/freeradius/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl '--with-openssl' &&
+depends SSL '--with-openssl' &&
 
 # TODO: add krb5-heimdal support (--enable-heimdal-krb5)
 optional_depends krb5 "" "" "for Kerberos 5 support" &&
diff --git a/net/freeradius/HISTORY b/net/freeradius/HISTORY
index 115d7bc..f1db2a7 100644
--- a/net/freeradius/HISTORY
+++ b/net/freeradius/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.2.5
 
diff --git a/net/fwbuilder/DEPENDS b/net/fwbuilder/DEPENDS
index bb97b43..eea5184 100755
--- a/net/fwbuilder/DEPENDS
+++ b/net/fwbuilder/DEPENDS
@@ -2,6 +2,6 @@ depends  automake  &&
 depends  autoconf  &&
 depends  libxml2   &&
 depends  libxslt   &&
-depends  openssl   &&
+depends  SSL   &&
 depends  qt4       &&
 depends  net-snmp
diff --git a/net/fwbuilder/HISTORY b/net/fwbuilder/HISTORY
index bb0d277..1dbab8b 100644
--- a/net/fwbuilder/HISTORY
+++ b/net/fwbuilder/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-12-30 Robert Figura <template AT sourcemage.org>
        * DETAILS: upgrade to 5.0.1.3592
        * DEPENDS: insert libfwbuilder's dependencies
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index ae535a6..fa8a0cf 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=iproute2
-         VERSION=3.12.0
-     
SOURCE_HASH=sha512:64d2e2cf08be31c258fc1dd9c8649db6a511d7af22ac0e4262c1f8607082639ca66c50f764ff3a4e07a19fa75222bf7101bf76d1ddf1756c445650451a03e96a
+         VERSION=3.16.0
+     
SOURCE_HASH=sha512:82491f9c73500c3378088947c0745b3a34fdcfc4202df47bef356c2a9330f915987d45ecd58ba163efd23a42a6b263de569953cdeb0adb46bfdd882da6b93219
           SOURCE=$SPELL-$VERSION.tar.xz
 #         SOURCE2=${SOURCE}.sign
 #  SOURCE2_IGNORE=signature
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 9234b2a..e678c32 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-15 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.16.0
+
 2013-12-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.12.0
 
diff --git a/net/ipsec-tools/DEPENDS b/net/ipsec-tools/DEPENDS
index 4ab6b43..9808176 100755
--- a/net/ipsec-tools/DEPENDS
+++ b/net/ipsec-tools/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 
 optional_depends readline \
                  "--with-readline" \
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index cee6ebe..f1268d0 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.8.2
 
diff --git a/net/iscsitarget/DEPENDS b/net/iscsitarget/DEPENDS
index ed472ed..09706da 100755
--- a/net/iscsitarget/DEPENDS
+++ b/net/iscsitarget/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/net/iscsitarget/HISTORY b/net/iscsitarget/HISTORY
index e7cbce4..ee9c0d9 100644
--- a/net/iscsitarget/HISTORY
+++ b/net/iscsitarget/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-06-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, INSTALL, {PRE_,}BUILD, FINAL, ldflags.patch,
          init.d/iscsi-target{,.conf}: spell created
diff --git a/net/monit/DEPENDS b/net/monit/DEPENDS
index 3dfc6fc..0c56a5f 100755
--- a/net/monit/DEPENDS
+++ b/net/monit/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends openssl '--with-ssl' '--without-ssl' 'for SSL support' &&
+optional_depends SSL '--with-ssl' '--without-ssl' 'for SSL support' &&
 optional_depends linux-pam '' '--without-pam' 'for PAM support'
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index d8fe618..b4a3c04 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-13 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.8.1
 
diff --git a/net/nagios-plugins/DEPENDS b/net/nagios-plugins/DEPENDS
index e291d89..92a899d 100755
--- a/net/nagios-plugins/DEPENDS
+++ b/net/nagios-plugins/DEPENDS
@@ -28,10 +28,10 @@ optional_depends "net-snmp" "" ""                         
              \
 optional_depends "perl-snmp" "" ""                                      \
                  "Provides additional check using snmp"                 &&
 
-optional_depends "openssl"                                              \
-                 "--with-openssl"                                       \
-                 "--without-openssl"                                    \
-                 "Enable openssl support"                               &&
+optional_depends "SSL"                                              \
+                 "--with-opennssl"                                       \
+                 "--without-opennssl"                                    \
+                 "Enable SSL support"                               &&
 
 optional_depends "openssh" "" ""                                        \
                  "Enable openssd support"                               &&
diff --git a/net/nagios-plugins/HISTORY b/net/nagios-plugins/HISTORY
index d15a86e..baff430 100644
--- a/net/nagios-plugins/HISTORY
+++ b/net/nagios-plugins/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/net/net-snmp/DEPENDS b/net/net-snmp/DEPENDS
index cc4c312..aaee8ac 100755
--- a/net/net-snmp/DEPENDS
+++ b/net/net-snmp/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 
 optional_depends perl \
                  "--enable-embedded-perl" \
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index 995f5a3..23e2dcc 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.7.2
 
diff --git a/net/netembryo/DEPENDS b/net/netembryo/DEPENDS
index 374ed2b..eec869a 100755
--- a/net/netembryo/DEPENDS
+++ b/net/netembryo/DEPENDS
@@ -2,7 +2,7 @@ optional_depends lksctp-tools       \
                  "--enable-sctp"    \
                  "--disable-sctp"   \
                  "For SCTP support" &&
-optional_depends openssl             \
-                 "--with-openssl"    \
-                 "--without-openssl" \
+optional_depends SSL             \
+                 "--with-opennssl"    \
+                 "--without-opennssl" \
                  "Enable SSL support through OpenSSL"
diff --git a/net/netembryo/HISTORY b/net/netembryo/HISTORY
index 27d9dcb..910d2a6 100644
--- a/net/netembryo/HISTORY
+++ b/net/netembryo/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-08-26 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: updated spell to 0.1.1
 
diff --git a/net/nsd/DEPENDS b/net/nsd/DEPENDS
index ed472ed..09706da 100755
--- a/net/nsd/DEPENDS
+++ b/net/nsd/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 21478f6..c447803 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.2.16
 
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index ffcaad8..40223dd 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -15,7 +15,7 @@ optional_depends  'MYSQL'                       \
                   '--disable-mysql'             \
                   'for MySQL database support'  &&
 
-optional_depends  'openssl'                                       \
+optional_depends  'SSL'                                       \
                   "--with-ssl --with-ssl-root=$INSTALL_ROOT/usr"  \
                   '--without-ssl'                                 \
                   'for HTTPS (secure HTTP) support'               &&
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 4574cc4..f02b38f 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-28 David C. Haley <khoralin AT gmail.com>
        * DETAILS: version bump 3.3.9 -> 5.0.1
        * PRE_BUILD: removed geoip "stuff"
diff --git a/net/openntpd/DEPENDS b/net/openntpd/DEPENDS
index 7d46a19..eeda283 100755
--- a/net/openntpd/DEPENDS
+++ b/net/openntpd/DEPENDS
@@ -1,2 +1,2 @@
-depends openssl &&
+depends SSL &&
 optional_depends prngd '' '' 'for Pseudo Random Number Generator Daemon 
support'
diff --git a/net/openntpd/HISTORY b/net/openntpd/HISTORY
index 5e9900d..ba3b847 100644
--- a/net/openntpd/HISTORY
+++ b/net/openntpd/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-08-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: actually regenerate configure script after patching
diff --git a/net/openvpn/DEPENDS b/net/openvpn/DEPENDS
index a4f8dc6..f204452 100755
--- a/net/openvpn/DEPENDS
+++ b/net/openvpn/DEPENDS
@@ -1,6 +1,6 @@
 depends  linux-pam  &&
 
-optional_depends  openssl                                                    
\
+optional_depends  SSL                                                    \
                   ""                                                         
\
                   "--disable-crypto --disable-ssl"                           
\
                   "for crypto and key exchange support (highly recommended)" 
&&
diff --git a/net/openvpn/HISTORY b/net/openvpn/HISTORY
index e946d8c..b2cec65 100644
--- a/net/openvpn/HISTORY
+++ b/net/openvpn/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-02-13 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 2.3.2
        * DEPENDS: added linux-pam as dependency
diff --git a/net/openwbem/DEPENDS b/net/openwbem/DEPENDS
index 942f71c..e13fd98 100755
--- a/net/openwbem/DEPENDS
+++ b/net/openwbem/DEPENDS
@@ -10,7 +10,7 @@ optional_depends  openslp                \
                   "--disable-openslp"    \
                   "openslp integration"  &&
 
-optional_depends  openssl                \
+optional_depends  SSL                \
                   "--enable-ssl"         \
                   "--disable-ssl"        \
                   "OpenSSL integration"  &&
diff --git a/net/openwbem/HISTORY b/net/openwbem/HISTORY
index 8989f5e..992ab9c 100644
--- a/net/openwbem/HISTORY
+++ b/net/openwbem/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/net/ppp/DEPENDS b/net/ppp/DEPENDS
index 6c9cc72..13d5794 100755
--- a/net/ppp/DEPENDS
+++ b/net/ppp/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 depends libpcap &&
 
 optional_depends shadow "" "" "for shadow password support" &&
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index c6cb7e1..63cf18d 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * CONFIGURE: added selector for IPv6 option
diff --git a/net/pppd-chldap/DEPENDS b/net/pppd-chldap/DEPENDS
index 9cf41c6..15e1f83 100755
--- a/net/pppd-chldap/DEPENDS
+++ b/net/pppd-chldap/DEPENDS
@@ -1,4 +1,4 @@
 depends ppp &&
 depends openldap &&
 
-optional_depends openssl "" "" "for TLS/SSL support"
+optional_depends SSL "" "" "for TLS/SSL support"
diff --git a/net/pppd-chldap/HISTORY b/net/pppd-chldap/HISTORY
index e0fc0ea..b8e2918 100644
--- a/net/pppd-chldap/HISTORY
+++ b/net/pppd-chldap/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * PREPARE: Use prepare_select_branch
        * DETAILS: Use get_scm_version
diff --git a/net/proxychains-ng/DETAILS b/net/proxychains-ng/DETAILS
index caeee1e..91ec229 100755
--- a/net/proxychains-ng/DETAILS
+++ b/net/proxychains-ng/DETAILS
@@ -1,9 +1,9 @@
            SPELL=proxychains-ng
           SPELLX=${SPELL/-ng}
-         VERSION=4.7
+         VERSION=4.8.1
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[1]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:7152a9cf904d4491e1e2d108c163325f02b7f4b408ad906c47b470d57118a183ae384ad6033eba4f136ab9a186798cf72304168ac48f167544cc78f41ac60f42
+     
SOURCE_HASH=sha512:6e1673b331722ea5f6282a055d9552e387a2d68cc5e0c3fbb310ebbf58d47f1c9de46f11bbe5977b328d7a0abf1a5f77c544ccea799cb047da5c8521ee7ec949
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
             DOCS="AUTHORS ChangeLog TODO $DOCS"
         WEB_SITE=https://github.com/rofl0r/proxychains-ng
diff --git a/net/proxychains-ng/HISTORY b/net/proxychains-ng/HISTORY
index c9a07e0..13c0c22 100644
--- a/net/proxychains-ng/HISTORY
+++ b/net/proxychains-ng/HISTORY
@@ -1,2 +1,5 @@
+2014-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.8.1
+
 2014-04-30 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, INSTALL: created spell
diff --git a/net/slowhttptest/DEPENDS b/net/slowhttptest/DEPENDS
index ed472ed..09706da 100755
--- a/net/slowhttptest/DEPENDS
+++ b/net/slowhttptest/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/net/slowhttptest/HISTORY b/net/slowhttptest/HISTORY
index c5fbcb8..ef6ad44 100644
--- a/net/slowhttptest/HISTORY
+++ b/net/slowhttptest/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.6
 
diff --git a/net/socat/DEPENDS b/net/socat/DEPENDS
index 9ac394e..19915d5 100755
--- a/net/socat/DEPENDS
+++ b/net/socat/DEPENDS
@@ -1,5 +1,5 @@
-optional_depends openssl  '--enable-openssl' \
-                          '--disable-openssl' \
+optional_depends SSL  '--enable-openssl' \
+                          '--disable-SSL' \
                           'encryption support' &&
 optional_depends readline '--enable-readline' \
                           '--disable-readline' \
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index b20f818..a6ed395 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-03-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.7.2.4
 
diff --git a/net/ssocks/DEPENDS b/net/ssocks/DEPENDS
index 0ba77eb..4846d6b 100755
--- a/net/ssocks/DEPENDS
+++ b/net/ssocks/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends openssl \
+optional_depends SSL \
                  "--with-ssl" \
                  "--without-ssl" \
                  "for SSL support"
diff --git a/net/ssocks/HISTORY b/net/ssocks/HISTORY
index c4e7cc5..8d67de0 100644
--- a/net/ssocks/HISTORY
+++ b/net/ssocks/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-24 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD: Fix LIBS, must include -lcrypto with -lssl
        * DETAILS: updated spell to 0.0.14
diff --git a/net/strongswan/DEPENDS b/net/strongswan/DEPENDS
index 4690fe0..f4260ad 100755
--- a/net/strongswan/DEPENDS
+++ b/net/strongswan/DEPENDS
@@ -6,7 +6,7 @@ depends pkgconfig &&
   optional_depends libgcrypt '--enable-gcrypt' \
                             '' \
                             'libgcrypt plugin' &&
-  optional_depends openssl  '--enable-openssl' \
+  optional_depends SSL  '--enable-openssl' \
                             '' \
                             'OpenSSL crypto plugin' &&
   optional_depends openssh  '--enable-agent' \
diff --git a/net/strongswan/HISTORY b/net/strongswan/HISTORY
index 787ccef..4e02bf7 100644
--- a/net/strongswan/HISTORY
+++ b/net/strongswan/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/net/stunnel/DEPENDS b/net/stunnel/DEPENDS
index 3541952..a3e8f08 100755
--- a/net/stunnel/DEPENDS
+++ b/net/stunnel/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 
 optional_depends tcp_wrappers \
                  "--enable-libwrap" \
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY
index 8553af6..a44beec 100644
--- a/net/stunnel/HISTORY
+++ b/net/stunnel/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-02-03 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.56; added mirrors for pgp signature;
          ACTIVE_FTP=on (official ftp doesn't support passive ftp connections)
diff --git a/net/tcpdump/DEPENDS b/net/tcpdump/DEPENDS
index 8abeac7..d55cd2c 100755
--- a/net/tcpdump/DEPENDS
+++ b/net/tcpdump/DEPENDS
@@ -1,6 +1,6 @@
 depends libpcap &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-crypto" \
                  "--without-crypto" \
                  "for SSL support"
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index 79aa1a4..c20e6f1 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-21 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.6.1
 
diff --git a/net/tinc/DEPENDS b/net/tinc/DEPENDS
index 3a0df5c..96714e6 100755
--- a/net/tinc/DEPENDS
+++ b/net/tinc/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 
 optional_depends zlib \
                  "--enable-zlib" \
diff --git a/net/tinc/HISTORY b/net/tinc/HISTORY
index f3ddaf3..c2ec79b 100644
--- a/net/tinc/HISTORY
+++ b/net/tinc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.24
 
diff --git a/net/tor/DEPENDS b/net/tor/DEPENDS
index b1b9ae4..4834af8 100755
--- a/net/tor/DEPENDS
+++ b/net/tor/DEPENDS
@@ -1,4 +1,4 @@
-depends  openssl  &&
+depends  SSL  &&
 depends  libevent &&
 
 optional_depends geoip "" "" "to collect per-country statistics" &&
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 11af43e..edc500b 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: versions 0.2.4.22, 0.2.5.4-alpha
 
diff --git a/net/unbound/DEPENDS b/net/unbound/DEPENDS
index a5e5a4d..961e4c2 100755
--- a/net/unbound/DEPENDS
+++ b/net/unbound/DEPENDS
@@ -1,8 +1,8 @@
 depends expat &&
 depends ldns &&
-depends openssl &&
+depends SSL &&
 
-optional_depends -sub "1.0" openssl \
+optional_depends -sub "1.0" SSL \
                             "--enable-gost" \
                             "--disable-gost" \
                             "for GOST support" &&
diff --git a/net/unbound/HISTORY b/net/unbound/HISTORY
index 1a3bfce..910b6b5 100644
--- a/net/unbound/HISTORY
+++ b/net/unbound/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-02-02 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.16
 
diff --git a/net/vtun/DEPENDS b/net/vtun/DEPENDS
index d552e50..361f9a9 100755
--- a/net/vtun/DEPENDS
+++ b/net/vtun/DEPENDS
@@ -1,6 +1,6 @@
 depends  flex       &&
 depends  bison      &&
-depends  openssl    &&
+depends  SSL    &&
 
 optional_depends  "zlib"                                \
                   "--enable-zlib"                       \
diff --git a/net/vtun/HISTORY b/net/vtun/HISTORY
index a334105..cffdeda 100644
--- a/net/vtun/HISTORY
+++ b/net/vtun/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 3.0.1
          Removed UPDATED
diff --git a/net/wvstreams/DEPENDS b/net/wvstreams/DEPENDS
index 36dc7da..6e7f67ed 100755
--- a/net/wvstreams/DEPENDS
+++ b/net/wvstreams/DEPENDS
@@ -1,5 +1,5 @@
 depends -sub CXX gcc     &&
-depends openssl &&
+depends SSL &&
 depends zlib    &&
 depends xplc    &&
 
@@ -19,8 +19,8 @@ optional_depends valgrind                                  \
                  "--with-valgrind"                         \
                  "--without-valgrind"                      \
                  "Enable valgrind support"                 &&
-optional_depends openssl                                   \
-                 "--with-openssl"                          \
-                 "--without-openssl"                       \
+optional_depends SSL                                   \
+                 "--with-opennssl"                          \
+                 "--without-opennssl"                       \
                  "Enable OpenSSL support"
 
diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index 1dc943e..96bc8a6 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-25 Ladislav Hagara <hgr AT vabo.cz>
        * PRE_BUILD: updated to apply openssl 1.0.0 and parallel-make patches
        * wvstreams-4.6.1-{openssl-1.0.0,parallel-make}.patch: added from 
Gentoo
diff --git a/perl-cpan/crypt-ssleay/DEPENDS b/perl-cpan/crypt-ssleay/DEPENDS
index 51962c1..55935a3 100755
--- a/perl-cpan/crypt-ssleay/DEPENDS
+++ b/perl-cpan/crypt-ssleay/DEPENDS
@@ -1,4 +1,4 @@
-runtime_depends openssl &&
+runtime_depends SSL &&
 depends perl &&
 runtime_depends mime-base64 &&
 runtime_depends lwp
diff --git a/perl-cpan/crypt-ssleay/HISTORY b/perl-cpan/crypt-ssleay/HISTORY
index 6a56d6e..8a7890e 100644
--- a/perl-cpan/crypt-ssleay/HISTORY
+++ b/perl-cpan/crypt-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-10 Eric Sandall <sandalle AT sourcemage.org>
        * Created
 
diff --git a/perl-cpan/net-ssleay/DEPENDS b/perl-cpan/net-ssleay/DEPENDS
index 97a2213..e7842e3 100755
--- a/perl-cpan/net-ssleay/DEPENDS
+++ b/perl-cpan/net-ssleay/DEPENDS
@@ -1,2 +1,2 @@
 depends perl &&
-depends openssl
+depends SSL
diff --git a/perl-cpan/net-ssleay/HISTORY b/perl-cpan/net-ssleay/HISTORY
index 9e8ee59..ff9a83b 100644
--- a/perl-cpan/net-ssleay/HISTORY
+++ b/perl-cpan/net-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.42; renewed urls
 
diff --git a/perl-cpan/parrot/DEPENDS b/perl-cpan/parrot/DEPENDS
index be5e519..f7a9ab3 100755
--- a/perl-cpan/parrot/DEPENDS
+++ b/perl-cpan/parrot/DEPENDS
@@ -4,7 +4,7 @@ optional_depends  gmp  ""  "--without-gmp"  "for GMP support" 
   &&
 optional_depends  gdbm ""  "--without-gdbm" "for GDBM support"   &&
 optional_depends  icu  ""  "--without-icu"  "for ICU support"    &&
 optional_depends  GLUT     ''  '--without-opengl' "OpenGL support" &&
-optional_depends  openssl  '' '--without-crypto' 'crypto support'  &&
+optional_depends  SSL  '' '--without-crypto' 'crypto support'  &&
 optional_depends  pcre     '' '--without-pcre' 'regex support'   &&
 optional_depends  readline '' '' 'line editing'    &&
 optional_depends  gettext  '' '--without-gettext' 'multilingual support' &&
diff --git a/perl-cpan/parrot/HISTORY b/perl-cpan/parrot/HISTORY
index 9d3df2d..6acb022 100644
--- a/perl-cpan/parrot/HISTORY
+++ b/perl-cpan/parrot/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.7.0/5.0.0
 
diff --git a/php-pear/php-dev/DEPENDS b/php-pear/php-dev/DEPENDS
index 9ed5881..1f039ef 100755
--- a/php-pear/php-dev/DEPENDS
+++ b/php-pear/php-dev/DEPENDS
@@ -75,9 +75,9 @@ optional_depends  gmp                                    \
                   "--without-gmp"                        \
                   "GNU multi precision library support"  &&
 
-optional_depends  openssl                \
-                  "--with-openssl=/usr"  \
-                  "--without-openssl"    \
+optional_depends  SSL                \
+                  "--with-opennssl=/usr"  \
+                  "--without-opennssl"    \
                   "for OpenSSL support"  &&
 
 optional_depends  gettext                    \
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 7db77c5..9c06a31 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index adf9b77..af0437b 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -71,15 +71,15 @@ optional_depends C-CLIENT \
                  "--with-imap=${INSTALL_ROOT}/usr" "--without-imap" \
                  "for IMAP support" &&
 
-optional_depends openssl \
-                 "--with-openssl" "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" "--without-openssl" \
                  "for OpenSSL support" &&
 
 if is_depends_enabled $SPELL $(get_spell_provider $SPELL C-CLIENT); then
-  if is_depends_enabled $SPELL openssl; then
+  if is_depends_enabled $SPELL SSL; then
     list_add "PHP5_OPTS" "--with-imap-ssl"
   else
-    optional_depends openssl \
+    optional_depends SSL \
                      "--with-imap-ssl" \
                      "--without-imap-ssl" \
                      "for SSL support with IMAP (but not elsewhere)"
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 1f45419..1dc499c 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,14 +1,14 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.4.31
-  SECURITY_PATCH=8
+         VERSION=5.4.32
+  SECURITY_PATCH=9
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-     
SOURCE_HASH=sha512:58ff77ed7cfe00ae92ad9d30f934af59e532a0d562f31701807616ae993eafa5b7eafe893f2648f12e02a02018012b31b27e1bb3c4d3b2fc0642e51cf5bb5486
+     
SOURCE_HASH=sha512:a2bf1c4977bfb36502163f5fd1ba81b6d7ac2a99f77c7e584761efbd6bbbc3ba0ec493ccc5bf61d78f956c8666b84b1b4bbfbbb778d2834541b47a9a5cfd63e0
 elif [[ $PHP5_BRANCH == previous ]]; then
-         VERSION=5.3.28
-  SECURITY_PATCH=22
-     
SOURCE_HASH=sha512:84b58379ca12748ae2c9ba37de28c80e78bf8e5b96cf9715b1eafd297a3e155089e9560d6fee7b031be0139dcbe954a9c0717b583ff1fb1cd8a89308b5f6dfd3
+         VERSION=5.3.29
+  SECURITY_PATCH=23
+     
SOURCE_HASH=sha512:c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
 #   if [[ $PHP5_SUHOSIN == y ]]; then
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 5bb1cd2..068fdef 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,18 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 5.4.32 (stable); SECURITY_PATCH++
+         (CVE-2014-2497, CVE-2014-3538, CVE-2014-3587, CVE-2014-3597,
+         CVE-2014-4670, CVE-2014-4698, CVE-2014-5120)
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: openssl => SSL
+       * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
+2014-08-15 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 5.3.29 (previous); SECURITY_PATCH++
+
 2014-07-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.4.31 (stable)
 
diff --git a/php-pear/php4/DEPENDS b/php-pear/php4/DEPENDS
index 311d43f..323c6cf 100755
--- a/php-pear/php4/DEPENDS
+++ b/php-pear/php4/DEPENDS
@@ -67,9 +67,9 @@ optional_depends  gmp                                    \
                   "--without-gmp"                        \
                   "GNU multi precision library support"  &&
 
-optional_depends  openssl                \
-                  "--with-openssl=/usr"  \
-                  "--without-openssl"    \
+optional_depends  SSL                \
+                  "--with-opennssl=/usr"  \
+                  "--without-opennssl"    \
                   "for OpenSSL support"  &&
 
 optional_depends  gettext                    \
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index 43fbe06..4bf3ea6 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index e5101f1..ea82dbc 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cups-filters
-         VERSION=1.0.54
-     
SOURCE_HASH=sha512:eee17f9fbc82f70857123ad62683e7136408f6888b7b666b3a787863c855fc00436d222fa2996cacedcc7245b24d9f08e9110cad8a7d17ca8e37e2210f86aab2
+         VERSION=1.0.58
+     
SOURCE_HASH=sha512:bfff717c971864c142880927025dbe459c1135596c9b37fcefd62e7cefd4d9eca3338eb2e924fc3a5fbfabf1fc013465ee7aa63455d7445482406b403531889c
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index 0960d3b..7366469 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.58
+
 2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.54
 
diff --git a/printer/cups-old/DEPENDS b/printer/cups-old/DEPENDS
index 1152a40..0e85430 100755
--- a/printer/cups-old/DEPENDS
+++ b/printer/cups-old/DEPENDS
@@ -10,7 +10,7 @@ optional_depends  "linux-pam"                     \
                   "--disable-pam"                 \
                   "for pluggable authentication"  &&
 
-optional_depends  "openssl"                       \
+optional_depends  "SSL"                       \
                   "--enable-ssl"                  \
                   "--disable-ssl"                 \
                   "for encrypted communications"
diff --git a/printer/cups-old/HISTORY b/printer/cups-old/HISTORY
index 7cdfbeb..96aa25a 100644
--- a/printer/cups-old/HISTORY
+++ b/printer/cups-old/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index 2b3c16d..4a0a367 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -7,11 +7,8 @@ if [[ $EXTRA_LANG == y ]]; then
       all de es fr ja pl sv
 fi &&
 
-config_query_option CUPS_OPTS \
-                    "Do you want to use network default printers" \
-                    y \
-                    '--enable-use-network-default' \
-                    '--disable-use-network-default' &&
+config_query_list CUPS_SSL "Which SSL backend do you want for https and 
ftps?" none gnutls SSL &&
+
 config_query_option CUPS_OPTS \
                     "Do you want to enable raw printing" \
                     n \
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index f7d5dff..1713424 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -41,15 +41,11 @@ optional_depends  "linux-pam"                     \
                   "--disable-pam"                 \
                   "for pluggable authentication"  &&
 
-optional_depends  "gnutls"                        \
-                  "--enable-gnutls"               \
-                  ""               \
-                  "use GNU TLS for SSL/TLS support"  &&
-
-optional_depends  "openssl"                       \
-                  "--enable-openssl"                  \
-                  ""                 \
-                  "for encrypted communications"  &&
+case $CUPS_SSL in
+  gnutls) depends gnutls "--enable-gnutls --disable-openssl" ;;
+  SSL)    depends SSL   "--enable-openssl --disable-gnutls" ;;
+  none)   OPTS+=" --disable-ssl " ;;
+esac &&
 
 optional_depends  "acl"                                           \
                   ""                                              \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 4bb484e..795d441 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,10 @@
+2014-08-23  Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS, CONFIGURE: improve SSL/gnutls choice - remive obsolete 
flags
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+         fix ssl
+
 2014-07-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.7.4
          SECURITY_PATCH++, fix CVE-2014-353
diff --git a/printer/gtklp/DEPENDS b/printer/gtklp/DEPENDS
index f1f4c11..5094ee0 100755
--- a/printer/gtklp/DEPENDS
+++ b/printer/gtklp/DEPENDS
@@ -3,7 +3,7 @@ depends gtk+2 &&
 depends intltool &&
 depends CUPS &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-ssl" \
                  "--disable-ssl" \
                  "for SSL/TLS support" &&
diff --git a/printer/gtklp/HISTORY b/printer/gtklp/HISTORY
index 0fe972d..17ad319 100644
--- a/printer/gtklp/HISTORY
+++ b/printer/gtklp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2.9; renewed website
        * DEPENDS: added missing dependencies
diff --git a/printer/gutenprint/BUILD b/printer/gutenprint/BUILD
index 7e3ff0e..ef085be 100755
--- a/printer/gutenprint/BUILD
+++ b/printer/gutenprint/BUILD
@@ -1,2 +1,3 @@
 OPTS="$GTP_LANG $OPTS" &&
+LDFLAGS+=" -Wl,--as-needed" &&
 default_build
diff --git a/printer/gutenprint/DEPENDS b/printer/gutenprint/DEPENDS
index 3a5946e..d40a015 100755
--- a/printer/gutenprint/DEPENDS
+++ b/printer/gutenprint/DEPENDS
@@ -12,10 +12,4 @@ optional_depends gimp \
 optional_depends "CUPS" \
                  "--with-cups --enable-cups-ppds" \
                  "--disable-cups" \
-                 "for CUPS support"  &&
-# make the gnutls dependency explicit
-if is_depends_enabled $SPELL cups;then
-  if is_depends_enabled cups gnutls;then
-    depends gnutls
-  fi
-fi
+                 "for CUPS support"
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index ccea0fc..acca22b 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: temove spurious gnutls check
+       * BUILD: force LDFLAGS="-Wl,--as-needed"
+         this previous misleading references to gnutls/openssl, which are 
inherited from cups
+
 2014-05-21 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.2.10
 
diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS
index 2981bd3..6631b2d 100755
--- a/printer/hplip/DEPENDS
+++ b/printer/hplip/DEPENDS
@@ -1,7 +1,7 @@
 depends  LIBUSB    &&
 depends  cups      &&
 depends  JPEG      &&
-depends  openssl   &&
+depends  SSL   &&
 depends  python    &&
 depends  dbus      &&
 depends  dbus-python &&
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 7d7b357..18af009 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-07-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.13.7
 
diff --git a/printer/pt/DEPENDS b/printer/pt/DEPENDS
index 0913c40..72fe4f5 100755
--- a/printer/pt/DEPENDS
+++ b/printer/pt/DEPENDS
@@ -1,7 +1,7 @@
 depends  CUPS  &&
 depends  gtk+  &&
 
-optional_depends  "openssl"                       \
+optional_depends  "SSL"                       \
                   "--enable-ssl"                  \
                   "--disable-ssl"                 \
                   "for encrypted communications"
diff --git a/printer/pt/HISTORY b/printer/pt/HISTORY
index 0f6d360..c8ef0ce 100644
--- a/printer/pt/HISTORY
+++ b/printer/pt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-17-06 Bor Kraljič <pyrobor AT ver.si>
        * pt-1.0.2.tar.gz.sig: resigned sources due to gpg error (bug #15746)
 
diff --git a/printer/zint/DEPENDS b/printer/zint/DEPENDS
index da62c1f..5a1980b 100755
--- a/printer/zint/DEPENDS
+++ b/printer/zint/DEPENDS
@@ -1,7 +1,7 @@
 depends -sub CXX gcc &&
 depends cmake   &&
 depends libpng  &&
-depends openssl &&
+depends SSL &&
 depends zlib    &&
 optional_depends qt4 '' '' 'build QT4 frontend'
 #optional_depends qrencode '' '' 'supports QR Code model 2 barcodes'
diff --git a/printer/zint/HISTORY b/printer/zint/HISTORY
index 6f7cb5a..e525472 100644
--- a/printer/zint/HISTORY
+++ b/printer/zint/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-11-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.4.2
          new URL
diff --git a/python-pypi/arandr/DEPENDS b/python-pypi/arandr/DEPENDS
index a4e7dc2..3816a89 100755
--- a/python-pypi/arandr/DEPENDS
+++ b/python-pypi/arandr/DEPENDS
@@ -1,3 +1,4 @@
+depends python &&
 depends xrandr &&
 depends docutils &&
 depends pygtk2
diff --git a/python-pypi/arandr/DETAILS b/python-pypi/arandr/DETAILS
index e141090..efa868e 100755
--- a/python-pypi/arandr/DETAILS
+++ b/python-pypi/arandr/DETAILS
@@ -1,9 +1,9 @@
            SPELL=arandr
-         VERSION=0.1.6
+         VERSION=0.1.7.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://christian.amsuess.com/tools/arandr/files/$SOURCE
-     
SOURCE_HASH=sha512:4dc98d7c8a9ec05e5040e6c29f99aa991b79444c583fbc38ad8b2a11844f748f021ed7cd93754809230c28bc9af21bea841754c09dc80cce7198efb0cb0b56c4
+     
SOURCE_HASH=sha512:1e3b8ec0d98d38515a159c7695abefd7451a3fa6b7d43641766c997aab63152dfa76c2d9208ba2848ce588dd033a8e85ae31b97acdd4aa5e450fd87725cc21ce
         WEB_SITE=http://christian.amsuess.com/tools/arandr/
          ENTERED=20120607
       LICENSE[0]=GPL
diff --git a/python-pypi/arandr/HISTORY b/python-pypi/arandr/HISTORY
index 2f15c26..8d00521 100644
--- a/python-pypi/arandr/HISTORY
+++ b/python-pypi/arandr/HISTORY
@@ -1,2 +1,6 @@
+2014-08-21 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 0.1.7.1
+       * DEPENDS: Add dependency on python
+
 2012-06-07 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS: spell created, version 0.1.6
diff --git a/python-pypi/attic/DEPENDS b/python-pypi/attic/DEPENDS
index 9f41721..e1f77c1 100755
--- a/python-pypi/attic/DEPENDS
+++ b/python-pypi/attic/DEPENDS
@@ -1,6 +1,6 @@
 depends python3        &&
 depends msgpack-python &&
-depends pyopenssl      &&
+depends pySSL      &&
 depends cython         &&
 optional_depends python-llfuse \
                  "" \
diff --git a/python-pypi/attic/HISTORY b/python-pypi/attic/HISTORY
index f8b5f92..b9ad69f 100644
--- a/python-pypi/attic/HISTORY
+++ b/python-pypi/attic/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
        * DEPENDS: depend on pyopenssl instead of openssl
diff --git a/python-pypi/cherrypy/DEPENDS b/python-pypi/cherrypy/DEPENDS
index ced7c27..ddc690d 100755
--- a/python-pypi/cherrypy/DEPENDS
+++ b/python-pypi/cherrypy/DEPENDS
@@ -1,5 +1,5 @@
 depends python &&
 depends SETUPTOOLS &&
 
-suggest_depends pyopenssl "" "" "for OpenSSL support" &&
+suggest_depends pySSL "" "" "for OpenSSL support" &&
 suggest_depends flup "" "" "for WSGI-enabled webserver or adapter support"
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index dad4bd4..fc840b6 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-05 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.5.0 (3)
 
diff --git a/python-pypi/formalchemy/DEPENDS b/python-pypi/formalchemy/DEPENDS
index c925abc..35ba2e3 100755
--- a/python-pypi/formalchemy/DEPENDS
+++ b/python-pypi/formalchemy/DEPENDS
@@ -1,5 +1,4 @@
-depends python     &&
-depends SETUPTOOLS &&
+. $SECTION_DIRECTORY/PY_DEPENDS &&
 depends webhelpers &&
 depends tempita    &&
 depends sqlalchemy
diff --git a/python-pypi/formalchemy/DETAILS b/python-pypi/formalchemy/DETAILS
index b9bbc8a..499fa8b 100755
--- a/python-pypi/formalchemy/DETAILS
+++ b/python-pypi/formalchemy/DETAILS
@@ -1,7 +1,7 @@
            SPELL=formalchemy
           SPELLX=FormAlchemy
-         VERSION=1.4.2
-     
SOURCE_HASH=sha512:3cdd63f4ebf78d8ba3210faa2e332e4cff04fb30bf02fa515017e83ef0e05387dbc0c018cf5d74f9a484b99f7711b5c3ae1d22cfb38a9a1b025fe59387cfe930
+         VERSION=1.5.1
+     
SOURCE_HASH=sha512:1992912537122dfd8e4da975477170d48d646e1b701103ed507f4c9e073c37ac47a3c99033a3d4de866ebc4b45f01917db325a8a6e2281fb5437bc54552f1374
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    WEB_SITE=http://doc.formalchemy.org/
diff --git a/python-pypi/formalchemy/HISTORY b/python-pypi/formalchemy/HISTORY
index b4c6ed1..9aafabe 100644
--- a/python-pypi/formalchemy/HISTORY
+++ b/python-pypi/formalchemy/HISTORY
@@ -1,3 +1,7 @@
+2014-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.5.1
+       * DEPENDS: add python3 support
+
 2012-03-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.4.2
          new website &url
diff --git a/python-pypi/gtklick/DETAILS b/python-pypi/gtklick/DETAILS
index 5b0eb28..846bfec 100755
--- a/python-pypi/gtklick/DETAILS
+++ b/python-pypi/gtklick/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gtklick
-         VERSION=0.4.0
+         VERSION=0.6.4
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://das.nasophon.de/download/$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:7f78abd4d51408739df87bfc5d1a6cc297bec32ff2cba3e1c4a85c30c152f2001b11cba80c50c100c70ee2d59a2f16de553d7b85987e7166c5ecdb8e7cb2483a
+     
SOURCE_HASH=sha512:8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://das.nasophon.de/gtklick/
       LICENSE[0]=GPL
diff --git a/python-pypi/gtklick/HISTORY b/python-pypi/gtklick/HISTORY
index 0d8d90b..e2c4a1d 100644
--- a/python-pypi/gtklick/HISTORY
+++ b/python-pypi/gtklick/HISTORY
@@ -1,2 +1,5 @@
+2014-08-14 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: bump to 0.6.4
+
 2008-12-13 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
diff --git a/python-pypi/hatta/DEPENDS b/python-pypi/hatta/DEPENDS
index 0a5fdb8..1d26058 100755
--- a/python-pypi/hatta/DEPENDS
+++ b/python-pypi/hatta/DEPENDS
@@ -3,4 +3,6 @@ depends werkzeug &&
 depends mercurial &&
 depends jinja2 &&
 
+suggest_depends pygments "" "" "for code highlighting support" &&
+
 suggest_depends pillow "" "" "for thumbnails rendering support"
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index 57b1ce9..cad57ba 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,6 @@
+2014-08-04 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: added pygments suggest dep
+
 2014-08-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * PRE_BUILD: apply patch
diff --git a/python-pypi/m2crypto/DEPENDS b/python-pypi/m2crypto/DEPENDS
index d6c3fd8..bc62d48 100755
--- a/python-pypi/m2crypto/DEPENDS
+++ b/python-pypi/m2crypto/DEPENDS
@@ -1,3 +1,3 @@
 depends python &&
-depends openssl &&
+depends SSL &&
 depends swig
diff --git a/python-pypi/m2crypto/HISTORY b/python-pypi/m2crypto/HISTORY
index 05ff9ba..bce0b40 100644
--- a/python-pypi/m2crypto/HISTORY
+++ b/python-pypi/m2crypto/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-01-13 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS, DETAILS: cleaned up
        * BUILD: useless, due to the new build system of section
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 161a22b..0fa479c 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mercurial
-         VERSION=3.0.2
-     
SOURCE_HASH=sha512:3ccd2c8cbe42f929dbaa2921989c2686d60b6961d6ad32471a4fbc91f5594a2398df913dce0c12bac5f7dd81036442a044c0e2247025cd010ab5e3e2265d9926
+         VERSION=3.1
+     
SOURCE_HASH=sha512:1ee2fe7a241bf81087e55d9e4ee8fa986f41bb0655d4828d244322c18f3958a1f3111506e2df15aefcf86100b4fe530fcab2d4c041b5945599ed3b3a889d50f5
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index e9ff43c..e479c8e 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2014-08-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: updated to 3.1
+
 2014-07-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.0.2
 
diff --git a/python-pypi/papyon/DEPENDS b/python-pypi/papyon/DEPENDS
index 3fbf183..275b104 100755
--- a/python-pypi/papyon/DEPENDS
+++ b/python-pypi/papyon/DEPENDS
@@ -1,3 +1,3 @@
-depends pyopenssl &&
+depends pySSL &&
 depends pygobject &&
 depends pycrypto 
diff --git a/python-pypi/papyon/HISTORY b/python-pypi/papyon/HISTORY
index 7e68022..57c8dd5 100644
--- a/python-pypi/papyon/HISTORY
+++ b/python-pypi/papyon/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.5.6
 
diff --git a/python-pypi/pyicqt/DEPENDS b/python-pypi/pyicqt/DEPENDS
index 031d256..5fcb97a 100755
--- a/python-pypi/pyicqt/DEPENDS
+++ b/python-pypi/pyicqt/DEPENDS
@@ -1,5 +1,5 @@
 depends python &&
-depends pyopenssl &&
+depends pySSL &&
 depends twisted &&
 depends zopeinterface &&
 depends pycrypto &&
diff --git a/python-pypi/pyicqt/HISTORY b/python-pypi/pyicqt/HISTORY
index d918b99..e9a2ce8 100644
--- a/python-pypi/pyicqt/HISTORY
+++ b/python-pypi/pyicqt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: pil -> pillow
 
diff --git a/python-pypi/pymsn/DEPENDS b/python-pypi/pymsn/DEPENDS
index 5ffcf5b..63cb310 100755
--- a/python-pypi/pymsn/DEPENDS
+++ b/python-pypi/pymsn/DEPENDS
@@ -1,3 +1,3 @@
 depends pygobject &&
-depends pyopenssl &&
+depends pySSL &&
 depends pycrypto
diff --git a/python-pypi/pymsn/HISTORY b/python-pypi/pymsn/HISTORY
index de9dc45..a9d476c 100644
--- a/python-pypi/pymsn/HISTORY
+++ b/python-pypi/pymsn/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-01-27 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
 
diff --git a/python-pypi/pymsnt/DEPENDS b/python-pypi/pymsnt/DEPENDS
index aa5470f..5bd9545 100755
--- a/python-pypi/pymsnt/DEPENDS
+++ b/python-pypi/pymsnt/DEPENDS
@@ -2,7 +2,7 @@ if [[ $PYMSNT_SCM == y ]]; then
 depends mercurial
 fi &&
 depends twisted &&
-depends pyopenssl &&
+depends pySSL &&
 depends pycrypto &&
 depends python &&
 optional_depends pyepoll "" "" "For epool reactor support" &&
diff --git a/python-pypi/pymsnt/HISTORY b/python-pypi/pymsnt/HISTORY
index e6092d6..ef0478b 100644
--- a/python-pypi/pymsnt/HISTORY
+++ b/python-pypi/pymsnt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: pil -> pillow
 
diff --git a/python-pypi/pyopenssl/DEPENDS b/python-pypi/pyopenssl/DEPENDS
index a7039a1..d67b875 100755
--- a/python-pypi/pyopenssl/DEPENDS
+++ b/python-pypi/pyopenssl/DEPENDS
@@ -1,2 +1,2 @@
 . $SECTION_DIRECTORY/PY_DEPENDS &&
-depends openssl
+depends SSL
diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY
index f595f13..a818a58 100644
--- a/python-pypi/pyopenssl/HISTORY
+++ b/python-pypi/pyopenssl/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.14
 
diff --git a/python-pypi/pypdf2/DETAILS b/python-pypi/pypdf2/DETAILS
index 3a8c2eb..4be6dca 100755
--- a/python-pypi/pypdf2/DETAILS
+++ b/python-pypi/pypdf2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pypdf2
           SPELLX=PyPDF2
-         VERSION=1.19
-     
SOURCE_HASH=sha512:d1c6746a90870ce0537af09f2a32bc5fd00b19f7c7d1c9e242248b00e767b031bcbacf31fe2b608f43730fb56a1c19d0cf7c7f99268a1ffe86475f913ebc8de9
+         VERSION=1.23
+     
SOURCE_HASH=sha512:eb5864695840eda7df48804c80eb733d6efa719ec84662c7c51e3c036079a094efa42a39a2fd151234a690b70f1f6446e9698298a710f8ee0604a39ce53e3591
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=https://pypi.python.org/pypi/PyPDF2
diff --git a/python-pypi/pypdf2/HISTORY b/python-pypi/pypdf2/HISTORY
index 4feb2f5..fe741ed 100644
--- a/python-pypi/pypdf2/HISTORY
+++ b/python-pypi/pypdf2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.23
+
 2013-12-15 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.19
          url - use pypi
diff --git a/python-pypi/python-ldap/DEPENDS b/python-pypi/python-ldap/DEPENDS
index aedea46..99998cc 100755
--- a/python-pypi/python-ldap/DEPENDS
+++ b/python-pypi/python-ldap/DEPENDS
@@ -5,4 +5,4 @@ if is_depends_enabled openldap cyrus-sasl; then
   optional_depends LIBSASL "" "" "for SASL support"
 fi &&
 
-optional_depends openssl "" "" "for encrypted communications"
+optional_depends SSL "" "" "for encrypted communications"
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index b22f2cd..4b64b4b 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,9 +1,10 @@
            SPELL=python-ldap
-         VERSION=2.4.13
-     
SOURCE_HASH=sha512:c77c487b48fa63b9bb9926fca0082834f6a2c6c7e9be89849e59b45a9e7c18146e4a7a982fe0a0504659ba680c39823eea29f349842a9f8df36acf8f10bab975
+         VERSION=2.4.15
           SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=https://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+    SOURCE_HINTS="no-check-certificate"
+     
SOURCE_HASH=sha512:2e2d5ecc4f96a63465dbc0da3b8a524729cf199f95eb559beeea5466da4fa9667f61aff7e482f73d6581d24477cb4780fccd599619fbb92b2810bdc81f2de310
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
       LICENSE[0]=PYTHON
         WEB_SITE=http://www.python-ldap.org/
          ENTERED=20020416
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index b859263..8a6cd95 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,10 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.4.15; added source hints to skip ssl 
check
+         on pypi
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.4.13
 
diff --git a/python-pypi/roundup/DEPENDS b/python-pypi/roundup/DEPENDS
index 87de9ab..566f0fb 100755
--- a/python-pypi/roundup/DEPENDS
+++ b/python-pypi/roundup/DEPENDS
@@ -1,7 +1,8 @@
 depends python &&
 
 suggest_depends pytz "" "" "for the full timezone support (recommended)" &&
-suggest_depends pyopenssl "" "" "for SSL support in built-in server" &&
+suggest_depends jinja2 "" "" "for template engine support 
(${PROBLEM_COLOR}experimental${DEFAULT_COLOR})" &&
+suggest_depends pySSL "" "" "for SSL support in built-in server" &&
 suggest_depends pysqlite "" "" "for SQLite database support via pysqlite" &&
 suggest_depends -sub SQLITE python "" "" "for SQLite database support via 
native Python module" &&
 suggest_depends psycopg2 "" "" "for PostgreSQL database support" &&
diff --git a/python-pypi/roundup/DETAILS b/python-pypi/roundup/DETAILS
index dcfa844..ac7b7af 100755
--- a/python-pypi/roundup/DETAILS
+++ b/python-pypi/roundup/DETAILS
@@ -1,9 +1,12 @@
            SPELL=roundup
-         VERSION=1.4.20
+         VERSION=1.5.0
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:62a1ca744afb7e17a4e165d695e1623d73810a3d3e6c374a4b73d010fcc3e93756ca0bfb6dc4cf7937acd1156c4b938e881e2e9ffd9b0c8e4c4366b730cc43b1
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=roundup.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://roundup.sourceforge.net/
       LICENSE[0]=PYTHON
diff --git a/python-pypi/roundup/HISTORY b/python-pypi/roundup/HISTORY
index d35c918..bc4dda0 100644
--- a/python-pypi/roundup/HISTORY
+++ b/python-pypi/roundup/HISTORY
@@ -1,3 +1,12 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+2014-08-15 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.5.0; switched to upstream gpg checking
+       * DEPENDS: added jinja2 suggest dep
+       * roundup.gpg: added, imported F3FE5730 public key (Ralf Schlatterbeck
+         (ELG-E keypair) <ralf AT zoo.priv.at>)
+
 2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added suggest dependency on native SQLite extension for
          Python
diff --git a/python-pypi/roundup/roundup.gpg b/python-pypi/roundup/roundup.gpg
new file mode 100644
index 0000000..2cea775
Binary files /dev/null and b/python-pypi/roundup/roundup.gpg differ
diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index 5e344f6..f87ac3b 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
            SPELL=scons
-         VERSION=2.3.1
-     
SOURCE_HASH=sha512:207fd0df949d1130afecc168a3b643fee2a17c53c3f9704260bbd2e462fdf24fd6606d7269ceaa664d5b5989cac34d6b9a5a460dfd0d6b69e651cfd85a0d45d2
+         VERSION=2.3.2
+     
SOURCE_HASH=sha512:90e6fb38cb39e030f0b77cf46f76a4ffef141d991087bd22a9bd0d012d568375b32084437e408c22bda54fa5517f294522ddd718838fef2598d892576cc2ae38
           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 f8e54a4..352d97e 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,6 @@
+2014-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.3.2
+
 2014-04-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.1
 
diff --git a/python-pypi/scrapely/DEPENDS b/python-pypi/scrapely/DEPENDS
index 7b223b7..6126885 100755
--- a/python-pypi/scrapely/DEPENDS
+++ b/python-pypi/scrapely/DEPENDS
@@ -2,4 +2,4 @@ depends python       &&
 depends numpy        &&
 depends SETUPTOOLS   &&
 depends w3lib        &&
-depends pyopenssl
+depends pySSL
diff --git a/python-pypi/scrapely/HISTORY b/python-pypi/scrapely/HISTORY
index 81e5ff5..da0ffa6 100644
--- a/python-pypi/scrapely/HISTORY
+++ b/python-pypi/scrapely/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Use get_scm_version
 
diff --git a/python-pypi/scrapy/DEPENDS b/python-pypi/scrapy/DEPENDS
index ff17518..13e0dde 100755
--- a/python-pypi/scrapy/DEPENDS
+++ b/python-pypi/scrapy/DEPENDS
@@ -4,4 +4,4 @@ depends twisted      &&
 depends lxml         &&
 depends simplejson   &&
 depends w3lib        &&
-depends pyopenssl
+depends pySSL
diff --git a/python-pypi/scrapy/HISTORY b/python-pypi/scrapy/HISTORY
index 2a1c3e5..9791ba9 100644
--- a/python-pypi/scrapy/HISTORY
+++ b/python-pypi/scrapy/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-25 Bor Kraljič <pyrobor AT ver.si>
        * DOWNLOAD: source $GRIMOIRE/hg_download.function before using 
hg_download
 
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index 836ba8d..f4cedfc 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
            SPELL=setuptools
-         VERSION=5.4
-     
SOURCE_HASH=sha512:530f3d91970d07693d6327814f71dd47f3dfe82fa6ada25a8c216aea62acdf4ec22a83c07f82b80cb59f0bdb41af90e83263f08fad7ca1ebebc184eee99f7eef
+         VERSION=5.7
+     
SOURCE_HASH=sha512:2fd5ae00acf8b3224e4fb741a6d0d1af42e63cf924839c3e4f71d7e1f6cece72d85fed27cee65a406dcfc30741f74d3b76bc802d3a425b2909a0806f9fd1b781
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=https://pypi.python.org/packages/source/s/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index c27dbbb..9289324 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 5.7
+
 2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.4
 
diff --git a/python-pypi/trac-ldapplugin/12.patch 
b/python-pypi/trac-ldapplugin/12.patch
deleted file mode 100644
index ab85bbb..0000000
--- a/python-pypi/trac-ldapplugin/12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig      2009-05-07 19:25:54.000000000 +0400
-+++ setup.py   2010-12-02 00:38:07.275726702 +0300
-@@ -14,7 +14,7 @@
-     license='BSD', 
-     url='http://trac-hacks.org/wiki/LdapPlugin',
-     keywords = "trac ldap permission group acl",
--    install_requires = [ 'Trac>=0.11', 'Trac<0.12'],
-+    install_requires = [ 'Trac>=0.11', 'Trac<0.13'],
-     packages = find_packages(exclude=['ez_setup', '*.tests*']),
-     package_data = { },
-     entry_points = {
diff --git a/python-pypi/trac-ldapplugin/DETAILS 
b/python-pypi/trac-ldapplugin/DETAILS
index 7eb166f..3bc1497 100755
--- a/python-pypi/trac-ldapplugin/DETAILS
+++ b/python-pypi/trac-ldapplugin/DETAILS
@@ -1,9 +1,8 @@
            SPELL=trac-ldapplugin
-         VERSION=0.6.0
-      PATCHLEVEL=1
+         VERSION=0.7.0
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://spacehopper.org/mirrors/$SOURCE
-     
SOURCE_HASH=sha512:3632ef224d615402be29bae14b5679c5f5d6b2c610cbc08e1525c69dbbcdcd2cc81b4aa3498b1b4144f38973e6a4969cbdff2ff2c8d8964392d3b8526cfbf81d
+   SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
+     
SOURCE_HASH=sha512:56fe7e51c4505aea384d34ba519bc84445a78f433bc27959a21c1e614fb7a0b5eecdcd6b436f6456db1acc20a0b8df60472a816fc13bec0124c9d7dd00a67a4f
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://trac-hacks.org/wiki/LdapPlugin
       LICENSE[0]=BSD
diff --git a/python-pypi/trac-ldapplugin/HISTORY 
b/python-pypi/trac-ldapplugin/HISTORY
index f4b4965..ae5d7a6 100644
--- a/python-pypi/trac-ldapplugin/HISTORY
+++ b/python-pypi/trac-ldapplugin/HISTORY
@@ -1,3 +1,6 @@
+2014-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.7.0; updated mirror url
+
 2010-12-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=2
        * PRE_BUILD: apply the patch
diff --git a/python-pypi/trac-ldapplugin/PRE_BUILD 
b/python-pypi/trac-ldapplugin/PRE_BUILD
deleted file mode 100755
index 199ef17..0000000
--- a/python-pypi/trac-ldapplugin/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/12.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/perm.patch"
diff --git a/python-pypi/trac-ldapplugin/perm.patch 
b/python-pypi/trac-ldapplugin/perm.patch
deleted file mode 100644
index 420151a..0000000
--- a/python-pypi/trac-ldapplugin/perm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ldapplugin/api.py.orig
-+++ ldapplugin/api.py
-@@ -62,7 +62,7 @@
-         self._ldapcfg = {}
-         for name,value in self.config.options('ldap'):
-             if name in LDAP_DIRECTORY_PARAMS:
--                self._ldapcfg[name] = value
-+                self._ldapcfg[str(name)] = value
-         # user entry local cache
-         self._cache = {}
-         # max time to live for a cache entry
-@@ -178,7 +178,7 @@
-         self._ldapcfg = {}
-         for name,value in self.config.options('ldap'):
-             if name in LDAP_DIRECTORY_PARAMS:
--                self._ldapcfg[name] = value
-+                self._ldapcfg[str(name)] = value
-         # user entry local cache
-         self._cache = {}
-         # max time to live for a cache entry
diff --git a/python-pypi/twisted/DEPENDS b/python-pypi/twisted/DEPENDS
index e260bd8..6d25781 100755
--- a/python-pypi/twisted/DEPENDS
+++ b/python-pypi/twisted/DEPENDS
@@ -1,5 +1,5 @@
 depends python &&
 depends pycrypto &&
 depends SETUPTOOLS &&
-depends pyopenssl  &&
+depends pySSL  &&
 depends zopeinterface
diff --git a/python-pypi/twisted/HISTORY b/python-pypi/twisted/HISTORY
index dbf8480..b7fb7fd 100644
--- a/python-pypi/twisted/HISTORY
+++ b/python-pypi/twisted/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-02-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 12.0.0
          new url
diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index 9a7906a..34eb5b3 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -38,7 +38,7 @@ optional_depends  fontconfig             \
                   '-no-fontconfig'       \
                   'for FontConfig anti-aliased font support'  &&
 
-optional_depends  openssl                \
+optional_depends  SSL                \
                   '-openssl'             \
                   '-no-openssl'          \
                   'ssl support(needed for kde4)'    &&
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 5ec620f..dd614c0 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+         fix flage
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-02-05 Tommy Boatman <tboatman AT sourcemage.org>
        * BUILD: removed demos to match CONFIGURE
 
diff --git a/qt5/qtbase/PRE_SUB_DEPENDS b/qt5/qtbase/PRE_SUB_DEPENDS
index 1e426ab..b6a6106 100755
--- a/qt5/qtbase/PRE_SUB_DEPENDS
+++ b/qt5/qtbase/PRE_SUB_DEPENDS
@@ -7,7 +7,7 @@ case $THIS_SUB_DEPENDS in
   POSTGRESQL)  is_depends_enabled $SPELL postgresql && return 0;;
   SQLITE)  is_depends_enabled $SPELL sqlite && return 0;;
   ODBC)  is_depends_enabled $SPELL ODBC-MGR && return 0;;
-  SSL)  is_depends_enabled $SPELL openssl && return 0;;
+  SSL)  is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && return 
0;;
   AUDIO)   [[ $QT_AUDIO == "-audio-backend" ]] && return 0;;
   SQL)   [[ $QT_SQL == "y" ]] && return 0;;
   GTK  ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
diff --git a/qt5/qtbase/SUB_DEPENDS b/qt5/qtbase/SUB_DEPENDS
index 8eebd41..c9bd78f 100755
--- a/qt5/qtbase/SUB_DEPENDS
+++ b/qt5/qtbase/SUB_DEPENDS
@@ -24,7 +24,7 @@ ODBC) echo "Odbc support requested, forcing it" &&
      depends ODBC-MGR '-plugin-sql-odbc'
       ;;
 SSL) echo "SSL support requested, forcing it" &&
-     depends openssl
+     depends SSL
       ;;
 MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
        depends mysql "-plugin-sql-mysql"
diff --git a/ruby-raa/ruby-1.8/DEPENDS b/ruby-raa/ruby-1.8/DEPENDS
index 888f0b4..fde6986 100755
--- a/ruby-raa/ruby-1.8/DEPENDS
+++ b/ruby-raa/ruby-1.8/DEPENDS
@@ -1,4 +1,4 @@
 optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
 optional_depends tk "" "" "for tk support" &&
-optional_depends openssl "" "" "for ssl and hashing modules"
+optional_depends SSL "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index c9cb450..f081c31 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-07-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.7-p374; SECURITY_PATCH++ 
(CVE-2013-4073,
          CVE-2013-1821)
diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index 8c5f8c3..acfc465 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -3,4 +3,4 @@ optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
 optional_depends tk "" "" "for tk support" &&
 optional_depends libyaml "" "" "for YAML output (recommended)" &&
-optional_depends openssl "" "" "for ssl and hashing modules"
+optional_depends SSL "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 79fb959..1734668 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.9.3-p484; swapped ibiblio with CDN 
mirror;
          SECURITY_PATCH++ (CVE-2013-4164)
diff --git a/ruby-raa/ruby-2.0/DEPENDS b/ruby-raa/ruby-2.0/DEPENDS
index 8c5f8c3..acfc465 100755
--- a/ruby-raa/ruby-2.0/DEPENDS
+++ b/ruby-raa/ruby-2.0/DEPENDS
@@ -3,4 +3,4 @@ optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
 optional_depends tk "" "" "for tk support" &&
 optional_depends libyaml "" "" "for YAML output (recommended)" &&
-optional_depends openssl "" "" "for ssl and hashing modules"
+optional_depends SSL "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY
index d2f1414..4dcfaa5 100644
--- a/ruby-raa/ruby-2.0/HISTORY
+++ b/ruby-raa/ruby-2.0/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-18 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.0-p353
          SECURITY_PATCH++ fixes CVE-2013-4164
diff --git a/ruby-raa/ruby-2.1/DEPENDS b/ruby-raa/ruby-2.1/DEPENDS
index 8c5f8c3..acfc465 100755
--- a/ruby-raa/ruby-2.1/DEPENDS
+++ b/ruby-raa/ruby-2.1/DEPENDS
@@ -3,4 +3,4 @@ optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
 optional_depends tk "" "" "for tk support" &&
 optional_depends libyaml "" "" "for YAML output (recommended)" &&
-optional_depends openssl "" "" "for ssl and hashing modules"
+optional_depends SSL "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-2.1/HISTORY b/ruby-raa/ruby-2.1/HISTORY
index 78afaa9..aebd46d 100644
--- a/ruby-raa/ruby-2.1/HISTORY
+++ b/ruby-raa/ruby-2.1/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.1.2
 
diff --git a/ruby-raa/ruby-enterprise-edition/DEPENDS 
b/ruby-raa/ruby-enterprise-edition/DEPENDS
index c865716..cf3460b 100755
--- a/ruby-raa/ruby-enterprise-edition/DEPENDS
+++ b/ruby-raa/ruby-enterprise-edition/DEPENDS
@@ -1,5 +1,5 @@
 depends zlib &&
-depends openssl &&
+depends SSL &&
 depends readline &&
 depends bison &&
 depends patch &&
diff --git a/ruby-raa/ruby-enterprise-edition/HISTORY 
b/ruby-raa/ruby-enterprise-edition/HISTORY
index e48af3b..e0479c8 100644
--- a/ruby-raa/ruby-enterprise-edition/HISTORY
+++ b/ruby-raa/ruby-enterprise-edition/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
        * CONFLICTS: add ruby-2.0
 
diff --git a/science-libs/glpk/DEPENDS b/science-libs/glpk/DEPENDS
index 8cecf43..059eea9 100755
--- a/science-libs/glpk/DEPENDS
+++ b/science-libs/glpk/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends gmp '--enable-gmp'  \
-                     '--disable-gmp' \
+optional_depends gmp '--with-gmp'  \
+                     '--without-gmp' \
                      'use GNU MP library'
 
diff --git a/science-libs/glpk/DETAILS b/science-libs/glpk/DETAILS
index 24f6d50..4b6ac30 100755
--- a/science-libs/glpk/DETAILS
+++ b/science-libs/glpk/DETAILS
@@ -1,5 +1,5 @@
            SPELL=glpk
-         VERSION=4.47
+         VERSION=4.55
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/science-libs/glpk/HISTORY b/science-libs/glpk/HISTORY
index 8779d00..b17c6f0 100644
--- a/science-libs/glpk/HISTORY
+++ b/science-libs/glpk/HISTORY
@@ -1,3 +1,7 @@
+2014-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.55
+       * DEPENDS: fix gmp flags
+
 2011-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4.47
 
diff --git a/science/boinc/DEPENDS b/science/boinc/DEPENDS
index 32bf299..72eb4e5 100755
--- a/science/boinc/DEPENDS
+++ b/science/boinc/DEPENDS
@@ -3,7 +3,7 @@ depends  autoconf    &&
 depends  automake    &&
 depends  curl        &&
 depends -sub CXX gcc         &&
-depends  openssl     &&
+depends  SSL     &&
 depends  psmisc      &&
 depends  zlib        &&
 
diff --git a/science/boinc/HISTORY b/science/boinc/HISTORY
index ca15512..9e5d1df 100644
--- a/science/boinc/HISTORY
+++ b/science/boinc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/science/cern_root/DEPENDS b/science/cern_root/DEPENDS
index 1d164f4..ca8aad9 100755
--- a/science/cern_root/DEPENDS
+++ b/science/cern_root/DEPENDS
@@ -47,7 +47,7 @@ optional_depends  openldap            \
                   "--disable-ldap"    \
                   "for LDAP support"  &&
 
-optional_depends  openssl                       \
+optional_depends  SSL                       \
                   "--enable-ssl"                \
                   "--disable-ssl"               \
                   "for SSL encryption support"  &&
diff --git a/science/cern_root/HISTORY b/science/cern_root/HISTORY
index bb5dcbc..e5895cd 100644
--- a/science/cern_root/HISTORY
+++ b/science/cern_root/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 5.30.02
 
diff --git a/security-libs/nessus-libraries/DEPENDS 
b/security-libs/nessus-libraries/DEPENDS
index bbfdec7..1bb3448 100755
--- a/security-libs/nessus-libraries/DEPENDS
+++ b/security-libs/nessus-libraries/DEPENDS
@@ -1,3 +1,3 @@
 depends  bison  &&
 depends  flex   &&
-depends  openssl "--enable-cipher"
+depends  SSL "--enable-cipher"
diff --git a/security-libs/nessus-libraries/HISTORY 
b/security-libs/nessus-libraries/HISTORY
index 52c20c9..baf4be6 100644
--- a/security-libs/nessus-libraries/HISTORY
+++ b/security-libs/nessus-libraries/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-10-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: depend on openssl unconditionally #11945
 
diff --git a/security-libs/opencryptoki/DEPENDS 
b/security-libs/opencryptoki/DEPENDS
index 50341d2..9776f30 100755
--- a/security-libs/opencryptoki/DEPENDS
+++ b/security-libs/opencryptoki/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends openssl "--with-openssl=${INSTALL_ROOT}/usr" \
-                         "--without-openssl" \
+optional_depends SSL "--with-openssl=${INSTALL_ROOT}/usr" \
+                         "--without-opennssl" \
                          "build with OpenSSL support?"
diff --git a/security-libs/opencryptoki/HISTORY 
b/security-libs/opencryptoki/HISTORY
index 3b499ec..fcbf21d 100644
--- a/security-libs/opencryptoki/HISTORY
+++ b/security-libs/opencryptoki/HISTORY
@@ -1,2 +1,8 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
        * BUILD, CONFIGURE, DETAILS, DEPENDS: spell created
diff --git a/security-libs/openssl_tpm_engine/DEPENDS 
b/security-libs/openssl_tpm_engine/DEPENDS
index 8f63586..4a4a02a 100755
--- a/security-libs/openssl_tpm_engine/DEPENDS
+++ b/security-libs/openssl_tpm_engine/DEPENDS
@@ -1,2 +1,2 @@
-depends openssl "--with-openssl=${INSTALL_ROOT}/usr" &&
+depends SSL "--with-openssl=${INSTALL_ROOT}/usr" &&
 depends trousers
diff --git a/security-libs/openssl_tpm_engine/HISTORY 
b/security-libs/openssl_tpm_engine/HISTORY
index 9637a96..dbcff9c 100644
--- a/security-libs/openssl_tpm_engine/HISTORY
+++ b/security-libs/openssl_tpm_engine/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS, DETAILS, TRIGGERS: spell created
 
diff --git a/security-libs/trousers/DEPENDS b/security-libs/trousers/DEPENDS
index a082f75..84ed5ee 100755
--- a/security-libs/trousers/DEPENDS
+++ b/security-libs/trousers/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl "--with-openssl=${INSTALL_ROOT}/usr" &&
+depends SSL "--with-openssl=${INSTALL_ROOT}/usr" &&
 
 optional_depends gmp '--with-gmp' '--without-gmp' \
                      'support the GMP math lib? (used in DAA)' &&
diff --git a/security-libs/trousers/HISTORY b/security-libs/trousers/HISTORY
index 174a89d..b7f77aa 100644
--- a/security-libs/trousers/HISTORY
+++ b/security-libs/trousers/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-10-02 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: fixed typo in gmp dependency
 
diff --git a/security/ettercap/DEPENDS b/security/ettercap/DEPENDS
index 22ddf8d..310edcc 100755
--- a/security/ettercap/DEPENDS
+++ b/security/ettercap/DEPENDS
@@ -1,7 +1,7 @@
 depends         libnet   &&
 depends  libpcap  &&
 depends  ncurses  &&
-depends  openssl  &&
+depends  SSL  &&
 
 optional_depends  gtk+2                  \
                   "--enable-gtk"         \
diff --git a/security/ettercap/HISTORY b/security/ettercap/HISTORY
index 45b52d0..d229896 100644
--- a/security/ettercap/HISTORY
+++ b/security/ettercap/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/security/fingerprint/DEPENDS b/security/fingerprint/DEPENDS
index 12af3b0..9f61e9f 100755
--- a/security/fingerprint/DEPENDS
+++ b/security/fingerprint/DEPENDS
@@ -1,4 +1,4 @@
 depends  libfakekey   &&
 depends  libfprint    &&
-depends  qca-openssl  &&
+depends  qca-SSL  &&
 depends  qt4
diff --git a/security/fingerprint/HISTORY b/security/fingerprint/HISTORY
index 6ad100e..8c94526 100644
--- a/security/fingerprint/HISTORY
+++ b/security/fingerprint/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-08-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
 
diff --git a/security/hashkill/DEPENDS b/security/hashkill/DEPENDS
index 36e266a..ebdbe71 100755
--- a/security/hashkill/DEPENDS
+++ b/security/hashkill/DEPENDS
@@ -1,2 +1,2 @@
-depends openssl &&
+depends SSL &&
 depends zlib 
diff --git a/security/hashkill/HISTORY b/security/hashkill/HISTORY
index 448ee9b..fa78999 100644
--- a/security/hashkill/HISTORY
+++ b/security/hashkill/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-09-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
        * DEPENDS, DETAILS: spell created
 
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index b1da0d5..ac9c44d 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -14,9 +14,9 @@ optional_depends gettext \
                  "--disable-nls" \
                  "to use Native Language Support" &&
 
-optional_depends openssl \
-                 "--with-openssl=$INSTALL_ROOT/usr" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl=$INSTALL_ROOT/usr" \
+                 "--without-opennssl" \
                  "for OpenSSL support" &&
 
 optional_depends libpcap \
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index a2b9a4d..9826cb3 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 6.46
        * DEPENDS: lua51 -> LUA
diff --git a/security/pam-imap/DEPENDS b/security/pam-imap/DEPENDS
index bbbdac8..2b0b2c8 100755
--- a/security/pam-imap/DEPENDS
+++ b/security/pam-imap/DEPENDS
@@ -1,2 +1,2 @@
 depends linux-pam &&
-depends openssl 
+depends SSL 
diff --git a/security/pam-imap/HISTORY b/security/pam-imap/HISTORY
index 1ddd461..b53ac63 100644
--- a/security/pam-imap/HISTORY
+++ b/security/pam-imap/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: updated spell to 0.3.8
        * INSTALL: mkdir added
diff --git a/security/pwsafe/DEPENDS b/security/pwsafe/DEPENDS
index 6b16041..ca33b49 100755
--- a/security/pwsafe/DEPENDS
+++ b/security/pwsafe/DEPENDS
@@ -2,5 +2,5 @@ optional_depends readline \
        "--enable-readline" \
        "--disable-readline" \
        "support for tab completion" &&
-depends openssl                      &&
+depends SSL                      &&
 depends perl
diff --git a/security/pwsafe/HISTORY b/security/pwsafe/HISTORY
index 768cb57..fe91d19 100644
--- a/security/pwsafe/HISTORY
+++ b/security/pwsafe/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Fix long description.
 
diff --git a/security/snort/DEPENDS b/security/snort/DEPENDS
index b5e6e76..1ea5086 100755
--- a/security/snort/DEPENDS
+++ b/security/snort/DEPENDS
@@ -26,9 +26,9 @@ fi  &&
 #depends snortsnarf
 #
 
-optional_depends  openssl                                            \
-                  "--with-openssl"                                   \
-                  "--without-openssl"                                \
+optional_depends  SSL                                            \
+                  "--with-opennssl"                                   \
+                  "--without-opennssl"                                \
                   "for OpenSSL support (used by XML output plugin)"
 
 optional_depends  libprelude                                         \
diff --git a/security/snort/HISTORY b/security/snort/HISTORY
index e5d1be0..95db17d 100644
--- a/security/snort/HISTORY
+++ b/security/snort/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-29 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 2.8.6
 
diff --git a/security/thc-hydra/DEPENDS b/security/thc-hydra/DEPENDS
index e0c4d3a..edd7f97 100755
--- a/security/thc-hydra/DEPENDS
+++ b/security/thc-hydra/DEPENDS
@@ -1,4 +1,4 @@
-depends openssl &&
+depends SSL &&
 optional_depends  "libssh" \
                   ""       \
                   ""       \
diff --git a/security/thc-hydra/HISTORY b/security/thc-hydra/HISTORY
index e0ddcaf..b2c0f52 100644
--- a/security/thc-hydra/HISTORY
+++ b/security/thc-hydra/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-08-26 David C. Haley <khoralin AT gmail.com>
        * DETAILS: Version bump 5.4 -> 7.5
                   SOURCE, SOURCE_URL, SOURCE_DESTINATION updated.
diff --git a/security/thc-pptp-bruter/DEPENDS 
b/security/thc-pptp-bruter/DEPENDS
index ed472ed..09706da 100755
--- a/security/thc-pptp-bruter/DEPENDS
+++ b/security/thc-pptp-bruter/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/security/thc-pptp-bruter/HISTORY 
b/security/thc-pptp-bruter/HISTORY
index f8de3d1..4dba235 100644
--- a/security/thc-pptp-bruter/HISTORY
+++ b/security/thc-pptp-bruter/HISTORY
@@ -1,2 +1,5 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2007-01-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS, DEPENDS, BUILD: created spell from Finn Haedicke's template
diff --git a/security/tpm-tools/DEPENDS b/security/tpm-tools/DEPENDS
index 995f7c8..76af642 100755
--- a/security/tpm-tools/DEPENDS
+++ b/security/tpm-tools/DEPENDS
@@ -1,3 +1,3 @@
 depends trousers &&
-optional_depends openssl_tpm_engine "--with-openssl=${INSTALL_ROOT}/usr" '' 
'for the openssl TPM engine' &&
+optional_depends SSL_tpm_engine "--with-openssl=${INSTALL_ROOT}/usr" '' 'for 
the openssl TPM engine' &&
 optional_depends opencryptoki '' '--disable-pkcs11-support' 'For PKCS#11 
support'
diff --git a/security/tpm-tools/HISTORY b/security/tpm-tools/HISTORY
index d2eb383..f318547 100644
--- a/security/tpm-tools/HISTORY
+++ b/security/tpm-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
        * BUILD, DETAILS, DEPENDS, TRIGGERS: spell created
 
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index 93a01e1..880fcfd 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -20,7 +20,7 @@ optional_depends libcap \
                  "--with-libcap" "--without-libcap" \
                  "for POSIX.1e capabilities management" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-ssl" "--without-ssl" \
                  "use SSL crypto library" &&
 
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 258158e..5d4197d 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.12.0
        * DEPENDS: gtk+3 added, gtk+2 options fixed
diff --git a/shell-term-fm/c3270/DEPENDS b/shell-term-fm/c3270/DEPENDS
index 2aba5fe..1d8ca5a 100755
--- a/shell-term-fm/c3270/DEPENDS
+++ b/shell-term-fm/c3270/DEPENDS
@@ -1,6 +1,6 @@
 depends  ncurses       &&
 depends  gcc           &&
-optional_depends openssl "--enable-ssl" "--disable-ssl"          \
+optional_depends SSL "--enable-ssl" "--disable-ssl"          \
                  "enable SSL support"                            &&
 optional_depends icu     "--enable-dbcs" "--disable-dbcs"        \
                  "enable Double Byte Character Set support"      &&
diff --git a/shell-term-fm/c3270/HISTORY b/shell-term-fm/c3270/HISTORY
index 80102ae..e7fe969 100644
--- a/shell-term-fm/c3270/HISTORY
+++ b/shell-term-fm/c3270/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/shell-term-fm/freerdp/DEPENDS b/shell-term-fm/freerdp/DEPENDS
index 6005bd1..96367fe 100755
--- a/shell-term-fm/freerdp/DEPENDS
+++ b/shell-term-fm/freerdp/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake   &&
-depends openssl &&
+depends SSL &&
 depends zlib    &&
 optional_depends pcsc-lite  '-DWITH_PCSC=1' \
                             '-DWITH_PCSC=0' \
diff --git a/shell-term-fm/freerdp/HISTORY b/shell-term-fm/freerdp/HISTORY
index 497b16a..063e355 100644
--- a/shell-term-fm/freerdp/HISTORY
+++ b/shell-term-fm/freerdp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-02-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.2, SOURCE_URL[0] and SOURCE_DIRECTORY updated
 
diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index ebcab41..918cbfa 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -1,4 +1,4 @@
-depends  openssl  &&
+depends  SSL  &&
 depends  libx11   &&
 
 if list_find $RDESKTOP_SOUND alsa; then
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index bb5b9d4..8467750 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-05-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.2
 
diff --git a/shell-term-fm/tn5250/DEPENDS b/shell-term-fm/tn5250/DEPENDS
index 050029a..87e0cbf 100755
--- a/shell-term-fm/tn5250/DEPENDS
+++ b/shell-term-fm/tn5250/DEPENDS
@@ -1,5 +1,5 @@
 depends ncurses &&
-optional_depends openssl \
+optional_depends SSL \
                  "--enable-ssl" \
                  "--disable-ssl" \
                  "enable SSL support" 
diff --git a/shell-term-fm/tn5250/HISTORY b/shell-term-fm/tn5250/HISTORY
index 732d901..5ae4f34 100644
--- a/shell-term-fm/tn5250/HISTORY
+++ b/shell-term-fm/tn5250/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-02-19 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.17.4
 
diff --git a/shell-term-fm/x3270/DEPENDS b/shell-term-fm/x3270/DEPENDS
index 632af6f..8acdcaf 100755
--- a/shell-term-fm/x3270/DEPENDS
+++ b/shell-term-fm/x3270/DEPENDS
@@ -1,7 +1,7 @@
 depends  xorg-server   &&
 depends  gcc           &&
 depends  readline      &&
-optional_depends openssl "--enable-ssl" "--disable-ssl"          \
+optional_depends SSL "--enable-ssl" "--disable-ssl"          \
                  "enable SSL support"                            &&
 optional_depends icu     "--enable-dbcs" "--disable-dbcs"        \
                  "enable Double Byte Character Set support"      
diff --git a/shell-term-fm/x3270/HISTORY b/shell-term-fm/x3270/HISTORY
index 64af27f..0fc5a0a 100644
--- a/shell-term-fm/x3270/HISTORY
+++ b/shell-term-fm/x3270/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-20 Tommy Boatman <tboatman_smgl AT live.com>
        * DETAILS: version 3.3.12ga7
 
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index 9e5139d..03941d8 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -1,5 +1,5 @@
 depends           -sub CXX gcc                                     &&
-depends           "openssl"                                        &&
+depends           "SSL"                                        &&
 depends           "zlib"                                           &&
 
 if [[ ${ASTERISK_DOXYGEN} == "y" ]]
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index 8394687..f385408 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-05-09 Treeve Jelbert <treeve AT sourcemage.org> 
        * DEPENDS: libusb => LIBUSB
 
diff --git a/telephony/decibel/DEPENDS b/telephony/decibel/DEPENDS
index 079ca54..647e419 100755
--- a/telephony/decibel/DEPENDS
+++ b/telephony/decibel/DEPENDS
@@ -3,7 +3,7 @@ if [ $DEC_SVN = y ]; then
   depends subversion
 fi                    &&
 depends tapioca-qt    &&
-depends openssl       &&
+depends SSL       &&
 depends cmake         &&
 optional_depends doxygen  '' '' 'to build documentation' &&
 optional_depends graphviz '' '' 'to build diagrams'
diff --git a/telephony/decibel/HISTORY b/telephony/decibel/HISTORY
index aea8f81..d3d95fa 100644
--- a/telephony/decibel/HISTORY
+++ b/telephony/decibel/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2009-04-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: new url for svn version
        * DEPENDS: add cmake, openssl
diff --git a/telephony/libexosip2/DEPENDS b/telephony/libexosip2/DEPENDS
index 4328efe..2694216 100755
--- a/telephony/libexosip2/DEPENDS
+++ b/telephony/libexosip2/DEPENDS
@@ -1,3 +1,3 @@
 depends libosip2 &&
 
-optional_depends openssl "" "" "for OpenSSL support"
+optional_depends SSL "" "" "for OpenSSL support"
diff --git a/telephony/libexosip2/HISTORY b/telephony/libexosip2/HISTORY
index f1e70a8..7ae2fcd 100644
--- a/telephony/libexosip2/HISTORY
+++ b/telephony/libexosip2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-11 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: Fixed SOURCE_URL[0]
          updated spell to 3.5.0
diff --git a/telephony/libjingle-tapioca/DEPENDS 
b/telephony/libjingle-tapioca/DEPENDS
index f14dd85..6295223 100755
--- a/telephony/libjingle-tapioca/DEPENDS
+++ b/telephony/libjingle-tapioca/DEPENDS
@@ -1,4 +1,4 @@
 depends -sub CXX gcc        &&
 depends pkgconfig  &&
 depends expat      &&
-depends openssl
+depends SSL
diff --git a/telephony/libjingle-tapioca/HISTORY 
b/telephony/libjingle-tapioca/HISTORY
index 5cc090e..b655cc1 100644
--- a/telephony/libjingle-tapioca/HISTORY
+++ b/telephony/libjingle-tapioca/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/telephony/ortp/DEPENDS b/telephony/ortp/DEPENDS
index 10f0cc9..0a2a960 100755
--- a/telephony/ortp/DEPENDS
+++ b/telephony/ortp/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends openssl '' '' 'encryption support' &&
+optional_depends SSL '' '' 'encryption support' &&
 optional_depends libsrtp '' '' 'secure transport support' &&
 optional_depends gtk-doc "" "" "for documentation"
diff --git a/telephony/ortp/HISTORY b/telephony/ortp/HISTORY
index 936fe02..c08d152 100644
--- a/telephony/ortp/HISTORY
+++ b/telephony/ortp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-03-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.20.0
 
diff --git a/telephony/sofia-sip/DEPENDS b/telephony/sofia-sip/DEPENDS
index a61ea1b..a287f0e 100755
--- a/telephony/sofia-sip/DEPENDS
+++ b/telephony/sofia-sip/DEPENDS
@@ -1,3 +1,3 @@
 depends glib2   &&
-depends openssl
+depends SSL
 
diff --git a/telephony/sofia-sip/HISTORY b/telephony/sofia-sip/HISTORY
index be11615..df9235a 100644
--- a/telephony/sofia-sip/HISTORY
+++ b/telephony/sofia-sip/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/telephony/telepathy-idle/DEPENDS 
b/telephony/telepathy-idle/DEPENDS
index 3bc4d11..f961c83 100755
--- a/telephony/telepathy-idle/DEPENDS
+++ b/telephony/telepathy-idle/DEPENDS
@@ -3,4 +3,4 @@ depends dbus-glib     &&
 depends pkgconfig     &&
 depends python        &&
 depends libxslt          &&
-depends openssl
+depends SSL
diff --git a/telephony/telepathy-idle/HISTORY 
b/telephony/telepathy-idle/HISTORY
index e14dacf..6675b81 100644
--- a/telephony/telepathy-idle/HISTORY
+++ b/telephony/telepathy-idle/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.1.11
 
diff --git a/telephony/telepathy-qt/DEPENDS b/telephony/telepathy-qt/DEPENDS
index 5316f11..7932e84 100755
--- a/telephony/telepathy-qt/DEPENDS
+++ b/telephony/telepathy-qt/DEPENDS
@@ -5,7 +5,7 @@ fi &&
 depends pkgconfig &&
 depends -sub DBUS qt4   &&
 depends python &&
-depends openssl &&
+depends SSL &&
 optional_depends telepathy-glib '' '' 'glib integration' &&
 optional_depends telepathy-farsight '' '' 'for the VOIP UI' &&
 optional_depends gstreamer '' '' 'for the VOIP UI'
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index dc0a2d5..97de1cb 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: updated stable version to 0.3.7
        * DEPENDS: added missing optional deps on telepathy-farsight
diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS
index 91d265a..f0cdc08 100755
--- a/utils/acpid2/DETAILS
+++ b/utils/acpid2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=acpid2
           SPELLX=acpid
-         VERSION=2.0.22
-     
SOURCE_HASH=sha512:ed52d80a17bca082cfe8d14acd4e9f736337f43c3c5c1e90b9fd5c4e8bfc2525dd0992d47230f0cae65e0eac1b2454adb350024f2955e82ffa7125e6eabf4f6a
+         VERSION=2.0.23
+     
SOURCE_HASH=sha512:b2f01f04a9c5370608016c16ecfbc5b503170c2686e6557ab1463e25d56a3ef1d2093d4701205ec1261564b1073653b404d0ae278c0bd8c8496606be1785963f
           SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY
index 340dadf..8643282 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,5 +1,5 @@
-2014-06-04 Treeve Jelbert <treeve AT sourcemage.org>
-       * DETAILS: version 2.0.22
+2014-08-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.0.23
 
 2013-09-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.20
diff --git a/utils/deltup/DEPENDS b/utils/deltup/DEPENDS
index 6321cd4..fe8704d 100755
--- a/utils/deltup/DEPENDS
+++ b/utils/deltup/DEPENDS
@@ -1,2 +1,2 @@
-depends  openssl  &&
+depends  SSL  &&
 depends -sub CXX gcc
diff --git a/utils/deltup/HISTORY b/utils/deltup/HISTORY
index dce57cc..5b7951f 100644
--- a/utils/deltup/HISTORY
+++ b/utils/deltup/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/utils/dialog/BUILD b/utils/dialog/BUILD
index 225da64..fd85f8e 100755
--- a/utils/dialog/BUILD
+++ b/utils/dialog/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS --build=${BUILD}" &&
+OPTS="$DIALOG_SO $OPTS --build=${BUILD}" &&
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
 
 ./configure --prefix="$TRACK_ROOT/usr" \
diff --git a/utils/dialog/CONFIGURE b/utils/dialog/CONFIGURE
new file mode 100755
index 0000000..6b400ea
--- /dev/null
+++ b/utils/dialog/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option DIALOG_SO "Install shared library and headers?" n \
+                              "--with-shared" ""
diff --git a/utils/dialog/HISTORY b/utils/dialog/HISTORY
index d2b23bc..956747e 100644
--- a/utils/dialog/HISTORY
+++ b/utils/dialog/HISTORY
@@ -1,3 +1,7 @@
+2014-08-11 Pol Vinogradov <vin.public AT gmail.com>
+       * BUILD, CONFIGURE, *SUB_DEPENDS, INSTALL: added option to build
+         shared library
+
 2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2-20130902
 
diff --git a/utils/dialog/INSTALL b/utils/dialog/INSTALL
index 2e4bd1e..a78aad9 100755
--- a/utils/dialog/INSTALL
+++ b/utils/dialog/INSTALL
@@ -1 +1,5 @@
-make install DESTDIR="$INSTALL_ROOT"
+make install DESTDIR="$INSTALL_ROOT" &&
+
+if [[ $DIALOG_SO == "--with-shared" ]]; then
+  cp dialog.h dlg_config.h $INSTALL_ROOT/usr/include
+fi
diff --git a/utils/dialog/PRE_SUB_DEPENDS b/utils/dialog/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8b15146
--- /dev/null
+++ b/utils/dialog/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+    SHARED) if [[ $DIALOG_SO != "--with-shared" ]]; then return 1; fi ;;
+         *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/utils/dialog/REPAIR^all^PRE_SUB_DEPENDS 
b/utils/dialog/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8b15146
--- /dev/null
+++ b/utils/dialog/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+    SHARED) if [[ $DIALOG_SO != "--with-shared" ]]; then return 1; fi ;;
+         *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/utils/dialog/SUB_DEPENDS b/utils/dialog/SUB_DEPENDS
new file mode 100755
index 0000000..da60b93
--- /dev/null
+++ b/utils/dialog/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+     SHARED) message "Shared library requested, forcing it" && 
DIALOG_SO="--with-shared" ;;
+          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/utils/ghasher/DEPENDS b/utils/ghasher/DEPENDS
index ebf63cc..8d1ca6c 100755
--- a/utils/ghasher/DEPENDS
+++ b/utils/ghasher/DEPENDS
@@ -1,3 +1,3 @@
-depends openssl &&
+depends SSL &&
 depends gtk+2 &&
 depends libglade2
diff --git a/utils/ghasher/HISTORY b/utils/ghasher/HISTORY
index 316cab8..8c4f856 100644
--- a/utils/ghasher/HISTORY
+++ b/utils/ghasher/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2007-06-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: added libglade2
        * BUILD: mkdir to fix #11377, added INSTALL_ROOT support
diff --git a/utils/ipmitool/DEPENDS b/utils/ipmitool/DEPENDS
index ad88c25..34b18f8 100755
--- a/utils/ipmitool/DEPENDS
+++ b/utils/ipmitool/DEPENDS
@@ -1,7 +1,7 @@
 depends ncurses &&
 depends readline &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--disable-internal-md5" \
                  "--enable-internal-md5" \
                  "to use external MD5 library"
diff --git a/utils/ipmitool/HISTORY b/utils/ipmitool/HISTORY
index be10b19..45b5443 100644
--- a/utils/ipmitool/HISTORY
+++ b/utils/ipmitool/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-12-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.8.13
          Removed PATCHLEVEL
diff --git a/utils/mnogosearch/DEPENDS b/utils/mnogosearch/DEPENDS
index 0d6e891..a746bea 100755
--- a/utils/mnogosearch/DEPENDS
+++ b/utils/mnogosearch/DEPENDS
@@ -3,8 +3,8 @@ optional_depends SYSTEM-LOGGER \
                  "--disable-syslog" \
                  "for syslog support"
 
-optional_depends openssl \
-                 "--with-openssl" "" \
+optional_depends SSL \
+                 "--with-opennssl" "" \
                  "to include OpenSSL support" &&
 
 optional_depends zlib \
diff --git a/utils/mnogosearch/HISTORY b/utils/mnogosearch/HISTORY
index dca7bcf..cdf583d 100644
--- a/utils/mnogosearch/HISTORY
+++ b/utils/mnogosearch/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/utils/ntp/DEPENDS b/utils/ntp/DEPENDS
index cebfbec..bea347b 100755
--- a/utils/ntp/DEPENDS
+++ b/utils/ntp/DEPENDS
@@ -1,7 +1,7 @@
 depends psmisc &&
 depends libcap "--enable-linuxcaps" &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-crypto" "--without-crypto" \
                  "for crypto functions" &&
 
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 1649c37..6024634 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: added missing optional dep on net-snmp
 
diff --git a/utils/openipmi/DEPENDS b/utils/openipmi/DEPENDS
index f78cabb..f9695e0 100755
--- a/utils/openipmi/DEPENDS
+++ b/utils/openipmi/DEPENDS
@@ -20,9 +20,9 @@ optional_depends net-snmp \
                  "--without-ucdsnmp" \
                  "for SNMP support" &&
 
-optional_depends openssl \
-                 "--with-openssl" \
-                 "--without-openssl" \
+optional_depends SSL \
+                 "--with-opennssl" \
+                 "--without-opennssl" \
                  "for IPMI 2.0 RMCP+ encryption and authentication support" 
&&
 
 # needs testing
diff --git a/utils/openipmi/HISTORY b/utils/openipmi/HISTORY
index ee7f00f..0e19dcd 100644
--- a/utils/openipmi/HISTORY
+++ b/utils/openipmi/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: fix bad with-SSL usage
+
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-01-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.19; cleaned up
        * BUILD: added make_normal; handle OPENIPMI_OPTS
diff --git a/utils/spice-gtk/DEPENDS b/utils/spice-gtk/DEPENDS
index 479d315..09bf6e2 100755
--- a/utils/spice-gtk/DEPENDS
+++ b/utils/spice-gtk/DEPENDS
@@ -1,6 +1,6 @@
 depends  celt051         &&
 depends  intltool        &&
-depends  openssl         &&
+depends  SSL         &&
 depends  pixman          &&
 depends  spice-protocol  &&
 
diff --git a/utils/spice-gtk/HISTORY b/utils/spice-gtk/HISTORY
index d24b7f3..59a1264 100644
--- a/utils/spice-gtk/HISTORY
+++ b/utils/spice-gtk/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Suggest virt-viewer for a better spice client
          See http://spice-space.org/download.html
diff --git a/utils/spice/DEPENDS b/utils/spice/DEPENDS
index 7e7f82c..8992508 100755
--- a/utils/spice/DEPENDS
+++ b/utils/spice/DEPENDS
@@ -3,7 +3,7 @@ depends celt051 &&
 depends cairo &&
 depends pixman &&
 depends spice-protocol &&
-depends openssl &&
+depends SSL &&
 depends libxrandr &&
 depends libxfixes &&
 depends libx11 &&
diff --git a/utils/spice/HISTORY b/utils/spice/HISTORY
index 5a17d19..d20b1c0 100644
--- a/utils/spice/HISTORY
+++ b/utils/spice/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on qemu built with nss support
          Optionally depends on LIBSASL
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index 2ee1f71..407e604 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc  &&
 depends cmake         &&
 depends bzip2         &&
 depends pkgconfig     &&
-depends openssl       &&
+depends SSL       &&
 depends libxml2       &&
 depends boost         &&
 
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 9d2af1e..342053f 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2013-03-04 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.7.8
        * PRE_BUILD, strigi-0.7.7-{gcc47,ffmpeg-0.11}.patch: removed
diff --git a/utils/syslog-ng/DEPENDS b/utils/syslog-ng/DEPENDS
index 9a08f4e..58f38e8 100755
--- a/utils/syslog-ng/DEPENDS
+++ b/utils/syslog-ng/DEPENDS
@@ -8,7 +8,7 @@ optional_depends libdbi-drivers \
                  '' \
                  '' \
                  'log to a SQL database' &&
-optional_depends openssl \
+optional_depends SSL \
                  '--enable-ssl' \
                  '--disable-ssl' \
                  'SSL support' &&
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 20df5a6..c834db2 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-04-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: add optional json-c, PYTHON
 
diff --git a/utils/uptimec/DEPENDS b/utils/uptimec/DEPENDS
index ed472ed..09706da 100755
--- a/utils/uptimec/DEPENDS
+++ b/utils/uptimec/DEPENDS
@@ -1 +1 @@
-depends openssl
+depends SSL
diff --git a/utils/uptimec/HISTORY b/utils/uptimec/HISTORY
index d69eb09..0c911f0 100644
--- a/utils/uptimec/HISTORY
+++ b/utils/uptimec/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 7524bd3..32abd3d 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -16,5 +16,5 @@ fi &&
 optional_depends gnutls "" "" "for TLS support in VNC" &&
 
 suggest_depends lxml "" "" "for XenAPI support in XM" &&
-suggest_depends pyopenssl "" "" "for SSL support" &&
+suggest_depends pySSL "" "" "for SSL support" &&
 suggest_depends python-pam "" "" "for PAM support"
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 3e4790e..cb81a05 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-07 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD, PRE_BUILD: Run the configure script, it runs subdirs in turn
 
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index 52ebb66..67bb53b 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,9 +1,9 @@
            SPELL=xine-lib
-         VERSION=1.2.3
-     
SOURCE_HASH=sha512:1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887
+         VERSION=1.2.6
+     
SOURCE_HASH=sha512:ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/xine/${SPELL}/${VERSION}/${SOURCE}
         WEB_SITE=http://www.xine-project.org/
          ENTERED=20010927
       LICENSE[0]=GPL
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 76c7bbb..2e548ee 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,6 @@
+2014-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.2.6
+
 2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2.3
 
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 28f10b2..41216c7 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -26,8 +26,8 @@ optional_depends  frei0r-plugins \
                   "to use frei0r for video filtering"  &&
 
 if [[ $FFMPEG_RELEASE == stable ]]; then
-  optional_depends openssl \
-                   "--enable-openssl" \
+  optional_depends SSL \
+                   "--enable-SSL" \
                    "" \
                    "for crypto support via OpenSSL 
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR})" &&
 
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 5de104c..7eafcf3 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ffmpeg
 if [[ $FFMPEG_RELEASE == stable ]]; then
-         VERSION=2.3
+         VERSION=2.3.2
   SECURITY_PATCH=15
 else
          VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index eccf0c3..6600112 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,14 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
+2014-08-13 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.3.2
+
+2014-08-04 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.3.1
+
 2014-07-21 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.3
 
diff --git a/video/gpac/DEPENDS b/video/gpac/DEPENDS
index 3af77f16..aec520d 100755
--- a/video/gpac/DEPENDS
+++ b/video/gpac/DEPENDS
@@ -3,7 +3,7 @@ optional_depends "OPENGL"                \
                  ""                      \
                  "--disable-opengl"      \
                  "build with opengl?"    &&
-optional_depends "openssl"               \
+optional_depends "SSL"               \
                  ""                      \
                  "--disable-ssl"         \
                  "build with ssl?"       &&
diff --git a/video/gpac/HISTORY b/video/gpac/HISTORY
index 449c78a..caccd6d 100644
--- a/video/gpac/HISTORY
+++ b/video/gpac/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 8de2b92..107a31e 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -183,7 +183,7 @@ optional_depends samba \
                  "for Samba (SMB) input support" &&
 
 if is_depends_enabled $SPELL samba; then
-  depends openssl
+  depends SSL
 fi &&
 
 optional_depends libquvi \
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 3598cba..728bdf3 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, DEPENDS, CONFIGURE: version 0.4.1
 
diff --git a/video/mythtv/DEPENDS b/video/mythtv/DEPENDS
index 74ad173..af5a811 100755
--- a/video/mythtv/DEPENDS
+++ b/video/mythtv/DEPENDS
@@ -6,7 +6,7 @@ depends  libvorbis   &&
 depends  flac        &&
 depends  cdparanoia  &&
 
-optional_depends openssl "--enable-libcrypto" "--disable-libcrypto" "for use 
of the OpenSSL cryptographic library" &&
+optional_depends SSL "--enable-libcrypto" "--disable-libcrypto" "for use of 
the OpenSSL cryptographic library" &&
 optional_depends yasm "--enable-yasm" "--disable-yasm" "for use of yasm 
assembler" &&
 optional_depends xmltv "" "" "For tv station grabbing" &&
 optional_depends libxml2 "--enable-libxml2" "--disable-libxml2" "to get disc 
metadata" &&
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index b073818..80670c9 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 0.26.0
        * CONFIGURE: removed query for OSS
diff --git a/video/tcvp/DEPENDS b/video/tcvp/DEPENDS
index f1677a5..6247eff 100755
--- a/video/tcvp/DEPENDS
+++ b/video/tcvp/DEPENDS
@@ -47,7 +47,7 @@ optional_depends  "libdvdnav"         \
                   "--enable-dvdnav"   \
                   "--disable-dvdnav"  \
                   "for DVD navigation support"  &&
-optional_depends  "openssl"           \
+optional_depends  "SSL"           \
                   "--enable-remote"   \
                   "--disable-remote"  \
                   "for remote support"  &&
diff --git a/video/tcvp/HISTORY b/video/tcvp/HISTORY
index da245d9..5d714b2 100644
--- a/video/tcvp/HISTORY
+++ b/video/tcvp/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2008-09-17 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: mpeg2dec -> libmpeg2
 
diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
index 1f218c9..8f37d2b 100755
--- a/video/xbmc/DEPENDS
+++ b/video/xbmc/DEPENDS
@@ -120,7 +120,7 @@ optional_depends samba \
                  "--disable-samba" \
                  "for samba support" &&
 depends tiff &&
-depends openssl &&
+depends SSL &&
 optional_depends libmicrohttpd \
                  "--enable-webserver" \
                  "--disable-webserver" \
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index 389a92e..4be5f5e 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2014-06-06 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS: version 13.1 Gotham
 
diff --git a/video/xine-ui/DETAILS b/video/xine-ui/DETAILS
index de334d5..698594f 100755
--- a/video/xine-ui/DETAILS
+++ b/video/xine-ui/DETAILS
@@ -1,9 +1,9 @@
            SPELL=xine-ui
-         VERSION=0.99.7
+         VERSION=0.99.8
           SOURCE=$SPELL-$VERSION.tar.xz
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+     
SOURCE_HASH=sha512:a2d11b0c512b9d485e0bbe418b36fb5fd52fe1a9c68cdb865771fc580b30bff513825f3e24ef85a902669c2c1ea8947512dd9abe4c12fdef94b8852cc8588da3
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/xine/${SPELL}/${VERSION}/${SOURCE}
         WEB_SITE=http://www.xine-project.org/
          ENTERED=20010927
       LICENSE[0]=GPL
diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index b0793e7..8c3ca3c 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,6 @@
+2014-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PRE_BUILD: version 0.99.8
+
 2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.99.7; switched to .xz source
        * curl.patch: dropped
diff --git a/video/xine-ui/PRE_BUILD b/video/xine-ui/PRE_BUILD
index 9f1183b..4b2c815 100755
--- a/video/xine-ui/PRE_BUILD
+++ b/video/xine-ui/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 # don't force mime db update
-sed -i "s: install-data-hook::" misc/Makefile.in
+sed -i "s: install-data-hook::" misc/Makefile.in &&
+sed -i s/CPPFunction/rl_completion_func_t/ src/xitk/network.c
diff --git a/video/xine-ui/xine-ui-0.99.7.tar.xz.sig 
b/video/xine-ui/xine-ui-0.99.7.tar.xz.sig
deleted file mode 100644
index 4b46c6f..0000000
Binary files a/video/xine-ui/xine-ui-0.99.7.tar.xz.sig and /dev/null differ
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index c8eb263..0e84c0d 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_BRANCH == devel ]]; then
-         VERSION=1.7.23
+         VERSION=1.7.25
   else
          VERSION=1.6.1
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 5d2aec3..c2f9905 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2014-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.7.25 (devel)
+
+2014-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.7.24 (devel)
+
 2014-07-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.7.23 (devel)
 
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index fdad975..f158088 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gtk+3
 if [[ $GTK_VER == devel ]];then
-         VERSION=3.13.3
-     
SOURCE_HASH=sha512:9b0206860c9488099672fc81fbb1f5ec9726e15c3095e5d7973d5282171da0cd3a59ea33c6297c954355a2b2621012779d3fd7e4d53595562a35970f1a8530fd
+         VERSION=3.13.6
+     
SOURCE_HASH=sha512:66013f44f23846e43f6dd169367a9f1c4738c6563ce525dc2d3b28430d9534c042b5a986ecc49ef1fcfe3a1d8ed162438083204d650f700153ef2bc3082ebde1
 else
-         VERSION=3.13.3
-     
SOURCE_HASH=sha512:9b0206860c9488099672fc81fbb1f5ec9726e15c3095e5d7973d5282171da0cd3a59ea33c6297c954355a2b2621012779d3fd7e4d53595562a35970f1a8530fd
+         VERSION=3.13.6
+     
SOURCE_HASH=sha512:66013f44f23846e43f6dd169367a9f1c4738c6563ce525dc2d3b28430d9534c042b5a986ecc49ef1fcfe3a1d8ed162438083204d650f700153ef2bc3082ebde1
 fi
           SOURCE=gtk+-$VERSION.tar.xz
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index 75499ca..dc06163 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2014-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.13.6
+
 2014-07-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.13.3
 
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index d6fa036..16e8758 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -18,7 +18,7 @@ optional_depends  JPEG                              \
                   '-qt-libjpeg'                     \
                   'to use the system jpeg library'  &&
 
-optional_depends  openssl                           \
+optional_depends  SSL                           \
                   '-openssl'                        \
                   '-no-openssl'                     \
                   'ssl support(needed for kde4)'    &&
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ab25849..1856f55 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+         fix openssl flags
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.8.6, SECURITY_PATCH=6
        * PRE_BUILD, boost.patch: patch removed
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS 
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index f47cf89..b04a07b 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -6,7 +6,7 @@ case $THIS_SUB_DEPENDS in
   MYSQL)  is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) && 
return 0;;
   POSTGRESQL)  is_depends_enabled $SPELL postgresql && return 0;;
   SQLITE)  is_depends_enabled $SPELL sqlite && return 0;;
-  SSL)  is_depends_enabled $SPELL openssl && return 0;;
+  SSL)  is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && return 
0;;
   TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
   STL)   [[ $QT_STL == "-stl" ]] && return 0;;
   QT3)   [[ $QT_QT3 == "-qt3support" ]] && return 0;;
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index 3b1b54c..8c58228 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -21,8 +21,8 @@ POSTGRESQL) echo "Postresql support requested, forcing  
postgresql dependency."
 SQLITE) echo "Sqlite support requested, forcing sqlite dependency." &&
      depends sqlite
       ;;
-SSL) echo "SSL support requested, forcing openssl dependency." &&
-     depends openssl
+SSL) echo "SSL support requested, forcing SSL dependency." &&
+     depends SSL
       ;;
 TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
          echo "Tools requested, forcing build." &&
diff --git a/x11-toolkits/sptk/DEPENDS b/x11-toolkits/sptk/DEPENDS
index 27b4c25..939c177 100755
--- a/x11-toolkits/sptk/DEPENDS
+++ b/x11-toolkits/sptk/DEPENDS
@@ -4,7 +4,7 @@ depends -sub CXX gcc      &&
 # using @ instead of : to avoid a sorcery problem,
 # as the colon is used as a separator in depends processing
 # @ will be rpelace during BUILD
-optional_depends  openssl  '' '' 'encryption support' &&
+optional_depends  SSL  '' '' 'encryption support' &&
 optional_depends  libevent '' '' 'handle event callbacks' &&
 optional_depends  zlib  '' '' 'compression support'  &&
 optional_depends  fltk2 '' '' 'gui support'          &&
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index 4e2184e..c1f4d39 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/x11/gkrellm2/DEPENDS b/x11/gkrellm2/DEPENDS
index 0d2a421..85a3d47 100755
--- a/x11/gkrellm2/DEPENDS
+++ b/x11/gkrellm2/DEPENDS
@@ -1,7 +1,7 @@
 if [ "$DAEMON_ONLY" = "n" ] ; then
   depends  gtk+2     &&
   depends  xorg-libs  &&
-  optional_depends  openssl            \
+  optional_depends  SSL            \
                     ""                 \
                     "without-ssl=yes"  \
                     "for SSL support in the mail checker"
diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index 10b224b..1d1ca78 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2013-02-17 Robin Cook <rcook AT wyrms.net>
        * PRE_BUILD: apply gentoo patches to build with newer glib2
 
diff --git a/x11/x11vnc/DEPENDS b/x11/x11vnc/DEPENDS
index 2b7884c..f93323a 100755
--- a/x11/x11vnc/DEPENDS
+++ b/x11/x11vnc/DEPENDS
@@ -28,12 +28,12 @@ if ! is_depends_enabled $SPELL libvncserver; then
                       "--without-24bpp"
 fi &&
 
-optional_depends openssl \
+optional_depends SSL \
                  "--with-ssl" \
                  "--without-ssl" \
                  "for SSL support" &&
 
-if is_depends_enabled $SPELL openssl; then
+if is_depends_enabled $SPELL SSL; then
   config_query_option X11VNC_OPTS \
                       "Enable libcrypto usage in OpenSSL?" y \
                       "--with-crypto" \
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index f00bf53..ee722c4 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,6 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
 2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added not strictly required, but highly recommended libxtst
          dependency
diff --git a/xorg-app/appres/DETAILS b/xorg-app/appres/DETAILS
index 82dcdc8..846753a 100755
--- a/xorg-app/appres/DETAILS
+++ b/xorg-app/appres/DETAILS
@@ -1,10 +1,10 @@
            SPELL=appres
              PKG=appres
-         VERSION=1.0.2
+         VERSION=1.0.4
         XORG_VER=X11R7.0
           SOURCE=${PKG}-${VERSION}.tar.bz2
    
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     
SOURCE_HASH=sha512:df9db62ae9ab88958466b73703b82e39a7d2124bda975a13867cf231ae97b2692f6e6eb615afac9202c3ff09ad9a4b2aae88ee9b06afeed596f575d3cec8afc2
+     
SOURCE_HASH=sha512:f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
diff --git a/xorg-app/appres/HISTORY b/xorg-app/appres/HISTORY
index 867d2c2..a28383b 100644
--- a/xorg-app/appres/HISTORY
+++ b/xorg-app/appres/HISTORY
@@ -1,3 +1,6 @@
+2014-08-21 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 1.0.4
+
 2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: updated spell to 1.0.2
 
diff --git a/xorg-util/zarfy/DEPENDS b/xorg-util/zarfy/DEPENDS
new file mode 100755
index 0000000..bc1e725
--- /dev/null
+++ b/xorg-util/zarfy/DEPENDS
@@ -0,0 +1,5 @@
+depends libx11 &&
+depends libxrandr &&
+depends gtk+2 &&
+depends gdk-pixbuf2 &&
+depends libglade2
diff --git a/xorg-util/zarfy/DETAILS b/xorg-util/zarfy/DETAILS
new file mode 100755
index 0000000..f32bc0f
--- /dev/null
+++ b/xorg-util/zarfy/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=zarfy
+         VERSION=0.1.0
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   
SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/${SPELL}%20${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:3d75c3f6a398ddea232a1520ca21a97b92498ba4d6a64b367bc42657f5d8ed3e98865cb8a441d3a54cc64dec63547c89691bcc6ee6e8fcd1f9dc59986ad37905
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://sourceforge.net/projects/zarfy";
+      LICENSE[0]="GPLv2"
+         ENTERED=20140821
+        KEYWORDS=""
+           SHORT="A gui to libxrandr"
+cat << EOF
+A gui to libxrandr. It presents the user with visual representaion of active
+displays on an interactive map of the screen memory. Features free 
postioning,
+configuration saving, scripting for R&R and an alternate gui for switching
+between monitors.
+EOF
diff --git a/xorg-util/zarfy/HISTORY b/xorg-util/zarfy/HISTORY
new file mode 100644
index 0000000..92e6597
--- /dev/null
+++ b/xorg-util/zarfy/HISTORY
@@ -0,0 +1,3 @@
+2014-08-21 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/xorg-util/zarfy/PRE_BUILD b/xorg-util/zarfy/PRE_BUILD
new file mode 100755
index 0000000..dfbc75c
--- /dev/null
+++ b/xorg-util/zarfy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit '/^PKG_CHECK_MODULES(ZARFY,/s/])$/, x11&/' configure.in &&
+autoconf
diff --git a/xorg-xserver/xorg-server/DEPENDS 
b/xorg-xserver/xorg-server/DEPENDS
index 20e4d47..ca34d0e 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -130,8 +130,8 @@ depends  font-cursor-misc                          &&
 depends  font-misc-misc                            &&
 depends  font-alias                                &&
 depends  libpciaccess                              &&
-depends  openssl                                   &&
 depends  libxtst                                   &&
+depends  SSL                                   &&
 
 if list_find "$XORG_SERVER_FONT_100DPI" "all"
 then
diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index 019014a..c043a58 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
+        * DEPENDS: openssl => SSL
+
+        * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
 2014-07-18 Sukneet Basuta <sukneet AT sourcemage.org>
        * CONFIGURE: missed an 'a' in 'disable-glamor'