Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (e2d554eced24128dc91ac0c269427dd1586d8514)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (e2d554eced24128dc91ac0c269427dd1586d8514)
  • Date: Thu, 2 Oct 2014 05:15:10 -0500

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

ChangeLog
| 423
FUNCTIONS
| 24
accounts
| 1
antivirus/clamav/DEPENDS
| 3
antivirus/clamav/DETAILS
| 2
antivirus/clamav/HISTORY
| 7
archive-libs/libarchive/DEPENDS
| 4
archive-libs/libarchive/HISTORY
| 6
archive-libs/lzo/BUILD
| 2
archive-libs/lzo/DETAILS
| 6
archive-libs/lzo/HISTORY
| 8
archive-libs/snappy/DETAILS
| 14
archive-libs/snappy/HISTORY
| 3
archive-libs/snappy/PREPARE
| 2
archive-libs/snappy/PRE_BUILD
| 6
archive/bacula/DEPENDS
| 6
archive/bacula/DETAILS
| 7
archive/bacula/HISTORY
| 9
archive/burp/DEPENDS
| 6
archive/burp/DETAILS
| 27
archive/burp/HISTORY
| 15
archive/dar/DEPENDS
| 2
archive/dar/HISTORY
| 3
archive/dar22/DEPENDS
| 2
archive/dar22/HISTORY
| 3
archive/dpkg/DETAILS
| 6
archive/dpkg/HISTORY
| 5
archive/dpkg/PRE_BUILD
| 2
archive/dpkg/dpkg-install-info.patch
| 60
archive/lz4/BUILD
| 1
archive/lz4/DETAILS
| 16
archive/lz4/HISTORY
| 3
archive/lzip/CONFLICTS
| 1
archive/lzip/DETAILS
| 2
archive/lzip/HISTORY
| 4
archive/p7zip/DETAILS
| 2
archive/p7zip/HISTORY
| 3
archive/tar/DETAILS
| 4
archive/tar/HISTORY
| 4
archive/tar/PRE_BUILD
| 4
archive/tar/glibc215.patch
| 10
archive/upx/0001-use-system-ucl.patch
| 29
archive/upx/BUILD
| 17
archive/upx/DEPENDS
| 3
archive/upx/DETAILS
| 13
archive/upx/HISTORY
| 6
archive/upx/INSTALL
| 2
archive/upx/PRE_BUILD
| 9
archive/xarchive/DEPENDS
| 2
audio-creation/ardour2/BUILD
| 1
audio-creation/ardour2/DEPENDS
| 4
audio-creation/ardour2/HISTORY
| 5
audio-creation/ardour2/INSTALL
| 1
audio-creation/ardour2/PRE_BUILD
| 8
audio-creation/ardour3/BUILD
| 6
audio-creation/ardour3/DEPENDS
| 5
audio-creation/ardour3/DETAILS
| 7
audio-creation/ardour3/HISTORY
| 6
audio-creation/audacity/DEPENDS
| 2
audio-creation/audacity/DETAILS
| 15
audio-creation/audacity/HISTORY
| 7
audio-creation/klick/BUILD
| 2
audio-creation/klick/DEPENDS
| 6
audio-creation/klick/DETAILS
| 4
audio-creation/klick/HISTORY
| 4
audio-drivers/alsa-driver/DETAILS
| 7
audio-drivers/alsa-driver/HISTORY
| 3
audio-drivers/alsa-firmware/DETAILS
| 7
audio-drivers/alsa-firmware/HISTORY
| 3
audio-drivers/alsa-lib/DETAILS
| 11
audio-drivers/alsa-lib/HISTORY
| 6
audio-drivers/alsa-oss/DETAILS
| 7
audio-drivers/alsa-oss/HISTORY
| 3
audio-drivers/alsa-plugins/DETAILS
| 7
audio-drivers/alsa-plugins/HISTORY
| 3
audio-drivers/alsa-tools/DETAILS
| 7
audio-drivers/alsa-tools/HISTORY
| 3
audio-drivers/alsa-utils/DETAILS
| 11
audio-drivers/alsa-utils/HISTORY
| 6
audio-drivers/jack/DETAILS
| 8
audio-drivers/jack/HISTORY
| 3
audio-drivers/jack2/DEPENDS
| 1
audio-drivers/jack2/DETAILS
| 20
audio-drivers/jack2/HISTORY
| 13
audio-drivers/libffado/DEPENDS
| 1
audio-drivers/libffado/DETAILS
| 7
audio-drivers/libffado/HISTORY
| 6
audio-drivers/portaudio19/DETAILS
| 7
audio-drivers/portaudio19/HISTORY
| 3
audio-drivers/pulseaudio/DEPENDS
| 46
audio-drivers/pulseaudio/DETAILS
| 5
audio-drivers/pulseaudio/HISTORY
| 8
audio-drivers/pulseaudio/PRE_BUILD
| 2
audio-drivers/pyalsa/DETAILS
| 7
audio-drivers/pyalsa/HISTORY
| 3
audio-libs/aubio03/BUILD
| 5
audio-libs/aubio03/DEPENDS
| 18
audio-libs/aubio03/DETAILS
| 23
audio-libs/aubio03/HISTORY
| 6
audio-libs/celt/DETAILS
| 7
audio-libs/celt/HISTORY
| 3
audio-libs/faad2/DETAILS
| 7
audio-libs/faad2/HISTORY
| 3
audio-libs/liblo/HISTORY
| 5
audio-libs/liblo/PRE_BUILD
| 6
audio-libs/liblo/pre-gcc48.patch
| 50
audio-libs/libvorbis/DETAILS
| 6
audio-libs/libvorbis/HISTORY
| 3
audio-libs/lilv-0/HISTORY
| 3
audio-libs/lilv-0/INSTALL
| 2
audio-libs/lv2/HISTORY
| 3
audio-libs/lv2/INSTALL
| 2
audio-libs/openal-soft/DETAILS
| 4
audio-libs/openal-soft/HISTORY
| 3
audio-libs/slv2/DEPENDS
| 2
audio-libs/slv2/HISTORY
| 3
audio-libs/taglib/DETAILS
| 6
audio-libs/taglib/HISTORY
| 4
audio-players/cantata/DETAILS
| 6
audio-players/cantata/HISTORY
| 3
audio-players/deadbeef/DETAILS
| 53
audio-players/deadbeef/HISTORY
| 7
audio-players/deadbeef/PRE_BUILD
| 3
audio-players/deadbeef/libzip.patch
| 11
audio-players/dermixd/BUILD
| 24
audio-players/dermixd/CONFIGURE
| 5
audio-players/dermixd/DEPENDS
| 14
audio-players/dermixd/DETAILS
| 6
audio-players/dermixd/FINAL
| 12
audio-players/dermixd/HISTORY
| 6
audio-players/dermixd/INSTALL
| 30
audio-players/dermixd/PRE_BUILD
| 28
audio-players/dermixd/init.d/dermixd
| 35
audio-players/dermixd/init.d/dermixd.conf
| 28
audio-players/moc/DETAILS
| 7
audio-players/moc/HISTORY
| 3
audio-players/mpd/BUILD
| 7
audio-players/mpd/CONFIGURE
| 8
audio-players/mpd/DEPENDS
| 26
audio-players/mpd/DETAILS
| 4
audio-players/mpd/HISTORY
| 19
audio-players/mpg123/DETAILS
| 2
audio-players/mpg123/HISTORY
| 9
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-players/xmms2/CONFIGURE
| 11
audio-players/xmms2/DEPENDS
| 3
audio-players/xmms2/HISTORY
| 3
audio-plugins/quodlibet-plugins/DETAILS
| 7
audio-plugins/quodlibet-plugins/HISTORY
| 3
audio-plugins/rt-plugins/0003-switch-build-system-to-cmake.patch
| 6136 ++++++++++
audio-plugins/rt-plugins/BUILD
| 2
audio-plugins/rt-plugins/DEPENDS
| 3
audio-plugins/rt-plugins/HISTORY
| 10
audio-plugins/rt-plugins/INSTALL
| 1
audio-plugins/rt-plugins/PRE_BUILD
| 3
audio-plugins/swh-plugins/HISTORY
| 3
audio-plugins/swh-plugins/PRE_BUILD
| 3
audio-soft/easytag/CONFIGURE
| 2
audio-soft/easytag/DEPENDS
| 51
audio-soft/easytag/DETAILS
| 7
audio-soft/easytag/HISTORY
| 13
audio-soft/gmtp/DEPENDS
| 5
audio-soft/gmtp/DETAILS
| 23
audio-soft/gmtp/HISTORY
| 3
audio-soft/meterbridge/DEPENDS
| 4
audio-soft/meterbridge/HISTORY
| 7
audio-soft/meterbridge/PRE_BUILD
| 23
audio-soft/meterbridge/binutils_gold.patch
| 15
audio-soft/meterbridge/main.h.patch
| 19
audio-soft/meterbridge/meterbridge_0.9.2_iec_fix.patch
| 20
audio-soft/qjackctl/DETAILS
| 8
audio-soft/qjackctl/HISTORY
| 3
audio-soft/sox/HISTORY
| 3
audio-soft/sox/PRE_BUILD
| 5
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/amsn/DETAILS
| 7
chat-im/amsn/HISTORY
| 3
chat-im/centerim/DEPENDS
| 2
chat-im/centerim/HISTORY
| 3
chat-im/choqok/DETAILS
| 7
chat-im/choqok/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/DETAILS
| 9
chat-im/licq/HISTORY
| 9
chat-im/mcabber/DETAILS
| 8
chat-im/mcabber/HISTORY
| 7
chat-im/mcabber/PRE_BUILD
| 6
chat-im/mcabber/mcabber.gpg
|binary
chat-im/mcabber/mcabber_use_libotr4.patch
| 596
chat-im/pidgin-sipe/DEPENDS
| 9
chat-im/pidgin-sipe/HISTORY
| 3
chat-im/pidgin-window-merge/DEPENDS
| 4
chat-im/pidgin-window-merge/DETAILS
| 19
chat-im/pidgin-window-merge/HISTORY
| 2
chat-im/pidgin-window-merge/PREPARE
| 2
chat-im/pidgin-window-merge/PRE_BUILD
| 6
chat-im/pidgin/DEPENDS
| 13
chat-im/pidgin/DETAILS
| 4
chat-im/pidgin/HISTORY
| 9
chat-im/pidgin/pidgin.gpg
|binary
chat-im/profanity/DEPENDS
| 2
chat-im/profanity/DETAILS
| 7
chat-im/profanity/HISTORY
| 6
chat-im/prosody/DEPENDS
| 2
chat-im/prosody/DETAILS
| 4
chat-im/prosody/HISTORY
| 6
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/DETAILS
| 7
chat-im/vacuum/HISTORY
| 6
chat-irc/bitlbee/DETAILS
| 4
chat-irc/bitlbee/HISTORY
| 3
chat-irc/hexchat/CONFIGURE
| 73
chat-irc/hexchat/DEPENDS
| 122
chat-irc/hexchat/DETAILS
| 13
chat-irc/hexchat/HISTORY
| 12
chat-irc/hexchat/INSTALL
| 5
chat-irc/hexchat/PRE_BUILD
| 4
chat-irc/hexchat/hexchat.gpg
|binary
chat-irc/ircd-ratbox/DEPENDS
| 6
chat-irc/ircd-ratbox/HISTORY
| 3
chat-irc/irssi/DEPENDS
| 2
chat-irc/irssi/DETAILS
| 11
chat-irc/irssi/HISTORY
| 9
chat-irc/weechat/DETAILS
| 8
chat-irc/weechat/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/DETAILS
| 2
chat-irc/znc/HISTORY
| 6
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/opal/DETAILS
| 7
chat-libs/opal/HISTORY
| 3
chat-libs/ptlib/DEPENDS
| 6
chat-libs/ptlib/DETAILS
| 7
chat-libs/ptlib/HISTORY
| 8
chat-libs/pwlib/DEPENDS
| 6
chat-libs/pwlib/HISTORY
| 3
chat-libs/tls/DEPENDS
| 2
chat-libs/tls/HISTORY
| 3
cluster/ocfs2-tools/DETAILS
| 7
cluster/ocfs2-tools/HISTORY
| 3
collab/cola/BUILD
| 2
collab/cola/CONFLICTS
| 1
collab/cola/DEPENDS
| 5
collab/cola/DETAILS
| 19
collab/cola/DOWNLOAD
| 1
collab/cola/HISTORY
| 71
collab/cola/INSTALL
| 2
collab/cola/PRE_BUILD
| 1
collab/cola/UP_TRIGGERS
| 1
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
collab/subversion/DEPENDS
| 2
collab/subversion/DETAILS
| 4
collab/subversion/HISTORY
| 13
crypto/ca-certificates/DETAILS
| 4
crypto/ca-certificates/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
| 4
crypto/gnupg-exp/HISTORY
| 12
crypto/gnupg/DETAILS
| 4
crypto/gnupg/HISTORY
| 6
crypto/gnutls/DEPENDS
| 7
crypto/gnutls/DETAILS
| 12
crypto/gnutls/HISTORY
| 18
crypto/gnutls/PREPARE
| 9
crypto/gpa/DETAILS
| 7
crypto/gpa/HISTORY
| 3
crypto/gpgme/DEPENDS
| 14
crypto/gpgme/DETAILS
| 6
crypto/gpgme/HISTORY
| 9
crypto/gpgme/PREPARE
| 2
crypto/gtk-led-askpass/BUILD
| 1
crypto/gtk-led-askpass/DETAILS
| 13
crypto/gtk-led-askpass/HISTORY
| 6
crypto/gtk-led-askpass/PRE_BUILD
| 5
crypto/hydan/DEPENDS
| 2
crypto/hydan/HISTORY
| 3
crypto/krb5/DEPENDS
| 1
crypto/krb5/DETAILS
| 6
crypto/krb5/HISTORY
| 9
crypto/libassuan/DETAILS
| 2
crypto/libassuan/HISTORY
| 3
crypto/libgcrypt/DETAILS
| 2
crypto/libgcrypt/HISTORY
| 3
crypto/libgpg-error/DETAILS
| 2
crypto/libgpg-error/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/nss/BUILD
| 4
crypto/nss/DEPENDS
| 3
crypto/nss/DETAILS
| 38
crypto/nss/HISTORY
| 28
crypto/nss/INSTALL
| 13
crypto/nss/PREPARE
| 2
crypto/nss/PRE_BUILD
| 17
crypto/nss/PRE_SUB_DEPENDS
| 3
crypto/nss/SUB_DEPENDS
| 10
crypto/nss/nss-pem-20140808.tar.bz2
|binary
crypto/opensc/DEPENDS
| 2
crypto/opensc/HISTORY
| 3
crypto/openssh/DEPENDS
| 2
crypto/openssh/HISTORY
| 6
crypto/openssh/PRE_BUILD
| 2
crypto/openssh/openssh-lpk-6.5p1-0.3.14.patch.gz
|binary
crypto/openssl/CONFLICTS
| 1
crypto/openssl/DETAILS
| 9
crypto/openssl/HISTORY
| 19
crypto/openssl/PREPARE
| 5
crypto/openssl/PROVIDES
| 1
crypto/openssl/openssl.gpg
|binary
crypto/p11-kit/DETAILS
| 2
crypto/p11-kit/HISTORY
| 3
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/leveldb/BUILD
| 1
database/leveldb/DEPENDS
| 8
database/leveldb/DETAILS
| 25
database/leveldb/HISTORY
| 3
database/leveldb/INSTALL
| 11
database/leveldb/PREPARE
| 2
database/libzdb/DEPENDS
| 4
database/libzdb/HISTORY
| 3
database/mariadb/BUILD
| 73
database/mariadb/CONFIGURE
| 191
database/mariadb/DEPENDS
| 96
database/mariadb/DETAILS
| 15
database/mariadb/FINAL
| 3
database/mariadb/HISTORY
| 32
database/mariadb/INSTALL
| 18
database/mariadb/PREPARE
| 4
database/mariadb/PRE_BUILD
| 16
database/mariadb/PRE_SUB_DEPENDS
| 20
database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
| 20
database/mariadb/SUB_DEPENDS
| 45
database/mariadb/UP_TRIGGERS
| 22
database/mongodb/BUILD
| 18
database/mongodb/CONFIGURE
| 11
database/mongodb/DEPENDS
| 23
database/mongodb/DETAILS
| 7
database/mongodb/FINAL
| 5
database/mongodb/HISTORY
| 23
database/mongodb/INSTALL
| 5
database/mongodb/PRE_BUILD
| 6
database/mongodb/fips.patch
| 21
database/mongodb/init.d/mongodb
| 7
database/mongodb/init.d/mongodb.conf
| 4
database/mongodb/init.d/mongos
| 21
database/mongodb/intsign.patch
| 67
database/mongodb/scons.patch
| 34
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
| 2
database/postgresql/DETAILS
| 12
database/postgresql/HISTORY
| 13
database/postgresql/PREPARE
| 9
database/postgresql/PRE_BUILD
| 7
database/redis/DETAILS
| 6
database/redis/HISTORY
| 3
database/sqlite/DETAILS
| 6
database/sqlite/HISTORY
| 6
database/tdb/DEPENDS
| 5
database/tdb/DETAILS
| 4
database/tdb/HISTORY
| 4
database/virtuoso/DEPENDS
| 2
database/virtuoso/HISTORY
| 3
dev/null
|binary
devel/android-tools/BUILD
| 2
devel/android-tools/DEPENDS
| 3
devel/android-tools/DETAILS
| 17
devel/android-tools/HISTORY
| 8
devel/android-tools/INSTALL
| 5
devel/android-tools/PRE_BUILD
| 24
devel/android-tools/init.d/adb
| 17
devel/automake/DETAILS
| 2
devel/automake/HISTORY
| 3
devel/b43-tools/DETAILS
| 7
devel/b43-tools/HISTORY
| 3
devel/bin86/DETAILS
| 8
devel/bin86/HISTORY
| 4
devel/bison/DETAILS
| 4
devel/bison/HISTORY
| 3
devel/bluefish/DETAILS
| 2
devel/bluefish/HISTORY
| 3
devel/bmake/BUILD
| 3
devel/bmake/DETAILS
| 16
devel/bmake/HISTORY
| 5
devel/bmake/INSTALL
| 3
devel/byacc/DETAILS
| 2
devel/byacc/HISTORY
| 6
devel/cgdb/DETAILS
| 6
devel/cgdb/HISTORY
| 3
devel/check/DETAILS
| 5
devel/check/HISTORY
| 3
devel/cmake/DETAILS
| 7
devel/cmake/HISTORY
| 9
devel/cobra/BUILD
| 1
devel/cobra/DEPENDS
| 1
devel/cobra/DETAILS
| 64
devel/cobra/HISTORY
| 2
devel/cobra/INSTALL
| 16
devel/codeblocks/DETAILS
| 7
devel/codeblocks/HISTORY
| 3
devel/copper/DETAILS
| 1
devel/copper/HISTORY
| 4
devel/copper/INSTALL
| 5
devel/cppcheck/DETAILS
| 4
devel/cppcheck/HISTORY
| 6
devel/ctags/DETAILS
| 2
devel/ctags/HISTORY
| 3
devel/dev86/DETAILS
| 8
devel/dev86/HISTORY
| 4
devel/devscripts/BUILD
| 1
devel/devscripts/DEPENDS
| 6
devel/devscripts/DETAILS
| 138
devel/devscripts/HISTORY
| 2
devel/devscripts/INSTALL
| 1
devel/devscripts/PRE_BUILD
| 5
devel/elfkickers/BUILD
| 1
devel/elfkickers/DETAILS
| 47
devel/elfkickers/HISTORY
| 2
devel/elfkickers/INSTALL
| 1
devel/extra-cmake-modules/DETAILS
| 8
devel/extra-cmake-modules/HISTORY
| 15
devel/flex/DETAILS
| 6
devel/flex/HISTORY
| 3
devel/fpc/DETAILS
| 4
devel/fpc/HISTORY
| 3
devel/gccxml/DETAILS
| 7
devel/gccxml/HISTORY
| 3
devel/gcl/DETAILS
| 7
devel/gcl/HISTORY
| 3
devel/gdb/DETAILS
| 4
devel/gdb/HISTORY
| 6
devel/geany-plugins/CONFIGURE
| 16
devel/geany-plugins/DEPENDS
| 9
devel/geany-plugins/DETAILS
| 2
devel/geany-plugins/HISTORY
| 4
devel/geany/DEPENDS
| 10
devel/geany/DETAILS
| 2
devel/geany/HISTORY
| 7
devel/ghc/DETAILS
| 19
devel/ghc/HISTORY
| 3
devel/git-cola/DETAILS
| 4
devel/git-cola/HISTORY
| 9
devel/git/DEPENDS
| 4
devel/git/DETAILS
| 20
devel/git/HISTORY
| 25
devel/gnusim8085/DEPENDS
| 2
devel/gnusim8085/DETAILS
| 27
devel/gnusim8085/HISTORY
| 2
devel/go/DEPENDS
| 2
devel/graphviz/DEPENDS
| 86
devel/graphviz/HISTORY
| 3
devel/guile/DETAILS
| 4
devel/guile/HISTORY
| 3
devel/icecream/DETAILS
| 4
devel/icecream/HISTORY
| 3
devel/libgc/DETAILS
| 6
devel/libgc/HISTORY
| 3
devel/libunwind/BUILD
| 2
devel/libunwind/DETAILS
| 13
devel/libunwind/HISTORY
| 8
devel/m4/DETAILS
| 2
devel/m4/HISTORY
| 4
devel/m4/PRE_BUILD
| 6
devel/m4/glibc215.patch
| 10
devel/make/HISTORY
| 3
devel/make/INSTALL
| 1
devel/mawk/BUILD
| 2
devel/mawk/CONFIGURE
| 1
devel/mawk/DETAILS
| 15
devel/mawk/HISTORY
| 6
devel/mawk/INSTALL
| 4
devel/mawk/PROVIDES
| 1
devel/meld/DETAILS
| 4
devel/meld/HISTORY
| 3
devel/mk-configure/BUILD
| 2
devel/mk-configure/DEPENDS
| 1
devel/mk-configure/DETAILS
| 16
devel/mk-configure/HISTORY
| 2
devel/mk-configure/INSTALL
| 2
devel/mlgmpidl/DETAILS
| 7
devel/mlgmpidl/HISTORY
| 3
devel/mono/DETAILS
| 7
devel/mono/HISTORY
| 4
devel/ninja-build-system/DETAILS
| 4
devel/ninja-build-system/HISTORY
| 3
devel/nodejs/BUILD
| 3
devel/nodejs/DEPENDS
| 9
devel/nodejs/DETAILS
| 9
devel/nodejs/HISTORY
| 5
devel/perl/BUILD
| 3
devel/perl/DETAILS
| 6
devel/perl/HISTORY
| 8
devel/perl/INSTALL
| 4
devel/pkgconfig/BUILD
| 5
devel/pkgconfig/DEPENDS
| 3
devel/pkgconfig/DETAILS
| 7
devel/pkgconfig/HISTORY
| 6
devel/polyorb/DEPENDS
| 6
devel/polyorb/HISTORY
| 6
devel/pyside-tools/DEPENDS
| 2
devel/pyside-tools/HISTORY
| 3
devel/python/DEPENDS
| 4
devel/python/DETAILS
| 8
devel/python/HISTORY
| 15
devel/python3/DEPENDS
| 1
devel/python3/DETAILS
| 2
devel/python3/HISTORY
| 6
devel/qgrit/DETAILS
| 8
devel/qgrit/HISTORY
| 3
devel/qt-creator/DETAILS
| 4
devel/qt-creator/HISTORY
| 3
devel/qxmledit/DETAILS
| 7
devel/qxmledit/HISTORY
| 7
devel/qxorm/DETAILS
| 4
devel/qxorm/HISTORY
| 6
devel/radare2/DEPENDS
| 2
devel/radare2/HISTORY
| 3
devel/runawk/BUILD
| 2
devel/runawk/DEPENDS
| 3
devel/runawk/DETAILS
| 19
devel/runawk/HISTORY
| 2
devel/runawk/INSTALL
| 2
devel/sdcc/DEPENDS
| 4
devel/sdcc/DETAILS
| 42
devel/sdcc/HISTORY
| 2
devel/splint/0001-fix-dependencies-in-Makefile.in.patch
| 25
devel/splint/DEPENDS
| 1
devel/splint/HISTORY
| 4
devel/splint/PRE_BUILD
| 4
devel/swig/DEPENDS
| 68
devel/swig/DETAILS
| 4
devel/swig/HISTORY
| 5
devel/swig/SUB_DEPENDS
| 16
devel/swiprolog/DEPENDS
| 2
devel/swiprolog/HISTORY
| 3
devel/tig/DETAILS
| 4
devel/tig/HISTORY
| 6
devel/vala/DETAILS
| 8
devel/vala/HISTORY
| 3
devel/valgrind/DETAILS
| 8
devel/valgrind/HISTORY
| 3
devel/xdg-utils/DETAILS
| 6
devel/xdg-utils/HISTORY
| 3
devel/xmlto/DETAILS
| 6
devel/xmlto/HISTORY
| 3
devel/yaz/DEPENDS
| 2
devel/yaz/HISTORY
| 3
disk/attr/BUILD
| 2
disk/attr/HISTORY
| 3
disk/attr/INSTALL
| 3
disk/avfs/DEPENDS
| 2
disk/avfs/HISTORY
| 3
disk/boxbackup/DEPENDS
| 2
disk/boxbackup/HISTORY
| 3
disk/brasero/DETAILS
| 8
disk/brasero/HISTORY
| 5
disk/btrfs-progs/DETAILS
| 20
disk/btrfs-progs/HISTORY
| 13
disk/btrfs-progs/INSTALL
| 1
disk/btrfs-progs/PRE_BUILD
| 6
disk/cdrdao/DETAILS
| 7
disk/cdrdao/HISTORY
| 3
disk/cdrtools/DETAILS
| 6
disk/cdrtools/HISTORY
| 7
disk/cdrtools/PRE_BUILD
| 2
disk/davfs/DETAILS
| 10
disk/davfs/HISTORY
| 9
disk/davfs/davfs.gpg
|binary
disk/ddrescue/DEPENDS
| 1
disk/ddrescue/DETAILS
| 6
disk/ddrescue/HISTORY
| 5
disk/ddrescue/PRE_BUILD
| 3
disk/dmg2img/DEPENDS
| 2
disk/dmg2img/HISTORY
| 3
disk/dump/DEPENDS
| 2
disk/dump/HISTORY
| 3
disk/e2fsprogs/DEPENDS
| 2
disk/eudev/BUILD
| 3
disk/eudev/DETAILS
| 4
disk/eudev/HISTORY
| 20
disk/eudev/INSTALL
| 3
disk/eudev/PRE_BUILD
| 2
disk/fuse-google-drive/DETAILS
| 7
disk/fuse-google-drive/HISTORY
| 3
disk/fuse/DETAILS
| 7
disk/fuse/HISTORY
| 3
disk/gdisk/DETAILS
| 4
disk/gdisk/HISTORY
| 3
disk/gnu-efi/DETAILS
| 4
disk/gnu-efi/HISTORY
| 3
disk/gummiboot/DETAILS
| 2
disk/gummiboot/HISTORY
| 8
disk/gummiboot/INSTALL
| 10
disk/gummiboot/mkgummi
| 33
disk/gummiboot/smgl-splash.bmp.xz
|binary
disk/isomaster/DETAILS
| 4
disk/isomaster/HISTORY
| 3
disk/libburn/DETAILS
| 9
disk/libburn/HISTORY
| 6
disk/libewf/DEPENDS
| 2
disk/libewf/HISTORY
| 3
disk/libisoburn/DETAILS
| 9
disk/libisoburn/HISTORY
| 6
disk/libisofs/DETAILS
| 9
disk/libisofs/HISTORY
| 6
disk/lilo/CONFIGURE
| 4
disk/lilo/HISTORY
| 6
disk/lilo/PRE_BUILD
| 6
disk/lilo/xvd.patch
| 29
disk/lvm/DETAILS
| 2
disk/lvm/HISTORY
| 5
disk/lvm/PRE_BUILD
| 3
disk/lvm/lvm-static-hotfix.patch
| 21
disk/netatalk/DEPENDS
| 2
disk/netatalk/HISTORY
| 3
disk/ntfs-3g/DETAILS
| 4
disk/ntfs-3g/HISTORY
| 3
disk/partclone/BUILD
| 2
disk/partclone/DETAILS
| 4
disk/partclone/HISTORY
| 9
disk/partimage-ng/DETAILS
| 7
disk/partimage-ng/HISTORY
| 3
disk/partimage/DEPENDS
| 2
disk/partimage/HISTORY
| 3
disk/squashfs-tools3/BUILD
| 2
disk/squashfs-tools3/DETAILS
| 27
disk/squashfs-tools3/HISTORY
| 33
disk/squashfs-tools3/INSTALL
| 3
disk/squashfs-tools3/PRE_BUILD
| 2
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
disk/xcdroast/DETAILS
| 4
disk/xcdroast/HISTORY
| 6
disk/xcdroast/PRE_BUILD
| 9
disk/xcdroast/cdda2wav_version.patch
| 54
disk/xcdroast/io_progressbar_fix.patch
| 39
disk/xcdroast/modern_cdrtools.patch
| 21
display/directfb/DEPENDS
| 2
display/directfb/HISTORY
| 3
display/fbv/DEPENDS
| 2
display/fbv/HISTORY
| 3
display/qingy/DEPENDS
| 4
display/qingy/HISTORY
| 3
doc/docutils/BUILD
| 1
doc/docutils/DEPENDS
| 1
doc/docutils/DETAILS
| 24
doc/docutils/HISTORY
| 60
doc/docutils/INSTALL
| 1
doc/docx2txt/DETAILS
| 4
doc/docx2txt/HISTORY
| 6
doc/dvipng/DEPENDS
| 6
doc/dvipng/HISTORY
| 6
doc/evince/DEPENDS
| 1
doc/evince/DETAILS
| 4
doc/evince/HISTORY
| 7
doc/fbreader/DETAILS
| 7
doc/fbreader/HISTORY
| 3
doc/groff/DEPENDS
| 10
doc/groff/HISTORY
| 3
doc/htmldoc/DEPENDS
| 2
doc/htmldoc/HISTORY
| 3
doc/man-pages-posix/DETAILS
| 11
doc/man-pages-posix/HISTORY
| 3
doc/man-pages/DETAILS
| 4
doc/man-pages/HISTORY
| 15
doc/mupdf/BUILD
| 2
doc/mupdf/DETAILS
| 8
doc/mupdf/HISTORY
| 4
doc/opensp/DEPENDS
| 6
doc/opensp/DETAILS
| 3
doc/opensp/HISTORY
| 4
doc/source-highlight/DEPENDS
| 2
doc/source-highlight/DETAILS
| 2
doc/source-highlight/HISTORY
| 3
e-16/e16/DETAILS
| 7
e-16/e16/HISTORY
| 3
e-17/e17/DETAILS
| 7
e-17/e17/HISTORY
| 3
e-17/ecore/DEPENDS
| 6
e-17/ecore/DETAILS
| 6
e-17/ecore/HISTORY
| 8
e-17/edbus/DETAILS
| 7
e-17/edbus/HISTORY
| 3
e-17/edje/DETAILS
| 7
e-17/edje/HISTORY
| 3
e-17/eet/DEPENDS
| 6
e-17/eet/HISTORY
| 3
e-17/efl/DEPENDS
| 2
e-17/efl/DETAILS
| 7
e-17/efl/HISTORY
| 6
e-17/eina/DETAILS
| 6
e-17/eina/HISTORY
| 3
e-17/emap/DETAILS
| 7
e-17/emap/HISTORY
| 3
e-17/emotion/DETAILS
| 7
e-17/emotion/HISTORY
| 3
e-17/emotion_generic_players/DETAILS
| 7
e-17/emotion_generic_players/HISTORY
| 3
e-17/enki/DETAILS
| 7
e-17/enki/HISTORY
| 3
e-17/enna/DETAILS
| 7
e-17/enna/HISTORY
| 3
e-17/eobj/DETAILS
| 7
e-17/eobj/HISTORY
| 3
e-17/ephoto/DETAILS
| 7
e-17/ephoto/HISTORY
| 3
e-17/ephysics/DETAILS
| 7
e-17/ephysics/HISTORY
| 3
e-17/erss/DETAILS
| 7
e-17/erss/HISTORY
| 3
e-17/evas/DEPENDS
| 2
e-17/evas/HISTORY
| 3
e-17/evas_generic_loaders/DETAILS
| 7
e-17/evas_generic_loaders/HISTORY
| 3
e-17/evfs/DETAILS
| 7
e-17/evfs/HISTORY
| 3
e-17/eweather/DETAILS
| 7
e-17/eweather/HISTORY
| 3
e-17/ewl/DETAILS
| 7
e-17/ewl/HISTORY
| 3
e-17/ewler/DETAILS
| 7
e-17/ewler/HISTORY
| 3
e-17/exchange/DETAILS
| 7
e-17/exchange/HISTORY
| 3
e-17/eyelight/DETAILS
| 7
e-17/eyelight/HISTORY
| 3
e-17/iconbar/DETAILS
| 7
e-17/iconbar/HISTORY
| 3
e-17/libeweather/DETAILS
| 7
e-17/libeweather/HISTORY
| 3
e-17/shellementary/DETAILS
| 7
e-17/shellementary/HISTORY
| 3
e-17/terminology/DETAILS
| 7
e-17/terminology/HISTORY
| 3
e/imlib/DEPENDS
| 2
e/imlib/HISTORY
| 3
e/imlib2/DEPENDS
| 14
e/imlib2/HISTORY
| 9
editors/auctex/CONFLICTS
| 1
editors/auctex/DEPENDS
| 2
editors/auctex/DETAILS
| 20
editors/auctex/HISTORY
| 82
editors/code-browser/DETAILS
| 2
editors/code-browser/HISTORY
| 3
editors/code-browser/code-browser-4.9-src.tar.gz.sig
|binary
editors/emacs/A0B0F199.gpg
|binary
editors/emacs/DEPENDS
| 4
editors/emacs/DETAILS
| 11
editors/emacs/HISTORY
| 12
editors/gawk/BUILD
| 6
editors/gawk/CONFIGURE
| 1
editors/gawk/DEPENDS
| 6
editors/gawk/DETAILS
| 2
editors/gawk/HISTORY
| 15
editors/gawk/INSTALL
| 5
editors/gawk/PROVIDES
| 1
editors/lyx/DETAILS
| 8
editors/lyx/HISTORY
| 3
editors/magicpoint/DEPENDS
| 2
editors/magicpoint/HISTORY
| 3
editors/moe/DETAILS
| 2
editors/moe/HISTORY
| 3
editors/openoffice/DEPENDS
| 2
editors/openoffice/HISTORY
| 3
editors/sandy/DETAILS
| 7
editors/sandy/HISTORY
| 3
editors/texmaker/DETAILS
| 4
editors/texmaker/HISTORY
| 6
editors/texworks/DETAILS
| 6
editors/texworks/HISTORY
| 3
editors/tidy/DETAILS
| 6
editors/tidy/HISTORY
| 3
editors/vbindiff/DETAILS
| 25
editors/vbindiff/HISTORY
| 2
editors/vim-csapprox/BUILD
| 1
editors/vim-csapprox/DEPENDS
| 1
editors/vim-csapprox/DETAILS
| 38
editors/vim-csapprox/HISTORY
| 2
editors/vim-csapprox/INSTALL
| 3
editors/vim-gnupg/DETAILS
| 7
editors/vim-gnupg/HISTORY
| 3
editors/vim/DETAILS
| 15
editors/vim/HISTORY
| 6
editors/vimoutliner/DETAILS
| 7
editors/vimoutliner/HISTORY
| 3
emacs-lisp/auctex/CONFLICTS
| 1
emacs-lisp/auctex/DEPENDS
| 3
emacs-lisp/auctex/DETAILS
| 19
emacs-lisp/auctex/HISTORY
| 86
emacs-lisp/autopair/DEPENDS
| 1
emacs-lisp/autopair/DETAILS
| 25
emacs-lisp/autopair/HISTORY
| 2
emacs-lisp/autopair/PREPARE
| 2
emacs-lisp/clojure-mode/DETAILS
| 7
emacs-lisp/clojure-mode/HISTORY
| 3
emacs-lisp/cluck/DETAILS
| 7
emacs-lisp/cluck/HISTORY
| 3
emacs-lisp/coffee-mode/DETAILS
| 7
emacs-lisp/coffee-mode/HISTORY
| 3
emacs-lisp/egg/DETAILS
| 7
emacs-lisp/egg/HISTORY
| 3
emacs-lisp/emacs-goodies-el/DETAILS
| 7
emacs-lisp/emacs-goodies-el/HISTORY
| 3
emacs-lisp/fill-column-indicator/DETAILS
| 7
emacs-lisp/fill-column-indicator/HISTORY
| 3
emacs-lisp/haml-mode/DETAILS
| 7
emacs-lisp/haml-mode/HISTORY
| 3
emacs-lisp/identica-mode/DETAILS
| 7
emacs-lisp/identica-mode/HISTORY
| 3
emacs-lisp/scss-mode/DETAILS
| 7
emacs-lisp/scss-mode/HISTORY
| 3
emacs-lisp/sinatra_el/DETAILS
| 7
emacs-lisp/sinatra_el/HISTORY
| 3
emacs-lisp/visual-regexp/DEPENDS
| 1
emacs-lisp/visual-regexp/DETAILS
| 26
emacs-lisp/visual-regexp/HISTORY
| 3
emacs-lisp/visual-regexp/PREPARE
| 2
fonts-x11/terminus-font/DEPENDS
| 2
fonts-x11/terminus-font/DETAILS
| 4
fonts-x11/terminus-font/HISTORY
| 3
fonts-x11/ttf-mensch/BUILD
| 1
fonts-x11/ttf-mensch/DEPENDS
| 1
fonts-x11/ttf-mensch/DETAILS
| 38
fonts-x11/ttf-mensch/HISTORY
| 3
fonts-x11/ttf-mensch/INSTALL
| 2
fonts-x11/ttf-mensch/PRE_BUILD
| 1
fonts-x11/ttf-monofur/BUILD
| 1
fonts-x11/ttf-monofur/DEPENDS
| 1
fonts-x11/ttf-monofur/DETAILS
| 14
fonts-x11/ttf-monofur/HISTORY
| 2
fonts-x11/ttf-monofur/INSTALL
| 6
fonts-x11/ttf-monofur/PRE_BUILD
| 3
fonts-x11/unifont/DETAILS
| 10
fonts-x11/unifont/HISTORY
| 8
fonts-x11/unifont/PRE_BUILD
| 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
| 42
ftp/curl/HISTORY
| 11
ftp/dctc/DEPENDS
| 6
ftp/dctc/HISTORY
| 3
ftp/deluge/DEPENDS
| 2
ftp/deluge/HISTORY
| 3
ftp/fatrat/DETAILS
| 12
ftp/fatrat/HISTORY
| 3
ftp/gftp/DEPENDS
| 6
ftp/gftp/HISTORY
| 3
ftp/imapsync/DEPENDS
| 4
ftp/imapsync/DETAILS
| 8
ftp/imapsync/HISTORY
| 5
ftp/lftp/DEPENDS
| 6
ftp/lftp/HISTORY
| 6
ftp/ncdc/DETAILS
| 2
ftp/ncdc/HISTORY
| 3
ftp/proftpd/CONFIGURE
| 4
ftp/proftpd/DEPENDS
| 29
ftp/proftpd/DETAILS
| 2
ftp/proftpd/HISTORY
| 10
ftp/proftpd/ldap-cert.patch
| 107
ftp/pure-ftpd/DEPENDS
| 2
ftp/pure-ftpd/HISTORY
| 3
ftp/rsync/DETAILS
| 9
ftp/rsync/HISTORY
| 9
ftp/tnftp/DEPENDS
| 2
ftp/tnftp/HISTORY
| 3
ftp/transmission/DEPENDS
| 2
ftp/transmission/DETAILS
| 4
ftp/transmission/HISTORY
| 9
ftp/transmission/transmission-2.84.tar.xz.sig
|binary
ftp/uget/BUILD
| 5
ftp/uget/DEPENDS
| 5
ftp/uget/DETAILS
| 6
ftp/uget/HISTORY
| 5
ftp/vsftpd/DEPENDS
| 2
ftp/vsftpd/HISTORY
| 3
ftp/wget/CONFIGURE
| 7
ftp/wget/DEPENDS
| 18
ftp/wget/HISTORY
| 15
ftp/wget/PRE_SUB_DEPENDS
| 2
ftp/wget/SUB_DEPENDS
| 4
gnome2-apps/abiword/DEPENDS
| 2
gnome2-apps/abiword/HISTORY
| 3
gnome2-apps/balsa/DEPENDS
| 2
gnome2-apps/balsa/HISTORY
| 3
gnome2-apps/dia/DETAILS
| 4
gnome2-apps/dia/HISTORY
| 4
gnome2-apps/dia/PRE_BUILD
| 6
gnome2-apps/dia/dia-0.97.3.tar.xz.sig
|binary
gnome2-apps/dia/glib-2.31.patch
| 53
gnome2-apps/galculator/DETAILS
| 4
gnome2-apps/galculator/HISTORY
| 3
gnome2-apps/homebank/DEPENDS
| 13
gnome2-apps/homebank/DETAILS
| 13
gnome2-apps/homebank/FINAL
| 1
gnome2-apps/homebank/HISTORY
| 19
gnome2-apps/homebank/PRE_BUILD
| 4
gnome2-apps/homebank/mime-noup.patch
| 14
gnome2-apps/mail-notification/DEPENDS
| 2
gnome2-apps/mail-notification/HISTORY
| 3
gnome2-libs/at-spi2-atk/DETAILS
| 7
gnome2-libs/at-spi2-atk/HISTORY
| 3
gnome2-libs/at-spi2-core/DETAILS
| 4
gnome2-libs/at-spi2-core/HISTORY
| 3
gnome2-libs/atk/DETAILS
| 6
gnome2-libs/atk/HISTORY
| 3
gnome2-libs/evolution-webcal/DEPENDS
| 2
gnome2-libs/evolution-webcal/HISTORY
| 3
gnome2-libs/gdk-pixbuf2/DEPENDS
| 29
gnome2-libs/gdk-pixbuf2/DETAILS
| 4
gnome2-libs/gdk-pixbuf2/HISTORY
| 10
gnome2-libs/glib2/DEPENDS
| 12
gnome2-libs/glib2/DETAILS
| 9
gnome2-libs/glib2/HISTORY
| 23
gnome2-libs/glib2/PRE_BUILD
| 9
gnome2-libs/glibmm/DETAILS
| 4
gnome2-libs/glibmm/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/gobject-introspection/DETAILS
| 4
gnome2-libs/gobject-introspection/HISTORY
| 3
gnome2-libs/gobject-introspection/gobject-introspection-1.40.0.tar.xz.sig
|binary
gnome2-libs/libgnomecups/DEPENDS
| 2
gnome2-libs/libgnomecups/HISTORY
| 3
gnome2-libs/libidl/DEPENDS
| 5
gnome2-libs/libidl/HISTORY
| 3
gnome2-libs/librep2/DETAILS
| 7
gnome2-libs/librep2/HISTORY
| 3
gnome2-libs/librsvg2/DEPENDS
| 38
gnome2-libs/librsvg2/DETAILS
| 4
gnome2-libs/librsvg2/HISTORY
| 10
gnome2-libs/pango/DEPENDS
| 7
gnome2-libs/pango/DETAILS
| 4
gnome2-libs/pango/HISTORY
| 19
gnome2-libs/policykit/DETAILS
| 6
gnome2-libs/policykit/HISTORY
| 4
gnome2-libs/tracker/DEPENDS
| 2
gnome2-libs/tracker/HISTORY
| 3
gnome2-libs/xdg-user-dirs/DETAILS
| 17
gnome2-libs/xdg-user-dirs/HISTORY
| 9
gnome3-libs/adwaita-icon-theme/DETAILS
| 14
gnome3-libs/adwaita-icon-theme/HISTORY
| 2
gnome3-libs/gcr/DETAILS
| 4
gnome3-libs/gcr/HISTORY
| 3
gnome3-libs/granite/BUILD
| 3
gnome3-libs/granite/DEPENDS
| 4
gnome3-libs/granite/DETAILS
| 13
gnome3-libs/granite/HISTORY
| 2
gnome3-libs/libgda5/DEPENDS
| 2
gnome3-libs/libgda5/HISTORY
| 3
gnu.gpg
|binary
gnustep-libs/gnustep-base/DEPENDS
| 6
gnustep-libs/gnustep-base/HISTORY
| 3
gnustep-libs/gnustep-gui/DEPENDS
| 2
gnustep-libs/gnustep-gui/HISTORY
| 3
graphics-libs/devil/DEPENDS
| 2
graphics-libs/devil/HISTORY
| 3
graphics-libs/freeglut/DEPENDS
| 29
graphics-libs/freeglut/HISTORY
| 6
graphics-libs/freetype2/DEPENDS
| 5
graphics-libs/freetype2/DETAILS
| 4
graphics-libs/freetype2/HISTORY
| 6
graphics-libs/ftgl/DEPENDS
| 2
graphics-libs/ftgl/DETAILS
| 6
graphics-libs/ftgl/HISTORY
| 6
graphics-libs/giblib/DEPENDS
| 7
graphics-libs/giblib/HISTORY
| 6
graphics-libs/giflib/CONFLICTS
| 1
graphics-libs/giflib/DEPENDS
| 4
graphics-libs/giflib/HISTORY
| 7
graphics-libs/giflib/PROVIDES
| 1
graphics-libs/giflib5/CONFLICTS
| 1
graphics-libs/giflib5/DEPENDS
| 1
graphics-libs/giflib5/DETAILS
| 17
graphics-libs/giflib5/HISTORY
| 3
graphics-libs/giflib5/PROVIDES
| 1
graphics-libs/giflib5/UP_TRIGGERS
| 12
graphics-libs/glew/DETAILS
| 6
graphics-libs/glew/HISTORY
| 3
graphics-libs/harfbuzz/DEPENDS
| 5
graphics-libs/harfbuzz/DETAILS
| 11
graphics-libs/harfbuzz/HISTORY
| 18
graphics-libs/jpeg/DETAILS
| 4
graphics-libs/jpeg/HISTORY
| 4
graphics-libs/jpeg/UP_TRIGGERS
| 4
graphics-libs/libcaca/DEPENDS
| 3
graphics-libs/libcaca/DETAILS
| 4
graphics-libs/libcaca/HISTORY
| 7
graphics-libs/libgxps/DETAILS
| 7
graphics-libs/libgxps/HISTORY
| 3
graphics-libs/libjpeg-turbo/DETAILS
| 4
graphics-libs/libjpeg-turbo/HISTORY
| 3
graphics-libs/libpano13/DETAILS
| 6
graphics-libs/libpano13/HISTORY
| 3
graphics-libs/mesalib/CONFLICTS
| 1
graphics-libs/mesalib/DEPENDS
| 1
graphics-libs/mesalib/DETAILS
| 12
graphics-libs/mesalib/HISTORY
| 11
graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig
|binary
graphics-libs/mesalib/PROVIDES
| 1
graphics-libs/opencv/DETAILS
| 4
graphics-libs/opencv/HISTORY
| 4
graphics-libs/opencv/PRE_BUILD
| 5
graphics-libs/opencv/pkgconfig.patch
| 35
graphics-libs/openjpeg/DETAILS
| 8
graphics-libs/openjpeg/HISTORY
| 7
graphics-libs/poppler/DETAILS
| 7
graphics-libs/poppler/HISTORY
| 3
graphics-libs/simage/DEPENDS
| 2
graphics-libs/simage/HISTORY
| 3
graphics-libs/vigra/DETAILS
| 9
graphics-libs/vigra/HISTORY
| 3
graphics/argyllcms/DETAILS
| 4
graphics/argyllcms/HISTORY
| 3
graphics/blender/DETAILS
| 7
graphics/blender/HISTORY
| 3
graphics/blender_cvs/DETAILS
| 7
graphics/blender_cvs/HISTORY
| 3
graphics/brlcad/DEPENDS
| 2
graphics/cgprof/DEPENDS
| 2
graphics/cinepaint/DEPENDS
| 4
graphics/cinepaint/DETAILS
| 10
graphics/cinepaint/HISTORY
| 5
graphics/cinepaint/PRE_BUILD
| 4
graphics/cinepaint/cinepaint-missing-include.patch
| 11
graphics/darktable/DETAILS
| 11
graphics/darktable/HISTORY
| 6
graphics/dcmtk/DEPENDS
| 27
graphics/dcmtk/DETAILS
| 25
graphics/dcmtk/HISTORY
| 2
graphics/dcraw/DETAILS
| 4
graphics/dcraw/HISTORY
| 3
graphics/exact-image/DEPENDS
| 2
graphics/exact-image/HISTORY
| 3
graphics/flphoto/DEPENDS
| 2
graphics/flphoto/HISTORY
| 3
graphics/fontforge/DEPENDS
| 2
graphics/fontforge/HISTORY
| 5
graphics/gexiv2/DETAILS
| 11
graphics/gexiv2/HISTORY
| 3
graphics/gimp/DETAILS
| 8
graphics/gimp/HISTORY
| 3
graphics/gocr/DETAILS
| 8
graphics/gocr/HISTORY
| 4
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/imagemagick/DETAILS
| 6
graphics/imagemagick/HISTORY
| 13
graphics/inkscape/DETAILS
| 10
graphics/inkscape/HISTORY
| 3
graphics/lcms2/DETAILS
| 4
graphics/lcms2/HISTORY
| 3
graphics/lensfun/DETAILS
| 15
graphics/lensfun/HISTORY
| 6
graphics/leptonica/DEPENDS
| 2
graphics/leptonica/DETAILS
| 8
graphics/leptonica/HISTORY
| 7
graphics/libgphoto2/DETAILS
| 4
graphics/libgphoto2/HISTORY
| 6
graphics/mtpaint/DEPENDS
| 2
graphics/mtpaint/HISTORY
| 3
graphics/mypaint/DETAILS
| 7
graphics/mypaint/HISTORY
| 3
graphics/nitrogen/DEPENDS
| 10
graphics/nitrogen/DETAILS
| 10
graphics/nitrogen/HISTORY
| 6
graphics/nitrogen/PREPARE
| 2
graphics/nitrogen/PRE_BUILD
| 5
graphics/nomacs/BUILD
| 1
graphics/nomacs/DEPENDS
| 2
graphics/nomacs/DETAILS
| 13
graphics/nomacs/HISTORY
| 5
graphics/optipng/BUILD
| 1
graphics/optipng/DETAILS
| 1
graphics/optipng/HISTORY
| 4
graphics/pngquant/DETAILS
| 4
graphics/pngquant/HISTORY
| 4
graphics/pngquant/PRE_BUILD
| 4
graphics/scrot/DEPENDS
| 4
graphics/scrot/HISTORY
| 3
graphics/shotwell/DEPENDS
| 3
graphics/shotwell/DETAILS
| 6
graphics/shotwell/HISTORY
| 5
graphics/swftools/DEPENDS
| 2
graphics/swftools/HISTORY
| 3
graphics/topmod/DETAILS
| 7
graphics/topmod/HISTORY
| 3
graphics/xaralx/DETAILS
| 7
graphics/xaralx/HISTORY
| 3
groups
| 4
haskell/happy/DETAILS
| 4
haskell/happy/HISTORY
| 3
haskell/haskell-aeson/DEPENDS
| 2
haskell/haskell-aeson/DETAILS
| 4
haskell/haskell-aeson/HISTORY
| 3
haskell/haskell-async/DEPENDS
| 1
haskell/haskell-async/HISTORY
| 3
haskell/haskell-attoparsec/DETAILS
| 4
haskell/haskell-attoparsec/HISTORY
| 3
haskell/haskell-bloomfilter/0001-fix-compile-errors-with-array-0.5.patch
| 41
haskell/haskell-bloomfilter/HISTORY
| 4
haskell/haskell-bloomfilter/PRE_BUILD
| 3
haskell/haskell-case-insensitive/DETAILS
| 4
haskell/haskell-case-insensitive/HISTORY
| 3
haskell/haskell-cryptohash/DETAILS
| 4
haskell/haskell-cryptohash/HISTORY
| 3
haskell/haskell-dataenc/DETAILS
| 4
haskell/haskell-dataenc/HISTORY
| 3
haskell/haskell-dlist/DETAILS
| 4
haskell/haskell-dlist/HISTORY
| 3
haskell/haskell-ghc-syb-utils/DEPENDS
| 2
haskell/haskell-ghc-syb-utils/DETAILS
| 13
haskell/haskell-ghc-syb-utils/HISTORY
| 3
haskell/haskell-git-annex/DETAILS
| 4
haskell/haskell-git-annex/HISTORY
| 5
haskell/haskell-hashed-storage/DETAILS
| 4
haskell/haskell-hashed-storage/HISTORY
| 3
haskell/haskell-haskeline/DETAILS
| 4
haskell/haskell-haskeline/HISTORY
| 3
haskell/haskell-hasktags/DEPENDS
| 3
haskell/haskell-hasktags/DETAILS
| 13
haskell/haskell-hasktags/HISTORY
| 3
haskell/haskell-haxml/DETAILS
| 4
haskell/haskell-haxml/HISTORY
| 3
haskell/haskell-hslogger/DETAILS
| 4
haskell/haskell-hslogger/HISTORY
| 3
haskell/haskell-http/DETAILS
| 4
haskell/haskell-http/HISTORY
| 3
haskell/haskell-missingh/DETAILS
| 4
haskell/haskell-missingh/HISTORY
| 3
haskell/haskell-mmap/DETAILS
| 4
haskell/haskell-mmap/HISTORY
| 3
haskell/haskell-monads-tf/DETAILS
| 4
haskell/haskell-monads-tf/HISTORY
| 3
haskell/haskell-mtl/DETAILS
| 4
haskell/haskell-mtl/HISTORY
| 6
haskell/haskell-network/DETAILS
| 4
haskell/haskell-network/HISTORY
| 3
haskell/haskell-polyparse/DETAILS
| 4
haskell/haskell-polyparse/HISTORY
| 3
haskell/haskell-quickcheck/DEPENDS
| 3
haskell/haskell-quickcheck/DETAILS
| 4
haskell/haskell-quickcheck/HISTORY
| 4
haskell/haskell-safesemaphore/DETAILS
| 4
haskell/haskell-safesemaphore/HISTORY
| 3
haskell/haskell-scientific/DETAILS
| 4
haskell/haskell-scientific/HISTORY
| 3
haskell/haskell-stm/DETAILS
| 4
haskell/haskell-stm/HISTORY
| 3
haskell/haskell-text/DETAILS
| 4
haskell/haskell-text/HISTORY
| 3
haskell/haskell-tf-random/DEPENDS
| 3
haskell/haskell-tf-random/DETAILS
| 17
haskell/haskell-tf-random/HISTORY
| 3
haskell/haskell-transformers/DETAILS
| 4
haskell/haskell-transformers/HISTORY
| 3
haskell/haskell-unordered-containers/DETAILS
| 4
haskell/haskell-unordered-containers/HISTORY
| 3
haskell/haskell-utf8-string/DETAILS
| 4
haskell/haskell-utf8-string/HISTORY
| 3
haskell/haskell-uuid/DETAILS
| 2
haskell/haskell-uuid/HISTORY
| 3
haskell/haskell-xmonad-contrib/CONFLICTS
| 1
haskell/haskell-xmonad-contrib/DEPENDS
| 7
haskell/haskell-xmonad-contrib/DETAILS
| 16
haskell/haskell-xmonad-contrib/HISTORY
| 34
haskell/haskell-xmonad/CONFLICTS
| 1
haskell/haskell-xmonad/DEPENDS
| 6
haskell/haskell-xmonad/DETAILS
| 20
haskell/haskell-xmonad/HISTORY
| 59
haskell/haskell-xmonad/INSTALL
| 2
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
| 4
http/dillo/DETAILS
| 7
http/dillo/HISTORY
| 9
http/dillo2/DEPENDS
| 6
http/dillo2/DETAILS
| 7
http/dillo2/HISTORY
| 9
http/eflwebkit/DEPENDS
| 2
http/eflwebkit/DETAILS
| 7
http/eflwebkit/HISTORY
| 6
http/elinks/DEPENDS
| 6
http/elinks/DETAILS
| 7
http/elinks/HISTORY
| 9
http/elog/DEPENDS
| 2
http/elog/HISTORY
| 3
http/esehttpd/DEPENDS
| 2
http/esehttpd/HISTORY
| 3
http/firefox/BUILD
| 17
http/firefox/CONFIGURE
| 3
http/firefox/DEPENDS
| 56
http/firefox/DETAILS
| 6
http/firefox/HISTORY
| 38
http/firefox/Makefile.in-pgo.patch
| 10
http/firefox/PRE_BUILD
| 5
http/firefox/install_dir.patch
| 38
http/firefox/mozconfig
| 1
http/gnash/DEPENDS
| 4
http/gnash/HISTORY
| 6
http/httpd-dev/DEPENDS
| 2
http/httpd-dev/HISTORY
| 3
http/lighttpd/DEPENDS
| 11
http/lighttpd/HISTORY
| 14
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/midori/DEPENDS
| 41
http/midori/DETAILS
| 17
http/midori/DOWNLOAD
| 8
http/midori/HISTORY
| 14
http/midori/PRE_BUILD
| 15
http/mod_wsgi/DEPENDS
| 2
http/mod_wsgi/DETAILS
| 7
http/mod_wsgi/HISTORY
| 5
http/netsurf/DEPENDS
| 2
http/netsurf/HISTORY
| 3
http/nginx/DEPENDS
| 2
http/nginx/DETAILS
| 1
http/nginx/HISTORY
| 7
http/nginx/init.d/nginx
| 2
http/pavuk/DEPENDS
| 2
http/pavuk/HISTORY
| 3
http/phantomjs/BUILD
| 5
http/phantomjs/DEPENDS
| 4
http/phantomjs/DETAILS
| 17
http/phantomjs/HISTORY
| 2
http/phantomjs/INSTALL
| 1
http/polipo/BUILD
| 1
http/polipo/DEPENDS
| 1
http/polipo/DETAILS
| 36
http/polipo/HISTORY
| 11
http/polipo/INSTALL
| 14
http/polipo/PRE_BUILD
| 4
http/polipo/init.d/polipo
| 15
http/polipo/polipo.gpg
|binary
http/seamonkey/DEPENDS
| 2
http/seamonkey/DETAILS
| 6
http/seamonkey/HISTORY
| 4
http/serf/BUILD
| 1
http/serf/DEPENDS
| 8
http/serf/DETAILS
| 6
http/serf/HISTORY
| 11
http/serf/INSTALL
| 1
http/siege/DEPENDS
| 2
http/siege/HISTORY
| 3
http/squid/DEPENDS
| 2
http/squid/HISTORY
| 3
http/surf/DETAILS
| 8
http/surf/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/webkitgtk/BUILD
| 3
http/webkitgtk/DEPENDS
| 2
http/webkitgtk/DETAILS
| 5
http/webkitgtk/HISTORY
| 14
http/webkitgtk/gtk-doc.patch
| 11
http/webkitgtk/opengl-headers.patch
| 29
http/webkitgtk3/BUILD
| 14
http/webkitgtk3/CONFIGURE
| 23
http/webkitgtk3/DEPENDS
| 29
http/webkitgtk3/DETAILS
| 5
http/webkitgtk3/HISTORY
| 19
http/webkitgtk3/gtk-doc.patch
| 11
http/webkitgtk3/opengl-headers.patch
| 29
http/wt/DEPENDS
| 2
http/wt/HISTORY
| 3
http/xshttpd/DEPENDS
| 2
http/xshttpd/HISTORY
| 3
java/icedtea6/DEPENDS
| 2
java/icedtea6/HISTORY
| 3
java/icedtea7/DEPENDS
| 4
java/icedtea7/HISTORY
| 6
java/kaffe/DEPENDS
| 2
java/kaffe/HISTORY
| 3
kde4-apps/calligra/BUILD
| 2
kde4-apps/calligra/CONFIGURE
| 2
kde4-apps/calligra/DEPENDS
| 3
kde4-apps/calligra/HISTORY
| 5
kde4-apps/digikam4/DETAILS
| 4
kde4-apps/digikam4/HISTORY
| 3
kde4-support/phonon-backend-gstreamer/DETAILS
| 6
kde4-support/phonon-backend-gstreamer/HISTORY
| 6
kde4-support/phonon-backend-mplayer/DETAILS
| 7
kde4-support/phonon-backend-mplayer/HISTORY
| 3
kde4-support/phonon-backend-vlc/DETAILS
| 4
kde4-support/phonon-backend-vlc/HISTORY
| 6
kde4-support/phonon/DETAILS
| 6
kde4-support/phonon/HISTORY
| 7
kde4-support/phonon/PRE_BUILD
| 6
kde4/HISTORY
| 3
kde4/KDE_DEPENDS
| 2
kde4/kdebindings4/BUILD
| 1
kde4/kdebindings4/CONFLICTS
| 1
kde4/kdebindings4/DETAILS
| 7
kde4/kdebindings4/DOWNLOAD
| 1
kde4/kdebindings4/HISTORY
| 404
kde4/kdebindings4/INSTALL
| 1
kde4/kdebindings4/PRE_BUILD
| 1
kde4/kdebindings4/UP_TRIGGERS
| 3
kde4/kdelibs4/DEPENDS
| 4
kde4/kdelibs4/HISTORY
| 8
kernels/drm/DETAILS
| 8
kernels/drm/HISTORY
| 3
kernels/linux/DETAILS
| 1
kernels/linux/HISTORY
| 79
kernels/linux/info/kernels/3.14
| 5
kernels/linux/info/kernels/3.15
| 5
kernels/linux/info/kernels/3.16
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.1
| 6
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.2
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.4
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.5
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.6
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.1
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.2
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.4
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.5
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.6
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.7
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.15.8
| 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/info/patches/maintenance_patches_3/patch-3.16.2
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3
| 5
kernels/linux/latest.defaults
| 4
kernels/mtdev/DETAILS
| 4
kernels/mtdev/HISTORY
| 3
kernels/solo6x10/DETAILS
| 8
kernels/solo6x10/HISTORY
| 3
latex/latex-beamer/DETAILS
| 13
latex/latex-beamer/HISTORY
| 4
latex/latex-beamer/INSTALL
| 17
latex/xdvi/DETAILS
| 7
latex/xdvi/HISTORY
| 4
latex/xdvi/INSTALL
| 2
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/cdk/DETAILS
| 4
libs/cdk/HISTORY
| 3
libs/dietlibc/DETAILS
| 7
libs/dietlibc/HISTORY
| 3
libs/dw2/DETAILS
| 7
libs/dw2/HISTORY
| 3
libs/gdbm/DETAILS
| 2
libs/gdbm/HISTORY
| 3
libs/gettext/DEPENDS
| 9
libs/gettext/DETAILS
| 6
libs/gettext/HISTORY
| 21
libs/gflags/BUILD
| 2
libs/gflags/DEPENDS
| 3
libs/gflags/DETAILS
| 6
libs/gflags/HISTORY
| 7
libs/gfreenect/DETAILS
| 7
libs/gfreenect/HISTORY
| 3
libs/glibc/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
| 51
libs/glibc/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
| 28
libs/glibc/00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch
| 64
libs/glibc/00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch
| 68
libs/glibc/DETAILS
| 17
libs/glibc/HISTORY
| 17
libs/glibc/PRE_BUILD
| 12
libs/glibc/as-test-x.patch
| 10
libs/glibc/glibc-2.17-sync-with-linux37.patch
| 130
libs/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
| 71
libs/glibc/glibc-2.19-xattr_header.patch
| 42
libs/glibc/glibc.gpg
|binary
libs/google-perftools/DEPENDS
| 2
libs/google-perftools/DETAILS
| 13
libs/google-perftools/HISTORY
| 7
libs/gsl/DETAILS
| 2
libs/gsl/HISTORY
| 3
libs/gwenhywfar/DEPENDS
| 2
libs/gwenhywfar/HISTORY
| 3
libs/gwenhywfar2/DEPENDS
| 2
libs/gwenhywfar2/HISTORY
| 3
libs/isl/DETAILS
| 26
libs/isl/HISTORY
| 2
libs/json-c/BUILD
| 2
libs/json-c/DETAILS
| 5
libs/json-c/HISTORY
| 6
libs/ldns/DEPENDS
| 18
libs/ldns/DETAILS
| 11
libs/ldns/HISTORY
| 8
libs/libcap/BUILD
| 7
libs/libcap/DETAILS
| 13
libs/libcap/HISTORY
| 6
libs/libcap/INSTALL
| 6
libs/libcap/PRE_BUILD
| 12
libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
| 29
libs/libcap/types.patch
| 10
libs/libchipcard/DEPENDS
| 2
libs/libchipcard/HISTORY
| 3
libs/libconfig/DEPENDS
| 2
libs/libconfig/HISTORY
| 3
libs/libdrm/BUILD
| 4
libs/libdrm/DETAILS
| 11
libs/libdrm/HISTORY
| 45
libs/libdrm/PRE_SUB_DEPENDS
| 2
libs/libdrm/SUB_DEPENDS
| 2
libs/libedit/DETAILS
| 4
libs/libedit/HISTORY
| 3
libs/libesmtp/DEPENDS
| 6
libs/libesmtp/HISTORY
| 6
libs/libevdev/DETAILS
| 4
libs/libevdev/HISTORY
| 9
libs/libevent/DEPENDS
| 4
libs/libevent/HISTORY
| 6
libs/libfm/DEPENDS
| 42
libs/libfm/DETAILS
| 5
libs/libfm/HISTORY
| 4
libs/libfreenect/DETAILS
| 9
libs/libfreenect/HISTORY
| 8
libs/libfreenect/PREPARE
| 6
libs/libfreenect/PRE_BUILD
| 7
libs/libgdiplus/DEPENDS
| 2
libs/libgdiplus/HISTORY
| 3
libs/libiptcdata/DETAILS
| 2
libs/libiptcdata/HISTORY
| 3
libs/libircclient/DEPENDS
| 6
libs/libircclient/HISTORY
| 3
libs/libnfc/DETAILS
| 7
libs/libnfc/HISTORY
| 3
libs/libnl/DETAILS
| 4
libs/libnl/HISTORY
| 3
libs/libodfgen/DEPENDS
| 6
libs/libodfgen/DETAILS
| 20
libs/libodfgen/HISTORY
| 7
libs/libofx/DEPENDS
| 20
libs/libofx/HISTORY
| 3
libs/libquvi-scripts/HISTORY
| 2
libs/librevenge/DEPENDS
| 6
libs/librevenge/DETAILS
| 13
libs/librevenge/HISTORY
| 3
libs/libtasn1/DETAILS
| 2
libs/libtasn1/HISTORY
| 8
libs/libtcod/0001-fix-installation-destination.patch
| 39
libs/libtcod/BUILD
| 2
libs/libtcod/DEPENDS
| 2
libs/libtcod/DETAILS
| 16
libs/libtcod/HISTORY
| 4
libs/libtcod/INSTALL
| 7
libs/libtcod/PRE_BUILD
| 4
libs/libtirpc/DETAILS
| 4
libs/libtirpc/HISTORY
| 3
libs/libunistring/DETAILS
| 4
libs/libunistring/HISTORY
| 3
libs/libusb/DEPENDS
| 2
libs/libusb/DETAILS
| 4
libs/libusb/HISTORY
| 6
libs/libva/DEPENDS
| 2
libs/libva/HISTORY
| 3
libs/libvdpau/DETAILS
| 6
libs/libvdpau/HISTORY
| 3
libs/libverto/DETAILS
| 4
libs/libverto/HISTORY
| 3
libs/libwpd/DEPENDS
| 5
libs/libwpd/DETAILS
| 6
libs/libwpd/HISTORY
| 5
libs/libwpg/DEPENDS
| 7
libs/libwpg/DETAILS
| 10
libs/libwpg/HISTORY
| 5
libs/libwps/DEPENDS
| 6
libs/libwps/DETAILS
| 8
libs/libwps/HISTORY
| 5
libs/libyaml/DETAILS
| 4
libs/libyaml/HISTORY
| 3
libs/mico/DEPENDS
| 2
libs/mico/HISTORY
| 3
libs/ncurses/HISTORY
| 3
libs/ncurses/INSTALL
| 3
libs/neon/DEPENDS
| 2
libs/neon/DETAILS
| 2
libs/neon/HISTORY
| 11
libs/neon/PRE_BUILD
| 4
libs/neon/PRE_SUB_DEPENDS
| 2
libs/neon/SUB_DEPENDS
| 2
libs/neon/spaces.patch
| 20
libs/newt/DEPENDS
| 2
libs/newt/DETAILS
| 6
libs/newt/HISTORY
| 7
libs/nspr/DETAILS
| 4
libs/nspr/HISTORY
| 3
libs/omniorb/DEPENDS
| 4
libs/omniorb/HISTORY
| 6
libs/omniorbpy/DEPENDS
| 4
libs/omniorbpy/HISTORY
| 6
libs/openmpi/DEPENDS
| 2
libs/openmpi/HISTORY
| 3
libs/openni-sensor/DETAILS
| 7
libs/openni-sensor/HISTORY
| 6
libs/openni-sensor/PREPARE
| 3
libs/openni-sensorkinect/DETAILS
| 7
libs/openni-sensorkinect/HISTORY
| 6
libs/openni-sensorkinect/PREPARE
| 3
libs/openni/DETAILS
| 7
libs/openni/HISTORY
| 6
libs/openni/PREPARE
| 3
libs/openscenegraph/DEPENDS
| 4
libs/openscenegraph/HISTORY
| 6
libs/osceleton/DETAILS
| 7
libs/osceleton/HISTORY
| 3
libs/pcre/DETAILS
| 2
libs/pcre/HISTORY
| 3
libs/poco/DEPENDS
| 4
libs/poco/HISTORY
| 3
libs/podofo/DEPENDS
| 2
libs/podofo/DETAILS
| 4
libs/podofo/HISTORY
| 4
libs/python-ant/DETAILS
| 7
libs/python-ant/HISTORY
| 3
libs/qoauth/DETAILS
| 7
libs/qoauth/HISTORY
| 3
libs/readline/DETAILS
| 2
libs/readline/HISTORY
| 6
libs/readline/INSTALL
| 3
libs/redland/DEPENDS
| 2
libs/redland/HISTORY
| 3
libs/sdl2/DEPENDS
| 4
libs/sdl2/DETAILS
| 9
libs/sdl2/HISTORY
| 10
libs/sdl2/PRE_BUILD
| 6
libs/sdl2_image/DEPENDS
| 2
libs/sdl2_image/HISTORY
| 3
libs/sip/DETAILS
| 5
libs/sip/HISTORY
| 12
libs/soup/DEPENDS
| 2
libs/soup/HISTORY
| 3
libs/talloc/DETAILS
| 7
libs/talloc/HISTORY
| 3
libs/tbb/DETAILS
| 4
libs/tbb/HISTORY
| 9
libs/tc2-modules/DEPENDS
| 4
libs/tc2-modules/HISTORY
| 6
libs/tzdata/DETAILS
| 8
libs/tzdata/HISTORY
| 8
libs/tzdata/iana.gpg
|binary
libs/upower/DETAILS
| 4
libs/upower/HISTORY
| 3
libs/vsqlite++/DEPENDS
| 4
libs/vsqlite++/DETAILS
| 13
libs/vsqlite++/HISTORY
| 3
libs/vsqlite++/PRE_BUILD
| 3
lua-forge/lua/HISTORY
| 3
lua-forge/lua/shared.patch
| 2
lua-forge/lua51/HISTORY
| 4
lua-forge/lua51/patch-src_Makefile
| 4
lua-forge/luacrypto/DEPENDS
| 2
lua-forge/luacrypto/HISTORY
| 3
lua-forge/luajit/DETAILS
| 4
lua-forge/luajit/HISTORY
| 3
lua-forge/luasec/DEPENDS
| 2
lua-forge/luasec/HISTORY
| 3
lxde/lxlauncher/DEPENDS
| 1
lxde/lxlauncher/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/bogofilter/CONFIGURE
| 2
mail/bogofilter/DETAILS
| 4
mail/bogofilter/HISTORY
| 4
mail/c-client/DEPENDS
| 2
mail/c-client/HISTORY
| 3
mail/claws-mail/DEPENDS
| 3
mail/claws-mail/DETAILS
| 6
mail/claws-mail/HISTORY
| 10
mail/cone/DEPENDS
| 2
mail/cone/DETAILS
| 4
mail/cone/HISTORY
| 6
mail/courier-authlib/DEPENDS
| 2
mail/courier-authlib/HISTORY
| 3
mail/courier-imap/DEPENDS
| 2
mail/courier-imap/HISTORY
| 3
mail/courier/DEPENDS
| 4
mail/courier/HISTORY
| 6
mail/courier/init.d/courier_filter
| 25
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/CONFIGURE
| 2
mail/exim/DEPENDS
| 6
mail/exim/DETAILS
| 4
mail/exim/HISTORY
| 22
mail/exim/exim.gpg
|binary
mail/fdm/DEPENDS
| 2
mail/fdm/HISTORY
| 3
mail/fetchmail/DEPENDS
| 2
mail/fetchmail/DETAILS
| 2
mail/fetchmail/HISTORY
| 6
mail/getmail/BUILD
| 2
mail/getmail/DEPENDS
| 2
mail/getmail/DETAILS
| 5
mail/getmail/HISTORY
| 8
mail/getmail/INSTALL
| 2
mail/gnarwl/CONFIGURE
| 7
mail/gnarwl/DETAILS
| 1
mail/gnarwl/HISTORY
| 11
mail/gnarwl/PRE_BUILD
| 6
mail/gnarwl/blacklist.patch
| 19
mail/gnarwl/time.patch
| 22
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
| 1
mail/isync/DETAILS
| 37
mail/isync/HISTORY
| 5
mail/libetpan/DEPENDS
| 6
mail/libetpan/HISTORY
| 6
mail/mailx/DEPENDS
| 2
mail/mailx/HISTORY
| 3
mail/masqmail/DETAILS
| 2
mail/masqmail/HISTORY
| 6
mail/masqmail/PRE_BUILD
| 6
mail/masqmail/log.patch
| 27
mail/mpop/DEPENDS
| 4
mail/mpop/HISTORY
| 3
mail/msmtp/DEPENDS
| 2
mail/msmtp/HISTORY
| 3
mail/mutt/DEPENDS
| 8
mail/mutt/DETAILS
| 7
mail/mutt/HISTORY
| 6
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/DETAILS
| 2
mail/postfix/HISTORY
| 6
mail/smtpc/DEPENDS
| 2
mail/smtpc/HISTORY
| 3
mail/spamassassin/DEPENDS
| 2
mail/spamassassin/HISTORY
| 3
mail/spamprobe/DEPENDS
| 2
mail/spamprobe/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/DETAILS
| 2
mail/sylpheed/HISTORY
| 9
mail/thunderbird/DEPENDS
| 41
mail/thunderbird/DETAILS
| 2
mail/thunderbird/HISTORY
| 9
mobile/barry/DEPENDS
| 2
mobile/barry/HISTORY
| 3
mobile/laptop-mode-tools/DETAILS
| 4
mobile/laptop-mode-tools/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/bmon/DEPENDS
| 7
net/bmon/DETAILS
| 8
net/bmon/HISTORY
| 7
net/bmon/PRE_BUILD
| 2
net/bmon/bmon-2.1.0-gcc4.diff
| 22
net/chrony/DETAILS
| 2
net/chrony/HISTORY
| 6
net/conntrack/DETAILS
| 7
net/conntrack/HISTORY
| 3
net/corkscrew/DETAILS
| 14
net/corkscrew/HISTORY
| 2
net/dhcp/DETAILS
| 2
net/dhcp/HISTORY
| 3
net/dhcpcd/DETAILS
| 4
net/dhcpcd/HISTORY
| 15
net/dnsmasq/DETAILS
| 7
net/dnsmasq/HISTORY
| 3
net/driftnet/DEPENDS
| 2
net/driftnet/HISTORY
| 3
net/envbot/DEPENDS
| 4
net/envbot/HISTORY
| 3
net/flow-tools/DEPENDS
| 6
net/flow-tools/HISTORY
| 6
net/fping/DETAILS
| 4
net/fping/HISTORY
| 3
net/freeradius/DEPENDS
| 2
net/freeradius/DETAILS
| 3
net/freeradius/HISTORY
| 6
net/fwbuilder/DEPENDS
| 2
net/fwbuilder/HISTORY
| 3
net/iproute2/DETAILS
| 4
net/iproute2/HISTORY
| 3
net/ipsec-tools/DEPENDS
| 2
net/ipsec-tools/DETAILS
| 4
net/ipsec-tools/HISTORY
| 6
net/iscsitarget/DEPENDS
| 2
net/iscsitarget/HISTORY
| 3
net/iw/DETAILS
| 4
net/iw/HISTORY
| 3
net/libpcap/DETAILS
| 2
net/libpcap/HISTORY
| 6
net/libreswan/BUILD
| 1
net/libreswan/CONFLICTS
| 1
net/libreswan/DEPENDS
| 47
net/libreswan/DETAILS
| 24
net/libreswan/HISTORY
| 10
net/libreswan/PRE_BUILD
| 5
net/libreswan/init.d/ipsec
| 23
net/libreswan/libreswan.gpg
|binary
net/mdnsresponder/BUILD
| 1
net/mdnsresponder/DEPENDS
| 2
net/mdnsresponder/DETAILS
| 6
net/mdnsresponder/HISTORY
| 7
net/mdnsresponder/PRE_BUILD
| 5
net/megatools/DEPENDS
| 16
net/megatools/DETAILS
| 26
net/megatools/HISTORY
| 2
net/minidlna/DETAILS
| 6
net/minidlna/HISTORY
| 3
net/minidlna/minidlna-1.1.2.tar.gz.sig
|binary
net/monit/DEPENDS
| 2
net/monit/DETAILS
| 4
net/monit/HISTORY
| 9
net/nagios-plugins/DEPENDS
| 8
net/nagios-plugins/HISTORY
| 6
net/net-snmp/DEPENDS
| 2
net/net-snmp/HISTORY
| 3
net/net-tools/BUILD
| 1
net/net-tools/CONFIGURE
| 10
net/net-tools/HISTORY
| 3
net/netembryo/DEPENDS
| 6
net/netembryo/HISTORY
| 6
net/nsd/DEPENDS
| 2
net/nsd/HISTORY
| 3
net/ntop/DEPENDS
| 4
net/ntop/HISTORY
| 3
net/openntpd/DEPENDS
| 2
net/openntpd/HISTORY
| 3
net/openswan/CONFLICTS
| 1
net/openswan/HISTORY
| 3
net/openvpn/DEPENDS
| 36
net/openvpn/DETAILS
| 2
net/openvpn/HISTORY
| 10
net/openvpn/INSTALL
| 2
net/openwbem/DEPENDS
| 2
net/openwbem/HISTORY
| 3
net/ppp/DEPENDS
| 2
net/ppp/HISTORY
| 3
net/pppd-chldap/DEPENDS
| 2
net/pppd-chldap/DETAILS
| 7
net/pppd-chldap/HISTORY
| 7
net/pppd-chldap/PREPARE
| 3
net/pptp-linux/BUILD
| 2
net/pptp-linux/DEPENDS
| 4
net/pptp-linux/DETAILS
| 12
net/pptp-linux/HISTORY
| 11
net/pptp-linux/PRE_BUILD
| 4
net/pptp-linux/options.patch
| 15
net/pptp-linux/pptp.gpg
|binary
net/proxychains-ng/DETAILS
| 20
net/proxychains-ng/HISTORY
| 5
net/proxychains-ng/INSTALL
| 4
net/samba/BUILD
| 3
net/samba/DEPENDS
| 1
net/samba/DETAILS
| 6
net/samba/HISTORY
| 8
net/samba4/DETAILS
| 7
net/samba4/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/DETAILS
| 2
net/stunnel/HISTORY
| 6
net/tcp_wrappers/BUILD
| 4
net/tcp_wrappers/HISTORY
| 4
net/tcpdump/DEPENDS
| 2
net/tcpdump/DETAILS
| 2
net/tcpdump/HISTORY
| 9
net/tinc/DEPENDS
| 2
net/tinc/DETAILS
| 2
net/tinc/HISTORY
| 6
net/tor.gpg
|binary
net/tor/DEPENDS
| 2
net/tor/DETAILS
| 4
net/tor/HISTORY
| 9
net/traceroute/DETAILS
| 6
net/traceroute/HISTORY
| 4
net/tsocks/DETAILS
| 6
net/tsocks/HISTORY
| 3
net/unbound/DEPENDS
| 4
net/unbound/HISTORY
| 3
net/vidalia/DETAILS
| 2
net/vidalia/HISTORY
| 3
net/vtun/DEPENDS
| 2
net/vtun/HISTORY
| 3
net/whois/DETAILS
| 4
net/whois/HISTORY
| 6
net/wpa_supplicant/BUILD
| 1
net/wpa_supplicant/DEPENDS
| 12
net/wpa_supplicant/HISTORY
| 4
net/wvstreams/DEPENDS
| 8
net/wvstreams/HISTORY
| 6
perl-cpan/config-param/DETAILS
| 4
perl-cpan/config-param/HISTORY
| 3
perl-cpan/crypt-ssleay/DEPENDS
| 2
perl-cpan/crypt-ssleay/HISTORY
| 3
perl-cpan/date-manip/DETAILS
| 4
perl-cpan/date-manip/HISTORY
| 3
perl-cpan/dbi/DETAILS
| 6
perl-cpan/dbi/HISTORY
| 4
perl-cpan/file-copy-recursive/DEPENDS
| 1
perl-cpan/file-copy-recursive/DETAILS
| 14
perl-cpan/file-copy-recursive/HISTORY
| 3
perl-cpan/file-desktopentry/DEPENDS
| 3
perl-cpan/file-desktopentry/HISTORY
| 3
perl-cpan/finance-quote/DETAILS
| 4
perl-cpan/finance-quote/HISTORY
| 3
perl-cpan/image-exiftool/DETAILS
| 4
perl-cpan/image-exiftool/HISTORY
| 3
perl-cpan/mail-imapclient/DETAILS
| 6
perl-cpan/mail-imapclient/HISTORY
| 4
perl-cpan/net-ssleay/DEPENDS
| 2
perl-cpan/net-ssleay/HISTORY
| 3
perl-cpan/parrot/DEPENDS
| 2
perl-cpan/parrot/HISTORY
| 3
perl-cpan/parse-debcontrol/DEPENDS
| 1
perl-cpan/parse-debcontrol/DETAILS
| 26
perl-cpan/parse-debcontrol/HISTORY
| 2
perl-cpan/perl-error/DETAILS
| 6
perl-cpan/perl-error/HISTORY
| 3
php-pear/memcache/DETAILS
| 4
php-pear/memcache/HISTORY
| 3
php-pear/php-dev/DEPENDS
| 6
php-pear/php-dev/DETAILS
| 9
php-pear/php-dev/HISTORY
| 9
php-pear/php/DEPENDS
| 14
php-pear/php/DETAILS
| 12
php-pear/php/HISTORY
| 39
php-pear/php4/DEPENDS
| 6
php-pear/php4/HISTORY
| 6
printer/cups-filters/BUILD
| 5
printer/cups-filters/DETAILS
| 4
printer/cups-filters/HISTORY
| 18
printer/cups-old/DEPENDS
| 2
printer/cups-old/HISTORY
| 3
printer/cups/CONFIGURE
| 7
printer/cups/DEPENDS
| 17
printer/cups/DETAILS
| 6
printer/cups/FINAL
| 1
printer/cups/HISTORY
| 23
printer/ghostscript/DEPENDS
| 5
printer/ghostscript/DETAILS
| 4
printer/ghostscript/HISTORY
| 11
printer/ghostscript/PRE_BUILD
| 2
printer/gtklp/DEPENDS
| 2
printer/gtklp/HISTORY
| 3
printer/gutenprint/BUILD
| 1
printer/gutenprint/DEPENDS
| 8
printer/gutenprint/DETAILS
| 4
printer/gutenprint/HISTORY
| 8
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/alembic/DETAILS
| 4
python-pypi/alembic/HISTORY
| 3
python-pypi/arandr/DEPENDS
| 1
python-pypi/arandr/DETAILS
| 4
python-pypi/arandr/HISTORY
| 4
python-pypi/attic/DEPENDS
| 8
python-pypi/attic/DETAILS
| 16
python-pypi/attic/HISTORY
| 7
python-pypi/bpython/DEPENDS
| 6
python-pypi/bpython/DETAILS
| 4
python-pypi/bpython/HISTORY
| 7
python-pypi/bsddb3/DETAILS
| 4
python-pypi/bsddb3/HISTORY
| 4
python-pypi/cffi/DETAILS
| 4
python-pypi/cffi/HISTORY
| 6
python-pypi/chardet/DETAILS
| 4
python-pypi/chardet/HISTORY
| 3
python-pypi/cherrypy/DEPENDS
| 2
python-pypi/cherrypy/DETAILS
| 4
python-pypi/cherrypy/HISTORY
| 12
python-pypi/curtsies/DEPENDS
| 1
python-pypi/curtsies/DETAILS
| 17
python-pypi/curtsies/HISTORY
| 2
python-pypi/cython/DETAILS
| 4
python-pypi/cython/HISTORY
| 3
python-pypi/django/DETAILS
| 6
python-pypi/django/HISTORY
| 3
python-pypi/docutils/DEPENDS
| 1
python-pypi/docutils/DETAILS
| 24
python-pypi/docutils/HISTORY
| 66
python-pypi/fb-python/DETAILS
| 4
python-pypi/fb-python/HISTORY
| 3
python-pypi/fdb/DETAILS
| 4
python-pypi/fdb/HISTORY
| 3
python-pypi/formalchemy/DEPENDS
| 3
python-pypi/formalchemy/DETAILS
| 4
python-pypi/formalchemy/HISTORY
| 4
python-pypi/formencode/DEPENDS
| 3
python-pypi/formencode/DETAILS
| 6
python-pypi/formencode/HISTORY
| 4
python-pypi/gitosis/DETAILS
| 7
python-pypi/gitosis/HISTORY
| 6
python-pypi/gitosis/PREPARE
| 5
python-pypi/greenlet/DEPENDS
| 2
python-pypi/greenlet/DETAILS
| 32
python-pypi/greenlet/HISTORY
| 2
python-pypi/grit-i18n/BUILD
| 1
python-pypi/grit-i18n/DEPENDS
| 2
python-pypi/grit-i18n/DETAILS
| 20
python-pypi/grit-i18n/HISTORY
| 3
python-pypi/grit-i18n/INSTALL
| 2
python-pypi/grit-i18n/PREPARE
| 3
python-pypi/gtklick/DETAILS
| 4
python-pypi/gtklick/HISTORY
| 3
python-pypi/hatta/DEPENDS
| 2
python-pypi/hatta/DETAILS
| 1
python-pypi/hatta/HISTORY
| 8
python-pypi/hatta/PRE_BUILD
| 1
python-pypi/hatta/wanted.patch
| 12
python-pypi/isort/DETAILS
| 4
python-pypi/isort/HISTORY
| 3
python-pypi/jinja2/DETAILS
| 4
python-pypi/jinja2/HISTORY
| 3
python-pypi/lxml/DETAILS
| 2
python-pypi/lxml/HISTORY
| 9
python-pypi/m2crypto/DEPENDS
| 2
python-pypi/m2crypto/HISTORY
| 3
python-pypi/mercurial/DETAILS
| 4
python-pypi/mercurial/HISTORY
| 12
python-pypi/meson/BUILD
| 2
python-pypi/meson/DEPENDS
| 2
python-pypi/meson/DETAILS
| 15
python-pypi/meson/HISTORY
| 3
python-pypi/meson/INSTALL
| 2
python-pypi/msgpack-python/DEPENDS
| 2
python-pypi/msgpack-python/DETAILS
| 4
python-pypi/msgpack-python/HISTORY
| 4
python-pypi/numpy/DETAILS
| 6
python-pypi/numpy/HISTORY
| 3
python-pypi/papyon/DEPENDS
| 2
python-pypi/papyon/HISTORY
| 3
python-pypi/paramiko/DETAILS
| 4
python-pypi/paramiko/HISTORY
| 3
python-pypi/pillow/DETAILS
| 4
python-pypi/pillow/HISTORY
| 3
python-pypi/pip/DEPENDS
| 2
python-pypi/pip/DETAILS
| 16
python-pypi/pip/HISTORY
| 2
python-pypi/psycopg2/DETAILS
| 2
python-pypi/psycopg2/HISTORY
| 9
python-pypi/pyicqt/DEPENDS
| 2
python-pypi/pyicqt/HISTORY
| 3
python-pypi/pyicu/DETAILS
| 4
python-pypi/pyicu/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/DETAILS
| 6
python-pypi/pyopenssl/HISTORY
| 6
python-pypi/pypdf2/DETAILS
| 4
python-pypi/pypdf2/HISTORY
| 3
python-pypi/python-ecdsa/DETAILS
| 4
python-pypi/python-ecdsa/HISTORY
| 3
python-pypi/python-efl/DETAILS
| 7
python-pypi/python-efl/HISTORY
| 3
python-pypi/python-ldap/DEPENDS
| 2
python-pypi/python-ldap/DETAILS
| 7
python-pypi/python-ldap/HISTORY
| 7
python-pypi/python-llfuse/DEPENDS
| 4
python-pypi/python-llfuse/DETAILS
| 13
python-pypi/python-llfuse/HISTORY
| 3
python-pypi/python-magic/DEPENDS
| 1
python-pypi/python-magic/DETAILS
| 16
python-pypi/python-magic/HISTORY
| 2
python-pypi/pyxattr/DETAILS
| 4
python-pypi/pyxattr/HISTORY
| 3
python-pypi/rbtools/DETAILS
| 4
python-pypi/rbtools/HISTORY
| 3
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
| 6
python-pypi/scrapely/DEPENDS
| 2
python-pypi/scrapely/DETAILS
| 7
python-pypi/scrapely/HISTORY
| 6
python-pypi/scrapy/DEPENDS
| 2
python-pypi/scrapy/HISTORY
| 3
python-pypi/setuptools/DETAILS
| 6
python-pypi/setuptools/HISTORY
| 22
python-pypi/six/DETAILS
| 4
python-pypi/six/HISTORY
| 3
python-pypi/sqlalchemy/DETAILS
| 4
python-pypi/sqlalchemy/HISTORY
| 6
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
python-pypi/virtualenv/DEPENDS
| 2
python-pypi/virtualenv/DETAILS
| 4
python-pypi/virtualenv/HISTORY
| 4
python-pypi/xlrd/DETAILS
| 4
python-pypi/xlrd/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
| 6
ruby-raa/ruby-2.0/DETAILS
| 6
ruby-raa/ruby-2.0/HISTORY
| 10
ruby-raa/ruby-2.1/DEPENDS
| 2
ruby-raa/ruby-2.1/DETAILS
| 4
ruby-raa/ruby-2.1/HISTORY
| 6
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-libs/itk/BUILD
| 1
science-libs/itk/DEPENDS
| 1
science-libs/itk/DETAILS
| 21
science-libs/itk/HISTORY
| 2
science-libs/vtk/BUILD
| 90
science-libs/vtk/DEPENDS
| 84
science-libs/vtk/DETAILS
| 14
science-libs/vtk/HISTORY
| 8
science/boinc/DEPENDS
| 2
science/boinc/HISTORY
| 3
science/cern_root/DEPENDS
| 2
science/cern_root/HISTORY
| 3
science/gdal/DEPENDS
| 2
science/gdal/HISTORY
| 3
science/gpsbabel/DETAILS
| 7
science/gpsbabel/HISTORY
| 3
science/qlandkarte-gt/DETAILS
| 6
science/qlandkarte-gt/HISTORY
| 3
security-libs/linux-pam/BUILD
| 1
security-libs/linux-pam/DEPENDS
| 9
security-libs/linux-pam/DETAILS
| 19
security-libs/linux-pam/HISTORY
| 10
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/fwknop/DETAILS
| 2
security/fwknop/HISTORY
| 9
security/hashkill/DEPENDS
| 2
security/hashkill/HISTORY
| 3
security/knock/DETAILS
| 4
security/knock/HISTORY
| 5
security/knock/INSTALL
| 5
security/knock/PRE_BUILD
| 7
security/knock/init.d/knock.conf
| 2
security/nmap/DEPENDS
| 8
security/nmap/DETAILS
| 4
security/nmap/HISTORY
| 13
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/BUILD
| 2
security/wireshark/DEPENDS
| 14
security/wireshark/DETAILS
| 6
security/wireshark/HISTORY
| 14
shell-term-fm/abduco/BUILD
| 2
shell-term-fm/abduco/DETAILS
| 21
shell-term-fm/abduco/HISTORY
| 2
shell-term-fm/abduco/INSTALL
| 2
shell-term-fm/bash/DEPENDS
| 8
shell-term-fm/bash/DETAILS
| 7
shell-term-fm/bash/HISTORY
| 24
shell-term-fm/bash/PRE_BUILD
| 2
shell-term-fm/bash/patches/bash42-001
| 78
shell-term-fm/bash/patches/bash42-002
| 60
shell-term-fm/bash/patches/bash42-003
| 318
shell-term-fm/bash/patches/bash42-004
| 53
shell-term-fm/bash/patches/bash42-005
| 131
shell-term-fm/bash/patches/bash42-006
| 46
shell-term-fm/bash/patches/bash42-007
| 46
shell-term-fm/bash/patches/bash42-008
| 74
shell-term-fm/bash/patches/bash42-009
| 82
shell-term-fm/bash/patches/bash42-010
| 61
shell-term-fm/bash/patches/bash42-011
| 46
shell-term-fm/bash/patches/bash42-012
| 151
shell-term-fm/bash/patches/bash42-013
| 52
shell-term-fm/bash/patches/bash42-014
| 47
shell-term-fm/bash/patches/bash42-015
| 81
shell-term-fm/bash/patches/bash42-016
| 46
shell-term-fm/bash/patches/bash42-017
| 47
shell-term-fm/bash/patches/bash42-018
| 74
shell-term-fm/bash/patches/bash42-019
| 47
shell-term-fm/bash/patches/bash42-020
| 60
shell-term-fm/bash/patches/bash42-021
| 61
shell-term-fm/bash/patches/bash42-022
| 61
shell-term-fm/bash/patches/bash42-023
| 62
shell-term-fm/bash/patches/bash42-024
| 45
shell-term-fm/bash/patches/bash42-025
| 143
shell-term-fm/bash/patches/bash42-026
| 58
shell-term-fm/bash/patches/bash42-027
| 47
shell-term-fm/bash/patches/bash42-028
| 52
shell-term-fm/bash/patches/bash42-029
| 524
shell-term-fm/bash/patches/bash42-030
| 178
shell-term-fm/bash/patches/bash42-031
| 80
shell-term-fm/bash/patches/bash42-032
| 75
shell-term-fm/bash/patches/bash42-033
| 57
shell-term-fm/bash/patches/bash42-034
| 46
shell-term-fm/bash/patches/bash42-035
| 66
shell-term-fm/bash/patches/bash42-036
| 92
shell-term-fm/bash/patches/bash42-037
| 112
shell-term-fm/bash/patches/bash42-038
| 47
shell-term-fm/bash/patches/bash42-039
| 58
shell-term-fm/bash/patches/bash42-040
| 56
shell-term-fm/bash/patches/bash42-041
| 47
shell-term-fm/bash/patches/bash42-042
| 57
shell-term-fm/bash/patches/bash42-043
| 65
shell-term-fm/bash/patches/bash42-044
| 70
shell-term-fm/bash/patches/bash42-045
| 53
shell-term-fm/bash/patches/bash43-001
| 58
shell-term-fm/bash/patches/bash43-002
| 62
shell-term-fm/bash/patches/bash43-003
| 48
shell-term-fm/bash/patches/bash43-004
| 47
shell-term-fm/bash/patches/bash43-005
| 63
shell-term-fm/bash/patches/bash43-006
| 48
shell-term-fm/bash/patches/bash43-007
| 50
shell-term-fm/bash/patches/bash43-008
| 188
shell-term-fm/bash/patches/bash43-009
| 64
shell-term-fm/bash/patches/bash43-010
| 157
shell-term-fm/bash/patches/bash43-011
| 49
shell-term-fm/bash/patches/bash43-012
| 43
shell-term-fm/bash/patches/bash43-013
| 66
shell-term-fm/bash/patches/bash43-014
| 102
shell-term-fm/bash/patches/bash43-015
| 58
shell-term-fm/bash/patches/bash43-016
| 132
shell-term-fm/bash/patches/bash43-017
| 51
shell-term-fm/bash/patches/bash43-018
| 44
shell-term-fm/bash/patches/bash43-019
| 84
shell-term-fm/bash/patches/bash43-020
| 110
shell-term-fm/bash/patches/bash43-021
| 52
shell-term-fm/bash/patches/bash43-022
| 56
shell-term-fm/bash/patches/bash43-023
| 104
shell-term-fm/bash/patches/bash43-024
| 54
shell-term-fm/bash/patches/bash43-025
| 123
shell-term-fm/bash/patches/bash43-026
| 60
shell-term-fm/bash/patches/bash43-027
| 221
shell-term-fm/bash/patches/bash43-028
| 2252 +++
shell-term-fm/busybox/BUILD
| 2
shell-term-fm/busybox/DETAILS
| 44
shell-term-fm/busybox/HISTORY
| 6
shell-term-fm/busybox/INSTALL
| 3
shell-term-fm/busybox/PRE_BUILD
| 5
shell-term-fm/busybox/busybox.config
| 94
shell-term-fm/byobu/DEPENDS
| 1
shell-term-fm/byobu/DETAILS
| 17
shell-term-fm/byobu/HISTORY
| 6
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/mc/DETAILS
| 6
shell-term-fm/mc/HISTORY
| 7
shell-term-fm/mc/PRE_BUILD
| 3
shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
| 38
shell-term-fm/mksh/DETAILS
| 4
shell-term-fm/mksh/HISTORY
| 6
shell-term-fm/pcmanfm/DEPENDS
| 9
shell-term-fm/pcmanfm/DETAILS
| 6
shell-term-fm/pcmanfm/HISTORY
| 4
shell-term-fm/rdesktop/DEPENDS
| 5
shell-term-fm/rdesktop/DETAILS
| 4
shell-term-fm/rdesktop/HISTORY
| 9
shell-term-fm/rxvt-unicode/BUILD
| 14
shell-term-fm/rxvt-unicode/CONFIGURE
| 60
shell-term-fm/rxvt-unicode/DEPENDS
| 1
shell-term-fm/rxvt-unicode/DETAILS
| 4
shell-term-fm/rxvt-unicode/HISTORY
| 10
shell-term-fm/screen/DETAILS
| 4
shell-term-fm/screen/HISTORY
| 4
shell-term-fm/shared-mime-info/DETAILS
| 4
shell-term-fm/shared-mime-info/HISTORY
| 3
shell-term-fm/spacefm/DEPENDS
| 2
shell-term-fm/spacefm/HISTORY
| 3
shell-term-fm/st/DETAILS
| 4
shell-term-fm/st/HISTORY
| 7
shell-term-fm/st/PRE_BUILD
| 9
shell-term-fm/st/patches/st-0.5-hidexcursor.diff
| 96
shell-term-fm/tilda/DETAILS
| 4
shell-term-fm/tilda/HISTORY
| 7
shell-term-fm/tilda/PRE_BUILD
| 3
shell-term-fm/tilda/focus.patch
| 11
shell-term-fm/tmux/DETAILS
| 6
shell-term-fm/tmux/HISTORY
| 3
shell-term-fm/tn5250/DEPENDS
| 2
shell-term-fm/tn5250/HISTORY
| 3
shell-term-fm/tty-clock/DETAILS
| 7
shell-term-fm/tty-clock/HISTORY
| 3
shell-term-fm/vifm/BUILD
| 3
shell-term-fm/vifm/CONFIGURE
| 3
shell-term-fm/vifm/DETAILS
| 4
shell-term-fm/vifm/HISTORY
| 4
shell-term-fm/x3270/DEPENDS
| 2
shell-term-fm/x3270/HISTORY
| 3
shell-term-fm/zsh/BUILD
| 3
shell-term-fm/zsh/DEPENDS
| 2
shell-term-fm/zsh/HISTORY
| 4
smgl/basesystem/DEPENDS
| 2
smgl/castfs/DETAILS
| 8
smgl/castfs/HISTORY
| 3
smgl/guru-tools/DETAILS
| 7
smgl/guru-tools/HISTORY
| 3
smgl/iana-etc/DEPENDS
| 2
smgl/quill/DETAILS
| 8
smgl/quill/HISTORY
| 3
smgl/simpleinit-msb/DETAILS
| 1
smgl/simpleinit-msb/HISTORY
| 6
smgl/simpleinit-msb/PRE_BUILD
| 1
smgl/simpleinit-msb/simpleinit-poweroff.patch
| 15
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
| 3
utils/anyrename/DEPENDS
| 2
utils/anyrename/HISTORY
| 3
utils/bibletime4/DETAILS
| 7
utils/bibletime4/HISTORY
| 3
utils/binwalk/BUILD
| 2
utils/binwalk/DETAILS
| 6
utils/binwalk/HISTORY
| 5
utils/chrpath/DETAILS
| 6
utils/chrpath/HISTORY
| 3
utils/consolekit/DEPENDS
| 2
utils/consolekit/DETAILS
| 6
utils/consolekit/HISTORY
| 4
utils/coreutils/DETAILS
| 2
utils/coreutils/HISTORY
| 3
utils/crosstool-ng/DETAILS
| 4
utils/crosstool-ng/HISTORY
| 3
utils/dbus-c++/DEPENDS
| 6
utils/dbus-c++/DETAILS
| 9
utils/dbus-c++/HISTORY
| 6
utils/dbus-c++/PREPARE
| 4
utils/dbus-c++/PRE_BUILD
| 3
utils/dbus-c++/unistd.patch
| 12
utils/dbus-mono/DETAILS
| 7
utils/dbus-mono/HISTORY
| 6
utils/dbus-mono/PREPARE
| 3
utils/dbus/DETAILS
| 6
utils/dbus/HISTORY
| 14
utils/deltup/DEPENDS
| 2
utils/deltup/HISTORY
| 3
utils/desktop-file-utils/DETAILS
| 4
utils/desktop-file-utils/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/direvent/DETAILS
| 19
utils/direvent/HISTORY
| 2
utils/file/DETAILS
| 4
utils/file/HISTORY
| 6
utils/flashrom/DETAILS
| 12
utils/flashrom/HISTORY
| 6
utils/ghasher/DEPENDS
| 2
utils/ghasher/HISTORY
| 3
utils/gnuplot/DETAILS
| 11
utils/gnuplot/HISTORY
| 7
utils/gnuplot/PRE_BUILD
| 3
utils/gnuplot/gnuplot-4.6.2-texinfo-5.patch
| 11
utils/grep/DETAILS
| 2
utils/grep/HISTORY
| 6
utils/gstopwatch/BUILD
| 1
utils/gstopwatch/DEPENDS
| 2
utils/gstopwatch/DETAILS
| 14
utils/gstopwatch/HISTORY
| 2
utils/gstopwatch/INSTALL
| 1
utils/gstopwatch/PRE_BUILD
| 4
utils/hal/DEPENDS
| 4
utils/hal/HISTORY
| 3
utils/hercules/DEPENDS
| 2
utils/htop/DETAILS
| 8
utils/htop/HISTORY
| 3
utils/iozone/DETAILS
| 5
utils/iozone/HISTORY
| 4
utils/iozone/INSTALL
| 4
utils/ipmitool/DEPENDS
| 2
utils/ipmitool/HISTORY
| 3
utils/kbd/DEPENDS
| 6
utils/kbd/DETAILS
| 10
utils/kbd/HISTORY
| 6
utils/kbd/PRE_BUILD
| 5
utils/kbd/fgconsole-serial.patch
| 11
utils/kbd/loadkeys.patch
| 40
utils/lxc/DETAILS
| 29
utils/lxc/HISTORY
| 2
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/openmoko-dfu-util/DETAILS
| 7
utils/openmoko-dfu-util/HISTORY
| 3
utils/powertop/DETAILS
| 6
utils/powertop/HISTORY
| 3
utils/pv/DETAILS
| 2
utils/pv/HISTORY
| 3
utils/qemu/BUILD
| 3
utils/qemu/HISTORY
| 3
utils/renouveau/DETAILS
| 7
utils/renouveau/HISTORY
| 3
utils/run-parts/BUILD
| 8
utils/run-parts/DETAILS
| 4
utils/run-parts/HISTORY
| 4
utils/schroot/DETAILS
| 4
utils/schroot/HISTORY
| 3
utils/smem/DETAILS
| 4
utils/smem/HISTORY
| 3
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/supermin/DEPENDS
| 2
utils/syslog-ng/DEPENDS
| 12
utils/syslog-ng/DETAILS
| 4
utils/syslog-ng/HISTORY
| 9
utils/taskwarrior/BUILD
| 4
utils/taskwarrior/DEPENDS
| 11
utils/taskwarrior/DETAILS
| 2
utils/taskwarrior/HISTORY
| 6
utils/uptimec/DEPENDS
| 2
utils/uptimec/HISTORY
| 3
utils/util-linux/DETAILS
| 4
utils/util-linux/HISTORY
| 3
utils/vbtracetool/DETAILS
| 7
utils/vbtracetool/HISTORY
| 3
utils/xdg-user-dirs/DETAILS
| 17
utils/xdg-user-dirs/HISTORY
| 12
utils/xen-tools/DETAILS
| 4
utils/xen/BUILD
| 1
utils/xen/DEPENDS
| 2
utils/xen/DETAILS
| 2
utils/xen/HISTORY
| 10
utils/youtube-dl/DETAILS
| 12
utils/youtube-dl/HISTORY
| 12
utils/youtube-dl/INSTALL
| 2
utils/youtube-dl/youtube-dl.gpg
|binary
video-libs/gst-libav-1.0/DEPENDS
| 3
video-libs/gst-libav-1.0/DETAILS
| 5
video-libs/gst-libav-1.0/HISTORY
| 4
video-libs/gst-plugins-bad-1.0/DETAILS
| 5
video-libs/gst-plugins-bad-1.0/HISTORY
| 3
video-libs/gst-plugins-base-1.0/DETAILS
| 5
video-libs/gst-plugins-base-1.0/HISTORY
| 3
video-libs/gst-plugins-base/DEPENDS
| 3
video-libs/gst-plugins-base/HISTORY
| 3
video-libs/gst-plugins-good-1.0/DETAILS
| 5
video-libs/gst-plugins-good-1.0/HISTORY
| 3
video-libs/gstreamer-1.0/DETAILS
| 4
video-libs/gstreamer-1.0/HISTORY
| 3
video-libs/libdvbpsi/DETAILS
| 4
video-libs/libdvbpsi/HISTORY
| 3
video-libs/libdvdnav/DETAILS
| 6
video-libs/libdvdnav/HISTORY
| 3
video-libs/libdvdread/DETAILS
| 6
video-libs/libdvdread/HISTORY
| 3
video-libs/libiec61883/DETAILS
| 2
video-libs/libiec61883/HISTORY
| 3
video-libs/libmms/DEPENDS
| 3
video-libs/libmms/HISTORY
| 3
video-libs/libvpx/DETAILS
| 4
video-libs/libvpx/HISTORY
| 3
video-libs/smpeg/DETAILS
| 3
video-libs/smpeg/HISTORY
| 3
video-libs/xine-lib/DETAILS
| 6
video-libs/xine-lib/HISTORY
| 3
video/animata/DETAILS
| 7
video/animata/HISTORY
| 3
video/bino/DETAILS
| 4
video/bino/HISTORY
| 3
video/dvdauthor/DETAILS
| 7
video/dvdauthor/HISTORY
| 3
video/ffmpeg/DEPENDS
| 4
video/ffmpeg/DETAILS
| 4
video/ffmpeg/HISTORY
| 20
video/gpac/DEPENDS
| 2
video/gpac/HISTORY
| 3
video/minitube/0001-remove-reference-to-missing-translations.patch
| 25
video/minitube/DETAILS
| 13
video/minitube/HISTORY
| 8
video/minitube/PRE_BUILD
| 3
video/mlt/DETAILS
| 7
video/mlt/HISTORY
| 3
video/mplayer/DEPENDS
| 14
video/mplayer/DETAILS
| 7
video/mplayer/HISTORY
| 9
video/mplayer2/DEPENDS
| 2
video/mplayer2/DETAILS
| 7
video/mplayer2/HISTORY
| 6
video/mpv/CONFIGURE
| 24
video/mpv/DEPENDS
| 116
video/mpv/DETAILS
| 4
video/mpv/HISTORY
| 27
video/mythtv/DEPENDS
| 2
video/mythtv/HISTORY
| 3
video/tcvp/DEPENDS
| 2
video/tcvp/HISTORY
| 3
video/v4l-utils/DETAILS
| 4
video/v4l-utils/HISTORY
| 3
video/vlc/DEPENDS
| 8
video/vlc/DETAILS
| 2
video/vlc/HISTORY
| 7
video/xbmc/DEPENDS
| 4
video/xbmc/DETAILS
| 6
video/xbmc/HISTORY
| 12
video/xine-ui/DETAILS
| 6
video/xine-ui/HISTORY
| 3
video/xine-ui/PRE_BUILD
| 3
windowmanagers/afterstep/DEPENDS
| 2
windowmanagers/afterstep/HISTORY
| 3
windowmanagers/amiwm/BUILD
| 3
windowmanagers/amiwm/HISTORY
| 3
windowmanagers/blackbox/DETAILS
| 7
windowmanagers/blackbox/HISTORY
| 3
windowmanagers/dvtm/DETAILS
| 4
windowmanagers/dvtm/HISTORY
| 3
windowmanagers/fluxbox/DETAILS
| 7
windowmanagers/fluxbox/HISTORY
| 3
windowmanagers/fvwm/DETAILS
| 7
windowmanagers/fvwm/HISTORY
| 3
windowmanagers/herbstluftwm/DETAILS
| 4
windowmanagers/herbstluftwm/HISTORY
| 3
windowmanagers/openbox/DETAILS
| 4
windowmanagers/openbox/HISTORY
| 3
windowmanagers/windowmaker/DEPENDS
| 2
windowmanagers/windowmaker/HISTORY
| 3
windowmanagers/wmii/DETAILS
| 8
windowmanagers/wmii/HISTORY
| 3
windowmanagers/xmonad/BUILD
| 3
windowmanagers/xmonad/DEPENDS
| 6
windowmanagers/xmonad/DETAILS
| 27
windowmanagers/xmonad/DOWNLOAD
| 1
windowmanagers/xmonad/HISTORY
| 5
windowmanagers/xmonad/INSTALL
| 6
windowmanagers/xmonad/POST_REMOVE
| 2
windowmanagers/xmonad/POST_RESURRECT
| 16
windowmanagers/xmonad/PRE_BUILD
| 1
windowmanagers/xmonad/PRE_RESURRECT
| 9
windowmanagers/xmonad/TRIGGERS
| 1
wm-addons/cairo-dock-plugins/DETAILS
| 2
wm-addons/cairo-dock-plugins/HISTORY
| 3
wm-addons/cairo-dock/DETAILS
| 2
wm-addons/cairo-dock/HISTORY
| 3
wm-addons/obvious/DETAILS
| 7
wm-addons/obvious/HISTORY
| 6
wm-addons/obvious/PREPARE
| 5
wm-addons/slock/DEPENDS
| 2
wm-addons/slock/HISTORY
| 3
wm-addons/wdm/DEPENDS
| 2
wm-addons/wdm/HISTORY
| 3
wm-addons/wicked/DETAILS
| 7
wm-addons/wicked/HISTORY
| 6
wm-addons/wicked/PREPARE
| 3
wm-addons/xmonad-contrib/BUILD
| 3
wm-addons/xmonad-contrib/DEPENDS
| 8
wm-addons/xmonad-contrib/DETAILS
| 23
wm-addons/xmonad-contrib/DOWNLOAD
| 1
wm-addons/xmonad-contrib/HISTORY
| 8
wm-addons/xmonad-contrib/INSTALL
| 5
wm-addons/xmonad-contrib/POST_REMOVE
| 2
wm-addons/xmonad-contrib/POST_RESURRECT
| 14
wm-addons/xmonad-contrib/PRE_BUILD
| 1
wm-addons/xmonad-contrib/PRE_RESURRECT
| 7
wm-addons/xmonad-contrib/TRIGGERS
| 1
x11-libs/cairo/DEPENDS
| 2
x11-libs/cairo/DETAILS
| 21
x11-libs/cairo/HISTORY
| 13
x11-libs/cairo/PREPARE
| 3
x11-libs/cairo/PRE_BUILD
| 15
x11-libs/cairo/PRE_SUB_DEPENDS
| 2
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
| 2
x11-libs/cairo/SUB_DEPENDS
| 4
x11-libs/cairo/cairo-broken-lto-build.patch
| 26
x11-libs/fontconfig/DEPENDS
| 10
x11-libs/fontconfig/DETAILS
| 4
x11-libs/fontconfig/HISTORY
| 6
x11-libs/libafterimage/DEPENDS
| 2
x11-libs/libafterimage/HISTORY
| 3
x11-libs/wine/DEPENDS
| 7
x11-libs/wine/DETAILS
| 9
x11-libs/wine/HISTORY
| 44
x11-toolkits/fltk2/DEPENDS
| 2
x11-toolkits/fltk2/HISTORY
| 3
x11-toolkits/gtk+2/DEPENDS
| 19
x11-toolkits/gtk+2/DETAILS
| 4
x11-toolkits/gtk+2/HISTORY
| 6
x11-toolkits/gtk+3/DETAILS
| 11
x11-toolkits/gtk+3/HISTORY
| 9
x11-toolkits/qt4/CVE-2014-0190.patch
| 32
x11-toolkits/qt4/DEPENDS
| 2
x11-toolkits/qt4/DETAILS
| 8
x11-toolkits/qt4/HISTORY
| 10
x11-toolkits/qt4/PRE_BUILD
| 4
x11-toolkits/qt4/PRE_SUB_DEPENDS
| 2
x11-toolkits/qt4/SUB_DEPENDS
| 4
x11-toolkits/qt4/boost.patch
| 16
x11-toolkits/sptk/DEPENDS
| 2
x11-toolkits/sptk/HISTORY
| 3

x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch
| 39
x11-toolkits/wxgtk-new/DETAILS
| 6
x11-toolkits/wxgtk-new/HISTORY
| 7
x11-toolkits/wxgtk-new/PRE_BUILD
| 3
x11-toolkits/wxgtk/DEPENDS
| 6
x11-toolkits/wxgtk/HISTORY
| 6
x11/conky/DETAILS
| 2
x11/conky/HISTORY
| 12
x11/conky/PRE_BUILD
| 10
x11/conky/conky-1.8.1-utf8-scroll.patch
| 104
x11/conky/conky-1.9.0-apcupsd.patch
| 106
x11/conky/conky-1.9.0-default-graph-size.patch
| 18
x11/conky/conky-1.9.0-diskio-dmmajor.patch
| 25
x11/conky/conky-1.9.0-lines-fix.patch
| 36
x11/conky/conky-1.9.0-ncurses.patch
| 31
x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
| 75
x11/freenx/DETAILS
| 7
x11/freenx/HISTORY
| 3
x11/gkrellm2/DEPENDS
| 2
x11/gkrellm2/HISTORY
| 3
x11/lightdm/DEPENDS
| 1
x11/lightdm/DETAILS
| 5
x11/lightdm/HISTORY
| 3
x11/slim/BUILD
| 4
x11/slim/HISTORY
| 3
x11/transset/DETAILS
| 7
x11/transset/HISTORY
| 3
x11/unclutter/DEPENDS
| 3
x11/unclutter/DETAILS
| 4
x11/unclutter/HISTORY
| 4
x11/x11vnc/DEPENDS
| 4
x11/x11vnc/HISTORY
| 3
x11/xclip/DETAILS
| 2
x11/xclip/HISTORY
| 3
x11/xlockmore/DEPENDS
| 2
x11/xlockmore/HISTORY
| 3
x11/xplanet/DEPENDS
| 2
x11/xplanet/HISTORY
| 3
xfce/garcon/DEPENDS
| 2
xfce/garcon/HISTORY
| 3
xfce/libxfce4util/DEPENDS
| 1
xfce/libxfce4util/HISTORY
| 3
xfce/ristretto/DEPENDS
| 4
xfce/ristretto/HISTORY
| 3
xfce/xfburn/DETAILS
| 7
xfce/xfburn/HISTORY
| 3
xorg-app/appres/DEPENDS
| 2
xorg-app/appres/DETAILS
| 4
xorg-app/appres/HISTORY
| 3
xorg-app/bdftopcf/DEPENDS
| 2
xorg-app/beforelight/DEPENDS
| 2
xorg-app/bitmap/DEPENDS
| 3
xorg-app/bitmap/HISTORY
| 3
xorg-app/editres/DEPENDS
| 2
xorg-app/x11perf/DEPENDS
| 7
xorg-app/x11perf/HISTORY
| 3
xorg-app/xdm/DEPENDS
| 53
xorg-app/xdm/HISTORY
| 4
xorg-app/xdpyinfo/DETAILS
| 6
xorg-app/xdpyinfo/HISTORY
| 3
xorg-app/xdriinfo/DEPENDS
| 2
xorg-app/xdriinfo/HISTORY
| 3
xorg-app/xfd/BUILD
| 1
xorg-app/xfd/DEPENDS
| 4
xorg-app/xfd/HISTORY
| 3
xorg-app/xfontsel/DEPENDS
| 7
xorg-app/xfontsel/HISTORY
| 3
xorg-app/xlsclients/DETAILS
| 4
xorg-app/xlsclients/HISTORY
| 3
xorg-data/xbitmaps/DEPENDS
| 2
xorg-driver/wizardpen/DETAILS
| 7
xorg-driver/wizardpen/HISTORY
| 3
xorg-driver/xf86-video-ati/DEPENDS
| 14
xorg-driver/xf86-video-ati/DETAILS
| 9
xorg-driver/xf86-video-ati/HISTORY
| 13
xorg-driver/xf86-video-ati/PREPARE
| 7
xorg-driver/xf86-video-ati/PRE_BUILD
| 2
xorg-driver/xf86-video-glint/DEPENDS
| 2
xorg-driver/xf86-video-glint/HISTORY
| 3
xorg-driver/xf86-video-intel/HISTORY
| 3
xorg-driver/xf86-video-mga/DEPENDS
| 2
xorg-driver/xf86-video-mga/HISTORY
| 3
xorg-driver/xf86-video-openchrome/DEPENDS
| 2
xorg-driver/xf86-video-openchrome/DETAILS
| 7
xorg-driver/xf86-video-openchrome/HISTORY
| 6
xorg-driver/xf86-video-r128/DEPENDS
| 2
xorg-driver/xf86-video-r128/HISTORY
| 3
xorg-driver/xf86-video-sis/DEPENDS
| 2
xorg-driver/xf86-video-sis/HISTORY
| 3
xorg-driver/xf86-video-tdfx/DEPENDS
| 2
xorg-driver/xf86-video-tdfx/HISTORY
| 3
xorg-driver/xf86-video-via/DEPENDS
| 2
xorg-driver/xf86-video-via/HISTORY
| 3
xorg-extras/xterm/DEPENDS
| 2
xorg-extras/xterm/HISTORY
| 4
xorg-lib/libdmx/DEPENDS
| 2
xorg-lib/libfontenc/DEPENDS
| 2
xorg-lib/libfs/DEPENDS
| 2
xorg-lib/libice/DEPENDS
| 2
xorg-lib/liblbxutil/DEPENDS
| 2
xorg-lib/liboldx/DEPENDS
| 2
xorg-lib/libsm/DEPENDS
| 2
xorg-lib/libx11/DEPENDS
| 3
xorg-lib/libx11/HISTORY
| 3
xorg-lib/libxau/DEPENDS
| 2
xorg-lib/libxaw/DEPENDS
| 26
xorg-lib/libxaw/HISTORY
| 3
xorg-lib/libxcb/DEPENDS
| 17
xorg-lib/libxcb/HISTORY
| 3
xorg-lib/libxcomposite/DEPENDS
| 22
xorg-lib/libxcomposite/HISTORY
| 3
xorg-lib/libxcursor/DEPENDS
| 20
xorg-lib/libxcursor/HISTORY
| 3
xorg-lib/libxdamage/DEPENDS
| 22
xorg-lib/libxdamage/HISTORY
| 3
xorg-lib/libxdmcp/DEPENDS
| 2
xorg-lib/libxevie/DEPENDS
| 2
xorg-lib/libxext/DEPENDS
| 19
xorg-lib/libxext/HISTORY
| 3
xorg-lib/libxfixes/DEPENDS
| 20
xorg-lib/libxfixes/HISTORY
| 3
xorg-lib/libxfont/DEPENDS
| 2
xorg-lib/libxfontcache/DEPENDS
| 2
xorg-lib/libxft/DEPENDS
| 26
xorg-lib/libxft/HISTORY
| 3
xorg-lib/libxi/DEPENDS
| 22
xorg-lib/libxi/HISTORY
| 3
xorg-lib/libxinerama/DEPENDS
| 20
xorg-lib/libxinerama/HISTORY
| 3
xorg-lib/libxkbfile/DEPENDS
| 20
xorg-lib/libxkbfile/HISTORY
| 3
xorg-lib/libxkbui/DEPENDS
| 2
xorg-lib/libxmu/DEPENDS
| 20
xorg-lib/libxmu/HISTORY
| 3
xorg-lib/libxp/DEPENDS
| 2
xorg-lib/libxpm/DEPENDS
| 20
xorg-lib/libxpm/HISTORY
| 3
xorg-lib/libxrandr/DEPENDS
| 22
xorg-lib/libxrandr/HISTORY
| 3
xorg-lib/libxrender/DEPENDS
| 16
xorg-lib/libxrender/HISTORY
| 3
xorg-lib/libxres/DEPENDS
| 18
xorg-lib/libxres/HISTORY
| 3
xorg-lib/libxscrnsaver/DEPENDS
| 2
xorg-lib/libxt/DEPENDS
| 2
xorg-lib/libxtrap/DEPENDS
| 2
xorg-lib/libxtst/DEPENDS
| 24
xorg-lib/libxtst/HISTORY
| 3
xorg-lib/libxv/DEPENDS
| 20
xorg-lib/libxv/HISTORY
| 3
xorg-lib/libxvmc/DEPENDS
| 22
xorg-lib/libxvmc/HISTORY
| 3
xorg-lib/libxxf86dga/DEPENDS
| 22
xorg-lib/libxxf86dga/HISTORY
| 3
xorg-lib/libxxf86misc/DEPENDS
| 22
xorg-lib/libxxf86misc/HISTORY
| 3
xorg-lib/libxxf86vm/DEPENDS
| 22
xorg-lib/libxxf86vm/HISTORY
| 3
xorg-proto/applewmproto/DEPENDS
| 2
xorg-proto/bigreqsproto/DEPENDS
| 2
xorg-proto/compositeproto/DEPENDS
| 2
xorg-proto/damageproto/DEPENDS
| 2
xorg-proto/dmxproto/DEPENDS
| 2
xorg-proto/dri2proto/DEPENDS
| 2
xorg-proto/evieext/DEPENDS
| 2
xorg-proto/fixesproto/DEPENDS
| 2
xorg-proto/fontcacheproto/DEPENDS
| 2
xorg-proto/fontsproto/DEPENDS
| 2
xorg-proto/glproto/DEPENDS
| 2
xorg-proto/inputproto/DEPENDS
| 2
xorg-proto/kbproto/DEPENDS
| 2
xorg-proto/printproto/DEPENDS
| 2
xorg-proto/randrproto/DEPENDS
| 2
xorg-proto/recordproto/DEPENDS
| 2
xorg-proto/renderproto/DEPENDS
| 2
xorg-proto/resourceproto/DEPENDS
| 2
xorg-proto/scrnsaverproto/DEPENDS
| 2
xorg-proto/trapproto/DEPENDS
| 2
xorg-proto/videoproto/DEPENDS
| 2
xorg-proto/windowswmproto/DEPENDS
| 2
xorg-proto/xcmiscproto/DEPENDS
| 2
xorg-proto/xextproto/DEPENDS
| 2
xorg-proto/xf86bigfontproto/DEPENDS
| 2
xorg-proto/xf86dgaproto/DEPENDS
| 2
xorg-proto/xf86driproto/DEPENDS
| 2
xorg-proto/xf86miscproto/DEPENDS
| 2
xorg-proto/xf86rushproto/DEPENDS
| 2
xorg-proto/xf86vidmodeproto/DEPENDS
| 2
xorg-proto/xineramaproto/DEPENDS
| 2
xorg-proto/xproto/DEPENDS
| 2
xorg-proto/xproxymanagementprotocol/DEPENDS
| 2
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
| 6
xorg-xserver/xorg-server/HISTORY
| 8
2917 files changed, 25255 insertions(+), 10397 deletions(-)

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

jack2: added primary mirror

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

gst-libav-1.0: => 1.4.3

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

gst-plugins-bad-1.0: => 1.4.3

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

gst-plugins-good-1.0: => 1.4.3

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

gst-plugins-base-1.0: => 1.4.3

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

gstreamer-1.0: => 1.4.3

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

bash: => 4.3.28 [security]

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

librsvg2: => 2.40.4

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

pango: => 1.36.8

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

glib2: => 2.42.0

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

automake: => 1.14.1

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

m4: => 1.4.17

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

bino 1.6.0

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

openal-soft 1.16.0

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

mpv 0.6.0

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

libcaca 0.99.beta19

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

ghostscript: => 9.15

commit dd7ad7084196155aa3a1f3d49ebe3191b92e484a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

firefox: Clean up dependencies

commit 3e59e06bced29d37890ccf022f459cd96450b573
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

byobu: Fix SOURCE

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

php: => 5.4.33

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

wireshark 1.12.1

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

linux 3.16.3

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

phantomjs: new spell, headless WebKit scriptable with a JavaScript API

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

nodejs: => 0.10.32

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

libdrm: => 2.4.58

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

wine: => 1.7.27

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

megatools: added missing glib-networking dependency

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

megatools: new spell, command line client for mega.co.nz

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

shell-term-fm/bash: another patch against the ShellShock issues, security
update

commit e26cc0823d1ccdecb517006228ecb359346f4d8c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnutls: Update stable branch to 3.2.18

commit 3fc6aedff7a8e0564011d67cefb1fe4d9f6ca02c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnutls: Simplify branch version handling

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

Revert "distcc 3.2rc1"

This reverts commit dec4abc6e8a0d575b9b92551a88ada90d1cd4e03.

We do not force devel versions; devel branch is needed here

commit dec4abc6e8a0d575b9b92551a88ada90d1cd4e03
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

distcc 3.2rc1

commit 858f8751e74ed6ea2a0a14186482b9835122f4e8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

icecream 1.0.1

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

mongodb: => 2.4.11

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

gettext -icu is only needed if libxmls2 uses it

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

easytag: => 2.2.4

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

cups-filters: => 1.0.59

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

mariadb: => 5.5.39 (5.5)

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

dhcpcd: => 6.4.5

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

mpd: => 0.18.16

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

tilda: => 1.1.13

commit 2f31b424d77fd6516aec26c34bdbe70e2e6e3888
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

wget: properly migrate from openssl to SSL provider

commit 766b7af1872aebd23236d24cc08d01ecfd4bedcd
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ruby-2.0: version 2.0.0-p576

commit 9d0d467975c78324622a6ed44b7f6df75fa52488
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mpd: fix build with --as-needed

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

shell-term-fm/bash: replace unofficial patch for CVE 2014 7169 with the
upstream patch

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

monit: => 5.9

commit 64d1ded0f0fdf48a51a74cb59cde5efa49defb29
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk: Add missing dependencies

commit e560cf8a2dfd1cc4a9cd8fc406eec1c21874d6de
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk: Replace custom code by cmake_build

commit a7c65807d897e99802049430c51810033f75231c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: cmake_build: Pass down CFLAGS and CXXFLAGS

commit d39b3474611bd74b4fc3620dbee6fa23d9df3a85
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: cmake_build: Allow spaces in INSTALL_ROOT and SOURCE_DIRECTORY

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

shell-term-fm/bash: fix CVE 2014 7169

commit e30a0e96cfd97182a7c93ad958243a1a57c2e77b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

itk: new spell, toolkit for performing registration and segmentation

commit 85624ac3506d188967a0cca6ba8db1be6176af86
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

rxvt-unicode: clarify extended ISO 14755 modes

commit 9d0e4b04196826f87c70548b7e61078cd59ddb74
Author: root <wich AT sourcemage.org>
Commit: root <wich AT sourcemage.org>

mesalib: development: 7.11.2

commit 21bcaa21d11748e0b7a37b63c58c4bf17a5ec1f9
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xdm: proper optional dependecy descriptions

commit 28ffdae80265529f7d7b28f75e6b6c445fcc3f9f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk 6.1.0

commit 413d8296897b22111a216cd9679fb69fe4f650fd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dcmtk: new spell, DICOM Toolkit

commit accc9b812a427d80050c63a3a299089cd444a1c4
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xterm: depends libxpm

commit e446adfa07c24f4be39cee83c01689de1938a02d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xfontsel: added missing dependencies

commit 57960bfdda81bb4e94103068662ed0a3cb5456ba
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xf86-video-ati: added missing dependencies

commit 8b15bd15e29a680498e1c3a0bfdf724f223ee96c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xdm: added missing dependencies

commit 25fc5ae446a8b190c05f723f8bfe47e1f40f4927
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

x11perf: added missing dependencies

commit 118e892b462bdbbc82aee8a574958ba6bb18e5a6
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

wine: depends gettext, libxml2

commit 866477cbc2641953a31bf39ed46bb9ba00a354ff
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

wget: depends pcre

commit 3fd20831f8cd85b440a4c5fa5b5a3263ac735dfc
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

thunderbird: added missing dependencies

commit ed0178369d5bdb21cd8a5736b038902398535abe
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

slock: depends libx11, libxext

commit 522150bf3fe3a3cb3b93441f0666686511448d45
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

scrot: depends imlib2, libx11

commit ec83b003bedc7c25a6ec75d41263a76d3515b0a2
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ruby-2.0: depends libffi

commit cf58f37d0e1cf7d236220999e075c155e67af4c7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

rdesktop: depends libxrandr

commit c7d15deb33ad5949b60407fa206fcf07cb18cd9c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

python: depends gettext

commit 9bea7133828dda34e72e12865bfafde92e69269d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

pidgin-sipe: added missing dependencies

commit 28c552392eed0dc6a5f997601b1d224eeb9e946c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

pidgin: depends nspr

commit bbec23dd8894a2a5d8eb65403c2ef3db10c56c3e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xterm: freetype2 was both hard and optional dep

commit 57bcc2de7001aa1585f6d9df2db68a85c7107efc
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

pango: depends MESALIB

commit fc408c2abd652ceeb773eb5884d6f2c24b7c7c96
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mplayer: mesalib -> MESALIB

commit 3a1c4ef3e85e3b0af4c052dde39fcaaea4181308
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

nss: depends sqlite

commit e4bd07cfe3810e5db3c500c556eb8738b76332e1
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mplayer: added missing dependencies

commit b68542e3136ed6d646567722c93effcb66f1beb7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mpd: depends on libogg if libvorbis is enabled

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

http/firefox: version 3.16.5, security update

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

crypto/nss: version 3.16.5, security update

commit cf641a7fe47f5b4daeda9b079fdc8ebbe532e6a1
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

mesalib: depends libxt

commit 2c3dea7335d83184f82213a2258c966da4dc6422
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxxf86vm: added missing dependencies

commit e20e9565ad8ad399f997cb75e0c2f3350d630e45
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxxf86misc: added missing dependencies

commit fa4c17784e8f97b288d5606f0974532c942aadaf
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxxf86dga: added missing dependencies

commit 60c9a7e3a2114c28b5ca02337ddb67825aad4665
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxvmc: added missing dependencies

commit 1a957de5a9caf92c7ec8bde25b6b18979057a7a3
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxv: added missing dependencies

commit e7c3e48ef9b561ca230f3bd2b3830a7f1a89bcea
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxtst: added missing dependencies

commit b4401d376745694dfda0effabc8609c27cb4d112
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxres: added missing dependencies

commit e58a42a4c72e487a8b4038c5843929746b7ea0c5
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxrandr: added missing dependencies

commit 57db7eca1a745e7050a755e99c54b708e561dd34
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxpm: added missing dependencies

commit c0551f1e7032cdbc336c3080f84fd7000fde8a22
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxkbfile: added missing dependencies

commit d6847acdfbe1215f4c49a003ad0d3b0081252a9d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxinerama: added missing dependencies

commit d60dca84053cbd5d76e3c13badbacfba2f709528
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxi: added missing dependencies

commit 1c97ed7f9db6848e4d95fc8360f65222ee563379
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxft: added missing dependencies

commit 5ec299d9edb3ae5203cb79cd98ab1aa564b33cbd
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxfixes: added missing dependencies

commit 845ad48d746a04062dfa85edd64f0819e620035c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxdamage: added missing dependencies

commit 6374a4367e1150b8e86f55d67348620e6697c81f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxcursor: added missing dependencies

commit dbea683a9d08dda34d7138a90e297a39bae7d05b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxcomposite: added missing dependencies

commit acb2868ce1b856e06a675c0566948c537e77bd15
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

imlib2: depends glib2, harfbuzz, pcre

commit 6b0905b3e7bc49ee047691cd6d215ba453712ba2
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

giblib: depends harfbuzz, libpng

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

hexchat: => 2.10.1

commit 4eddce7ac795eadb3af0472a53fa359a3614ad59
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Changelog: Remove accidentally added superflous spaces

commit 9e6d815dbff2948088885354f9a9136a19f4926b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lxc: new spell, Userspace tools for the Linux kernel containers

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

shell-term-fm/bash: version 4.3 patchlevel 25

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

graphics/nitrogen: add support for building the scm version

commit 075dc6d20393a338e987b820ca6f395950df010f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

chat-im/pidgin-window-merge: new spell, one window plugin for Pidgin

commit 46932d9aff5fc1160a1c36d0b6fb8c308f158fe3
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

chat-im/pidgin: updated to 2.10.9

commit 4d9ae3594cfc6929d226d82abad9b4f2bf11f79a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vbindiff: new spell, Visual Binary Diff

commit 0fdcc558aea6f3529613858a1f3bc0213e1207a6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

make: Install gmake symlink

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

openvpn: => 2.3.4

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

python-pypi/grit-i18n added

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

xdg-user-dirs: => 0.15

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

move xdg-user-dirs to utils

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

sip: => 4.16.3

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

cmake: => 3.0.2

commit 7d9b6ccbb773b3f24de21834efdd16426d1c8b57
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

flashrom 0.9.7

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

dbus-1.8.8 - SECURITY FIX

commit c77c372e08f5b76aeb5ad30e9fd83c66152929d6
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

doc/evince: version 3.13.92

commit 6097460558b01a37fefa6cd00c8972300f0c8ac8
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

gnome3-libs/adwaita-icon-theme: new spell, Adwaita icon theme for GNOME

commit 4f272e0b87d6051bdcdfcde701009146365e4cae
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

irrlicht: move to games grimoire

commit d0f41e546d50f5866740e3c7867a45099659ecee
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

isl: new spell, Integer Set Library

commit 0dec33697ad6f26caabef0648340e0d5639982cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

corkscrew: new spell, tool for tunneling SSH through HTTP proxies

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

chrony: => 1.31

commit 0b24f04169b15e5e907334e5a315196ece95ee31
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

elfkickers: new spell, Kickers of ELF

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

lxml: => 3.4.0

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

extra-cmake-modules: => 1.2.1

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

libs/libiptcdata: fix SOURCE_URL[0]

commit 5070b8b2f28efe4076e033fa5ab4dd0cb147ce30
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lyx 2.1.1

commit daf50d7c20bbff6bbc983e2a2c7040ce3f196c03
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texmaker 4.3

commit 63f1a81de5071e18cc5c943aa73320d4d77ec963
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

irrlicht: new spell, high performance realtime 3D engine

commit ceaf532bdaa5a4c829b816098a5c6dcf9300032c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texworks 0.4.5-r1281

commit 0c56325f2194b5659888e3b28bd4ec9d4c076175
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

latex-beamer 3.33

commit 87a0d7e8dd8fcc6d72de321101af8efc47cde82d
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

leveldb: new spell, fast key-value storage library by Google

commit ebd3fc05030c8c878416b4f45e5096b825fda455
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

snappy: fix malformed DETAILS

commit 2f1caabc70adcb1cabff677575405ff738fc0120
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

snappy: 1.1.2 and add git version

commit 067a1e974e20076a0d1d9f34060b2086f17bdc10
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vim-csapprox: new spell, Make gvim-only colorschemes work in terminal

commit a67f89ca59b6ed5924cffacda5ef8aee98793d2f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/xbmc: version 13.2

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

x11-toolkits/wxgtk-new: fix link error in dependent spells

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

graphics-libs/vigra: version 1.10.0

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

graphics-libs/libpano13: version 2.9.19

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

cherrypy: => 3.6.0

commit 1d5a4fa873e15289ef429b81f417a4885dcb47f4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cobra: new spell, Cobra Programming Language

commit 7d446689fe905a421138446aa655946dc93d77ef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

newt: Clarify the python's module name

commit fd69a540417b415527a0db631cc66431ad419fc5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

newt: Update website

commit 9de36259ef50f1efbc9e701bbade0ae271b1e8f3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

byobu: Optionally depends on newt for byobu-config

commit 192eb0fbb06d6efe480db8d6be9a9146e21c0882
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

byobu: new spell, text based window manager and terminal multiplexer

commit 2903da1351e130c4d488e6054dc55fdad67cc6fd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abduco: new spell, session {at,de}tach support

commit 74786298ba8145716a68ad06ac51530e0765a714
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ChangeLog: Fix last entry date

commit 4d64d5c220572004d75017762c78e6ae5e33b4d0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dvtm 0.12

commit f7b23c7d4dde28c301a1804aa3e9816e6a613cde
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mono 2.11.4

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

http/firefox: version 32.0.1

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

mpd: => 0.18.14

commit a869590d13a923f349f5ba79788b8654fed7a485
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

squashfs-tools3: new spell, squashfs-tools 3.x

commit f647eebe2c4baf394de7f8eea9fc0c8fd3e7a945
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

binwalk 2.0.1

commit 4e3439270f320f4dfae9c28b785f2ecaa3183709
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gocr 0.50

commit 2340b318dcadfd4969ef0a86faff1e3b13a217bd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

crosstool-ng 1.20.0

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

graphics/dcraw: version 9.22

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

utils/chrpath: version 0.16

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

image-exiftool: version 9.70

commit 59d996006644b88675a10a9d73238627de77f25c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gawk: typo in DEPENDS

commit 0b694fe5e3ac106c4c8628611f772e8b2389bee5
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gtk+2: typo in DEPENDS

commit 860b171073abb92432ee610499fa6bec969e3881
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

runawk: new spell, Wrapper for AWK providing modules

commit f397f302618e22c2649c5ca0a2c22733742480b9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mk-configure: new spell, Lightweight replacement for autotools

commit 84321096b85829685a70de99f0a9a4fa7b35b448
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bmake: Fix system search path

commit 3b5650e63dc3e78b2cac8be2d6e39ec646d5b4a9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bmake: new spell, Portable version of NetBSD make

commit 5d3f69f50ab421e85194c79db0b6fb8cef152c5e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

python-magic: new spell, File type identification using libmagic

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

swig: => 3.0.2

commit a2e9ff6724ae70a3c0b2e60e3fe618957127a7da
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

pango: added missing dependencies

commit a01f497cc0fa1618b6495118036e96b2799ea620
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxrender: added missing dependencies

commit 74ffc130cdae305153fdc02fe9514b4f650484bb
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxmu: added missing dependencies

commit 8891b33f8a532a2bd0cb719a64302559da062b7e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxext: depends libpthread-stubs, libxcb, libxdmcp

commit 8907a5467f4905c3da592d169b9597928488c39e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxcb: depends libxdmcp

commit fc1f37174fbf2671af2dbaa3a1002a5518116ad6
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libxaw: added missing X11 dependencies

commit 7b18275bb55f467de1deb386b1300b8000c5a0f7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libx11: depends libpthread-stubs

commit 98250744aa2c95b2a2de0a69a433742de54a38df
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libmms: depends pcre

commit effed55d5b780c6cb9b46428ab8c4e90ee074bd4
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libidl: depends libidl

commit 8c98a80b3fdbf9feab35d59a7f00c51f8cf5db61
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

librsvg2: added missing dependencies

commit b579b2ea288b2a993d595321bf6c5e9cd46bac4b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

imlib2: added missing X11 dependencies

commit 122e9088f89b8f95f6a42e042a038587313ce11b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

harfbuzz: depends glib2, libpng, pcre

commit 755b56b16e951b987b5f00ce9c223c4b2bd9038b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gtk+2: added missing dependencies

commit a92839cd847112d7e177aa1f79d7b983dffd259a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

groff: optional X11 dependencies

commit 248fce7e6ca471ca2690f0002a9e61ee5e5064ad
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

graphviz: added missing dependencies

commit 5c7a03608434bd12f8312524cf45e0b08ff82135
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

giflib: depends libice, libsm, libx11

commit bec5c075dc25241288ead35646cb16e331501743
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

giblib: depends freetype2, libx11, libxext

commit 7535018a6dec9666b00a20c8840a0d9686be9450
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ghostscript: depends fontconfig

commit 643f56c00e00fefc886bc8c2830435aae187d113
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gettext: depends icu

commit d624911952232db4e3b2a3955992aee885d8e752
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gdk-pixbuf2: libpthread-stubs

commit 69db0172f30df877a741216056ab54d9926dfee2
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

freetype2: depends glib2, harfbuzz, pcre

commit ccad0eb84a22928d6c10dba7b9d917ad1ef2bc7f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gawk: depends gmp, mpfr

commit 589ef6590069a3b09d9f790a28f2dffb8ce89b97
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

*awk: Let the user choose the primary AWK implementation

commit f0922418443a0e95dd34097ffa6f727bb0a5e2f8
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

fontconfig: added missing dependencies

commit 5a8978f0451fc7b9f5c7c5fde5c59eaba8cc156b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

*awk: Update HISTORY

commit 521788cc8c90f78b339cbf9d3d7d6c563b331e2f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

stunnel 5.03

commit c78b5f53a4e917bc90cda22f5da5e89e6b2cccd8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

*awk: provide AWK, make other spells depend on it

commit 960f2e9327333281e5b5011390f620a3c856bd3f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

firefox: added various missing dependencies

commit 7c07a2fc051e8a6354eeefa7c73de620175b2b13
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

fdm: depends pcre, SSL

commit 178a8618fb279be4ba682eac5e1910ef71b8dec1
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

dvipng: depends gd, t1lib

commit 510fe9c06930e2dbf404f1cb2c5075cc0b1d5146
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

curl: depends gmp

commit 465c3104f219f0a4ebbadd10dbb3166ace40924f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

courier-authlib: depends libtool

commit 0f8b52f8dc6597dec157a6b8b472925ee6d6177a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

cairo: missing libxext

commit 42f4985239cd395c8cc33e5d4ac3f4c03b7d08ef
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

bitmap: add missing depends libxt

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

phonon-backend-vlc 0.8.0

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

phonon-backend-gstreamer 4.8.0

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

phonon 4.8.0

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

seamonkey 2.29, SECURITY_PATCH=57

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

libvpx 1.3.0

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

mksh: => R50b

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

man-pages 3.72

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

utils/direvent: new spell, directory event monitoring daemon

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

calligra: use non-empty value for KTINY to properly remember a "no"

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

calligra: really add vc to DEPENDS

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

calligra: add vc as optional dependency

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

linux-pam - depends libtirpc

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

libtirpc: => 0.2.5

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

graphics/gexiv2: version 0.10.1

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

graphics/cinepaint: version 1.0-4

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

graphics-libs/ftgl: make dependency on texlive optional

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

graphics/gimp: version 2.8.14

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

wine: => 1.7.26

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

kernels/linux: version 3.16.2

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

net/tor: version 0.2.5.6

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

x11-toolkits/wxgtk-new: version 3.0.1

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

youtube-dl: the missing change to INSTALL to make the versioned source
work

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

youtube-dl: update to youtube-dl-2014.09.04.3

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

youtube-dl: switch to versioned sources and use upstream signature

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

dia: => 0.97.3

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

postgresql: => 9.3.5

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

nmap 6.47

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

mc 4.8.13

commit a9562b342304522e9cd4853afedbfe494183e14a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

subversion: Fix dependency on serf (without the flag, it may be skipped)

commit 5e35905b65250285330d2375c7756e3ffa9f749d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

imagemagick: 6.8.9-7

commit de091c41fa5eeda9f9ea6940794990066fb67d30
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

courier: courier_filter init script

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

consolekit: => 0.4.6

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

kbd: => 2.0.2

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

check: => 0.9.14

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

libreswan: => 3.10

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

tig 2.0.3

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

tcpdump 4.6.2

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

libpcap 1.6.2

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

linux-pam: => 1.1.8

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

memcache: => 3.0.8

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

imagemagick: use ftp.sunet.se as backup URL

commit 8ea3be24128cf08b6852220f39e911d494f0e5d0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

meld 1.8.6

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

firefox 32.0, SECURITY_PATCH=75

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

nss 3.16.4

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

cups - also uses krb5

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

mpd: => 0.18.13

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

libunistring: => 0.9.4

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

eudev: => 1.10

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

libgpg-error 1.13

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

libassuan 2.1.2

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

psycopg2: => 2.5.4

commit 40f01a2221afa2e7589e5c4f147c6bd43684f83a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

sdcc: new spell, Small Device C Compiler

commit c0c284e80fe3d13d55f5092759e0f1a87205826c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mawk: new spell, Interpreter for the AWK Programming Language

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

cups-1.7.5 - SECURITY FIX

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

ghostscript: => 9.14

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

qxmledit: => 0.8.11

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

tzdata: => 2014g

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

byacc: => 20140715

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

libgphoto2: => 2.5.5

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

deprecate collab/cola [replaced by git-cola]

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

glib2: Re-add commented optional PYTHON dep at request from fellow mage,
for making things optional again some time in the future.

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

graphics-libs/glew: version 1.11.0

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

disk/attr: fix library permissions

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

glib2: hard-depends on PYTHON to avoid the situation without any glib2
when INSTALL fails after removing old one ...

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

pkgconfig: Remove glib2 dependency, fixing things to version 0.28.

This duplicates a bit of binary code because pkgconfig now relies on
internal glib2, but this is necessary because glib2 itself depends
on pkgconfig to be built. At least, the pkg-config command should be
working if present. It does not if, because of another bug, the glib2
install fails and the glib2 .so is missing. You cannot install glib2
after that. Pkgconfig is basic enough to warrant some extra care with
external dependencies (which is why they include a copy of glib2 to
begin with, mind).

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

cairo: needs xextproto

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

whois: bump to 5.1.5 (source for 5.1.4 already pulled by upstream)

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

firefox: fix build with gcc-4.9 (on a core2 64 bit machine with PIC
CFLAGS, if
that matters ... did not need that on an Athlon II X3 machine
with
"native" archspecs)

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

jack2: depends on libsamplerate, also change scm option to git

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

subversion: bump to 1.8.10 (1.8.9 source already unavailable)

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

lxml: => 3.3.6

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

davfs2: => 1.5.2

commit a9d2c4e4f1944afbb8e7ec124118788089527b3f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: nl80211 support requires libnl

commit 9d6e97102d81d3708656ac75f6487af2276fd4cf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: Allow the use of libressl

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

file: => 5.19

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

gnutls 3.2.17 and 3.1.26

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

libdrm: final stray .orig file from committery

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

xmms2: does not build without CDDA

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

evince: needs symbolic icons

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

mupdf: bump to 1.4

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

xcdroast: remove old patch

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

lightdm: bump to 1.8.0

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

xcdroast: bump to 0.98alpha16, include patches

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

cdrtools: bump to 3.01a24 and man path fix

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

sox: hack for current ffmpeg

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

swh-plugins: fix with current autotools

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

audacity: bump to 2.0.5 and build fix

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

ardour2: keep spell working

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

aubio03: historic version of spell for ardour2

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

libxfce4util: more depends

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

garcon: more depends

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

eina: bump to 1.7.10

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

ecore: bump to 1.7.10

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

dbus-c++: build fixup

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

lilv-0: fail-safe cleanup before install

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

slv2: fix dependency on lv2

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

lv2: more robust installation

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

jack2: bump to 1.9.10

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

libiec61883: hash changed

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

libconfig: needs C++ compiler

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

libffado: depends on libconfig

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

screen: bump to 4.2.1

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

lvm: 2.02.109 and hack to make static build work (again)

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

gawk: reduce library usage

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

tcp_wrappers: PIC build

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

net-tools: fix build by disabling obsolete hardware

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

cairo: build fix

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

wxgtk: depend on glu

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

freeglut: fix deps for mesalib-1x

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

libdrm: NV and NOUVEAU duality

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

nss: fixup, also new PEM; spell still a mess

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

opencryptoki: fix bad with-SSL usage

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

snort: fix bad with-SSL usage

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

nmap: fix bad with-SSL usage

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

php-dev: fix bad with-SSL usage

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

php4: fix bad with-SSL usage

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

php: fix bad with-SSL usage

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

wvstreams: fix bad with-SSL usage

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

netembryo: fix bad with-SSL usage

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

nagios-plugins: fix bad with-SSL usage

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

flow-tools: fix bad with-SSL usage

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

bind-tools: fix bad with-SSL usage

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

bind: fix bad with-SSL usage

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

libetpan: fix bad with-SSL usage

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

cyrus-imapd: fix bad with-SSL usage

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

anubis: fix bad with-SSL usage

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

omniorbpy: fix bad with-SSL usage

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

omniorb: fix bad with-SSL usage

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

libesmtp: fix bad with-SSL usage

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

links: fix bad with-SSL usage

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

lighttpd: fix bad with-SSL usage

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

elinks: fix bad with-SSL usage

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

polyorb: fix bad with-SSL usage

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

lftp: fix bad with-SSL usage

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

aria2: fix bad with-SSL usage

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

postgresql: fix bad with-SSL usage

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

mysql: fix bad with-SSL usage

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

cyrus-sasl: fix bad with-SSL usage

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

burp: fix bad with-SSL usage

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

bacula: fix bad with-SSL usage

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

openipmi: fix bad with-SSL usage

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

mnogosearch: fix bad with-SSL usage

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

gutenprint - fix spurious dependencies

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

tweak ssl choices

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

wget - imporve libressl detection

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

acpid2: => 2.0.23

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

curl - support libressl

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

upower: => 0.99.1

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

glpk: => 4.55

commit 705f5fb931c96f6bec6c56bae55eb5811a555348
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libssh2: Allow the use of libressl

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

libarchive - fix typo

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

libevent - fix typo

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

wine: => 1.7.25

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

php: => 5.4.32 (stable) [security]

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

wavegain: new spell, wav files loudness normalizer

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

cups-filters: => 1.0.58

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

setuptools: => 5.7

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

libgcrypt 1.6.2

commit a9ef25f5be0a7e8aa7953ec09f893b873831dc54
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

zarfy: new spell, A gui to libxrandr

commit 5d688bf3dc4b467161c28b4d231ca70e12eb1803
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

arandr 0.1.7.1

commit 7f11e0c286c88d574560218021e2e7b15a07ccc5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

appres 1.0.4

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

krb5 deepnds SSL

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

krb5-1.12.2 SECURITY fix

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

gpgme-1.5.1 - SECURITY fix

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

python3 - depends SSL

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

clamav: => 0.98.4

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

qtbase - fix SSL

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

cupos - fix SSL

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

podofo: => 0.9.3

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

pulseaudio - openssl => SSL

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

libssh - fix build with libressl

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

qt4 - fix ssl gflags

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

openss - check for libressl

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

libressl-2.0.5 new spell

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

xorg-server: depends SSL

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

sptk: depends SSL

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

qt4: depends SSL

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

x11vnc: depends SSL

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

gkrellm2: depends SSL

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

xbmc: depends SSL

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

tcvp: depends SSL

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

mythtv: depends SSL

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

mpv: depends SSL

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

gpac: depends SSL

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

ffmpeg: depends SSL

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

xen: depends SSL

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

uptimec: depends SSL

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

syslog-ng: depends SSL

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

strigi: depends SSL

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

spice-gtk: depends SSL

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

spice: depends SSL

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

openipmi: depends SSL

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

ntp: depends SSL

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

mnogosearch: depends SSL

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

ipmitool: depends SSL

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

ghasher: depends SSL

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

deltup: depends SSL

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

telepathy-qt: depends SSL

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

telepathy-idle: depends SSL

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

sofia-sip: depends SSL

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

ortp: depends SSL

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

libjingle-tapioca: depends SSL

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

libexosip2: depends SSL

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

decibel: depends SSL

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

asterisk: depends SSL

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

x3270: depends SSL

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

tn5250: depends SSL

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

rdesktop: depends SSL

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

freerdp: depends SSL

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

c3270: depends SSL

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

trousers: depends SSL

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

openssl_tpm_engine: depends SSL

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

opencryptoki: depends SSL

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

nessus-libraries: depends SSL

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

wireshark: depends SSL

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

tpm-tools: depends SSL

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

thc-pptp-bruter: depends SSL

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

thc-hydra: depends SSL

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

snort: depends SSL

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

pwsafe: depends SSL

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

pam-imap: depends SSL

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

nmap: depends SSL

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

hashkill: depends SSL

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

fingerprint: depends SSL

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

ettercap: depends SSL

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

cern_root: depends SSL

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

boinc: depends SSL

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

ruby-enterprise-edition: depends SSL

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

ruby-2.1: depends SSL

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

ruby-2.0: depends SSL

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

ruby-1.9: depends SSL

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

ruby-1.8: depends SSL

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

qtbase: depends SSL

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

twisted: depends SSL

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

scrapy: depends SSL

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

scrapely: depends SSL

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

roundup: depends SSL

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

python-ldap: depends SSL

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

pyopenssl: depends SSL

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

pymsnt: depends SSL

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

pymsn: depends SSL

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

pyicqt: depends SSL

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

papyon: depends SSL

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

m2crypto: depends SSL

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

cherrypy: depends SSL

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

attic: depends SSL

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

zint: depends SSL

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

pt: depends SSL

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

hplip: depends SSL

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

gtklp: depends SSL

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

cups-old: depends SSL

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

cups: depends SSL

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

php-dev: depends SSL

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

php4: depends SSL

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

php: depends SSL

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

parrot: depends SSL

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

net-ssleay: depends SSL

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

crypt-ssleay: depends SSL

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

wvstreams: depends SSL

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

vtun: depends SSL

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

unbound: depends SSL

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

tor: depends SSL

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

tinc: depends SSL

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

tcpdump: depends SSL

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

stunnel: depends SSL

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

strongswan: depends SSL

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

ssocks: depends SSL

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

socat: depends SSL

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

slowhttptest: depends SSL

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

pppd-chldap: depends SSL

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

ppp: depends SSL

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

openwbem: depends SSL

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

openvpn: depends SSL

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

openntpd: depends SSL

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

ntop: depends SSL

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

nsd: depends SSL

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

net-snmp: depends SSL

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

netembryo: depends SSL

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

nagios-plugins: depends SSL

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

monit: depends SSL

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

iscsitarget: depends SSL

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

ipsec-tools: depends SSL

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

fwbuilder: depends SSL

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

freeradius: depends SSL

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

flow-tools: depends SSL

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

envbot: depends SSL

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

bitcoin: depends SSL

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

bind-tools: depends SSL

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

bind: depends SSL

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

accel-ppp: depends SSL

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

xsupplicant: depends SSL

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

barry: depends SSL

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

sylpheed-gtk2: depends SSL

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

sylpheed: depends SSL

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

ssmtp: depends SSL

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

spamassassin: depends SSL

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

smtpc: depends SSL

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

postfix: depends SSL

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

openwebmail: depends SSL

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

opendkim: depends SSL

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

nbsmtp: depends SSL

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

mutt: depends SSL

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

msmtp: depends SSL

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

mpop: depends SSL

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

mailx: depends SSL

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

libetpan: depends SSL

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

isync: depends SSL

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

imap: depends SSL

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

gotmail: depends SSL

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

fetchmail: depends SSL

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

exim: depends SSL

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

dovecot: depends SSL

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

dk-milter: depends SSL

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

cyrus-imapd: depends SSL

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

courier-imap: depends SSL

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

courier: depends SSL

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

cone: depends SSL

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

claws-mail: depends SSL

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

c-client: depends SSL

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

anubis: depends SSL

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

althea: depends SSL

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

alpine: depends SSL

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

luasec: depends SSL

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

luacrypto: depends SSL

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

tc2-modules: depends SSL

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

soup: depends SSL

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

redland: depends SSL

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

podofo: depends SSL

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

poco: depends SSL

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

omniorbpy: depends SSL

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

omniorb: depends SSL

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

neon: depends SSL

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

mico: depends SSL

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

libircclient: depends SSL

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

libevent: depends SSL

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

libesmtp: depends SSL

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

libchipcard: depends SSL

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

ldns: depends SSL

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

gwenhywfar2: depends SSL

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

gwenhywfar: depends SSL

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

asio: depends SSL

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

kdelibs4: depends SSL

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

icedtea7: depends SSL

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

xshttpd: depends SSL

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

wt: depends SSL

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

webcleaner: depends SSL

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

w3m: depends SSL

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

w3c-libwww: depends SSL

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

squid: depends SSL

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

siege: depends SSL

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

serf: depends SSL

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

pavuk: depends SSL

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

nginx: depends SSL

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

netsurf: depends SSL

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

middleman: depends SSL

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

lynx: depends SSL

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

links-twibright: depends SSL

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

links: depends SSL

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

lighttpd: depends SSL

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

httpd-dev: depends SSL

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

gnash: depends SSL

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

esehttpd: depends SSL

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

elog: depends SSL

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

elinks: depends SSL

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

dillo2: depends SSL

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

dillo: depends SSL

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

cherokee: depends SSL

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

cadaver: depends SSL

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

apache-mod_ssl: depends SSL

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

apache22: depends SSL

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

apache2: depends SSL

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

gnustep-base: depends SSL

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

libgda5: depends SSL

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

libgnomecups: depends SSL

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

gnome-vfs2: depends SSL

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

gnome-python2: depends SSL

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

evolution-webcal: depends SSL

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

mail-notification: depends SSL

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

balsa: depends SSL

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

rb-libtorrent: depends SSL

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

libtorrent: depends SSL

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

dclib: depends SSL

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

wget: depends SSL

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

vsftpd: depends SSL

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

transmission: depends SSL

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

tnftp: depends SSL

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

pure-ftpd: depends SSL

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

proftpd: depends SSL

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

lftp: depends SSL

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

gftp: depends SSL

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

deluge: depends SSL

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

dctc: depends SSL

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

curl: depends SSL

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

ctorrent: depends SSL

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

createtorrent: depends SSL

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

btpd: depends SSL

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

aria2: depends SSL

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

openoffice: depends SSL

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

eet: depends SSL

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

ecore: depends SSL

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

htmldoc: depends SSL

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

uif2iso: depends SSL

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

testdisk: depends SSL

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

partimage: depends SSL

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

netatalk: depends SSL

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

libewf: depends SSL

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

dump: depends SSL

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

dmg2img: depends SSL

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

boxbackup: depends SSL

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

avfs: depends SSL

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

qingy: depends SSL

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

yaz: depends SSL

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

swiprolog: depends SSL

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

radare2: depends SSL

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

python: depends SSL

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

pyside-tools: depends SSL

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

polyorb: depends SSL

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

git: depends SSL

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

android-tools: depends SSL

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

virtuoso: depends SSL

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

postgresql: depends SSL

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

pgadmin3: depends SSL

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

mysql-workbench: depends SSL

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

mysql: depends SSL

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

mongodb: depends SSL

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

mariadb: depends SSL

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

libzdb: depends SSL

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

firebird25: depends SSL

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

firebird: depends SSL

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

couchdb: depends SSL

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

rapidsvn: depends SSL

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

openldap: depends SSL

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

openca: depends SSL

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

tls: depends SSL

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

pwlib: depends SSL

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

ptlib: depends SSL

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

loudmouth: depends SSL

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

libstrophe: depends SSL

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

libmsn: depends SSL

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

gloox: depends SSL

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

znc: depends SSL

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

xchat-gnome: depends SSL

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

xchat: depends SSL

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

irssi: depends SSL

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

ircd-ratbox: depends SSL

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

hexchat: depends SSL

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

vacuum: depends SSL

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

tmsnc: depends SSL

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

qutim: depends SSL

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

qutecom: depends SSL

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

psi: depends SSL

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

prosody: depends SSL

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

profanity: depends SSL

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

licq: depends SSL

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

jabberd: depends SSL

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

gajim: depends SSL

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

ejabberd: depends SSL

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

centerim: depends SSL

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

libarchive: depends SSL

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

dar22: depends SSL

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

dar: depends SSL

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

burp: depends SSL

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

bacula: depends SSL

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

xmlsec: depends SSL

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

xca: depends SSL

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

unhash: depends SSL

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

ssldump: depends SSL

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

qca-openssl: depends SSL

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

pad: depends SSL

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

openssh: depends SSL

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

opensc: depends SSL

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

mosh: depends SSL

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

lsh: depends SSL

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

libp11: depends SSL

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

hydan: depends SSL

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

engine_pkcs11: depends SSL

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

encfs: depends SSL

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

cyrus-sasl: depends SSL

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

chntpw: depends SSL

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

openssl update UP_TRIGGERS

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

openssl - provides SSL

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

sqlite: => 3.8.6

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

pango: => 1.36.6

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

harfbuzz: => 0.9.35

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

iproute2: => 3.16.0

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

libnl: => 3.2.25

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

scons: => 2.3.2

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

pypdf2: => 1.23

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

gtk+3: => 3.13.6

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

glib2: => 2.41.2

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

devel/git: version 2.1.0

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

video/xine-ui: version 0.99.8

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

video-libs/xine-lib: version 1.2.6

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

graphics/graphicsmagick: version 1.3.19

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

gtklick: bump to 0.6.4

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

klick: bump to 0.12.2

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

roundup: => 1.5.0

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

graphics/lensfun: version 0.2.8

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

php: => 5.3.29 (previous) [security]

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

linux 3.16.1

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

graphics/inkscape: version 0.48.5

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

devel/libgc: fix urls

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

ffmpeg 2.3.2

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

gnupg-exp: => 2.0.26

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

partclone: => 0.2.72

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

sip: => 4.16.2

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

python-ldap: => 2.4.15

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

trac-ldapplugin: => 0.7.0

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

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

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

accel-ppp: => 1.8.0

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

krb5: => 1.12.1

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

homebank: => 4.6.3

commit d89c1980f8d9c83b6371f187c18436d13b8c5cd7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

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

commit f4ec354201aaf8995acc79cbc3fef8a52dca0b10
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

utils/dialog: added option for shared library

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

exim: => 4.84

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

boost: => 1_56_0

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

formalchemy: => 1.5.1

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

extra-cmake-modules: => 1.1.0

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

cmake: => 3.0.1

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

wine: => 1.7.24

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

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

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

deadbeef 0.6.2

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

ChangeLog: qmmp-plugin-pack added

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

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

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

qmmp 0.8.1

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

dhcpcd: => 6.4.3

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

qmmp 0.8.0

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

proxychains-ng: => 4.8.1

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

digikam4 4.2.0

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

phonon-backend-vlc 0.7.2

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

phonon-backend-gstreamer 4.7.2

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

phonon 4.7.2

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

mercurial: => 3.1

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

ffmpeg 2.3.1

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

linux 3.16

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

git 2.0.4

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

hatta: added pygments suggest dep

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

lighttpd: added Lua 5.2 support

commit 3c208328a312edd162169d899a9a734a925cb970
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk3: version 2.5.1

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

hatta: fixed exception on +wanted page

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

homebank: => 4.6.2

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

linux 3.15.8

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

gdb: => 7.8

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

nomacs 2.0.2

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

wireshark 1.12.0

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

vlc 2.1.5

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

qt4 4.8.6, SECURITY_PATCH=6

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

tar: => 1.28

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

fwknop: => 2.6.3

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

harfbuzz: => 0.9.33

commit 0921f2c52e4c6bfa4e522a7cc1e71c2a954f4428
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

lua-forge/luajit: update to 2.0.3

Updated luajit to 2.0.3. This is largely a bugfix release.

commit d55a7ae972bdd153da4f3bdd67db7f1c51efe5a8
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

chat-im/prosody: updated to 0.9.4

Updated prosody to 0.9.4. Lots of bugfixes, including a security update
(mod_compression).

commit 619f35d39e5391c3ba66e91639d642293e2cf9f5
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

shell-term-fm/tmux: update to 1.9a

Updated to 1.9a. Lots of bugfixes and proper 256-color support for a
wider range of terminal types.

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

gnarwl: fixed blacklist functioning

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

minitube 2.2

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

dhcpcd: => 6.4.2

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

libdrm: => 2.4.56

commit ee65962d45a11d9f3f1a28f2a0b361fde4501217
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

youtube-dl 2014.07.25.1

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

kernels/linux: version 3.15.7

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

python-pypi/meson-0.18.0 new spell

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

graphics/argyllcms: version 1.6.3

commit 0d707217b2de84d25818097fa5900c749d9b53c9
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/midori: fixed building with gobject-introspection

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

xorg-app/xdpyinfo: version 1.3.1

commit feaaab3fa571022494b7542784f33f5bdee814c9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abiword: Fix typo in DEPENDS

commit 5c7a101dc7970ac96c20dcb7e7c6619eb1d1c8b5
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

gnome3-libs/granite: new spell, elementary Development Library

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

libdrm: => 2.4.55

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

wine: => 1.7.23

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

php: => 5.4.31 (stable)

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

burp: => 1.4.18 (devel)

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

rsync: => 3.1.1

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

docutils: => 0.12

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

libtasn1: => 4.0

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

gnutls: => 3.2.16

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

exim: => 4.83 (security)

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

devel/ninja-build-system: version 1.5.1

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

jinja2: => 2.7.3

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

chardet: => 2.2.1

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

sqlalchemy: => 0.9.7

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

http/firefox: add option for profiled build

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

utils/gnuplot: version 4.6.5

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

cups: => 1.7.4 SECURITY fix

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

graphics/nomacs: new spell, image viewer

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

opencv: patch from Arch added

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

opencv 2.4.9

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

gtk+2 2.24.24

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

firefox 31.0

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

nss - fix 3.16 patching

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

nss 3.16.3

commit b96c1ae156ef8af79aeb30c2587d66ad326e9cbd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

brasero 3.11.3

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

ffmpeg 2.3

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

v4l-utils 1.2.1

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

tcpdump 4.6.1

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

libpcap 1.6.1

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

pango: => 1.36.5

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

cffi: => 0.8.6

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

setuptools: => 5.4

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

rbtools: => 0.6.2

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

cython: => 0.20.2

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

six: => 1.7.3

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

xlrd: => 0.9.3

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

shell-term-fm/busybox: version 1.22.1

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

net/vidalia: version 0.2.21

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

net/tor.gpg: add 63FEE659

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

net/tor: versions 0.2.4.22 and 0.2.5.5

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

net/tsocks: fix SOURCE_URL[0]

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

libreswan: => 3.9

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

coreutils: => 8.23

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

kernels/linux: version 3.15.6

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

git: => 2.0.2

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

policykit 0.112 SECURITY FIX

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

chrony: => 1.30

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

mksh: => R50

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

bpython: => 0.13.1

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

freeradius: => 2.2.5

commit 926d78bb430862e5075c0bbdec36cfdf3428cf7c
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

devel/vala: version 0.24.0

commit 646923a612a375570585240be5244d86aa34b915
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

emacs: Depedency for SVG support is on librsvg2

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

gettext: => 0.19.2

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

partclone: => 0.2.71

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

bitlbee: => 3.2.2

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

pcmanfm: => 1.2.1

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

libfm: => 1.2.1

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

doc/man-pages: version 3.70

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

mail/claws-mail: version 3.10.1

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

jpeg: => 9a

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

video/mpv: version 0.4.1

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

mail/cone: version 0.90

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

mpg123: bump to 1.20.1

commit d16700082f4a8cea628b48f7fb4f509113cdfa84
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st: Add patch to hide X cursor when typing

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

devel/git: version 2.0.1

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

devel/git-cola: version 2.0.4

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

kernels/linux: version 3.15.5

commit dae18e1ed919f930182155b0ebe8030c06a54dc0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gcr 3.12.2

commit 772e8837c378e4d6b24cc6957c3689bf5eae29a8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

p11-kit 0.20.3

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

wine: => 1.7.22

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

serf: => 1.3.6

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

libvdpau: => 0.8

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

unifont: => 7.0.03

commit 423e4d2ef0c36276feff14b88107494e09e26b72
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk3: version 2.4.4

commit 7f2e2d59c08f3e0c122bb871e63f286579e6a919
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk: updated to 2.4.4

commit e6bca07eb7e63ba2320034abd444f896294b28bc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st 0.5

commit 60d97df7ad75beb52fd452f262ebd99e46007170
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gtk-led-askpass 0.11

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

gnarwl: added optional patch to allow usage of $time variable that
returns current time in days since 1 Jan 1970

commit ce4a00f9f3e43376a8042d1e6d48028e2209eb02
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

whois 5.1.4

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

extra-cmake-modules: => 1.0.0

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

galculator: => 2.1.3

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

mercurial: => 3.0.2

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

science/qlandkarte-gt: version 1.7.7

commit ced607e9778a186dd7483364d7e42c9096bc3924
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

visual-regexp: new spell, A regexp/replace command for Emacs with
interactive visual feedback

commit 2d43ad3164efbb6524a74ef5558a75a3f78050d9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

autopair: new spell, Automagically pair braces and quotes

commit c088ec22f17cf34bb646eb3556e730b59ab7fe3e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

traceroute 2.0.20

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

dbus 1.8.6, SECURITY_PATCH=11

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

kernels/linux: version 3.15.4

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

x11-toolkits/gtk+3: version 3.13.3

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

gnome2-libs/glib2: version 2.41.1

commit 7803433d2dffc063758ac161ae694565111805df
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/midori: git -> bzr, converted to cmake build system completely

commit 6aa4f662bc53abad41c33aceff446d932965d0a4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xen: Run the configure script, it runs subdirs in turn

commit 9afd09aa8f5e05f7e87441983e6635920ef67f3f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xen 4.4.0

commit b7c486e9da1e7b93bf039c9b615571a602f1c47b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dev86 0.16.21

commit 079251fbf9ccdef6cbf9bde7a8b99d0408d18a20
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bin86 0.16.21

commit ace693c70f6dc71d61c41eccf1c401bc0c90911e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

lua: link liblua.so with libm.so

commit 38533de76a83c8ee42a13e3ac78f7695bf4445db
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

lua51: shared object not properly linked to dependencies

commit accca463bb487d8da8eda456d3e756b892fb5e17
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xen-tools: Fix heredoc

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

Revert "php: fixed 5.2 branch build"

Reason: erroneous commit fixed by previous update

This reverts commit af6dbae028c0e029a2f5eaff7cbd177aa4231858.

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

php: fixed 5.2 branch build

commit 0dc97db9aa657680046d67b9a859aded37b61625
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

python: download site ssl certificate does not verify

commit c9b0e6d163426f30e67e1ecf56b7dab9a4e257c0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnusim8085: new spell, Graphical simulator, assembler and debugger for
the Intel 8085 microprocessor

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

cherrypy: => 3.5.0

commit df4457490220ad214afd7df305289d3d5b533813
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wicked: Use prepare_select_branch

commit f8e986601ff8f09d977e398dd9e1ebe247942b86
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

obvious: Use prepare_select_branch

commit 60a64031fb2c75ea6a8bbdc041812797f94c5f74
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dbus-mono: Use prepare_select_branch

commit 5349a3ea80ca2ab3af774d77d38818c30e819f33
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gitosis: Use prepare_select_branch

commit 46552e41c8907d1d081c2af2eba7ad895e0e2123
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openni: Use prepare_select_branch

commit a8444a8fd33eb2b21afe13fba027273de6cb728d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openni-sensorkinect: Use prepare_select_branch

commit 8290eddc3e73c7f80e0ecc16d365ae7f48e047ee
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openni-sensor: Use prepare_select_branch

commit 4f9ccc8a2c68137124b921aeb9d5b827dc6aaed6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libfreenect: Use prepare_select_branch

commit cd9ec586b6ed5da889b3489830deb4a166f442d1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Add missing includes to ppd-chldap and dbus-c++

commit 024847b1ec4a2a311808e4afbe2a702d338da8a5
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

x11-libs/cairo: added scm branch

commit 2bce02ea2705c165468dccb647a60400e2be8f6b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

FUNCTIONS: more fixes in get_scm_version

commit 132363d653976f6a21006996d41d91ef902ce85f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

FUNCTIONS: more fixes to recent changes

commit dc4460b874cdce1f43c52da360f8a09d9ded4c46
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

wm-addons/cairo-dock-plugins: version 3.3.2

commit 7aaffcfccee439165b052aabffab9d926c4b316a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

wm-addons/cairo-dock: version 3.3.2

commit a50277310dba7ec7ac96a6e5c5fa99f8b92ca013
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pppd-chldap: Use prepare_select branch

commit c78d591bb84a6f5c8e61e5d73fe7dada853c94f9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dbus-c++: Use prepare_select_branch and get_scm_version

commit 62d3b562bc39430a3a5fcda52895a7af0d142336
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Make several spells to use get_scm_version

commit fc676197b8718a13742c0b6c26a0127ca5e476d9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Fix get_up_spell_name to handle the dot and plus symbols

commit 1cb0116b167025e3758bcdac6a9b70166e7dfb50
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Add get_scm_version function

commit 95c6323e73a818fce3a4a025bf0b28868a7780d0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lzo 2.08

commit 7688278caa3487e3898f89ceab797cd9267db2fa
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lzo: Install libraries to the root directory

commit c861ef198e9f2b1bc327420d45b84c129170923d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

btrfs-progs: Fix installation paths

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

transmission: => 2.84

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

lighttpd: added libev optional dependency

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

burp: => 1.4.16 (devel)

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

gnupg-exp 2.0.25

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

gnupg 1.4.18

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

libwpg: => 0.3.0

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

libwps: => 0.3.0

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

libwpd: => 0.10.0

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

new spell -libodfgen

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

new spell -librevenge

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

video/ffmpeg: version 2.2.4, fixes CVE-2014-4610

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

kernels/linux: version 3.15.2, fixes CVE-2014-4611 and CVE-2014-4608

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

archive-libs/lzo: version 2.07, fixes CVE-2014-4607

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

archive/lz4: new spell, a very fast lossless compression algorithm

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

http/firefox: add --enable-profile-guided-optimization

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

libisoburn: => 1.3.8

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

libisofs: => 1.3.8

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

libburn: => 1.3.8

commit 0089166be1835b3fdf3082c65fb683fce4354acb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

shotwell 0.18.0

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

wine: => 1.7.21

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

finance-quote: => 1.35

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

gdk-pixbuf2: => 2.30.8

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

php: => 5.4.30 [security]

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

homebank: => 4.6.1

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

easytag: => 2.2.3

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

openjpeg-1.5.2 - SECURITY fix+++

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

pptp-linux: => 1.8.0

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

setuptools: => 5.2

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

sqlalchemy: => 0.9.6

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

fdb: => 1.4.1

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

setuptools: => 5.0.2

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

simpleinit-msb: fixed critical segfault on invoking from Xen (as a guest
HVM DomU)

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

homebank: => 4.6

commit e6b17e03641098e485b265d20d20a6db01de6f5a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

auctex: Move to the emacs-lisp section

commit a81bf8b1d8fe4d924c8e1ec47dd4633e97b001b8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xdvi 22.86

commit ab99c706d57c5da90244b1f402608c23593d8300
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

auctex 11.87

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

gnupg-exp 2.0.24, SECURITY_PATCH=8

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

samba 3.6.24, SECURITY_PATCH=23, CVE-2014-0244 and CVE-2014-3493

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

gnupg 1.4.17, SECURITY_PATCH=11

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

devel/android-tools: set device permissions in udev rule file if systemd
is not installed

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

dbi: => 1.631

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

tbb: => 42_20140601

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

iw: => 3.15

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

qxmledit: => 0.8.10

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

tzdata: => 2014e

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

audio-soft/gmtp: new spell, a GUI for communicating with mtp-capable
devices

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

devel/android-tools: new spell, tools for debugging android-based devices

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

utils/schroot: version 1.6.10

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

ardour3: => 3.5.380

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

liblo: added gcc pre-4.8 support

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

python: => 2.7.7

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

eudev: => 1.8

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

groups - add input

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

qxorm: => 1.2.8

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

video/mpv: version 0.3.11

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

archive/p7zip: fix source url

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

kernels/linux: version 3.15.1

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

gstopwatch: new spell, simple stopwatch, written in GTK3

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

dhcpcd: => 6.4.0

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

doc/man-pages: version 3.69

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

alsa-utils: => 1.0.28

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

alsa-lib: => 1.0.28

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

mariadb: => 5.5.38 (5.5)

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

libusb: => 1.0.19

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

libquvi-scripts: corrected HISTORY entry

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

dermixd: bump to 2.0.0, adapt to new build system

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

devel/gdb: version 7.7.1

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

ddrescue: => 1.18.1

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

lzip: => 1.15

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

wine: => 1.7.20

commit 2b42b42b0f525315c682ad29c2451561468b5762
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xlsclient 1.1.3

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

easytag: => 2.2.2

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

dbus-1.8.4 SECURITY fix

commit 3f6f8d5e180f49574095d88d408d4766aba3d7f8
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

openssh: update LPK patch

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

harfbuzz: => 0.9.29

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

cmake: => 3.0.0

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

gettext: => 0.19.1

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

setuptools: => 4.0.1

commit 37b78420db3346ff525c6f8332323433ddb6b2fe
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/firefox: version 30.0

commit 2a03f8128b316d580178a8c168983c9bb8a1cbe1
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

crypto/nss: version 3.16.1

commit 3b70076cc8d0122b0f147f957c793527ebd1b40e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

libs/nspr: version 4.10.6

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

knock: => 0.7

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

mtdev: => 1.1.5

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

sylpheed: => 3.4.2

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

sip: => 4.16.1

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

xdg-utils: => 1.1.0-rc1

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

cups-filters: => 1.0.54

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

x11/conky: add bug fixes from gentoo

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

x11/conky: fix SOURCE_URL[0]

commit c43639df41656bb5efe58fb4e939703114cc161b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

gnome2-libs/gobject-introspection: version 1.40.0

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

cups: => 1.7.3

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

mdnsresponder: => 544

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

vlc: => 2.1.4

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

pulseaudio: => 5.0

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

gtk+3: => 3.12.2

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

glib2 - allow install of gdbus-codegen

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

at-spi2-atk: => 2.12.1

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

atk: => 2.12.0

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

eudev: => 1.7

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

kernels/linux: version 3.15

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

x11/xclip: fix SOURCE_URL[0]

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

irssi: => 0.8.16

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

kernels/linux: version 3.14.6, fixes CVE-2014-3153

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

shell-term-fm/rxvt-unicode: make features configurable

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

fonts-x11/ttf-monofur: new spell, a monospace font

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

lxml: => 3.3.5

commit 17f0fc263a864e4704285983245f9d099d6888bb
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/xbmc: version 13.1

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

mercurial: => 3.0.1

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

sqlite: => 3.8.5

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

tilda: => 1.1.12

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

ntfs-3g: => 2014.2.15

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

extra-cmake-modules: => 0.0.14

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

openssl: => 1.0.1h (1.0), 0.9.8za (0.9) [security]

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

libtasn1: => 3.6

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

bison: => 3.0.2

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

gettext: => 0.19

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

grep: => 2.20

commit dc20ef0c4d4e0aaae401828ef3e1cbff18556b1a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk3: version 2.4.3

commit 6595e16401033154070133140294129ce8fea8cc
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk: version 2.4.3

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

haskell/haskell-ghc-syb-utils: new spell, boilerplate reduction for the
GHC API

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

tbb: => 42_20140416

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

gpgme: => 1.5.0

commit 819fc542b2670ea89c3c8e3cc14d0ca4e6308297
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

ffmpeg 2.2.3

commit c1841f05f514d218e2802864cb65c8bb02eed8d3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnupg-exp 2.0.23

commit 390f2cedf494b953d6c134a5a813f2d53cfbf6ff
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

btrfs-progs 3.14.2

commit 90f5dc96e6fb0552124c72a5d6cfea9dceb88053
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

btrfs-progs: Fetch releases from git too

commit 63cf64294e43c80312a77ae0bf083b1539e61a44
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

btrfs-progs: Upstream fixed manpage's Makefile

commit 2c14e4ed4b17696e1a5a48bcd2effe47ceb70662
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

add sddm group & user

commit c7584dd4019be53004a312055586e84183a5d79d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qxorm: => 1.2.7

commit d56ecb50f75c590b42d6bb8ecf764fe6c2208162
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 799a50f59d1f2d253b196c69a525ad4e62e6405b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 4475eefce8b8e91b2db01d3a88d4b791b20fc43f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 9bccc0589a775b4ded11d435895b1124537e0b96
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit ed3e6ecaddca7dfd15be6930c364da0b67049d71
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 22dfe2f562230c5c219e6b64ff020a64d52aa96f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 30619a3473401fbfbc78c20d066ba6d3ce44512b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit f36b0389533c431a3a119359c03c1c1d1c5e24c6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit dcba251cb762c51201a9a4b00f74e06423f66470
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 0839add0aa33b51970de2dd2a74cf7940fa6c8ad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 63a28d304064c142d663be07cee409cddd1ef4f5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 3bc4c9feb41ad6cc12b36cbae434befde6b12d8a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 7986beaad70b34648c99f758013acbf48a61b195
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit ab91bf2df075ea5c05c0a2b72c238b55f71d562e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 27071b80e14ac471215372610dec67b390691d79
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit b8c6f5f60c9677315092db0ea67a0ba4940f67be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit abc219c3c333d55e88d1055314624f8138203405
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 17e56913cea5e99f38cd7737c622f6cfba6d3186
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

- change depends giflib => GIFLIB

commit 43552bdb7cee98526da57b051e3f8f87f7a7ea85
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kaffe - change depends giflib => GIFLIB

commit 6692bee4c8b7f098e6f44537fb0c17a89fa52e23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgdiplus - change depends giflib => GIFLIB

commit d03b83bf715f31c2989bcd39cd5d26986898cb33
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

openscenegraph - change depends giflib => GIFLIB

commit 54594029c98b14d6c27cf6302381d497fe3decc1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sdl2_image - change depends giflib => GIFLIB

commit 5366cf33b1cc61dd675203e8058b26e30baefbdc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tc2-modules - change depends giflib => GIFLIB

commit 941704b92d304a420a6a1518a63018a662c1759b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

spamprobe - change depends giflib => GIFLIB

commit 5a2b65108540ad634e56c875e706ec10691a0fdf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

driftnet - change depends giflib => GIFLIB

commit 080ec34cb36cda65d026962829f464ad7defbeab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gdal - change depends giflib => GIFLIB

commit 83e014d0773ee7513794d934698f26abbae9125c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

anyrename - change depends giflib => GIFLIB

commit 39ba8ee9fe2693ed19c1a8ced6b4c306ecb64b01
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mplayer - change depends giflib => GIFLIB

commit 9001fcd2b90c274306c2b40150646aef627d87f1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mplayer2 - change depends giflib => GIFLIB

commit ddaa1e6d5142965485662139fcf9c4cc0191be43
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

afterstep - change depends giflib => GIFLIB

commit e3584b19b0df291a4e86a3e4456bf2643a0dabf3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

windowmaker - change depends giflib => GIFLIB

commit 858cd8acc17bf214fbd13252da8e72b132242823
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wdm - change depends giflib => GIFLIB

commit 202463a87ef4b12b535044472df42cc62b949191
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libafterimage - change depends giflib => GIFLIB

commit f6197ea2d6fa5595ee54b8d3058c7df156600fd4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine - change depends giflib => GIFLIB

commit 2cb81468b3f3682997cc2f42e6eeeb549c868847
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xplanet - change depends giflib => GIFLIB

commit 6f965af59f397f8a7e7699b5af31ea545c009a4e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

evas - change depends giflib => GIFLIB

commit ab2c0a2e0844904d3a0b2222c2c1c598f1fa036f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dvipng - change depends giflib => GIFLIB

commit 64a57f5b30b07eeaf2fa8a45ead1d71e0e2afc85
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fbv - change depends giflib => GIFLIB

commit cf2f9b38e15c832209ca5b767bcba99a0e32f437
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

directfb - change depends giflib => GIFLIB

commit 6105460cd2c527ee46c701a7f9d099899c0f98b5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

KDE_DEPENDS - dpends GIFLIB

commit 6d99562657039f66ceaeb8f0152aac196efb4462
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

giflib5 - 5.0.6

commit aea4c72a78e1314b32774e30b40e25acce33238c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdelibs4 - depends GIFLIB

commit 80510b29f8b74d830758573bbe87c13d494ab638
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

leptonica - depends GIFLIB

commit b216a7136dcce38a7e98efec8f564903096d3c45
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fontforge - depends GIFLIB

commit a1fbb1c1d2bf5fdaaceedefda160e5a3a385c3dc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

giflib - provides GIFLIB

commit 9c619f5d7dbf08965d51d50d61d4c0566b53b7ab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

freeglut - dpends cleanup

commit 15d4986ec59a6492953e7a273ef94f3e6410e990
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/licq: version 1.8.2

commit c9277bc54e5fd08f8de361f43ff615a6b3a28958
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/gnutls: version 3.1.25 and 3.2.15, fixes CVE-2014-3466

commit 246184cdf2d38e6ba10e3fe9573195da08a44865
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

config-param: bump to 3.001000

commit f5c2818d9945056455255d786c0f92b135518657
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: version 3.14.5

commit 2c4a136350aa7efddfaed0b3252eeb058e888f78
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: => 5.4.29 [security]

commit 39f8f9750abccad2e12634d638eaf02afc1717b8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/zsh: add optional dependency on gdbm

commit d42333933387762f2231d6d93ee19b6155bbe0c2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mod_wsgi: => 3.5 [security]

commit f64c5f1ac076c14811d1b52a1d4aa8e86448c51a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/git-cola: version 2.0.3

commit 61a6d957d68f827c8ced445c8b0c5a9744bffa97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/git: version 2.0.0

commit 98e2f35c2ca62980e93c090879d556ca156ad34a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sip: => 4.16

commit f43d31f287c5339c37e4c087edf4a12db4555c5e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/cantata: version 1.3.4

commit f70d977408bb31263ac47062619ad577dd6e2bdf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/man-pages: version 3.68

commit 4891c8e553597b67c8ede908fcd13df4acb1f2a6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/man-pages-posix: version 2013-a

commit f31d5d2c5bd6e4052656eaf1347eff01c13f47be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dnsmasq: => 2.71

commit 525a2d10792ef48be21453614ec530fd98a834a3
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

mail/claws-mail: updated to 3.10.0

commit a2210a10d53dfb035c28a1d0155380af5d83f8e5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

perl: => 5.20.0

commit 3233857c7399ce4e8de1aa27081d3e86e9056c65
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libevdev: => 1.2.1

commit 0a4b109292049f8b502d52173ff0565ad7be9a3f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python3: => 3.4.1

commit bb939a267bc39dd9ac47f3375a23fe7ac33e5f80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

shared-mime-info: => 1.3

commit 10b6be1a6e296743475cffce0848275498d5109f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

psycopg2: => 2.5.3

commit 250daf3877174964df78bb54a2bf01203213c24e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

grep: => 2.19

commit 77cd9533d309c20f9f8ca62a9e2a6fad81822547
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

thunderbird: => 24.5.0
DEPENDS: use nss version 3.16

commit bec1d6db3f414b4b989b6b10ea3da34e6e702eaa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg123: 1.20.0

commit f8dff64b8f8bd81ee7ee4dea90773cdbb6a384c9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/glibc: add bug fixes from gentoo

commit 7ca290f3fdf682314d755b6cca45010a4ee2ef31
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/glibc: add bug fixes from arch linux

commit f1e54b375ada0631c97efe13c667a93da5075558
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/attic: depend on pyopenssl

commit 84cd35cd95c0cb713f02fd165bc3bafd07ee7191
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/pyopenssl: version 0.14

commit 1c0eb4771e84a285e9f15ad9bf8ab27320c0da49
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: corrected HISTORY entry

commit a64381232dbc2614525e3cac1ae32b18cde27bba
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/attic: new spell, a backup tool

commit d10854fe51cf2cfa2df83e856b8045a9dac29508
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/python-llfuse: new spell, bindings for the fuse low-level API

commit 024005ffc7ef879019d7c1813907387c7a808e13
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/msgpack-python: version 0.4.2

commit 9ff3a41474100306407c01efc334f5f3cb2d50df
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/splint: fix dependency in Makefile.in

commit 00e964099cae8862eb265215c238b7e42cc2ae12
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

taskwarrior: post-update fixes

commit 1b500d65fb6d3d8d35379a98f0e5341c17a66b07
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpv: => 0.3.10

commit 4742249f8be3b947526aba8a2fbc4529d27df42b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

libs/glibc: version 2.19

commit 19d6d3842c0a4d16181ac3291bdbea925642e3e7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cups-filters: Use make_single

commit a1d4adadfbcc375a34a809e20874ded9e1511cae
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

util-linux: => 2.24.2

commit ce80bede64517915897626ac5560573ea6ab067b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

setuptools: => 3.6

commit 56dd524f0049405c566b774bb960c23b26637f44
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnu-efi: => 3.0v

commit 7cf0d1dad54a2b86425ff28fc2b15e28ac8e9f80
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-utf8-string: version 0.3.8

commit 6da2ec2fe504befcdc33ac7fe62ad518280e67eb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-hasktags: new spell, ctags for haskell

commit 0bfdb6bbfd05a5259bc90299cc16468ee7a3ec86
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

make sure our udev.conf gets installed so /dev/shm gets created

commit a24c8a257b89f764c8026bb44c4c0f5634103a58
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/powertop: version 2.6.1

commit 3214241bd72427bbb4b966cd8bf4e1e44f7cae08
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyxattr: => 0.5.3

commit 67404ae0cf4da2b1bbeb5a5c43cb7b7e9fd15911
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lxlauncher: depends on menu-cache

commit 3b88f7808ba26e0ffdc4f6a4930a5ce5f3b58386
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-ati: Use prepare_select_branch

commit b0d67d0c4b20482d233aa4573026324169eef40c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-ati: SCM branch depends on glamor

commit 538a594bc89d4b35c1fae553d2aa57976dcf5ca2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ctags: fix SOURCE_URL

commit 61bf4d412c032473c925093543f6069730f39311
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.54

commit b4063ffd9df291137b2591168bb6ad0536750842
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.53

commit 46362c198244a51f34b776fddbfe3192d04541ae
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.51

commit 8b978e29f49ebfdbff5c55ef07753ca2569fa0ee
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.50

commit 3fe6091599d21d2069cf9162947ad07dafce5cdf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.49

commit bd9b2780d53f6212a0dbb143189a28b67f1a9cf7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.48

commit 0ef0ce274426101ae019d40e39f78313102c375c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.47

commit 3321aee398acafedebe9ea5d74ff8c17229369c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm: => 2.4.46

commit 91307a0f06eb0045d919daf583ae34be39f2595d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdrm - fix nouveau build

commit f93ceef43d7eb255257bd58f4a7b06be7508f027
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rdesktop: => 1.8.2

commit 36b9c5dd9d12bf8c196b2c6d003b9c80240894b5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libedit: version 20140213-3.1

commit 5258b185ee61d2c6b5195e55e73d011360f1e401
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

collab/subversion: version 1.8.9

commit f6e1c5320090872b63f9f03cebffe31f69fd50f7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/git: version 1.9.3

commit 3f699b0cbf687b7c99a82eb50ba7dd3129d67d2a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gutenprint: => 5.2.10

commit 0650e128728c2d164da44369af87e63635e2bb7e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/numpy: version 1.8.1

commit be68cad993c275916f6cb5d5bb15b431fe92de5f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/smpeg: fix SOURCE_URL

commit efc2b1b258536fdc2582ee4d7732146bb4b8517d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

perl: => 5.18.2

commit 3b85e04b8bb5b60ae6b42163f1a4349265596bcf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bpython: => 0.13

commit 7efde055dce926be16ab7e4db34396a4bec7c01f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

curtsies: new spell, curses-like terminal wrapper, with colored strings

commit 18901581e99a3fb71f2e2513b7673b8b123263be
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

greenlet: new spell, lightweight in-process concurrent programming

commit 59d150e86a9c8acc472e7223019329b42af89d23
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

transmission: => 2.83

commit 27dfd7a7909f9a1aa2886bd46d1be88dc363c00d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

fonts-x11/ttf-mensch: new spell, a console font based on Menlo

commit 11a949b19c1c6d3bf54406e81f4b8659402b7d61
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-app/xfd: add dependencies on libxrender and libxmu

commit b29efaeff92b89719077e6717cea9577240d6d81
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/gnutls: fix SOURCE_DIRECTORY

commit eeba5d29d7f2024a3f8fdf64bfba1632dd425dfa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine: => 1.7.19

commit ce4491de8f33cba1077edad4943d73394fe693de
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

docx2txt: => 1.4

commit da5a26f03c88b04d03e22961a9eea1665d7ef54c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

readline - tweak install

commit 90cde15e49260d534bfa7aa800a12e7e7d56c7f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

vifm: => 0.7.7

commit d1984c8929e99517523f57c630b9b4e00bdde9a6
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk3: updated to 2.4.2

commit 2f4ca1463fc6bfa12ae60925702cf23a95d5ed82
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/webkitgtk: updated to 2.4.2

commit 4ccf7b3f27bc13d8087f898dd89dd1756ee994a9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

iozone: => 3_424

commit 00cec578e25b918d361c4066b78e5631077e1b55
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

proftpd: => 1.3.5

commit dba7ca535f6f12d776de6be70dd0c6cca997a617
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

eudev - fix typo in build

commit 1319b83da37624ee6a35c444c8f4fc7c8fe6104e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gummiboot: => 45

commit 4b665751b7536805e0ad4ee014c85907e9430f89
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

polipo: => 1.1.1

commit 9affe4d1aa4d8fed5345596af247556c397bfd61
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/man-pages: version 3.66

commit 99e1c95148257c8462ec9f9e31fa571227903059
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/source-highlight: version 3.1.7

commit 0fbc6599fd8f45e1a41ec7cd6eef77bf4c007169
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

znc: => 1.4

commit 3598fee42f2f60abaceb47aa2ec1a73c9391ca93
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cgdb: version 0.6.7

commit f9ffdf4a728840ea29d742244332f63561ed1d9f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

getmail: post-update fixes

commit eddddabf3bceab53e2b33cf8d8ebbf26327d19c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: 3.14.4

commit f0ee55ab78c955abc87ea1e79ffdee2c1a8f0dc5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cppcheck: version 1.65

commit 19bdc0cffe25ac604a534c424642f0a71a9889d1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libevdev: => 1.2

commit 7fff18eac2fef82d96e1af8fd1b00aaf4db9e989
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

extra-cmake-modules: => 0.0.13

commit 06a0f67303ac35256886edcb412f694b8d16d203
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

clamav: => 0.98.3

commit ccf1f795cff387a996e9cc2d50d30b080d51820a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: => 5.5.37 (5.5 branch)

commit abe35152142ebb86ba0a17a1fe3334c3148f15e7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

monit: => 5.8.1

commit 1130d3073f11459afcf4a9a5616dcad1be2382c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

psycopg2: => 2.5.2

commit a7058d7fee402341285d522344fe011256e344fe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dhcp: => 4.2.6

commit dd6275de329b05a6b86c35d670eadbc350f38bb4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

homebank: => 4.5.6

commit 8d133e7175356e1551126a55f0a31f180ab98cd6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libofx: renewed dependencies

commit 324bf8f3f4f16e22c97ef73b2f49ea91be66d9c8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

opensp: don't duplicate docs and added gettext opt dep

commit 2d95f38eedff7fb818746439e29dd307a742fca4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tinc: => 1.0.24

commit eb094d90127e58deb4cdd8c36e66495592ba2180
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/xbmc: updated to 13.0_r2 Gotham

commit 5da1d363e609692be5c098fa9b30282fa98ea0cb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ruby-2.1: => 2.1.2

commit e222da5c38815b71993023c5bf65ec40f0f4c57e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libyaml: => 0.1.6

commit 4ce84a9d71a96e79d12de7bad3788c039ec4afec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

groups: add plasma

commit 4633e0b06593b4b66bb86757af024989f5d98f6f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

masqmail: fixed logging

commit 1fa2f87dd268d7cfd73d5e4213e046c47e181419
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/rxvt-unicode: version 9.20

commit f165747c08291f78d63f19844df3a6c81bc20a08
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

imapsync: Depends on file-copy-recursive

commit cf5d5123e63973c78193df4e816f43bc4fe77666
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

getmail 4.46.0

commit 3981d149657fd75224a3bbc20b17bee8e6905c9a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fetchmail 6.3.26

commit 129e01a294d2ebf33a4ddd9bd03be5dc9b2f56fb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

isync: new spell, IMAP and MailDir mailbox synchronizer

commit 59f7a17470786608e0b948aaf9b0a50473a70712
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

file-copy-recursive: new spell, Perl extension for recursively copying
files and directories

commit 0f215829aaf5e8489df1ffa9230f7b0edc23c616
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mail-imapclient 3.35

commit e9bff1d90b9ca633330a934a3d154392797537cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

date-manip 6.43

commit 4903eca90e770b4ddb75d1b0f7a31c1b4541c496
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

imapsync 1.584

commit 0e8a2116f7b51d7432ccf5f872062bbacfc68a89
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

wm-addons/xmonad-contrib: moved to haskell/haskell-xmonad-contrib

commit 8bc08734e28cda8dcbd456319c05a5fbc7bd6ca6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/xmonad: moved to haskell/haskell-xmonad

commit d9faec27a0474474fb9fa677d5ee092ba251f54a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/openbox: version 3.5.2

commit 49d5e7c9637acc8348a5ec93f52f8d50ea827784
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/herbstluftwm: version 0.6.2

commit d66f26b877186ab22909f1b2434fad33857b3e35
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/amiwm: make_single

commit 1f42da5fee634043c36d2e4bf5b980b514df936f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

terminus-font: => 4.39

commit c23f130e20b60a63538fdee0a0f87d680ac7c1b7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ldns: added openssl warn and perl opt dep

commit 3281928a716990b00d07677ebb8a67d1a27316d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ldns: => 1.6.17

commit 2459c59795d6d3cbb3ab204ef032b24e2899e4d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mcabber: => 0.10.3

commit 0638fa04cb4c11b8fcf4f21ad8c55996f1e5d338
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: apply patches up to 7.4.282

commit f153995250054efd665070125cfe2f2432524ec5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cdrtools 3.01a23

commit ae87c3f0adcab1655cd6919e36ee8f8ac5eeb1e0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cppcheck: version 1.64

commit 3e1d080fadf8b15a12ff276886d53512981aa56a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

tig 2.0.1

commit 074cfb30aed19a7b29eded7952546e3ffc2d8cc1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.14.3

commit 9c5525ef7e4ca273e0b059d2343cf9fb3d73f4f1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbus: => 1.8.2

commit 1c2c0fb9672c8769541cd3f4cf73e306d8529fec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gummiboot - add config script

commit 955935466d6807bc50e30d24a9a027cfdedbfcf5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgphoto2: => 2.5.4

commit 0301bce2d0d5ed76708cb33c49bdf7773f44270c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

isort: => 3.8.0

commit 612a07437183ae5730300f5c3adb5960ecb6621d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gummiboot - add a splash screen

commit eff180687a51db585a50299c086ba80710e1a21a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

openswan: conflicts with new libreswan spell

commit 4666ef684e2a94ac30cd75d1a400368adab38f42
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libreswan: new spell, IPsec implementation for Linux - Openswan fork

commit 34fdf002d1c42aa697e481369d4fd1843ac57df5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-uuid: fix WEB_SITE

commit bc5b9f02e2e6a0bd05ff04739a4dfaff57bfbcbb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-safesemaphore: version 0.10.1

commit 986b2c9251da448454e2b5a87c64a5a28ffc87d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-quickcheck: version 2.7.3

commit 307f0606c1de8ca352f078c7fbbdb36c6ae991d7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-tf-random: new spell, a high-quality splittable
pseudorandom number generator

commit a86b63ccc9c0bc3db59ee63a000e1a2d53dc3e80
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-network: version 2.5.0.0

commit 4e46c0cd90d4429a5af02e0a40261c25f0969772
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-mtl: version 2.2.0.1

commit 7a9b19b887b25b2f399d3937694288254c8f5cb2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-transformers: version 0.4.0.0

commit 0490238a9e2b6690b3b32bf4953564e7ccf7bedc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-monads-tf: version 0.1.0.2

commit 11db10ce36eef65e42f3aa70997e369dc0f67d2b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-mmap: version 0.5.9

commit 79a39e76229da2cb96f54c37b61999d2f23643fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-http: version 4000.2.14

commit fa2cbbc49aa36e1d05c0f015ccd07ad15b3f72f3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-hslogger: version 1.2.4

commit 45ab44ee4b01199e16f24fb51dfd17d4d9e2474f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

minidlna: Updated to 1.1.2

commit 43119160cb7b32965553f2a269e5889491c0fee9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mercurial: => 3.0

commit 2e159891244d1c9398df3c640bcc77fdc0657a60
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

moe: => 1.5

commit cecb9d16e5df1b2c23095a52df5914be676fc9d9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fping: => 3.10

commit bf51715a57b9f7e642a96638c8b067f0efb0ce1c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pv: => 1.5.3

commit 2544be442ec039ffa9f7590ce62e8753f74ce1da
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell-haxml: version 1.24.1

commit f02f97906e83f34ec5a0c91bca6364406d6ceb52
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-polyparse: version 1.9

commit 82309c9acb5e58a16d4bdfc42b96fcbc8d8a5906
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-dlist: version 0.7.0.1

commit ddf495b09dccd6acf3e7497f5f7fc9ed5ffc9a31
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-cryptohash: version 0.11.4

commit c9ec118508c0a8172f71124504a4ece7bf6cdc33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-case-insensitive: version 1.2.0.0

commit 933b088897fc9c0eacf52d66413a2c7268f4aaa4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/happy: version 1.19.3

commit 32911e6d5b24d366862ae308eb704b12d5e65bd0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

openmpi: fix Fortran dependency

commit 4d50a92cb360d6f18648fbbd46b3c610df7d96d2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

alembic: => 0.6.5

commit bd2f66ddb10b15377a8c58ff31b639863a01f4e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

setuptools: => 3.5

commit 98785ee016d1eaca8f542ca697a29343df017482
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine: => 1.7.18

commit f54d68ebad21184dd7875a2a8559e334afed675b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: version 7.8.2

commit c42841df6ef836d9e5c85cc927a5ee543769e37f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/ncurses: add libtinfo symlink

commit bc282990372b7cacf5fed3e165958623b4ba89aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-bloomfilter: fix compile error with ghc 7.8.2

commit 9339fbd186444a752fd31a70c1adeb1a3e9466f8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-missingh: version 1.2.1.0

commit 6f9e2bf17212987c2915fab430eb7810cc481f58
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

wm-addons/xmonad-contrib: version 0.11.3

commit bca3efe3f7dc6da89c71eee534633d6c2a480002
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-aeson: version 0.7.0.3

commit 2c1b6ea404533fd228d91e34ac5b4a90073d0a13
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-attoparsec: version 0.11.3.0

commit aa36efe8ed91be2e80f0ce92b8c572ecfc1fa766
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-unordered-containers: version 0.2.4.0

commit b3ae23ee57d3b46e204488b3a573087bae6de894
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-scientific: version 0.2.0.2

commit aedcf4f2785b920392f535f250c630cf254cff9d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-text: version 1.1.1.1

commit c058809582150440f6a468846c016ff854214e61
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-async: add dependency on haskell-stm

commit 8c398fc5e8d68703ff0d29499f4683ed2b00555d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-stm: version 2.4.3

commit 1e20bc209909ade6d4d8429dff86e06caa3a1142
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partclone - add FAT support

commit 3e20afaafd378084439cd8b06c06913003734f1b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: => 5.4.28 [security]

commit d0714a271e7dc3f9fac2ff8752b1a617aa486e40
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/emacs: versions 24.3

commit 18ba42223e2df6bc9d932c891f51a098bb760add
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mpv: version 0.3.9

commit 7ebc0f784a6585f66390f6cfd1a945b0388f4f35
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-hashed-storage: version 0.5.11

commit bfa7ebfd3fb174a45fb4f0f7d5f49947f8f1c73f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-haskeline: version 0.7.1.2

commit 6b55fdb9546fbf4b5cc0bdef1bc5f2e257934da4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

proxychains-ng: fixed config path

commit 40730a0e60656888a5c51739d147be029c89d4cf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cups-filters: => 1.0.53

commit 9cbbacc7095495a60b8f3e437dd82cec7b2859d8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

proxychains-ng: new spell, TCP and DNS through proxy server

commit 4e3c2d724f6c2ebfb97af6b2df3945c0704d055e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/darktable: version 1.4.2

commit 44016150ca471b7b490b1a80e6a70717efa09e78
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texmaker 4.1.1

commit af345708416f15e450c3664eec55180f048b8da5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

django: => 1.4.11 [security]

commit 1be9817dd092aa19945eda78e528a2ebf1d87e44
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libevdev: => 1.1

commit 43ad76d7dfa06a5b41015bf3cac108c97c95700b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

htop 1.0.3

commit 44e2c2c90d844f371c4f560054af08c7e152671e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fwknop: => 2.6.2

commit 6c96c4bde847dc43799a44645a98794b9320682d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox: version 29.0

commit c60573dafdd7d7e0a08f85a2be34bdd9b1ed9336
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/nss: versions 3.14.5, 3.16, remove obsolete branches

commit f9b968b161cbd0e60c0a6f0b954965ef05070c5c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/gflags: pull source from github

commit 79aa7ff40923af7410ca2beeb0c5e3ac1e65ca44
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-dataenc: version 0.14.0.7

commit 1553ffa17dd323b572adb576caa58e1fae70aedc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-mtl: version 2.1.3.1

commit c41d203ef137bc3723072dd5f680accd1703c66f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gdisk: => 0.8.10

commit 9f953c70a3bd398274f55347cdce45e6c3f81315
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rsync: => 3.1.0

commit e8b7536834b7a8cd866aa855984b09977f2d7678
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

davfs: => 1.5.0

commit f79309f43ede157561961c2d36b411d8c6179563
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

neon: re-added spaces patch

commit ac6d80c06bbae39772aa6eeb299e7057b98deded
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exim: fixed priority for gdbm

commit 4d2828c4bfd7cc61faea11af28e42379f8de5d47
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/vsqlite++: new spell, C++ bindings for sqlite3

commit 1ba1e72e2f352023f0dee5db665cf472c3ccb57c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/gflags: version 2.1.1

commit 499781dbf1d81290d3248b5d7abf93eede073158
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

laptop-mode-tools 1.64

commit a31bb6d3853a2ff846090d89b0ed3f7e5ef9a6de
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

uget: => 1.10.4

commit 3efccac5d6611a8a9f91c7aa93fe6f12d044a637
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ipsec-tools: => 0.8.2

commit 013e09114f98c1ac2c80490627fdda7e9e22fa9f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/git-cola: version 2.0.2

commit a533f1a160dec357bf0c4f631acf9fe26ae2654c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: version 3.14.2

commit aa00fe80c5137b2dd900225500809a1bb97b1e0b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/paramiko: version 0.13.0

commit 2ceefbfd14b4bfa57b56764102394b6c5048f9aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/python-ecdsa: version 0.11

commit cc1176eccb0c70dfd464af82942a0dbba7271942
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/qt-creator: version 3.1.0

commit c77ddd96433d12c658b5198043ef4653987cf9cf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

optipng: fixed man directory

commit c2008643dd280a02ee96aa6000d18c0da42575a7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpv: => 0.3.8

commit 8604f2d4c225e0638c8fb704bcd5e9e8b61788a7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pngquant: => 2.2.0

commit b799e09598900ea7a9585f6d262d83f572f2e62e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

imagemagick 6.8.9-0

commit 819631630fa9c3e4100170a8c258e3259e4bc94d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

smem: => 1.4

commit 0399d9c1077b4b429a2965ff67f8fac2a31ab6a0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lilo: added patch for Xen XVD disks recognition

commit d6e567f22a6fbb90343667738ff238c98fd1f61f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: => 5.4.27 [security]

commit 7fd1d3bf8583a7dd3cec1b516753db2fbf30a6d1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ncdc: => 1.19.1

commit 47dedcc6133129b97dd76167bb850c832b916d73
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wireshark 1.10.7, SECURITY_PATCH=48

commit 76a9f35de2e08adac4885f4d7b0d6232c5a65d13
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

syslog-ng - more depends

commit 9851d011ebdece257562d908380cf718a6bd278e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bluefish: => 2.2.6

commit d756734c53599276ee4f4e0405c33dc37b5c30c9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine: => 1.7.17

commit 6d713000c954dcd8af945ab3e61229363f2f572c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pango: => 1.36.3

commit b05a7f373ec2b46d87067d44ad8cc21e2d4ada23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

librsvg2: => 2.40.2

commit 20df177b2f504dcbb643411584cbb12e298da055
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

harfbuzz: => 0.9.27

commit 7f93a5ae67aa52a57ab9f0e6e01d1ff7e11e1ac9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glibmm: => 2.40.0

commit 82c979bcce1707751bb6b5fc31707bc73209bdb6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

guile: => 2.0.11

commit 89432cafbf8cfd7e8b80b4dcc5c39cfb50a91cb3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glib2: => 2.40.0

commit c30dbfe577d389b638d986be6add1f981e66fb2a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gettext: made libxml2 optional

commit 405508651aaacf55ad4308f0ca653b13d83ea6d0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cherrypy: => 3.3.0 (branch 3)

commit 2f7390f987581aa12eaa6482c4abf16948e58d11
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

eudev: => 1.6

commit 6dbd30c3f9fe6132a644720989fb6a9caa5c3d2a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

json-c-0.12 SECURITY fix

commit 7acae5b9b537e11c5211be646a286a851ab1fb2a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate kde4/kdebindings4 [replaced by kde4-bindings-profile]

commit 1d6409fbd2ac894823c027724dd65f741b6b4df5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvbpsi: => 1.2.0

commit 9911f219ed021021a94c2b39fef6ce0b9bdf1a01
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fb-python: => 0.9.3

commit f296e28372d3aa2fb15a26481ff4ae3b7f517995
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nmap 6.46

commit 4d06c81c0cc9e0f226698db1a503d13b6a48f71c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: fixed logic bug in init script

commit b61d5028a16470e2eb51887b4feca93130f8e8fc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

polipo: implemented reload function to prevent exiting when HUP signal is
sent

commit 6406d37bdbcd274c2c4025b8b1e4444b3fd84962
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

isomaster: => 1.3.11

commit 4ef55b91cf684a3280b86b24677ff906e9f38933
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

geany: => 1.24.1

commit 3b6f8a946e2d2379de12b4540a3125eda1ad5774
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fontconfig: => 2.11.1

commit fe1e60cdc73d99792d861c7d47733e369be48348
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

freetype2: => 2.5.3 [security]

commit 20ca917e6ffd726b8d95dd1ca827e86723dcd4b3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

slim: fixed build with recent freetype2/cmake

commit a019493227e74dba322b5aaa9f580a878bed4610
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ChangeLog: corrected double-spaces for history entries

commit 1e0a6b5101e4bffa1b36376f82b66d3291ffaa18
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

devscripts: new spell, Debian developer scripts

commit 3956610f54097650b27979e39977565d5d03e030
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

polipo: new spell, caching web proxy

commit 65651147c08dd54a49e5a326d6c450ec75bbc9f8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fwknop: => 2.6.1

commit 59281b2c4ac2141ba7ecce6788772f45ec0264ad
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

geany-plugins: => 1.24

commit f8d1d60abf9c68296ae9b73bc9ecce6bdd124e64
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

geany: => 1.24

commit c33c088120995aa717cf03cfb5361a40ea23ea55
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

file-desktopentry: depends on file-basedir

commit c0da3c66f60838fed3d3ec6cffe13542d8f0fbdc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

parse-debcontrol: new spell, Easy OO parsing of debian control-like files

commit f854ecf6fb29bc460207da45c81c573cafd157f4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dpkg 1.17.6

Switch to xz-compressed source, and removed the install-info patch since
it
has been completely removed from dpkg.

commit 2523ea7af0e741127d955789a414f53797d90dd2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.14.1

commit 60a8dd4deb00cceef127c2f45f2c9749e96b9de4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.14

commit 5008e2adc7dd6bde5aa25248eba2047d3ee4083b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fpc 2.6.4

commit 6b8d22f282495ea03d69851fc58a4d9a198ba6c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Pass down ARFLAGS=rv, to workaround buildsystem bug

commit debff4e6353697d5240f04b36c3ce720e0df5dd7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-via - depends mesalib

commit 29ea9d280d5324db4b64d97d046dba86c0c85391
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-tdfx - depends mesalib

commit 1c7320c809a5ce511352d1da59da6bb6b600359f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-sis - depends mesalib

commit 0f135504da723e13932514b766db22e970b2daa8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-r128 - depends mesalib

commit 851c1c8e733d7ea0d982bb988c7241d4646073ec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-openchrome - depends mesalib

commit 5b91c7d9c490b53b8f91635b948047fb8934cf7f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-mga - depends mesalib

commit 381b4d5c2ee1eada58369261fe7bc1349a3b8faa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-intel - depends mesalib

commit 5b34ca4a4eb4ba4449bcb826bb0190a02a644607
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-glint - depends mesalib

commit 86b0f9b924ac3c5df8312663a5a86692d8094c78
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xf86-video-ati - depends mesalib

commit 235b499bcc7d08083d35b330a17361cc4bbcf541
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xorg-xserver/xorg-server - depends mesalib

commit 9f5cefe9dea562ae38e1d01cbdc56b4fa98fc9dd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xorg-app/xdriinfo - depends mesalib

commit e80b767eb774b286e1faa93218b6393ea30e982b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

x11/xlockmore - depends mesalib

commit 5f6ff0c87a0f39194a069e9370f0746e50a2d94e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

x11-toolkits/wxgtk - depends mesalib

commit 1e4d3dbe8b9c7df9a655adaf5d6196a75271c9f3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

x11-toolkits/fltk2 - depends mesalib

commit 947e5bf937d3a7bf6dd89608e481dc881c28663d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libs/sdl2 - depends mesalib

commit 370b95cd052b151403b11c4caab36c32e7dde36f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libs/openscenegraph - depends mesalib

commit 4017a2f13a71d936365727be28ea82b8cc70e6bb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libs/libva - depends mesalib

commit 8e8f5d07ef4fdc9c990045439cfc81ad580c16f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libcaca - depends mesalib

commit 06730450edbb67ac081bf6622114f46a0627ee8b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

webkitgtk3 - depends mesalib

commit 2af4a0c348fa91731ed935e78248daf09ebe9f75
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

webkitgtk - depends mesalib

commit 3acfcf344918adeaef6ea1c04788585aca81e143
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

eflwebkit - depends mesalib

commit ca57efc7a352b096fa29fc284c178180160aca38
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesalib - conflicts mesalib-1x

(cherry picked from commit be55e2b3505085de6303a044f225739b69693059)

commit 5ed58f2e6cc1cfaddd4fcf36493741bcec342484
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cffi: => 0.8.2

commit 36cc23a68e201a281f8fd988ee56f40fad063213
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

serf: => 1.3.4

commit bd8aea6ea55264d78dd3fa0ea63d25b8126de329
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

scons: => 2.3.1

commit d9e882fb0342069aef5d144bda657a2ec0915c16
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gawk: => 4.1.1

commit 5c1ac41be982ea67622ff603b92369d212c2fd56
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

unifont: => 6.3.20140214

commit 96226863928bf48ba146e93d293b1ad085751cc0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

readline: => 6.3

commit c51dafc9bebf376e14de52e14d3f53497556bea6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

file: => 5.18

commit e616c73488d1ebd09692def6391142d1dfdc0bad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

subversion-1.8.8 - SECURIT fix

commit af333294f2b840bf4e05581ea4b9b9312599ac23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tbb: => 42_20140122

commit ceb10e78f42f2612dd8b10338a66bddb4a196c68
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libvorbis: => 1.3.4

commit 193bf98a3005f354461d6f10941463281d012702
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sdl2: => 2.0.3

commit 28658b47ac8633cf584d0a6cd35d56cf07e3f9d6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gdbm: => 1.11

commit 9d0219615c59858195ef9a706f24b41c8ff74db0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gsl: => 1.16

commit e94311c234aa6e865145d8ea23e28c6390445c3d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnu.gpg -add AE05B3E9: Patrick Alken

commit 0a0b3fe5f1c11e39b4cb6f7b592cee33ed47b5ff
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libcap: => 2.24

commit 745c34d744edcfc49e3c46b6f9bc66f6f347c558
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

run-parts: => 4.4

commit 0a683676b7be76e9817cd1f10f95d27e96a4a8c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

byacc: => 20140409

commit 99df1294b280d7b470252227458055ecc68ed868
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

syslog-ng: => 3.5.4.1

commit 507d44df00f469f4143fba6f61d6d284239beac3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dhcpcd: => 6.3.2

commit 05d5eaaca5faa1417d2b44dc3edc432a6e7782a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

formencode: => 1.3.0a1

commit dbb5129317c09a7ca772ac9c8120e3fc8370ff8c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvdnav: => 4.2.1

commit 41f666aaa26cbde2bb0f648e5dab4606ecfbce6a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvdread: => 4.2.1

commit f540f49eaf12379ef34bc5b6ed063470a1126904
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

perl-error: => 0.17022

commit 9451057532660936f640d178d886c5189bd6b632
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xmlto: => 0.0.26

commit cdb186c4778176a21b6151f3b55c633e8aa6a5f5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libjpeg-turbo 1.3.1

commit 0d13d4d854ef35ac6a3ef78685d6d2530fc46972
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cups-filters: => 1.0.52

commit 5bf9ad2bb302abfbd7d2fe8521ba583811b68d54
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

midori 0.5.8

commit 92840431c6e685e295d99f3b02889a1b7a6047b5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ca-certificates: => 20140325

commit 198560b0d0968586d3afc30bf8f6711d92d0af59
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

git: => 1.9.1

commit 0d44268f511f569f683c6ec629f263479e816b58
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pip: new spell, Python easy_install replacement

commit a12cf3b77f9ca3f87f9e219e2830d05f375d143d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

virtualenv: => 1.11.4

commit 6d938b1b0c1198abc87ca8b72c0f6e4f24670ff2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

lcms2: => 2.6

commit 09e762bd78a00003a98707bafeee9013dd7cd135
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

docx2txt: => 1.3

commit 058f4a6a7a893925336da6d0610ac9a4b1bed1da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

desktop-file-utils: => 0.22

commit c40258c3c34229a76dd7e00cc754f4cba0fcf213
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

flex: => 2.5.39

commit 44105f0031295b8ffcaec39e6432f74da1ebecf2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

taglib: => 1.9.1

commit 3602ff4607c6d3c675a0adbdc50a27b4b17d33e1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/openssl: version 1.0.1g, fixes CVE-2014-0160

commit 20a705ad8adb3dd50a48bc7c88f6a2d436ffc939
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/cdk: version 5.0-20140118

commit e883b00c2fcfb100e48c66da0967de307adf63cd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/newt: version 0.52.17

commit fe32572015ff8c2d0d034cc29f5c5cc288694474
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libtcod: new spell, a library for developing roguelike games

commit 78d2a2a4a181dac2795744b9451a67c029ec45dd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

archive/upx: version 3.91

commit a9d0b4c3b41ed581a4b80a2bc6ab4dda116f921b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: => 3.6.23 [security]

commit 8fc43b8e3ca5d205a8ebd9a62f35ad0529942747
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tdb: => 1.2.13

commit 0d565820b49dbeec4788fba53d45ac721f8e7492
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: update triggers for switching between branches

commit 3f109537d4be7f5d6f27e612d6559a1623e565b1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: added branch 5.5

commit bd8e57a018b1a3d24e43b7219c4078014cd903e5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

bsddb3: => 6.0.1

commit cdcff87fa23c862646ef6b474611532f75a40b6a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

leptonica: => 1.70

commit 4f93f0817ccc5b79fb37331fbfb9f5813c67fb73
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

bogofilter: => 1.2.4

commit 8442fbc00d8350a6d3c8647ee184a0eea3c5e4de
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mc: => 4.8.12

commit 683c380840909a27846608b46bb9b822c411973c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/pillow: version 2.4.0

commit b6b726ea27be091ecbaa26ce9b87a531b107a5c3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-plugins/rt-plugins: use cmake as build system

this resolves an issue when --as-needed is set in LDFLAGS

commit 474ca955a59340f56bff33e636349b18abfbe227
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-soft/meterbridge: fix error when link with as-needed

commit 7d7d251e517dcc75a1bf53513de25d0f67d7291f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-git-annex: version 5.20140406

commit 4e842f1100d00074dab7768e2cd51911d7e77092
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mpv: depend on lua instead of LUA

commit b46464d2826c6169159aba1e4fe6a94b2e17e3d8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/gst-plugins-base: depend on libxdmcp

commit ef16258eaeb4849a2bc37af445f446bdc8587499
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postfix: => 2.9.9

commit 8f50fd64ccde010ce6a65f1036d1d107da951069
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mongodb: => 2.4.10

commit d42430fb5b7c6dc5e6c8a7cfc65744e9690ec7d0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

code-browser: => 4.9

commit 2707a98739efeb5c4ba3a9492dff04153a41eb5d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

copper: added copper-elf-1.6 symlink

commit fdcc8ff80a7408bda57e6e7603f83630e6ae47d0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

redis: => 2.6.17

commit c4431df56cea830b467c9ac67bd3d3099ffae398
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

google-perftools: => 2.1

commit ebdd91dd089457b922c8fa38f731688c58736345
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libunwind: fixed syntax errors in spell files; don't do useless doc-ing

commit 31262b3b0b3aa0eb2e57c2119f04ada2af6c8dde
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libverto: => 0.2.6

commit 847e6111e1cc677ea54fab7869ace3d4b09d8bd9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ristretto: renewed dependencies

commit 051ca5e14491ab75b84faff8ee5466027ad9acfa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

deadbeef: => 0.6.1

commit 16382d3f9d4725fb8086da3e1b9641fba79bd9f9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

at-spi2-core: => 2.12.0

commit 0faa20a34fcc57d3ab27263aa5bcbb8946554f64
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gettext: => 0.18.3.2

commit 24e6fb04ea47bffbbc7e8321388a4226da3aaa80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnu.gpg : add D7E69871: Daiki Ueno

commit 64d773e5a99fbf1e1fe5286c787dd6a16824238a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/unclutter: depend on libx11, libxext and imake

commit bed0f141d337593be5b70e98e82e28e92a1d97be
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/hal: depend on UDEV instead of udev

commit 457362c1bc3ddd0532517bf651b49315f0cc04b1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libusb: depend on UDEV instead of udev

commit 60f6aa4a8c445b42e823b0a5ab9dbc44856f0f25
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/spacefm: depend on UDEV instead of udev

commit d6828b9e1a8c90295068e59f858c5e64e540ae35
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/bmon: version 3.2

commit e37566bda73396d9670792207204e480da3dcf01
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcre: => 8.35

commit 8670477a1c816ff9836ca61f28e70a8da3ac727a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

setuptools: => 3.4.1

commit 986101c7899c15aeb34420a3e00ca2063537680c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pyicu: => 1.6

commit 459b1abba7b126abdecef485915776bcb32294f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sylpheed: => 3.4.1

diff --git a/ChangeLog b/ChangeLog
index dd5eb90..fb622c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,226 @@
+2014-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/megatools: new spell, command line client for mega.co.nz
+ * http/phantomjs: new spell, headless WebKit scriptable with a
+ JavaScript API
+
+2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
+ * utils/lxc: new spell, Userspace tools for the Linux kernel
containers
+ * graphics/dcmtk: new spell, DICOM Toolkit
+ * science-libs/itk: new spell, toolkit for performing registration
+ and segmentation
+
+2014-09-23 Pol Vinogradov <vin.public AT gmail.com>
+ * chat-im/pidgin-window-merge: new spell, one window plugin for Pidgin
+
+2014-09-23 Ismael Luceno <ismael AT sourcemage.org>
+ * editors/vbindiff: new spell, Visual Binary Diff
+
+2014-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * move xdg-user-dirs to utils
+ * python-pypi/grit-i18n: added
+
+2014-09-19 Pol Vinogradov <vin.public AT gmail.com>
+ * gnome3-libs/adwaita-icon-theme: new spell, Adwaita icon theme for
GNOME
+
+2014-09-18 Jeremy Blosser <jblosser AT sourcemage.org>
+ * graphics/irrlicht: move spell to games grimoire
+
+2014-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * net/corkscrew: new spell, tool for tunneling SSH through HTTP
+ proxies
+ * libs/isl: new spell, Integer Set Library
+
+2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/elfkickers: new spell, Kickers of ELF
+
+2014-09-15 Jeremy Blosser <jblosser AT sourcemage.org>
+ * database/leveldb: new spell, fast key-value storage library by
Google
+ * graphics/irrlicht: new spell, high performance realtime 3D engine
+
+2014-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * editors/vim-csapprox: new spell, Make gvim-only colorschemes work
+ transparently in terminal vim
+
+2014-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * shell-term-fm/abduco: new spell, session {at,de}tach support
+ * shell-term-fm/byobu: new spell, text based window manager and
+ terminal multiplexer
+ * devel/cobra: new spell, Cobra Programming Language
+
+2014-09-11 Ismael Luceno <ismael AT sourcemage.org>
+ * disk/squashfs-tools3: new spell, squashfs-tools 3.x
+
+2014-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/runawk: new spell, Wrapper for AWK providing modules
+ * devel/mk-configure: new spell, Lightweight replacement for autotools
+ * devel/bmake: new spell, Portable version of NetBSD make
+
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/python-magic: new spell, File type identification using
+ libmagic
+
+2014-09-07 Ladislav Hagara <hgr AT vabo.cz>
+ * utils/direvent: new spell, directory event monitoring daemon
+
+2014-08-31 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/sdcc: new spell, Small Device C Compiler
+ * devel/mawk: new spell, Interpreter for the AWK Programming Language
+
+2014-08-24 Thomas Orgis <sobukus AT souremage.org>
+ * audio-libs/aubio03: old copy of aubio for ardour2
+
+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
+
+2014-07-25 Pol Vinogradov <vin.public AT gmail.com>
+ * gnome3-libs/granite: new spell, elementary Development Library
+
+2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * docutils: moved to python-pypi section
+
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * graphics/nomacs: new spell, image viewer
+
+2014-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * net/tor.gpg: add 63FEE659
+
+2014-07-09 Ismael Luceno <ismael AT sourcemage.org>
+ * emacs-lisp/visual-regexp: new spell, A regexp/replace command for
+ Emacs with interactive visual feedback
+ * emacs-lisp/autopair: new spell, Automagically pair braces and
+ quotes
+
+2014-07-05 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/gnusim8085: new spell, Graphical simulator, assembler and
+ debugger for the Intel 8085 microprocessor
+
+2014-07-03 Pol Vinogradov <vin.public AT gmail.com>
+ * FUNCTIONS: more fixes to get_up_spell_name and get_scm_version
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: Fix get_up_spell_name to handle the dot and plus symbols
+
+2014-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: Added get_scm_version function
+
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * libs/librevenge: WordPerfect Document importer
+ * libs/libodfgen: ODF generator, originally by Javier Vasquez
+
+2014-06-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * archive/lz4: new spell, a very fast lossless compression algorithm
+
+2014-06-25 Ismael Luceno <ismael AT sourcemage.org>
+ * editors/auctex: moved to emacs-lisp/auctex
+
+2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * devel/android-tools: new spell, tools for debugging android-based
+ devices
+ * audio-soft/gmtp: new spell, a GUI for communicating with mtp-capable
+ devices
+
+2014-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * accounts, group: add inpu
+
+2014-06-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/gstopwatch: new spell, simple stopwatch, written in GTK3
+
+2014-06-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * fonts-x11/ttf-monofur: new spell, a monospace font
+
+2014-06-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-ghc-syb-utils: new spell, boilerplate reduction for
the
+ GHC API
+
+2014-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * accounts, group: add sddm
+
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * graphics-libs/giflib5: new spell, provides GIFLIB
+
+2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/python-llfuse: new spell, bindings for fuse's low-level
API
+ * python-pypi/attic: new spell,, a backup tool
+
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-hasktags: new spell, ctags for haskell
+
+2014-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/greenlet: new spell, lightweight in-process concurrent
+ programming
+ * python-pypi/curtsies: new spell, curses-like terminal wrapper, with
+ colored strings
+
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * fonts-x11/ttf-mensch: new spell, a console font based on Menlo
+
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * mail/isync: new spell, IMAP and MailDir mailbox synchronizer
+
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * perl-cpan/file-copy-recursive: new spell, Perl extension for
recursively copying files and directories
+
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * windowmanagers/xmonad: spell deprecated [integrate into the
grimoire's
+ haskell build facilities]
+ * wm-addons/xmonad-contrib: moved to haskell/haskell-xmonad-contrib
+
+2014-05-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * groups: kde5 => plasma
+
+2014-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/libreswan: new spell, IPsec implementation for Linux - Openswan
+ fork
+
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-tf-random: new spell, a high-quality splittable
+ pseudorandom number generator
+
+2014-04-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/proxychains-ng: new spell, TCP and DNS through proxy server
+
+2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/vsqlite++: new spell, C++ bindings for sqlite3
+
+2014-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4/kdebindings4: spell deprecated [replaced by
kde4-bindings-profile]
+
+2014-04-16 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/devscripts: new spell, Debian developer scripts
+
+2014-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * http/polipo: new spell, caching web proxy
+
+2014-04-15 Ismael Luceno <ismael AT sourcemage.org>
+ * perl-cpan/parse-debcontrol: new spell, Easy OO parsing of debian
control-like files
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * gnu.gpg: add key AE05B3E9: "Patrick Alken <alken AT colorado.edu>"
+
+2014-04-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/pip: new spell, Python easy_install replacement
+
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libtcod: new spell, a library for developing roguelike games
+
+2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * gnu.gpg: add D7E69871 "Daiki Ueno <ueno AT unixuser.org>
+
2014-04-01 Vlad Glagolev <stealth AT sourcemage.org>
* utils/gstpw: new spell, simple GTK+2 stopwatch program

@@ -5,7 +228,7 @@
* editors/vimoutliner: new spell, Outline processor designed for
lightning fast authoring

-2014-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+2014-03-24 Treeve Jelbert <treeve AT sourcemage.org>
* hicolor-icon-theme: move to desktop-themes
* oxygen-icons: move to desktop-themes

@@ -18,7 +241,7 @@
* audio-libs/stk: new spell, the synthesis toolkit in C++
* FUNCTIONS: bring waf_build into line with default_build

-2014-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+2014-03-22 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/rbtools: new spell, tools for ReviewBoard

2014-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -48,20 +271,20 @@
* audio-drivers/mudita24: new spell, a mixer GUI for ice1712 based
sound
cards

-2014-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+2014-03-07 Treeve Jelbert <treeve AT sourcemage.org>
* devel/extra-cmake-modules: new spell

2014-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/python-ecdsa: new spell, ECDSA cryptographic signature
library

-2014-03-05 Ismael Luceno <ismael AT sourcemage.org>
+2014-03-05 Ismael Luceno <ismael AT sourcemage.org>
* utils/nicstat: new spell, Network traffic statics utility for
Solaris and Linux

-2014-03-04 Treeve Jelbert <treeve AT sourcemage.org>
+2014-03-04 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: fix cmake usage of install dirs, for lib and man

-2014-02-27 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* libs/libevdev: new spell, wrapper library for evdev devices

2014-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -72,7 +295,7 @@
* devel/stlink: new spell, tools for interacting with ST's ARM
developer boards

-2014-02-23 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/cffi: new spell, python -> interface
* python-pypi/pycparser: new spell, C99 parser

@@ -91,36 +314,36 @@
* haskell/haskell-scientific: new spell, representing scientific
numbers
in haskell

-2014-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-12 Treeve Jelbert <treeve AT sourcemage.org>
* http/qtwebkit: spell deprecated [replaced by qt5/qtwebkit]

2014-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* devel/ninja-build-system: new spell, a small build system with a
focus
on speed

-2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdegraphics4: spell deprecated

-2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdemultimedia4: spell deprecated

-2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdeedu4: spell deprecated

-2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: delete obsolete kde3 stuff

-2014-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* disk/gummiboot: new spell, EFI boot manager

-2014-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-06 Treeve Jelbert <treeve AT sourcemage.org>
* qbs: move to devel, it is not just for qt5

2014-02-05 Vlad Glagolev <stealth AT sourcemage.org>
* accounts, groups: added account data for gnarwl spell
* mail/gnarwl: new spell, LDAP based email autoresponder

-2014-02-03 Treeve Jelbert <treeve AT sourcemage.org>
+2014-02-03 Treeve Jelbert <treeve AT sourcemage.org>
* disk/gnu-efi: new spell, Develop EFI applications

2014-02-02 Vlad Glagolev <stealth AT sourcemage.org>
@@ -135,7 +358,7 @@
2014-01-25 Robin Cook <rcook AT wyrms.net>
* x11-toolkits/goocanvas2 new spell

-2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* devel/qxmledit: Qt4/5 XML editor
* groups: add kde5

@@ -151,7 +374,7 @@
* libs/osgearth: new spell, a 3D mapping SDK for openscenegraph
applications

-2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: remove obsolete functions regarding qt3/kde3

2014-01-11 Vlad Glagolev <stealth AT sourcemage.org>
@@ -165,43 +388,43 @@
2014-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* kernels/nct6775: spell deprecated [part of mainline now]

-2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/isort: new spell, sort python imports

-2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
+2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
* ruby-raa/ruby-2.1: new spell

-2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
+2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qtserialport: new spell, serial port access for qt5

2013-12-09 Ladislav Hagara <hgr AT vabo.cz>
* python-pypi/python-efl: new spell, python bindings for EFL

-2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
+2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: fix PYTHON2 typo

-2013-12-03 Ismael Luceno <ismael AT sourcemage.org>
+2013-12-03 Ismael Luceno <ismael AT sourcemage.org>
* disk/pspshrink: new spell, ISO Compressor for PSP games

2013-12-02 Ladislav Hagara <hgr AT vabo.cz>
* e-17/emotion_generic_players: new spell, Emotion Generic Players

-2013-11-30 Ismael Luceno <ismael AT sourcemage.org>
+2013-11-30 Ismael Luceno <ismael AT sourcemage.org>
* utils/xdelta3: new spell, Diff program that works on binaries.

2013-11-26 Vlad Glagolev <stealth AT sourcemage.org>
* php-pear/php-clamav: new spell, ClamAV Interface for PHP5 scripts

-2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: fix for python2 usage when it is not primary installation

2013-11-24 Jeremy Blosser <jblosser AT sourcemage.org>
* python-pypi/viridian: new spell, ampache client in python

-2013-11-24 Ismael Luceno <ismael AT sourcemage.org>
+2013-11-24 Ismael Luceno <ismael AT sourcemage.org>
* net/cgminer: new spell, multi-threaded multi-pool FPGA and ASIC
miner for bitcoin

-2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3

2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
@@ -211,16 +434,16 @@
2013-11-17 Robin Cook <rcook AT wyrms.net>
* libs/iec16022: new spell, library for DataMatrix barcodes

-2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qtsystems: spell deprecated

-2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qtpim: spell deprecated

-2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qt3d: spell deprecated

-2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qbs: new spell, build system for qt

2013-11-06 Ismael Luceno <ismael AT sourcemage.org>
@@ -283,7 +506,7 @@
2013-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* video/mpv: new spell, free and open-source general-purpose video
player

-2013-09-22 Treeve Jelbert <treeve AT sourcemage.org>
+2013-09-22 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/kinterbasdb: spell deprecated [replaced by fdb]
* devel/qxorm: new spell, ORM library for Qt/Boost
* FUNCTIONS: fix qt5_build
@@ -360,14 +583,14 @@
* python-pypi/sigal: new spell, a static gallery generator
* python-pypi/markdown: spell deprecated [spell exists twice in test]

-2013-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+2013-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* libs/pugixml: new spll, xml parser

2013-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/nocache: new spell, a tool for excluding processes from
participating in the buffer cache

-2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
+2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* net/tcpdump.gpg: add D9C15D0D <The Tcpdump Group>

2013-08-05 Ismael Luceno <ismael AT sourcemage.org>
@@ -377,22 +600,22 @@
* e17/etrophy: Added a library to manage scores, trophies, and
unlockables
* e17/echievements: Added an achievements module for Enlightenment 17

-2013-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* disk/eudev: new spell - fork of udev

-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* database/rekall: spell deprecated

-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* database/xbsql: spell deprecated

-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* database/xbase64: spell deprecated

-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* database/xbase: spell deprecated

-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* database/hk_classes: spell deprecated

2013-07-26 Vlad Glagolev <stealth AT sourcemage.org>
@@ -1099,7 +1322,7 @@
your environment
* perl-cpan/xml-sax-base: new spell, base class SAX Drivers and
Filters

-2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* qt5: new section
* qt5/qtxmlpatterns: new spell
* qt5/qtwayland: new spell
@@ -1222,7 +1445,7 @@
* audio-players/stretchplayer: new spell
audio player with time stretch and pitch shift

-2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* audio-libs/libmusicbrainz5: new spell, new api for musicbrainz

2012-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -1322,7 +1545,7 @@
2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
* shell-term-fm/qtfm: new spell, pure Qt based file manager

-2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
+2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/calligra: new spell - office suite for kde

2012-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -1332,7 +1555,7 @@
2012-05-09 Ladislav Hagara <hgr AT vabo.cz>
* crypto/npth: new spell, new GNU Portable Threads Library

-2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
+2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* libs/libusbx: new spell
fork of original libusb project

@@ -1357,7 +1580,7 @@
image compression format
* doc/mupdf: new spell, lightweight PDF and XPS viewer

-2012-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+2012-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* disk/partclone: new spell partition clone/image tool

2012-04-20 David C. Haley <khoralin AT gmail.com>
@@ -1367,10 +1590,10 @@
* libs/libutempter: new spell
terminal emulator library interface

-2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
* devel/apiextractor: spell deprecated

-2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+2012-04-20 Treeve Jelbert <treeve AT sourcemage.org>
* devel/generatorrunner: spell deprecated

2012-04-16 Pol Vinogradov <vin.public AT gmail.com>
@@ -3844,7 +4067,7 @@
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* ruby: split into ruby-1.8 and ruby-1.9

-2010-02-25 Treeve Jelbert <treeve AT sourcemage.org>
+2010-02-25 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/twisted-core: spell deprecated [replaced by twisted]
* python-pypi/gdata: new spell - Google Data api
* python-pypi/coherence: mew spell - UPnP support
@@ -3922,7 +4145,7 @@
* telephony/telepathy-butterfly: new spell, pymsn based msn support
for
telepathy

-2010-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+2010-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/kraft: new spell, small business management for kde4

2010-01-10 Ladislav Hagara <hgr AT vabo.cz>
@@ -4069,7 +4292,7 @@
* php-pear/php-memcached: new spell, memcached extension based on
libmemcached library

-2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-support/polkit-qt-1: new spell, qt4 support for polkit-1

2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
@@ -4098,7 +4321,7 @@
* latex/TEX_{DEPENDS,FINAL,POST_REMOVE}: adapted to texlive
* latex/glosstex: new spell, a tool for preparing glossaries

-2009-10-31 Treeve Jelbert <treeve AT sourcemage.org>
+2009-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: fix cmake_build if OPTS is non-null

2009-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -4138,14 +4361,14 @@
2009-10-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* x11-libs/dri: removed finally

-2009-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+2009-10-13 Treeve Jelbert <treeve AT sourcemage.org>
* qtcurve-kde4: move to kde4-look
* kde4-apps/krusader4: new spell, file manager for kde4

2009-10-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* FUNCTIONS: added a new function

-2009-10-10 Treeve Jelbert <treeve AT sourcemage.org>
+2009-10-10 Treeve Jelbert <treeve AT sourcemage.org>
* move konqueror4-plugins to kde4-apps

2009-10-09 David Kowis <dkowis AT shlrm.org>
@@ -4161,13 +4384,13 @@
* net/shorewall-perl: deprecated in favour of shorewall-common
* net/shorewall-shell: deprecated in favour of shorewall-common

-2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
* devel/generatorrunner: new spell, supercedes boostpythongenerator

2009-10-04 Bor Kraljič <pyrobor AT ver.si>
* libs/podofo: new spell: dependency for calibre

-2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
+2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/konversation4: new spell, irc client

2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
@@ -4213,7 +4436,7 @@
2009-09-26 Finn Haedicke <finn_haedicke AT gmx.net>
* ftp/grsync: new spell, gui for rsync

-2009-09-24 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/tellico2: new spell, kde4 collection manager

2009-09-23 Ladislav Hagara <hgr AT vabo.cz>
@@ -4288,7 +4511,7 @@
using LDAP
* utils/nss-ldapd: spell deprecated (renamed to nss-pam-ldapd)

-2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* doc/docx2txt: new spell, convert Microsoft docx files
* devel/pyside-tools: tools for Pyside
* devel/pyside: Qt bindings for Python
@@ -4303,11 +4526,11 @@
2009-09-04 Finn Haedicke <finn_haedicke AT gmx.net>
* display/read-edid: new spell; display metadata extractor

-2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* crypto/libp11: new spell, PKCS#11 library
* crypto/engine_pkcs11: new spell engine for openssl

-2009-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-03 Treeve Jelbert <treeve AT sourcemage.org>
* libs/libcsv: new spell, parse csv files

2009-09-03 Quentin Rameau <quinq AT sourcemage.org>
@@ -4316,7 +4539,7 @@
2009-09-02 Vlad Glagolev <stealth AT sourcemage.org>
* php-pear/memcache: new spell, memcached extension

-2009-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+2009-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* libs/openmpi: new spell, massively parallel support (needed by
boost)

2009-09-01 Arjan Bouter <abouter AT sourcemage.org>
@@ -4327,7 +4550,7 @@
* utils/joystick: new spell, a set of tools for handling
joysticks

-2009-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-31 Treeve Jelbert <treeve AT sourcemage.org>
* accounts, group: add camera

2009-08-30 Donald Johnson <ltdonny AT gmail.com>
@@ -4350,12 +4573,12 @@
2009-08-28 Ladislav Hagara <hgr AT vabo.cz>
* gnome2-apps/balsa2: removed deprecated spell (renamed to balsa)

-2009-08-27 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-27 Treeve Jelbert <treeve AT sourcemage.org>
* devel/apiextractor: new spell, tool for extracting interface details
* devel/boostpythongenerator: new spell build pyhhon bindings using
boost
* editors/scribus4: next generation desktop publishing, based on qt4

-2009-08-25 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-25 Treeve Jelbert <treeve AT sourcemage.org>
* graphics/exact-image: new spell, fast, modern graphics tools

2009-08-24 Quentin Rameau <quinq AT sourcemage.org>
@@ -4376,10 +4599,10 @@
* devel/python3: new spell, python 2 successor
* devel/python3000: spell deprecated [renamed to python3]

-2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/rekonq: new spell, webkit based browser for kde4

-2009-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-20 Treeve Jelbert <treeve AT sourcemage.org>
* libs/libdrizzle: client and protocol library for the Drizzle project
* libs/protobuf: new spell , encoding structured data
* cluster/gearmand: new spell, manager for sharing work
@@ -4439,7 +4662,7 @@
2009-08-01 Thomas Orgis <sobukus AT sourcemage.org>
* utils/clamz: new spell; Amazon MP3 downloader replacement

-2009-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+2009-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdepim4-runtime: new spell, bits split from kdepim4

2009-07-31 Arjan Bouter <abouter AT sourcemage.org>
@@ -4462,7 +4685,7 @@
2009-07-27 Donald Johnson <ltdonny AT gmail.com>
* utils/notify-osd: new spell, alternate notification-daemon

-2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* devel/qt-creator: new spell, qt4 developer kit

2009-07-27 Quentin Rameau <quinq AT sourcemage.org>
@@ -4492,7 +4715,7 @@
* python-pypi/bpython: new spell, fancy interface to the Python
interpreter

-2009-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* move system-config-printer to printer section
entire build process has changed

@@ -4506,13 +4729,13 @@
2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
* kde4-apps/kile4: Added a KDE4 (La)TeX editor and shell

-2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/kchmviewer4: new spell, based on kchmviewer

2009-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* perl-cpan/module-build: deprecated [was merged into perl] #15248

-2009-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/skrooge: new spell, financial stuff for kde4

2009-07-19 Arjan Bouter <abouter AT sourcemage.org>
@@ -4554,7 +4777,7 @@
* devel/stfl: new spell, a curses based widget set library
* http/newsbeuter: new spell, terminal based rss reader

-2009-07-05 Treeve Jelbert <treeve AT sourcemage.org>
+2009-07-05 Treeve Jelbert <treeve AT sourcemage.org>
* mobile/geoclue: new spell, geolocation tools
* mobile/gypsy: new spell, geolocation using GPS

@@ -4597,11 +4820,11 @@
2009-06-24 Ladislav Hagara <hgr AT vabo.cz>
* utils/eggdbus: new spell, D-Bus bindings for GObject

-2009-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+2009-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* x11/merkaartor: new spell, edit openstreetmap data
submitted by Bor Kraljic <pyrobor AT ver.si>

-2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
* perl-cpan/dbd-pglite: new spell, PostgreSQL emulation mode for
SQLite

2009-06-17 Ladislav Hagara <hgr AT vabo.cz>
@@ -4631,12 +4854,12 @@
2009-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* perl-cpan/alien-wxwidgets: new spell

-2009-06-08 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+2009-06-08 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* cairo-dock: new spell, a cairo-based dock
* cairo-dock-plugins: new spell, plugins for cairo-dock
* ftp/gnaughty: new spell, an automatic porn graber

-2009-06-08 Treeve Jelbert <treeve AT sourcemage.org>
+2009-06-08 Treeve Jelbert <treeve AT sourcemage.org>
* x11-toolkits/wxgtk-new: new spell, for wxgtk-2.9
build process is so different that it is easier to split things

@@ -4653,7 +4876,7 @@
2009-06-03 Robert Figura <template AT sourcemage.org>
* utils/latencytop: new spell, measure kernel and process latency

-2009-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+2009-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/krename4: new spell, file renaming

2009-05-28 Eric Sandall <sandalle AT sourcemage.org>
@@ -4723,14 +4946,14 @@
2009-05-09 George Sherwood <gsherwood AT sourcemage.org>
* xfce4-plugins/xfce-gvfs-mount: new spell, mount remote filesytems

-2009-05-07 Treeve Jelbert <treeve AT sourcemage.org>
+2009-05-07 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdelibs4-experimental: new spell, experimental stuff for kde4

2009-05-09 Pol Vinogradov <vin.public AT gmail.com>
* python-pypi/cx_freeze: new spell, a set of scripts and modules for
freezing Python scripts into executables

-2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* groups: add dialout (used by udev)
* net/iw: new spell, wireless configuration utility

@@ -4748,7 +4971,7 @@
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* http/uzbl: new spell, A browser that adheres to the unix philosophy

-2009-04-28 Treeve Jelbert <treeve AT sourcemage.org>
+2009-04-28 Treeve Jelbert <treeve AT sourcemage.org>
* printer/exaro-libs: spell deprecated [replaced by exaro]

2009-04-26 Vlad Glagolev <stealth AT sourcemage.org>
@@ -5606,7 +5829,7 @@
* audio-soft/enscribe-watermark: new spell
a tool that converts JPEG and PNG images into audio watermarks

-2008-10-24 Treeve Jelbert <treeve AT sourcemage.org>
+2008-10-24 Treeve Jelbert <treeve AT sourcemage.org>
* printer/espgs: spell deprecated [replaced by ghostscript]
* kde4-apps/kwave4: new spell, sound editor

@@ -5742,10 +5965,10 @@
* gnome2-libs/pangomm: new spell, C++ API for Pango
* python-pypi/python-suds: renamed to suds...

-2008-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+2008-09-21 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/kipi-plugins4: new spell plugins for various kde4 bits

-2008-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+2008-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* printer/pycups: new spell - python wrapper for cups

2008-09-20 Vlad Glagolev <stealth AT sourcemage.org>
@@ -5787,7 +6010,7 @@
* video/mpeg2dec: deprecated / renamed to video-libs/libmpeg2
* video-libs/libmpeg2: new spell, a free MPEG-2 video stream decoder

-2008-09-14 Treeve Jelbert <treeve AT sourcemage.org>
+2008-09-14 Treeve Jelbert <treeve AT sourcemage.org>
* graphics-libs/libraw: new spell, RAW image manipulation
* kde4-apps/FUNCTIONS: pass $OPTS to cmake
* kde4-apps/libksane: spell deprecated [replaced by kdegraphics4]
@@ -6423,7 +6646,7 @@
the JACK 2.0 audio server.
* http/arora: New spell, a web browser based on Qt and WebKit.

-2008-07-06 Treeve Jelbert <treeve AT sourcemage.org>
+2008-07-06 Treeve Jelbert <treeve AT sourcemage.org>
* graphics-libs/libungif: spell deprecated [replaced by giflib]

2008-07-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -6761,7 +6984,7 @@
* disk/discid: new spell, program to calculate the disc-ID for audio
cds
* ruby-raa/rubyripper: new spell, secure audio-cd ripper for *NIX

-2008-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+2008-04-19 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdeaddons4: spell deprecated [replaced by ]

2008-04-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -7029,7 +7252,7 @@
* kde-apps/knetstats: new spell, a KDE network monitor
* disk/gphotofs: new spell, fuse FS for camera access

-2008-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+2008-03-03 Treeve Jelbert <treeve AT sourcemage.org>
* gnome2-apps/gnucash2: spell deprecated [replaced by ]

2008-03-02 Treeve Jelbert <treeve AT sourcemage.org>
@@ -7113,7 +7336,7 @@
2008-02-23 Dale E. Edmons <linuxfan AT sourcemage.org>
* utils/open-vm-tools: New spell. WIP, but casts. Feel free to
modify.

-2008-02-22 Treeve Jelbert <treeve AT sourcemage.org>
+2008-02-22 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kdevplatform4: new spell
* kde4/kdevelop4: new spell

@@ -7200,7 +7423,7 @@
2008-02-03 Ladislav Hagara <hgr AT vabo.cz>
* utils/mktemp: deprecated in favour of coreutils [Bug 14271]

-2008-02-03 Treeve Jelbert <treeve AT sourcemage.org>
+2008-02-03 Treeve Jelbert <treeve AT sourcemage.org>
* devel/falcon: new spell, general purpose untyped scripting language

2008-02-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -7342,7 +7565,7 @@
2008-01-19 Alexander Tsamutali <astsmtl AT gmail.com>
* ftp/wxdfast: new spell, an open source download manager

-2008-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+2008-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/reportlab: spell moved from doc
* kde4-apps/koffice2: spell moved from kde4
* kde4-apps/tagua: spell moved from kde4
@@ -7551,7 +7774,7 @@
2008-01-12 Elisamuel Resto <ryuji AT sourcemage.org>
* wm-addons/alock: new spell, X session locker

-2008-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+2008-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/dragonplayer: new spell, video player

2008-01-11 Juuso Alasuutari <iuso AT sourcemage.org>
@@ -7617,7 +7840,7 @@
* e/exquisite: new spell, an EFL based psplash replacement
* e/emprint: new spell, an EFL based utility for taking screenshots

-2008-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+2008-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* graphics-libs/libspectre: new spell, Postscript library

2008-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -7643,7 +7866,7 @@
2007-12-29 Robin Cook <rcook AT wyrms.net>
* gnome2-lib/goffice-0.6: new spell

-2007-12-28 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-28 Treeve Jelbert <treeve AT sourcemage.org>
* printer/glabels: new spell, print labels
* kde-apps/kvpnc: new spell, kde front end for VPN

@@ -7704,7 +7927,7 @@
* video/gnome-mplayer: new spell, gnome mplayer frontend
* video/gecko-mediaplayer: new spell, gecko plugin for gnome-mplayer

-2007-12-16 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* move database/knoda to kde-apps/knoda
* move database/knorr.gpg to higher level
* FUNCTIONS: add default_kde3_build
@@ -7723,7 +7946,7 @@
2007-12-14 Vlad Glagolev <stealth AT sourcemage.org>
* python-devel/bzr-gtk: new spell, pygtk2 GUI for Bazaar VCS

-2007-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-13 Treeve Jelbert <treeve AT sourcemage.org>
* kde-apps/kimdaba: spell deprecated [replaced by kphotoalbum]
* kde4/ktorrent4: new spell, for kde4
* kde4/kmldonkey4: new spell, for kde4
@@ -7731,11 +7954,11 @@
2007-12-12 Alexander Tsamutali <astsmtl AT gmail.com>
* wm-addons/xmonad-contrib: new spell, third party extensions for
xmonad

-2007-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-11 Treeve Jelbert <treeve AT sourcemage.org>
* kde4/kphotoalbum4: new spell, for kde4
* kde4/kgraphviewer4: new spell for kde4

-2007-12-09 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* database/tokyocabinet: new spell, successor to qdbm

2007-12-09 George Sherwood <george AT beernabeer.com>
@@ -7746,7 +7969,7 @@
* graphics-libs/ilmbase: new spell, high dynamic-range (HDR)
image file format library and tools

-2007-12-08 Treeve Jelbert <treeve AT sourcemage.org>
+2007-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* libs/jbigkit: new spell: compression library

2007-12-05 Arjan Bouter <abouter AT sourcemage.org>
@@ -7864,7 +8087,7 @@
2007-11-11 Thomas Orgis <sobukus AT sourcemage.org>
* perl-cpan/wxperl: new spell, perl module for WxWidgets toolkit

-2007-11-11 Treeve Jelbert <treeve AT sourcemage.org>
+2007-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* printer/hpoj: spell deprecated [replaced by hplip]
* printer/hpijs: spell deprecated [replaced by hplip]
* printer/gs-afpl: spell deprecated [replaced by ghostscript]
@@ -8283,7 +8506,7 @@
* gnome2-libs/clutter: new spell, clutter eye candy library
* gnome2-libs/clutter-cairo: new spell, clutter cairo binding

-2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
+2007-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* devel/qgit4: new spell, qt4 version of qgit

2007-07-30 Juuso Alasuutari <iuso AT sourcemage.org>
@@ -8312,7 +8535,7 @@
2007-07-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* audio-soft/gnump3d: new spell, streaming server in perl

-2007-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+2007-07-22 Treeve Jelbert <treeve AT sourcemage.org>
* kde-apps/digikamplugins: spell deprecated [replaced by ]

2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>
@@ -12174,7 +12397,7 @@
* database: new section; add firebird spell;
will ultimately move many database type spells here.

-2003-10-03 hgg <hgreig AT bigpond.net.au>
+2003-10-03 hgg <hgreig AT bigpond.net.au>
* GRIMOIRE: test grimoire now has support for optional_requires to
allow
full use of xfree86-devel or xfree86-libs or xdirectfb spells to
provide x11-{libs,server}. THE CATCH IS YOU MUST USE DEVEL SORCERY
diff --git a/FUNCTIONS b/FUNCTIONS
index 970d697..55bef4f 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -535,16 +535,18 @@ function waf_install() {

# spells in several sections now need cmake or qt4
cmake_build() {
- cd $SOURCE_DIRECTORY &&
+ cd "$SOURCE_DIRECTORY" &&
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
- cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
+ cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT"/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_MANDIR=share/man \
-DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
- -DSYSCONFDIR=$INSTALL_ROOT/etc \
+ -DSYSCONFDIR="$INSTALL_ROOT"/etc \
-DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
$OPTS ../ &&
make
}
@@ -659,7 +661,21 @@ function prepare_select_branch() {
## Get uppercase spell name with _ instead of -
#---
function get_up_spell_name() {
- echo ${1:-$SPELL} | tr "a-z-" "A-Z_"
+ echo ${1:-$SPELL} | tr '.+a-z-' '_XA-Z_'
+}
+
+#---
+## Get branch-based/autoupdate-aware version number
+#---
+function get_scm_version() {
+ local spell=$(get_up_spell_name) &&
+ local spell_branch="${spell}_BRANCH" &&
+ local spell_autoupdate="${spell}_AUTOUPDATE" &&
+ if [ "${!spell_autoupdate}" = "y" ]; then
+ echo $(date "+%Y%m%d")
+ else
+ echo ${!spell_branch:-scm}
+ fi
}

# Move SPELL_OPTS to OPTS
diff --git a/accounts b/accounts
index 08ae4c0..9e6b5d1 100755
--- a/accounts
+++ b/accounts
@@ -104,4 +104,5 @@ polkitd:196:197
opendkim:197:198
dk-milter:198:199
gnarwl:201:201
+sddm:202:202:
nobody:65534:65534
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 faeb06b..0e0065b 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.98.1
+ 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 f78f2ef..d232973 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,10 @@
+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
+
2014-01-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.98.1

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-libs/lzo/BUILD b/archive-libs/lzo/BUILD
index 6bf90bf..881b4c1 100755
--- a/archive-libs/lzo/BUILD
+++ b/archive-libs/lzo/BUILD
@@ -1,3 +1,3 @@
-OPTS="--enable-shared $OPTS" &&
+OPTS="--libdir=/lib --enable-shared $OPTS" &&

default_build
diff --git a/archive-libs/lzo/DETAILS b/archive-libs/lzo/DETAILS
index 32d0991..235558d 100755
--- a/archive-libs/lzo/DETAILS
+++ b/archive-libs/lzo/DETAILS
@@ -1,7 +1,7 @@
SPELL=lzo
- VERSION=2.06
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:2369b87627c6f075b58b88189344989969050289185596db1174e6d918baa2b86e6076c8ec9cc68953df10c13bd1145d841603f26bde8a80111fb0d7091bf1c7
+ VERSION=2.08
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.oberhumer.com/opensource/lzo/download/$SOURCE
diff --git a/archive-libs/lzo/HISTORY b/archive-libs/lzo/HISTORY
index 1378b50..11c168e 100644
--- a/archive-libs/lzo/HISTORY
+++ b/archive-libs/lzo/HISTORY
@@ -1,3 +1,11 @@
+2014-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.08
+ * BUILD: Install libraries to the root directory, lzo is used by some
+ system tools.
+
+2014-06-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.07, SECURITY_PATCH++, fixes CVE-2014-4607
+
2012-07-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: added, to build shared library
diff --git a/archive-libs/snappy/DETAILS b/archive-libs/snappy/DETAILS
index ed55d03..bb31a53 100755
--- a/archive-libs/snappy/DETAILS
+++ b/archive-libs/snappy/DETAILS
@@ -1,9 +1,19 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=snappy
- VERSION=1.0.4
-
SOURCE_HASH=sha512:34e70dc35af9e8d7601618c2521be0cd0ba74907b8e67362d02c515c06c7bf2a2f58dac3dfed75270b7d9c9a1d6ec408c76e3665dc70bbeda8f87584cb4f01b0
+if [ "${SNAPPY_BRANCH}" == "scm" ]; then
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-${SNAPPY_BRANCH}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${SNAPPY_BRANCH}
+ FORCE_DOWNLOAD=on
+ SOURCE_URL[0]=git://github.com/google/${SPELL}.git
+ SOURCE_IGNORE=volatile
+else
+ VERSION=1.1.2
+
SOURCE_HASH=sha512:da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://snappy.googlecode.com/files/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://code.google.com/p/snappy/
LICENSE[0]=BSD
ENTERED=20120116
diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY
index 7351a51..2d26cb0 100644
--- a/archive-libs/snappy/HISTORY
+++ b/archive-libs/snappy/HISTORY
@@ -1,2 +1,5 @@
+2014-09-15 Jeremy Blosser <jblosser AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: 1.1.2 and add git version.
+
2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: spell created, version 1.0.4
diff --git a/archive-libs/snappy/PREPARE b/archive-libs/snappy/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/archive-libs/snappy/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/archive-libs/snappy/PRE_BUILD b/archive-libs/snappy/PRE_BUILD
new file mode 100755
index 0000000..597c57c
--- /dev/null
+++ b/archive-libs/snappy/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [ "${SNAPPY_BRANCH}" == "scm" ]; then
+ ./autogen.sh
+fi
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/DETAILS b/archive/bacula/DETAILS
index edf3ab7..0e0e171 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=bacula
if [[ $BACULA_BRANCH == scm ]]; then
- if [[ $BACULA_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_IGNORE=volatile
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index ecd8152..e7947dc 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,12 @@
+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
+
2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

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/DETAILS b/archive/burp/DETAILS
index 8030ec9..ee6f7f5 100755
--- a/archive/burp/DETAILS
+++ b/archive/burp/DETAILS
@@ -1,34 +1,37 @@
+. "$GRIMOIRE/FUNCTIONS"
+
SPELL=burp
-if [[ $BURP_BRANCH == scm ]]; then
- if [[ $BURP_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+case "$BURP_BRANCH" in
+ scm)
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git://github.com/grke/burp.git:$SPELL
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-elif [[ $BURP_BRANCH == devel ]]; then
- VERSION=1.4.10
+ ;;
+ devel)
+ VERSION=1.4.18
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:43fdfa3ec755fe359c6bf6491278132ce48ebee3356036211f682c521ed75ac2ea783dbf64b4eae2d229f01c1957ee9abe2e7b691f55c84a68c877d67cb254ff
+
SOURCE_HASH=sha512:38a3e22e366dbf44b6ce8e69de60051eefad8a95681062b15a6bf4d0a2131af11ea6a3522670e8b33b2c3b094e382fbb08738a102e0d95bf208871e6a4715d7f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
-elif [[ $BURP_BRANCH == stable ]]; then
+ ;;
+ stable)
VERSION=1.3.48
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:08de252f25ff7aa448dd6768272a9a14622902347445313b570c857b4e690374e92956379d5b388f446a88427fc4924f9c0df83cba390aa15fd040b8e92f1946
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
-else
+ ;;
+ *)
VERSION=1.3.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:ed540ed4091c7c1b0aeaf62b276e7fe07f4ae1ca92c67a3eb081c431b687b7aba6d6648a0f3d7ec122ae02d39fd5ed03ed263a68285fd3423615079844e8217f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
-fi
+ ;;
+esac
WEB_SITE=http://burp.grke.net/
ENTERED=20130118
LICENSE[0]=AGPL
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
index 59039fd..4d5e8f2 100644
--- a/archive/burp/HISTORY
+++ b/archive/burp/HISTORY
@@ -1,3 +1,18 @@
+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++
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.16 (devel)
+
2014-03-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: devel -> stable; stable -> legacy; added 1.4.10 version as
devel branch
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/archive/dpkg/DETAILS b/archive/dpkg/DETAILS
index 485aeb6..daa0d2c 100755
--- a/archive/dpkg/DETAILS
+++ b/archive/dpkg/DETAILS
@@ -1,9 +1,9 @@
SPELL=dpkg
- VERSION=1.14.29
- SOURCE=${SPELL}_${VERSION}.tar.gz
+ VERSION=1.17.6
+ SOURCE=${SPELL}_${VERSION}.tar.xz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://ftp.debian.org/debian/pool/main/d/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:c6a2fb230473e38e4487d7b1bddcdd8d280f303ed7eecb00ada73cea639069c46b8928ec63a771c919d26a31f5680588b8942682da01a6084d0fa001eac3afff
+
SOURCE_HASH=sha512:8b33c4956fb24b843941c13805e0991740467b37f27f88ba3231a3a43878602e2264d6672de93b1ef5caabb3307c6f893de53a144adbc66af9702b4898f0212f
WEB_SITE=http://packages.debian.org/testing/admin/dpkg
ENTERED=20030725
LICENSE[0]=GPL
diff --git a/archive/dpkg/HISTORY b/archive/dpkg/HISTORY
index 12b831b..48fcec1 100644
--- a/archive/dpkg/HISTORY
+++ b/archive/dpkg/HISTORY
@@ -1,3 +1,8 @@
+2014-04-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.17.6.
+ Switched to xz-compressed source.
+ Removed install-info patch, it has been completely removed from
dpkg.
+
2013-04-26 Ismael Luceno <ismael.luceno AT gmail.com>
* DEPENDS: depends on timedate (for dpkg-parsechangelog)

diff --git a/archive/dpkg/PRE_BUILD b/archive/dpkg/PRE_BUILD
index bdd4c8f..8b827b9 100755
--- a/archive/dpkg/PRE_BUILD
+++ b/archive/dpkg/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/dpkg-install-info.patch &&
cd ${SOURCE_DIRECTORY}/dselect &&
sed -i 's:\<ncursesw/::' dselect.h main.cc Makefile.*
diff --git a/archive/dpkg/dpkg-install-info.patch
b/archive/dpkg/dpkg-install-info.patch
deleted file mode 100644
index 3f63b96..0000000
--- a/archive/dpkg/dpkg-install-info.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur dpkg-1.14.16.6/scripts/Makefile.am
dpkg-1.14.16.6-fixed/scripts/Makefile.am
---- dpkg-1.14.16.6/scripts/Makefile.am 2008-01-18 11:12:53.000000000 +0100
-+++ dpkg-1.14.16.6-fixed/scripts/Makefile.am 2008-02-13 03:02:33.000000000
+0100
-@@ -47,7 +47,6 @@
- cleanup-info.pl \
- dpkg-divert.pl \
- dpkg-statoverride.pl \
-- install-info.pl \
- update-alternatives.pl \
- changelog/debian.pl \
- t/000_pod.t \
-@@ -125,11 +124,7 @@
-
-
- # Automake has its own install-info rule, gah
--all-local: install-info-stamp
--install-info-stamp: $(srcdir)/install-info.pl
-- $(do_perl_subst) <$< >install-info
-- chmod +x install-info
-- touch $@
-+all-local:
-
- install-exec-local: install-info-stamp
- $(mkdir_p) $(DESTDIR)$(sbindir)
-diff -Naur dpkg-1.14.16.6/scripts/Makefile.in
dpkg-1.14.16.6-fixed/scripts/Makefile.in
---- dpkg-1.14.16.6/scripts/Makefile.in 2008-01-26 20:38:33.000000000 +0100
-+++ dpkg-1.14.16.6-fixed/scripts/Makefile.in 2008-02-13 03:02:33.000000000
+0100
-@@ -251,7 +251,6 @@
- cleanup-info.pl \
- dpkg-divert.pl \
- dpkg-statoverride.pl \
-- install-info.pl \
- update-alternatives.pl \
- changelog/debian.pl \
- t/000_pod.t \
-@@ -284,7 +283,6 @@
-
- CLEANFILES = \
- $(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \
-- install-info install-info-stamp
-
- perllibdir = $(PERL_LIBDIR)
- nobase_dist_perllib_DATA = \
-@@ -726,15 +724,7 @@
- chmod +x $@
-
- # Automake has its own install-info rule, gah
--all-local: install-info-stamp
--install-info-stamp: $(srcdir)/install-info.pl
-- $(do_perl_subst) <$< >install-info
-- chmod +x install-info
-- touch $@
--
--install-exec-local: install-info-stamp
-- $(mkdir_p) $(DESTDIR)$(sbindir)
-- $(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
-+all-local:
-
- install-data-local:
- $(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
diff --git a/archive/lz4/BUILD b/archive/lz4/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/archive/lz4/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/archive/lz4/DETAILS b/archive/lz4/DETAILS
new file mode 100755
index 0000000..411f168
--- /dev/null
+++ b/archive/lz4/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=lz4
+ VERSION=r118
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/Cyan4973/${SPELL}/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:41b3c0502590f123938e5a1f9f8595a63e166f946d8035bbd902e62f3461ccc1ce7da87c935744f568459a275f5be803489a8f29bf174505a9907899fd1fcbb7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://code.google.com/p/lz4/";
+ LICENSE[0]=BSD
+ ENTERED=20140628
+ SHORT="a very fast lossless compression algorithm"
+cat << EOF
+LZ4 is a very fast lossless compression algorithm, providing compression
+speed at 400 MB/s per core, scalable with multi-cores CPU. It also features
+an extremely fast decoder, with speed in multiple GB/s per core, typically
+reaching RAM speed limits on multi-core systems.
+EOF
diff --git a/archive/lz4/HISTORY b/archive/lz4/HISTORY
new file mode 100644
index 0000000..1d9e0f8
--- /dev/null
+++ b/archive/lz4/HISTORY
@@ -0,0 +1,3 @@
+2014-06-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD: spell created
+
diff --git a/archive/lzip/CONFLICTS b/archive/lzip/CONFLICTS
deleted file mode 100755
index 12987ce..0000000
--- a/archive/lzip/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts xz-utils
diff --git a/archive/lzip/DETAILS b/archive/lzip/DETAILS
index 0b34991..6a70928 100755
--- a/archive/lzip/DETAILS
+++ b/archive/lzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=lzip
- VERSION=1.12
+ VERSION=1.15
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/lzip/HISTORY b/archive/lzip/HISTORY
index 7b4084b..8416b8e 100644
--- a/archive/lzip/HISTORY
+++ b/archive/lzip/HISTORY
@@ -1,3 +1,7 @@
+2014-06-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.15
+ * CONFLICTS: deleted, not true
+
2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.12

diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index d3515e3..6d4a672 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -3,7 +3,7 @@

SOURCE_HASH=sha512:7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
SOURCE=${SPELL}_${VERSION}_src_all.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
DOCS=""
WEB_SITE=http://p7zip.sourceforge.net/
ENTERED=20050123
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 6525382..1ab18e0 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,6 @@
+2014-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
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/archive/tar/DETAILS b/archive/tar/DETAILS
index bd11021..54d3ee3 100755
--- a/archive/tar/DETAILS
+++ b/archive/tar/DETAILS
@@ -1,6 +1,6 @@
SPELL=tar
- VERSION=1.26
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.28
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index 57e0fb4..feed688 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,7 @@
+2014-07-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.28
+ * PRE_BUILD, glibc215.patch: deleted
+
2012-12-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* glibc215.patch: added, to fix build with glibc >=2.15
diff --git a/archive/tar/PRE_BUILD b/archive/tar/PRE_BUILD
deleted file mode 100755
index 7b5070f..0000000
--- a/archive/tar/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p0 < "$SPELL_DIRECTORY/glibc215.patch"
diff --git a/archive/tar/glibc215.patch b/archive/tar/glibc215.patch
deleted file mode 100644
index 2a903b2..0000000
--- a/archive/tar/glibc215.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnu/stdio.in.h.orig 2011-03-12 12:14:33.000000000 +0300
-+++ gnu/stdio.in.h 2012-12-08 23:25:16.851175859 +0400
-@@ -164,7 +164,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/archive/upx/0001-use-system-ucl.patch
b/archive/upx/0001-use-system-ucl.patch
new file mode 100644
index 0000000..e80e848
--- /dev/null
+++ b/archive/upx/0001-use-system-ucl.patch
@@ -0,0 +1,29 @@
+From 89fb169f3d2c9bf742eba9087ce6e8ead3548652 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 7 Apr 2014 18:35:00 +0200
+Subject: [PATCH] use system ucl
+
+---
+ src/Makefile | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5375f81..83c0583 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,11 +52,7 @@ objext ?= .o
+ upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
+ upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
+
+-# we need UCL and zlib - you can set envvar UPX_UCLDIR
+-ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
+-INCLUDES += -I$(UPX_UCLDIR)/include
+-LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext)
$(UPX_UCLDIR)/src/.libs/libucl$(libext))))
+-endif
++INCLUDE += -I$(INSTALL_ROOT)/usr/include/ucl
+ LIBS += -lucl -lz
+ # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+ include $(top_srcdir)/src/stub/src/c/Makevars.lzma
+--
+1.9.0
+
diff --git a/archive/upx/BUILD b/archive/upx/BUILD
index 0d645b9..d0ad834 100755
--- a/archive/upx/BUILD
+++ b/archive/upx/BUILD
@@ -1,16 +1,7 @@
-cd $SOURCE_DIRECTORY &&
-message "Compiling UPX" &&
-cd src &&
-sedit "s!# configuration section!UCLDIR=${SOURCE_DIRECTORY2}!" Makefile &&
-sedit "s/CC_COMPILE = \$(CC) \$(CCARCH) \$(DEFS) \$(EXTRA_DEFS)
\$(INCLUDES) \$(EXTRA_INCLUDES) \$(CFLAGS) \$(EXTRA_CFLAGS)
\$(CFLAGS_OUTPUT) -c \$(CC_SRC)/CC_COMPILE = \$(CC) \$(DEFS)
\$(EXTRA_DEFS) \$(INCLUDES) \$(EXTRA_INCLUDES) ${CFLAGS} \$(EXTRA_CFLAGS)
\$(CFLAGS_OUTPUT) -c \$(CC_SRC)/" Makefile.bld &&
-sedit "s/CXX_COMPILE = \$(CXX) \$(CXXARCH) \$(DEFS) \$(EXTRA_DEFS)
\$(INCLUDES) \$(EXTRA_INCLUDES) \$(CXXFLAGS) \$(EXTRA_CXXFLAGS)
\$(CXXFLAGS_OUTPUT) -c \$(CXX_SRC)/CXX_COMPILE = \$(CXX) \$(DEFS)
\$(EXTRA_DEFS) \$(INCLUDES) \$(EXTRA_INCLUDES) ${CXXFLAGS} \$(EXTRA_CXXFLAGS)
\$(CXXFLAGS_OUTPUT) -c \$(CXX_SRC)/" Makefile.bld &&
-make target=linux &&
+cd $SOURCE_DIRECTORY/src &&
+CXX=${CXX} default_build_make &&

if spell_installed perl; then
- message "Compiling documentation" &&
- cd $SOURCE_DIRECTORY && cd doc &&
- make
+ cd $SOURCE_DIRECTORY/doc &&
+ make upx.1
fi
-
-#Deleting useless SOURCE_DIRECTORY2
-rm -rf ${SOURCE_DIRECTORY2}
diff --git a/archive/upx/DEPENDS b/archive/upx/DEPENDS
index 11a7242..1116125 100755
--- a/archive/upx/DEPENDS
+++ b/archive/upx/DEPENDS
@@ -1,2 +1,3 @@
-depends ucl &&
+depends -sub CXX gcc &&
+depends ucl &&
optional_depends "perl" "" "" "Needed to build the documentation"
diff --git a/archive/upx/DETAILS b/archive/upx/DETAILS
index a8ad187..8a8d8e8 100755
--- a/archive/upx/DETAILS
+++ b/archive/upx/DETAILS
@@ -1,12 +1,9 @@
SPELL=upx
- VERSION=1.25
- SOURCE=$SPELL-$VERSION-src.tar.gz
- SOURCE2=ucl-1.03.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
- SOURCE2_URL[0]=http://www.oberhumer.com/opensource/ucl/download/$SOURCE2
-
SOURCE_HASH=sha512:4d082bbf825ca80715d04ecdee119662376d402aa21fa31000d5587562403b13033054dbe3c76207b3af0878d1fdd6f58599dc3eb7798925d7d6899036997a58
-
SOURCE2_HASH=sha512:7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ VERSION=3.91
+ SOURCE=$SPELL-$VERSION-src.tar.bz2
+ SOURCE_URL[0]=http://upx.sourceforge.net/download/${SOURCE}
+
SOURCE_HASH=sha512:7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src
SOURCE_DIRECTORY2=${BUILD_DIRECTORY}/ucl-1.03
WEB_SITE=http://upx.sourceforge.net/
ENTERED=20050330
diff --git a/archive/upx/HISTORY b/archive/upx/HISTORY
index f08776b..c6638c7 100644
--- a/archive/upx/HISTORY
+++ b/archive/upx/HISTORY
@@ -1,3 +1,9 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.91, remove SOURCE2
+ * BUILD, INSTALL: adapt to current Makefile
+ * PRE_BUILD, 0001-use-system-ucl.patch: use system ucl
+ * DEPENDS: add dependency on gcc and ucl
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/archive/upx/INSTALL b/archive/upx/INSTALL
index 476ac2a..06f9418 100755
--- a/archive/upx/INSTALL
+++ b/archive/upx/INSTALL
@@ -1,4 +1,4 @@
-cp ${SOURCE_DIRECTORY}/src/upx ${INSTALL_ROOT}/usr/bin/upx
+install -m755 ${SOURCE_DIRECTORY}/src/upx.out ${INSTALL_ROOT}/usr/bin/ &&

if spell_installed perl; then
cp ${SOURCE_DIRECTORY}/doc/upx.1 ${INSTALL_ROOT}/usr/share/man/man1/
diff --git a/archive/upx/PRE_BUILD b/archive/upx/PRE_BUILD
index 6f98591..7d32ad4 100755
--- a/archive/upx/PRE_BUILD
+++ b/archive/upx/PRE_BUILD
@@ -1,7 +1,4 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-cd ${BUILD_DIRECTORY} &&
-unpack_file &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&

-mk_source_dir ${SOURCE_DIRECTORY2} &&
-cd ${BUILD_DIRECTORY} &&
-unpack_file 2
+patch -p1 < $SPELL_DIRECTORY/0001-use-system-ucl.patch
diff --git a/archive/xarchive/DEPENDS b/archive/xarchive/DEPENDS
index 44c5341..5aaaa1b 100755
--- a/archive/xarchive/DEPENDS
+++ b/archive/xarchive/DEPENDS
@@ -1,5 +1,5 @@
depends bash &&
-depends gawk &&
+depends AWK &&
depends gtk+2 &&

optional_depends "tar" \
diff --git a/audio-creation/ardour2/BUILD b/audio-creation/ardour2/BUILD
index d323308..3cc68a0 100755
--- a/audio-creation/ardour2/BUILD
+++ b/audio-creation/ardour2/BUILD
@@ -1,3 +1,4 @@
+PKG_CONFIG_PATH="$INSTALL_ROOT/opt/aubio03/lib/pkgconfig:$PKG_CONFIG_PATH" \
scons -j$MAKE_NJOBS "PREFIX=$INSTALL_ROOT/usr" $OPTS \
SYSLIBS=1 \
$ARDOUR2_SURFACES \
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index ea0847a..25d9e87 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -15,7 +15,7 @@ depends gtkmm2 &&
depends libgnomecanvas &&
depends libgnomecanvasmm &&
depends boost &&
-depends aubio &&
+depends aubio03 &&
depends liblo &&
depends alsa-lib &&
depends libsamplerate &&
@@ -26,7 +26,7 @@ depends libsigc++2 &&
depends soundtouch
depends gtk-engines2 &&

-optional_depends slv2 \
+optional_depends lilv-0 \
"LV2=1" \
"LV2=0" \
"for LV2 plugin support" &&
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index fe37256..5895129 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ DEPENDS, PRE_BUILD, BUILD, INSTALL: Keep it building with old version
+ of aubio, fixed lv2 dep. Note for the future: Ardour 2 is not
obsoleted by
+ Ardour 3! Import of old sessions in the latter is not lossless, sadly.
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, ardour-2.8.16-lilv16.patch: build fix from

https://abf.rosalinux.ru/openmandriva/ardour/raw/master/ardour-2.8.16-lilv16.patch
diff --git a/audio-creation/ardour2/INSTALL b/audio-creation/ardour2/INSTALL
index b7e83d0..78e35a6 100755
--- a/audio-creation/ardour2/INSTALL
+++ b/audio-creation/ardour2/INSTALL
@@ -1 +1,2 @@
+PKG_CONFIG_PATH="$INSTALL_ROOT/opt/aubio03/lib/pkgconfig:$PKG_CONFIG_PATH" \
scons install
diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
index 8543e88..a6b66c6 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -6,4 +6,10 @@ patch -p1 < "$SPELL_DIRECTORY/ardour-2.8.16-lilv16.patch" &&

sed -i "s:soundtouch-1.0:soundtouch-1.4:" SConstruct &&
# Brute force lib64 killing.
-sed -i "s:lib64:lib:" SConstruct
+sed -i "s:lib64:lib:" SConstruct &&
+# Just setting pkgconfig path may work, too.
+# Nope, configuration stage fings aubio, but fails to use the flags to find
+# the header. So, enforcing is back in.
+# Force old aubio lib into the build.
+# I hate scons. -- ThOr
+perl -pi -e "s:CPPPATH = \[ '\.' \]:CPPPATH = [ '.',
'$INSTALL_ROOT/opt/aubio03/include' ], LIBPATH = [
'$INSTALL_ROOT/opt/aubio03/lib']:" SConstruct
diff --git a/audio-creation/ardour3/BUILD b/audio-creation/ardour3/BUILD
index 33dd493..cda691f 100755
--- a/audio-creation/ardour3/BUILD
+++ b/audio-creation/ardour3/BUILD
@@ -1,4 +1,6 @@
-OPTS="--configdir=$INSTALL_ROOT/etc $OPTS" &&
-OPTS="--noconfirm --freedesktop $ARDOUR3_OPTS $OPTS" &&
+OPTS="--noconfirm \
+ --configdir=$INSTALL_ROOT/etc \
+ $ARDOUR3_OPTS \
+ $OPTS" &&

waf_build
diff --git a/audio-creation/ardour3/DEPENDS b/audio-creation/ardour3/DEPENDS
index 8b79dde..0262163 100755
--- a/audio-creation/ardour3/DEPENDS
+++ b/audio-creation/ardour3/DEPENDS
@@ -40,6 +40,11 @@ if is_depends_enabled $SPELL lv2; then
depends suil-0
fi &&

+optional_depends shared-mime-info \
+ "--freedesktop" \
+ "" \
+ "to build documentation" &&
+
optional_depends doxygen \
"--docs" \
"" \
diff --git a/audio-creation/ardour3/DETAILS b/audio-creation/ardour3/DETAILS
index 1c393d7..7f95a36 100755
--- a/audio-creation/ardour3/DETAILS
+++ b/audio-creation/ardour3/DETAILS
@@ -1,9 +1,10 @@
SPELL=ardour3
SPELLX=Ardour3
- VERSION=3.5.357
+ VERSION=3.5.380
SOURCE="${SPELLX}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=ftp://ftp.archlinux.org/other/ardour/$SPELLX-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:90a310d10b2bc56cb2acc7fbcea2bfb4d1e49052cd9cbf26d5a5d4efe8786b868e20ef679f07f186547ff281364eeb90e03587f6d86ea3551123f0bafdbb3623
+ SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/${SOURCE}
+ SOURCE_URL[1]=http://sourcemage.ru/mirror/$SOURCE
+
SOURCE_HASH=sha512:a53b4e3e6201367f1d82bab53b4cf38d3d0466c80cbbafc062c23b7bf19d0c572d859dfc3e1f75845a62d1bc0387504ed94e3887c82b730b98ec8c3f5cb71c87
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="http://ardour.org";
LICENSE[0]=GPLv2
diff --git a/audio-creation/ardour3/HISTORY b/audio-creation/ardour3/HISTORY
index 671326d..7306581 100644
--- a/audio-creation/ardour3/HISTORY
+++ b/audio-creation/ardour3/HISTORY
@@ -1,3 +1,9 @@
+2014-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.380; switched back to sourcemage url;
+ added 2nd mirror
+ * BUILD: merge OPTS
+ * DEPENDS: made --freedesktop optional
+
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.5.357
* BUILD: add --configdir and --freedesktop to OPTS
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 895c3f3..32eac44 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,5 +1,5 @@
depends zip &&
-if [[ "$AUDACITY_BRANCH" == "current" ]]; then
+if [[ "$AUDACITY_UNI" == "no" ]]; then
depends wxgtk-no-unicode
else
depends wxgtk
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 9f48789..0eaae5b 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,21 +1,18 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=audacity
case "$AUDACITY_BRANCH"
in scm)
- if [ "$AUDACITY_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2

SOURCE_URL[0]="cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/audacity:audacity"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
;; *)
- VERSION=2.0.2
- SOURCE=${SPELL}-minsrc-${VERSION}.tar.bz2
- SOURCE_URL[0]=http://audacity.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
+ VERSION=2.0.5
+ SOURCE=${SPELL}-minsrc-${VERSION}.tar.xz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/files/$SOURCE
+
SOURCE_HASH=sha512:d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
;; esac
WEB_SITE=http://audacity.sourceforge.net/
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 04a2720..b0f177c 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,10 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 2.0.5
+ * DEPENDS: use AUDACITY_UNI for unicode decision
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-08-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.2
* DETAILS, PREPARE: removed option to build beta version since
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/alsa-driver/DETAILS
b/audio-drivers/alsa-driver/DETAILS
index 99ee902..5d15e82 100755
--- a/audio-drivers/alsa-driver/DETAILS
+++ b/audio-drivers/alsa-driver/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-driver
if [[ $ALSA_DRIVER_BRANCH == scm ]]; then
- if [[ $ALSA_DRIVER_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE2=alsa-kmirror-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-driver.git:alsa-driver-git
diff --git a/audio-drivers/alsa-driver/HISTORY
b/audio-drivers/alsa-driver/HISTORY
index a9dad60..a7d9f45 100644
--- a/audio-drivers/alsa-driver/HISTORY
+++ b/audio-drivers/alsa-driver/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.25
* BUILD: add --enable-dynamic-minors to $OPTS
diff --git a/audio-drivers/alsa-firmware/DETAILS
b/audio-drivers/alsa-firmware/DETAILS
index 80f9f03..2d3b66c 100755
--- a/audio-drivers/alsa-firmware/DETAILS
+++ b/audio-drivers/alsa-firmware/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-firmware
if [[ $ALSA_FIRMWARE_BRANCH == scm ]]; then
- if [[ $ALSA_FIRMWARE_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2

SOURCE_URL[0]=git://git.alsa-project.org/alsa-firmware.git:alsa-firmware-git
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/alsa-firmware/HISTORY
b/audio-drivers/alsa-firmware/HISTORY
index 2cbbb71..f90d20c 100644
--- a/audio-drivers/alsa-firmware/HISTORY
+++ b/audio-drivers/alsa-firmware/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.25

diff --git a/audio-drivers/alsa-lib/DETAILS b/audio-drivers/alsa-lib/DETAILS
index 600a99a..9c95489 100755
--- a/audio-drivers/alsa-lib/DETAILS
+++ b/audio-drivers/alsa-lib/DETAILS
@@ -1,18 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-lib
if [[ $ALSA_LIB_BRANCH == scm ]]; then
- if [[ $ALSA_LIB_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-lib.git:alsa-lib-git
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
- VERSION=1.0.27.2
-
SOURCE_HASH=sha512:3fa9160e001cf21ddc6332c3748f8aa27bd1b514616fd1a9993c34128fe99d07e2dfc5f1a9177e1c17456d1361496f90bf3552f940fd85c6ea5ac9bbc30fe8ce
+ VERSION=1.0.28
+
SOURCE_HASH=sha512:a08430d0beb4a751b1608d148f4fc3d1077a689f5f7197b830a2768d66238b69de2614448d56643fbcb3141faa06ab361b7a8579cce4303304bce8c10de01f08
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/audio-drivers/alsa-lib/HISTORY b/audio-drivers/alsa-lib/HISTORY
index 0f54bb2..bf5f8b2 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.28
+
2013-07-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.27.2

diff --git a/audio-drivers/alsa-oss/DETAILS b/audio-drivers/alsa-oss/DETAILS
index f3fadce..7de5390 100755
--- a/audio-drivers/alsa-oss/DETAILS
+++ b/audio-drivers/alsa-oss/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-oss
if [[ $ALSA_OSS_BRANCH == scm ]]; then
- if [[ $ALSA_OSS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-oss.git:alsa-oss-git
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/alsa-oss/HISTORY b/audio-drivers/alsa-oss/HISTORY
index 9a1c42b..46bd2d9 100644
--- a/audio-drivers/alsa-oss/HISTORY
+++ b/audio-drivers/alsa-oss/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.25

diff --git a/audio-drivers/alsa-plugins/DETAILS
b/audio-drivers/alsa-plugins/DETAILS
index 57af1f5..f2a8b2e 100755
--- a/audio-drivers/alsa-plugins/DETAILS
+++ b/audio-drivers/alsa-plugins/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-plugins
if [[ $ALSA_PLUGINS_BRANCH == scm ]]; then
- if [[ $ALSA_PLUGINS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-plugins.git:alsa-plugins-git
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/alsa-plugins/HISTORY
b/audio-drivers/alsa-plugins/HISTORY
index 20a4577..9320d28 100644
--- a/audio-drivers/alsa-plugins/HISTORY
+++ b/audio-drivers/alsa-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.26

diff --git a/audio-drivers/alsa-tools/DETAILS
b/audio-drivers/alsa-tools/DETAILS
index 310755a..5d86f02 100755
--- a/audio-drivers/alsa-tools/DETAILS
+++ b/audio-drivers/alsa-tools/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-tools
if [[ $ALSA_TOOLS_BRANCH == scm ]]; then
- if [[ $ALSA_TOOLS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-tools.git:alsa-tools-git
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/alsa-tools/HISTORY
b/audio-drivers/alsa-tools/HISTORY
index 98e6f58..9855e1b 100644
--- a/audio-drivers/alsa-tools/HISTORY
+++ b/audio-drivers/alsa-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on gtk+2

diff --git a/audio-drivers/alsa-utils/DETAILS
b/audio-drivers/alsa-utils/DETAILS
index 7661165..2d30879 100755
--- a/audio-drivers/alsa-utils/DETAILS
+++ b/audio-drivers/alsa-utils/DETAILS
@@ -1,18 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=alsa-utils
if [[ $ALSA_UTILS_BRANCH == scm ]]; then
- if [[ $ALSA_UTILS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-utils.git:alsa-utils-git
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
- VERSION=1.0.27.2
-
SOURCE_HASH=sha512:c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6

+ VERSION=1.0.28
+
SOURCE_HASH=sha512:faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.alsa-project.org/pub/utils/$SOURCE
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index ce57023..a71b392 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.28
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.27.2

diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index d903b2b..55f6d9c 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=jack
if [[ $JACK_BRANCH == scm ]]
then
- if [[ $JACK_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/trunk/jack:jack
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 24adffb..7a74e02 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.124.1
* DEPENDS: add optional dependencies on zita-alsa-pcmi and libffado
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index d3a94f7..ee59b70 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -2,6 +2,7 @@ depends pkgconfig &&
depends expat &&
depends -sub CXX gcc &&
depends python &&
+depends libsamplerate &&

if [[ $JACK2_BRANCH == scm ]]; then
depends subversion
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 74371ef..2de72bd 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -1,22 +1,20 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=jack2
SPELLX=jack
WEB_SITE=http://jackaudio.org/
if [[ $JACK2_BRANCH == scm ]]; then
- if [[ $JACK2_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
-
SOURCE_URL[0]=svn_http://subversion.jackaudio.org/jack/jack2/trunk/jackmp:jackdmp
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/jackaudio/jack2.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.9.9.5 # Officially, it is called 1.9.9, but the tarball
says 1.9.9.5 .
+ VERSION=1.9.10
SOURCE=$SPELLX-$VERSION.tar.bz2
- SOURCE_URL[0]=http://jackaudio.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:173a10943c98cb17f0041216cc24ce03d5e147f27be121fdf66c4e9d21ba8bf125a1749b985cacffb075618d92025231eb047c754d33d777275373d010a85e27
+ SOURCE_URL[0]=https://dl.dropboxusercontent.com/u/28869550/$SOURCE
+ SOURCE_URL[1]=http://jackaudio.org/downloads/$SOURCE
+
SOURCE_HASH=sha512:d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
fi
WEB_SITE=http://jackaudio.org/
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 4e89474..ecf805a 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,16 @@
+2014-10-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added primary dropbox mirror
+
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: needs libsamplerate
+ * DETAILS: scm=git
+
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.10
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: fix build error due to incompatibility with waf_build
* DEPENDS: add dependency on dbus-python
diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS
index 7021d64..7e85a8b 100755
--- a/audio-drivers/libffado/DEPENDS
+++ b/audio-drivers/libffado/DEPENDS
@@ -7,6 +7,7 @@ depends libxml++ &&
depends libraw1394 &&
depends libiec61883 &&
depends libavc1394 &&
+depends libconfig &&
depends dbus &&
depends dbus-c++ &&
depends -sub CXX gcc &&
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index b6dcbf9..f19431d 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libffado
if [[ "$LIBFFADO_BRANCH" == scm ]]; then
- if [[ "$LIBFFADO_AUTOUPDATE" == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2

SOURCE_URL=svn_http://subversion.ffado.org/ffado/branches/libffado-2.0:$SPELL-svn
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index a181b3f..ad5d3ec 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libconfig
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-12 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, DEPENDS: Bump to 2.1.0

diff --git a/audio-drivers/portaudio19/DETAILS
b/audio-drivers/portaudio19/DETAILS
index 12afafb..13cf9e2 100755
--- a/audio-drivers/portaudio19/DETAILS
+++ b/audio-drivers/portaudio19/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=portaudio19
case ${PORTAUDIO19_BRANCH} in
scm)
-if [[ "$PORTAUDIO19_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=cvs
-fi
+ VERSION=$(get_scm_version)
# SOURCE_URL=svn://www.portaudio.com/repos/portaudio/branches/v19-devel
SOURCE=${SPELL}_cvs.tar.bz2
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/portaudio19/HISTORY
b/audio-drivers/portaudio19/HISTORY
index 6aa46f0..ed83dc3 100644
--- a/audio-drivers/portaudio19/HISTORY
+++ b/audio-drivers/portaudio19/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-02-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: stable_v19_20140130

diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 21f5f34..356aa0b 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -2,7 +2,6 @@ depends liboil &&
depends libsndfile &&
depends libatomic_ops &&
depends speex &&
-
if [[ "$PULSE_DB" == 'gdbm' ]]; then
depends gdbm
elif [[ "$PULSE_DB" == 'tdb' ]]; then
@@ -13,10 +12,12 @@ fi &&

depends json-c &&

-optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support" &&
+# gettext is needed in order to build the desktop files
+depends gettext &&
+#optional_depends gettext \
+# "--enable-nls" \
+# "--disable-nls" \
+# "for Native Language Support" &&
optional_depends libx11 \
"--enable-x11" \
"--disable-x11" \
@@ -37,12 +38,12 @@ optional_depends glib2 \
"--enable-glib2" \
"--disable-glib2" \
"Enable glib2 support?" &&
-optional_depends gtk+2 \
- "--enable-gtk2" \
- "--disable-gtk2" \
- "for GTK+2 support" &&
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "for GTK+3 support" &&

-if is_depends_enabled $SPELL gtk+2; then
+if is_depends_enabled $SPELL gtk+3; then
depends libxxf86vm
fi &&

@@ -70,17 +71,13 @@ optional_depends lirc \
"--enable-lirc" \
"--disable-lirc" \
"Enable infra-red remote control support?" &&
-optional_depends hal \
- "--enable-hal" \
- "--disable-hal" \
- "Enable Hardware Abstraction Layer support?" &&
-optional_depends -sub HWDB UDEV \
- "--enable-udev" \
+optional_depends UDEV \
+ "--enable-udev --disable-hal-compat" \
"--disable-udev" \
"for device hotplug support" &&
optional_depends bluez \
- "--enable-bluez" \
- "--disable-bluez" \
+ "--enable-bluez4" \
+ "--disable-bluez4" \
"for BlueZ support" &&

if is_depends_enabled $SPELL bluez; then
@@ -93,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)" &&
@@ -106,10 +103,15 @@ optional_depends libcap \
"--without-caps" \
"Enable POSIX capability support?" &&

-if is_depends_enabled $SPELL xorg-libs; then
- depends libxtst
-fi &&
+optional_depends fftw \
+ '--with-fftw' \
+ '--without-fftw' \
+ 'build equalizer' &&

+optional_depends orc \
+ '--enable-orc' \
+ '--disable-orc' \
+ 'improve code' &&
#optional_depends policykit \
# "--enable-polkit" \
# "--disable-polkit" \
diff --git a/audio-drivers/pulseaudio/DETAILS
b/audio-drivers/pulseaudio/DETAILS
index 5d53362..b3254ab 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,9 +1,10 @@
SPELL=pulseaudio
- VERSION=4.0
+ VERSION=5.0
+
SOURCE_HASH=sha512:f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://freedesktop.org/software/$SPELL/releases/$SOURCE
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+# SOURCE_GPG=gurus.gpg:${SOURCE}.sig
WEB_SITE=http://www.pulseaudio.org/
ENTERED=20070504
LICENSE[0]=GPL
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index 5da161e..052330a 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,11 @@
+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
+ gettedxt is nneded in order to build .desktop files
+ * PRE_BUILD: remove Werror flag from configure
+
2014-01-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.0

diff --git a/audio-drivers/pulseaudio/PRE_BUILD
b/audio-drivers/pulseaudio/PRE_BUILD
index ed59915..aac16a1 100755
--- a/audio-drivers/pulseaudio/PRE_BUILD
+++ b/audio-drivers/pulseaudio/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/-Werror//' configure &&

for group in pulse{,-rt,-access}; do
create_group $group
diff --git a/audio-drivers/pulseaudio/pulseaudio-4.0.tar.xz.sig
b/audio-drivers/pulseaudio/pulseaudio-4.0.tar.xz.sig
deleted file mode 100644
index f049fcd..0000000
Binary files a/audio-drivers/pulseaudio/pulseaudio-4.0.tar.xz.sig and
/dev/null differ
diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index de2141a..977e556 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=pyalsa
if [[ $PYALSA_BRANCH == scm ]]; then
- if [[ $PYALSA_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.alsa-project.org/alsa-python.git:pyalsa-git
SOURCE_IGNORE=volatile
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index 25a942a..8448029 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.26

diff --git a/audio-libs/aubio03/BUILD b/audio-libs/aubio03/BUILD
new file mode 100755
index 0000000..b68d0f8
--- /dev/null
+++ b/audio-libs/aubio03/BUILD
@@ -0,0 +1,5 @@
+cd "$SOURCE_DIRECTORY" &&
+# Stupid, stupid!
+export LDFLAGS="$LDFLAGS -lm" &&
+./configure $OPTS --prefix="$INSTALL_ROOT/opt/aubio03" &&
+make
diff --git a/audio-libs/aubio03/DEPENDS b/audio-libs/aubio03/DEPENDS
new file mode 100755
index 0000000..26e106f
--- /dev/null
+++ b/audio-libs/aubio03/DEPENDS
@@ -0,0 +1,18 @@
+depends libsndfile &&
+depends libsamplerate &&
+depends fftw &&
+
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "for ALSA support" &&
+
+optional_depends JACK-DRIVER \
+ "--enable-jack" \
+ "--disable-jack" \
+ "for JACK support" &&
+
+optional_depends lash \
+ "--enable-lash" \
+ "--disable-lash" \
+ "for LASH support (it will force alsa and jack depends)"
diff --git a/audio-libs/aubio03/DETAILS b/audio-libs/aubio03/DETAILS
new file mode 100644
index 0000000..af8440c
--- /dev/null
+++ b/audio-libs/aubio03/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=aubio03
+ VERSION=0.3.2
+ SOURCE=aubio-$VERSION.tar.gz
+ SOURCE_URL[0]=http://aubio.org/pub/$SOURCE
+
SOURCE_HASH=sha512:b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/aubio-$VERSION
+ WEB_SITE=http://aubio.org/
+ LICENSE[0]=GPL
+ ENTERED=20080710
+ SHORT="library for audio labelling"
+cat << EOF
+This is an old version there only to make Ardour2 work!
+
+aubio is a library for audio labelling. Its features include segmenting a
+sound file before each of its attacks, performing pitch detection, tapping
the
+beat and producing midi streams from live audio. The name aubio comes from
+'audio' with a typo: several transcription errors are likely to be found in
+the results too.
+
+The aim of this project is to provide these automatic labelling features to
+other audio softwares. Functions can be used offline in sound editors and
+software samplers, or online in audio effects and virtual instruments.
+EOF
diff --git a/audio-libs/aubio03/HISTORY b/audio-libs/aubio03/HISTORY
new file mode 100644
index 0000000..386d8c0
--- /dev/null
+++ b/audio-libs/aubio03/HISTORY
@@ -0,0 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD: install old version of spell to
/opt/aubio03 as
+ prerequesite for ardour2
+
+2008-07-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/audio-libs/celt/DETAILS b/audio-libs/celt/DETAILS
index c912469..b8c3aef 100755
--- a/audio-libs/celt/DETAILS
+++ b/audio-libs/celt/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=celt
if [[ $CELT_BRANCH == scm ]]; then
- if [[ $CELT_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_URL[0]=git_http://git.xiph.org/celt.git:$SPELL
diff --git a/audio-libs/celt/HISTORY b/audio-libs/celt/HISTORY
index 7b80e84..5a01fb7 100644
--- a/audio-libs/celt/HISTORY
+++ b/audio-libs/celt/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.1

diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index f0b6864..9b6e823 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=faad2
if [ "$FAAD2_BRANCH" = "scm" ]; then
- if [ "$FAAD2_AUTOUPDATE" = "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/faac:faad2
SOURCE_IGNORE=volatile
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 1a62ddf..a05161d 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: remove use of obsolete macro in configure.in

diff --git a/audio-libs/liblo/HISTORY b/audio-libs/liblo/HISTORY
index 06b3d34..a4e0e14 100644
--- a/audio-libs/liblo/HISTORY
+++ b/audio-libs/liblo/HISTORY
@@ -1,3 +1,8 @@
+2014-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * pre-gcc48.patch: added, to fix build with compilers with full C++11
+ support
+
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.28

diff --git a/audio-libs/liblo/PRE_BUILD b/audio-libs/liblo/PRE_BUILD
new file mode 100755
index 0000000..d3ef378
--- /dev/null
+++ b/audio-libs/liblo/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8.0; then
+ patch -p0 < "$SPELL_DIRECTORY/pre-gcc48.patch"
+fi
diff --git a/audio-libs/liblo/pre-gcc48.patch
b/audio-libs/liblo/pre-gcc48.patch
new file mode 100644
index 0000000..961ecb0
--- /dev/null
+++ b/audio-libs/liblo/pre-gcc48.patch
@@ -0,0 +1,50 @@
+--- lo/lo_cpp.h.orig 2014-01-27 21:30:49.000000000 +0400
++++ lo/lo_cpp.h 2014-06-21 22:48:04.546899637 +0400
+@@ -426,19 +426,22 @@
+ }
+ }
+
+- Server(const num_string_type &port, lo_err_handler err_h=0)
+- : Server(lo_server_new(port, err_h)) {}
++ Server(const num_string_type &port, lo_err_handler err_h=0) {
++ server = lo_server_new(port, err_h);
++ }
+
+- Server(const num_string_type &port, int proto, lo_err_handler
err_h=0)
+- : Server(lo_server_new_with_proto(port, proto, err_h)) {}
++ Server(const num_string_type &port, int proto, lo_err_handler
err_h=0) {
++ server = lo_server_new_with_proto(port, proto, err_h);
++ }
+
+ Server(const string_type &group, const num_string_type &port,
+- const string_type &iface="", const string_type &ip="",
lo_err_handler err_h=0)
+- : Server((iface._s || ip._s)
+- ? lo_server_new_multicast_iface(group, port,
+- iface._s?:0,
+- ip._s?:0, err_h)
+- : lo_server_new_multicast(group, port, err_h)) {}
++ const string_type &iface="", const string_type &ip="",
lo_err_handler err_h=0) {
++ if (iface._s || ip._s) {
++ server = lo_server_new_multicast_iface(group, port,
iface._s?:0, ip._s?:0, err_h);
++ } else {
++ server = lo_server_new_multicast(group, port, err_h);
++ }
++ }
+
+ virtual ~Server()
+ { if (server) lo_server_free(server); }
+@@ -734,8 +737,12 @@
+ }
+ }
+
+- Bundle(const Bundle &b)
+- : Bundle((lo_bundle)b) {}
++ Bundle(const Bundle &b) {
++ lo_bundle newb = (lo_bundle)b;
++ bundle = newb;
++ if (newb)
++ lo_bundle_incref(newb);
++ }
+
+ ~Bundle()
+ { if (bundle) lo_bundle_free_recursive(bundle); }
diff --git a/audio-libs/libvorbis/DETAILS b/audio-libs/libvorbis/DETAILS
index 5de4430..08fb54d 100755
--- a/audio-libs/libvorbis/DETAILS
+++ b/audio-libs/libvorbis/DETAILS
@@ -1,7 +1,7 @@
SPELL=libvorbis
- VERSION=1.3.3
-
SOURCE_HASH=sha512:12d9bd4afb8d6b8b47ff0587d819f17e867cf6ec95405cfb97d35b5a4b3b15b35f5a7b2e66f649d58dda0469c2c4731b710ed609e79e77be228e62dece16905f
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.3.4
+
SOURCE_HASH=sha512:f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.xiph.org/releases/vorbis/$SOURCE
WEB_SITE=http://www.xiph.org/vorbis/
diff --git a/audio-libs/libvorbis/HISTORY b/audio-libs/libvorbis/HISTORY
index e294f58..ce92c38 100644
--- a/audio-libs/libvorbis/HISTORY
+++ b/audio-libs/libvorbis/HISTORY
@@ -1,3 +1,6 @@
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.4
+
2012-02-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.3

diff --git a/audio-libs/lilv-0/HISTORY b/audio-libs/lilv-0/HISTORY
index 07d457f..84d7695 100644
--- a/audio-libs/lilv-0/HISTORY
+++ b/audio-libs/lilv-0/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: fail-safe cleanup of non-libraries
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: created

diff --git a/audio-libs/lilv-0/INSTALL b/audio-libs/lilv-0/INSTALL
index 54ea838..8d809b8 100755
--- a/audio-libs/lilv-0/INSTALL
+++ b/audio-libs/lilv-0/INSTALL
@@ -1,4 +1,4 @@
./waf install --destdir=".pre-install" &&
-rm -rv .pre-install/usr/{bin,etc,share/man} &&
+rm -rvf .pre-install/usr/{bin,etc,share/man} &&
# cp -a complains about inability to preserve times for symlinks
cp -rv .pre-install/* "$INSTALL_ROOT/"
diff --git a/audio-libs/lv2/HISTORY b/audio-libs/lv2/HISTORY
index 7d9c040..d141342 100644
--- a/audio-libs/lv2/HISTORY
+++ b/audio-libs/lv2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: pre-create directory
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created
* CONFLICTS: replaces lv2core
diff --git a/audio-libs/lv2/INSTALL b/audio-libs/lv2/INSTALL
index 0ea15cc..6af2edc 100755
--- a/audio-libs/lv2/INSTALL
+++ b/audio-libs/lv2/INSTALL
@@ -1 +1,3 @@
+# Too dumb to use mkdir -p in waf?
+mkdir -p "$INSTALL_ROOT/usr/lib/lv2" &&
waf_install
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index c7d25a7..e217ee0 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,6 +1,6 @@
SPELL=openal-soft
- VERSION=1.15.1
-
SOURCE_HASH=sha512:ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
+ VERSION=1.16.0
+
SOURCE_HASH=sha512:b89e46902ce475afd47c4c153ae666646e8b277abf1be97f92b6a10dc585ed780c663591398a9fd7e4118595dd45d2d8d6df0101b4148686150bbb3fe2939ddc
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index e57c201..f2dfb81 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.16.0
+
2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.15.1
* avutil.patch, PRE_BUILD: removed
diff --git a/audio-libs/slv2/DEPENDS b/audio-libs/slv2/DEPENDS
index 0a13f7c..569adcc 100755
--- a/audio-libs/slv2/DEPENDS
+++ b/audio-libs/slv2/DEPENDS
@@ -1,5 +1,5 @@
depends python &&
-depends lv2core &&
+depends lv2 &&
depends redland &&

optional_depends JACK-DRIVER \
diff --git a/audio-libs/slv2/HISTORY b/audio-libs/slv2/HISTORY
index 1694755..2c49867 100644
--- a/audio-libs/slv2/HISTORY
+++ b/audio-libs/slv2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depend on lv2 instead of lv2core
+
2011-10-22 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Updated to 0.6.6.

diff --git a/audio-libs/taglib/DETAILS b/audio-libs/taglib/DETAILS
index 0ef1a2d..ddbbe53 100755
--- a/audio-libs/taglib/DETAILS
+++ b/audio-libs/taglib/DETAILS
@@ -1,9 +1,9 @@
SPELL=taglib
- VERSION=1.8
-
SOURCE_HASH=sha512:04c3b12bd11d11000ebf6721bfebd47e2995b9b11ad28c1560a83370b9d871eb37155a006637b36b4c3daa68cd690f09c1ab4faf4d3214e6f3f5388b5581fc94
+ VERSION=1.9.1
+
SOURCE_HASH=sha512:63a4f06b88b33be716dde3111e62a624995bc020127c9d22f63e918a535ebba858c59308ca4295eeedb29dc72b87d6673db5483f20d9dbf3f56cd93c7ba7ed58
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://github.com/downloads/taglib/taglib/$SOURCE
+ SOURCE_URL[0]=http://taglib.github.io/releases/$SOURCE
WEB_SITE=http://developer.kde.org/~wheeler/taglib
ENTERED=20040120
LICENSE[0]=GPL
diff --git a/audio-libs/taglib/HISTORY b/audio-libs/taglib/HISTORY
index e726c9b..ced8284 100644
--- a/audio-libs/taglib/HISTORY
+++ b/audio-libs/taglib/HISTORY
@@ -1,3 +1,7 @@
+2014-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.1
+ new URL
+
2012-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8
new URL
diff --git a/audio-players/cantata/DETAILS b/audio-players/cantata/DETAILS
index fc7b261..b9b2c7d 100755
--- a/audio-players/cantata/DETAILS
+++ b/audio-players/cantata/DETAILS
@@ -1,8 +1,8 @@
SPELL=cantata
- VERSION=1.3.3
+ VERSION=1.3.4
SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60ZUN1NThacGFrdFE";
-
SOURCE_HASH=sha512:1f50abf9e92316ba3cd8da0a542a6fbdabfa58bb8dd7349058ffeffa5f95a4db31e4810e580497fea5c08f31f8e891c1c7b600f66f81f400527d40c58f14148a
+
SOURCE_URL[0]="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU";
+
SOURCE_HASH=sha512:7bd8886d194d5a7c83d4cf41cbaae1f216cb2fa41642588f4be903e1f03fcdddcaa809ac56d061859ed570f54e52fa2c42ac49d742eb636d2b3b29352e3e2343
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://code.google.com/p/cantata/";
LICENSE[0]=GPL
diff --git a/audio-players/cantata/HISTORY b/audio-players/cantata/HISTORY
index 2b4d57e..bde9de9 100644
--- a/audio-players/cantata/HISTORY
+++ b/audio-players/cantata/HISTORY
@@ -1,3 +1,6 @@
+2014-05-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.4
+
2014-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3.3

diff --git a/audio-players/deadbeef/DETAILS b/audio-players/deadbeef/DETAILS
index 1f214c7..d84a664 100755
--- a/audio-players/deadbeef/DETAILS
+++ b/audio-players/deadbeef/DETAILS
@@ -1,29 +1,46 @@
SPELL=deadbeef
- VERSION=0.6.0
+ VERSION=0.6.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:3f6add4998dd0fc67c94c289905700144153ae2dc8c7e6cfa1bbfab7844c7dfe3985d5ff87909d9d0b1abe4926b5498055389ab74e83cc7db63f254081d7e666
+
SOURCE_HASH=sha512:7caee245d7fa68e98ce5edc6aa6acc829d62c963f523c81e0406182a1aa36759219a8c0a2bdf010ac810f22b15acc81d06e8cab4ab820956c96cbc0a94423b7b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://deadbeef.sourceforge.net/";
LICENSE[0]="GPLv2"
ENTERED=20100308
KEYWORDS=""
- SHORT="DeaDBeeF (as in 0xDEADBEEF) is an audio player for
GNU/Linux systems with X11 and console support."
+ SHORT="ultimate music player for GNU/Linux"
cat << EOF
Main features:
-
- * mp3, ogg vorbis, flac, ape, wv, wav, m4a, mpc, cd audio (and many
- more) * sid, nsf and lots of other popular chiptune formats * ID3v1,
- ID3v2.2, ID3v2.3, ID3v2.4, APEv2, xing/info tags support * character
- set detection for non-unicode id3 tags - supports cp1251 and iso8859-1 *
- unicode tags are fully supported as well (both utf8 and ucs2) * cuesheet
- (.cue files) support, with charset detection (utf8/cp1251/iso8859-1) *
- tracker modules like mod, s3m, it, xm, etc * HVSC song length database
- support for sid * gtk2 interface with efficient custom widgets * no GNOME
- or KDE dependencies * minimize to tray, with scrollwheel volume control *
- drag and drop, both inside of playlist, and from filemanagers and such
- * control playback from command line * global hotkeys * plugin support;
- bundled with lots of plugins, such as global hotkeys and last.fm
scrobbler;
- sdk is included * duration calculation is as precise as possible for
- vbr mp3 files (with and without xing/info tags)
+- mp3, ogg vorbis, flac, ape, wv/iso.wv, wav, m4a/mp3 (aac and alac), mpc,
tta,
+ cd audio, and many more
+- nsf, ay, vtx, vgm/vgz, spc and many other popular chiptune formats
+- SID with HVSC song length database support for sid
+- tracker modules - mod, s3m, it, xm, etc
+- ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, Xing/Info, VorbisComments tag
reading
+ and writing, as well as reading many other tag/metadata formats in most
+ supported formats
+- automatic character set detection for non-unicode id3 tags - supports
cp1251,
+ iso8859-1, and now chinese cp936 (optional), as well as SHIFT-JIS and
MS-DOS
+ CP866 for selected formats
+- unicode tags are fully supported as well (both utf8 and ucs2)
+- cuesheet (.cue files) support, including charset detection/conversion
+- clean fast GUI using GTK2 and GTK3, you pick what you like more!
+- no GNOME or KDE dependencies
+- minimization to system tray, with scrollwheel volume control, etc
+- drag and drop, both in playlist, and from other apps
+- control playback from command line
+- global hotkeys
+- multiple playlists using tabbed interface
+- album cover display
+- OSD notifications about current playing songs
+- 18-band graphical equalizer and other DSP plugins
+- built-in high quality tag editor, with custom fields support
+- customizable groups in playlists
+- customizable columns with flexible title formatting
+- streaming radio support for ogg vorbis, mp3 and aac streams
+- gapless playback for correctly encoded files
+- lots of plugin, such as global hotkeys, last.fm scrobbler, converter, and
many
+ more, sdk is included
+- comes with advanced Converter plugin, which allows to transcode files to
other
+ formats
EOF
diff --git a/audio-players/deadbeef/HISTORY b/audio-players/deadbeef/HISTORY
index f87c724..5045677 100644
--- a/audio-players/deadbeef/HISTORY
+++ b/audio-players/deadbeef/HISTORY
@@ -1,3 +1,10 @@
+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
+
2013-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.0
* CONFIGURE: added missing config options
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/dermixd/BUILD b/audio-players/dermixd/BUILD
deleted file mode 100755
index ce7153c..0000000
--- a/audio-players/dermixd/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-#no autotools yet... constructing the build
-# choice: gnu, gnu-oss, gnu-alsa
-if list_find "$OPTS" --enable-alsa
-then
- if [[ "$DMD_OSS" == y ]]
- then
- DMD_BUILD=gnu
- else
- DMD_BUILD=gnu-alsa
- fi
-else
- DMD_BUILD=gnu-oss
-fi &&
-if [[ "$DMD_PRIO" == y ]]; then
- export CPPFLAGS="$CPPFLAGS -DLINUX"
-fi &&
-MAKE_OPT= &&
-if list_find "$OPTS" --enable-sndfile; then
- MAKE_OPT="$MAKE_OPT SNDFILE=yes"
-fi &&
-if list_find "$OPTS" --enable-vorbis; then
- MAKE_OPT="$MAKE_OPT VORBISFILE=yes"
-fi &&
-make $MAKE_OPT $DMD_BUILD
diff --git a/audio-players/dermixd/CONFIGURE b/audio-players/dermixd/CONFIGURE
index 6ef0249..29ef3bc 100755
--- a/audio-players/dermixd/CONFIGURE
+++ b/audio-players/dermixd/CONFIGURE
@@ -1,7 +1,4 @@
-config_query DMD_OSS "Include OSS support (it is forced without ALSA!)" y &&
# I would like to make that depend on yes to init script
# ...and even opt to mod the default config accordingly!
config_query DMD_USER \
-"Create musicdaemon user (init script per default uses it)" y &&
-config_query DMD_PRIO \
-"Enable Linux-specific dropped priority for worker threads (less likely
interruption of mixer/output threads)" n
+"Create musicdaemon user (init script per default uses it)" y
diff --git a/audio-players/dermixd/DEPENDS b/audio-players/dermixd/DEPENDS
index ba3eeea..ac0861a 100755
--- a/audio-players/dermixd/DEPENDS
+++ b/audio-players/dermixd/DEPENDS
@@ -1,8 +1,10 @@
depends -sub CXX gcc &&
+depends perl &&
+depends config-param &&
optional_depends alsa-lib --enable-alsa --disable-alsa "ALSA output" &&
-optional_depends perl --enable-perl --disable-perl "install PERL frontend" &&
-optional_depends mpg123 "" "" "for mpeg input -- \
-need control interface of -thor version or >= 0.60! \
-(you can install mpg123 later without rebuilding)" &&
-optional_depends libvorbis "--enable-vorbis" "--disable-vorbis" "OGG/Vorbis
input" &&
-optional_depends libsndfile "--enable-sndfile" "--disable-sndfile" "sndfile
input"
+optional_depends mpg123 "--enable-mpg123" "--disable-mpg123" "for mpeg input
using libmpg123" &&
+optional_depends libvorbis "--enable-vorbisfile" "--disable-vorbisfile"
"OGG/Vorbis input" &&
+optional_depends libsndfile "--enable-sndfile" "--disable-sndfile" "sndfile
input" &&
+optional_depends file "--enable-magic" "--disable-magic" "identify files
using libmagic" &&
+optional_depends ladspa "--enable-ladspa" "--disable-ladspa" "using LADSPA
plugins" &&
+optional_depends soundtouch "--enable-soundtouch" "--disable-soundtouch"
"timepitch effect"
diff --git a/audio-players/dermixd/DETAILS b/audio-players/dermixd/DETAILS
index 1ebe32a..befa9af 100755
--- a/audio-players/dermixd/DETAILS
+++ b/audio-players/dermixd/DETAILS
@@ -1,5 +1,5 @@
SPELL=dermixd
- VERSION=1.6.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -16,8 +16,8 @@ cat << EOF
DerMixD takes an arbitrary number of input channels and creates an arbitrary
number of mixes on an arbitrary number of output channels (i.e. audio device
on host machine).
-It is controlled via simple commands on TCP socket (you can talk to it with
-telnet) that are scriptable in a timed manner.
+It is controlled via simple commands on a local or TCP socket (you can talk
+to it with telnet) that are scriptable in a timed manner.
Most important input classes are MPEG audio files/streams via (recent)
mpg123 and libsndfile (there is a sine generator for fun and raw audio input
and on the output side there's OSS and ALSA as well as raw and text
diff --git a/audio-players/dermixd/FINAL b/audio-players/dermixd/FINAL
new file mode 100755
index 0000000..aadaddb
--- /dev/null
+++ b/audio-players/dermixd/FINAL
@@ -0,0 +1,12 @@
+if [[ "$DMD_USER" == "y" ]]
+then
+ create_group audio &&
+ create_account musicdaemon
+# in future modify default config?
+# cp ${SCRIPT_DIRECTORY}/dermixd.conf .
+else
+ create_account nobody
+# sed 's/USER=dermixd/USER=nobody/' \
+# ${SCRIPT_DIRECTORY}/dermixd.conf > dermixd.conf
+fi
+
diff --git a/audio-players/dermixd/HISTORY b/audio-players/dermixd/HISTORY
index db9b7ea..6dd8e91 100644
--- a/audio-players/dermixd/HISTORY
+++ b/audio-players/dermixd/HISTORY
@@ -1,3 +1,9 @@
+2014-06-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS: update to 2.0.0
+ * PRE_BUILD, BUILD, INSTALL: not needed anymore
+ * init.d/dermixd, init.d/dermixd.conf: adapt
+ * CONFIGURE, FINAL: reduced to user creation
+
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/audio-players/dermixd/INSTALL b/audio-players/dermixd/INSTALL
deleted file mode 100755
index bbfbe9f..0000000
--- a/audio-players/dermixd/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-if [[ "$DMD_USER" == "y" ]]
-then
- create_group audio &&
- create_account musicdaemon
-# in future modify default config?
-# cp ${SCRIPT_DIRECTORY}/dermixd.conf .
-else
- create_account nobody
-# sed 's/USER=dermixd/USER=nobody/' \
-# ${SCRIPT_DIRECTORY}/dermixd.conf > dermixd.conf
-fi &&
-
-
-BINDIR=${INSTALL_ROOT}/usr/bin &&
-DOCDIR=${INSTALL_ROOT}/usr/share/doc/dermixd &&
-install -v -d ${BINDIR} &&
-install -v -d ${DOCDIR} &&
-install -v dermixd ${BINDIR} &&
-install -v README BUGS TODO LICENSE CHANGES ${DOCDIR} &&
-if list_find "$OPTS" --enable-perl
-then
- PERLDIR=${INSTALL_ROOT}/usr/lib/dermixd &&
- install -v -d ${PERLDIR} &&
- install -v frontend/simple_player ${BINDIR}/dermixd-play &&
- install -v frontend/dermixd-control ${BINDIR}/dermixd-control &&
- install -v frontend/shuffle ${BINDIR}/shuffle &&
- install -v frontend/Param.pm ${PERLDIR} &&
- install -v -d ${PERLDIR}/DerMixD &&
- install -v frontend/DerMixD/{Base,Control}.pm ${PERLDIR}/DerMixD
-fi
diff --git a/audio-players/dermixd/PRE_BUILD b/audio-players/dermixd/PRE_BUILD
deleted file mode 100755
index c34e659..0000000
--- a/audio-players/dermixd/PRE_BUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-# gcc-4.3 hotfix
-echo 'Index: common.hxx
-Index: param.cxx
-===================================================================
---- param.cxx (Revision 442)
-+++ param.cxx (Arbeitskopie)
-@@ -9,6 +9,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <string>
-+#include <cstring>
- #include <vector>
- using namespace std;
-
-Index: common.hxx
-===================================================================
---- common.hxx (Revision 442)
-+++ common.hxx (Arbeitskopie)
-@@ -16,6 +16,7 @@
- #include <sched.h>
- #include <semaphore.h>
- #include <string>
-+#include <cstring>
- #include <vector>
- #include <queue>
- #include <limits.h>' | patch -Np0
diff --git a/audio-players/dermixd/init.d/dermixd
b/audio-players/dermixd/init.d/dermixd
index 9e88af9..a4d10e7 100644
--- a/audio-players/dermixd/init.d/dermixd
+++ b/audio-players/dermixd/init.d/dermixd
@@ -4,25 +4,27 @@ PROGRAM=/usr/bin/dermixd
RUNLEVEL=3

CONTROL=/usr/bin/dermixd-control
-#some defaults... ok, dermixd should start to read a config file...
+
+# defaults to have something
+USER=musicdaemon
+TCP=yes
PORT=8888
+UNIX=yes
+SOCKET=/tmp/dermixd.socket
+REMOTE=no
BUFFER=2048
AUDIO_RATE=44100
CHANNELS=2
-DEBUG_OUT=
+NICE=-5
+INPUT_ZEROSCAN=no
+INPUT_PREBUFFER=10
+INPUT_ZEROLEVEL=0.01
+INPUT_ZERORANGE=5
+INITIAL_SETUP=yes
DEFAULT_OUTPUT=
DEFAULT_OUTFILE=
-MPG123_DECODER=/usr/bin/mpg123
-MPG123_PREBUFFER=2
-MPG123_ZEROSCAN=yes
-MPG123_ZEROLEVEL=100
-MPG123_GAPLESS=no
-INITIAL_SETUP=yes
OUTPUT_STOPPED=yes
-NICE=-5
-#be on the safe side
-USER=nobody
-REMOTE=no
+#DEBUG_OUT=

. /etc/init.d/smgl_init
. /etc/sysconfig/dermixd
@@ -30,7 +32,7 @@ REMOTE=no
start()
{
echo "starting DerMixD..."
- COMMAND="$PROGRAM port='$PORT' buffer='$BUFFER'
audio_rate='$AUDIO_RATE' channels='$CHANNELS'
mpg123.decoder='$MPG123_DECODER' mpg123.prebuffer='$MPG123_PREBUFFER'
mpg123.zeroscan='$MPG123_ZEROSCAN' mpg123.gapless=$MPG123_GAPLESS"
+ COMMAND="$PROGRAM port='$PORT' socket='$SOCKET' buffer='$BUFFER'
audio_rate='$AUDIO_RATE' channels='$CHANNELS'
input.prebuffer='$INPUT_PREBUFFER' input.zeroscan='$INPUT_ZEROSCAN'
input.zerolevel='$INPUT_ZEROLEVEL' input.zerorange='$INPUT_ZERORANGE'"
if ! test -z "$DEBUG_OUT"; then COMMAND="$COMMAND
output='$DEBUG_OUT'"; fi
if [[ "$REMOTE" == "yes" ]]; then COMMAND="$COMMAND -r"; fi
if [[ "$INITIAL_SETUP" == "yes" ]]
@@ -43,18 +45,19 @@ start()
nice -n $NICE su -s /bin/bash -c "${COMMAND}" ${USER} &&
if [[ "$INITIAL_SETUP" == "yes" ]] && [[ "$OUTPUT_STOPPED" == "yes" ]]
then
- $CONTROL outstop 0
+ $CONTROL outeject 0
fi
+ test -z "$SOCKET" || chmod g+w "$SOCKET"
}

stop()
{
echo "stopping daemon politely"
- $CONTROL --port=${PORT} shutdown
+ $CONTROL --socket="$SOCKET" --port="$PORT" shutdown
}

status()
{
echo "status:"
- $CONTROL --port=${PORT} fullstat
+ $CONTROL -- fullstat
}
diff --git a/audio-players/dermixd/init.d/dermixd.conf
b/audio-players/dermixd/init.d/dermixd.conf
index 4d5ce6b..6e65acc 100644
--- a/audio-players/dermixd/init.d/dermixd.conf
+++ b/audio-players/dermixd/init.d/dermixd.conf
@@ -5,9 +5,18 @@
# but not more! Anyone can send commands per TCP!
USER=musicdaemon

+# enable TCP
+TCP=yes
+
# port to bind to
PORT=8888

+# enable UNIX domain socket
+UNIX=yes
+
+# local socket to use
+SOCKET=/tmp/dermixd.socket
+
# allow non-local connections? yes/no
# Trust your network if enabling that!
REMOTE=no
@@ -26,21 +35,18 @@ NICE=-5

# configuration of the mpeg input

-# path to mpg123 decoder binary
-MPG123_DECODER=/usr/bin/mpg123
-
-# use mpg123's own gapless support?
-MPG123_GAPLESS=no
-
# skip zero level at beginning and end of tracks to get gapless output?
yes/no
-MPG123_ZEROSCAN=yes
+INPUT_ZEROSCAN=no

-# size of mpg123 prebuffer in seconds
-MPG123_PREBUFFER=2
+# size of input prebuffer in seconds
+INPUT_PREBUFFER=10

# less that that is zero
-# (talking 16 bit audio, that means we have a range of 0 to 32767)
-MPG123_ZEROLEVEL=100
+# (relative amplitude)
+INPUT_ZEROLEVEL=0.01
+
+# Range to scan for silence from beginning/end.
+INPUT_ZERORANGE=5

# do create an initial setup of two input channels and one output channel?
yes/no
INITIAL_SETUP=yes
diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index 1b14df6..5a2b02b 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=moc
if [[ "$MOC_BRANCH" == "scm" ]]; then
- if [[ "$MOC_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
- else
- VERSION=svn
- fi
SOURCE=${SPELL}-svn.tar.bz2
SOURCE_URL[0]=svn://daper.net/moc/trunk:moc
SOURCE_IGNORE=volatile
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index 951c7b0..9cdb086 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: added unstable version 2.5.0-beta1
* PREPARE: use prepare_select_branch
diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD
index 5365ee6..f0b6fde 100755
--- a/audio-players/mpd/BUILD
+++ b/audio-players/mpd/BUILD
@@ -1,6 +1,7 @@
create_account musicdaemon &&

-OPTS="$MPD_OPTS $OPTS" &&
-OPTS="$OPTS --disable-mpc" &&
+OPTS="--disable-mpc $MPD_OPTS $OPTS" &&

-LDFLAGS+="-L/usr/lib/sidplay/builders" default_build
+LDFLAGS="-L/usr/lib/sidplay/builders $LDFLAGS" &&
+
+default_build
diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 6b59084..6c4d738 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -1,3 +1,7 @@
+# remove obsolete options
+list_remove MPD_OPTS "--enable-mvp" &&
+list_remove MPD_OPTS "--disable-mvp" &&
+
config_query_option MPD_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" \
"--disable-ipv6" &&
@@ -26,10 +30,6 @@ config_query_option MPD_OPTS "Enable recorder file output
plugin?" n \
"--enable-recorder-output" \
"--disable-recorder-output" &&

-config_query_option MPD_OPTS "Enable support for Hauppauge Media MVP?" n \
- "--enable-mvp" \
- "--disable-mvp" &&
-
config_query_option MPD_OPTS "Enable support for Inotify automatic database
update?" y \
"--enable-inotify" \
"--disable-inotify" &&
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 8e5f012..0d29c2b 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,9 +1,12 @@
depends zlib &&
depends glib2 &&
+depends -sub CXX gcc &&

# TODO: missing libraries in grimoire:
# - libroar (--enable-roar) for RoarAudio support
# - libgme (--enable-gme) for Blargg's game music emulator plugin
+# - libadplug (--enable-adplug) for AdPlug decoder plugin
+# - libopus (--enable-opus) for Opus codec support
# - libiso9660 (--enable-iso9660) for iso9660 archive support
# - despotify (--enable-despotify) for despotify (spotify.com) support

@@ -12,16 +15,6 @@ optional_depends libao \
"--disable-ao" \
"for libao support" &&

-optional_depends libffado \
- "--enable-ffado" \
- "--disable-ffado" \
- "for libffado (FireWire) support" &&
-
-optional_depends liblastfm \
- "--enable-lastfm" \
- "--disable-lastfm" \
- "for last.fm radio support" &&
-
optional_depends yajl \
"--enable-soundcloud" \
"--disable-soundcloud" \
@@ -43,6 +36,8 @@ optional_depends libvorbis \
"for Ogg Vorbis support" &&

if is_depends_enabled $SPELL libvorbis; then
+ depends libogg &&
+
config_query_option MPD_OPTS "Enable Ogg Vorbis encoder support?" y \
"--enable-vorbis-encoder" \
"--disable-vorbis-encoder"
@@ -178,10 +173,16 @@ optional_depends LIBAVCODEC \
"--enable-ffmpeg" \
"--disable-ffmpeg" \
"for FFMPEG support" &&
+
if is_depends_enabled $SPELL ffmpeg; then
sub_depends ffmpeg STABLE
fi &&

+optional_depends libmpdclient \
+ "--enable-libmpdclient" \
+ "--disable-libmpdclient" \
+ "for MPD client support" &&
+
optional_depends OPENAL \
"--enable-openal" \
"--disable-openal" \
@@ -197,11 +198,6 @@ optional_depends libcdio-paranoia \
"--disable-cdio-paranoia" \
"for audio CD support" &&

-optional_depends libsoup \
- "--enable-soup" \
- "--disable-soup" \
- "for libsoup HTTP streaming support" &&
-
optional_depends avahi \
"--with-zeroconf=avahi" \
"--with-zeroconf=no" \
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 03acd06..ff32e83 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpd
- VERSION=0.18.9
+ VERSION=0.18.16
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.musicpd.org/download/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:12e45e14108cce0a3a993b6d17dfc05ed7d14ea99cce85f202904b9bf1624bfecadbd4d465e3c9057822691a1a245e67524229b160fceb2f72d27d6a8bd56479
+
SOURCE_HASH=sha512:bddd0236066bae97ef690b24a0eac46d892fe10ce7c5455634cb8b84210bf2ceb1b5ee8c7754fcf581de7fbd165c9b805f179e243b88bc87e6254e72fa6c8f45
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index da518dc..a64f197 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,22 @@
+2014-09-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.18.16
+ * BUILD: cleaned up; error-safe++
+
+2014-09-26 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: fix build with existing LDFLAGS (like --as-needed)
+
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: depends libogg if libvorbis is enabled
+
+2014-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.18.14
+
+2014-09-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.18.13
+ * CONFIGURE: removed obsolete options
+ * DEPENDS: removed obsolete dependencies: libffado, lastfm, libsoup;
+ added missing dependencies: libmpdclient, gcc; updated TODO list
+
2014-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.18.9

diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 79f28ce..5a651df 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.18.1
+ VERSION=1.20.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 74c9483..f66dda3 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,12 @@
+2014-07-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.20.1
+
+2014-05-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.20.0
+
+2014-05-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.19.0
+
2014-02-16 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.18.1

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-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index bab1c79..1c5107e 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -149,11 +149,12 @@ config_query_option XMMS2_OPTS
\
y \
"--with-plugins=wave" \
"--without-plugins=wave" &&
-config_query_option XMMS2_OPTS \
- "Do you want CDDA support" \
- y \
- "--with-plugins=cdda" \
- "--without-plugins=cdda" &&
+# Does not build without CDDA.
+#config_query_option XMMS2_OPTS \
+# "Do you want CDDA support" \
+# y \
+# "--with-plugins=cdda" \
+# "--without-plugins=cdda" &&
config_query_option XMMS2_OPTS \
"Do you want GVFS support" \
y \
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index a6df3fe..8580b7f 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -4,10 +4,9 @@ depends glib2
&&

#Transport plugins &&
if list_find "$XMMS2_OPTS" "--with-xmms2d" ; then
- if list_find "$XMMS2_OPTS" "--with-plugins=cdda" ; then
+# CDDA plugin is required.
depends libcdio &&
depends libdiscid
- fi &&
if list_find "$XMMS2_OPTS" "--with-plugins=xspf" ||
list_find "$XMMS2_OPTS" "--with-plugins=xml" ||
list_find "$XMMS2_OPTS" "--with-plugins=rss"
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 6c90a3c..72826c8 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ CONFIGURE, DEPENDS: always build with CDDA (breaks otherwise)
+
2011-10-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8DrO_o
* PRE_BUILD: no more patching
diff --git a/audio-plugins/quodlibet-plugins/DETAILS
b/audio-plugins/quodlibet-plugins/DETAILS
index e722ae5..501412e 100755
--- a/audio-plugins/quodlibet-plugins/DETAILS
+++ b/audio-plugins/quodlibet-plugins/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=quodlibet-plugins
-if test "$QUODLIBET_PLUGINS_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL.tar.bz2
SOURCE_IGNORE=volatile
SOURCE_HINTS=old_svn_compat
diff --git a/audio-plugins/quodlibet-plugins/HISTORY
b/audio-plugins/quodlibet-plugins/HISTORY
index f9d2c3c..71f1ebb 100644
--- a/audio-plugins/quodlibet-plugins/HISTORY
+++ b/audio-plugins/quodlibet-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2006-10-29 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: removed BUILD_API=2
DEPENDS: fixed, svn changed to subversion
diff --git a/audio-plugins/rt-plugins/0003-switch-build-system-to-cmake.patch
b/audio-plugins/rt-plugins/0003-switch-build-system-to-cmake.patch
new file mode 100644
index 0000000..bd159c9
--- /dev/null
+++ b/audio-plugins/rt-plugins/0003-switch-build-system-to-cmake.patch
@@ -0,0 +1,6136 @@
+From 3acb2bea8282214f002af2c45699eeee1cdc8db5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 6 Apr 2014 14:31:38 +0000
+Subject: [PATCH] switch build system to cmake
+
+- reorganize directory layout. source files go to src,
+headers to include
+- remove unnecessary macros from all .c files
+- use the <> form of #include for the ladspa header
+- remove redundant definition of f_round from ladspa-util.h
+- remove redundant config.h header file; this seems to have been
+an auto-generated header at some point copied from some other
+project. It isn't used anywhere in this project.
+- adapt the README to the new build system
+- add cppcheck target
+---
+ CMakeLists.txt | 21 +++
+ Makefile | 47 ------
+ README | 7 +-
+ RTallpass1.c | 236 ------------------------------
+ RTallpass2.c | 255 ---------------------------------
+ RThighpass.c | 251 --------------------------------
+ RThighshelf.c | 269 -----------------------------------
+ RTlowpass.c | 251 --------------------------------
+ RTlowshelf.c | 269 -----------------------------------
+ RTlr4hipass.c | 239 -------------------------------
+ RTlr4lowpass.c | 239 -------------------------------
+ RTparaeq.c | 269 -----------------------------------
+ build/.keep | 0
+ cmake/compilerwarnings.cmake | 37 +++++
+ cmake/cppcheck.cmake | 12 ++
+ include/biquad.h | 331
+++++++++++++++++++++++++++++++++++++++++++
+ include/ladspa-util.h | 211 +++++++++++++++++++++++++++
+ src/CMakeLists.txt | 26 ++++
+ src/RTallpass1.c | 231 ++++++++++++++++++++++++++++++
+ src/RTallpass2.c | 250 ++++++++++++++++++++++++++++++++
+ src/RThighpass.c | 246 ++++++++++++++++++++++++++++++++
+ src/RThighshelf.c | 264 ++++++++++++++++++++++++++++++++++
+ src/RTlowpass.c | 246 ++++++++++++++++++++++++++++++++
+ src/RTlowshelf.c | 264 ++++++++++++++++++++++++++++++++++
+ src/RTlr4hipass.c | 234 ++++++++++++++++++++++++++++++
+ src/RTlr4lowpass.c | 234 ++++++++++++++++++++++++++++++
+ src/RTparaeq.c | 264 ++++++++++++++++++++++++++++++++++
+ util/biquad.h | 331
-------------------------------------------
+ util/config.h | 99 -------------
+ util/ladspa-util.h | 230 ------------------------------
+ 30 files changed, 2877 insertions(+), 2986 deletions(-)
+ create mode 100644 CMakeLists.txt
+ delete mode 100644 Makefile
+ delete mode 100644 RTallpass1.c
+ delete mode 100644 RTallpass2.c
+ delete mode 100644 RThighpass.c
+ delete mode 100644 RThighshelf.c
+ delete mode 100644 RTlowpass.c
+ delete mode 100644 RTlowshelf.c
+ delete mode 100644 RTlr4hipass.c
+ delete mode 100644 RTlr4lowpass.c
+ delete mode 100644 RTparaeq.c
+ create mode 100644 build/.keep
+ create mode 100644 cmake/compilerwarnings.cmake
+ create mode 100644 cmake/cppcheck.cmake
+ create mode 100644 include/biquad.h
+ create mode 100644 include/ladspa-util.h
+ create mode 100644 src/CMakeLists.txt
+ create mode 100644 src/RTallpass1.c
+ create mode 100644 src/RTallpass2.c
+ create mode 100644 src/RThighpass.c
+ create mode 100644 src/RThighshelf.c
+ create mode 100644 src/RTlowpass.c
+ create mode 100644 src/RTlowshelf.c
+ create mode 100644 src/RTlr4hipass.c
+ create mode 100644 src/RTlr4lowpass.c
+ create mode 100644 src/RTparaeq.c
+ delete mode 100644 util/biquad.h
+ delete mode 100644 util/config.h
+ delete mode 100644 util/ladspa-util.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..566ef09
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,21 @@
++cmake_minimum_required(VERSION 2.8)
++Project(rt-plugins)
++
++set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
++
++include(compilerwarnings)
++include(cppcheck)
++
++set(COMMONFLAGS "-pipe")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMONFLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
++
++add_definitions("-D_BSD_SOURCE -D_XOPEN_SOURCE=600")
++
++set(CMAKE_SHARED_MODULE_PREFIX "")
++
++add_subdirectory(src)
++
++file(GLOB HEADERS "${PROJECT_SOURCE_DIR}/include/*.h")
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index 4394311..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,47 +0,0 @@
+-INSTALL_PLUGINS_DIR ?= /usr/local/lib/ladspa/
+-
+-# rt 31.5.2013: got rid of sse2 stuff so we can build for ARM
+-CPPFLAGS += -D_BSD_SOURCE -DPIC -D_XOPEN_SOURCE=600 -I.
+-
+-CFLAGS += -Ofast -fomit-frame-pointer -fstrength-reduce -funroll-loops
-fPIC -std=c11
+-
+-CFLAGS += -Wall -Wextra -Werror -pedantic
+-CFLAGS += -Wcast-align -Wfloat-equal -Wformat-nonliteral -Wformat-security
+-CFLAGS += -Winit-self -Wmissing-include-dirs
+-CFLAGS += -Wno-suggest-attribute=noreturn -Wno-write-strings
-Wpointer-arith -Wundef -Wpacked
+-CFLAGS += -Wredundant-decls
+-CFLAGS += -Wunreachable-code -Wno-unused-parameter -Wconversion -Wshadow
+-CFLAGS += -Wstrict-prototypes -Wbad-function-cast -Wold-style-definition
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+-
+-LDFLAGS += -shared
+-
+-PLUGINS = RTallpass1.so \
+- RTallpass2.so \
+- RTlowpass.so \
+- RThighpass.so \
+- RThighshelf.so \
+- RTlowshelf.so \
+- RTlr4hipass.so \
+- RTlr4lowpass.so \
+- RTparaeq.so \
+-
+-all: $(PLUGINS)
+-
+-%.o: %.c
+- @echo -e "(CC) $@"
+- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+-
+-%.so: %.o
+- @echo -e "(LD) $@"
+- @$(LD) $(LDFLAGS) -o $@ $<
+-
+-install: all
+- mkdir -p $(INSTALL_PLUGINS_DIR)
+- install -m644 $(PLUGINS) $(INSTALL_PLUGINS_DIR)
+-
+-clean:
+- -rm -f `find . -name "*.so"`
+- -rm -f `find . -name "*.o"`
+- -rm -f `find . -name "*~"`
+-
+-.PHONY: install all clean
+diff --git a/README b/README
+index 98c6892..24ce89a 100644
+--- a/README
++++ b/README
+@@ -2,11 +2,14 @@ Compiling
+ ~~~~~~~~~
+
+ Install with
++ cd build
++ cmake ..
+ make
+ sudo make install
+
+ By default this installs plugins in /usr/local/lib/ladspa. If
+-you want them to go somewhere else, edit the Makefile.
++you want them to go somewhere else, configure cmake accordingly
++by running 'ccmake .'
+
+ You should set the environment variable LADSPA_PATH to contain the
+ path to the plugins, so they can be found. Something like this:
+@@ -26,6 +29,8 @@ I know, these instruction sets are only implemented on
Intel and Athlon
+ processors. Compiling for other architectures will probably require some
+ changes to the source code.
+
++You can set USE_SSE2 to off using ccmake if you do not want to use SSE2.
++
+
+ Bug reports
+ ~~~~~~~~~~~
+diff --git a/RTallpass1.c b/RTallpass1.c
+deleted file mode 100644
+index 4ea528b..0000000
+--- a/RTallpass1.c
++++ /dev/null
+@@ -1,236 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define ALLPASS1_FC 0
+-#define ALLPASS1_INPUT 1
+-#define ALLPASS1_OUTPUT 2
+-
+-static LADSPA_Descriptor *allPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *fc;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- bilin * filter;
+- float fs;
+-} AllPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return allPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateAllPass(LADSPA_Handle instance) {
+- AllPass *plugin_data = (AllPass *)instance;
+- bilin *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- bilin_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupAllPass(LADSPA_Handle instance) {
+- AllPass *plugin_data = (AllPass *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortAllPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- AllPass *plugin;
+-
+- plugin = (AllPass *)instance;
+- switch (port) {
+- case ALLPASS1_FC:
+- plugin->fc = data;
+- break;
+- case ALLPASS1_INPUT:
+- plugin->input = data;
+- break;
+- case ALLPASS1_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateAllPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- AllPass *plugin_data = (AllPass *)malloc(sizeof(AllPass));
+- bilin *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(bilin));
+- bilin_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runAllPass(LADSPA_Handle instance, unsigned long sample_count) {
+- AllPass *plugin_data = (AllPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+-
+- bilin * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- ap1_set_params(filter, fc, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- // RT 2.9.2013: replace biquad_run with ap1_run to cut
floating-
+- // point multiplications from 3 to 1:
+- buffer_write(output[pos], (LADSPA_Data) ap1_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- allPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (allPassDescriptor) {
+- allPassDescriptor->UniqueID = 9010;
+- allPassDescriptor->Label = "RTallpass1";
+- allPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- allPassDescriptor->Name =
+- D_("RT First Order Allpass");
+- allPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- allPassDescriptor->Copyright =
+- "GPL";
+- allPassDescriptor->PortCount = 3;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
+- sizeof(LADSPA_PortDescriptor));
+- allPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
+- sizeof(LADSPA_PortRangeHint));
+- allPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(3, sizeof(char*));
+- allPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[ALLPASS1_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[ALLPASS1_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[ALLPASS1_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[ALLPASS1_FC].LowerBound = 0.0;
+- port_range_hints[ALLPASS1_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Input */
+- port_descriptors[ALLPASS1_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[ALLPASS1_INPUT] =
+- D_("Input");
+- port_range_hints[ALLPASS1_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[ALLPASS1_INPUT].LowerBound = -1.0;
+- port_range_hints[ALLPASS1_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[ALLPASS1_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[ALLPASS1_OUTPUT] =
+- D_("Output");
+- port_range_hints[ALLPASS1_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[ALLPASS1_OUTPUT].LowerBound = -1.0;
+- port_range_hints[ALLPASS1_OUTPUT].UpperBound = +1.0;
+-
+- allPassDescriptor->activate = activateAllPass;
+- allPassDescriptor->cleanup = cleanupAllPass;
+- allPassDescriptor->connect_port = connectPortAllPass;
+- allPassDescriptor->deactivate = NULL;
+- allPassDescriptor->instantiate = instantiateAllPass;
+- allPassDescriptor->run = runAllPass;
+- allPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (allPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)allPassDescriptor->PortDescriptors);
+- free((char **)allPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)allPassDescriptor->PortRangeHints);
+- free(allPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTallpass2.c b/RTallpass2.c
+deleted file mode 100644
+index a0bac58..0000000
+--- a/RTallpass2.c
++++ /dev/null
+@@ -1,255 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define ALLPASS_FC 0
+-#define ALLPASS_Q 1
+-#define ALLPASS_INPUT 2
+-#define ALLPASS_OUTPUT 3
+-
+-static LADSPA_Descriptor *allPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *gain;
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} AllPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return allPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateAllPass(LADSPA_Handle instance) {
+- AllPass *plugin_data = (AllPass *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupAllPass(LADSPA_Handle instance) {
+- AllPass *plugin_data = (AllPass *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortAllPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- AllPass *plugin;
+-
+- plugin = (AllPass *)instance;
+- switch (port) {
+- case ALLPASS_FC:
+- plugin->fc = data;
+- break;
+- case ALLPASS_Q:
+- plugin->Q = data;
+- break;
+- case ALLPASS_INPUT:
+- plugin->input = data;
+- break;
+- case ALLPASS_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateAllPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- AllPass *plugin_data = (AllPass *)malloc(sizeof(AllPass));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runAllPass(LADSPA_Handle instance, unsigned long sample_count) {
+- AllPass *plugin_data = (AllPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Bandwidth (octaves) (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+-
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- ap_set_params(filter, fc, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- // RT 2.9.2013: replace biquad_run with ap2_run to cut
floating-
+- // point multiplications from 5 to 2:
+- buffer_write(output[pos], (LADSPA_Data) ap2_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- allPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (allPassDescriptor) {
+- allPassDescriptor->UniqueID = 9005;
+- allPassDescriptor->Label = "RTallpass2";
+- allPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- allPassDescriptor->Name =
+- D_("RT Biquad Allpass");
+- allPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- allPassDescriptor->Copyright =
+- "GPL";
+- allPassDescriptor->PortCount = 4;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
+- sizeof(LADSPA_PortDescriptor));
+- allPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
+- sizeof(LADSPA_PortRangeHint));
+- allPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(4, sizeof(char*));
+- allPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[ALLPASS_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[ALLPASS_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[ALLPASS_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[ALLPASS_FC].LowerBound = 0;
+- port_range_hints[ALLPASS_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Bandwidth (octaves) */
+- port_descriptors[ALLPASS_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[ALLPASS_Q] =
+- D_("Q");
+- port_range_hints[ALLPASS_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[ALLPASS_Q].LowerBound = 0;
+- port_range_hints[ALLPASS_Q].UpperBound = 10;
+-
+- /* Parameters for Input */
+- port_descriptors[ALLPASS_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[ALLPASS_INPUT] =
+- D_("Input");
+- port_range_hints[ALLPASS_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[ALLPASS_INPUT].LowerBound = -1.0;
+- port_range_hints[ALLPASS_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[ALLPASS_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[ALLPASS_OUTPUT] =
+- D_("Output");
+- port_range_hints[ALLPASS_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[ALLPASS_OUTPUT].LowerBound = -1.0;
+- port_range_hints[ALLPASS_OUTPUT].UpperBound = +1.0;
+-
+- allPassDescriptor->activate = activateAllPass;
+- allPassDescriptor->cleanup = cleanupAllPass;
+- allPassDescriptor->connect_port = connectPortAllPass;
+- allPassDescriptor->deactivate = NULL;
+- allPassDescriptor->instantiate = instantiateAllPass;
+- allPassDescriptor->run = runAllPass;
+- allPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (allPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)allPassDescriptor->PortDescriptors);
+- free((char **)allPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)allPassDescriptor->PortRangeHints);
+- free(allPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RThighpass.c b/RThighpass.c
+deleted file mode 100644
+index 3376ad9..0000000
+--- a/RThighpass.c
++++ /dev/null
+@@ -1,251 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define HIGHPASS_FC 0
+-#define HIGHPASS_Q 1
+-#define HIGHPASS_INPUT 2
+-#define HIGHPASS_OUTPUT 3
+-
+-static LADSPA_Descriptor *highPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} HighPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return highPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateHighPass(LADSPA_Handle instance) {
+- HighPass *plugin_data = (HighPass *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupHighPass(LADSPA_Handle instance) {
+- HighPass *plugin_data = (HighPass *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortHighPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- HighPass *plugin;
+-
+- plugin = (HighPass *)instance;
+- switch (port) {
+- case HIGHPASS_FC:
+- plugin->fc = data;
+- break;
+- case HIGHPASS_Q:
+- plugin->Q = data;
+- break;
+- case HIGHPASS_INPUT:
+- plugin->input = data;
+- break;
+- case HIGHPASS_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateHighPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- HighPass *plugin_data = (HighPass *)malloc(sizeof(HighPass));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runHighPass(LADSPA_Handle instance, unsigned long sample_count)
{
+- HighPass *plugin_data = (HighPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Bandwidth (octaves) (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- hp_set_params(filter, fc, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- highPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (highPassDescriptor) {
+- highPassDescriptor->UniqueID = 9007;
+- highPassDescriptor->Label = "RThighpass";
+- highPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- highPassDescriptor->Name =
+- D_("RT 2nd-order highpass");
+- highPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- highPassDescriptor->Copyright =
+- "GPL";
+- highPassDescriptor->PortCount = 4;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
+- sizeof(LADSPA_PortDescriptor));
+- highPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
+- sizeof(LADSPA_PortRangeHint));
+- highPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(4, sizeof(char*));
+- highPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[HIGHPASS_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[HIGHPASS_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[HIGHPASS_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[HIGHPASS_FC].LowerBound = 0;
+- port_range_hints[HIGHPASS_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Q */
+- port_descriptors[HIGHPASS_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[HIGHPASS_Q] =
+- D_("Q");
+- port_range_hints[HIGHPASS_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[HIGHPASS_Q].LowerBound = 0;
+- port_range_hints[HIGHPASS_Q].UpperBound = 5;
+-
+- /* Parameters for Input */
+- port_descriptors[HIGHPASS_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[HIGHPASS_INPUT] =
+- D_("Input");
+- port_range_hints[HIGHPASS_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[HIGHPASS_INPUT].LowerBound = -1.0;
+- port_range_hints[HIGHPASS_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[HIGHPASS_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[HIGHPASS_OUTPUT] =
+- D_("Output");
+- port_range_hints[HIGHPASS_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[HIGHPASS_OUTPUT].LowerBound = -1.0;
+- port_range_hints[HIGHPASS_OUTPUT].UpperBound = +1.0;
+-
+- highPassDescriptor->activate = activateHighPass;
+- highPassDescriptor->cleanup = cleanupHighPass;
+- highPassDescriptor->connect_port = connectPortHighPass;
+- highPassDescriptor->deactivate = NULL;
+- highPassDescriptor->instantiate = instantiateHighPass;
+- highPassDescriptor->run = runHighPass;
+- highPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (highPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)highPassDescriptor->PortDescriptors);
+- free((char **)highPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)highPassDescriptor->PortRangeHints);
+- free(highPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RThighshelf.c b/RThighshelf.c
+deleted file mode 100644
+index 9d02d45..0000000
+--- a/RThighshelf.c
++++ /dev/null
+@@ -1,269 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define HIGHSHELF_GAIN 0
+-#define HIGHSHELF_FC 1
+-#define HIGHSHELF_Q 2
+-#define HIGHSHELF_INPUT 3
+-#define HIGHSHELF_OUTPUT 4
+-
+-static LADSPA_Descriptor *highShelfDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *gain;
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} HighShelf;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return highShelfDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateHighShelf(LADSPA_Handle instance) {
+- HighShelf *plugin_data = (HighShelf *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupHighShelf(LADSPA_Handle instance) {
+- HighShelf *plugin_data = (HighShelf *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortHighShelf(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- HighShelf *plugin;
+-
+- plugin = (HighShelf *)instance;
+- switch (port) {
+- case HIGHSHELF_GAIN:
+- plugin->gain = data;
+- break;
+- case HIGHSHELF_FC:
+- plugin->fc = data;
+- break;
+- case HIGHSHELF_Q:
+- plugin->Q = data;
+- break;
+- case HIGHSHELF_INPUT:
+- plugin->input = data;
+- break;
+- case HIGHSHELF_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateHighShelf(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- HighShelf *plugin_data = (HighShelf *)malloc(sizeof(HighShelf));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runHighShelf(LADSPA_Handle instance, unsigned long
sample_count) {
+- HighShelf *plugin_data = (HighShelf *)instance;
+-
+- /* Gain (dB) (float value) */
+- const LADSPA_Data gain = *(plugin_data->gain);
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Bandwidth (octaves) (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- hs_set_params(filter, fc, gain, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- highShelfDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (highShelfDescriptor) {
+- highShelfDescriptor->UniqueID = 9003;
+- highShelfDescriptor->Label = "RThighshelf";
+- highShelfDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- highShelfDescriptor->Name =
+- D_("RT High Shelf");
+- highShelfDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- highShelfDescriptor->Copyright =
+- "GPL";
+- highShelfDescriptor->PortCount = 5;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
+- sizeof(LADSPA_PortDescriptor));
+- highShelfDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
+- sizeof(LADSPA_PortRangeHint));
+- highShelfDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(5, sizeof(char*));
+- highShelfDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Gain (dB) */
+- port_descriptors[HIGHSHELF_GAIN] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[HIGHSHELF_GAIN] =
+- D_("Gain (dB)");
+- port_range_hints[HIGHSHELF_GAIN].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_0;
+- port_range_hints[HIGHSHELF_GAIN].LowerBound = -70;
+- port_range_hints[HIGHSHELF_GAIN].UpperBound = +30;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[HIGHSHELF_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[HIGHSHELF_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[HIGHSHELF_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[HIGHSHELF_FC].LowerBound = 0;
+- port_range_hints[HIGHSHELF_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Quality Factor */
+- port_descriptors[HIGHSHELF_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[HIGHSHELF_Q] =
+- D_("Q");
+- port_range_hints[HIGHSHELF_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[HIGHSHELF_Q].LowerBound = 0;
+- port_range_hints[HIGHSHELF_Q].UpperBound = 5;
+-
+- /* Parameters for Input */
+- port_descriptors[HIGHSHELF_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[HIGHSHELF_INPUT] =
+- D_("Input");
+- port_range_hints[HIGHSHELF_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[HIGHSHELF_INPUT].LowerBound = -1.0;
+- port_range_hints[HIGHSHELF_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[HIGHSHELF_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[HIGHSHELF_OUTPUT] =
+- D_("Output");
+- port_range_hints[HIGHSHELF_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[HIGHSHELF_OUTPUT].LowerBound = -1.0;
+- port_range_hints[HIGHSHELF_OUTPUT].UpperBound = +1.0;
+-
+- highShelfDescriptor->activate = activateHighShelf;
+- highShelfDescriptor->cleanup = cleanupHighShelf;
+- highShelfDescriptor->connect_port = connectPortHighShelf;
+- highShelfDescriptor->deactivate = NULL;
+- highShelfDescriptor->instantiate = instantiateHighShelf;
+- highShelfDescriptor->run = runHighShelf;
+- highShelfDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (highShelfDescriptor) {
+- free((LADSPA_PortDescriptor
*)highShelfDescriptor->PortDescriptors);
+- free((char **)highShelfDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)highShelfDescriptor->PortRangeHints);
+- free(highShelfDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTlowpass.c b/RTlowpass.c
+deleted file mode 100644
+index 9ea377f..0000000
+--- a/RTlowpass.c
++++ /dev/null
+@@ -1,251 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define LOWPASS_FC 0
+-#define LOWPASS_Q 1
+-#define LOWPASS_INPUT 2
+-#define LOWPASS_OUTPUT 3
+-
+-static LADSPA_Descriptor *lowPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} LowPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return lowPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateLowPass(LADSPA_Handle instance) {
+- LowPass *plugin_data = (LowPass *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupLowPass(LADSPA_Handle instance) {
+- LowPass *plugin_data = (LowPass *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortLowPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- LowPass *plugin;
+-
+- plugin = (LowPass *)instance;
+- switch (port) {
+- case LOWPASS_FC:
+- plugin->fc = data;
+- break;
+- case LOWPASS_Q:
+- plugin->Q = data;
+- break;
+- case LOWPASS_INPUT:
+- plugin->input = data;
+- break;
+- case LOWPASS_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateLowPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- LowPass *plugin_data = (LowPass *)malloc(sizeof(LowPass));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runLowPass(LADSPA_Handle instance, unsigned long sample_count) {
+- LowPass *plugin_data = (LowPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Bandwidth (octaves) (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- lp_set_params(filter, fc, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- lowPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (lowPassDescriptor) {
+- lowPassDescriptor->UniqueID = 9006;
+- lowPassDescriptor->Label = "RTlowpass";
+- lowPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- lowPassDescriptor->Name =
+- D_("RT 2nd-order lowpass");
+- lowPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- lowPassDescriptor->Copyright =
+- "GPL";
+- lowPassDescriptor->PortCount = 4;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
+- sizeof(LADSPA_PortDescriptor));
+- lowPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
+- sizeof(LADSPA_PortRangeHint));
+- lowPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(4, sizeof(char*));
+- lowPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[LOWPASS_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LOWPASS_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[LOWPASS_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[LOWPASS_FC].LowerBound = 0;
+- port_range_hints[LOWPASS_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Q */
+- port_descriptors[LOWPASS_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LOWPASS_Q] =
+- D_("Q");
+- port_range_hints[LOWPASS_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[LOWPASS_Q].LowerBound = 0;
+- port_range_hints[LOWPASS_Q].UpperBound = 5;
+-
+- /* Parameters for Input */
+- port_descriptors[LOWPASS_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[LOWPASS_INPUT] =
+- D_("Input");
+- port_range_hints[LOWPASS_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LOWPASS_INPUT].LowerBound = -1.0;
+- port_range_hints[LOWPASS_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[LOWPASS_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[LOWPASS_OUTPUT] =
+- D_("Output");
+- port_range_hints[LOWPASS_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LOWPASS_OUTPUT].LowerBound = -1.0;
+- port_range_hints[LOWPASS_OUTPUT].UpperBound = +1.0;
+-
+- lowPassDescriptor->activate = activateLowPass;
+- lowPassDescriptor->cleanup = cleanupLowPass;
+- lowPassDescriptor->connect_port = connectPortLowPass;
+- lowPassDescriptor->deactivate = NULL;
+- lowPassDescriptor->instantiate = instantiateLowPass;
+- lowPassDescriptor->run = runLowPass;
+- lowPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (lowPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)lowPassDescriptor->PortDescriptors);
+- free((char **)lowPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)lowPassDescriptor->PortRangeHints);
+- free(lowPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTlowshelf.c b/RTlowshelf.c
+deleted file mode 100644
+index 12a2c7c..0000000
+--- a/RTlowshelf.c
++++ /dev/null
+@@ -1,269 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define LOWSHELF_GAIN 0
+-#define LOWSHELF_FC 1
+-#define LOWSHELF_Q 2
+-#define LOWSHELF_INPUT 3
+-#define LOWSHELF_OUTPUT 4
+-
+-static LADSPA_Descriptor *lowShelfDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *gain;
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} LowShelf;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return lowShelfDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateLowShelf(LADSPA_Handle instance) {
+- LowShelf *plugin_data = (LowShelf *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupLowShelf(LADSPA_Handle instance) {
+- LowShelf *plugin_data = (LowShelf *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortLowShelf(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- LowShelf *plugin;
+-
+- plugin = (LowShelf *)instance;
+- switch (port) {
+- case LOWSHELF_GAIN:
+- plugin->gain = data;
+- break;
+- case LOWSHELF_FC:
+- plugin->fc = data;
+- break;
+- case LOWSHELF_Q:
+- plugin->Q = data;
+- break;
+- case LOWSHELF_INPUT:
+- plugin->input = data;
+- break;
+- case LOWSHELF_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateLowShelf(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- LowShelf *plugin_data = (LowShelf *)malloc(sizeof(LowShelf));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runLowShelf(LADSPA_Handle instance, unsigned long sample_count)
{
+- LowShelf *plugin_data = (LowShelf *)instance;
+-
+- /* Gain (dB) (float value) */
+- const LADSPA_Data gain = *(plugin_data->gain);
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Bandwidth (octaves) (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- ls_set_params(filter, fc, gain, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- lowShelfDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (lowShelfDescriptor) {
+- lowShelfDescriptor->UniqueID = 9002;
+- lowShelfDescriptor->Label = "RTlowshelf";
+- lowShelfDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- lowShelfDescriptor->Name =
+- D_("RT Low Shelf");
+- lowShelfDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- lowShelfDescriptor->Copyright =
+- "GPL";
+- lowShelfDescriptor->PortCount = 5;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
+- sizeof(LADSPA_PortDescriptor));
+- lowShelfDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
+- sizeof(LADSPA_PortRangeHint));
+- lowShelfDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(5, sizeof(char*));
+- lowShelfDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Gain (dB) */
+- port_descriptors[LOWSHELF_GAIN] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LOWSHELF_GAIN] =
+- D_("Gain (dB)");
+- port_range_hints[LOWSHELF_GAIN].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_0;
+- port_range_hints[LOWSHELF_GAIN].LowerBound = -70;
+- port_range_hints[LOWSHELF_GAIN].UpperBound = +30;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[LOWSHELF_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LOWSHELF_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[LOWSHELF_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[LOWSHELF_FC].LowerBound = 0;
+- port_range_hints[LOWSHELF_FC].UpperBound = (LADSPA_Data) 0.4;
+-
+- /* Parameters for Quality Factor */
+- port_descriptors[LOWSHELF_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LOWSHELF_Q] =
+- D_("Q");
+- port_range_hints[LOWSHELF_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[LOWSHELF_Q].LowerBound = 0;
+- port_range_hints[LOWSHELF_Q].UpperBound = 5;
+-
+- /* Parameters for Input */
+- port_descriptors[LOWSHELF_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[LOWSHELF_INPUT] =
+- D_("Input");
+- port_range_hints[LOWSHELF_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LOWSHELF_INPUT].LowerBound = -1.0;
+- port_range_hints[LOWSHELF_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[LOWSHELF_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[LOWSHELF_OUTPUT] =
+- D_("Output");
+- port_range_hints[LOWSHELF_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LOWSHELF_OUTPUT].LowerBound = -1.0;
+- port_range_hints[LOWSHELF_OUTPUT].UpperBound = +1.0;
+-
+- lowShelfDescriptor->activate = activateLowShelf;
+- lowShelfDescriptor->cleanup = cleanupLowShelf;
+- lowShelfDescriptor->connect_port = connectPortLowShelf;
+- lowShelfDescriptor->deactivate = NULL;
+- lowShelfDescriptor->instantiate = instantiateLowShelf;
+- lowShelfDescriptor->run = runLowShelf;
+- lowShelfDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (lowShelfDescriptor) {
+- free((LADSPA_PortDescriptor
*)lowShelfDescriptor->PortDescriptors);
+- free((char **)lowShelfDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)lowShelfDescriptor->PortRangeHints);
+- free(lowShelfDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTlr4hipass.c b/RTlr4hipass.c
+deleted file mode 100644
+index 15d6c49..0000000
+--- a/RTlr4hipass.c
++++ /dev/null
+@@ -1,239 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define LR4HIGHPASS_FC 0
+-#define LR4HIGHPASS_INPUT 1
+-#define LR4HIGHPASS_OUTPUT 2
+-
+-static LADSPA_Descriptor *lr4highPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *fc;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filters;
+- float fs;
+-} LR4HighPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return lr4highPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateLR4HighPass(LADSPA_Handle instance) {
+- LR4HighPass *plugin_data = (LR4HighPass *)instance;
+- biquad *filters = plugin_data->filters;
+- float fs = plugin_data->fs;
+- biquad_init(&filters[0]);
+- biquad_init(&filters[1]);
+- plugin_data->filters = filters;
+- plugin_data->fs = fs;
+-}
+-
+-static void cleanupLR4HighPass(LADSPA_Handle instance) {
+- LR4HighPass *plugin_data = (LR4HighPass *)instance;
+- free(plugin_data->filters);
+- free(instance);
+-}
+-
+-static void connectPortLR4HighPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- LR4HighPass *plugin;
+-
+- plugin = (LR4HighPass *)instance;
+- switch (port) {
+- case LR4HIGHPASS_FC:
+- plugin->fc = data;
+- break;
+- case LR4HIGHPASS_INPUT:
+- plugin->input = data;
+- break;
+- case LR4HIGHPASS_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateLR4HighPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- LR4HighPass *plugin_data = (LR4HighPass *)malloc(sizeof(LR4HighPass));
+- biquad *filters = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+-
+- filters = calloc(2, sizeof(biquad));
+- biquad_init(&filters[0]);
+- biquad_init(&filters[1]);
+-
+- plugin_data->filters = filters;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runLR4HighPass(LADSPA_Handle instance, unsigned long
sample_count) {
+- LR4HighPass *plugin_data = (LR4HighPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filters = plugin_data->filters;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+- bq_t in;
+-
+- hp_set_params(&filters[0], fc, 0.7071068, fs);
+- hp_set_params(&filters[1], fc, 0.7071068, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- in = biquad_run(&filters[0], input[pos]);
+- in = biquad_run(&filters[1], in);
+- buffer_write(output[pos], (LADSPA_Data) in);
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- lr4highPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (lr4highPassDescriptor) {
+- lr4highPassDescriptor->UniqueID = 9021;
+- lr4highPassDescriptor->Label = "RTlr4hipass";
+- lr4highPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- lr4highPassDescriptor->Name =
+- D_("RT LR4 highpass");
+- lr4highPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- lr4highPassDescriptor->Copyright =
+- "GPL";
+- lr4highPassDescriptor->PortCount = 3;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
+- sizeof(LADSPA_PortDescriptor));
+- lr4highPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
+- sizeof(LADSPA_PortRangeHint));
+- lr4highPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(3, sizeof(char*));
+- lr4highPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[LR4HIGHPASS_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LR4HIGHPASS_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[LR4HIGHPASS_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[LR4HIGHPASS_FC].LowerBound = 0;
+- port_range_hints[LR4HIGHPASS_FC].UpperBound = (LADSPA_Data)
0.4;
+-
+- /* Parameters for Input */
+- port_descriptors[LR4HIGHPASS_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[LR4HIGHPASS_INPUT] =
+- D_("Input");
+- port_range_hints[LR4HIGHPASS_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LR4HIGHPASS_INPUT].LowerBound = -1.0;
+- port_range_hints[LR4HIGHPASS_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[LR4HIGHPASS_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[LR4HIGHPASS_OUTPUT] =
+- D_("Output");
+- port_range_hints[LR4HIGHPASS_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LR4HIGHPASS_OUTPUT].LowerBound = -1.0;
+- port_range_hints[LR4HIGHPASS_OUTPUT].UpperBound = +1.0;
+-
+- lr4highPassDescriptor->activate = activateLR4HighPass;
+- lr4highPassDescriptor->cleanup = cleanupLR4HighPass;
+- lr4highPassDescriptor->connect_port = connectPortLR4HighPass;
+- lr4highPassDescriptor->deactivate = NULL;
+- lr4highPassDescriptor->instantiate = instantiateLR4HighPass;
+- lr4highPassDescriptor->run = runLR4HighPass;
+- lr4highPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (lr4highPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)lr4highPassDescriptor->PortDescriptors);
+- free((char **)lr4highPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)lr4highPassDescriptor->PortRangeHints);
+- free(lr4highPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTlr4lowpass.c b/RTlr4lowpass.c
+deleted file mode 100644
+index 16ad5c9..0000000
+--- a/RTlr4lowpass.c
++++ /dev/null
+@@ -1,239 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define LR4LOWPASS_FC 0
+-#define LR4LOWPASS_INPUT 1
+-#define LR4LOWPASS_OUTPUT 2
+-
+-static LADSPA_Descriptor *lr4lowPassDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *fc;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filters;
+- float fs;
+-} LR4LowPass;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return lr4lowPassDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateLR4LowPass(LADSPA_Handle instance) {
+- LR4LowPass *plugin_data = (LR4LowPass *)instance;
+- biquad *filters = plugin_data->filters;
+- float fs = plugin_data->fs;
+- biquad_init(&filters[0]);
+- biquad_init(&filters[1]);
+- plugin_data->filters = filters;
+- plugin_data->fs = fs;
+-}
+-
+-static void cleanupLR4LowPass(LADSPA_Handle instance) {
+- LR4LowPass *plugin_data = (LR4LowPass *)instance;
+- free(plugin_data->filters);
+- free(instance);
+-}
+-
+-static void connectPortLR4LowPass(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- LR4LowPass *plugin;
+-
+- plugin = (LR4LowPass *)instance;
+- switch (port) {
+- case LR4LOWPASS_FC:
+- plugin->fc = data;
+- break;
+- case LR4LOWPASS_INPUT:
+- plugin->input = data;
+- break;
+- case LR4LOWPASS_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateLR4LowPass(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- LR4LowPass *plugin_data = (LR4LowPass *)malloc(sizeof(LR4LowPass));
+- biquad *filters = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+-
+- filters = calloc(2, sizeof(biquad));
+- biquad_init(&filters[0]);
+- biquad_init(&filters[1]);
+-
+- plugin_data->filters = filters;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runLR4LowPass(LADSPA_Handle instance, unsigned long
sample_count) {
+- LR4LowPass *plugin_data = (LR4LowPass *)instance;
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filters = plugin_data->filters;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+- bq_t in;
+-
+- lp_set_params(&filters[0], fc, 0.7071068, fs);
+- lp_set_params(&filters[1], fc, 0.7071068, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- in = biquad_run(&filters[0], input[pos]);
+- in = biquad_run(&filters[1], in);
+- buffer_write(output[pos], (LADSPA_Data) in);
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- lr4lowPassDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (lr4lowPassDescriptor) {
+- lr4lowPassDescriptor->UniqueID = 9020;
+- lr4lowPassDescriptor->Label = "RTlr4lowpass";
+- lr4lowPassDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- lr4lowPassDescriptor->Name =
+- D_("RT LR4 lowpass");
+- lr4lowPassDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- lr4lowPassDescriptor->Copyright =
+- "GPL";
+- lr4lowPassDescriptor->PortCount = 3;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
+- sizeof(LADSPA_PortDescriptor));
+- lr4lowPassDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
+- sizeof(LADSPA_PortRangeHint));
+- lr4lowPassDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(3, sizeof(char*));
+- lr4lowPassDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[LR4LOWPASS_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[LR4LOWPASS_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[LR4LOWPASS_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[LR4LOWPASS_FC].LowerBound = 0;
+- port_range_hints[LR4LOWPASS_FC].UpperBound = (LADSPA_Data)
0.4;
+-
+- /* Parameters for Input */
+- port_descriptors[LR4LOWPASS_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[LR4LOWPASS_INPUT] =
+- D_("Input");
+- port_range_hints[LR4LOWPASS_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LR4LOWPASS_INPUT].LowerBound = -1.0;
+- port_range_hints[LR4LOWPASS_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[LR4LOWPASS_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[LR4LOWPASS_OUTPUT] =
+- D_("Output");
+- port_range_hints[LR4LOWPASS_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[LR4LOWPASS_OUTPUT].LowerBound = -1.0;
+- port_range_hints[LR4LOWPASS_OUTPUT].UpperBound = +1.0;
+-
+- lr4lowPassDescriptor->activate = activateLR4LowPass;
+- lr4lowPassDescriptor->cleanup = cleanupLR4LowPass;
+- lr4lowPassDescriptor->connect_port = connectPortLR4LowPass;
+- lr4lowPassDescriptor->deactivate = NULL;
+- lr4lowPassDescriptor->instantiate = instantiateLR4LowPass;
+- lr4lowPassDescriptor->run = runLR4LowPass;
+- lr4lowPassDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (lr4lowPassDescriptor) {
+- free((LADSPA_PortDescriptor
*)lr4lowPassDescriptor->PortDescriptors);
+- free((char **)lr4lowPassDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)lr4lowPassDescriptor->PortRangeHints);
+- free(lr4lowPassDescriptor);
+- }
+-
+-}
+-
+diff --git a/RTparaeq.c b/RTparaeq.c
+deleted file mode 100644
+index 3e77a83..0000000
+--- a/RTparaeq.c
++++ /dev/null
+@@ -1,269 +0,0 @@
+-/* Copyright 2013 Richard Taylor
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+- CREDITS:
+-
+- Much of the code here was adapted from Steve Harris's swh-plugins
+- (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
+- making your code available.
+-
+- The guts of the code, in util/biquad.h, is an implementation
+- of the biquad filters described in Robert Bristow-Johnson's "Cookbook
+- formulae for audio EQ biquad filter coefficients" found here:
+- http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
+-*/
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#define _ISOC9X_SOURCE 1
+-#define _ISOC99_SOURCE 1
+-#define __USE_ISOC99 1
+-#define __USE_ISOC9X 1
+-
+-#include <math.h>
+-
+-#include "ladspa.h"
+-
+-#include "util/biquad.h"
+-
+-#define SINGLEPARA_GAIN 0
+-#define SINGLEPARA_FC 1
+-#define SINGLEPARA_Q 2
+-#define SINGLEPARA_INPUT 3
+-#define SINGLEPARA_OUTPUT 4
+-
+-static LADSPA_Descriptor *singleParaDescriptor = NULL;
+-
+-typedef struct {
+- LADSPA_Data *gain;
+- LADSPA_Data *fc;
+- LADSPA_Data *Q;
+- LADSPA_Data *input;
+- LADSPA_Data *output;
+- biquad * filter;
+- float fs;
+-} SinglePara;
+-
+-const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
+- switch (index) {
+- case 0:
+- return singleParaDescriptor;
+- default:
+- return NULL;
+- }
+-}
+-
+-static void activateSinglePara(LADSPA_Handle instance) {
+- SinglePara *plugin_data = (SinglePara *)instance;
+- biquad *filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+- biquad_init(filter);
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+-}
+-
+-static void cleanupSinglePara(LADSPA_Handle instance) {
+- SinglePara *plugin_data = (SinglePara *)instance;
+- free(plugin_data->filter);
+- free(instance);
+-}
+-
+-static void connectPortSinglePara(
+- LADSPA_Handle instance,
+- unsigned long port,
+- LADSPA_Data *data) {
+- SinglePara *plugin;
+-
+- plugin = (SinglePara *)instance;
+- switch (port) {
+- case SINGLEPARA_GAIN:
+- plugin->gain = data;
+- break;
+- case SINGLEPARA_FC:
+- plugin->fc = data;
+- break;
+- case SINGLEPARA_Q:
+- plugin->Q = data;
+- break;
+- case SINGLEPARA_INPUT:
+- plugin->input = data;
+- break;
+- case SINGLEPARA_OUTPUT:
+- plugin->output = data;
+- break;
+- }
+-}
+-
+-static LADSPA_Handle instantiateSinglePara(
+- const LADSPA_Descriptor *descriptor,
+- unsigned long s_rate) {
+- SinglePara *plugin_data = (SinglePara *)malloc(sizeof(SinglePara));
+- biquad *filter = NULL;
+- float fs;
+-
+- fs = (float)s_rate;
+- filter = malloc(sizeof(biquad));
+- biquad_init(filter);
+-
+- plugin_data->filter = filter;
+- plugin_data->fs = fs;
+-
+- return (LADSPA_Handle)plugin_data;
+-}
+-
+-#undef buffer_write
+-#define buffer_write(b, v) (b = v)
+-
+-static void runSinglePara(LADSPA_Handle instance, unsigned long
sample_count) {
+- SinglePara *plugin_data = (SinglePara *)instance;
+-
+- /* Gain (dB) (float value) */
+- const LADSPA_Data gain = *(plugin_data->gain);
+-
+- /* Frequency (Hz) (float value) */
+- const LADSPA_Data fc = *(plugin_data->fc);
+-
+- /* Quality factor (float value) */
+- const LADSPA_Data Q = *(plugin_data->Q);
+-
+- /* Input (array of floats of length sample_count) */
+- const LADSPA_Data * const input = plugin_data->input;
+-
+- /* Output (array of floats of length sample_count) */
+- LADSPA_Data * const output = plugin_data->output;
+- biquad * filter = plugin_data->filter;
+- float fs = plugin_data->fs;
+-
+- unsigned long pos;
+-
+- eq_set_params(filter, fc, gain, Q, fs);
+-
+- for (pos = 0; pos < sample_count; pos++) {
+- buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
+- }
+-
+-}
+-
+-void _init(void);
+-void _init(void) {
+- char **port_names;
+- LADSPA_PortDescriptor *port_descriptors;
+- LADSPA_PortRangeHint *port_range_hints;
+-
+-#define D_(s) (s)
+-
+- singleParaDescriptor =
+- (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
+-
+- if (singleParaDescriptor) {
+- singleParaDescriptor->UniqueID = 9001;
+- singleParaDescriptor->Label = "RTparaeq";
+- singleParaDescriptor->Properties =
+- LADSPA_PROPERTY_HARD_RT_CAPABLE;
+- singleParaDescriptor->Name =
+- D_("RT parametric eq");
+- singleParaDescriptor->Maker =
+- "Richard Taylor <rtaylor AT tru.ca>";
+- singleParaDescriptor->Copyright =
+- "GPL";
+- singleParaDescriptor->PortCount = 5;
+-
+- port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
+- sizeof(LADSPA_PortDescriptor));
+- singleParaDescriptor->PortDescriptors =
+- (const LADSPA_PortDescriptor *)port_descriptors;
+-
+- port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
+- sizeof(LADSPA_PortRangeHint));
+- singleParaDescriptor->PortRangeHints =
+- (const LADSPA_PortRangeHint *)port_range_hints;
+-
+- port_names = (char **)calloc(5, sizeof(char*));
+- singleParaDescriptor->PortNames =
+- (const char **)port_names;
+-
+- /* Parameters for Gain (dB) */
+- port_descriptors[SINGLEPARA_GAIN] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[SINGLEPARA_GAIN] =
+- D_("Gain (dB)");
+- port_range_hints[SINGLEPARA_GAIN].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[SINGLEPARA_GAIN].LowerBound = -70;
+- port_range_hints[SINGLEPARA_GAIN].UpperBound = +30;
+-
+- /* Parameters for Frequency (Hz) */
+- port_descriptors[SINGLEPARA_FC] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[SINGLEPARA_FC] =
+- D_("Frequency (Hz)");
+- port_range_hints[SINGLEPARA_FC].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
+- port_range_hints[SINGLEPARA_FC].LowerBound = 0;
+- port_range_hints[SINGLEPARA_FC].UpperBound = (LADSPA_Data)
0.4;
+-
+- /* Parameters for Quality Factor */
+- port_descriptors[SINGLEPARA_Q] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
+- port_names[SINGLEPARA_Q] =
+- D_("Q");
+- port_range_hints[SINGLEPARA_Q].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
+- port_range_hints[SINGLEPARA_Q].LowerBound = 0;
+- port_range_hints[SINGLEPARA_Q].UpperBound = 100;
+-
+- /* Parameters for Input */
+- port_descriptors[SINGLEPARA_INPUT] =
+- LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
+- port_names[SINGLEPARA_INPUT] =
+- D_("Input");
+- port_range_hints[SINGLEPARA_INPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[SINGLEPARA_INPUT].LowerBound = -1.0;
+- port_range_hints[SINGLEPARA_INPUT].UpperBound = +1.0;
+-
+- /* Parameters for Output */
+- port_descriptors[SINGLEPARA_OUTPUT] =
+- LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
+- port_names[SINGLEPARA_OUTPUT] =
+- D_("Output");
+- port_range_hints[SINGLEPARA_OUTPUT].HintDescriptor =
+- LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
+- port_range_hints[SINGLEPARA_OUTPUT].LowerBound = -1.0;
+- port_range_hints[SINGLEPARA_OUTPUT].UpperBound = +1.0;
+-
+- singleParaDescriptor->activate = activateSinglePara;
+- singleParaDescriptor->cleanup = cleanupSinglePara;
+- singleParaDescriptor->connect_port = connectPortSinglePara;
+- singleParaDescriptor->deactivate = NULL;
+- singleParaDescriptor->instantiate = instantiateSinglePara;
+- singleParaDescriptor->run = runSinglePara;
+- singleParaDescriptor->run_adding = NULL;
+- }
+-}
+-
+-void _fini(void);
+-void _fini(void) {
+- if (singleParaDescriptor) {
+- free((LADSPA_PortDescriptor
*)singleParaDescriptor->PortDescriptors);
+- free((char **)singleParaDescriptor->PortNames);
+- free((LADSPA_PortRangeHint
*)singleParaDescriptor->PortRangeHints);
+- free(singleParaDescriptor);
+- }
+-
+-}
+-
+diff --git a/build/.keep b/build/.keep
+new file mode 100644
+index 0000000..e69de29
+diff --git a/cmake/compilerwarnings.cmake b/cmake/compilerwarnings.cmake
+new file mode 100644
+index 0000000..7f6f935
+--- /dev/null
++++ b/cmake/compilerwarnings.cmake
+@@ -0,0 +1,37 @@
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Werror" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wall" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wextra" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -pedantic" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wcast-align" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wconversion" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wformat-nonliteral" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wformat-security" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wfloat-equal" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Winit-self" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wlogical-op" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wmissing-include-dirs" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wno-write-strings" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wpointer-arith" )
++#set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wswitch-default" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wswitch-enum" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wundef" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wunused-macros" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wno-unused-parameter" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wshadow" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wpacked" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wredundant-decls" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Wunreachable-code" )
++set( WARNINGS_COMMONFLAGS "${WARNINGS_COMMONFLAGS} -Winline" )
++#
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNINGS_COMMONFLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wold-style-definition")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-declarations")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wnested-externs")
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS_COMMONFLAGS}")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual" )
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++" )
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast" )
+diff --git a/cmake/cppcheck.cmake b/cmake/cppcheck.cmake
+new file mode 100644
+index 0000000..86d49a2
+--- /dev/null
++++ b/cmake/cppcheck.cmake
+@@ -0,0 +1,12 @@
++find_program(CPPCHECK_EXE "cppcheck")
++
++if(CPPCHECK_EXE)
++ message(STATUS "[CPPCHECK] at ${CPPCHECK_EXE}")
++ add_custom_target(cppcheck)
++
++ add_custom_command(TARGET cppcheck POST_BUILD
++ COMMAND ${CPPCHECK_EXE} --template=gcc -f --std=posix --std=c99
--std=c++11 --enable=all -i ${PROJECT_BINARY_DIR} -I
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}
++ )
++else()
++ message(STATUS "[CPPCHECK] Could not find cppcheck executable")
++endif()
+diff --git a/include/biquad.h b/include/biquad.h
+new file mode 100644
+index 0000000..49451d8
+--- /dev/null
++++ b/include/biquad.h
+@@ -0,0 +1,331 @@
++#ifndef BIQUAD_H
++#define BIQUAD_H
++
++#define LN_2_2 0.34657359f // ln(2)/2
++
++#include "ladspa-util.h"
++#include <math.h>
++
++#ifndef LIMIT
++#define LIMIT(v,l,u) (v<l?l:(v>u?u:v))
++#endif
++
++// rt 8.1.2013: store biquad coefficients and accumulators in double
++// precision, to limit effects of round-off error. Change this to
++// float if you need more speed: it probably won't make an audible
++// difference unless you need filters with really high Q or low
++// frequency.
++#ifndef BIQUAD_TYPE
++#define BIQUAD_TYPE double
++#endif
++
++// rt 25.6.2013: amplitude of square wave (at Nyquist freq)
++// added to kill denormals ... may need to experiment with
++// this value. NB: 1.e-18 = -360dB
++#define DENORMALKILLER 1.e-18;
++
++typedef BIQUAD_TYPE bq_t;
++
++/* Biquad filter (adapted from lisp code by Eli Brandt,
++ http://www.cs.cmu.edu/~eli/) */
++
++typedef struct {
++ bq_t a1;
++ bq_t a2;
++ bq_t b0;
++ bq_t b1;
++ bq_t b2;
++ bq_t x1;
++ bq_t x2;
++ bq_t y1;
++ bq_t y2;
++ bq_t dn; // denormal state (rt 25.6.2013)
++} biquad;
++
++typedef struct {
++ bq_t a1;
++ bq_t b0;
++ bq_t b1;
++ bq_t x1;
++ bq_t y1;
++ bq_t dn; // denormal state
++} bilin;
++
++
++static inline void biquad_init(biquad *f) {
++ f->x1 = 0.0f;
++ f->x2 = 0.0f;
++ f->y1 = 0.0f;
++ f->y2 = 0.0f;
++ f->dn = DENORMALKILLER;
++}
++
++static inline void bilin_init(bilin *f) {
++ f->x1 = 0.0f;
++ f->y1 = 0.0f;
++ f->dn = DENORMALKILLER;
++}
++
++//static inline void eq_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
++// bq_t fs);
++static inline void eq_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
bq_t fs)
++{
++ bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0f, fs/2.0f) / fs;
++ bq_t J = pow(10.0f, gain * 0.025f);
++ bq_t cw = cos(w);
++ bq_t sw = sin(w);
++ Q = Q / J; // adjust so input Q is standard elec. eng. Q
++// bq_t g = sw * sinhf(LN_2_2 * LIMIT(bw, 0.0001f, 4.0f) * w / sw); //
case: bw
++ bq_t g = sw/(2.0*Q); // case: Q
++// bq_t g = sin(w0)/2.0 * sqrt( (J + 1.0/J)*(1.0/S - 1.0) + 2.0 ) //
case: S
++
++ bq_t a0 = 1.0f + g / J;
++ bq_t a0r = 1.0f / a0;
++
++ f->b0 = (1.0 + (g * J)) * a0r;
++ f->b1 = (-2.0 * cw) * a0r;
++ f->b2 = (1.0 - (g * J)) * a0r;
++ f->a1 = -(f->b1);
++ f->a2 = ((g / J) - 1.0) * a0r;
++}
++
++//static inline void ls_set_params(biquad *f, bq_t fc, bq_t gain, bq_t
slope,
++// bq_t fs);
++static inline void ls_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
++ bq_t fs)
++{
++ bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0, fs/2.0) / fs;
++ bq_t cw = cos(w);
++ bq_t sw = sin(w);
++ bq_t A = powf(10.0f, (float) (gain * (bq_t) 0.025));
++
++// rt 8.1.2013: increased slope limit from 1.0f to 5.0f:
++// bq_t b = sqrt(((1.0f + A * A) / LIMIT(slope, 0.0001f, 5.0f)) - ((A -
++// 1.0f) * (A - 1.0)));
++
++// bq_t apc = cw * (A + 1.0f);
++// bq_t amc = cw * (A - 1.0f);
++// bq_t bs = b * sw;
++// bq_t a0r = 1.0f / (A + 1.0f + amc + bs);
++
++// f->b0 = a0r * A * (A + 1.0f - amc + bs);
++// f->b1 = a0r * 2.0f * A * (A - 1.0f - apc);
++// f->b2 = a0r * A * (A + 1.0f - amc - bs);
++// f->a1 = a0r * 2.0f * (A - 1.0f + apc);
++// f->a2 = a0r * (-A - 1.0f - amc + bs);
++
++ // rt 22.1.2013 changed this to use Q instead of slope
++ bq_t alpha = sw / (2.0 * Q);
++ bq_t b = 2.0*sqrt(A)*alpha;
++ bq_t ap = A + 1.0;
++ bq_t am = A - 1.0;
++ bq_t a0 = ap + am*cw + b;
++ bq_t a0r = 1.0 / a0;
++
++ f->b0 = a0r * A * (ap - am*cw + b);
++ f->b1 = a0r * 2.0 * A * (am - ap*cw);
++ f->b2 = a0r * A * (ap - am*cw - b);
++ f->a1 = 2.0 * a0r * (am + ap*cw);
++ f->a2 = -a0r * (ap + am*cw - b);
++}
++
++//static inline void hs_set_params(biquad *f, bq_t fc, bq_t gain, bq_t
slope,
++// bq_t fs);
++static inline void hs_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
bq_t fs)
++{
++ bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0, fs/2.0) / fs;
++ bq_t cw = cos(w);
++ bq_t sw = sin(w);
++ bq_t A = powf(10.0f, (float) (gain * (bq_t) 0.025));
++// rt 8.1.2013: increased slope limit from 1.0f to 5.0f:
++// bq_t b = sqrt(((1.0f + A * A) / LIMIT(slope, 0.0001f, 5.0f)) - ((A -
++// 1.0f) * (A - 1.0f)));
++// bq_t apc = cw * (A + 1.0f);
++// bq_t amc = cw * (A - 1.0f);
++// bq_t bs = b * sw;
++// bq_t a0r = 1.0f / (A + 1.0f - amc + bs);
++
++// f->b0 = a0r * A * (A + 1.0f + amc + bs);
++// f->b1 = a0r * -2.0f * A * (A - 1.0f + apc);
++// f->b2 = a0r * A * (A + 1.0f + amc - bs);
++// f->a1 = a0r * -2.0f * (A - 1.0f - apc);
++// f->a2 = a0r * (-A - 1.0f + amc + bs);
++
++ // rt 22.1.2013 changed this to use Q instead of slope
++ bq_t alpha = sw / (2.0 * Q);
++ bq_t b = 2.0*sqrt(A)*alpha;
++ bq_t ap = A + 1.0;
++ bq_t am = A - 1.0;
++ bq_t a0 = ap - am*cw + b;
++ bq_t a0r = 1.0 / a0;
++
++ f->b0 = a0r * A * (ap + am*cw + b);
++ f->b1 = -a0r * 2.0 * A * (am + ap*cw);
++ f->b2 = a0r * A * (ap + am*cw - b);
++ f->a1 = -2.0 * a0r * (am - ap*cw);
++ f->a2 = -a0r * (ap - am*cw - b);
++}
++
++static inline void lp_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
++{
++ bq_t omega = 2.0 * M_PI * fc/fs;
++ bq_t sn = sin(omega);
++ bq_t cs = cos(omega);
++// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
++ bq_t alpha = sn / (2.0 * Q);
++
++ const bq_t a0r = 1.0 / (1.0 + alpha);
++ f->b0 = a0r * (1.0 - cs) * 0.5;
++ f->b1 = a0r * (1.0 - cs);
++ f->b2 = a0r * (1.0 - cs) * 0.5;
++ f->a1 = a0r * (2.0 * cs);
++ f->a2 = a0r * (alpha - 1.0);
++}
++
++static inline void hp_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
++{
++ bq_t omega = 2.0 * M_PI * fc/fs;
++ bq_t sn = sin(omega);
++ bq_t cs = cos(omega);
++// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
++ bq_t alpha = sn / (2.0 * Q);
++
++ const bq_t a0r = 1.0 / (1.0 + alpha);
++ f->b0 = a0r * (1.0 + cs) * 0.5;
++ f->b1 = a0r * -(1.0 + cs);
++ f->b2 = a0r * (1.0 + cs) * 0.5;
++ f->a1 = a0r * (2.0 * cs);
++ f->a2 = a0r * (alpha - 1.0);
++}
++
++static inline void bp_set_params(biquad *f, bq_t fc, bq_t bw, bq_t fs)
++{
++ bq_t omega = 2.0 * M_PI * fc/fs;
++ bq_t sn = sin(omega);
++ bq_t cs = cos(omega);
++ bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
++
++ const bq_t a0r = 1.0 / (1.0 + alpha);
++ f->b0 = a0r * alpha;
++ f->b1 = 0.0;
++ f->b2 = a0r * -alpha;
++ f->a1 = a0r * (2.0 * cs);
++ f->a2 = a0r * (alpha - 1.0);
++}
++
++// rt 8.1.2013: allpass from biquad cookbook
++static inline void ap_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
++{
++ bq_t omega = 2.0 * M_PI * fc/fs;
++ bq_t sn = sin(omega);
++ bq_t cs = cos(omega);
++// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
++ bq_t alpha = sn / (2.0 * Q);
++
++ bq_t a0 = 1.0 + alpha;
++ bq_t a0r = 1.0 / a0;
++ f->b0 = a0r * (1.0 - alpha);
++ f->b1 = a0r * (-2.0 * cs);
++ f->b2 = 1.0;
++ f->a1 = -f->b1;
++ f->a2 = -f->b0;
++}
++
++static inline void ap1_set_params(bilin *f, bq_t fc, bq_t fs)
++{
++// rt 8.1.2013: implementation of first-order digital allpass found here:
++//
https://ccrma.stanford.edu/realsimple/DelayVar/Phasing_First_Order_Allpass_Filters.html
++// see here for turning transfer function into difference equation:
++// http://en.wikipedia.org/wiki/Digital_filter
++ bq_t tphi = tan( M_PI * fc / fs);
++ bq_t p = (1.0f - tphi) / (1.0f + tphi);
++
++ // case 1: phase varies from 0 to 180 degrees
++ f->b0 = -p;
++ f->b1 = 1.0f;
++
++ // case 2: phase varies from 180 to 360 degrees
++// f->b0 = p;
++// f->b1 = -1.0f;
++
++ f->a1 = p;
++}
++
++// routine that runs a biquad (i.e. 2nd-order) digital filter
++static inline bq_t biquad_run(biquad *f, const bq_t x) {
++ bq_t y;
++
++// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
++ y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2
++ + f->a1 * f->y1 + f->a2 * f->y2 + f->dn;
++ f->dn = -f->dn;
++
++// see previous commment
++// y = flush_to_zero(y);
++
++ f->x2 = f->x1;
++ f->x1 = x;
++ f->y2 = f->y1;
++ f->y1 = y;
++
++ return y;
++}
++
++// rt 2.9.2013: special version of biquad_run for 2nd-order
++// allpass; takes advantage of factoring to reduce floating-point
++// multiplications from 5 to 2
++static inline bq_t ap2_run(biquad *f, const bq_t x) {
++ bq_t y;
++
++// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
++ y = f->b0 * (x - f->y2) + f->b1 * (f->x1 - f->y1) + f->x2 + f->dn;
++ f->dn = -f->dn;
++
++// see previous commment
++// y = flush_to_zero(y);
++
++ f->x2 = f->x1;
++ f->x1 = x;
++ f->y2 = f->y1;
++ f->y1 = y;
++
++ return y;
++}
++
++// routine that runs a bilinear (i.e. 1st-order) digital filter
++static inline bq_t bilin_run(bilin *f, const bq_t x) {
++ bq_t y;
++
++// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
++ y = f->b0 * x + f->b1 * f->x1 + f->a1 * f->y1 + f->dn;
++ f->dn = -f->dn;
++
++// see previous commment
++// y = flush_to_zero(y);
++
++ f->x1 = x;
++ f->y1 = y;
++
++ return y;
++}
++
++// rt 2.9.2013: special version of bilin_run for 2nd-order
++// allpass; takes advantage of factoring to reduce floating-point
++// multiplications from 5 to 2
++static inline bq_t ap1_run(bilin *f, const bq_t x) {
++ bq_t y;
++
++// rt 15.5.2013: adding a Nyquist-frequency square-wave to kill denormals:
++ y = f->b0 * (x - f->y1) + f->x1 + f->dn;
++ f->dn = -f->dn;
++
++// see previous commment
++// y = flush_to_zero(y);
++
++ f->x1 = x;
++ f->y1 = y;
++
++ return y;
++}
++
++#endif
+diff --git a/include/ladspa-util.h b/include/ladspa-util.h
+new file mode 100644
+index 0000000..2f3264e
+--- /dev/null
++++ b/include/ladspa-util.h
+@@ -0,0 +1,211 @@
++/* Some misc util functions for audio DSP work, written by Steve Harris,
++ * December 2000
++ *
++ * steve AT plugin.org.uk
++ */
++
++#ifndef LADSPA_UTIL_H
++#define LADSPA_UTIL_H
++
++#include <math.h>
++#include <stdint.h>
++
++// 16.16 fixpoint
++typedef union {
++ int32_t all;
++ struct {
++#ifdef WORDS_BIGENDIAN
++ int16_t in;
++ uint16_t fr;
++#else
++ uint16_t fr;
++ int16_t in;
++#endif
++ } part;
++} fixp16;
++
++// 32.32 fixpoint
++typedef union {
++ int64_t all;
++ struct {
++#ifdef WORDS_BIGENDIAN
++ int32_t in;
++ uint32_t fr;
++#else
++ uint32_t fr;
++ int32_t in;
++#endif
++ } part;
++} fixp32;
++
++/* 32 bit "pointer cast" union */
++typedef union {
++ float f;
++ int32_t i;
++} ls_pcast32;
++
++// 1.0 / ln(2)
++#define LN2R 1.442695041f
++
++/* detet floating point denormal numbers by comparing them to the smallest
++ * normal, crap, but reliable */
++#define DN_CHECK(x, l) if (fabs(x) < 1e-38) printf("DN: "l"\n")
++
++// Denormalise floats, only actually needed for PIII and recent PowerPC
++//#define FLUSH_TO_ZERO(fv) (((*(unsigned
int*)&(fv))&0x7f800000)==0)?0.0f:(fv)
++
++static inline float flush_to_zero(float f)
++{
++ ls_pcast32 v;
++
++ v.f = f;
++
++ // original: return (v.i & 0x7f800000) == 0 ? 0.0f : f;
++ // version from Tim Blechmann
++ return (v.i & 0x7f800000) < 0x08000000 ? 0.0f : f;
++}
++
++static inline void round_to_zero(volatile float *f)
++{
++ *f += 1e-18f;
++ *f -= 1e-18f;
++}
++
++/* A set of branchless clipping operations from Laurent de Soras */
++
++static inline float f_max(float x, float a)
++{
++ x -= a;
++ x += fabsf(x);
++ x *= 0.5f;
++ x += a;
++
++ return x;
++}
++
++static inline float f_min(float x, float b)
++{
++ x = b - x;
++ x += fabsf(x);
++ x *= 0.5f;
++ x = b - x;
++
++ return x;
++}
++
++static inline float f_clamp(float x, float a, float b)
++{
++ const float x1 = fabsf(x - a);
++ const float x2 = fabsf(x - b);
++
++ x = x1 + a + b;
++ x -= x2;
++ x *= 0.5f;
++
++ return x;
++}
++
++// Limit a value to be l<=v<=u
++#define LIMIT(v,l,u) ((v)<(l)?(l):((v)>(u)?(u):(v)))
++
++// Truncate-to-zero modulo (ANSI C doesn't specify) will only work
++// if -m < v < 2m
++#define MOD(v,m) (v<0?v+m:(v>=m?v-m:v))
++
++// Truncate-to-zero modulo (ANSI C doesn't specify) will only work
++// if v > -m and v < m
++#define NEG_MOD(v,m) ((v)<0?((v)+(m)):(v))
++
++// Convert a value in dB's to a coefficent
++#define DB_CO(g) ((g) > -90.0f ? powf(10.0f, (g) * 0.05f) : 0.0f)
++#define CO_DB(v) (20.0f * log10f(v))
++
++// Linearly interpolate [ = a * (1 - f) + b * f]
++#define LIN_INTERP(f,a,b) ((a) + (f) * ((b) - (a)))
++
++// Cubic interpolation function
++static inline float cube_interp(const float fr, const float inm1, const
float
++ in, const float inp1, const float inp2)
++{
++ return in + 0.5f * fr * (inp1 - inm1 +
++ fr * (4.0f * inp1 + 2.0f * inm1 - 5.0f * in - inp2 +
++ fr * (3.0f * (in - inp1) - inm1 + inp2)));
++}
++
++/* fast sin^2 aproxiamtion, adapted from jan AT rpgfan's posting to the
++ * music-dsp list */
++static inline float f_sin_sq(float angle)
++{
++ const float asqr = angle * angle;
++ float result = -2.39e-08f;
++
++ result *= asqr;
++ result += 2.7526e-06f;
++ result *= asqr;
++ result -= 1.98409e-04f;
++ result *= asqr;
++ result += 8.3333315e-03f;
++ result *= asqr;
++ result -= 1.666666664e-01f;
++ result *= asqr;
++ result += 1.0f;
++ result *= angle;
++
++ return result * result;
++}
++
++#define f_round(f) lrintf(f)
++
++// Truncate float to int
++static inline long int f_trunc(float f)
++{
++ return f_round(floorf(f));
++}
++
++/* Andrew Simper's pow(2, x) aproximation from the music-dsp list */
++
++#if 0
++
++/* original */
++static inline float f_pow2(float x)
++{
++ long *px = (long*)(&x); // store address of float as long pointer
++ const float tx = (x-0.5f) + (3<<22); // temporary value for truncation
++ const long lx = *((long*)&tx) - 0x4b400000; // integer power of 2
++ const float dx = x-(float)(lx); // float remainder of power of 2
++
++ x = 1.0f + dx*(0.6960656421638072f + // cubic apporoximation of 2^x
++ dx*(0.224494337302845f + // for x in the range [0, 1]
++ dx*(0.07944023841053369f)));
++ *px += (lx<<23); // add integer power of 2 to exponent
++
++ return x;
++}
++
++#else
++
++/* union version */
++static inline float f_pow2(float x)
++{
++ ls_pcast32 *px, tx, lx;
++ float dx;
++
++ px = (ls_pcast32 *)&x; // store address of float as long pointer
++ tx.f = (x-0.5f) + (3<<22); // temporary value for truncation
++ lx.i = tx.i - 0x4b400000; // integer power of 2
++ dx = x - (float)lx.i; // float remainder of power of 2
++
++ x = 1.0f + dx * (0.6960656421638072f + // cubic apporoximation of 2^x
++ dx * (0.224494337302845f + // for x in the range [0, 1]
++ dx * (0.07944023841053369f)));
++ (*px).i += (lx.i << 23); // add integer power of 2 to exponent
++
++ return (*px).f;
++}
++
++#endif
++
++/* Fast exponentiation function, y = e^x */
++#define f_exp(x) f_pow2(x * LN2R)
++
++#endif
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+new file mode 100644
+index 0000000..aa896e7
+--- /dev/null
++++ b/src/CMakeLists.txt
+@@ -0,0 +1,26 @@
++include_directories(${PROJECT_SOURCE_DIR}/include)
++
++option(USE_SSE2 "use SSE2 instructions to avoid floating point
denormalization issues" on)
++
++add_library(RTallpass1 MODULE RTallpass1.c)
++add_library(RTallpass2 MODULE RTallpass2.c)
++
++add_library(RTlowpass MODULE RTlowpass.c)
++add_library(RThighpass MODULE RThighpass.c)
++
++add_library(RTlowshelf MODULE RTlowshelf.c)
++add_library(RThighshelf MODULE RThighshelf.c)
++
++add_library(RTlr4hipass MODULE RTlr4hipass.c)
++add_library(RTlr4lowpass MODULE RTlr4lowpass.c)
++
++add_library(RTparaeq MODULE RTparaeq.c)
++
++set_target_properties(RTallpass1 RTallpass2 RTlowpass RThighpass RTlowshelf
RThighshelf RTlr4hipass RTlr4lowpass RTparaeq
++ PROPERTIES LINK_FLAGS "-nostartfiles")
++if(USE_SSE2)
++ set_target_properties(RTallpass1 RTallpass2 RTlowpass RThighpass
RTlowshelf RThighshelf RTlr4hipass RTlr4lowpass RTparaeq
++ PROPERTIES COMPILE_FLAGS "-msse2 -mfpmath=sse")
++endif()
++install(TARGETS RTallpass1 RTallpass2 RTlowpass RThighpass RTlowshelf
RThighshelf RTlr4hipass RTlr4lowpass RTparaeq
++ LIBRARY DESTINATION lib/ladspa)
+diff --git a/src/RTallpass1.c b/src/RTallpass1.c
+new file mode 100644
+index 0000000..8bbae7f
+--- /dev/null
++++ b/src/RTallpass1.c
+@@ -0,0 +1,231 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define ALLPASS1_FC 0
++#define ALLPASS1_INPUT 1
++#define ALLPASS1_OUTPUT 2
++
++static LADSPA_Descriptor *allPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *fc;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ bilin * filter;
++ float fs;
++} AllPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return allPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateAllPass(LADSPA_Handle instance) {
++ AllPass *plugin_data = (AllPass *)instance;
++ bilin *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ bilin_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupAllPass(LADSPA_Handle instance) {
++ AllPass *plugin_data = (AllPass *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortAllPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ AllPass *plugin;
++
++ plugin = (AllPass *)instance;
++ switch (port) {
++ case ALLPASS1_FC:
++ plugin->fc = data;
++ break;
++ case ALLPASS1_INPUT:
++ plugin->input = data;
++ break;
++ case ALLPASS1_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateAllPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ AllPass *plugin_data = (AllPass *)malloc(sizeof(AllPass));
++ bilin *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(bilin));
++ bilin_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runAllPass(LADSPA_Handle instance, unsigned long sample_count) {
++ AllPass *plugin_data = (AllPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++
++ bilin * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ ap1_set_params(filter, fc, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ // RT 2.9.2013: replace biquad_run with ap1_run to cut
floating-
++ // point multiplications from 3 to 1:
++ buffer_write(output[pos], (LADSPA_Data) ap1_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ allPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (allPassDescriptor) {
++ allPassDescriptor->UniqueID = 9010;
++ allPassDescriptor->Label = "RTallpass1";
++ allPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ allPassDescriptor->Name =
++ D_("RT First Order Allpass");
++ allPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ allPassDescriptor->Copyright =
++ "GPL";
++ allPassDescriptor->PortCount = 3;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
++ sizeof(LADSPA_PortDescriptor));
++ allPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
++ sizeof(LADSPA_PortRangeHint));
++ allPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(3, sizeof(char*));
++ allPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[ALLPASS1_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[ALLPASS1_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[ALLPASS1_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[ALLPASS1_FC].LowerBound = 0.0;
++ port_range_hints[ALLPASS1_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Input */
++ port_descriptors[ALLPASS1_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[ALLPASS1_INPUT] =
++ D_("Input");
++ port_range_hints[ALLPASS1_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[ALLPASS1_INPUT].LowerBound = -1.0;
++ port_range_hints[ALLPASS1_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[ALLPASS1_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[ALLPASS1_OUTPUT] =
++ D_("Output");
++ port_range_hints[ALLPASS1_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[ALLPASS1_OUTPUT].LowerBound = -1.0;
++ port_range_hints[ALLPASS1_OUTPUT].UpperBound = +1.0;
++
++ allPassDescriptor->activate = activateAllPass;
++ allPassDescriptor->cleanup = cleanupAllPass;
++ allPassDescriptor->connect_port = connectPortAllPass;
++ allPassDescriptor->deactivate = NULL;
++ allPassDescriptor->instantiate = instantiateAllPass;
++ allPassDescriptor->run = runAllPass;
++ allPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (allPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)allPassDescriptor->PortDescriptors);
++ free((char **)allPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)allPassDescriptor->PortRangeHints);
++ free(allPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RTallpass2.c b/src/RTallpass2.c
+new file mode 100644
+index 0000000..d663b28
+--- /dev/null
++++ b/src/RTallpass2.c
+@@ -0,0 +1,250 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define ALLPASS_FC 0
++#define ALLPASS_Q 1
++#define ALLPASS_INPUT 2
++#define ALLPASS_OUTPUT 3
++
++static LADSPA_Descriptor *allPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *gain;
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} AllPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return allPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateAllPass(LADSPA_Handle instance) {
++ AllPass *plugin_data = (AllPass *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupAllPass(LADSPA_Handle instance) {
++ AllPass *plugin_data = (AllPass *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortAllPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ AllPass *plugin;
++
++ plugin = (AllPass *)instance;
++ switch (port) {
++ case ALLPASS_FC:
++ plugin->fc = data;
++ break;
++ case ALLPASS_Q:
++ plugin->Q = data;
++ break;
++ case ALLPASS_INPUT:
++ plugin->input = data;
++ break;
++ case ALLPASS_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateAllPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ AllPass *plugin_data = (AllPass *)malloc(sizeof(AllPass));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runAllPass(LADSPA_Handle instance, unsigned long sample_count) {
++ AllPass *plugin_data = (AllPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Bandwidth (octaves) (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ ap_set_params(filter, fc, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ // RT 2.9.2013: replace biquad_run with ap2_run to cut
floating-
++ // point multiplications from 5 to 2:
++ buffer_write(output[pos], (LADSPA_Data) ap2_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ allPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (allPassDescriptor) {
++ allPassDescriptor->UniqueID = 9005;
++ allPassDescriptor->Label = "RTallpass2";
++ allPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ allPassDescriptor->Name =
++ D_("RT Biquad Allpass");
++ allPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ allPassDescriptor->Copyright =
++ "GPL";
++ allPassDescriptor->PortCount = 4;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
++ sizeof(LADSPA_PortDescriptor));
++ allPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
++ sizeof(LADSPA_PortRangeHint));
++ allPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(4, sizeof(char*));
++ allPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[ALLPASS_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[ALLPASS_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[ALLPASS_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[ALLPASS_FC].LowerBound = 0;
++ port_range_hints[ALLPASS_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Bandwidth (octaves) */
++ port_descriptors[ALLPASS_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[ALLPASS_Q] =
++ D_("Q");
++ port_range_hints[ALLPASS_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[ALLPASS_Q].LowerBound = 0;
++ port_range_hints[ALLPASS_Q].UpperBound = 10;
++
++ /* Parameters for Input */
++ port_descriptors[ALLPASS_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[ALLPASS_INPUT] =
++ D_("Input");
++ port_range_hints[ALLPASS_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[ALLPASS_INPUT].LowerBound = -1.0;
++ port_range_hints[ALLPASS_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[ALLPASS_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[ALLPASS_OUTPUT] =
++ D_("Output");
++ port_range_hints[ALLPASS_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[ALLPASS_OUTPUT].LowerBound = -1.0;
++ port_range_hints[ALLPASS_OUTPUT].UpperBound = +1.0;
++
++ allPassDescriptor->activate = activateAllPass;
++ allPassDescriptor->cleanup = cleanupAllPass;
++ allPassDescriptor->connect_port = connectPortAllPass;
++ allPassDescriptor->deactivate = NULL;
++ allPassDescriptor->instantiate = instantiateAllPass;
++ allPassDescriptor->run = runAllPass;
++ allPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (allPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)allPassDescriptor->PortDescriptors);
++ free((char **)allPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)allPassDescriptor->PortRangeHints);
++ free(allPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RThighpass.c b/src/RThighpass.c
+new file mode 100644
+index 0000000..3cf29c5
+--- /dev/null
++++ b/src/RThighpass.c
+@@ -0,0 +1,246 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define HIGHPASS_FC 0
++#define HIGHPASS_Q 1
++#define HIGHPASS_INPUT 2
++#define HIGHPASS_OUTPUT 3
++
++static LADSPA_Descriptor *highPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} HighPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return highPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateHighPass(LADSPA_Handle instance) {
++ HighPass *plugin_data = (HighPass *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupHighPass(LADSPA_Handle instance) {
++ HighPass *plugin_data = (HighPass *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortHighPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ HighPass *plugin;
++
++ plugin = (HighPass *)instance;
++ switch (port) {
++ case HIGHPASS_FC:
++ plugin->fc = data;
++ break;
++ case HIGHPASS_Q:
++ plugin->Q = data;
++ break;
++ case HIGHPASS_INPUT:
++ plugin->input = data;
++ break;
++ case HIGHPASS_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateHighPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ HighPass *plugin_data = (HighPass *)malloc(sizeof(HighPass));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runHighPass(LADSPA_Handle instance, unsigned long sample_count)
{
++ HighPass *plugin_data = (HighPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Bandwidth (octaves) (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ hp_set_params(filter, fc, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ highPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (highPassDescriptor) {
++ highPassDescriptor->UniqueID = 9007;
++ highPassDescriptor->Label = "RThighpass";
++ highPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ highPassDescriptor->Name =
++ D_("RT 2nd-order highpass");
++ highPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ highPassDescriptor->Copyright =
++ "GPL";
++ highPassDescriptor->PortCount = 4;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
++ sizeof(LADSPA_PortDescriptor));
++ highPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
++ sizeof(LADSPA_PortRangeHint));
++ highPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(4, sizeof(char*));
++ highPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[HIGHPASS_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[HIGHPASS_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[HIGHPASS_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[HIGHPASS_FC].LowerBound = 0;
++ port_range_hints[HIGHPASS_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Q */
++ port_descriptors[HIGHPASS_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[HIGHPASS_Q] =
++ D_("Q");
++ port_range_hints[HIGHPASS_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[HIGHPASS_Q].LowerBound = 0;
++ port_range_hints[HIGHPASS_Q].UpperBound = 5;
++
++ /* Parameters for Input */
++ port_descriptors[HIGHPASS_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[HIGHPASS_INPUT] =
++ D_("Input");
++ port_range_hints[HIGHPASS_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[HIGHPASS_INPUT].LowerBound = -1.0;
++ port_range_hints[HIGHPASS_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[HIGHPASS_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[HIGHPASS_OUTPUT] =
++ D_("Output");
++ port_range_hints[HIGHPASS_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[HIGHPASS_OUTPUT].LowerBound = -1.0;
++ port_range_hints[HIGHPASS_OUTPUT].UpperBound = +1.0;
++
++ highPassDescriptor->activate = activateHighPass;
++ highPassDescriptor->cleanup = cleanupHighPass;
++ highPassDescriptor->connect_port = connectPortHighPass;
++ highPassDescriptor->deactivate = NULL;
++ highPassDescriptor->instantiate = instantiateHighPass;
++ highPassDescriptor->run = runHighPass;
++ highPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (highPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)highPassDescriptor->PortDescriptors);
++ free((char **)highPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)highPassDescriptor->PortRangeHints);
++ free(highPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RThighshelf.c b/src/RThighshelf.c
+new file mode 100644
+index 0000000..399aaf2
+--- /dev/null
++++ b/src/RThighshelf.c
+@@ -0,0 +1,264 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define HIGHSHELF_GAIN 0
++#define HIGHSHELF_FC 1
++#define HIGHSHELF_Q 2
++#define HIGHSHELF_INPUT 3
++#define HIGHSHELF_OUTPUT 4
++
++static LADSPA_Descriptor *highShelfDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *gain;
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} HighShelf;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return highShelfDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateHighShelf(LADSPA_Handle instance) {
++ HighShelf *plugin_data = (HighShelf *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupHighShelf(LADSPA_Handle instance) {
++ HighShelf *plugin_data = (HighShelf *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortHighShelf(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ HighShelf *plugin;
++
++ plugin = (HighShelf *)instance;
++ switch (port) {
++ case HIGHSHELF_GAIN:
++ plugin->gain = data;
++ break;
++ case HIGHSHELF_FC:
++ plugin->fc = data;
++ break;
++ case HIGHSHELF_Q:
++ plugin->Q = data;
++ break;
++ case HIGHSHELF_INPUT:
++ plugin->input = data;
++ break;
++ case HIGHSHELF_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateHighShelf(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ HighShelf *plugin_data = (HighShelf *)malloc(sizeof(HighShelf));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runHighShelf(LADSPA_Handle instance, unsigned long
sample_count) {
++ HighShelf *plugin_data = (HighShelf *)instance;
++
++ /* Gain (dB) (float value) */
++ const LADSPA_Data gain = *(plugin_data->gain);
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Bandwidth (octaves) (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ hs_set_params(filter, fc, gain, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ highShelfDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (highShelfDescriptor) {
++ highShelfDescriptor->UniqueID = 9003;
++ highShelfDescriptor->Label = "RThighshelf";
++ highShelfDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ highShelfDescriptor->Name =
++ D_("RT High Shelf");
++ highShelfDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ highShelfDescriptor->Copyright =
++ "GPL";
++ highShelfDescriptor->PortCount = 5;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
++ sizeof(LADSPA_PortDescriptor));
++ highShelfDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
++ sizeof(LADSPA_PortRangeHint));
++ highShelfDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(5, sizeof(char*));
++ highShelfDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Gain (dB) */
++ port_descriptors[HIGHSHELF_GAIN] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[HIGHSHELF_GAIN] =
++ D_("Gain (dB)");
++ port_range_hints[HIGHSHELF_GAIN].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_0;
++ port_range_hints[HIGHSHELF_GAIN].LowerBound = -70;
++ port_range_hints[HIGHSHELF_GAIN].UpperBound = +30;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[HIGHSHELF_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[HIGHSHELF_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[HIGHSHELF_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[HIGHSHELF_FC].LowerBound = 0;
++ port_range_hints[HIGHSHELF_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Quality Factor */
++ port_descriptors[HIGHSHELF_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[HIGHSHELF_Q] =
++ D_("Q");
++ port_range_hints[HIGHSHELF_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[HIGHSHELF_Q].LowerBound = 0;
++ port_range_hints[HIGHSHELF_Q].UpperBound = 5;
++
++ /* Parameters for Input */
++ port_descriptors[HIGHSHELF_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[HIGHSHELF_INPUT] =
++ D_("Input");
++ port_range_hints[HIGHSHELF_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[HIGHSHELF_INPUT].LowerBound = -1.0;
++ port_range_hints[HIGHSHELF_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[HIGHSHELF_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[HIGHSHELF_OUTPUT] =
++ D_("Output");
++ port_range_hints[HIGHSHELF_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[HIGHSHELF_OUTPUT].LowerBound = -1.0;
++ port_range_hints[HIGHSHELF_OUTPUT].UpperBound = +1.0;
++
++ highShelfDescriptor->activate = activateHighShelf;
++ highShelfDescriptor->cleanup = cleanupHighShelf;
++ highShelfDescriptor->connect_port = connectPortHighShelf;
++ highShelfDescriptor->deactivate = NULL;
++ highShelfDescriptor->instantiate = instantiateHighShelf;
++ highShelfDescriptor->run = runHighShelf;
++ highShelfDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (highShelfDescriptor) {
++ free((LADSPA_PortDescriptor
*)highShelfDescriptor->PortDescriptors);
++ free((char **)highShelfDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)highShelfDescriptor->PortRangeHints);
++ free(highShelfDescriptor);
++ }
++
++}
++
+diff --git a/src/RTlowpass.c b/src/RTlowpass.c
+new file mode 100644
+index 0000000..b98a8a6
+--- /dev/null
++++ b/src/RTlowpass.c
+@@ -0,0 +1,246 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define LOWPASS_FC 0
++#define LOWPASS_Q 1
++#define LOWPASS_INPUT 2
++#define LOWPASS_OUTPUT 3
++
++static LADSPA_Descriptor *lowPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} LowPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return lowPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateLowPass(LADSPA_Handle instance) {
++ LowPass *plugin_data = (LowPass *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupLowPass(LADSPA_Handle instance) {
++ LowPass *plugin_data = (LowPass *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortLowPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ LowPass *plugin;
++
++ plugin = (LowPass *)instance;
++ switch (port) {
++ case LOWPASS_FC:
++ plugin->fc = data;
++ break;
++ case LOWPASS_Q:
++ plugin->Q = data;
++ break;
++ case LOWPASS_INPUT:
++ plugin->input = data;
++ break;
++ case LOWPASS_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateLowPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ LowPass *plugin_data = (LowPass *)malloc(sizeof(LowPass));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runLowPass(LADSPA_Handle instance, unsigned long sample_count) {
++ LowPass *plugin_data = (LowPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Bandwidth (octaves) (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ lp_set_params(filter, fc, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ lowPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (lowPassDescriptor) {
++ lowPassDescriptor->UniqueID = 9006;
++ lowPassDescriptor->Label = "RTlowpass";
++ lowPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ lowPassDescriptor->Name =
++ D_("RT 2nd-order lowpass");
++ lowPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ lowPassDescriptor->Copyright =
++ "GPL";
++ lowPassDescriptor->PortCount = 4;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(4,
++ sizeof(LADSPA_PortDescriptor));
++ lowPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(4,
++ sizeof(LADSPA_PortRangeHint));
++ lowPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(4, sizeof(char*));
++ lowPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[LOWPASS_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LOWPASS_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[LOWPASS_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[LOWPASS_FC].LowerBound = 0;
++ port_range_hints[LOWPASS_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Q */
++ port_descriptors[LOWPASS_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LOWPASS_Q] =
++ D_("Q");
++ port_range_hints[LOWPASS_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[LOWPASS_Q].LowerBound = 0;
++ port_range_hints[LOWPASS_Q].UpperBound = 5;
++
++ /* Parameters for Input */
++ port_descriptors[LOWPASS_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[LOWPASS_INPUT] =
++ D_("Input");
++ port_range_hints[LOWPASS_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LOWPASS_INPUT].LowerBound = -1.0;
++ port_range_hints[LOWPASS_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[LOWPASS_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[LOWPASS_OUTPUT] =
++ D_("Output");
++ port_range_hints[LOWPASS_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LOWPASS_OUTPUT].LowerBound = -1.0;
++ port_range_hints[LOWPASS_OUTPUT].UpperBound = +1.0;
++
++ lowPassDescriptor->activate = activateLowPass;
++ lowPassDescriptor->cleanup = cleanupLowPass;
++ lowPassDescriptor->connect_port = connectPortLowPass;
++ lowPassDescriptor->deactivate = NULL;
++ lowPassDescriptor->instantiate = instantiateLowPass;
++ lowPassDescriptor->run = runLowPass;
++ lowPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (lowPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)lowPassDescriptor->PortDescriptors);
++ free((char **)lowPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)lowPassDescriptor->PortRangeHints);
++ free(lowPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RTlowshelf.c b/src/RTlowshelf.c
+new file mode 100644
+index 0000000..e6265b5
+--- /dev/null
++++ b/src/RTlowshelf.c
+@@ -0,0 +1,264 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define LOWSHELF_GAIN 0
++#define LOWSHELF_FC 1
++#define LOWSHELF_Q 2
++#define LOWSHELF_INPUT 3
++#define LOWSHELF_OUTPUT 4
++
++static LADSPA_Descriptor *lowShelfDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *gain;
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} LowShelf;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return lowShelfDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateLowShelf(LADSPA_Handle instance) {
++ LowShelf *plugin_data = (LowShelf *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupLowShelf(LADSPA_Handle instance) {
++ LowShelf *plugin_data = (LowShelf *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortLowShelf(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ LowShelf *plugin;
++
++ plugin = (LowShelf *)instance;
++ switch (port) {
++ case LOWSHELF_GAIN:
++ plugin->gain = data;
++ break;
++ case LOWSHELF_FC:
++ plugin->fc = data;
++ break;
++ case LOWSHELF_Q:
++ plugin->Q = data;
++ break;
++ case LOWSHELF_INPUT:
++ plugin->input = data;
++ break;
++ case LOWSHELF_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateLowShelf(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ LowShelf *plugin_data = (LowShelf *)malloc(sizeof(LowShelf));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runLowShelf(LADSPA_Handle instance, unsigned long sample_count)
{
++ LowShelf *plugin_data = (LowShelf *)instance;
++
++ /* Gain (dB) (float value) */
++ const LADSPA_Data gain = *(plugin_data->gain);
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Bandwidth (octaves) (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ ls_set_params(filter, fc, gain, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ lowShelfDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (lowShelfDescriptor) {
++ lowShelfDescriptor->UniqueID = 9002;
++ lowShelfDescriptor->Label = "RTlowshelf";
++ lowShelfDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ lowShelfDescriptor->Name =
++ D_("RT Low Shelf");
++ lowShelfDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ lowShelfDescriptor->Copyright =
++ "GPL";
++ lowShelfDescriptor->PortCount = 5;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
++ sizeof(LADSPA_PortDescriptor));
++ lowShelfDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
++ sizeof(LADSPA_PortRangeHint));
++ lowShelfDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(5, sizeof(char*));
++ lowShelfDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Gain (dB) */
++ port_descriptors[LOWSHELF_GAIN] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LOWSHELF_GAIN] =
++ D_("Gain (dB)");
++ port_range_hints[LOWSHELF_GAIN].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_0;
++ port_range_hints[LOWSHELF_GAIN].LowerBound = -70;
++ port_range_hints[LOWSHELF_GAIN].UpperBound = +30;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[LOWSHELF_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LOWSHELF_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[LOWSHELF_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[LOWSHELF_FC].LowerBound = 0;
++ port_range_hints[LOWSHELF_FC].UpperBound = (LADSPA_Data) 0.4;
++
++ /* Parameters for Quality Factor */
++ port_descriptors[LOWSHELF_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LOWSHELF_Q] =
++ D_("Q");
++ port_range_hints[LOWSHELF_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[LOWSHELF_Q].LowerBound = 0;
++ port_range_hints[LOWSHELF_Q].UpperBound = 5;
++
++ /* Parameters for Input */
++ port_descriptors[LOWSHELF_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[LOWSHELF_INPUT] =
++ D_("Input");
++ port_range_hints[LOWSHELF_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LOWSHELF_INPUT].LowerBound = -1.0;
++ port_range_hints[LOWSHELF_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[LOWSHELF_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[LOWSHELF_OUTPUT] =
++ D_("Output");
++ port_range_hints[LOWSHELF_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LOWSHELF_OUTPUT].LowerBound = -1.0;
++ port_range_hints[LOWSHELF_OUTPUT].UpperBound = +1.0;
++
++ lowShelfDescriptor->activate = activateLowShelf;
++ lowShelfDescriptor->cleanup = cleanupLowShelf;
++ lowShelfDescriptor->connect_port = connectPortLowShelf;
++ lowShelfDescriptor->deactivate = NULL;
++ lowShelfDescriptor->instantiate = instantiateLowShelf;
++ lowShelfDescriptor->run = runLowShelf;
++ lowShelfDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (lowShelfDescriptor) {
++ free((LADSPA_PortDescriptor
*)lowShelfDescriptor->PortDescriptors);
++ free((char **)lowShelfDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)lowShelfDescriptor->PortRangeHints);
++ free(lowShelfDescriptor);
++ }
++
++}
++
+diff --git a/src/RTlr4hipass.c b/src/RTlr4hipass.c
+new file mode 100644
+index 0000000..80dd651
+--- /dev/null
++++ b/src/RTlr4hipass.c
+@@ -0,0 +1,234 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define LR4HIGHPASS_FC 0
++#define LR4HIGHPASS_INPUT 1
++#define LR4HIGHPASS_OUTPUT 2
++
++static LADSPA_Descriptor *lr4highPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *fc;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filters;
++ float fs;
++} LR4HighPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return lr4highPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateLR4HighPass(LADSPA_Handle instance) {
++ LR4HighPass *plugin_data = (LR4HighPass *)instance;
++ biquad *filters = plugin_data->filters;
++ float fs = plugin_data->fs;
++ biquad_init(&filters[0]);
++ biquad_init(&filters[1]);
++ plugin_data->filters = filters;
++ plugin_data->fs = fs;
++}
++
++static void cleanupLR4HighPass(LADSPA_Handle instance) {
++ LR4HighPass *plugin_data = (LR4HighPass *)instance;
++ free(plugin_data->filters);
++ free(instance);
++}
++
++static void connectPortLR4HighPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ LR4HighPass *plugin;
++
++ plugin = (LR4HighPass *)instance;
++ switch (port) {
++ case LR4HIGHPASS_FC:
++ plugin->fc = data;
++ break;
++ case LR4HIGHPASS_INPUT:
++ plugin->input = data;
++ break;
++ case LR4HIGHPASS_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateLR4HighPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ LR4HighPass *plugin_data = (LR4HighPass *)malloc(sizeof(LR4HighPass));
++ biquad *filters = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++
++ filters = calloc(2, sizeof(biquad));
++ biquad_init(&filters[0]);
++ biquad_init(&filters[1]);
++
++ plugin_data->filters = filters;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runLR4HighPass(LADSPA_Handle instance, unsigned long
sample_count) {
++ LR4HighPass *plugin_data = (LR4HighPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filters = plugin_data->filters;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++ bq_t in;
++
++ hp_set_params(&filters[0], fc, 0.7071068, fs);
++ hp_set_params(&filters[1], fc, 0.7071068, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ in = biquad_run(&filters[0], input[pos]);
++ in = biquad_run(&filters[1], in);
++ buffer_write(output[pos], (LADSPA_Data) in);
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ lr4highPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (lr4highPassDescriptor) {
++ lr4highPassDescriptor->UniqueID = 9021;
++ lr4highPassDescriptor->Label = "RTlr4hipass";
++ lr4highPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ lr4highPassDescriptor->Name =
++ D_("RT LR4 highpass");
++ lr4highPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ lr4highPassDescriptor->Copyright =
++ "GPL";
++ lr4highPassDescriptor->PortCount = 3;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
++ sizeof(LADSPA_PortDescriptor));
++ lr4highPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
++ sizeof(LADSPA_PortRangeHint));
++ lr4highPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(3, sizeof(char*));
++ lr4highPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[LR4HIGHPASS_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LR4HIGHPASS_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[LR4HIGHPASS_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[LR4HIGHPASS_FC].LowerBound = 0;
++ port_range_hints[LR4HIGHPASS_FC].UpperBound = (LADSPA_Data)
0.4;
++
++ /* Parameters for Input */
++ port_descriptors[LR4HIGHPASS_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[LR4HIGHPASS_INPUT] =
++ D_("Input");
++ port_range_hints[LR4HIGHPASS_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LR4HIGHPASS_INPUT].LowerBound = -1.0;
++ port_range_hints[LR4HIGHPASS_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[LR4HIGHPASS_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[LR4HIGHPASS_OUTPUT] =
++ D_("Output");
++ port_range_hints[LR4HIGHPASS_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LR4HIGHPASS_OUTPUT].LowerBound = -1.0;
++ port_range_hints[LR4HIGHPASS_OUTPUT].UpperBound = +1.0;
++
++ lr4highPassDescriptor->activate = activateLR4HighPass;
++ lr4highPassDescriptor->cleanup = cleanupLR4HighPass;
++ lr4highPassDescriptor->connect_port = connectPortLR4HighPass;
++ lr4highPassDescriptor->deactivate = NULL;
++ lr4highPassDescriptor->instantiate = instantiateLR4HighPass;
++ lr4highPassDescriptor->run = runLR4HighPass;
++ lr4highPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (lr4highPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)lr4highPassDescriptor->PortDescriptors);
++ free((char **)lr4highPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)lr4highPassDescriptor->PortRangeHints);
++ free(lr4highPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RTlr4lowpass.c b/src/RTlr4lowpass.c
+new file mode 100644
+index 0000000..f1d269e
+--- /dev/null
++++ b/src/RTlr4lowpass.c
+@@ -0,0 +1,234 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define LR4LOWPASS_FC 0
++#define LR4LOWPASS_INPUT 1
++#define LR4LOWPASS_OUTPUT 2
++
++static LADSPA_Descriptor *lr4lowPassDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *fc;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filters;
++ float fs;
++} LR4LowPass;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return lr4lowPassDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateLR4LowPass(LADSPA_Handle instance) {
++ LR4LowPass *plugin_data = (LR4LowPass *)instance;
++ biquad *filters = plugin_data->filters;
++ float fs = plugin_data->fs;
++ biquad_init(&filters[0]);
++ biquad_init(&filters[1]);
++ plugin_data->filters = filters;
++ plugin_data->fs = fs;
++}
++
++static void cleanupLR4LowPass(LADSPA_Handle instance) {
++ LR4LowPass *plugin_data = (LR4LowPass *)instance;
++ free(plugin_data->filters);
++ free(instance);
++}
++
++static void connectPortLR4LowPass(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ LR4LowPass *plugin;
++
++ plugin = (LR4LowPass *)instance;
++ switch (port) {
++ case LR4LOWPASS_FC:
++ plugin->fc = data;
++ break;
++ case LR4LOWPASS_INPUT:
++ plugin->input = data;
++ break;
++ case LR4LOWPASS_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateLR4LowPass(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ LR4LowPass *plugin_data = (LR4LowPass *)malloc(sizeof(LR4LowPass));
++ biquad *filters = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++
++ filters = calloc(2, sizeof(biquad));
++ biquad_init(&filters[0]);
++ biquad_init(&filters[1]);
++
++ plugin_data->filters = filters;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runLR4LowPass(LADSPA_Handle instance, unsigned long
sample_count) {
++ LR4LowPass *plugin_data = (LR4LowPass *)instance;
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filters = plugin_data->filters;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++ bq_t in;
++
++ lp_set_params(&filters[0], fc, 0.7071068, fs);
++ lp_set_params(&filters[1], fc, 0.7071068, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ in = biquad_run(&filters[0], input[pos]);
++ in = biquad_run(&filters[1], in);
++ buffer_write(output[pos], (LADSPA_Data) in);
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ lr4lowPassDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (lr4lowPassDescriptor) {
++ lr4lowPassDescriptor->UniqueID = 9020;
++ lr4lowPassDescriptor->Label = "RTlr4lowpass";
++ lr4lowPassDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ lr4lowPassDescriptor->Name =
++ D_("RT LR4 lowpass");
++ lr4lowPassDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ lr4lowPassDescriptor->Copyright =
++ "GPL";
++ lr4lowPassDescriptor->PortCount = 3;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(3,
++ sizeof(LADSPA_PortDescriptor));
++ lr4lowPassDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(3,
++ sizeof(LADSPA_PortRangeHint));
++ lr4lowPassDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(3, sizeof(char*));
++ lr4lowPassDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[LR4LOWPASS_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[LR4LOWPASS_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[LR4LOWPASS_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[LR4LOWPASS_FC].LowerBound = 0;
++ port_range_hints[LR4LOWPASS_FC].UpperBound = (LADSPA_Data)
0.4;
++
++ /* Parameters for Input */
++ port_descriptors[LR4LOWPASS_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[LR4LOWPASS_INPUT] =
++ D_("Input");
++ port_range_hints[LR4LOWPASS_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LR4LOWPASS_INPUT].LowerBound = -1.0;
++ port_range_hints[LR4LOWPASS_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[LR4LOWPASS_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[LR4LOWPASS_OUTPUT] =
++ D_("Output");
++ port_range_hints[LR4LOWPASS_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[LR4LOWPASS_OUTPUT].LowerBound = -1.0;
++ port_range_hints[LR4LOWPASS_OUTPUT].UpperBound = +1.0;
++
++ lr4lowPassDescriptor->activate = activateLR4LowPass;
++ lr4lowPassDescriptor->cleanup = cleanupLR4LowPass;
++ lr4lowPassDescriptor->connect_port = connectPortLR4LowPass;
++ lr4lowPassDescriptor->deactivate = NULL;
++ lr4lowPassDescriptor->instantiate = instantiateLR4LowPass;
++ lr4lowPassDescriptor->run = runLR4LowPass;
++ lr4lowPassDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (lr4lowPassDescriptor) {
++ free((LADSPA_PortDescriptor
*)lr4lowPassDescriptor->PortDescriptors);
++ free((char **)lr4lowPassDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)lr4lowPassDescriptor->PortRangeHints);
++ free(lr4lowPassDescriptor);
++ }
++
++}
++
+diff --git a/src/RTparaeq.c b/src/RTparaeq.c
+new file mode 100644
+index 0000000..5376d64
+--- /dev/null
++++ b/src/RTparaeq.c
+@@ -0,0 +1,264 @@
++/* Copyright 2013 Richard Taylor
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++ CREDITS:
++
++ Much of the code here was adapted from Steve Harris's swh-plugins
++ (version 0.4.15) found at http://plugin.org.uk/. Thanks Steve for
++ making your code available.
++
++ The guts of the code, in util/biquad.h, is an implementation
++ of the biquad filters described in Robert Bristow-Johnson's "Cookbook
++ formulae for audio EQ biquad filter coefficients" found here:
++ http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt
++*/
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <math.h>
++
++#include <ladspa.h>
++
++#include "biquad.h"
++
++#define SINGLEPARA_GAIN 0
++#define SINGLEPARA_FC 1
++#define SINGLEPARA_Q 2
++#define SINGLEPARA_INPUT 3
++#define SINGLEPARA_OUTPUT 4
++
++static LADSPA_Descriptor *singleParaDescriptor = NULL;
++
++typedef struct {
++ LADSPA_Data *gain;
++ LADSPA_Data *fc;
++ LADSPA_Data *Q;
++ LADSPA_Data *input;
++ LADSPA_Data *output;
++ biquad * filter;
++ float fs;
++} SinglePara;
++
++const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
++ switch (index) {
++ case 0:
++ return singleParaDescriptor;
++ default:
++ return NULL;
++ }
++}
++
++static void activateSinglePara(LADSPA_Handle instance) {
++ SinglePara *plugin_data = (SinglePara *)instance;
++ biquad *filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++ biquad_init(filter);
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++}
++
++static void cleanupSinglePara(LADSPA_Handle instance) {
++ SinglePara *plugin_data = (SinglePara *)instance;
++ free(plugin_data->filter);
++ free(instance);
++}
++
++static void connectPortSinglePara(
++ LADSPA_Handle instance,
++ unsigned long port,
++ LADSPA_Data *data) {
++ SinglePara *plugin;
++
++ plugin = (SinglePara *)instance;
++ switch (port) {
++ case SINGLEPARA_GAIN:
++ plugin->gain = data;
++ break;
++ case SINGLEPARA_FC:
++ plugin->fc = data;
++ break;
++ case SINGLEPARA_Q:
++ plugin->Q = data;
++ break;
++ case SINGLEPARA_INPUT:
++ plugin->input = data;
++ break;
++ case SINGLEPARA_OUTPUT:
++ plugin->output = data;
++ break;
++ }
++}
++
++static LADSPA_Handle instantiateSinglePara(
++ const LADSPA_Descriptor *descriptor,
++ unsigned long s_rate) {
++ SinglePara *plugin_data = (SinglePara *)malloc(sizeof(SinglePara));
++ biquad *filter = NULL;
++ float fs;
++
++ fs = (float)s_rate;
++ filter = malloc(sizeof(biquad));
++ biquad_init(filter);
++
++ plugin_data->filter = filter;
++ plugin_data->fs = fs;
++
++ return (LADSPA_Handle)plugin_data;
++}
++
++#undef buffer_write
++#define buffer_write(b, v) (b = v)
++
++static void runSinglePara(LADSPA_Handle instance, unsigned long
sample_count) {
++ SinglePara *plugin_data = (SinglePara *)instance;
++
++ /* Gain (dB) (float value) */
++ const LADSPA_Data gain = *(plugin_data->gain);
++
++ /* Frequency (Hz) (float value) */
++ const LADSPA_Data fc = *(plugin_data->fc);
++
++ /* Quality factor (float value) */
++ const LADSPA_Data Q = *(plugin_data->Q);
++
++ /* Input (array of floats of length sample_count) */
++ const LADSPA_Data * const input = plugin_data->input;
++
++ /* Output (array of floats of length sample_count) */
++ LADSPA_Data * const output = plugin_data->output;
++ biquad * filter = plugin_data->filter;
++ float fs = plugin_data->fs;
++
++ unsigned long pos;
++
++ eq_set_params(filter, fc, gain, Q, fs);
++
++ for (pos = 0; pos < sample_count; pos++) {
++ buffer_write(output[pos], (LADSPA_Data) biquad_run(filter,
input[pos]));
++ }
++
++}
++
++void _init(void);
++void _init(void) {
++ char **port_names;
++ LADSPA_PortDescriptor *port_descriptors;
++ LADSPA_PortRangeHint *port_range_hints;
++
++#define D_(s) (s)
++
++ singleParaDescriptor =
++ (LADSPA_Descriptor *)malloc(sizeof(LADSPA_Descriptor));
++
++ if (singleParaDescriptor) {
++ singleParaDescriptor->UniqueID = 9001;
++ singleParaDescriptor->Label = "RTparaeq";
++ singleParaDescriptor->Properties =
++ LADSPA_PROPERTY_HARD_RT_CAPABLE;
++ singleParaDescriptor->Name =
++ D_("RT parametric eq");
++ singleParaDescriptor->Maker =
++ "Richard Taylor <rtaylor AT tru.ca>";
++ singleParaDescriptor->Copyright =
++ "GPL";
++ singleParaDescriptor->PortCount = 5;
++
++ port_descriptors = (LADSPA_PortDescriptor *)calloc(5,
++ sizeof(LADSPA_PortDescriptor));
++ singleParaDescriptor->PortDescriptors =
++ (const LADSPA_PortDescriptor *)port_descriptors;
++
++ port_range_hints = (LADSPA_PortRangeHint *)calloc(5,
++ sizeof(LADSPA_PortRangeHint));
++ singleParaDescriptor->PortRangeHints =
++ (const LADSPA_PortRangeHint *)port_range_hints;
++
++ port_names = (char **)calloc(5, sizeof(char*));
++ singleParaDescriptor->PortNames =
++ (const char **)port_names;
++
++ /* Parameters for Gain (dB) */
++ port_descriptors[SINGLEPARA_GAIN] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[SINGLEPARA_GAIN] =
++ D_("Gain (dB)");
++ port_range_hints[SINGLEPARA_GAIN].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[SINGLEPARA_GAIN].LowerBound = -70;
++ port_range_hints[SINGLEPARA_GAIN].UpperBound = +30;
++
++ /* Parameters for Frequency (Hz) */
++ port_descriptors[SINGLEPARA_FC] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[SINGLEPARA_FC] =
++ D_("Frequency (Hz)");
++ port_range_hints[SINGLEPARA_FC].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_SAMPLE_RATE | LADSPA_HINT_DEFAULT_440;
++ port_range_hints[SINGLEPARA_FC].LowerBound = 0;
++ port_range_hints[SINGLEPARA_FC].UpperBound = (LADSPA_Data)
0.4;
++
++ /* Parameters for Quality Factor */
++ port_descriptors[SINGLEPARA_Q] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL;
++ port_names[SINGLEPARA_Q] =
++ D_("Q");
++ port_range_hints[SINGLEPARA_Q].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE |
LADSPA_HINT_DEFAULT_1;
++ port_range_hints[SINGLEPARA_Q].LowerBound = 0;
++ port_range_hints[SINGLEPARA_Q].UpperBound = 100;
++
++ /* Parameters for Input */
++ port_descriptors[SINGLEPARA_INPUT] =
++ LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO;
++ port_names[SINGLEPARA_INPUT] =
++ D_("Input");
++ port_range_hints[SINGLEPARA_INPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[SINGLEPARA_INPUT].LowerBound = -1.0;
++ port_range_hints[SINGLEPARA_INPUT].UpperBound = +1.0;
++
++ /* Parameters for Output */
++ port_descriptors[SINGLEPARA_OUTPUT] =
++ LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO;
++ port_names[SINGLEPARA_OUTPUT] =
++ D_("Output");
++ port_range_hints[SINGLEPARA_OUTPUT].HintDescriptor =
++ LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE;
++ port_range_hints[SINGLEPARA_OUTPUT].LowerBound = -1.0;
++ port_range_hints[SINGLEPARA_OUTPUT].UpperBound = +1.0;
++
++ singleParaDescriptor->activate = activateSinglePara;
++ singleParaDescriptor->cleanup = cleanupSinglePara;
++ singleParaDescriptor->connect_port = connectPortSinglePara;
++ singleParaDescriptor->deactivate = NULL;
++ singleParaDescriptor->instantiate = instantiateSinglePara;
++ singleParaDescriptor->run = runSinglePara;
++ singleParaDescriptor->run_adding = NULL;
++ }
++}
++
++void _fini(void);
++void _fini(void) {
++ if (singleParaDescriptor) {
++ free((LADSPA_PortDescriptor
*)singleParaDescriptor->PortDescriptors);
++ free((char **)singleParaDescriptor->PortNames);
++ free((LADSPA_PortRangeHint
*)singleParaDescriptor->PortRangeHints);
++ free(singleParaDescriptor);
++ }
++
++}
++
+diff --git a/util/biquad.h b/util/biquad.h
+deleted file mode 100644
+index 49451d8..0000000
+--- a/util/biquad.h
++++ /dev/null
+@@ -1,331 +0,0 @@
+-#ifndef BIQUAD_H
+-#define BIQUAD_H
+-
+-#define LN_2_2 0.34657359f // ln(2)/2
+-
+-#include "ladspa-util.h"
+-#include <math.h>
+-
+-#ifndef LIMIT
+-#define LIMIT(v,l,u) (v<l?l:(v>u?u:v))
+-#endif
+-
+-// rt 8.1.2013: store biquad coefficients and accumulators in double
+-// precision, to limit effects of round-off error. Change this to
+-// float if you need more speed: it probably won't make an audible
+-// difference unless you need filters with really high Q or low
+-// frequency.
+-#ifndef BIQUAD_TYPE
+-#define BIQUAD_TYPE double
+-#endif
+-
+-// rt 25.6.2013: amplitude of square wave (at Nyquist freq)
+-// added to kill denormals ... may need to experiment with
+-// this value. NB: 1.e-18 = -360dB
+-#define DENORMALKILLER 1.e-18;
+-
+-typedef BIQUAD_TYPE bq_t;
+-
+-/* Biquad filter (adapted from lisp code by Eli Brandt,
+- http://www.cs.cmu.edu/~eli/) */
+-
+-typedef struct {
+- bq_t a1;
+- bq_t a2;
+- bq_t b0;
+- bq_t b1;
+- bq_t b2;
+- bq_t x1;
+- bq_t x2;
+- bq_t y1;
+- bq_t y2;
+- bq_t dn; // denormal state (rt 25.6.2013)
+-} biquad;
+-
+-typedef struct {
+- bq_t a1;
+- bq_t b0;
+- bq_t b1;
+- bq_t x1;
+- bq_t y1;
+- bq_t dn; // denormal state
+-} bilin;
+-
+-
+-static inline void biquad_init(biquad *f) {
+- f->x1 = 0.0f;
+- f->x2 = 0.0f;
+- f->y1 = 0.0f;
+- f->y2 = 0.0f;
+- f->dn = DENORMALKILLER;
+-}
+-
+-static inline void bilin_init(bilin *f) {
+- f->x1 = 0.0f;
+- f->y1 = 0.0f;
+- f->dn = DENORMALKILLER;
+-}
+-
+-//static inline void eq_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
+-// bq_t fs);
+-static inline void eq_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
bq_t fs)
+-{
+- bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0f, fs/2.0f) / fs;
+- bq_t J = pow(10.0f, gain * 0.025f);
+- bq_t cw = cos(w);
+- bq_t sw = sin(w);
+- Q = Q / J; // adjust so input Q is standard elec. eng. Q
+-// bq_t g = sw * sinhf(LN_2_2 * LIMIT(bw, 0.0001f, 4.0f) * w / sw); //
case: bw
+- bq_t g = sw/(2.0*Q); // case: Q
+-// bq_t g = sin(w0)/2.0 * sqrt( (J + 1.0/J)*(1.0/S - 1.0) + 2.0 ) //
case: S
+-
+- bq_t a0 = 1.0f + g / J;
+- bq_t a0r = 1.0f / a0;
+-
+- f->b0 = (1.0 + (g * J)) * a0r;
+- f->b1 = (-2.0 * cw) * a0r;
+- f->b2 = (1.0 - (g * J)) * a0r;
+- f->a1 = -(f->b1);
+- f->a2 = ((g / J) - 1.0) * a0r;
+-}
+-
+-//static inline void ls_set_params(biquad *f, bq_t fc, bq_t gain, bq_t
slope,
+-// bq_t fs);
+-static inline void ls_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
+- bq_t fs)
+-{
+- bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0, fs/2.0) / fs;
+- bq_t cw = cos(w);
+- bq_t sw = sin(w);
+- bq_t A = powf(10.0f, (float) (gain * (bq_t) 0.025));
+-
+-// rt 8.1.2013: increased slope limit from 1.0f to 5.0f:
+-// bq_t b = sqrt(((1.0f + A * A) / LIMIT(slope, 0.0001f, 5.0f)) - ((A -
+-// 1.0f) * (A - 1.0)));
+-
+-// bq_t apc = cw * (A + 1.0f);
+-// bq_t amc = cw * (A - 1.0f);
+-// bq_t bs = b * sw;
+-// bq_t a0r = 1.0f / (A + 1.0f + amc + bs);
+-
+-// f->b0 = a0r * A * (A + 1.0f - amc + bs);
+-// f->b1 = a0r * 2.0f * A * (A - 1.0f - apc);
+-// f->b2 = a0r * A * (A + 1.0f - amc - bs);
+-// f->a1 = a0r * 2.0f * (A - 1.0f + apc);
+-// f->a2 = a0r * (-A - 1.0f - amc + bs);
+-
+- // rt 22.1.2013 changed this to use Q instead of slope
+- bq_t alpha = sw / (2.0 * Q);
+- bq_t b = 2.0*sqrt(A)*alpha;
+- bq_t ap = A + 1.0;
+- bq_t am = A - 1.0;
+- bq_t a0 = ap + am*cw + b;
+- bq_t a0r = 1.0 / a0;
+-
+- f->b0 = a0r * A * (ap - am*cw + b);
+- f->b1 = a0r * 2.0 * A * (am - ap*cw);
+- f->b2 = a0r * A * (ap - am*cw - b);
+- f->a1 = 2.0 * a0r * (am + ap*cw);
+- f->a2 = -a0r * (ap + am*cw - b);
+-}
+-
+-//static inline void hs_set_params(biquad *f, bq_t fc, bq_t gain, bq_t
slope,
+-// bq_t fs);
+-static inline void hs_set_params(biquad *f, bq_t fc, bq_t gain, bq_t Q,
bq_t fs)
+-{
+- bq_t w = 2.0f * M_PI * LIMIT(fc, 1.0, fs/2.0) / fs;
+- bq_t cw = cos(w);
+- bq_t sw = sin(w);
+- bq_t A = powf(10.0f, (float) (gain * (bq_t) 0.025));
+-// rt 8.1.2013: increased slope limit from 1.0f to 5.0f:
+-// bq_t b = sqrt(((1.0f + A * A) / LIMIT(slope, 0.0001f, 5.0f)) - ((A -
+-// 1.0f) * (A - 1.0f)));
+-// bq_t apc = cw * (A + 1.0f);
+-// bq_t amc = cw * (A - 1.0f);
+-// bq_t bs = b * sw;
+-// bq_t a0r = 1.0f / (A + 1.0f - amc + bs);
+-
+-// f->b0 = a0r * A * (A + 1.0f + amc + bs);
+-// f->b1 = a0r * -2.0f * A * (A - 1.0f + apc);
+-// f->b2 = a0r * A * (A + 1.0f + amc - bs);
+-// f->a1 = a0r * -2.0f * (A - 1.0f - apc);
+-// f->a2 = a0r * (-A - 1.0f + amc + bs);
+-
+- // rt 22.1.2013 changed this to use Q instead of slope
+- bq_t alpha = sw / (2.0 * Q);
+- bq_t b = 2.0*sqrt(A)*alpha;
+- bq_t ap = A + 1.0;
+- bq_t am = A - 1.0;
+- bq_t a0 = ap - am*cw + b;
+- bq_t a0r = 1.0 / a0;
+-
+- f->b0 = a0r * A * (ap + am*cw + b);
+- f->b1 = -a0r * 2.0 * A * (am + ap*cw);
+- f->b2 = a0r * A * (ap + am*cw - b);
+- f->a1 = -2.0 * a0r * (am - ap*cw);
+- f->a2 = -a0r * (ap - am*cw - b);
+-}
+-
+-static inline void lp_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
+-{
+- bq_t omega = 2.0 * M_PI * fc/fs;
+- bq_t sn = sin(omega);
+- bq_t cs = cos(omega);
+-// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
+- bq_t alpha = sn / (2.0 * Q);
+-
+- const bq_t a0r = 1.0 / (1.0 + alpha);
+- f->b0 = a0r * (1.0 - cs) * 0.5;
+- f->b1 = a0r * (1.0 - cs);
+- f->b2 = a0r * (1.0 - cs) * 0.5;
+- f->a1 = a0r * (2.0 * cs);
+- f->a2 = a0r * (alpha - 1.0);
+-}
+-
+-static inline void hp_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
+-{
+- bq_t omega = 2.0 * M_PI * fc/fs;
+- bq_t sn = sin(omega);
+- bq_t cs = cos(omega);
+-// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
+- bq_t alpha = sn / (2.0 * Q);
+-
+- const bq_t a0r = 1.0 / (1.0 + alpha);
+- f->b0 = a0r * (1.0 + cs) * 0.5;
+- f->b1 = a0r * -(1.0 + cs);
+- f->b2 = a0r * (1.0 + cs) * 0.5;
+- f->a1 = a0r * (2.0 * cs);
+- f->a2 = a0r * (alpha - 1.0);
+-}
+-
+-static inline void bp_set_params(biquad *f, bq_t fc, bq_t bw, bq_t fs)
+-{
+- bq_t omega = 2.0 * M_PI * fc/fs;
+- bq_t sn = sin(omega);
+- bq_t cs = cos(omega);
+- bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
+-
+- const bq_t a0r = 1.0 / (1.0 + alpha);
+- f->b0 = a0r * alpha;
+- f->b1 = 0.0;
+- f->b2 = a0r * -alpha;
+- f->a1 = a0r * (2.0 * cs);
+- f->a2 = a0r * (alpha - 1.0);
+-}
+-
+-// rt 8.1.2013: allpass from biquad cookbook
+-static inline void ap_set_params(biquad *f, bq_t fc, bq_t Q, bq_t fs)
+-{
+- bq_t omega = 2.0 * M_PI * fc/fs;
+- bq_t sn = sin(omega);
+- bq_t cs = cos(omega);
+-// bq_t alpha = sn * sinh(M_LN2 / 2.0 * bw * omega / sn);
+- bq_t alpha = sn / (2.0 * Q);
+-
+- bq_t a0 = 1.0 + alpha;
+- bq_t a0r = 1.0 / a0;
+- f->b0 = a0r * (1.0 - alpha);
+- f->b1 = a0r * (-2.0 * cs);
+- f->b2 = 1.0;
+- f->a1 = -f->b1;
+- f->a2 = -f->b0;
+-}
+-
+-static inline void ap1_set_params(bilin *f, bq_t fc, bq_t fs)
+-{
+-// rt 8.1.2013: implementation of first-order digital allpass found here:
+-//
https://ccrma.stanford.edu/realsimple/DelayVar/Phasing_First_Order_Allpass_Filters.html
+-// see here for turning transfer function into difference equation:
+-// http://en.wikipedia.org/wiki/Digital_filter
+- bq_t tphi = tan( M_PI * fc / fs);
+- bq_t p = (1.0f - tphi) / (1.0f + tphi);
+-
+- // case 1: phase varies from 0 to 180 degrees
+- f->b0 = -p;
+- f->b1 = 1.0f;
+-
+- // case 2: phase varies from 180 to 360 degrees
+-// f->b0 = p;
+-// f->b1 = -1.0f;
+-
+- f->a1 = p;
+-}
+-
+-// routine that runs a biquad (i.e. 2nd-order) digital filter
+-static inline bq_t biquad_run(biquad *f, const bq_t x) {
+- bq_t y;
+-
+-// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
+- y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2
+- + f->a1 * f->y1 + f->a2 * f->y2 + f->dn;
+- f->dn = -f->dn;
+-
+-// see previous commment
+-// y = flush_to_zero(y);
+-
+- f->x2 = f->x1;
+- f->x1 = x;
+- f->y2 = f->y1;
+- f->y1 = y;
+-
+- return y;
+-}
+-
+-// rt 2.9.2013: special version of biquad_run for 2nd-order
+-// allpass; takes advantage of factoring to reduce floating-point
+-// multiplications from 5 to 2
+-static inline bq_t ap2_run(biquad *f, const bq_t x) {
+- bq_t y;
+-
+-// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
+- y = f->b0 * (x - f->y2) + f->b1 * (f->x1 - f->y1) + f->x2 + f->dn;
+- f->dn = -f->dn;
+-
+-// see previous commment
+-// y = flush_to_zero(y);
+-
+- f->x2 = f->x1;
+- f->x1 = x;
+- f->y2 = f->y1;
+- f->y1 = y;
+-
+- return y;
+-}
+-
+-// routine that runs a bilinear (i.e. 1st-order) digital filter
+-static inline bq_t bilin_run(bilin *f, const bq_t x) {
+- bq_t y;
+-
+-// rt 15.5.2013: add a Nyquist-frequency square-wave to kill denormals:
+- y = f->b0 * x + f->b1 * f->x1 + f->a1 * f->y1 + f->dn;
+- f->dn = -f->dn;
+-
+-// see previous commment
+-// y = flush_to_zero(y);
+-
+- f->x1 = x;
+- f->y1 = y;
+-
+- return y;
+-}
+-
+-// rt 2.9.2013: special version of bilin_run for 2nd-order
+-// allpass; takes advantage of factoring to reduce floating-point
+-// multiplications from 5 to 2
+-static inline bq_t ap1_run(bilin *f, const bq_t x) {
+- bq_t y;
+-
+-// rt 15.5.2013: adding a Nyquist-frequency square-wave to kill denormals:
+- y = f->b0 * (x - f->y1) + f->x1 + f->dn;
+- f->dn = -f->dn;
+-
+-// see previous commment
+-// y = flush_to_zero(y);
+-
+- f->x1 = x;
+- f->y1 = y;
+-
+- return y;
+-}
+-
+-#endif
+diff --git a/util/config.h b/util/config.h
+deleted file mode 100644
+index 1dcbc37..0000000
+--- a/util/config.h
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/* config.h. Generated by configure. */
+-/* config.h.in. Generated from configure.in by autoheader. */
+-#ifndef _CONFIG_H
+-#define _CONFIG_H
+-
+-/* #undef EXPLICIT_S */
+-/* #undef ACCEL_3DNOW */
+-#define HAVE_LRINTF 1
+-#define PACKAGE_LOCALE_DIR "/usr/local//locale"
+-#define PACKAGE_DATA_DIR "/usr/local/share/swh-plugins"
+-
+-#endif
+-
+-/* Define to 1 if translation of program messages to the user's native
+- language is requested. */
+-#define ENABLE_NLS 1
+-
+-/* Wether were using FFTW version 3 */
+-#define FFTW3
+-
+-/* Define if the GNU dcgettext() function is already present or
preinstalled.
+- */
+-#define HAVE_DCGETTEXT 1
+-
+-/* Define to 1 if you have the <dlfcn.h> header file. */
+-#define HAVE_DLFCN_H 1
+-
+-/* Define if the GNU gettext() function is already present or preinstalled.
*/
+-#define HAVE_GETTEXT 1
+-
+-/* Define if you have the iconv() function. */
+-/* #undef HAVE_ICONV */
+-
+-/* Define to 1 if you have the <inttypes.h> header file. */
+-#define HAVE_INTTYPES_H 1
+-
+-/* Define to 1 if you have the `m' library (-lm). */
+-#define HAVE_LIBM 1
+-
+-/* Define to 1 if you have the `mx' library (-lmx). */
+-/* #undef HAVE_LIBMX */
+-
+-/* Define to 1 if you have the `rt' library (-lrt). */
+-#define HAVE_LIBRT 1
+-
+-/* Define if you have C99's lrintf function. */
+-#define HAVE_LRINTF 1
+-
+-/* Define to 1 if you have the <memory.h> header file. */
+-#define HAVE_MEMORY_H 1
+-
+-/* Define to 1 if you have the <stdint.h> header file. */
+-#define HAVE_STDINT_H 1
+-
+-/* Define to 1 if you have the <stdlib.h> header file. */
+-#define HAVE_STDLIB_H 1
+-
+-/* Define to 1 if you have the <strings.h> header file. */
+-#define HAVE_STRINGS_H 1
+-
+-/* Define to 1 if you have the <string.h> header file. */
+-#define HAVE_STRING_H 1
+-
+-/* Define to 1 if you have the <sys/stat.h> header file. */
+-#define HAVE_SYS_STAT_H 1
+-
+-/* Define to 1 if you have the <sys/types.h> header file. */
+-#define HAVE_SYS_TYPES_H 1
+-
+-/* Define to 1 if you have the <unistd.h> header file. */
+-#define HAVE_UNISTD_H 1
+-
+-/* Name of package */
+-#define PACKAGE "swh-plugins"
+-
+-/* Define to the address where bug reports for this package should be sent.
*/
+-#define PACKAGE_BUGREPORT ""
+-
+-/* Define to the full name of this package. */
+-#define PACKAGE_NAME ""
+-
+-/* Define to the full name and version of this package. */
+-#define PACKAGE_STRING ""
+-
+-/* Define to the one symbol short name of this package. */
+-#define PACKAGE_TARNAME ""
+-
+-/* Define to the version of this package. */
+-#define PACKAGE_VERSION ""
+-
+-/* Define to 1 if you have the ANSI C header files. */
+-#define STDC_HEADERS 1
+-
+-/* Version number of package */
+-#define VERSION "0.4.15"
+-
+-/* Define to 1 if your processor stores words with the most significant byte
+- first (like Motorola and SPARC, unlike Intel and VAX). */
+-/* #undef WORDS_BIGENDIAN */
+diff --git a/util/ladspa-util.h b/util/ladspa-util.h
+deleted file mode 100644
+index 5d3dcc9..0000000
+--- a/util/ladspa-util.h
++++ /dev/null
+@@ -1,230 +0,0 @@
+-/* Some misc util functions for audio DSP work, written by Steve Harris,
+- * December 2000
+- *
+- * steve AT plugin.org.uk
+- */
+-
+-#ifndef LADSPA_UTIL_H
+-#define LADSPA_UTIL_H
+-
+-#include <math.h>
+-#include <stdint.h>
+-
+-#include "config.h"
+-
+-// 16.16 fixpoint
+-typedef union {
+- int32_t all;
+- struct {
+-#ifdef WORDS_BIGENDIAN
+- int16_t in;
+- uint16_t fr;
+-#else
+- uint16_t fr;
+- int16_t in;
+-#endif
+- } part;
+-} fixp16;
+-
+-// 32.32 fixpoint
+-typedef union {
+- int64_t all;
+- struct {
+-#ifdef WORDS_BIGENDIAN
+- int32_t in;
+- uint32_t fr;
+-#else
+- uint32_t fr;
+- int32_t in;
+-#endif
+- } part;
+-} fixp32;
+-
+-/* 32 bit "pointer cast" union */
+-typedef union {
+- float f;
+- int32_t i;
+-} ls_pcast32;
+-
+-// 1.0 / ln(2)
+-#define LN2R 1.442695041f
+-
+-/* detet floating point denormal numbers by comparing them to the smallest
+- * normal, crap, but reliable */
+-#define DN_CHECK(x, l) if (fabs(x) < 1e-38) printf("DN: "l"\n")
+-
+-// Denormalise floats, only actually needed for PIII and recent PowerPC
+-//#define FLUSH_TO_ZERO(fv) (((*(unsigned
int*)&(fv))&0x7f800000)==0)?0.0f:(fv)
+-
+-static inline float flush_to_zero(float f)
+-{
+- ls_pcast32 v;
+-
+- v.f = f;
+-
+- // original: return (v.i & 0x7f800000) == 0 ? 0.0f : f;
+- // version from Tim Blechmann
+- return (v.i & 0x7f800000) < 0x08000000 ? 0.0f : f;
+-}
+-
+-static inline void round_to_zero(volatile float *f)
+-{
+- *f += 1e-18f;
+- *f -= 1e-18f;
+-}
+-
+-/* A set of branchless clipping operations from Laurent de Soras */
+-
+-static inline float f_max(float x, float a)
+-{
+- x -= a;
+- x += fabsf(x);
+- x *= 0.5f;
+- x += a;
+-
+- return x;
+-}
+-
+-static inline float f_min(float x, float b)
+-{
+- x = b - x;
+- x += fabsf(x);
+- x *= 0.5f;
+- x = b - x;
+-
+- return x;
+-}
+-
+-static inline float f_clamp(float x, float a, float b)
+-{
+- const float x1 = fabsf(x - a);
+- const float x2 = fabsf(x - b);
+-
+- x = x1 + a + b;
+- x -= x2;
+- x *= 0.5f;
+-
+- return x;
+-}
+-
+-// Limit a value to be l<=v<=u
+-#define LIMIT(v,l,u) ((v)<(l)?(l):((v)>(u)?(u):(v)))
+-
+-// Truncate-to-zero modulo (ANSI C doesn't specify) will only work
+-// if -m < v < 2m
+-#define MOD(v,m) (v<0?v+m:(v>=m?v-m:v))
+-
+-// Truncate-to-zero modulo (ANSI C doesn't specify) will only work
+-// if v > -m and v < m
+-#define NEG_MOD(v,m) ((v)<0?((v)+(m)):(v))
+-
+-// Convert a value in dB's to a coefficent
+-#define DB_CO(g) ((g) > -90.0f ? powf(10.0f, (g) * 0.05f) : 0.0f)
+-#define CO_DB(v) (20.0f * log10f(v))
+-
+-// Linearly interpolate [ = a * (1 - f) + b * f]
+-#define LIN_INTERP(f,a,b) ((a) + (f) * ((b) - (a)))
+-
+-// Cubic interpolation function
+-static inline float cube_interp(const float fr, const float inm1, const
float
+- in, const float inp1, const float inp2)
+-{
+- return in + 0.5f * fr * (inp1 - inm1 +
+- fr * (4.0f * inp1 + 2.0f * inm1 - 5.0f * in - inp2 +
+- fr * (3.0f * (in - inp1) - inm1 + inp2)));
+-}
+-
+-/* fast sin^2 aproxiamtion, adapted from jan AT rpgfan's posting to the
+- * music-dsp list */
+-static inline float f_sin_sq(float angle)
+-{
+- const float asqr = angle * angle;
+- float result = -2.39e-08f;
+-
+- result *= asqr;
+- result += 2.7526e-06f;
+- result *= asqr;
+- result -= 1.98409e-04f;
+- result *= asqr;
+- result += 8.3333315e-03f;
+- result *= asqr;
+- result -= 1.666666664e-01f;
+- result *= asqr;
+- result += 1.0f;
+- result *= angle;
+-
+- return result * result;
+-}
+-
+-#ifdef HAVE_LRINTF
+-
+-#define f_round(f) lrintf(f)
+-
+-#else
+-
+-// Round float to int using IEEE int* hack
+-static inline long int f_round(float f)
+-{
+- ls_pcast32 p;
+-
+- p.f = f;
+- p.f += (3<<22);
+-
+- return p.i - 0x4b400000;
+-}
+-
+-#endif
+-
+-// Truncate float to int
+-static inline long int f_trunc(float f)
+-{
+- return f_round(floorf(f));
+-}
+-
+-/* Andrew Simper's pow(2, x) aproximation from the music-dsp list */
+-
+-#if 0
+-
+-/* original */
+-static inline float f_pow2(float x)
+-{
+- long *px = (long*)(&x); // store address of float as long pointer
+- const float tx = (x-0.5f) + (3<<22); // temporary value for truncation
+- const long lx = *((long*)&tx) - 0x4b400000; // integer power of 2
+- const float dx = x-(float)(lx); // float remainder of power of 2
+-
+- x = 1.0f + dx*(0.6960656421638072f + // cubic apporoximation of 2^x
+- dx*(0.224494337302845f + // for x in the range [0, 1]
+- dx*(0.07944023841053369f)));
+- *px += (lx<<23); // add integer power of 2 to exponent
+-
+- return x;
+-}
+-
+-#else
+-
+-/* union version */
+-static inline float f_pow2(float x)
+-{
+- ls_pcast32 *px, tx, lx;
+- float dx;
+-
+- px = (ls_pcast32 *)&x; // store address of float as long pointer
+- tx.f = (x-0.5f) + (3<<22); // temporary value for truncation
+- lx.i = tx.i - 0x4b400000; // integer power of 2
+- dx = x - (float)lx.i; // float remainder of power of 2
+-
+- x = 1.0f + dx * (0.6960656421638072f + // cubic apporoximation of 2^x
+- dx * (0.224494337302845f + // for x in the range [0, 1]
+- dx * (0.07944023841053369f)));
+- (*px).i += (lx.i << 23); // add integer power of 2 to exponent
+-
+- return (*px).f;
+-}
+-
+-#endif
+-
+-/* Fast exponentiation function, y = e^x */
+-#define f_exp(x) f_pow2(x * LN2R)
+-
+-#endif
+--
+1.9.0
+
diff --git a/audio-plugins/rt-plugins/BUILD b/audio-plugins/rt-plugins/BUILD
index 6dfecc1..e013b8d 100755
--- a/audio-plugins/rt-plugins/BUILD
+++ b/audio-plugins/rt-plugins/BUILD
@@ -1 +1 @@
-default_build_make
+cmake_build
diff --git a/audio-plugins/rt-plugins/DEPENDS
b/audio-plugins/rt-plugins/DEPENDS
index a02b2c8..0146535 100755
--- a/audio-plugins/rt-plugins/DEPENDS
+++ b/audio-plugins/rt-plugins/DEPENDS
@@ -1 +1,2 @@
-depends ladspa
+depends ladspa &&
+depends cmake
diff --git a/audio-plugins/rt-plugins/HISTORY
b/audio-plugins/rt-plugins/HISTORY
index fffe977..a5b95b1 100644
--- a/audio-plugins/rt-plugins/HISTORY
+++ b/audio-plugins/rt-plugins/HISTORY
@@ -1,3 +1,11 @@
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0003-switch-build-system-to-cmake.patch, PRE_BUILD, DEPENDS:
+ use cmake as build system
+
2014-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS, DETAILS: spell created
+ * DEPENDS, DETAILS, PRE_BUILD, INSTALL,
+ 0001-clean-up-the-Makefile.patch,
+ 0002-make-the-code-compile-with-higher-warning-levels.patch: spell
created
+
+

diff --git a/audio-plugins/rt-plugins/INSTALL
b/audio-plugins/rt-plugins/INSTALL
deleted file mode 100755
index 131ca30..0000000
--- a/audio-plugins/rt-plugins/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL_PLUGINS_DIR=${INSTALL_ROOT}/usr/lib/ladspa default_install
diff --git a/audio-plugins/rt-plugins/PRE_BUILD
b/audio-plugins/rt-plugins/PRE_BUILD
index 095c784..3629306 100755
--- a/audio-plugins/rt-plugins/PRE_BUILD
+++ b/audio-plugins/rt-plugins/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
patch -p1 < $SPELL_DIRECTORY/0001-clean-up-the-Makefile.patch &&
-patch -p1 <
$SPELL_DIRECTORY/0002-make-the-code-compile-with-higher-warning-levels.patch
+patch -p1 <
$SPELL_DIRECTORY/0002-make-the-code-compile-with-higher-warning-levels.patch
&&
+patch -p1 < $SPELL_DIRECTORY/0003-switch-build-system-to-cmake.patch
diff --git a/audio-plugins/swh-plugins/HISTORY
b/audio-plugins/swh-plugins/HISTORY
index 88cb9e1..88472fb 100644
--- a/audio-plugins/swh-plugins/HISTORY
+++ b/audio-plugins/swh-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix build with current autotools
+
2014-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* swh-plugins-nosetlocale.patch: add missing file

diff --git a/audio-plugins/swh-plugins/PRE_BUILD
b/audio-plugins/swh-plugins/PRE_BUILD
index 7899656..a61ccfe 100755
--- a/audio-plugins/swh-plugins/PRE_BUILD
+++ b/audio-plugins/swh-plugins/PRE_BUILD
@@ -5,6 +5,9 @@ patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-gettext.patch
&&
patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-pic.patch &&
patch -p1 < $SPELL_DIRECTORY/swh-plugins-nosetlocale.patch &&

+# Minimal hack to make it work with current autoconf.
+# More should be done. Like, ditching bitchin' autoconf.
+sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in &&
# ipdate gettext macros
autopoint -f &&
autoreconf -f -i
diff --git a/audio-soft/easytag/CONFIGURE b/audio-soft/easytag/CONFIGURE
index 4f64657..e5d9f2b 100755
--- a/audio-soft/easytag/CONFIGURE
+++ b/audio-soft/easytag/CONFIGURE
@@ -1 +1 @@
-config_query EASYTAG_GTK3 "Build with gtk+3 (experimental)?" n
+config_query EASYTAG_GTK3 "Build with gtk+3?" y
diff --git a/audio-soft/easytag/DEPENDS b/audio-soft/easytag/DEPENDS
index 1f79b01..54501d8 100755
--- a/audio-soft/easytag/DEPENDS
+++ b/audio-soft/easytag/DEPENDS
@@ -1,9 +1,29 @@
-depends glib2 &&
+depends atk &&
+depends bzip2 &&
+depends cairo &&
+depends expat &&
+depends fontconfig &&
+depends freetype2 &&
+depends gdk-pixbuf2 &&
+depends libffi &&
+depends libpng &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxrender &&
+depends pango &&
+depends pcre &&
+depends pixman &&
+depends zlib &&
+depends glib2 &&
+depends itstool &&

if [ "$EASYTAG_GTK3" == "y" ]; then
- depends gtk+3 "--with-gtk3"
+ depends gtk+3
else
- depends gtk+2
+ depends gtk+2 '--with-gtk2'
fi &&

optional_depends libid3tag \
@@ -41,7 +61,7 @@ optional_depends gettext \
"--disable-nls" \
"Enable nls support" &&

-optional_depends taglib \
+optional_depends -sub MP4 taglib \
"--enable-mp4" \
"--disable-mp4" \
"for MP4 files support" &&
@@ -54,25 +74,4 @@ optional_depends wavpack \
optional_depends speex \
"--enable-speex" \
"--disable-speex" \
- "Enable ogg/speex container support" &&
-
-depends atk &&
-depends bzip2 &&
-depends cairo &&
-depends expat &&
-depends fontconfig &&
-depends freetype2 &&
-depends gdk-pixbuf2 &&
-depends libffi &&
-depends libpng &&
-depends libx11 &&
-depends libxau &&
-depends libxcb &&
-depends libxdmcp &&
-depends libxext &&
-depends libxrender &&
-depends pango &&
-depends pcre &&
-depends pixman &&
-depends zlib
-
+ "Enable ogg/speex container support"
diff --git a/audio-soft/easytag/DETAILS b/audio-soft/easytag/DETAILS
index 2a4006e..f619acf 100755
--- a/audio-soft/easytag/DETAILS
+++ b/audio-soft/easytag/DETAILS
@@ -1,15 +1,16 @@
SPELL=easytag
- VERSION=2.1.9
+ VERSION=2.2.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:498d2268367287eb018936f6bed7b8688e1a7231cef43b87285b0b460ea5f5e53a802a4480e31b4421ea1a15383108a92769dcfa8ae1b657e790a04996f8820a

+
SOURCE_HASH=sha512:bafa1e26371bb95f5edf74424b3733d0ffbb80c740c65e404cf863445a835fdc87f958e9cfddaac7d85281cb3be5ad6584a5750415e294a96c5ef26d4e51f9bf
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://projects.gnome.org/easytag/
+ DOC_DIRS=""
KEYWORDS="tools audio"
ENTERED=20020115
- SHORT="Utility for maintaining audio file Tags"
+ SHORT="utility for maintaining audio file tags"
cat << EOF
EasyTAG is an utility for viewing and editing tags for
MP3, MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index ffdb5df..d6aa233 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,3 +1,16 @@
+2014-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.4
+
+2014-06-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.3
+
+2014-06-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.2; fixed short desc; don't do useless
+ doc'ing
+ * CONFIGURE: gtk+3 becomes major
+ * DEPENDS: added MP4 subdep for taglib; renewed gtk flags; added
missing
+ itstool required dep; cleaned up
+
2014-01-12 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.1.9
* CONFIGURE: added for option to build with GTK3
diff --git a/audio-soft/gmtp/DEPENDS b/audio-soft/gmtp/DEPENDS
new file mode 100755
index 0000000..689a503
--- /dev/null
+++ b/audio-soft/gmtp/DEPENDS
@@ -0,0 +1,5 @@
+depends libvorbis &&
+depends flac &&
+depends libmtp &&
+depends libid3tag &&
+depends gtk+3
diff --git a/audio-soft/gmtp/DETAILS b/audio-soft/gmtp/DETAILS
new file mode 100755
index 0000000..dbdb07c
--- /dev/null
+++ b/audio-soft/gmtp/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=gmtp
+ VERSION=1.3.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/gMTP-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:667f80e9511c20123dd1317880c0a6741ed016f00d79b85ed2e9f4760338db75a215bef36d7882856e7375bf8b2b309b69c838f4c25b96e291fcdcfe2773b725
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://gmtp.sourceforge.net/index.html";
+ LICENSE[0]=BSD
+ ENTERED=20140622
+ SHORT="A simple MP3 and Media player client for UNIX and UNIX
like systems"
+cat << EOF
+gMTP is simple client for devices that understand mtp.
+
+gMTP supports:
+
+ * Upload, Download, Removal, Renaming and Moving of files as needed. *
+ Drag'n'Drop support for uploading files to the device. * Folder Creation
+ and Deletion. * Album Art management. * Metadata support for MP3, WMA,
+ OGG and FLAC audio files, ensuring correct
+ track information on your media player when uploading audio files.
+ * Device Naming support. * Basic creation, editing and deletion of
+ playlists. Able to import and export playlists in *.m3u format.
+EOF
diff --git a/audio-soft/gmtp/HISTORY b/audio-soft/gmtp/HISTORY
new file mode 100644
index 0000000..619a2d9
--- /dev/null
+++ b/audio-soft/gmtp/HISTORY
@@ -0,0 +1,3 @@
+2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/audio-soft/meterbridge/DEPENDS b/audio-soft/meterbridge/DEPENDS
index 52ed4d0..05cd144 100755
--- a/audio-soft/meterbridge/DEPENDS
+++ b/audio-soft/meterbridge/DEPENDS
@@ -1,4 +1,6 @@
depends JACK-DRIVER &&
depends sdl &&
# TODO: meterbridge requires sdl_image with PNG support
-depends sdl_image
+depends sdl_image &&
+depends autoconf &&
+depends automake
diff --git a/audio-soft/meterbridge/HISTORY b/audio-soft/meterbridge/HISTORY
index 0be7602..8b04fb8 100644
--- a/audio-soft/meterbridge/HISTORY
+++ b/audio-soft/meterbridge/HISTORY
@@ -1,3 +1,10 @@
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PRE_BUILD: run autoconf and friends to fix linker error
+ * binutils_gold.patch, PRE_BUILD: fix linker error
+ * main.h.patch, PRE_BUILD: move patch into separate file
+ * meterbridge_0.9.2_iec_fix.patch, PRE_BUILD: fix bug in the 50-60dB
range
+ of the scale
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/audio-soft/meterbridge/PRE_BUILD
b/audio-soft/meterbridge/PRE_BUILD
index 5163110..52337c1 100755
--- a/audio-soft/meterbridge/PRE_BUILD
+++ b/audio-soft/meterbridge/PRE_BUILD
@@ -1,17 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# Fixing this in version 0.9.2:
-# vu_meters.c:11: error: static declaration of 'buf_rect' follows non-static
declaration
-# main.h:11: error: previous declaration of 'buf_rect' was here
-echo '--- /usr/src/meterbridge-0.9.2/src/main.h 2003-06-05
11:42:41.000000000 +0200
-+++ src/main.h 2008-08-01 10:08:16.000000000 +0200
-@@ -8,7 +8,8 @@
-
- extern SDL_Surface *screen;
- extern SDL_Surface *image, *meter, *meter_buf;
--extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
-+/* extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS]; */
-+extern SDL_Rect win, dest[MAX_METERS];
-
- extern jack_port_t *input_ports[MAX_METERS];
- extern jack_port_t *output_ports[MAX_METERS];' | patch -Np0
+
+patch -p1 < $SPELL_DIRECTORY/main.h.patch &&
+patch -p1 < $SPELL_DIRECTORY/binutils_gold.patch &&
+patch -p1 < $SPELL_DIRECTORY/meterbridge_0.9.2_iec_fix.patch &&
+
+autoconf -f &&
+aclocal --force &&
+automake -f --add-missing
diff --git a/audio-soft/meterbridge/binutils_gold.patch
b/audio-soft/meterbridge/binutils_gold.patch
new file mode 100644
index 0000000..23edcaf
--- /dev/null
+++ b/audio-soft/meterbridge/binutils_gold.patch
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold.
+Author: Alessio Treglia <alessio AT debian.org>
+Forwarded: Steve Harris <steve AT plugin.org.uk>
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- meterbridge-0.9.2.orig/src/Makefile.am
++++ meterbridge-0.9.2/src/Makefile.am
+@@ -6,4 +6,4 @@ bin_PROGRAMS = meterbridge
+ EXTRA_DIST = *.h
+
+ meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c
dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c
+-meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
++meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
diff --git a/audio-soft/meterbridge/main.h.patch
b/audio-soft/meterbridge/main.h.patch
new file mode 100644
index 0000000..eafd68a
--- /dev/null
+++ b/audio-soft/meterbridge/main.h.patch
@@ -0,0 +1,19 @@
+Description: Removed duplicate declaration of buf_rect.
+Bug-Debian: http://bugs.debian.org/287641
+Author: Guenter Geiger <geiger AT debian.org>
+Forwarded: steve AT plugin.org.uk
+---
+ src/main.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- meterbridge.orig/src/main.h
++++ meterbridge/src/main.h
+@@ -8,7 +8,7 @@
+
+ extern SDL_Surface *screen;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++extern SDL_Rect win, dest[MAX_METERS];
+
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
diff --git a/audio-soft/meterbridge/meterbridge_0.9.2_iec_fix.patch
b/audio-soft/meterbridge/meterbridge_0.9.2_iec_fix.patch
new file mode 100644
index 0000000..3adc351
--- /dev/null
+++ b/audio-soft/meterbridge/meterbridge_0.9.2_iec_fix.patch
@@ -0,0 +1,20 @@
+Subject: peak-meter scaling according to IEC-268-18 is misimplemented
+Bug-Lad:
+ http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-June/033486.html
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677547
+Author: Robin Gareus <robin AT gareus.org>
+---
+ src/dpm_meters.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- meterbridge.orig/src/dpm_meters.c
++++ meterbridge/src/dpm_meters.c
+@@ -33,7 +33,7 @@ int iec_scale(float db) {
+ } else if (db < -60.0f) {
+ def = (db + 70.0f) * 0.25f;
+ } else if (db < -50.0f) {
+- def = (db + 60.0f) * 0.5f + 5.0f;
++ def = (db + 60.0f) * 0.5f + 2.5f;
+ } else if (db < -40.0f) {
+ def = (db + 50.0f) * 0.75f + 7.5;
+ } else if (db < -30.0f) {
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 3a1f598..0d483da 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=qjackctl
if [[ $QJACKCTL_BRANCH == scm ]]
then
- if [[ $QJACKCTL_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"

SOURCE_URL[0]=cvs://:pserver:anonymous AT qjackctl.cvs.sourceforge.net:/cvsroot/qjackctl:qjackctl
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index 97fb799..aab46e9 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.11
* BUILD: set path to qt4
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index f1d00c1..c56965f 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: add a define missing from current ffmpeg
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 14.4.1

diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index bc5bec1..6784dae 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -8,3 +8,8 @@ patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
fi
+# New ffmpeg misses that define for some reason.
+echo "#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+#endif" >> src/ffmpeg.h
+
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/amsn/DETAILS b/chat-im/amsn/DETAILS
index 0517de5..dfe2fc4 100755
--- a/chat-im/amsn/DETAILS
+++ b/chat-im/amsn/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=amsn
if [[ $AMSN_BRANCH == scm ]]; then
- if [[ $AMSN_AUTOUPDATE == y ]]; then
- VERSION="$(date +%Y%m%d)"
- else
- VERSION=svnsnapshot
- fi
+ VERSION="$(get_scm_version)"
SOURCE=${SPELL}_dev.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/msn
SOURCE_IGNORE=volatile
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index 784aba2..30cd276 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libv4l -> v4l-utils

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/choqok/DETAILS b/chat-im/choqok/DETAILS
index cefd432..26cd449 100755
--- a/chat-im/choqok/DETAILS
+++ b/chat-im/choqok/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=choqok
if [[ "$CHOQOK_BRANCH" = scm ]]; then
- if [[ "$CHOQOK_AUTOUPDATE" = y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL=git://git.kde.org/choqok
SOURCE_IGNORE=volatile
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
index d330970..3540463 100644
--- a/chat-im/choqok/HISTORY
+++ b/chat-im/choqok/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: Use prepare_select_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/DETAILS b/chat-im/licq/DETAILS
index c02a64e..5d9f724 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -1,16 +1,13 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=licq
if [[ "$LICQ_BRANCH" == "scm" ]]; then
- if [[ "$LICQ_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://github.com/licq-im/licq.git:licq
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git/$SPELL
else
- VERSION=1.8.0
+ VERSION=1.8.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index b07d69c..7feeab2 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-06-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.2
+
2013-08-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.0

diff --git a/chat-im/mcabber/DETAILS b/chat-im/mcabber/DETAILS
index 06efa93..16f19da 100755
--- a/chat-im/mcabber/DETAILS
+++ b/chat-im/mcabber/DETAILS
@@ -1,9 +1,13 @@
SPELL=mcabber
- VERSION=0.10.2
+ VERSION=0.10.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://mcabber.com/files/${SOURCE}
SOURCE_URL[1]=http://www.lilotux.net/~mikael/${SPELL}/files/${SOURCE}
-
SOURCE_HASH=sha512:976c29ec753a364392ba6b5280c9031d9eb8884236b7d07fbeaa69a731806706f72b93a0bbbca1eca4f11325412d5beff62b14d94acca912841b8b820c2b3652
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE_GPG=mcabber.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
DOCS="doc/*.txt mcabberrc.example"
diff --git a/chat-im/mcabber/HISTORY b/chat-im/mcabber/HISTORY
index 5d84099..c8290ff 100644
--- a/chat-im/mcabber/HISTORY
+++ b/chat-im/mcabber/HISTORY
@@ -1,3 +1,10 @@
+2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.3; converted to upstream signature
+ checking
+ * mcabber.gpg: added ACB7FC95 public key (Mikael BERTHE (MiKael)
+ <mikael.berthe AT lilotux.net>)
+ * PRE_BUILD, mcabber_use_libotr4.patch: dropped, fixed by upstream
+
2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, PRE_BUILD, mcabber_use_libotr4.patch: fix build with
libotr >= 4.0.0,
patch is from Debian
diff --git a/chat-im/mcabber/PRE_BUILD b/chat-im/mcabber/PRE_BUILD
deleted file mode 100755
index 82029af..0000000
--- a/chat-im/mcabber/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/mcabber_use_libotr4.patch &&
-aclocal &&
-automake --add-missing &&
-autoreconf
diff --git a/chat-im/mcabber/mcabber.gpg b/chat-im/mcabber/mcabber.gpg
new file mode 100644
index 0000000..1705c37
Binary files /dev/null and b/chat-im/mcabber/mcabber.gpg differ
diff --git a/chat-im/mcabber/mcabber_use_libotr4.patch
b/chat-im/mcabber/mcabber_use_libotr4.patch
deleted file mode 100644
index ac044b3..0000000
--- a/chat-im/mcabber/mcabber_use_libotr4.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-# HG changeset patch
-# Parent 1b31bdb72d83850b146a0e1e135eba35bad73d29
-Switch to libotr v4 API
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -184,16 +184,26 @@
-
- # Check for otr
- AC_ARG_ENABLE(otr,
-- AC_HELP_STRING([--enable-otr],
-- [enable OTR (Off-the-Record) messaging
support]),
-- enable_otr=$enableval, otr="")
-+ AC_HELP_STRING([--enable-otr],
-+ [enable OTR (Off-the-Record) messaging support]),
-+ enable_otr=$enableval,
-+ otr="")
- if test "x$enable_otr" = "xyes"; then
-- # Look for libgcrypt and libotr
-- AM_PATH_LIBGCRYPT(1.2.2, [
-- AM_PATH_LIBOTR(3.1.0, ,
-- AC_MSG_ERROR(libotr 3.1.0 or newer is required.))
-- ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
-- )
-+ # Look for libgcrypt and libotr
-+ AM_PATH_LIBGCRYPT(1.2.2, [
-+ AM_PATH_LIBOTR(4.0.0, [
-+ AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
-+ ], [
-+ AM_PATH_LIBOTR(3.1.0, [
-+ AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
-+ AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3])
-+ ], [
-+ AC_MSG_ERROR(libotr 3.1.0 or newer is required.)
-+ ])
-+ ])
-+ ], [
-+ AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
-+ ])
- fi
-
- # Check for Enchant stuff
-@@ -290,3 +300,4 @@
- mcabber.pc
- Makefile])
- AC_OUTPUT
-+dnl vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim
users...
---- a/mcabber/otr.c
-+++ b/mcabber/otr.c
-@@ -56,6 +56,20 @@
- const char *protocol,
- const char *recipient,
- const char *message);
-+static void cb_update_context_list(void *opdata);
-+static void cb_new_fingerprint (void *opdata, OtrlUserState us,
-+ const char *accountname,
-+ const char *protocol,
-+ const char *username,
-+ unsigned char fingerprint[20]);
-+static void cb_write_fingerprints (void *opdata);
-+static void cb_gone_secure (void *opdata, ConnContext
*context);
-+static void cb_gone_insecure (void *opdata, ConnContext
*context);
-+static void cb_still_secure (void *opdata, ConnContext *context,
-+ int is_reply);
-+static int cb_max_message_size (void *opdata, ConnContext
*context);
-+
-+#ifdef HAVE_LIBOTR3
- static void cb_notify (void *opdata,
- OtrlNotifyLevel level,
- const char *accountname,
-@@ -69,22 +83,26 @@
- const char *protocol,
- const char *username,
- const char *msg);
--static void cb_update_context_list(void *opdata);
- static const char *cb_protocol_name (void *opdata, const char
*protocol);
- static void cb_protocol_name_free (void *opdata,
- const char *protocol_name);
--static void cb_new_fingerprint (void *opdata, OtrlUserState us,
-- const char *accountname,
-- const char *protocol,
-- const char *username,
-- unsigned char fingerprint[20]);
--static void cb_write_fingerprints (void *opdata);
--static void cb_gone_secure (void *opdata, ConnContext
*context);
--static void cb_gone_insecure (void *opdata, ConnContext
*context);
--static void cb_still_secure (void *opdata, ConnContext *context,
-- int is_reply);
- static void cb_log_message (void *opdata, const char *message);
--static int cb_max_message_size (void *opdata, ConnContext
*context);
-+
-+static void otr_handle_smp_tlvs (OtrlTLV *tlvs, ConnContext *ctx);
-+#else /* HAVE_LIBOTR3 */
-+static char *tagfile = NULL;
-+static guint otr_timer_source = 0;
-+
-+static void cb_handle_smp_event (void *opdata, OtrlSMPEvent event,
-+ ConnContext *context, unsigned
short percent,
-+ char *question);
-+static void cb_handle_msg_event (void *opdata, OtrlMessageEvent
event,
-+ ConnContext *context, const char
*message,
-+ gcry_error_t err);
-+static void cb_create_instag (void *opdata, const char
*accountname,
-+ const char *protocol);
-+static void cb_timer_control (void *opdata, unsigned int
interval);
-+#endif /* HAVE_LIBOTR3 */
-
- static OtrlMessageAppOps ops =
- {
-@@ -92,26 +110,44 @@
- cb_create_privkey,
- cb_is_logged_in,
- cb_inject_message,
-+#ifdef HAVE_LIBOTR3
- cb_notify,
- cb_display_otr_message,
-+#endif
- cb_update_context_list,
-+#ifdef HAVE_LIBOTR3
- cb_protocol_name,
- cb_protocol_name_free,
-+#endif
- cb_new_fingerprint,
- cb_write_fingerprints,
- cb_gone_secure,
- cb_gone_insecure,
- cb_still_secure,
-+#ifdef HAVE_LIBOTR3
- cb_log_message,
-+#endif
- cb_max_message_size,
-- NULL, /*account_name*/
-- NULL /*account_name_free*/
-+ NULL, /* account_name */
-+ NULL, /* account_name_free */
-+#ifndef HAVE_LIBOTR3
-+ NULL, /* received_symkey */
-+ NULL, /* otr_error_message */
-+ NULL, /* otr_error_message_free */
-+ NULL, /* resent_msg_prefix */
-+ NULL, /* resent_msg_prefix_free */
-+ cb_handle_smp_event,
-+ cb_handle_msg_event,
-+ cb_create_instag,
-+ NULL, /* convert_msg */
-+ NULL, /* convert_free */
-+ cb_timer_control,
-+#endif
- };
-
- static void otr_message_disconnect(ConnContext *ctx);
- static ConnContext *otr_get_context(const char *buddy);
- static void otr_startstop(const char *buddy, int start);
--static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx);
-
- static char *otr_get_dir(void);
-
-@@ -135,7 +171,6 @@
- account = jidtodisp(fjid);
- keyfile = g_strdup_printf("%s%s.key", root, account);
- fprfile = g_strdup_printf("%s%s.fpr", root, account);
-- g_free(root);
-
- if (otrl_privkey_read(userstate, keyfile)){
- scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR key from %s", keyfile);
-@@ -145,6 +180,14 @@
- scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR fingerprints from %s",
- fprfile);
- }
-+#ifndef HAVE_LIBOTR3
-+ tagfile = g_strdup_printf("%s%s.tag", root, account);
-+ if (otrl_instag_read(userstate, tagfile)) {
-+ scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR instance tag from %s",
tagfile);
-+ cb_create_instag(NULL, account, OTR_PROTOCOL_NAME);
-+ }
-+#endif
-+ g_free(root);
- }
-
- void otr_terminate(void)
-@@ -154,6 +197,13 @@
- if (!otr_is_enabled)
- return;
-
-+#ifndef HAVE_LIBOTR3
-+ if (otr_timer_source > 0) {
-+ g_source_remove (otr_timer_source);
-+ otr_timer_source = 0;
-+ }
-+#endif
-+
- for (ctx = userstate->context_root; ctx; ctx = ctx->next)
- if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
- otr_message_disconnect(ctx);
-@@ -175,6 +225,12 @@
- userstate = NULL;
- g_free(keyfile);
- keyfile = NULL;
-+ g_free(fprfile);
-+ fprfile = NULL;
-+#ifndef HAVE_LIBOTR3
-+ g_free(tagfile);
-+ tagfile = NULL;
-+#endif
- }
-
- static char *otr_get_dir(void)
-@@ -206,7 +262,12 @@
-
- mc_strtolower(lowcasebuddy);
- ctx = otrl_context_find(userstate, lowcasebuddy, account,
OTR_PROTOCOL_NAME,
-+#ifdef HAVE_LIBOTR3
- 1, &null, NULL, NULL);
-+#else
-+ // INSTAG XXX
-+ OTRL_INSTAG_BEST, 1, &null, NULL, NULL);
-+#endif
- g_free(lowcasebuddy);
- return ctx;
- }
-@@ -216,7 +277,12 @@
- if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
- cb_gone_insecure(NULL, ctx);
- otrl_message_disconnect(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
- ctx->protocol, ctx->username);
-+#else
-+ // INSTAG XXX
-+ ctx->protocol, ctx->username, OTRL_INSTAG_BEST);
-+#endif
- }
-
- static void otr_startstop(const char *buddy, int start)
-@@ -283,6 +349,8 @@
- cb_write_fingerprints(NULL);
- }
-
-+#ifdef HAVE_LIBOTR3
-+
- static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx)
- {
- OtrlTLV *tlv = NULL;
-@@ -354,6 +422,130 @@
- }
- }
-
-+#else /* HAVE_LIBOTR3 */
-+
-+static void cb_handle_smp_event(void *opdata, OtrlSMPEvent event,
-+ ConnContext *context, unsigned short
percent,
-+ char *question)
-+{
-+ const char *msg = NULL;
-+ char *freeme = NULL;
-+ switch (event) {
-+ case OTRL_SMPEVENT_ASK_FOR_SECRET:
-+ msg = freeme = g_strdup_printf("OTR: Socialist Millionaires'
Protocol: "
-+ "Received SMP Initiation.\n"
-+ "Answer with /otr smpr %s $secret",
-+ context->username);
-+ break;
-+ case OTRL_SMPEVENT_ASK_FOR_ANSWER:
-+ msg = freeme = g_strdup_printf("OTR: Socialist Millionaires'
Protocol: "
-+ "Received SMP Initiation.\n"
-+ "Answer with /otr smpr %s $secret\n"
-+ "Question: %s", context->username,
-+ question);
-+ break;
-+ case OTRL_SMPEVENT_CHEATED:
-+ msg = "OTR: Socialist Millionaires' Protocol: Correspondent cancelled
negotiation!";
-+ otrl_message_abort_smp(userstate, &ops, opdata, context);
-+ break;
-+ case OTRL_SMPEVENT_IN_PROGRESS:
-+ scr_log_print(LPRINT_DEBUG, "OTR: Socialist Millionaires' Protocol: "
-+ "Negotiation is in pogress...");
-+ break;
-+ case OTRL_SMPEVENT_SUCCESS:
-+ msg = "OTR: Socialist Millionaires' Protocol: Success!";
-+ break;
-+ case OTRL_SMPEVENT_FAILURE:
-+ msg = "OTR: Socialist Millionaires' Protocol: Failure.";
-+ break;
-+ case OTRL_SMPEVENT_ABORT:
-+ msg = "OTR: Socialist Millionaires' Protocol: Aborted.";
-+ break;
-+ case OTRL_SMPEVENT_ERROR:
-+ msg = "OTR: Socialist Millionaires' Protocol: Error occured, aborting
negotiations!";
-+ otrl_message_abort_smp(userstate, &ops, opdata, context);
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ if (msg) {
-+ scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
-+ g_free(freeme);
-+ }
-+}
-+
-+static void cb_handle_msg_event(void *opdata, OtrlMessageEvent event,
-+ ConnContext *context, const char *message,
-+ gcry_error_t err)
-+{
-+ const char *msg = NULL;
-+ char *freeme = NULL;
-+ switch (event) {
-+ case OTRL_MSGEVENT_ENCRYPTION_REQUIRED:
-+ msg = "OTR: Policy requires encryption on message!";
-+ break;
-+ case OTRL_MSGEVENT_ENCRYPTION_ERROR:
-+ msg = "OTR: Encryption error! Message not sent.";
-+ break;
-+ case OTRL_MSGEVENT_CONNECTION_ENDED:
-+ msg = "OTR: Connection closed by remote end, message lost. "
-+ "Close or refresh connection.";
-+ break;
-+ case OTRL_MSGEVENT_SETUP_ERROR:
-+ // FIXME
-+ msg = freeme = g_strdup_printf("OTR: Error setting up private
conversation: %u",
-+ err);
-+ break;
-+ case OTRL_MSGEVENT_MSG_REFLECTED:
-+ msg = "OTR: Received own OTR message!";
-+ break;
-+ case OTRL_MSGEVENT_MSG_RESENT:
-+ msg = "OTR: Previous message was resent.";
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_NOT_IN_PRIVATE:
-+ msg = "OTR: Received encrypted message, but connection is not
established " \
-+ "yet! Message lost.";
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_UNREADABLE:
-+ msg = "OTR: Unable to read incoming message!";
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
-+ msg = "OTR: Malformed incoming message!";
-+ break;
-+ case OTRL_MSGEVENT_LOG_HEARTBEAT_RCVD:
-+ scr_log_print(LPRINT_DEBUG, "OTR: Received heartbeat.");
-+ break;
-+ case OTRL_MSGEVENT_LOG_HEARTBEAT_SENT:
-+ scr_log_print(LPRINT_DEBUG, "OTR: Sent heartbeat.");
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
-+ msg = freeme = g_strdup_printf("OTR: Received general otr error: %s",
-+ message);
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
-+ msg = freeme = g_strdup_printf("OTR: Received unencrypted message:
%s",
-+ message);
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
-+ msg = "OTR: Unable to determine type of received OTR message!";
-+ break;
-+ case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
-+ // XXX
-+ scr_log_print(LPRINT_DEBUG, "OTR: Received message for other
instance.");
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ if (msg) {
-+ scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
-+ g_free(freeme);
-+ }
-+}
-+
-+#endif /* HAVE_LIBOTR3 */
-+
- /*
- * returns whether a otr_message was received
- * sets *otr_data to NULL, when it was an internal otr message
-@@ -362,8 +554,10 @@
- {
- int ignore_message;
- char *newmessage = NULL;
-+#ifdef HAVE_LIBOTR3
- OtrlTLV *tlvs = NULL;
- OtrlTLV *tlv = NULL;
-+#endif
- ConnContext *ctx;
-
- ctx = otr_get_context(buddy);
-@@ -371,8 +565,8 @@
- ignore_message = otrl_message_receiving(userstate, &ops, NULL,
- ctx->accountname, ctx->protocol,
- ctx->username, *otr_data,
-- &newmessage, &tlvs,NULL, NULL);
--
-+#ifdef HAVE_LIBOTR3
-+ &newmessage, &tlvs, NULL, NULL);
-
- tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
- if (tlv) {
-@@ -387,6 +581,9 @@
-
- if (tlvs != NULL)
- otrl_tlv_free(tlvs);
-+#else
-+ &newmessage, NULL, NULL, NULL,
NULL);
-+#endif
-
- if (ignore_message)
- *otr_data = NULL;
-@@ -410,13 +607,27 @@
-
- if (ctx->msgstate == OTRL_MSGSTATE_PLAINTEXT)
- err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
- ctx->protocol, ctx->username, *msg, NULL,
- &newmessage, NULL, NULL);
-+#else
-+ // INSTAG XXX
-+ ctx->protocol, ctx->username,
OTRL_INSTAG_BEST,
-+ *msg, NULL, &newmessage,
OTRL_FRAGMENT_SEND_SKIP,
-+ NULL, NULL, NULL);
-+#endif
- else {
- htmlmsg = html_escape(*msg);
- err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
- ctx->protocol, ctx->username, htmlmsg, NULL,
- &newmessage, NULL, NULL);
-+#else
-+ // INSTAG XXX
-+ ctx->protocol, ctx->username,
OTRL_INSTAG_BEST,
-+ htmlmsg, NULL, &newmessage,
OTRL_FRAGMENT_SEND_SKIP,
-+ NULL, NULL, NULL);
-+#endif
- g_free(htmlmsg);
- }
-
-@@ -648,6 +859,59 @@
- LM_MESSAGE_SUB_TYPE_NOT_SET, NULL);
- }
-
-+/* When the list of ConnContexts changes (including a change in
-+ * state), this is called so the UI can be updated. */
-+static void cb_update_context_list(void *opdata)
-+{
-+ /*maybe introduce new status characters for mcabber,
-+ * then use this function (?!)*/
-+}
-+
-+/* A new fingerprint for the given user has been received. */
-+static void cb_new_fingerprint(void *opdata, OtrlUserState us,
-+ const char *accountname, const char
*protocol,
-+ const char *username,
-+ unsigned char fingerprint[20])
-+{
-+ char *sbuf = NULL;
-+ char readable[45];
-+
-+ otrl_privkey_hash_to_human(readable, fingerprint);
-+ sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
-+ scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
-+ g_free(sbuf);
-+}
-+
-+/* The list of known fingerprints has changed. Write them to disk. */
-+static void cb_write_fingerprints(void *opdata)
-+{
-+ otrl_privkey_write_fingerprints(userstate, fprfile);
-+}
-+
-+/* A ConnContext has entered a secure state. */
-+static void cb_gone_secure(void *opdata, ConnContext *context)
-+{
-+ scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
-+ HBB_PREFIX_INFO, 0);
-+}
-+
-+/* A ConnContext has left a secure state. */
-+static void cb_gone_insecure(void *opdata, ConnContext *context)
-+{
-+ scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
-+ HBB_PREFIX_INFO, 0);
-+}
-+
-+/* We have completed an authentication, using the D-H keys we
-+ * already knew. is_reply indicates whether we initiated the AKE. */
-+static void cb_still_secure(void *opdata, ConnContext *context, int
is_reply)
-+{
-+ scr_WriteIncomingMessage(context->username, "OTR: channel reestablished",
0,
-+ HBB_PREFIX_INFO, 0);
-+}
-+
-+#ifdef HAVE_LIBOTR3
-+
- /* Display a notification message for a particular
- * accountname / protocol / username conversation. */
- static void cb_notify(void *opdata, OtrlNotifyLevel level,
-@@ -684,14 +948,6 @@
- return 0;
- }
-
--/* When the list of ConnContexts changes (including a change in
-- * state), this is called so the UI can be updated. */
--static void cb_update_context_list(void *opdata)
--{
-- /*maybe introduce new status characters for mcabber,
-- * then use this function (?!)*/
--}
--
- /* Return a newly allocated string containing a human-friendly name
- * for the given protocol id */
- static const char *cb_protocol_name(void *opdata, const char *protocol)
-@@ -705,54 +961,40 @@
- /* We didn't allocated memory, so we don't have to free anything :p */
- }
-
--/* A new fingerprint for the given user has been received. */
--static void cb_new_fingerprint(void *opdata, OtrlUserState us,
-- const char *accountname, const char
*protocol,
-- const char *username,
-- unsigned char fingerprint[20])
-+/* Log a message. The passed message will end in "\n". */
-+static void cb_log_message(void *opdata, const char *message)
- {
-- char *sbuf = NULL;
-- char readable[45];
--
-- otrl_privkey_hash_to_human(readable, fingerprint);
-- sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
-- scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
-- g_free(sbuf);
-+ scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
- }
-
--/* The list of known fingerprints has changed. Write them to disk. */
--static void cb_write_fingerprints(void *opdata)
--{
-- otrl_privkey_write_fingerprints(userstate, fprfile);
--}
-+#else /* HAVE_LIBOTR3 */
-
--/* A ConnContext has entered a secure state. */
--static void cb_gone_secure(void *opdata, ConnContext *context)
-+/* Generate unique instance tag for account. */
-+static void cb_create_instag(void *opdata, const char *accountname,
-+ const char *protocol)
- {
-- scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
-- HBB_PREFIX_INFO, 0);
-+ if (otrl_instag_generate(userstate, tagfile, accountname, protocol)) {
-+ scr_LogPrint(LPRINT_LOGNORM, "OTR instance tag generation failed!");
-+ }
- }
-
--/* A ConnContext has left a secure state. */
--static void cb_gone_insecure(void *opdata, ConnContext *context)
-+static gboolean otr_timer_cb(gpointer userdata)
- {
-- scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
-- HBB_PREFIX_INFO, 0);
-+ otrl_message_poll(userstate, &ops, userdata);
-+ return TRUE;
- }
-
--/* We have completed an authentication, using the D-H keys we
-- * already knew. is_reply indicates whether we initiated the AKE. */
--static void cb_still_secure(void *opdata, ConnContext *context, int
is_reply)
-+static void cb_timer_control(void *opdata, unsigned int interval)
- {
-- scr_WriteIncomingMessage(context->username, "OTR: channel reestablished",
0,
-- HBB_PREFIX_INFO, 0);
-+ if (otr_timer_source > 0) {
-+ g_source_remove(otr_timer_source);
-+ otr_timer_source = 0;
-+ }
-+ if (interval > 0)
-+ otr_timer_source = g_timeout_add_seconds(interval, otr_timer_cb,
opdata);
- }
-
--/* Log a message. The passed message will end in "\n". */
--static void cb_log_message(void *opdata, const char *message)
--{
-- scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
--}
-+#endif /* HAVE_LIBOTR3 */
-
- /* Find the maximum message size supported by this protocol. */
- static int cb_max_message_size(void *opdata, ConnContext *context)
---- a/mcabber/otr.h
-+++ b/mcabber/otr.h
-@@ -5,6 +5,9 @@
-
- #ifdef HAVE_LIBOTR
-
-+#ifndef HAVE_LIBOTR3
-+# include <libotr/instag.h>
-+#endif
- #include <libotr/proto.h>
- #include <libotr/message.h>
- #include <libotr/privkey.h>
diff --git a/chat-im/pidgin-sipe/DEPENDS b/chat-im/pidgin-sipe/DEPENDS
index 5419726..920623f 100755
--- a/chat-im/pidgin-sipe/DEPENDS
+++ b/chat-im/pidgin-sipe/DEPENDS
@@ -1,6 +1,11 @@
-depends pidgin &&
+depends gettext &&
depends glib2 &&
+depends icu &&
+depends libffi &&
+depends libidn &&
depends libxml2 &&
+depends nspr &&
depends nss &&
-depends gettext
+depends pcre &&
+depends pidgin

diff --git a/chat-im/pidgin-sipe/HISTORY b/chat-im/pidgin-sipe/HISTORY
index 2add5c6..505cdd6 100644
--- a/chat-im/pidgin-sipe/HISTORY
+++ b/chat-im/pidgin-sipe/HISTORY
@@ -1,2 +1,5 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2013-06-12 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS, DEPENDS: new spell
diff --git a/chat-im/pidgin-window-merge/DEPENDS
b/chat-im/pidgin-window-merge/DEPENDS
new file mode 100755
index 0000000..80af1d9
--- /dev/null
+++ b/chat-im/pidgin-window-merge/DEPENDS
@@ -0,0 +1,4 @@
+depends autoconf &&
+depends automake &&
+depends git &&
+depends pidgin
diff --git a/chat-im/pidgin-window-merge/DETAILS
b/chat-im/pidgin-window-merge/DETAILS
new file mode 100755
index 0000000..4765f04
--- /dev/null
+++ b/chat-im/pidgin-window-merge/DETAILS
@@ -0,0 +1,19 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=pidgin-window-merge
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
+ SOURCE_URL=git://github.com/dm0-/window_merge.git:$SPELL-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+ WEB_SITE=http://github.com/dm0-/window_merge
+ ENTERED=20140923
+ LICENSE[0]=GPL
+ KEYWORDS="chat plugin window"
+ SHORT="One window plugin for Pidgin"
+cat << EOF
+Window Merge is a Pidgin plugin that merges a conversation window
+with the Buddy List window. It can be used to achieve a rudimentary
+"single window mode" for Pidgin. Both Window Merge and Pidgin itself
+should be kept updated for the most stable experience
+EOF
diff --git a/chat-im/pidgin-window-merge/HISTORY
b/chat-im/pidgin-window-merge/HISTORY
new file mode 100644
index 0000000..404d690
--- /dev/null
+++ b/chat-im/pidgin-window-merge/HISTORY
@@ -0,0 +1,2 @@
+2014-09-23 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/chat-im/pidgin-window-merge/PREPARE
b/chat-im/pidgin-window-merge/PREPARE
new file mode 100755
index 0000000..a68f274
--- /dev/null
+++ b/chat-im/pidgin-window-merge/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch scm
diff --git a/chat-im/pidgin-window-merge/PRE_BUILD
b/chat-im/pidgin-window-merge/PRE_BUILD
new file mode 100755
index 0000000..0bbdbfe
--- /dev/null
+++ b/chat-im/pidgin-window-merge/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY" &&
+
+mkdir -p m4 &&
+autoreconf -fi
diff --git a/chat-im/pidgin/4C292FCC.gpg b/chat-im/pidgin/4C292FCC.gpg
deleted file mode 100644
index 689916a..0000000
Binary files a/chat-im/pidgin/4C292FCC.gpg and /dev/null differ
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index 08ea19a..10c9e76 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -1,7 +1,8 @@
-depends libxml2 &&
depends glib2 &&
-depends xml-parser-expat &&
depends intltool &&
+depends libxml2 &&
+depends nspr &&
+depends xml-parser-expat &&

optional_depends silc-toolkit \
"" \
@@ -83,9 +84,9 @@ optional_depends gstreamer \
"--disable-gstreamer" \
"for GStreamer audio support" &&

-optional_depends farsight2 \
- "" \
- "--disable-farsight --disable-vv" \
+optional_depends farstream \
+ "--enable-farstream --enable-vv" \
+ "--disable-farstream --disable-vv" \
"for voice/video support" &&

optional_depends avahi \
@@ -112,8 +113,8 @@ optional_depends libidn
\
'--enable-idn' \
'--disable-idn' \
'for International Domain Name support' &&
+
optional_depends sqlite \
'--enable-cap' \
'--disable-cap' \
'for contact availability prediction'
-
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index fc19a7b..0dca129 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,11 +1,11 @@
SPELL=pidgin
- VERSION=2.10.7
+ VERSION=2.10.9
SECURITY_PATCH=16
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=4C292FCC.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=pidgin.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pidgin.sourceforge.net/
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 028feef..9d5371a 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,12 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: nspr
+
+2014-09-23 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.10.9
+ * DEPENDS: farsight2 -> farstream, fixed its flags
+ * 4C292FCC.gpg: removed
+ * pidgin.gpg: added new key, A40AB77B, Mark Doliner <mark AT kingant.net>
+
2013-10-23 Mark Bainter <mbainter AT sourcemage.org>
* DEPENDS: Pidgin depends on glib2 2.16 or newer

diff --git a/chat-im/pidgin/pidgin.gpg b/chat-im/pidgin/pidgin.gpg
new file mode 100644
index 0000000..dd98f71
Binary files /dev/null and b/chat-im/pidgin/pidgin.gpg differ
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/DETAILS b/chat-im/profanity/DETAILS
index 79473fe..1e49f9b 100755
--- a/chat-im/profanity/DETAILS
+++ b/chat-im/profanity/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=profanity
if [[ ${PROFANITY_BRANCH} == scm ]]; then
- if [[ ${PROFANITY_AUTOUPDATE} == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=git://github.com/boothj5/${SPELL}.git
SOURCE_IGNORE=volatile
diff --git a/chat-im/profanity/HISTORY b/chat-im/profanity/HISTORY
index 1513a04..bd15642 100644
--- a/chat-im/profanity/HISTORY
+++ b/chat-im/profanity/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-10-13 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS, PREPARE, DEPENDS, PRE_BUILD: spell created

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/DETAILS b/chat-im/prosody/DETAILS
index be5ad8b..b67a5c6 100755
--- a/chat-im/prosody/DETAILS
+++ b/chat-im/prosody/DETAILS
@@ -1,8 +1,8 @@
SPELL=prosody
- VERSION=0.9.1
+ VERSION=0.9.4
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.im/downloads/source/${SOURCE}
-
SOURCE_HASH=sha512:dbd0d8476f0abb4030f8c1ac68786cde2dd68bc2e6602ba8ea27b7d23f2010f963dd3ff50e0a6e7780bddfba014c7bbd1fa0c607d070d979131c15431e04c3fa
+
SOURCE_HASH=sha512:9bba454caf50ed590dc18febd1a739f35e850805ac19e9a2e822ce3b39306a4f6d67162a49b11baa7e4f575b19e954dfd91f984780a724f6e0c69202947ca94c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://prosody.im/";
LICENSE[0]=MIT/X11
diff --git a/chat-im/prosody/HISTORY b/chat-im/prosody/HISTORY
index 783c961..dc2023c 100644
--- a/chat-im/prosody/HISTORY
+++ b/chat-im/prosody/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-10-14 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS: version 0.9.1
* DEPENDS: added lualdap support
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/DETAILS b/chat-im/vacuum/DETAILS
index ba7cb19..a9e5f11 100755
--- a/chat-im/vacuum/DETAILS
+++ b/chat-im/vacuum/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=vacuum
-if test "$VACUUM_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
diff --git a/chat-im/vacuum/HISTORY b/chat-im/vacuum/HISTORY
index 393c51a..7001cab 100644
--- a/chat-im/vacuum/HISTORY
+++ b/chat-im/vacuum/HISTORY
@@ -1,3 +1,9 @@
+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
+
2012-03-07 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: switched to qt4_cmake_build
* DEPENDS: added cmake
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index 27b84e7..ad8bae7 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,10 +1,10 @@
SPELL=bitlbee
- VERSION=3.2.1
+ VERSION=3.2.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
-
SOURCE_HASH=sha512:5df1ab94602a801024a459ef166e5515e94e202773b8ade838c55967865f706291d3b3fa63bdd7737d461e96cf8af2f191d5ea4451e14149ac28edb9f5bfce9f
+
SOURCE_HASH=sha512:5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2
DOCS="doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/HACKING
doc/INSTALL doc/README doc/user-guide/user-guide.* $DOCS"
DOC_DIRS=""
WEB_SITE=http://www.bitlbee.org
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 06a539e..a6aee76 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,6 @@
+2014-07-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.2
+
2014-03-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.1; quoting paths; fixed short desc
* CONFIGURE: readability++; moved libpurple-exclusive plugins to
diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE
index 9fe71e0..656a340 100755
--- a/chat-irc/hexchat/CONFIGURE
+++ b/chat-irc/hexchat/CONFIGURE
@@ -1,35 +1,46 @@
-config_query_option HEXCHAT_OPTS "Enable threads?" y \
- "--enable-threads=pth" "--disable-theads" &&
-
-config_query_option HEXCHAT_OPTS "Enable IPv6?" n \
- "--enable-ipv6" "--disable-ipv6" &&
-
-config_query_option HEXCHAT_OPTS "Enable use of Xft directly?" n \
- "--enable-xft" "--disable-xft" &&
-
-config_query_option HEXCHAT_OPTS "Enable use of XShm for fast tinting?" n \
- "--enable-shm" "--disable-shm" &&
+# remove obsolete options from HEXCHAT_OPTS
+list_remove HEXCHAT_OPTS '--enable-threads=pth' &&
+list_remove HEXCHAT_OPTS '--disable-theads' &&
+list_remove HEXCHAT_OPTS '--enable-xft' &&
+list_remove HEXCHAT_OPTS '--disable-xft' &&
+list_remove HEXCHAT_OPTS '--enable-shm' &&
+list_remove HEXCHAT_OPTS '--disable-shm' &&
+list_remove HEXCHAT_OPTS '--enable-mmx' &&
+list_remove HEXCHAT_OPTS '--disable-mmx' &&
+list_remove HEXCHAT_OPTS '--enable-sasl' &&
+list_remove HEXCHAT_OPTS '--disable-sasl' &&
+
+config_query_option HEXCHAT_OPTS "Enable IPv6?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&

config_query_option HEXCHAT_OPTS "Build the text frontend?" n \
- "--enable-textfe" "--disable-textfe" &&
+ "--enable-textfe" \
+ "--disable-textfe" &&

config_query_option HEXCHAT_OPTS "Enable plugin support?" y \
- "--enable-plugin" "--disable-plugin" &&
-
-config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y \
- "--enable-checksum" "--disable-checksum" &&
-
-config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \
- "--enable-doat" "--disable-doat" &&
-
-config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
- "--enable-fishlim" "--disable-fishlim" &&
-
-config_query_option HEXCHAT_OPTS "Enable SASL plugin?" y \
- "--enable-sasl" "--disable-sasl" &&
-
-config_query_option HEXCHAT_OPTS "Enable MMX assembly routines?" y \
- "--enable-mmx" "--disable-mmx" &&
-
-config_query_option HEXCHAT_OPTS "enable use of XShm for fast tinting?" n \
- "--enable-mmx" "--disable-mmx"
+ "--enable-plugin" \
+ "--disable-plugin" &&
+
+if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
+ config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y \
+ "--enable-checksum" \
+ "--disable-checksum" &&
+
+ config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \
+ "--enable-doat" \
+ "--disable-doat" &&
+
+ config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \
+ "--enable-fishlim" \
+ "--disable-fishlim" &&
+
+ config_query_option HEXCHAT_OPTS "Enable sysinfo plugin?" y \
+ "--enable-sysinfo" \
+ "--disable-sysinfo"
+else
+ list_add HEXCHAT_OPTS '--disable-checksum' &&
+ list_add HEXCHAT_OPTS '--disable-doat' &&
+ list_add HEXCHAT_OPTS '--disable-fishlim' &&
+ list_add HEXCHAT_OPTS '--disable-sysinfo'
+fi
diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS
index e10f03d..c9be841 100755
--- a/chat-irc/hexchat/DEPENDS
+++ b/chat-irc/hexchat/DEPENDS
@@ -1,51 +1,71 @@
-depends glib2 &&
-
-optional_depends gettext \
- "" \
- "--disable-nls" \
- "Enable gettext for i18n?" &&
-
-optional_depends openssl \
- "--enable-openssl=/usr/bin/openssl" \
- "" \
- "Enable use of openSSL?" &&
-
-optional_depends gtk+2 \
- "--enable-gtkfe" \
- "--disable-gtkfe --enable-textfe" \
- "Enable building the gtk frontend" &&
-
-optional_depends python \
- "" \
- "--disable-python" \
- "for Python scripting support" &&
-
-optional_depends perl \
- "" \
- "--disable-perl" \
- "for perl scripting support" &&
-
-optional_depends tcl \
- "--enable-tcl=/usr/lib" \
- "" \
- "for tcl scripting support" &&
-
-optional_depends dbus \
- "" \
- "--disable-dbus" \
- "Enable DBUS support?" &&
-
-optional_depends libnotify \
- "" \
- "--disable-libnotify" \
- "Enable libnotify support?" &&
-
-optional_depends gtkspell \
- "--enable-spell=gtkspell" \
- "" \
- "for spell checker support" &&
-
-optional_depends libsexy \
- "--enable-spell=libsexy" \
- "" \
- "for spell checker support"
+depends glib2 &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+optional_depends openssl \
+ "--enable-openssl=/usr/bin/openssl" \
+ "--disable-openssl" \
+ "to enable use of openSSL" &&
+
+optional_depends gtk+2 \
+ "--enable-gtkfe" \
+ "--disable-gtkfe" \
+ "for building gtk frontend" &&
+
+if list_find "$HEXCHAT_OPTS" "--disable-textfe" && ! is_depends_enabled
$SPELL gtk+2; then
+ message "${PROBLEM_COLOR}No frontend selected,
aborting...${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then
+ optional_depends python \
+ "--enable-python=python2" \
+ "--disable-python" \
+ "for Python scripting support" &&
+
+ optional_depends perl \
+ "--enable-perl" \
+ "--disable-perl" \
+ "for Perl scripting support"
+else
+ list_add HEXCHAT_OPTS '--disable-python' &&
+ list_add HEXCHAT_OPTS '--disable-perl'
+fi &&
+
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "to enable DBUS support" &&
+
+optional_depends libnotify \
+ "--enable-libnotify" \
+ "--disable-libnotify" \
+ "to enable libnotify support" &&
+
+optional_depends iso-codes \
+ "--enable-isocodes" \
+ "--disable-isocodes" \
+ "for iso-codes with spell-check" &&
+
+optional_depends libcanberra \
+ "--enable-libcanberra" \
+ "--disable-libcanberra" \
+ "for libcanberra support" &&
+
+optional_depends libntlm \
+ "--enable-ntlm" \
+ "--disable-ntlm" \
+ "for Microsoft's NTLM auth library support" &&
+
+optional_depends libproxy \
+ "--enable-libproxy" \
+ "--disable-libproxy" \
+ "for libproxy support" &&
+
+optional_depends monodevelop \
+ "--with-theme-manager" \
+ "--without-theme-manager" \
+ "to compile theme manager"
diff --git a/chat-irc/hexchat/DETAILS b/chat-irc/hexchat/DETAILS
index 3f8746d..ccdcdc9 100755
--- a/chat-irc/hexchat/DETAILS
+++ b/chat-irc/hexchat/DETAILS
@@ -1,9 +1,12 @@
SPELL=hexchat
- VERSION=2.9.1
+ VERSION=2.10.1
SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://dl.hexchat.net/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=https://github.com/downloads/$SPELL/$SPELL/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ SOURCE_GPG=hexchat.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.hexchat.org/
ENTERED=20120909
LICENSE[0]=GPL
@@ -11,8 +14,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SHORT="IRC client for X"
cat << EOF
HexChat is an IRC chat program. It allows you to join multiple IRC channels
-(chat rooms) at the same time, talk publicly, private one-on-one
+(chat rooms) at the same time, talk publicly, private one-on-one
conversations etc.

-HexChat is based on XChat
+HexChat is based on XChat.
EOF
diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY
index 898621b..c9490aa 100644
--- a/chat-irc/hexchat/HISTORY
+++ b/chat-irc/hexchat/HISTORY
@@ -1,2 +1,14 @@
+2014-09-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.1; converted to upstream signature
+ checking; cleaned up
+ * DEPENDS, CONFIGURE: rewritten
+ * PRE_BUILD: dropped
+ * INSTALL: corrected plugin header path
+ * hexchat.gpg: added, 0DE76DFC public key (TingPing
+ <tingping AT fedoraproject.org>) imported
+
+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/hexchat/INSTALL b/chat-irc/hexchat/INSTALL
index e6227ae..8c58061 100755
--- a/chat-irc/hexchat/INSTALL
+++ b/chat-irc/hexchat/INSTALL
@@ -1,3 +1,4 @@
-install -vm 644 plugins/xchat-plugin.h "$INSTALL_ROOT/usr/include" &&
+# actually it's false
+make UPDATE_MIME_DATABASE=true install &&

-default_install
+install -vm 644 "src/common/hexchat-plugin.h" "$INSTALL_ROOT/usr/include"
diff --git a/chat-irc/hexchat/PRE_BUILD b/chat-irc/hexchat/PRE_BUILD
deleted file mode 100755
index ba99dad..0000000
--- a/chat-irc/hexchat/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-./autogen.sh
diff --git a/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig
b/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig
deleted file mode 100644
index 86a676e..0000000
Binary files a/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig and /dev/null differ
diff --git a/chat-irc/hexchat/hexchat.gpg b/chat-irc/hexchat/hexchat.gpg
new file mode 100644
index 0000000..48046ed
Binary files /dev/null and b/chat-irc/hexchat/hexchat.gpg differ
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/DETAILS b/chat-irc/irssi/DETAILS
index 40db363..aa7ad00 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -1,20 +1,17 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=irssi
if [[ $IRSSI_BRANCH == scm ]]; then
- if [[ $IRSSI_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=ON
SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
SOURCE_IGNORE=volatile
SOURCE=$SPELL-scm.tar.bz2
else
- VERSION=0.8.15
+ VERSION=0.8.16
SECURITY_PATCH=1
- SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
SOURCE2_IGNORE=signature
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 187baca..5101f76 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-06-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.16
+
2011-09-27 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: fixed the fix ;) SOURCE has to exist before
SOURCE2=$SOURCE.sig can be used.
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 6341b97..f8f86d6 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -1,15 +1,13 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=weechat
if [ "$WEECHAT_BRANCH" == "scm" ]; then
- VERSION=$WEECHAT_BRANCH
- if [ "$WEECHAT_AUTOUPDATE" == "y" ]; then
- VERSION+=-$(date +%Y%m%d)
- fi
+ VERSION=$(get_scm_version)
SOURCE=weechat-$WEECHAT_BRANCH.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-$WEECHAT_BRANCH
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
SOURCE_URL[0]=git://git.sv.gnu.org/weechat.git:$SPELL
-else
+else
if [ "$WEECHAT_BRANCH" == "devel" ]; then
VERSION=0.4.4-dev
SOURCE=$SPELL-devel.tar.bz2
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index 5a709c3..fe6fe6d 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-02-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable 0.4.3, unstable 0.4.4-dev
* FINAL: removed
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/DETAILS b/chat-irc/znc/DETAILS
index 3b3e9b2..36a7593 100755
--- a/chat-irc/znc/DETAILS
+++ b/chat-irc/znc/DETAILS
@@ -1,5 +1,5 @@
SPELL=znc
- VERSION=1.2
+ VERSION=1.4
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index c06aedf..56d1c73 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,9 @@
+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
+
2014-03-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2; SECURITY_PATCH++ (CVE-2013-2130)

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/opal/DETAILS b/chat-libs/opal/DETAILS
index 693fe75..89dde06 100755
--- a/chat-libs/opal/DETAILS
+++ b/chat-libs/opal/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=opal
if [[ $OPAL_BRANCH == scm ]]; then
- if [[ $OPAL_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2

SOURCE_URL[0]=svn_https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk:opalvoip
FORCE_DOWNLOAD=on
diff --git a/chat-libs/opal/HISTORY b/chat-libs/opal/HISTORY
index 74ef7f7..a344612 100644
--- a/chat-libs/opal/HISTORY
+++ b/chat-libs/opal/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-07-10 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.10.5
Fixed SOURCE_URL[0]
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/DETAILS b/chat-libs/ptlib/DETAILS
index 6b859bc..c8dbb19 100755
--- a/chat-libs/ptlib/DETAILS
+++ b/chat-libs/ptlib/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ptlib
if [[ $PTLIB_BRANCH == scm ]]; then
- if [[ $PTLIB_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2

SOURCE_URL[0]=svn_https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk:opalvoip
FORCE_DOWNLOAD=on
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index 3b7cce5..66423dd 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,11 @@
+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
+
2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.10.5
Fixed SOURCE_URL[0]
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/cluster/ocfs2-tools/DETAILS b/cluster/ocfs2-tools/DETAILS
index b107da2..716fa93 100755
--- a/cluster/ocfs2-tools/DETAILS
+++ b/cluster/ocfs2-tools/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ocfs2-tools
if [[ $OCFS2_TOOLS_BRANCH == scm ]]; then
- if [[ $OCFS2_TOOLS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git://oss.oracle.com/git/${SPELL}.git:${SPELL}-${VERSION}
diff --git a/cluster/ocfs2-tools/HISTORY b/cluster/ocfs2-tools/HISTORY
index b6b4e06..3b4856c 100644
--- a/cluster/ocfs2-tools/HISTORY
+++ b/cluster/ocfs2-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-01-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added scm branch and latest release from devel (1.8) branch
(cloned from official git tag db4aef6, repacked and put to our
mirror)
diff --git a/collab/cola/BUILD b/collab/cola/BUILD
index a05d2aa..27ba77d 100755
--- a/collab/cola/BUILD
+++ b/collab/cola/BUILD
@@ -1 +1 @@
-default_build_python
+true
diff --git a/collab/cola/CONFLICTS b/collab/cola/CONFLICTS
new file mode 100755
index 0000000..1854aaa
--- /dev/null
+++ b/collab/cola/CONFLICTS
@@ -0,0 +1 @@
+conflicts cola y
diff --git a/collab/cola/DEPENDS b/collab/cola/DEPENDS
deleted file mode 100755
index 8843a27..0000000
--- a/collab/cola/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends git &&
-depends python &&
-depends pyqt4 &&
-optional_depends pyinotify '' '' 'python inotify suport?' &&
-depends simplejson
diff --git a/collab/cola/DETAILS b/collab/cola/DETAILS
index 4d617d6..66d6cac 100755
--- a/collab/cola/DETAILS
+++ b/collab/cola/DETAILS
@@ -1,17 +1,8 @@
SPELL=cola
- SPELLX=git-cola
- VERSION=1.7.5
- SOURCE="${SPELLX}-${VERSION}.tar.gz"
- SOURCE_URL[0]=https://github.com/downloads/git-cola/git-cola/${SOURCE}
-
SOURCE_HASH=sha512:69813c7565686269848905dc57633faf1d371821ecd7cf6903ee7ee1a3bd9cf989c2e8fbf312f32a17912c64556ab4a010ff51f00a4b8b25c86b45d82a898c8b
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
- WEB_SITE="http://cola.tuxfamily.org";
- LICENSE[0]=GPL2
- ENTERED=20080801
- SHORT="a highly caffeninated git gui"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-git-cola: a highly caffeinated git gui
-
-Cola is a sweet, carbonated git gui known for its sugary flavour and
-caffeine-inspired features.
+deprecated spell [replaced by git-cola]
EOF
+
diff --git a/collab/cola/DOWNLOAD b/collab/cola/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/collab/cola/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/collab/cola/HISTORY b/collab/cola/HISTORY
index 512d265..4d1b200 100644
--- a/collab/cola/HISTORY
+++ b/collab/cola/HISTORY
@@ -1,67 +1,4 @@
-2012-02-08 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.7.5 (added SPELLX for source rename)
- * INSTALL: removed uneeded sed edit
-
-2011-11-15 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.7.0 (fixed SOURCE_URL[0])
-
-2011-10-04 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.3.5
-
-2011-06-03 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.3.4
-
-2011-04-15 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.3.2
-
-2011-03-26 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.3.1
-
-2011-01-27 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.3
-
-2010-10-21 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.2.5
-
-2010-09-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.2.4
-
-2010-08-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.2.3
-
-2010-05-23 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.2.1
-
-2010-04-26 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: Fixed SOURCE
- updated spell to 1.4.2
-
-2009-12-15 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.1.1
-
-2009-12-07 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.1
-
-2009-11-19 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.0.5
-
-2009-11-07 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.0.2
-
-2009-11-01 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.0.1
-
-2009-10-28 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.4.0
-
-2009-09-17 Bor Kraljic <pyrobor AT ver.si>
- * DEPENDS: added optional_depends for pyinotify
- * INSTALL: changed to use default_python_install
- added sedit to change prefix to /usr
- * BUILD: changed to use default_python_build
- * DETAILS: Fixed SOURCE
- updated spell to 1.3.9.14
-
-2008-08-01 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS, DETAILS, BUILD, INSTALL: spell created
-
+2014-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by git-cola]
diff --git a/collab/cola/INSTALL b/collab/cola/INSTALL
index 46c6fba..27ba77d 100755
--- a/collab/cola/INSTALL
+++ b/collab/cola/INSTALL
@@ -1 +1 @@
-default_install_python
+true
diff --git a/collab/cola/PRE_BUILD b/collab/cola/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/collab/cola/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/collab/cola/UP_TRIGGERS b/collab/cola/UP_TRIGGERS
new file mode 100755
index 0000000..5b64b9f
--- /dev/null
+++ b/collab/cola/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger git-cola cast_self
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/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 020fec4..362db5b 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -6,7 +6,7 @@ depends bison &&
depends e2fsprogs &&
depends libtool &&
depends zlib &&
-depends serf &&
+depends serf "--with-serf" &&

if [[ "$SVN_HEAD" == y ]]; then
depends python
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index b08c074..684c209 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=subversion
- VERSION=1.8.5
- SECURITY_PATCH=5
+ VERSION=1.8.10
+ SECURITY_PATCH=7
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index e97f4a7..11c5203 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,16 @@
+2014-09-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Fix dependency on serf (without the flag, it may be
skipped)
+
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.8.10 ... They pulled the tarball already!
+
+2014-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.9
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.8
+ SECURITY_PATCH++ fix CVE-2014-0032
+
2014-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.5
SECURITY_PATCH++ fix CVE-2013-4505 CVE-2013-4558
diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index 38882be..14c5d1a 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -1,7 +1,7 @@
SPELL=ca-certificates
- VERSION=20140223
+ VERSION=20140325
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:003b6fd2301eee3ca2119781ee75a1b195f142678d4570b598c4b93847de23c4f659152f834db1f0c8866767324d02b27807260cf43f6ae16207538fa419aa31
+
SOURCE_HASH=sha512:729339c7050bdc791738f07c6523a1cbe3ccfcf4ea321a314f673172bd6999f707bcf924e2aa4bad0e263d5e374e592f1d693db7fbf23bab61b44ce5708cb57b
SOURCE=${SPELL}_${VERSION}_all.deb
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/c/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index e7234ab..dac5288 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20140325
+
2014-03-13 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 20140223

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 e3735c1..dbf9424 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnupg-exp
- VERSION=2.0.22
- SECURITY_PATCH=7
+ VERSION=2.0.26
+ SECURITY_PATCH=8
PATCHLEVEL=0

SOURCE=gnupg-$VERSION.tar.bz2
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index a033c80..7488387 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,15 @@
+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
+
+2014-06-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.24, SECURITY_PATCH=8
+
+2014-06-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.23
+
2013-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.22, SECURITY_PATCH=7, CVE-2013-4402

diff --git a/crypto/gnupg/DETAILS b/crypto/gnupg/DETAILS
index 4e6091d..db0a8c9 100755
--- a/crypto/gnupg/DETAILS
+++ b/crypto/gnupg/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg
- VERSION=1.4.16
+ VERSION=1.4.18
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnupg.org/
ENTERED=20010922
PATCHLEVEL=0
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
LICENSE[0]=GPL
KEYWORDS="crypto"
SHORT="Tool for secure secure communication and data storage"
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 83b68a9..6814438 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,9 @@
+2014-06-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.18
+
+2014-06-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.17, SECURITY_PATCH=11
+
2013-12-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.16, SECURITY_PATCH=10, CVE-2013-4576

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index 337a276..826779f 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -9,8 +9,13 @@ optional_depends "zlib" \
"--without-zlib" \
"for zlib compression support" &&

+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "NLS support" &&
+
optional_depends "libtasn1" \
- "--with-libtasn1-prefix=$INSTALL_ROOT/usr" \
+ "" \
"--with-included-libtasn1" \
"to use external libtasn1" &&

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index c9ad32d..d5326b6 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -1,19 +1,17 @@
SPELL=gnutls
case $GNUTLS_BRANCH in
stable)
- VERSION=3.2.12.1
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=3.2.18
;;
stable-old)
- VERSION=3.1.22
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=3.1.26
;;
esac
- BRANCH_VER=$(awk 'BEGIN{FS="."}{print $1"."$2}' <<< $VERSION)
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$BRANCH_VER/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index f18a900..f15bcec 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,21 @@
+2014-09-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Simplified branch version handling
+ * DETAILS: updated stable branch to 3.2.18
+
+2014-08-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.2.17 and 3.1.26
+
+2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 3.2.16
+ * DEPENDS: add gettext, remove lzo
+
+2014-06-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 3.1.25 and 3.2.15, SECURITY_PATCH++, fixes
+ CVE-2014-3466
+
+2014-05-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_DIRECTORY
+
2014-03-08 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated GNUTLS_BRANCH=stable to 3.2.12.1
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 7f99c37..3c7353f 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -1,7 +1,6 @@
. ${GRIMOIRE}/FUNCTIONS &&
-if [[ "$GNUTLS_BRANCH" == "3.2" ]]; then
- GNUTLS_BRANCH=stable
-elif [[ "$GNUTLS_BRANCH" == "3.1" ]]; then
- GNUTLS_BRANCH=stable-old
-fi &&
+case "$GNUTLS_BRANCH" in
+3.2) GNUTLS_BRANCH=stable;;
+3.1) GNUTLS_BRANCH=stable-old;;
+esac &&
prepare_select_branch stable stable-old
diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index c112442..3dace30 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gpa
if [ "$GPA_BRANCH" == "scm" ]; then
- if [ "$GPA_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-scm.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_URL[0]=git://git.gnupg.org/gpa.git:$SPELL-scm
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index a487ab2..fadb54f 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-05-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.4

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 133dd9a..c53ce9b 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -32,6 +32,12 @@ case $GPGME_BRANCH in

SOURCE_HASH=sha512:59a91f7d7f16dfcd6b53da3ea627691b23cb98a932b2ebc6af1d40c7450b283150a99eae820046c355c757cd3daf53e72c0123ff6e130cf602691cadbdc7136b
SOURCE=$SPELL-$VERSION.tar.bz2
;;
+ 1.5)
+ VERSION=1.5.1
+
SOURCE_HASH=sha512:66162d8baf8ce3d7eeaba5aa9cd4efb2704a7a00ce3e0e08a78bdf29ce812e00240a373e7e134825326117fab5495fe42cdf3944eb76f89048e045bcc6e114ff
+ SECURITY_PATCH=2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ ;;
esac

SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 87e6ace..17a3700 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,12 @@
+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
+
2013-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.3

diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index 445b185..1a23a2d 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -13,7 +13,7 @@ if [[ $GPGME_OLD == n ]]; then
persistent_remove GPGME_OLD
fi

-config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4
+config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5

###
# 2006-07-07
diff --git a/crypto/gtk-led-askpass/BUILD b/crypto/gtk-led-askpass/BUILD
deleted file mode 100755
index 8f58e6d..0000000
--- a/crypto/gtk-led-askpass/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-make
diff --git a/crypto/gtk-led-askpass/DETAILS b/crypto/gtk-led-askpass/DETAILS
index e170524..222cbbb 100755
--- a/crypto/gtk-led-askpass/DETAILS
+++ b/crypto/gtk-led-askpass/DETAILS
@@ -1,10 +1,11 @@
SPELL=gtk-led-askpass
- VERSION=0.10
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://rhydd.org/source/gtk-led-aspass/$SOURCE
-
SOURCE_HASH=sha512:4047f301c05c876473a7f554c5b781dcb2b2fe015e1ba81a9679cdac2f9a86eaf86acb07bb3d3dc445f28750da44760d0716a3df8c6772f7626f469d45935588
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.orig
- WEB_SITE=http://rhydd.org/wiki/Gtk_LED_Askpass
+ VERSION=0.11
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://git.rhydd.org/$SPELL::$SPELL-$VERSION
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ WEB_SITE="http://git.rhydd.org/?p=$SPELL;a=summary";
LICENSE[0]=GPL
ENTERED=20080330
SHORT="GTK+2-based ssh-askpass"
diff --git a/crypto/gtk-led-askpass/HISTORY b/crypto/gtk-led-askpass/HISTORY
index 99169a5..ddb0c5d 100644
--- a/crypto/gtk-led-askpass/HISTORY
+++ b/crypto/gtk-led-askpass/HISTORY
@@ -1,3 +1,9 @@
+2014-07-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL, PRE_BUILD: updated spell to 0.11
+ Source fetched from git repository now.
+ Updated website.
+ Run autoreconf, since it uses autotools now.
+
2008-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: $INSTALL_ROOT

diff --git a/crypto/gtk-led-askpass/PRE_BUILD
b/crypto/gtk-led-askpass/PRE_BUILD
index 3f79ea6..cde1ced 100755
--- a/crypto/gtk-led-askpass/PRE_BUILD
+++ b/crypto/gtk-led-askpass/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sed -i "s:/local::" Makefile
+cd "$SOURCE_DIRECTORY" &&
+autoreconf -fsi
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/libassuan/DETAILS b/crypto/libassuan/DETAILS
index 8db342f..0d84cb6 100755
--- a/crypto/libassuan/DETAILS
+++ b/crypto/libassuan/DETAILS
@@ -1,5 +1,5 @@
SPELL=libassuan
- VERSION=2.1.1
+ VERSION=2.1.2

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libassuan/$SOURCE
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index 383f30a..791dc75 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2014-09-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.2
+
2013-10-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.1

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/libgpg-error/DETAILS b/crypto/libgpg-error/DETAILS
index 19332be..6917afa 100755
--- a/crypto/libgpg-error/DETAILS
+++ b/crypto/libgpg-error/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgpg-error
- VERSION=1.12
+ VERSION=1.13
PATCHLEVEL=0

SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/crypto/libgpg-error/HISTORY b/crypto/libgpg-error/HISTORY
index 553b5e1..7e4e54b 100644
--- a/crypto/libgpg-error/HISTORY
+++ b/crypto/libgpg-error/HISTORY
@@ -1,3 +1,6 @@
+2014-09-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.13
+
2013-07-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12

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/nss/BUILD b/crypto/nss/BUILD
index dd7249c..6cd185d 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,5 +1,5 @@
if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi &&

MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&
@@ -9,7 +9,7 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
MAKE_OPTS="$MAKE_OPTS USE_64=1"
fi &&

-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
cd $SOURCE_DIRECTORY/nss &&
MAKE_OPTS="$MAKE_OPTS NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1
ZLIB_LIBS=-lz"
make_single &&
diff --git a/crypto/nss/DEPENDS b/crypto/nss/DEPENDS
index 6c41a13..9a93434 100755
--- a/crypto/nss/DEPENDS
+++ b/crypto/nss/DEPENDS
@@ -1,5 +1,6 @@
depends nspr &&
depends perl &&
-if [[ $NSS_BRANCH == "3.15" ]]; then
+depends sqlite &&
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
depends zlib
fi
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 6a70fcb..9ae7db4 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,47 +1,29 @@
SPELL=nss

if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi

case $NSS_BRANCH in
- 3.11)
- VERSION=3.11.9
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
- PATCHLEVEL=2
- ;;
- 3.12)
- VERSION=3.12.11
- SECURITY_PATCH=3
- PATCHLEVEL=1
- SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_WITH_CKBI_1_88_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:19601383313fe6457b1af03161a9902811a77715e8a9a04ec4e70fd8e9685b3883497b7a8c5f877728fea2144c3e14c0d811f13fe1cd39dccd95feb60d3eb57f
- ;;
- 3.13)
- VERSION=3.13.6
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
- ;;
3.14)
- VERSION=3.14.3
+ VERSION=3.14.5
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec
+
SOURCE_HASH=sha512:ef35939d6b4627df0e562da7b0f1bb599c8f7cf09f7baa9fc059ddd725a91a4d34204a22e05e3aa9b2a609c085834f611f9e6ff2dde69e16e9cd7e7c74a86ddf
;;
3.15)
VERSION=3.15.5

SOURCE_HASH=sha512:4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+ ;;
+ 3.16)
+ VERSION=3.16.5
+
SOURCE_HASH=sha512:687513e2e4ac8139d045a9f4af3440db0dbcd1e8b1834da1a1a3c9f948929c00464b2a6e857bc9f83125df52f30d1ed91786f22fcdf24f148a7ed5cc474f0c75
+ SECURITY_PATCH=5
+ SOURCE=$SPELL-$VERSION.tar.gz
;;
esac
-
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
ENTERED=20030919
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index cdd5fed..1bb2522 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,31 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: sqlite
+
+2014-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.16.5, SECURITY_PATCH++
+
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.16.4
+
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fixup of default branch with PEM
+ * nss-pem-20140808.tar.bz2: new PEM from
+ https://git.fedorahosted.org/git/nss-pem.git
+ * INSTALL: fix path for nss-config in 3.15.5
+
+2014-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix 3.16 aptching
+
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.16.3
+
+2014-06-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 3.16.1
+
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, SUB_DEPENDS, PRE_BUILD, BUILD, DEPENDS, PRE_SUB_DEPENDS:
+ remove obsolete branches, add 3.16 branch, update 3.14 branch to
3.14.5
+
2014-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.15.5

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 9e14711..f216bde 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,8 +1,8 @@
if [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.15
+ NSS_BRANCH=3.16
fi &&

-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
cd $SOURCE_DIRECTORY/dist
else
cd $SOURCE_DIRECTORY/mozilla/dist
@@ -19,7 +19,7 @@ install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib &&

install -v -d -m755 $INSTALL_ROOT/usr/lib/pkgconfig &&
-if [[ $NSS_BRANCH == "3.15" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then
install -v -m644 */lib/pkgconfig/nss.pc $INSTALL_ROOT/usr/lib/pkgconfig
else
install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
@@ -27,8 +27,11 @@ fi &&

install -v -d -m755 $INSTALL_ROOT/usr/bin &&
install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&
-if [[ $NSS_BRANCH != "3.15" ]]; then
- install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin
+
+if [[ $NSS_BRANCH == "3.16" ]]; then
+ install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
+elif [[ $NSS_BRANCH == "3.15" ]]; then
+ install -v -m755 ../nss/config/nss-config $INSTALL_ROOT/usr/bin
fi &&

install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 3b52816..47f9fef 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14 3.15
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 429b805..127e978 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,7 +2,9 @@ default_pre_build &&

cd $SOURCE_DIRECTORY &&

-if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "DEFAULT" ]]; then
+if [[ $NSS_BRANCH == "3.16" || $NSS_BRANCH == "DEFAULT" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
+elif [[ $NSS_BRANCH == "3.15" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
@@ -10,9 +12,16 @@ else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&

-if [[ "$NSS_PEM" == "y" && $NSS_BRANCH != "3.15" ]]; then
- tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
- patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
+if [[ "$NSS_PEM" == "y" ]]; then
+ # New or old source trees are easy to tell apart.
+ if test -e nss; then
+ tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 &&
+ patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ else
+ # Playing safe with old stuff, no new PEM source there.
+ tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
+ patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ fi &&
if [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
fi
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index ba9efc3..74b4152 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,8 +1,7 @@
case $THIS_SUB_DEPENDS in
- 3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
- 3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
+ 3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index 5a1ad57..620f12a 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -1,14 +1,12 @@
case $THIS_SUB_DEPENDS in
- 3.12.x) echo "3.12.x release needed, forcing it." &&
- NSS_BRANCH="3.12" ;;
- 3.13.x) echo "3.13.x release needed, forcing it." &&
- NSS_BRANCH="3.13" ;;
3.14.x) echo "3.14.x release needed, forcing it." &&
NSS_BRANCH="3.14" ;;
3.15.x) echo "3.15.x release needed, forcing it." &&
NSS_BRANCH="3.15" ;;
- PEM) if [[ $NSS_BRANCH == "3.15" ]]; then
- echo "pem is not supported yet for branch 3.15" &&
+ 3.16.x) echo "3.16.x release needed, forcing it." &&
+ NSS_BRANCH="3.16" ;;
+ PEM) if [[ $NSS_BRANCH == "3.16" ]]; then
+ echo "pem is not supported yet for branch $NSS_BRANCH" &&
return 1
else
echo "nss with pem needed, forcing it." &&
diff --git a/crypto/nss/nss-pem-20140808.tar.bz2
b/crypto/nss/nss-pem-20140808.tar.bz2
new file mode 100644
index 0000000..8c23ceb
Binary files /dev/null and b/crypto/nss/nss-pem-20140808.tar.bz2 differ
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 543a4df..025489f 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,9 @@
+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.
+
2014-03-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.6p1

diff --git a/crypto/openssh/PRE_BUILD b/crypto/openssh/PRE_BUILD
index 86a99df..9d8eda1 100755
--- a/crypto/openssh/PRE_BUILD
+++ b/crypto/openssh/PRE_BUILD
@@ -2,6 +2,6 @@ default_pre_build &&

if [ "${OPENSSH_LPK}" == "y" ]; then
cd "${SOURCE_DIRECTORY}" &&
- bzcat $SPELL_DIRECTORY/openssh-lpk-6.0p1-0.3.14.patch.bz2 | patch -p1 &&
+ zcat $SPELL_DIRECTORY/openssh-lpk-6.5p1-0.3.14.patch.gz | patch -p1 &&
autoconf
fi
diff --git a/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
b/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
deleted file mode 100644
index bc9e221..0000000
Binary files a/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2 and
/dev/null differ
diff --git a/crypto/openssh/openssh-lpk-6.5p1-0.3.14.patch.gz
b/crypto/openssh/openssh-lpk-6.5p1-0.3.14.patch.gz
new file mode 100644
index 0000000..d84b17c
Binary files /dev/null and b/crypto/openssh/openssh-lpk-6.5p1-0.3.14.patch.gz
differ
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 c867d4e..0fafa67 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,13 +6,12 @@ fi

case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8y
- SECURITY_PATCH=20
+ VERSION=0.9.8zb
+ SECURITY_PATCH=22
;;
1.0)
- VERSION=1.0.0l
- SECURITY_PATCH=21
- PATCHLEVEL=0
+ VERSION=1.0.1i
+ SECURITY_PATCH=24
;;
esac

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index a39ecbe..2767afc 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,22 @@
+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)
+
+2014-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1g, SECURITY_PATCH=22, CVE-2014-0160
+ * openssl.gpg: import key FA40E9E2
+
2014-01-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0l, SECURITY_PATCH=21

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 e01c054..d90e7db 100644
Binary files a/crypto/openssl/openssl.gpg and b/crypto/openssl/openssl.gpg
differ
diff --git a/crypto/p11-kit/DETAILS b/crypto/p11-kit/DETAILS
index dd4b636..6d40ac9 100755
--- a/crypto/p11-kit/DETAILS
+++ b/crypto/p11-kit/DETAILS
@@ -1,5 +1,5 @@
SPELL=p11-kit
- VERSION=0.18.1
+ VERSION=0.20.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_GPG=D92765AF.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index 7aeaed2..36fbe16 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,6 @@
+2014-07-12 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.20.3
+
2013-04-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.18.1

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/leveldb/BUILD b/database/leveldb/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/database/leveldb/BUILD
@@ -0,0 +1 @@
+make
diff --git a/database/leveldb/DEPENDS b/database/leveldb/DEPENDS
new file mode 100755
index 0000000..68614d1
--- /dev/null
+++ b/database/leveldb/DEPENDS
@@ -0,0 +1,8 @@
+optional_depends google-perftools \
+ "" \
+ "" \
+ "for tcmalloc" &&
+optional_depends snappy \
+ "" \
+ "" \
+ "compress data using snappy"
diff --git a/database/leveldb/DETAILS b/database/leveldb/DETAILS
new file mode 100755
index 0000000..b793cd6
--- /dev/null
+++ b/database/leveldb/DETAILS
@@ -0,0 +1,25 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=leveldb
+ LIBVER=1.17
+if [ "${LEVELDB_BRANCH}" == "scm" ]; then
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-${LEVELDB_BRANCH}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${LEVELDB_BRANCH}
+ FORCE_DOWNLOAD=on
+ SOURCE_URL[0]=git://github.com/google/${SPELL}.git
+ SOURCE_IGNORE=volatile
+else
+ VERSION=1.17
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/google/${SPELL}/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:8bd279078d421ae4bbca6031680764957ad19be356eb186a686fa62869ad64635764ca1d421a2bb1d747349faea415355101c88e5455bde8827f631aa6c7f711
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+ WEB_SITE="http://code.google.com/p/leveldb/";
+ LICENSE[0]=BSD3
+ ENTERED=20140915
+ SHORT="fast key-value storage library"
+cat << EOF
+LevelDB is a fast key-value storage library written at Google that provides
+an ordered mapping from string keys to string values.
+EOF
diff --git a/database/leveldb/HISTORY b/database/leveldb/HISTORY
new file mode 100644
index 0000000..bcb9733
--- /dev/null
+++ b/database/leveldb/HISTORY
@@ -0,0 +1,3 @@
+2014-09-15 Jeremy Blosser <jblosser AT sourcemage.org>
+ * PREPARE, BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/database/leveldb/INSTALL b/database/leveldb/INSTALL
new file mode 100755
index 0000000..5466918
--- /dev/null
+++ b/database/leveldb/INSTALL
@@ -0,0 +1,11 @@
+install -m 755 -d ${INSTALL_ROOT}/usr/include/leveldb &&
+install -m 644 ./include/leveldb/* ${INSTALL_ROOT}/usr/include/leveldb/ &&
+
+install -m 644 libleveldb.a ${INSTALL_ROOT}/usr/lib/ &&
+install -m 755 libleveldb.so.${LIBVER} ${INSTALL_ROOT}/usr/lib/ &&
+ldconfig &&
+
+pushd ${INSTALL_ROOT}/usr/lib &&
+ln -sfn libleveldb.so.${LIBVER} libleveldb.so.1 &&
+ln -sfn libleveldb.so.${LIBVER} libleveldb.so &&
+popd
diff --git a/database/leveldb/PREPARE b/database/leveldb/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/database/leveldb/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
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/BUILD b/database/mariadb/BUILD
index 47781f2..019f655 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -1,27 +1,62 @@
create_account mariadb &&

-OPTS="$MADB_OPTS $OPTS" &&
+OPTS="$MARIADB_OPTS $OPTS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&

-local LD_PRELOAD_OLD="$LD_PRELOAD" &&
-unset LD_PRELOAD &&
-CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ if [[ $MARIA_TESTS == n ]]; then
+ OPTS="-DWITH_UNIT_TESTS=OFF -DINSTALL_MYSQLTESTDIR=OFF $OPTS"
+ else
+ OPTS="-DWITH_UNIT_TESTS=ON -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
$OPTS"
+ fi &&

-if glibc_is_nptl; then
- OPTS="--with-named-thread-libs=-lpthread $OPTS" &&
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-fi &&
+ if [[ $MARIA_BENCH == n ]]; then
+ OPTS="-DINSTALL_SQLBENCHDIR=OFF $OPTS"
+ else
+ OPTS="-DINSTALL_SQLBENCHDIR=share/mysql/sql-bench $OPTS"
+ fi &&

-OPTS="--with-mysqld-user=mariadb \
- --with-charset=$MADB_CHARSET \
- --with-plugins=${MADB_ENGINES// /,} \
- --localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
- --enable-assembler \
- --enable-thread-safe-client \
- --with-readline \
- $OPTS" &&
+ OPTS="-DDEFAULT_CHARSET=$MARIADB_CHARSET \
+ -DMYSQL_DATADIR=${INSTALL_ROOT}/var/lib/mariadb \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/doc/mariadb \
+ -DINSTALL_DOCREADMEDIR=share/doc/mariadb \
+ -DINSTALL_MANDIR=share/man \
+ $OPTS" &&

-default_build &&
+ if [[ $MARIADB_ENGINES == none ]] || [[ $MARIADB_ENGINES == all ]]; then
+ OPTS="-DWITH_${MARIADB_ENGINES^^} $OPTS"
+ else
+ for engine in $MARIADB_ENGINES; do
+ OPTS="-DWITH_${engine^^}_STORAGE_ENGINE=ON $OPTS"
+ done
+ fi &&

-LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make
+ cmake_build
+else
+ local LD_PRELOAD_OLD="$LD_PRELOAD" &&
+ unset LD_PRELOAD &&
+ CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+
+ if glibc_is_nptl; then
+ OPTS="--with-named-thread-libs=-lpthread $OPTS" &&
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ fi &&
+
+ OPTS="--with-mysqld-user=mariadb \
+ --with-charset=$MARIADB_CHARSET \
+ --with-plugins=${MARIADB_ENGINES// /,} \
+ --localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
+ --enable-assembler \
+ --enable-thread-safe-client \
+ --with-readline \
+ $OPTS" &&
+
+ default_build &&
+
+ LD_PRELOAD="$LD_PRELOAD_OLD" &&
+ make
+fi
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index 496c711..8945b10 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -1,85 +1,124 @@
source $GRIMOIRE/config_query_multi.function &&

-config_query_option MADB_OPTS "Install client only?" n \
- "--without-server" \
- "--with-server" &&
+# backporting legacy options
+if [[ -n "$MADB_OPTS" ]]; then
+ persistent_add MARIADB_OPTS &&
+ MARIADB_OPTS="$MADB_OPTS" &&
+ persistent_remove MADB_OPTS
+fi &&
+
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ if list_find "$MARIADB_OPTS" "--with-embedded-server"; then
+ list_remove "MARIADB_OPTS" "--with-embedded-server" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=ON"
+ elif list_find "$MARIADB_OPTS" "--without-embedded-server"; then
+ list_remove "MARIADB_OPTS" "--without-embedded-server" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=OFF"
+ elif list_find "$MARIADB_OPTS" "--with-server"; then
+ list_remove "MARIADB_OPTS" "--with-server" &&
+ list_add "MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"
+ elif list_find "$MARIADB_OPTS" "--without-server"; then
+ list_remove "MARIADB_OPTS" "--without-server" &&
+ list_add "MARIADB_OPTS" "-DWITHOUT_SERVER=ON"
+ fi &&
+
+ config_query_option MARIADB_OPTS "Build the embedded server (libmysqld)?"
n \
+ "-DWITH_EMBEDDED_SERVER=ON" \
+ "-DWITH_EMBEDDED_SERVER=OFF" &&
+
+ config_query_option MARIADB_OPTS "Install client only?" n \
+ "-DWITHOUT_SERVER=ON" \
+ "-DWITHOUT_SERVER=OFF"
+else
+ config_query_option MARIADB_OPTS "Install client only?" n \
+ "--without-server" \
+ "--with-server" &&
+
+ config_query_option MARIADB_OPTS "Build the embedded server (libmysqld)?"
n \
+ "--with-embedded-server" \
+ "--without-embedded-server" &&
+
+ if list_find "$MARIADB_OPTS" "--with-server"; then
+ config_query_option MARIADB_OPTS "Use libevent and have connection
pooling?" n \
+ "--with-libevent=yes" \
+ "--with-libevent=no"
+ fi
+fi &&
+
+# backporting legacy options
+if [[ -n "$MADB_CHARSET" ]]; then
+ persistent_add MARIADB_CHARSET &&
+ MARIADB_CHARSET="$MADB_CHARSET" &&
+ persistent_remove MADB_CHARSET
+fi &&

-config_query_option MADB_OPTS "Build the embedded server (libmysqld)?" n \
- "--with-embedded-server" \
- "--without-embedded-server" &&
+config_query_list MARIADB_CHARSET "Select default character set:" \
+ latin1 \
+ utf8 \
+ binary \
+ armscii8 \
+ ascii \
+ big5 \
+ cp1250 \
+ cp1251 \
+ cp1256 \
+ cp1257 \
+ cp850 \
+ cp852 \
+ cp866 \
+ cp932 \
+ dec8 \
+ eucjpms \
+ euckr \
+ gb2312 \
+ gbk \
+ geostd8 \
+ greek \
+ hebrew \
+ hp8 \
+ keybcs2 \
+ koi8r \
+ koi8u \
+ latin2 \
+ latin5 \
+ latin7 \
+ macce \
+ macroman \
+ sjis \
+ swe7 \
+ tis620 \
+ ucs2 \
+ ujis \
+ utf16 \
+ utf32 \
+ utf8mb4 &&

-if list_find "$MADB_OPTS" "--with-server"; then
- config_query_option MADB_OPTS "Use libevent and have connection pooling?"
n \
- "--with-libevent=yes" \
- "--with-libevent=no"
+# backporting legacy options
+if [[ -n "$MADB_ENGINES" ]]; then
+ persistent_add MARIADB_ENGINES &&
+ MARIADB_ENGINES="$MADB_ENGINES" &&
+ persistent_remove MADB_ENGINES
fi &&

-config_query_list MADB_CHARSET "Select default character set" \
- latin1 \
- utf8 \
- binary \
- armscii8 \
- ascii \
- big5 \
- cp1250 \
- cp1251 \
- cp1256 \
- cp1257 \
- cp850 \
- cp852 \
- cp866 \
- cp932 \
- dec8 \
- eucjpms \
- euckr \
- gb2312 \
- gbk \
- geostd8 \
- greek \
- hebrew \
- hp8 \
- keybcs2 \
- koi8r \
- koi8u \
- latin2 \
- latin5 \
- latin7 \
- macce \
- macroman \
- sjis \
- swe7 \
- tis620 \
- ucs2 \
- ujis &&
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap innobase myisam myisammrg ndbcluster oqgraph partition
perfschema sphinx tokudb xtradb"
+else
+ local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap ibmdb2i innodb_plugin myisam ndbcluster oqgraph pbxt sphinx
xtradb"
+fi &&
+
+config_query_multi MARIADB_ENGINES "What storage engines to build?" \
+ none \
+ all \
+ $MARIADB_ENGINES_LIST &&

-config_query_multi MADB_ENGINES \
- "What additional storage engines to build?" \
- none \
- all \
- archive \
- xtradb \
- blackhole \
- example \
- federated \
- innodb_plugin \
- ndbcluster \
- myisam \
- partition \
- auth \
- daemon_example \
- ftexample \
- csv \
- federatedx \
- heap \
- ibmdb2i \
- aria \
- myisammrg \
- oqgraph \
- pbxt \
- sphinx &&
+if list_find "$MARIADB_ENGINES" "all"; then
+ MARIADB_ENGINES="all"
+elif list_find "$MARIADB_ENGINES" "none"; then
+ MARIADB_ENGINES="none"
+fi &&

-if list_find "$MADB_ENGINES" "all"; then
- MADB_ENGINES="all"
-elif list_find "$MADB_ENGINES" "none"; then
- MADB_ENGINES="none"
+if list_find "$MARIADB_ENGINES" "aria" && [[ $MARIADB_BRANCH == 5.5 ]]; then
+ config_query_option MARIADB_OPTS "Use Aria engine (instead of MyISAM) for
temporary tables?" y \
+ "-DUSE_ARIA_FOR_TMP_TABLES=ON" \
+ "-DUSE_ARIA_FOR_TMP_TABLES=OFF"
fi
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index ed9f6ec..ccabcec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -1,34 +1,72 @@
depends perl &&
depends procps &&
depends -sub CXX gcc &&
+depends bison &&

-optional_depends zlib \
- "--with-zlib-dir=$INSTALL_ROOT/" \
- "--with-zlib-dir=bundled" \
- "to use system zlib instead of bundled" &&
-
-# temporarily broken cause of mismatching API
-#optional_depends readline \
-# "--without-readline" "" \
-# "to use system readline instead of bundled" &&
-
-optional_depends libedit \
- "--without-libedit" "" \
- "to use system libedit instead of bundled" &&
-
-optional_depends openssl \
- "--with-ssl" \
- "--without-ssl" \
- "for OpenSSL support" &&
-
-optional_depends valgrind \
- "--with-valgrind" \
- "--without-valgrind" \
- "for Valgrind instrumentation" &&
-
-if list_find "$MADB_OPTS" "--with-libevent=yes"; then
- optional_depends libevent \
- "--with-libevent=$INSTALL_ROOT/usr" \
- "--with-libevent=bundled" \
- "to use system libevent instead of bundled"
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ depends cmake &&
+
+ optional_depends readline \
+ "-DWITH_READLINE=OFF" \
+ "-DWITH_READLINE=ON" \
+ "to use system readline instead of bundled" &&
+
+ optional_depends zlib \
+ "-DWITH_ZLIB=system" \
+ "-DWITH_ZLIB=bundled" \
+ "to use system zlib instead of bundled" &&
+
+ optional_depends SSL \
+ "-DWITH_SSL=system" \
+ "-DWITH_SSL=bundled" \
+ "to use system SSL instead of bundled" &&
+
+ optional_depends tcp_wrappers \
+ "-DWITH_LIBWRAP=ON" \
+ "-DWITH_LIBWRAP=OFF" \
+ "for tcp wrappers support" &&
+
+ optional_depends valgrind \
+ "-DWITH_VALGRIND=ON" \
+ "-DWITH_VALGRIND=OFF" \
+ "for Valgrind instrumentation" &&
+
+ if list_find "$MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"; then
+ optional_depends libevent "" "" "to use libevent and have connection
pooling"
+ fi &&
+
+ if list_find "$MARIADB_ENGINES" "xtradb"; then
+ depends libaio
+ fi &&
+
+ if list_find "$MARIADB_ENGINES" "oqgraph"; then
+ depends boost
+ fi
+else
+ optional_depends zlib \
+ "--with-zlib-dir=$INSTALL_ROOT/" \
+ "--with-zlib-dir=bundled" \
+ "to use system zlib instead of bundled" &&
+
+ optional_depends libedit \
+ "--without-libedit" \
+ "" \
+ "to use system libedit instead of bundled" &&
+
+ optional_depends SSL \
+ "--with-ssl" \
+ "--without-ssl" \
+ "for OpenSSL support" &&
+
+ optional_depends valgrind \
+ "--with-valgrind" \
+ "--without-valgrind" \
+ "for Valgrind instrumentation" &&
+
+ if list_find "$MARIADB_OPTS" "--with-libevent=yes"; then
+ optional_depends libevent \
+ "--with-libevent=$INSTALL_ROOT/usr" \
+ "--with-libevent=bundled" \
+ "to use system libevent instead of bundled"
+ fi
fi
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 7111b30..0bff9e8 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -2,6 +2,9 @@
if [[ $MARIADB_BRANCH == 5.3 ]]; then
VERSION=5.3.12

SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
+elif [[ $MARIADB_BRANCH == 5.5 ]]; then
+ VERSION=5.5.39
+
SOURCE_HASH=sha512:a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67
else
VERSION=5.2.14
SECURITY_PATCH=3
@@ -10,19 +13,23 @@ else
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+
SOURCE_URL[0]=http://mirror.netcologne.de/$SPELL/$SPELL-$VERSION/source/$SOURCE
+else

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[3]=http://mirrors.supportex.net/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
+fi
LICENSE[0]=GPL
WEB_SITE=https://mariadb.org/
KEYWORDS="sql database"
ENTERED=20100402
SHORT="backward compatible, drop-in replacement branch of the
MySQL(r) database server"
cat << EOF
-MariaDB is a backward compatible, drop-in replacement branch of the
-MySQL(r) database server.
+MariaDB is a backward compatible, drop-in replacement branch of the MySQL(r)
+database server.

-It includes all major open source storage engines,
-including the Maria storage engine.
+It includes all major open source storage engines, including the Maria
storage
+engine.
EOF
diff --git a/database/mariadb/FINAL b/database/mariadb/FINAL
index daee887..9a9db7d 100755
--- a/database/mariadb/FINAL
+++ b/database/mariadb/FINAL
@@ -1,4 +1,5 @@
-if list_find "$MADB_OPTS" "--with-server" ]]; then
+if list_find "$MARIADB_OPTS" "--with-server" || \
+ list_find "$MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"; then
message "${MESSAGE_COLOR}After initial install of MariaDB run"
message "\"mysql_install_db --user=mariadb\" to create directory"
message "structure and initial tables. See MariaDB documentation"
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 70c5fbd..b00c93a 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,35 @@
+2014-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.39 (5.5 branch)
+ * BUILD: corrected man path for 5.5 branch
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
+2014-06-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.38 (5.5 branch)
+
+2014-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.37 (5.5 branch); added mirror for 5.5
+ branch; cleaned up
+ * CONFIGURE: added config option for tmp tables
+
+2014-04-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: update triggers for switching between branches
+
+2014-04-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PREPARE: added 5.5 branch
+ * CONFIGURE: renamed lists MADB_* -> MARIADB_*; added missing
charsets;
+ split engines list for different branches
+ * DEPENDS: added bison dependency; added cmake (optional) and libaio,
+ boost for 5.5 branch
+ * BUILD: cmake build for 5.5 branch; use MARIADB_OPTS
+ * INSTALL: added target for 5.5 branch
+ * PRE_BUILD: added check for 5.5 branch; renamed mysqld user mysql ->
+ mariadb
+ * FINAL: fixed syntax error; added check for 5.5 branch
+ * {PRE_,}SUB_DEPENDS: rewritten; echo -> message
+ * REPAIR^all^PRE_SUB_DEPENDS: added
+
2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added 5.3 branch; PATCHLEVEL=1 for 5.2 branch to set
MARIADB_BRANCH in tablet for further usage; updated website
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 9c90b69..1db0634 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,13 +1,17 @@
-make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
- testroot="${TRACK_ROOT}/usr/share/mysql" \
- install &&
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ default_install
+else
+ make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+ testroot="${TRACK_ROOT}/usr/share/mysql" \
+ install &&

-if [[ $MARIA_TESTS == n ]]; then
+ if [[ $MARIA_TESTS == n ]]; then
rm -rf "${INSTALL_ROOT}/usr/share/mysql/mysql-test"
-fi &&
+ fi &&

-if [[ $MARIA_BENCH == n ]]; then
- rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+ if [[ $MARIA_BENCH == n ]]; then
+ rm -rf "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+ fi
fi &&

if [[ $INIT_INSTALLED ]]; then
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index cb0d439..708765d 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -7,12 +7,12 @@
#
persistent_read $SPELL MARIADB_BRANCH MARIADB_BRANCH || true &&

-if [[ -z "$MARIADB_BRANCH" ]]; then
+if spell_ok $SPELL && [[ -z "$MARIADB_BRANCH" ]]; then
persistent_add MARIADB_BRANCH &&
local MARIADB_BRANCH="5.2"
fi &&

-prepare_select_branch 5.3 5.2 &&
+prepare_select_branch 5.5 5.3 5.2 &&

config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/PRE_BUILD b/database/mariadb/PRE_BUILD
index 68b9b02..c01bcd3 100755
--- a/database/mariadb/PRE_BUILD
+++ b/database/mariadb/PRE_BUILD
@@ -1,9 +1,15 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&

-# our zlib location isn't default
-if is_depends_enabled $SPELL zlib; then
- patch -p0 < "$SPELL_DIRECTORY/zlib-conf.patch"
+if [[ $MARIADB_BRANCH != 5.5 ]]; then
+ sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
+ sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+ # our zlib location isn't default
+ if is_depends_enabled $SPELL zlib; then
+ patch -p0 < "$SPELL_DIRECTORY/zlib-conf.patch"
+ fi
+else
+ sedit "s:data/test:share/mysql/data/test:" sql/CMakeLists.txt &&
+ sedit "s:MYSQLD_USER \"mysql\":MYSQLD_USER \"mariadb\":"
scripts/CMakeLists.txt
fi
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
index ede9a09..e5dae45 100755
--- a/database/mariadb/PRE_SUB_DEPENDS
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -1,6 +1,20 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) if list_find "$MADB_OPTS" "--with-embedded-server";
then return 0; fi;;
- innodb|INNODB) if [[ $MADB_ENGINES == *innodb_plugin* || "$MADB_ENGINES"
== "all" ]]; then return 0; fi;;
- NDB) if [[ $MADB_ENGINES == *ndbcluster* || "$MADB_ENGINES" == "all" ]];
then return 0; fi;;
+ embedded|EMBEDDED) if list_find "$MARIADB_OPTS" "--with-embedded-server"
|| \
+ list_find "$MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=ON"; then
+ return 0
+ fi
+ ;;
+ innodb|INNODB) if list_find "$MARIADB_ENGINES" "innodb_plugin" || \
+ list_find "$MARIADB_ENGINES" "innobase" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+ NDB) if list_find "$MARIADB_ENGINES" "ndbcluster" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
esac
+
return 1
diff --git a/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
b/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..e5dae45
--- /dev/null
+++ b/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,20 @@
+case $THIS_SUB_DEPENDS in
+ embedded|EMBEDDED) if list_find "$MARIADB_OPTS" "--with-embedded-server"
|| \
+ list_find "$MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=ON"; then
+ return 0
+ fi
+ ;;
+ innodb|INNODB) if list_find "$MARIADB_ENGINES" "innodb_plugin" || \
+ list_find "$MARIADB_ENGINES" "innobase" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+ NDB) if list_find "$MARIADB_ENGINES" "ndbcluster" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+esac
+
+return 1
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
index fb44ab1..88bc25a 100755
--- a/database/mariadb/SUB_DEPENDS
+++ b/database/mariadb/SUB_DEPENDS
@@ -1,17 +1,32 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
- MADB_OPTS="--with-embedded-server $MADB_OPTS"
;;
- innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
- if [ "$MADB_ENGINES" == "none" ]; then
- MADB_ENGINES="innodb_plugin"
- else
- MADB_ENGINES="innodb_plugin $MADB_ENGINES"
- fi ;;
- NDB) echo "ndbcluster storage engine support requested, forcing it." &&
- if [ "$MADB_ENGINES" == "none" ]; then
- MADB_ENGINES="ndbcluster"
- else
- MADB_ENGINES="ndbcluster $MADB_ENGINES"
- fi ;;
- *) echo "unknown sub-depends!"; return 1 ;;
+ embedded|EMBEDDED) message "${MESSAGE_COLOR}Embbeded server requested,
forcing it.${DEFAULT_COLOR}" &&
+ if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ list_remove "MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=OFF" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=ON"
+ else
+ list_remove "MARIADB_OPTS"
"--without-embedded-server" &&
+ list_add "MARIADB_OPTS" "--with-embedded-server"
+ fi
+ ;;
+ innodb|INNODB) message "${MESSAGE_COLOR}InnoDB storage engine support
requested, forcing it.${DEFAULT_COLOR}" &&
+ if list_find "$MARIADB_ENGINES" "none"; then
+ list_remove "MARIADB_ENGINES" "none"
+ fi &&
+
+ if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ list_add "MARIADB_ENGINES" innobase
+ else
+ list_add "MARIADB_ENGINES" innodb_plugin
+ fi
+ ;;
+ NDB) message "${MESSAGE_COLOR}ndbcluster storage engine
support requested, forcing it.${DEFAULT_COLOR}" &&
+ if list_find "$MARIADB_ENGINES" "none"; then
+ list_remove "MARIADB_ENGINES" "none"
+ fi &&
+
+ list_add "MARIADB_ENGINES" "ndbcluster"
+ ;;
+ *) message "${PROBLEM_COLOR}Unknown
sub-depends!${DEFAULT_COLOR}" &&
+ return 1
+ ;;
esac
diff --git a/database/mariadb/UP_TRIGGERS b/database/mariadb/UP_TRIGGERS
index 000b21c..daf653e 100755
--- a/database/mariadb/UP_TRIGGERS
+++ b/database/mariadb/UP_TRIGGERS
@@ -1,14 +1,18 @@
-# up_trigger everything on update to 5.1.32 as most stuff links to
libmysqlclient.so.15 from version 5.0.77
+# up_trigger everything on branch updates
+local NEW_SPELL_BRANCH="" &&
+local OLD_SPELL_BRANCH="" &&
+
+if spell_ok $SPELL; then
+ NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
+ OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&

-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
- message "This is a possibly incompatible update of libmysql..."
- message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libmysqlclient.so.15"; then
+ if gaze -q install $each | xargs readelf -d 2> /dev/null |
+ grep -Eq "NEEDED.*libmysqlclient(_r)?.so"; then
up_trigger $each cast_self
fi
done
diff --git a/database/mongodb/BUILD b/database/mongodb/BUILD
index 2b10b63..73c97d7 100755
--- a/database/mongodb/BUILD
+++ b/database/mongodb/BUILD
@@ -1,6 +1,18 @@
create_account mongodb &&

-# use bundled spidermonkey, 2.2 will switch to V8
-OPTS="--sharedclient --usesm $OPTS" &&
+if ! list_find "$LDFLAGS" "-s"; then
+ OPTS="--nostrip $OPTS"
+fi &&

-scons --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
+case $MONGODB_JSE in
+ v8)
+ OPTS="--usev8 $OPTS"
+ ;;
+ spidermonkey)
+ OPTS="--usesm $OPTS"
+ ;;
+esac &&
+
+OPTS="--mongod-concurrency-level=$MONGODB_CCL $MONGODB_OPTS $OPTS" &&
+
+scons all --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
diff --git a/database/mongodb/CONFIGURE b/database/mongodb/CONFIGURE
new file mode 100755
index 0000000..7614005
--- /dev/null
+++ b/database/mongodb/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_list MONGODB_CCL "Choose mongod concurrency level:" \
+ db \
+ global &&
+
+config_query_list MONGODB_JSE "Choose JavaScript engine to use:" \
+ v8 \
+ spidermonkey &&
+
+config_query_option MONGODB_OPTS "Build shared client?" y \
+ "--sharedclient" \
+ ""
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index 0dd5739..e3f34c7 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -1,7 +1,24 @@
-depends -sub CXX gcc &&
depends scons &&
depends readline &&
-depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost &&
+depends -sub CXX gcc &&
+depends -sub CPP pcre '--use-system-pcre' &&
+depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost '--use-system-boost'
&&
+
+optional_depends google-perftools \
+ "--use-system-tcmalloc" \
+ "" \
+ "to use system version of tcmalloc library" &&
+
+optional_depends snappy \
+ "--use-system-snappy" \
+ "" \
+ "to use system version of snappy library" &&
+
+optional_depends LIBSASL \
+ "--use-sasl-client" \
+ "" \
+ "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/DETAILS b/database/mongodb/DETAILS
index f6f1fec..a0096f1 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,9 +1,10 @@
SPELL=mongodb
- VERSION=2.0.9
+ VERSION=2.4.11
SECURITY_PATCH=1
SOURCE=$SPELL-src-r$VERSION.tar.gz
- SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:5c7504bcc0f58999424c8bed5e43b7649b812bc2009fa251118442cd072e5cef08eaec4d3a45ad387eceaa79d0b336c58939a1b8f6e5b4566b0f745254844030
+ SOURCE_URL[0]=http://fastdl.mongodb.org/src/$SOURCE
+ SOURCE_URL[1]=http://downloads.mongodb.org/src/$SOURCE
+
SOURCE_HASH=sha512:a132275b7d0be357958d4bffaa8d8b660df1812811e8b94b1482906d1cf4567f6b6f13c77dcdf6dea38c56f54fe4b462a41379185c04c9eb5661848b80e40106
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/FINAL b/database/mongodb/FINAL
new file mode 100755
index 0000000..86fab5a
--- /dev/null
+++ b/database/mongodb/FINAL
@@ -0,0 +1,5 @@
+message "${PROBLEM_COLOR}"
+message "WARNING: don't forget to run mongod and mongos with '--upgrade'"
+message "flag to upgrade db and meta data version on updates of MongoDB"
+message "major branch versions (e.g. 2.2.* -> 2.4.*)."
+message "${DEFAULT_COLOR}"
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 2e6dc88..63156e7 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,26 @@
+2014-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.11
+ * PRE_BUILD: apply new patch
+ * scons.patch: adapted for new version
+ * intsign.patch: added, backported from Debian to fix build
+
+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
+ * CONFIGURE: added, to select between js engines and concurrency
levels
+ * PRE_BUILD: sed -i -> sedit
+ * INSTALL: install run dir for mongos daemon
+ * FINAL: added, notify SA about spell branch updates
+ * init.d/mongodb: added stop() for clean shutdown
+ * init.d/mongos: added, init script for mongos (sharding daemon)
+ * fips.patch: added, to fix build against OpenSSL without FIPS support
+ (official patch 51a0bf4)
+ * scons.patch: added, to respect CXX/LD flags
+ * boost150.patch.gz: dropped, fixed by upstream
+
2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply patch
* boost150.patch.gz: added, to fix build with boost 1.50+
diff --git a/database/mongodb/INSTALL b/database/mongodb/INSTALL
index 50a5204..af039c1 100755
--- a/database/mongodb/INSTALL
+++ b/database/mongodb/INSTALL
@@ -1,8 +1,9 @@
-scons --prefix="$INSTALL_ROOT/usr" --full install &&
+scons install --prefix="$INSTALL_ROOT/usr" --full $OPTS &&

if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/mongodb.conf" \
"$INSTALL_ROOT/etc/sysconfig/mongodb"
fi &&

-install -d -o mongodb -g mongodb -vm 755 "$INSTALL_ROOT/var/run/mongod"
+install -d -o mongodb -g mongodb -vm 755 "$INSTALL_ROOT/var/run/mongod" \
+ "$INSTALL_ROOT/var/run/mongos"
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index ff92c07..79e40d7 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-zcat "$SPELL_DIRECTORY/boost150.patch.gz" | patch -p1 &&
+patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/fips.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/intsign.patch" &&

-sed -i "s:lib64:lib:g" SConstruct
+sedit "s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/boost150.patch.gz
b/database/mongodb/boost150.patch.gz
deleted file mode 100644
index 24fbd28..0000000
Binary files a/database/mongodb/boost150.patch.gz and /dev/null differ
diff --git a/database/mongodb/fips.patch b/database/mongodb/fips.patch
new file mode 100644
index 0000000..c0da948
--- /dev/null
+++ b/database/mongodb/fips.patch
@@ -0,0 +1,21 @@
+--- src/mongo/util/net/ssl_manager.cpp.orig
++++ src/mongo/util/net/ssl_manager.cpp
+@@ -186,6 +186,7 @@
+
+ void SSLManager::_setupFIPS() {
+ // Turn on FIPS mode if requested.
++#ifdef OPENSSL_FIPS
+ int status = FIPS_mode_set(1);
+ if (!status) {
+ error() << "can't activate FIPS mode: " <<
+@@ -193,6 +194,10 @@
+ fassertFailed(16703);
+ }
+ log() << "FIPS 140-2 mode activated" << endl;
++#else
++ error() << "this version of mongodb was not compiled with FIPS
support";
++ fassertFailed(17084);
++#endif
+ }
+
+ bool SSLManager::_setupPEM(const std::string& keyFile , const
std::string& password) {
diff --git a/database/mongodb/init.d/mongodb b/database/mongodb/init.d/mongodb
index a4c4457..386518f 100755
--- a/database/mongodb/init.d/mongodb
+++ b/database/mongodb/init.d/mongodb
@@ -18,4 +18,11 @@ start() {
evaluate_retval
}

+stop() {
+ echo "Stopping $NAME..."
+
+ su mongodb -s /bin/sh -c "$PROGRAM $ARGS --shutdown"
+ evaluate_retval
+}
+
. /etc/init.d/smgl_init
diff --git a/database/mongodb/init.d/mongodb.conf
b/database/mongodb/init.d/mongodb.conf
index b3a4479..60b6e5e 100644
--- a/database/mongodb/init.d/mongodb.conf
+++ b/database/mongodb/init.d/mongodb.conf
@@ -1,3 +1,5 @@
-# For the arguments and description see ``mongod --help''
+# For the arguments and description see ``mongod --help'' and ``mongos
--help''

MONGOD_ARGS=""
+
+MONGOS_ARGS=""
diff --git a/database/mongodb/init.d/mongos b/database/mongodb/init.d/mongos
new file mode 100755
index 0000000..2485ffd
--- /dev/null
+++ b/database/mongodb/init.d/mongos
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+. /etc/sysconfig/mongodb
+
+PROGRAM=/usr/bin/mongos
+PIDFILE=/var/run/mongos/mongos.pid
+ARGS="-f /etc/mongos.conf --pidfilepath $PIDFILE --fork $MONGOS_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+start() {
+ echo "Starting $NAME..."
+
+ # needs C locale on startup
+ export LC_ALL="C"
+
+ su mongodb -s /bin/sh -c "$PROGRAM $ARGS"
+ evaluate_retval
+}
+
+. /etc/init.d/smgl_init
diff --git a/database/mongodb/intsign.patch b/database/mongodb/intsign.patch
new file mode 100644
index 0000000..bd02e4d
--- /dev/null
+++ b/database/mongodb/intsign.patch
@@ -0,0 +1,67 @@
+--- mongodb-2.4.6.orig/src/mongo/db/auth/privilege_set.cpp
++++ mongodb-2.4.6/src/mongo/db/auth/privilege_set.cpp
+@@ -79,7 +79,7 @@ namespace mongo {
+ resourceSearchList[1] =
nsToDatabaseSubstring(desiredPrivilege.getResource());
+
+ ActionSet unmetRequirements = desiredPrivilege.getActions();
+- for (int i = 0; i < boost::size(resourceSearchList); ++i) {
++ for (unsigned int i = 0; i < boost::size(resourceSearchList); ++i) {
+ ResourcePrivilegeCacheEntry* entry =
_lookupEntry(resourceSearchList[i]);
+ if (NULL == entry)
+ continue;
+--- mongodb-2.4.6.orig/src/mongo/db/cmdline_test.cpp
++++ mongodb-2.4.6/src/mongo/db/cmdline_test.cpp
+@@ -71,7 +71,7 @@ namespace {
+ "KEEP",
+ "--servicePasswordFake=KEEP"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+ testCensoringArgv(argv, argv, argc);
+ }
+
+@@ -88,7 +88,7 @@ namespace {
+ "--servicePassword",
+ "get out of dodge"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+
+ const char* const expected[] = {
+ "first",
+@@ -120,7 +120,7 @@ namespace {
+ "-servicePassword",
+ "get out of dodge"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+
+ const char* const expected[] = {
+ "first",
+@@ -152,7 +152,7 @@ namespace {
+ "KEEP",
+ "--servicePasswordFake=KEEP"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+ testCensoringVector(argv, argv, argc);
+ }
+
+@@ -169,7 +169,7 @@ namespace {
+ "--servicePassword",
+ "get out of dodge"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+
+ const char* const expected[] = {
+ "first",
+@@ -201,7 +201,7 @@ namespace {
+ "-servicePassword",
+ "get out of dodge"
+ };
+- const int argc = boost::size(argv);
++ const unsigned int argc = boost::size(argv);
+
+ const char* const expected[] = {
+ "first",
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
new file mode 100644
index 0000000..e4edb15
--- /dev/null
+++ b/database/mongodb/scons.patch
@@ -0,0 +1,34 @@
+--- SConstruct.orig 2014-08-22 01:56:32.000000000 +0400
++++ SConstruct 2014-09-27 15:28:11.496080339 +0400
+@@ -704,7 +704,6 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers)
is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fPIC",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -719,9 +718,10 @@
+ env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp
is faster than gcc's
+
+ env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
+--- src/mongo/SConscript.orig 2014-08-22 01:56:32.000000000 +0400
++++ src/mongo/SConscript 2014-09-27 18:24:40.903897125 +0400
+@@ -456,7 +456,7 @@
+ env.Library('stacktrace', 'util/stacktrace.cpp')
+
+ env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',
+- LIBDEPS=['stacktrace',
++ LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools',
+ '$BUILD_DIR/mongo/base/base'])
+
+ serverOnlyFiles += mmapFiles
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..ab8a949 100755
--- a/database/postgresql/DEPENDS
+++ b/database/postgresql/DEPENDS
@@ -43,7 +43,7 @@ optional_depends readline \
"--without-readline" \
"for Readline support in psql, the command line interface"
&&

-optional_depends openssl \
+optional_depends SSL \
"--with-openssl" \
"--without-openssl" \
"for SSL (encrypted) connection support" &&
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 94a1bb6..76bca98 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,18 +1,10 @@
SPELL=postgresql
- VERSION=9.3.4
+ VERSION=9.3.5
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4
+
SOURCE_HASH=sha512:a49bc8ea7635be5082044f5ebd6b81de7198583aedb072dffec8425521af90f2cb8e9f6e7b55b361ff24cbebc0670afefe365e8f5b80b8248ddf492b8092a746
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE

SOURCE_URL[1]=ftp://ftp9.de.postgresql.org/unix/databases/postgresql/source/v${VERSION}/${SOURCE}
-
-if [[ $PGSQL_CLUSTER == y ]]; then
- CLUSTER_VERSION=1.9.0rc5
- SOURCE2=pgcluster-$CLUSTER_VERSION-patch.tar.gz
- SOURCE2_URL[0]=http://pgfoundry.org/frs/download.php/1706/$SOURCE2
-
SOURCE2_HASH=sha512:df328505fee683051642850bade5932595184d3af8db6d47663d8c6e5fec5dc62256390ead83a2fa719efe212f8a44350f57cb4f1361bde63b2227e5cc13e927
-fi
-
WEB_SITE=http://www.postgresql.org/
GATHER_DOCS=off
SECURITY_PATCH=14
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 19d1648..4440861 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,16 @@
+2014-09-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.3.5; removed unsupported PGCluster
+ patch
+ * PREPARE: complete deprecation
+ * DEPENDS: fixed SSL flags
+ * PRE_BUILD: removed
+
+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/postgresql/PREPARE b/database/postgresql/PREPARE
index 721679d..9718817 100755
--- a/database/postgresql/PREPARE
+++ b/database/postgresql/PREPARE
@@ -1,8 +1,3 @@
-config_query PGSQL_CLUSTER "Do you want to apply the PGCluster patch?" n &&
-
-if [[ $PGSQL_CLUSTER == y ]]; then
- message "${PROBLEM_COLOR}"
- message "Keep in mind that PGCluster patch and current"
- message "PostgreSQL version aren't always in sync."
- message "${DEFAULT_COLOR}"
+if [[ -v PGSQL_CLUSTER ]]; then
+ persistent_remove PGSQL_CLUSTER
fi
diff --git a/database/postgresql/PRE_BUILD b/database/postgresql/PRE_BUILD
deleted file mode 100755
index 2f70e1b..0000000
--- a/database/postgresql/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $PGSQL_CLUSTER == y ]]; then
- verify_file 2 &&
- zcat "$SOURCE_CACHE/$SOURCE2" | patch -p1
-fi
diff --git a/database/redis/DETAILS b/database/redis/DETAILS
index 85bac0b..e3ef2d7 100755
--- a/database/redis/DETAILS
+++ b/database/redis/DETAILS
@@ -1,9 +1,9 @@
SPELL=redis
- VERSION=2.6.13
+ VERSION=2.6.17
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://redis.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:2676b4afb688aac7b4bfdcd2e6b054ab8ea8b94294c948189ebbf4d29f019d07f5c764328b2fd148ae35627612887b7e7ab9037e5e370c6275a998d9d3a4262b
+ SOURCE_URL[0]=http://download.redis.io/releases/$SOURCE
+
SOURCE_HASH=sha512:bc0d487cdab3ce1bfe68a6efad9f4532552065fa45cd4c4429f3413397ec228d1ecf9afd8d2cc6d4aee115c7fb757fa1ef480f34c264b2290fd30ec831131f82
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=BSD
WEB_SITE=http://redis.io/
diff --git a/database/redis/HISTORY b/database/redis/HISTORY
index b7bbfcc..c14482e 100644
--- a/database/redis/HISTORY
+++ b/database/redis/HISTORY
@@ -1,3 +1,6 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.17; updated source url
+
2013-06-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.13

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index d805b81..c30f9ac 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.8.4.3
- VERSIONX=autoconf-3080403
-
SOURCE_HASH=sha512:bfd2f8cea02497f3d3e3b4925bcf8156bacadfe4b711ae55339357fc91649a2fa59787e3a907ee49dd4ac441c1e980f3b29a5ec28d4c5d6323b92f69fb19be73
+ 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 5b68ecb..2e4fdd4 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,9 @@
+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
+
2014-04-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.8.4.3

diff --git a/database/tdb/DEPENDS b/database/tdb/DEPENDS
index f506c2d..e2ab49e 100755
--- a/database/tdb/DEPENDS
+++ b/database/tdb/DEPENDS
@@ -1,5 +1,10 @@
depends python &&

+optional_depends gettext \
+ "" \
+ "--without-gettext" \
+ "for Native Language Support" &&
+
optional_depends docbook-xsl "" "" "for manual pages" &&

if is_depends_enabled $SPELL docbook-xsl; then
diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
index 93d4272..3af9143 100755
--- a/database/tdb/DETAILS
+++ b/database/tdb/DETAILS
@@ -1,9 +1,9 @@
SPELL=tdb
- VERSION=1.2.12
+ VERSION=1.2.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://samba.org/ftp/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.samba.org/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7f6061cae722db79a604ed517e615bed8d06c1b69549e6c1b771611797e1b4f64ebc7af63c3b911ed055979dd6782c8fca44af829c3466911f4181e835ef9b28
+
SOURCE_HASH=sha512:a0482b2933f4c8e7e56b3c3bd3d9899aedfc0fce80250ed9c675f3769dffb8ea2ad3b4b4aad164edada49ff51f7f38ba8fb706132976ed1fb5c4c7dcbafb7b40
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://tdb.samba.org/
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
index 2ddcc3e..f8c22ea 100644
--- a/database/tdb/HISTORY
+++ b/database/tdb/HISTORY
@@ -1,3 +1,7 @@
+2014-04-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.13
+ * DEPENDS: added gettext optional dependency
+
2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: 1.2.12

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/BUILD b/devel/android-tools/BUILD
new file mode 100755
index 0000000..db2797d
--- /dev/null
+++ b/devel/android-tools/BUILD
@@ -0,0 +1,2 @@
+cd ${SOURCE_DIRECTORY}/core-${XHASH} &&
+default_build_make
diff --git a/devel/android-tools/DEPENDS b/devel/android-tools/DEPENDS
new file mode 100755
index 0000000..715416f
--- /dev/null
+++ b/devel/android-tools/DEPENDS
@@ -0,0 +1,3 @@
+depends zlib &&
+depends SSL &&
+depends libarchive
diff --git a/devel/android-tools/DETAILS b/devel/android-tools/DETAILS
new file mode 100755
index 0000000..0bc591f
--- /dev/null
+++ b/devel/android-tools/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=android-tools
+ XDATE=20130123
+ XVERSION=3.fc21
+ XHASH=98d0789
+ XEXTRAS_HASH=4ff85ad
+ VERSION=${XDATE}git${XHASH}-${XVERSION}
+ SOURCE="${SPELL}-${VERSION}.src.rpm"
+
SOURCE_URL[0]=http://kojipkgs.fedoraproject.org/packages/${SPELL}/${XDATE}git${XHASH}/${XVERSION}/src/${SOURCE}
+
SOURCE_HASH=sha512:09f9a8a56f8c32d1e385fd9f7f7aa6eeec6928f11c46ce371f29fae8e656633f669e62b6a8860c020bd92414742c5a245eb55f4ae3588fd30c68da0cc97d40ea
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://android.googlesource.com/platform/system/core.git/";
+ LICENSE[0]=BSD
+ ENTERED=20140622
+ SHORT="tools for developing android based devices"
+cat << EOF
+Tools for developing android based devices.
+EOF
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
new file mode 100644
index 0000000..84053cc
--- /dev/null
+++ b/devel/android-tools/HISTORY
@@ -0,0 +1,8 @@
+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
+ in udev rules file
+
diff --git a/devel/android-tools/INSTALL b/devel/android-tools/INSTALL
new file mode 100755
index 0000000..2b64d9c
--- /dev/null
+++ b/devel/android-tools/INSTALL
@@ -0,0 +1,5 @@
+install -m755 -o root -g root ${SOURCE_DIRECTORY}/core-${XHASH}/adb/adb
${INSTALL_ROOT}/usr/bin &&
+install -m755 -o root -g root
${SOURCE_DIRECTORY}/core-${XHASH}/fastboot/fastboot ${INSTALL_ROOT}/usr/bin &&
+mkdir -p ${INSTALL_ROOT}/usr/share/doc/${SPELL} &&
+install -m644 -o root -g root
${SOURCE_DIRECTORY}/core-${XHASH}/adb/{OVERVIEW,SERVICES}.TXT
${INSTALL_ROOT}/usr/share/doc/${SPELL} &&
+install -m644 -o root -g root ${SOURCE_DIRECTORY}/51-android.rules
${INSTALL_ROOT}/etc/udev/rules.d
diff --git a/devel/android-tools/PRE_BUILD b/devel/android-tools/PRE_BUILD
new file mode 100755
index 0000000..99041b6
--- /dev/null
+++ b/devel/android-tools/PRE_BUILD
@@ -0,0 +1,24 @@
+mk_source_dir &&
+cd ${SOURCE_DIRECTORY} &&
+bsdtar xvf ${SOURCE_CACHE}/${SOURCE} &&
+
+bsdtar xf core-${XHASH}.tar.xz &&
+bsdtar xf extras-${XEXTRAS_HASH}.tar.xz &&
+
+cd ${SOURCE_DIRECTORY}/core-${XHASH} &&
+
+mv ../core-Makefile Makefile &&
+mv ../adb-Makefile adb/Makefile &&
+mv ../fastboot-Makefile fastboot/Makefile &&
+
+# Avoid libselinux dependency.
+sed -e 's: -lselinux::' -i fastboot/Makefile &&
+sed -e '/#include <selinux\/selinux.h>/d' \
+ -e 's:#include <selinux/label.h>:struct selabel_handle;:' \
+ -i ../extras/ext4_utils/make_ext4fs.h &&
+sed -e '160,174d;434,455d' -i ../extras/ext4_utils/make_ext4fs.c &&
+
+if ! spell_ok systemd; then
+ sedit 's:, TAG+="systemd", ENV{SYSTEMD_WANTS}="adb.service":, MODE="0664",
GROUP="plugdev":' ${SOURCE_DIRECTORY}/51-android.rules
+fi
+
diff --git a/devel/android-tools/init.d/adb b/devel/android-tools/init.d/adb
new file mode 100755
index 0000000..882cec3
--- /dev/null
+++ b/devel/android-tools/init.d/adb
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/adb
+ARGS=""
+RUNLEVEL=3
+PIDFILE=/var/run/adb.pid
+
+. /etc/init.d/smgl_init
+
+start() {
+ ${PROGRAM} start-server
+ ${PROGRAM} devices
+}
+
+stop() {
+ ${PROGRAM} kill-server
+}
diff --git a/devel/automake/DETAILS b/devel/automake/DETAILS
index 0736416..df86aa8 100755
--- a/devel/automake/DETAILS
+++ b/devel/automake/DETAILS
@@ -1,5 +1,5 @@
SPELL=automake
- VERSION=1.14
+ VERSION=1.14.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index a0d1ca2..864b89a 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.14.1
+
2013-07-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.14

diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index efd9a05..ba27446 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=b43-tools
-if [[ $B43_TOOLS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}.tar.bz2"
SOURCE_URL[0]=git://git.bues.ch/${SPELL}.git
SOURCE_IGNORE=volatile
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index d9466aa..b8d98ce 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-12-11 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: website moved to git.bues.ch

diff --git a/devel/bin86/DETAILS b/devel/bin86/DETAILS
index 394f9df..744471d 100755
--- a/devel/bin86/DETAILS
+++ b/devel/bin86/DETAILS
@@ -1,10 +1,10 @@
SPELL=bin86
- VERSION=0.16.19
+ VERSION=0.16.21
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.debath.co.uk/dev86/$SOURCE
-
SOURCE_HASH=sha512:7cd54b1425a2a631b8af3e3e3b26c91b287f6e14e94f7795eb9e6a746c5acfe9137689bb802adf30f355cb731d59b4753acfa829028380c89ef3259642cad454
- WEB_SITE=http://www.debath.co.uk/
+ WEB_SITE=http://v3.sk/~lkundrak/dev86
+ SOURCE_URL[0]=$WEB_SITE/$SOURCE
+
SOURCE_HASH=sha512:e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/devel/bin86/HISTORY b/devel/bin86/HISTORY
index d1c3fcf..44a293f 100644
--- a/devel/bin86/HISTORY
+++ b/devel/bin86/HISTORY
@@ -1,3 +1,7 @@
+2014-07-06 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.16.21
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.16.19, updated WEB_SITE

diff --git a/devel/bison/DETAILS b/devel/bison/DETAILS
index 3fd8626..6ca85f6 100755
--- a/devel/bison/DETAILS
+++ b/devel/bison/DETAILS
@@ -1,6 +1,6 @@
SPELL=bison
- VERSION=3.0
- SOURCE=${SPELL}-${VERSION}.tar.gz
+ VERSION=3.0.2
+ SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/devel/bison/HISTORY b/devel/bison/HISTORY
index 8af81b5..2e6ec05 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,3 +1,6 @@
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.2
+
2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0

diff --git a/devel/bluefish/DETAILS b/devel/bluefish/DETAILS
index 4ebcaf6..50d3ff0 100755
--- a/devel/bluefish/DETAILS
+++ b/devel/bluefish/DETAILS
@@ -5,7 +5,7 @@ if [[ $BLUEFISH_UNSTABLE == y ]]; then
SOURCE=$SPELL-unstable-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-unstable-$VERSION"
else
- VERSION=2.2.5
+ VERSION=2.2.6
BRANCH=stable
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/bluefish/HISTORY b/devel/bluefish/HISTORY
index 1c95696..1acd875 100644
--- a/devel/bluefish/HISTORY
+++ b/devel/bluefish/HISTORY
@@ -1,3 +1,6 @@
+2014-04-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.6
+
2014-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.5

diff --git a/devel/bmake/BUILD b/devel/bmake/BUILD
new file mode 100755
index 0000000..d660b07
--- /dev/null
+++ b/devel/bmake/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+prefix=/usr default_build &&
+make_normal
diff --git a/devel/bmake/DETAILS b/devel/bmake/DETAILS
new file mode 100755
index 0000000..8f0d94f
--- /dev/null
+++ b/devel/bmake/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=bmake
+ VERSION=20140620
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://ftp.netbsd.org/pub/NetBSD/misc/sjg/${SOURCE}
+
SOURCE_HASH=sha512:c25ff8e0296599c558f88abd6619db361fefff3e560e8aa31bdd169ad6dcb780b4faf7867ed392f319af189fd2b8e833a6e345785f801c823279f90ce625dc8c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://crufty.net/help/sjg/bmake.html";
+ LICENSE[0]="BSD"
+ ENTERED=20140909
+ KEYWORDS=""
+ SHORT="Portable version of NetBSD make"
+cat << EOF
+Bmake is derived from NetBSD's make(1), its goal is to be a portable version
+of same, so new features are added via imports of NetBSD's make. Thus bmake
+is kept in sync with NetBSD's make.
+EOF
diff --git a/devel/bmake/HISTORY b/devel/bmake/HISTORY
new file mode 100644
index 0000000..771e9bb
--- /dev/null
+++ b/devel/bmake/HISTORY
@@ -0,0 +1,5 @@
+2014-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix system search path
+
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: spell created
diff --git a/devel/bmake/INSTALL b/devel/bmake/INSTALL
new file mode 100755
index 0000000..9d9a4c0
--- /dev/null
+++ b/devel/bmake/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/devel/byacc/DETAILS b/devel/byacc/DETAILS
index f1cec97..087cf76 100755
--- a/devel/byacc/DETAILS
+++ b/devel/byacc/DETAILS
@@ -1,5 +1,5 @@
SPELL=byacc
- VERSION=20130925
+ VERSION=20140715
SOURCE=$SPELL-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
diff --git a/devel/byacc/HISTORY b/devel/byacc/HISTORY
index 9e78485..e4c4cde 100644
--- a/devel/byacc/HISTORY
+++ b/devel/byacc/HISTORY
@@ -1,3 +1,9 @@
+2014-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20140714 (1.9)
+
+2014-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20140409
+
2013-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20130925

diff --git a/devel/cgdb/DETAILS b/devel/cgdb/DETAILS
index 01fd23e..62a1707 100755
--- a/devel/cgdb/DETAILS
+++ b/devel/cgdb/DETAILS
@@ -1,9 +1,9 @@
SPELL=cgdb
- VERSION=0.6.4
+ VERSION=0.6.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:4005bc6c0cca1e6e109eaa080dba57076f4eddaf379f5ec9499b5d2d383ec537d396cf3ff212d47bd36eaa35ed953de762e06826e68b47a99a0f0b8d2eeea0f3
+ SOURCE_URL[0]=http://cgdb.me/files/$SOURCE
+
SOURCE_HASH=sha512:0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e
LICENSE[0]=GPL
WEB_SITE=http://cgdb.sourceforge.net/
ENTERED=20030601
diff --git a/devel/cgdb/HISTORY b/devel/cgdb/HISTORY
index 9b6861e..85d7da0 100644
--- a/devel/cgdb/HISTORY
+++ b/devel/cgdb/HISTORY
@@ -1,3 +1,6 @@
+2014-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.6.7
+
2009-07-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 0.6.4

diff --git a/devel/check/DETAILS b/devel/check/DETAILS
index ed2a16a..292e229 100755
--- a/devel/check/DETAILS
+++ b/devel/check/DETAILS
@@ -1,10 +1,11 @@
SPELL=check
- VERSION=0.9.9
+ VERSION=0.9.14
+
SOURCE_HASH=sha512:fba3e54e36c2fdff465eadaa96e7a5bbafd5d7de7594dfe90e71c3a0bf7fb0f5e6d1b242ade55e49ef83c4a97fcf607dc53c7d04de9b4d764ea795a46e7c7be0
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/check/$SOURCE
WEB_SITE=http://check.sourceforge.net
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
LICENSE[0]=LGPL
ENTERED=20051123
KEYWORDS="devel"
diff --git a/devel/check/HISTORY b/devel/check/HISTORY
index ddc0fec..77ed977 100644
--- a/devel/check/HISTORY
+++ b/devel/check/HISTORY
@@ -1,3 +1,6 @@
+2014-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.14
+
2013-01-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.9

diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index 4f654a5..e878e75 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,9 +1,10 @@
SPELL=cmake
- VERSION=2.8.12.2
-
SOURCE_HASH=sha512:a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d
+ VERSION=3.0.2
+
SOURCE_HASH=sha512:de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02
+ VX=v`echo $VERSION|cut -c-3`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.cmake.org/files/v2.8/$SOURCE
+ SOURCE_URL[0]=http://www.cmake.org/files/$VX/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=BSD
WEB_SITE=http://www.cmake.org/HTML/index.html
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index fcd0a40..b13083b 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,12 @@
+2014-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.2
+
+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
+
2014-01-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.12.2

diff --git a/devel/cobra/BUILD b/devel/cobra/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/cobra/BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/cobra/DEPENDS b/devel/cobra/DEPENDS
new file mode 100755
index 0000000..78057dd
--- /dev/null
+++ b/devel/cobra/DEPENDS
@@ -0,0 +1 @@
+depends mono
diff --git a/devel/cobra/DETAILS b/devel/cobra/DETAILS
new file mode 100755
index 0000000..4f1ccbe
--- /dev/null
+++ b/devel/cobra/DETAILS
@@ -0,0 +1,64 @@
+ SPELL=cobra
+ VERSION=0.9.6
+ SOURCE="Cobra-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}-language.com/downloads/${SOURCE}
+
SOURCE_HASH=sha512:9fbf5ffb35db3895d74176013f023e6f3c390bc0208a6e02aed6f9f168a85f03b85026452ffe03354b502682803479fb49e429ab3411cf40e477f813d87caf52
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Cobra-${VERSION}"
+ WEB_SITE="http://cobra-language.com/";
+ LICENSE[0]="MIT"
+ ENTERED=20140913
+ KEYWORDS=""
+ SHORT="Cobra Programming Language"
+cat << EOF
+$SHORT
+
+There are plenty of object-oriented programming languages in existence
+including C#, Python and Ruby. So why use Cobra? This document addresses
+that question.
+
+Right now, if you want software contracts in your language, how can you
+get them? The answer is to use Eiffel or D. What if you want static and
+dynamic binding? Use Objective-C or Boo. What if you want expressiveness
+and quick coding? Use Python, Ruby or Smalltalk. What if you want runtime
+performance? Use C#, Java, C++, etc. What if you want first class language
+support for unit tests? Use D.
+
+But what if you want all of those? ... You can't get them! And that's
+frustrating because none of those productivity-boosting features are
+incompatible with each other. You shouldn't have to choose between C++'s
+speed, Python's expressiveness and Eiffel's contracts. There's no theoretical
+reason that you can't have it all. There's "just" a lot of work required to
+make it happen.
+
+One way to characterize Cobra is with these high level points:
+
+* Quick, expressive coding
+* Fast execution
+* Static and dynamic binding
+* Language level support for quality
+
+Cobra achieves 1 by following Python and Ruby (but not religiously). It
+achieves 2 by favoring static typing ("i = 5" means "i" is an integer and
+always will be) and leveraging .NET|Mono for machine code generation. It
+does 3 by using the .NET typing system at compile-time for static types,
+and using the .NET run-time for dynamic binding. It takes language features
+for 4 from multiple sources including Eiffel, Python and its own compile-time
+nil tracking.
+
+There are additional refinements in Cobra such as defaulting to accurate
+decimal math and providing detailed postmortem exception reports.
+
+So the "what's new" in Cobra is not the individual elements such as
contracts,
+classes, etc. It's the combination of everything that goes into it. Consider
+what would happen if you were coding in Cobra, then switched to another
+language:
+
+ If moving from Cobra to Python, you would give up optional static typing,
+ contracts, compile-time nil tracking, closures and more. If moving from
+ Cobra to C#, you would give up native contracts, clean collection
literals,
+ expressive syntax, uniform compile-time nil tracking, mixins and more.
+
+Note that Cobra has few new elements because it was never intended to be
+experimental. It's a practical synthesis of already-proven features that
+are currently scattered across multiple languages.
+EOF
diff --git a/devel/cobra/HISTORY b/devel/cobra/HISTORY
new file mode 100644
index 0000000..fe85096
--- /dev/null
+++ b/devel/cobra/HISTORY
@@ -0,0 +1,2 @@
+2014-09-13 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/devel/cobra/INSTALL b/devel/cobra/INSTALL
new file mode 100755
index 0000000..0a75f68
--- /dev/null
+++ b/devel/cobra/INSTALL
@@ -0,0 +1,16 @@
+INSTDIR="$INSTALL_ROOT/usr/lib"
+DOCDIR="$INSTALL_ROOT/usr/share/doc/cobra-$VERSION"
+
+# FIXME: Do the installation manually, it's a mess
+mkdir -p "$DOCDIR" &&
+cd "$SOURCE_DIRECTORY/Source" &&
+echo "$INSTDIR" > install-directory.text &&
+bin/install-from-workspace &&
+cp -r ../*.text ../Developer "$DOCDIR" &&
+# Fix up the rest of the documentation
+for i in HowTo Reusables Samples Supplements; do
+ mv "$INSTDIR/Cobra-$VERSION/$i" "$DOCDIR"
+done &&
+# Move the wrapper
+mv "$INSTDIR/bin/cobra" "$INSTALL_ROOT/usr/bin" &&
+rmdir "$INSTDIR/bin"
diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS
index 41345f4..c5bcf74 100755
--- a/devel/codeblocks/DETAILS
+++ b/devel/codeblocks/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=codeblocks
if [[ $CODEBLOCKS_BRANCH = scm ]]; then
- if [[ $CODEBLOCKS_AUTOUPDATE = y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE_IGNORE=volatile
SOURCE_URL[0]="svn://svn.berlios.de/${SPELL}/trunk:${SPELL}"
FORCE_DOWNLOAD=on
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index b7fa00b..a554936 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch

diff --git a/devel/copper/DETAILS b/devel/copper/DETAILS
index 288fe70..0e8e11a 100755
--- a/devel/copper/DETAILS
+++ b/devel/copper/DETAILS
@@ -1,5 +1,6 @@
SPELL=copper
VERSION=1.6
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}-src.tar.gz"
SOURCE_URL[0]=http://tibleiz.net/download/${SOURCE}

SOURCE_HASH=sha512:c26bd3b2bdd3d320956bb090585773d446db006f2ae94991ea8c059eeafd8b20b149ed0b5edde71892f756b47754e56eafd15ae5dcaeed6a824d25c7b161f94f
diff --git a/devel/copper/HISTORY b/devel/copper/HISTORY
index ddada21..0c36e8d 100644
--- a/devel/copper/HISTORY
+++ b/devel/copper/HISTORY
@@ -1,2 +1,6 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: added elf-1.6 binary symlink
+
2012-11-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, BUILD, INSTALL: spell created
diff --git a/devel/copper/INSTALL b/devel/copper/INSTALL
index 04bdeaa..1f9b449 100755
--- a/devel/copper/INSTALL
+++ b/devel/copper/INSTALL
@@ -1 +1,4 @@
-make prefix="$INSTALL_ROOT/usr" install
+make prefix="$INSTALL_ROOT/usr" install &&
+
+ln -vsf "$TRACK_ROOT/usr/bin/copper-elf" \
+ "$INSTALL_ROOT/usr/bin/copper-elf-$VERSION"
diff --git a/devel/cppcheck/DETAILS b/devel/cppcheck/DETAILS
index 7736155..605abe5 100755
--- a/devel/cppcheck/DETAILS
+++ b/devel/cppcheck/DETAILS
@@ -1,8 +1,8 @@
SPELL=cppcheck
- VERSION=1.63
+ VERSION=1.65
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508
+
SOURCE_HASH=sha512:ce1ef2771470383e33e159b99ce5bcf1c7f570c7a539d9488bf771a5d23b4511acd7ad7e14b839e5433f47032f4d662b6c053579d4e353caf7bf22588e1d2916
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

WEB_SITE="http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page";
LICENSE[0]=GPL
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index 6280628..b8a8c18 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,9 @@
+2014-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.65
+
+2014-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.64
+
2014-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.63
* INSTALL, BUILD: install cfg files necessary for using cppcheck
diff --git a/devel/ctags/DETAILS b/devel/ctags/DETAILS
index 5ee7fa9..263fe51 100755
--- a/devel/ctags/DETAILS
+++ b/devel/ctags/DETAILS
@@ -3,7 +3,7 @@

SOURCE_HASH=sha512:981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
LICENSE[0]=GPL
WEB_SITE=http://ctags.sourceforge.net/
ENTERED=20020208
diff --git a/devel/ctags/HISTORY b/devel/ctags/HISTORY
index 76d6b0d..c7d1746 100644
--- a/devel/ctags/HISTORY
+++ b/devel/ctags/HISTORY
@@ -1,3 +1,6 @@
+2014-05-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL
+
2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.8

diff --git a/devel/dev86/DETAILS b/devel/dev86/DETAILS
index a460485..a959234 100755
--- a/devel/dev86/DETAILS
+++ b/devel/dev86/DETAILS
@@ -1,10 +1,10 @@
SPELL=dev86
- VERSION=0.16.19
+ VERSION=0.16.21
SOURCE=Dev86src-$VERSION.tar.gz
-
SOURCE_HASH=sha512:4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
+
SOURCE_HASH=sha512:6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.debath.co.uk/dev86/$SOURCE
- WEB_SITE=http://www.debath.co.uk/dev86/
+ WEB_SITE=http://v3.sk/~lkundrak/dev86
+ SOURCE_URL[0]=$WEB_SITE/$SOURCE
ENTERED=20060131
LICENSE[0]=GPL
KEYWORDS="compiler devel"
diff --git a/devel/dev86/HISTORY b/devel/dev86/HISTORY
index 81abd6b..61f37ae 100644
--- a/devel/dev86/HISTORY
+++ b/devel/dev86/HISTORY
@@ -1,3 +1,7 @@
+2014-07-06 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.16.21
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.16.19

diff --git a/devel/devscripts/BUILD b/devel/devscripts/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/devel/devscripts/BUILD
@@ -0,0 +1 @@
+make
diff --git a/devel/devscripts/DEPENDS b/devel/devscripts/DEPENDS
new file mode 100755
index 0000000..cf06307
--- /dev/null
+++ b/devel/devscripts/DEPENDS
@@ -0,0 +1,6 @@
+depends dpkg &&
+depends python3 &&
+depends setuptools &&
+depends perl &&
+depends db_file &&
+depends file-desktopentry
diff --git a/devel/devscripts/DETAILS b/devel/devscripts/DETAILS
new file mode 100755
index 0000000..b636482
--- /dev/null
+++ b/devel/devscripts/DETAILS
@@ -0,0 +1,138 @@
+ SPELL=devscripts
+ VERSION=2.14.1
+ SOURCE="${SPELL}_${VERSION}.tar.xz"
+
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/d/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:c961e3af5cdff3784e393f5f5d932066a41494c478f4875ff53078b127077883597ebae170413a694fd68831e1d11357ae8a50bcd5d25cf3c5359bc9fc7c4912
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://packages.debian.org/source/sid/devscripts";
+ LICENSE[0]="GPL"
+ ENTERED=20140415
+ KEYWORDS=""
+ SHORT="Debian developer scripts"
+cat << EOF
+Scripts to make the life of a Debian Package maintainer easier.
+
+Contains the following scripts, dependencies/recommendations shown in
+brackets afterwards:
+
+ - annotate-output: run a command and prepend time and stream (O for stdout,
+ E for stderr) for every line of output
+ - archpath: print tla/Bazaar package names [tla | bazaar] - bts: a
+ command-line tool for manipulating the BTS [www-browser,
+ libauthen-sasl-perl, libnet-smtp-ssl-perl, libsoap-lite-perl, libwww-perl,
+ bsd-mailx | mailx]
+ - build-rdeps: search for all packages that build-depend on a given package
+ [dctrl-tools]
+ - chdist: tool to easily play with several distributions [dctrl-tools] -
+ checkbashisms: check whether a /bin/sh script contains any common
+ bash-specific contructs
+ - cowpoke: upload a Debian source package to a cowbuilder host and build it,
+ optionally also signing and uploading the result to an incoming queue
+ [ssh-client]
+ - cvs-debi, cvs-debc: wrappers around debi and debc respectively (see below)
+ which allow them to be called from the CVS working directory
+ [cvs-buildpackage]
+ - cvs-debrelease: wrapper around debrelease which allows it to be called
+ from the CVS working directory [cvs-buildpackage, dupload | dput,
+ ssh-client]
+ - cvs-debuild: wrapper for cvs-buildpackage to use debuild as its package
+ building program [cvs-buildpackage, fakeroot, lintian, gnupg]
+ - dcmd: run a given command replacing the name of a .changes or .dsc file
+ with each of the files referenced therein
+ - dcontrol: remotely query package and source control files for all Debian
+ distributions [liburl-perl, libwww-perl]
+ - dd-list: given a list of packages, pretty-print it ordered by maintainer -
+ debc: display the contents of just-built .debs - debchange/dch:
automagically
+ add entries to debian/changelog files
+ [libdistro-info-perl, libparse-debcontrol-perl, libsoap-lite-perl]
+ - debcheckout: checkout the development repository of a Debian package -
+ debclean: clean a Debian source tree [fakeroot] - debcommit: commit changes
+ to cvs, darcs, svn, svk, tla, bzr, git, or hg,
+ basing commit message on changelog [cvs | darcs | subversion | svk |
+ tla | bzr | git-core | mercurial, libtimedate-perl]
+ - debdiff: compare two versions of a Debian package to check for
+ added and removed files [wdiff, patchutils]
+ - debi: install a just-built package - debpkg: dpkg wrapper to be able to
+ manage/test packages without su - debrelease: wrapper around dupload or dput
+ [dupload | dput, ssh-client] - debsign, debrsign: sign a .changes/.dsc pair
+ without needing any of
+ the rest of the package to be present; can sign the pair remotely or
+ fetch the pair from a remote machine for signing [gnupg, debian-keyring,
+ ssh-client]
+ - debsnap: grab packages from http://snapshot.debian.org [libwww-perl,
+ libjson-perl]
+ - debuild: wrapper to build a package without having to su or worry
+ about how to invoke dpkg to build using fakeroot. Also deals with common
+ environment problems, umask etc. [fakeroot, lintian, gnupg]
+ - deb-reversion: increase a binary package version number and repacks the
+ package, useful for porters and the like
+ - dep3changelog: generate a changelog entry from a DEP3-style patch header -
+ desktop2menu: given a freedesktop.org desktop file, generate a skeleton
+ for a menu file [libfile-desktopentry-perl]
+ - dget: download Debian source and binary packages [wget | curl] -
+ diff2patches: extract patches from a .diff.gz file placing them under
+ debian/ or, if present, debian/patches [patchutils]
+ - dpkg-depcheck, dpkg-genbuilddeps: determine the packages used during
+ the build of a Debian package; useful for determining the Build-Depends
+ control field needed [build-essential, strace]
+ - dscextract: extract a single file from a Debian source package
[patchutils]
+ - dscverify: verify the integrity of a Debian package from the
+ .changes or .dsc files [gnupg, debian-keyring, libdigest-md5-perl]
+ - edit-patch: add/edit a patch for a source package and commit the changes
+ [quilt | dpatch | cdbs]
+ - getbuildlog: download package build logs from Debian auto-builders [wget]
+ - grep-excuses: grep the update_excuses.html file for your packages
+ [libterm-size-perl, wget, w3m]
+ - licensecheck: attempt to determine the license of source files -
+ list-unreleased: search for unreleased packages - manpage-alert: locate
+ binaries without corresponding manpages [man-db] - mass-bug: mass-file bug
+ reports [bsd-mailx | mailx] - mergechanges: merge .changes files from the
+ same release but built
+ on different architectures
+ - mk-build-deps: given a package name and/or control file, generate a binary
+ package which may be installed to satisfy the build-dependencies of the
+ given package [equivs]
+ - namecheck: check project names are not already taken - nmudiff: mail a
+ diff of the current package against the previous version
+ to the BTS to assist in tracking NMUs [patchutils, mutt]
+ - origtargz: fetch the orig tarball of a Debian package from various
sources,
+ and unpack it
+ - plotchangelog: view a nice plot of the data in a changelog file
+ [libtimedate-perl, gnuplot]
+ - pts-subscribe: subscribe to the PTS for a limited period of time
+ [bsd-mailx | mailx, at]
+ - rc-alert: list installed packages which have release-critical bugs
+ [wget | curl]
+ - rmadison: remotely query the Debian archive database about packages
+ [liburi-perl, wget | curl]
+ - sadt: run DEP-8 tests [python3-debian] - suspicious-source: output a list
+ of files which are not common source
+ files [python3-magic]
+ - svnpath: print Subversion repository paths [subversion] - tagpending:
+ run from a Debian source tree and tag bugs that are to be
+ closed in the latest changelog as pending [libsoap-lite-perl]
+ - transition-check: check a list of source packages for involvement in
+ transitions for which uploads to unstable are currently blocked
+ [libwww-perl, libyaml-syck-perl]
+ - uscan: scan upstream sites for new releases of packages
+ [gpgv, gnupg, liblwp-protocol-https-perl, libwww-perl, unzip, lzma,
+ xz-utils]
+ - uupdate: integrate upstream changes into a source package [patch] -
+ what-patch: determine what patch system, if any, a source package is using
+ [patchutils]
+ - whodepends: check which maintainers' packages depend on a package -
+ who-uploads: determine the most recent uploaders of a package to the Debian
+ archive [gnupg, debian-keyring, debian-maintainers, wget]
+ - wnpp-alert: list installed packages which are orphaned or up for adoption
+ [wget | curl]
+ - wnpp-check: check whether there is an open request for packaging or
+ intention to package bug for a package [wget | curl]
+ - who-permits-upload: Retrieve information about Debian Maintainer access
+ control lists [gnupg, libencode-locale-perl, libparse-debcontrol-perl,
+ libwww-perl, debian-keyring]
+ - wrap-and-sort: wrap long lines and sort items in packaging files
+ [python3-debian]
+
+Also included are a set of example mail filters for filtering mail from
+Debian mailing lists using exim, procmail, etc.
+EOF
diff --git a/devel/devscripts/HISTORY b/devel/devscripts/HISTORY
new file mode 100644
index 0000000..dbad658
--- /dev/null
+++ b/devel/devscripts/HISTORY
@@ -0,0 +1,2 @@
+2014-04-16 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/devel/devscripts/INSTALL b/devel/devscripts/INSTALL
new file mode 100755
index 0000000..d3221ef
--- /dev/null
+++ b/devel/devscripts/INSTALL
@@ -0,0 +1 @@
+make DESTDIR=/ install
diff --git a/devel/devscripts/PRE_BUILD b/devel/devscripts/PRE_BUILD
new file mode 100755
index 0000000..71dea72
--- /dev/null
+++ b/devel/devscripts/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Building deb-reversion.1 requires xslt style sheets not available on SMGL
+sed -i 's/deb-reversion\.1 //' Makefile.common &&
+sed -i 's/--install-layout=deb//' scripts/Makefile
diff --git a/devel/elfkickers/BUILD b/devel/elfkickers/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/devel/elfkickers/BUILD
@@ -0,0 +1 @@
+make
diff --git a/devel/elfkickers/DETAILS b/devel/elfkickers/DETAILS
new file mode 100755
index 0000000..c46e9de
--- /dev/null
+++ b/devel/elfkickers/DETAILS
@@ -0,0 +1,47 @@
+ SPELL=elfkickers
+ SPELLX=ELFkickers
+ VERSION=3.0a
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://www.muppetlabs.com/~breadbox/pub/software/$SOURCE
+
SOURCE_HASH=sha512:c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE="http://www.muppetlabs.com/~breadbox/software/$SPELL.html";
+ LICENSE[0]="GPLv2+"
+ ENTERED=20140916
+ KEYWORDS=""
+ SHORT="Kickers of ELF"
+cat << EOF
+This distribution is a collection of programs that are generally unrelated,
+except in that they all deal with ELF files.
+
+The main purpose of these programs is to be illustrative and educational --
+to help fellow programmers understand ELF files and something of how they
+work under the Linux platform.
+
+Each program is independent. There is very little shared code between them,
+and in fact they all take slightly different approaches to handling ELF
files.
+
+The distribution includes:
+
+* sstrip: a small utility that removes a few bytes from an executable
+ that strip leaves behind.
+
+* objres: a "compiler" for including arbitrary binary resources in object
+ files.
+
+* elftoc: a program that takes an ELF file and generates C code that defines
a
+ struct with the same memory image, using the structs and preprocessor
+ symbols defined in <elf.h>.
+
+* elfls: a utility that displays an ELF file's program and/or section header
+ tables, which serve as a kind of global roadmap to the file's contents.
+
+* rebind: a small utility that alters the binding of selected symbols in an
+ object file.
+
+* ebfc: a compiler for a tiny programming language. The compiler can generate
+ ELF executables, object files, and shared libraries.
+
+* infect: an example of how to modify an executable without affecting its
+ original program.
+EOF
diff --git a/devel/elfkickers/HISTORY b/devel/elfkickers/HISTORY
new file mode 100644
index 0000000..d7ca4de
--- /dev/null
+++ b/devel/elfkickers/HISTORY
@@ -0,0 +1,2 @@
+2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: spell created
diff --git a/devel/elfkickers/INSTALL b/devel/elfkickers/INSTALL
new file mode 100755
index 0000000..4e76028
--- /dev/null
+++ b/devel/elfkickers/INSTALL
@@ -0,0 +1 @@
+make prefix=/usr install
diff --git a/devel/extra-cmake-modules/DETAILS
b/devel/extra-cmake-modules/DETAILS
index 8431652..1272ae3 100755
--- a/devel/extra-cmake-modules/DETAILS
+++ b/devel/extra-cmake-modules/DETAILS
@@ -1,9 +1,9 @@
SPELL=extra-cmake-modules
- VERSION=0.0.11
- VX=4.97.0
-
SOURCE_HASH=sha512:854d66b2f799c6d1873e4d1615ba54f5e4cea2c902d400e57b9191074852640c50c36522a3730a7f5bc7917ab49a6649494ec8b42e1faf7c3ebff3a613a361e6
+ VERSION=1.2.1
+ VX=5.2.0
+
SOURCE_HASH=sha512:48e8b5051f91ebf6643e381dd4d98fdcaca2d029894184ad5e984f175a8e2a6a6f0616755c87daca08093d2c911646e0d48c391df4e9ec93f20dc23d81ab6f99
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL=$KDE_URL/unstable/frameworks/$VX/$SOURCE
+ SOURCE_URL=$KDE_URL/stable/frameworks/$VX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

WEB_SITE=https://projects.kde.org/projects/frameworks/extra-cmake-modules
LICENSE[0]=GPL
diff --git a/devel/extra-cmake-modules/HISTORY
b/devel/extra-cmake-modules/HISTORY
index 8eb7527..063c207 100644
--- a/devel/extra-cmake-modules/HISTORY
+++ b/devel/extra-cmake-modules/HISTORY
@@ -1,3 +1,18 @@
+2014-09-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.1
+
+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
+
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.0.14/4.10.0
+
+2014-05-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.0.13/4.99.0
+
2014-03-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.0.11/4.97.0

diff --git a/devel/flex/DETAILS b/devel/flex/DETAILS
index 8a07322..cff8d0a 100755
--- a/devel/flex/DETAILS
+++ b/devel/flex/DETAILS
@@ -1,7 +1,7 @@
SPELL=flex
- VERSION=2.5.37
-
SOURCE_HASH=sha512:1f34285953a7f058e6a2dddc305fc82cfcaaa451d6d7777da17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.5.39
+
SOURCE_HASH=sha512:488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/flex/$SOURCE
LICENSE[0]=BSD
diff --git a/devel/flex/HISTORY b/devel/flex/HISTORY
index 59e5cab..6a12985 100644
--- a/devel/flex/HISTORY
+++ b/devel/flex/HISTORY
@@ -1,3 +1,6 @@
+2014-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.39
+
2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.5.37

diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 55f5c0f..4fb8f11 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,6 +1,6 @@
SPELL=fpc
- VERSION=2.6.2
-
SOURCE_HASH=sha512:caa1b2c54907b30b536db2ca65bcdd646e8b9e6f2e99fedf9a88edf65f912660a0a9d060cede2ae0f06cdc8bc8099f73274a617cfa65df46c982a1c17ed42192
+ VERSION=2.6.4
+
SOURCE_HASH=sha512:653968786b40c69c3703f67cddfe7c501686cc8b3524a045498c247dc36b66a6619e9cdb5bb5ca002fb700ddc0b653f2a4298e92527df46fc09c8a69e8e9c3a5
SOURCE=$SPELL-$VERSION.source.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/freepascal/Source/$VERSION/$SOURCE
SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/source/$SOURCE
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index 18da7e0..055d6c9 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.4
+
2013-04-21 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS, EXPORTS, INSTALL, PREPARE, PRE_BUILD,
REPAIR^none^EXPORTS: updated spell to 2.6.2
diff --git a/devel/gccxml/DETAILS b/devel/gccxml/DETAILS
index ea96f2e..87f07fc 100755
--- a/devel/gccxml/DETAILS
+++ b/devel/gccxml/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gccxml
-if [[ "$GCCXML_AUTOUPDATE" == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://github.com/gccxml/gccxml.git
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/gccxml/HISTORY b/devel/gccxml/HISTORY
index 4e27b40..d61e8d2 100644
--- a/devel/gccxml/HISTORY
+++ b/devel/gccxml/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-06-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: now hosteted at github
* DEPENDS: add git
diff --git a/devel/gcl/DETAILS b/devel/gcl/DETAILS
index b247906..cbb3846 100755
--- a/devel/gcl/DETAILS
+++ b/devel/gcl/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gcl
if [[ "$GCL_BRANCH" == "scm" ]]; then
- if [[ "$GCL_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.gnu.org:/sources/gcl:gcl
diff --git a/devel/gcl/HISTORY b/devel/gcl/HISTORY
index 67c88b1..c338582 100644
--- a/devel/gcl/HISTORY
+++ b/devel/gcl/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index cdc4e77..deba7e8 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,6 +1,6 @@
SPELL=gdb
- VERSION=7.7
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=7.8
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index 05e44d5..9594b8c 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,9 @@
+2014-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.8
+
+2014-06-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.7.1
+
2014-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.7

diff --git a/devel/geany-plugins/CONFIGURE b/devel/geany-plugins/CONFIGURE
index f7035ff..755d1ca 100755
--- a/devel/geany-plugins/CONFIGURE
+++ b/devel/geany-plugins/CONFIGURE
@@ -2,10 +2,18 @@ config_query_option GEANY_PLUGINS_OPTS "Build Addons plugin
(tasks, systray, etc
"--enable-addons" \
"--disable-addons" &&

+config_query_option GEANY_PLUGINS_OPTS "Build Autoclose plugin?" y \
+ "--enable-autoclose" \
+ "--disable-autoclose" &&
+
config_query_option GEANY_PLUGINS_OPTS "Build CodeNav plugin?" y \
"--enable-codenav" \
"--disable-codenav" &&

+config_query_option GEANY_PLUGINS_OPTS "Build Defineformat plugin?" y \
+ "--enable-defineformat" \
+ "--disable-defineformat" &&
+
config_query_option GEANY_PLUGINS_OPTS "Build GeanyDoc plugin?" y \
"--enable-geanydoc" \
"--disable-geanydoc" &&
@@ -46,6 +54,14 @@ config_query_option GEANY_PLUGINS_OPTS "Build GeanyVC
plugin?" y \
"--enable-geanyvc" \
"--disable-geanyvc" &&

+config_query_option GEANY_PLUGINS_OPTS "Build PairTagHighlighter plugin?" y \
+ "--enable-pairtaghighlighter" \
+ "--disable-pairtaghighlighter" &&
+
+config_query_option GEANY_PLUGINS_OPTS "Build PoHelper plugin?" y \
+ "--enable-pohelper" \
+ "--disable-pohelper" &&
+
config_query_option GEANY_PLUGINS_OPTS "Build pretty-printer plugin?" y \
"--enable-pretty_printer" \
"--disable-pretty_printer" &&
diff --git a/devel/geany-plugins/DEPENDS b/devel/geany-plugins/DEPENDS
index 855053e..b6adc51 100755
--- a/devel/geany-plugins/DEPENDS
+++ b/devel/geany-plugins/DEPENDS
@@ -10,6 +10,15 @@ optional_depends gtk+2 \
"--disable-commander" \
"to build Commander plugin" &&

+optional_depends pygtk2 \
+ "--enable-geanypy" \
+ "--disable-geanypy" \
+ "to build Geanypy (Python bindings) plugin" &&
+
+if is_depends_enabled $SPELL pygtk2; then
+ depends python
+fi &&
+
optional_depends lua51 \
"--enable-geanylua" \
"--disable-geanylua" \
diff --git a/devel/geany-plugins/DETAILS b/devel/geany-plugins/DETAILS
index 1adeaaf..19d4d50 100755
--- a/devel/geany-plugins/DETAILS
+++ b/devel/geany-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany-plugins
- VERSION=1.23
+ VERSION=1.24
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://plugins.geany.org/$SPELL/$SOURCE
diff --git a/devel/geany-plugins/HISTORY b/devel/geany-plugins/HISTORY
index 9a0f057..f85d56d 100644
--- a/devel/geany-plugins/HISTORY
+++ b/devel/geany-plugins/HISTORY
@@ -1,3 +1,7 @@
+2014-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.24
+ * DEPENDS, CONFIGURE: added new plugins
+
2013-03-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.23
* DEPENDS: updated dependencies according to new/dropped plugins
diff --git a/devel/geany/DEPENDS b/devel/geany/DEPENDS
index 5a954a0..c54ea02 100755
--- a/devel/geany/DEPENDS
+++ b/devel/geany/DEPENDS
@@ -1,6 +1,14 @@
-depends gtk+2 &&
depends xml-parser-expat &&

+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "to compile with GTK+3 support
(${PROBLEM_COLOR}experimental${DEFAULT_COLOR})" &&
+
+if ! is_depends_enabled $SPELL gtk+3; then
+ depends gtk+2
+fi &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/devel/geany/DETAILS b/devel/geany/DETAILS
index 382cbe9..697f470 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany
- VERSION=1.23.1
+ VERSION=1.24.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.geany.org/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 55d7ffd..75884a5 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,10 @@
+2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.24.1
+
+2014-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.24
+ * DEPENDS: added optional gtk+3 dependency
+
2013-05-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.23.1

diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index bb77896..ad0d053 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,16 +1,21 @@
SPELL=ghc
- VERSION=7.6.3
- SOURCE=$SPELL-$VERSION-src.tar.bz2
+ VERSION=7.8.2
+ SOURCE=$SPELL-$VERSION-src.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ac86f18b4feeb0bdc9e867261600b210caf62740d73ae657259bbe8149b8c2c4f5a73d09d74d944d4e50f85cc87503485365f0a0ae65befe8d2b6844e5e1253a
+
SOURCE_HASH=sha512:5fb26edd5a03e2bf27961f4476f86f90f292ed0828a0a3a19de333b493f428a267374466a65649379c3ad7f400b0e592d7c355cfecd334af7ceb52bb8d8c60b7
if [[ ! -x /usr/bin/ghc ]] ; then
ARCH="$(uname -m)"
- [[ "$ARCH" = i686 ]] && ARCH=i386
- SOURCE2=${SPELL}-${VERSION}-${ARCH}-unknown-linux.tar.bz2
+ if [[ "$ARCH" = i686 ]]; then
+ ARCH=i386
+ fi
+ SOURCE2=${SPELL}-${VERSION}-${ARCH}-unknown-linux-centos65.tar.xz
SOURCE2_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE2}
-
SOURCE2_HASH=sha512:d9b1f7ce5467b2c56cd4bc01e68b8226da8e5b158cadc32ac767d7bd931c53a4d24524fec58f0598d68957f83d5a3c11a383a2cc96fbf77d64e872a11cfe149b
- [ "$ARCH" = "x86_64" ] &&
SOURCE2_HASH=sha512:5192f26b512a301ff6f430d9bc70867742ba575e241448cfbc871570a8873f105a9e29ccf58fdaeeb0ac8c5e9f1d2e7ea4062fbe148053d4d9844fb4a0f07eba
+ if [ "$ARCH" = "x86_64" ]; then
+
SOURCE2_HASH=sha512:fe2b4571e7799c154162c8ffda97c6679083d7b9c9359be19b8f4871afe10d5e572c272e6d25bb277b6b025ca4e401e2098cf74cda0e39973b782eb1ad56e2da
+ else
+
SOURCE2_HASH=sha512:102eac5d679f8f0832cdcb2eddf2ea96276183d950fe11e050475e696ad76753767f92c5976c3e0d6893c4a82cd6425f6210a9a4df4575c62465517449dc20d1
+ fi
fi
TMPFS=off

diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 034c7aa..40092f0 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: version 7.8.2
+
2013-05-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: version 7.6.3

diff --git a/devel/git-cola/DETAILS b/devel/git-cola/DETAILS
index e848585..b5f7c27 100755
--- a/devel/git-cola/DETAILS
+++ b/devel/git-cola/DETAILS
@@ -1,8 +1,8 @@
SPELL=git-cola
- VERSION=2.0.1
+ VERSION=2.0.4
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://github.com/${SPELL}/${SPELL}/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:dfbc0e0646afd7982c7b4ee05fde92a358d25b0e7824b9fa8fb1353b776876dd3338188fc29694650a9a45aff03a7b89749a3909ada937c3fc808f53b686f1cc
+
SOURCE_HASH=sha512:c27254bde34db09a54c02c4f3ac5e44ed8a73963bec7d7cadb4690b35753f52d0ac5bbe6445208a6f67ebc30b76f420e30c855b5287aa7a1656603fc78a8a207
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://git-cola.github.com/";
LICENSE[0]=GPL
diff --git a/devel/git-cola/HISTORY b/devel/git-cola/HISTORY
index 8626ce3..c550274 100644
--- a/devel/git-cola/HISTORY
+++ b/devel/git-cola/HISTORY
@@ -1,3 +1,12 @@
+2014-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.4
+
+2014-05-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.3
+
+2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.2
+
2014-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.1

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 731673f..9c5b680 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,28 +1,28 @@
SPELL=git
- VERSION=1.9.0
-
SOURCE_HASH=sha512:e81f320cf13262e08a262c9fb70d701b8d8017a5d6b10c8be959c234b99486012cb7fa808a49f97db143777cd6c4368fd08a69f8ef272f9e187f82aed32d0854
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:c6cd5b7ac37d231321160047133d526133a2eeb115acf5ca2041e1970622a838da631a07439a07564c9f2f34a74975daf62b45ed0184e493715e8d4f16c2187e
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
- SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
+ SOURCE_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
- SOURCE3=$SPELL-manpages-$VERSION.tar.gz
+ SOURCE3=$SPELL-manpages-$VERSION.tar.xz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:eae17ced4bbd866a8ce7fb5e03cfbbbae1f325074936b63ee6778719cae00935514c7db9a9e747bbb29a3d0cf8cde65717d096899ead7e2468e6609115df5594
- SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
+
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
fi
if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
- SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
+ SOURCE5=$SPELL-htmldocs-$VERSION.tar.xz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:96abd81db12054296d6a10b3f510e55a718f6501d63968056252c1988f03ba6c2cbbb389dfe1fff52e0346b884253d92f1c3e2eb7201eb9a86109c99e9289fbe
- SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
+
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
fi
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 59df908..36eae11 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,28 @@
+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>
+ * DETAILS: version 2.0.1
+
+2014-05-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.0
+
+2014-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.9.3
+
+2014-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.1
+ download from KERNEL
+
2014-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.0

diff --git a/devel/gnusim8085/DEPENDS b/devel/gnusim8085/DEPENDS
new file mode 100755
index 0000000..0e47194
--- /dev/null
+++ b/devel/gnusim8085/DEPENDS
@@ -0,0 +1,2 @@
+depends gtk+2 &&
+depends gtksourceview
diff --git a/devel/gnusim8085/DETAILS b/devel/gnusim8085/DETAILS
new file mode 100755
index 0000000..b7ab400
--- /dev/null
+++ b/devel/gnusim8085/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=gnusim8085
+ VERSION=1.3.7
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
+
SOURCE_HASH=sha512:b1b701ef3292c2b3ea7a599f450ee495fdec730fa53e2ad9ea27c716a7de61d503f32345ed3cf6eeef3ef698ed4f0b957cb7ae207df0bee46363e76b5176b822
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://gnusim8085.org/";
+ LICENSE[0]="GPLv2"
+ ENTERED=20140705
+ KEYWORDS=""
+ SHORT="Graphical simulator, assembler and debugger for the Intel
8085 microprocessor"
+cat << EOF
+GNUSim8085 is a 8085 microprocessor simulator with following features:
+
+* A simple editor component with syntax highlighting.
+* A keypad to input assembly language instructions with appropriate
+ arguments.
+* Easy view of register contents.
+* Easy view of flag contents.
+* Hexadecimal <--> Decimal converter.
+* View of stack, memory and I/O contents.
+* Support for breakpoints for programming debugging.
+* Stepwise program execution.
+* One click conversion of assembly program to opcode listing.
+* Printing support (known not to work well on Windows).
+* UI translated in various languages.
+EOF
diff --git a/devel/gnusim8085/HISTORY b/devel/gnusim8085/HISTORY
new file mode 100644
index 0000000..40b778a
--- /dev/null
+++ b/devel/gnusim8085/HISTORY
@@ -0,0 +1,2 @@
+2014-07-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/devel/go/DEPENDS b/devel/go/DEPENDS
index 3b4ed5b..6f28c8d 100755
--- a/devel/go/DEPENDS
+++ b/devel/go/DEPENDS
@@ -2,6 +2,6 @@ depends SYSTEM-LOGGER &&
depends mercurial &&
depends bison &&
depends gcc &&
-depends gawk &&
+depends AWK &&
depends ed &&
depends make
diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index 7f81103..29281e9 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -1,23 +1,44 @@
-depends autoconf &&
-depends automake &&
-depends zlib &&
-depends libpng &&
-depends libxaw &&
-depends bison &&
-depends flex &&
-depends groff &&
-depends libtool &&
-depends JPEG &&
-depends intltool &&
-depends glib2 &&
-depends expat &&
-depends gettext &&
-
-# for ps2pdf
-depends POSTSCRIPT-INTERPRETER &&
-
+depends atk &&
+depends autoconf &&
+depends automake &&
+depends bison &&
+depends expat &&
+depends flex &&
# use external GD so that graphviz doesn't install its own
depends gd '--without-mylibgd' &&
+depends gettext &&
+depends glib2 &&
+depends groff &&
+depends harfbuzz &&
+depends icu &&
+depends intltool &&
+depends jasper &&
+depends JPEG &&
+depends libcroco &&
+depends libffi &&
+depends libice &&
+depends libpng &&
+depends libpthread-stubs &&
+depends librsvg2 &&
+depends libsm &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxaw &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxml2 &&
+depends libxmu &&
+depends libxpm &&
+depends libxrender &&
+depends libxt &&
+depends LZMA &&
+depends pcre &&
+depends pixman &&
+# for ps2pdf
+depends POSTSCRIPT-INTERPRETER &&
+depends zlib &&

# not listed in 'configure --help' but nevertheless processed
optional_depends PHP '--enable-php' '--disable-php' 'for PHP bindings' &&
@@ -62,13 +83,17 @@ optional_depends pango
\
"--enable-pangocairo" \
"--with-mylibgd=yes --with-pangocairo=no" \
"Use pangocairo library?" &&
-
-if is_depends_enabled $SPELL pango; then depends -sub SVG cairo; fi &&
+if is_depends_enabled $SPELL pango; then
+ depends -sub SVG cairo;
+fi &&

optional_depends gtk+2 \
"--with-gtk --with-gdk-pixbuf" \
"--without-gtk --without-gdk-pixbuf" \
"Use GTK+2 libraries?" &&
+if is_depends_enabled $SPELL gtk+2; then
+ depends gdk-pixbuf2
+fi &&

optional_depends libgnomeui \
"--with-gnomeui" \
@@ -79,25 +104,12 @@ optional_depends gtkglext \
"--with-gtkglext" \
"--without-gtkglext" \
"OpenGL support" &&
+if is_depends_enabled $SPELL gtkglext; then
+ depends OPENGL
+fi &&
+
optional_depends "ghostscript" \
"--with-ghostscript=yes" \
"--with-ghostscript=no" \
"support for postscript"

-depends atk &&
-if is_depends_enabled $SPELL gtk+2; then
- depends gdk-pixbuf2
-fi &&
-depends harfbuzz &&
-depends jasper &&
-depends libice &&
-depends librsvg2 &&
-depends libsm &&
-depends libx11 &&
-depends libxml2 &&
-depends libxmu &&
-depends libxpm &&
-depends libxrender &&
-depends libxt &&
-depends pixman &&
-depends LZMA
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index eceb25e..5a298ec 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
2014-02-10 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: 2.36.0

diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 6e334e7..36cf1b1 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -1,6 +1,6 @@
SPELL=guile
- VERSION=2.0.9
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.0.11
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index cc46b46..0023c42 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.11
+
2013-09-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.0.9

diff --git a/devel/icecream/DETAILS b/devel/icecream/DETAILS
index 7550907..fb6b17f 100755
--- a/devel/icecream/DETAILS
+++ b/devel/icecream/DETAILS
@@ -1,8 +1,8 @@
SPELL=icecream
- VERSION=0.9.6
+ VERSION=1.0.1
SOURCE="icecc-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://ftp.suse.com/pub/projects/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:d71f89f24f06566bf7d8330d46b373d640c282e8e775215faf916f7208f5ffdaa056d646105d1071ccd6a4921af7e278da2c3c5c9861cf293441e81b9670fed1
+
SOURCE_HASH=sha512:04ffaf84ed38eac73939d99cd484a223fe8df07293a1e71ff63da18ee3c2d6c05d7cf6d4b9a90800745c0dc0d38485b4a22dd58feaa6e577f852e9af600b199f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/icecc-${VERSION}"
WEB_SITE="http://en.opensuse.org/Icecream";
LICENSE[0]=GPL
diff --git a/devel/icecream/HISTORY b/devel/icecream/HISTORY
index 57fede9..8e98133 100644
--- a/devel/icecream/HISTORY
+++ b/devel/icecream/HISTORY
@@ -1,2 +1,5 @@
+2014-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.1
+
2011-04-07 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DETAILS, init.d/icecream, init.d/icecream-scheduler: spell
created
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/libunwind/BUILD b/devel/libunwind/BUILD
index ce7473a..129c82a 100755
--- a/devel/libunwind/BUILD
+++ b/devel/libunwind/BUILD
@@ -1,4 +1,4 @@
-if [[$LIBUNWIND_BRANCH == scm]];then
+if [[ $LIBUNWIND_BRANCH == scm ]]; then
mkdir -p config &&
libtoolize --copy &&
aclocal &&
diff --git a/devel/libunwind/DETAILS b/devel/libunwind/DETAILS
index e98c502..00002a6 100755
--- a/devel/libunwind/DETAILS
+++ b/devel/libunwind/DETAILS
@@ -1,11 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libunwind
-if [[$LIBUNWIND_BRANCH == scm]];then
-if [[ "$DRM_AUTOUPDATE" == "y" ]]
-then
- VERSION="$(date +%Y%m%d)"
-else
- VERSION=git
-fi
+if [[ $LIBUNWIND_BRANCH == scm ]];then
+ VERSION="$(get_scm_version)"
SOURCE=$SPELL-git.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_URL=git://git.sv.gnu.org/libunwind.git
@@ -16,7 +12,8 @@ else
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL=http://download.savannah.gnu.org/releases/libunwind/$SOURCE
fi
-
+ DOCS="doc/NOTES $DOCS"
+ DOC_DIRS=""
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.nongnu.org/libunwind/
ENTERED=20090421
diff --git a/devel/libunwind/HISTORY b/devel/libunwind/HISTORY
index 6a0aa22..48802a8 100644
--- a/devel/libunwind/HISTORY
+++ b/devel/libunwind/HISTORY
@@ -1,2 +1,8 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, BUILD: fixed syntax error
+
2009-04-21 Ethan Grammatikidis <eekee57 AT fastmail.fm>
- * DETAILS, BUILD: Crated spell.
+ * DETAILS, BUILD: Created spell.
diff --git a/devel/m4/DETAILS b/devel/m4/DETAILS
index e3eff61..16b77f6 100755
--- a/devel/m4/DETAILS
+++ b/devel/m4/DETAILS
@@ -1,5 +1,5 @@
SPELL=m4
- VERSION=1.4.16
+ VERSION=1.4.17
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY
index 7ca5ce7..cefe527 100644
--- a/devel/m4/HISTORY
+++ b/devel/m4/HISTORY
@@ -1,3 +1,7 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.17
+ * glibc215.patch, PRE_BUILD: deleted - builds with glibc-2.20
+
2012-12-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* glibc215.patch: added, to fix build with glibc >=2.15
diff --git a/devel/m4/PRE_BUILD b/devel/m4/PRE_BUILD
deleted file mode 100755
index 62c7b7c..0000000
--- a/devel/m4/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-patch -p0 < "$SPELL_DIRECTORY/glibc215.patch" &&
-
-sed -i '/#include "m4.h"/i#include <sys/stat.h>' src/path.c
diff --git a/devel/m4/glibc215.patch b/devel/m4/glibc215.patch
deleted file mode 100644
index 9b6f475..0000000
--- a/devel/m4/glibc215.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/stdio.in.h.orig 2011-03-01 19:39:29.000000000 +0300
-+++ lib/stdio.in.h 2012-12-08 23:01:59.570142449 +0400
-@@ -162,7 +162,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index a8157b3..f13edcb 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,6 @@
+2014-09-23 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: Install gmake symlink
+
2013-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional guile

diff --git a/devel/make/INSTALL b/devel/make/INSTALL
index 64f3354..23b4300 100755
--- a/devel/make/INSTALL
+++ b/devel/make/INSTALL
@@ -1,2 +1,3 @@
make install DESTDIR=$INSTALL_ROOT &&
+ln -s make ${INSTALL_ROOT}/usr/bin/gmake &&
chmod a-s ${INSTALL_ROOT}/usr/bin/make
diff --git a/devel/mawk/BUILD b/devel/mawk/BUILD
new file mode 100755
index 0000000..900140b
--- /dev/null
+++ b/devel/mawk/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --bindir=$INSTALL_ROOT/bin" &&
+default_build
diff --git a/devel/mawk/CONFIGURE b/devel/mawk/CONFIGURE
new file mode 100755
index 0000000..31cf3fe
--- /dev/null
+++ b/devel/mawk/CONFIGURE
@@ -0,0 +1 @@
+config_query MAWK_DEF "Use $SPELL as the primary AWK interpreter on the
system?" y
diff --git a/devel/mawk/DETAILS b/devel/mawk/DETAILS
new file mode 100755
index 0000000..26769fd
--- /dev/null
+++ b/devel/mawk/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=mawk
+ VERSION=1.3.4-20131226
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]=ftp://invisible-island.net/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:1e9bce2c738289283b0ed56ed4706eeb42da8951fd2c8d13d8858af15c41bd2bd18d73f0a1de997086089fbfb557f5ff3b033a27acbd11751106fe9f37ed7c5d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://invisible-island.net/mawk/mawk.html";
+ LICENSE[0]="GPLv2"
+ ENTERED=20140831
+ KEYWORDS=""
+ SHORT="Interpreter for the AWK Programming Language"
+cat << EOF
+The AWK language is useful for manipulation of data files, text retrieval and
+processing, and for prototyping and experimenting with algorithms.
+EOF
diff --git a/devel/mawk/HISTORY b/devel/mawk/HISTORY
new file mode 100644
index 0000000..07eb853
--- /dev/null
+++ b/devel/mawk/HISTORY
@@ -0,0 +1,6 @@
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * PROVIDES: Provide AWK
+ * CONFIGURE, INSTALL: Let the user choose the primary AWK
implementation
+
+2014-08-31 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS: spell created
diff --git a/devel/mawk/INSTALL b/devel/mawk/INSTALL
new file mode 100755
index 0000000..a8cc99c
--- /dev/null
+++ b/devel/mawk/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+if [ "$MAWK_DEF" = y ]; then
+ ln -sf "$SPELL" "$INSTALL_ROOT"/bin/awk
+fi
diff --git a/devel/mawk/PROVIDES b/devel/mawk/PROVIDES
new file mode 100644
index 0000000..37a9c1c
--- /dev/null
+++ b/devel/mawk/PROVIDES
@@ -0,0 +1 @@
+AWK
diff --git a/devel/meld/DETAILS b/devel/meld/DETAILS
index 4eec28e..35369ef 100755
--- a/devel/meld/DETAILS
+++ b/devel/meld/DETAILS
@@ -1,10 +1,10 @@
SPELL=meld
- VERSION=1.6.0
+ VERSION=1.8.6
BRANCH=$(echo $VERSION|cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d
+
SOURCE_HASH=sha512:7a1c52c6686efab1e233f1f1506b9f0a8d4c040150fefc63d09510156a17819c375c9d10090c97e4a913ce3887d118ee09e75af7de4def24dfc5a75d5ad71511
LICENSE[0]=GPL
KEYWORDS="gnome devel"
WEB_SITE=http://meld.sourceforge.net/
diff --git a/devel/meld/HISTORY b/devel/meld/HISTORY
index 7c3e735..266b283 100644
--- a/devel/meld/HISTORY
+++ b/devel/meld/HISTORY
@@ -1,3 +1,6 @@
+2014-09-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6
+
2012-06-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.0

diff --git a/devel/mk-configure/BUILD b/devel/mk-configure/BUILD
new file mode 100755
index 0000000..a9ea826
--- /dev/null
+++ b/devel/mk-configure/BUILD
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+bmake PREFIX=/usr SYSCONFDIR=/etc
diff --git a/devel/mk-configure/DEPENDS b/devel/mk-configure/DEPENDS
new file mode 100755
index 0000000..0c08095
--- /dev/null
+++ b/devel/mk-configure/DEPENDS
@@ -0,0 +1 @@
+depends bmake
diff --git a/devel/mk-configure/DETAILS b/devel/mk-configure/DETAILS
new file mode 100755
index 0000000..45518ce
--- /dev/null
+++ b/devel/mk-configure/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=mk-configure
+ VERSION=0.27.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]="http://sourceforge.net/projects/$SPELL/files/$SPELL/$SPELL-$VERSION/$SOURCE";
+
SOURCE_HASH=sha512:faa1dbadf875a238e4e5377e9185f5c015571f3adfd2168439d840ea1e6ebdfd82114ce5b223ef97406015a9a41457cb7dda1610ec963edc27c0adc36987d450
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://sourceforge.net/projects/$SPELL/";
+ LICENSE[0]="BSD"
+ ENTERED=20140909
+ KEYWORDS=""
+ SHORT="Lightweight replacement for autotools"
+cat << EOF
+mk-configure is a lightweight easy for use replacement for GNU autotools,
+written in bmake (portable version of NetBSD make) and POSIX tools (shell,
+awk etc.).
+EOF
diff --git a/devel/mk-configure/HISTORY b/devel/mk-configure/HISTORY
new file mode 100644
index 0000000..ebb05a2
--- /dev/null
+++ b/devel/mk-configure/HISTORY
@@ -0,0 +1,2 @@
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/devel/mk-configure/INSTALL b/devel/mk-configure/INSTALL
new file mode 100755
index 0000000..e46fa6d
--- /dev/null
+++ b/devel/mk-configure/INSTALL
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+bmake DESTDIR="$INSTALL_ROOT" PREFIX=/usr SYSCONFDIR=/etc install
diff --git a/devel/mlgmpidl/DETAILS b/devel/mlgmpidl/DETAILS
index 7891781..ded0bd3 100755
--- a/devel/mlgmpidl/DETAILS
+++ b/devel/mlgmpidl/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mlgmpidl
-if [[ "$MLGMPIDL_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-svn.tar.bz2"

SOURCE_URL[0]="svn://scm.gforge.inria.fr/svnroot/mlxxxidl/mlgmpidl/trunk:${SPELL}"
SOURCE_IGNORE=volatile
diff --git a/devel/mlgmpidl/HISTORY b/devel/mlgmpidl/HISTORY
index 106843b..77f7a9e 100644
--- a/devel/mlgmpidl/HISTORY
+++ b/devel/mlgmpidl/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-03-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD, PREPARE: spell created

diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index 83deebe..ee0ea27 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -5,13 +5,12 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then

SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}

SOURCE_HASH=sha512:2067ee108f15610ea11c515fba67625995f5136c8888d21a1ef9417320538f5e46cc39c19c351873b5c126170bc23f21f042b544575506ca4c454beda4b8438a
else
- VERSION=2.10.2
+ VERSION=2.11.4
SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:500660a70cef15fc79d626cd2ec44023476a02f46dcc0d9df18e0791816466e48396ff109773b8cdd90e76a484f9f1ba25e7439d70c897ae9443e63fb32d5c10
+ SOURCE_URL=http://download.mono-project.com/sources/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:e196686637be91b782a9ff4d42098a361eaf00b6de1b18796a7390b2e55f04f6d05b3c055b302b5a72940597cbde5f75e94a8e8c4530300d3303c84fb021dfda
fi
- SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.mono-project.com
ENTERED=20020625
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index bbbe955..d8e51eb 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,7 @@
+2014-09-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated MONO_TRUNK=n to 2.11.4
+
2011-05-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.2

diff --git a/devel/ninja-build-system/DETAILS
b/devel/ninja-build-system/DETAILS
index daae17e..2128a35 100755
--- a/devel/ninja-build-system/DETAILS
+++ b/devel/ninja-build-system/DETAILS
@@ -1,8 +1,8 @@
SPELL=ninja-build-system
- VERSION=1.4.0
+ VERSION=1.5.1
SOURCE="ninja-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/martine/ninja/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:8c939d586f30db884b2f3783fa6cd9a6f1b0904d231d1cd9b9196efdc0144585cdff11f5d7821f0f7d45643b82f65889e5fc950d7ae2c6d83c57c2cd43ba9361
+
SOURCE_HASH=sha512:ab82389ee88bd68ec57e720dabb47494371990dca581cf9bb35650177164f04bf41c81ab3e5019a370eeacc7f5f49ae81d41d8b21e1b07cc8abedce37e00da61
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ninja-${VERSION}"
WEB_SITE="http://martine.github.io/ninja/";
LICENSE[0]=APACHE
diff --git a/devel/ninja-build-system/HISTORY
b/devel/ninja-build-system/HISTORY
index fdc7a45..be7ce13 100644
--- a/devel/ninja-build-system/HISTORY
+++ b/devel/ninja-build-system/HISTORY
@@ -1,3 +1,6 @@
+2014-07-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.1
+
2014-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/devel/nodejs/BUILD b/devel/nodejs/BUILD
index a23a8e8..a89d357 100755
--- a/devel/nodejs/BUILD
+++ b/devel/nodejs/BUILD
@@ -1,2 +1,3 @@
-./configure --prefix=/usr &&
+./configure --prefix=$INSTALL_ROOT/usr $OPTS &&
+
make
diff --git a/devel/nodejs/DEPENDS b/devel/nodejs/DEPENDS
index a86d429..77397da 100755
--- a/devel/nodejs/DEPENDS
+++ b/devel/nodejs/DEPENDS
@@ -1 +1,8 @@
-depends python
+depends -sub CXX gcc &&
+depends python &&
+depends zlib '--shared-zlib' &&
+
+optional_depends -sub "1.0" openssl \
+ "--shared-openssl" \
+ "" \
+ "to use system OpenSSL library instead of
bundled"
diff --git a/devel/nodejs/DETAILS b/devel/nodejs/DETAILS
index 58ea65a..94b873e 100755
--- a/devel/nodejs/DETAILS
+++ b/devel/nodejs/DETAILS
@@ -1,9 +1,10 @@
SPELL=nodejs
- VERSION=0.8.12
-
SOURCE_HASH=sha512:27eb75c785e32b1faf417aea09f849679ff2c22f94253961574d171b1f599297550770849dd3b6faca853e26a2320619477ac7d7ea57b9a3be817cfa49e8afd2
- SOURCE=node-v$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/node-v$VERSION
+ SPELLX=${SPELL/js}
+ VERSION=0.10.32
+ SOURCE=$SPELLX-v$VERSION.tar.gz
SOURCE_URL[0]=http://nodejs.org/dist/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:5871100fac79c81e940b68cd0eba978c46863375985b86c0124bc0a13eafc7bd371663bb0798a04108fb0234b24a28241ba49fe687300a36475674f7ad9ec9bf
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-v$VERSION"
WEB_SITE=http://nodejs.org/
ENTERED=20120211
LICENSE[0]=MIT
diff --git a/devel/nodejs/HISTORY b/devel/nodejs/HISTORY
index 9d7a98b..680d455 100644
--- a/devel/nodejs/HISTORY
+++ b/devel/nodejs/HISTORY
@@ -1,3 +1,8 @@
+2014-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.32; quoting paths
+ * BUILD: use INSTALL_ROOT, OPTS
+ * DEPENDS: added gcc, zlib and openssl dependencies
+
2012-10-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.12

diff --git a/devel/perl/BUILD b/devel/perl/BUILD
index 16ceb94..a5c21d7 100755
--- a/devel/perl/BUILD
+++ b/devel/perl/BUILD
@@ -1,3 +1,4 @@
+export LDFLAGS+=' -L/lib64 -lm'
unset LANG

if ! declare -f up_trigger > /dev/null; then
@@ -40,10 +41,8 @@ fi &&

./Configure -Doptimize="$CFLAGS" $CONFIG_OPTS $PERL_PATHS &&

-make_single &&
make depend &&
make &&
-make_normal &&

if [[ $NEW_CUSTOM == y ]]; then
cp config.sh $PERL_CONFIG
diff --git a/devel/perl/DETAILS b/devel/perl/DETAILS
index 6650c93..e06ef92 100755
--- a/devel/perl/DETAILS
+++ b/devel/perl/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl
- VERSION=5.18.1
+ VERSION=5.20.0
SECURITY_PATCH=3
-
SOURCE_HASH=sha512:24bfc22d13b3f090aa7f24c9697f881b13eb3a52048210dbfedb07716ea66f95f434691414d3ece4b0d10946e8152f693f8850d1cf8d617059def23a3465f1db
+
SOURCE_HASH=sha512:a97e25763ec19af10d7d2f5b32ce349bc85add896998234f40e8734ca3cd5c370634f3a4615c1f4fdcdd725c85abe0053a24848c9f60ba8023d9de44dd57111a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.cpan.org/src/5.0/$SOURCE
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
ENTERED=20010922
LICENSE[0]=ART
DISTCC_HOSTS=""
- CCACHE=off
+# CCACHE=off
KEYWORDS="perl"
SHORT="Larry Wall's practical extraction and reporting language"
cat << EOF
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index c61cce9..4e8d926 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,11 @@
+2014-05-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.20.0
+ * INSTALL: remove obsoolete options
+
+2014-05-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.18.2
+ * BUILD: remove make_single
+
2013-11-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.18.1

diff --git a/devel/perl/INSTALL b/devel/perl/INSTALL
index c2c7b9b..aa82ba9 100755
--- a/devel/perl/INSTALL
+++ b/devel/perl/INSTALL
@@ -1,6 +1,4 @@
-make install DESTDIR=$INSTALL_ROOT \
- INSTALLFLAGS="--man1dir=$INSTALL_ROOT/usr/share/man/man1 --man1ext=1 \
- --man3dir=$INSTALL_ROOT/usr/share/man/man3 --man3ext=3" &&
+make install DESTDIR=$INSTALL_ROOT &&

# for compatibility (irssi)
for dynadir in $(ls -d $INSTALL_ROOT/usr/lib/perl5/$VERSION/*/auto); do
diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
new file mode 100755
index 0000000..344ab34
--- /dev/null
+++ b/devel/pkgconfig/BUILD
@@ -0,0 +1,5 @@
+# Keep dependencies minimal: If for some reason glib2 is broken, it cannot
+# subsequently be built when pkg-config is also broken due to linking to
+# system glib2.
+OPTS="$OPTS --with-internal-glib" &&
+default_build
diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
deleted file mode 100755
index 329e0ab..0000000
--- a/devel/pkgconfig/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ "$VERSION" != "0.25" ]]; then
- depends glib2
-fi
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index ff7cfdd..402a75f 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,13 +1,6 @@
SPELL=pkgconfig
-
-if spell_ok glib2; then
VERSION=0.28

SOURCE_HASH=sha512:6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
- else
- VERSION=0.25
-
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
-fi
-
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index c6d2105..bf759d5 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,9 @@
+2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: fixed to version 0.28 now
+ * DEPENDS: gone, see below
+ * BUILD: enforcing use of internal glib2 to avoid vicious dependency
+ circle with such a basic tool (which is required to build glib2)
+
2013-07-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.28

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..aa87f6b 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,10 +1,12 @@
+depends gettext &&
+
optional_depends gdbm "" "" "gnu db support(old)" &&
optional_depends db "" "" "for Sleepycat db support" &&
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/DETAILS b/devel/python/DETAILS
index f539ff4..8350bab 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,10 +1,12 @@
SPELL=python
- VERSION=2.7.6
+ VERSION=2.7.7
SOURCE=Python-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
- SOURCE_URL[0]=http://www.python.org/ftp/$SPELL/$VERSION/$SOURCE
- SOURCE2_URL[0]=http://www.python.org/ftp/$SPELL/$VERSION/$SOURCE2
+ SOURCE_URL[0]=https://www.python.org/ftp/$SPELL/$VERSION/$SOURCE
+ SOURCE2_URL[0]=https://www.python.org/ftp/$SPELL/$VERSION/$SOURCE2
+ SOURCE_HINTS=no-check-certificate
+ SOURCE2_HINTS=no-check-certificate
SOURCE_GPG=python.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
STAGED_INSTALL=off
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 1e9aa97..a6a8b02 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,18 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: depends gettext
+
+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
+
+2014-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.7
+
2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.6
* python.gpg: add 18ADD4FF Benjamin Peterson <benjamin AT python.org>
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/DETAILS b/devel/python3/DETAILS
index 28c7aa1..8e23b10 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,5 +1,5 @@
SPELL=python3
- VERSION=3.4.0
+ VERSION=3.4.1
SECURITY_PATCH=3
SOURCE=Python-$VERSION.tgz
SOURCE2=$SOURCE.asc
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index b26f795..67be9cc 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,9 @@
+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
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.0
* python.gpg: add key F73C700D: public key "Larry Hastings
<larry AT hastings.org>"
diff --git a/devel/qgrit/DETAILS b/devel/qgrit/DETAILS
index c21727d..b0f4517 100755
--- a/devel/qgrit/DETAILS
+++ b/devel/qgrit/DETAILS
@@ -1,10 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=qgrit
- if [[ ${QGRIT_AUTOUPDATE} == "y" ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-scm.tar.bz2"
SOURCE_URL[0]=git_http://github.com/${SPELL}/${SPELL}.git:$SPELL
SOURCE_IGNORE=volatile
diff --git a/devel/qgrit/HISTORY b/devel/qgrit/HISTORY
index 4e2f935..9c06244 100644
--- a/devel/qgrit/HISTORY
+++ b/devel/qgrit/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-06-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, PREPARE, INSTALL: spell created

diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 19e14f7..a16668b 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -5,8 +5,8 @@ if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
SOURCE=$SPELL-opensource-src-$VERSION.tar.gz

SOURCE_URL[0]=http://download.qt-project.org/development_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
else
- VERSION=3.0.1
-
SOURCE_HASH=sha512:fa8b2c4196136b310127daf308a5a99b0ef39b2e25db83930f959a034418a08590edbe8e19e6afea02c1d647602bb49c96df8db156d24f6b9b9246c1a93ead19
+ VERSION=3.1.0
+
SOURCE_HASH=sha512:2a54d03ae2319db8e2593a6668e2f50a40cb3cef5463df9a0a88702a15e36e7beb286150b0cc81cd18fb093c71cce1b8e86ccb1e9b37b51b26a33dceec53a839
SOURCE=$SPELL-opensource-src-$VERSION.tar.gz

SOURCE_URL[0]=http://download.qt-project.org/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
fi
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 75417d1..53d8698 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2014-04-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.1.0
+
2014-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 3.0.1

diff --git a/devel/qxmledit/DETAILS b/devel/qxmledit/DETAILS
index 1c76b6c..515af16 100755
--- a/devel/qxmledit/DETAILS
+++ b/devel/qxmledit/DETAILS
@@ -1,11 +1,10 @@
SPELL=qxmledit
- VERSION=0.8.9.1
- VX=0B4p7QlvKSOF1RXI4alN6dWxYa1k
-
SOURCE_HASH=sha512:23ae628a5ab0a9d883d2e6b503f554f6101a3b832bc5135dda1efea3affc845decc50681ac49ccac6b004fda0dd62325cb172b979af7b8479b8d297f297764a0
+ VERSION=0.8.11
+
SOURCE_HASH=sha512:26870d85a111e65653d9b91e0e20d0224f15dc3a1544f489288bb0424beed008b5d44a88844bc68cdd1317c8dd4df63edfb8ee068e57bba41b453de54b2f7b80
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/$SPELL
- SOURCE_URL[0]=https://googledrive.com/host/$VX/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/files/$SOURCE
LICENSE[0]=LGPL
ENTERED=20140125
KEYWORDS=""
diff --git a/devel/qxmledit/HISTORY b/devel/qxmledit/HISTORY
index 37ec12e..4785cde 100644
--- a/devel/qxmledit/HISTORY
+++ b/devel/qxmledit/HISTORY
@@ -1,3 +1,10 @@
+2014-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.11
+ new now download from sourceforge
+
+2014-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.10
+
2014-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.9.

diff --git a/devel/qxorm/DETAILS b/devel/qxorm/DETAILS
index ffca33d..9180974 100755
--- a/devel/qxorm/DETAILS
+++ b/devel/qxorm/DETAILS
@@ -1,7 +1,7 @@
SPELL=qxorm
SPELLX=QxOrm
- VERSION=1.2.6
-
SOURCE_HASH=sha512:7eac2df323db208141164501439b9813f4a938724703cfe17e0a764f84d25a21a2cf5dad3f23828177611cbe8073ab8888b6726cde704a9627b2ee5240ec1300
+ VERSION=1.2.8
+
SOURCE_HASH=sha512:4bd59277900c5b8bd651611da2d96d7675d6e0ae7ef5adfd17b24ef43b09a03460df9c1f7dfbee0c1362f42760606fdc3bfd9922ef8b9ba740e39af76d15cf4a
SOURCE=${SPELLX}_${VERSION}.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}
WEB_SITE=http://www.qxorm.com
diff --git a/devel/qxorm/HISTORY b/devel/qxorm/HISTORY
index 307d35e..fe192e2 100644
--- a/devel/qxorm/HISTORY
+++ b/devel/qxorm/HISTORY
@@ -1,3 +1,9 @@
+2014-06-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.8
+
+2014-05-32 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.7
+
2014-02-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.6

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/runawk/BUILD b/devel/runawk/BUILD
new file mode 100755
index 0000000..c01537d
--- /dev/null
+++ b/devel/runawk/BUILD
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+mkcmake PREFIX=/usr
diff --git a/devel/runawk/DEPENDS b/devel/runawk/DEPENDS
new file mode 100755
index 0000000..0f190be
--- /dev/null
+++ b/devel/runawk/DEPENDS
@@ -0,0 +1,3 @@
+depends AWK &&
+depends bmake &&
+depends mk-configure
diff --git a/devel/runawk/DETAILS b/devel/runawk/DETAILS
new file mode 100755
index 0000000..c2d8cff
--- /dev/null
+++ b/devel/runawk/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=runawk
+ VERSION=1.5.1
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]="http://sourceforge.net/projects/$SPELL/files/$SPELL/$SPELL-$VERSION/$SOURCE";
+
SOURCE_HASH=sha512:dc8f156836c682fd00317a3c7202f57a9b04403e2fc9a45f1fe6aa7c99af2b9b4d72f6f16d73cd133168596ea002773bcbcce301a9090478b68a6503c30b22cb
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://sourceforge.net/projects/$SPELL/";
+ LICENSE[0]="MIT"
+ ENTERED=20140909
+ KEYWORDS=""
+ SHORT="Wrapper for AWK providing modules"
+cat << EOF
+RunAWK is a small wrapper for AWK interpreter that helps write standalone
+programs in AWK. It provides support for modules and other powerful
+features. It comes with dozens of modules which provide efficient means for
+handling command line options, powerful functions for manipulating strings
+and arrays as well as sorting, mathematical, tmpfile, braceexpand functions
+and a lot of others.
+EOF
diff --git a/devel/runawk/HISTORY b/devel/runawk/HISTORY
new file mode 100644
index 0000000..ebb05a2
--- /dev/null
+++ b/devel/runawk/HISTORY
@@ -0,0 +1,2 @@
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/devel/runawk/INSTALL b/devel/runawk/INSTALL
new file mode 100755
index 0000000..6e47997
--- /dev/null
+++ b/devel/runawk/INSTALL
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+mkcmake DESTDIR="$INSTALL_ROOT" PREFIX=/usr install
diff --git a/devel/sdcc/DEPENDS b/devel/sdcc/DEPENDS
new file mode 100755
index 0000000..1ae3bd0
--- /dev/null
+++ b/devel/sdcc/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends gputils \
+ "" \
+ "--disable-pic14-port --disable-pic16-port" \
+ "for PIC14 and PIC16 support"
diff --git a/devel/sdcc/DETAILS b/devel/sdcc/DETAILS
new file mode 100755
index 0000000..b2f28b6
--- /dev/null
+++ b/devel/sdcc/DETAILS
@@ -0,0 +1,42 @@
+ SPELL=sdcc
+ VERSION=3.4.0
+ SOURCE="${SPELL}-src-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:551d393ef30e4ea653d5130b52df1e9560fc9a0e59cc674ab20a79f5d1da9a1ae7e33d283e88b7abfd8648116178813aef62859f021cd3fbb56d06fd9899ba10
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://sdcc.sourceforge.net/";
+ LICENSE[0]="GPLv2+"
+ ENTERED=20140831
+ KEYWORDS=""
+ SHORT="Small Device C Compiler"
+cat << EOF
+SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
+the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08
+based (hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
+Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on
+supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for
+other microprocessors.
+
+The package also includes simulators, debugger, and run-time libraries.
+
+Features:
+* extensive MCU specific language extensions, allowing effective use of the
+ underlying hardware.
+* a host of standard optimizations such as global sub expression elimination,
+ loop optimizations (loop invariant, strength reduction of induction
variables
+ and loop reversing), constant folding and propagation, copy propagation,
dead
+ code elimination and jump tables for 'switch' statements.
+* MCU specific optimizations, including a global register allocator.
+* adaptable MCU specific backend that should be well suited for other 8 bit
MCUs
+* independent rule based peep hole optimizer.
+* a full range of data types: char (8 bits, 1 byte), short (16 bits, 2
bytes),
+ int (16 bits, 2 bytes), long (32 bit, 4 bytes), float (4 byte IEEE) and
+ _Bool/bool;
+* basic (no integer constants) support for long long (64 bit, 8 bytes) data
+ types for the z80, z180, r2k, r3ka, gbz80, hc08 and s08 targets.
+* the ability to add inline assembler code anywhere in a function.
+* the ability to report on the complexity of a function to help decide what
+ should be re-written in assembler.
+* a good selection of automated regression tests.
+EOF
diff --git a/devel/sdcc/HISTORY b/devel/sdcc/HISTORY
new file mode 100644
index 0000000..7c76ad4
--- /dev/null
+++ b/devel/sdcc/HISTORY
@@ -0,0 +1,2 @@
+2014-08-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/devel/splint/0001-fix-dependencies-in-Makefile.in.patch
b/devel/splint/0001-fix-dependencies-in-Makefile.in.patch
new file mode 100644
index 0000000..209e871
--- /dev/null
+++ b/devel/splint/0001-fix-dependencies-in-Makefile.in.patch
@@ -0,0 +1,25 @@
+From c79298d8813e010cfce30b31c66008c1a7c99392 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 24 May 2014 19:24:23 +0200
+Subject: [PATCH] fix dependencies in Makefile.in
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7615e79..ed52d12 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -480,7 +480,7 @@ am__objects_18 = constraintList.$(OBJEXT)
constraintResolve.$(OBJEXT) \
+ constraint.$(OBJEXT) loopHeuristics.$(OBJEXT)
+ am__objects_19 =
+ am__objects_20 = $(am__objects_19)
+-am__objects_21 = $(am__objects_7) $(am__objects_16) $(am__objects_17) \
++am__objects_21 = $(am_objects_12) $(am__objects_7) $(am__objects_16)
$(am__objects_17) \
+ $(am__objects_18) $(am__objects_20) $(am__objects_19)
+ am_splint_OBJECTS = $(am__objects_21)
+ splint_OBJECTS = $(am_splint_OBJECTS)
+--
+1.9.3
+
diff --git a/devel/splint/DEPENDS b/devel/splint/DEPENDS
new file mode 100755
index 0000000..5584a0a
--- /dev/null
+++ b/devel/splint/DEPENDS
@@ -0,0 +1 @@
+depends autoconf
diff --git a/devel/splint/HISTORY b/devel/splint/HISTORY
index 44d48b7..63ad1b2 100644
--- a/devel/splint/HISTORY
+++ b/devel/splint/HISTORY
@@ -1,3 +1,7 @@
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-dependencies-in-Makefile.in.patch, DEPENDS:
+ fix dependency in Makefile.in
+
2008-05-20 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 3.1.2, corrected WEB_SITE.
* BUILD: Replaced ./configure && make with default_build,
diff --git a/devel/splint/PRE_BUILD b/devel/splint/PRE_BUILD
new file mode 100755
index 0000000..dfc431e
--- /dev/null
+++ b/devel/splint/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-dependencies-in-Makefile.in.patch &&
+autoconf
diff --git a/devel/swig/DEPENDS b/devel/swig/DEPENDS
index 948e015..a979679 100755
--- a/devel/swig/DEPENDS
+++ b/devel/swig/DEPENDS
@@ -1,54 +1,14 @@
-depends -sub CXX gcc &&
-
-optional_depends tcl \
- "--with-tcl" \
- "--without-tcl" \
- "to include Tcl/Tk support" &&
-
-optional_depends lua51 \
- "--with-lua" \
- "--without-lua" \
- "include lua51 support" &&
-
-optional_depends ocaml \
- "--with-ocaml" \
- "--without-ocaml" \
- "include Ocaml support" &&
-
-optional_depends python \
- "--with-python=$INSTALL_ROOT/usr/bin/python" \
- "--without-python" \
- "to include Python 2 support" &&
-
-optional_depends python3 \
- "--with-python3=$INSTALL_ROOT/usr/bin/python3" \
- "--without-python3" \
- "to include Python 3 support" &&
-
-optional_depends perl \
- "--with-perl=$INSTALL_ROOT/usr/bin/perl" \
- "--without-perl" \
- "to include Perl 5 support" &&
-
-optional_depends php \
- "--with-php4=$INSTALL_ROOT/usr/bin/php" \
- "--without-php4" \
- "to include PHP 4 support (NOTE: problematic now)" &&
-
-optional_depends RUBY \
- "--with-ruby=$INSTALL_ROOT/usr/bin/ruby" \
- "--without-ruby" \
- "to include Ruby support" &&
-
-optional_depends JAVA \
- '--with-java' \
- '--without-java' \
- 'to include Java support' \
- 'z-rejected' &&
-
-optional_depends guile \
- "--with-guile=$INSTALL_ROOT/usr/bin/guile" \
- "--without-guile" \
- "to include Guile support" &&
-
-optional_depends pcre "" "--without-pcre" "for regular expression support"
+depends -sub CXX gcc &&
+depends zlib &&
+
+optional_depends guile "--with-guile" "--without-guile" "Guile
support" &&
+optional_depends JAVA '--with-java' '--without-java' 'Java
support' 'z-rejected' &&
+optional_depends LUA "--with-lua" "--without-lua" "LUA support"
&&
+optional_depends ocaml "--with-ocaml" "--without-ocaml" "Ocaml
support" &&
+optional_depends pcre "--with-pcre" "--without-pcre" "regular
expression support" &&
+optional_depends perl "--with-perl5" "--without-perl5" "Perl 5
support" &&
+optional_depends php "--with-php" "--without-php" "PHP support"
&&
+optional_depends python "--with-python" "--without-python" "Python 2
support" &&
+optional_depends python3 "--with-python3" "--without-python3" "Python 3
support" &&
+optional_depends RUBY "--with-ruby" "--without-ruby" "Ruby
support" &&
+optional_depends tcl "--with-tcl" "--without-tcl" "Tcl/Tk
support"
diff --git a/devel/swig/DETAILS b/devel/swig/DETAILS
index a02d91b..739ecba 100755
--- a/devel/swig/DETAILS
+++ b/devel/swig/DETAILS
@@ -1,6 +1,6 @@
SPELL=swig
- VERSION=2.0.11
-
SOURCE_HASH=sha512:6ebe40acebd779dc7d647595d4bd5db700615d333b53024fd8e36c7541a2c32677a77655bac475a5cb3add9742cef6d9c7e8e12d8c1105f7e76a3d10e2fea95e
+ VERSION=3.0.2
+
SOURCE_HASH=sha512:9aa027d53b2cc1534458abbf2137e59c4aac747e1406dcd45fedab91d4899872fab2aae3d7297fa38bf5093a21f19eaa543f0e0dee2c54497efcdd7e31ee7ccf
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY
index b64dea3..90169cc 100644
--- a/devel/swig/HISTORY
+++ b/devel/swig/HISTORY
@@ -1,3 +1,8 @@
+2014-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.2
+ * DEPENDS, *SUB_DEPENDS*: simplify some flags
+ php4 is nolonger supported
+
2013-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.11

diff --git a/devel/swig/SUB_DEPENDS b/devel/swig/SUB_DEPENDS
index c863258..5f9c37c 100755
--- a/devel/swig/SUB_DEPENDS
+++ b/devel/swig/SUB_DEPENDS
@@ -1,12 +1,12 @@
case "$THIS_SUB_DEPENDS" in
- PYTHON) depends python "--with-python=$INSTALL_ROOT/usr/bin/python" ;;
- PYTHON3) depends python3 "--with-python3=$INSTALL_ROOT/usr/bin/python3"
;;
- GUILE) depends guile "--with-guile=$INSTALL_ROOT/usr/bin/guile" ;;
- JAVA) depends JAVA "--with-java" ;;
- PERL) depends perl "--with-perl=$INSTALL_ROOT/usr/bin/perl" ;;
- RUBY) depends ruby "--with-ruby=$INSTALL_ROOT/usr/bin/ruby" ;;
- PHP) depends php "--with-php4=$INSTALL_ROOT/usr/bin/php" ;;
- TCL) depends tcl "--with-tcl" ;;
+ PYTHON) depends python "--with-python " ;;
+ PYTHON3) depends python3 "--with-python3" ;;
+ GUILE) depends guile "--with-guile" ;;
+ JAVA) depends JAVA "--with-java" ;;
+ PERL) depends perl "--with-perl5" ;;
+ RUBY) depends ruby "--with-ruby" ;;
+ PHP) depends php "--with-php" ;;
+ TCL) depends tcl "--with-tcl" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
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/tig/DETAILS b/devel/tig/DETAILS
index fce0bce..e854d0c 100755
--- a/devel/tig/DETAILS
+++ b/devel/tig/DETAILS
@@ -1,8 +1,8 @@
SPELL=tig
- VERSION=1.2
+ VERSION=2.0.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://jonas.nitro.dk/${SPELL}/releases/${SOURCE}
-
SOURCE_HASH=sha512:4c769c2aca5d8957f322beb41f340a439315587194106e8f18cba75cbe3b61f8beda8d5de85699bbd93306ec8caceeb342bb1861556d50f46a955710e81f920f
+
SOURCE_HASH=sha512:0d16c4ec68d7b846b8cb990756ff683584eaf7eea89f9853d3803c86ef7544e2b80e1376a0e441082d7d23a2496fb7bcf8b5d987fe026b3d85e777064351fa15
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://jonas.nitro.dk/tig/";
LICENSE[0]=GPL
diff --git a/devel/tig/HISTORY b/devel/tig/HISTORY
index f2386eb..33ccd0d 100644
--- a/devel/tig/HISTORY
+++ b/devel/tig/HISTORY
@@ -1,3 +1,9 @@
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.3
+
+2014-05-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.1
+
2013-08-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2

diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 6370805..c1911a5 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,10 +1,10 @@
SPELL=vala
if [[ "$VALA_DEVEL" == "y" ]]; then
- VERSION=0.20.1
-
SOURCE_HASH=sha512:6246228815bcc042de0aeea3f4593c95b0d81fdfec8a4336a8e9178dd8a4a7013694a2cec543c3c49aad026d5d3597e194884b6cfecb10040db886afba9e72e1
+ VERSION=0.24.0
+
SOURCE_HASH=sha512:a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479
else
- VERSION=0.20.1
-
SOURCE_HASH=sha512:6246228815bcc042de0aeea3f4593c95b0d81fdfec8a4336a8e9178dd8a4a7013694a2cec543c3c49aad026d5d3597e194884b6cfecb10040db886afba9e72e1
+ VERSION=0.24.0
+
SOURCE_HASH=sha512:a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 28ef6a6..3bf70dc 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2014-07-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 0.24.0
+
2013-05-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.20.1

diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index ff78eb4..d7c4349 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=valgrind
if [[ $VALGRIND_BRANCH == scm ]]
then
- if [[ $VALGRIND_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_URL[0]=svn://svn.valgrind.org/valgrind/trunk:$SPELL-svn
FORCE_DOWNLOAD=on
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 2e0c13f..0e68c30 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2014-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.9.0
* BUILD: use empty CFLAGS to prevent segfault
diff --git a/devel/xdg-utils/DETAILS b/devel/xdg-utils/DETAILS
index 8ce1fd7..eeeb1d3 100755
--- a/devel/xdg-utils/DETAILS
+++ b/devel/xdg-utils/DETAILS
@@ -1,7 +1,7 @@
SPELL=xdg-utils
- VERSION=1.0.2
-
SOURCE_HASH=sha512:5de3143205e573a3fb93f2641407e5006134400dfc3e034b7ea80784b81aae43c1da747fbd92ffd0965e15401e6ff95b87ee6ae4422c0cf08d7fc92762c307b0
- SOURCE=$SPELL-$VERSION.tgz
+ VERSION=1.1.0-rc1
+
SOURCE_HASH=sha512:230a3e843eac9a2727dcee81979517258f8b0dddd8e350a6e3a131b9d0db1ea88e66b5c0f495f36a71c778085560a61cf67babab1b8afa3518fa199571a1e3d3
+ SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://portland.freedesktop.org/download/$SOURCE
diff --git a/devel/xdg-utils/HISTORY b/devel/xdg-utils/HISTORY
index edfb8e1..b59dc41 100644
--- a/devel/xdg-utils/HISTORY
+++ b/devel/xdg-utils/HISTORY
@@ -1,3 +1,6 @@
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0-rc1
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Runtime depends on xprop

diff --git a/devel/xmlto/DETAILS b/devel/xmlto/DETAILS
index 1c88fc3..70f40a6 100755
--- a/devel/xmlto/DETAILS
+++ b/devel/xmlto/DETAILS
@@ -1,5 +1,7 @@
SPELL=xmlto
- VERSION=0.0.25
+ VERSION=0.0.26
+
SOURCE_HASH=sha512:85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
+# SOURCE_GPG=xmlto.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -9,8 +11,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_HINTS[0]="no-check-certificate"
WEB_SITE=https://fedorahosted.org/xmlto/
ENTERED=20030619
-
SOURCE_HASH=sha512:53d99619f4c067dc72c0ccf32c85a4efa21d25666c4ed984c63a99ec2291c0264ea05ad79faa801feaddc599c7bcdb2fb851f0384a0989b527fb97ed4980ed48
-# SOURCE_GPG=xmlto.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/devel/xmlto/HISTORY b/devel/xmlto/HISTORY
index 5b7290d..e303870 100644
--- a/devel/xmlto/HISTORY
+++ b/devel/xmlto/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 0.0.26
+
2012-02-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.0.25

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/attr/BUILD b/disk/attr/BUILD
index 8c24689..e774754 100755
--- a/disk/attr/BUILD
+++ b/disk/attr/BUILD
@@ -2,5 +2,5 @@ OPTS="$ATTR_LIB64 $OPTS" &&
OPTS="--libdir=${INSTALL_ROOT}/lib $OPTS" &&
OPTS="--bindir=${INSTALL_ROOT}/bin $OPTS" &&
make_single &&
-default_build &&
+INSTALL_USER=root INSTALL_GROUP=root default_build &&
make_normal
diff --git a/disk/attr/HISTORY b/disk/attr/HISTORY
index 7f66723..84fbe74 100644
--- a/disk/attr/HISTORY
+++ b/disk/attr/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, INSTALL: fix library permissions
+
2013-06-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.47
* attr.gpg: add 0542DF34 Brandon Philips <brandon AT ifup.co>
diff --git a/disk/attr/INSTALL b/disk/attr/INSTALL
index 6c05693..8b5b1b4 100755
--- a/disk/attr/INSTALL
+++ b/disk/attr/INSTALL
@@ -1,3 +1,4 @@
make_single &&
make install install-lib install-dev &&
-make_normal
+make_normal &&
+chmod 0755 ${INSTALL_ROOT}/lib/libattr.so.*.*.*
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/brasero/DETAILS b/disk/brasero/DETAILS
index 82f830b..685fbe4 100755
--- a/disk/brasero/DETAILS
+++ b/disk/brasero/DETAILS
@@ -1,11 +1,11 @@
SPELL=brasero
- VERSION=3.4.0
- BRANCH=${VERSION:0:3}
+ VERSION=3.11.3
+ BRANCH=${VERSION%.*}
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+
SOURCE_HASH=sha512:ac4e5948c27b0925a0ac9ae1a39afbadd7075cb221ea748750b0c1400489a2dac82fc96f317ab82c1243b29346f4ec889f2b0819e7c2459d79bb771dd9129813
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- WEB_SITE=http://www.gnome.org/projects/brasero/
+ WEB_SITE=https://wiki.gnome.org/Apps/Brasero
ENTERED=20060823
LICENSE[0]=GPL
KEYWORDS="burning dvd disk"
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index fcd102b..19775d1 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,8 @@
+2014-07-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed WEB_SITE
+ updated spell to 3.11.3
+
2012-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0

diff --git a/disk/brasero/brasero-3.4.0.tar.xz.sig
b/disk/brasero/brasero-3.4.0.tar.xz.sig
deleted file mode 100644
index 54ad453..0000000
Binary files a/disk/brasero/brasero-3.4.0.tar.xz.sig and /dev/null differ
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 1e66912..4d15fdb 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,22 +1,16 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=btrfs-progs
+
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
if [ "$BTRFS_PROGS_BRANCH" = scm ]; then
- if [ "$BTRFS_PROGS_AUTOUPDATE" = y ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
+else
+ VERSION=3.14.2
+ SOURCE_URL[0]="$SOURCE_URL[0]::v$VERSION"
+fi
SOURCE=$SPELL-scm.tar.bz2
-
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
-else
- VERSION=0.19
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/$SOURCE
-
SOURCE_HASH=sha512:f0978432b524f307302d80e3a904684c21b6549f0b444f51a17f1d6f0a3dfebfc39ef185c3431a007fb354218aa7027e665ca6a3c58267bb8d0905ae34dc7b80
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-fi
WEB_SITE=http://btrfs.wiki.kernel.org/
ENTERED=20090205
LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index f3897fd..2c8fd3e 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,16 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, INSTALL: Fix installation paths
+
+2014-06-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fetch releases from git too
+ * DETAILS: Updated spell to 3.14.2
+
+2014-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Upstream fixed manpage's Makefile
+
2012-05-26 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Fixed compilation
* DEPENDS: Added dependency on acl and e2fsprogs
diff --git a/disk/btrfs-progs/INSTALL b/disk/btrfs-progs/INSTALL
new file mode 100755
index 0000000..baa07f4
--- /dev/null
+++ b/disk/btrfs-progs/INSTALL
@@ -0,0 +1 @@
+make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/bin install
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
deleted file mode 100755
index cd3928f..0000000
--- a/disk/btrfs-progs/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "s:/local::" Makefile &&
-sedit "s:/local::" man/Makefile &&
-sedit 's:mandir = $(prefix)/man:mandir = $(prefix)/share/man:' man/Makefile
diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index d50e664..b5178be 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=cdrdao
if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
- if [[ "$CDRDAO_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=sfcvs
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=1
SOURCE=$SPELL-sfcvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-sfcvs
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 0295cd1..72e90af 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-09-09 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: moved all in build here.
added aclocal and automake --add-missing to build with new automake
diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index 2bf63b8..27ee7c3 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,10 +1,10 @@
SPELL=cdrtools
- VERSION=3.01a14
+ VERSION=3.01a24
ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
- SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE}
-
SOURCE_HASH=sha512:6b345346696c58b19beda33db10fb0b409ded85877091f642cb8567e37f19e576c7ab92a8e2e2e7318bd272268d6615816a1fddd2728bfb2c202368c9e5e5a4e
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/${ALPHA:+alpha/}${SOURCE}
+
SOURCE_HASH=sha512:81a94cddac63ce1d160928b292cfe03806f47cbc6e6278bc819eb8f2019b7fdb4d2036b30e230e32e4c3f51711d0d2eea68b97e75b6b3bbbb3f1a93e891c28ef
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=http://cdrecord.berlios.de/private/cdrecord.html
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index b82920a..f7c830e 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,10 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 3.01a24, switch URL to Sourceforge
+ * PRE_BUILD: fix man path
+
+2014-05-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.01a23
+
2013-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.01a14

diff --git a/disk/cdrtools/PRE_BUILD b/disk/cdrtools/PRE_BUILD
index 85565c8..7562753 100755
--- a/disk/cdrtools/PRE_BUILD
+++ b/disk/cdrtools/PRE_BUILD
@@ -3,4 +3,4 @@ cd ${SOURCE_DIRECTORY}
&&
sedit "s:/usr/src/linux/include::i" DEFAULTS/Defaults.linux &&
sedit "s:/opt/schily:/usr:gi" DEFAULTS/Defaults.linux &&
sedit "s:/usr/src/linux/include::gi" DEFAULTS/Defaults.linux &&
-sedit "1iMANDIR= share/man" RULES/rules.man
+sedit "1iMANDIR= man" RULES/rules.man
diff --git a/disk/davfs/DETAILS b/disk/davfs/DETAILS
index 3a03ee3..dd44fec 100755
--- a/disk/davfs/DETAILS
+++ b/disk/davfs/DETAILS
@@ -1,11 +1,13 @@
SPELL=davfs
SAV_PROJECT=davfs2
- VERSION=1.4.7
-
SOURCE_HASH=sha512:6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae
+ VERSION=1.5.2
SOURCE=${SAV_PROJECT}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SAV_PROJECT}-${VERSION}
+ SOURCE2=$SOURCE.sig

SOURCE_URL[0]=http://download.savannah.gnu.org/releases/${SAV_PROJECT}/${SOURCE}
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=davfs.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SAV_PROJECT}-${VERSION}"
WEB_SITE=https://savannah.nongnu.org/projects/${SAV_PROJECT}
LICENSE[0]=GPL
ENTERED=20021202
diff --git a/disk/davfs/HISTORY b/disk/davfs/HISTORY
index 01e0948..cb0a682 100644
--- a/disk/davfs/HISTORY
+++ b/disk/davfs/HISTORY
@@ -1,3 +1,12 @@
+2014-08-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.2; converted to upstream signature
+ checking; quoted paths
+ * davfs.gpg: added gpg keyring - 99D2A26E public key (Werner Baumann
+ (wbaumann) <werner.baumann AT onlinehome.de>)
+
+2014-04-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.0
+
2012-07-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.7

diff --git a/disk/davfs/davfs.gpg b/disk/davfs/davfs.gpg
new file mode 100644
index 0000000..616bfaf
Binary files /dev/null and b/disk/davfs/davfs.gpg differ
diff --git a/disk/ddrescue/DEPENDS b/disk/ddrescue/DEPENDS
index f148724..867f861 100755
--- a/disk/ddrescue/DEPENDS
+++ b/disk/ddrescue/DEPENDS
@@ -1 +1,2 @@
depends -sub CXX gcc
+depends lzip
diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index 44f1e4a..3d8c030 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -1,7 +1,7 @@
SPELL=ddrescue
- VERSION=1.16
-
SOURCE_HASH=sha512:c775ac34701b63ab7efd0a56cecf5c8b198874239e48383142db0ccb83c193c7101335374dc89efaa815b466258181f458a3589ea4abb230804b553fb42b345d
- SOURCE="$SPELL-$VERSION.tar.gz"
+ VERSION=1.18.1
+
SOURCE_HASH=sha512:66493da18f0c0cab5ad692ede2debad2376aeec53b23f96c5063d21da362f724370e785bfe38f5495bc57971d5ed428c6da8155b4eafd7d07a94e5a4d0955c96
+ SOURCE="$SPELL-$VERSION.tar.lz"
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index b3fab8c..606e866 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,8 @@
+2014-06-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.18.1
+ * DEPENDS: added, for lzip
+ * PRE_BUILD: added
+
2012-06-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.16

diff --git a/disk/ddrescue/PRE_BUILD b/disk/ddrescue/PRE_BUILD
new file mode 100755
index 0000000..6416225
--- /dev/null
+++ b/disk/ddrescue/PRE_BUILD
@@ -0,0 +1,3 @@
+verify_file &&
+mk_source_dir $SOURCE_DIRECTORY &&
+lzip -cd $SOURCE_CACHE/$SOURCE |tar -x
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/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index 227b8ec..3cd348a 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends gnupg &&
depends INITSCRIPTS &&
depends smgl-fhs &&
diff --git a/disk/eudev/BUILD b/disk/eudev/BUILD
index 99548e1..1267b3f 100755
--- a/disk/eudev/BUILD
+++ b/disk/eudev/BUILD
@@ -1,6 +1,7 @@
cd $SOURCE_DIRECTORY &&

-./configure prefix=$INSTALL_ROOT \
+./configure \
+ --prefix=$INSTALL_ROOT \
--with-rootprefix=$INSTALL_ROOT \
--with-rootlibdir=$INSTALL_ROOT/lib \
--datarootdir=$INSTALL_ROOT/usr/share \
diff --git a/disk/eudev/DETAILS b/disk/eudev/DETAILS
index c99197b..46d66f5 100755
--- a/disk/eudev/DETAILS
+++ b/disk/eudev/DETAILS
@@ -1,6 +1,6 @@
SPELL=eudev
- VERSION=1.5.3
-
SOURCE_HASH=sha512:c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb
+ VERSION=1.10
+
SOURCE_HASH=sha512:76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//v}"
URL=http://dev.gentoo.org/~blueness/eudev
diff --git a/disk/eudev/HISTORY b/disk/eudev/HISTORY
index def9c68..736317c 100644
--- a/disk/eudev/HISTORY
+++ b/disk/eudev/HISTORY
@@ -1,3 +1,23 @@
+22014-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.10
+
+22014-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8
+ * PRE_BUILD: create 'input' group
+
+2014-06-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7
+
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, INSTALL: replace the udev.conf that comes with eudev
+ with ours in PRE_BUILD so /dev/shm gets created
+
+2014-05-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix typo
+
+2014-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6
+
2014-03-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.3
change url
diff --git a/disk/eudev/INSTALL b/disk/eudev/INSTALL
index 7c0bcbf..2f2bde4 100755
--- a/disk/eudev/INSTALL
+++ b/disk/eudev/INSTALL
@@ -19,9 +19,6 @@ install_config_file "$SPELL_DIRECTORY/modprobe.aliases" \
#install_config_file "$SPELL_DIRECTORY/udev.missing" \
# "$UDEV_CFG/udev.missing" &&

-# These are used by devices init script, udev.conf also by udev
-install_config_file "$SPELL_DIRECTORY/udev.conf" \
- "$UDEV_CFG/udev.conf" &&
default_install &&

# some programs still link to old udev
diff --git a/disk/eudev/PRE_BUILD b/disk/eudev/PRE_BUILD
index 797047b..5e1b2ac 100755
--- a/disk/eudev/PRE_BUILD
+++ b/disk/eudev/PRE_BUILD
@@ -1,3 +1,5 @@
+create_group input &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+cp ${SPELL_DIRECTORY}/udev.conf ${SOURCE_DIRECTORY}/src/udev/ &&
autoreconf -f -i --symlink
diff --git a/disk/fuse-google-drive/DETAILS b/disk/fuse-google-drive/DETAILS
index a0566fd..78dbed3 100755
--- a/disk/fuse-google-drive/DETAILS
+++ b/disk/fuse-google-drive/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fuse-google-drive
- if [ "$FUSE_GOOGLE_DRIVE_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-scm.tar.bz2"
SOURCE_URL[0]=git://github.com/jcline/${SPELL}.git:${SPELL}-scm
FORCE_DOWNLOAD=on
diff --git a/disk/fuse-google-drive/HISTORY b/disk/fuse-google-drive/HISTORY
index 3de4ed4..9a6aaa6 100644
--- a/disk/fuse-google-drive/HISTORY
+++ b/disk/fuse-google-drive/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-05-16 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS, DETAILS, PRE_BUILD, PREPARE: spell created
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 9d70ade..290c21c 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
VERSION=2.9.3
@@ -6,11 +7,7 @@ if [ "$FUSE_BRANCH" != "scm" ]; then
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- if [ "$FUSE_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://fuse.git.sourceforge.net/gitroot/fuse/fuse:fuse-git
FORCE_DOWNLOAD=on
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 80c3753..e5de356 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.3
* DEPENDS: add runtime util-linux
diff --git a/disk/gdisk/DETAILS b/disk/gdisk/DETAILS
index 837e348..f56e453 100755
--- a/disk/gdisk/DETAILS
+++ b/disk/gdisk/DETAILS
@@ -1,7 +1,7 @@
SPELL=gdisk
SPELLX=gptfdisk
- VERSION=0.8.8
-
SOURCE_HASH=sha512:22da28425ff06d2cca0838ff99950295c463d8557b0191efc74d4c9d819871ac635f69c62d07e93460ad07f4eb4c1ab4fd728b82374925f59783a52497a4becb
+ VERSION=0.8.10
+
SOURCE_HASH=sha512:3187bc231c3390a86f5b7b32270d5f0d1e6c7bccd9d1cbf100c29f4822afa73362aa1fbdd3b29f20c42d67ec51bd777b7b58b5791e31182b3860915bc695948f
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index 8c29788..625036d 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,6 @@
+2014-04-28 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 0.8.10
+
2014-02-02 Treeve Jelbert <treeve AT souremage.org>
* DETAILS: version 0.8.8
* DEPENDS: add ncurses, util-linux
diff --git a/disk/gnu-efi/DETAILS b/disk/gnu-efi/DETAILS
index 8864138..d78e438 100755
--- a/disk/gnu-efi/DETAILS
+++ b/disk/gnu-efi/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnu-efi
- VERSION=3.0u
-
SOURCE_HASH=sha512:77224d555befb96b14c20a3a39aacb50ed2db9dfff0c112113c3fb211152106f76cf278b4d37b4251e9f83327c7fd59319e6dee802c97d3bfa7308f7c43b34e3
+ VERSION=3.0v
+
SOURCE_HASH=sha512:0bacae20dafb8ea2e8293d8dac9be395e2d1a05ac2d58aff96593cd99def8a2335c967e0fb2f02c3a1cb1571ad4a8b97671b542a21b519391abfa915af6dd695
PATCHLEVEL=1
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/[a-z]/}
diff --git a/disk/gnu-efi/HISTORY b/disk/gnu-efi/HISTORY
index 92892e8..41dfbb7 100644
--- a/disk/gnu-efi/HISTORY
+++ b/disk/gnu-efi/HISTORY
@@ -1,3 +1,6 @@
+2014-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0v
+
2014-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: clear CFLAGS
diff --git a/disk/gummiboot/DETAILS b/disk/gummiboot/DETAILS
index bb8c2b7..2390495 100755
--- a/disk/gummiboot/DETAILS
+++ b/disk/gummiboot/DETAILS
@@ -1,5 +1,5 @@
SPELL=gummiboot
- VERSION=44
+ VERSION=45
SOURCE_IGNORE=volatile
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/gummiboot/HISTORY b/disk/gummiboot/HISTORY
index 4918aa3..d3e35f8 100644
--- a/disk/gummiboot/HISTORY
+++ b/disk/gummiboot/HISTORY
@@ -1,3 +1,11 @@
+2014-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 45
+ * mkgummi: fix
+
+2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL, smgl-splash.bmp.xz: provide splash screen
+ * INSTALL, mkgummi: provide a configuration script
+
2014-03-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 44
* CONFLICTS: added
diff --git a/disk/gummiboot/INSTALL b/disk/gummiboot/INSTALL
new file mode 100755
index 0000000..e4a7337
--- /dev/null
+++ b/disk/gummiboot/INSTALL
@@ -0,0 +1,10 @@
+default_install &&
+DEST=$INSTALL_ROOT/usr/sbin &&
+mkdir -p $DEST &&
+cp $SPELL_DIRECTORY/mkgummi $DEST &&
+DEST=$INSTALL_ROOT/boot &&
+SPLASH=smgl-splash.bmp &&
+mkdir -p $DEST &&
+xzcat $SPELL_DIRECTORY/$SPLASH.xz > $DEST/$SPLASH &&
+message "A SMGL splash screen is available in /boot"
+message "use mkgummi to update the gummiboot configuration"
diff --git a/disk/gummiboot/mkgummi b/disk/gummiboot/mkgummi
new file mode 100755
index 0000000..d32201e
--- /dev/null
+++ b/disk/gummiboot/mkgummi
@@ -0,0 +1,33 @@
+#!/bin/bash
+root_dev()
+{
+ ROOT_DEV=$( mount | grep ' / ' | awk ' $1 ~ /\/dev\/*/ {print $1}')
+ ROOT_PART=$(blkid |grep ${ROOT_DEV}: |cut -d\ -f6)
+}
+# find the root partition
+root_dev
+echo root = $ROOT_DEV
+echo root partition = $ROOT_PART
+
+modprobe efivarfs &&
+mount -t efivarfs efivarfs /sys/firmware/efi/efivars &&
+gummiboot install &&
+cd /boot &&
+DEST=/boot/loader/entries &&
+
+# delete existing smgl confif files
+mkdir -p $DEST &&
+rm -f $DEST/smgl* &&
+
+# create the smgl config files for gummiboot
+for VX in `ls vmlinuz-* | cut -d- -f2`;do
+ echo creating efi config for $VX &&
+ cat > $DEST/smgl-$VX.conf << EOF
+title SourceMage GNU/Linux
+version $VX
+linux /vmlinuz-$VX
+#options ro root=/dev/$ROOT_DEV
+options ro root=$ROOT_PART
+EOF
+done &&
+umount /sys/firmware/efi/efivars
diff --git a/disk/gummiboot/smgl-splash.bmp.xz
b/disk/gummiboot/smgl-splash.bmp.xz
new file mode 100644
index 0000000..937f0a1
Binary files /dev/null and b/disk/gummiboot/smgl-splash.bmp.xz differ
diff --git a/disk/isomaster/DETAILS b/disk/isomaster/DETAILS
index fc236e9..5fe2ae7 100755
--- a/disk/isomaster/DETAILS
+++ b/disk/isomaster/DETAILS
@@ -1,8 +1,8 @@
SPELL=isomaster
- VERSION=1.3.9
+ VERSION=1.3.11
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://littlesvr.ca/$SPELL/releases/$SOURCE
-
SOURCE_HASH=sha512:746f8e67fc5ebf39caaf1900c55752c07761cf919f49b49fdbf449b0c1309445c01b38d57cd5b741c057dd8d020d941863d2b29c1d5a725078cf8448d3ff8a4b
+
SOURCE_HASH=sha512:98c654c9320410765f5d7656396b3d87c34505410638c01e3ae65b89a20eb19d6554a70c3deca79e39524459e3cce618be3e42fdce8b5de1d88fa72fa6e122d9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://littlesvr.ca/isomaster/
LICENSE[0]=GPL
diff --git a/disk/isomaster/HISTORY b/disk/isomaster/HISTORY
index 4cf0138..7cbc86d 100644
--- a/disk/isomaster/HISTORY
+++ b/disk/isomaster/HISTORY
@@ -1,3 +1,6 @@
+2014-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.11
+
2012-07-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.9

diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index a96730b..d156552 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libburn
if [[ $LIBBURN_BRANCH == scm ]]; then
- if [[ $LIBBURN_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_HINTS=old_svn_compat
@@ -12,7 +9,7 @@ if [[ $LIBBURN_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.3.6
+ VERSION=1.3.8
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 243b94c..e2b4ea2 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.8
+
2014-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.6

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/libisoburn/DETAILS b/disk/libisoburn/DETAILS
index d214651..85da7b5 100755
--- a/disk/libisoburn/DETAILS
+++ b/disk/libisoburn/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libisoburn
if [[ $LIBISOBURN_BRANCH == scm ]]; then
- if [[ $LIBISOBURN_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_HINTS=old_svn_compat
@@ -12,7 +9,7 @@ if [[ $LIBISOBURN_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.3.6.pl01
+ VERSION=1.3.8
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libisoburn/HISTORY b/disk/libisoburn/HISTORY
index 88219af..6d18f41 100644
--- a/disk/libisoburn/HISTORY
+++ b/disk/libisoburn/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.8
+
2014-03-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.6.pl01

diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
index bddfc23..fe619c1 100755
--- a/disk/libisofs/DETAILS
+++ b/disk/libisofs/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libisofs
if [[ $LIBISOFS_BRANCH == scm ]]; then
- if [[ $LIBISOFS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_HINTS=old_svn_compat
@@ -12,7 +9,7 @@ if [[ $LIBISOFS_BRANCH == scm ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=1.3.6
+ VERSION=1.3.8
SOURCE2_IGNORE=signature
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index 9f536ca..615176c 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.8
+
2014-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.6

diff --git a/disk/lilo/CONFIGURE b/disk/lilo/CONFIGURE
index cd4cb2e..35e828e 100755
--- a/disk/lilo/CONFIGURE
+++ b/disk/lilo/CONFIGURE
@@ -1 +1,3 @@
-config_query RUN_LILO "Run LILO automatically upon LILO upgrades?" n
+config_query RUN_LILO "Run LILO automatically upon LILO upgrades?" n &&
+
+config_query LILO_XVD "Apply patch to get lilo to recognize Xen XVD disks?" n
diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY
index 85e7196..a4f9512 100644
--- a/disk/lilo/HISTORY
+++ b/disk/lilo/HISTORY
@@ -1,3 +1,9 @@
+2014-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added option to apply XVD patch
+ * PRE_BUILD: apply patch
+ * xvd.patch: added, patch by Lloyd Richardson <lloyd AT drlabs.org> and
+ Bostjan Skufca <bostjan AT a2o.si> for Xen XVD disks recognition
+
2013-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 24.0
* PRE_BUILD, 0001-fix-failure-during-install.patch: fix failure
during install
diff --git a/disk/lilo/PRE_BUILD b/disk/lilo/PRE_BUILD
index 1787098..1be3d3e 100755
--- a/disk/lilo/PRE_BUILD
+++ b/disk/lilo/PRE_BUILD
@@ -1,3 +1,7 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-failure-during-install.patch
+patch -p1 < $SPELL_DIRECTORY/0001-fix-failure-during-install.patch &&
+
+if [[ $LILO_XVD == y ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/xvd.patch"
+fi
diff --git a/disk/lilo/xvd.patch b/disk/lilo/xvd.patch
new file mode 100644
index 0000000..35e2ce6
--- /dev/null
+++ b/disk/lilo/xvd.patch
@@ -0,0 +1,29 @@
+--- src/geometry.c.orig
++++ src/geometry.c
+@@ -339,7 +339,7 @@ unsigned char max_partno[512] = {
+ 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Cx
*/
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, /* Cx
*/
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+@@ -670,6 +670,7 @@ void geo_query_dev(GEOMETRY *geo,int device,int all)
+ case MAJOR_SD6:
+ case MAJOR_SD7:
+ case MAJOR_SD8:
++ case MAJOR_XVD:
+ MASK15:
+ geo->device = 0x80 + last_dev(MAJOR_HD,64) + (MINOR(device) >> 4);
+ if (!get_all) break;
+--- src/lilo.h.orig
++++ src/lilo.h
+@@ -148,6 +148,7 @@
+ #define MAJOR_EMD 153 /* Enhanced multi-disk RAID sets */
+ #define MAJOR_CARM1 160 /* Carmel SATA Disk on first 8-port controller */
+ #define MAJOR_CARM2 161 /* Carmel SATA Disk on 2nd 8-port controller */
++#define MAJOR_XVD 202 /* xen xvd disks */
+
+ /* don't use the following */
+ #define MAJOR_MDP 254 /* Enhanced multi-disk RAID sets [experimental?]
*/
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 24d5f19..796574c 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=lvm
- VERSION=2.02.100
+ VERSION=2.02.109
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index a36332b..d68974e 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: 2.02.109
+ * lvm-static-hotfix.patch, PRE_BUILD: dirty hack to link missing libs
+ to static build (was needed on a fresh install, not sure why broken
now)
+
2013-08-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.100

diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
new file mode 100755
index 0000000..92c0ce3
--- /dev/null
+++ b/disk/lvm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/lvm-static-hotfix.patch"
diff --git a/disk/lvm/lvm-static-hotfix.patch
b/disk/lvm/lvm-static-hotfix.patch
new file mode 100644
index 0000000..e586dbb
--- /dev/null
+++ b/disk/lvm/lvm-static-hotfix.patch
@@ -0,0 +1,21 @@
+diff -ru LVM2.2.02.109.orig/tools/Makefile.in LVM2.2.02.109/tools/Makefile.in
+--- LVM2.2.02.109.orig/tools/Makefile.in 2014-08-05 03:10:57.000000000
+0200
++++ LVM2.2.02.109/tools/Makefile.in 2014-08-08 08:45:14.849098142 +0200
+@@ -128,7 +128,7 @@
+
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
+- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
++ -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) -lpthread
+
+ all: device-mapper
+
+@@ -144,7 +144,7 @@
+
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a
$(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-luuid -lpthread
+
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
+ cat $(top_builddir)/lib/liblvm-internal.a > $@
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/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index d9503f7..a8bd414 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,7 +1,7 @@
SPELL=ntfs-3g
SPELLX=ntfs-3g_ntfsprogs
- VERSION=2013.1.13
-
SOURCE_HASH=sha512:34cc930320a9a54df406d0fdd71154503bac1181b5642382fcb38fa8c51235fa252c74a5c1ab06019972a236bbd717b47d2acbc7581a747657e4f7a8f216d8bc
+ VERSION=2014.2.15
+
SOURCE_HASH=sha512:7e4a5c9ac9d43dcf0d4b4085dea6703126fc4808cb9e1b7038884b20df2a8ab8f54c269d7204a279b62c5ba1127a966fd64226a8ed8f0c11667d9326c2f8fa7c
SOURCE=$SPELLX-$VERSION.tgz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.tuxera.com
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index d3f1686..90790c8 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2014.02.15
+
2013-01-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2013.1.13

diff --git a/disk/partclone/BUILD b/disk/partclone/BUILD
new file mode 100755
index 0000000..80489b8
--- /dev/null
+++ b/disk/partclone/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --enable-fat" &&
+default_build
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index a8a58c3..fecc6c9 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.70
-
SOURCE_HASH=sha512:7aa6c6618e36b2114d9ddee1d7fe957faea713315871ae357a174a8214d6b36c3a75ad8f03419d9893e2c53a4dd32925af12870c407a84310321a6c434cf4b69
+ 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 060c3c1..ca33cf5 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: added, for fat support
+
2014-01-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.70

diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index 5956188..dcf763d 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=partimage-ng
-if [[ "${PARTIMAGE_NG_AUTOUPDATE}" == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=trunk
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-trunk.tar.bz2

SOURCE_URL[0]=bzr_http://bazaar.launchpad.net/~vonami/partimage-ng/trunk:$SPELL-trunk
SOURCE_IGNORE=volatile
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 44e8cfe..8b8c859 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

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/squashfs-tools3/BUILD b/disk/squashfs-tools3/BUILD
new file mode 100755
index 0000000..1814cd2
--- /dev/null
+++ b/disk/squashfs-tools3/BUILD
@@ -0,0 +1,2 @@
+cd squashfs-tools &&
+make
diff --git a/disk/squashfs-tools3/DETAILS b/disk/squashfs-tools3/DETAILS
new file mode 100755
index 0000000..7c8c6f7
--- /dev/null
+++ b/disk/squashfs-tools3/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=squashfs-tools3
+ VERSION=3.4
+ SOURCE=squashfs${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/squashfs${VERSION}
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/squashfs/${SOURCE}
+
SOURCE_HASH=sha512:5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe
+ WEB_SITE=http://squashfs.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20050104
+ KEYWORDS="filesystem disk"
+ SHORT="Compressed read-only filesystem for Linux"
+cat << EOF
+Data, inodes and directories are compressed.
+
+Squashfs stores full uid/gids (32 bits), and file creation time.
+
+Files up to 2^32 bytes are supported. Filesystems can be up to 2^32 bytes.
+
+Inode and directory data are highly compacted, and packed on byte
+boundaries. Each compressed inode is on average 8 bytes in length (the exact
+length varies on file type, i.e. regular file, directory, symbolic link, and
+block/char device inodes have different sizes).
+
+Squashfs can use block sizes up to 64K (the default size is 64K). Using 64K
+blocks achieves greater compression ratios than the normal 4K block size.
+File duplicates are detected and removed.
+EOF
diff --git a/disk/squashfs-tools3/HISTORY b/disk/squashfs-tools3/HISTORY
new file mode 100644
index 0000000..9e6416b
--- /dev/null
+++ b/disk/squashfs-tools3/HISTORY
@@ -0,0 +1,33 @@
+2014-09-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.4
+ * PRE_BUILD, INSTALL: Add version suffix to installed binaries
+
+2008-02-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 3.3
+
+2006-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1-r2, removed UPDATED
+
+2006-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0
+ * INSTALL: added unsquashfs
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-12-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2-r2
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-07-07 Flavien Bridault <disk AT sourcemage.org>
+ * DETAILS: updated to 2.2
+
+2005-04-30 Flavien Bridault <disk AT sourcemage.org>
+ * BUILD, INSTALL: updated according to Benoit squashfs spell
+ (#8661) which takes into account $INSTALL_ROOT
+
+2005-01-04 Wolfgang Scheicher <worf AT sbox.tu-graz.ac.at>
+ * created this spell
+
diff --git a/disk/squashfs-tools3/INSTALL b/disk/squashfs-tools3/INSTALL
new file mode 100755
index 0000000..414770a
--- /dev/null
+++ b/disk/squashfs-tools3/INSTALL
@@ -0,0 +1,3 @@
+# we install both binaries in /usr/sbin (like debian)
+mkdir -p "${INSTALL_ROOT}/usr/sbin" &&
+cp mksquashfs3 unsquashfs3 "${INSTALL_ROOT}/usr/sbin"
diff --git a/disk/squashfs-tools3/PRE_BUILD b/disk/squashfs-tools3/PRE_BUILD
new file mode 100755
index 0000000..db141cc
--- /dev/null
+++ b/disk/squashfs-tools3/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sedit 's/fs\([: ]\|$\)/fs3\1/g' "$SOURCE_DIRECTORY"/squashfs-tools/Makefile
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/disk/xcdroast/DETAILS b/disk/xcdroast/DETAILS
index b2572a7..1fe2ef4 100755
--- a/disk/xcdroast/DETAILS
+++ b/disk/xcdroast/DETAILS
@@ -1,9 +1,9 @@
SPELL=xcdroast
- VERSION=0.98alpha15
+ VERSION=0.98alpha16
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ad9b9d679c5c220c424b04e90113609e5023d730b99fe3ab0007bf05d35dd610edf14da664f37e1def5801e0702a03da2f5b002df0cb9c4f5f5c398c6c8b23a4
+
SOURCE_HASH=sha512:dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
WEB_SITE=http://www.xcdroast.org/
LICENSE[0]=GPL
ENTERED=20020210
diff --git a/disk/xcdroast/HISTORY b/disk/xcdroast/HISTORY
index aea93aa..278f7a9 100644
--- a/disk/xcdroast/HISTORY
+++ b/disk/xcdroast/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 0.98alpha16
+ * PRE_BUILD, io_progressbar_fix.patch, cdd2wav_version.patch: upstream
+ patches
+ * modern_cdrtools.patch: removed
+
2012-01-24 Ismael Luceno <ismael.luceno AT gmail.com>
* DEPENDS: depend on CD-BURN-UTILITY instead of cdrtools.

diff --git a/disk/xcdroast/PRE_BUILD b/disk/xcdroast/PRE_BUILD
index bd15df7..4e56430 100755
--- a/disk/xcdroast/PRE_BUILD
+++ b/disk/xcdroast/PRE_BUILD
@@ -2,5 +2,10 @@ default_pre_build &&
if [ $XCDROAST_GTK2 == "y" ]; then
tar xzf $SCRIPT_DIRECTORY/new_configure.tar.gz -C $SOURCE_DIRECTORY &&
OPTS="$OPTS --enable-gtk2"
-fi &&
-patch -d $SOURCE_DIRECTORY -p1 < $SPELL_DIRECTORY/modern_cdrtools.patch
+fi
+cd "$SOURCE_DIRECTORY" &&
+# Upstream patches. http://www.xcdroast.org/xcdr098/patches/
+echo cdda2wav_version.patch &&
+patch -p1 < "$SCRIPT_DIRECTORY/cdda2wav_version.patch" &&
+echo io_progressbar_fix.patch &&
+patch -p0 < "$SCRIPT_DIRECTORY/io_progressbar_fix.patch"
diff --git a/disk/xcdroast/cdda2wav_version.patch
b/disk/xcdroast/cdda2wav_version.patch
new file mode 100644
index 0000000..cd001e0
--- /dev/null
+++ b/disk/xcdroast/cdda2wav_version.patch
@@ -0,0 +1,54 @@
+diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c
+--- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200
++++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100
+@@ -10062,6 +10062,7 @@
+
+ gint check_version_cdda2wav(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10076,32 +10077,38 @@
+ }
+
+ strcpy(line,"");
++ strcpy(vline,"");
+ for (;;) {
+ if (fgets(line,MAXLINE,fpin) == NULL)
+ break;
+ dodebug(10,"got: %s",line);
++
++ /* only get first line */
++ if (strcmp(vline,"") == 0) {
++ strncpy(vline, line, MAXLINE);
++ }
+ }
+
+ if (pclose(fpin) == -1) {
+ g_error("pclose error\n");
+ }
+
+- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
++ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
+ /* failed to open - permission denied */
+ return 2;
+ }
+
+- /* now line contains the version string of cdda2wav */
++ /* now vline contains the version string of cdda2wav */
+ /* try to extract the version number */
+
+- p = strstr(line,"version");
++ p = strstr(vline,"version");
+ if (p != NULL) {
+ p = strtok(p+8, " _");
+ if (p != NULL) {
+ strcpy(ver,p);
+ }
+ } else {
+- p = strstr(line,"cdda2wav");
++ p = strstr(vline,"cdda2wav");
+ if (p != NULL) {
+ p = strtok(p+9, " ");
+ if (p != NULL) {
diff --git a/disk/xcdroast/io_progressbar_fix.patch
b/disk/xcdroast/io_progressbar_fix.patch
new file mode 100644
index 0000000..5632c1f
--- /dev/null
+++ b/disk/xcdroast/io_progressbar_fix.patch
@@ -0,0 +1,39 @@
+--- src/io.c.last So. Jan 24 19:18:45 2010
++++ src/io.c Fr. Jul 16 10:59:32 2010
+@@ -3202,6 +3202,8 @@
+ close(fd2[1]);
+ }
+
++ g_setenv("LC_ALL", "C", TRUE);
++
+ /* startup child */
+ if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) {
+ g_error("execl error\n");
+@@ -3402,6 +3404,8 @@
+ close(fd3[1]);
+ }
+
++ g_setenv("LC_ALL", "C", TRUE);
++
+ /* startup child */
+ if (execv(callpath,arglist) < 0) {
+ g_error("execv error\n");
+@@ -3506,6 +3510,8 @@
+ close(pipefd[1]);
+ }
+
++ g_setenv("LC_ALL", "C", TRUE);
++
+ /* startup first child */
+ if (execv(callpath,arglist) < 0) {
+ g_error("execv error\n");
+@@ -3568,6 +3574,8 @@
+ close(fd3[1]);
+ }
+
++ g_setenv("LC_ALL", "C", TRUE);
++
+ /* startup second child */
+ if (execv(callpath2,arglist2) < 0) {
+ g_error("execv error\n");
+
diff --git a/disk/xcdroast/modern_cdrtools.patch
b/disk/xcdroast/modern_cdrtools.patch
deleted file mode 100644
index 3aba1e8..0000000
--- a/disk/xcdroast/modern_cdrtools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xcdroast-0.98alpha15/src/io.c 2003-10-26 15:24:48.000000000 +0100
-+++ xcdroast-0.98alpha15-P/src/io.c 2006-09-25 20:07:33.000000000 +0200
-@@ -9026,7 +9026,7 @@
- strcat(tmp2,"-D ");
- }
- if (masterparam.opt[7]) {
-- strcat(tmp2,"-L ");
-+ strcat(tmp2,"-allow-leading-dots ");
- }
- if (masterparam.opt[8]) {
- strcat(tmp2,"-d ");
-@@ -9160,7 +9160,7 @@
- }
- if (masterparam.publisher) {
- strcpy(tmptmp, masterparam.publisher);
-- g_snprintf(tmp5,MAXLINE,"-P \"%s\" ",
-+ g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ",
- convert_escape(tmptmp));
- strcat(tmp4,tmp5);
- }
-
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index 500027d..1acd7e5 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -21,7 +21,7 @@ optional_depends libpng \
'--disable-png' \
'for PNG images' &&

-optional_depends giflib \
+optional_depends GIFLIB \
'--enable-gif' \
'--disable-gif' \
'for GIF images' &&
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index 268d78d..308094c 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-03-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.4.11

diff --git a/display/fbv/DEPENDS b/display/fbv/DEPENDS
index c3a5e9b..36639ce 100755
--- a/display/fbv/DEPENDS
+++ b/display/fbv/DEPENDS
@@ -1,3 +1,3 @@
-depends giflib &&
+depends GIFLIB &&
depends libpng &&
depends JPEG
diff --git a/display/fbv/HISTORY b/display/fbv/HISTORY
index 0877dd8..9ef019a 100644
--- a/display/fbv/HISTORY
+++ b/display/fbv/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

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/docutils/BUILD b/doc/docutils/BUILD
deleted file mode 100755
index 3d7f60b..0000000
--- a/doc/docutils/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-python setup.py build
diff --git a/doc/docutils/DEPENDS b/doc/docutils/DEPENDS
deleted file mode 100755
index 867b4d4..0000000
--- a/doc/docutils/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends python
diff --git a/doc/docutils/DETAILS b/doc/docutils/DETAILS
deleted file mode 100755
index 0a487fe..0000000
--- a/doc/docutils/DETAILS
+++ /dev/null
@@ -1,24 +0,0 @@
- SPELL=docutils
- VERSION=0.11
-
SOURCE_HASH=sha512:8e87581b27ce4fb5e97dcef56047f4bf3a076b98e9e42f5dc66f4c370e5893d1571e46f00fee6f1c8b9f8c8a79e128e4599b9ee213ad1dee2bf16a0246e187df
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://$SPELL.sourceforge.net
- SOURCE_URL[0]=https://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
- LICENSE=GPL
- ENTERED=20040509
- KEYWORDS="doc"
- SHORT="Tools for processing plaintext documentation into useful
formats."
-cat << EOF
-The purpose of the Docutils project is to create a set of tools
-for processing plaintext documentation into useful formats, such as HTML,
-XML, and TeX. Includes reStructuredText, the easy to read, easy to use,
-what-you-see-is-what-you-get plaintext markup language.
-
-Several sources are or will be supported:
- - Standalone files (implemented).
- - Inline documentation from Python modules and packages, extracted
- with namespace context.
- - PEPs (Python Enhancement Proposals) (implemented).
-And others as discovered.
-EOF
diff --git a/doc/docutils/HISTORY b/doc/docutils/HISTORY
deleted file mode 100644
index fd1d133..0000000
--- a/doc/docutils/HISTORY
+++ /dev/null
@@ -1,60 +0,0 @@
-2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 0.11
-
-2013-07-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 0.10
-
-2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.9.1
-
-2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 0.9
-
-2011-10-30 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.1
-
-2010-08-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.7
-
-2009-10-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.6
- * DEPENDS: clean up
-
-2007-03-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.4
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-05-30 Martin Svehla <doc AT sourcemage.org>
- * DETAILS: version updated to 0.3.9
- * INSTALL: using INSTALL_ROOT
-
-2005-01-04 PhoboX <doc AT sourcemage.org>
- * DETAILS: version updated to 0.3.7
-
-2004-12-16 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Python renamed to python
-
-2004-08-09 PhoboX <doc AT sourcemage.org>
- * DETAILS: version updated to 0.3.5
-
-2004-07-17 PhoboX <doc AT sourcemage.org>
- * DETAILS: reformated description
- * DETAILS, BUILD: converted to build api2
- * INSTALL: added
-
-2004-07-06 PhoboX <doc AT sourcemage.org>
- * DETAILS: corrected SOURCE
-
-2004-05-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.3.3-alpha
-
-2004-05-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version snapshot
- * BUILD, DEPENDS: added
- spell created
-
diff --git a/doc/docutils/INSTALL b/doc/docutils/INSTALL
deleted file mode 100755
index 95db496..0000000
--- a/doc/docutils/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-python setup.py install --root=${INSTALL_ROOT}/
diff --git a/doc/docx2txt/DETAILS b/doc/docx2txt/DETAILS
index 4bff984..7f1e4be 100755
--- a/doc/docx2txt/DETAILS
+++ b/doc/docx2txt/DETAILS
@@ -1,6 +1,6 @@
SPELL=docx2txt
- VERSION=1.2
-
SOURCE_HASH=sha512:ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6
+ VERSION=1.4
+
SOURCE_HASH=sha512:5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/docx2txt/HISTORY b/doc/docx2txt/HISTORY
index 67435cd..c5bbb6c 100644
--- a/doc/docx2txt/HISTORY
+++ b/doc/docx2txt/HISTORY
@@ -1,3 +1,9 @@
+2014-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4
+
+2014-04-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3
+
2012-01-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2
* INSTALL: fix BINDIR
diff --git a/doc/dvipng/DEPENDS b/doc/dvipng/DEPENDS
index 3139b35..80e2785 100755
--- a/doc/dvipng/DEPENDS
+++ b/doc/dvipng/DEPENDS
@@ -1,5 +1,7 @@
-depends libpng &&
-depends giflib &&
depends freetype2 &&
+depends gd &&
depends ghostscript &&
+depends GIFLIB &&
+depends libpng &&
+depends t1lib &&
depends texlive
diff --git a/doc/dvipng/HISTORY b/doc/dvipng/HISTORY
index e26a24f..a4f6d14 100644
--- a/doc/dvipng/HISTORY
+++ b/doc/dvipng/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: gd, t1lib
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 30FDD71A.gpg: added gpg keyring
diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index 721a339..bac4262 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -8,6 +8,7 @@ depends gtk+3 &&
depends gconf2 &&
depends shared-mime-info &&
depends gnome-icon-theme &&
+depends adwaita-icon-theme &&
depends xml-parser-expat &&
depends itstool &&
depends libsecret &&
diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index 519932d..cfdc43f 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,11 +1,11 @@
SPELL=evince
- VERSION=3.8.3
+ VERSION=3.13.92
BRANCH=$(echo $VERSION | cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/evince/$BRANCH/$SOURCE
WEB_SITE=http://www.gnome.org/projects/evince
-
SOURCE_HASH=sha512:22b913d61ad5f143b014129e5b18985bd3ff2790b3819a6a16a5de1f08eb617f77b421a431f01beab9ca90dc03d7a5dc413163f99405800d2c4997ec1e9408cd
+
SOURCE_HASH=sha512:507a3e6be85d70560d2948d8330207ca12469677d1acc9b534dbcd31fd5248e514f455c0613c842a23405b4aa47fe0aef32c32b7038614e8986690f106ce15d7
LICENSE[0]=GPL
ENTERED=20050502
KEYWORDS="doc"
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 68c898b..3394249 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,10 @@
+2014-09-19 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 3.13.92
+ * DEPENDS: adwaita icons replaced symbolic ones
+
+2014-04-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: need symbolic icons
+
2013-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.3

diff --git a/doc/fbreader/DETAILS b/doc/fbreader/DETAILS
index 2c48d4e..17c9c10 100755
--- a/doc/fbreader/DETAILS
+++ b/doc/fbreader/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fbreader
if [[ "$FBREADER_BRANCH" == "scm" ]];then
-if [[ "$FBREADER_AUTOUPDATE" == "y" ]];then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-scm.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
SOURCE_URL[0]=git://github.com/geometer/FBReader.git:$SPELL-scm
diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index d0bd3ce..2d17b6b 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-06-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated source url
* DEPENDS: dropped not required enca dependency
diff --git a/doc/groff/DEPENDS b/doc/groff/DEPENDS
index ef22d34..2506c28 100755
--- a/doc/groff/DEPENDS
+++ b/doc/groff/DEPENDS
@@ -8,3 +8,13 @@ optional_depends POSTSCRIPT-INTERPRETER \
optional_depends netpbm "" "" "required for html output" &&

optional_depends psutils "" "" "required for html output"
+
+optional_depends libx11 \
+ "--with-x" \
+ "--without-x" \
+ "for X11 support in groff" &&
+if is_depends_enabled $SPELL libx11; then
+ depends libxaw &&
+ depends libxmu &&
+ depends libxt
+fi
diff --git a/doc/groff/HISTORY b/doc/groff/HISTORY
index 0035d06..62ebf6e 100644
--- a/doc/groff/HISTORY
+++ b/doc/groff/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: optional X11 dependencies
+
2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.22.2
* BUILD: deleted
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/doc/man-pages-posix/DETAILS b/doc/man-pages-posix/DETAILS
index d3cb949..ec13394 100755
--- a/doc/man-pages-posix/DETAILS
+++ b/doc/man-pages-posix/DETAILS
@@ -1,12 +1,9 @@
SPELL=man-pages-posix
- VERSION=2003-a
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sign
+ VERSION=2013-a
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_HASH=sha512:e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/docs/manpages/man-pages-posix/$SOURCE
- SOURCE2_URL[0]=$KERNEL_URL/pub/linux/docs/manpages/man-pages-posix/$SOURCE2
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/docs/man-pages/man-pages-posix/$SOURCE
LICENSE[0]=GPL
KEYWORDS="man doc"
WEB_SITE=http://www.kernel.org/doc/man-pages/
diff --git a/doc/man-pages-posix/HISTORY b/doc/man-pages-posix/HISTORY
index e2ffc64..94f1669 100644
--- a/doc/man-pages-posix/HISTORY
+++ b/doc/man-pages-posix/HISTORY
@@ -1,3 +1,6 @@
+2014-05-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2013-a
+
2008-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD, HISTORY: created this spell, version 2003-a

diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 6fd7046..49ed55b 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,6 +1,6 @@
SPELL=man-pages
- VERSION=3.54
-
SOURCE_HASH=sha512:90cb33ef9daf7f2e30d1d3e19de8d7065abc772502bde2b26811933136c547c7ffd51f027d4c96fd10bed922d2ecbc52963b610a2d907e0c8a3b8ffc7a879ac8
+ VERSION=3.72
+
SOURCE_HASH=sha512:10d513c926d44122955ad5c852af9c87d7f46296cdc22cbf2397115163a7873c57ba79b8b94f50a5ce202b55005a24dd5a219a0db0b5c015070f68a943834296
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 0cf02b0..8fe1ff6 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,18 @@
+2014-09-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.72
+
+2014-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.70
+
+2014-06-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.69
+
+2014-05-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.68
+
+2014-05-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.66
+
2013-09-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.54

diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index 886140f..447d986 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1 +1 @@
-make build=release verbose=1
+CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" build=release verbose=1
diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 8c478a1..19bf44f 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,9 +1,9 @@
SPELL=mupdf
- VERSION=1.2
-
SOURCE_HASH=sha512:49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02
- SOURCE=$SPELL-$VERSION-source.zip
+ VERSION=1.4
+
SOURCE_HASH=sha512:6ed37df85760f08a8c967c824c08fcaa79bc2bfc4f1787d50cb59b8c11f1be41d7163e0e5d0bede93b066ff2ef9fcfaf748555ea7b4a02ddabb6a0b175f403fe
+ SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source"
- SOURCE_URL[0]=http://mupdf.googlecode.com/files/$SOURCE
+ SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE
WEB_SITE=http://www.mupdf.com/
ENTERED=20120426
LICENSE[0]=GPL
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 893cd7f..50d61ca 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2014-04-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.4; changed source extension to tar.gz;-)
+ * BUILD: insert compiler flags as desired by Makefile
+
2013-03-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2; changed source extension to zip

diff --git a/doc/opensp/DEPENDS b/doc/opensp/DEPENDS
index cbf4ac5..d081d55 100755
--- a/doc/opensp/DEPENDS
+++ b/doc/opensp/DEPENDS
@@ -1,5 +1,11 @@
depends -sub CXX gcc &&
depends sgml-common &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
optional_depends xmlto "--enable-doc-build"\
"--disable-doc-build"\
"to build documention"
diff --git a/doc/opensp/DETAILS b/doc/opensp/DETAILS
index 63c60d8..f3749f4 100755
--- a/doc/opensp/DETAILS
+++ b/doc/opensp/DETAILS
@@ -1,13 +1,14 @@
SPELL=opensp
VERSION=1.5.2
+ PATCHLEVEL=1

SOURCE_HASH=sha512:a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e

SOURCE=OpenSP-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSP-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/openjade/$SOURCE
LICENSE[0]=BSD
+ GATHER_DOCS=off
WEB_SITE=http://openjade.sourceforge.net
ENTERED=20030713
- UPDATED=20050406
KEYWORDS="sgml xml doc"
SHORT="The OpenJade Group's SGML and XML parsing tools"
cat << EOF
diff --git a/doc/opensp/HISTORY b/doc/opensp/HISTORY
index 8bf5df7..86d5011 100644
--- a/doc/opensp/HISTORY
+++ b/doc/opensp/HISTORY
@@ -1,3 +1,7 @@
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1; don't do useless doc'ing
+ * DEPENDS: added gettext optional dependency
+
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/doc/source-highlight/DEPENDS b/doc/source-highlight/DEPENDS
index b3684a3..0212a50 100755
--- a/doc/source-highlight/DEPENDS
+++ b/doc/source-highlight/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends bison &&
depends flex &&
depends -sub CXX gcc
diff --git a/doc/source-highlight/DETAILS b/doc/source-highlight/DETAILS
index 4c51ec5..fce8e25 100755
--- a/doc/source-highlight/DETAILS
+++ b/doc/source-highlight/DETAILS
@@ -1,5 +1,5 @@
SPELL=source-highlight
- VERSION=1.11
+ VERSION=3.1.7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/doc/source-highlight/HISTORY b/doc/source-highlight/HISTORY
index 39482eb..24f379f 100644
--- a/doc/source-highlight/HISTORY
+++ b/doc/source-highlight/HISTORY
@@ -1,3 +1,6 @@
+2014-05-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.1.7
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 9E629EAC.gpg: added gpg keyring
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 9002492..0a81547 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=e16
if [[ "$E16_BRANCH" == "scm" ]]; then
- if [[ "$E16_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-0.16-cvs.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index bbdfc89..57dacbb 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-04-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.13

diff --git a/e-17/e17/DETAILS b/e-17/e17/DETAILS
index e7f17c3..285a8c6 100755
--- a/e-17/e17/DETAILS
+++ b/e-17/e17/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=e17
if [[ "$E17_BRANCH" == "scm" ]]; then
- if [[ "$E17_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=enlightenment-0.17-git.tar.bz2
PATCHLEVEL=6
FORCE_DOWNLOAD=on
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index fe6f303..5c3e08e 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Replace xorg-libs with libx11, libxau, libxdmcp, and
libxext
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/DETAILS b/e-17/ecore/DETAILS
index 391bf72..97af11a 100755
--- a/e-17/ecore/DETAILS
+++ b/e-17/ecore/DETAILS
@@ -1,10 +1,10 @@
SPELL=ecore
- VERSION=1.7.8
+ VERSION=1.7.10
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
-#
SOURCE_HASH=sha512:e4739f43abbbce8e78ad739fab9cedb1a6bcf1684958a17b5490f3b7fe00ae90177d26365d43d10708d3a31bfb255991f7be72442f8101840f8cbac8de842cb5
+
SOURCE_HASH=sha512:24fbe064913c566f885a2e51185b1f1d37c62c0d03ba0d549e9715ba516fb6b3f630ad331f89f66e91de1401b06b01b16916650448dda11d5e1efa24e52eaf39
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Ecore/
ENTERED=20011101
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index 554b75b..f5282c0 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,11 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Updated to 1.7.10 (removed guru sig)
+
+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/ecore/ecore-1.7.8.tar.bz2.sig
b/e-17/ecore/ecore-1.7.8.tar.bz2.sig
deleted file mode 100644
index 34f0581..0000000
Binary files a/e-17/ecore/ecore-1.7.8.tar.bz2.sig and /dev/null differ
diff --git a/e-17/edbus/DETAILS b/e-17/edbus/DETAILS
index d62dc16..52c0bf6 100755
--- a/e-17/edbus/DETAILS
+++ b/e-17/edbus/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=edbus
-if [[ $EDBUS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
diff --git a/e-17/edbus/HISTORY b/e-17/edbus/HISTORY
index 40bdfa0..5489fe1 100644
--- a/e-17/edbus/HISTORY
+++ b/e-17/edbus/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/edje/DETAILS b/e-17/edje/DETAILS
index a2832f0..d96b96b 100755
--- a/e-17/edje/DETAILS
+++ b/e-17/edje/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=edje
if [[ "$EDJE_BRANCH" == "scm" ]]; then
- if [[ "$EDJE_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
diff --git a/e-17/edje/HISTORY b/e-17/edje/HISTORY
index 5564cd9..215468f 100644
--- a/e-17/edje/HISTORY
+++ b/e-17/edje/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8
* DEPENDS: Depends on evas
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/e-17/efl/DEPENDS b/e-17/efl/DEPENDS
index 1cbd499..dd0956a 100755
--- a/e-17/efl/DEPENDS
+++ b/e-17/efl/DEPENDS
@@ -31,7 +31,7 @@ optional_depends gettext
\
'--disable-nls' \
'for Native Language Support (recommended)' &&

-optional_depends giflib \
+optional_depends GIFLIB \
'--enable-image-loader-gif' \
'--disable-image-loader-gif' \
'for GIF image loader (recommended)' &&
diff --git a/e-17/efl/DETAILS b/e-17/efl/DETAILS
index 23abda4..153b7c8 100755
--- a/e-17/efl/DETAILS
+++ b/e-17/efl/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=efl
-if [[ $EFL_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.enlightenment.org/core/efl.git:$SPELL-git
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index ab441aa..1cd3922 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-03-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: subversion -> git

diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS
index ada4cf1..6942279 100755
--- a/e-17/eina/DETAILS
+++ b/e-17/eina/DETAILS
@@ -1,10 +1,10 @@
SPELL=eina
- VERSION=1.7.8
+ VERSION=1.7.10
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
-#
SOURCE_HASH=sha512:eaf690cc11a38b19b4ee04475907143c5ac8d9c1c0ba34b8c20d3be535f67dc699edd99d36b4db8e2de5ac9acf6df1f7eace2b8925ce4367d3fecbecef319a53
+
SOURCE_HASH=sha512:c1195ec9f2cd79777912ba3c8b6e69a206d035c9a7f2c38762c18e3c86ec43d52f020e4dd8d0ea0c9b580aff9707cede909412260ac6d23796ddbd78eb8e280e
LICENSE[0]=LGPL
WEB_SITE=http://trac.enlightenment.org/e/wiki/Eina
ENTERED=20081013
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index c141be6..19ca3ab 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Updated to 1.7.10 (removed guru sig)
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8

diff --git a/e-17/eina/eina-1.7.8.tar.bz2.sig
b/e-17/eina/eina-1.7.8.tar.bz2.sig
deleted file mode 100644
index 97dfed6..0000000
Binary files a/e-17/eina/eina-1.7.8.tar.bz2.sig and /dev/null differ
diff --git a/e-17/emap/DETAILS b/e-17/emap/DETAILS
index 0a3dc3e..25f8c7b 100755
--- a/e-17/emap/DETAILS
+++ b/e-17/emap/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=emap
- if [ "$EMAP_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL-svn
SOURCE_IGNORE=volatile
diff --git a/e-17/emap/HISTORY b/e-17/emap/HISTORY
index 5ec2692..9aeb73f 100644
--- a/e-17/emap/HISTORY
+++ b/e-17/emap/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/emotion/DETAILS b/e-17/emotion/DETAILS
index 3942bda..71ce14f 100755
--- a/e-17/emotion/DETAILS
+++ b/e-17/emotion/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=emotion
if [ "$EMOTION_BRANCH" == "scm" ]; then
- if [ "$EMOTION_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
diff --git a/e-17/emotion/HISTORY b/e-17/emotion/HISTORY
index 2d5b75c..a97596c 100644
--- a/e-17/emotion/HISTORY
+++ b/e-17/emotion/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8

diff --git a/e-17/emotion_generic_players/DETAILS
b/e-17/emotion_generic_players/DETAILS
index 5488736..707ac01 100755
--- a/e-17/emotion_generic_players/DETAILS
+++ b/e-17/emotion_generic_players/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=emotion_generic_players
-if [[ $EMOTION_GENERIC_PLAYERS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.enlightenment.org/core/${SPELL}.git:$SPELL-git
diff --git a/e-17/emotion_generic_players/HISTORY
b/e-17/emotion_generic_players/HISTORY
index 7970f4f..948c4c6 100644
--- a/e-17/emotion_generic_players/HISTORY
+++ b/e-17/emotion_generic_players/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created

diff --git a/e-17/enki/DETAILS b/e-17/enki/DETAILS
index 7a6b7b0..b8f8705 100755
--- a/e-17/enki/DETAILS
+++ b/e-17/enki/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=enki
-if [ "$ENKI_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-svn
diff --git a/e-17/enki/HISTORY b/e-17/enki/HISTORY
index 10c89df..39456b6 100644
--- a/e-17/enki/HISTORY
+++ b/e-17/enki/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/enna/DETAILS b/e-17/enna/DETAILS
index ff2a4fd..c96e426 100755
--- a/e-17/enna/DETAILS
+++ b/e-17/enna/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=enna
-if [ "$ENNA_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=mercurial
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-hg.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
SOURCE_URL[0]=hg_http://hg.geexbox.org/${SPELL}:${SPELL}-hg
diff --git a/e-17/enna/HISTORY b/e-17/enna/HISTORY
index 964ee41..d824e54 100644
--- a/e-17/enna/HISTORY
+++ b/e-17/enna/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch

diff --git a/e-17/eobj/DETAILS b/e-17/eobj/DETAILS
index 8539204..98c8c2b 100755
--- a/e-17/eobj/DETAILS
+++ b/e-17/eobj/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=eobj
-if [[ $EOBJ_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL
diff --git a/e-17/eobj/HISTORY b/e-17/eobj/HISTORY
index bfdd5e6..74dc219 100644
--- a/e-17/eobj/HISTORY
+++ b/e-17/eobj/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with efl

diff --git a/e-17/ephoto/DETAILS b/e-17/ephoto/DETAILS
index e7d8001..0a98854 100755
--- a/e-17/ephoto/DETAILS
+++ b/e-17/ephoto/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ephoto
PATCHLEVEL=1
-if [ "$EPHOTO_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
diff --git a/e-17/ephoto/HISTORY b/e-17/ephoto/HISTORY
index fbaf2c0..7ac21af 100644
--- a/e-17/ephoto/HISTORY
+++ b/e-17/ephoto/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/e-17/ephysics/DETAILS b/e-17/ephysics/DETAILS
index ab1c2f7..3e27540 100755
--- a/e-17/ephysics/DETAILS
+++ b/e-17/ephysics/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ephysics
PATCHLEVEL=0
-if [ "$EPHYSICS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
diff --git a/e-17/ephysics/HISTORY b/e-17/ephysics/HISTORY
index 07fd5cf..7ad3b61 100644
--- a/e-17/ephysics/HISTORY
+++ b/e-17/ephysics/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: typo efs -> efl

diff --git a/e-17/erss/DETAILS b/e-17/erss/DETAILS
index 9cb73f3..b2c14e5 100755
--- a/e-17/erss/DETAILS
+++ b/e-17/erss/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=erss
-if [ "$ERSS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/OLD/MISC/$SPELL:$SPELL
diff --git a/e-17/erss/HISTORY b/e-17/erss/HISTORY
index 49d07c1..aabfeb5 100644
--- a/e-17/erss/HISTORY
+++ b/e-17/erss/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index ee2186e..d3d464f 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -57,7 +57,7 @@ optional_depends OPENGL \
"--disable-gl-xlib" \
"for OpenGL X11 display engine" &&

-optional_depends giflib \
+optional_depends GIFLIB \
'--enable-image-loader-gif' \
'--disable-image-loader-gif' \
'for GIF image loader' &&
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index bfc9eb1..7c4e27d 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Replaced xorg-libs with libsm and libx11

diff --git a/e-17/evas_generic_loaders/DETAILS
b/e-17/evas_generic_loaders/DETAILS
index 6e7097f..628c9de 100755
--- a/e-17/evas_generic_loaders/DETAILS
+++ b/e-17/evas_generic_loaders/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=evas_generic_loaders
PATCHLEVEL=0
if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
- if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.enlightenment.org/core/${SPELL}.git:$SPELL-git
diff --git a/e-17/evas_generic_loaders/HISTORY
b/e-17/evas_generic_loaders/HISTORY
index ac7b99a..a6b9022 100644
--- a/e-17/evas_generic_loaders/HISTORY
+++ b/e-17/evas_generic_loaders/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8

diff --git a/e-17/evfs/DETAILS b/e-17/evfs/DETAILS
index 77663c7..de873aa 100755
--- a/e-17/evfs/DETAILS
+++ b/e-17/evfs/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=evfs
-if [[ "$EVFS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/OLD/$SPELL:$SPELL
diff --git a/e-17/evfs/HISTORY b/e-17/evfs/HISTORY
index f2ad688..d9f5b74 100644
--- a/e-17/evfs/HISTORY
+++ b/e-17/evfs/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/e-17/eweather/DETAILS b/e-17/eweather/DETAILS
index 2a5db8b..8fedd18 100755
--- a/e-17/eweather/DETAILS
+++ b/e-17/eweather/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=eweather
- if [ "$EWEATHER_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/E-MODULES-EXTRA/$SPELL:$SPELL-svn
SOURCE_IGNORE=volatile
diff --git a/e-17/eweather/HISTORY b/e-17/eweather/HISTORY
index 0f6de18..75719bf 100644
--- a/e-17/eweather/HISTORY
+++ b/e-17/eweather/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDES: changed to using efl

diff --git a/e-17/ewl/DETAILS b/e-17/ewl/DETAILS
index b109267..a59daac 100755
--- a/e-17/ewl/DETAILS
+++ b/e-17/ewl/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ewl
-if [ "$EWL_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/BROKEN/$SPELL:$SPELL
diff --git a/e-17/ewl/HISTORY b/e-17/ewl/HISTORY
index 5003b92..b6079b1 100644
--- a/e-17/ewl/HISTORY
+++ b/e-17/ewl/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: changed e-emotion to emotion

diff --git a/e-17/ewler/DETAILS b/e-17/ewler/DETAILS
index cf7b8f1..f2ca01f 100755
--- a/e-17/ewler/DETAILS
+++ b/e-17/ewler/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=ewler
-if [[ "$EWLER_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/OLD/MISC/$SPELL:$SPELL
diff --git a/e-17/ewler/HISTORY b/e-17/ewler/HISTORY
index cd59577..d9bacc1 100644
--- a/e-17/ewler/HISTORY
+++ b/e-17/ewler/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/e-17/exchange/DETAILS b/e-17/exchange/DETAILS
index f844a45..47d2418 100755
--- a/e-17/exchange/DETAILS
+++ b/e-17/exchange/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=exchange
-if [ "$EXCHANGE_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL-svn
diff --git a/e-17/exchange/HISTORY b/e-17/exchange/HISTORY
index faa1dad..322a379 100644
--- a/e-17/exchange/HISTORY
+++ b/e-17/exchange/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/eyelight/DETAILS b/e-17/eyelight/DETAILS
index 5101fab..d38a7a8 100755
--- a/e-17/eyelight/DETAILS
+++ b/e-17/eyelight/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=eyelight
-if [[ $ELEMENTARY_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL
diff --git a/e-17/eyelight/HISTORY b/e-17/eyelight/HISTORY
index 667a84e..eb5e17e 100644
--- a/e-17/eyelight/HISTORY
+++ b/e-17/eyelight/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-11-15 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: changed e-emotion to emotion

diff --git a/e-17/iconbar/DETAILS b/e-17/iconbar/DETAILS
index 4682095..e440d8d 100755
--- a/e-17/iconbar/DETAILS
+++ b/e-17/iconbar/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=iconbar
-if [ "$ICONBAR_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/OLD/$SPELL:$SPELL
diff --git a/e-17/iconbar/HISTORY b/e-17/iconbar/HISTORY
index 5bf716a..52bafb2 100644
--- a/e-17/iconbar/HISTORY
+++ b/e-17/iconbar/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/e-17/libeweather/DETAILS b/e-17/libeweather/DETAILS
index 8fa1383..51e8c8b 100755
--- a/e-17/libeweather/DETAILS
+++ b/e-17/libeweather/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libeweather
- if [ "$LIBEWEATHER_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL-svn
SOURCE_IGNORE=volatile
diff --git a/e-17/libeweather/HISTORY b/e-17/libeweather/HISTORY
index b84feb6..e898704 100644
--- a/e-17/libeweather/HISTORY
+++ b/e-17/libeweather/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/shellementary/DETAILS b/e-17/shellementary/DETAILS
index e5d5398..76c537d 100755
--- a/e-17/shellementary/DETAILS
+++ b/e-17/shellementary/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=shellementary
-if [[ $SHELLEMENTARY_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL
diff --git a/e-17/shellementary/HISTORY b/e-17/shellementary/HISTORY
index 0c786eb..38e0900 100644
--- a/e-17/shellementary/HISTORY
+++ b/e-17/shellementary/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/e-17/terminology/DETAILS b/e-17/terminology/DETAILS
index f3445bf..b33110a 100755
--- a/e-17/terminology/DETAILS
+++ b/e-17/terminology/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=terminology
if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
PATCHLEVEL=0
- if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.enlightenment.org/apps/terminology.git:$SPELL-git
diff --git a/e-17/terminology/HISTORY b/e-17/terminology/HISTORY
index 8606c6c..58a373f 100644
--- a/e-17/terminology/HISTORY
+++ b/e-17/terminology/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.3.0

diff --git a/e/imlib/DEPENDS b/e/imlib/DEPENDS
index bc70289..797932f 100755
--- a/e/imlib/DEPENDS
+++ b/e/imlib/DEPENDS
@@ -2,5 +2,5 @@ depends tiff &&
depends libpng &&
depends zlib &&
depends JPEG &&
-depends giflib &&
+depends GIFLIB &&
depends gtk+
diff --git a/e/imlib/HISTORY b/e/imlib/HISTORY
index 28d34a6..ca3e1af 100644
--- a/e/imlib/HISTORY
+++ b/e/imlib/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 6bb0bb4..0f5fa69 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,12 +1,20 @@
-depends libtool &&
depends freetype2 &&
+depends glib2 &&
+depends harfbuzz &&
+depends libtool &&
+depends pcre &&

optional_depends libx11 \
'--with-x' \
'--without-x' \
'X11 support' &&
-
if is_depends_enabled $SPELL libx11; then
+ depends libice &&
+ depends libpthread-stubs &&
+ depends libsm &&
+ depends libxau &&
+ depends libxcb &&
+ depends libxdmcp &&
depends libxext
fi &&

@@ -40,7 +48,7 @@ optional_depends 'JPEG' \
'--without-jpeg' \
'JPEG image loader' &&

-optional_depends 'giflib' \
+optional_depends 'GIFLIB' \
'--with-gif' \
'--without-gif' \
'GIF image loader'
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index d0a26e0..20cffe7 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,12 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: glib2, harfbuzz, pcre
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing X11 dependencies
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-06-23 Remko van der Vossen <wich AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS: make X a proper optiona depends
* PRE_BUILD, Imlib2.h.patch: patch not needed anymore, --without-x is
diff --git a/editors/auctex/CONFLICTS b/editors/auctex/CONFLICTS
deleted file mode 100755
index ef81aa7..0000000
--- a/editors/auctex/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts preview-latex y
diff --git a/editors/auctex/DEPENDS b/editors/auctex/DEPENDS
deleted file mode 100755
index cdf28e2..0000000
--- a/editors/auctex/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends EMACS &&
-depends texlive
diff --git a/editors/auctex/DETAILS b/editors/auctex/DETAILS
deleted file mode 100755
index 216f8d9..0000000
--- a/editors/auctex/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
- SPELL=auctex
- VERSION=11.84
- SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE2=${SOURCE}.sig
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=${GNU_URL}/${SPELL}/${SOURCE}
- SOURCE2_URL[0]=${GNU_URL}/${SPELL}/${SOURCE2}
- SOURCE_GPG=gnu.gpg:${SOURCE2}:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- WEB_SITE=http://www.gnu.org/software/auctex/
- LICENSE[0]=GPL
- ENTERED=20010922
- UPDATED=20020617
- KEYWORDS="latex emacs tex editors"
- SHORT="AUC TeX is a LaTeX enviroment for emacs"
-cat << EOF
-AUC TeX is an extensible package that supports writing and formatting TeX
-files for most variants of GNU Emacs. Many different macro packages are
-supported, including AMS TeX, LaTeX, and TeXinfo
-EOF
diff --git a/editors/auctex/HISTORY b/editors/auctex/HISTORY
deleted file mode 100644
index b042a84..0000000
--- a/editors/auctex/HISTORY
+++ /dev/null
@@ -1,82 +0,0 @@
-2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * DEPENDS: switch from tetex to texlive [auto]
-
-2007-05-01 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: updated to 11.84
- * DEPENDS: needs tetex
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2006-06-25 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: updated to 11.83
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-12-23 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: updated to 11.82
-
-2005-12-13 Pieter Lenaerts <e-type AT sourcemage.org>
- * added CONFLICTS preview-latex: preview-latex is included in auctex
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-10-01 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: updated to 11.81
-
-2005-08-28 Jeremy Blosser <jblosser-smgl AT firinn.org>
- * DETAILS: Added upstream GPG checking via gnu.gpg.
-
-2005-02-23 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: version 11.55
-
-2005-02-10 Andrew Stitt <astitt AT sourcemage.org>
- * DEPENDS: requires is depreciated, use depends
-
-2005-01-13 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: v 11.54
-
-2004-08-17 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: version 11.53
- * DEPENDS: requires EMACS
-
-2004-08-17 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: version 11.51
-
-2004-08-16 Pieter Lenaerts <e-type AT sourcemage.org>
- * DETAILS: version 11.50
- * DETAILS: changed website to http://www.gnu.org/software/auctex/
- * DETAILS: changed SOURCE_URL to
http://ftp.gnu.org/pub/gnu/${SPELL}/${SOURCE}
- * BUILD, PRE_BUILD deleted, default_build and default_install suffice
-
-2004-06-17 Pieter Lenaerts <e-type AT sourcemage.org>
- * Converted to BUILD_API 2
- * Updated to 11.14
- * Changed download url to http://ftp.gnu.org/pub/gnu/auctex/11.14/
-
-2003-05-25 Richard Becker <beri AT craban.net>
- * Updated to 11.13
- * Changed website to http://www.gnu.org/software/auctex/
- * Changed download url to
http://savannah.gnu.org/download/auctex/stable.pkg/
-
-2002-07-17 Eric Sandall <sandalle AT sourcemage.org>
- * Changed website to http://mirrors.sunsite.dk/auctex/www/auctex/
- * Added LICENSE
-
-2002-06-14 Eric Sandall <sandalle AT sourcemage.org>
- * Added MD5 entry to DETAILS
-
-2002-05-29 Eric Sandall <sandalle AT sourcemage.org>
- * Works with gcc3
-
-2002-04-19 Eric Sandall <sandalle AT sourcemage.org>
- * Received auctex for inclusion in editors
- * PRE_BUILD : Modified to create $SOURCE_DIRECTORY and unpack $SOURCE
- * BUILD : Removed 'cd $SOURCE_DIRECTORY' as it's unneeded
- * DETAILS : Updated UPDATED field
-
-2002-04-20 Joel Mayes <anonymous AT sourcemage.org>
- * Initial spell creation
-
diff --git a/editors/code-browser/DETAILS b/editors/code-browser/DETAILS
index fdedb78e..b15517f 100755
--- a/editors/code-browser/DETAILS
+++ b/editors/code-browser/DETAILS
@@ -2,7 +2,7 @@
if [[ $CODE_BROWSER_BRANCH == 3 ]]; then
VERSION=3.23
else
- VERSION=4.7
+ VERSION=4.9
fi
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/editors/code-browser/HISTORY b/editors/code-browser/HISTORY
index 6431fca..084f121 100644
--- a/editors/code-browser/HISTORY
+++ b/editors/code-browser/HISTORY
@@ -1,3 +1,6 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.9 (4)
+
2013-07-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.7 (4)

diff --git a/editors/code-browser/code-browser-4.7-src.tar.gz.sig
b/editors/code-browser/code-browser-4.7-src.tar.gz.sig
deleted file mode 100644
index 4cb1143..0000000
Binary files a/editors/code-browser/code-browser-4.7-src.tar.gz.sig and
/dev/null differ
diff --git a/editors/code-browser/code-browser-4.9-src.tar.gz.sig
b/editors/code-browser/code-browser-4.9-src.tar.gz.sig
new file mode 100644
index 0000000..9f1b867
Binary files /dev/null and
b/editors/code-browser/code-browser-4.9-src.tar.gz.sig differ
diff --git a/editors/emacs/A0B0F199.gpg b/editors/emacs/A0B0F199.gpg
new file mode 100644
index 0000000..2ad4408
Binary files /dev/null and b/editors/emacs/A0B0F199.gpg differ
diff --git a/editors/emacs/BC40251C.gpg b/editors/emacs/BC40251C.gpg
deleted file mode 100644
index 4cac76c..0000000
Binary files a/editors/emacs/BC40251C.gpg and /dev/null differ
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 8b1fc3b..2c7520b 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -23,7 +23,7 @@ optional_depends "tiff" \
"--without-tiff" \
"for TIFF format support" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--with-gif" \
"--without-gif" \
"for GIF format support" &&
@@ -33,7 +33,7 @@ optional_depends libxpm \
--without-xpm \
"for XPM (X pixmap) suport" &&

-optional_depends librsvg \
+optional_depends librsvg2 \
--with-rsvg \
--without-rsvg \
"for SVG (Scalable Vector Graphics) support" &&
diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 4df5384..41a66d9 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -1,24 +1,21 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=emacs
if [[ "$EMACS_BRANCH" == "scm" ]]; then
- if [[ "$EMACS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=trunk
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-trunk.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-trunk
SOURCE_URL[0]=bzr://bzr.savannah.gnu.org/emacs/trunk/:emacs-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=24.1
+ VERSION=24.3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:4}
SOURCE_URL[0]=${GNU_URL}/${SPELL}/${SOURCE}
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/${SPELL}/${SOURCE}
SOURCE2_URL[1]=ftp://ftp.gnu.org/pub/gnu/${SPELL}/${SOURCE2}
- SOURCE_GPG=BC40251C.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE_GPG=A0B0F199.gpg:${SOURCE2}:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
WEB_SITE=http://www.gnu.org/software/emacs
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index f1789a6..e873644 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,15 @@
+2014-07-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Depedency for SVG support is on librsvg2
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
+2014-05-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 24.3
+
2013-07-31 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Updated optional depedencies
Fixed typo
diff --git a/editors/gawk/BUILD b/editors/gawk/BUILD
index faf4b96..6e4e95a 100755
--- a/editors/gawk/BUILD
+++ b/editors/gawk/BUILD
@@ -1,10 +1,14 @@
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"

-
+# Disable mpfr and readline as that complicates upgrade
+# of gmp ... which fails mid-way since sorcery really relies
+# on awk to work. Proper fix would be to protect all
+# base libraries during dispel, like libc. -- ThOr
./configure --build=${BUILD} \
--prefix=${TRACK_ROOT}/usr \
--bindir=${TRACK_ROOT}/bin \
--infodir=${TRACK_ROOT}/usr/share/info \
--mandir=${TRACK_ROOT}/usr/share/man \
+ --without-mpfr --without-readline \
${OPTS} &&
make DESTDIR=$INSTALL_ROOT
diff --git a/editors/gawk/CONFIGURE b/editors/gawk/CONFIGURE
new file mode 100755
index 0000000..af13ca0
--- /dev/null
+++ b/editors/gawk/CONFIGURE
@@ -0,0 +1 @@
+config_query GAWK_DEF "Use $SPELL as the primary AWK interpreter on the
system?" y
diff --git a/editors/gawk/DEPENDS b/editors/gawk/DEPENDS
index 62c729b..666b64a 100755
--- a/editors/gawk/DEPENDS
+++ b/editors/gawk/DEPENDS
@@ -1,5 +1,7 @@
-depends gnupg &&
-depends smgl-fhs &&
+depends gmp &&
+depends gnupg &&
+depends mpfr &&
+depends smgl-fhs &&

optional_depends gettext \
"--enable-nls" \
diff --git a/editors/gawk/DETAILS b/editors/gawk/DETAILS
index 95d86b4..a7cf04d 100755
--- a/editors/gawk/DETAILS
+++ b/editors/gawk/DETAILS
@@ -1,5 +1,5 @@
SPELL=gawk
- VERSION=4.1.0
+ VERSION=4.1.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index 122727a..bb49c1b 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,18 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: gmp, mpfr
+
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * PROVIDES: Provide AWK
+ * CONFIGURE, INSTALL: Let the user choose the primary AWK
implementation
+
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: reduce usage of libraries to prevent failure of spell
+ upgrades (example: awk broken when updating gmp, sorcery cannot
complete
+ when awk cannot run due to temporarily missing libgmp)
+
+2014-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1.1
+
2013-05-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.1.0

diff --git a/editors/gawk/INSTALL b/editors/gawk/INSTALL
index ddfa021..8d4d071 100755
--- a/editors/gawk/INSTALL
+++ b/editors/gawk/INSTALL
@@ -1,3 +1,4 @@
make DESTDIR=$INSTALL_ROOT install &&
-rm -f ${INSTALL_ROOT}/bin/awk &&
-ln -sf gawk ${INSTALL_ROOT}/bin/awk
+if [ "$GAWK_DEF" = y ]; then
+ ln -sf "$SPELL" "$INSTALL_ROOT"/bin/awk
+fi
diff --git a/editors/gawk/PROVIDES b/editors/gawk/PROVIDES
new file mode 100644
index 0000000..37a9c1c
--- /dev/null
+++ b/editors/gawk/PROVIDES
@@ -0,0 +1 @@
+AWK
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index 54a81c6..1338139 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,11 +1,11 @@
SPELL=lyx
- VERSION=2.0.6
+ VERSION=2.1.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$SOURCE
- SOURCE_URL[1]=ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$SOURCE
-
SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.0.x/${SOURCE}
+ SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/${VERSION%.*}.x/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.lip6.fr/pub/lyx/stable/${VERSION%.*}.x/$SOURCE
+
SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${VERSION%.*}.x/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 420e8da..123944a 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,6 @@
+2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.1
+
2014-01-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.0.6

diff --git a/editors/magicpoint/DEPENDS b/editors/magicpoint/DEPENDS
index a157113..1ab3d43 100755
--- a/editors/magicpoint/DEPENDS
+++ b/editors/magicpoint/DEPENDS
@@ -14,7 +14,7 @@ optional_depends freetype2 \
"--disable-freetype" \
"for TrueType2 fonts" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--enable-gif" \
"--disable-gif" \
"for GIF image support" &&
diff --git a/editors/magicpoint/HISTORY b/editors/magicpoint/HISTORY
index 7e279b7..96fb07e 100644
--- a/editors/magicpoint/HISTORY
+++ b/editors/magicpoint/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/editors/moe/DETAILS b/editors/moe/DETAILS
index ca94080..6e106a7 100755
--- a/editors/moe/DETAILS
+++ b/editors/moe/DETAILS
@@ -1,5 +1,5 @@
SPELL=moe
- VERSION=1.3
+ VERSION=1.5
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_URL=${GNU_URL}/${SPELL}/${SOURCE}
diff --git a/editors/moe/HISTORY b/editors/moe/HISTORY
index 9982e65..b6a188c 100644
--- a/editors/moe/HISTORY
+++ b/editors/moe/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5
+
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/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/editors/sandy/DETAILS b/editors/sandy/DETAILS
index d8e2088..6d6a1e8 100755
--- a/editors/sandy/DETAILS
+++ b/editors/sandy/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=sandy
-if [[ ${SANDY_AUTOUPDATE} == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
SOURCE_URL[0]=hg_http://hg.suckless.org/sandy:${SPELL}-scm
diff --git a/editors/sandy/HISTORY b/editors/sandy/HISTORY
index 958f8a0..fb7fa70 100644
--- a/editors/sandy/HISTORY
+++ b/editors/sandy/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PROVIDES: modified Neko Nyancat's
spell files from Feature #368
diff --git a/editors/texmaker/DETAILS b/editors/texmaker/DETAILS
index 101423b..4e8edec 100755
--- a/editors/texmaker/DETAILS
+++ b/editors/texmaker/DETAILS
@@ -1,8 +1,8 @@
SPELL=texmaker
- VERSION=4.0.1
+ VERSION=4.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://www.xm1math.net/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:85db34f670cad7d39c7acea5eefd61a9985f183277ddf758a3216dd322c0e43c21f94d2659fbe7dbcbf8f25d5df7c8c1408172214080d9234f4048499fbb8c4b
+
SOURCE_HASH=sha512:9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.xm1math.net/texmaker";
LICENSE[0]=GPL
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index 6cab122..0c38a7f 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,3 +1,9 @@
+2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.3
+
+2014-04-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.1
+
2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on gcc with CXX and qt4 with SQLITE

diff --git a/editors/texworks/DETAILS b/editors/texworks/DETAILS
index 5d1e102..32214b6 100755
--- a/editors/texworks/DETAILS
+++ b/editors/texworks/DETAILS
@@ -1,9 +1,9 @@
SPELL=texworks
- VERSION=0.4.4-r1004
+ VERSION=0.4.5-r1281
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:0f22ebca59673dea0081190f5d064b856735522ee708ae79cb0ae0760c098ac539a45ae6e2a475b75a0bffd9147e1bd3185d8bd6bb710d48408524b686ea0990
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-0.4.4"
+
SOURCE_HASH=sha512:4ab6b1253e05e80c55788b4f6aa6673ede81dd39cdecd09823efbb8a377b73f403018d23e7f214358b6ac7bc86b9afac5ee7437203996e5bff36d9938c2f5dda
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION%-*}"
WEB_SITE="http://www.tug.org/texworks/";
LICENSE[0]=GPL
ENTERED=20120915
diff --git a/editors/texworks/HISTORY b/editors/texworks/HISTORY
index ba28f48..841336c 100644
--- a/editors/texworks/HISTORY
+++ b/editors/texworks/HISTORY
@@ -1,3 +1,6 @@
+2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.5-r1281
+
2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
* DEPENDS: add dependency on texlive
diff --git a/editors/tidy/DETAILS b/editors/tidy/DETAILS
index 181fa72..d5b8804 100755
--- a/editors/tidy/DETAILS
+++ b/editors/tidy/DETAILS
@@ -1,9 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=tidy
if [[ "${TIDY_BRANCH}" == "scm" ]]; then
- if [[ "${TIDY_AUTOUPDATE}" == "y" ]]
- then VERSION=$(date +%Y%m%d)
- else VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvsroot.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT tidy.cvs.sourceforge.net:/cvsroot/tidy:tidy
SOURCE_IGNORE=volatile
diff --git a/editors/tidy/HISTORY b/editors/tidy/HISTORY
index 7bcbe53..194ba80 100644
--- a/editors/tidy/HISTORY
+++ b/editors/tidy/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Word-wrap long description to 80 chars
* DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
diff --git a/editors/vbindiff/DETAILS b/editors/vbindiff/DETAILS
new file mode 100755
index 0000000..65fb410
--- /dev/null
+++ b/editors/vbindiff/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=vbindiff
+ VERSION=3.0_beta4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.cjmweb.net/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.cjmweb.net/vbindiff/";
+ LICENSE[0]="GPLv2+"
+ ENTERED=20140923
+ KEYWORDS=""
+ SHORT="Visual Binary Diff"
+cat << EOF
+VBinDiff (Visual Binary Diff) displays files in hexadecimal and ASCII (or
+EBCDIC). It can also display two files at once, and highlight the differences
+between them. Unlike diff, it works well with large files (up to 4 GB).
+
+VBinDiff was inspired by the Compare Files function of the ProSel utilities
+by Glen Bredon, for the Apple II. When I couldn’t find a similar utility
+for the PC, I wrote it myself.
+
+The single-file mode was inspired by the LIST utility of 4DOS and
+friends. While less provides a good line-oriented display, it has no
+equivalent to LIST’s hex display. (True, you can pipe the file through
+hexdump, but that’s incredibly inefficient on multi-gigabyte files.)
+EOF
diff --git a/editors/vbindiff/HISTORY b/editors/vbindiff/HISTORY
new file mode 100644
index 0000000..f5a6c1a
--- /dev/null
+++ b/editors/vbindiff/HISTORY
@@ -0,0 +1,2 @@
+2014-09-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/editors/vim-csapprox/BUILD b/editors/vim-csapprox/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/editors/vim-csapprox/BUILD
@@ -0,0 +1 @@
+true
diff --git a/editors/vim-csapprox/DEPENDS b/editors/vim-csapprox/DEPENDS
new file mode 100755
index 0000000..367c2e1
--- /dev/null
+++ b/editors/vim-csapprox/DEPENDS
@@ -0,0 +1 @@
+depends vim
diff --git a/editors/vim-csapprox/DETAILS b/editors/vim-csapprox/DETAILS
new file mode 100755
index 0000000..0eb50b9
--- /dev/null
+++ b/editors/vim-csapprox/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=vim-csapprox
+ VERSION=4.0
+
SOURCE_HASH=sha512:5ce5534af16c4abfe7fa2fac9ee904162eebd793120efb4e72dcaa2834209b64834b0013a7e929f0a56caf4d1b103fac116c3cf1f9e958afe9c7fcebf7c2ca87
+ SOURCE=$SPELL-$VERSION.zip
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.vim.org/scripts/download_script.php?src_id=18594
+ WEB_SITE=http://www.vim.org/scripts/script.php?script_id=2390
+ LICENSE[0]=BSD
+ ENTERED=20140915
+ SHORT="Make gvim-only colorschemes work transparently in terminal
vim"
+cat << EOF
+It's hard to find colorschemes for terminal Vim. Most colorschemes are
written
+to only support GVim, and don't work at all in terminal Vim.
+
+This plugin makes GVim-only colorschemes Just Work in terminal Vim, as long
as
+the terminal supports 88 or 256 colors - and most do these days. This
usually
+requires no user interaction (but see the help for what to do if things don't
+Just Work). After getting this plugin happily installed, any time you use
+:colorscheme it will do its magic and make the colorscheme Just Work.
+
+Whenever you change colorschemes using the :colorscheme command this script
will
+be executed. It will take the colors that the scheme specified for use in
the
+GUI and use an approximation algorithm to try to gracefully degrade them to
the
+closest color available in your terminal. If you are running in a GUI or if
+your terminal doesn't support 88 or 256 colors, no changes are made. Also,
no
+changes will be made if the colorscheme seems to have been high color
already.
+
+If for some reason this transparent method isn't suitable to you (for
instance
+if your environment can't be configured to meet the |csapprox-requirements|,
or
+you need to work in Vim 6), another option is also available: using the
+|:CSApproxSnapshot| command to create a new GUI/88-/256-color terminal
+colorscheme. To use this command, a user would generally start GVim, choose
a
+colorscheme that sets up the desired colors, and then use
|:CSApproxSnapshot| to
+create a new colorscheme based on those colors that works in high color
+terminals. This method is more flexible than the transparent mode and works
in
+more places, but also requires more user intervention, and makes it harder to
+deal with colorschemes being updated and such.
+EOF
diff --git a/editors/vim-csapprox/HISTORY b/editors/vim-csapprox/HISTORY
new file mode 100644
index 0000000..84b95c9
--- /dev/null
+++ b/editors/vim-csapprox/HISTORY
@@ -0,0 +1,2 @@
+2014-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/editors/vim-csapprox/INSTALL b/editors/vim-csapprox/INSTALL
new file mode 100755
index 0000000..0c3d087
--- /dev/null
+++ b/editors/vim-csapprox/INSTALL
@@ -0,0 +1,3 @@
+vimdir="$INSTALL_ROOT/usr/share/vim/vimfiles"
+unzip -d "$vimdir" "$SOURCE_CACHE"/"$SOURCE" &&
+vim -c "helptags $vimdir/doc" -c q
diff --git a/editors/vim-gnupg/DETAILS b/editors/vim-gnupg/DETAILS
index 76d7544..fedba71 100755
--- a/editors/vim-gnupg/DETAILS
+++ b/editors/vim-gnupg/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=vim-gnupg
-if [[ "$VIM_GNUPG_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/jamessan/${SPELL}.git
SOURCE_IGNORE=volatile
diff --git a/editors/vim-gnupg/HISTORY b/editors/vim-gnupg/HISTORY
index 1a163b4..634892d 100644
--- a/editors/vim-gnupg/HISTORY
+++ b/editors/vim-gnupg/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-05-22 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 726bf49..8f73b2a 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -1,22 +1,17 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=vim
if [[ "${VIM_BRANCH}" == "scm" ]]
then
-
- if [[ "${VIM_AUTOUPDATE}" == "y" ]]
- then VERSION=$(date +%Y%m%d) && FORCE_DOWNLOAD=on
- else VERSION=hg
- fi
-
+ VERSION=$(get_scm_version) && FORCE_DOWNLOAD=on
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
-
else
XVERSION=7.4
- PATCH_VERSION=183
+ PATCH_VERSION=282
VERSION=$XVERSION.$PATCH_VERSION
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=${SPELL}-${XVERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
SOURCE_URL[0]=http://ftp.vim.org/pub/vim/unix/${SOURCE}
@@ -30,7 +25,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
SOURCE2=vim-$XVERSION-patches-001-$PATCH_VERSION.tar.xz
SOURCE2_URL[0]=http://www.hawo.net/~siflfran/smgl/$SOURCE2
SOURCE2_URL[1]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
-
SOURCE2_HASH=sha512:5590a70ca2b0d0511401775e009bc19c77cea32d2c3e6313d4c4873c18dbf6f352090185e44cb203753288f9b1f5703287254157a86066f615362aa6cda19182
+
SOURCE2_HASH=sha512:90a68e2a6628f218e8c75762289ec2784f318b4070d40fbc112621e582742398b36d81aab0029542413ee945b6fa951839e3bfc3bc8dcc96a986c9a2d05ef80d
fi

WEB_SITE=http://www.vim.org
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 0f60c18..dfb9dbd 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD: apply upstream patches 7.4.001 to 7.4.282
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD: apply upstream patches 7.4.001 to 7.4.183
* vim-patches-tarball: adapted to current version
diff --git a/editors/vimoutliner/DETAILS b/editors/vimoutliner/DETAILS
index df56596..e0d1ffd 100755
--- a/editors/vimoutliner/DETAILS
+++ b/editors/vimoutliner/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=vimoutliner
-if [[ "$VIMOUTLINER_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/$SPELL/$SPELL.git
SOURCE_IGNORE=volatile
diff --git a/editors/vimoutliner/HISTORY b/editors/vimoutliner/HISTORY
index 1a163b4..634892d 100644
--- a/editors/vimoutliner/HISTORY
+++ b/editors/vimoutliner/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-05-22 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created
diff --git a/emacs-lisp/auctex/CONFLICTS b/emacs-lisp/auctex/CONFLICTS
new file mode 100755
index 0000000..ef81aa7
--- /dev/null
+++ b/emacs-lisp/auctex/CONFLICTS
@@ -0,0 +1 @@
+conflicts preview-latex y
diff --git a/emacs-lisp/auctex/DEPENDS b/emacs-lisp/auctex/DEPENDS
new file mode 100755
index 0000000..f5eb87b
--- /dev/null
+++ b/emacs-lisp/auctex/DEPENDS
@@ -0,0 +1,3 @@
+depends EMACS &&
+depends texlive &&
+depends texlive-texmf --with-texmf-dir=/usr/share/texmf
diff --git a/emacs-lisp/auctex/DETAILS b/emacs-lisp/auctex/DETAILS
new file mode 100755
index 0000000..54dd202c
--- /dev/null
+++ b/emacs-lisp/auctex/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=auctex
+ VERSION=11.87
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SOURCE}.sig
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=${GNU_URL}/${SPELL}/${SOURCE}
+ SOURCE2_URL[0]=${GNU_URL}/${SPELL}/${SOURCE2}
+ SOURCE_GPG=gnu.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=http://www.gnu.org/software/auctex/
+ LICENSE[0]=GPL
+ ENTERED=20010922
+ KEYWORDS="latex emacs tex editors"
+ SHORT="AUC TeX is a LaTeX enviroment for emacs"
+cat << EOF
+AUC TeX is an extensible package that supports writing and formatting TeX
+files for most variants of GNU Emacs. Many different macro packages are
+supported, including AMS TeX, LaTeX, and TeXinfo
+EOF
diff --git a/emacs-lisp/auctex/HISTORY b/emacs-lisp/auctex/HISTORY
new file mode 100644
index 0000000..12cd7c5
--- /dev/null
+++ b/emacs-lisp/auctex/HISTORY
@@ -0,0 +1,86 @@
+2014-06-24 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 11.87
+ * DEPENDS: needs texlive-texmf
+
+2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: switch from tetex to texlive [auto]
+
+2007-05-01 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 11.84
+ * DEPENDS: needs tetex
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-06-25 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 11.83
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-12-23 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 11.82
+
+2005-12-13 Pieter Lenaerts <e-type AT sourcemage.org>
+ * added CONFLICTS preview-latex: preview-latex is included in auctex
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-10-01 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 11.81
+
+2005-08-28 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * DETAILS: Added upstream GPG checking via gnu.gpg.
+
+2005-02-23 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: version 11.55
+
+2005-02-10 Andrew Stitt <astitt AT sourcemage.org>
+ * DEPENDS: requires is depreciated, use depends
+
+2005-01-13 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: v 11.54
+
+2004-08-17 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: version 11.53
+ * DEPENDS: requires EMACS
+
+2004-08-17 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: version 11.51
+
+2004-08-16 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: version 11.50
+ * DETAILS: changed website to http://www.gnu.org/software/auctex/
+ * DETAILS: changed SOURCE_URL to
http://ftp.gnu.org/pub/gnu/${SPELL}/${SOURCE}
+ * BUILD, PRE_BUILD deleted, default_build and default_install suffice
+
+2004-06-17 Pieter Lenaerts <e-type AT sourcemage.org>
+ * Converted to BUILD_API 2
+ * Updated to 11.14
+ * Changed download url to http://ftp.gnu.org/pub/gnu/auctex/11.14/
+
+2003-05-25 Richard Becker <beri AT craban.net>
+ * Updated to 11.13
+ * Changed website to http://www.gnu.org/software/auctex/
+ * Changed download url to
http://savannah.gnu.org/download/auctex/stable.pkg/
+
+2002-07-17 Eric Sandall <sandalle AT sourcemage.org>
+ * Changed website to http://mirrors.sunsite.dk/auctex/www/auctex/
+ * Added LICENSE
+
+2002-06-14 Eric Sandall <sandalle AT sourcemage.org>
+ * Added MD5 entry to DETAILS
+
+2002-05-29 Eric Sandall <sandalle AT sourcemage.org>
+ * Works with gcc3
+
+2002-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * Received auctex for inclusion in editors
+ * PRE_BUILD : Modified to create $SOURCE_DIRECTORY and unpack $SOURCE
+ * BUILD : Removed 'cd $SOURCE_DIRECTORY' as it's unneeded
+ * DETAILS : Updated UPDATED field
+
+2002-04-20 Joel Mayes <anonymous AT sourcemage.org>
+ * Initial spell creation
+
diff --git a/emacs-lisp/autopair/DEPENDS b/emacs-lisp/autopair/DEPENDS
new file mode 100755
index 0000000..ce886b1
--- /dev/null
+++ b/emacs-lisp/autopair/DEPENDS
@@ -0,0 +1 @@
+depends EMACS
diff --git a/emacs-lisp/autopair/DETAILS b/emacs-lisp/autopair/DETAILS
new file mode 100755
index 0000000..c6aeff7
--- /dev/null
+++ b/emacs-lisp/autopair/DETAILS
@@ -0,0 +1,25 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=autopair
+ VERSION=$(get_scm_version)
+ SOURCE="${SPELL}-git.tar.bz2"
+ SOURCE_URL[0]=git://github.com/capitaomorte/$SPELL.git
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ WEB_SITE="https://github.com/capitaomorte/$SPELL";
+ LICENSE[0]="GPLv3+"
+ ENTERED=20140708
+ KEYWORDS=""
+ SHORT="Automagically pair braces and quotes"
+cat << EOF
+Autopair is an extension to the Emacs text editor that automatically pairs
+braces and quotes:
+
+ Opening braces/quotes are autopaired; Closing braces/quotes are
+ autoskipped; Backspacing an opening brace/quote autodeletes its pair.
+ Newline between newly-opened brace pairs open an extra indented line.
+
+Autopair works well across all Emacs major-modes, deduces from the language's
+syntax table which characters to pair, skip or delete. It should work even
+with extensions that redefine such keys.
+EOF
diff --git a/emacs-lisp/autopair/HISTORY b/emacs-lisp/autopair/HISTORY
new file mode 100644
index 0000000..8f8547b
--- /dev/null
+++ b/emacs-lisp/autopair/HISTORY
@@ -0,0 +1,2 @@
+2014-07-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/autopair/PREPARE b/emacs-lisp/autopair/PREPARE
new file mode 100755
index 0000000..86a5079
--- /dev/null
+++ b/emacs-lisp/autopair/PREPARE
@@ -0,0 +1,2 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/emacs-lisp/clojure-mode/DETAILS b/emacs-lisp/clojure-mode/DETAILS
index 94bf4ac..852ca44 100755
--- a/emacs-lisp/clojure-mode/DETAILS
+++ b/emacs-lisp/clojure-mode/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=clojure-mode
-if [ "$CLOJURE_MODE_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/technomancy/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/clojure-mode/HISTORY b/emacs-lisp/clojure-mode/HISTORY
index c17eca9..a6d9c90 100644
--- a/emacs-lisp/clojure-mode/HISTORY
+++ b/emacs-lisp/clojure-mode/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/cluck/DETAILS b/emacs-lisp/cluck/DETAILS
index 8b04e1f..39b4df6 100755
--- a/emacs-lisp/cluck/DETAILS
+++ b/emacs-lisp/cluck/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=cluck
-if [ "$CLUCK_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/ddp/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/cluck/HISTORY b/emacs-lisp/cluck/HISTORY
index ff0ee4f..2668c33 100644
--- a/emacs-lisp/cluck/HISTORY
+++ b/emacs-lisp/cluck/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/coffee-mode/DETAILS b/emacs-lisp/coffee-mode/DETAILS
index 71b7bad..00435dc 100755
--- a/emacs-lisp/coffee-mode/DETAILS
+++ b/emacs-lisp/coffee-mode/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=coffee-mode
-if [ "$COFFEE_MODE_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/defunkt/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/coffee-mode/HISTORY b/emacs-lisp/coffee-mode/HISTORY
index c17eca9..a6d9c90 100644
--- a/emacs-lisp/coffee-mode/HISTORY
+++ b/emacs-lisp/coffee-mode/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/egg/DETAILS b/emacs-lisp/egg/DETAILS
index 9bda953..3b0003e 100755
--- a/emacs-lisp/egg/DETAILS
+++ b/emacs-lisp/egg/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=egg
-if [ "$EGG_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/byplayer/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/egg/HISTORY b/emacs-lisp/egg/HISTORY
index ff0ee4f..2668c33 100644
--- a/emacs-lisp/egg/HISTORY
+++ b/emacs-lisp/egg/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/emacs-goodies-el/DETAILS
b/emacs-lisp/emacs-goodies-el/DETAILS
index a761b80..350a5fc 100755
--- a/emacs-lisp/emacs-goodies-el/DETAILS
+++ b/emacs-lisp/emacs-goodies-el/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=emacs-goodies-el
-if [ "$EMACS_GOODIES_EL_AUTOUPDATE" = y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE="$SPELL-scm.tar.bz2"

SOURCE_URL[0]=cvs://:pserver:anonymous AT anonscm.debian.org:/cvs/pkg-goodies-el:$SPELL:HEAD
SOURCE_IGNORE=volatile
diff --git a/emacs-lisp/emacs-goodies-el/HISTORY
b/emacs-lisp/emacs-goodies-el/HISTORY
index 23befb1..ba776d6 100644
--- a/emacs-lisp/emacs-goodies-el/HISTORY
+++ b/emacs-lisp/emacs-goodies-el/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-19 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created

diff --git a/emacs-lisp/fill-column-indicator/DETAILS
b/emacs-lisp/fill-column-indicator/DETAILS
index 3e0be53..5d96d3a 100755
--- a/emacs-lisp/fill-column-indicator/DETAILS
+++ b/emacs-lisp/fill-column-indicator/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fill-column-indicator
-if [ "$FILL_COLUMN_INDICATOR_AUTOUPDATE" = y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"

SOURCE_URL[0]=git://github.com/alpaker/Fill-Column-Indicator.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/fill-column-indicator/HISTORY
b/emacs-lisp/fill-column-indicator/HISTORY
index 2e32b80..20fb631 100644
--- a/emacs-lisp/fill-column-indicator/HISTORY
+++ b/emacs-lisp/fill-column-indicator/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-11-08 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/haml-mode/DETAILS b/emacs-lisp/haml-mode/DETAILS
index d972296..461cd25 100755
--- a/emacs-lisp/haml-mode/DETAILS
+++ b/emacs-lisp/haml-mode/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=haml-mode
-if [ "$HAML_MODE_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/nex3/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/haml-mode/HISTORY b/emacs-lisp/haml-mode/HISTORY
index 0262cbb..3f9b3dc 100644
--- a/emacs-lisp/haml-mode/HISTORY
+++ b/emacs-lisp/haml-mode/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/identica-mode/DETAILS
b/emacs-lisp/identica-mode/DETAILS
index ac735b6..cfde214 100755
--- a/emacs-lisp/identica-mode/DETAILS
+++ b/emacs-lisp/identica-mode/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=identica-mode
-if [ "$IDENTICA_MODE_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://git.sv.gnu.org/${SPELL}.git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/identica-mode/HISTORY
b/emacs-lisp/identica-mode/HISTORY
index 98947ec..98b8e8f 100644
--- a/emacs-lisp/identica-mode/HISTORY
+++ b/emacs-lisp/identica-mode/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/scss-mode/DETAILS b/emacs-lisp/scss-mode/DETAILS
index b97dd35..c0ae588 100755
--- a/emacs-lisp/scss-mode/DETAILS
+++ b/emacs-lisp/scss-mode/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=scss-mode
-if [ "$SCSS_MODE_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/antonj/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/scss-mode/HISTORY b/emacs-lisp/scss-mode/HISTORY
index c17eca9..a6d9c90 100644
--- a/emacs-lisp/scss-mode/HISTORY
+++ b/emacs-lisp/scss-mode/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/sinatra_el/DETAILS b/emacs-lisp/sinatra_el/DETAILS
index e684fce..0f7e571 100755
--- a/emacs-lisp/sinatra_el/DETAILS
+++ b/emacs-lisp/sinatra_el/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=sinatra_el
-if [ "$SINATRA_EL_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/eschulte/${SPELL}.git:${SPELL}-git
FORCE_DOWNLOAD=on
diff --git a/emacs-lisp/sinatra_el/HISTORY b/emacs-lisp/sinatra_el/HISTORY
index 0262cbb..3f9b3dc 100644
--- a/emacs-lisp/sinatra_el/HISTORY
+++ b/emacs-lisp/sinatra_el/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Use prepare_select_branch

diff --git a/emacs-lisp/visual-regexp/DEPENDS
b/emacs-lisp/visual-regexp/DEPENDS
new file mode 100755
index 0000000..ce886b1
--- /dev/null
+++ b/emacs-lisp/visual-regexp/DEPENDS
@@ -0,0 +1 @@
+depends EMACS
diff --git a/emacs-lisp/visual-regexp/DETAILS
b/emacs-lisp/visual-regexp/DETAILS
new file mode 100755
index 0000000..8d9d2dd
--- /dev/null
+++ b/emacs-lisp/visual-regexp/DETAILS
@@ -0,0 +1,26 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=visual-regexp
+ VERSION=$(get_scm_version)
+ SOURCE="${SPELL}-git.tar.bz2"
+ SOURCE_URL[0]=git://github.com/benma/$SPELL.el.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ WEB_SITE="https://github.com/benma/visual-regexp.el/";
+ LICENSE[0]="GPLv3+"
+ ENTERED=20140708
+ KEYWORDS=""
+ SHORT="A regexp/replace command for Emacs with interactive visual
feedback"
+cat << EOF
+visual-regexp for Emacs is like `replace-regexp`, but with live visual
+feedback directly in the buffer.
+
+While constructing the regexp in the minibuffer, you get live visual feedback
+for the matches, including group matches.
+
+While constructing the replacement in the minibuffer, you get live visual
+feedback for the replacements.
+
+It can be used to replace all matches in one go (like `replace-regexp`),
+or a decision can be made on each match (like `query-replace-regexp`).
+EOF
diff --git a/emacs-lisp/visual-regexp/HISTORY
b/emacs-lisp/visual-regexp/HISTORY
new file mode 100644
index 0000000..88b8ca8
--- /dev/null
+++ b/emacs-lisp/visual-regexp/HISTORY
@@ -0,0 +1,3 @@
+2014-07-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/emacs-lisp/visual-regexp/PREPARE
b/emacs-lisp/visual-regexp/PREPARE
new file mode 100755
index 0000000..86a5079
--- /dev/null
+++ b/emacs-lisp/visual-regexp/PREPARE
@@ -0,0 +1,2 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/fonts-x11/terminus-font/DEPENDS b/fonts-x11/terminus-font/DEPENDS
index 06ae8bd..4fceecb 100755
--- a/fonts-x11/terminus-font/DEPENDS
+++ b/fonts-x11/terminus-font/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends perl &&
depends bdftopcf &&

diff --git a/fonts-x11/terminus-font/DETAILS b/fonts-x11/terminus-font/DETAILS
index b743851..c7bf7b2 100755
--- a/fonts-x11/terminus-font/DETAILS
+++ b/fonts-x11/terminus-font/DETAILS
@@ -1,9 +1,9 @@
SPELL=terminus-font
- VERSION=4.38
+ VERSION=4.39
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL-$VERSION/$SOURCE/download
-
SOURCE_HASH=sha512:e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5
+
SOURCE_HASH=sha512:d2b1c55584eabf423a455ea11d90ba8037b4e5823c677a8c604de1e41c55d829b743db2d1932cd755064db681fcd0b5be8484439ddde4394955d0af5174ff591
WEB_SITE=http://terminus-font.sourceforge.net/
ENTERED=20050720
LICENSE[0]=GPL
diff --git a/fonts-x11/terminus-font/HISTORY b/fonts-x11/terminus-font/HISTORY
index 4524e98..5d6d20e 100644
--- a/fonts-x11/terminus-font/HISTORY
+++ b/fonts-x11/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.39
+
2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: Proper download link

diff --git a/fonts-x11/ttf-mensch/BUILD b/fonts-x11/ttf-mensch/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-mensch/BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ttf-mensch/DEPENDS b/fonts-x11/ttf-mensch/DEPENDS
new file mode 100755
index 0000000..ebcc0be
--- /dev/null
+++ b/fonts-x11/ttf-mensch/DEPENDS
@@ -0,0 +1 @@
+. $SECTION_DIRECTORY/X11_DEPENDS
diff --git a/fonts-x11/ttf-mensch/DETAILS b/fonts-x11/ttf-mensch/DETAILS
new file mode 100755
index 0000000..cc9601c
--- /dev/null
+++ b/fonts-x11/ttf-mensch/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=ttf-mensch
+ VERSION=1
+ SOURCE_IGNORE=unversioned
+ SOURCE="mensch.ttf"
+ SOURCE_URL[0]=http://robey.lag.net/downloads/${SOURCE}
+
SOURCE_HASH=sha512:5525beb76b4d49bd1cb4cfb105d513ebe5e6e7c2faa9c66967440c7a849587c74b8568fa2b81d4500e776078a35f70cf83d28dd6d670e9ae91bb69ece36a3c53
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://robey.lag.net/2010/06/21/mensch-font.html";
+ LICENSE[0]=Freely Distributable
+ ENTERED=20140518
+ SHORT="a console font based on MacOS X's Menlo font"
+cat << EOF
+The latest MacOS release (10.6, or “Snow Leopard”) comes with a new
+monospace font. It’s called “Menlo” and it’s a slightly modified
+form of the standard Linux font (with appropriately weightly Linux name)
+“DejaVu Sans Serif Mono”, which is itself an updated form of Bitstream
+Vera Sans Mono. Apple’s modifications are a definite improvement to my
+eyes, mostly because they thicken up some of the wispier glyphs from DejaVu,
+like the underline and period.
+
+The Mensch font is based on Menlo and is modified as follows:
+
+ * Zero is back to being a circle with a dot in the middle. * The
+ ampersand’s loop was closed. That was also bugging me. * Three is rendered
+ in the gothic style, because the gothic style is clearly
+ superior.
+ * Lowercase L is drawn in a more traditional style (the Menlo variant looks
+ bizarre to me), and one is turned gothic. I think the original artist
+ drew the L weirdly to make it extremely clear that it’s not a one, but
+ if you draw a gothic one, the difference is obvious even with a simpler L.
+ * The bang, question, lowercase I, and lowercase J are made friendlier by
+ turning the dots into actual circles, not just blocks.
+ * Angle brackets are embiggened to facilitate languages like Java and C++
that
+ use them to enclose class names. They parallel parens and square brackets
+ in size now.
+ * Q and lowercase Q are made more distinct. Lowercase Q gets a little more
+ spunk. (This was a bit gratuitous.)
+EOF
diff --git a/fonts-x11/ttf-mensch/HISTORY b/fonts-x11/ttf-mensch/HISTORY
new file mode 100644
index 0000000..8c397e5
--- /dev/null
+++ b/fonts-x11/ttf-mensch/HISTORY
@@ -0,0 +1,3 @@
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/fonts-x11/ttf-mensch/INSTALL b/fonts-x11/ttf-mensch/INSTALL
new file mode 100755
index 0000000..aaf22b8
--- /dev/null
+++ b/fonts-x11/ttf-mensch/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/fonts/TTF/ &&
+install -m644 ${SOURCE_CACHE}/mensch.ttf ${INSTALL_ROOT}/usr/share/fonts/TTF/
diff --git a/fonts-x11/ttf-mensch/PRE_BUILD b/fonts-x11/ttf-mensch/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-mensch/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ttf-monofur/BUILD b/fonts-x11/ttf-monofur/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-monofur/BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ttf-monofur/DEPENDS b/fonts-x11/ttf-monofur/DEPENDS
new file mode 100755
index 0000000..007dc92
--- /dev/null
+++ b/fonts-x11/ttf-monofur/DEPENDS
@@ -0,0 +1 @@
+depends smgl-foma
diff --git a/fonts-x11/ttf-monofur/DETAILS b/fonts-x11/ttf-monofur/DETAILS
new file mode 100755
index 0000000..f41e432
--- /dev/null
+++ b/fonts-x11/ttf-monofur/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=ttf-monofur
+ VERSION=1.0
+ SOURCE="mono_tt.zip"
+ SOURCE_URL[0]='http://img.dafont.com/dl/?f=monofur'
+
SOURCE_HASH=sha512:0b18dcb9af20822ff31efeafe719187605054571c1f6fbff4f48dc34c8f01557c1bedd6384c23e4e6d8de6110c7edae7541505dee88aab08a08259659151fffe
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ttf-monofur"
+ WEB_SITE='http://www.dafont.com/monofur.font'
+ LICENSE[0]=PD
+ ENTERED=20140607
+ KEYWORDS=""
+ SHORT="a monospaced font"
+cat << EOF
+A monospaced font derived from the eurofurence typeface family.
+EOF
diff --git a/fonts-x11/ttf-monofur/HISTORY b/fonts-x11/ttf-monofur/HISTORY
new file mode 100644
index 0000000..955ef60
--- /dev/null
+++ b/fonts-x11/ttf-monofur/HISTORY
@@ -0,0 +1,2 @@
+2014-06-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/fonts-x11/ttf-monofur/INSTALL b/fonts-x11/ttf-monofur/INSTALL
new file mode 100755
index 0000000..4060c63
--- /dev/null
+++ b/fonts-x11/ttf-monofur/INSTALL
@@ -0,0 +1,6 @@
+local FONT_DIR=${INSTALL_ROOT}/usr/share/fonts/X11/TTF
+local DOC_DIR=${INSTALL_ROOT}/usr/share/doc/${SPELL}
+install -d ${DOC_DIR} &&
+install -d ${FONT_DIR} &&
+install -t ${DOC_DIR} ${SOURCE_DIRECTORY}/*.txt &&
+install -t ${FONT_DIR} ${SOURCE_DIRECTORY}/*.ttf
diff --git a/fonts-x11/ttf-monofur/PRE_BUILD b/fonts-x11/ttf-monofur/PRE_BUILD
new file mode 100755
index 0000000..471ef66
--- /dev/null
+++ b/fonts-x11/ttf-monofur/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file
diff --git a/fonts-x11/unifont/DETAILS b/fonts-x11/unifont/DETAILS
index a0c405b..f6d551e 100755
--- a/fonts-x11/unifont/DETAILS
+++ b/fonts-x11/unifont/DETAILS
@@ -1,8 +1,8 @@
SPELL=unifont
- VERSION=5.1.20080907
- SOURCE="${SPELL}-${VERSION}.ttf.gz"
- SOURCE_URL[0]=http://unifoundry.com/${SOURCE}
-
SOURCE_HASH=sha512:5f4db26b24d57706fba01cf1419d82f1f323bb8d8b564ec0dba13e7faee3c8d897bbc589f1ecab891ae228b54efcad3675575296b944b0014f548a2c4eb6203e
+ VERSION=7.0.03
+
SOURCE_HASH=sha512:d720f2a8004f7965f8a3dbce8151fe7543ae0d3bcb82311e9d82565db7e83006615261b6ebefe91512de8c959bdbe41cdfb27c911481a7f07a606885d2abddfb
+ SOURCE="${SPELL}-${VERSION}.ttf"
+ SOURCE_URL[0]=$GNU_URL/$SPELL/${SPELL}-${VERSION}/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://unifoundry.com/unifont.html";
LICENSE[0]=GPL/PD
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
SHORT="GNU Unifont Glyphs"
cat << EOF
This spell contains the latest release of the GNU Unifont, with glyphs for
-every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
+every printable code point in the Unicode 7.0 Basic Multilingual Plane (BMP).
The BMP occupies the first 65,536 code points of the Unicode space, denoted
as U+0000..U+FFFF.
EOF
diff --git a/fonts-x11/unifont/HISTORY b/fonts-x11/unifont/HISTORY
index 3078640..a665d72 100644
--- a/fonts-x11/unifont/HISTORY
+++ b/fonts-x11/unifont/HISTORY
@@ -1,2 +1,10 @@
+2014-07-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS version 7.0.03
+ use GNU_URL
+ * PRE_BUILD: do not unzip
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS version 6.3.20140214
+
2011-05-27 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/fonts-x11/unifont/PRE_BUILD b/fonts-x11/unifont/PRE_BUILD
index 7068fee..9e12afa 100755
--- a/fonts-x11/unifont/PRE_BUILD
+++ b/fonts-x11/unifont/PRE_BUILD
@@ -1,5 +1,4 @@
mkdir "${SOURCE_DIRECTORY}" &&
cd "${SOURCE_DIRECTORY}" &&
verify_file &&
-cp "${SOURCE_CACHE}/${SOURCE}" ./ &&
-gunzip ${SOURCE}
+cp "${SOURCE_CACHE}/${SOURCE}" ./
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..2d4842f 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -1,30 +1,36 @@
+depends gmp &&
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..e5b3f7b 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,14 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: gmp
+
+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/fatrat/DETAILS b/ftp/fatrat/DETAILS
index eed0a4d..3a881f1 100755
--- a/ftp/fatrat/DETAILS
+++ b/ftp/fatrat/DETAILS
@@ -1,27 +1,19 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fatrat

if [[ $FATRAT_BRANCH == scm ]]; then
-
- if [[ $FATRAT_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
-
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.dolezel.info/fatrat.git
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
-
else
-
VERSION=1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.dolezel.info/download/data/fatrat/$SOURCE

SOURCE_HASH=sha512:b8231c5e2490b451217ff19e0d29b8fa28e4fd912785c64ff0957d5fd40476af5d0769ad0b1df48fab3c48fab209b2a1dc72935b3514b4a250a7c16b62c42c53
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
fi

WEB_SITE=http://fatrat.dolezel.info/
diff --git a/ftp/fatrat/HISTORY b/ftp/fatrat/HISTORY
index 241c0a4..c953d60 100644
--- a/ftp/fatrat/HISTORY
+++ b/ftp/fatrat/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

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/imapsync/DEPENDS b/ftp/imapsync/DEPENDS
index cef08d7..cda471e 100755
--- a/ftp/imapsync/DEPENDS
+++ b/ftp/imapsync/DEPENDS
@@ -3,5 +3,5 @@ depends mail-imapclient &&
depends digest-md5 &&
depends term-readkey &&
depends io-socket-ssl &&
-depends date-manip
-
+depends date-manip &&
+depends file-copy-recursive
diff --git a/ftp/imapsync/DETAILS b/ftp/imapsync/DETAILS
index 4bd2dd8..1076ce1 100755
--- a/ftp/imapsync/DETAILS
+++ b/ftp/imapsync/DETAILS
@@ -1,10 +1,10 @@
SPELL=imapsync
- VERSION=1.267
-
SOURCE_HASH=sha512:5cf124db38c0fd99ab214741d1759c48e4fc24f08365d8eb70c833964b90ef6c980731728ccced2276beb007e4763dda64cf6e5f4d550f8b729509d3cbd76ace
+ VERSION=1.584
+
SOURCE_HASH=sha512:8978cc999b9af38b8d135a226456f858e265e21b138990b926d8b569088ccafc035dba9426f1a7f0d1027ef5e4432eec9ad113d8eb18c00c199afa3fb803eebe
SOURCE=${SPELL}-$VERSION.tgz
- SOURCE_URL[0]=http://www.linux-france.org/prj/imapsync/dist/$SOURCE
+ SOURCE_URL[0]=https://fedorahosted.org/released/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- WEB_SITE=http://www.linux-france.org/prj/imapsync/
+ WEB_SITE=http://imapsync.lamiral.info/
ENTERED=20081015
LICENSE[0]=GPL
KEYWORDS="mail imap sync"
diff --git a/ftp/imapsync/HISTORY b/ftp/imapsync/HISTORY
index 09e2333..d110124 100644
--- a/ftp/imapsync/HISTORY
+++ b/ftp/imapsync/HISTORY
@@ -1,3 +1,8 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Depends on file-copy-recursive
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.584
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap

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/ncdc/DETAILS b/ftp/ncdc/DETAILS
index a5502ab..d70ac33 100755
--- a/ftp/ncdc/DETAILS
+++ b/ftp/ncdc/DETAILS
@@ -1,5 +1,5 @@
SPELL=ncdc
- VERSION=1.19
+ VERSION=1.19.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://dev.yorhel.nl/download/$SOURCE
diff --git a/ftp/ncdc/HISTORY b/ftp/ncdc/HISTORY
index 1562589..ad3be52 100644
--- a/ftp/ncdc/HISTORY
+++ b/ftp/ncdc/HISTORY
@@ -1,3 +1,6 @@
+2014-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.19.1
+
2014-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.19
* DEPENDS: added optional geoip support
diff --git a/ftp/proftpd/CONFIGURE b/ftp/proftpd/CONFIGURE
index ac57f9c..c596720 100755
--- a/ftp/proftpd/CONFIGURE
+++ b/ftp/proftpd/CONFIGURE
@@ -26,12 +26,13 @@ config_query PROFTPD_MOD "Choose optional user
contributed modules to install?"

if [[ $PROFTPD_MOD == "y" ]]; then
local MODULES="mod_copy \
- mod_deflate \
+ mod_dnsbl \
mod_dynmasq \
mod_exec \
mod_ifsession \
mod_ifversion \
mod_load \
+ mod_log_forensic \
mod_qos \
mod_quotatab \
mod_ratio \
@@ -39,6 +40,7 @@ if [[ $PROFTPD_MOD == "y" ]]; then
mod_rewrite \
mod_sftp \
mod_site_misc \
+ mod_snmp \
mod_sql \
mod_tls \
mod_unique_id \
diff --git a/ftp/proftpd/DEPENDS b/ftp/proftpd/DEPENDS
index a45290b..203f7bb 100755
--- a/ftp/proftpd/DEPENDS
+++ b/ftp/proftpd/DEPENDS
@@ -1,5 +1,12 @@
-if list_find "$PROFTPD_MODS" "mod_deflate"; then
- depends zlib
+# handle 'n' selection for modules in CONFIGURE
+if [[ $PROFTPD_MOD == n ]]; then
+ persistent_add PROFTPD_MODS
+fi
+
+optional_depends zlib "" "" "to build mod_deflate module" &&
+
+if is_depends_enabled $SPELL zlib; then
+ list_add "PROFTPD_MODS" "mod_deflate"
fi &&

if list_find "$PROFTPD_MODS" "mod_sql"; then
@@ -33,22 +40,28 @@ 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 &&

-if list_find "$PROFTPD_OPTS" "mod_sftp_pam"; then
+if list_find "$PROFTPD_MODS" "mod_sftp_pam"; then
depends linux-pam
fi &&

-if list_find "$PROFTPD_OPTS" "mod_tls_memcache"; then
+if list_find "$PROFTPD_MODS" "mod_tls_memcache"; then
depends libmemcached
fi &&

+optional_depends geoip "" "" "to build mod_geoip module" &&
+
+if is_depends_enabled $SPELL geoip; then
+ list_add "PROFTPD_MODS" "mod_geoip"
+fi &&
+
optional_depends openldap "" "" "to build mod_ldap module" &&

if is_depends_enabled $SPELL openldap; then
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 2ccc036..f7aa3bc 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,5 +1,5 @@
SPELL=proftpd
- VERSION=1.3.4d
+ VERSION=1.3.5
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 85e0acb..c023499 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,13 @@
+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
+ * DEPENDS: fixed mod variable for mod_sftp_pam & mod_tls_memcache;
added
+ geoip optional dependency for mod_geoip; properly handle modules
list
+ * ldap-cert.patch: updated for 1.3.5
+
2013-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.4d

diff --git a/ftp/proftpd/ldap-cert.patch b/ftp/proftpd/ldap-cert.patch
index f4fee22..6333238 100644
--- a/ftp/proftpd/ldap-cert.patch
+++ b/ftp/proftpd/ldap-cert.patch
@@ -1,6 +1,6 @@
---- contrib/mod_ldap.c.orig 2011-05-24 00:56:40.000000000 +0400
-+++ contrib/mod_ldap.c 2012-07-31 15:14:59.181954021 +0400
-@@ -161,7 +161,14 @@
+--- contrib/mod_ldap.c.orig 2013-11-24 04:45:28.000000000 +0400
++++ contrib/mod_ldap.c 2014-05-16 13:13:12.326617345 +0400
+@@ -142,7 +142,14 @@
*ldap_attr_memberuid = "memberUid",
*ldap_attr_ftpquota = "ftpQuota",
*ldap_attr_ftpquota_profiledn = "ftpQuotaProfileDN",
@@ -16,25 +16,25 @@
#ifdef HAS_LDAP_INITIALIZE
static char *ldap_server_url;
#endif /* HAS_LDAP_INITIALIZE */
-@@ -171,7 +178,9 @@
- ldap_forcedefaultuid = 0, ldap_forcedefaultgid = 0,
- ldap_forcegenhdir = 0, ldap_protocol_version = 3,
+@@ -152,7 +159,9 @@
+ ldap_forcedefaultuid = FALSE, ldap_forcedefaultgid = FALSE,
+ ldap_forcegenhdir = FALSE, ldap_protocol_version = 3,
ldap_dereference = LDAP_DEREF_NEVER,
- ldap_search_scope = LDAP_SCOPE_SUBTREE;
+ ldap_search_scope = LDAP_SCOPE_SUBTREE,
+ ldap_tls_crl_check = -1,
+ ldap_tls_require_cert = -1;
- static struct timeval ldap_querytimeout_tp;

- static uid_t ldap_defaultuid = -1;
-@@ -214,6 +223,86 @@
+ static struct timeval ldap_querytimeout_tv;
+ #define PR_LDAP_QUERY_TIMEOUT_DEFAULT 5
+@@ -196,6 +205,86 @@
struct berval bindcred;
#endif

+ if (ldap_tls_ca_cert_dir) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR,
ldap_tls_ca_cert_dir);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTDIR option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR,
ldap_tls_ca_cert_dir);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTDIR option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -42,9 +42,9 @@
+ }
+
+ if (ldap_tls_ca_cert_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
ldap_tls_ca_cert_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
ldap_tls_ca_cert_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CACERTFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -52,9 +52,9 @@
+ }
+
+ if (ldap_tls_cert_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE,
ldap_tls_cert_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CERTFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE,
ldap_tls_cert_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CERTFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -62,9 +62,9 @@
+ }
+
+ if (ldap_tls_cipher_suite) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE,
ldap_tls_cipher_suite);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CIPHER_SUITE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE,
ldap_tls_cipher_suite);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CIPHER_SUITE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -72,9 +72,9 @@
+ }
+
+ if (ldap_tls_dh_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_DHFILE, ldap_tls_dh_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_DHFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_DHFILE, ldap_tls_dh_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_DHFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -82,9 +82,9 @@
+ }
+
+ if (ldap_tls_key_file) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ldap_tls_key_file);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_KEYFILE option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ldap_tls_key_file);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_KEYFILE option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -92,9 +92,9 @@
+ }
+
+ if (ldap_tls_crl_check != -1) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CRLCHECK, (void
*)&ldap_tls_crl_check);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CRLCHECK option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_CRLCHECK, (void
*)&ldap_tls_crl_check);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_CRLCHECK option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -102,9 +102,9 @@
+ }
+
+ if (ldap_tls_require_cert != -1) {
-+ ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, (void
*)&ldap_tls_require_cert);
-+ if (ret != LDAP_OPT_SUCCESS) {
-+ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_REQUIRE_CERT option failed: %s", ldap_err2string(ret));
++ res = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, (void
*)&ldap_tls_require_cert);
++ if (res != LDAP_OPT_SUCCESS) {
++ pr_log_pri(PR_LOG_ERR, MOD_LDAP_VERSION ": pr_ldap_connect(): Setting
LDAP_OPT_X_TLS_REQUIRE_CERT option failed: %s", ldap_err2string(res));
+ pr_ldap_unbind();
+ return -1;
+ }
@@ -112,9 +112,9 @@
+ }
+
#ifdef HAS_LDAP_INITIALIZE
- pr_log_debug(DEBUG3, MOD_LDAP_VERSION ": attempting connection to %s",
ldap_server_url ? ldap_server_url : "(null)");
-
-@@ -1876,6 +1965,130 @@
+ (void) pr_log_writefile(ldap_logfd, MOD_LDAP_VERSION,
+ "attempting connection to URL %s",
+@@ -2029,6 +2118,130 @@
return PR_HANDLED(cmd);
}

@@ -242,10 +242,10 @@
+ return PR_HANDLED(cmd);
+}
+
- static int
- ldap_getconf(void)
- {
-@@ -2060,6 +2273,22 @@
+ /* Initialization routines
+ */
+
+@@ -2279,6 +2492,22 @@
}
}

@@ -268,19 +268,20 @@
return 0;
}

-@@ -2093,6 +2322,15 @@
- { "LDAPForceGeneratedHomedir", set_ldap_forcegenhdir, NULL },
- { "LDAPDefaultQuota", set_ldap_defaultquota, NULL },
- { "LDAPGroups", set_ldap_grouplookups, NULL },
-+ { "LDAPTLSCACertDir", set_ldap_tls_ca_cert_dir, NULL },
-+ { "LDAPTLSCACertFile", set_ldap_tls_ca_cert_file, NULL },
-+ { "LDAPTLSCertFile", set_ldap_tls_cert_file, NULL },
-+ { "LDAPTLSCipherSuite", set_ldap_tls_cipher_suite, NULL },
-+ { "LDAPTLSCrlCheck", set_ldap_tls_crl_check, NULL },
-+ { "LDAPTLSCrlFile", set_ldap_tls_crl_file, NULL },
-+ { "LDAPTLSDHFile", set_ldap_tls_dh_file, NULL },
-+ { "LDAPTLSKeyFile", set_ldap_tls_key_file, NULL },
-+ { "LDAPTLSRequireCert", set_ldap_tls_require_cert, NULL },
+@@ -2309,7 +2538,15 @@
+ { "LDAPServer", set_ldapserver, NULL },
+ { "LDAPUsers", set_ldapuserlookups, NULL },
+ { "LDAPUseTLS", set_ldapusetls, NULL },
+-
++ { "LDAPTLSCACertDir", set_ldap_tls_ca_cert_dir, NULL
},
++ { "LDAPTLSCACertFile", set_ldap_tls_ca_cert_file, NULL },
++ { "LDAPTLSCertFile", set_ldap_tls_cert_file, NULL
},
++ { "LDAPTLSCipherSuite", set_ldap_tls_cipher_suite, NULL },
++ { "LDAPTLSCrlCheck", set_ldap_tls_crl_check, NULL
},
++ { "LDAPTLSCrlFile", set_ldap_tls_crl_file, NULL },
++ { "LDAPTLSDHFile", set_ldap_tls_dh_file, NULL },
++ { "LDAPTLSKeyFile", set_ldap_tls_key_file, NULL },
++ { "LDAPTLSRequireCert", set_ldap_tls_require_cert, NULL },
{ NULL, NULL, NULL },
};

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/rsync/DETAILS b/ftp/rsync/DETAILS
index 9bb3a1e..0798429 100755
--- a/ftp/rsync/DETAILS
+++ b/ftp/rsync/DETAILS
@@ -1,17 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=rsync
if [[ $RSYNC_BRANCH == scm ]]; then
- if [[ $RSYNC_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.samba.org/$SPELL.git:$SPELL-git
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=3.0.9
+ VERSION=3.1.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY
index 4b33384..2bfeb35 100644
--- a/ftp/rsync/HISTORY
+++ b/ftp/rsync/HISTORY
@@ -1,3 +1,12 @@
+2014-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.1
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-24 Treeve Jelbert <treev AT pi.be>
+ * DETAILS: version 3.1.0
+
2011-09-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.9

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/DETAILS b/ftp/transmission/DETAILS
index 4c7d388..0939061 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,6 +1,6 @@
SPELL=transmission
- VERSION=2.82
- SECURITY_PATCH=1
+ VERSION=2.84
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://download.transmissionbt.com/files/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 03665ac..37e8574 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,12 @@
+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++
+
+2014-05-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.83
+
2013-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.82

diff --git a/ftp/transmission/transmission-2.82.tar.xz.sig
b/ftp/transmission/transmission-2.82.tar.xz.sig
deleted file mode 100644
index 650cd50..0000000
Binary files a/ftp/transmission/transmission-2.82.tar.xz.sig and /dev/null
differ
diff --git a/ftp/transmission/transmission-2.84.tar.xz.sig
b/ftp/transmission/transmission-2.84.tar.xz.sig
new file mode 100644
index 0000000..5ed119d
Binary files /dev/null and b/ftp/transmission/transmission-2.84.tar.xz.sig
differ
diff --git a/ftp/uget/BUILD b/ftp/uget/BUILD
new file mode 100755
index 0000000..981e094
--- /dev/null
+++ b/ftp/uget/BUILD
@@ -0,0 +1,5 @@
+if is_depends_enabled $SPELL gnutls; then
+ LDFLAGS="-lgcrypt $LDFLAGS"
+fi &&
+
+default_build
diff --git a/ftp/uget/DEPENDS b/ftp/uget/DEPENDS
index b6065cd..785a4ee 100755
--- a/ftp/uget/DEPENDS
+++ b/ftp/uget/DEPENDS
@@ -6,6 +6,11 @@ optional_depends curl \
"--disable-plugin-curl" \
"for cURL plug-in" &&

+optional_depends gnutls \
+ "--enable-gnutls" \
+ "--disable-gnutls" \
+ "for GnuTLS support" &&
+
optional_depends aria2 \
"--enable-plugin-aria2" \
"--disable-plugin-aria2" \
diff --git a/ftp/uget/DETAILS b/ftp/uget/DETAILS
index 75e268f..5347b51 100755
--- a/ftp/uget/DETAILS
+++ b/ftp/uget/DETAILS
@@ -1,10 +1,10 @@
SPELL=uget
- VERSION=1.10.3
+ VERSION=1.10.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/urlget/$SOURCE
-
SOURCE_HASH=sha512:c939832ad2b635e5b1d1e448bf075c13362e3f69f708e6669ad435f6467b258441d5adef34cea176082fa107865c2edd3ceb54c5b9074f0d71f94496e4995a34
+
SOURCE_HASH=sha512:013654ea6d06e8075bb216082dd85e7a4d1ed8510af4ecaf49c816dbf127f1adb157ca275a574f87900d7980cbe70e1e918fe54f0ceb4d0115da0ba07d4f2273
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE=http://uget.visuex.com/
+ WEB_SITE=http://ugetdm.com/
LICENSE[0]=LGPL
ENTERED=20100626
SHORT="download manager written in GTK+"
diff --git a/ftp/uget/HISTORY b/ftp/uget/HISTORY
index 0986b8b1..c802090 100644
--- a/ftp/uget/HISTORY
+++ b/ftp/uget/HISTORY
@@ -1,3 +1,8 @@
+2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.10.4; updated website
+ * DEPENDS: added gnutls optional dependency
+ * BUILD: added, to fix linker error when gnutls is enabled
+
2013-01-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.10.3

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..0cbdfaf 100755
--- a/ftp/wget/CONFIGURE
+++ b/ftp/wget/CONFIGURE
@@ -1,4 +1,9 @@
-config_query_list WGET_SSL "Which SSL backend do you want for https and
ftps?" none gnutls openssl &&
+if [[ "$WGET_SSL" == "openssl" ]]; then
+ WGET_SSL="SSL" &&
+ persistent_add WGET_SSL
+fi &&
+
+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..c024043 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -1,5 +1,6 @@
-depends gnupg &&
-depends smgl-fhs &&
+depends gnupg &&
+depends pcre &&
+depends smgl-fhs &&

optional_depends libidn \
"--enable-iri" \
@@ -19,15 +20,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..a863d52 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,18 @@
+2014-09-26 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFIGURE: properly migrate from openssl to SSL provider
+
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: pcre
+
+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/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index c35602e..abaa811 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -93,6 +93,6 @@ optional_depends psiconv '' '' 'for the psiconv (psion
conversion) plugin' &&
optional_depends gimp '' '' 'for the gimp plugin' &&

optional_depends tidy \
- "--with-libtidy" "--without-libtidy"' \
+ --with{,out}-libtidy \
"for HTML cleaning using tidy"

diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 25878ac..45cdd96 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2014-07-25 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Fix typo
+
2014-01-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated devel version to 3.0.0
* DEPENDS: updated depends, commented out currently broken backends
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/dia/DETAILS b/gnome2-apps/dia/DETAILS
index 33d0771..775352b 100755
--- a/gnome2-apps/dia/DETAILS
+++ b/gnome2-apps/dia/DETAILS
@@ -1,12 +1,12 @@
SPELL=dia
- VERSION=0.97.2
+ VERSION=0.97.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH
LICENSE[0]=GPL
- WEB_SITE=http://www.gnome.org/projects/dia/
+ WEB_SITE=https://wiki.gnome.org/Apps/Dia
ENTERED=20010922
KEYWORDS="gnome2"
SHORT="GTK-based diagram drawing program, similar to Visio"
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index aa37fb0..d7ec8ac 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,7 @@
+2014-09-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.97.3; fixed WEB_SITE
+ * glib-2.31.patch: removed, fixed by upstream
+
2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: detect docbook-xsl man path and use instead of online one
* DEPENDS: added docbook-xsl required dep
diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD
index c3f34d0..e3208ed 100755
--- a/gnome2-apps/dia/PRE_BUILD
+++ b/gnome2-apps/dia/PRE_BUILD
@@ -1,13 +1,11 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
cd $SOURCE_DIRECTORY &&

# dockbook's dir
local DB_VER=$(installed_version docbook-xsl | cut -c -4) &&
local DB_DIR="$INSTALL_ROOT/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}"
&&

-sedit
"s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:"
configure &&
-
-patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
+sedit
"s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:"
configure
diff --git a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig
b/gnome2-apps/dia/dia-0.97.2.tar.xz.sig
deleted file mode 100644
index fa8da34..0000000
Binary files a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig and /dev/null differ
diff --git a/gnome2-apps/dia/dia-0.97.3.tar.xz.sig
b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig
new file mode 100644
index 0000000..a11cfeb
Binary files /dev/null and b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig differ
diff --git a/gnome2-apps/dia/glib-2.31.patch b/gnome2-apps/dia/glib-2.31.patch
deleted file mode 100644
index 209d196..0000000
--- a/gnome2-apps/dia/glib-2.31.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: dia-0.97.1/objects/custom/shape_typeinfo.c
-===================================================================
---- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
-+++ dia-0.97.1/objects/custom/shape_typeinfo.c
-@@ -27,7 +27,7 @@
- #include "custom_util.h"
- #include <string.h>
- #include <stdarg.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- #include <libxml/parser.h>
-
-Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
-===================================================================
---- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
-+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
-@@ -61,7 +61,7 @@ TODO:
- #endif
- #include <errno.h>
-
--#include <glib/gprintf.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
-
- #include "intl.h"
-Index: dia-0.97.1/tests/test-boundingbox.c
-===================================================================
---- dia-0.97.1.orig/tests/test-boundingbox.c
-+++ dia-0.97.1/tests/test-boundingbox.c
-@@ -28,7 +28,7 @@
- #include <glib.h>
- #include <glib-object.h>
-
--#if GLIB_CHECK_VERSION(2,16,0)
-+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
- #include <glib/gtestutils.h>
- #endif
- #include "dialib.h"
-Index: dia-0.97.1/tests/test-objects.c
-===================================================================
---- dia-0.97.1.orig/tests/test-objects.c
-+++ dia-0.97.1/tests/test-objects.c
-@@ -28,7 +28,7 @@
- #include <glib.h>
- #include <glib-object.h>
-
--#if GLIB_CHECK_VERSION(2,16,0)
-+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
- #include <glib/gtestutils.h>
- #endif
-
-
diff --git a/gnome2-apps/galculator/DETAILS b/gnome2-apps/galculator/DETAILS
index 4e9a775..b623063 100755
--- a/gnome2-apps/galculator/DETAILS
+++ b/gnome2-apps/galculator/DETAILS
@@ -1,9 +1,9 @@
SPELL=galculator
- VERSION=2.0.1
+ VERSION=2.1.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/galculator/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+
SOURCE_HASH=sha512:782b5a672fa40bab01dc39fb32e79e8da08993bace6c37768db2ca11a2bb996fdc07e773a0f70b7bba73c018de6ea6e3f71afc3885ccbc94d345fef62cdfa74a
LICENSE[0]=GPL
WEB_SITE=http://galculator.sourceforge.net/
ENTERED=20030120
diff --git a/gnome2-apps/galculator/HISTORY b/gnome2-apps/galculator/HISTORY
index 3133378..ec4cdb2 100644
--- a/gnome2-apps/galculator/HISTORY
+++ b/gnome2-apps/galculator/HISTORY
@@ -1,3 +1,6 @@
+2014-07-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.3; switched to hash check
+
2012-12-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.1
fixed long description wrap
diff --git a/gnome2-apps/galculator/galculator-2.0.1.tar.bz2.sig
b/gnome2-apps/galculator/galculator-2.0.1.tar.bz2.sig
deleted file mode 100644
index 776a34d..0000000
Binary files a/gnome2-apps/galculator/galculator-2.0.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/homebank/DEPENDS b/gnome2-apps/homebank/DEPENDS
index edffa0e..f7b1755 100755
--- a/gnome2-apps/homebank/DEPENDS
+++ b/gnome2-apps/homebank/DEPENDS
@@ -1 +1,12 @@
-depends gtk+2
+depends gtk+2 &&
+depends shared-mime-info &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+optional_depends libofx \
+ "--with-ofx" \
+ "--without-ofx" \
+ "for OFX (Open Financial eXchange) support"
diff --git a/gnome2-apps/homebank/DETAILS b/gnome2-apps/homebank/DETAILS
index adbf4d1..00e858c 100755
--- a/gnome2-apps/homebank/DETAILS
+++ b/gnome2-apps/homebank/DETAILS
@@ -1,14 +1,15 @@
SPELL=homebank
- VERSION=4.2.1
+ VERSION=4.6.3
SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://${SPELL}.free.fr/public/${SOURCE}
-
SOURCE_HASH=sha512:690c477835072c57fe8c299c4afae4a4236f3b9de48c50f1a029deff3a8f7b36d30dcf5b10e529d0bd9512fb00c7a1ab385363b3979da0aceddf4eea57e733e2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-$VERSION
- WEB_SITE=http://${SPELL}.free.fr/
+ SOURCE_URL[0]=http://homebank.free.fr/public/${SOURCE}
+
SOURCE_HASH=sha512:aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOC_DIRS=""
+ WEB_SITE=http://homebank.free.fr/
ENTERED=20060624
LICENSE[0]=GPL
KEYWORDS="finance gnome2"
- SHORT="HomeBank is a personal finance management software"
+ SHORT="personal finance management software"
cat << EOF
HomeBank is the free software you have always wanted to manage your personal
accounts at home. The main concept is to be light, simple and very easy to
use.
diff --git a/gnome2-apps/homebank/FINAL b/gnome2-apps/homebank/FINAL
new file mode 100755
index 0000000..2a9eda3
--- /dev/null
+++ b/gnome2-apps/homebank/FINAL
@@ -0,0 +1 @@
+"$INSTALL_ROOT/usr/bin/update-mime-database" "$INSTALL_ROOT/usr/share/mime"
diff --git a/gnome2-apps/homebank/HISTORY b/gnome2-apps/homebank/HISTORY
index 1001739..7264f19 100644
--- a/gnome2-apps/homebank/HISTORY
+++ b/gnome2-apps/homebank/HISTORY
@@ -1,3 +1,22 @@
+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
+
+2014-06-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.6.1
+
+2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.6; quoting paths
+
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.5.6; cleaned up
+ * DEPENDS: added missing dependencies
+ * PRE_BUILD: added, to apply patch
+ * FINAL: added, to updated MIME database
+ * mime-noup.patch: added, to prevent MIME db from updating in INSTALL
+
2010-04-27 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.2.1

diff --git a/gnome2-apps/homebank/PRE_BUILD b/gnome2-apps/homebank/PRE_BUILD
new file mode 100755
index 0000000..808e8b6
--- /dev/null
+++ b/gnome2-apps/homebank/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/mime-noup.patch"
diff --git a/gnome2-apps/homebank/mime-noup.patch
b/gnome2-apps/homebank/mime-noup.patch
new file mode 100644
index 0000000..29a4db4
--- /dev/null
+++ b/gnome2-apps/homebank/mime-noup.patch
@@ -0,0 +1,14 @@
+--- mime/Makefile.in.orig 2014-03-01 15:31:41.000000000 +0400
++++ mime/Makefile.in 2014-05-12 14:00:03.431211914 +0400
+@@ -531,11 +531,6 @@
+ # $(mimeicon_DATA)
+
+ install-data-local: install-mimexmlDATA
+- if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ;
then \
+- if which update-mime-database>/dev/null 2>&1; then \
+- update-mime-database $(DESTDIR)$(datadir)/mime; \
+- fi \
+- fi
+
+ uninstall-local:
+ if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ;
then \
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/at-spi2-atk/DETAILS b/gnome2-libs/at-spi2-atk/DETAILS
index 058489b..0d17937 100755
--- a/gnome2-libs/at-spi2-atk/DETAILS
+++ b/gnome2-libs/at-spi2-atk/DETAILS
@@ -1,11 +1,12 @@
SPELL=at-spi2-atk
- VERSION=2.8.1
- PATCHLEVEL=0
+ VERSION=2.12.1
+
SOURCE_HASH=sha512:a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2
+ PATCHLEVEL=0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
WEB_SITE=http://projects.gnome.org/accessibility/
ENTERED=20100613
diff --git a/gnome2-libs/at-spi2-atk/HISTORY b/gnome2-libs/at-spi2-atk/HISTORY
index 995a4a4..ef9d8d1 100644
--- a/gnome2-libs/at-spi2-atk/HISTORY
+++ b/gnome2-libs/at-spi2-atk/HISTORY
@@ -1,3 +1,6 @@
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILAS: version 2.12.1
+
2013-05-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.1

diff --git a/gnome2-libs/at-spi2-atk/at-spi2-atk-2.8.1.tar.xz.sig
b/gnome2-libs/at-spi2-atk/at-spi2-atk-2.8.1.tar.xz.sig
deleted file mode 100644
index f78bc83..0000000
Binary files a/gnome2-libs/at-spi2-atk/at-spi2-atk-2.8.1.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/at-spi2-core/DETAILS
b/gnome2-libs/at-spi2-core/DETAILS
index 8295ede..98451a9 100755
--- a/gnome2-libs/at-spi2-core/DETAILS
+++ b/gnome2-libs/at-spi2-core/DETAILS
@@ -1,6 +1,6 @@
SPELL=at-spi2-core
- VERSION=2.10.2
-
SOURCE_HASH=sha512:51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da
+ VERSION=2.12.0
+
SOURCE_HASH=sha512:955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
PATCHLEVEL=0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/at-spi2-core/HISTORY
b/gnome2-libs/at-spi2-core/HISTORY
index 5335622..8ad1ce5 100644
--- a/gnome2-libs/at-spi2-core/HISTORY
+++ b/gnome2-libs/at-spi2-core/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.12.0
+
2014-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.10.2

diff --git a/gnome2-libs/atk/DETAILS b/gnome2-libs/atk/DETAILS
index fcf697e..d9c947f 100755
--- a/gnome2-libs/atk/DETAILS
+++ b/gnome2-libs/atk/DETAILS
@@ -1,10 +1,10 @@
SPELL=atk
if [[ $ATK_DEVEL == y ]]; then
- VERSION=2.11.4
+ VERSION=2.12.0
else
- VERSION=2.11.4
+ VERSION=2.12.0
fi
-
SOURCE_HASH=sha512:36ce1af3989672af143e27c0da1fbebca5b2178855852ed914f2e3f80606c6ecb1b10ea6694abf4aa1a64a0b5594a6e4e56bf4b640d32410a1509e9438166e75
+
SOURCE_HASH=sha512:422f0f4ef5f29707e77065557516a218ff23e78f61fa8e8c78b4a528c06cfeaff934e67eaaec00dc82cd13b2869e30618883a53010bd828dbebe51baea848272
PATCHLEVEL=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-libs/atk/HISTORY b/gnome2-libs/atk/HISTORY
index 2171703..b830b08 100644
--- a/gnome2-libs/atk/HISTORY
+++ b/gnome2-libs/atk/HISTORY
@@ -1,3 +1,6 @@
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.12.0
+
2013-12-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.11.4

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/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
index dbc0691..7bad65b 100755
--- a/gnome2-libs/gdk-pixbuf2/DEPENDS
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -1,13 +1,22 @@
-depends glib2 &&
-depends libpng &&
-depends zlib &&
-depends JPEG &&
-depends tiff &&
+depends glib2 &&
+depends JPEG &&
+depends libffi &&
+depends libpng &&
+depends libpthread-stubs &&
+depends LZMA &&
+depends pcre &&
+depends tiff &&
+depends zlib &&

optional_depends libx11 \
'--with-x11' \
'--without-x11' \
'enable X11 support' &&
+if is_depends_enabled $SPELL libx11; then
+ depends libxau &&
+ depends libxcb &&
+ depends libxdmcp
+fi &&

optional_depends gobject-introspection \
"--enable-introspection" \
@@ -17,13 +26,5 @@ optional_depends gobject-introspection \
optional_depends jasper \
--enable-jasper \
--disable-jasper \
- "enable JPEG2000 loader" &&
+ "enable JPEG2000 loader"

-depends libffi &&
-if is_depends_enabled $SPELL libx11; then
- depends libxau &&
- depends libxcb &&
- depends libxdmcp
-fi &&
-depends pcre &&
-depends LZMA
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
index fbb640e..27b0913 100755
--- a/gnome2-libs/gdk-pixbuf2/DETAILS
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -1,6 +1,6 @@
SPELL=gdk-pixbuf2
- VERSION=2.30.2
-
SOURCE_HASH=sha512:bde531eb3a55258b8d6f4b7e47b3b67814da6f2db12352dd7e30605a25ef4c668bc3bdafb3ed1dcc0a66378838b1228213d5049b2be76e86b2161404d2df110d
+ VERSION=2.30.8
+
SOURCE_HASH=sha512:2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d
SECURITY_PATCH=1
PATCHLEVEL=0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index 5e038cd..a3df523 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,8 +1,14 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libpthread-stubs
+
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.30.8
+
2014-01-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.30.2
+ * DETAILS: version 2.30.2

2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.30.0
+ * DETAILS: version 2.30.0

2013-05-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.1
diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 603c114..726afcb 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -14,10 +14,14 @@ if ! spell_installed pkgconfig; then
fi &&

depends perl &&
-optional_depends PYTHON \
- "--enable-modular-tests" \
- "--disable-modular-tests" \
- "Perform post-build testing" &&
+# It used to be optional, but cannot be until we figure out what to do
+# about gdbus-codegen. INSTALL fails without python and leaves us
+# without glib2, which can break other serious stuff.
+#optional_depends PYTHON \
+# "--enable-modular-tests" \
+# "--disable-modular-tests" \
+# "Perform post-build testing" &&
+depends PYTHON &&

if spell_ok $SPELL; then
optional_depends FAM \
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 31a1582..4daee55 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,17 +1,16 @@
SPELL=glib2
if [[ $GLIB_VER == devel ]];then
- VERSION=2.38.2
-
SOURCE_HASH=sha512:f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0
+ VERSION=2.42.0
+
SOURCE_HASH=sha512:61b94d8d230d964cbacc5365496165450b0084fc7f215afda5ce0c4d7a5dc7cdf5c5dc7436924330a5a47df1748e6a041f71d9b7882addf464961f14dc9f4ea2
SOURCE=glib-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
else
- VERSION=2.38.2
-
SOURCE_HASH=sha512:f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0
+ VERSION=2.42.0
+
SOURCE_HASH=sha512:61b94d8d230d964cbacc5365496165450b0084fc7f215afda5ce0c4d7a5dc7cdf5c5dc7436924330a5a47df1748e6a041f71d9b7882addf464961f14dc9f4ea2
SECURITY_PATCH=1
SOURCE=glib-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
- PATCHLEVEL=0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_DIRECTORY="$BUILD_DIRECTORY/glib-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/glib/$BRANCH/$SOURCE
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 600e442..c0d2b1e 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,26 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.42.0
+ * PRE_BUILD: not needed
+
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: some PYTHON is always needed now to avoid failure during
+ INSTALL (for a dbus codegen tool, also the modular-tests option
+ doesn't exist anymore)
+
+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
+
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: do not use autogen.sh, use autoreconf
+ do not disable gdbus-codegen, it is needed by gtk+3
+ * DETAILS: PATCHLEVEL=1
+
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.40.0
+
2014-01-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.38.2

diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
deleted file mode 100755
index fb8af6f..0000000
--- a/gnome2-libs/glib2/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if ! is_depends_enabled $SPELL python; then
- sed -i -e '/^SUBDIRS = / s,gdbus-2.0/codegen,,' gio/Makefile.am &&
- sed -i -e '/^SUBDIRS += / s,tests,,' gio/Makefile.am
-fi
-
-./autogen.sh
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index 3d72305..28c56ab 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,6 +1,6 @@
SPELL=glibmm
- VERSION=2.38.1
-
SOURCE_HASH=sha512:f9f9b71cfc0f810452669a497eb215c1073fc9b9d63f94adb575d1e3cf8c11412378ae717c7425220a80e96f44095445290536e9667730b1dfc91624cfd263ba
+ VERSION=2.40.0
+
SOURCE_HASH=sha512:3a51b3e311ba59505b3c452afdfdf456f184c39651d81317ff62f942d309f8707306cc68c69c20f7534f585036086088159414c7e75de59ab2684c4850559cb9
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 370c7b6..05b05b8 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,6 @@
+2014-04-19Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.40.0
+
2013-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.38.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/gobject-introspection/DETAILS
b/gnome2-libs/gobject-introspection/DETAILS
index 41a5625..b070645 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,8 +1,8 @@
SPELL=gobject-introspection
if [[ $GOBJ_VER == devel ]]; then
- VERSION=1.38.0
+ VERSION=1.40.0
else
- VERSION=1.38.0
+ VERSION=1.40.0
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.xz
diff --git a/gnome2-libs/gobject-introspection/HISTORY
b/gnome2-libs/gobject-introspection/HISTORY
index 9fc9d65..a050c8f 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,6 @@
+2014-06-09 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 1.40.0
+
2013-11-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.38.0

diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-1.38.0.tar.xz.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-1.38.0.tar.xz.sig
deleted file mode 100644
index 13ce5ea..0000000
Binary files
a/gnome2-libs/gobject-introspection/gobject-introspection-1.38.0.tar.xz.sig
and /dev/null differ
diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-1.40.0.tar.xz.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-1.40.0.tar.xz.sig
new file mode 100644
index 0000000..135f1e6
Binary files /dev/null and
b/gnome2-libs/gobject-introspection/gobject-introspection-1.40.0.tar.xz.sig
differ
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/libidl/DEPENDS b/gnome2-libs/libidl/DEPENDS
index afee2b9..6942160 100755
--- a/gnome2-libs/libidl/DEPENDS
+++ b/gnome2-libs/libidl/DEPENDS
@@ -1,3 +1,4 @@
-depends glib2 &&
depends bison &&
-depends flex
+depends flex &&
+depends glib2 &&
+depends pcre
diff --git a/gnome2-libs/libidl/HISTORY b/gnome2-libs/libidl/HISTORY
index e127868..be037ab 100644
--- a/gnome2-libs/libidl/HISTORY
+++ b/gnome2-libs/libidl/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ DETAILS: pcre
+
2010-04-01 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.8.14

diff --git a/gnome2-libs/librep2/DETAILS b/gnome2-libs/librep2/DETAILS
index edc6d2f..4f40946 100755
--- a/gnome2-libs/librep2/DETAILS
+++ b/gnome2-libs/librep2/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=librep2
if [ "${LIBREP2_CVS}" == "y" ]; then
- if [ "${LIBREP2_AUTOUPDATE}" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-cvs.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
SOURCE_URL[0]=svn_http://svn.gnome.org/svn/librep/trunk:librep-svn
diff --git a/gnome2-libs/librep2/HISTORY b/gnome2-libs/librep2/HISTORY
index f03ecc8..924b318 100644
--- a/gnome2-libs/librep2/HISTORY
+++ b/gnome2-libs/librep2/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-25 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 0.92.1b
changed SOURCE_URL[1]
diff --git a/gnome2-libs/librsvg2/DEPENDS b/gnome2-libs/librsvg2/DEPENDS
index f7bb212..edec806 100755
--- a/gnome2-libs/librsvg2/DEPENDS
+++ b/gnome2-libs/librsvg2/DEPENDS
@@ -1,17 +1,29 @@
-depends libx11 &&
-depends libice &&
-depends glib2 &&
-depends fontconfig &&
-depends freetype2 &&
+depends atk &&
depends -sub PNG cairo &&
-depends pango &&
-depends libxml2 &&
+depends expat &&
+depends fontconfig &&
+depends freetype2 &&
+depends glib2 &&
+depends harfbuzz &&
+depends pango &&
+depends libcroco &&
+depends libffi &&
+depends libice &&
+depends libpng &&
+depends libpthread-stubs &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxml2 &&
# make icu usage explicit
if is_depends_enabled libxml2 icu;then
depends icu
fi &&
-
-depends libcroco &&
+depends libxrender &&
+depends pcre &&
+depends pixman &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
@@ -36,11 +48,5 @@ optional_depends gdk-pixbuf2 \
"--disable-pixbuf-loader" \
"build gdk pixbuf loader" &&

-
-depends atk &&
-optional_depends gtk+2 '' '' 'GTK2 support' &&
-optional_depends gtk+3 '' '' 'GTK3 support' &&
-depends harfbuzz &&
-depends libpng &&
-depends pixman
+optional_depends gtk+3 '' '' 'GTK3 support'

diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index 86b7064..2e9bf85 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,6 +1,6 @@
SPELL=librsvg2
- VERSION=2.40.1
-
SOURCE_HASH=sha512:fe84430a7be4bb70c47745acb40628a806f066e4d4322c0fb90a77aa2bb7a41d8235e4055ab09cb166deb44a07781166146aa5c1a8508de9ad6f8e2686a32a49
+ VERSION=2.40.4
+
SOURCE_HASH=sha512:effb6de6042cc89d9ce01a80058f09b2f4bee43055d07e4b4fb35120f5283e93073221c9453ec03fbb42c71b30202b3febeb5607c9b62c46d2a00ac233a55ed1
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SECURITY_PATCH=2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index fcc9bf5..d6ee81e 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,13 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.40.5
+ * DEPENDS: no longer uses gtk+2
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: add missing dependencies
+
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.40.2
+
2013-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 2.40.1

diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 0bbac40..c9d882a 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -2,11 +2,15 @@

depends automake &&
depends cairo &&
+depends expat &&
depends fontconfig &&
depends freetype2 &&
depends glib2 &&
depends harfbuzz &&
+depends libffi &&
depends libpng &&
+depends mesalib &&
+depends pcre &&
depends pixman &&

optional_depends libxft \
@@ -15,9 +19,12 @@ optional_depends libxft \
"for XFT and X11 support" &&

if is_depends_enabled $SPELL libxft; then
+ depends libpthread-stubs &&
depends libx11 &&
depends libxau &&
+ depends libxcb &&
depends libxdmcp &&
+ depends libxext &&
depends libxrender &&
if spell_ok cairo && is_version_less $(installed_version cairo) 1.8; then
force_depends cairo
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index b900965..d262e96 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,6 @@
SPELL=pango
- VERSION=1.36.2
-
SOURCE_HASH=sha512:986752002cd7a7af4efc33bbf278a5076ca19c20a6a5b885a52b6b4769f564e119b69063143989782ad9934727ba80a0f87349573adf2ef74baf7c101cb03b7c
+ VERSION=1.36.8
+
SOURCE_HASH=sha512:799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215
# 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 916f1d3..1be0528 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,22 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.36.8
+ * DEPENDS: mesalib
+
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: MESALIB
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
+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
+
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.36.3
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.36.2

diff --git a/gnome2-libs/policykit/DETAILS b/gnome2-libs/policykit/DETAILS
index d8b3107..a64303b 100755
--- a/gnome2-libs/policykit/DETAILS
+++ b/gnome2-libs/policykit/DETAILS
@@ -1,10 +1,10 @@
SPELL=policykit
- VERSION=0.111
- PATCHLEVEL=1
+ VERSION=0.112
+
SOURCE_HASH=sha512:e4ad1bd287b38e5650cb94b1897a959b2ceaa6c19b4478ba872eacb13b58758fd42f6ab1718976162d823d850cd5c99b3ccadf1b57d75dea7790101422029d5f
+ SECURITY_PATCH=1
SOURCE=polkit-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/polkit-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/polkit/releases/$SOURCE
-
SOURCE_HASH=sha512:88eb1dfad25244020632f964219a382f7b7f7efc00cf563c66f9c6e6ef72af3c7198602be751aa8f0845b5b4f928d003e8041e1c92533beb9d00c38a7688b2d0
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
WEB_SITE=http://www.freedesktop.org/software/polkit/
diff --git a/gnome2-libs/policykit/HISTORY b/gnome2-libs/policykit/HISTORY
index 56479b8..5e1b8c0 100644
--- a/gnome2-libs/policykit/HISTORY
+++ b/gnome2-libs/policykit/HISTORY
@@ -1,3 +1,7 @@
+2014-07-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.112
+ SECURITY_PATCH=1, fixes CVE-2013-4288
+
2013-08-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* DEPENDS: Depends on shadow for usermod
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 46711c8..335fc58 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -99,7 +99,7 @@ optional_depends tiff
\
"--disable-libtiff" \
"for TIFF data extractor" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--enable-libgif" \
"--disable-libgif" \
"for GIF data extractor" &&
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index b3646a2..5ab6f8c 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-02-26 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.14.5
* DEPENDS: added optional_depends taglib, libgxps, libcue, giflib,
gdk-pixbuf2
diff --git a/gnome2-libs/xdg-user-dirs/DETAILS
b/gnome2-libs/xdg-user-dirs/DETAILS
deleted file mode 100755
index 6494754..0000000
--- a/gnome2-libs/xdg-user-dirs/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
- SPELL=xdg-user-dirs
- VERSION=0.10
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://user-dirs.freedesktop.org/releases/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- LICENSE[0]=LGPL
- WEB_SITE=http://www.freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
- ENTERED=20070416
- KEYWORDS="theme gnome2 libs"
- SHORT="Tool to help manage well known user directories"
-cat << EOF
-Freedesktop.org
-xdg-user-dirs is a tool to help manage well known user directories like the
-desktop folder and the music folder. It also handles localization (i.e.
-translation) of the filenames.
-EOF
diff --git a/gnome2-libs/xdg-user-dirs/HISTORY
b/gnome2-libs/xdg-user-dirs/HISTORY
deleted file mode 100644
index 36c274a..0000000
--- a/gnome2-libs/xdg-user-dirs/HISTORY
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-03-14 Robin Cook <rcook AT wyrms.net>
- * DETAILS: updated VERSION to 0.10
-
-2007-09-22 Robin Cook <rcook AT wyrms.net>
- * DETAILS: updated VERSION to 0.9
-
-2007-04-16 Robin Cook <rcook AT wyrms.net>
- * Initial Spell 0.6, DETAILS, HISTORY
-
diff --git a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig
b/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig
deleted file mode 100644
index 6ba187a..0000000
Binary files a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig and
/dev/null differ
diff --git a/gnome3-libs/adwaita-icon-theme/DETAILS
b/gnome3-libs/adwaita-icon-theme/DETAILS
new file mode 100755
index 0000000..6bd63fa
--- /dev/null
+++ b/gnome3-libs/adwaita-icon-theme/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=adwaita-icon-theme
+ VERSION=3.13.91
+ BRANCH=${VERSION:0:4}
+ SOURCE=$SPELL-$VERSION.tar.xz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+
SOURCE_HASH=sha512:48d9739e808b8035d0108106c2011e17a4940d2c7dff402a9419932bc2012b219d0edec9d95dfb90082bc16b1f746dd1e281671de4553db9b26a2041743b34c3
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.gnome.org/
+ ENTERED=20140919
+ SHORT="GNOME icon theme, Adwaita icons"
+cat << EOF
+GNOME icon theme, Adwaita icons.
+EOF
diff --git a/gnome3-libs/adwaita-icon-theme/HISTORY
b/gnome3-libs/adwaita-icon-theme/HISTORY
new file mode 100644
index 0000000..b4f6910
--- /dev/null
+++ b/gnome3-libs/adwaita-icon-theme/HISTORY
@@ -0,0 +1,2 @@
+2014-09-19 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: created spell
diff --git a/gnome3-libs/gcr/DETAILS b/gnome3-libs/gcr/DETAILS
index 8144217..f93aa76 100755
--- a/gnome3-libs/gcr/DETAILS
+++ b/gnome3-libs/gcr/DETAILS
@@ -1,10 +1,10 @@
SPELL=gcr
- VERSION=3.8.2
+ VERSION=3.12.2
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2
LICENSE[0]=GPL
WEB_SITE=http://developer.gnome.org/gcr/
ENTERED=20120329
diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index 893fbf5..3bb829c 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,3 +1,6 @@
+2014-07-12 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.12.2
+
2013-05-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.2

diff --git a/gnome3-libs/gcr/gcr-3.8.2.tar.xz.sig
b/gnome3-libs/gcr/gcr-3.8.2.tar.xz.sig
deleted file mode 100644
index 83a4121..0000000
Binary files a/gnome3-libs/gcr/gcr-3.8.2.tar.xz.sig and /dev/null differ
diff --git a/gnome3-libs/granite/BUILD b/gnome3-libs/granite/BUILD
new file mode 100755
index 0000000..e94421d
--- /dev/null
+++ b/gnome3-libs/granite/BUILD
@@ -0,0 +1,3 @@
+. "$GRIMOIRE"/FUNCTIONS &&
+
+cmake_build
diff --git a/gnome3-libs/granite/DEPENDS b/gnome3-libs/granite/DEPENDS
new file mode 100755
index 0000000..fcb2572
--- /dev/null
+++ b/gnome3-libs/granite/DEPENDS
@@ -0,0 +1,4 @@
+depends cmake &&
+depends vala &&
+depends libgee &&
+depends gtk+3
diff --git a/gnome3-libs/granite/DETAILS b/gnome3-libs/granite/DETAILS
new file mode 100755
index 0000000..17df963
--- /dev/null
+++ b/gnome3-libs/granite/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=granite
+ VERSION=0.3.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://launchpad.net/$SPELL/${VERSION:0:3}/${VERSION:0:3}/+download/$SOURCE
+
SOURCE_HASH=sha512:3ebbb7453b770f8b5b98cee0f96db8443d7583af0117b2d34c9daa82bf36d25418e0fcf61118e7551ced91e751d8b032998dc9cca2569e61c7227666c4383872
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://launchpad.net/granite";
+ LICENSE[0]=LGPL
+ ENTERED=20140725
+ SHORT="elementary Development Library"
+cat << EOF
+An extension to GTK+ that provides several useful widgets and classes to
ease application development
+EOF
diff --git a/gnome3-libs/granite/HISTORY b/gnome3-libs/granite/HISTORY
new file mode 100644
index 0000000..aa434b9
--- /dev/null
+++ b/gnome3-libs/granite/HISTORY
@@ -0,0 +1,2 @@
+2014-07-25 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, DEPENDS, DETAILS: spell created
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/gnu.gpg b/gnu.gpg
index 2e7360b..6f47c0b 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
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/gnustep-libs/gnustep-gui/DEPENDS
b/gnustep-libs/gnustep-gui/DEPENDS
index 72e95f3..543f25d 100755
--- a/gnustep-libs/gnustep-gui/DEPENDS
+++ b/gnustep-libs/gnustep-gui/DEPENDS
@@ -10,7 +10,7 @@ optional_depends libpng \
"--enable-png" \
"--disable-png" \
"Enable PNG support" &&
-optional_depends giflib \
+optional_depends GIFLIB \
"--disable-ungif --enable-libgif" \
"" \
"Add gif support." &&
diff --git a/gnustep-libs/gnustep-gui/HISTORY
b/gnustep-libs/gnustep-gui/HISTORY
index d894d39..99c3f0f 100644
--- a/gnustep-libs/gnustep-gui/HISTORY
+++ b/gnustep-libs/gnustep-gui/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.24.0

diff --git a/graphics-libs/devil/DEPENDS b/graphics-libs/devil/DEPENDS
index 3fbba14..02006c7 100755
--- a/graphics-libs/devil/DEPENDS
+++ b/graphics-libs/devil/DEPENDS
@@ -28,7 +28,7 @@ optional_depends JPEG \
"--disable-jpeg" \
"for JPEG image support" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--enable-gif" \
"--disable-gif" \
"for GIF image support" &&
diff --git a/graphics-libs/devil/HISTORY b/graphics-libs/devil/HISTORY
index 18675ae..d03702b 100644
--- a/graphics-libs/devil/HISTORY
+++ b/graphics-libs/devil/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS
index ea62f11..3bb1971 100755
--- a/graphics-libs/freeglut/DEPENDS
+++ b/graphics-libs/freeglut/DEPENDS
@@ -1,29 +1,10 @@
-depends autoconf &&
-depends automake &&
-depends libtool &&
-depends libxdamage &&
depends OPENGL &&
+if test mesalib-1x = "$(get_spell_provider $SPELL OPENGL)"; then
+ # New mesalib has it separated out.
+ depends glu
+fi &&
depends libx11 &&
depends libxi &&
depends libxext &&
depends libxxf86vm &&
-
-optional_depends "libpng" \
- "--enable-png" \
- "--disable-png" \
- "for PNG graphics support" &&
-
-optional_depends "JPEG" \
- "--enable-jpeg" \
- "--disable-jpeg" \
- "for JPEG graphics support" &&
-
-optional_depends "giflib" \
- "--enable-gif" \
- "--disable-gif" \
- "for GIF graphics support" &&
-
-optional_depends "tiff" \
- "--enable-tiff" \
- "--disable-tiff" \
- "for TIFF graphics support"
+depends libxrandr
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index e0c60cb..5ffe91c 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: separate glu for mesalib-1x
+
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: major cleanup
+
2013-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.1

diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS
index a2c3640..6dd5042 100755
--- a/graphics-libs/freetype2/DEPENDS
+++ b/graphics-libs/freetype2/DEPENDS
@@ -1 +1,4 @@
-depends libpng
+depends glib2 &&
+depends harfbuzz &&
+depends libpng &&
+depends pcre
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 218a36f..b24f419 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,6 +1,6 @@
SPELL=freetype2
- VERSION=2.5.2
- SECURITY_PATCH=8
+ VERSION=2.5.3
+ SECURITY_PATCH=9
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/freetype-$VERSION"
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index a8bb910..773b375 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
+2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.3; SECURITY_PATCH++ (CVE-2014-2240)
+
2014-02-11 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: libpng

diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS
index 0ae9e4c..0f5b54d 100755
--- a/graphics-libs/ftgl/DEPENDS
+++ b/graphics-libs/ftgl/DEPENDS
@@ -2,6 +2,6 @@ depends bzip2 &&
depends -sub CXX gcc &&
depends freetype2 &&
depends libxext &&
-depends texlive &&
depends zlib &&
+optional_depends texlive "" "" "to build documentation" &&
optional_depends GLUT "" "" "for a demo program"
diff --git a/graphics-libs/ftgl/DETAILS b/graphics-libs/ftgl/DETAILS
index b9b802e..65a6ba3 100755
--- a/graphics-libs/ftgl/DETAILS
+++ b/graphics-libs/ftgl/DETAILS
@@ -1,10 +1,10 @@
SPELL=ftgl
VERSION=2.1.3-rc5
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/-rc5/~rc5}
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/FTGL%20Source/${VERSION/-/%7E}/${SOURCE}
WEB_SITE=http://ftgl.wiki.sourceforge.net/
-
SOURCE_HASH=sha512:9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
+
SOURCE_HASH=sha512:77518c4546b53662b45a5c9af2418697b1a4a6250316c1e11ee71ccffc58ce03d5f19c901021b0e1cd05fec8444c84197e4bef77c662513dd6da8c29800cc3cd
LICENSE[0]=GPL
ENTERED=20040709
KEYWORDS="opengl fonts graphics libs"
diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY
index b4e5b9b..c1433fa 100644
--- a/graphics-libs/ftgl/HISTORY
+++ b/graphics-libs/ftgl/HISTORY
@@ -1,5 +1,9 @@
+2014-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * DEPENDS: make the dependency on texlive optional
+
2013-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- BUILD: add -lGL and -lGLU to LIBS
+ * BUILD: add -lGL and -lGLU to LIBS

2012-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on texlive, bzip2, libxext, zlib
diff --git a/graphics-libs/giblib/DEPENDS b/graphics-libs/giblib/DEPENDS
index a85bb36..33cbe2b 100755
--- a/graphics-libs/giblib/DEPENDS
+++ b/graphics-libs/giblib/DEPENDS
@@ -1 +1,6 @@
-depends imlib2
+depends freetype2 &&
+depends harfbuzz &&
+depends imlib2 &&
+depends libpng &&
+depends libx11 &&
+depends libxext
diff --git a/graphics-libs/giblib/HISTORY b/graphics-libs/giblib/HISTORY
index b84ad5a..de8f8c4 100644
--- a/graphics-libs/giblib/HISTORY
+++ b/graphics-libs/giblib/HISTORY
@@ -1,3 +1,9 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: harfbuzz, libpng
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: freetype2, libx11, libxext
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: No need to check if using modular X as that's all that's
available now
diff --git a/graphics-libs/giflib/CONFLICTS b/graphics-libs/giflib/CONFLICTS
index 339238c..6bdbce6 100755
--- a/graphics-libs/giflib/CONFLICTS
+++ b/graphics-libs/giflib/CONFLICTS
@@ -1 +1,2 @@
conflicts libungif y
+conflicts giflib5 n
diff --git a/graphics-libs/giflib/DEPENDS b/graphics-libs/giflib/DEPENDS
index 5b466eb..bb40f11 100755
--- a/graphics-libs/giflib/DEPENDS
+++ b/graphics-libs/giflib/DEPENDS
@@ -1 +1,5 @@
+depends libice &&
+depends libsm &&
+depends libx11 &&
+
optional_depends xmlto "" "" "for html documentation"
diff --git a/graphics-libs/giflib/HISTORY b/graphics-libs/giflib/HISTORY
index cf94fe4..bfb0a2c 100644
--- a/graphics-libs/giflib/HISTORY
+++ b/graphics-libs/giflib/HISTORY
@@ -1,3 +1,10 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libice, libsm, libx11
+
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * PROVIDES: added
+ * CONFLICTS: conflict giflib5
+
2014-02-25 Remko van der Vossen
* DEPENDS, PRE_BUILD: xmlto can shove it
* DETAILS: use sane sourceforge url
diff --git a/graphics-libs/giflib/PROVIDES b/graphics-libs/giflib/PROVIDES
new file mode 100755
index 0000000..d406a0a
--- /dev/null
+++ b/graphics-libs/giflib/PROVIDES
@@ -0,0 +1 @@
+provides GIFLIB
diff --git a/graphics-libs/giflib5/CONFLICTS b/graphics-libs/giflib5/CONFLICTS
new file mode 100755
index 0000000..851f9a9
--- /dev/null
+++ b/graphics-libs/giflib5/CONFLICTS
@@ -0,0 +1 @@
+conflicts giflib n
diff --git a/graphics-libs/giflib5/DEPENDS b/graphics-libs/giflib5/DEPENDS
new file mode 100755
index 0000000..5b466eb
--- /dev/null
+++ b/graphics-libs/giflib5/DEPENDS
@@ -0,0 +1 @@
+optional_depends xmlto "" "" "for html documentation"
diff --git a/graphics-libs/giflib5/DETAILS b/graphics-libs/giflib5/DETAILS
new file mode 100755
index 0000000..24d5db5
--- /dev/null
+++ b/graphics-libs/giflib5/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=giflib5
+ SPELLX=${SPELL//5}
+ VERSION=5.0.6
+
SOURCE_HASH=sha512:117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/files/$SOURCE
+ LICENSE[0]=MIT
+ WEB_SITE=http://sourceforge.net/projects/$SPELL/
+ KEYWORDS="images graphics libs"
+ ENTERED=20140529
+ SHORT="giflib is a non-LZQ library for compressed GIF images"
+cat << EOF
+giflib is a library for reading and writing gif images. It is API and ABI
+compatible with libungif which was in wide use while the LZW compression
+algorithm was patented.
+EOF
diff --git a/graphics-libs/giflib5/HISTORY b/graphics-libs/giflib5/HISTORY
new file mode 100644
index 0000000..34378e8
--- /dev/null
+++ b/graphics-libs/giflib5/HISTORY
@@ -0,0 +1,3 @@
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.6
+ drevied from giflib spell
diff --git a/graphics-libs/giflib5/PROVIDES b/graphics-libs/giflib5/PROVIDES
new file mode 100755
index 0000000..d406a0a
--- /dev/null
+++ b/graphics-libs/giflib5/PROVIDES
@@ -0,0 +1 @@
+provides GIFLIB
diff --git a/graphics-libs/giflib5/UP_TRIGGERS
b/graphics-libs/giflib5/UP_TRIGGERS
new file mode 100755
index 0000000..d559a8f
--- /dev/null
+++ b/graphics-libs/giflib5/UP_TRIGGERS
@@ -0,0 +1,12 @@
+# up_trigger stuff that still uses old giflib so it's not broken afterwards
+
+if spell_ok giflib; then
+ message "Switching from giflib to giflib5 requires recompiling spells
using giflib"
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends giflib); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libgif"; then
+ up_trigger $each cast_self
+ fi
+ done
+fi
diff --git a/graphics-libs/glew/DETAILS b/graphics-libs/glew/DETAILS
index abd3dc1..36ba42c 100755
--- a/graphics-libs/glew/DETAILS
+++ b/graphics-libs/glew/DETAILS
@@ -1,8 +1,8 @@
SPELL=glew
- VERSION=1.10.0
-
SOURCE_HASH=sha512:0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
+ VERSION=1.11.0
+
SOURCE_HASH=sha512:ab7fa5027b069adb7ce2f0ec9dc4e7f30d852e4212c68759873f060e32cc2be04cef66748a7e8696240ed6e3efbf4f0a2aa94640723facf83123c4cc6d955308
SOURCE=$SPELL-$VERSION.tgz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-$VERSION
WEB_SITE=http://glew.sf.net
ENTERED=20060224
diff --git a/graphics-libs/glew/HISTORY b/graphics-libs/glew/HISTORY
index b57cd30..35c4f46 100644
--- a/graphics-libs/glew/HISTORY
+++ b/graphics-libs/glew/HISTORY
@@ -1,3 +1,6 @@
+2014-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.11.0
+
2013-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.10.0

diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index f7165a2..3888196 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,4 +1,7 @@
-depends ragel &&
+depends glib2 &&
+depends libpng &&
+depends pcre &&
+depends ragel &&

optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
"Enable tools used for command-line utilities?" &&
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index d98d67a..89abce2 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -1,18 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=harfbuzz
if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
- if [ "$HARFBUZZ_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_URL[0]=git://anongit.freedesktop.org/harfbuzz:harfbuzz-git

SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
SOURCE_IGNORE=volatile
else
- VERSION=0.9.26
-
SOURCE_HASH=sha512:73a6588fddb7f33ee90f96f3e34b8c6ba4bafffc4879560e38c4b7550adbd56154169de916c48bd46b34e771641a1f83226e9bfae7ea04ccb31576c4a1aca802
+ 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 75ff9f5..4ab00dc 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,21 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: glib2, libpng, pcre
+
+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
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.29
+
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.27
+
2014-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.26
* SUB_DEPENDS, PRE_SUB_DEPENDS: add sub dependency on graphite2
diff --git a/graphics-libs/jpeg/DETAILS b/graphics-libs/jpeg/DETAILS
index d1a1daf..0e50ab7 100755
--- a/graphics-libs/jpeg/DETAILS
+++ b/graphics-libs/jpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=jpeg
- VERSION=8d
-
SOURCE_HASH=sha512:7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
+ VERSION=9a
+
SOURCE_HASH=sha512:9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b
SOURCE=${SPELL}src.v$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ijg.org
diff --git a/graphics-libs/jpeg/HISTORY b/graphics-libs/jpeg/HISTORY
index 231f690..4ed1bef 100644
--- a/graphics-libs/jpeg/HISTORY
+++ b/graphics-libs/jpeg/HISTORY
@@ -1,3 +1,7 @@
+2014-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9a
+ * UP_TRIGGERS: corrected library version detection
+
2012-02-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8d

diff --git a/graphics-libs/jpeg/UP_TRIGGERS b/graphics-libs/jpeg/UP_TRIGGERS
index 96b5ada..8a2c1bd 100755
--- a/graphics-libs/jpeg/UP_TRIGGERS
+++ b/graphics-libs/jpeg/UP_TRIGGERS
@@ -1,4 +1,4 @@
-# up_trigger everything on major version updates
+# up_trigger everything on major version updates

local OLD_SPELL_VERSION=""
if spell_ok $SPELL; then
@@ -10,7 +10,7 @@ if spell_ok $SPELL; then
OLD_SPELL_VERSION=${OLD_SPELL_VERSION/6b/62}
for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libjpeg\.so\.$OLD_SPELL_VERSION"; then
+ grep -q "NEEDED.*libjpeg\.so\.${OLD_SPELL_VERSION:0:1}"; then
up_trigger $each cast_self
fi
done
diff --git a/graphics-libs/libcaca/DEPENDS b/graphics-libs/libcaca/DEPENDS
index dbc487c..47ecdee 100755
--- a/graphics-libs/libcaca/DEPENDS
+++ b/graphics-libs/libcaca/DEPENDS
@@ -1,12 +1,13 @@
optional_depends slang "" "--disable-slang" "to build support for slang
output" &&
optional_depends imlib2 "" "--disable-imlib2" "to open not only BMP files"
&&
optional_depends doxygen "" "--disable-doc" "to generate documentation"
&&
-optional_depends mesalib "" "--disable-gl" "for OpenGL support"
&&
+optional_depends MESALIB "" "--disable-gl" "for OpenGL support"
&&
optional_depends ncurses "" "--disable-ncurses" "Enable ncurses graphics
support?" &&
optional_depends libx11 "" "--disable-x11" "Enable X11 support?"
&&
optional_depends GLUT "" "" "Enable GLUT support?"
&&
optional_depends CSHARP "" "--disable-csharp" "Enable C-Sharp bindings?"
&&
optional_depends JAVA "" "--disable-java" "Enable JAVA bindings?"
&&
optional_depends -sub CXX gcc "" "--disable-cxx" "Enable C++ bindings?"
&&
+optional_depends PYTHON "" "--disable-python" "Enable Python bindings?"
&&
optional_depends RUBY "" "--disable-ruby" "Enable Ruby bindings?"
&&
optional_depends pango "" "" "Enable pango use?"
diff --git a/graphics-libs/libcaca/DETAILS b/graphics-libs/libcaca/DETAILS
index cb00cfb..4d0d4d0 100755
--- a/graphics-libs/libcaca/DETAILS
+++ b/graphics-libs/libcaca/DETAILS
@@ -1,11 +1,11 @@
SPELL=libcaca
- VERSION=0.99.beta17
+ VERSION=0.99.beta19
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://caca.zoy.org/raw-attachment/wiki/libcaca/$SOURCE
WEB_SITE=http://caca.zoy.org/wiki/libcaca
ENTERED=20031218
-
SOURCE_HASH=sha512:1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19
+
SOURCE_HASH=sha512:780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
LICENSE[0]=GPL
KEYWORDS="graphics libs"
SHORT="libcaca is a graphics library that outputs text instead of
pixels"
diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY
index 7241b1d..eba16ca 100644
--- a/graphics-libs/libcaca/HISTORY
+++ b/graphics-libs/libcaca/HISTORY
@@ -1,3 +1,10 @@
+2014-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.99.beta19
+ * DEPENDS: optional_depends PYTHON added
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/graphics-libs/libgxps/DETAILS b/graphics-libs/libgxps/DETAILS
index 61a2bfd..d680600 100755
--- a/graphics-libs/libgxps/DETAILS
+++ b/graphics-libs/libgxps/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libgxps
if [[ $LIBGXPS_BRANCH == scm ]]; then
- if [[ $LIBGXPS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git://git.gnome.org/libgxps
FORCE_DOWNLOAD=1
diff --git a/graphics-libs/libgxps/HISTORY b/graphics-libs/libgxps/HISTORY
index 880a0d2..0d17496 100644
--- a/graphics-libs/libgxps/HISTORY
+++ b/graphics-libs/libgxps/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing ``&&''

diff --git a/graphics-libs/libjpeg-turbo/DETAILS
b/graphics-libs/libjpeg-turbo/DETAILS
index b158cc3..1277268 100755
--- a/graphics-libs/libjpeg-turbo/DETAILS
+++ b/graphics-libs/libjpeg-turbo/DETAILS
@@ -1,6 +1,6 @@
SPELL=libjpeg-turbo
- VERSION=1.3.0
-
SOURCE_HASH=sha512:4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053
+ VERSION=1.3.1
+
SOURCE_HASH=sha512:6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081
PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics-libs/libjpeg-turbo/HISTORY
b/graphics-libs/libjpeg-turbo/HISTORY
index 07f7051..cbeba6a 100644
--- a/graphics-libs/libjpeg-turbo/HISTORY
+++ b/graphics-libs/libjpeg-turbo/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.1
+
2013-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.0

diff --git a/graphics-libs/libpano13/DETAILS b/graphics-libs/libpano13/DETAILS
index fb57119..de95bc1 100755
--- a/graphics-libs/libpano13/DETAILS
+++ b/graphics-libs/libpano13/DETAILS
@@ -1,8 +1,8 @@
SPELL=libpano13
- VERSION=2.9.18
+ VERSION=2.9.19
SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/panotools/$SOURCE
-
SOURCE_HASH=sha512:bd8449a8ee01e990fa19784889c1afb0e64f90e25596c872e7470fb700c327aad4fc0c565977576dac34dca4cea55a46aad9dc547d3ee4ab6b353cd8b6656874
+
SOURCE_URL[0]=$SOURCEFORGE_URL/panotools/${SPELL}/${SPELL}-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://panotools.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/graphics-libs/libpano13/HISTORY b/graphics-libs/libpano13/HISTORY
index 59a3a3b..b6388ad 100644
--- a/graphics-libs/libpano13/HISTORY
+++ b/graphics-libs/libpano13/HISTORY
@@ -1,3 +1,6 @@
+2014-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.9.19
+
2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.9.18

diff --git a/graphics-libs/mesalib/CONFLICTS b/graphics-libs/mesalib/CONFLICTS
new file mode 100755
index 0000000..9cc9eaf
--- /dev/null
+++ b/graphics-libs/mesalib/CONFLICTS
@@ -0,0 +1 @@
+conflicts mesalib-1x
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 0ece5f9..20b12f9 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -14,6 +14,7 @@ depends libxext &&
depends libxxf86vm &&
depends libxau &&
depends libxfixes &&
+depends libxt &&
depends glproto &&
depends talloc &&
depends libxml2 &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 7a9bca1..0936423 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mesalib

if [[ -z $MESALIB_BRANCH ]]; then
@@ -12,15 +13,10 @@ case "$MESALIB_BRANCH" in
VERSION=7.10.3
;;
development)
- VERSION=7.11.1
+ VERSION=7.11.2
;;
scm)
- if [[ "$MESALIB_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
-
+ VERSION=$(get_scm_version)
;;
esac

@@ -32,7 +28,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_IGNORE=volatile
else
SOURCE=MesaLib-${VERSION}.tar.bz2
- SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE
+
SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/older-versions/${VERSION%%.*}.x/$VERSION/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 31cc51c..9aa7580 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,14 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libxt
+ * DETAILS: development: 7.11.2
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * PROVIDES: add MESALIB
+ * CONFLICTS: added, conflicts mesalib-1x
+
2013-05-31 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: GLUT functionality depends on libxmu and libxi (plus
libx11)

diff --git a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
deleted file mode 100644
index 2916753..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig
new file mode 100644
index 0000000..d0a5d61
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3fc56f6..324200b 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1 +1,2 @@
OPENGL
+MESALIB
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 9d6788d..501384d 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
- VERSION=2.4.8
-
SOURCE_HASH=sha512:83fc9b8ad3bc9fcad547919a2a78e5163e988e2a0f35d6f9735de522fb9e21d2b2ea8ea1dc4a05fb8cabf5754fc56803438a5a5984ecfa1b5c7b72d58f4b5d78
+ VERSION=2.4.9
+
SOURCE_HASH=sha512:a24b4bc0f7e58246e55370cdacd161f54b282d71a4ffbd654dd4b158031c9f8f93b8cb5a171f8266d4a776375573eff6b6b88793a812df99b3f516176e7a55b1
SOURCE=$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$SOURCE
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index b83bb83..5d87fec 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,7 @@
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.9
+ * PRE_BUILD, pkgconfig.patch: patch from Arch added
+
2014-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.8

diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD
new file mode 100755
index 0000000..e5dd5dd
--- /dev/null
+++ b/graphics-libs/opencv/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/pkgconfig.patch
+
diff --git a/graphics-libs/opencv/pkgconfig.patch
b/graphics-libs/opencv/pkgconfig.patch
new file mode 100644
index 0000000..5626eb6
--- /dev/null
+++ b/graphics-libs/opencv/pkgconfig.patch
@@ -0,0 +1,35 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake
opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12
20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12
20:41:48.936262732 +0000
+@@ -10,7 +10,7 @@
+ #
-------------------------------------------------------------------------------------------
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
++set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
+ set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
+
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+@@ -35,10 +35,11 @@
+ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
+
+ #build the list of components
+-set(OpenCV_LIB_COMPONENTS_ "")
++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
+ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+ get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
+ get_filename_component(libname "${libpath}" NAME)
++ get_filename_component(lname "${libpath}" NAME_WE)
+
+ if(INSTALL_TO_MANGLED_PATHS)
+ set(libname "${libname}.${OPENCV_VERSION}")
+@@ -51,7 +52,8 @@
+ set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+ endif()
+
+- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_}
\${exec_prefix}/${installDir}/${libname}")
++ string(REPLACE "libopencv" "-lopencv" lname "${lname}")
++ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
+ endforeach()
+
+ # add extra dependencies required for OpenCV
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index c3fb931..5092b32 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -1,11 +1,11 @@
SPELL=openjpeg
- VERSION=1.5.1
-
SOURCE_HASH=sha512:7b6c6889eb478008bd659cf2f2dcc0551ebb0c15f6765d1df04bc75208acb300929e399d0ea9b5c69a6d43b39cd1e58ab94bc71c3b6efdfba35903f46b54dd2d
- SECURITY_PATCH=1
+ VERSION=1.5.2
+
SOURCE_HASH=sha512:b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
+ SECURITY_PATCH=2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://openjpeg.googlecode.com/files/$SOURCE
+
SOURCE_URL[0]=https://sf.net/projects/openjpeg.mirror/files/$VERSION/$SOURCE
LICENSE[0]=BSD
WEB_SITE=http://code.google.com/p/openjpeg/
KEYWORDS="images graphics libs"
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index 434d1f6..b5e02db 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,10 @@
+2014-06-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2
+ SECURITY_PATCH++
+ fixes CVE-2013-4289 CVE-2013-4290
+ CVE-2013-1447 CVE-2013-6045 CVE-2013-6052 CVE-2013-6054
CVE-2013-6053 CVE-2013-6887
+ new url - sourceforge
+
2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: extra depends libpng, tiff, lcms2, zlib

diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index b571dcc..59be572 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=poppler
if [[ $POPPLER_BRANCH == scm ]]; then
- if [[ $POPPLER_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 3c39c5d..52958f0 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.22.4

diff --git a/graphics-libs/simage/DEPENDS b/graphics-libs/simage/DEPENDS
index b7549ab..fa9a5c1 100755
--- a/graphics-libs/simage/DEPENDS
+++ b/graphics-libs/simage/DEPENDS
@@ -2,7 +2,7 @@ optional_depends qt4 \
"--enable-qimage --with-qt=$INSTALL_ROOT/usr" \
"-disable-qimage" \
"Use QImage to load/save images?" &&
-optional_depends giflib "" "--without-gif" \
+optional_depends GIFLIB "" "--without-gif" \
"Enable giflib support?" &&
optional_depends JPEG "" "--without-jpeg" \
"Enable jpeg support?" &&
diff --git a/graphics-libs/simage/HISTORY b/graphics-libs/simage/HISTORY
index d8aebe4..a340742 100644
--- a/graphics-libs/simage/HISTORY
+++ b/graphics-libs/simage/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics-libs/vigra/DETAILS b/graphics-libs/vigra/DETAILS
index 5cb5137..8f98e99 100755
--- a/graphics-libs/vigra/DETAILS
+++ b/graphics-libs/vigra/DETAILS
@@ -1,9 +1,8 @@
SPELL=vigra
- VERSION=1.8.0
- SOURCE=${SPELL}-${VERSION}-src.tar.gz
-
SOURCE_URL[0]=http://kogs-www.informatik.uni-hamburg.de/~koethe/${SPELL}/${SOURCE}
- SOURCE_URL[1]=http://hci.iwr.uni-heidelberg.de/vigra/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1
+ VERSION=1.10.0
+ SOURCE=${SPELL}-${VERSION}-src-with-docu.tar.gz
+
SOURCE_URL[0]=https://github.com/ukoethe/vigra/releases/download/Version-${VERSION//./-}/${SOURCE}
+
SOURCE_HASH=sha512:4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/

LICENSE[0]=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/LICENSE
diff --git a/graphics-libs/vigra/HISTORY b/graphics-libs/vigra/HISTORY
index aa0f051..8ed9394 100644
--- a/graphics-libs/vigra/HISTORY
+++ b/graphics-libs/vigra/HISTORY
@@ -1,3 +1,6 @@
+2014-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.10.0
+
2011-09-21 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.8.0, added one more URL
* BUILD: switched to cmake build process
diff --git a/graphics/argyllcms/DETAILS b/graphics/argyllcms/DETAILS
index f87c062..55498ad 100755
--- a/graphics/argyllcms/DETAILS
+++ b/graphics/argyllcms/DETAILS
@@ -1,8 +1,8 @@
SPELL=argyllcms
- VERSION=1.5.1
+ VERSION=1.6.3
SOURCE="Argyll_V${VERSION}_src.zip"
SOURCE_URL[0]=http://www.${SPELL}.com/${SOURCE}
-
SOURCE_HASH=sha512:c21cd676edd6415a866fb2a7b122eac18e7596f265a0f2dc8d1f7ca761f64be9fd64ead1430e36eff8767672e73bd93de61398ff588e94a0e121d848afd8bb96
+
SOURCE_HASH=sha512:7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Argyll_V${VERSION}"
WEB_SITE="http://www.argyllcms.com/";
LICENSE[0]=GPL
diff --git a/graphics/argyllcms/HISTORY b/graphics/argyllcms/HISTORY
index c0d7358..05ea7e9 100644
--- a/graphics/argyllcms/HISTORY
+++ b/graphics/argyllcms/HISTORY
@@ -1,3 +1,6 @@
+2014-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.3
+
2013-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.5.1
* 04_CVE-2012-4405.diff, argyllcms-1.4.0-jpeg.patch, PRE_BUILD:
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index e35dc3a..7b93235 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=blender
if [ "$BLENDER_BRANCH" == "scm" ]; then
- if [ "$BLENDER_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"

SOURCE_URL[0]=svn_https://svn.blender.org/svnroot/bf-blender/trunk/blender:$SPELL-svn
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index db50eb1..d71524a 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-02-19 Robin Cook <rcook AT wymns.net>
* DETAILS: updated to 2.62
* DEPENDS: uncommented openexr optional depends
diff --git a/graphics/blender_cvs/DETAILS b/graphics/blender_cvs/DETAILS
index 5be6856..97e0fa9 100755
--- a/graphics/blender_cvs/DETAILS
+++ b/graphics/blender_cvs/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=blender_cvs
-if [[ "$BLENDER_CVS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-src

SOURCE_URL[0]=svn_https://svn.blender.org/svnroot/bf-blender/trunk/blender:blender
diff --git a/graphics/blender_cvs/HISTORY b/graphics/blender_cvs/HISTORY
index 7a4cbab..4ddaebf 100644
--- a/graphics/blender_cvs/HISTORY
+++ b/graphics/blender_cvs/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/graphics/brlcad/DEPENDS b/graphics/brlcad/DEPENDS
index 05fdd85..d28e76a 100755
--- a/graphics/brlcad/DEPENDS
+++ b/graphics/brlcad/DEPENDS
@@ -1,5 +1,5 @@
depends bison &&
-depends gawk &&
+depends AWK &&
depends flex &&
depends ncurses &&
optional_depends zlib '--enable-zlib-build' '--disable-zlib-build' 'for
compression support' &&
diff --git a/graphics/cgprof/DEPENDS b/graphics/cgprof/DEPENDS
index e4cf037..bc4f417 100755
--- a/graphics/cgprof/DEPENDS
+++ b/graphics/cgprof/DEPENDS
@@ -1,2 +1,2 @@
-depends gawk &&
+depends AWK &&
depends graphviz
diff --git a/graphics/cinepaint/DEPENDS b/graphics/cinepaint/DEPENDS
index 5a7a9bb..0cc44de 100755
--- a/graphics/cinepaint/DEPENDS
+++ b/graphics/cinepaint/DEPENDS
@@ -1,9 +1,9 @@
-depends autoconf &&
-depends automake &&
depends flex &&
depends fltk &&
depends ftgl &&
+depends gettext &&
depends gtk+2 "--enable-gtk2" &&
+depends glib2 &&
depends JPEG &&
depends lcms &&
depends libpng &&
diff --git a/graphics/cinepaint/DETAILS b/graphics/cinepaint/DETAILS
index e75a1b2..d35170a 100755
--- a/graphics/cinepaint/DETAILS
+++ b/graphics/cinepaint/DETAILS
@@ -11,12 +11,12 @@ if [[ "${CINEPAINT_CVS}" == "y" ]] ; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/cinepaint-cvs
FORCE_DOWNLOAD=on
else
- VERSION=1.3
- SOURCE=$SPELL-$VERSION.tgz
-
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/$SOURCE
+ VERSION=1.0-4
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/${SOURCE}
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:2f548af6d54ce246d4b6786d7d7aa6024d76c31b9d7ec2e073e780b3da8ec8c32fabc8efe50b3c640ca09a0302c1cc2e737b2013f4e07b6ba24d51c7a1c6c37d
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+
SOURCE_HASH=sha512:de39f454499001cad22b54e1e8faf481d21d541932e47c65d7a9f5499a9dc67d585e46741a453b07db01fef4930c420d860c6cebfcc73e330fb5a33dc9b2cdae
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
fi
WEB_SITE=http://cinepaint.sourceforge.net/
ENTERED=20021031
diff --git a/graphics/cinepaint/HISTORY b/graphics/cinepaint/HISTORY
index 69f552c..a7b3fae 100644
--- a/graphics/cinepaint/HISTORY
+++ b/graphics/cinepaint/HISTORY
@@ -1,3 +1,8 @@
+2014-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0-4
+ * PRE_BUILD, cinepaint-missing-include.patch: removed
+ * DEPENDS: remove dependencies on automake and autoconf
+
2012-10-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3
* PRE_BUILD, cinepaint-missing-include.patch: add patch from
diff --git a/graphics/cinepaint/PRE_BUILD b/graphics/cinepaint/PRE_BUILD
deleted file mode 100755
index dd5f366..0000000
--- a/graphics/cinepaint/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/cinepaint-missing-include.patch &&
-sh autogen.sh
diff --git a/graphics/cinepaint/cinepaint-missing-include.patch
b/graphics/cinepaint/cinepaint-missing-include.patch
deleted file mode 100644
index ed15921..0000000
--- a/graphics/cinepaint/cinepaint-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur
cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
2012-04-20 18:51:10.625503826 -0400
-+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
2012-04-20 18:52:04.478835055 -0400
-@@ -32,6 +32,7 @@
-
- #include <list>
- #include <string>
-+#include <unistd.h>
-
- #include "icc_modell_beobachter.h"
-
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 95130bb..5bf5889 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,16 +1,13 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.4.1
+ VERSION=1.4.2
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:c4e2c880592407d85f7fcb10045b22e0e0e4117baa95e213593214660572c3a406c8272e5d86d7c8c105f556465179cd8322f1c3a82544dc081db29bf21b4b25
+
SOURCE_HASH=sha512:5a4ba7f5de75bb4db31861fbc095e7854bf701211377b42bbbc3da00a57bcf5aa6e81745b5f34c1c6c7d9a6a3a43678db3d8373d556587e2d3c9210193163f9e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
-if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 0ec9fa3..f977e60 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.2
+
2014-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.1

diff --git a/graphics/dcmtk/DEPENDS b/graphics/dcmtk/DEPENDS
new file mode 100755
index 0000000..cd1540e
--- /dev/null
+++ b/graphics/dcmtk/DEPENDS
@@ -0,0 +1,27 @@
+optional_depends tiff \
+ --with{,out}-libtiff \
+ "for TIFF support" &&
+
+optional_depends libpng \
+ --with{,out}-libpng \
+ "for PNG support" &&
+
+optional_depends libxml2 \
+ --with{,out}-libxml \
+ "for XML meta-data?" &&
+
+optional_depends zlib \
+ --with{,out}-zlib \
+ "for Zlib compression?" &&
+
+optional_depends SSL \
+ --with{,out}-openssl \
+ "for DICOM security extensions" &&
+
+optional_depends libsndfile \
+ --with{,out}-libsndfile \
+ "for Sound support" &&
+
+optional_depends tcp_wrappers \
+ --with{,out}-libwrap \
+ "TCP wrapper access control"
diff --git a/graphics/dcmtk/DETAILS b/graphics/dcmtk/DETAILS
new file mode 100755
index 0000000..2b712a4
--- /dev/null
+++ b/graphics/dcmtk/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=dcmtk
+ VERSION=3.6.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=ftp://dicom.offis.de/pub/dicom/offis/software/${SPELL}/${SPELL}360/${SOURCE}
+
SOURCE_HASH=sha512:2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://dicom.offis.de/";
+ LICENSE[0]="ModifiedBSD/Mixed"
+ ENTERED=20140925
+ KEYWORDS=""
+ SHORT="DICOM Toolkit"
+cat << EOF
+DCMTK is a collection of libraries and applications implementing large parts
+the DICOM standard. It includes software for examining, constructing and
+converting DICOM image files, handling offline media, sending and receiving
+images over a network connection, as well as demonstrative image storage
+and worklist servers. DCMTK is is written in a mixture of ANSI C and C++. It
+comes in complete source code and is made available as "open source"
software.
+
+DCMTK has been used at numerous DICOM demonstrations to provide central,
+vendor-independent image storage and worklist servers (CTNs - Central Test
+Nodes). It is used by hospitals and companies all over the world for a wide
+variety of purposes ranging from being a tool for product testing to being
+a building block for research projects, prototypes and commercial products.
+EOF
diff --git a/graphics/dcmtk/HISTORY b/graphics/dcmtk/HISTORY
new file mode 100644
index 0000000..723da0c
--- /dev/null
+++ b/graphics/dcmtk/HISTORY
@@ -0,0 +1,2 @@
+2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/graphics/dcraw/DETAILS b/graphics/dcraw/DETAILS
index 46d742d..3b093d2 100755
--- a/graphics/dcraw/DETAILS
+++ b/graphics/dcraw/DETAILS
@@ -1,6 +1,6 @@
SPELL=dcraw
- VERSION=9.19
-
SOURCE_HASH=sha512:16597d92e53b16d0efa3da77a8a269dea5308028c1a4a7ef61f2c6e069ccab8aea7bfb95126c1fef63382df9d9e8e52a48f6d67b8aa826de947712c053c9961d
+ VERSION=9.22
+
SOURCE_HASH=sha512:e4e332465b52eef1cf07e32a3962b24bcc6405614edd7d3d1fd375466fc5a253aaf212bf1b030d47e51f76d5c1bd7e0475813f302b67c7fba395d0cd922ee858
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/dcraw
SOURCE_URL[0]=http://www.cybercom.net/~dcoffin/dcraw/archive/$SOURCE
diff --git a/graphics/dcraw/HISTORY b/graphics/dcraw/HISTORY
index 1f2ee7f..e18fecf 100644
--- a/graphics/dcraw/HISTORY
+++ b/graphics/dcraw/HISTORY
@@ -1,3 +1,6 @@
+2014-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.22
+
2013-08-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 9.19

diff --git a/graphics/exact-image/DEPENDS b/graphics/exact-image/DEPENDS
index 9c80f07..e8d5d2b 100755
--- a/graphics/exact-image/DEPENDS
+++ b/graphics/exact-image/DEPENDS
@@ -6,7 +6,7 @@ optional_depends evas '--with-evas' '--without-evas'
'ebound suppor
optional_depends JPEG '--with-libjpeg' '--without-libjpeg' 'jpeg
support' &&
optional_depends tiff '--with-libtiff' '--without-libtiff' '' &&
optional_depends libpng '--with-libpng' '--without-libpng' '' &&
-optional_depends giflib '--with-libungif' '--without-libungif' '' &&
+optional_depends GIFLIB '--with-libungif' '--without-libungif' '' &&
optional_depends jasper '--with-jasper' '--without-jasper' 'jpeg-2000
support' &&
optional_depends openexr '--with-openexr' '--without-openexr' '' &&
optional_depends expat '--with-expat' '--without-expat' '' &&
diff --git a/graphics/exact-image/HISTORY b/graphics/exact-image/HISTORY
index 2244021..ec692ae 100644
--- a/graphics/exact-image/HISTORY
+++ b/graphics/exact-image/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/graphics/flphoto/DEPENDS b/graphics/flphoto/DEPENDS
index 9f30eed..5aa011e 100755
--- a/graphics/flphoto/DEPENDS
+++ b/graphics/flphoto/DEPENDS
@@ -3,4 +3,4 @@ depends JPEG &&
optional_depends libgphoto2 "" "" "For Digital Cameras Support" &&
optional_depends CUPS "" "" "For printing support" &&
optional_depends libpng "" "" "For png format support" &&
-optional_depends giflib "" "" "For gif format support"
+optional_depends GIFLIB "" "" "For gif format support"
diff --git a/graphics/flphoto/HISTORY b/graphics/flphoto/HISTORY
index 988bbdf..5fd1c83 100644
--- a/graphics/flphoto/HISTORY
+++ b/graphics/flphoto/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics/fontforge/DEPENDS b/graphics/fontforge/DEPENDS
index b03e707..2ebe2e4 100755
--- a/graphics/fontforge/DEPENDS
+++ b/graphics/fontforge/DEPENDS
@@ -6,7 +6,7 @@ depends libice &&
depends libsm &&
depends zlib &&
depends libpng &&
-depends giflib &&
+depends GIFLIB &&
depends tiff &&
depends JPEG &&
depends freetype2 "--with-freetype-src=$INSTALL_ROOT/usr/include/freetype2"
&&
diff --git a/graphics/fontforge/HISTORY b/graphics/fontforge/HISTORY
index c0b6e2d..99d48d7 100644
--- a/graphics/fontforge/HISTORY
+++ b/graphics/fontforge/HISTORY
@@ -1,4 +1,7 @@
-204-03-26 Treeve Jelbert <treeve AT sourcemage.org>
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
+2014-03-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20120731-b
* BUILD: deleted
* PRE_BUILD: do not apply patch
diff --git a/graphics/gexiv2/DETAILS b/graphics/gexiv2/DETAILS
index 0441863..b1e7cc6 100755
--- a/graphics/gexiv2/DETAILS
+++ b/graphics/gexiv2/DETAILS
@@ -1,11 +1,10 @@
SPELL=gexiv2
- SPELLX=libgexiv2
- VERSION=0.6.1
-
SOURCE_HASH=sha512:76aecd20ffac202badb51eab4e40fee563c3073892beec716bcf24e285df42f2498594a9e0bf487e198e8c955047d55e5b49b506bbf8b67c64956c0b99a84b1b
- SOURCE=${SPELLX}_$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ VERSION=0.10.1
+
SOURCE_HASH=sha512:6b8a0c68b0370d14af704e08bc59953ef78f7b433f21429360b4ef6680d45881cb706e18bbf88c60c8d9f66dd05bce3f767164fcac4696cff73394ac071321a3
+ SOURCE=${SPELL}-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://trac.yorba.org/wiki/gexiv2
- SOURCE_URL[0]=http://yorba.org/download/gexiv2/${VERSION::3}/$SOURCE
+
SOURCE_URL[0]=https://download.gnome.org/sources/gexiv2/${VERSION%.*}/$SOURCE
LICENSE[0]=GPL
ENTERED=20100709
SHORT="GObject-based wrapper around the Exiv2 library"
diff --git a/graphics/gexiv2/HISTORY b/graphics/gexiv2/HISTORY
index d1aaf13..dbf0596 100644
--- a/graphics/gexiv2/HISTORY
+++ b/graphics/gexiv2/HISTORY
@@ -1,3 +1,6 @@
+2014-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10.1
+
2013-07-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.6.1
* DEPENDS: add optional dependency on gobject-introspection
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index cb048d4..2e349d0 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,13 +1,13 @@
SPELL=gimp
if [[ $GIMP_DEVEL == y ]]; then
- VERSION=2.8.10
+ VERSION=2.8.14
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8
+
SOURCE_HASH=sha512:533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
else
- VERSION=2.8.10
+ VERSION=2.8.14
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8
+
SOURCE_HASH=sha512:533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 2c1b312..fe3e777 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2014-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.8.14
+
2013-12-21 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to fix freetype2 header path

diff --git a/graphics/gocr/DETAILS b/graphics/gocr/DETAILS
index 3bb865e..043d125 100755
--- a/graphics/gocr/DETAILS
+++ b/graphics/gocr/DETAILS
@@ -1,9 +1,9 @@
- SPELL=gocr
- VERSION=0.48
-
SOURCE_HASH=sha512:53520c94b6991818482d0f6a5e3e7102f8530fd1215607b04e528244b697479d98669cfe4fd9098e5e1a2e5dd88c45f1edb1171c14adb798e811efd23bdada73
+ SPELL=gocr
+ VERSION=0.50
+
SOURCE_HASH=sha512:36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/jocr/$SOURCE
+ SOURCE_URL[0]=http://www-e.uni-magdeburg.de/jschulen/ocr/$SOURCE
WEB_SITE=http://jocr.sourceforge.net
LICENSE=GPL
DOCS="HISTORY README doc/gocr.html"
diff --git a/graphics/gocr/HISTORY b/graphics/gocr/HISTORY
index 813ccfb..bb16e0b 100644
--- a/graphics/gocr/HISTORY
+++ b/graphics/gocr/HISTORY
@@ -1,3 +1,7 @@
+2014-09-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.50
+
2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.48
* BUILD: deleted
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/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 94dd75d..c680eab 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,12 +1,12 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=6.8.8-8
+ VERSION=6.8.9-7
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/$SOURCE
- SOURCE_URL[1]=http://www.imagemagick.org/download/legacy/$SOURCE
-
SOURCE_HASH=sha512:8f1383a8c2935a7e49395089ba7ed583532ce6c14925ae8a0f946f9153e754f19461aaa455c0552d022e70b3f2e81295dcfce423a159d88319125dfc2087faf1
+
SOURCE_URL[1]=http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$SOURCE
+
SOURCE_HASH=sha512:e9be966b430d4aca1fe64435b68a5586c458ba8e238ba47d5d7046e90c2e807e6f7b476ede00c22ffb2dbdf9bb21762e121bba6e48062ebee2800612caf81eed
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index ee366b3..a0485da 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,16 @@
+2014-09-04 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 6.8.9-7
+
+2014-09-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: put in an existing backup URL (yes, we also could update,
+ but things are removed too quickly from primary site)
+
+2014-07-14 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 6.8.9-5
+
+2014-04-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 6.8.9-0
+
2014-03-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.8-8
* DEPENDS: add optional dependencies on jbigkit, openjpeg,
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/lcms2/DETAILS b/graphics/lcms2/DETAILS
index 0b69003..3244f11 100755
--- a/graphics/lcms2/DETAILS
+++ b/graphics/lcms2/DETAILS
@@ -1,7 +1,7 @@
SPELL=lcms2
SPELLX=lcms
- VERSION=2.5
-
SOURCE_HASH=sha512:c41daee7bb366eed940283d3760e5862d8d2bb6e465d1f712123449a2013431321155c8500dba4c4393a1e49fdef0bc2f5399e1573f0295cc0dac3fe88c60853
+ VERSION=2.6
+
SOURCE_HASH=sha512:af2dd8829a5d8b280688bc247812829c885368951d385a23a1596cf8d0a7aed627c8faa35740073efc51a86ef5c900fc9bdb9dcdfad885fb8b1eae16953f9041
VX=${VERSION//a}
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VX"
diff --git a/graphics/lcms2/HISTORY b/graphics/lcms2/HISTORY
index 5115045..1c5dfc8 100644
--- a/graphics/lcms2/HISTORY
+++ b/graphics/lcms2/HISTORY
@@ -1,3 +1,6 @@
+2014-04-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6
+
2013-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5

diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index 54c8d2a..73e7143 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=lensfun
if [[ $LENSFUN_BRANCH == scm ]]; then
-if [[ $LENSFUN_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-scm.tar.bz2
SOURCE_HINTS=old_svn_compat
FORCE_DOWNLOAD=ON
@@ -12,13 +9,13 @@ fi
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 1fff259..fa633d1 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,9 @@
+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
+
2012-08-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.2.7

diff --git a/graphics/leptonica/DEPENDS b/graphics/leptonica/DEPENDS
index ee65ed9..7ef30ab 100755
--- a/graphics/leptonica/DEPENDS
+++ b/graphics/leptonica/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends giflib '' '--without-giflib' &&
+optional_depends GIFLIB '' '--without-giflib' &&
optional_depends JPEG '' '' 'JPEG support' &&
optional_depends libpng '' '' 'PNG support' &&
optional_depends tiff '' '--without-libtiff' 'TIFF support' &&
diff --git a/graphics/leptonica/DETAILS b/graphics/leptonica/DETAILS
index 54bbdb0..b729204 100755
--- a/graphics/leptonica/DETAILS
+++ b/graphics/leptonica/DETAILS
@@ -1,10 +1,10 @@
SPELL=leptonica
- VERSION=1.69
-
SOURCE_HASH=sha512:4939408d3908729c9ef39d9e9fb001115d19260aa1282b448a2b44cb2ce3dada92c36b98611d597f054534b59bbd8a988374372223430b9b83b195716f165e42
+ VERSION=1.70
+
SOURCE_HASH=sha512:6a0769b4ff646c84582c3c81d770e72b282d941f88fa9e46548705cd4850d48a40f0af0829903cd917319c872f4679caa98bde556fa753eff65f3e9fc3679084
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://code.google.com/p/$SPELL
- SOURCE_URL[0]=http://$SPELL.googlecode.com/files/$SOURCE
+ WEB_SITE=http://leptonica.org
+ SOURCE_URL[0]=$WEB_SITE/source/$SOURCE
LICENSE[0]=APACHE
ENTERED=20111102
KEYWORDS="graphics"
diff --git a/graphics/leptonica/HISTORY b/graphics/leptonica/HISTORY
index bdb0002..3ae7253 100644
--- a/graphics/leptonica/HISTORY
+++ b/graphics/leptonica/HISTORY
@@ -1,3 +1,10 @@
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
+2014-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.70
+ new website & url
+
2012-10-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.69

diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index f74c1a4..0c56a38 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgphoto2
- VERSION=2.5.3
-
SOURCE_HASH=sha512:57dc0edaec47bc07f41632ac6b5731296671f6ca53176cb9ef63efc4b0e397bcef6672aed5299c7e44fc1adff08d2e8c6706e1bfc3ac6dafd8429de7ef0ad238
+ VERSION=2.5.5
+
SOURCE_HASH=sha512:ed931e0e92dd9d27ba1267c4b4cfae589b2c2be600ed4412c756e17cde4c388cc56e35d243dc78ab092353d1267ec1f05b7371a1301714eb027b9bc58ea45abe
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 9e84fae..40755e2 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,9 @@
+2014-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.5
+
+2014-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.4
+
2014-01-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5.3

diff --git a/graphics/mtpaint/DEPENDS b/graphics/mtpaint/DEPENDS
index 81fed4e..77837f1 100755
--- a/graphics/mtpaint/DEPENDS
+++ b/graphics/mtpaint/DEPENDS
@@ -1,6 +1,6 @@
depends gtk+2 'gtk2' &&

-optional_depends giflib '' 'nogif' 'for GIF support' &&
+optional_depends GIFLIB '' 'nogif' 'for GIF support' &&
optional_depends JPEG 'jpeg' 'nojpeg' 'for JPEG support' &&
optional_depends openjpeg 'jp2' 'nojp2' 'for JPEG 2000 support' &&
optional_depends tiff 'tiff' 'notiff' 'for TIFF support'
diff --git a/graphics/mtpaint/HISTORY b/graphics/mtpaint/HISTORY
index 3524062..3d523c2 100644
--- a/graphics/mtpaint/HISTORY
+++ b/graphics/mtpaint/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2012-01-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.40

diff --git a/graphics/mypaint/DETAILS b/graphics/mypaint/DETAILS
index 68d547b..e6c42d4 100755
--- a/graphics/mypaint/DETAILS
+++ b/graphics/mypaint/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mypaint
if [[ $MYPAINT_BRANCH == scm ]]; then
- if [[ $MYPAINT_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE="$SPELL-scm.tar.bz2"
SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-scm
SOURCE_IGNORE=volatile
diff --git a/graphics/mypaint/HISTORY b/graphics/mypaint/HISTORY
index 746f8d8..078f953 100644
--- a/graphics/mypaint/HISTORY
+++ b/graphics/mypaint/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-04-27 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: added dependency on lcms2

diff --git a/graphics/nitrogen/DEPENDS b/graphics/nitrogen/DEPENDS
index c921199..9c84df7 100755
--- a/graphics/nitrogen/DEPENDS
+++ b/graphics/nitrogen/DEPENDS
@@ -1 +1,9 @@
-depends gtkmm2
+depends gtkmm2 &&
+depends gtk+2 &&
+depends glib2 &&
+depends -sub CXX gcc &&
+optional_depends libxinerama "--enable-xinerama" "--disable-xinerama" "for
multi-monitor support"
+if [[ $NITROGEN_BRANCH == scm ]]; then
+ depends automake &&
+ depends autoconf
+fi
diff --git a/graphics/nitrogen/DETAILS b/graphics/nitrogen/DETAILS
index 095f3ad..1742c15 100755
--- a/graphics/nitrogen/DETAILS
+++ b/graphics/nitrogen/DETAILS
@@ -1,9 +1,19 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=nitrogen
+if [[ $NITROGEN_BRANCH == scm ]]; then
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/l3ib/nitrogen.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
+else
VERSION=1.5.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://projects.l3ib.org/${SPELL}/files/${SOURCE}

SOURCE_HASH=sha512:f4fdafcecb946f6918220f7562a69eb5223d4303c9bf3df4adb5dedfd8d402ee4f3fd3b1692875ede545d3e03f0ca88fa475206a839bb36677fa008a33e99551
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
WEB_SITE="http://projects.l3ib.org/nitrogen/";
LICENSE[0]=GPL
ENTERED=20080808
diff --git a/graphics/nitrogen/HISTORY b/graphics/nitrogen/HISTORY
index 1649ff1..a1a2980 100644
--- a/graphics/nitrogen/HISTORY
+++ b/graphics/nitrogen/HISTORY
@@ -1,3 +1,9 @@
+2014-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS, PRE_BUILD, PREPARE: add support for building
+ the scm version
+ * DEPENDS: add dependencies on gtk+2, glib2, gcc and an optional
+ dependency on libxinerama
+
2013-03-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.5.2
* BUILD: add libX11 to LDFLAGS
diff --git a/graphics/nitrogen/PREPARE b/graphics/nitrogen/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/graphics/nitrogen/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics/nitrogen/PRE_BUILD b/graphics/nitrogen/PRE_BUILD
new file mode 100755
index 0000000..64cba99
--- /dev/null
+++ b/graphics/nitrogen/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if [[ $NITROGEN_BRANCH == scm ]]; then
+ ./bootstrap
+fi
diff --git a/graphics/nomacs/BUILD b/graphics/nomacs/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/graphics/nomacs/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/graphics/nomacs/DEPENDS b/graphics/nomacs/DEPENDS
new file mode 100755
index 0000000..a52c1c4
--- /dev/null
+++ b/graphics/nomacs/DEPENDS
@@ -0,0 +1,2 @@
+depends qt4 &&
+depends opencv
diff --git a/graphics/nomacs/DETAILS b/graphics/nomacs/DETAILS
new file mode 100755
index 0000000..20c7509
--- /dev/null
+++ b/graphics/nomacs/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=nomacs
+ VERSION=2.0.2
+ SOURCE=$SPELL-$VERSION-source.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:ccb183365ec39d4df1ce8db99cc2d410824ae987e89db556fe896212f60886f36f6fa9dcd2382f09e9be751f54dd8144fd94808b4298b4c0741eecb300f77241
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.nomacs.org/
+ LICENSE[0]=GPL
+ ENTERED=20140722
+ SHORT="image viewer"
+cat << EOF
+Image viewer with capability of syncing multiple instances.
+EOF
diff --git a/graphics/nomacs/HISTORY b/graphics/nomacs/HISTORY
new file mode 100644
index 0000000..dd8ed37
--- /dev/null
+++ b/graphics/nomacs/HISTORY
@@ -0,0 +1,5 @@
+2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.2
+
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD: spell created, version 2.0.0
diff --git a/graphics/optipng/BUILD b/graphics/optipng/BUILD
index 2f26843..f9af227 100755
--- a/graphics/optipng/BUILD
+++ b/graphics/optipng/BUILD
@@ -1,4 +1,5 @@
./configure -prefix="$INSTALL_ROOT/usr" \
+ -mandir="$INSTALL_ROOT/usr/share/man" \
$OPTS &&

make
diff --git a/graphics/optipng/DETAILS b/graphics/optipng/DETAILS
index 19c70a0..e1dbf94 100755
--- a/graphics/optipng/DETAILS
+++ b/graphics/optipng/DETAILS
@@ -1,6 +1,7 @@
SPELL=optipng
VERSION=0.7.5
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:6f319965739235387e99244dda5f52533e22b7040301cf680180e383f24361819f66cb3adf1a90923e9509ed08d55bbe442ec363310c385fcf70f551febfbb6f
diff --git a/graphics/optipng/HISTORY b/graphics/optipng/HISTORY
index 6379d6d..ed09390 100644
--- a/graphics/optipng/HISTORY
+++ b/graphics/optipng/HISTORY
@@ -1,3 +1,7 @@
+2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: fixed man directory
+
2014-03-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.5

diff --git a/graphics/pngquant/DETAILS b/graphics/pngquant/DETAILS
index 1eafb34..9259177 100755
--- a/graphics/pngquant/DETAILS
+++ b/graphics/pngquant/DETAILS
@@ -1,8 +1,8 @@
SPELL=pngquant
- VERSION=1.8.2
+ VERSION=2.2.0
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_URL[0]=http://pngquant.org/$SOURCE
-
SOURCE_HASH=sha512:394688ea754be781f96372a793c4186d35014dc1fc3b974e2335542d0aaaebe811bd4db5c34f7d7ec492aa38ff8b46c43a6ce77dc78483c4d43afb8aef8ba708
+
SOURCE_HASH=sha512:58ab515f1b3a12d95edc597b088f026668be3d022e753ddaf2e9474dd9feaaad9f0362b1b7ad0951ffe27b00fa7940e555372b404a52b79398e06e3c533b584c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pngquant.org/
ENTERED=20130201
diff --git a/graphics/pngquant/HISTORY b/graphics/pngquant/HISTORY
index 31d822c..2e8a8d7 100644
--- a/graphics/pngquant/HISTORY
+++ b/graphics/pngquant/HISTORY
@@ -1,2 +1,6 @@
+2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.0
+ * PRE_BUILD: added, to prevent double-build stage
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: spell created
diff --git a/graphics/pngquant/PRE_BUILD b/graphics/pngquant/PRE_BUILD
new file mode 100755
index 0000000..43bb7c1
--- /dev/null
+++ b/graphics/pngquant/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:install\: \$(BIN):install\::" Makefile
diff --git a/graphics/scrot/DEPENDS b/graphics/scrot/DEPENDS
index 17c2648..e5eda80 100755
--- a/graphics/scrot/DEPENDS
+++ b/graphics/scrot/DEPENDS
@@ -1 +1,3 @@
-depends giblib
+depends giblib &&
+depends imlib2 &&
+depends libx11
diff --git a/graphics/scrot/HISTORY b/graphics/scrot/HISTORY
index bddf88b..281b3d7 100644
--- a/graphics/scrot/HISTORY
+++ b/graphics/scrot/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: imlib2, libx11
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/graphics/shotwell/DEPENDS b/graphics/shotwell/DEPENDS
index 553abc1..f7c4f03 100755
--- a/graphics/shotwell/DEPENDS
+++ b/graphics/shotwell/DEPENDS
@@ -8,4 +8,5 @@ depends json-glib &&
depends webkitgtk &&
depends gstreamer-1.0 &&
depends gst-plugins-base-1.0 &&
-depends libgee
+depends libgee &&
+depends rest
diff --git a/graphics/shotwell/DETAILS b/graphics/shotwell/DETAILS
index 10c0491..b6be1e2 100755
--- a/graphics/shotwell/DETAILS
+++ b/graphics/shotwell/DETAILS
@@ -1,11 +1,11 @@
SPELL=shotwell
- VERSION=0.14.1
+ VERSION=0.18.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://yorba.org/download/shotwell/${VERSION::4}/$SOURCE
+
SOURCE_URL[0]=https://download.gnome.org/sources/$SPELL/${VERSION%.*}/$SOURCE
WEB_SITE=http://yorba.org/shotwell/
ENTERED=20100709
-
SOURCE_HASH=sha512:cefc5130b7fd5bd2b7d7889c5ebba01e9a447e885ece8353e42cd4cd515c068722d2460a2cdf31a94824605091c06042e086986aff8fe2dd0b589ad2a2dce20b
+
SOURCE_HASH=sha512:42fbb0840bb64b07512381695b2b0b076b5fd574e3c23cfed9b8722d49b87574ee2d1edc7c10cefbbda3da01f80a2e5162ea9e7d1b48d6f6c416a84f2b3d6fca
LICENSE[0]=GPL
SHORT="digital photo organizer"
cat << EOF
diff --git a/graphics/shotwell/HISTORY b/graphics/shotwell/HISTORY
index 39d27d8..8fe90e5 100644
--- a/graphics/shotwell/HISTORY
+++ b/graphics/shotwell/HISTORY
@@ -1,3 +1,8 @@
+2014-06-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on rest
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 0.18.0
+
2013-04-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.14.1

diff --git a/graphics/swftools/DEPENDS b/graphics/swftools/DEPENDS
index 756f3c0..04f2443 100755
--- a/graphics/swftools/DEPENDS
+++ b/graphics/swftools/DEPENDS
@@ -1,4 +1,4 @@
depends freetype2 &&
depends JPEG &&

-optional_depends giflib '' '' 'enable gif2swf transformation tool ?'
+optional_depends GIFLIB '' '' 'enable gif2swf transformation tool ?'
diff --git a/graphics/swftools/HISTORY b/graphics/swftools/HISTORY
index e2d83f7..f48e4e4 100644
--- a/graphics/swftools/HISTORY
+++ b/graphics/swftools/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/graphics/topmod/DETAILS b/graphics/topmod/DETAILS
index b8d6be3..170267c 100755
--- a/graphics/topmod/DETAILS
+++ b/graphics/topmod/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=topmod
-if [[ $TOPMOD_AUTOUPDATE == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_URL[0]=svn_http://${SPELL}.googlecode.com/svn/trunk:topmod-svn
SOURCE_IGNORE=volatile
diff --git a/graphics/topmod/HISTORY b/graphics/topmod/HISTORY
index 188ca90..ad1e028 100644
--- a/graphics/topmod/HISTORY
+++ b/graphics/topmod/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS, DETAILS, BUILD, INSTALL, PRE_BUILD, PREPARE: spell created
* 64.bit.patch: initial unbreaking patch from Arch
diff --git a/graphics/xaralx/DETAILS b/graphics/xaralx/DETAILS
index d2e01db..dc99ab3 100755
--- a/graphics/xaralx/DETAILS
+++ b/graphics/xaralx/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=xaralx
SPELLX=XaraLX
if [[ $XARALX_BRANCH == scm ]]; then
- if [[ $XARALX_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_URL[0]=svn://svn.xara.com/Trunk/${SPELLX}:${SPELLX}
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index dc17e5d..4631599 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/groups b/groups
index 25f9eaa..666ffdc 100755
--- a/groups
+++ b/groups
@@ -124,7 +124,9 @@ mdm:196:
polkitd:197:
opendkim:198:
dk-milter:199:
-kde5:200:
+plasma:200:
gnarwl:201:
+sddm:202:
+input:203:
users:1000:
nogroup:65534:
diff --git a/haskell/happy/DETAILS b/haskell/happy/DETAILS
index ae20c0d..03dc5a7 100755
--- a/haskell/happy/DETAILS
+++ b/haskell/happy/DETAILS
@@ -1,8 +1,8 @@
SPELL=happy
- VERSION=1.18.10
+ VERSION=1.19.3
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:e052b016bae9f255a9dfa7e4970a015cc5abfdd5216e6e4d4317c63890f154dd68da75aac1ac9bb5a8c84854e59066d0daed09c6ac4d4928ce93ecf4c8bcfb80
+
SOURCE_HASH=sha512:8d04a5756eb3b36a0aea3e7828adb69d657c6f9a18a2552295c60483fd50caf27a21cff3da4052e25adf25b0203907e782372ed0d2e2563467425144654a281b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.haskell.org/happy/";
LICENSE[0]=BSD3
diff --git a/haskell/happy/HISTORY b/haskell/happy/HISTORY
index ead5031..59e411f 100644
--- a/haskell/happy/HISTORY
+++ b/haskell/happy/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.19.3
+
2013-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.18.10

diff --git a/haskell/haskell-aeson/DEPENDS b/haskell/haskell-aeson/DEPENDS
index 4d2f13a..55fc430 100755
--- a/haskell/haskell-aeson/DEPENDS
+++ b/haskell/haskell-aeson/DEPENDS
@@ -4,7 +4,7 @@ depends haskell-blaze-builder &&
depends haskell-hashable &&
depends haskell-mtl &&
depends haskell-syb &&
-depends haskell-text &&
+depends haskell-text "--flags=new-bytestring-builder" &&
depends haskell-unordered-containers &&
depends haskell-vector &&
depends haskell-scientific
diff --git a/haskell/haskell-aeson/DETAILS b/haskell/haskell-aeson/DETAILS
index 197871c..6a769bd 100755
--- a/haskell/haskell-aeson/DETAILS
+++ b/haskell/haskell-aeson/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-aeson
- VERSION=0.7.0.1
+ VERSION=0.7.0.3
SOURCE="aeson-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/aeson/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:5baecdeaeb5af81687e86fb9f7b35a394a160278842f547354032f0d8d599b5da2d3ccd8ed8824157c671b6c8f5a8dd341c4e60c3fbce031bf6b6314b79eaaf0
+
SOURCE_HASH=sha512:8dc1734ce7ba8550d2bdb04cc920218902d75c1b6044b9e63112b94a40d3ff588c4873b7f1ce7519bc7f3bf664421342f210804a265287c2f2868df8a70ad2c1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/aeson-${VERSION}"
WEB_SITE="https://github.com/bos/aeson";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-aeson/HISTORY b/haskell/haskell-aeson/HISTORY
index ee9169a..a00feac 100644
--- a/haskell/haskell-aeson/HISTORY
+++ b/haskell/haskell-aeson/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 0.7.0.3
+
2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 0.7.0.1

diff --git a/haskell/haskell-async/DEPENDS b/haskell/haskell-async/DEPENDS
new file mode 100755
index 0000000..acd076e
--- /dev/null
+++ b/haskell/haskell-async/DEPENDS
@@ -0,0 +1 @@
+depends haskell-stm
diff --git a/haskell/haskell-async/HISTORY b/haskell/haskell-async/HISTORY
index 2d28697..4ba9dbc 100644
--- a/haskell/haskell-async/HISTORY
+++ b/haskell/haskell-async/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on haskell-stm
+
2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.1.5

diff --git a/haskell/haskell-attoparsec/DETAILS
b/haskell/haskell-attoparsec/DETAILS
index 8e42e04..2a21ebf 100755
--- a/haskell/haskell-attoparsec/DETAILS
+++ b/haskell/haskell-attoparsec/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-attoparsec
- VERSION=0.11.1.0
+ VERSION=0.11.3.0
SOURCE="attoparsec-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/attoparsec/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:d2ccea16852a05bae7c81fa53478274e84d0358e41f8d5383dcf7845a16885315459bc7f591e6318157c64dd674cffc6bd80a29a4a318f8a657a3d562f444764
+
SOURCE_HASH=sha512:fbdfea4c49060ebd8dcc1906ef4a401244abf82cb34b969b0c164dce96d062e2e6fed05a894b6fd4b6396fd6226a2a1788b4a8e5af227781d6690f38fe795172
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/attoparsec-${VERSION}"
WEB_SITE="https://github.com/bos/attoparsec";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-attoparsec/HISTORY
b/haskell/haskell-attoparsec/HISTORY
index b5aa689..7de99d2 100644
--- a/haskell/haskell-attoparsec/HISTORY
+++ b/haskell/haskell-attoparsec/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.3.0
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 0.11.1.0

diff --git
a/haskell/haskell-bloomfilter/0001-fix-compile-errors-with-array-0.5.patch
b/haskell/haskell-bloomfilter/0001-fix-compile-errors-with-array-0.5.patch
new file mode 100644
index 0000000..8c580cd
--- /dev/null
+++ b/haskell/haskell-bloomfilter/0001-fix-compile-errors-with-array-0.5.patch
@@ -0,0 +1,41 @@
+From fe97449bf7d5757de1712d42a66b280582278901 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 3 May 2014 15:02:34 +0200
+Subject: [PATCH] fix compile errors with array-0.5
+
+---
+ Data/BloomFilter.hs | 3 ++-
+ Data/BloomFilter/Array.hs | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
+index 69711ef..7a284b8 100644
+--- a/Data/BloomFilter.hs
++++ b/Data/BloomFilter.hs
+@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_)
+ import Control.Monad.ST (ST, runST)
+ import Control.DeepSeq (NFData(..))
+ import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite)
+-import Data.Array.ST (STUArray, thaw, unsafeFreeze)
++import Data.Array.ST (STUArray, thaw)
++import Data.Array.Unsafe (unsafeFreeze)
+ import Data.Array.Unboxed (UArray)
+ import Data.Bits ((.&.), (.|.))
+ import Data.BloomFilter.Array (newArray)
+diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs
+index e085bbe..d94757a 100644
+--- a/Data/BloomFilter/Array.hs
++++ b/Data/BloomFilter/Array.hs
+@@ -3,7 +3,8 @@
+
+ module Data.BloomFilter.Array (newArray) where
+
+-import Control.Monad.ST (ST, unsafeIOToST)
++import Control.Monad.ST (ST)
++import Control.Monad.ST.Unsafe (unsafeIOToST)
+ import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
+ #if __GLASGOW_HASKELL__ >= 704
+ import Foreign.C.Types (CInt(..), CSize(..))
+--
+1.9.1
+
diff --git a/haskell/haskell-bloomfilter/HISTORY
b/haskell/haskell-bloomfilter/HISTORY
index 0d8eec9..43dff36 100644
--- a/haskell/haskell-bloomfilter/HISTORY
+++ b/haskell/haskell-bloomfilter/HISTORY
@@ -1,3 +1,7 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-compile-errors-with-array-0.5.patch:
+ fix compile error with array-0.5
+
2013-07-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-bloomfilter/PRE_BUILD
b/haskell/haskell-bloomfilter/PRE_BUILD
new file mode 100755
index 0000000..3246958
--- /dev/null
+++ b/haskell/haskell-bloomfilter/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-compile-errors-with-array-0.5.patch
diff --git a/haskell/haskell-case-insensitive/DETAILS
b/haskell/haskell-case-insensitive/DETAILS
index f9c6fda..df81b9b 100755
--- a/haskell/haskell-case-insensitive/DETAILS
+++ b/haskell/haskell-case-insensitive/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-case-insensitive
- VERSION=1.1.0.3
+ VERSION=1.2.0.0
SOURCE="case-insensitive-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/package/case-insensitive-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:d9b21c31e65224e5ce181fa680ee7f67371ae03248a51a2329e46ba27b22e0f426e02cbc872af7ca42c84d56450ffac2ff62ffaf41e7055abcb43aa97e3c404c
+
SOURCE_HASH=sha512:bfdcf01256fb7150bcde060d4fba4b6e9e3f750aaa6948ce2bd39f38319e844a14c338def5af896696d41fc613442116ee7b17a1e9f018666eda6c9b3fec3432
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/case-insensitive-${VERSION}"
WEB_SITE="https://github.com/basvandijk/case-insensitive";
LICENSE[0]=BSD
diff --git a/haskell/haskell-case-insensitive/HISTORY
b/haskell/haskell-case-insensitive/HISTORY
index a69e544..ebdc8d4 100644
--- a/haskell/haskell-case-insensitive/HISTORY
+++ b/haskell/haskell-case-insensitive/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.0.0
+
2014-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-cryptohash/DETAILS
b/haskell/haskell-cryptohash/DETAILS
index 57831eb..e5eb390 100755
--- a/haskell/haskell-cryptohash/DETAILS
+++ b/haskell/haskell-cryptohash/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-cryptohash
- VERSION=0.11.2
+ VERSION=0.11.4
SOURCE="cryptohash-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/cryptohash/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:d05f0e372cc1be2be5849244b45f7f3412ae6ded189dafe7ff3977478222f7ddf3ecf4853e7ab95f1db67c138e97851484d3315d3185d9c07aaa0449cb90a8d3
+
SOURCE_HASH=sha512:1c522f231aad6053c43fc5d45ac8cf56d7ed61e2e5c868325a2ff8d6a07910482d861a2d9317e44afe4cbf70e5ec7e73ccc318cb57651b31e762d3a10c32b596
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/cryptohash-${VERSION}"
WEB_SITE="http://github.com/vincenthz/hs-cryptohash";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-cryptohash/HISTORY
b/haskell/haskell-cryptohash/HISTORY
index 09f421b..e654029 100644
--- a/haskell/haskell-cryptohash/HISTORY
+++ b/haskell/haskell-cryptohash/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.4
+
2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.2

diff --git a/haskell/haskell-dataenc/DETAILS b/haskell/haskell-dataenc/DETAILS
index eaec0e6..a2a333d 100755
--- a/haskell/haskell-dataenc/DETAILS
+++ b/haskell/haskell-dataenc/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-dataenc
- VERSION=0.14.0.5
+ VERSION=0.14.0.7
SOURCE="dataenc-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/dataenc/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:b73e5060a3b9c00fbcdadb6dd8ca890c4a6f8ef862822e7d71bde1c0a99de1199cfa384cd8c219f41218f8eef4e9017ecc2c1c186516d7a809aadb599530bf88
+
SOURCE_HASH=sha512:82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/dataenc-${VERSION}"
WEB_SITE="http://www.haskell.org/haskellwiki/Library/Data_encoding";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-dataenc/HISTORY b/haskell/haskell-dataenc/HISTORY
index cd05d20..a9d0865 100644
--- a/haskell/haskell-dataenc/HISTORY
+++ b/haskell/haskell-dataenc/HISTORY
@@ -1,3 +1,6 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.14.0.7
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-dlist/DETAILS b/haskell/haskell-dlist/DETAILS
index e1c2857..98af3fa 100755
--- a/haskell/haskell-dlist/DETAILS
+++ b/haskell/haskell-dlist/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-dlist
- VERSION=0.6.0.1
+ VERSION=0.7.0.1
SOURCE="dlist-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/dlist/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:31f692e14f0bdddbbdec985e6e5b0262ac74f0d03cd97c77427bf5552e58f2f79c20d8f4ba03479b45dd3f54a1d141a275928878d1b2a9eb71c667745f8bd5e4
+
SOURCE_HASH=sha512:1e76327669e54bd4bde234aed80abbc09a55697f573f4ccf3843a2259224a478a86c40d32ccd26aa703457f22615b31eaeae4da078c3f48b8ff7e8d1f515a9dc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/dlist-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/dlist";
LICENSE[0]=BSD
diff --git a/haskell/haskell-dlist/HISTORY b/haskell/haskell-dlist/HISTORY
index f489545..8a95741 100644
--- a/haskell/haskell-dlist/HISTORY
+++ b/haskell/haskell-dlist/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.7.0.1
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.6.0.1

diff --git a/haskell/haskell-ghc-syb-utils/DEPENDS
b/haskell/haskell-ghc-syb-utils/DEPENDS
new file mode 100755
index 0000000..5010903
--- /dev/null
+++ b/haskell/haskell-ghc-syb-utils/DEPENDS
@@ -0,0 +1,2 @@
+depends ghc &&
+depends haskell-syb
diff --git a/haskell/haskell-ghc-syb-utils/DETAILS
b/haskell/haskell-ghc-syb-utils/DETAILS
new file mode 100755
index 0000000..ec95e55
--- /dev/null
+++ b/haskell/haskell-ghc-syb-utils/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=haskell-ghc-syb-utils
+ VERSION=0.2.1.2
+ SOURCE="ghc-syb-utils-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/package/ghc-syb-utils-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:dd71c0ad28005f412267e49b53f916e3ea679e3be0c6f70ad27e3ff882a9cc3ce825e76dd434eb8a2551083a79a9a0020b6f0510e19dc186ea95010349295474
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ghc-syb-utils-${VERSION}"
+ WEB_SITE="http://github.com/nominolo/ghc-syb";
+ LICENSE[0]=BSD
+ ENTERED=20140604
+ SHORT="scrap Your Boilerplate utilities for the GHC API"
+cat << EOF
+Scrap Your Boilerplate instances for GHC's data types.
+EOF
diff --git a/haskell/haskell-ghc-syb-utils/HISTORY
b/haskell/haskell-ghc-syb-utils/HISTORY
new file mode 100644
index 0000000..f900aaf
--- /dev/null
+++ b/haskell/haskell-ghc-syb-utils/HISTORY
@@ -0,0 +1,3 @@
+2014-06-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-git-annex/DETAILS
b/haskell/haskell-git-annex/DETAILS
index de44828..174a214 100755
--- a/haskell/haskell-git-annex/DETAILS
+++ b/haskell/haskell-git-annex/DETAILS
@@ -1,9 +1,9 @@
SPELL=haskell-git-annex
XSPELL=git-annex
- VERSION=5.20140402
+ VERSION=5.20140405
SOURCE="${XSPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:82fc637dec3e662e7dbf072a12ee3cc9dbbc1fc095a550de0e588dfe628972d4117c4769ec87fa03d775da655de119b1b79d10edee612e242355d690b7caef88
+
SOURCE_HASH=sha512:6723bb3a0eaca521559492606db6ba27256f16d45c6cc129991daddf442996b08b9eb9aeb9245d32c241435c66cf6581aaa0c1c4cde7dfaf196f0d2b5dd66e7a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${XSPELL}-${VERSION}"
WEB_SITE="Homepage: http://git-annex.branchable.com/";
LICENSE[0]=License: GPL-3
diff --git a/haskell/haskell-git-annex/HISTORY
b/haskell/haskell-git-annex/HISTORY
index ecaf65f..ab4b2f6 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,5 +1,8 @@
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.20140405
+
2014-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 5.20140403
+ * DETAILS: version 5.20140402

2014-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20140320
diff --git a/haskell/haskell-hashed-storage/DETAILS
b/haskell/haskell-hashed-storage/DETAILS
index 350a46f..0ef53b9 100755
--- a/haskell/haskell-hashed-storage/DETAILS
+++ b/haskell/haskell-hashed-storage/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-hashed-storage
- VERSION=0.5.10
+ VERSION=0.5.11
SOURCE="hashed-storage-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/hashed-storage/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:dfb9cecdfe44e311020ccb79c437d2bb326f18d4022a0386aacd5c23a7c93b6a4f70baa7c2724b796785257a1733407975682fd3b949eda80bee9824df9b7001
+
SOURCE_HASH=sha512:11bfc05ecb2de5adc5a46116d15d969207a310583e7183e2a21ef767a23eabc55622c84ef351ace81a29800a544358c604b4a255800a713af01266331bf321ba
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/hashed-storage-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/hashed-storage";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-hashed-storage/HISTORY
b/haskell/haskell-hashed-storage/HISTORY
index cd05d20..60f7f2e 100644
--- a/haskell/haskell-hashed-storage/HISTORY
+++ b/haskell/haskell-hashed-storage/HISTORY
@@ -1,3 +1,6 @@
+2014-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.11
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-haskeline/DETAILS
b/haskell/haskell-haskeline/DETAILS
index 8e30a6a..f2c8fe9 100755
--- a/haskell/haskell-haskeline/DETAILS
+++ b/haskell/haskell-haskeline/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-haskeline
- VERSION=0.7.0.3
+ VERSION=0.7.1.2
SOURCE="haskeline-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/haskeline/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:85c4749d2f8daa05731dd28ff645dfbd7e9c694b8e199af0312a2c8f1dc86fa2911e50a0906dd58ee019545b0bb63108aabdab36ba5ae9417e365717ad824a6e
+
SOURCE_HASH=sha512:11d3ee9507d10d14ad05a45eb269a70a661e755502c7a39c5516508e66bda7c0d56c0d91db3e6ea665ee532001bef246be14a95c12eb257724616753e2b93f6c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/haskeline-${VERSION}"
WEB_SITE="Homepage: http://trac.haskell.org/haskeline";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-haskeline/HISTORY
b/haskell/haskell-haskeline/HISTORY
index cd05d20..8a74247 100644
--- a/haskell/haskell-haskeline/HISTORY
+++ b/haskell/haskell-haskeline/HISTORY
@@ -1,3 +1,6 @@
+2014-04-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.7.1.2
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-hasktags/DEPENDS
b/haskell/haskell-hasktags/DEPENDS
new file mode 100755
index 0000000..d023774
--- /dev/null
+++ b/haskell/haskell-hasktags/DEPENDS
@@ -0,0 +1,3 @@
+depends ghc &&
+depends haskell-json &&
+depends haskell-utf8-string
diff --git a/haskell/haskell-hasktags/DETAILS
b/haskell/haskell-hasktags/DETAILS
new file mode 100755
index 0000000..67b5711
--- /dev/null
+++ b/haskell/haskell-hasktags/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=haskell-hasktags
+ VERSION=0.69.0
+ SOURCE="hasktags-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/package/hasktags-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:fb35b0c676a194ffaff743521c9df25217350ef51b7f87c9c26f5fde8785c7ef6149123008287dcc61d9aea822e8804d8127204c0de6bcfa77d29e14153606fa
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/hasktags-${VERSION}"
+ WEB_SITE="https://github.com/MarcWeber/hasktags";
+ LICENSE[0]=BSD
+ ENTERED=20140524
+ SHORT="a tool to generate tag files for vim and emacs"
+cat << EOF
+hasktags: a tool to generate tag files for vim and emacs.
+EOF
diff --git a/haskell/haskell-hasktags/HISTORY
b/haskell/haskell-hasktags/HISTORY
new file mode 100644
index 0000000..211b0a8
--- /dev/null
+++ b/haskell/haskell-hasktags/HISTORY
@@ -0,0 +1,3 @@
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-haxml/DETAILS b/haskell/haskell-haxml/DETAILS
index 79d7177..7d018db 100755
--- a/haskell/haskell-haxml/DETAILS
+++ b/haskell/haskell-haxml/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-haxml
- VERSION=1.22.5
+ VERSION=1.24.1
SOURCE="HaXml-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/HaXml/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0481737b7d45f0075541b9c67d147778450abb08db686e81ca663eecd9d1133de498e1065dc772d3166f63c4aeb624f5d260585a14b66dceb311d5dc7715346f
+
SOURCE_HASH=sha512:421f3a61e8eebf5ad915551c51dcd843a544e7959b93d6dd4ab2ffc6c20954f559da75dcfecc6fea838f80dc4d3c83243be3ce7a21e92bc165b3e0be120451bf
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/HaXml-${VERSION}"
WEB_SITE="http://www.cs.york.ac.uk/fp/HaXml/";
LICENSE[0]=LGPL
diff --git a/haskell/haskell-haxml/HISTORY b/haskell/haskell-haxml/HISTORY
index a86f244..ca9dbf9 100644
--- a/haskell/haskell-haxml/HISTORY
+++ b/haskell/haskell-haxml/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.24.1
+
2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-hslogger/DETAILS
b/haskell/haskell-hslogger/DETAILS
index 1a450d1..4b763b3 100755
--- a/haskell/haskell-hslogger/DETAILS
+++ b/haskell/haskell-hslogger/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-hslogger
- VERSION=1.2.3
+ VERSION=1.2.4
SOURCE="hslogger-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/hslogger/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ebf1108efd8ecbcd8b67c3ce646f5ffde3f95ff8092ab8f9d0fb00b1207fc69db45b2abfdf71312b32e86d922672f88ca6dfce15c0c7371fc78dc223fdf61356
+
SOURCE_HASH=sha512:41880352ea3883bcdf12b50d6d7933ef092c715ff69f5b8bb57e4a603f09443cbf8188475b2968af04965387d4723fc194786794d9765c004a41541b70598581
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/hslogger-${VERSION}"
WEB_SITE="http://software.complete.org/hslogger";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-hslogger/HISTORY
b/haskell/haskell-hslogger/HISTORY
index 5ea4cec..fbabcff 100644
--- a/haskell/haskell-hslogger/HISTORY
+++ b/haskell/haskell-hslogger/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.4
+
2013-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.3

diff --git a/haskell/haskell-http/DETAILS b/haskell/haskell-http/DETAILS
index 370edc0..843e8c3 100755
--- a/haskell/haskell-http/DETAILS
+++ b/haskell/haskell-http/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-http
- VERSION=4000.2.11
+ VERSION=4000.2.14
SOURCE="HTTP-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/HTTP/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:3c7d91de84d55ca010e066f823f7b7220db27b0746ca26baee6bf549fa16767e54a31735a69e66d8debd5f1cd9a793210c324aebca4b903627ec5ea673dfc912
+
SOURCE_HASH=sha512:d571884fe414cab99dd2a2364a25eba0320689d428cd6d4415f291fce2d66f56c7282eb4b4a3d6847f9334dc6b67d96a0efbe541f6ff5129de048869558e9e13
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/HTTP-${VERSION}"
WEB_SITE="https://github.com/haskell/HTTP";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-http/HISTORY b/haskell/haskell-http/HISTORY
index 0cbeaad..b8e2782 100644
--- a/haskell/haskell-http/HISTORY
+++ b/haskell/haskell-http/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4000.2.14
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4000.2.11

diff --git a/haskell/haskell-missingh/DETAILS
b/haskell/haskell-missingh/DETAILS
index a43a420..c829613 100755
--- a/haskell/haskell-missingh/DETAILS
+++ b/haskell/haskell-missingh/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-missingh
- VERSION=1.2.0.2
+ VERSION=1.2.1.0
SOURCE="MissingH-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/MissingH/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
+
SOURCE_HASH=sha512:54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MissingH-${VERSION}"
WEB_SITE="http://software.complete.org/missingh";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-missingh/HISTORY
b/haskell/haskell-missingh/HISTORY
index f850442..3813a94 100644
--- a/haskell/haskell-missingh/HISTORY
+++ b/haskell/haskell-missingh/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.1.0
+
2013-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.0.2

diff --git a/haskell/haskell-mmap/DETAILS b/haskell/haskell-mmap/DETAILS
index f197e9c..1c1b47f 100755
--- a/haskell/haskell-mmap/DETAILS
+++ b/haskell/haskell-mmap/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-mmap
- VERSION=0.5.8
+ VERSION=0.5.9
SOURCE="mmap-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mmap/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:6c8b526ec9fedba195ce021f86eeb3fa35f7c95b9299d17503ad7d7e91b9485b3d9980e0ccbdc3876ec465ec8aa07cf9d0521c62e2c8a652a36df11b9badffb5
+
SOURCE_HASH=sha512:3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mmap-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/mmap";
LICENSE[0]=License: BSD3
diff --git a/haskell/haskell-mmap/HISTORY b/haskell/haskell-mmap/HISTORY
index cd05d20..da365e5 100644
--- a/haskell/haskell-mmap/HISTORY
+++ b/haskell/haskell-mmap/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.9
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-monads-tf/DETAILS
b/haskell/haskell-monads-tf/DETAILS
index d5002a2..ca9352e 100755
--- a/haskell/haskell-monads-tf/DETAILS
+++ b/haskell/haskell-monads-tf/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-monads-tf
- VERSION=0.1.0.1
+ VERSION=0.1.0.2
SOURCE="monads-tf-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/package/monads-tf-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ea087bc58e4116accdb8d210d66a6ebdbe927ffacebc6f80aaf9fe288541eb1f721d846243aa9098e7f23c145845b508c1ead75e7892eb5a372a22b45fd9ec35
+
SOURCE_HASH=sha512:5539d735f3d638a700a36e1d3cf0a96dbfd15f9701208e2a6ab71eaee2d00b6e2bd49acbc3e561414e923952ca702d33662511fe057a95bad125609f6216b620
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/monads-tf-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/monads-tf";
LICENSE[0]=BSD
diff --git a/haskell/haskell-monads-tf/HISTORY
b/haskell/haskell-monads-tf/HISTORY
index e59d8c4..18da165 100644
--- a/haskell/haskell-monads-tf/HISTORY
+++ b/haskell/haskell-monads-tf/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.1.0.2
+
2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-mtl/DETAILS b/haskell/haskell-mtl/DETAILS
index 85b7be6..15cc5fd 100755
--- a/haskell/haskell-mtl/DETAILS
+++ b/haskell/haskell-mtl/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-mtl
- VERSION=2.1.2
+ VERSION=2.2.0.1
SOURCE="mtl-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mtl/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ef8043adeb2746c770bebd4683c95c399bdc047c278b619d89230f342d13c33f0a9275c6be399e6da329f385ff209ff537e002b82d5075684202e8703fc5e29d
+
SOURCE_HASH=sha512:7e201bbaf96da123c6c9e38e68bc1161c7cfcec39ae2828cf495e5082608e1e84b83f3d3ff9cff6fe884b4bf43dc46692e980382b38808f55ecf1ad7f5d01a5e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mtl-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-mtl/HISTORY b/haskell/haskell-mtl/HISTORY
index 18763f1..5b24de5 100644
--- a/haskell/haskell-mtl/HISTORY
+++ b/haskell/haskell-mtl/HISTORY
@@ -1,3 +1,9 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.2.0.1
+
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.3.1
+
2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.2

diff --git a/haskell/haskell-network/DETAILS b/haskell/haskell-network/DETAILS
index 31641b6..2e902e3 100755
--- a/haskell/haskell-network/DETAILS
+++ b/haskell/haskell-network/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-network
- VERSION=2.4.2.2
+ VERSION=2.5.0.0
SOURCE="network-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/network/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
+
SOURCE_HASH=sha512:37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/network-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-network/HISTORY b/haskell/haskell-network/HISTORY
index b9ba92c..80f0beb 100644
--- a/haskell/haskell-network/HISTORY
+++ b/haskell/haskell-network/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.0.0
+
2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.2.2

diff --git a/haskell/haskell-polyparse/DETAILS
b/haskell/haskell-polyparse/DETAILS
index 9b80b45..de3c187 100755
--- a/haskell/haskell-polyparse/DETAILS
+++ b/haskell/haskell-polyparse/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-polyparse
- VERSION=1.8
+ VERSION=1.9
SOURCE="polyparse-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/polyparse/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:f0a6b84945c1da009ae594089d2a5df51f37c0f8e776c07489671e6770abf68d7a6794c179b7c922aa1ea30c79bb1879fa3505848313bbfb51d46fecc1c9bfa4
+
SOURCE_HASH=sha512:80f7cc269c7082d256aa273ce668a8fd9f58b4827fa69e390d749a622d667d5c01b7ede3719d52408d3efa35de66928a3fa659f3798826a2d53222d8a8d9d7e6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/polyparse-${VERSION}"
WEB_SITE="http://code.haskell.org/~malcolm/polyparse/";
LICENSE[0]=LGPL
diff --git a/haskell/haskell-polyparse/HISTORY
b/haskell/haskell-polyparse/HISTORY
index a86f244..591fa4b 100644
--- a/haskell/haskell-polyparse/HISTORY
+++ b/haskell/haskell-polyparse/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.9
+
2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-quickcheck/DEPENDS
b/haskell/haskell-quickcheck/DEPENDS
index 8eace53..32e0c14 100755
--- a/haskell/haskell-quickcheck/DEPENDS
+++ b/haskell/haskell-quickcheck/DEPENDS
@@ -1 +1,2 @@
-depends ghc
+depends ghc &&
+depends haskell-tf-random
diff --git a/haskell/haskell-quickcheck/DETAILS
b/haskell/haskell-quickcheck/DETAILS
index dac0394..c6d9578 100755
--- a/haskell/haskell-quickcheck/DETAILS
+++ b/haskell/haskell-quickcheck/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-quickcheck
- VERSION=2.6
+ VERSION=2.7.3
SOURCE="QuickCheck-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/QuickCheck/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166
+
SOURCE_HASH=sha512:7aac1ec22085862219d83b4acff2098bca6d1471ac26f45a8886aaae277d5a9f2de43a7110341cf9c079f89b6396db66060f31c100002e90382f941a3d3a54e3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QuickCheck-${VERSION}"
WEB_SITE="http://www.math.chalmers.se/~rjmh/QuickCheck/";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-quickcheck/HISTORY
b/haskell/haskell-quickcheck/HISTORY
index f38ba1e..3bf2ae6 100644
--- a/haskell/haskell-quickcheck/HISTORY
+++ b/haskell/haskell-quickcheck/HISTORY
@@ -1,3 +1,7 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7.3
+ * DEPENDS: depend on haskell-tf-random
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6

diff --git a/haskell/haskell-safesemaphore/DETAILS
b/haskell/haskell-safesemaphore/DETAILS
index 07a805c..565d4f1 100755
--- a/haskell/haskell-safesemaphore/DETAILS
+++ b/haskell/haskell-safesemaphore/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-safesemaphore
- VERSION=0.10.0
+ VERSION=0.10.1
SOURCE="SafeSemaphore-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/SafeSemaphore/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:9dfde05927b9e000a998c164454715f68b7d3ece7c9078e53f6de1be18096e58d7fe68f3547f9414d341f9a8fd58a9ff0085c2bb6c78d5957b428d917e03af58
+
SOURCE_HASH=sha512:877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/SafeSemaphore-${VERSION}"
WEB_SITE="https://github.com/ChrisKuklewicz/SafeSemaphore";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-safesemaphore/HISTORY
b/haskell/haskell-safesemaphore/HISTORY
index af01445..d979583 100644
--- a/haskell/haskell-safesemaphore/HISTORY
+++ b/haskell/haskell-safesemaphore/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10.1
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.10.0

diff --git a/haskell/haskell-scientific/DETAILS
b/haskell/haskell-scientific/DETAILS
index a8d0d0f..73e27a2 100755
--- a/haskell/haskell-scientific/DETAILS
+++ b/haskell/haskell-scientific/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-scientific
- VERSION=0.2.0.1
+ VERSION=0.2.0.2
SOURCE="scientific-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/package/scientific-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:bff2cb2f91ad5153588d5b6c07ec5e02438cdb582a72bfbd10504f2b53f3e2975e16bbe6b2d69dc8943916bc016f3e7e2dc94a17a34afe28577a32b799072d8b
+
SOURCE_HASH=sha512:ee63f686a22e84ab82358b5df287fd1e41099f053b5b3f020a1970de6a8a18eea885d3d16d39e4a73621b7346e4e262c55bf7740b927d880a563801c2a18bd23
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/scientific-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/scientific";
LICENSE[0]=BSD
diff --git a/haskell/haskell-scientific/HISTORY
b/haskell/haskell-scientific/HISTORY
index cac9aac..12ddbf6 100644
--- a/haskell/haskell-scientific/HISTORY
+++ b/haskell/haskell-scientific/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.0.2
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-stm/DETAILS b/haskell/haskell-stm/DETAILS
index 10a38f3..f98691f 100755
--- a/haskell/haskell-stm/DETAILS
+++ b/haskell/haskell-stm/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-stm
- VERSION=2.4.2
+ VERSION=2.4.3
SOURCE="stm-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/stm/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da
+
SOURCE_HASH=sha512:a42d6ffc27318f11be80be16292b5e86a47087780aea5ff7bd27b1d36e966429e3dd645e0c749cc6d957be48a947e63f314cdfb412d7a9adb676d7e9fdfb6e57
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/stm-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stm";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-stm/HISTORY b/haskell/haskell-stm/HISTORY
index aeb09be..8076dde 100644
--- a/haskell/haskell-stm/HISTORY
+++ b/haskell/haskell-stm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.3
+
2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.2

diff --git a/haskell/haskell-text/DETAILS b/haskell/haskell-text/DETAILS
index f814336..e30e5dd 100755
--- a/haskell/haskell-text/DETAILS
+++ b/haskell/haskell-text/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-text
- VERSION=0.11.3.1
+ VERSION=1.1.1.1
SOURCE="text-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/text/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6
+
SOURCE_HASH=sha512:78053c6db64bb37f062a2f522b03536106e7a35aa2ff923e375da5b73e01994c58ae7040bb6497fddf2be40be0f87e68e61fb4928b42e933671639a41bc31cf5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/text-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/text";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-text/HISTORY b/haskell/haskell-text/HISTORY
index c68d4d9..29aeb3f 100644
--- a/haskell/haskell-text/HISTORY
+++ b/haskell/haskell-text/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.1.1
+
2013-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.3.1

diff --git a/haskell/haskell-tf-random/DEPENDS
b/haskell/haskell-tf-random/DEPENDS
new file mode 100755
index 0000000..c988845
--- /dev/null
+++ b/haskell/haskell-tf-random/DEPENDS
@@ -0,0 +1,3 @@
+depends ghc &&
+depends haskell-primitive &&
+depends haskell-random
diff --git a/haskell/haskell-tf-random/DETAILS
b/haskell/haskell-tf-random/DETAILS
new file mode 100755
index 0000000..e4506da
--- /dev/null
+++ b/haskell/haskell-tf-random/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=haskell-tf-random
+ VERSION=0.5
+ SOURCE="tf-random-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/package/tf-random-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:a766909571b4b37daaaaa9fa1aa9739bd2db8c32c0f64452fd7c3717f4578090e5227b763772858c6c311c5f366dd461421ffc3beb295455902fea1fb133deb7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/tf-random-${VERSION}"
+ WEB_SITE="http://hackage.haskell.org/package/tf-random";
+ LICENSE[0]=BSD
+ ENTERED=20140505
+ SHORT="a high-quality splittable pseudorandom number generator"
+cat << EOF
+This package contains an implementation of a high-quality splittable
+pseudorandom number generator. The generator is based on a cryptographic
+hash function built on top of the ThreeFish block cipher. See the paper
+Splittable Pseudorandom Number Generators Using Cryptographic Hashing by
+Claessen, Pałka for details and the rationale of the design.
+EOF
diff --git a/haskell/haskell-tf-random/HISTORY
b/haskell/haskell-tf-random/HISTORY
new file mode 100644
index 0000000..02f39ee
--- /dev/null
+++ b/haskell/haskell-tf-random/HISTORY
@@ -0,0 +1,3 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-transformers/DETAILS
b/haskell/haskell-transformers/DETAILS
index b26c350..d0c9592 100755
--- a/haskell/haskell-transformers/DETAILS
+++ b/haskell/haskell-transformers/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-transformers
- VERSION=0.3.0.0
+ VERSION=0.4.0.0
SOURCE="transformers-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/transformers/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
+
SOURCE_HASH=sha512:d6d40c60f7df1a7af0853aad285da4ef36cc57df586b49a827e67dcbf31e86a15cc2456cd9b38906c3dcb205871b876ed7c0633a098e106026b18751c9610e41
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/transformers-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/transformers";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-transformers/HISTORY
b/haskell/haskell-transformers/HISTORY
index 719b8d3..4327493 100644
--- a/haskell/haskell-transformers/HISTORY
+++ b/haskell/haskell-transformers/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.0.0
+
2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.0.0

diff --git a/haskell/haskell-unordered-containers/DETAILS
b/haskell/haskell-unordered-containers/DETAILS
index baca211..4b6462a 100755
--- a/haskell/haskell-unordered-containers/DETAILS
+++ b/haskell/haskell-unordered-containers/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-unordered-containers
- VERSION=0.2.3.3
+ VERSION=0.2.4.0
SOURCE="unordered-containers-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/unordered-containers/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:f869ea72abce17cdaa1d97dbd566cf7ff08f4fae3b45b435c36da5ee1250ca4a5cb4dc852e8713948c8f3dd8bf0662e5a95e370cbe7d18756e1ee60493fc84b2
+
SOURCE_HASH=sha512:8ae2eac130285831de3168db71da4fe0f9d779940a2b6d2a6db9106f4c3c1d307a2c53b848f67640431f094193bd0ccabd79d7a44bfed3f2aa3b9e61274d1e52
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/unordered-containers-${VERSION}"
WEB_SITE="Homepage:
https://github.com/tibbe/unordered-containers";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-unordered-containers/HISTORY
b/haskell/haskell-unordered-containers/HISTORY
index b078e1d..3a77d76 100644
--- a/haskell/haskell-unordered-containers/HISTORY
+++ b/haskell/haskell-unordered-containers/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.4.0
+
2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.2.3.3

diff --git a/haskell/haskell-utf8-string/DETAILS
b/haskell/haskell-utf8-string/DETAILS
index 4a255d5..6ac05c5 100755
--- a/haskell/haskell-utf8-string/DETAILS
+++ b/haskell/haskell-utf8-string/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-utf8-string
- VERSION=0.3.7
+ VERSION=0.3.8
SOURCE="utf8-string-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/utf8-string/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:44e64e5ff42a2e4defe97d78468d070791ad82f0405173046666de398b14e55b8758a34ae624086dfa597d46a67eb12886375e04d58255e18e6d1b446c7efd79
+
SOURCE_HASH=sha512:70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/utf8-string-${VERSION}"
WEB_SITE="http://github.com/glguy/utf8-string/";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-utf8-string/HISTORY
b/haskell/haskell-utf8-string/HISTORY
index 6f422b8..fc3ca2e 100644
--- a/haskell/haskell-utf8-string/HISTORY
+++ b/haskell/haskell-utf8-string/HISTORY
@@ -1,3 +1,6 @@
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.8
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.7

diff --git a/haskell/haskell-uuid/DETAILS b/haskell/haskell-uuid/DETAILS
index 8fdc4df..2b12f9c 100755
--- a/haskell/haskell-uuid/DETAILS
+++ b/haskell/haskell-uuid/DETAILS
@@ -4,7 +4,7 @@
SOURCE_URL[0]=http://hackage.haskell.org/package/uuid-${VERSION}/${SOURCE}

SOURCE_HASH=sha512:de60f5d4b150be8c13e26f6dbe8e35c25cad799f3b3bfdfdf80e6dcacc241eec845cae211da8e0b1e0be37245cb97ca65e3a3ed2482a1112eb66a3b7edb0c45c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/uuid-${VERSION}"
- WEB_SITE="http://projects.haskell.org/uuid/";
+ WEB_SITE="http://hackage.haskell.org/package/uuid";
LICENSE[0]=BSD3
ENTERED=20130709
SHORT="For creating, comparing, parsing and printing Universally
Unique Identifiers"
diff --git a/haskell/haskell-uuid/HISTORY b/haskell/haskell-uuid/HISTORY
index 75cad1a..2dce165 100644
--- a/haskell/haskell-uuid/HISTORY
+++ b/haskell/haskell-uuid/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE
+
2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 1.3.3

diff --git a/haskell/haskell-xmonad-contrib/CONFLICTS
b/haskell/haskell-xmonad-contrib/CONFLICTS
new file mode 100755
index 0000000..68523e8
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/CONFLICTS
@@ -0,0 +1 @@
+conflicts xmonad-contrib y
diff --git a/haskell/haskell-xmonad-contrib/DEPENDS
b/haskell/haskell-xmonad-contrib/DEPENDS
new file mode 100755
index 0000000..82aef12
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/DEPENDS
@@ -0,0 +1,7 @@
+depends ghc &&
+depends haskell-x11 &&
+depends haskell-mtl &&
+depends haskell-utf8-string &&
+depends haskell-random &&
+depends haskell-extensible-exceptions &&
+depends haskell-xmonad
diff --git a/haskell/haskell-xmonad-contrib/DETAILS
b/haskell/haskell-xmonad-contrib/DETAILS
new file mode 100755
index 0000000..16bb485
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=haskell-xmonad-contrib
+ VERSION=0.11.3
+ SOURCE="xmonad-contrib-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad-contrib/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:13a1fe176e3c099e71def2404920be33afb800e15ed8479f9d2d9810c878e417943d75af821dfe01bfa3daff3f4cfb4a1001d3c2c39e2a59f4175b76ebe9cf99
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xmonad-contrib-${VERSION}"
+ WEB_SITE="http://xmonad.org";
+ LICENSE[0]=BSD3
+ ENTERED=20071212
+ SHORT="third party extensions for xmonad"
+cat << EOF
+A huge library of extensions to xmonad is available. These scripts provide
new
+layout algorithms, key bindings, window tabbing, emulation of other window
+managers and more. A stable version of the extension library is available
with
+each xmonad release.
+EOF
diff --git a/haskell/haskell-xmonad-contrib/HISTORY
b/haskell/haskell-xmonad-contrib/HISTORY
new file mode 100644
index 0000000..4f11921
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/HISTORY
@@ -0,0 +1,34 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS: conflict with xmonad-contrib
+
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.3
+
+2013-09-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.2
+
+2012-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+ * DEPENDS: added dependency on haskell-extensible-exceptions
+ * PRE_BUILD, 0001-getAtomName-is-now-defined-in-the-X11-library.patch:
+ fix compile error
+
+2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10
+
+2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on haskell-random
+
+2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.2
+ * DEPENDS: added dependency on haskell-utf8-string
+
+2008-03-30 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.7
+
+2008-02-01 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.6
+
+2007-12-12 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, BUILD, INSTALL, POST_REMOVE, PRE_RESURRECT,
+ POST_RESURRECT, HISTORY: created this spell
diff --git a/haskell/haskell-xmonad/CONFLICTS
b/haskell/haskell-xmonad/CONFLICTS
new file mode 100755
index 0000000..5152361
--- /dev/null
+++ b/haskell/haskell-xmonad/CONFLICTS
@@ -0,0 +1 @@
+conflicts xmonad y
diff --git a/haskell/haskell-xmonad/DEPENDS b/haskell/haskell-xmonad/DEPENDS
new file mode 100755
index 0000000..b2f2e50
--- /dev/null
+++ b/haskell/haskell-xmonad/DEPENDS
@@ -0,0 +1,6 @@
+depends ghc &&
+depends haskell-x11 &&
+depends haskell-mtl &&
+depends haskell-utf8-string &&
+depends haskell-extensible-exceptions &&
+depends xmessage
diff --git a/haskell/haskell-xmonad/DETAILS b/haskell/haskell-xmonad/DETAILS
new file mode 100755
index 0000000..640fe26
--- /dev/null
+++ b/haskell/haskell-xmonad/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=haskell-xmonad
+ VERSION=0.11
+ SOURCE="xmonad-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xmonad-${VERSION}"
+ WEB_SITE="http://xmonad.org";
+ LICENSE[0]=BSD3
+ ENTERED=20070812
+ SHORT="a lightweight X11 window manager"
+cat << EOF
+Xmonad is a minimalist tiling window manager for X, written in Haskell.
Windows
+are managed using automatic layout algorithms, which can be dynamically
+reconfigured. At any time windows are arranged so as to maximise the use of
+screen real estate. All features of the window manager are accessible purely
+from the keyboard: a mouse is entirely optional. Xmonad is configured in
+Haskell, and custom layout algorithms may be implemented by the user in
+config files. A principle of Xmonad is predictability: the user should know
+in advance precisely the window arrangement that will result from any action.
+EOF
diff --git a/haskell/haskell-xmonad/HISTORY b/haskell/haskell-xmonad/HISTORY
new file mode 100644
index 0000000..3f11209
--- /dev/null
+++ b/haskell/haskell-xmonad/HISTORY
@@ -0,0 +1,59 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS: conflict with xmonad
+
+2013-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: install manpage
+
+2013-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+ * DEPENDS: added dependency on haskell-utf8-string
+
+2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on haskell-extensible-exceptions
+
+2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10
+
+2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.2
+
+2009-10-31 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.9
+
+2009-07-26 Peng Chang (Charles) <chp AT sourcemage.org>
+ * PRE_RESURRECT, POST_RESURRECT: check whether
+ package.conf.old exists before backing up
+
+2009-04-22 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.8.1
+
+2008-03-30 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.7
+
+2008-02-01 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.6
+
+2007-12-10 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.5
+ * CONFIGURE, PRE_BUILD, ghc-6.8.patch: removed
+ * INSTALL, POST_REMOVE, PRE_RESURRECT, POST_RESURRECT:
+ a set of procedures on package.conf
+
+2007-12-06 Alexander Tsamutali <astsmtl AT gmail.com>
+ * PRE_BUILD, ghc-6.8.patch: fixed building with ghc-6.8
+
+2007-12-02 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DEPENDS: doesn't depend on haskell-x11-extras
+
+2007-11-28 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.4.1
+
+2007-10-21 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.4
+
+2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.3
+
+2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS, DEPENDS, CONFIGURE, PRE_BUILD, BUILD, INSTALL, HISTORY:
+ created spell
diff --git a/haskell/haskell-xmonad/INSTALL b/haskell/haskell-xmonad/INSTALL
new file mode 100755
index 0000000..e1bd5c9
--- /dev/null
+++ b/haskell/haskell-xmonad/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install -m644 ${SOURCE_DIRECTORY}/man/xmonad.1
${INSTALL_ROOT}/usr/share/man/man1/
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 a00ee92..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" &&
@@ -17,7 +17,7 @@ optional_depends "JPEG" \
"--disable-jpeg" \
"for jpeg image support" &&

-optional_depends "giflib" \
+optional_depends "GIFLIB" \
"--enable-gif" \
"--disable-gif" \
"for gif image support" &&
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 8520471..9f6e248 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dillo
if [[ "$DILLO_CVS" == "y" ]]; then
- if [ "$DILLO_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 0de4120..9541a9b 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2012-02-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.0.2

diff --git a/http/dillo2/DEPENDS b/http/dillo2/DEPENDS
index ecc16f0..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"
@@ -23,7 +23,7 @@ optional_depends "JPEG" \
"--disable-jpeg" \
"for jpeg image support" &&

-optional_depends "giflib" \
+optional_depends "GIFLIB" \
"--enable-gif" \
"--disable-gif" \
"for gif image support" &&
diff --git a/http/dillo2/DETAILS b/http/dillo2/DETAILS
index efaea9f..dd1433d 100755
--- a/http/dillo2/DETAILS
+++ b/http/dillo2/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dillo2
if [[ "$DILLO2_CVS" == "y" ]]; then
- if [ "$DILLO2_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
index 110e575..3911f3a 100644
--- a/http/dillo2/HISTORY
+++ b/http/dillo2/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* dillo2.desktop: added generic name

diff --git a/http/eflwebkit/DEPENDS b/http/eflwebkit/DEPENDS
index fc90423..5df9966 100755
--- a/http/eflwebkit/DEPENDS
+++ b/http/eflwebkit/DEPENDS
@@ -10,7 +10,7 @@ depends libxt &&
depends fontconfig &&
depends cairo &&
depends freetype2 &&
-depends mesalib &&
+depends MESALIB &&
depends cmake &&
depends eina &&
depends eet &&
diff --git a/http/eflwebkit/DETAILS b/http/eflwebkit/DETAILS
index 098b50b..5a6781c 100755
--- a/http/eflwebkit/DETAILS
+++ b/http/eflwebkit/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=eflwebkit
if [ "$EFLWEBKIT_BRANCH" == "scm" ]; then
- if [ "$EFLWEBKIT_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_URL[0]=svn_http://svn.webkit.org/repository/webkit/trunk:$SPELL-svn
diff --git a/http/eflwebkit/HISTORY b/http/eflwebkit/HISTORY
index 7039131..5fc09eb 100644
--- a/http/eflwebkit/HISTORY
+++ b/http/eflwebkit/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2011-12-27 Robin Cook <rcook AT wyms.net>
* PREPARE: changed to query branch
* DETAILS: modified for branch query
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/DETAILS b/http/elinks/DETAILS
index 7da45cc..eca9709 100755
--- a/http/elinks/DETAILS
+++ b/http/elinks/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=elinks
SECURITY_PATCH=2
if [[ $ELINKS_BRANCH == scm ]]; then
- if [[ $ELINKS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git_http://elinks.cz/elinks.git:$SPELL
SOURCE_IGNORE=volatile
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index 26ad324..2f42d6c 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,12 @@
+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
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: enable verbose build mode

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/firefox/BUILD b/http/firefox/BUILD
index 03db091..a1decaa 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -3,6 +3,14 @@ cd $SOURCE_DIRECTORY/mozilla* &&
FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&

+unset DBUS_SESSION_BUS_ADDRESS \
+ DISPLAY \
+ ORBIT_SOCKETDIR \
+ SESSION_MANAGER \
+ XDG_SESSION_COOKIE \
+ XAUTHORITY &&
+export LIBGL_ALWAYS_INDIRECT=1
+
#
# No fast optimization for Mozilla, bit us so many times...
#
@@ -28,6 +36,13 @@ for option in $OPTS; do
echo "ac_add_options $option" >> .mozconfig
done &&

+local MAKE_TARGET
+if [[ $FIREFOX_PGO == y ]]; then
+ MAKE_TARGET=profiledbuild
+else
+ MAKE_TARGET=build
+fi &&
+
make_single &&
-make -f client.mk build &&
+make -f client.mk $MAKE_TARGET &&
make_normal
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 704b84d..d4324a9 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -7,4 +7,7 @@ config_query FIREFOX_SAFE "Enable safe browsing
(anti-phishing) implementation?"

config_query FIREFOX_STRIP \
'Remove debugging symbols?' \
+ n &&
+config_query FIREFOX_PGO \
+ 'Enable profile guided optimizations (takes twice as
long to build)?' \
n
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 430f12e..9312e8f 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,39 +1,49 @@
-depends -sub CXX gcc &&
-depends nspr '--with-system-nspr' &&
-depends -sub "3.15.x" nss '--with-system-nss' &&
-depends zlib '--with-system-zlib' &&
-depends libjpeg-turbo '--with-system-jpeg' &&
-depends libidl &&
+depends -sub CXX gcc &&
depends perl &&
depends python &&
-depends zip &&
-depends gtk+2 '--enable-xft --disable-freetype2' &&
-depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
depends pysqlite &&

-depends atk &&
depends glib2 &&
+depends gtk+2 &&
+depends atk &&
+depends libx11 &&
+depends libxext &&
+depends libxrender &&
+depends libxt &&
+
depends pango &&
+depends libxft '--enable-xft --disable-freetype2' &&
+
depends cairo &&
+depends gdk-pixbuf2 &&
+
+depends JPEG '--with-system-jpeg' &&
+depends -sub APNG libpng &&
+
+depends nspr '--with-system-nspr' &&
+depends -sub "3.16.x" nss '--with-system-nss' &&
+
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+
+depends libidl &&
+
+depends zip &&
+depends zlib '--with-system-zlib' &&

optional_depends startup-notification \
- '--enable-startup-notification' \
- '--disable-startup-notification' \
+ --{en,dis}able-startup-notification \
'for startup notifications' &&

optional_depends gconf2 \
- '--enable-gconf' \
- '--disable-gconf' \
+ --{en,dis}able-gconf \
'for gconf support' &&

-optional_depends 'wireless_tools' \
- '--enable-necko-wifi' \
- '--disable-necko-wifi' \
+optional_depends wireless_tools \
+ --{en,dis}able-necko-wifi \
'for Necko WiFi scanning' &&

-optional_depends 'pulseaudio' \
- '--enable-pulseaudio' \
- '--disable-pulseaudio' \
+optional_depends pulseaudio \
+ --{en,dis}able-pulseaudio \
'use pulseaudio for audio support' &&

# Firefox is currently borked and does not compile without alsa-lib headers,
@@ -62,8 +72,7 @@ if is_depends_enabled $SPELL alsa-lib; then
fi &&

optional_depends dbus-glib \
- '--enable-dbus' \
- '--disable-dbus' \
+ --{en,dis}able-dbus \
'for dbus support' &&

# Firefox is currently borked and does not compile without OpenGL headers
@@ -74,8 +83,7 @@ optional_depends dbus-glib \
depends OPENGL &&

optional_depends gstreamer \
- '--enable-gstreamer' \
- '--disable-gstreamer' \
+ --{en,dis}able-gstreamer \
'for gstreamer based AV support' &&

suggest_depends_2 firefox-smglwiki '' '' \
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 9b76ba8..350122e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=28.0
+ VERSION=32.0.3
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:9334b45d8b56829e7061b87c377aae80e48060e127dfc3eb6a6996590dd92268bd0273203094cdf9aa22fda8128ab9ed1e5fd6fee3e93a430359c0a0631090f7
+
SOURCE_HASH=sha512:4cc4beb2bc00e38c61dea2878e75bdd28accbb0850d50146ae8e70e4c6d062f2985a23a6c4b84cd0ca552659a2b77843c3de93229708bc996cbb11d3b6497943

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=73
+ SECURITY_PATCH=76
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 2c0762b..02db8be 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,41 @@
+2014-09-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Cleanup dependencies
+
+2014-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 32.0.3, security update
+
+2014-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 32.0.1
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added various missing dependencies
+
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 32.0, SECURITY_PATCH=75
+ * PRE_BUILD, bug999496_change1f10a8067853.patch: patch removed
+
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, bug999496_change1f10a8067853.patch: fix build with gcc
4.9
+
+2014-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, CONFIGURE, PRE_BUILD, Makefile.in-pgo.patch:
+ add option for profiled build
+
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 31.0
+
+2014-06-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * mozconfig: add --enable-profile-guided-optimization, this is
+ how upstream builds their releases
+
+2014-06-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 30.0, SECURITY_PATCH++
+
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 29.0
+ * DEPENDS: depend on nss 3.16
+ * install_dir.patch: renewed
+
2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 28.0
* DETAILS, PREPARE: removed support for cvs version since there
hasn't been
diff --git a/http/firefox/Makefile.in-pgo.patch
b/http/firefox/Makefile.in-pgo.patch
new file mode 100644
index 0000000..3679dd9
--- /dev/null
+++ b/http/firefox/Makefile.in-pgo.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.old 2014-01-27 08:45:10.795890277 +1300
++++ Makefile.in 2014-01-27 08:51:22.170242862 +1300
+@@ -205,3 +205,7 @@
+ $(call SUBMAKE,$@,js/src)
+ endif
+ endif
++
++
++pgo-profile-run:
++ $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 6d4f7c4..db7ca75 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -22,4 +22,9 @@ fi &&

if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
+fi &&
+
+if [[ $FIREFOX_PGO == y ]]; then
+ echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig &&
+ patch -p0 < ${SPELL_DIRECTORY}/Makefile.in-pgo.patch
fi
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index 27341b8..df0e7f8 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,18 +1,20 @@
-From 7813eacdf8383d21f384a908ee6ed46a4e7ef1c9 Mon Sep 17 00:00:00 2001
+From f08c2e802224e5824b6f251553aa46c9c23dbcfc Mon Sep 17 00:00:00 2001
From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Thu, 12 Dec 2013 17:50:02 +0100
-Subject: [PATCH] omit version number from installation path
+Date: Mon, 28 Apr 2014 22:34:23 +0200
+Subject: [PATCH] fix install path

---
- config/baseconfig.mk | 8 ++++----
- js/src/config/baseconfig.mk | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ config/baseconfig.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 50f4cd4..1e7c1f2 100644
+index b4723a9..8417918 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
-@@ -1,7 +1,7 @@
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -21,21 +23,9 @@ index 50f4cd4..1e7c1f2 100644
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
-index 1ff076c..5386569 100644
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,5 +1,5 @@
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
--
-1.8.4.2
+1.9.1

diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 498246c..a50644b 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -19,6 +19,7 @@ ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --disable-tests
+ac_add_options --enable-profile-guided-optimization
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --mandir=$INSTALL_ROOT/usr
ac_add_options --enable-optimize="$CFLAGS -fno-fast-math"
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 4b22f09..f336165 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -81,7 +81,7 @@ optional_depends lirc
\
# '--disable-xpcom' \
# 'Enable xpcom support in NPAPI plugin' &&

-optional_depends giflib \
+optional_depends GIFLIB \
'' \
'' \
'Enable support for gif images.' &&
@@ -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 5b91dbe..40ff85e 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,9 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2012-12-22 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 0.8.10
* BUILD, DEPENDS: boost specific fixes from BLFS project
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 c0b2425..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,13 +22,18 @@ 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 \
'--with-memcache' '--without-memcache' \
'memcache storage for mod_trigger_b4_dl' &&

+optional_depends libev \
+ "--with-libev" \
+ "--without-libev" \
+ "for fdevent handlers support" &&
+
if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
depends libxml2
fi &&
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 97ba093..68a0383 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,17 @@
+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
+
2014-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.35; SECURITY_PATCH++
(CVE-2014-2323, CVE-2014-2324)
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/midori/DEPENDS b/http/midori/DEPENDS
index a37eea8..3c4d498 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,44 +1,49 @@
+depends cmake &&
+depends libnotify &&
depends libxml2 &&
depends libsoup &&
depends python &&
depends sqlite &&
depends vala &&

+if [[ "$MIDORI_BRANCH" == "scm" ]]; then
+ depends bzr
+fi &&
+
optional_depends gtk+3 \
- "--enable-gtk3" \
- "--disable-gtk3" \
+ "-DUSE_GTK3=ON" \
+ "-DUSE_GTK3=OFF" \
"use GTK3 instead of GTK2?" &&

if is_depends_enabled $SPELL gtk+3 ; then
- depends webkitgtk3
+ depends webkitgtk3 &&
+ optional_depends granite \
+ "-DUSE_GRANITE=ON" \
+ "-DUSE_GRANITE=OFF" \
+ "for fancy notebook and pop-overs"
else
depends gtk+2 &&
depends webkitgtk
fi &&

optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
+ "-DENABLE_NLS=1" \
+ "-DENABLE_NLS=0" \
"for native language support" &&

-optional_depends libnotify \
- "" \
- "--disable-libnotify" \
- "for notification support" &&
+optional_depends gobject-introspection \
+ "-DUSE_GIR=ON" \
+ "-DUSE_GIR=OFF" \
+ "generate GObject Introspection bindings" &&

optional_depends libzeitgeist \
- "--enable-zeitgeist" \
- "--disable-zeitgeist" \
+ "-DUSE_ZEITGEIST=ON" \
+ "-DUSE_ZEITGEIST=OFF" \
"for Zeitgeist history integration" &&

-optional_depends unique \
- "--enable-unique" \
- "--disable-unique" \
- "for single instance support" &&
-
optional_depends gtk-doc \
- "--enable-apidocs" \
- "--disable-apidocs" \
+ "-DUSE_APIDOCS=ON" \
+ "-DUSE_APIDOCS=OFF" \
"for API documentation" &&

optional_depends gnome-icon-theme "" "" "for all the icons" &&
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 8794e6d..570a26c 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -1,21 +1,18 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=midori
if [[ $MIDORI_BRANCH == scm ]]; then
- if [[ $MIDORI_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
- SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL-git
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-trunk.tar.bz2
+
SOURCE_URL[0]=bzr_http://bazaar.launchpad.net/~midori/midori/trunk/:midori-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-trunk"
else
- VERSION=0.5.7
+ VERSION=0.5.8
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=${SPELL}_${VERSION}_all_.tar.bz2
SOURCE_URL[0]=http://www.midori-browser.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:493ace56d144d8b554e1dcd9d93f3ab97167b42f12190418a59b49ae7354a60be89c2611eaee728832f8acec417fe8759f00a0a6a1b210a4896557012e79286a
+
SOURCE_HASH=sha512:3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://twotoasts.de/index.php/midori/
diff --git a/http/midori/DOWNLOAD b/http/midori/DOWNLOAD
new file mode 100755
index 0000000..3c77268
--- /dev/null
+++ b/http/midori/DOWNLOAD
@@ -0,0 +1,8 @@
+. $GRIMOIRE/FUNCTIONS &&
+
+if [[ "$MIDORI_BRANCH" == "scm" ]]
+then
+ bzr_download
+else
+ default_download
+fi
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index e4ea212..4f22739 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,17 @@
+2014-07-27 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: fixed building with gobject-introspection
+
+2014-07-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPEMDS, DOWNLOAD, PRE_BUILD: git -> bzr, converted to
cmake
+ build system completely
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.5.8
+ * PRE_BUILD: added
+
2014-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.7

diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
new file mode 100755
index 0000000..d67eea9
--- /dev/null
+++ b/http/midori/PRE_BUILD
@@ -0,0 +1,15 @@
+if [[ "$MIDORI_BRANCH" == "scm" ]]; then
+ default_pre_build
+else
+ mk_source_dir $SOURCE_DIRECTORY &&
+ cd $SOURCE_DIRECTORY &&
+ unpack_file
+fi &&
+
+cd $SOURCE_DIRECTORY &&
+
+sed -i 's;webkit-1.0;webkitgtk-3.0;g' \
+ CMakeLists.txt \
+ build/gir/CMakeFiles/g-ir-scanner_katze.dir/build.make \
+ build/gir/CMakeFiles/g-ir-scanner_midori.dir/build.make \
+ cmake/GIR.cmake
diff --git a/http/mod_wsgi/DEPENDS b/http/mod_wsgi/DEPENDS
index b00e2f0..861fefc 100755
--- a/http/mod_wsgi/DEPENDS
+++ b/http/mod_wsgi/DEPENDS
@@ -1,2 +1,2 @@
depends APACHE2 &&
-depends python
+depends PYTHON
diff --git a/http/mod_wsgi/DETAILS b/http/mod_wsgi/DETAILS
index 1480cc0..2e2c8e5 100755
--- a/http/mod_wsgi/DETAILS
+++ b/http/mod_wsgi/DETAILS
@@ -1,10 +1,11 @@
SPELL=mod_wsgi
- VERSION=3.3
-
SOURCE_HASH=sha512:095cf6b9b4be615e0e8f262b972db10d3022d1d7d8adabfb587fd3862563d5d0febb700137c5f9393c1bf1466b35127b5c143a1a11b0b1de79d2c6933df2b18c
+ VERSION=3.5
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:27002e933883c96bc06877f2f83a8bef816d1f7080ff01c89cc9f20dd1049f53b21a028cb156159f2a4c374048f5e52dce48b52d5b9584fbd0ca9455c285136b
LICENSE[0]=APACHE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://modwsgi.googlecode.com/files/$SOURCE
+
SOURCE_URL[0]=https://github.com/GrahamDumpleton/$SPELL/archive/$VERSION.tar.gz
WEB_SITE=http://code.google.com/p/modwsgi/
ENTERED=20080916
KEYWORDS="interpreter http python"
diff --git a/http/mod_wsgi/HISTORY b/http/mod_wsgi/HISTORY
index 601ddbf..c0e3423 100644
--- a/http/mod_wsgi/HISTORY
+++ b/http/mod_wsgi/HISTORY
@@ -1,3 +1,8 @@
+2014-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.5; SECURITY_PATCH=1 (CVE-2014-0240);
+ updated source url
+ * DEPENDS: python -> PYTHON
+
2010-07-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.3

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/DETAILS b/http/nginx/DETAILS
index 153cec6..3bb0dfe 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -22,6 +22,7 @@ case "$NGINX_RELEASE" in
SECURITY_PATCH=4
;;
esac
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_URL[0]=http://nginx.org/download/$SOURCE
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index ec0a8ff..0a19720 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,10 @@
+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
+
2013-11-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patch
diff --git a/http/nginx/init.d/nginx b/http/nginx/init.d/nginx
index 93ec2ac..e6aebce 100644
--- a/http/nginx/init.d/nginx
+++ b/http/nginx/init.d/nginx
@@ -10,7 +10,7 @@ reload() {
echo "Gracefully reloading Nginx web server..."

if [[ `nginx -v 2>&1 | cut -d. -f2` == 6 ]]; then
- kill -HUP "$PIDFILE"
+ kill -HUP `cat "$PIDFILE"`
else
$PROGRAM -s reload
fi
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/phantomjs/BUILD b/http/phantomjs/BUILD
new file mode 100755
index 0000000..cc27c6b
--- /dev/null
+++ b/http/phantomjs/BUILD
@@ -0,0 +1,5 @@
+./build.sh --confirm &&
+
+if list_find "$LDFLAGS" "-s"; then
+ strip -v bin/phantomjs
+fi
diff --git a/http/phantomjs/DEPENDS b/http/phantomjs/DEPENDS
new file mode 100755
index 0000000..fd63d85
--- /dev/null
+++ b/http/phantomjs/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends openssl &&
+depends freetype2 &&
+depends fontconfig
diff --git a/http/phantomjs/DETAILS b/http/phantomjs/DETAILS
new file mode 100755
index 0000000..87529c5
--- /dev/null
+++ b/http/phantomjs/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=phantomjs
+ VERSION=1.9.7
+ SOURCE=$SPELL-$VERSION-source.zip
+ SOURCE_URL[0]=https://bitbucket.org/ariya/$SPELL/downloads/$SOURCE
+
SOURCE_HASH=sha512:ed2bbfd1e460e5fba721c7660bf0dd827197684fec1b3e52515648165d92dd876f7b604c043d2e8d2deb766dc43fc89a9fde41985b809e158c696bb2ac721815
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS="examples"
+ DOCS="LICENSE.BSD $DOCS"
+ WEB_SITE=http://phantomjs.org/
+ ENTERED=20140929
+ LICENSE[0]=BSD
+ SHORT="headless WebKit scriptable with a JavaScript API"
+cat << EOF
+PhantomJS is a headless WebKit scriptable with a JavaScript API. It has fast
and
+native support for various web standards: DOM handling, CSS selector, JSON,
+Canvas, and SVG.
+EOF
diff --git a/http/phantomjs/HISTORY b/http/phantomjs/HISTORY
new file mode 100644
index 0000000..027d0bc
--- /dev/null
+++ b/http/phantomjs/HISTORY
@@ -0,0 +1,2 @@
+2014-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 1.9.7
diff --git a/http/phantomjs/INSTALL b/http/phantomjs/INSTALL
new file mode 100755
index 0000000..cd67850
--- /dev/null
+++ b/http/phantomjs/INSTALL
@@ -0,0 +1 @@
+install -vm 755 bin/phantomjs "$INSTALL_ROOT/usr/bin"
diff --git a/http/polipo/BUILD b/http/polipo/BUILD
new file mode 100755
index 0000000..72af8ad
--- /dev/null
+++ b/http/polipo/BUILD
@@ -0,0 +1 @@
+make PREFIX="$INSTALL_ROOT/usr" CDEBUGFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
diff --git a/http/polipo/DEPENDS b/http/polipo/DEPENDS
new file mode 100755
index 0000000..8fae400
--- /dev/null
+++ b/http/polipo/DEPENDS
@@ -0,0 +1 @@
+optional_depends SYSTEM-LOGGER "" "" "for logging to syslog"
diff --git a/http/polipo/DETAILS b/http/polipo/DETAILS
new file mode 100755
index 0000000..9e8ad2e
--- /dev/null
+++ b/http/polipo/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=polipo
+ VERSION=1.1.1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SOURCE}.asc
+
SOURCE_URL[0]=http://www.pps.univ-paris-diderot.fr/~jch/software/files/${SPELL}/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=polipo.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
+ ENTERED=20140416
+ LICENSE[0]=MIT
+ KEYWORDS="http proxy cache"
+ SHORT="caching web proxy"
+cat << EOF
+Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy, a
+proxy server). While Polipo was designed to be used by one person or a small
+group of people, there is nothing that prevents it from being used by a
larger
+group.
+
+Polipo has some features that are unique among currently available proxies:
+
+* Polipo will use HTTP/1.1 pipelining if it believes that the remote server
+ supports it, whether the incoming requests are pipelined or come in
+ simultaneously on multiple connections (this is more than the simple usage
of
+ persistent connections, which is done by e.g. Squid);
+* Polipo will cache the initial segment of an instance if the download has
been
+ interrupted, and, if necessary, complete it later using Range requests;
+* Polipo will upgrade client requests to HTTP/1.1 even if they come in as
+ HTTP/1.0, and up- or downgrade server replies to the client's capabilities
+ (this may involve conversion to or from the HTTP/1.1 chunked encoding);
+* Polipo has complete support for IPv6 (except for scoped (link-local)
+ addresses);
+* Polipo can optionally use a technique known as Poor Man's Multiplexing to
+ reduce latency even further.
+EOF
diff --git a/http/polipo/HISTORY b/http/polipo/HISTORY
new file mode 100644
index 0000000..417118a
--- /dev/null
+++ b/http/polipo/HISTORY
@@ -0,0 +1,11 @@
+2014-05-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.1
+
+2014-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * init.d/polipo: implemented reload function to prevent exiting when
+ HUP signal is sent
+
+2014-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, polipo.gpg, init.d/polipo:
+ spell created
diff --git a/http/polipo/INSTALL b/http/polipo/INSTALL
new file mode 100755
index 0000000..8ba89a9
--- /dev/null
+++ b/http/polipo/INSTALL
@@ -0,0 +1,14 @@
+make PREFIX="$INSTALL_ROOT/usr" install &&
+
+install -vm 755 -d "$INSTALL_ROOT/etc/polipo" &&
+
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SOURCE_DIRECTORY/config.sample" \
+ "$INSTALL_ROOT/etc/polipo/config" &&
+
+ install_config_file "$SOURCE_DIRECTORY/forbidden.sample" \
+ "$INSTALL_ROOT/etc/polipo/forbidden"
+fi &&
+
+install -vm 700 -d "$INSTALL_ROOT/var/cache/polipo"
diff --git a/http/polipo/PRE_BUILD b/http/polipo/PRE_BUILD
new file mode 100755
index 0000000..d60a33f
--- /dev/null
+++ b/http/polipo/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:^MANDIR =.*:MANDIR = $INSTALL_ROOT/usr/share/man:;s:^INFODIR
=.*:INFODIR = $INSTALL_ROOT/usr/share/info:" Makefile
diff --git a/http/polipo/init.d/polipo b/http/polipo/init.d/polipo
new file mode 100755
index 0000000..c96e9be
--- /dev/null
+++ b/http/polipo/init.d/polipo
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/polipo
+PIDFILE="/var/run/polipo.pid"
+ARGS="-c /etc/polipo/config daemonise=true pidFile=${PIDFILE}"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
+
+reload() {
+ echo "Reloading the forbidden URLs file..."
+
+ reloadproc $PROGRAM USR2
+}
diff --git a/http/polipo/polipo.gpg b/http/polipo/polipo.gpg
new file mode 100644
index 0000000..2be80b2
Binary files /dev/null and b/http/polipo/polipo.gpg differ
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 680ff14..4b141a9 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -11,7 +11,7 @@ if spell_ok nspr && is_version_less $(installed_version
nspr) 4.9.3; then
force_depends nspr
fi &&

-depends -sub 3.15.x nss &&
+depends -sub 3.16.x nss &&

if spell_ok nss && is_version_less $(installed_version nss) 3.15.1; then
force_depends nss
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index c43c7c8..0efab1e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,8 +1,8 @@
SPELL=seamonkey
- VERSION=2.21
- SECURITY_PATCH=56
+ VERSION=2.29
+ SECURITY_PATCH=57
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:1d141bb5507b2b2f4be3d0435342c54c04aa5a4942f801ab34e9af216e164153d4a34c47e68231ff3a958a64860be718452bb904c71e787067c93cdeae0c5643
+
SOURCE_HASH=sha512:5cba0c75f70489c6ef9a349e005dd99b60a9f72a43efdecdbf5d4a3d8ecd2b2c72159c104957801db9f5394eef247859735e6cf281deb4e2d9aaca66d5ddcae3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index e86ff15..2a50619 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2014-09-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.29, SECURITY_PATCH=57
+ * DEPENDS: nss >= 3.16.2 is needed
+
2013-09-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.21, SECURITY_PATCH=56
* DEPENDS: sqlite3 >= 3.7.17 is needed
diff --git a/http/serf/BUILD b/http/serf/BUILD
new file mode 100755
index 0000000..9a3ca2a
--- /dev/null
+++ b/http/serf/BUILD
@@ -0,0 +1 @@
+scons PREFIX=${INSTALL_ROOT}/usr
diff --git a/http/serf/DEPENDS b/http/serf/DEPENDS
index f8b0625..ec2ab96b 100755
--- a/http/serf/DEPENDS
+++ b/http/serf/DEPENDS
@@ -1,4 +1,6 @@
-depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
-depends openssl "--with-openssl=$INSTALL_ROOT/usr" &&
+depends scons &&
+depends apr &&
+depends apr-util &&
+depends SSL &&
depends zlib
+
diff --git a/http/serf/DETAILS b/http/serf/DETAILS
index 87685dc..57c1933 100755
--- a/http/serf/DETAILS
+++ b/http/serf/DETAILS
@@ -1,9 +1,9 @@
SPELL=serf
- VERSION=1.2.1
+ VERSION=1.3.6
+
SOURCE_HASH=sha512:e27751c385b447d66beebebd7113e336a7ef46de967063ca5267cd704609920ed0a7279f71f5cb7249d01755ef29da6d566e24fdbbea833873b156d4d30e0727
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:370164d5ab6dc36169ca3eb6e0eae75e3b46dde4238a9726d300010b02ecff2cc01290ffd1cdc6da57fb9df05f719ca5f64e23a9f03881e092721e4102ca0521
- SOURCE_URL[0]=http://serf.googlecode.com/files/$SOURCE
+ SOURCE_URL[0]=http://serf.googlecode.com/svn/src_releases/$SOURCE
LICENSE[0]=Apache
WEB_SITE=http://code.google.com/p/${SPELL}
ENTERED=20130626
diff --git a/http/serf/HISTORY b/http/serf/HISTORY
index b81ddae..6fd433c 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,14 @@
+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
+
+2014-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.4
+ * DEPENDS: add scons, remove old options
+ * BUILD INSTALL: added, for scons
+
2013-06-26 Javier Vasquez <j.e.vasquez.v AT gmail.com>
* New spell

diff --git a/http/serf/INSTALL b/http/serf/INSTALL
new file mode 100755
index 0000000..9f0c0eb
--- /dev/null
+++ b/http/serf/INSTALL
@@ -0,0 +1 @@
+scons install
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/surf/DETAILS b/http/surf/DETAILS
index c2e397f..3b004a9 100755
--- a/http/surf/DETAILS
+++ b/http/surf/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=surf
if [[ ${SURF_BRANCH} == "scm" ]]
then
- if [[ ${SURF_AUTOUPDATE} == "y" ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
SOURCE_URL[0]=hg_http://code.suckless.org/hg/${SPELL}:${SPELL}-scm
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
index da2a64d..0c09f6f 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: ensure EDITOR has a value by sourcing
/etc/profile.d/editor.sh or defaulting to nano
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/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 081340c..ca900eb 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,4 +1,3 @@
OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
-
+sed -i '30i#include <unicode/utf8.h>'
${SOURCE_DIRECTORY}/Source/WebCore/platform/text/TextCodecUTF8.h &&
default_build
-
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index a1e8519..d176250 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -13,7 +13,7 @@ depends libxt &&
depends libxrender &&
depends libxcomposite &&
depends libxdamage &&
-depends mesalib --enable-accelerated-compositing &&
+depends MESALIB --enable-accelerated-compositing &&
depends glib2 &&
depends fontconfig &&
depends freetype2 &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 85ab13f..f78c5f9 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,12 +1,11 @@
SPELL=webkitgtk
- VERSION=2.2.4
+ VERSION=2.4.4
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+
SOURCE_HASH=sha512:ae3160ec7962d452606966afd258961432db5f0da0e0fc0e249ce1927abf2151adc858b7f12d5d36d7c7d91e16c6ebed1694f88185c678ba1cf8d3d08b55f1ce
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index c7ce335..f5a5a06 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,17 @@
+2014-07-12 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.4
+
+2014-06-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 2.4.3
+ * BUILD: added missing header fix
+ * gtk-doc.patch, opengl-headers.patch: removed unused files
+
+2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.2
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2014-01-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.2.4
* DEPENDS: updated to new dependencies
diff --git a/http/webkitgtk/gtk-doc.patch b/http/webkitgtk/gtk-doc.patch
deleted file mode 100644
index c362565..0000000
--- a/http/webkitgtk/gtk-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile.in.orig 2012-03-27 20:31:16.000000000 +0400
-+++ GNUmakefile.in 2012-04-15 10:40:36.226272195 +0400
-@@ -74045,7 +74045,7 @@
- @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
- @ENABLE_WEBKIT2_TRUE@ fi; \
- @ENABLE_WEBKIT2_TRUE@ fi
-- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
-+@ENABLE_GTK_DOC_TRUE@ @$(AM_V_GEN)$(PYTHON)
$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-
- uninstall-local:
- @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/http/webkitgtk/opengl-headers.patch
b/http/webkitgtk/opengl-headers.patch
deleted file mode 100644
index 0ff8fee..0000000
--- a/http/webkitgtk/opengl-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Source/WebCore/platform/graphics/OpenGLShims.h.orig
-+++ Source/WebCore/platform/graphics/OpenGLShims.h
-@@ -56,6 +56,8 @@
- typedef void (*glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const
GLvoid*);
- typedef GLenum (*glCheckFramebufferStatusType) (GLenum);
- typedef void (*glCompileShaderType) (GLuint);
-+typedef void (*glCompressedTexImage2DType) (GLenum, GLint, GLenum, GLsizei,
GLsizei, GLint, GLsizei, const GLvoid *);
-+typedef void (*glCompressedTexSubImage2DType) (GLenum, GLint, GLint, GLint,
GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
- typedef GLuint (*glCreateProgramType) ();
- typedef GLuint (*glCreateShaderType) (GLenum);
- typedef void (*glDeleteBuffersType) (GLsizei, const GLuint*);
-@@ -152,6 +154,8 @@
- FUNCTION_TABLE_ENTRY(glBufferSubData);
- FUNCTION_TABLE_ENTRY(glCheckFramebufferStatus);
- FUNCTION_TABLE_ENTRY(glCompileShader);
-+ FUNCTION_TABLE_ENTRY(glCompressedTexImage2D);
-+ FUNCTION_TABLE_ENTRY(glCompressedTexSubImage2D);
- FUNCTION_TABLE_ENTRY(glCreateProgram);
- FUNCTION_TABLE_ENTRY(glCreateShader);
- FUNCTION_TABLE_ENTRY(glDeleteBuffers);
-@@ -253,6 +257,8 @@
- #define glCheckFramebufferStatusEXT glCheckFramebufferStatus
- #define glCheckFramebufferStatus
LOOKUP_GL_FUNCTION(glCheckFramebufferStatus)
- #define glCompileShader
LOOKUP_GL_FUNCTION(glCompileShader)
-+#define glCompressedTexImage2D
LOOKUP_GL_FUNCTION(glCompressedTexImage2D)
-+#define glCompressedTexSubImage2D
LOOKUP_GL_FUNCTION(glCompressedTexSubImage2D)
- #define glCreateProgram
LOOKUP_GL_FUNCTION(glCreateProgram)
- #define glCreateShader
LOOKUP_GL_FUNCTION(glCreateShader)
- #define glDeleteBuffers
LOOKUP_GL_FUNCTION(glDeleteBuffers)
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 081340c..a8369b8 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,10 @@
-OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
-
-default_build
-
+OPTS="$WEBKIT_OPTS $OPTS" &&
+sed -i '30i#include <unicode/utf8.h>' \
+ Source/WebCore/platform/text/TextCodecUTF8.h &&
+sed -i '30i#include <unicode/utf16.h>' \
+ Source/WTF/wtf/text/StringBuilder.h &&
+sed -i '26i#include <unicode/utf16.h>' \
+ Source/WTF/wtf/text/StringImpl.h &&
+sed -i '29i#include <unicode/utf16.h>' \
+ Source/WTF/wtf/unicode/UTF8.h &&
+cmake_build
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 992cf7d..87e576f 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,21 +1,8 @@
-config_query_option WEBKIT_OPTS "Enable support for WebGL?" y \
- "--enable-webgl" "--disable-webgl" &&
-
-config_query_option WEBKIT_OPTS "Enable support for GLX?" y \
- "--enable-glx" "--disable-glx" &&
-
-config_query_option WEBKIT_OPTS "Enable support for EGL?" y \
- "--enable-egl" "--disable-egl" &&
-
-config_query_option WEBKIT_OPTS "Enable support for OpenGL ES 2?" n \
- "--enable-gles2" "--disable-gles2" &&
+config_query_option WEBKIT_OPTS "Enable support for WebGL" y \
+ -DENABLE_WEBGL={ON,OFF} &&

config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
- "--enable-jit" "--disable-jit" &&
-
-config_query_option WEBKIT_OPTS "Enable Opcode statistics?" n \
- "--enable-opcode-stats" "--disable-opcode-stats"
-
-# Something like this will be needed for wayland
-#config_query_list WEBKIT_TARGET "Build for which target?" x11 wayland
x11,wayland directfb
+ -DENABLE_JIT={ON,OFF} &&

+config_query_option WEBKIT_OPTS "Enable Media statistics?" n \
+ -DENABLE_MEDIA_STATISTICS={ON,OFF}
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index f0cbcf2..eddaa40 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -1,6 +1,5 @@
depends -sub CXX gcc &&
-depends autoconf &&
-depends automake &&
+depends cmake &&
depends libtool &&
depends bison &&
depends gperf &&
@@ -13,15 +12,14 @@ depends libxt &&
depends libxrender &&
depends libxcomposite &&
depends libxdamage &&
-depends mesalib --enable-accelerated-compositing &&
+depends MESALIB &&
depends glib2 &&
depends fontconfig &&
depends freetype2 &&
depends harfbuzz &&
-depends cairo --enable-svg &&
+depends cairo &&
depends pango &&
-depends gtk+3 --with-gtk=3.0 &&
-depends gtk+2 &&
+depends gtk+3 -DPORT=GTK &&
depends gdk-pixbuf2 &&
depends libsoup &&
depends at-spi2-core &&
@@ -34,24 +32,23 @@ depends PYTHON &&
depends RUBY &&

optional_depends enchant \
- "--enable-spellcheck" "--disable-spellcheck" \
+ -DENABLE_SPELLCHECK={ON,OFF} \
"Enable spellchecking support?" &&

optional_depends libsecret \
- "--enable-credential-storage"
"--disable-credential-storage" \
+ -DENABLE_CREDENTIAL_STORAGE={1,0} \
"Enable support for credential storage?" &&

-optional_depends gobject-introspection \
- "--enable-introspection" "--disable-introspection" \
+optional_depends gobject-introspection "" "" \
"Enable GObject introspection?" &&

optional_depends geoclue \
- "--enable-geolocation" "--disable-geolocation" \
+ -DENABLE_GEOLOCATION={ON,OFF} \
"Enable geolocation support?" &&

optional_depends gstreamer-1.0 \
- "--enable-web-audio --enable-video" \
- "--disable-web-audio --disable-video" \
+ "-DENABLE_WEB_AUDIO=ON -DENABLE_VIDEO=ON" \
+ "-DENABLE_WEB_AUDIO=OFF -DENABLE_VIDEO=OFF" \
"Enable support for enable HTML5 video and Web Audio?" &&

if is_depends_enabled $SPELL gstreamer-1.0 ; then
@@ -59,9 +56,9 @@ if is_depends_enabled $SPELL gstreamer-1.0 ; then
fi &&

optional_depends upower \
- "--enable-battery-status" "--disable-battery-status" \
+ -DENABLE_BATTERY_STATUS={ON,OFF} \
"Enable support for Battery Status API?" &&

optional_depends gtk-doc \
- "--enable-gtk-doc" "--disable-gtk-doc" \
- "Build documentation with gtk-doc?"
+ -DENABLE_GTKDOC={ON,OFF} \
+ "Build documentation with gtk-doc?"
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index a8d1e2e..0e3d568 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,12 +1,11 @@
SPELL=webkitgtk3
- VERSION=2.2.4
+ VERSION=2.5.1
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705
+
SOURCE_HASH=sha512:f4ec8ec22a00e7011d55c90bb5bb2b2e09bbe0087c2221d580eecbb4ee4d4feeef11b4ada97f1deff2a965e72aa897eb805697e610343934a24ef69bfaa5486c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 6adac04..557a79b 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,22 @@
+2014-08-02 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.5.1
+ * CONFIGURE, DEPENDS, BUILD: converted to cmake build system,
+ added more missing header fixes, some cleanup
+
+2014-07-12 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.4
+
+2014-06-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 2.4.3
+ * BUILD: added missing header fix, no need to disable webkit2
+ * gtk-doc.patch, opengl-headers.patch: removed unused files
+
+2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.4.2
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2014-01-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.2.4
* DEPENDS: updated to new dependencies
diff --git a/http/webkitgtk3/gtk-doc.patch b/http/webkitgtk3/gtk-doc.patch
deleted file mode 100644
index c362565..0000000
--- a/http/webkitgtk3/gtk-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile.in.orig 2012-03-27 20:31:16.000000000 +0400
-+++ GNUmakefile.in 2012-04-15 10:40:36.226272195 +0400
-@@ -74045,7 +74045,7 @@
- @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
- @ENABLE_WEBKIT2_TRUE@ fi; \
- @ENABLE_WEBKIT2_TRUE@ fi
-- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
-+@ENABLE_GTK_DOC_TRUE@ @$(AM_V_GEN)$(PYTHON)
$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-
- uninstall-local:
- @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/http/webkitgtk3/opengl-headers.patch
b/http/webkitgtk3/opengl-headers.patch
deleted file mode 100644
index 0ff8fee..0000000
--- a/http/webkitgtk3/opengl-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Source/WebCore/platform/graphics/OpenGLShims.h.orig
-+++ Source/WebCore/platform/graphics/OpenGLShims.h
-@@ -56,6 +56,8 @@
- typedef void (*glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const
GLvoid*);
- typedef GLenum (*glCheckFramebufferStatusType) (GLenum);
- typedef void (*glCompileShaderType) (GLuint);
-+typedef void (*glCompressedTexImage2DType) (GLenum, GLint, GLenum, GLsizei,
GLsizei, GLint, GLsizei, const GLvoid *);
-+typedef void (*glCompressedTexSubImage2DType) (GLenum, GLint, GLint, GLint,
GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
- typedef GLuint (*glCreateProgramType) ();
- typedef GLuint (*glCreateShaderType) (GLenum);
- typedef void (*glDeleteBuffersType) (GLsizei, const GLuint*);
-@@ -152,6 +154,8 @@
- FUNCTION_TABLE_ENTRY(glBufferSubData);
- FUNCTION_TABLE_ENTRY(glCheckFramebufferStatus);
- FUNCTION_TABLE_ENTRY(glCompileShader);
-+ FUNCTION_TABLE_ENTRY(glCompressedTexImage2D);
-+ FUNCTION_TABLE_ENTRY(glCompressedTexSubImage2D);
- FUNCTION_TABLE_ENTRY(glCreateProgram);
- FUNCTION_TABLE_ENTRY(glCreateShader);
- FUNCTION_TABLE_ENTRY(glDeleteBuffers);
-@@ -253,6 +257,8 @@
- #define glCheckFramebufferStatusEXT glCheckFramebufferStatus
- #define glCheckFramebufferStatus
LOOKUP_GL_FUNCTION(glCheckFramebufferStatus)
- #define glCompileShader
LOOKUP_GL_FUNCTION(glCompileShader)
-+#define glCompressedTexImage2D
LOOKUP_GL_FUNCTION(glCompressedTexImage2D)
-+#define glCompressedTexSubImage2D
LOOKUP_GL_FUNCTION(glCompressedTexSubImage2D)
- #define glCreateProgram
LOOKUP_GL_FUNCTION(glCreateProgram)
- #define glCreateShader
LOOKUP_GL_FUNCTION(glCreateShader)
- #define glDeleteBuffers
LOOKUP_GL_FUNCTION(glDeleteBuffers)
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/icedtea6/DEPENDS b/java/icedtea6/DEPENDS
index 63bff5e..98f016f 100755
--- a/java/icedtea6/DEPENDS
+++ b/java/icedtea6/DEPENDS
@@ -8,7 +8,7 @@ depends unzip
&&
depends libxslt
&&
depends ant "--with-ant-home=/opt/ant"
&&
depends cups
&&
-depends giflib
&&
+depends GIFLIB
&&
depends JPEG
&&
depends libpng
&&
depends alsa-lib
&&
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index 1c8f8e5..8f8df5f 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-02-18 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 1.12.2
* DEPENDS: added libffi
diff --git a/java/icedtea7/DEPENDS b/java/icedtea7/DEPENDS
index 6b1f152..b461241 100755
--- a/java/icedtea7/DEPENDS
+++ b/java/icedtea7/DEPENDS
@@ -2,7 +2,7 @@ depends gcc &&
depends -sub CXX gcc &&
depends lsb-release &&
depends pkgconfig &&
-depends giflib &&
+depends GIFLIB &&
depends lcms &&
depends libpng &&
depends zlib &&
@@ -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 e56fcb2..bd2304b 100644
--- a/java/icedtea7/HISTORY
+++ b/java/icedtea7/HISTORY
@@ -1,3 +1,9 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-09-08 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: changed to build with new automake

diff --git a/java/kaffe/DEPENDS b/java/kaffe/DEPENDS
index 5d258e4..fcf3d6e 100755
--- a/java/kaffe/DEPENDS
+++ b/java/kaffe/DEPENDS
@@ -1,5 +1,5 @@
depends JPEG &&
-depends giflib &&
+depends GIFLIB &&
depends libpng &&
optional_depends -sub JAVA gcc \
'--enable-gcj' \
diff --git a/java/kaffe/HISTORY b/java/kaffe/HISTORY
index 5305792..1f71b0c 100644
--- a/java/kaffe/HISTORY
+++ b/java/kaffe/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on gcj to dependency on gcc with
sub-depends on JAVA (scripted)
diff --git a/kde4-apps/calligra/BUILD b/kde4-apps/calligra/BUILD
index 2b28a23..ef3da71 100755
--- a/kde4-apps/calligra/BUILD
+++ b/kde4-apps/calligra/BUILD
@@ -1,4 +1,4 @@
-OPTS+=" $KTINY" &&
+[[ "$KTINY" = off ]] || OPTS +=" $KTINY" &&
OPTS+=" -DQT3SUPPORT=$QT3" &&
if [[ $KDE_NEPOMUK == n ]];then
OPTS+=" -DNEPOMUK=off"
diff --git a/kde4-apps/calligra/CONFIGURE b/kde4-apps/calligra/CONFIGURE
index 30e5172..d81779e 100755
--- a/kde4-apps/calligra/CONFIGURE
+++ b/kde4-apps/calligra/CONFIGURE
@@ -1,3 +1,3 @@
source $SECTION_DIRECTORY/KDE_CONFIGURE &&
-config_query_option KTINY 'build tiny suite - Words/Tables/Stage' y
'-DTINY=1' ''
+config_query_option KTINY 'build tiny suite - Words/Tables/Stage' y
'-DTINY=1' 'off'
config_query_option QT3 'build parts which use Qt3 support?' n 'on' 'off'
diff --git a/kde4-apps/calligra/DEPENDS b/kde4-apps/calligra/DEPENDS
index 0c2325a..0936411 100755
--- a/kde4-apps/calligra/DEPENDS
+++ b/kde4-apps/calligra/DEPENDS
@@ -27,7 +27,10 @@ depends icu &&
depends sqlite &&
optional_depends mysql '' '' 'import MySql to Kexi' &&
optional_depends postgresql '' '' 'import Postgresql to Kexi' &&
+# Krita and Sheets
+depends eigen2 &&
#Krita
+optional_depends vc '' '' 'explicit SIMD optimization' &&
optional_depends libkdcraw '' '' 'process RAW photos' &&
optional_depends glew '' '' 'OpenGL shaders in Krita' &&
optional_depends gmm '' '' 'Krita panorama plugin' &&
diff --git a/kde4-apps/calligra/HISTORY b/kde4-apps/calligra/HISTORY
index 52fca1a..18e7bd8 100644
--- a/kde4-apps/calligra/HISTORY
+++ b/kde4-apps/calligra/HISTORY
@@ -1,3 +1,8 @@
+2014-09-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: eigen2 needed for Krita and Sheets, vc for SIMD
+ * CONFIGURE, BUILD: provide non-empty value for KTINY when not chosen,
+ otherwise this choice is never remembered (sorcery bug or feature?)
+
2013-03-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.2

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..872a1c5 100755
--- a/kde4-support/phonon-backend-gstreamer/DETAILS
+++ b/kde4-support/phonon-backend-gstreamer/DETAILS
@@ -1,8 +1,8 @@
SPELL=phonon-backend-gstreamer
- VERSION=4.6.3
-
SOURCE_HASH=sha512:819b4ac7b2193f4d32f160ffb1fb22f702e66ed9de3d6bdf818e238dfcdf88fbf974abc85f9d65c5da589bf413a525a1cd8131097b49354ebc255e90a813dbbc
+ VERSION=4.8.0
+
SOURCE_HASH=sha512:ab26afc6ba914c1c63ce6eefce7a161df71537eb04c52ffb51245a5190de072d46604fc15d4eb85dd1ceacabf3c5257df7d0e9e72f96567c87f9eef34009fece
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
+ SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://phonon.kde.org/
LICENSE[0]=LGPL
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY
b/kde4-support/phonon-backend-gstreamer/HISTORY
index 044c3cd..c519def 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.0, SOURCE_URL[0] updated
+
+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-mplayer/DETAILS
b/kde4-support/phonon-backend-mplayer/DETAILS
index 03a0c7e..93ce4c0 100755
--- a/kde4-support/phonon-backend-mplayer/DETAILS
+++ b/kde4-support/phonon-backend-mplayer/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=phonon-backend-mplayer
- if [[ "$PHONON_BACKEND_MPLAYER_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git_http://anongit.kde.org/phonon-mplayer:${SPELL}-git
SOURCE_IGNORE=volatile
diff --git a/kde4-support/phonon-backend-mplayer/HISTORY
b/kde4-support/phonon-backend-mplayer/HISTORY
index f33096a..c588336 100644
--- a/kde4-support/phonon-backend-mplayer/HISTORY
+++ b/kde4-support/phonon-backend-mplayer/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PROVIDES: provide PHONON_BACKEND

diff --git a/kde4-support/phonon-backend-vlc/DETAILS
b/kde4-support/phonon-backend-vlc/DETAILS
index c370db8..9d17241 100755
--- a/kde4-support/phonon-backend-vlc/DETAILS
+++ b/kde4-support/phonon-backend-vlc/DETAILS
@@ -1,6 +1,6 @@
SPELL=phonon-backend-vlc
- VERSION=0.6.2
-
SOURCE_HASH=sha512:1ae699b5b912ef2f76803c389858ab8b22ff7896912c5b859b0e77bc87eba9a4b79dcd5e20291ae161a0834683dedd3b39bd47db9788ef790a9ba5b4a3fe52f2
+ VERSION=0.8.0
+
SOURCE_HASH=sha512:fa2c71d45f5085566639b8f74638a9994cc0148f15045ec480b25844414f3c660fd9b24848263dc80aa8f931bff0a9559d918b5d777d91b822ff154b3c1ed8ca
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/phonon-backend-vlc/HISTORY
b/kde4-support/phonon-backend-vlc/HISTORY
index 36de0ee..060d96d 100644
--- a/kde4-support/phonon-backend-vlc/HISTORY
+++ b/kde4-support/phonon-backend-vlc/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.0, SOURCE_URL[0] updated
+
+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..d8d0ee3 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.8.0
+
SOURCE_HASH=sha512:0dc12a4d479245ba7ffab954c91c78e3c469982e6b8ed5ff9b80150aebab448023ffde68b67a2520ca76af9ce3c0608d250f59275767c092f4e364da8cfe105f
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..e7ab9d9 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,10 @@
+2014-09-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.0
+ * PRE_BUILD: removed
+
+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-support/phonon/PRE_BUILD b/kde4-support/phonon/PRE_BUILD
deleted file mode 100755
index 624577e..0000000
--- a/kde4-support/phonon/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
-cd $SOURCE_DIRECTORY
-
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 8421c1b..08f1d93 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,6 @@
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE_DEPENDS: giflib => GIFLIB
+
2013-07-11 Eric Sandall <sandalle AT sourcemage.org>
* KDE_DEPENDS: Add kdepimlibs4 case
Default case causes circular dependency with kdebase4-runtime
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 087a0c57..066127c 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -21,7 +21,7 @@ case $SPELL in
depends libpng &&
depends libxml2 &&
depends libxslt &&
- depends giflib
+ depends GIFLIB
;;

kdebase4-runtime)
diff --git a/kde4/kdebindings4/BUILD b/kde4/kdebindings4/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdebindings4/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdebindings4/CONFLICTS b/kde4/kdebindings4/CONFLICTS
deleted file mode 100755
index 6db4f05..0000000
--- a/kde4/kdebindings4/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kdebindings4 y
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
deleted file mode 100755
index a319776..0000000
--- a/kde4/kdebindings4/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
- SPELL=kdebindings4
- VERSION=0
- PATCHLEVEL=9999
- SHORT="deprecated"
-cat << EOF
- deprecated spell [replaced by kde4-bindings-profile]
-EOF
diff --git a/kde4/kdebindings4/DOWNLOAD b/kde4/kdebindings4/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdebindings4/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
deleted file mode 100644
index 79f85a5..0000000
--- a/kde4/kdebindings4/HISTORY
+++ /dev/null
@@ -1,404 +0,0 @@
-2011-10-15 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: removed spaces before EOF/cat
-
-2011-08-31 Bor Kraljič <pyrobor AT ver.si>
- * CONFLICTS: conflict with self. Just to be sure.
-
-2011-08-15 Bor Kraljič <pyrobor AT ver.si>
- * UP_TRIGGERS: added "&&"
-
-2011-08-04 Bor Kraljič <pyrobor AT ver.si>
- * deprecated in favour of kde4-bindings-profile [Split of the source]
- * PATCHLEVEL=9999
- * DETAILS: version 0
-
-2011-07-11 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.6.5
-
-2011-06-11 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.6.4
-
-2011-05-06 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.6.3
-
-2011-04-06 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.6.2
-
-2011-03-07 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.6.1
-
-2011-01-26 Bor Kraljič <pyrobor AT ver.si>
- * PRE_BUILD: removed patches that are not needed anymore
- * fix-pyqt4-build.patch, sip4.12.patch: removed, no longer needed
- * DETAILS: updated spell to 4.6.0
-
-2011-01-08 Bor Kraljič <pyrobor AT ver.si>
- * sip4.12.patch: fixes compile problem with sip 4.12
-
-2011-01-07 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.5.5
-
-2010-12-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.5.4
-
-2010-11-25 Bor Kraljič <pyrobor AT ver.si>
- * PRE_BUILD: added, hack to install pc files in /usr/lib/pkgconfig
-
-2010-11-03 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.5.3
-
-2010-10-07 Bor Kraljič <pyrobor AT ver.si>
- * fix-pyqt4-build.patch: fixes build with pyqt4 4.7.7
-
-2010-10-06 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.5.2
-
-2010-08-31 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.5.1
-
-2010-06-30 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.4.5
-
-2010-06-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.4.4
-
-2010-05-05 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.4.3
-
-2010-04-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.4.2
-
-2010-03-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.4.1 (stable)
-
-2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
- * DEPENDS: updated ruby dependency to RUBY provider
-2010-02-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.4.0 (stable)
-
-2010-01-31 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 4.3.5
-2010-01-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.95 (unstable)
-
-2010-01-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.90 (unstable)
-
-2009-12-14 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DETAILS: updated version to 4.3.4
-
-2009-11-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: fix WEB_SITE, broken by previous update
-
-2009-11-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.3 (stable)
-
-2009-10-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: remove support for multiple versions
- the devel version is always out of date when it reaches stable
grimoire
- it also requires qt-4.6
- remove KDE_VER
- if you want the devel version, use git devel-kde44 branch
- * DETAILS: version 4.3.73svn1040395 (unstable)
-
-2009-10-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.72svn1035674 (unstable)
- * DEPENDS: more optional packages
- add soem explicit flags
-
-2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.2 (stable)
-
-2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.69svn1027298 (unstable)
-
-2009-09-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.1 (stable)
-
-2009-08-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.63svn1007208 (unstable)
-
-2009-08-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.0 (stable)
-
-2009-08-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: remove svn support
-
-2009-07-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.98 (unstable)
-
-2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.3.61svn998540 (unstable)
-
-2009-07-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: revert url fixes
-
-2009-07-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.96 (unstable)
-
-2009-07-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.95 (unstable)
-
-2009-06-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.90 (unstable)
-
-2009-06-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.89svn977047 (unstable)
-
-2009-06-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.4 (stable)
-
-2009-05-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.88svn973768 (unstable)
-
-2009-05-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.87svn969966 (unstable)
-
-2009-05-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.85 (unstable)
-
-2009-05-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.3 (stable)
-
-2009-05-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.71.svn961800 (unstable)
-
-2009-04-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.70.svn954171 (unstable)
-
-2009-04-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.69.svn949727 (unstable)
-
-2009-04-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.2 (stable)
-
-2009-03-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.68.svn945504 (unstable)
-
-2009-03-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.67.svn940805 (unstable)
-
-2009-03-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.66.svn937700 (unstable)
-
-2009-03-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.1 (stable)
-
-2009-03-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.65.svn932664 (unstable)
-
-2009-02-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.63.svn925121 (unstable)
-
-2009-01-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.61.svn917530 (unstable)
-
-2009-01-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.0 (stable)
-
-2009-01-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.2.60.svn912032 (unstable)
-
-2009-01-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.4
-
-2009-01-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.96 (unstable)
-
-2009-01-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.87 (unstable)
-
-2008-12-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.85 (unstable)
-
-2008-12-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.82 (devel)
- * DEPENDS: enable optional falcon
-
-2008-11-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.81 (devel)
-
-2008-11-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.80 (devel)
-
-2008-11-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.73 (devel)
-
-2008-11-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.72 (devel)
-
-2008-11-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.3 (stable)
-
-2008-10-29 Juuso Alasuutari <iuso AT sourcemage.org>
- * SUB_DEPENDS: Fixed typos and invalid syntax.
-
-2008-10-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.71 (devel)
-
-2008-10-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.70 (devel)
-
-2008-10-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add optional kdegraphics4
-
-2008-10-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.69
-
-2008-10-04 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_SUB_DEPENDS, SUB_DEPENDS: added
- * DEPENDS" add sip
- disable falcon
-
-2008-10-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.2
-
-2008-10-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.68
-
-2008-09-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.67
-
-2008-09-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.66
-
-2008-09-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.65
-
-2008-09-03 Julien "_kaze_" ROZO <julien AT rozo.org>
- * DETAILS: updated stable version to 4.1.1
- * DEPENDS: added pyqt4 as a dependency if python dependency is enabled
-
-2008-08-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.64
-
-2008-08-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.61
-
-2008-08-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: remove versioning from svn tarball
-
-2008-08-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.60
-
-2008-07-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.1.0
-
-2008-07-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.99
-
-2008-07-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.98
-
-2008-07-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.85
-
-2008-06-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.84
-
-2008-06-24 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.83
-
-2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.82
-
-2008-05-29 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: Added FORCE_DOWNLOAD=on,
- import KDE_VCS_AUTOUPDATE var from kdelibs4.
-
-2008-05-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.80
-
-2008-05-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.74
-
-2008-05-09 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: Added SVN version.
-
-2008-05-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.73
-
-2008-05-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.72
-
-2008-04-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.71
-
-2008-04-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.70
-
-2008-04-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.69
-
-2008-04-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.68
-
-2008-04-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.3
-
-2008-03-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.67
-
-2008-03-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.66
-
-2008-03-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.2
-
-2008-03-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.65
-
-2008-02-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.64
-
-2008-02-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * DETAILS: added fallback KDE_VER=stable so summoning works if you
don't
- have kdelibs4 yet (at least for the stable choice)
-
-2008-02-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.63
-
-2008-02-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.1
- add stable/unstable versions; currently(4.0.1/4.0.61)
-
-2008-02-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.61
-
-2008-02-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add optional falcon
-
-2008-01-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.60
- KEYWORDS=kde4
-
-2008-01-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.0
-
-2007-12-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.97.0
-
-2007-12-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.96.2
-
-2007-11-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.96.1
-
-2007-11-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.96.0
-
-2007-11-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.95.2
-
-2007-11-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.95.1
-
-2007-10-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.95.0
- * DEPENDS: add qscintilla. qwt5
-
-2007-10-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.94.0
-
-2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.93.0
diff --git a/kde4/kdebindings4/INSTALL b/kde4/kdebindings4/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdebindings4/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdebindings4/PRE_BUILD b/kde4/kdebindings4/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdebindings4/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdebindings4/UP_TRIGGERS b/kde4/kdebindings4/UP_TRIGGERS
deleted file mode 100644
index 5433ac9..0000000
--- a/kde4/kdebindings4/UP_TRIGGERS
+++ /dev/null
@@ -1,3 +0,0 @@
-up_trigger kdebindings4 dispel_self &&
-up_trigger kde4-bindings-profile cast_self
-
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index 2670a6f..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 &&
@@ -17,7 +17,7 @@ depends perl &&
depends libpng &&
depends libxml2 &&
depends libxslt &&
-depends giflib &&
+depends GIFLIB &&
depends JPEG &&
depends attica &&
depends shared-desktop-ontologies &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index bef22f4..b8d5a12 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,11 @@
+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
+
2013-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.5

diff --git a/kernels/drm/DETAILS b/kernels/drm/DETAILS
index 416bc49..ffbcf69 100755
--- a/kernels/drm/DETAILS
+++ b/kernels/drm/DETAILS
@@ -1,10 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=drm
-if [[ "$DRM_AUTOUPDATE" == "y" ]]
-then
- VERSION="$(date +%Y%m%d)"
-else
- VERSION=git
-fi
+ VERSION="$(get_scm_version)"
SOURCE=$SPELL-git.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_URL=git://anongit.freedesktop.org/git/mesa/drm:drm-git
diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index a8fafaf..2a89c3c 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

diff --git a/kernels/linux/DETAILS b/kernels/linux/DETAILS
index 691d7ac..3d0d938 100755
--- a/kernels/linux/DETAILS
+++ b/kernels/linux/DETAILS
@@ -8,6 +8,7 @@ test -f ${CONFIG_CACHE}/${SPELL}.details.defaults &&

VERSION=${KERNEL_VERSION=${LATEST_maintenance_patches/patch-/}}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/linux-cache-${VERSION}
LINUX_SOURCE_DIRECTORY=${BUILD_DIRECTORY}/linux-${VERSION}
+ SECURITY_PATCH=3
WEB_SITE=http://www.kernel.org/
GATHER_DOCS=off
ENTERED=20020819
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index d95ad9e..ae148d3 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,82 @@
+2014-09-29 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.16.3
+ * info/patches/maintenance_patches_3/patch-3.16.3: added
+
+2014-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.16.2, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.16.2: version 3.16.2
+
+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
+
+2014-07-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.7, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.7: version 3.15.7
+
+2014-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.6, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.6: version 3.15.6
+
+2014-07-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.5, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.5: version 3.15.5
+
+2014-06-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.4, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.4: version 3.15.4
+
+2014-06-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.2, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.2: version 3.15.2
+ * DETAILS: SECURITY_PATCH++, fixes CVE-2014-4611 and CVE-2014-4608
+
+2014-06-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15.1, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15.1: version 3.15.1
+
+2014-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/kernels/3.15, latest.defaults,
+ info/patches/maintenance_patches_3/patch-3.15: version 3.15
+
+2014-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/patches/maintenance_patches_3/patch-3.14.6: added
+ * latest_defaults: version 3.14.6
+ * DETAILS: SECURITY_PATH++, fixes CVE-2014-3153
+
+2014-06-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/patches/maintenance_patches_3/patch-3.14.5: added
+ * latest_defaults: version 3.14.5
+
+2014-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/patches/maintenance_patches_3/patch-3.14.4: added
+ * latest_defaults: version 3.14.4
+ * DETAILS: SECURITY_PATCH=1 fixes CVE-2014-0196
+
+2014-05-07 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.14.3
+ * info/patches/maintenance_patches_3/patch-3.14.3: added
+
+2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * info/patches/maintenance_patches_3/patch-3.14.2: added
+ * latest_defaults: version 3.14.2
+
+2014-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.14, LATEST_3=3.14
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.14.1
+ * info/kernels/3.14: added
+ * info/patches/maintenance_patches_3/patch-3.14: added
+ * info/patches/maintenance_patches_3/patch-3.14.1: added
+
2014-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* info/patches/maintenance_patches_3/patch-3.13.9: added
* latest_defaults: version 3.13.9
diff --git a/kernels/linux/info/kernels/3.14 b/kernels/linux/info/kernels/3.14
new file mode 100755
index 0000000..ab25023
--- /dev/null
+++ b/kernels/linux/info/kernels/3.14
@@ -0,0 +1,5 @@
+version="3.14"
+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/kernels/3.15 b/kernels/linux/info/kernels/3.15
new file mode 100755
index 0000000..6846b92
--- /dev/null
+++ b/kernels/linux/info/kernels/3.15
@@ -0,0 +1,5 @@
+version="3.15"
+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/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.14
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14
new file mode 100755
index 0000000..1867946
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14
@@ -0,0 +1,5 @@
+patchversion="3.14.0"
+source=""
+source_url=""
+appliedkernels="3.14"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.1
new file mode 100755
index 0000000..85b43b8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.1
@@ -0,0 +1,6 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="4518cd93e2114bbb049be21a52d793d3dfb6c01f"
+
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.2
new file mode 100755
index 0000000..9c1d153
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.2
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f4e1a89522bf2985c3bfaf3fab944e2b69b8c7c9"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
new file mode 100755
index 0000000..94b9151
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="31a81e08b3bb1c571c949aac95996a44c2c59d2f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.4
new file mode 100755
index 0000000..3b6255a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.4
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2b53c1bfed4fe977bcc8832b3b1fc8c1b8486e26"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.5
new file mode 100755
index 0000000..32eb5da
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.5
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="e1e877f9b3064f69b500a3bda8692fcaaf62bfb6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.6
new file mode 100755
index 0000000..c754e8a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.6
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="db4de57cdea603a4ade442e8eb46008050d08cbf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15
new file mode 100755
index 0000000..83f19ea
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15
@@ -0,0 +1,5 @@
+patchversion="3.15.0"
+source=""
+source_url=""
+appliedkernels="3.15"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.1
new file mode 100755
index 0000000..3ba6a76
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.1
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="5d5331c260846e3ef20ed6cfd7fd2c78a61dc54b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.2
new file mode 100755
index 0000000..1f2da5f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.2
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f7925fc373dd813985f1e79ec0000534ddb78c5d"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.4
new file mode 100755
index 0000000..cd7c0e5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.4
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="0d7c129934c0b1309f5fc6e7941b5fdc47c9f7b6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.5
new file mode 100755
index 0000000..7054fd2
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.5
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="20f4be9fd46ee98edcc0adf206325e97555cc245"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.6
new file mode 100755
index 0000000..86013e1
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.6
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3d5673d60a32d9c4af35647b3405bdfd8080898a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.7
new file mode 100755
index 0000000..5d5588f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.7
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="409256034fef4d81a70ec69d300d46bab1c947c8"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.8
new file mode 100755
index 0000000..89a937c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.15.8
@@ -0,0 +1,5 @@
+appliedkernels="3.15"
+patchversion="${appliedkernels}.8"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="347c77b1e3d827f6c071004ea98af0383606a782"
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/info/patches/maintenance_patches_3/patch-3.16.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.2
new file mode 100755
index 0000000..24860b5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.2
@@ -0,0 +1,5 @@
+appliedkernels="3.16"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8bb4cdf8a8c4958d870db987227441e8a45292c8"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3
new file mode 100755
index 0000000..b03bab7
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3
@@ -0,0 +1,5 @@
+appliedkernels="3.16"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3e36f531e04e148b22fcc96e5cd1eb1b2297c7e2"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index ab50076..778ec89 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.13
+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.13.9
+LATEST_maintenance_patches_3=patch-3.16.3
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/mtdev/DETAILS b/kernels/mtdev/DETAILS
index b91c532..786a2b7 100755
--- a/kernels/mtdev/DETAILS
+++ b/kernels/mtdev/DETAILS
@@ -1,6 +1,6 @@
SPELL=mtdev
- VERSION=1.1.4
-
SOURCE_HASH=sha512:75da652e720cce9efcc23c2b72a0d8050096f054eff1338e02477816e107d469a7f9c5f4973146d38d939c3515ea39e926c70cf8f2ca0372c83c75506c61732b
+ VERSION=1.1.5
+
SOURCE_HASH=sha512:78477a4af784e3f846df867f1428ffdc458e3ff33d465d45a84247a7e52f0e215cace397d72be64f6e641f07e0b97a930eff0e07fe9507e0138fb028a4037d6d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://bitmath.org/code/mtdev/
diff --git a/kernels/mtdev/HISTORY b/kernels/mtdev/HISTORY
index 7402547..2576d9d 100644
--- a/kernels/mtdev/HISTORY
+++ b/kernels/mtdev/HISTORY
@@ -1,3 +1,6 @@
+2014-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.5
+
2013-10-09 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS: 1.1.4

diff --git a/kernels/solo6x10/DETAILS b/kernels/solo6x10/DETAILS
index c5ee130..5e723da 100755
--- a/kernels/solo6x10/DETAILS
+++ b/kernels/solo6x10/DETAILS
@@ -1,11 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=solo6x10
if [[ "$SOLO6X10_BRANCH" == scm ]]; then
- if [[ "$SOLO6X10_AUTOUPDATE" == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-scm.tar.bz2
SOURCE_URL[0]=git://github.com/bluecherrydvr/$SPELL.git:$SPELL-scm
SOURCE_IGNORE=volatile
diff --git a/kernels/solo6x10/HISTORY b/kernels/solo6x10/HISTORY
index 102f243..6a1e391 100644
--- a/kernels/solo6x10/HISTORY
+++ b/kernels/solo6x10/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-04-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.4.7

diff --git a/latex/latex-beamer/DETAILS b/latex/latex-beamer/DETAILS
index 6a54529..434d4e6 100755
--- a/latex/latex-beamer/DETAILS
+++ b/latex/latex-beamer/DETAILS
@@ -1,10 +1,11 @@
SPELL=latex-beamer
- VERSION=3.07
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c010b88f11cc2c6a455f622c9d65ba5907a68aeb984d0ec06f0b417b9871847d8180ec489074726f09563e3ec07717bf4b2984bdf64f7538f304b5d598a29ac6
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://${SPELL}.sourceforge.net";
+ VERSION=3.33
+ COMMIT=31cc758a62ae
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=https://bitbucket.org/rivanvx/beamer/get/version-${VERSION//./-}.tar.bz2
+
SOURCE_HASH=sha512:2df00786fbec66fe145ab82c3b53f2b419d6a2b6bfc81dbe123be9434dfec1d66e52ad14787f01300f5d6eb9880965812c70e0b4e01c988168498c5c70426fe2
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rivanvx-beamer-$COMMIT"
+ WEB_SITE="https://bitbucket.org/rivanvx/beamer/";
LICENSE[0]=GPL
GATHER_DOCS="off"
ENTERED=20070427
diff --git a/latex/latex-beamer/HISTORY b/latex/latex-beamer/HISTORY
index de6f978..da5992f 100644
--- a/latex/latex-beamer/HISTORY
+++ b/latex/latex-beamer/HISTORY
@@ -1,3 +1,7 @@
+2014-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 3.33
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: switch from tetex to texlive [auto]

diff --git a/latex/latex-beamer/INSTALL b/latex/latex-beamer/INSTALL
index 7e99018..9bd5417 100755
--- a/latex/latex-beamer/INSTALL
+++ b/latex/latex-beamer/INSTALL
@@ -1,7 +1,10 @@
-mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/latex/beamer &&
-mkdir -p ${INSTALL_ROOT}/usr/share/texmf/doc/beamer &&
-cp -R ${SOURCE_DIRECTORY}/doc/* \
- ${SOURCE_DIRECTORY}/{examples,solutions} \
- ${INSTALL_ROOT}/usr/share/texmf/doc/beamer
-cp -R ${SOURCE_DIRECTORY}/{base,themes,emulation,extensions} \
- $INSTALL_ROOT/usr/share/texmf/tex/latex/beamer
+mkdir -p "$INSTALL_ROOT"/usr/share/texmf/tex/latex/beamer &&
+mkdir -p "$INSTALL_ROOT"/usr/share/texmf/doc/beamer &&
+mkdir -p "$INSTALL_ROOT"/usr/share/emacs/site-lisp &&
+cp -R "$SOURCE_DIRECTORY"/emacs/* \
+ "$INSTALL_ROOT"/usr/share/emacs/site-lisp &&
+cp -R "$SOURCE_DIRECTORY"/doc/* \
+ "$SOURCE_DIRECTORY"/{examples,solutions} \
+ "$INSTALL_ROOT"/usr/share/texmf/doc/beamer &&
+cp -R "$SOURCE_DIRECTORY"/base \
+ "$INSTALL_ROOT"/usr/share/texmf/tex/latex/beamer
diff --git a/latex/xdvi/DETAILS b/latex/xdvi/DETAILS
index 138cbb4..b735c79 100755
--- a/latex/xdvi/DETAILS
+++ b/latex/xdvi/DETAILS
@@ -1,12 +1,11 @@
SPELL=xdvi
- VERSION=22.84
+ VERSION=22.86
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.math.berkeley.edu/pub/Software/TeX/$SOURCE
-
SOURCE_HASH=sha512:76f6f0cc17d7d0ee70c5843d14ecd0e42e8c9317a4e124c244e36117258ceec34433fb412a67cdba791cbf8cc24525c0fc5bf06f9493fc22b5a585bdb342012c
+ SOURCE_URL[0]=http://math.berkeley.edu/~vojta/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:b8105d1157bdc5e9cd0cd6cf55b7512a01257ac80db60c265b93ea9a5bf5ef527ca7aa1011c20e37f9d81e8dfde01ff373f3a3762c1358a626c019bbfff846ef
WEB_SITE=http://www.math.berkeley.edu/~vojta/xdvi.html
ENTERED=20020215
- UPDATED=20050428
KEYWORDS="doc"
SHORT="xdvi: a DVI viewer for X."
cat << EOF
diff --git a/latex/xdvi/HISTORY b/latex/xdvi/HISTORY
index e1f1ded..38ed3c3 100644
--- a/latex/xdvi/HISTORY
+++ b/latex/xdvi/HISTORY
@@ -1,3 +1,7 @@
+2014-06-25 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: create /usr/share/dvips/config/
+ * DETAILS: updated spell to 22.86
+
2009-08-06 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* PROVIDES: added XDVI

diff --git a/latex/xdvi/INSTALL b/latex/xdvi/INSTALL
new file mode 100755
index 0000000..cec9023
--- /dev/null
+++ b/latex/xdvi/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p "$INSTALL_ROOT"/usr/share/dvips/config &&
+default_install
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/cdk/DETAILS b/libs/cdk/DETAILS
index ac94b7b..a5c7d3e 100755
--- a/libs/cdk/DETAILS
+++ b/libs/cdk/DETAILS
@@ -1,6 +1,6 @@
SPELL="cdk"
- VERSION="5.0-20120323"
-
SOURCE_HASH=sha512:bd3a3f7a79eeea23a2e79aefbe689f6b89c91108f3c1cc3e205c02021fbd39139c67da45f5c8c219d85dd57058725be1a12dce37cfaf767d756f8d56761f750f
+ VERSION="5.0-20140118"
+
SOURCE_HASH=sha512:a38bff8c39ee1a25aba7b1ab864ee03f9d53f9594994ab26d6d8272b97c5896d19c4f0695db987b1fd347c2bdd5d0c17232fef72042260d1aff0c77e14caaca4
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]="ftp://invisible-island.net/cdk/$SOURCE";
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tgz}"
diff --git a/libs/cdk/HISTORY b/libs/cdk/HISTORY
index 958acfb..436f767 100644
--- a/libs/cdk/HISTORY
+++ b/libs/cdk/HISTORY
@@ -1,3 +1,6 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.0-20140118
+
2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.0-20120323
* INSTALL: make cdk5-config executable
diff --git a/libs/dietlibc/DETAILS b/libs/dietlibc/DETAILS
index 572735b..401924f 100755
--- a/libs/dietlibc/DETAILS
+++ b/libs/dietlibc/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dietlibc
if [[ $DIETLIBC_BRANCH == scm ]]; then
- if [[ $DIETLIBC_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_URL[0]=cvs://:pserver:cvs AT cvs.fefe.de:/cvs:dietlibc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
diff --git a/libs/dietlibc/HISTORY b/libs/dietlibc/HISTORY
index 2f92581..c6b4079 100644
--- a/libs/dietlibc/HISTORY
+++ b/libs/dietlibc/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/libs/dw2/DETAILS b/libs/dw2/DETAILS
index d3beba0..a7bd03b 100755
--- a/libs/dw2/DETAILS
+++ b/libs/dw2/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dw2
- if [ "$DW2_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
diff --git a/libs/dw2/HISTORY b/libs/dw2/HISTORY
index d233fe1..05a8840 100644
--- a/libs/dw2/HISTORY
+++ b/libs/dw2/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,DETAILS,HISTORY,INSTALL,PRE_BUILD,PREPARE: added spell
diff --git a/libs/gdbm/DETAILS b/libs/gdbm/DETAILS
index fb5b3c6..b3d95d8 100755
--- a/libs/gdbm/DETAILS
+++ b/libs/gdbm/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdbm
- VERSION=1.10
+ VERSION=1.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/gdbm/HISTORY b/libs/gdbm/HISTORY
index 4d9d284..f742f10 100644
--- a/libs/gdbm/HISTORY
+++ b/libs/gdbm/HISTORY
@@ -1,3 +1,6 @@
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11
+
2011-11-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.10

diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS
index 649078f..31dc595 100755
--- a/libs/gettext/DEPENDS
+++ b/libs/gettext/DEPENDS
@@ -1,6 +1,13 @@
depends gnupg &&
depends smgl-fhs &&
-depends libxml2 &&
+
+optional_depends libxml2 "" "--with-included-libxml" "use system libxml2" &&
+if is_depends enabled $SPELL libxml2;then
+ if is_depends_enabled libxml2 icu;then
+ depends icu
+ fi
+fi &&
+
optional_depends libunistring '' '--with-included-libunistring' 'use sytem
libunistring' &&
optional_depends libcroco "" "--with-included-libcroco" "use system
libcroco" &&

diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index d07d8b7..05021fb 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,7 +1,7 @@
SPELL=gettext
- VERSION=0.18.3.1
- PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.19.2
+# PATCHLEVEL=1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 763c1d3..fcd1bc7 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,24 @@
+2014-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: icu is only needed if libxmls2 uses it
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: icu
+
+2014-07-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.19.2
+
+2014-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.19.1
+
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.19
+
+2014-04-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: libxml2 is optional
+
+2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.18.3.2
+
2013-08-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.18.3.1

diff --git a/libs/gflags/BUILD b/libs/gflags/BUILD
new file mode 100755
index 0000000..acc2ed5
--- /dev/null
+++ b/libs/gflags/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" -DBUILD_SHARED_LIBS=on" &&
+cmake_build
diff --git a/libs/gflags/DEPENDS b/libs/gflags/DEPENDS
index f148724..2236fb7 100755
--- a/libs/gflags/DEPENDS
+++ b/libs/gflags/DEPENDS
@@ -1 +1,2 @@
-depends -sub CXX gcc
+depends -sub CXX gcc &&
+depends cmake
diff --git a/libs/gflags/DETAILS b/libs/gflags/DETAILS
index 31e3ccb..0510998 100755
--- a/libs/gflags/DETAILS
+++ b/libs/gflags/DETAILS
@@ -1,8 +1,8 @@
SPELL=gflags
- VERSION=2.0
+ VERSION=2.1.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://gflags.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:ba7061d5d57fcadb53ef70f846caacc44c319552e7dd6b05def38f961d3d89f4023e4eda95845efb399f3e94f24f75bdadfc67b22e29bccc94e46de8db501b83
+
SOURCE_URL[0]=https://github.com/schuhschuh/gflags/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://code.google.com/p/gflags/
LICENSE[0]=BSD
diff --git a/libs/gflags/HISTORY b/libs/gflags/HISTORY
index 543f042..3cb92b3 100644
--- a/libs/gflags/HISTORY
+++ b/libs/gflags/HISTORY
@@ -1,2 +1,9 @@
+2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: change SOURCE_URL[0] to github
+
+2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.1
+ * DEPENDS, BUILD: use cmake
+
2013-01-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: spell created
diff --git a/libs/gfreenect/DETAILS b/libs/gfreenect/DETAILS
index d527dea..1781145 100755
--- a/libs/gfreenect/DETAILS
+++ b/libs/gfreenect/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gfreenect
-if [[ "$GFREENECT_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/elima/GFreenect.git:gfreenect.git
SOURCE_IGNORE=volatile
diff --git a/libs/gfreenect/HISTORY b/libs/gfreenect/HISTORY
index 3c7d489..4bafa59 100644
--- a/libs/gfreenect/HISTORY
+++ b/libs/gfreenect/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-10-31 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: gobject-introspection and gtk-doc added

diff --git
a/libs/glibc/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
b/libs/glibc/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
new file mode 100644
index 0000000..5a71075
--- /dev/null
+++ b/libs/glibc/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
@@ -0,0 +1,51 @@
+From 6a714e48586aa7f21d2eeef9195cee57c9ebaa60 Mon Sep 17 00:00:00 2001
+From: Thorsten Kukuk <kukuk AT suse.de>
+Date: Fri, 16 Aug 2013 14:54:23 -0400
+Subject: [PATCH 05/11] reload /etc/resolv.conf when it has changed
+
+if /etc/resolv.conf is updated, then make sure applications
+already running get the updated information.
+
+ripped from SuSE
+
+http://bugs.gentoo.org/177416
+---
+ resolv/res_libc.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/resolv/res_libc.c b/resolv/res_libc.c
+index ee3fa21..f30b3a9 100644
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
+@@ -22,6 +22,7 @@
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #include <bits/libc-lock.h>
++#include <sys/stat.h>
+
+
+ /* The following bit is copied from res_data.c (where it is #ifdef'ed
+@@ -95,6 +96,20 @@ int
+ __res_maybe_init (res_state resp, int preinit)
+ {
+ if (resp->options & RES_INIT) {
++ static time_t last_mtime, last_check;
++ time_t now;
++ struct stat statbuf;
++
++ time (&now);
++ if (now != last_check) {
++ last_check = now;
++ if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime
!= statbuf.st_mtime) {
++ last_mtime = statbuf.st_mtime;
++ atomicinclock (lock);
++ atomicinc (__res_initstamp);
++ atomicincunlock (lock);
++ }
++ }
+ if (__res_initstamp != resp->_u._ext.initstamp) {
+ if (resp->nscount > 0)
+ __res_iclose (resp, true);
+--
+1.8.5.4
+
diff --git
a/libs/glibc/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
b/libs/glibc/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
new file mode 100644
index 0000000..a3523a6
--- /dev/null
+++ b/libs/glibc/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
@@ -0,0 +1,28 @@
+From 2a6098d40483e825eebc18f74203b0b1d1c6e6c8 Mon Sep 17 00:00:00 2001
+From: Guy Martin <gmsoft AT tuxicoman.be>
+Date: Fri, 16 Aug 2013 15:00:05 -0400
+Subject: [PATCH 07/11] rtld: do not ignore arch-specific CFLAGS
+
+https://bugs.gentoo.org/452184
+http://sourceware.org/bugzilla/show_bug.cgi?id=15005
+http://sourceware.org/ml/libc-alpha/2013-01/msg00247.html
+---
+ elf/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index 4c58fc9..56900d2 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -421,7 +421,7 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS)
-D'LIBDIR="$(libdir)"' \
+ -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+ CFLAGS-cache.c = $(SYSCONF-FLAGS)
+-CFLAGS-rtld.c = $(SYSCONF-FLAGS)
++CFLAGS-rtld.c += $(SYSCONF-FLAGS)
+
+ CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst
%,%.os,$(all-rtld-routines))),\
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
+--
+1.8.5.4
+
diff --git
a/libs/glibc/00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch
b/libs/glibc/00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch
new file mode 100644
index 0000000..7ad04dc
--- /dev/null
+++
b/libs/glibc/00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch
@@ -0,0 +1,64 @@
+From 8f1bdcb971a624a08796dae3ad01a9eb7552ba24 Mon Sep 17 00:00:00 2001
+From: Carlos O'Donell <carlos AT systemhalted.org>
+Date: Fri, 16 Aug 2013 15:00:53 -0400
+Subject: [PATCH 08/11] nptl: handle EAGAIN with some futex operations
+
+https://bugs.gentoo.org/452184
+---
+ nptl/pthread_mutex_trylock.c | 3 ++-
+ nptl/sysdeps/unix/sysv/linux/sem_timedwait.c | 2 +-
+ nptl/sysdeps/unix/sysv/linux/sem_wait.c | 4 ++--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
+index 4d5f75d..4bf19ec 100644
+--- a/nptl/pthread_mutex_trylock.c
++++ b/nptl/pthread_mutex_trylock.c
+@@ -260,7 +260,8 @@ __pthread_mutex_trylock (mutex)
+ private), 0, 0);
+
+ if (INTERNAL_SYSCALL_ERROR_P (e, __err)
+- && INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
++ && ((INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
++ || (INTERNAL_SYSCALL_ERRNO (e, __err) == EAGAIN)))
+ {
+ THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending,
NULL);
+
+diff --git a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
+index 7dfe51d..f96f625 100644
+--- a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
++++ b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c
+@@ -94,7 +94,7 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
+ rt.tv_sec = sec;
+ rt.tv_nsec = nsec;
+ err = do_futex_timed_wait(isem, &rt);
+- if (err != 0 && err != -EWOULDBLOCK)
++ if (err != 0 && err != -EWOULDBLOCK && err != -EAGAIN)
+ {
+ __set_errno (-err);
+ err = -1;
+diff --git a/nptl/sysdeps/unix/sysv/linux/sem_wait.c
b/nptl/sysdeps/unix/sysv/linux/sem_wait.c
+index 7d586cf..6f2a89f 100644
+--- a/nptl/sysdeps/unix/sysv/linux/sem_wait.c
++++ b/nptl/sysdeps/unix/sysv/linux/sem_wait.c
+@@ -67,7 +67,7 @@ __new_sem_wait (sem_t *sem)
+ while (1)
+ {
+ err = do_futex_wait(isem);
+- if (err != 0 && err != -EWOULDBLOCK)
++ if (err != 0 && err != -EWOULDBLOCK && err != -EAGAIN)
+ {
+ __set_errno (-err);
+ err = -1;
+@@ -112,7 +112,7 @@ __old_sem_wait (sem_t *sem)
+ /* Disable asynchronous cancellation. */
+ __pthread_disable_asynccancel (oldtype);
+ }
+- while (err == 0 || err == -EWOULDBLOCK);
++ while (err == 0 || err == -EWOULDBLOCK || err == -EAGAIN);
+
+ __set_errno (-err);
+ return -1;
+--
+1.8.5.4
+
diff --git a/libs/glibc/00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch
b/libs/glibc/00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch
new file mode 100644
index 0000000..4f4806f
--- /dev/null
+++ b/libs/glibc/00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch
@@ -0,0 +1,68 @@
+From b76e856d84e14d5ece6988fee589aff26d6ac2f2 Mon Sep 17 00:00:00 2001
+From: David Lamparter <equinox-gentoo AT diac24.net>
+Date: Fri, 16 Aug 2013 15:06:34 -0400
+Subject: [PATCH 11/11] arm: fix PIC vs SHARED typos
+
+the logic in setjmp/__longjmp incorrectly tie to "PIC" to figure out
+whether the code is going into a shared library when it should be using
+"SHARED". otherwise, building static PIC code goes wrong.
+
+https://bugs.gentoo.org/336914
+http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
+
+2011-09-19 David Lamparter <equinox-gentoo AT diac24.net>
+
+ * sysdeps/arm/eabi/setjmp.S: Change PIC to SHARED.
+ * sysdeps/arm/eabi/__longjmp.S: Likewise
+---
+ ports/sysdeps/arm/__longjmp.S | 4 ++--
+ ports/sysdeps/arm/setjmp.S | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S
+index 27c57a1..c2efe12 100644
+--- a/ports/sysdeps/arm/__longjmp.S
++++ b/ports/sysdeps/arm/__longjmp.S
+@@ -73,7 +73,7 @@ ENTRY (__longjmp)
+ add a2, a2, a3
+ ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET]
+ # else
+-# ifdef PIC
++# ifdef SHARED
+ ldr a2, 1f
+ ldr a3, .Lrtld_global_ro
+ 0: add a2, pc, a2
+@@ -126,7 +126,7 @@ ENTRY (__longjmp)
+ .Lrtld_local_ro:
+ .long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
+ # else
+-# ifdef PIC
++# ifdef SHARED
+ 1: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
+ .Lrtld_global_ro:
+ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT)
+diff --git a/ports/sysdeps/arm/setjmp.S b/ports/sysdeps/arm/setjmp.S
+index b0b45ed..54e5de4 100644
+--- a/ports/sysdeps/arm/setjmp.S
++++ b/ports/sysdeps/arm/setjmp.S
+@@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
+ add a3, a3, a4
+ ldr a3, [a3, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET]
+ # else
+-# ifdef PIC
++# ifdef SHARED
+ ldr a3, 1f
+ ldr a4, .Lrtld_global_ro
+ 0: add a3, pc, a3
+@@ -110,7 +110,7 @@ ENTRY (__sigsetjmp)
+ .Lrtld_local_ro:
+ .long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
+ # else
+-# ifdef PIC
++# ifdef SHARED
+ 1: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
+ .Lrtld_global_ro:
+ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT)
+--
+1.8.5.4
+
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 25649f1..33d684b 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=glibc
TMPFS=off
if [ "$GLIBC_NPTL" = "n" ]; then
@@ -21,19 +22,15 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
else
if [[ "${GLIBC_BRANCH}" == "scm" ]]; then
- if [[ "${GLIBC_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_BRANCH}-$(date +%Y%m%d)
- else
- VERSION=${GLIBC_BRANCH}
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.17
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.19
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
@@ -54,14 +51,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
local LINUX_DIRECTORY
LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
. $LINUX_DIRECTORY/latest.defaults
-
+
if [[ $(uname -r) = 3.* ]]; then
HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
SOURCE3=linux-${LATEST_3}.tar.xz
SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
case $HEADERS_VERSION in
- 3.[1-9]*)
+ 3.[1-9]*)
SOURCE6="linux-${LATEST_3}.tar.sign"
SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
;;
@@ -78,7 +75,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
SOURCE8="patch-${HEADERS_VERSION}.sign"
SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
- else
+ else
SOURCE8="${SOURCE7}.sign"
SOURCE8_URL="${SOURCE7_URL}.sign"
fi
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 245e5ad..2b8c65f 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,20 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, glibc-2.19-fix-sign-in-bsloww1-input.patch,
+ glibc-2.19-xattr_header.patch: add bug fixes from arch linux
+ * PRE_BUILD,
+ 00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch,
+ 00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch,
+ 00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch,
+ 00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch: add bug fixes from
gentoo
+
+2014-05-24 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.19, .bz2 -> .xz
+ * PRE_BUILD, as-test-x.patch, glibc-2.17-sync-with-linux37.patch:
removed obsolete patches
+ * glibc.gpg: new key, 6C2A4AFF, Carlos O'Donell's key again
+
2014-02-15 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, PRE_BUILD: Use .xz files for 3.x kernels, .bz2 missing
for newer versions.
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 84a75c6..96ab47f 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -88,17 +88,23 @@ fi &&
sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
rm -rf $GLIBC_HEADERS_DIR/include/drm &&

+
+
#
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
patch -p0 < $SPELL_DIRECTORY/Makefile.patch &&
-patch -p1 < $SPELL_DIRECTORY/as-test-x.patch &&
# no idea why or how this is missing from configure
patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&

-# patch from Arch
-patch -p1 < $SPELL_DIRECTORY/glibc-2.17-sync-with-linux37.patch &&
+patch -p1 < $SPELL_DIRECTORY/glibc-2.19-fix-sign-in-bsloww1-input.patch &&
+patch -p1 < $SPELL_DIRECTORY/glibc-2.19-xattr_header.patch &&
+
+patch -p1 <
$SPELL_DIRECTORY/00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch
&&
+patch -p1 <
$SPELL_DIRECTORY/00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch
&&
+patch -p1 <
$SPELL_DIRECTORY/00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch
&&
+patch -p1 < $SPELL_DIRECTORY/00_all_0011-arm-fix-PIC-vs-SHARED-typos.patch
&&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/as-test-x.patch b/libs/glibc/as-test-x.patch
deleted file mode 100644
index b0f299c..0000000
--- a/libs/glibc/as-test-x.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:56:51.519950207
-0700
-+++ b/sysdeps/unix/sysv/linux/configure.in 2007-09-13 17:40:35.186895935
-0700
-@@ -24,6 +24,7 @@
- CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
- fi
- define([libc_cv_linuxVER],
[libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
-+as_test_x="test -x"
- AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
- AC_EGREP_CPP([eat flaming death], [#include <linux/version.h>
- #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < ]dnl
diff --git a/libs/glibc/glibc-2.17-sync-with-linux37.patch
b/libs/glibc/glibc-2.17-sync-with-linux37.patch
deleted file mode 100644
index 4b9a960..0000000
--- a/libs/glibc/glibc-2.17-sync-with-linux37.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
-index 06e8414..b62a696 100644
---- a/sysdeps/gnu/netinet/tcp.h
-+++ b/sysdeps/gnu/netinet/tcp.h
-@@ -37,20 +37,29 @@
- /*
- * User-settable options (used with setsockopt).
- */
--#define TCP_NODELAY 1 /* Don't delay send to coalesce
packets */
--#define TCP_MAXSEG 2 /* Set maximum segment size */
--#define TCP_CORK 3 /* Control sending of partial frames */
--#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
--#define TCP_KEEPINTVL 5 /* Interval between keepalives */
--#define TCP_KEEPCNT 6 /* Number of keepalives before death */
--#define TCP_SYNCNT 7 /* Number of SYN retransmits */
--#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
--#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
--#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
--#define TCP_INFO 11 /* Information about this connection. */
--#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
--#define TCP_CONGESTION 13 /* Congestion control algorithm. */
--#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
-+#define TCP_NODELAY 1 /* Don't delay send to coalesce
packets */
-+#define TCP_MAXSEG 2 /* Set maximum segment size */
-+#define TCP_CORK 3 /* Control sending of partial frames */
-+#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
-+#define TCP_KEEPINTVL 5 /* Interval between keepalives */
-+#define TCP_KEEPCNT 6 /* Number of keepalives before death */
-+#define TCP_SYNCNT 7 /* Number of SYN retransmits */
-+#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state
*/
-+#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive
*/
-+#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
-+#define TCP_INFO 11 /* Information about this connection. */
-+#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
-+#define TCP_CONGESTION 13 /* Congestion control algorithm.
*/
-+#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
-+#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
-+#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin
streams*/
-+#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
-+#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout
*/
-+#define TCP_REPAIR 19 /* TCP sock is under repair right now */
-+#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
-+#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue.
*/
-+#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
-+#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
-
- #ifdef __USE_MISC
- # include <sys/types.h>
-@@ -173,7 +182,9 @@ enum
- # define TCPI_OPT_TIMESTAMPS 1
- # define TCPI_OPT_SACK 2
- # define TCPI_OPT_WSCALE 4
--# define TCPI_OPT_ECN 8
-+# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init
*/
-+# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with
ECT */
-+# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd
*/
-
- /* Values for tcpi_state. */
- enum tcp_ca_state
-@@ -241,6 +252,49 @@ struct tcp_md5sig
- u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
- };
-
-+/* For socket repair options. */
-+struct tcp_repair_opt
-+{
-+ u_int32_t opt_code;
-+ u_int32_t opt_val;
-+};
-+
-+/* Queue to repair, for TCP_REPAIR_QUEUE. */
-+enum
-+{
-+ TCP_NO_QUEUE,
-+ TCP_RECV_QUEUE,
-+ TCP_SEND_QUEUE,
-+ TCP_QUEUES_NR,
-+};
-+
-+/* For cookie transactions socket options. */
-+#define TCP_COOKIE_MIN 8 /* 64-bits */
-+#define TCP_COOKIE_MAX 16 /* 128-bits */
-+#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
-+
-+/* Flags for both getsockopt and setsockopt */
-+#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie
*/
-+#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
-+ * supercedes everything. */
-+
-+/* Flags for getsockopt */
-+#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
-+#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
-+
-+#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
-+#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0
(RFC3226) */
-+
-+struct tcp_cookie_transactions
-+{
-+ u_int16_t tcpct_flags;
-+ u_int8_t __tcpct_pad1;
-+ u_int8_t tcpct_cookie_desired;
-+ u_int16_t tcpct_s_data_desired;
-+ u_int16_t tcpct_used;
-+ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
-+};
-+
- #endif /* Misc. */
-
- #endif /* netinet/tcp.h */
-diff --git a/sysdeps/unix/sysv/linux/bits/socket.h
b/sysdeps/unix/sysv/linux/bits/socket.h
-index df8f167..eadd7d9 100644
---- a/sysdeps/unix/sysv/linux/bits/socket.h
-+++ b/sysdeps/unix/sysv/linux/bits/socket.h
-@@ -1,6 +1,5 @@
- /* System-specific socket constants and types. Linux version.
-- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
-- Free Software Foundation, Inc.
-+ Copyright (C) 1991-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -208,6 +207,8 @@ enum
- #define MSG_MORE MSG_MORE
- MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to
return.*/
- #define MSG_WAITFORONE MSG_WAITFORONE
-+ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
-+#define MSG_FASTOPEN MSG_FASTOPEN
-
- MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
- descriptor received through
diff --git a/libs/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
b/libs/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
new file mode 100644
index 0000000..91b0c9a
--- /dev/null
+++ b/libs/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
@@ -0,0 +1,71 @@
+From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh AT redhat.com>
+Date: Thu, 27 Feb 2014 21:29:16 +0530
+Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623)
+
+In 84ba214c, I removed some redundant sign computations and in the
+process, I incorrectly got rid of a temporary variable, thus passing
+the absolute value of the input to bsloww1. This caused #16623.
+
+This fix undoes the incorrect change.
+---
+ sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------
+ 3 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
+index 6105e9f..50109b8 100644
+--- a/sysdeps/ieee754/dbl-64/s_sin.c
++++ b/sysdeps/ieee754/dbl-64/s_sin.c
+@@ -447,19 +447,21 @@ __sin (double x)
+ }
+ else
+ {
++ double t;
+ if (a > 0)
+ {
+ m = 1;
++ t = a;
+ db = da;
+ }
+ else
+ {
+ m = 0;
+- a = -a;
++ t = -a;
+ db = -da;
+ }
+- u.x = big + a;
+- y = a - (u.x - big);
++ u.x = big + t;
++ y = t - (u.x - big);
+ res = do_sin (u, y, db, &cor);
+ cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ retval = ((res == res + cor) ? ((m) ? res : -res)
+@@ -671,19 +673,21 @@ __cos (double x)
+ }
+ else
+ {
++ double t;
+ if (a > 0)
+ {
+ m = 1;
++ t = a;
+ db = da;
+ }
+ else
+ {
+ m = 0;
+- a = -a;
++ t = -a;
+ db = -da;
+ }
+- u.x = big + a;
+- y = a - (u.x - big);
++ u.x = big + t;
++ y = t - (u.x - big);
+ res = do_sin (u, y, db, &cor);
+ cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
+ retval = ((res == res + cor) ? ((m) ? res : -res)
+--
+1.9.0
+
diff --git a/libs/glibc/glibc-2.19-xattr_header.patch
b/libs/glibc/glibc-2.19-xattr_header.patch
new file mode 100644
index 0000000..438626e
--- /dev/null
+++ b/libs/glibc/glibc-2.19-xattr_header.patch
@@ -0,0 +1,42 @@
+From: Serge Hallyn <serge.hallyn AT ubuntu.com>
+Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500)
+Subject: misc/sys/xattr.h: guard against linux uapi header inclusion
+X-Git-Url:
https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0
+
+misc/sys/xattr.h: guard against linux uapi header inclusion
+
+If the glibc xattr.h header is included after the uapi header,
+compilation fails due to an enum re-using a #define from the
+uapi header. Protect against this by guarding the define and
+enum inclusions against each other.
+
+(A corresponding kernel patch has been sent here:
+http://lkml.org/lkml/2014/3/7/331 )
+
+(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
+and https://sourceware.org/glibc/wiki/Synchronizing_Headers
+for more information.)
+
+Signed-off-by: Serge Hallyn <serge.hallyn AT ubuntu.com>
+---
+
+diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
+index 929cd87..796df90 100644
+--- a/misc/sys/xattr.h
++++ b/misc/sys/xattr.h
+@@ -26,6 +26,7 @@ __BEGIN_DECLS
+
+ /* The following constants should be used for the fifth parameter of
+ `*setxattr'. */
++#ifndef __USE_KERNEL_XATTR_DEFS
+ enum
+ {
+ XATTR_CREATE = 1, /* set value, fail if attr already exists. */
+@@ -33,6 +34,7 @@ enum
+ XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
+ #define XATTR_REPLACE XATTR_REPLACE
+ };
++#endif
+
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+ is SIZE bytes long). Return 0 on success, -1 for errors. */
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
index 95a2b71..6b34a7e 100644
Binary files a/libs/glibc/glibc.gpg and b/libs/glibc/glibc.gpg differ
diff --git a/libs/google-perftools/DEPENDS b/libs/google-perftools/DEPENDS
index 968d179..3d40085 100755
--- a/libs/google-perftools/DEPENDS
+++ b/libs/google-perftools/DEPENDS
@@ -3,7 +3,7 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] ; then
else
optional_depends libunwind \
"" "" \
- "Use libunwind instead of relying on the frame pointer?"
+ "to use libunwind instead of relying on the frame
pointer"
fi &&

depends -sub CXX gcc &&
diff --git a/libs/google-perftools/DETAILS b/libs/google-perftools/DETAILS
index 469c33d..a630b84 100755
--- a/libs/google-perftools/DETAILS
+++ b/libs/google-perftools/DETAILS
@@ -1,11 +1,12 @@
SPELL=google-perftools
- VERSION=1.7
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://google-perftools.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:610b7c93d21266ffa62858a754d7f1dcd8a5612114f3cf1a32456d9c838f08d5bb984ccdb98e9cd5037f4a232879b96b0430dc7e372d7e47d165a990d0c13e82
+ SPELLX=gperftools
+ VERSION=2.1
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ SOURCE_URL[0]=http://gperftools.googlecode.com/files/$SOURCE
+
SOURCE_HASH=sha512:b5e3387fa4865fc1dd91c60311335aec18c76519ee5016278a3b114e117ba8936772321f7a18c003e54a641a19c249e20916347e44a67ded76d7a9f04230fd03
LICENSE[0]=BSD
- WEB_SITE=http://code.google.com/p/google-perftools/
+ WEB_SITE=http://code.google.com/p/gperftools/
KEYWORDS="libs"
ENTERED=20070627
SHORT='Robust performance tools from Google'
diff --git a/libs/google-perftools/HISTORY b/libs/google-perftools/HISTORY
index a1e5468..e873018 100644
--- a/libs/google-perftools/HISTORY
+++ b/libs/google-perftools/HISTORY
@@ -1,9 +1,14 @@
+2014-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1; renewed website, source url; quoting
+ paths
+ * DEPENDS: cleaned up
+
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)

2011-05-11 David Kowis <dkowis AT shlrm.org>
- * DETAILS: version to 1.7
+ * DETAILS: version to 1.7

2009-04-21 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DEPENDS: requires libunwind in x86_64, optionally depends on it on
diff --git a/libs/gsl/DETAILS b/libs/gsl/DETAILS
index 79c37bb..48286b8 100755
--- a/libs/gsl/DETAILS
+++ b/libs/gsl/DETAILS
@@ -1,5 +1,5 @@
SPELL=gsl
- VERSION=1.15
+ VERSION=1.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/gsl/HISTORY b/libs/gsl/HISTORY
index 82d4060..3d5b25d 100644
--- a/libs/gsl/HISTORY
+++ b/libs/gsl/HISTORY
@@ -1,3 +1,6 @@
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.16
+
2011-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15

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/isl/DETAILS b/libs/isl/DETAILS
new file mode 100755
index 0000000..c546aff
--- /dev/null
+++ b/libs/isl/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=isl
+ VERSION=0.13
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=http://${SPELL}.gforge.inria.fr/${SOURCE}
+
SOURCE_HASH=sha512:08cbcefc671be7754ec8ab17695d960bc2340df06d8c16143530f24b38dc1d0bc1ed095ba4f8c1c61d99739224ce2d8b07a648953026fef5bdd4f390d6fe3b43
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://isl.gforge.inria.fr/";
+ LICENSE[0]="MIT"
+ ENTERED=20140917
+ KEYWORDS=""
+ SHORT="Integer Set Library"
+cat << EOF
+isl is a library for manipulating sets and relations of integer points
bounded
+by linear constraints. Supported operations on sets include intersection,
+union, set difference, emptiness check, convex hull, (integer) affine hull,
+integer projection, computing the lexicographic minimum using parametric
+integer programming, coalescing and parametric vertex enumeration. It also
+includes an ILP solver based on generalized basis reduction, transitive
+closures on maps (which may encode infinite graphs), dependence analysis
+and bounds on piecewise step-polynomials. For more information see
+the project page, the online user manual (html) or the complete manual
+(pdf). For an introduction to the underlying concepts, see the first part
+of the presentation Integer sets and relations: from high-level modeling to
+low-level implementation . The barvinok package contains an iscc calculator
+that exposes some of the operations supported by isl.
+EOF
diff --git a/libs/isl/HISTORY b/libs/isl/HISTORY
new file mode 100644
index 0000000..5056b99
--- /dev/null
+++ b/libs/isl/HISTORY
@@ -0,0 +1,2 @@
+2014-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/libs/json-c/BUILD b/libs/json-c/BUILD
new file mode 100755
index 0000000..142f4fc
--- /dev/null
+++ b/libs/json-c/BUILD
@@ -0,0 +1,2 @@
+CFLAGS+=" -Wno-error" &&
+default_build
diff --git a/libs/json-c/DETAILS b/libs/json-c/DETAILS
index b7e24ce..4ef7871 100755
--- a/libs/json-c/DETAILS
+++ b/libs/json-c/DETAILS
@@ -1,6 +1,7 @@
SPELL=json-c
- VERSION=0.11
-
SOURCE_HASH=sha512:65ab563fe908d585ba05fff3b77283050ec4f94114ff6e4b916557013d75498271cf65b2660a0aaf74b23beaa80385c80d37ab6a700ba967dd859fa779a81cb0
+ VERSION=0.12
+
SOURCE_HASH=sha512:c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://s3.amazonaws.com/json-c_releases/releases/$SOURCE
diff --git a/libs/json-c/HISTORY b/libs/json-c/HISTORY
index 3acd68d..3a610d5 100644
--- a/libs/json-c/HISTORY
+++ b/libs/json-c/HISTORY
@@ -1,3 +1,9 @@
+2014-04-18 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 0.12
+ SECURITY_PATCH=1
+ fixes CVE-2013-6371 & CVE-2013-637
+ * BUILD: added, to suppress errors
+
2013-10-17 Treeve Jelbert <treeve AT souremage.org>
* DETAILS: version 0.11
new SOURCE_URL & WEB_SITE
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index ce0aff0..6c552da 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -1,8 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends make &&
depends libtool &&
-depends openssl &&
+depends SSL &&
+
+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 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" &&
@@ -16,4 +23,9 @@ if is_depends_enabled $SPELL swig; then
config_query_option LDNS_OPTS "Install ldnsx Python module?" y \
"--with-pyldnsx" \
"--without-pyldnsx"
-fi
+fi &&
+
+optional_depends perl \
+ "--with-p5-dns-ldns" \
+ "--without-p5-dns-ldns" \
+ "to generate DNS::LDNS Perl bindings"
diff --git a/libs/ldns/DETAILS b/libs/ldns/DETAILS
index af3114d..d39fe25 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,16 +1,15 @@
SPELL=ldns
- VERSION=1.6.16
+ VERSION=1.6.17
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/ldns/$SOURCE
-
SOURCE_HASH=sha512:ae32abf4fc146b4f8efb7d7751b09f629d28cbcb39d9493e5c00198b862d16274bc1bf6ac68c4fe35f177184bfe71bf68e1e6461c0fe6b6d57855549b08a4515
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
LICENSE[0]=MIT
WEB_SITE=http://www.nlnetlabs.nl/projects/ldns/
GATHER_DOCS=off
ENTERED=20060126
KEYWORDS="dns libs"
- SHORT="ldns is a DNS programming library"
-
+ SHORT="DNS programming library"
cat << EOF
ldns is a library to simplify (experimental) DNS programming,
also included is the first tool to make use of this library
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index a4d2c03..8a4b125 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,11 @@
+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
+ optional dependency
+
2012-11-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.16

diff --git a/libs/libcap/BUILD b/libs/libcap/BUILD
index d3d44c3..8f58e6d 100755
--- a/libs/libcap/BUILD
+++ b/libs/libcap/BUILD
@@ -1,6 +1 @@
-# fails to compile on non amd64 with PIC, bug #9087
-disable_pic &&
-
-# -I added (bug #14583)
-# -L added (bug #14660)
-make PAM_CAP=$LIBCAP_PAM CFLAGS="$CFLAGS -I$SOURCE_DIRECTORY/libcap/include
-L$SOURCE_DIRECTORY/libcap"
+make
diff --git a/libs/libcap/DETAILS b/libs/libcap/DETAILS
index 33ba854..f3ef180 100755
--- a/libs/libcap/DETAILS
+++ b/libs/libcap/DETAILS
@@ -1,12 +1,13 @@
SPELL=libcap
- VERSION=2.22
+ VERSION=2.24
+
SOURCE_HASH=sha512:c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b
PATCHLEVEL=0
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sign
+ SOURCE=$SPELL-$VERSION.tar.xz
+# SOURCE2=$SOURCE.sign

SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+# SOURCE2_URL[0]=$SOURCE_URL.sign
+# SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://sites.google.com/site/fullycapable/
diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index d341d3d..d423225 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,9 @@
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.24
+ * PRE_BUILD, INSTALL, *.patch: deleted
+ * BUILD: simplify
+ builds & installs without PAM on amd64, linux 3.14.0
+
2011-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.22

diff --git a/libs/libcap/INSTALL b/libs/libcap/INSTALL
deleted file mode 100755
index ba6384a..0000000
--- a/libs/libcap/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-prefix="$INSTALL_ROOT/usr" \
-make \
- exec_prefix="$INSTALL_ROOT" \
- inc_prefix="$INSTALL_ROOT/usr" \
- PAM_CAP=$LIBCAP_PAM \
- install
diff --git a/libs/libcap/PRE_BUILD b/libs/libcap/PRE_BUILD
deleted file mode 100755
index 7143ba1..0000000
--- a/libs/libcap/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/types.patch" &&
-
-# note that, yes indeed, they typo'd the extra S
-sed -i "s:^COPTFLAGS=.*:COPTFLAG=${CFLAGS}:; \
- s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" Make.Rules &&
-
-# there's no indent for gperf..
-sed -i "s:\$(INDENT)::" libcap/Makefile &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
diff --git
a/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
b/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
deleted file mode 100644
index 1bc4d63..0000000
--- a/libs/libcap/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f2020ee4ee4b2f245637c77e81d62ab6d1db3c6c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier AT gentoo.org>
-Date: Tue, 25 Jan 2011 15:52:31 -0500
-Subject: [PATCH] ignore RAISE_SETFCAP install failures
-
-While the new RAISE_SETFCAP feature is nifty, its failure to run (often
-due to the fs not supporting it) shouldn't impair the default install.
-
-Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
----
- progs/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/progs/Makefile b/progs/Makefile
-index c261f57..9e1a84d 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -30,7 +30,7 @@ install: all
- install -m 0755 $$p $(SBINDIR) ; \
- done
- ifeq ($(RAISE_SETFCAP),yes)
-- $(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
-+ -$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap
- endif
-
- clean:
---
-1.7.4.rc2
-
diff --git a/libs/libcap/types.patch b/libs/libcap/types.patch
deleted file mode 100644
index 63d5849..0000000
--- a/libs/libcap/types.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- progs/capsh.c.orig 2008-10-25 07:28:47.000000000 +0400
-+++ progs/capsh.c 2009-03-25 11:51:13.228249448 +0300
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <asm/types.h>
- #include <sys/prctl.h>
- #include <sys/capability.h>
- #include <unistd.h>
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/libconfig/DEPENDS b/libs/libconfig/DEPENDS
new file mode 100755
index 0000000..cf20e51
--- /dev/null
+++ b/libs/libconfig/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub CXX gcc
+
diff --git a/libs/libconfig/HISTORY b/libs/libconfig/HISTORY
index a2d4b8c..c74b1b4 100644
--- a/libs/libconfig/HISTORY
+++ b/libs/libconfig/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: C++
+
2013-02-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.4.9

diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index c160d7f..7ce40ce 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -1,5 +1,7 @@
if [[ $LIBDRM_NV == y ]]; then
- OPTS="--enable-nouveau-experimental-api $OPTS"
+ OPTS="--enable-nouveau $OPTS"
+else
+ OPTS="--disable-nouveau $OPTS"
fi &&
if [[ $LIBDRM_INTEL == n ]]; then
OPTS="--disable-intel $OPTS"
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 639a9da..dae4c86 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -1,18 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libdrm
if [[ $LIBDRM_BRANCH == scm ]]; then
- if [[ $LIBDRM_AUTOUPDATE == y ]]; then
- VERSION="$(date +%Y%m%d)"
- else
- VERSION=git
- fi
+ VERSION="$(get_scm_version)"
SOURCE=drm-git.tar.bz2 # Use the same source as drm
SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/drm:drm-git
SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.45
-
SOURCE_HASH=sha512:459540071398c85f107e6fd3e8696fae1d6bd17677392ef3e48df3ee0ceded735d4ffbf3fa485d4db532b5ec97be150d4c250118dfdf5be758ffa4e0cd457c1b
+ VERSION=2.4.58
+
SOURCE_HASH=sha512:26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index a3d247c..af87b24 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,6 +1,49 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2014-09-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.58
+
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: support NV and NOUVEAU, both in field
+ use:-/
+
+2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.56
+
+2014-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.55
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.54
+
+2014-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.53
+
+2014-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.51
+
+2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.50
+
+2013-11-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.49
+
+2013-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.48
+
+2013-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.47
+
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

+2013-07-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.4.46
+
+2013-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix nouveau
+
2013-05-30 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: 2.4.45

diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
index b8aa194..10c89b6 100755
--- a/libs/libdrm/PRE_SUB_DEPENDS
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
+ NV|NOUVEAU) [[ "$LIBDRM_NV" == "y" ]] && return 0 ;;
INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
RADEON) [[ "$LIBDRM_RADEON" == "y" ]] && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
index f0d0d9e..5db50df 100755
--- a/libs/libdrm/SUB_DEPENDS
+++ b/libs/libdrm/SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- NV) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
+ NV|NOUVEAU) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Nouveau KMS API${DEFAULT_COLOR}" &&
LIBDRM_NV='y'
;;
INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
diff --git a/libs/libdrm/libdrm-2.4.26.tar.bz2.sig
b/libs/libdrm/libdrm-2.4.26.tar.bz2.sig
deleted file mode 100644
index ba03db0..0000000
Binary files a/libs/libdrm/libdrm-2.4.26.tar.bz2.sig and /dev/null differ
diff --git a/libs/libedit/DETAILS b/libs/libedit/DETAILS
index 60a7c9d..ce219ad 100755
--- a/libs/libedit/DETAILS
+++ b/libs/libedit/DETAILS
@@ -1,6 +1,6 @@
SPELL=libedit
- VERSION=20110227-3.0
-
SOURCE_HASH=sha512:864e235d771ba32fb708d36fb6bd71f763895ddd3ec0d4d0fd8d1942d185f28d1da4fcc0827b77b032b65ea0ec7eac91264fdba1d4d77b6414c8a18218dedaba
+ VERSION=20140213-3.1
+
SOURCE_HASH=sha512:e4aa842c52cd750ea16acd41fed5b037c1455f33e19edaef4754d9d9eb833100c4a98dd874b197ffc09a8808dcee18348c86c7314a3df722d7b02a957d7d08e4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.thrysoee.dk/editline/
diff --git a/libs/libedit/HISTORY b/libs/libedit/HISTORY
index d3de745..399f745 100644
--- a/libs/libedit/HISTORY
+++ b/libs/libedit/HISTORY
@@ -1,3 +1,6 @@
+2014-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20140213-3.1
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

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/libevdev/DETAILS b/libs/libevdev/DETAILS
index dbd9726..607d447 100755
--- a/libs/libevdev/DETAILS
+++ b/libs/libevdev/DETAILS
@@ -1,6 +1,6 @@
SPELL=libevdev
- VERSION=1.0.1
-
SOURCE_HASH=sha512:4b66adf79f24c7700438dfc4bfeea10b9b17daebd5bcf6fa315cb8b02808ae065997b8b4801e37dd2db5b23827a351399ce64caef895603f0af03f9ab4f5d069
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:4a075168dabc9f934f8e129dfc754799a75fa43cc861d2fc5327613f7d1b23d49ff6a6188c7a51ba5c55a2d109d417a047d24e6eea5ba6da1b97851278d85452
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.freedesktop.org/wiki/Software/libevdev/
diff --git a/libs/libevdev/HISTORY b/libs/libevdev/HISTORY
index 1251664..b89f8d0 100644
--- a/libs/libevdev/HISTORY
+++ b/libs/libevdev/HISTORY
@@ -1,3 +1,12 @@
+2014-05-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.1
+
+2014-05-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2
+
+2014-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1
+
2014-03-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1

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/libfm/DEPENDS b/libs/libfm/DEPENDS
index 65bf748..4dfd017 100755
--- a/libs/libfm/DEPENDS
+++ b/libs/libfm/DEPENDS
@@ -3,21 +3,43 @@ depends cairo &&
depends dbus &&
depends dbus-glib &&
depends glib2 &&
-depends gtk+2 &&
depends libpng &&
depends menu-cache &&
depends pango &&
+depends fontconfig &&
+depends freetype2 &&
+depends gdk-pixbuf2 &&
+
+optional_depends gtk+3 \
+ "--with-gtk=3" \
+ "--with-gtk=2" \
+ "to use GTK+3 instead of GTK+2" &&
+
+if ! is_depends_enabled $SPELL gtk+3; then
+ depends gtk+2
+fi &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+optional_depends vala \
+ "--enable-actions" \
+ "--disable-actions" \
+ "for custom actions in context menu" &&
+
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc --disable-gtk-doc-html' \
'build documentation?' &&
-optional_depends udisks "--enable-udisks" "--disable-udisks" \
- "build libfm with udisks support" &&

-optional_depends libexif \
- "--enable-exif" \
- "--disable-exif" \
- "for faster thumbnails" &&
-depends fontconfig &&
-depends freetype2 &&
-depends gdk-pixbuf2
+optional_depends udisks \
+ "--enable-udisks" \
+ "--disable-udisks" \
+ "build libfm with udisks support" &&
+
+optional_depends libexif \
+ "--enable-exif" \
+ "--disable-exif" \
+ "for faster thumbnails"
diff --git a/libs/libfm/DETAILS b/libs/libfm/DETAILS
index 356e4a9..683f705 100755
--- a/libs/libfm/DETAILS
+++ b/libs/libfm/DETAILS
@@ -1,9 +1,10 @@
SPELL=libfm
- VERSION=1.2.0
+ VERSION=1.2.1
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/${SPELL}%20%28required%20by%20PCManFM%29/${SOURCE}
-
SOURCE_HASH=sha512:a62d3b8a26bf52c058f49e9b5328409f32189c708c0de8f419e7946e0be19f2d5dad604a214381b98bf1b26a81e85f60bced8b29b40bbfeb7e1c0aee4d1e36f2
+
SOURCE_HASH=sha512:358f9e468cf7eed90acbe9d2ccf755b6974b2c70049e9c843d61cb648c9b8012d1175fe78a12b0f19ab139f3c926dce49214e9ce0e4b0ffe075853dcaa895ee0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOC_DIRS=""
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
ENTERED=20101126
diff --git a/libs/libfm/HISTORY b/libs/libfm/HISTORY
index b8be1b4..57a992e 100644
--- a/libs/libfm/HISTORY
+++ b/libs/libfm/HISTORY
@@ -1,3 +1,7 @@
+2014-07-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.1; don't do useless doc'ing
+ * DEPENDS: added missing optional dependencies
+
2014-02-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0, gz -> xz

diff --git a/libs/libfreenect/DETAILS b/libs/libfreenect/DETAILS
index 8109f7f..8fabd52 100755
--- a/libs/libfreenect/DETAILS
+++ b/libs/libfreenect/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libfreenect
-if [[ "$LIBFREENECT_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
- SOURCE_URL[0]=git://github.com/OpenKinect/libfreenect.git:libfreenect-git
+
SOURCE_URL[0]=git://github.com/OpenKinect/libfreenect.git:libfreenect-git:"$LIBFREENECT_BRANCH"
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
WEB_SITE=http://openkinect.org/
diff --git a/libs/libfreenect/HISTORY b/libs/libfreenect/HISTORY
index ca586bf..cb8daa2 100644
--- a/libs/libfreenect/HISTORY
+++ b/libs/libfreenect/HISTORY
@@ -1,4 +1,10 @@
-2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/libs/libfreenect/PREPARE b/libs/libfreenect/PREPARE
index 32d8b00..347c0fd 100755
--- a/libs/libfreenect/PREPARE
+++ b/libs/libfreenect/PREPARE
@@ -1,4 +1,4 @@
-config_query LIBFREENECT_AUTOUPDATE "Queue for update on every system
update?" n &&
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch master unstable &&
config_query LIBFREENECT_PYTHON_WRAPPER "Do you want to build libfreenect
python wrapper?" n &&
-config_query LIBFREENECT_AUDIO "Do you want to enable audio?" n &&
-config_query_list LIBFREENECT_GIT_BRANCH "Which branch of libfreenect do you
want to build?" master unstable
+config_query LIBFREENECT_AUDIO "Do you want to enable audio?" n
diff --git a/libs/libfreenect/PRE_BUILD b/libs/libfreenect/PRE_BUILD
deleted file mode 100755
index ed29463..0000000
--- a/libs/libfreenect/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ "$LIBFREENECT_GIT_BRANCH" == "unstable" ]]; then
- message "${MESSAGE_COLOR}git checkout unstable${DEFAULT_COLOR}" &&
- git checkout origin/unstable
-fi
diff --git a/libs/libgdiplus/DEPENDS b/libs/libgdiplus/DEPENDS
index ac2a8d1..cf10f45 100755
--- a/libs/libgdiplus/DEPENDS
+++ b/libs/libgdiplus/DEPENDS
@@ -1,7 +1,7 @@
depends glib2 &&
depends cairo '--with-cairo=system' &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--with-libgif" \
"--without-libgif" \
"Enable GIF support" &&
diff --git a/libs/libgdiplus/HISTORY b/libs/libgdiplus/HISTORY
index 409f912..45161f7 100644
--- a/libs/libgdiplus/HISTORY
+++ b/libs/libgdiplus/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2011-02-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10

diff --git a/libs/libiptcdata/DETAILS b/libs/libiptcdata/DETAILS
index 5685756..4498a0d 100755
--- a/libs/libiptcdata/DETAILS
+++ b/libs/libiptcdata/DETAILS
@@ -1,7 +1,7 @@
SPELL=libiptcdata
VERSION=1.0.4
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]="${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
diff --git a/libs/libiptcdata/HISTORY b/libs/libiptcdata/HISTORY
index cdbacbb..8d6d944 100644
--- a/libs/libiptcdata/HISTORY
+++ b/libs/libiptcdata/HISTORY
@@ -1,3 +1,6 @@
+2014-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
2010-07-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.4

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/libnfc/DETAILS b/libs/libnfc/DETAILS
index 9344fca..c9eadbc 100755
--- a/libs/libnfc/DETAILS
+++ b/libs/libnfc/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=libnfc
if [[ "$LIBNFC_BRANCH" == "scm" ]]; then
- if [[ "$LIBNFC_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
diff --git a/libs/libnfc/HISTORY b/libs/libnfc/HISTORY
index a65dcb5..d046795 100644
--- a/libs/libnfc/HISTORY
+++ b/libs/libnfc/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

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/libodfgen/DEPENDS b/libs/libodfgen/DEPENDS
new file mode 100755
index 0000000..0948deb
--- /dev/null
+++ b/libs/libodfgen/DEPENDS
@@ -0,0 +1,6 @@
+depends -sub CXX gcc &&
+depends boost &&
+depends zlib &&
+depends pkgconfig &&
+depends librevenge &&
+optional_depends doxygen '' '--without-docs' 'build documentation'
diff --git a/libs/libodfgen/DETAILS b/libs/libodfgen/DETAILS
new file mode 100755
index 0000000..58ae8a3
--- /dev/null
+++ b/libs/libodfgen/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=libodfgen
+ VERSION=0.1.1
+
SOURCE_HASH=sha512:887180ef93f82635b1df26bf25a090d0a21c44d03f8a1268ceb877561bf4d7c14e1f14681e8994aff87a4993b9ca81aa83439ee29306d34a75423826a9582af4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://dev-www.libreoffice.org/src/${SPELL}-${VERSION}.tar.bz2
+ LICENSE[0]=MPL
+ WEB_SITE=http://sf.net/p/libwpd/libodfgen
+ ENTERED=20140215
+ SHORT="Library for generating documents in Open Document Format"
+cat << EOF
+libodfgen is a library for generating documents in Open
+Document Format (ODF). It provides generator implementation for the
+following libraries:
+* libwpd (::WPXDocumentInterface): text documents
+* libwpg (libwpg::WPGPaintInterface): vector drawings
+* libetonyek (libetonyek::KEYPresentationInterface): presentations
+As these APIs are used by multiple libraries, libodfgen can be used to
+generate ODF from many sources.
+EOF
diff --git a/libs/libodfgen/HISTORY b/libs/libodfgen/HISTORY
new file mode 100644
index 0000000..6f979fe
--- /dev/null
+++ b/libs/libodfgen/HISTORY
@@ -0,0 +1,7 @@
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.1
+ * DEPENDS: add librevenge, pkgconfig, doxygen
+ remove libwpd, libwpg, etonyek
+
+2014-02-15 Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ * DETAILS: Initial spell
diff --git a/libs/libofx/DEPENDS b/libs/libofx/DEPENDS
index b2a2e17..70d3bdc 100755
--- a/libs/libofx/DEPENDS
+++ b/libs/libofx/DEPENDS
@@ -1,8 +1,18 @@
depends -sub CXX gcc &&
-depends curl &&
depends opensp &&
-depends openssl &&
depends libtool &&
-optional_depends pkgconfig '' '' 'package detection' &&
-optional_depends doxygen '' '' 'build documentation' &&
-optional_depends libxml++ '' '' 'build ofxconnect examples'
+depends pkgconfig &&
+
+optional_depends doxygen \
+ "--enable-doxygen" \
+ "--disable-doxygen" \
+ "to build documentation" &&
+
+optional_depends curl \
+ "--with-libcurl" \
+ "--without-libcurl" \
+ "to build ofxconnect examples (${MESSAGE_COLOR}also
requires libxml++${DEFAULT_COLOR})" &&
+
+if is_depends_enabled $SPELL curl; then
+ depends libxml++
+fi
diff --git a/libs/libofx/HISTORY b/libs/libofx/HISTORY
index ec9fd9f..99a6705 100644
--- a/libs/libofx/HISTORY
+++ b/libs/libofx/HISTORY
@@ -1,3 +1,6 @@
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: renewed dependency-list & flags
+
2014-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.9

diff --git a/libs/libquvi-scripts/HISTORY b/libs/libquvi-scripts/HISTORY
index f205bba..86b77e7 100644
--- a/libs/libquvi-scripts/HISTORY
+++ b/libs/libquvi-scripts/HISTORY
@@ -1,5 +1,5 @@
2014-03-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 0.4.2
+ * DETAILS: version 0.4.21

2013-11-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.4.20
diff --git a/libs/librevenge/DEPENDS b/libs/librevenge/DEPENDS
new file mode 100755
index 0000000..d254060
--- /dev/null
+++ b/libs/librevenge/DEPENDS
@@ -0,0 +1,6 @@
+depends -sub CXX gcc &&
+depends boost &&
+depends zlib &&
+depends pkgconfig &&
+optional_depends doxygen '' '--without-docs' 'build documentation' &&
+optional_depends cppunit '' '--disable-tests' 'build tests'
diff --git a/libs/librevenge/DETAILS b/libs/librevenge/DETAILS
new file mode 100755
index 0000000..546c644
--- /dev/null
+++ b/libs/librevenge/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=librevenge
+ VERSION=0.0.1
+
SOURCE_HASH=sha512:a11f2bba3cba4df921c577fc5ab5f3964483c017bf6db4f34ce5dc18181904a9006d7eaba3c41ecef9908d511cf3ce972f839a004061272ed4380620398acb15
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://dev-www.libreoffice.org/src/${SPELL}-${VERSION}.tar.bz2
+ LICENSE[0]=MPL
+ WEB_SITE=http://sf.net/p/libwpd/librevenge
+ ENTERED=20140629
+ SHORT="WordPerfect Document importer"
+cat << EOF
+WordPerfect Document importer
+EOF
diff --git a/libs/librevenge/HISTORY b/libs/librevenge/HISTORY
new file mode 100644
index 0000000..094b3e1
--- /dev/null
+++ b/libs/librevenge/HISTORY
@@ -0,0 +1,3 @@
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.0.1
+ spell created
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index 7803222..035faae 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtasn1
- VERSION=3.4
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index 6d6777a..9477d4e 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,4 +1,10 @@
-2013-12-17Treeve Jelbert <treeve AT sourcemage.org>
+2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0
+
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.6
+
+2013-12-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4

2012-12-29 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/libs/libtcod/0001-fix-installation-destination.patch
b/libs/libtcod/0001-fix-installation-destination.patch
new file mode 100644
index 0000000..9b125a0
--- /dev/null
+++ b/libs/libtcod/0001-fix-installation-destination.patch
@@ -0,0 +1,39 @@
+From 28f7c93390c97a7af648d643fc96d344eeb0252a Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 7 Apr 2014 19:19:39 +0200
+Subject: [PATCH] fix installation destination
+
+---
+ CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a573528..5dea975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(include)
+ find_package(OpenGL REQUIRED)
+
+ SET(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+-SET(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR})
++SET(INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+ SET(DEPENDENCY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dependencies)
+ SET(GUI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/gui)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c882ded..14bb952 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -85,6 +85,6 @@ ENDIF()
+
+ #${LIBTCOD_CPP_NAME} is empty on non-linux platforms
+ INSTALL(TARGETS ${LIBTCOD_NAME} ${LIBTCOD_GUI_NAME} ${LIBTCOD_CPP_NAME}
+- RUNTIME DESTINATION ${INSTALL_DIR}
+- LIBRARY DESTINATION ${INSTALL_DIR}
++ RUNTIME DESTINATION ${INSTALL_DIR}/bin
++ LIBRARY DESTINATION ${INSTALL_DIR}/lib
+ )
+--
+1.9.0
+
diff --git a/libs/libtcod/BUILD b/libs/libtcod/BUILD
new file mode 100755
index 0000000..2a137fa
--- /dev/null
+++ b/libs/libtcod/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" -DLIBTCOD_SAMPLES=off" &&
+cmake_build
diff --git a/libs/libtcod/DEPENDS b/libs/libtcod/DEPENDS
new file mode 100755
index 0000000..7c6f202
--- /dev/null
+++ b/libs/libtcod/DEPENDS
@@ -0,0 +1,2 @@
+depends sdl &&
+depends upx
diff --git a/libs/libtcod/DETAILS b/libs/libtcod/DETAILS
new file mode 100755
index 0000000..bbfcb10
--- /dev/null
+++ b/libs/libtcod/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libtcod
+ VERSION=1.5.1
+ VERSION_HASH="d56ffc19afb9"
+ SOURCE="libtcod-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=https://bitbucket.org/jice/${SPELL}/get/${VERSION}.tar.bz2
+
SOURCE_HASH=sha512:0db7196b01838b5301f46fff42b62aa42f4835e2647a5aca1b5ae55885f43d392bb7035c5af26be3d08ac439a7d55d18edb20b1ef5e7bd8eb1e0fd1428f88c69
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/jice-${SPELL}-${VERSION_HASH}"
+ WEB_SITE="http://doryen.eptalys.net/libtcod/";
+ LICENSE[0]=BSD
+ ENTERED=20140407
+ SHORT="a free, fast, portable and uncomplicated API for roguelike
games"
+cat << EOF
+libtcod, a.k.a. “The Doryen Library”, is a free, fast, portable and
+uncomplicated API for roguelike developpers providing an advanced true color
+console, input, and lots of other utilities frequently used in roguelikes.
+EOF
diff --git a/libs/libtcod/HISTORY b/libs/libtcod/HISTORY
new file mode 100644
index 0000000..4cc134f
--- /dev/null
+++ b/libs/libtcod/HISTORY
@@ -0,0 +1,4 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-installation-destination.patch, BUILD, DEPENDS,
+ DETAILS, PRE_BUILD, INSTALL: spell created
+
diff --git a/libs/libtcod/INSTALL b/libs/libtcod/INSTALL
new file mode 100755
index 0000000..fd9a1b9
--- /dev/null
+++ b/libs/libtcod/INSTALL
@@ -0,0 +1,7 @@
+default_install &&
+
+mkdir -p ${INSTALL_ROOT}/usr/include/tcod &&
+install -m644 $SOURCE_DIRECTORY/include/*.{h,hpp}
${INSTALL_ROOT}/usr/include/tcod &&
+
+mkdir -p ${INSTALL_ROOT}/usr/share/libtcod &&
+install -m644 $SOURCE_DIRECTORY/terminal.png $INSTALL_ROOT/usr/share/libtcod/
diff --git a/libs/libtcod/PRE_BUILD b/libs/libtcod/PRE_BUILD
new file mode 100755
index 0000000..e803469
--- /dev/null
+++ b/libs/libtcod/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/0001-fix-installation-destination.patch
diff --git a/libs/libtirpc/DETAILS b/libs/libtirpc/DETAILS
index 0193fc3..ac53e9d 100755
--- a/libs/libtirpc/DETAILS
+++ b/libs/libtirpc/DETAILS
@@ -1,6 +1,6 @@
SPELL=libtirpc
- VERSION=0.2.3
-
SOURCE_HASH=sha512:dd480fcb6feda4a2bba7e5a5dc9b1f523697a39ddaa44a5742405f66d202996d99a562a31dbf6daf06e9b7ce5d82dfd1cce7b76a34466b92f84176e77498163d
+ VERSION=0.2.5
+
SOURCE_HASH=sha512:9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]="${SOURCEFORGE_URL}/libtirpc/libtirpc/${VERSION}/${SOURCE}"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/libs/libtirpc/HISTORY b/libs/libtirpc/HISTORY
index 96c6964..1b4a7fb 100644
--- a/libs/libtirpc/HISTORY
+++ b/libs/libtirpc/HISTORY
@@ -1,3 +1,6 @@
+2014-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.5
+
2013-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix SOURCE_URL[0]

diff --git a/libs/libunistring/DETAILS b/libs/libunistring/DETAILS
index 8f2cbc9..38b2831 100755
--- a/libs/libunistring/DETAILS
+++ b/libs/libunistring/DETAILS
@@ -1,6 +1,6 @@
SPELL=libunistring
- VERSION=0.9.3
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.9.4
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/libs/libunistring/HISTORY b/libs/libunistring/HISTORY
index dec7a35..8c422de 100644
--- a/libs/libunistring/HISTORY
+++ b/libs/libunistring/HISTORY
@@ -1,2 +1,5 @@
+2014-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.4
+
2011-09-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: spell created, version 0.9.3
diff --git a/libs/libusb/DEPENDS b/libs/libusb/DEPENDS
index 864c31e..901a4da 100755
--- a/libs/libusb/DEPENDS
+++ b/libs/libusb/DEPENDS
@@ -10,7 +10,7 @@ optional_depends doxygen \
"" \
"Build C++ API documentation" &&

-optional_depends udev \
+optional_depends UDEV \
"--enable-udev" \
"--disable-udev" \
"udev support"
diff --git a/libs/libusb/DETAILS b/libs/libusb/DETAILS
index c8c2805..49a71bb 100755
--- a/libs/libusb/DETAILS
+++ b/libs/libusb/DETAILS
@@ -1,6 +1,6 @@
SPELL=libusb
- VERSION=1.0.18
-
SOURCE_HASH=sha512:bbc3d75cb91f4e6a024549c2bac38ee85aeda8529a4553fd36bc8e8a5c223cd89eb952eda71fcc0071d6c6c818a0631d4cca084fed69d4986eee5dcf9a87d662
+ VERSION=1.0.19
+
SOURCE_HASH=sha512:f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 854c8fe..90158f1 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,9 @@
+2014-0615 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.19
+
+2014-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on UDEV instead of udev
+
2014-02-27 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: optional dependency on udev

diff --git a/libs/libva/DEPENDS b/libs/libva/DEPENDS
index 0da5b3c..8c4df59 100755
--- a/libs/libva/DEPENDS
+++ b/libs/libva/DEPENDS
@@ -1,3 +1,3 @@
-depends mesalib &&
+depends MESALIB &&
depends libdrm &&
depends libxfixes
diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index 0716b9f..a19724a 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-10-07 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS, DEPENDS: spell created

diff --git a/libs/libvdpau/DETAILS b/libs/libvdpau/DETAILS
index 8ea43cf..6a616e5 100755
--- a/libs/libvdpau/DETAILS
+++ b/libs/libvdpau/DETAILS
@@ -1,7 +1,7 @@
SPELL=libvdpau
- VERSION=0.7
-
SOURCE_HASH=sha512:c0ebb124956372a59eaa7e5c9330b6d4f32acd924aa620c4c037f3917623860887231b9b9f4c0a375a300c82a3e0b7284afbe9139d8562f6a74a85848d362286
- SOURCE="${SPELL}-${VERSION}.tar.gz"
+ VERSION=0.8
+
SOURCE_HASH=sha512:8e851e88225ada3d44dedf423ee8b1d89b59008f3ed4b52e6bf9f9f9e31b2f02e0a907b9b8d9d22e2ef84eddb5d2453e00465c9985bdd33654467dcc922d0d00
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://people.freedesktop.org/~aplattner/vdpau/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

WEB_SITE="http://http.download.nvidia.com/XFree86/vdpau/doxygen/html/";
diff --git a/libs/libvdpau/HISTORY b/libs/libvdpau/HISTORY
index 6b7e346..0e5d733 100644
--- a/libs/libvdpau/HISTORY
+++ b/libs/libvdpau/HISTORY
@@ -1,3 +1,6 @@
+2014-07-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8
+
2013-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7

diff --git a/libs/libverto/DETAILS b/libs/libverto/DETAILS
index ab6e197..4945983 100755
--- a/libs/libverto/DETAILS
+++ b/libs/libverto/DETAILS
@@ -1,6 +1,6 @@
SPELL=libverto
- VERSION=0.2.5
-
SOURCE_HASH=sha512:d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
+ VERSION=0.2.6
+
SOURCE_HASH=sha512:aa8d047501d28741f2f8185fc4a0ef6dc4b99dbe69b583c40cd4c0afc97db4dd0a928d9ec23861fff61651e9ac82e52da9473b8e62ccc11a91e5e5c6b41dfd3b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://fedorahosted.org/releases/l/i/libverto/$SOURCE
diff --git a/libs/libverto/HISTORY b/libs/libverto/HISTORY
index fcc571f..e565580 100644
--- a/libs/libverto/HISTORY
+++ b/libs/libverto/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.6
+
2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.5

diff --git a/libs/libwpd/DEPENDS b/libs/libwpd/DEPENDS
index f148724..a112c92 100755
--- a/libs/libwpd/DEPENDS
+++ b/libs/libwpd/DEPENDS
@@ -1 +1,4 @@
-depends -sub CXX gcc
+depends -sub CXX gcc &&
+depends librevenge &&
+depends zlib &&
+optional_depends doxygen '' '--without-docs' 'build documentation'
diff --git a/libs/libwpd/DETAILS b/libs/libwpd/DETAILS
index 8066e44..35a301a 100755
--- a/libs/libwpd/DETAILS
+++ b/libs/libwpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=libwpd
- VERSION=0.9.4
+ VERSION=0.10.0
+
SOURCE_HASH=sha512:fb3c069691e2c5caaa8181147824261a232fddc21ab825f3084b64354c8593efac023e4db9515163c975b400c661997ebf59d6137b960a5a5b86efeab0e0f254
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://libwpd.sourceforge.net/index.html
ENTERED=20071006
diff --git a/libs/libwpd/HISTORY b/libs/libwpd/HISTORY
index d5a250f..fb8d608 100644
--- a/libs/libwpd/HISTORY
+++ b/libs/libwpd/HISTORY
@@ -1,3 +1,8 @@
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.0
+ new url, libreoffice.org
+ * DEPENDS: add librevenge, doxygen,zlib
+
2012-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.4

diff --git a/libs/libwpd/libwpd-0.9.4.tar.bz2.sig
b/libs/libwpd/libwpd-0.9.4.tar.bz2.sig
deleted file mode 100644
index 0585074..0000000
Binary files a/libs/libwpd/libwpd-0.9.4.tar.bz2.sig and /dev/null differ
diff --git a/libs/libwpg/DEPENDS b/libs/libwpg/DEPENDS
index 2e2f3be..e9eb7e5 100755
--- a/libs/libwpg/DEPENDS
+++ b/libs/libwpg/DEPENDS
@@ -1,2 +1,5 @@
-depends -sub CXX gcc &&
-depends libwpd
+depends -sub CXX gcc &&
+depends pkgconfig &&
+depends libwpd &&
+depends librevenge &&
+optional_depends doxygen '' '--without-docs' 'build documentation'
diff --git a/libs/libwpg/DETAILS b/libs/libwpg/DETAILS
index 352b5fb..3a8ef3e 100755
--- a/libs/libwpg/DETAILS
+++ b/libs/libwpg/DETAILS
@@ -1,10 +1,10 @@
SPELL=libwpg
- VERSION=0.2.0
-
SOURCE_HASH=sha512:a78699d9a8e6817f4124d1782b8cb28254cf838a6533096a8855aaea06ee83f2a4b2eaac4e0ac49764e41419ed2cd7a16094d5a267f666c853729b980f368c6e
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.3.0
+
SOURCE_HASH=sha512:254b5d2ff3cfeb23a3a94d81e9fc44c4c78550bb25a822e2b0ae7bc7cfdcdc4db5742992d20087353d66c81df956b9837c329c950afd41e297bddd0e9d1f3aa8
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- LICENSE[0]=GPL
+ SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
+$SOURCEFORGE_URL/$SPELL/$SOURCE LICENSE[0]=GPL
WEB_SITE=http://libwpg.sourceforge.net/
ENTERED=20071006
KEYWORDS="libs wordperfect"
diff --git a/libs/libwpg/HISTORY b/libs/libwpg/HISTORY
index 5dc2ae6..3c11ff3 100644
--- a/libs/libwpg/HISTORY
+++ b/libs/libwpg/HISTORY
@@ -1,3 +1,8 @@
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.0
+ new url libreoffice.org
+ * DEPENDS: add librevenge, doxygen, pkgconfig
+
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/libs/libwps/DEPENDS b/libs/libwps/DEPENDS
index 2e2f3be..aaa03de 100755
--- a/libs/libwps/DEPENDS
+++ b/libs/libwps/DEPENDS
@@ -1,2 +1,4 @@
-depends -sub CXX gcc &&
-depends libwpd
+depends -sub CXX gcc &&
+depends librevenge &&
+depends boost &&
+optional_depends doxygen '' '--without-docs' 'build documentation'
diff --git a/libs/libwps/DETAILS b/libs/libwps/DETAILS
index 4bd04bc..a9c26e0 100755
--- a/libs/libwps/DETAILS
+++ b/libs/libwps/DETAILS
@@ -1,9 +1,9 @@
SPELL=libwps
- VERSION=0.2.7
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.3.0
+
SOURCE_HASH=sha512:c24bfc0f78fee739cc6ee14c4f7bbfa707892e059dfa5398651f43031c14161e245820cf9dc779dd86ff6628299ecf5b25af77b343e5a615302fe78670f521c9
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://libwps.sourceforge.net/
ENTERED=20071006
diff --git a/libs/libwps/HISTORY b/libs/libwps/HISTORY
index 05c9c86..d30a6b7 100644
--- a/libs/libwps/HISTORY
+++ b/libs/libwps/HISTORY
@@ -1,3 +1,8 @@
+2014-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.0
+ new url, libreoffice.org
+ * DEPENDS: add librevenge, boost, doxygen; delete libwpd
+
2012-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.7

diff --git a/libs/libwps/libwps-0.2.7.tar.gz.sig
b/libs/libwps/libwps-0.2.7.tar.gz.sig
deleted file mode 100644
index a246772..0000000
Binary files a/libs/libwps/libwps-0.2.7.tar.gz.sig and /dev/null differ
diff --git a/libs/libyaml/DETAILS b/libs/libyaml/DETAILS
index 0c91b31..1b77ec8 100755
--- a/libs/libyaml/DETAILS
+++ b/libs/libyaml/DETAILS
@@ -1,9 +1,9 @@
SPELL=libyaml
- VERSION=0.1.4
+ VERSION=0.1.6
+
SOURCE_HASH=sha512:eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44
SOURCE=yaml-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
-
SOURCE_HASH=sha512:5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784
WEB_SITE=http://pyyaml.org/wiki/LibYAML
ENTERED=20120417
LICENSE[0]=MIT
diff --git a/libs/libyaml/HISTORY b/libs/libyaml/HISTORY
index fc80446..753296f 100644
--- a/libs/libyaml/HISTORY
+++ b/libs/libyaml/HISTORY
@@ -1,3 +1,6 @@
+2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.6
+
2012-04-17 David Kowis<dkowis AT shlrm.org>
* DETAILS,HISTORY: created libyaml spell

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/ncurses/HISTORY b/libs/ncurses/HISTORY
index afd923a..e36c75d 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: create libtinfo symlink
+
2012-10-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: PATCHLEVEL=1
* BUILD: --enable-pc-files added
diff --git a/libs/ncurses/INSTALL b/libs/ncurses/INSTALL
index d77e07f..231bb29 100755
--- a/libs/ncurses/INSTALL
+++ b/libs/ncurses/INSTALL
@@ -101,4 +101,7 @@ else
done

fi &&
+
+ln -sf libcurses.so.${MVERSION} ${INSTALL_ROOT}/lib/libtinfo.so.${MVERSION}
&&
+
ldconfig
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/DETAILS b/libs/neon/DETAILS
index 63938c0..1a63d7f 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,6 +1,7 @@
SPELL=neon
VERSION=0.30.0
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -9,6 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.webdav.org/neon/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
LICENSE[0]=LGPL
+ DOC_DIRS=""
WEB_SITE=http://www.webdav.org/neon/
ENTERED=20020528
KEYWORDS="http libs"
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index d1a44ac..4bb4d8b 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/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-04-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1; don't duplicate manuals
+ * PRE_BUILD: added, to apply the patch
+ * spaces.patch: re-added, to fix urls and file names containing
spaces;
+ adapted to 0.30.0 version
+
2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.30.0
* PRE_BUILD, spaces.patch: deleted
diff --git a/libs/neon/PRE_BUILD b/libs/neon/PRE_BUILD
new file mode 100755
index 0000000..9c335ec
--- /dev/null
+++ b/libs/neon/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/spaces.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/neon/spaces.patch b/libs/neon/spaces.patch
new file mode 100644
index 0000000..fafeca8
--- /dev/null
+++ b/libs/neon/spaces.patch
@@ -0,0 +1,20 @@
+--- src/ne_uri.c.orig 2011-11-23 03:26:30.000000000 +0400
++++ src/ne_uri.c 2014-04-28 19:37:28.005947413 +0400
+@@ -96,7 +96,7 @@
+ /* 0xXX x0 x2 x4 x6 x8 xA xC xE */
+ /* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
+ /* 1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
+-/* 2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
++/* 2x */ AL, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
+ /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
+ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
+ /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
+@@ -475,7 +475,7 @@
+
+ /* CH must be an unsigned char; evaluates to 1 if CH should be
+ * percent-encoded (note !!x == x ? 1 : 0). */
+-#define path_escape_ch(ch) (!!(uri_lookup(ch) & URI_ESCAPE))
++#define path_escape_ch(ch) ((ch == ' ') | (!!(uri_lookup(ch) & URI_ESCAPE)))
+
+ char *ne_path_escape(const char *path)
+ {
diff --git a/libs/newt/DEPENDS b/libs/newt/DEPENDS
index 692a7f4..ca937ef 100755
--- a/libs/newt/DEPENDS
+++ b/libs/newt/DEPENDS
@@ -8,4 +8,4 @@ optional_depends tcl "--with-tcl" \
"--without-tcl" \
"tcl bindings" &&

-optional_depends python '' '' 'for Python bindings'
+optional_depends python '' '' 'for Python bindings (snack module)'
diff --git a/libs/newt/DETAILS b/libs/newt/DETAILS
index 9900765..5187acc 100755
--- a/libs/newt/DETAILS
+++ b/libs/newt/DETAILS
@@ -1,12 +1,12 @@
SPELL=newt
- VERSION=0.52.13
-
SOURCE_HASH=sha512:fb4066dc76f760edd1ce5bb215916f923337504b874029618193d5e526f35d638dffaf1774c5dfaa1b178579c008625bbead4088dcd58f2e5fac12311334eff9
+ VERSION=0.52.17
+
SOURCE_HASH=sha512:ff96180e4501af88609a647b7737e2309e04cf8c7f1e93bf338c1d133ca49fdd20acfc872f8a91d8546a4f1c7a7d2e540bf3d245ff85eaf85a0414cbc7702b41
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://fedorahosted.org/releases/n/e/${SPELL}/${SOURCE}
SOURCE_HINTS[0]=no-check-certificate
LICENSE[0]=LGPL
- WEB_SITE=http://www.redhat.com/
+ WEB_SITE=https://fedorahosted.org/newt/
ENTERED=20020316
KEYWORDS="libs"
SHORT="A development library for text mode user interfaces."
diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY
index 415d1e4..f0da943 100644
--- a/libs/newt/HISTORY
+++ b/libs/newt/HISTORY
@@ -1,3 +1,10 @@
+2014-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Update website
+ * DEPENDS: Clarify the python's module name
+
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.52.17
+
2011-08-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.52.13

diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 5e0eb13..1b1f995 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,6 +1,6 @@
SPELL=nspr
- VERSION=4.10.4
-
SOURCE_HASH=sha512:9aadd94473e840246b08b4377ac68ec8a1474997b7a08484993186843afdaca65157cf8797d8922f137d881a4df6fda66edc188ba579fdc6bba429571a701222
+ VERSION=4.10.6
+
SOURCE_HASH=sha512:a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index d427571..5f25fd1 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2014-06-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: 4.10.6
+
2014-03-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.4

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/openmpi/DEPENDS b/libs/openmpi/DEPENDS
index dfb67ea..8950203 100755
--- a/libs/openmpi/DEPENDS
+++ b/libs/openmpi/DEPENDS
@@ -1,6 +1,6 @@
depends -sub CXX gcc &&

optional_depends -sub FORTRAN gcc \
- '--enable-mpi-f77 --disable-mpi-f90' \
+ '--enable-mpi-f77 --enable-mpi-f90' \
'--disable-mpi-f77 --disable-mpi-f90' \
'Fortran support'
diff --git a/libs/openmpi/HISTORY b/libs/openmpi/HISTORY
index 6809791..7d32240 100644
--- a/libs/openmpi/HISTORY
+++ b/libs/openmpi/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: fix enabling for Fortran support
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.5

diff --git a/libs/openni-sensor/DETAILS b/libs/openni-sensor/DETAILS
index 43c88b6..e405072 100755
--- a/libs/openni-sensor/DETAILS
+++ b/libs/openni-sensor/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=openni-sensor
-if [[ "$OPENNI_SENSOR_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/PrimeSense/Sensor.git:openni-primesense-git
SOURCE_IGNORE=volatile
diff --git a/libs/openni-sensor/HISTORY b/libs/openni-sensor/HISTORY
index 09af20c..580c640 100644
--- a/libs/openni-sensor/HISTORY
+++ b/libs/openni-sensor/HISTORY
@@ -1,2 +1,8 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-08-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, BUILD, INSTALL: spell created
diff --git a/libs/openni-sensor/PREPARE b/libs/openni-sensor/PREPARE
index 7a5d332..86a5079 100755
--- a/libs/openni-sensor/PREPARE
+++ b/libs/openni-sensor/PREPARE
@@ -1 +1,2 @@
-config_query OPENNI_SENSOR_AUTOUPDATE "Queue for update on every system
update?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/libs/openni-sensorkinect/DETAILS
b/libs/openni-sensorkinect/DETAILS
index 6add9f3..dbbd525 100755
--- a/libs/openni-sensorkinect/DETAILS
+++ b/libs/openni-sensorkinect/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=openni-sensorkinect
-if [[ "$OPENNI_SENSORKINECT_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"

SOURCE_URL[0]=git://github.com/avin2/SensorKinect.git:openni-sensorkinect-git
SOURCE_IGNORE=volatile
diff --git a/libs/openni-sensorkinect/HISTORY
b/libs/openni-sensorkinect/HISTORY
index 09af20c..580c640 100644
--- a/libs/openni-sensorkinect/HISTORY
+++ b/libs/openni-sensorkinect/HISTORY
@@ -1,2 +1,8 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-08-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, BUILD, INSTALL: spell created
diff --git a/libs/openni-sensorkinect/PREPARE
b/libs/openni-sensorkinect/PREPARE
index d869393..86a5079 100755
--- a/libs/openni-sensorkinect/PREPARE
+++ b/libs/openni-sensorkinect/PREPARE
@@ -1 +1,2 @@
-config_query OPENNI_SENSORKINECT_AUTOUPDATE "Queue for update on every
system update?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/libs/openni/DETAILS b/libs/openni/DETAILS
index cae33af..fe69f8b 100755
--- a/libs/openni/DETAILS
+++ b/libs/openni/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=openni
-if [[ "$OPENNI_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/OpenNI/OpenNI.git:openni-git
SOURCE_IGNORE=volatile
diff --git a/libs/openni/HISTORY b/libs/openni/HISTORY
index 4508263..6cfcf45 100644
--- a/libs/openni/HISTORY
+++ b/libs/openni/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/libs/openni/PREPARE b/libs/openni/PREPARE
index f83bf08..86a5079 100755
--- a/libs/openni/PREPARE
+++ b/libs/openni/PREPARE
@@ -1 +1,2 @@
-config_query OPENNI_AUTOUPDATE "Queue for update on every system update?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index a4b7b4e..4941f1c 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -1,6 +1,6 @@
depends cmake &&
depends freetype2 &&
-depends giflib &&
+depends GIFLIB &&
depends gdal &&
depends GLUT &&
depends jasper &&
@@ -11,7 +11,7 @@ depends libxext &&
depends libice &&
depends libxml2 &&
depends libxrandr &&
-depends mesalib &&
+depends MESALIB &&
depends tiff &&
depends unzip &&
depends zlib &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index cf302f7..a78deca 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,9 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: pass path of freetype2 headers to cmake
* DEPENDS: add dep on jasper, optional dep on asio
diff --git a/libs/osceleton/DETAILS b/libs/osceleton/DETAILS
index 413db23..39c80ad 100755
--- a/libs/osceleton/DETAILS
+++ b/libs/osceleton/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=osceleton
-if [[ "$OSCELETON_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_URL[0]=git://github.com/Sensebloom/OSCeleton.git:osceleton-git
SOURCE_IGNORE=volatile
diff --git a/libs/osceleton/HISTORY b/libs/osceleton/HISTORY
index b21f8c3..f4e9fde 100644
--- a/libs/osceleton/HISTORY
+++ b/libs/osceleton/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-11-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE, PRE_BUILD, BUILD, INSTALL, Makefile: spell created
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 3f26497..20b13a0 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.34
+ VERSION=8.35
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index bdb43b8..5b4e00e 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.35
+
2013-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.34

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/python-ant/DETAILS b/libs/python-ant/DETAILS
index afb8a5f..3f8e2ad 100755
--- a/libs/python-ant/DETAILS
+++ b/libs/python-ant/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=python-ant
VERSION=40b559e
-if [[ "$PYTHON_ANT_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-scm.tar.bz2"
SOURCE_URL[0]=git://github.com/mvillalba/python-ant.git:python-ant-scm
SOURCE_IGNORE=volatile
diff --git a/libs/python-ant/HISTORY b/libs/python-ant/HISTORY
index f3631a7..9507410 100644
--- a/libs/python-ant/HISTORY
+++ b/libs/python-ant/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE: pull directly from git

diff --git a/libs/qoauth/DETAILS b/libs/qoauth/DETAILS
index fca14ff..119a981 100755
--- a/libs/qoauth/DETAILS
+++ b/libs/qoauth/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=qoauth
-if [ "$QOAUTH_AUTOUPDATE" == y ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
SOURCE_URL[0]=git://github.com/ayoy/${SPELL}.git
SOURCE_IGNORE=volatile
diff --git a/libs/qoauth/HISTORY b/libs/qoauth/HISTORY
index a4d3d8c..22e946f 100644
--- a/libs/qoauth/HISTORY
+++ b/libs/qoauth/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-01-11 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS: spell created

diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 8876e35..4f23564 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -1,5 +1,5 @@
SPELL=readline
- VERSION=6.2
+ VERSION=6.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 6b016f0..0ad5aff 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,9 @@
+2014-05-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTAALL: add ldconfig, otherwise next spell fails
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.3
+
2011-02-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.2

diff --git a/libs/readline/INSTALL b/libs/readline/INSTALL
index a3aaf2b..6a9aca9 100755
--- a/libs/readline/INSTALL
+++ b/libs/readline/INSTALL
@@ -10,4 +10,5 @@ if [[ "$INSTALL_INPUTRC" == y ]]; then
mkdir -p "$INSTALL_ROOT/etc/profile.d" &&
install -vm 755 "$SPELL_DIRECTORY/etc/profile.d/readline.sh" \
"$INSTALL_ROOT/etc/profile.d"
-fi
+fi &&
+ldconfig
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/sdl2/DEPENDS b/libs/sdl2/DEPENDS
index 15e21db..69ee55a 100755
--- a/libs/sdl2/DEPENDS
+++ b/libs/sdl2/DEPENDS
@@ -74,11 +74,11 @@ optional_depends directfb \
"--enable-video-directfb" "--disable-video-directfb" \
"Use DirectFB video driver?" &&

-suggest_depends mesalib \
+suggest_depends MESALIB \
"--enable-video-opengl" "--disable-video-opengl" \
"Include OpenGL support?" &&

-suggest_depends mesalib \
+suggest_depends MESALIB \
"--enable-video-opengles" "--disable-video-opengles" \
"Include OpenGL ES support?" &&

diff --git a/libs/sdl2/DETAILS b/libs/sdl2/DETAILS
index b961359..6033885 100755
--- a/libs/sdl2/DETAILS
+++ b/libs/sdl2/DETAILS
@@ -1,17 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=sdl2
if [ "$SDL2_BRANCH" == "scm" ]; then
- if [ "$SDL2_AUTOUPDATE" == "y" ]; then
- VERSION=2.0-$(date +%Y%m%d)
- else
- VERSION=2.0-hg
- fi
+ VERSION=2.0-$(get_scm_version)
SOURCE=$SPELL-2.0-hg.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-2.0-hg
SOURCE_URL[0]=hg_http://hg.libsdl.org/SDL:$SPELL-2.0-hg
SOURCE_IGNORE=volatile
else
- VERSION=2.0.1
+ VERSION=2.0.3
SOURCE=SDL2-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/sdl2/HISTORY b/libs/sdl2/HISTORY
index 96e069f..5a263cd 100644
--- a/libs/sdl2/HISTORY
+++ b/libs/sdl2/HISTORY
@@ -1,3 +1,13 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
+2014-04-13 Treeve Jelbert <treeve AT sourceamge.org>
+ * DETAILS: version 2.0.3
+ * PRE_BUILD: fix it
+
2013-11-02 Robin Cook <rcook AT wyrms.net>
* NEW SPELL: BUILD, CONFIGURE, DEPENDS, DETAILS, PRE_BUILD, PREPARE
PRE_SUB_DEPENDS, SUB_DEPENDS
diff --git a/libs/sdl2/PRE_BUILD b/libs/sdl2/PRE_BUILD
index 54d5833..67c0b6f 100755
--- a/libs/sdl2/PRE_BUILD
+++ b/libs/sdl2/PRE_BUILD
@@ -3,8 +3,4 @@ cd $SOURCE_DIRECTORY &&

if [ "$SDL_BRANCH" == "scm" ]; then
NOCONFIGURE=y ./autogen.sh
-fi &&
-
-mkdir -p smgl &&
-cp $SCRIPT_DIRECTORY/sdl2 smgl/ &&
-cp $SCRIPT_DIRECTORY/sdl2.sh smgl/
+fi
diff --git a/libs/sdl2_image/DEPENDS b/libs/sdl2_image/DEPENDS
index c1e222e..b3f0a0d 100755
--- a/libs/sdl2_image/DEPENDS
+++ b/libs/sdl2_image/DEPENDS
@@ -20,7 +20,7 @@ optional_depends libwebp \
"--enable-webp" "--disable-webp" \
"Support loading WEBP images?" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--enable-gif" "--disable-gif" \
"Support loading GIF images?"

diff --git a/libs/sdl2_image/HISTORY b/libs/sdl2_image/HISTORY
index 409237c..ae58b4d 100644
--- a/libs/sdl2_image/HISTORY
+++ b/libs/sdl2_image/HISTORY
@@ -1,2 +1,5 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-11-02 Robin Cook <rcook AT wyrms.net>
* New Spell: DEPENDS, DETAILS, PREPARE, PRE_BUILD
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 4c1b793..1c6540f 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,7 +1,6 @@
SPELL=sip
- VERSION=4.15.5
-
SOURCE_HASH=sha512:7ddccf274027992efecfcb7186999164260955046e62723b0e26ac13002f7a4f4d12222880a62efc06c3b9318d337db4c7c2f48a16b2c7b971652bdd27c49f9c
- URI=sip4
+ VERSION=4.16.3
+
SOURCE_HASH=sha512:99fc63706212f052c907e4e6d16b224a5389ffb316a90e9d8d8e79c9a8f41ce6038b7c3f4b168e155d81cf394a05073b946142946902dc3bbacec73f0523d109
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 97d9348..96fe912 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,15 @@
+2014-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.16.3
+
+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
+
+2014-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.16
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.15.5

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/talloc/DETAILS b/libs/talloc/DETAILS
index f2f8a91..1022d5c 100755
--- a/libs/talloc/DETAILS
+++ b/libs/talloc/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=talloc
if [[ $TALLOC_BRANCH == scm ]]
then
- if [[ "$TALLOC_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=samba4-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index 36bcf3d..3fafc68 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: conflicts with samba's internal lib

diff --git a/libs/tbb/DETAILS b/libs/tbb/DETAILS
index bd460f7..bee1937 100755
--- a/libs/tbb/DETAILS
+++ b/libs/tbb/DETAILS
@@ -1,6 +1,6 @@
SPELL=tbb
- VERSION=42_20131118
-
SOURCE_HASH=sha512:1f3e2bd807b7fa0cf42c712353cc2a622ddad22fe64359e668480617831ac595a46fa8db86ecd0376989cb4928bb4febe4d11a0f27c26437c60ed0a61c451174
+ VERSION=42_20140601
+
SOURCE_HASH=sha512:2ac1efdf1246fe700af16d8047d7fe9fe915e35f566915a8b03b083815c3ba74d18417b5ba1126ad8cfe6633dad241d75bd439a15b5851778f5c71614c426442
SOURCE=tbb${VERSION}oss_src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION}oss
WEB_SITE=http://www.threadingbuildingblocks.org
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 99eb853..a67d46e 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,12 @@
+2014-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 42_20140601
+
+2014-06-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 42_20140416
+
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 42_20140122
+
2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 42_20131118

diff --git a/libs/tc2-modules/DEPENDS b/libs/tc2-modules/DEPENDS
index 289b113..86afa12 100755
--- a/libs/tc2-modules/DEPENDS
+++ b/libs/tc2-modules/DEPENDS
@@ -3,7 +3,7 @@ optional_depends "xorg-libs" \
"--with-x" \
"--without-x" \
"to be able to build the GIF reader module" &&
-optional_depends "giflib" \
+optional_depends "GIFLIB" \
"--enable-gif" \
"--disable-gif" \
"for a GIF image reader module" &&
@@ -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 8a5dfcf..775d774 100644
--- a/libs/tc2-modules/HISTORY
+++ b/libs/tc2-modules/HISTORY
@@ -1,3 +1,9 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2008-07-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: depends on giflib, libungif deprecated

diff --git a/libs/tzdata/DETAILS b/libs/tzdata/DETAILS
index 54da1ea..2dab9bd 100755
--- a/libs/tzdata/DETAILS
+++ b/libs/tzdata/DETAILS
@@ -1,9 +1,11 @@
SPELL=tzdata
- VERSION=2014a
-
SOURCE_HASH=sha512:91493a5ea85be2db6334c71d742e490e109896de28b08f6a76fa6cd30c03edb8b45c2ed4cab254464f1e559aaf22b1533f6b3582718f56142114178846cd5a96
- PATCHLEVEL=1
+ VERSION=2014g
SOURCE="${SPELL}${VERSION}.tar.gz"
+ SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://ftp.iana.org/tz/releases/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=iana.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.iana.org/time-zones";
LICENSE[0]="GPL"
diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index df66c8b..82664ce 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,11 @@
+2014-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2014g
+
+2014-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2014e
+ use upstream signature
+ * iana.gpg: aded 62AA7E34 "Paul Eggert <eggert AT cs.ucla.edu>
+
2014-03-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2014a

diff --git a/libs/tzdata/iana.gpg b/libs/tzdata/iana.gpg
new file mode 100644
index 0000000..5f7539e
Binary files /dev/null and b/libs/tzdata/iana.gpg differ
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/libs/vsqlite++/DEPENDS b/libs/vsqlite++/DEPENDS
new file mode 100755
index 0000000..6476f47
--- /dev/null
+++ b/libs/vsqlite++/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends boost &&
+depends sqlite &&
+depends autoconf
diff --git a/libs/vsqlite++/DETAILS b/libs/vsqlite++/DETAILS
new file mode 100755
index 0000000..8bd0a1f
--- /dev/null
+++ b/libs/vsqlite++/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=vsqlite++
+ VERSION=0.3.13
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/vinzenz/vsqlite--/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/vsqlite---${VERSION}"
+ WEB_SITE="https://github.com/vinzenz/vsqlite--";
+ LICENSE[0]=BSD
+ ENTERED=20140427
+ SHORT="a welldesigned and portable SQLite3 Wrapper for C++"
+cat << EOF
+VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++.
+EOF
diff --git a/libs/vsqlite++/HISTORY b/libs/vsqlite++/HISTORY
new file mode 100644
index 0000000..1afac25
--- /dev/null
+++ b/libs/vsqlite++/HISTORY
@@ -0,0 +1,3 @@
+2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/libs/vsqlite++/PRE_BUILD b/libs/vsqlite++/PRE_BUILD
new file mode 100755
index 0000000..cd8a40b
--- /dev/null
+++ b/libs/vsqlite++/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+./autogen.sh
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 9ebdb3e..dbfcdc8 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,6 @@
+2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
+ * shared.patch: link with libm.so
+
2013-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.3

diff --git a/lua-forge/lua/shared.patch b/lua-forge/lua/shared.patch
index fa07115..0945e01 100644
--- a/lua-forge/lua/shared.patch
+++ b/lua-forge/lua/shared.patch
@@ -17,7 +17,7 @@
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -ldl
++ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -lm -ldl
+
clean:
$(RM) $(ALL_T) $(ALL_O)
diff --git a/lua-forge/lua51/HISTORY b/lua-forge/lua51/HISTORY
index a15ba61..218a311 100644
--- a/lua-forge/lua51/HISTORY
+++ b/lua-forge/lua51/HISTORY
@@ -1,3 +1,7 @@
+2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
+ * patch-src_Makefile: shared object was not linked
+ to libraries properly
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 5.1.5
* PRE_BUILD: changed to add the -lm -ldl to LDFLAGS
diff --git a/lua-forge/lua51/patch-src_Makefile
b/lua-forge/lua51/patch-src_Makefile
index 7ecea06..5de88ce 100644
--- a/lua-forge/lua51/patch-src_Makefile
+++ b/lua-forge/lua51/patch-src_Makefile
@@ -7,7 +7,7 @@ diff -ur lua-5.1.5/src/Makefile lua-mod/src/Makefile
MYCFLAGS=
-MYLDFLAGS=
-MYLIBS=
-+MYLDFLAGS= -lm -ldl
++MYLDFLAGS=
+MYLIBS= -ldl

# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE
=========
@@ -29,7 +29,7 @@ diff -ur lua-5.1.5/src/Makefile lua-mod/src/Makefile
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(MYLDFLAGS) $(CORE_O) $(LIB_O)
++ $(CC) -o $@ -shared $(MYLDFLAGS) $(CORE_O) $(LIB_O) $(LIBS)
+
clean:
$(RM) $(ALL_T) $(ALL_O)
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/luajit/DETAILS b/lua-forge/luajit/DETAILS
index c541e9b..34c281f 100755
--- a/lua-forge/luajit/DETAILS
+++ b/lua-forge/luajit/DETAILS
@@ -1,9 +1,9 @@
SPELL=luajit
- VERSION=2.0.0
+ VERSION=2.0.3
SOURCE=LuaJIT-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/LuaJIT-$VERSION"
SOURCE_URL[0]="http://luajit.org/download/$SOURCE";
-
SOURCE_HASH=sha512:7aee798e68d0a5b2f1aaaf61b558e0734d48f2501a255d8e3c7208c1319586fdec1ebc4f80238ab1f58dfd3c9d0042b806a567ccce5b769ab4d6345f70844b36
+
SOURCE_HASH=sha512:7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0
WEB_SITE="http://luajit.org/";
ENTERED=20121222
LICENSE[0]=MIT
diff --git a/lua-forge/luajit/HISTORY b/lua-forge/luajit/HISTORY
index 651ddc3..0cfaa6f 100644
--- a/lua-forge/luajit/HISTORY
+++ b/lua-forge/luajit/HISTORY
@@ -1,3 +1,6 @@
+2014-07-31 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated to 2.0.3
+
2012-12-22 Justin Boffemmyer <flux AT sourcemage.org>
* DETAILS, BUILD, CONFIGURE, DEPENDS, INSTALL: spell created

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/lxde/lxlauncher/DEPENDS b/lxde/lxlauncher/DEPENDS
index 64b601b..b111ff4 100755
--- a/lxde/lxlauncher/DEPENDS
+++ b/lxde/lxlauncher/DEPENDS
@@ -1,4 +1,5 @@
depends gnome-menus &&
depends startup-notification &&
depends gtk+2 &&
+depends menu-cache &&
depends lxmenu-data
diff --git a/lxde/lxlauncher/HISTORY b/lxde/lxlauncher/HISTORY
index b1be58e..18fbf0a 100644
--- a/lxde/lxlauncher/HISTORY
+++ b/lxde/lxlauncher/HISTORY
@@ -1,3 +1,6 @@
+2014-05-24 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on menu-cache
+
2011-10-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.2.2

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/bogofilter/CONFIGURE b/mail/bogofilter/CONFIGURE
index 58a8d32..94be5bc 100755
--- a/mail/bogofilter/CONFIGURE
+++ b/mail/bogofilter/CONFIGURE
@@ -1,2 +1,2 @@
config_query_list BOGOFILTER_DB "Which database do you wish to use." \
- "db" "sqlite" "tokyocabinet" "qdbm"
+ "db" "sqlite" "tokyocabinet"
diff --git a/mail/bogofilter/DETAILS b/mail/bogofilter/DETAILS
index 77ec24d..8f7a420 100755
--- a/mail/bogofilter/DETAILS
+++ b/mail/bogofilter/DETAILS
@@ -1,6 +1,6 @@
SPELL=bogofilter
- VERSION=1.2.3
-
SOURCE_HASH=sha512:4b3bb4b1e0f12a88a5ec5421c88001ddeb242c39c55733000dfd38691dc4f5c34a5254de60399b20c63c9ee9e1e13ef73582e215fbabc3738871394b26924ca0
+ VERSION=1.2.4
+
SOURCE_HASH=sha512:e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/mail/bogofilter/HISTORY b/mail/bogofilter/HISTORY
index cc230d4..5a0b416 100644
--- a/mail/bogofilter/HISTORY
+++ b/mail/bogofilter/HISTORY
@@ -1,3 +1,7 @@
+2014-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.4
+ * CONFIGURE: upstream removed qdbm support
+
2012-12-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.3
SECURITY_PATCH=1 fixes CVE-2012-5468
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 10d5108..19ca863 100755
--- a/mail/claws-mail/DEPENDS
+++ b/mail/claws-mail/DEPENDS
@@ -140,7 +140,6 @@ fi &&
depends atk &&
depends cairo &&
depends curl &&
-depends db &&
if is_depends_enabled $SPELL dbus; then
depends dbus-glib
fi &&
@@ -161,6 +160,6 @@ depends libsm &&
depends libice &&

depends libx11 &&
-depends openssl &&
+depends SSL &&
depends pango &&
depends pixman
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 9e16d29..93e32fe 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,8 +1,8 @@
SPELL=claws-mail
- VERSION=3.9.3
+ VERSION=3.10.1
SECURITY_PATCH=1
- SOURCE=$SPELL-${VERSION}.tar.bz2
-
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/Claws%20Mail/$VERSION/$SOURCE
+ SOURCE=$SPELL-${VERSION}.tar.xz
+ SOURCE_URL=$SOURCEFORGE_URL/$SPELL/Claws%20Mail/$VERSION/$SOURCE
SOURCE2=${SOURCE}.asc
SOURCE2_URL=${SOURCE_URL}.asc
SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 484b3a4..29125f4 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,13 @@
+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
+
+2014-05-27 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 3.10.0, fixed SOURCE_URL, .bz2 -> .xz
+ * DEPENDS: removed db
+
2014-01-26 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 3.9.3
* DEPENDS: updated to new depends
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/DETAILS b/mail/cone/DETAILS
index 13879bf..52d0ed8 100755
--- a/mail/cone/DETAILS
+++ b/mail/cone/DETAILS
@@ -1,7 +1,7 @@
SPELL=cone
- VERSION=0.84
+ VERSION=0.90
SOURCE="$SPELL-$VERSION.tar.bz2"
- SOURCE_URL[0]=$SOURCEFORGE_URL/courier/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/courier/${SPELL}/${VERSION}/${SOURCE}
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
SOURCE2_URL[0]=$SOURCEFORGE_URL/courier/$SOURCE2
diff --git a/mail/cone/HISTORY b/mail/cone/HISTORY
index 511fcc9..5e6b1b7 100644
--- a/mail/cone/HISTORY
+++ b/mail/cone/HISTORY
@@ -1,3 +1,9 @@
+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
+
2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.84
* BUILD, PRE_BUILD, cone-gcc43.patch: removed
diff --git a/mail/courier-authlib/DEPENDS b/mail/courier-authlib/DEPENDS
index a02829e..22afa29 100755
--- a/mail/courier-authlib/DEPENDS
+++ b/mail/courier-authlib/DEPENDS
@@ -1,4 +1,4 @@
-#depends libtool &&
+depends libtool &&

case ${CAUTHLIB_AUTHDB} in
db) depends db "--with-db=db"
diff --git a/mail/courier-authlib/HISTORY b/mail/courier-authlib/HISTORY
index cd92b86..c754af5 100644
--- a/mail/courier-authlib/HISTORY
+++ b/mail/courier-authlib/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libtool
+
2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 0.63.0
* DEPENDS: removed non-existent configure flags
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..f81f028 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,9 +1,15 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added msmtp

2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added masqmail

+2011-04-02 Remko van der Vossen <wich AT sourcemage.org>
+ * init.d/courier_filter: added
+
2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 0.65.3
* init.d/*: simplified and use smgl_init (working NEEDS)
diff --git a/mail/courier/init.d/courier_filter
b/mail/courier/init.d/courier_filter
new file mode 100755
index 0000000..d46d9d4
--- /dev/null
+++ b/mail/courier/init.d/courier_filter
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/courierfilter start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/courierfilter stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/courierfilter restart
+ evaluate_retval
+}
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/CONFIGURE b/mail/exim/CONFIGURE
index 92ac630..1f55766 100755
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -10,8 +10,8 @@ config_query_list EXIM_DBM "Select one hash DB" \
tdb
elif spell_ok gdbm ; then
config_query_list EXIM_DBM "Select one hash DB" \
- db \
gdbm \
+ db \
tdb
elif spell_ok tdb ; then
config_query_list EXIM_DBM "Select one hash DB" \
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 5498658..01cfab1c 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -1,5 +1,5 @@
depends pcre &&
-depends gawk &&
+depends AWK &&
if [[ "$EXIM_DBM" == "db" ]]; then
depends db
elif [[ "$EXIM_DBM" == "gdbm" ]]; then
@@ -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 48f1354..59d2996 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,6 +1,6 @@
SPELL=exim
- VERSION=4.80.1
- SECURITY_PATCH=7
+ VERSION=4.84
+ SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index a3b90e0..71120d7 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,25 @@
+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)
+ <tlyons AT exim.org>)
+ * ldap-tlsopt.patch: dropped, fixed by upstream
+
+2014-04-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: fixed priority for gdbm
+
+2014-01-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * ldap-tlsopt.patch: backported official patch that fixes LDAP over
+ TLS/SSL lookups (5428a9463ae1080029a84a1b33e4a8a6915c5f28)
+ * init.d/exim: changed permissions to 755
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added msmtp

diff --git a/mail/exim/exim.gpg b/mail/exim/exim.gpg
index 96662af..d8385b6 100644
Binary files a/mail/exim/exim.gpg and b/mail/exim/exim.gpg differ
diff --git a/mail/exim/init.d/exim b/mail/exim/init.d/exim
old mode 100644
new mode 100755
diff --git a/mail/fdm/DEPENDS b/mail/fdm/DEPENDS
index 6b7b0f9..92401b1 100755
--- a/mail/fdm/DEPENDS
+++ b/mail/fdm/DEPENDS
@@ -1 +1,3 @@
+depends pcre &&
+depends SSL &&
depends tdb
diff --git a/mail/fdm/HISTORY b/mail/fdm/HISTORY
index 4461e4c..9723325 100644
--- a/mail/fdm/HISTORY
+++ b/mail/fdm/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: pcre, SSL
+
2013-06-05 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 1.7
* BUILD: now uses a configure
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/DETAILS b/mail/fetchmail/DETAILS
index 7f5f792..1bc85f8 100755
--- a/mail/fetchmail/DETAILS
+++ b/mail/fetchmail/DETAILS
@@ -1,5 +1,5 @@
SPELL=fetchmail
- VERSION=6.3.20
+ VERSION=6.3.26
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/mail/fetchmail/HISTORY b/mail/fetchmail/HISTORY
index c7bc93e..348a5b0 100644
--- a/mail/fetchmail/HISTORY
+++ b/mail/fetchmail/HISTORY
@@ -1,3 +1,9 @@
+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
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.3.20, SECURITY_PATCH=8, fetchmail-SA-2011-01,
CVE-2011-1947

diff --git a/mail/getmail/BUILD b/mail/getmail/BUILD
index 3d7f60b..a05d2aa 100755
--- a/mail/getmail/BUILD
+++ b/mail/getmail/BUILD
@@ -1 +1 @@
-python setup.py build
+default_build_python
diff --git a/mail/getmail/DEPENDS b/mail/getmail/DEPENDS
index 867b4d4..e4ea57a 100755
--- a/mail/getmail/DEPENDS
+++ b/mail/getmail/DEPENDS
@@ -1 +1 @@
-depends python
+depends PYTHON
diff --git a/mail/getmail/DETAILS b/mail/getmail/DETAILS
index 7eb2bdd..e2ff457 100755
--- a/mail/getmail/DETAILS
+++ b/mail/getmail/DETAILS
@@ -1,9 +1,10 @@
SPELL=getmail
- VERSION=4.20.4
+ VERSION=4.46.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pyropus.ca/software/getmail/old-versions/$SOURCE
-
SOURCE_HASH=sha512:d1c3aeb11db363027f030a7fa6ddd222d3c4223c25f8f0242f73cdbfa29301f25b681ea347be79d75f61e727bea9b7bc75c755403e1944f661e760bf139f825f
+
SOURCE_HASH=sha512:f0ff29cf78ff1fbc6e0c16b3fa9342d72fb70590aa0b944977906171e8a68423a4442cde38b2585956cd1855458a4b3fc0dd0a8507bda24a722325e9c0704a33
+ GATHER_DOCS=off
WEB_SITE=http://pyropus.ca/software/getmail
LICENSE=GPL
ENTERED=20020716
diff --git a/mail/getmail/HISTORY b/mail/getmail/HISTORY
index 655ada6..df06cc9 100644
--- a/mail/getmail/HISTORY
+++ b/mail/getmail/HISTORY
@@ -1,3 +1,11 @@
+2014-05-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: don't do useless doc'ing
+ * BUILD, INSTALL: use functions
+ * DEPENDS: python -> PYTHON
+
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.46.0
+
2011-07-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.20.4

diff --git a/mail/getmail/INSTALL b/mail/getmail/INSTALL
index 762d43b..46c6fba 100755
--- a/mail/getmail/INSTALL
+++ b/mail/getmail/INSTALL
@@ -1 +1 @@
-python setup.py install
+default_install_python
diff --git a/mail/gnarwl/CONFIGURE b/mail/gnarwl/CONFIGURE
new file mode 100755
index 0000000..d238233
--- /dev/null
+++ b/mail/gnarwl/CONFIGURE
@@ -0,0 +1,7 @@
+message "${MESSAGE_COLOR}"
+message "The following option is useful in query filter with vacationStart
and"
+message "vacationEnd attributes. It gives a number of days since Unix Epoch"
+message "(1 January 1970)."
+message "${DEFAULT_COLOR}" &&
+
+config_query GNARWL_TIME "Do you want to patch in support for expansion of
time variable?" n
diff --git a/mail/gnarwl/DETAILS b/mail/gnarwl/DETAILS
index ce9e5c6..66b2565 100755
--- a/mail/gnarwl/DETAILS
+++ b/mail/gnarwl/DETAILS
@@ -1,5 +1,6 @@
SPELL=gnarwl
VERSION=3.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tgz

SOURCE_URL[0]=http://www.onyxbits.de/sites/default/files/upload_cck/node/526/$SOURCE

SOURCE_HASH=sha512:acb9e90cc61d48f57a141625d3584710260aea08e228f3f10fffec57b50b33cf120da26718c9e2d8685939a458768fb33c6d7cce26c93cd2ecc28386b8aec652
diff --git a/mail/gnarwl/HISTORY b/mail/gnarwl/HISTORY
index db6860d..2539052 100644
--- a/mail/gnarwl/HISTORY
+++ b/mail/gnarwl/HISTORY
@@ -1,2 +1,13 @@
+2014-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * blacklist.patch: added, to fix blacklist functioning
+
+2014-07-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added, for patch option
+ * PRE_BUILD: apply patch
+ * time.patch: added, to allow usage of $time variable that returns
+ current time in days since 1 Jan 1970
+
2014-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS, {PRE_,}BUILD, INSTALL, excluded: spell created
diff --git a/mail/gnarwl/PRE_BUILD b/mail/gnarwl/PRE_BUILD
index 9129419..06c8876 100755
--- a/mail/gnarwl/PRE_BUILD
+++ b/mail/gnarwl/PRE_BUILD
@@ -1,6 +1,12 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/blacklist.patch" &&
+
+if [[ $GNARWL_TIME == y ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/time.patch"
+fi &&
+
# use custom CFLAGS
sedit "s:-g -Wall -O2:$CFLAGS:" Makefile.in &&

diff --git a/mail/gnarwl/blacklist.patch b/mail/gnarwl/blacklist.patch
new file mode 100644
index 0000000..90dafac
--- /dev/null
+++ b/mail/gnarwl/blacklist.patch
@@ -0,0 +1,19 @@
+--- src/mailhandler.c.orig 2008-06-25 00:23:33.000000000 +0400
++++ src/mailhandler.c 2014-07-31 00:11:19.788194344 +0400
+@@ -196,6 +196,7 @@
+ }
+
+ if (sndr!=NULL) {
++ addAddr(sndr);
+ sender=NULL;
+ mail_status=mail_status|MAIL_PREDEF_SENDER;
+ cpyStr(&sender,sndr);
+@@ -213,7 +214,7 @@
+ }
+
+
+- if (mail_status>=MAIL_BADHEADER) return FALSE;
++ if (mail_status>=MAIL_BADHEADER || mail_status & MAIL_BLADDR) return
FALSE;
+ return TRUE;
+ }
+
diff --git a/mail/gnarwl/time.patch b/mail/gnarwl/time.patch
new file mode 100644
index 0000000..c81c194
--- /dev/null
+++ b/mail/gnarwl/time.patch
@@ -0,0 +1,22 @@
+--- src/dbaccess.c.orig 2009-02-22 23:27:00.000000000 +0400
++++ src/dbaccess.c 2014-07-11 15:13:43.122741657 +0400
+@@ -216,14 +216,19 @@
+ char **entry;
+ char **retbuf;
+ int i;
++ time_t seconds;
++ char days[sizeof(seconds)];
+
+ maxwait.tv_sec=LDAPQUERY_MAXWAIT;
+ maxwait.tv_usec=0;
++ seconds = time(NULL);
+
+
+ cpyStr(&tmp,cfg.qfilter);
+ expandVars(&tmp,cfg.map_receiver,(char*)mail);
+ expandVars(&tmp,cfg.map_sender,sender);
++ sprintf(days, "%d", seconds/(60*60*24));
++ expandVars(&tmp,"$time", days);
+
+
i=ldap_search_st(ldcon,cfg.base,cfg.scope,tmp,cfg.macro_attr,0,&maxwait,&res);
+ if (i!=LDAP_SUCCESS) {
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
new file mode 100755
index 0000000..09706da
--- /dev/null
+++ b/mail/isync/DEPENDS
@@ -0,0 +1 @@
+depends SSL
diff --git a/mail/isync/DETAILS b/mail/isync/DETAILS
new file mode 100755
index 0000000..7ad5d99
--- /dev/null
+++ b/mail/isync/DETAILS
@@ -0,0 +1,37 @@
+ SPELL=isync
+ VERSION=1.1.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:6503c1d8ba412274a09f468994a54dd2d13af2601da3dbfe1ba3f8aefc33cb2a5effd2ca66fcff1c5224ce80ffb11c42d8f362f7cc6409760c32e4031ea87744
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://isync.sourceforge.net/";
+ LICENSE[0]="GPLv2"
+ ENTERED=20140510
+ KEYWORDS=""
+ SHORT="IMAP and MailDir mailbox synchronizer"
+cat << EOF
+isync is a command line application which synchronizes mailboxes; currently
+Maildir and IMAP4 mailboxes are supported. New messages, message deletions
+and flag changes can be propagated both ways. isync is suitable for use in
+IMAP-disconnected mode.
+
+Synchronization is based on unique message identifiers (UIDs), so
+no identification conflicts can occur (as opposed to some other mail
+synchronizers). Synchronization state is kept in one local text file per
+mailbox pair; multiple replicas of a mailbox can be maintained.
+
+
+Features:
+* Fine-grained selection of synchronization operations to perform.
+* Synchronizes single mailboxes or entire mailbox collections.
+* Partial mirrors possible: keep only the latest messages locally.
+* Trash functionality: backup messages before removing them.
+* IMAP features:
+ - Security: supports TLS/SSL via imaps: (port 993) and STARTTLS; CRAM-MD5
for
+ authentication.
+ - Supports NAMESPACE for simplified configuration.
+ - Pipelining for maximum speed (currently only partially implemented).
+
+isync should work fairly well with any IMAP4 compliant server; particularily
+efficient with those that support the UIDPLUS and LITERAL+ extensions.
+EOF
diff --git a/mail/isync/HISTORY b/mail/isync/HISTORY
new file mode 100644
index 0000000..7716c69
--- /dev/null
+++ b/mail/isync/HISTORY
@@ -0,0 +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/masqmail/DETAILS b/mail/masqmail/DETAILS
index 6dfe039..6ea2d64 100755
--- a/mail/masqmail/DETAILS
+++ b/mail/masqmail/DETAILS
@@ -1,6 +1,6 @@
SPELL=masqmail
VERSION=0.3.4
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 43e78f6..589cd19 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,9 @@
+2014-05-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * PRE_BUILD: added, to apply log patch and prevent a log dir from
+ installing
+ * log.patch: added, to fix empty log file creation
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added msmtp

diff --git a/mail/masqmail/PRE_BUILD b/mail/masqmail/PRE_BUILD
new file mode 100755
index 0000000..28ef01f
--- /dev/null
+++ b/mail/masqmail/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:install-data-local\: log_dir:install-data-local\::" Makefile.in &&
+
+patch -p0 < "$SPELL_DIRECTORY/log.patch"
diff --git a/mail/masqmail/log.patch b/mail/masqmail/log.patch
new file mode 100644
index 0000000..71e5122
--- /dev/null
+++ b/mail/masqmail/log.patch
@@ -0,0 +1,27 @@
+--- src/conf.c.orig 2012-01-18 12:31:45.000000000 +0400
++++ src/conf.c 2014-05-11 15:40:03.205332624 +0400
+@@ -416,6 +416,7 @@
+ conf.localpartcmp = strcmp;
+ conf.max_defer_time = 86400 * 4; /* 4 days */
+ conf.max_msg_size = 0; /* no limit on msg size */
++ conf.log_dir = LOG_DIR;
+ conf.spool_dir = SPOOL_DIR;
+ conf.mail_dir = "/var/mail";
+ conf.listen_addresses = g_list_append(NULL,
parse_interface("localhost", 25));
+--- src/masqmail.c.orig 2012-01-18 12:31:45.000000000 +0400
++++ src/masqmail.c 2014-05-11 15:48:18.197013226 +0400
+@@ -640,14 +640,10 @@
+ }
+ }
+
+- conf.log_dir = LOG_DIR;
+- /* FIXME: fails if we run as user */
+- logopen();
+ if (!read_conf(conf_file)) {
+ logwrite(LOG_ALERT, "SHUTTING DOWN due to problems reading
config\n");
+ exit(5);
+ }
+- logclose();
+
+ if (do_queue) {
+ conf.do_queue = TRUE;
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/DETAILS b/mail/mutt/DETAILS
index 7657908..f57b15c 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -1,13 +1,10 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mutt
PATCH_DIRECTORY=$SCRIPT_DIRECTORY/patches

case $MUTT_BRANCH in
scm)
- if [[ $MUTT_AUTOUPDATE == "y" ]]; then
- VERSION=mercurial_$(date +%Y%m%d)
- else
- VERSION=mercurial
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-mercurial.tar.bz2
SOURCE_URL[0]=hg_http://dev.mutt.org/hg/mutt:$SPELL-mercurial:HEAD
FORCE_DOWNLOAD=on
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index 5177be6..378c7e7 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,9 @@
+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
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS, DOWNLOAD, PREPARE, PRE_BUILD:
Use prepare_select_branch
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/DETAILS b/mail/postfix/DETAILS
index 2895678..5e33523 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.9.8
+ VERSION=2.9.9
PFIX_BRANCH=official
SECURITY_PATCH=1
fi
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 2e811a3..f90e316 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-09-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.8

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/spamprobe/DEPENDS b/mail/spamprobe/DEPENDS
index 929f6ef..31f66b7 100755
--- a/mail/spamprobe/DEPENDS
+++ b/mail/spamprobe/DEPENDS
@@ -1,4 +1,4 @@
depends db &&
-optional_depends giflib "--with-gif" "--without-gif" "to classify image
only mails" &&
+optional_depends GIFLIB "--with-gif" "--without-gif" "to classify image
only mails" &&
optional_depends JPEG "--with-jpeg" "--without-jpeg" "process jpeg
images" &&
optional_depends libpng "--with-png" "--without-png" "process png images"
diff --git a/mail/spamprobe/HISTORY b/mail/spamprobe/HISTORY
index 48eebb5..e154bdc 100644
--- a/mail/spamprobe/HISTORY
+++ b/mail/spamprobe/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

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/DETAILS b/mail/sylpheed/DETAILS
index a83a87e..483b2e3 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,7 +3,7 @@ if [[ $SYLPHEED_GTK2 == n ]]; then
VERSION=1.0.6

SOURCE_HASH=sha512:2b94979b671ef63b62040ed6b394368536a4817de910407cdfcdadc891e77a6752a6b547c0c1fdaa5360bd4c3b6c0a497f3d75bb17476a0ee37f7c4b5f18136e
else
- VERSION=3.4.0
+ VERSION=3.4.2
SECURITY_PATCH=1
if [[ $SYLPHEED_IT == y ]]; then
SOURCE3=Sylpheed3.0_icon-set.tar.gz
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index afdf86a..21d37d8 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-04-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.4.1
+
2014-04-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.4.0

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 3d83a4b..b88876f 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,18 +1,29 @@
-depends -sub CXX gcc &&
-depends nspr '--with-system-nspr' &&
-depends -sub "3.15.x" nss '--with-system-nss' &&
-depends zlib '--with-system-zlib' &&
-depends JPEG '--with-system-jpeg' &&
-depends libidl &&
-depends perl &&
-depends python &&
-depends zip &&
-depends gtk+2 '--enable-xft --disable-freetype2' &&
-depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
-depends pysqlite &&
-#depends -sub 'TEE' cairo "--enable-system-cairo \
-# --enable-default-toolkit=cairo-gtk2" &&
-#
+depends atk &&
+depends cairo &&
+#depends -sub 'TEE' cairo "--enable-system-cairo \
+# --enable-default-toolkit=cairo-gtk2" &&
+depends fontconfig &&
+depends freetype2 &&
+depends -sub CXX gcc &&
+depends gdk-pixbuf2 &&
+depends glib2 &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends JPEG '--with-system-jpeg' &&
+depends libidl &&
+depends libx11 &&
+depends libxext &&
+depends libxrender &&
+depends libxt &&
+depends nspr '--with-system-nspr' &&
+depends -sub "3.16.x" nss '--with-system-nss' &&
+depends pango &&
+depends perl &&
+depends pysqlite &&
+depends python &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+depends zip &&
+depends zlib '--with-system-zlib' &&
+
# LDAP support doesn't work (fails to build)
#
#optional_depends openldap \
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index a39b041..609f0c7 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=24.2.0
+ VERSION=24.5.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_HASH"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 51695a1..726b773 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,5 +1,12 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
+2014-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: version 24.5.0
+ * DEPENDS: use nss version 3.16
+
2014-02-27 Remko van der Vossen <wich AT sourcemage.org>
-»·······* DEPENDS: optional depends gstreamer
+ * DEPENDS: optional depends gstreamer

2013-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 24.2.0, SECURITY_PATCH++
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/laptop-mode-tools/DETAILS
b/mobile/laptop-mode-tools/DETAILS
index 502fa53..0477504 100755
--- a/mobile/laptop-mode-tools/DETAILS
+++ b/mobile/laptop-mode-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=laptop-mode-tools
- VERSION=1.60
+ VERSION=1.64
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
SOURCE_URL[0]=http://samwel.tk/laptop_mode/tools/downloads/$SOURCE
-
SOURCE_HASH=sha512:79596bb24b2af8bbeb3424eeff51022bb381609325a0eb5c009e0970dffe055d2493509d56a4e2c8f745c27f03bc176372d9b27e3a0a050f7bc1c58f86aae5c9
+
SOURCE_HASH=sha512:539388f5a86fc73a171aadafe8d3a04385cadedb41d3cb53822d4ad55b77262a82e717bfa910ec64c1ebba4d14cc02c9e1fab575c752ef8a77c2f67a023c8188
LICENSE[0]=GPL
WEB_SITE=http://www.samwel.tk/laptop_mode
ENTERED=20070916
diff --git a/mobile/laptop-mode-tools/HISTORY
b/mobile/laptop-mode-tools/HISTORY
index b57e047..26f1c0e 100644
--- a/mobile/laptop-mode-tools/HISTORY
+++ b/mobile/laptop-mode-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-04-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.64
+
2012-04-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.60

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/bmon/DEPENDS b/net/bmon/DEPENDS
index fa2ad51..77da999 100755
--- a/net/bmon/DEPENDS
+++ b/net/bmon/DEPENDS
@@ -1,3 +1,4 @@
-depends ncurses &&
-optional_depends libdbi "" "" "for database support" &&
-optional_depends rrdtool "" "" "for rrd support"
+depends ncurses &&
+depends confuse &&
+depends libnl &&
+depends autoconf
diff --git a/net/bmon/DETAILS b/net/bmon/DETAILS
index 1079e00..40c5375 100755
--- a/net/bmon/DETAILS
+++ b/net/bmon/DETAILS
@@ -1,10 +1,10 @@
SPELL=bmon
- VERSION=2.1.0
+ VERSION=3.2
SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://people.suug.ch/~tgr/bmon/files/${SOURCE}
-
SOURCE_HASH=sha512:83b14a9701d987fc511e3c42cca972a2f6a35342616b62bf297696510395d8ad2b420a629a16e5f9aef60254a90802af0077c13cad58613f44027ec1a87d25cd
+ SOURCE_URL[0]=https://github.com/tgraf/bmon/archive/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:a5017a8924f8ac5eaf9f671a8494302081050aab14f629f863eecccd01ea1f4a223b3f8ce4deb4304d5904dd99acca92e973ba503167d3805641d88ddbb938ce
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- WEB_SITE=http://people.suug.ch/~tgr/bmon/
+ WEB_SITE=http://www.infradead.org/~tgr/bmon/
ENTERED=20060701
LICENSE[0]=GPL
SHORT="a network data rate estimator"
diff --git a/net/bmon/HISTORY b/net/bmon/HISTORY
index 9d0f389..fb24aaf 100644
--- a/net/bmon/HISTORY
+++ b/net/bmon/HISTORY
@@ -1,3 +1,10 @@
+2014-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.2
+ * DEPENDS: remove optional dependencies, add dependencies on libnl
+ and confuse
+ * bmon-2.1.0-gcc4.diff: removed
+ * PRE_BUILD: run autogen.sh
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/bmon/PRE_BUILD b/net/bmon/PRE_BUILD
index 6c870ee..b163def 100755
--- a/net/bmon/PRE_BUILD
+++ b/net/bmon/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/bmon-2.1.0-gcc4.diff
+./autogen.sh
diff --git a/net/bmon/bmon-2.1.0-gcc4.diff b/net/bmon/bmon-2.1.0-gcc4.diff
deleted file mode 100644
index 433edf5..0000000
--- a/net/bmon/bmon-2.1.0-gcc4.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- bmon-2.1.0.orig/src/out_xml_event.c 2005-04-05 12:01:33.000000000
-0300
-+++ bmon-2.1.0/src/out_xml_event.c 2005-09-09 17:56:07.000000000 -0300
-@@ -127,7 +127,7 @@
- .om_draw = xml_event_draw,
- .om_set_opts = xml_event_set_opts,
- .om_probe = xml_event_probe,
-- .om_shutdown xml_event_shutdown,
-+ .om_shutdown = xml_event_shutdown
- };
-
- static void __init xml_event_init(void)
---- bmon-2.1.0.orig/src/out_audio.c 2005-04-05 12:01:33.000000000 -0300
-+++ bmon-2.1.0/src/out_audio.c 2005-09-09 17:58:20.000000000 -0300
-@@ -141,7 +141,7 @@
- .om_draw = audio_draw,
- .om_set_opts = audio_set_opts,
- .om_probe = audio_probe,
-- .om_shutdown audio_shutdown,
-+ .om_shutdown = audio_shutdown
- };
-
- static void __init audio_init(void)
diff --git a/net/chrony/DETAILS b/net/chrony/DETAILS
index a49b5b1..f6c4573 100755
--- a/net/chrony/DETAILS
+++ b/net/chrony/DETAILS
@@ -1,5 +1,5 @@
SPELL=chrony
- VERSION=1.29.1
+ VERSION=1.31
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION-tar-gz-asc.txt
diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY
index 6bf4cef..137ac25 100644
--- a/net/chrony/HISTORY
+++ b/net/chrony/HISTORY
@@ -1,3 +1,9 @@
+2014-09-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.31
+
+2014-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.30
+
2014-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.29.1
SECURITY_PATCH++
diff --git a/net/conntrack/DETAILS b/net/conntrack/DETAILS
index d14244e..027dde9 100755
--- a/net/conntrack/DETAILS
+++ b/net/conntrack/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=conntrack
SPELLX=conntrack-tools
if [[ "$CONNTRACK_BRANCH" == "scm" ]]; then
-if [[ "$CONNTRACK_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_IGNORE=volatile
diff --git a/net/conntrack/HISTORY b/net/conntrack/HISTORY
index e04b539..da78547 100644
--- a/net/conntrack/HISTORY
+++ b/net/conntrack/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/net/corkscrew/DETAILS b/net/corkscrew/DETAILS
new file mode 100755
index 0000000..ba6909d
--- /dev/null
+++ b/net/corkscrew/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=corkscrew
+ VERSION=2.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.agroman.net/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.agroman.net/corkscrew/";
+ LICENSE[0]="GPLv2"
+ ENTERED=20140917
+ KEYWORDS=""
+ SHORT="tool for tunneling SSH through HTTP proxies"
+cat << EOF
+Corksrew is a $SHORT
+EOF
diff --git a/net/corkscrew/HISTORY b/net/corkscrew/HISTORY
new file mode 100644
index 0000000..5056b99
--- /dev/null
+++ b/net/corkscrew/HISTORY
@@ -0,0 +1,2 @@
+2014-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index f800647..2be2d1a 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,5 +1,5 @@
SPELL=dhcp
- VERSION=4.2.5-P1
+ VERSION=4.2.6
SECURITY_PATCH=5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index df61b7e..a026cb5 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,6 @@
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.6
+
2013-04-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.2.5-P1; SECURITY_PATCH++ (CVE-2013-2266)

diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index cafefc1..f9482b2 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcpcd
- VERSION=6.2.1
-
SOURCE_HASH=sha512:0b3db1011e4e427d5c781dafb20e5541da486126e27cc1f018b825c8e2c21bf911f714f0663b6ee813888a558a006b4bddbbdfd7a91a73b17b0d09c53243541d
+ VERSION=6.4.5
+
SOURCE_HASH=sha512:04161d7475ac8abd71e6f20f63400ca29fa765751816d067850699576b67ab12d9fe822ffd1c6234823ddca7820009667ae7781bf2a31c2595b05208cca29711
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 54159da..3a53c2e 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,18 @@
+2014-09-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.4.5
+
+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
+
+2014-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.4.0
+
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.3.2
+
2014-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE, BUILD: allow building IpV4/6 support

diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 43d44a8..e45ab33 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,9 +1,10 @@
SPELL=dnsmasq
- VERSION=2.58
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.71
+
SOURCE_HASH=sha512:b0f1b8633b4560cb9a4fe6d98b8c0db40182c989e698964a9153ea3a96663dcaaa33848dd0876e8f9a93e8a24fc4bd91120335291871712ad6b9e9e97fa3baa1
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SECURITY_PATCH=2
LICENSE[0]=GPL
WEB_SITE=http://www.thekelleys.org.uk/dnsmasq/doc.html
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 562a12d..8bfddb7 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,6 @@
+2014-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.71
+
2011-09-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.58
* PRE_BUILD: added hack to build with dbus (from Arch Linux) (fixes
#183)
diff --git a/net/dnsmasq/dnsmasq-2.58.tar.gz.sig
b/net/dnsmasq/dnsmasq-2.58.tar.gz.sig
deleted file mode 100644
index 459a171..0000000
Binary files a/net/dnsmasq/dnsmasq-2.58.tar.gz.sig and /dev/null differ
diff --git a/net/driftnet/DEPENDS b/net/driftnet/DEPENDS
index d044102..ae82b4a 100755
--- a/net/driftnet/DEPENDS
+++ b/net/driftnet/DEPENDS
@@ -1,4 +1,4 @@
-depends giflib &&
+depends GIFLIB &&
depends JPEG &&
depends libpcap &&
depends gtk+
diff --git a/net/driftnet/HISTORY b/net/driftnet/HISTORY
index d9745af..14b8fe6 100644
--- a/net/driftnet/HISTORY
+++ b/net/driftnet/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

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/fping/DETAILS b/net/fping/DETAILS
index dbc46d7..03b4196 100755
--- a/net/fping/DETAILS
+++ b/net/fping/DETAILS
@@ -1,9 +1,9 @@
SPELL=fping
- VERSION=3.9
+ VERSION=3.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.fping.org/dist/$SOURCE
-
SOURCE_HASH=sha512:1550c77faef2c5c696baf8e9307c905821a35aab33534d5a4bd388b20e8c70aa47c9aeeaf4b4d1cafd1f0f399271ec787bcd25cbd84224912c127c2a13d19fa1
+
SOURCE_HASH=sha512:64bf93c7dbfa2b8adc3344514b2e6e182f1e5950da08b042b8d4d5e4c94b2b8bdc3aaba804339d0461dd88e0efbdfc0bd914a10d22810da8138c9c45335f7047
DOCS="ChangeLog doc/README.1992 $DOCS"
DOC_DIRS=""
WEB_SITE=http://www.fping.org/
diff --git a/net/fping/HISTORY b/net/fping/HISTORY
index 4ad8a5b..41fa6d6 100644
--- a/net/fping/HISTORY
+++ b/net/fping/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.10
+
2014-03-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.9

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/DETAILS b/net/freeradius/DETAILS
index f03c125..c6e4fd3 100755
--- a/net/freeradius/DETAILS
+++ b/net/freeradius/DETAILS
@@ -1,7 +1,6 @@
SPELL=freeradius
- VERSION=2.2.0
+ VERSION=2.2.5
SECURITY_PATCH=2
- PATCHLEVEL=1
SOURCE=$SPELL-server-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=ftp://ftp.freeradius.org/pub/${SPELL}/${SOURCE}
diff --git a/net/freeradius/HISTORY b/net/freeradius/HISTORY
index 45185ae..f1db2a7 100644
--- a/net/freeradius/HISTORY
+++ b/net/freeradius/HISTORY
@@ -1,3 +1,9 @@
+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
+
2012-10-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: added, to build with system libtool/libltdl
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/DETAILS b/net/ipsec-tools/DETAILS
index c4637cd..57f5352 100755
--- a/net/ipsec-tools/DETAILS
+++ b/net/ipsec-tools/DETAILS
@@ -1,10 +1,10 @@
SPELL=ipsec-tools
- VERSION=0.8.1
+ VERSION=0.8.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c8308aba9764a8e0a0507dbc62e8e93dc4b51f7215f2c3bb50f2e7e1f46dde0c773cfe2992660ccd319523775a9bab668371ee53cd4af153d2fcf13a0ef4e1eb
+
SOURCE_HASH=sha512:2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f
DOCS="src/setkey/*.cf $DOCS"
DOC_DIRS="src/racoon/doc src/racoon/samples"
WEB_SITE=http://ipsec-tools.sourceforge.net/
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index a268416..f1268d0 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.1; added missing docs
* DEPENDS: added missing optional dependencies
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/iw/DETAILS b/net/iw/DETAILS
index 778c7ce..c90211d 100755
--- a/net/iw/DETAILS
+++ b/net/iw/DETAILS
@@ -1,6 +1,6 @@
SPELL=iw
- VERSION=3.13
-
SOURCE_HASH=sha512:cbfa2ea8f4584e61060d56e52f405d1e67dc04d08b75179dde58d2ed20b78eae78b04650af1760265df97e559af0af6664e384d65109bf380391bc38b08a348d
+ VERSION=3.15
+
SOURCE_HASH=sha512:82b6cc30a8c1c5568413d2e1dbf8aeacccf79cf34ece235ef816b31d897a4296c14793b4f1adc561c211210dcfb97d46c4f0f6cfb005b525b81795f50a929b27
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://linuxwireless.org/en/users/Documentation/iw
diff --git a/net/iw/HISTORY b/net/iw/HISTORY
index 78aeaeb..6b8d876 100644
--- a/net/iw/HISTORY
+++ b/net/iw/HISTORY
@@ -1,3 +1,6 @@
+2014-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.15
+
2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.13

diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index 20dc0c3..2b39d37 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,5 +1,5 @@
SPELL=libpcap
- VERSION=1.5.1
+ VERSION=1.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index cf190b3..763cd79 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,9 @@
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.2
+
+2014-07-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.1
+
2013-11-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.1

diff --git a/net/libreswan/BUILD b/net/libreswan/BUILD
new file mode 100755
index 0000000..5ddecbb
--- /dev/null
+++ b/net/libreswan/BUILD
@@ -0,0 +1 @@
+make $OPTS programs
diff --git a/net/libreswan/CONFLICTS b/net/libreswan/CONFLICTS
new file mode 100755
index 0000000..140c856
--- /dev/null
+++ b/net/libreswan/CONFLICTS
@@ -0,0 +1 @@
+conflicts openswan
diff --git a/net/libreswan/DEPENDS b/net/libreswan/DEPENDS
new file mode 100755
index 0000000..fbc7591
--- /dev/null
+++ b/net/libreswan/DEPENDS
@@ -0,0 +1,47 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends gmp &&
+depends nspr &&
+depends nss &&
+depends pkgconfig &&
+depends iptables &&
+
+if is_version_less $(get_kernel_version) 2.6.9; then
+ depends ipsec-tools
+else
+ depends iproute2 &&
+
+ if spell_ok iproute2 && is_version_less $(installed_version iproute2)
2.6.8; then
+ force_depends iproute2
+ fi
+fi &&
+
+optional_depends linux-pam \
+ "USE_XAUTHPAM=true" \
+ "USE_XAUTHPAM=false" \
+ "for pam/xauth support" &&
+
+optional_depends curl \
+ "USE_LIBCURL=true" \
+ "USE_LIBCURL=false" \
+ "for CRL fetching support via curl" &&
+
+optional_depends openldap \
+ "USE_LDAP=true" \
+ "USE_LDAP=false" \
+ "for CRL fetching support via openldap" &&
+
+optional_depends libselinux \
+ "USE_LABELED_IPSEC=true" \
+ "USE_LABELED_IPSEC=false" \
+ "for Labeled IPSec Functionality" &&
+
+optional_depends unbound \
+ "USE_DNSSEC=true" \
+ "USE_DNSSEC=false" \
+ "for DNSSEC support" &&
+
+optional_depends libcap-ng \
+ "USE_LIBCAP_NG=true" \
+ "USE_LIBCAP_NG=false" \
+ "to drop unneeded capabilities for the pluto daemon"
diff --git a/net/libreswan/DETAILS b/net/libreswan/DETAILS
new file mode 100755
index 0000000..20eb3a0
--- /dev/null
+++ b/net/libreswan/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=libreswan
+ VERSION=3.10
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=https://download.libreswan.org/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.libreswan.org/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE_GPG=libreswan.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ LICENSE[0]=GPL
+ WEB_SITE=http://libreswan.org/
+ ENTERED=20140506
+ KEYWORDS="net"
+ SHORT="IPsec implementation for Linux - Openswan fork"
+cat << EOF
+Libreswan is an IPsec implementation for Linux. It has support for most of
the
+extensions (RFC + IETF drafts) related to IPsec, including IKEv2, X.509
+Digital Certificates, NAT Traversal, and many others.
+Libreswan uses the native Linux IPsec stack (NETKEY/XFRM) per default.
+
+Libreswan was forked from Openswan 2.6.38, which was forked from FreeS/WAN
1.99.
+EOF
diff --git a/net/libreswan/HISTORY b/net/libreswan/HISTORY
new file mode 100644
index 0000000..cba2107
--- /dev/null
+++ b/net/libreswan/HISTORY
@@ -0,0 +1,10 @@
+2014-09-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.10
+
+2014-07-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.9
+ * no-pam.patch: removed, fixed by upstream
+
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, CONFLICTS, {PRE_,}BUILD, libreswan.gpg,
+ init.d/ipsec, no-pam.patch: created the spell
diff --git a/net/libreswan/PRE_BUILD b/net/libreswan/PRE_BUILD
new file mode 100755
index 0000000..63d5243
--- /dev/null
+++ b/net/libreswan/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:/usr/local:$INSTALL_ROOT/usr:g" Makefile.inc && # Install to
/usr
+sedit "s:=man:=share/man:" Makefile.inc # Install
manpages to /usr/share
diff --git a/net/libreswan/init.d/ipsec b/net/libreswan/init.d/ipsec
new file mode 100644
index 0000000..18fe740
--- /dev/null
+++ b/net/libreswan/init.d/ipsec
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/ipsec
+ARGS="setup"
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+status()
+{
+ $PROGRAM $ARGS status
+}
+
+start()
+{
+ $PROGRAM $ARGS start
+}
+
+stop()
+{
+ $PROGRAM $ARGS stop
+}
diff --git a/net/libreswan/libreswan.gpg b/net/libreswan/libreswan.gpg
new file mode 100644
index 0000000..f42c13c
Binary files /dev/null and b/net/libreswan/libreswan.gpg differ
diff --git a/net/mdnsresponder/BUILD b/net/mdnsresponder/BUILD
index 337b05e..1f5dbd8 100755
--- a/net/mdnsresponder/BUILD
+++ b/net/mdnsresponder/BUILD
@@ -1,2 +1,3 @@
cd $SOURCE_DIRECTORY/mDNSPosix/ &&
+make_single &&
make os=linux
diff --git a/net/mdnsresponder/DEPENDS b/net/mdnsresponder/DEPENDS
new file mode 100755
index 0000000..ff6a28e
--- /dev/null
+++ b/net/mdnsresponder/DEPENDS
@@ -0,0 +1,2 @@
+depends flex &&
+depends bison
diff --git a/net/mdnsresponder/DETAILS b/net/mdnsresponder/DETAILS
index 03dc403..219cea3 100755
--- a/net/mdnsresponder/DETAILS
+++ b/net/mdnsresponder/DETAILS
@@ -1,8 +1,8 @@
SPELL=mdnsresponder
- VERSION=333.10
+ VERSION=544
SOURCE=mDNSResponder-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:976502db2fcdf8d24cf81002179fd9ff38d2b8afb6a8183f424ebeee4e968bafb2dbcd9770424a71b3bda12bd2267093471ec31da30c6e4fc5d71eeba7b3e6c2
-
SOURCE_URL[0]=http://www.opensource.apple.com/darwinsource/tarballs/other/${SOURCE}
+
SOURCE_HASH=sha512:30bff5503e2efadeced05f90c882f63c01018deabafef660ee953be5d2cb8e047ebaf659faa54a9ad566ee39f9f16b0bc7046515aeb5e7a1b33fa66dd6e8a472
+
SOURCE_URL[0]=http://www.opensource.apple.com/tarballs/mDNSResponder/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mDNSResponder-$VERSION
WEB_SITE=http://developer.apple.com/networking/bonjour/index.html
ENTERED=20080107
diff --git a/net/mdnsresponder/HISTORY b/net/mdnsresponder/HISTORY
index af306df..f3664fd 100644
--- a/net/mdnsresponder/HISTORY
+++ b/net/mdnsresponder/HISTORY
@@ -1,3 +1,10 @@
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 544
+ update url
+ * BUILD: use make_single
+ * DEPENDS: added
+ * PRE_BUILD: added, to fix build
+
2012-05-30 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 333.10
* BUILD: no longer fails to build with multiple make jobs
diff --git a/net/mdnsresponder/PRE_BUILD b/net/mdnsresponder/PRE_BUILD
new file mode 100755
index 0000000..ac14106
--- /dev/null
+++ b/net/mdnsresponder/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -e '/%{/ i\
+%parse-param { void *context }\n
+' -e '/yyerror/s/(/( void *context,/' mDNSShared/dnsextd_parser.y
diff --git a/net/megatools/DEPENDS b/net/megatools/DEPENDS
new file mode 100755
index 0000000..83b00ac
--- /dev/null
+++ b/net/megatools/DEPENDS
@@ -0,0 +1,16 @@
+depends glib2 &&
+depends curl &&
+depends SSL &&
+depends glib-networking &&
+
+optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection for this build" &&
+
+optional_depends asciidoc \
+ "--enable-docs-build" \
+ "--disable-docs-build" \
+ "to build man pages instead of using bundled ones" &&
+
+optional_depends fuse "" "" "to build megafs utility"
diff --git a/net/megatools/DETAILS b/net/megatools/DETAILS
new file mode 100755
index 0000000..4fa9b12
--- /dev/null
+++ b/net/megatools/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=megatools
+ VERSION=1.9.92
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://megatools.megous.com/builds/$SOURCE
+
SOURCE_HASH=sha512:a2b1da7c97473fb921bd54933cc87f4be07203d17898066aca73a3b37390fc157c23baa8ed5a3c1f2be37a88af952e3737d321f327f0567c6d5d929e094e3102
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://megatools.megous.com/
+ LICENSE[0]=GPL
+ ENTERED=20140929
+ SHORT="command line client for mega.co.nz"
+cat << EOF
+Megatools is a collection of programs for accessing Mega service from a
command
+line of your desktop or server.
+
+Megatools allow you to copy individual files as well as entire directory
trees
+to and from the cloud. You can also perform streaming downloads for example
to
+preview videos and audio files, without needing to download the entire file.
+
+You can register account using a 'megareg' tool, with the benefit of having
true
+control of your encryption keys.
+
+Megatools are robust and optimized for fast operation - as fast as Mega
servers
+allow. Memory requirements and CPU utilization are kept at minimum.
+
+Mega website can be found at mega.co.nz.
+EOF
diff --git a/net/megatools/HISTORY b/net/megatools/HISTORY
new file mode 100644
index 0000000..9128a70
--- /dev/null
+++ b/net/megatools/HISTORY
@@ -0,0 +1,2 @@
+2014-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/net/minidlna/DETAILS b/net/minidlna/DETAILS
index dca2692..d76f2e3 100755
--- a/net/minidlna/DETAILS
+++ b/net/minidlna/DETAILS
@@ -1,9 +1,9 @@
SPELL=minidlna
- VERSION=1.1.1
+ VERSION=1.1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+#
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE
-#
SOURCE_HASH=sha512:bf1c2e7465ad24ae7c57f4270d40875227e0fb0e3db6c20fee7e286d7f93cfa17935475a8e9dda2da539d88f33fc4ec123a55e8cdf8e6656ae0e37306bb9625e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://minidlna.sourceforge.net/";
LICENSE[0]=GPL
diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index 581e7da..ed88cfe 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.2
+
2013-12-07 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.1.1
diff --git a/net/minidlna/minidlna-1.1.2.tar.gz.sig
b/net/minidlna/minidlna-1.1.2.tar.gz.sig
new file mode 100644
index 0000000..b79fc65
Binary files /dev/null and b/net/minidlna/minidlna-1.1.2.tar.gz.sig differ
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/DETAILS b/net/monit/DETAILS
index 4f9ce8a..3968692 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,8 +1,8 @@
SPELL=monit
- VERSION=5.8
+ VERSION=5.9
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://mmonit.com/${SPELL}/dist/${SOURCE}";
-
SOURCE_HASH=sha512:61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda
+
SOURCE_HASH=sha512:915d548d5a4e043b346ec32d9fd3131d7eafd8ed1167e4fca3d4918df9ff87a166dbb2b3398d59a8510c7190c43fe26043568742a27828257140683bea349c83
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://mmonit.com/monit/";
LICENSE[0]=GPL
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index 086fa8c..a0688fd 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,12 @@
+2014-09-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.9
+
+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
+
2014-03-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.8

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/net-tools/BUILD b/net/net-tools/BUILD
index 1f79ca2..65e023e 100755
--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -16,4 +16,3 @@ sedit '382,391s/$/\\n\\/' mii-tool.c
&&
./configure.sh config.in < smgl_config_opts &&
make_single &&
make COPTS="-D_GNU_SOURCE -Wall $CFLAGS" LOPTS="$LDFLAGS"
-
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index 5ef105b..772bee8 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -20,8 +20,14 @@ config_query ARCNET "ARCnet hardware support?"
y &&
config_query SLIP "SLIP (serial line) hardware support?" y &&
config_query PPP "PPP (serial line) hardware support?" y &&
config_query IPIP "IPIP Tunnel hardware support?" y &&
-config_query STRIP "STRIP (Metricom radio) hardware support?" y &&
-config_query TOKEN "Token ring (generic) hardware support?" y &&
+# Disable STRIP and Token Ring, not supported by kernel anymore, see
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700008 .
+#config_query STRIP "STRIP (Metricom radio) hardware support?" y &&
+persistent_add STRIP &&
+STRIP=n &&
+#config_query TOKEN "Token ring (generic) hardware support?" y &&
+persistent_add TOKEN &&
+TOKEN=n &&
config_query HWAX25 "AX25 (packet radio) hardware support?" y &&
config_query HWROSE "Rose (packet radio) hardware support?" y &&
config_query HWNETROM "NET/ROM (packet radio) hardware support?" y &&
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index dc4db4b..4e1f3eb 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD: disable STRIP and Token Ring lacking kernel
support
+
2009-09-30 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: use INITSCRIPTS provider

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..26c942a 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -1,6 +1,6 @@
depends autoconf &&
depends automake &&
-depends gawk &&
+depends AWK &&
depends geoip &&
depends gdbm &&
depends libtool &&
@@ -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/openswan/CONFLICTS b/net/openswan/CONFLICTS
new file mode 100755
index 0000000..132638a
--- /dev/null
+++ b/net/openswan/CONFLICTS
@@ -0,0 +1 @@
+conflicts libreswan
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index 93f38bb..318473b 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,6 @@
+2014-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, conflicts with new libreswan spell
+
2013-10-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.39; SECURITY_PATCH++ (CVE-2013-2053)
* openswan.gpg: added 9FC816CA public key (Openswan Master Signing Key
diff --git a/net/openvpn/DEPENDS b/net/openvpn/DEPENDS
index a4f8dc6..8a253e0 100755
--- a/net/openvpn/DEPENDS
+++ b/net/openvpn/DEPENDS
@@ -1,16 +1,26 @@
-depends linux-pam &&
+optional_depends linux-pam \
+ "--enable-plugin-auth-pam" \
+ "--disable-plugin-auth-pam" \
+ "to build auth-pam plugin" &&

-optional_depends openssl
\
- ""
\
- "--disable-crypto --disable-ssl"
\
- "for crypto and key exchange support (highly recommended)"
&&
+optional_depends SSL \
+ "--enable-crypto --enable-ssl" \
+ "--disable-crypto --disable-ssl" \
+ "for crypto and key exchange support (highly recommended)"
&&

-optional_depends lzo
\
- ""
\
- "--disable-lzo"
\
- "for LZO compression (highly recommended)"
&&
+optional_depends lzo \
+ "--enable-lzo" \
+ "--disable-lzo" \
+ "for LZO compression (highly recommended)" &&

-optional_depends SYSTEM-LOGGER
\
- ""
\
- ""
\
- "for logging through syslog"
+optional_depends iproute2 \
+ "--enable-iproute2" \
+ "--disable-iproute2" \
+ "for iproute2 support" &&
+
+optional_depends libselinux \
+ "--enable-selinux" \
+ "--disable-selinux" \
+ "for SELinux support" &&
+
+suggest_depends SYSTEM-LOGGER "" "" "for logging through syslog"
diff --git a/net/openvpn/DETAILS b/net/openvpn/DETAILS
index 4a2180d..d45b74e 100755
--- a/net/openvpn/DETAILS
+++ b/net/openvpn/DETAILS
@@ -1,5 +1,5 @@
SPELL=openvpn
- VERSION=2.3.2
+ VERSION=2.3.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/openvpn/HISTORY b/net/openvpn/HISTORY
index e946d8c..50a947f 100644
--- a/net/openvpn/HISTORY
+++ b/net/openvpn/HISTORY
@@ -1,3 +1,13 @@
+2014-09-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.3.4
+ * DEPENDS: made PAM optional; added missing dependencies -- iproute2,
+ libselinux; set SYSTEM-LOGGER as suggest dependency; added missing
+ flags
+ * INSTALL: quoting paths
+
+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/openvpn/INSTALL b/net/openvpn/INSTALL
index 0f29202..2c57664 100755
--- a/net/openvpn/INSTALL
+++ b/net/openvpn/INSTALL
@@ -1,2 +1,2 @@
default_install &&
-mkdir -p $INSTALL_ROOT/etc/openvpn
+mkdir -p "$INSTALL_ROOT/etc/openvpn"
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/DETAILS b/net/pppd-chldap/DETAILS
index 7bd6fde..02ff35b 100755
--- a/net/pppd-chldap/DETAILS
+++ b/net/pppd-chldap/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=pppd-chldap
- if [[ $PPPD_CHLDAP_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git://github.com/dkruchinin/pppd-ldap.git:$SPELL
diff --git a/net/pppd-chldap/HISTORY b/net/pppd-chldap/HISTORY
index 0ad87c4..b8e2918 100644
--- a/net/pppd-chldap/HISTORY
+++ b/net/pppd-chldap/HISTORY
@@ -1,3 +1,10 @@
+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
+
2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, CONFIGURE, PREPARE, {PRE_,}BUILD, INSTALL: spell
created
diff --git a/net/pppd-chldap/PREPARE b/net/pppd-chldap/PREPARE
index 9a91549..86a5079 100755
--- a/net/pppd-chldap/PREPARE
+++ b/net/pppd-chldap/PREPARE
@@ -1 +1,2 @@
-config_query PPPD_CHLDAP_AUTOUPDATE 'Automatically update on every system
update?' n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/net/pptp-linux/BUILD b/net/pptp-linux/BUILD
index 190baed..7206258 100755
--- a/net/pptp-linux/BUILD
+++ b/net/pptp-linux/BUILD
@@ -1 +1 @@
-make DESTDIR="$INSTALL_ROOT" OPTIMIZE="$CFLAGS"
+make DESTDIR="$INSTALL_ROOT" IP="/sbin/ip" OPTIMIZE="$CFLAGS"
diff --git a/net/pptp-linux/DEPENDS b/net/pptp-linux/DEPENDS
index 37f3364..9ae843d 100755
--- a/net/pptp-linux/DEPENDS
+++ b/net/pptp-linux/DEPENDS
@@ -1 +1,3 @@
-depends ppp
+depends ppp &&
+depends perl &&
+depends iproute2
diff --git a/net/pptp-linux/DETAILS b/net/pptp-linux/DETAILS
index 778234b..50d4a00 100755
--- a/net/pptp-linux/DETAILS
+++ b/net/pptp-linux/DETAILS
@@ -1,15 +1,17 @@
SPELL=pptp-linux
- VERSION=1.7.2
+ VERSION=1.8.0
SOURCE=pptp-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pptp-$VERSION
+ SOURCE2=$SOURCE.signature
SOURCE_URL[0]=$SOURCEFORGE_URL/pptpclient/$SOURCE
-
#SOURCE_HASH=sha512:1b57d933b818b6115d847116ce17bb377713eebf76cfb791e085ced42291e56045ec807310b898ec0684e9251d232f59dc12b56cc63fa834a6767cd198a1f4d9
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.signature
+ SOURCE_GPG=pptp.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/pptp-$VERSION"
LICENSE[0]=GPL
WEB_SITE=http://pptpclient.sourceforge.net/
KEYWORDS="microsoft net pptp"
ENTERED=20030602
- SHORT="A Linux client for the Microsoft PPTP protocol."
+ SHORT="Linux client for the Microsoft PPTP protocol"
cat << EOF
PPTP Client is a Linux, FreeBSD and NetBSD client for the proprietary
Microsoft Point-to-Point Tunneling Protocol, PPTP. Allows connection
diff --git a/net/pptp-linux/HISTORY b/net/pptp-linux/HISTORY
index f8d9fa9..7d85c12 100644
--- a/net/pptp-linux/HISTORY
+++ b/net/pptp-linux/HISTORY
@@ -1,3 +1,14 @@
+2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0; converted to upstream pgp signature
+ check; quoting paths; cleaned up
+ * DEPENDS: added missing dependency: iproute2
+ * BUILD: fixed ip binary path
+ * PRE_BUILD: added, to apply patch
+ * options.patch: added, to prevent options file from trashing on
+ non-castfs systems
+ * pptp.gpg: added, AE2466C0 public key (James Cameron
+ <quozl AT us.netrek.org>) imported
+
2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated VERSION to 1.7.2

diff --git a/net/pptp-linux/PRE_BUILD b/net/pptp-linux/PRE_BUILD
new file mode 100755
index 0000000..5409d5e
--- /dev/null
+++ b/net/pptp-linux/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/options.patch"
diff --git a/net/pptp-linux/options.patch b/net/pptp-linux/options.patch
new file mode 100644
index 0000000..ec25535
--- /dev/null
+++ b/net/pptp-linux/options.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2013-10-23 12:10:46.000000000 +0400
++++ Makefile 2014-06-25 22:45:47.565785309 +0400
+@@ -76,8 +76,10 @@
+ mkdir -p $(MANDIR)
+ install -m 644 pptp.8 $(MANDIR)
+ install -m 644 pptpsetup.8 $(MANDIR)
+- mkdir -p $(PPPDIR)
+- install -m 644 options.pptp $(PPPDIR)
++ if [ ! -f $(PPPDIR)/options.pptp ]; then \
++ mkdir -p $(PPPDIR) ; \
++ install -m 644 options.pptp $(PPPDIR) ; \
++ fi
+
+ uninstall:
+ $(RM) $(BINDIR)/pptp $(MANDIR)/pptp.8
diff --git a/net/pptp-linux/pptp-1.7.2.tar.gz.sig
b/net/pptp-linux/pptp-1.7.2.tar.gz.sig
deleted file mode 100644
index 24dfee7..0000000
Binary files a/net/pptp-linux/pptp-1.7.2.tar.gz.sig and /dev/null differ
diff --git a/net/pptp-linux/pptp.gpg b/net/pptp-linux/pptp.gpg
new file mode 100644
index 0000000..4801ede
Binary files /dev/null and b/net/pptp-linux/pptp.gpg differ
diff --git a/net/proxychains-ng/DETAILS b/net/proxychains-ng/DETAILS
new file mode 100755
index 0000000..91ec229
--- /dev/null
+++ b/net/proxychains-ng/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=proxychains-ng
+ SPELLX=${SPELL/-ng}
+ VERSION=4.8.1
+ SOURCE=${SPELLX}-$VERSION.tar.bz2
+ SOURCE_URL[1]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:6e1673b331722ea5f6282a055d9552e387a2d68cc5e0c3fbb310ebbf58d47f1c9de46f11bbe5977b328d7a0abf1a5f77c544ccea799cb047da5c8521ee7ec949
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ DOCS="AUTHORS ChangeLog TODO $DOCS"
+ WEB_SITE=https://github.com/rofl0r/proxychains-ng
+ ENTERED=20140430
+ LICENSE[0]=GPL
+ KEYWORDS="proxy"
+ SHORT="TCP and DNS through proxy server"
+cat << EOF
+ProxyChains is a UNIX program, that hooks network-related libc functions in
+DYNAMICALLY LINKED programs via a preloaded DLL (dlsym(), LD_PRELOAD) and
+redirects the connections through SOCKS4a/5 or HTTP proxies.
+
+It supports TCP only (no UDP/ICMP etc).
+EOF
diff --git a/net/proxychains-ng/HISTORY b/net/proxychains-ng/HISTORY
new file mode 100644
index 0000000..13c0c22
--- /dev/null
+++ b/net/proxychains-ng/HISTORY
@@ -0,0 +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/proxychains-ng/INSTALL b/net/proxychains-ng/INSTALL
new file mode 100755
index 0000000..180610f
--- /dev/null
+++ b/net/proxychains-ng/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+
+install_config_file "$SOURCE_DIRECTORY/src/proxychains.conf" \
+ "$INSTALL_ROOT/etc/proxychains.conf"
diff --git a/net/samba/BUILD b/net/samba/BUILD
index 667bf34..e00bc74 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -3,10 +3,11 @@ OPTS="--with-swatdir=/usr/share/swat \
--with-automount \
--with-winbind \
--with-libsmbclient \
+ PKG_CONFIG="$INSTALL_ROOT/usr/bin/pkg-config" \
$SAMBA_QUOTA \
$OPTS" &&

-cd $SOURCE_DIRECTORY/source3 &&
+cd $SOURCE_DIRECTORY/source3 &&
default_build &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index 48e457e..95378a3 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -1,5 +1,6 @@
depends e2fsprogs &&
depends popt "--without-included-popt" &&
+depends pkgconfig &&

if [[ "$SAMBA_AD" == "y" ]]; then
depends openldap "--with-ldap" &&
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index ab142f0..a4d8bac 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,12 +1,12 @@
SPELL=samba
- VERSION=3.6.22
- SECURITY_PATCH=21
+ VERSION=3.6.24
+ SECURITY_PATCH=23
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981
+
SOURCE_HASH=sha512:40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 2db1eaa..e292c9b 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,11 @@
+2014-06-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.24, SECURITY_PATCH=23, CVE-2014-0244 and CVE-2014-3493
+
+2014-04-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.23; SECURITY_PATCH++ (CVE-2013-4496)
+ * DEPENDS: depends pkgconfig
+ * BUILD: pass pkg-config script's path to properly locate tdb and
talloc
+
2013-12-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.22, SECURITY_PATCH=21, CVE-2013-4408 and CVE-2012-6150

diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index dac8217..ce8c5fe 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=samba4
if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
- if [[ "$SAMBA4_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.samba.org/samba.git:$SPELL
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index ed1d789..cf1538c 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-11-23 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Fixed stable to just use default_pre_build, the other
way leaves no files
* DEPENDS: Fixed --with-sendfile-support syntax
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/DETAILS b/net/stunnel/DETAILS
index ee48212..996d153 100755
--- a/net/stunnel/DETAILS
+++ b/net/stunnel/DETAILS
@@ -1,5 +1,5 @@
SPELL=stunnel
- VERSION=4.56
+ VERSION=5.03
BRANCH=$(echo $VERSION | cut -d. -f1)
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY
index 8553af6..29891ca 100644
--- a/net/stunnel/HISTORY
+++ b/net/stunnel/HISTORY
@@ -1,3 +1,9 @@
+2014-09-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.03
+
+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/tcp_wrappers/BUILD b/net/tcp_wrappers/BUILD
index 006f4ca..bc8814d 100755
--- a/net/tcp_wrappers/BUILD
+++ b/net/tcp_wrappers/BUILD
@@ -2,5 +2,9 @@
sed -i "/^extern/d" scaffold.c &&
patch -p 1 < $SCRIPT_DIRECTORY/tcp_wrappers.patch &&

+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ # There are folks who want to link libwrap into shared objects.
+ CFLAGS+=" -DPIC -fPIC"
+fi
sedit 's/= -O/= '"$CFLAGS"'/' Makefile &&
make REAL_DAEMON_DIR=${INSTALL_ROOT}/usr/sbin linux
diff --git a/net/tcp_wrappers/HISTORY b/net/tcp_wrappers/HISTORY
index 34e996d..5b81b5e 100644
--- a/net/tcp_wrappers/HISTORY
+++ b/net/tcp_wrappers/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: enforce PIC on x86-64 to enable other spells to include
+ libwrap.a in dynamic libs, which does happen and fails otherwise
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

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/DETAILS b/net/tcpdump/DETAILS
index 058c57e..d8af69f 100755
--- a/net/tcpdump/DETAILS
+++ b/net/tcpdump/DETAILS
@@ -1,5 +1,5 @@
SPELL=tcpdump
- VERSION=4.5.1
+ VERSION=4.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index ecf8cde..fea2605 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,12 @@
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.6.2
+
+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
+
2013-11-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.5.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/DETAILS b/net/tinc/DETAILS
index fc927a0..b02bcf0 100755
--- a/net/tinc/DETAILS
+++ b/net/tinc/DETAILS
@@ -1,5 +1,5 @@
SPELL=tinc
- VERSION=1.0.23
+ VERSION=1.0.24
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE2=$SOURCE.sig
diff --git a/net/tinc/HISTORY b/net/tinc/HISTORY
index 897e994..c2ec79b 100644
--- a/net/tinc/HISTORY
+++ b/net/tinc/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-10-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.23; don't do useless doc'ing

diff --git a/net/tor.gpg b/net/tor.gpg
index 8fc8f2d..0ad4de0 100644
Binary files a/net/tor.gpg and b/net/tor.gpg differ
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/DETAILS b/net/tor/DETAILS
index 76de97c..a163862 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,10 +1,10 @@
SPELL=tor

if [ "$TOR_DEVEL" == "y" ]; then
- VERSION=0.2.2.23-alpha
+ VERSION=0.2.5.6-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.3.25
+ VERSION=0.2.4.22
SECURITY_PATCH=10
fi

diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 22c0dc4..7cccf46 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,12 @@
+2014-09-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 0.2.5.6-alpha
+
+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
+
2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.3.25; SECURITY_PATCH++ (CVE-2012-5573)

diff --git a/net/traceroute/DETAILS b/net/traceroute/DETAILS
index 323f7c5..9249c59 100755
--- a/net/traceroute/DETAILS
+++ b/net/traceroute/DETAILS
@@ -1,9 +1,9 @@
SPELL=traceroute
- VERSION=2.0.19
+ VERSION=2.0.20
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:406b742dd0248720f1c15f2fc30050f9c420c8cfe564028b6f9519158afcbde6810af10d86739377809342762cb403fc32487867413a281b0644349ede125485
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d
WEB_SITE=http://traceroute.sourceforge.net/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/net/traceroute/HISTORY b/net/traceroute/HISTORY
index 7f098a7..1f26aa8 100644
--- a/net/traceroute/HISTORY
+++ b/net/traceroute/HISTORY
@@ -1,3 +1,7 @@
+2014-07-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.0.20
+
2013-12-06 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: 2.0.19

diff --git a/net/tsocks/DETAILS b/net/tsocks/DETAILS
index 1d4b17e..d8c74e8 100755
--- a/net/tsocks/DETAILS
+++ b/net/tsocks/DETAILS
@@ -1,9 +1,11 @@
SPELL=tsocks
- VERSION=1.8beta5
+ XVERSION=1.8
+ BETAVERSION=5
+ VERSION=${XVERSION}beta${BETAVERSION}

SOURCE_HASH=sha512:b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/beta*/}
- SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${XVERSION}%20beta%20${BETAVERSION}/${SOURCE}
LICENSE[0]=GPL
PATCHLEVEL=1
WEB_SITE=http://tsocks.sourceforge.net
diff --git a/net/tsocks/HISTORY b/net/tsocks/HISTORY
index 5d9919c..f4306d8 100644
--- a/net/tsocks/HISTORY
+++ b/net/tsocks/HISTORY
@@ -1,3 +1,6 @@
+2014-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
2008-01-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++ to install extra scripts
* INSTALL: Install socks inspection and configuration syntax check
scripts
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/vidalia/DETAILS b/net/vidalia/DETAILS
index f415065..a1a1f55 100755
--- a/net/vidalia/DETAILS
+++ b/net/vidalia/DETAILS
@@ -1,5 +1,5 @@
SPELL=vidalia
- VERSION=0.2.10
+ VERSION=0.2.21
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.torproject.org/${SPELL}/dist/${SOURCE}
SOURCE2=$SOURCE.asc
diff --git a/net/vidalia/HISTORY b/net/vidalia/HISTORY
index 9eabe61..efbadd2 100644
--- a/net/vidalia/HISTORY
+++ b/net/vidalia/HISTORY
@@ -1,3 +1,6 @@
+2014-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.21
+
2010-10-20 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.2.10
fixed WEB_SITE
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/whois/DETAILS b/net/whois/DETAILS
index 2e3449c..38effc2 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
SPELL=whois
- VERSION=5.1.1
+ VERSION=5.1.5
SOURCE=${SPELL}_$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-
SOURCE_HASH=sha512:aea7b3ca73162737dfbc363d837538a5c4d287c4adb1407073e5d34523a04d93088166da6202b19c377f3d65891764d43d2a7ba506aa354252a7601cd91f0117
+
SOURCE_HASH=sha512:99fb43494aa7ff809055e31679eecb1d8a2a1276c54e550a9559cbca84c4ed7044953bf86f9f155e28f4a3c9d78f7c87ec28188f971c8f30e07d4ca5ef03c8eb
WEB_SITE=http://www.linux.it/~md/software/
ENTERED=20011228
LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index b3c507c..2e208f3 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,9 @@
+2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.5
+
+2014-07-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.4
+
2014-01-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.1.1

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 56f5817..b2a6909 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,3 +1,4 @@
+CFLAGS="$CFLAGS -I$INSTALL_ROOT/usr/include/libnl3"
cd "$SOURCE_DIRECTORY/wpa_supplicant"

# Create .config file for make (this is here instead of PRE_BUILD because
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index b19658a..597453e 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -1,12 +1,18 @@
depends wireless_tools &&

+if [ "$CONFIG_DRIVER_NL80211" = y ]; then
+ depends libnl
+fi &&
+
if [[ $CONFIG_EAP_SIM == y || $CONFIG_EAP_AKA == y ]]; then
depends pcsc-lite
fi &&

-if [[ $CONFIG_TLS && $CONFIG_TLS != internal ]]; then
- depends $CONFIG_TLS
-fi &&
+case "$CONFIG_TLS" in
+internal) ;;
+openssl) depends SSL ;;
+*) depends $CONFIG_TLS ;;
+esac &&

if [[ $CONFIG_DNET_PCAP == y || $CONFIG_L2_PACKET == pcap ]]; then
depends libpcap &&
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index b8dcc0b..431042c 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2014-08-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Allow the use of libressl
+ * BUILD, DEPENDS: nl80211 support requires libnl
+
2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD, INSTALL: dbus service patching isn't required for 1.1;
fixed build
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/config-param/DETAILS b/perl-cpan/config-param/DETAILS
index 474df04..fd43ed2 100755
--- a/perl-cpan/config-param/DETAILS
+++ b/perl-cpan/config-param/DETAILS
@@ -1,8 +1,8 @@
SPELL=config-param
- VERSION=3.000010
+ VERSION=3.001000
SOURCE="Config-Param-${VERSION}.tar.gz"
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TH/THORGIS/${SOURCE}
-
SOURCE_HASH=sha512:794ef0bf8353923b40cbf00d49c5d65df67d64aec8001547e4da03f3165bf93590af90f31bdc8292704e6f409fd6691093e84dbcbe0cb5b83f69dacd873ce262
+
SOURCE_HASH=sha512:094760ccba97af0743a92ef55c6480da94e081c9bbe4f9f9ecd4cf91b9b50314ae09a215b29807b07242178132ddd4689f0e341e395d455c62a9b4cb0c2ad8f6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Config-Param-${VERSION}"
WEB_SITE="http://search.cpan.org/~thorgis/Config-Param/";
LICENSE[0]=ART
diff --git a/perl-cpan/config-param/HISTORY b/perl-cpan/config-param/HISTORY
index ec73eec..87a0b8f 100644
--- a/perl-cpan/config-param/HISTORY
+++ b/perl-cpan/config-param/HISTORY
@@ -1,3 +1,6 @@
+2014-05-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 3.001000
+
2012-10-04 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 3.000010

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/date-manip/DETAILS b/perl-cpan/date-manip/DETAILS
index c705947..5f971c4 100755
--- a/perl-cpan/date-manip/DETAILS
+++ b/perl-cpan/date-manip/DETAILS
@@ -1,6 +1,6 @@
SPELL=date-manip
- VERSION=6.39
-
SOURCE_HASH=sha512:1d4c0a3d997f623686acb5689458e78f023c608fc59d47b8bbf582470a144a84d043f7e1c9768f9191d4418e4c1195bc850a64ee84982c0ef1b0ee266680167d
+ VERSION=6.43
+
SOURCE_HASH=sha512:00b60957f11c076ecb6f971911d33c438d68e9b9c22ca7425cdd700c397ce6f0d4e876a9d666295a009c2efd9bf617af633662b7ea29d4ee07e2b48927bc5020
SOURCE=Date-Manip-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Date-Manip-$VERSION
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SB/SBECK/$SOURCE
diff --git a/perl-cpan/date-manip/HISTORY b/perl-cpan/date-manip/HISTORY
index af72d6b..4b2728c 100644
--- a/perl-cpan/date-manip/HISTORY
+++ b/perl-cpan/date-manip/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 6.43
+
2013-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 6.39

diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 5e073d8..561ef2d 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,9 +1,9 @@
SPELL=dbi
- VERSION=1.630
-
SOURCE_HASH=sha512:e7524d46ad54e3766a035c424964d381ab9d771120382e99e4f35b422caccadf4049ec273424ee3b3ef558ff8d2125ac674c0ca23bfa4708ef78e66dbd1b4c78
+ VERSION=1.631
+
SOURCE_HASH=sha512:7ed04167cfeb1f256613f06179d5280bbbf53e1d93d3306d5654f7278572f5cb131fb9ad16403cde05215c741cedd77e51b7cbdef15b5d4ea9dc79490775fa9e
SOURCE=DBI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
+ SOURCE_URL[0]=http://cpan.metacpan.org/authors/id/T/TI/TIMB/$SOURCE
LICENSE=ART
WEB_SITE=http://dbi.perl.org
ENTERED=20011108
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index 7470b90..889c490 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,7 @@
+2014-06-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.631
+ new url
+
2013-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.630

diff --git a/perl-cpan/file-copy-recursive/DEPENDS
b/perl-cpan/file-copy-recursive/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/file-copy-recursive/DETAILS
b/perl-cpan/file-copy-recursive/DETAILS
new file mode 100755
index 0000000..f7c1e05
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=file-copy-recursive
+ VERSION=0.38
+ SOURCE="File-Copy-Recursive-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/${SOURCE}
+
SOURCE_HASH=sha512:49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/File-Copy-Recursive-${VERSION}"
+ WEB_SITE="http://search.cpan.org/~dmuey/File-Copy-Recursive-0.38/";
+ LICENSE[0]="Artistic"
+ ENTERED=20140510
+ KEYWORDS=""
+ SHORT="Perl extension for recursively copying files and
directories"
+cat << EOF
+Perl extension for recursively copying files and directories.
+EOF
diff --git a/perl-cpan/file-copy-recursive/HISTORY
b/perl-cpan/file-copy-recursive/HISTORY
new file mode 100644
index 0000000..d56d6ac
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/HISTORY
@@ -0,0 +1,3 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/file-desktopentry/DEPENDS
b/perl-cpan/file-desktopentry/DEPENDS
index ded78bc..017abe3 100755
--- a/perl-cpan/file-desktopentry/DEPENDS
+++ b/perl-cpan/file-desktopentry/DEPENDS
@@ -1 +1,2 @@
-depends file-spec
+depends file-spec &&
+depends file-basedir
diff --git a/perl-cpan/file-desktopentry/HISTORY
b/perl-cpan/file-desktopentry/HISTORY
index 20a6f78..59c6263 100644
--- a/perl-cpan/file-desktopentry/HISTORY
+++ b/perl-cpan/file-desktopentry/HISTORY
@@ -1,3 +1,6 @@
+2014-04-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on file-basedir
+
2008-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 0.04

diff --git a/perl-cpan/finance-quote/DETAILS b/perl-cpan/finance-quote/DETAILS
index 77f0f07..68619b5 100755
--- a/perl-cpan/finance-quote/DETAILS
+++ b/perl-cpan/finance-quote/DETAILS
@@ -1,7 +1,7 @@
SPELL=finance-quote
SPELLX=Finance-Quote
- VERSION=1.17
-
SOURCE_HASH=sha512:c55c8ebca493dafc9593e49f9fba48131fba6d7dd6bb956b6c6f6dbfefe579c73e24bab86d69fb4e088f8733d8fb9a236a87c52e9d77384c3609de004eb6c900
+ VERSION=1.35
+
SOURCE_HASH=sha512:bf04da96dcf66a4789eb6ca76fa7b2c7ff5ec618e9ac69885c6c9eca6c1ef524c45adb4833c12b9fd7fa29c4ebc44f5a94d7733c3b49ff97cb14930c55ee563a
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/perl-cpan/finance-quote/HISTORY b/perl-cpan/finance-quote/HISTORY
index ba16e72..9b7c89a 100644
--- a/perl-cpan/finance-quote/HISTORY
+++ b/perl-cpan/finance-quote/HISTORY
@@ -1,3 +1,6 @@
+2014-06-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.35
+
2009-12-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.17

diff --git a/perl-cpan/image-exiftool/DETAILS
b/perl-cpan/image-exiftool/DETAILS
index 458d4a6..783924b 100755
--- a/perl-cpan/image-exiftool/DETAILS
+++ b/perl-cpan/image-exiftool/DETAILS
@@ -1,8 +1,8 @@
SPELL=image-exiftool
- VERSION=9.27
+ VERSION=9.70
SOURCE="Image-ExifTool-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.sno.phy.queensu.ca/~phil/exiftool/${SOURCE}
-
SOURCE_HASH=sha512:af7bccc262def4b394d5f8ff132bec5b5833ce3d87eee30f7e6f9ff0b3957f9fba2d23dedc10176e20159a08d8f43e34639c670d5cb9007b75a1ec671ed04977
+
SOURCE_HASH=sha512:8345d7db73c88177ebe8fb74f18ce711d8dce64426cefaadeccd5f6eaf4c22e35834577c5b23d5dd9de71c48286189bd419c40e100b5d1d2d70d03045d9f6a31
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Image-ExifTool-${VERSION}"
WEB_SITE="http://www.sno.phy.queensu.ca/~phil/exiftool/";
LICENSE[0]=PERL
diff --git a/perl-cpan/image-exiftool/HISTORY
b/perl-cpan/image-exiftool/HISTORY
index c31ebe4..3d124ad 100644
--- a/perl-cpan/image-exiftool/HISTORY
+++ b/perl-cpan/image-exiftool/HISTORY
@@ -1,3 +1,6 @@
+2014-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.70
+
2013-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 9.27

diff --git a/perl-cpan/mail-imapclient/DETAILS
b/perl-cpan/mail-imapclient/DETAILS
index b6fde77..e9ffec1 100755
--- a/perl-cpan/mail-imapclient/DETAILS
+++ b/perl-cpan/mail-imapclient/DETAILS
@@ -1,9 +1,9 @@
SPELL=mail-imapclient
- VERSION=2.2.9
+ VERSION=3.35
SOURCE=Mail-IMAPClient-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mail-IMAPClient-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/D/DJ/DJKERNEN/$SOURCE
-
SOURCE_HASH=sha512:231b9f7c6d0118aaa1c4a940c65ff30b9ca9041563f59279b900d881756e23cc3a440046273e48e5bc106bac00080020c427e41b6a1b8fe55be19b12eda22e80
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/P/PL/PLOBBES/$SOURCE
+
SOURCE_HASH=sha512:c8fc11d098a0c0370347155e860e4eb1b0842c5de825f206d166bd6d99d510a492aa0ebe5a15f561aae1f379641f502fc4984660be2a0b42be52a01a58661595
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=Mail::IMAPClient";
ENTERED=20081015
diff --git a/perl-cpan/mail-imapclient/HISTORY
b/perl-cpan/mail-imapclient/HISTORY
index 7ddac42..6c05910 100644
--- a/perl-cpan/mail-imapclient/HISTORY
+++ b/perl-cpan/mail-imapclient/HISTORY
@@ -1,3 +1,7 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 3.35
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

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/perl-cpan/parse-debcontrol/DEPENDS
b/perl-cpan/parse-debcontrol/DEPENDS
new file mode 100755
index 0000000..6826bc7
--- /dev/null
+++ b/perl-cpan/parse-debcontrol/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/parse-debcontrol/DETAILS
b/perl-cpan/parse-debcontrol/DETAILS
new file mode 100755
index 0000000..f44a164
--- /dev/null
+++ b/perl-cpan/parse-debcontrol/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=parse-debcontrol
+ SPELLX=Parse-DebControl
+ VERSION=2.005
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/J/JA/JAYBONCI/$SOURCE
+
SOURCE_HASH=sha512:1a496bf8ea7ca3a2f7068a916fa3c2256f828195525d1519c1bd170737864775b7486d669ee635965b3512ee34da232401fa75efd3569dc142896eab71484f41
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE="http://search.cpan.org/dist/$SPELLX/lib/${SPELLX/-//}.pm";
+ LICENSE[0]="Artistic"
+ ENTERED=20140415
+ KEYWORDS=""
+ SHORT="Easy OO parsing of debian control-like files"
+cat << EOF
+Parse::DebControl is an easy OO way to parse debian control files and other
+colon separated key-value pairs. It's specifically designed to handle the
+format used in Debian control files, template files, and the cache files
+used by dpkg.
+
+For basic format information see:
+http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-controlsyntax
+
+This module does not actually do any intelligence with the file content
+(because there are a lot of files in this format), but merely handles the
+format. It can handle simple control files, or files hundreds of lines long
+efficiently and easily.
+EOF
diff --git a/perl-cpan/parse-debcontrol/HISTORY
b/perl-cpan/parse-debcontrol/HISTORY
new file mode 100644
index 0000000..feaa31e
--- /dev/null
+++ b/perl-cpan/parse-debcontrol/HISTORY
@@ -0,0 +1,2 @@
+2014-04-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/perl-cpan/perl-error/DETAILS b/perl-cpan/perl-error/DETAILS
index 961df68..9cc9a8d 100755
--- a/perl-cpan/perl-error/DETAILS
+++ b/perl-cpan/perl-error/DETAILS
@@ -1,8 +1,8 @@
SPELL=perl-error
- VERSION=0.17020
-#
SOURCE_HASH=sha512:3336230dd3c65a657e44e9c2bb57638b3d66ad2de6192ea5a1e6ccb9585caebe59988c7802b234f1663b2bd51ec5c1cebb84dd9c859488184b3c992b5b714d4c
+ VERSION=0.17022
+
SOURCE_HASH=sha512:ebfddf176044cb3edb656fb555ebf77ac8d08860505bcf0bc3778e1c927ab9e34c6c9400713e96d3cbc94fdac554752949826c6bd32e28352fd4d2157a6a1e99
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE=Error-$VERSION.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SH/SHLOMIF/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Error-$VERSION"
WEB_SITE=http://search.cpan.org/~shlomif/Error/
diff --git a/perl-cpan/perl-error/Error-0.17020.tar.gz.sig
b/perl-cpan/perl-error/Error-0.17020.tar.gz.sig
deleted file mode 100644
index 4cfeb15..0000000
Binary files a/perl-cpan/perl-error/Error-0.17020.tar.gz.sig and /dev/null
differ
diff --git a/perl-cpan/perl-error/HISTORY b/perl-cpan/perl-error/HISTORY
index ab2c4d6..53a0ad7 100644
--- a/perl-cpan/perl-error/HISTORY
+++ b/perl-cpan/perl-error/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.17022
+
2013-06-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.17020

diff --git a/php-pear/memcache/DETAILS b/php-pear/memcache/DETAILS
index b9ce401..3098210 100755
--- a/php-pear/memcache/DETAILS
+++ b/php-pear/memcache/DETAILS
@@ -1,8 +1,8 @@
SPELL=memcache
- VERSION=3.0.7
+ VERSION=3.0.8
SOURCE=$SPELL-$VERSION.tgz
SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-
SOURCE_HASH=sha512:c40a9d831b347c877d7a56bf21a7f96a715a7e251212963daf7aa01564a27bbc8fbcab55fc4a20976763b32d6498501b031776fc531d094389ea98853282cefe
+
SOURCE_HASH=sha512:916c6b21ab7c1021128626c0df35ef0b83cb76b6115fe7c45b003ca4f78ad9484bf3c998bc7ebdee19f84349ff1e56759f74e75aee5bc70b1de9a03c45a99bc3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pecl.php.net/package/memcache/
LICENSE[0]=PHP
diff --git a/php-pear/memcache/HISTORY b/php-pear/memcache/HISTORY
index 91078da..0d5a79e 100644
--- a/php-pear/memcache/HISTORY
+++ b/php-pear/memcache/HISTORY
@@ -1,3 +1,6 @@
+2014-09-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.8
+
2012-10-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.7

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/DETAILS b/php-pear/php-dev/DETAILS
index 39c0bd7..3217d64 100755
--- a/php-pear/php-dev/DETAILS
+++ b/php-pear/php-dev/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=php-dev
-if [ "$PHP_DEV_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=6.0
-fi
- SNAP_VER=svn
+ VERSION=$(get_scm_version)
+ SNAP_VER=svn
SOURCE=$SPELL-${SNAP_VER}.tar.bz2
SOURCE_IGNORE=volatile
LICENSE[0]=http://www.php.net/license/3_0.txt
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 3ad9a33..9c06a31 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,12 @@
+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
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index ad80f0a..385b776 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 $(get_spell_provider $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)"
@@ -102,9 +102,9 @@ if is_version_less 5.2.9999 "${VERSION}"; then
"use enchant for spelling functions?" &&

optional_depends icu \
- "--with-icu-dir=${INSTALL_ROOT}/usr" \
- "--without-icu-dir" \
- "for ICU unicode support" &&
+ "--enable-intl --with-icu-dir=${INSTALL_ROOT}/usr" \
+ "--disable-intl --without-icu-dir" \
+ "for ICU unicode (internationalization) support" &&

optional_depends oniguruma \
"--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 96595bc..9253d0b 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.26
- SECURITY_PATCH=4
+ VERSION=5.4.33
+ SECURITY_PATCH=9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:9ff29943bfe283fc5b925a2d463a4bc6e4bd070909f202ce6e3a45a7281720b550d5569c5ee8e60412342739833d237974442182c392cfa1b2e9d73375f897ef
+
SOURCE_HASH=sha512:c7a97db745aa77c2deccea022d97732bce736ccd481a7b6c63d7da79ce3d1a4d13d3f4968bfdab3ac1091a23dd6a243f3d3b0b2ac688205decc944d3d6ecf347
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 cb5d48f..ebefc20 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,42 @@
+2014-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.33 (stable)
+ * DEPENDS: corrected SSL case
+
+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
+
+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)
+
+2014-06-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.30 (stable); SECUIRTY_PATCH++
+ (CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
+ CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515)
+
+2014-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.29 (stable); SECUIRTY_PATCH++
+ (CVE-2014-0238, CVE-2014-0237)
+
+2014-05-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.28 (stable); SECUIRTY_PATCH++
+ (CVE-2014-0185)
+
+2014-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.27 (stable); SECUIRTY_PATCH++
+ (CVE-2013-7345)
+ * DEPENDS: added intl enable/disable flags for icu
+
2014-03-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.26 (stable); SECUIRTY_PATCH++
(CVE-2014-1943, CVE-2014-2270)
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/BUILD b/printer/cups-filters/BUILD
index 695f4c8..31e759c 100755
--- a/printer/cups-filters/BUILD
+++ b/printer/cups-filters/BUILD
@@ -1,3 +1,4 @@
OPTS="--with-rcdir=no $OPTS" &&
-
-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS
index fd42b04..31b697a 100755
--- a/printer/cups-filters/DETAILS
+++ b/printer/cups-filters/DETAILS
@@ -1,6 +1,6 @@
SPELL=cups-filters
- VERSION=1.0.50
-
SOURCE_HASH=sha512:8b10b9cf5bd0a6da11e26e56f7bce3b7122f6eb330f1c79102023df0ca363a6ebccd4e2e1e38ef3de32a22fadd9fee73b89ff516c2fe23339bb23b56535e238d
+ VERSION=1.0.59
+
SOURCE_HASH=sha512:f28eadf8a687b60245941ad13526544d9eaf0d7c85e74dbd0d9fb22df65bb60a7e6fc2be2092dff6198d6f376c1b9eb6ee3c948901bd0cd47bce85404de451b7
# 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 4a35b0e..5e63f91 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,21 @@
+2014-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.59
+
+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
+
+2014-05-24 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Use make_single
+
+2014-04-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.53
+
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.52
+
2014-03-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.50

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 810813b..67dee1b 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -2,6 +2,8 @@ depends zlib &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends shared-mime-info &&
+depends mdnsresponder &&
+
optional_depends libpaper \
'--enable-libpaper' \
'--disable-libpaper' \
@@ -39,21 +41,18 @@ 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" \
"" \
"" \
"for file system access control lists support" &&

+optional_depends krb5 '--enable-gssapi' '--disable-gssapi' 'GSSAPI support'
&&

suggest_depends ghostscript '' '' 'to print Postscript files'
suggest_depends cups-filters '' '' 'extra backends and filters'
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 4a09d4b..9b92f66 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -3,9 +3,9 @@
# VERSION=1.4.3
# SOURCE_HASH=sha512:
#else
- VERSION=1.7.1
-
SOURCE_HASH=sha512:e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57
- SECURITY_PATCH=5
+ VERSION=1.7.5
+
SOURCE_HASH=sha512:fe446b3d904539d744d3fa24f3ced2549ef9dfea8c805f1602eb71d03e19c2f06edaacf51f148e8216207af0c901f7d956c855f49b13b01112b01c9c45b75b9d
+ SECURITY_PATCH=7
#fi
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/printer/cups/FINAL b/printer/cups/FINAL
index 8abcc90..604cb27 100755
--- a/printer/cups/FINAL
+++ b/printer/cups/FINAL
@@ -1 +1,2 @@
+default_final &&
update-mime-database /usr/share/mime/
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index f2411f5..f95133c 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,26 @@
+2014-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add krb5
+ * FINAL: specify default_final
+
+2014-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.5
+ SECURITY_PATCH++, fix CVE-2014-5029/5030/5031
+
+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
+
+2014-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.3
+ * DEPEDNS: add mdnsresponder
+
2014-01-9 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.1

diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 73287b3..f92f602 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,4 +1,5 @@
depends e2fsprogs &&
+depends fontconfig &&
depends freetype2 &&
depends JPEG &&
depends tiff '--with-system-libtiff' &&
@@ -32,7 +33,7 @@ optional_depends libpaper \
"papersize support" &&

optional_depends "CUPS" \
- "--enable-cups --with-install-cups" \
+ "--enable-cups" \
"--disable-cups" \
"CUPS print spooler support" &&

@@ -45,3 +46,5 @@ optional_depends "openjpeg" \
"--enable-openjpeg" \
"--disable-openjpeg" \
"JPX decoding"
+
+optional_depends lcms2 '' '' 'colour support'
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 4c48187..3c5462a 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,6 +1,6 @@
SPELL=ghostscript
- VERSION=9.10
-
SOURCE_HASH=sha512:59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04
+ VERSION=9.15
+
SOURCE_HASH=sha512:5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index b99cfd7..081aaac 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,14 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.15
+
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: fontconfig
+
+2014-08-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.14
+ * DEPENDS: remove obsolete cups option
+ * PRE_BUILD: remove some more embedded libraries
+
2013-09-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.10

diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index 1f9a497..198cfab 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jasper jpeg jpegxr lcms libpng openjpeg tiff zlib
+rm -rf freetype jpeg jpegxr lcms libpng openjpeg tiff lcms2 cups ijs expat
*.vcproj
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/DETAILS b/printer/gutenprint/DETAILS
index a60b561..b10a1bc 100755
--- a/printer/gutenprint/DETAILS
+++ b/printer/gutenprint/DETAILS
@@ -5,8 +5,8 @@
# SOURCE=$SPELL$VERSION.tar.bz2
#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL$VERSION"
#else
- VERSION=5.2.9
-
SOURCE_HASH=sha512:082990e09c49247baab9575b34882026770923915eb1c4ff6f75475cd341691263c7567a430542ead868e80ee6ea82e00ad12c89be0611913f934d66a10a9549
+ VERSION=5.2.10
+
SOURCE_HASH=sha512:bb71fd5c127748730dde01471b09907d500b72c35401abaf92c631d04156bacafd4b1a9baef61f48db6c4a622fd612a1e2834ed30207b5b178767ea9d9d5e1ac
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
#fi
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index de87d36..acca22b 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,11 @@
+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
+
2012-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.2.9

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/alembic/DETAILS b/python-pypi/alembic/DETAILS
index c3e4889..871bbf3 100755
--- a/python-pypi/alembic/DETAILS
+++ b/python-pypi/alembic/DETAILS
@@ -1,6 +1,6 @@
SPELL=alembic
- VERSION=0.6.4
-
SOURCE_HASH=sha512:8bcc294329b58f672582384e98bd015933efcaa4345f28e67b34bd623cce7a7cd532837ddfe71e286c73c98d70f161cb722b5dd285a4a381c2a912329c196324
+ VERSION=0.6.5
+
SOURCE_HASH=sha512:9498887714c1b48921032f807cb06c17fae44e087ad395b004aea0afca85f1709bfef5760b3636d314653a04fc7e13a31360891fa50154fd57267609cc94b19a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/a/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/alembic/HISTORY b/python-pypi/alembic/HISTORY
index 9e68589..e09498d 100644
--- a/python-pypi/alembic/HISTORY
+++ b/python-pypi/alembic/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.5
+
2014-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.4

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
new file mode 100755
index 0000000..e1f77c1
--- /dev/null
+++ b/python-pypi/attic/DEPENDS
@@ -0,0 +1,8 @@
+depends python3 &&
+depends msgpack-python &&
+depends pySSL &&
+depends cython &&
+optional_depends python-llfuse \
+ "" \
+ "" \
+ ""
diff --git a/python-pypi/attic/DETAILS b/python-pypi/attic/DETAILS
new file mode 100755
index 0000000..782f354
--- /dev/null
+++ b/python-pypi/attic/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=attic
+ VERSION=0.12
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=https://github.com/jborg/${SPELL}/archive/$VERSION.tar.gz
+
SOURCE_HASH=sha512:91a8441ea09141d4fd24d18cac3fd346f340a9e99cb97c62dfdabbb2efa8968dc8e7baa384fb5b8222a711eef258b1fa14fb29c2479b81ec49cf21485abce87a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://attic-backup.org/";
+ LICENSE[0]=BSD
+ ENTERED=20140525
+ SHORT="a deduplicating backup program"
+cat << EOF
+Attic is a deduplicating backup program written in Python. The main goal of
+Attic is to provide an efficient and secure way to backup data. The data
+deduplication technique used makes Attic suitable for daily backups since
+only the changes are stored.
+EOF
diff --git a/python-pypi/attic/HISTORY b/python-pypi/attic/HISTORY
new file mode 100644
index 0000000..b9ad69f
--- /dev/null
+++ b/python-pypi/attic/HISTORY
@@ -0,0 +1,7 @@
+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/bpython/DEPENDS b/python-pypi/bpython/DEPENDS
index 8a7aa57..97ee8ba 100755
--- a/python-pypi/bpython/DEPENDS
+++ b/python-pypi/bpython/DEPENDS
@@ -1,5 +1,11 @@
depends python &&
depends pygments &&

+suggest_depends curtsies "" "" "for Curtsies frontend support
(${MESSAGE_COLOR}also requires greenlet${DEFAULT_COLOR})" &&
+
+if is_depends_enabled $SPELL curtsies; then
+ depends greenlet
+fi &&
+
suggest_depends pygtk2 "" "" "for GTK interface support" &&
suggest_depends urwid "" "" "for console interface support"
diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
index 272e4fa..37cfebe 100755
--- a/python-pypi/bpython/DETAILS
+++ b/python-pypi/bpython/DETAILS
@@ -1,8 +1,8 @@
SPELL=bpython
- VERSION=0.12
+ VERSION=0.13.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
-
SOURCE_HASH=sha512:001deb068dbc31e592b1c9c524cfbb5061cc9f1abb30d7597472920032285d20632f4ca75a10d4444be947413f9d2d65f476b64a66717956bca7d52b6b7ce948
+
SOURCE_HASH=sha512:cb3f1e8d8df5eb9978956b3503ef98b1c39e80704792281be7e560ec0d648aefa6d979ab45a642ec369fc252e7fde399013aa1a4154ceb73465bc3d95bea4b19
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.bpython-interpreter.org/
LICENSE[0]=MIT
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
index 287ce6e..ac02e23 100644
--- a/python-pypi/bpython/HISTORY
+++ b/python-pypi/bpython/HISTORY
@@ -1,3 +1,10 @@
+2014-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.13.1
+
+2014-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.13
+ * DEPENDS: added curtsies suggest dependency
+
2013-01-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.12

diff --git a/python-pypi/bsddb3/DETAILS b/python-pypi/bsddb3/DETAILS
index 57ee95b..401292d 100755
--- a/python-pypi/bsddb3/DETAILS
+++ b/python-pypi/bsddb3/DETAILS
@@ -1,5 +1,5 @@
SPELL=bsddb3
- VERSION=6.0.0
+ VERSION=6.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG=jcea.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.jcea.es/programacion/pybsddb.htm
- LICENSE[0]=MIT
+ LICENSE[0]=BSD
ENTERED=20061025
KEYWORDS="python db"
SHORT="Python wrapper for BerkeleyDB"
diff --git a/python-pypi/bsddb3/HISTORY b/python-pypi/bsddb3/HISTORY
index 7c392ff..5376a07 100644
--- a/python-pypi/bsddb3/HISTORY
+++ b/python-pypi/bsddb3/HISTORY
@@ -1,3 +1,7 @@
+2014-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.0.1
+ LICENSE[0]=BSD
+
2013-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.0.0

diff --git a/python-pypi/cffi/DETAILS b/python-pypi/cffi/DETAILS
index f3c1adf..6c3ae71 100755
--- a/python-pypi/cffi/DETAILS
+++ b/python-pypi/cffi/DETAILS
@@ -1,6 +1,6 @@
SPELL=cffi
- VERSION=0.8.1
-
SOURCE_HASH=sha512:bed5cd911a58efd95721d75ff1925e210ccd9b373f8d38cc4a86ddd2b529d757390abf51bbf5b9e583f4ecdc27710560bb6c31679cd8c45d34b3562a91eac136
+ VERSION=0.8.6
+
SOURCE_HASH=sha512:b913d459bf0d355f0cb42fa0587a940c227d6765450033b14ab4d5281173cd1875cd6872911bb4f0b567cc1c5b0ca330615ec5f6ba205b25c41b683ae8c77790
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/cffi/HISTORY b/python-pypi/cffi/HISTORY
index ef465d7..6e21761 100644
--- a/python-pypi/cffi/HISTORY
+++ b/python-pypi/cffi/HISTORY
@@ -1,3 +1,9 @@
+2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.2
+
2014-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.1
spell created
diff --git a/python-pypi/chardet/DETAILS b/python-pypi/chardet/DETAILS
index 1a3bc47..181b6eb 100755
--- a/python-pypi/chardet/DETAILS
+++ b/python-pypi/chardet/DETAILS
@@ -1,6 +1,6 @@
SPELL="chardet"
- VERSION=2.1.1
-
SOURCE_HASH=sha512:eff1011381a8b101f1c4e8885e8e146df1390be92a68402a55b16ce8957ed732f33900bab8b29242be75f4006f20b86e5a90e3cf26457f9a792c49abb32d8d8d
+ VERSION=2.2.1
+
SOURCE_HASH=sha512:87059b77b14c39fded7f1287f8eeab6a880e21f4b49a3aa103daf537bbb1e237069347e1953ebaa9a393bd4dee01993873c84aad3c00536ae34784686aecfe68
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
SOURCE_URL[0]=http://pypi.python.org/packages/source/c/$SPELL/$SOURCE
diff --git a/python-pypi/chardet/HISTORY b/python-pypi/chardet/HISTORY
index 8df6fc6..cccfe7e 100644
--- a/python-pypi/chardet/HISTORY
+++ b/python-pypi/chardet/HISTORY
@@ -1,3 +1,6 @@
+2014-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.1
+
2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: PYTHON

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/DETAILS b/python-pypi/cherrypy/DETAILS
index 6576e5e..a417ae9 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,10 +1,10 @@
SPELL=cherrypy
SPELLX=CherryPy
if [[ $BRANCH == 3 ]]; then
- VERSION=3.2.5
+ VERSION=3.6.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:562a8dbacf35dc64ba015ab01cdf076eb6c58a21df67fc9cb3936ff37f3d6dad6271595ba431920533f3cc6c6c10896d9a36e818fada70d87ae041d7f00d97d8
+
SOURCE_HASH=sha512:3eaee1269272de9c52fa9547b7e10155ecae010005fb56dc300f24a537b4a22971a4f7e3e9920f9eff2ee951deb7ec8dfcf47a491cf5f6ed49c056f4a4316170
else
VERSION=2.3.0
SOURCE=$SPELLX-$VERSION.tar.gz
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index 7c6647a..c99c660 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,15 @@
+2014-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.0 (3)
+
+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)
+
+2014-04-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated 3rd branch to 3.3.0
+
2014-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated 3rd branch to 3.2.5

diff --git a/python-pypi/curtsies/DEPENDS b/python-pypi/curtsies/DEPENDS
new file mode 100755
index 0000000..e4ea57a
--- /dev/null
+++ b/python-pypi/curtsies/DEPENDS
@@ -0,0 +1 @@
+depends PYTHON
diff --git a/python-pypi/curtsies/DETAILS b/python-pypi/curtsies/DETAILS
new file mode 100755
index 0000000..9e18a75
--- /dev/null
+++ b/python-pypi/curtsies/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=curtsies
+ VERSION=0.0.32
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:b5495d73ddc6639dba870e9730830c8dceb2913c71566e709f365e94d178d149b070575ec087b35d6ec67623749e87be7197017b218e8b4055f5864a6e6587b2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/c/$SPELL/$SOURCE
+ GATHER_DOCS=off
+ LICENSE[0]=MIT
+ WEB_SITE=https://github.com/thomasballinger/curtsies
+ ENTERED=20140520
+ SHORT="curses-like terminal wrapper, with colored strings"
+cat << EOF
+Most terminals will display text in color if you use ANSI escape codes -
+curtsies makes rendering such text to the terminal easy. Curtsies assumes
use of
+an VT-100 compatible terminal: unlike curses, it has no compatibility layer
for
+other types of terminals.
+EOF
diff --git a/python-pypi/curtsies/HISTORY b/python-pypi/curtsies/HISTORY
new file mode 100644
index 0000000..6cb6576
--- /dev/null
+++ b/python-pypi/curtsies/HISTORY
@@ -0,0 +1,2 @@
+2014-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell
diff --git a/python-pypi/cython/DETAILS b/python-pypi/cython/DETAILS
index 92447ff..cb29db3 100755
--- a/python-pypi/cython/DETAILS
+++ b/python-pypi/cython/DETAILS
@@ -1,6 +1,6 @@
SPELL=cython
- VERSION=0.20.1
-
SOURCE_HASH=sha512:4bd511d55a795bccbcd3ccacfc79a3b97d67238abf4e8fe18cc2cf76f6d2c379b3d159155314826d8e6d00d9977fb3e34be07d06954e8dad5f92a23ed988275b
+ VERSION=0.20.2
+
SOURCE_HASH=sha512:118e3ebd76f50bda8187b76654e65caab2c2c403df9b89da525c2c963dedc7b38d898ae0b92d44b278731d969a891eb3f7b5bcc138cfe3e037f175d4c87c29ec
SOURCE=Cython-${VERSION}.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Cython-${VERSION}"
SOURCE_URL[0]=http://www.cython.org/release/${SOURCE}
diff --git a/python-pypi/cython/HISTORY b/python-pypi/cython/HISTORY
index e73b729..ef9edcf 100644
--- a/python-pypi/cython/HISTORY
+++ b/python-pypi/cython/HISTORY
@@ -1,3 +1,6 @@
+2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.20.2
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.20.1

diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index eed1b0e..2813784 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.4.4
- SECURITY_PATCH=4
+ VERSION=1.4.11
+ SECURITY_PATCH=5
SOURCE=Django-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Django-$VERSION"
SOURCE_URL[0]=http://www.djangoproject.com/download/$VERSION/tarball/
-
SOURCE_HASH=sha512:68277152c49ca855c74f1a7644dfa171a50b1fc926e7b2702f5e3d97f0e37e6fb27b61e056805e95fc265bb2237e0d9c62b5fd6ce7cb6b9cac6bf1959e69deea
+
SOURCE_HASH=sha512:60cc3c769a9b21e93e6c4e79132ab8f4a48df1cb1c55faaa547c5fd28b9785ddca3b5393790bf96a4715d9b708c6da376ef4a28ec14849147d63f0fe40d386cb
fi
WEB_SITE=http://www.djangoproject.com/
LICENSE[0]=BSD
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index db4a73e..2643ba0 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,6 @@
+2014-04-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.11; SECURITY_PATCH++
+
2013-02-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.4; SECURITY_PATCH++

diff --git a/python-pypi/docutils/DEPENDS b/python-pypi/docutils/DEPENDS
new file mode 100755
index 0000000..48d8ddc
--- /dev/null
+++ b/python-pypi/docutils/DEPENDS
@@ -0,0 +1 @@
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/docutils/DETAILS b/python-pypi/docutils/DETAILS
new file mode 100755
index 0000000..4beac77
--- /dev/null
+++ b/python-pypi/docutils/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=docutils
+ VERSION=0.12
+
SOURCE_HASH=sha512:0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://$SPELL.sourceforge.net
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
+ LICENSE=GPL
+ ENTERED=20040509
+ KEYWORDS="doc"
+ SHORT="Tools for processing plaintext documentation into useful
formats."
+cat << EOF
+The purpose of the Docutils project is to create a set of tools
+for processing plaintext documentation into useful formats, such as HTML,
+XML, and TeX. Includes reStructuredText, the easy to read, easy to use,
+what-you-see-is-what-you-get plaintext markup language.
+
+Several sources are or will be supported:
+ - Standalone files (implemented).
+ - Inline documentation from Python modules and packages, extracted
+ with namespace context.
+ - PEPs (Python Enhancement Proposals) (implemented).
+And others as discovered.
+EOF
diff --git a/python-pypi/docutils/HISTORY b/python-pypi/docutils/HISTORY
new file mode 100644
index 0000000..08b11c8
--- /dev/null
+++ b/python-pypi/docutils/HISTORY
@@ -0,0 +1,66 @@
+2014-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.12
+ * DEPENDS: use $SECTION_DIRECTORY/PY_DEPENDS
+ * BUILD, INSTALL: deleted
+ spell moved to python section
+
+2014-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+
+2013-07-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10
+
+2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.9.1
+
+2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9
+
+2011-10-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.1
+
+2010-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7
+
+2009-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6
+ * DEPENDS: clean up
+
+2007-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-05-30 Martin Svehla <doc AT sourcemage.org>
+ * DETAILS: version updated to 0.3.9
+ * INSTALL: using INSTALL_ROOT
+
+2005-01-04 PhoboX <doc AT sourcemage.org>
+ * DETAILS: version updated to 0.3.7
+
+2004-12-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Python renamed to python
+
+2004-08-09 PhoboX <doc AT sourcemage.org>
+ * DETAILS: version updated to 0.3.5
+
+2004-07-17 PhoboX <doc AT sourcemage.org>
+ * DETAILS: reformated description
+ * DETAILS, BUILD: converted to build api2
+ * INSTALL: added
+
+2004-07-06 PhoboX <doc AT sourcemage.org>
+ * DETAILS: corrected SOURCE
+
+2004-05-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.3-alpha
+
+2004-05-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version snapshot
+ * BUILD, DEPENDS: added
+ spell created
+
diff --git a/python-pypi/fb-python/DETAILS b/python-pypi/fb-python/DETAILS
index 24ca148..6a94495 100755
--- a/python-pypi/fb-python/DETAILS
+++ b/python-pypi/fb-python/DETAILS
@@ -1,7 +1,7 @@
SPELL=fb-python
SPELLX=firebirdsql
- VERSION=0.9.0
-
SOURCE_HASH=sha512:e281fc3d1d3b5349587da36d24a7b7859fb0ff3561d6b17cde297105035fc087afdd4a39097f72f7983f6c4a4114e54629a3fe811e2730ee36f7fdf2823cb02c
+ VERSION=0.9.3
+
SOURCE_HASH=sha512:95ad82814b5af202e321284ba6f632da7b7ae680b39eaf7a33ab27b0f6f8be916c4acc72c304b299c094cca1b44dcd474e84da431c7b2ebb65651ae0635f7fa2
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELLX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/fb-python/HISTORY b/python-pypi/fb-python/HISTORY
index f979235..804b95e 100644
--- a/python-pypi/fb-python/HISTORY
+++ b/python-pypi/fb-python/HISTORY
@@ -1,3 +1,6 @@
+2014-04-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.3
+
2014-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.0

diff --git a/python-pypi/fdb/DETAILS b/python-pypi/fdb/DETAILS
index 3aed2b0..a60750d 100755
--- a/python-pypi/fdb/DETAILS
+++ b/python-pypi/fdb/DETAILS
@@ -1,6 +1,6 @@
SPELL=fdb
- VERSION=1.4
-
SOURCE_HASH=sha512:a5e17e069201de0933bd1d48b50e8f19329f81d6d38315e93b84fd7559b9f5461b9a8b948ee53926f42ecf973dcee93ec03bf783bf4ca6b2ceb13672c6192484
+ VERSION=1.4.1
+
SOURCE_HASH=sha512:e28d1c1c15c07c99cc19910efac86459a52badf8083e042f35e2faabbe98a1681b86df8f0136fbb1d11b90321414ec8b651156ae81c451a7fe007f9a1cea6eeb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/fdb/HISTORY b/python-pypi/fdb/HISTORY
index 06794b7..c3a9bda 100644
--- a/python-pypi/fdb/HISTORY
+++ b/python-pypi/fdb/HISTORY
@@ -1,3 +1,6 @@
+2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.1
+
2013-06-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4

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/formencode/DEPENDS b/python-pypi/formencode/DEPENDS
index 503782e..48d8ddc 100755
--- a/python-pypi/formencode/DEPENDS
+++ b/python-pypi/formencode/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/formencode/DETAILS b/python-pypi/formencode/DETAILS
index 286481e..96f98d3 100755
--- a/python-pypi/formencode/DETAILS
+++ b/python-pypi/formencode/DETAILS
@@ -1,7 +1,7 @@
SPELL=formencode
- VERSION=1.2.6
-
SOURCE_HASH=sha512:107f43fc86882dc0e3898a805b93e8d0139815390d06d5f5798e6fe7d6278bc423c8232f5a5c0752cbb92a1e8a33bd9f6818b7f462bec0fcc4e0b81254191285
- SOURCE=FormEncode-$VERSION.zip
+ VERSION=1.3.0a1
+
SOURCE_HASH=sha512:c6651b4e18645e5628edc1ebb694efccad4f2d0023842118847c28cc1b169e8c42974cef501b565eee6cc71fe382e877a2bbd83b6b99d4bca711d4432e396b72
+ SOURCE=FormEncode-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/F/FormEncode/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/FormEncode-$VERSION
WEB_SITE=http://formencode.org/
diff --git a/python-pypi/formencode/HISTORY b/python-pypi/formencode/HISTORY
index a5626d9..d7f9b0d 100644
--- a/python-pypi/formencode/HISTORY
+++ b/python-pypi/formencode/HISTORY
@@ -1,3 +1,7 @@
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0a1
+ * DEPENDS: python => PYTHON
+
2013-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.6

diff --git a/python-pypi/gitosis/DETAILS b/python-pypi/gitosis/DETAILS
index 4470f29..be6233a 100755
--- a/python-pypi/gitosis/DETAILS
+++ b/python-pypi/gitosis/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gitosis
-if [[ "${GITOSIS_AUTOUPDATE}" == "y" ]]; then
- VERSION="$(date +%Y%m%d)"
-else
- VERSION=git
-fi
+ VERSION="$(get_scm_version)"
SOURCE=${SPELL}-git.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_URL=git://eagain.net/gitosis.git:${SPELL}-git
diff --git a/python-pypi/gitosis/HISTORY b/python-pypi/gitosis/HISTORY
index a7e665f..fdd9a22 100644
--- a/python-pypi/gitosis/HISTORY
+++ b/python-pypi/gitosis/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/gitosis/PREPARE b/python-pypi/gitosis/PREPARE
index dc640e1..86a5079 100755
--- a/python-pypi/gitosis/PREPARE
+++ b/python-pypi/gitosis/PREPARE
@@ -1,3 +1,2 @@
-config_query GITOSIS_AUTOUPDATE \
- "Automaticaly update the spell on sorcery queue/system-update?"
"n"
-
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/python-pypi/greenlet/DEPENDS b/python-pypi/greenlet/DEPENDS
new file mode 100755
index 0000000..531ab1e
--- /dev/null
+++ b/python-pypi/greenlet/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends zip
diff --git a/python-pypi/greenlet/DETAILS b/python-pypi/greenlet/DETAILS
new file mode 100755
index 0000000..dcfc9ad
--- /dev/null
+++ b/python-pypi/greenlet/DETAILS
@@ -0,0 +1,32 @@
+ SPELL=greenlet
+ VERSION=0.4.2
+ SOURCE=$SPELL-$VERSION.zip
+
SOURCE_HASH=sha512:9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/g/$SPELL/$SOURCE
+ DOC_DIRS=""
+ LICENSE[0]=MIT
+ WEB_SITE=https://github.com/python-greenlet/greenlet
+ ENTERED=20140520
+ SHORT="lightweight in-process concurrent programming"
+cat << EOF
+The greenlet package is a spin-off of Stackless, a version of CPython that
+supports micro-threads called "tasklets". Tasklets run pseudo-concurrently
+(typically in a single or a few OS-level threads) and are synchronized with
data
+exchanges on "channels".
+
+A "greenlet", on the other hand, is a still more primitive notion of
+micro-thread with no implicit scheduling; coroutines, in other words. This is
+useful when you want to control exactly when your code runs. You can build
+custom scheduled micro-threads on top of greenlet; however, it seems that
+greenlets are useful on their own as a way to make advanced control
+flow structures. For example, we can recreate generators; the difference with
+Python's own generators is that our generators can call nested functions and
the
+nested functions can yield values too. Additionally, you don't need a "yield"
+keyword.
+
+Greenlets are provided as a C extension module for the regular unmodified
+interpreter.
+
+Greenlets are lightweight coroutines for in-process concurrent programming.
+EOF
diff --git a/python-pypi/greenlet/HISTORY b/python-pypi/greenlet/HISTORY
new file mode 100644
index 0000000..6cb6576
--- /dev/null
+++ b/python-pypi/greenlet/HISTORY
@@ -0,0 +1,2 @@
+2014-05-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell
diff --git a/python-pypi/grit-i18n/BUILD b/python-pypi/grit-i18n/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/grit-i18n/BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/grit-i18n/DEPENDS b/python-pypi/grit-i18n/DEPENDS
new file mode 100755
index 0000000..8e7ccbb
--- /dev/null
+++ b/python-pypi/grit-i18n/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends SVN
diff --git a/python-pypi/grit-i18n/DETAILS b/python-pypi/grit-i18n/DETAILS
new file mode 100755
index 0000000..4de18d3
--- /dev/null
+++ b/python-pypi/grit-i18n/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=grit-i18n
+if [[ "$GYP_SCM_AUTOUPDATE" == "y" ]]
+then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+
SOURCE_URL[0]=svn_http://grit-i18n.googlecode.com/svn/trunk:$SPELL-read-only
+ LICENSE[0]=BSD
+ WEB_SITE=https://code.google.com/p/grit-i18n/
+ KEYWORDS="utils"
+ ENTERED=20140730
+ SHORT='internationalization tool'
+cat << EOF
+GRIT is the internationalization tool used by the Chromium projects (the
foundation for the
+Google Chrome browser) and for several internal projects at Google.
+EOF
diff --git a/python-pypi/grit-i18n/HISTORY b/python-pypi/grit-i18n/HISTORY
new file mode 100644
index 0000000..68f8b38
--- /dev/null
+++ b/python-pypi/grit-i18n/HISTORY
@@ -0,0 +1,3 @@
+2014-07-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE, DETAILS: Created
+
diff --git a/python-pypi/grit-i18n/INSTALL b/python-pypi/grit-i18n/INSTALL
new file mode 100755
index 0000000..ac6691a
--- /dev/null
+++ b/python-pypi/grit-i18n/INSTALL
@@ -0,0 +1,2 @@
+DEST=$INSTALL_ROOT/usr/lib/python2.7/site-packages &&
+cp -a $SOURCE_DIRECTORY/* $DEST
diff --git a/python-pypi/grit-i18n/PREPARE b/python-pypi/grit-i18n/PREPARE
new file mode 100755
index 0000000..3e16aba
--- /dev/null
+++ b/python-pypi/grit-i18n/PREPARE
@@ -0,0 +1,3 @@
+config_query GYP_SCM_AUTOUPDATE \
+ "Automatically update on every system update?" n
+
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/DETAILS b/python-pypi/hatta/DETAILS
index 8d03771..ac1d75e 100755
--- a/python-pypi/hatta/DETAILS
+++ b/python-pypi/hatta/DETAILS
@@ -1,5 +1,6 @@
SPELL=hatta
VERSION=1.6.3
+ PATCHLEVEL=1
SOURCE=Hatta-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/H/Hatta/$SOURCE

SOURCE_HASH=sha512:856a64cac7fcae791f5b53a37cce75d3331883c5038fd074d3129c19388ef3540fa5dc29810fb9ac460d2c132c54192f2997577046b6c203cd5f587537c66935
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index 69fff64..cad57ba 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,11 @@
+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
+ * wanted.patch: added, to fix exception on +wanted page
+
2013-10-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.3
* locale.patch: updated for new release
diff --git a/python-pypi/hatta/PRE_BUILD b/python-pypi/hatta/PRE_BUILD
index d028efb..af933f7 100755
--- a/python-pypi/hatta/PRE_BUILD
+++ b/python-pypi/hatta/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/wanted.patch" &&
patch -p0 < "$SPELL_DIRECTORY/locale.patch"
diff --git a/python-pypi/hatta/wanted.patch b/python-pypi/hatta/wanted.patch
new file mode 100644
index 0000000..3adffe7
--- /dev/null
+++ b/python-pypi/hatta/wanted.patch
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- hatta/templates/wanted.html.orig Sat May 18 14:05:36 2013
++++ hatta/templates/wanted.html Sat Aug 2 19:31:56 2014
+@@ -8,7 +8,7 @@
+ <ul class="wanted">
+ {% for refs, page_title in pages %}
+ <li><b>{{ page.wiki_link(page_title)|safe }}</b>
+- <i>(<a href="{{ url(page_title, wiki.backlinks) }}"
++ <i>(<a href="{{ url(page_title, 'backlinks') }}"
+ class="backlinks"
+ >{{ ngettext("%(num)d reference", "%(num)d references", refs) }}</a>)</i>
+ </li>
diff --git a/python-pypi/isort/DETAILS b/python-pypi/isort/DETAILS
index 7e0fce0..30448c8 100755
--- a/python-pypi/isort/DETAILS
+++ b/python-pypi/isort/DETAILS
@@ -1,6 +1,6 @@
SPELL=isort
- VERSION=3.6.2
-
SOURCE_HASH=sha512:30d15c392a48b8fca915b568edf309ce3aceb3e7d744e5abd3154783164c37869f142825d437f4ac8a79d578beec7bff243977294f1f4cd1001481a3c650773d
+ VERSION=3.8.0
+
SOURCE_HASH=sha512:5ea46f160144183ae0b0b0ca3aab011355644ed057186b01f9d996e2f77c321d35607eb0268b57a24701e00c51a1a607e7bb8351c727942a7360f2c337d42eb4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/isort/HISTORY b/python-pypi/isort/HISTORY
index f1e3828..e26d559 100644
--- a/python-pypi/isort/HISTORY
+++ b/python-pypi/isort/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.8.0
+
2014-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6.2

diff --git a/python-pypi/jinja2/DETAILS b/python-pypi/jinja2/DETAILS
index 02b58d3..a2a8b68 100755
--- a/python-pypi/jinja2/DETAILS
+++ b/python-pypi/jinja2/DETAILS
@@ -1,7 +1,7 @@
SPELL=jinja2
SPELLX=Jinja2
- VERSION=2.7.2
-
SOURCE_HASH=sha512:4aec74b87957ae723709eed59fb9ee0d888534888eb63228e9a194f32984a6d219fa92446bd6a1975eb09008f0eb63e997fa86c45bff04f27c375d178349c073
+ VERSION=2.7.3
+
SOURCE_HASH=sha512:2810db2b52fe800e2a4a47ea41a07f997b1647a2b7ad05fe564f9d554d6a402283c84c4e2491e5dad8d22acd83d3ca420f0983ed2effc732f6d79600a846071b
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/jinja2/HISTORY b/python-pypi/jinja2/HISTORY
index ee716c4..06722f1 100644
--- a/python-pypi/jinja2/HISTORY
+++ b/python-pypi/jinja2/HISTORY
@@ -1,3 +1,6 @@
+2014-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.3
+
2014-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.2
SECURITY_PATCH=1
diff --git a/python-pypi/lxml/DETAILS b/python-pypi/lxml/DETAILS
index 533e490..d8b2b80 100755
--- a/python-pypi/lxml/DETAILS
+++ b/python-pypi/lxml/DETAILS
@@ -1,5 +1,5 @@
SPELL=lxml
- VERSION=3.3.3
+ VERSION=3.4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://pypi.python.org/packages/source/l/$SPELL/$SOURCE
diff --git a/python-pypi/lxml/HISTORY b/python-pypi/lxml/HISTORY
index c7f3849..9fb92be 100644
--- a/python-pypi/lxml/HISTORY
+++ b/python-pypi/lxml/HISTORY
@@ -1,3 +1,12 @@
+2014-09-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.4.0
+
+2014-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.3.6
+
+2014-06-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.3.5
+
2014-03-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.3.3

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 780dcbd..0fa479c 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.9.2
-
SOURCE_HASH=sha512:60148bb953069228c1ccb043fdf6abb6f96b127bb0be8c2de6b32ca356140b7c3426f1c2ee09882e714672f6f1ba2dba4ee0622928896e9d4b79383ed50c347a
+ 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 719287b..e479c8e 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,15 @@
+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
+
+2014-06-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.1
+
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0
+
2014-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.9.2

diff --git a/python-pypi/meson/BUILD b/python-pypi/meson/BUILD
new file mode 100755
index 0000000..7eead1e
--- /dev/null
+++ b/python-pypi/meson/BUILD
@@ -0,0 +1,2 @@
+true
+
diff --git a/python-pypi/meson/DEPENDS b/python-pypi/meson/DEPENDS
new file mode 100755
index 0000000..e3c00ee
--- /dev/null
+++ b/python-pypi/meson/DEPENDS
@@ -0,0 +1,2 @@
+. $SECTION_DIRECTORY/PY_DEPENDS &&
+depends ninja-build
diff --git a/python-pypi/meson/DETAILS b/python-pypi/meson/DETAILS
new file mode 100755
index 0000000..76fb342
--- /dev/null
+++ b/python-pypi/meson/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=meson
+ VERSION=0.18.0
+
SOURCE_HASH=sha512:b22601868065558a4e47585f016915545dc6f3e22f0bc93a6d17f0ada3ddaf7fd3f90fccf41af2d72d0cca27b6facc78211579d3b2fe8cf69658a428a262cd59
+ SOURCE=$SPELL\_$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE_URL[0]=https://github.com/jpakkane/meson/releases/download/$VERSION/$SOURCE
+ LICENSE[0]=MIT
+ WEB_SITE=https://jpakkane.github.io/meson/
+ ENTERED=20140728
+ KEYWORDS="python devel"
+ SHORT="python based build sysyem"
+cat << EOF
+Meson aims to be a cross-platform build system that is both highly
performant and a pleasure to
+use.
+EOF
diff --git a/python-pypi/meson/HISTORY b/python-pypi/meson/HISTORY
new file mode 100644
index 0000000..91c3ede
--- /dev/null
+++ b/python-pypi/meson/HISTORY
@@ -0,0 +1,3 @@
+2014-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.18.0
+ * Created spell
diff --git a/python-pypi/meson/INSTALL b/python-pypi/meson/INSTALL
new file mode 100755
index 0000000..dfc4ff9
--- /dev/null
+++ b/python-pypi/meson/INSTALL
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+./install_meson.py --prefix $INSTALL_ROOT/usr
diff --git a/python-pypi/msgpack-python/DEPENDS
b/python-pypi/msgpack-python/DEPENDS
index 6e84a0e..e4ea57a 100755
--- a/python-pypi/msgpack-python/DEPENDS
+++ b/python-pypi/msgpack-python/DEPENDS
@@ -1 +1 @@
-depends python
+depends PYTHON
diff --git a/python-pypi/msgpack-python/DETAILS
b/python-pypi/msgpack-python/DETAILS
index 8caa8c8..69cdffc 100755
--- a/python-pypi/msgpack-python/DETAILS
+++ b/python-pypi/msgpack-python/DETAILS
@@ -1,8 +1,8 @@
SPELL=msgpack-python
- VERSION=0.1.13
+ VERSION=0.4.2
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]="http://pypi.python.org/packages/source/m/${SPELL}/${SOURCE}#md5=a6781bf2b670963c0ff1316976e66b14";
-
SOURCE_HASH=sha512:fa2e4871093d0fa10f15cb34a2f379c1b0040c1c33f412966c0aba0f7bf531134f8e6d122e3bed9eaae32499cba6beb95efcaf2a8723ddbba61f12e9d6b4a3d1
+
SOURCE_HASH=sha512:73cae17c08d34bd721828b1759b998372600e26fdfc62c16cb571b5cb41bf1a65ef98af65db0e48da229461f835aa17a547b03b25f407f570e493d8f363ab507
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://msgpack.org/";
LICENSE[0]=Apache
diff --git a/python-pypi/msgpack-python/HISTORY
b/python-pypi/msgpack-python/HISTORY
index c74d5e3..b37a29a 100644
--- a/python-pypi/msgpack-python/HISTORY
+++ b/python-pypi/msgpack-python/HISTORY
@@ -1,3 +1,7 @@
+2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.2
+ * DEPENDS: depend on PYTHON instead of python
+
2012-06-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index 1e3aa37..83c4810 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,9 +1,9 @@
SPELL=numpy
- VERSION=1.8.0
-
SOURCE_HASH=sha512:ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857
+ VERSION=1.8.1
+
SOURCE_HASH=sha512:2dfe7c114c304a4bd5c050738852fb5b13c54d3cfa04b39d72af96bac356182e3ea7f9979ebe370bdbc7108770c65c848275ff6b7ab11924da7d139e197f81da
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=https://github.com/numpy/numpy/archive/v${VERSION}.tar.gz
WEB_SITE=http://numpy.scipy.org/
ENTERED=20020319
LICENSE[0]=PYTHON
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index 527ac25..b290b97 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,6 @@
+2014-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: verison 1.8.1, fix SOURCE_URL
+
2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.0

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/paramiko/DETAILS b/python-pypi/paramiko/DETAILS
index e79dda7..8e1ab9e 100755
--- a/python-pypi/paramiko/DETAILS
+++ b/python-pypi/paramiko/DETAILS
@@ -1,8 +1,8 @@
SPELL=paramiko
- VERSION=1.12.2
+ VERSION=1.13.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a8247c27ef3068b1c73ca39d7ce0da36ea7cbf28bdac805c92fd73bbe57c7f84e38433d330d54ea850ef952c57ff596dfb6627caee8e8b9c4ce69b1958fed094
+
SOURCE_HASH=sha512:b05b93eb27600ac9df178aa4f045ee6b20f0052ea5e3f937d4eb6c6e1940208b02f9d6ddabf3070edaf4a68b86ca817ae77ebfb24a7d1dc725be86f99b071fc6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/paramiko/paramiko/
ENTERED=20060403
diff --git a/python-pypi/paramiko/HISTORY b/python-pypi/paramiko/HISTORY
index faad668..b354a97 100644
--- a/python-pypi/paramiko/HISTORY
+++ b/python-pypi/paramiko/HISTORY
@@ -1,3 +1,6 @@
+2014-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.13.0
+
2014-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.12.2
* DEPENDS: requires python, python-ecdsa
diff --git a/python-pypi/pillow/DETAILS b/python-pypi/pillow/DETAILS
index caafa00..8d3814c 100755
--- a/python-pypi/pillow/DETAILS
+++ b/python-pypi/pillow/DETAILS
@@ -1,8 +1,8 @@
SPELL=pillow
- VERSION=2.1.0
+ VERSION=2.4.0
SOURCE="Pillow-${VERSION}.zip"
SOURCE_URL[0]=https://pypi.python.org/packages/source/P/Pillow/${SOURCE}
-
SOURCE_HASH=sha512:a81321ac7a5cc94c861e93ef0975a439044a1cbbb02a41815796dc73849fc233e11f38ca2b53e286ab46ab0d7c3ab2fc06140762df85e09fd64d0f1938e5ec4d
+
SOURCE_HASH=sha512:8eaf087dd30f02792398d8b219a829289776c26cf014fbce6658f355e07548abec67c4e1f1203d58b938a86bdce17ceb3764b2024e095f894fc06caf05c99789
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Pillow-${VERSION}"
WEB_SITE="http://python-imaging.github.io/";
LICENSE[0]=PIL
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index 6f9c23f..ed15b97 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.0
+
2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, font.diff, PRE_BUILD, PRE_SUB_DEPENDS, PROVIDES,
SUB_DEPENDS: spell created
diff --git a/python-pypi/pip/DEPENDS b/python-pypi/pip/DEPENDS
new file mode 100755
index 0000000..e440941
--- /dev/null
+++ b/python-pypi/pip/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/pip/DETAILS b/python-pypi/pip/DETAILS
new file mode 100755
index 0000000..586624e
--- /dev/null
+++ b/python-pypi/pip/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pip
+ VERSION=1.5.4
+
SOURCE_HASH=sha512:5ab83cc64f1bdd5f9a8bbe18653f68dd50c48a627fe120e3d58e26df7958ff4d48baa2334e067ef5d315008ffc08c6042f6d0f1d45a2f25788263c796de2818c
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=https://github.com/pypa/pip
+ LICENSE[0]=MIT
+ ENTERED=20140409
+ KEYWORDS="python"
+ SHORT="Python easy_install replacement"
+cat << EOF
+pip is a replacement for easy_install. It uses mostly the same techniques for
+finding packages, so packages that were made easy_installable should be
+pip-installable as well.
+EOF
diff --git a/python-pypi/pip/HISTORY b/python-pypi/pip/HISTORY
new file mode 100644
index 0000000..7ad7e90
--- /dev/null
+++ b/python-pypi/pip/HISTORY
@@ -0,0 +1,2 @@
+2014-04-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: spell created
diff --git a/python-pypi/psycopg2/DETAILS b/python-pypi/psycopg2/DETAILS
index 95b32b0..711d7ea 100755
--- a/python-pypi/psycopg2/DETAILS
+++ b/python-pypi/psycopg2/DETAILS
@@ -1,5 +1,5 @@
SPELL=psycopg2
- VERSION=2.5
+ VERSION=2.5.4
BRANCH=`echo $VERSION|cut -d . -f 1,2|tr . -`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/python-pypi/psycopg2/HISTORY b/python-pypi/psycopg2/HISTORY
index 9f83896..f8470d6 100644
--- a/python-pypi/psycopg2/HISTORY
+++ b/python-pypi/psycopg2/HISTORY
@@ -1,3 +1,12 @@
+2014-09-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.4
+
+2014-05-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.3
+
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.2
+
2013-04-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.5
* DEPENDS: switched to PYTHON (added python3 compat)
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/pyicu/DETAILS b/python-pypi/pyicu/DETAILS
index 70b17ce..7f7d06e 100755
--- a/python-pypi/pyicu/DETAILS
+++ b/python-pypi/pyicu/DETAILS
@@ -1,7 +1,7 @@
SPELL=pyicu
SPELLX=PyICU
- VERSION=1.5
-
SOURCE_HASH=sha512:c196d65a5d112c2a720a10082fe461195858b87b03d5273facc13bb711a1c42264eec7899af52d71d783f35ad19e735fc74ffe994a1369ebf5550b58115c5e6e
+ VERSION=1.6
+
SOURCE_HASH=sha512:ccea152b3b9ac71467edf7c1706e3beb150da82713cb7fd6d26a288eda1b398786ea83c7bd184c3e063e742e52aa9e3aa0f8ddebff18bb5b7408790b776a9142
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/P/$SPELLX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-pypi/pyicu/HISTORY b/python-pypi/pyicu/HISTORY
index ff18e5d..7e9bc49 100644
--- a/python-pypi/pyicu/HISTORY
+++ b/python-pypi/pyicu/HISTORY
@@ -1,3 +1,6 @@
+2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6
+
2013-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix python usage

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/DETAILS b/python-pypi/pyopenssl/DETAILS
index 80652d0..313b6e6 100755
--- a/python-pypi/pyopenssl/DETAILS
+++ b/python-pypi/pyopenssl/DETAILS
@@ -1,7 +1,7 @@
SPELL=pyopenssl
SPELLX=pyOpenSSL
- VERSION=0.13.1
-
SOURCE_HASH=sha512:5be0fddd0517566fa954e13854a428a21962b13f0c31a8ca0a27d90b74b3a9cfc60e3650e5915a28b3e55b97c655d4a6589122408ef61e6dea509745662bbc0e
+ VERSION=0.14
+
SOURCE_HASH=sha512:afd14aad8f7313425b9f0d79d80fbc17feaf128204cbda21db4116c8ce6e08e77e865110971c02bdc99b27a2d43402cc87f04586375167f41c61d0f474109512
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
LICENSE=GPL
ENTERED=20040509
KEYWORDS="crypto python"
- SHORT="Python interface to openssl"
+ SHORT="Python interface to openssl"
cat << EOF
Python interface to openssl.
EOF
diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY
index 7bc70d2..a818a58 100644
--- a/python-pypi/pyopenssl/HISTORY
+++ b/python-pypi/pyopenssl/HISTORY
@@ -1,3 +1,9 @@
+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
+
2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use PYTHON

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-ecdsa/DETAILS
b/python-pypi/python-ecdsa/DETAILS
index 1e4894e..2b021e0 100755
--- a/python-pypi/python-ecdsa/DETAILS
+++ b/python-pypi/python-ecdsa/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-ecdsa
SPELLX=ecdsa
- VERSION=0.10
+ VERSION=0.11
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/e/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:c1a51e95af938aca01001a4aa7e3a830157d5ffd0370d880340e513edbe176b30750fb86270d605b729dcc5741346d552b2bf16d7b3b4910fd1d06f96eaffc0f
+
SOURCE_HASH=sha512:77fc2bc26456d90a630e2ef98d94a1448b30e1c3bcebf81c52f12f8ce0ea305eceacc87e14273d340a70c60ad83fad61361c9dea83dea04546ed3604875b78fb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=https://github.com/warner/python-ecdsa
ENTERED=20140305
diff --git a/python-pypi/python-ecdsa/HISTORY
b/python-pypi/python-ecdsa/HISTORY
index b83defb..1a65b3d 100644
--- a/python-pypi/python-ecdsa/HISTORY
+++ b/python-pypi/python-ecdsa/HISTORY
@@ -1,2 +1,5 @@
+2014-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+
2014-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: spell created
diff --git a/python-pypi/python-efl/DETAILS b/python-pypi/python-efl/DETAILS
index f7fe148..cab93aa 100755
--- a/python-pypi/python-efl/DETAILS
+++ b/python-pypi/python-efl/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=python-efl
-if [[ ${PYTHON-EFL_AUTOUPDATE} == y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git

SOURCE_URL[0]=git://git.enlightenment.org/bindings/python/${SPELL}.git:$SPELL-git
diff --git a/python-pypi/python-efl/HISTORY b/python-pypi/python-efl/HISTORY
index 7f8c84a..335b266 100644
--- a/python-pypi/python-efl/HISTORY
+++ b/python-pypi/python-efl/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-12-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, CONFLICTS: spell created

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/python-llfuse/DEPENDS
b/python-pypi/python-llfuse/DEPENDS
new file mode 100755
index 0000000..fe60ad2
--- /dev/null
+++ b/python-pypi/python-llfuse/DEPENDS
@@ -0,0 +1,4 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends attr &&
+depends fuse
diff --git a/python-pypi/python-llfuse/DETAILS
b/python-pypi/python-llfuse/DETAILS
new file mode 100755
index 0000000..ad69108
--- /dev/null
+++ b/python-pypi/python-llfuse/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=python-llfuse
+ VERSION=0.40
+ SOURCE="llfuse-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/l/llfuse/${SOURCE}
+
SOURCE_HASH=sha512:b568d14e181c316d592d01b7879d2b04c717759124d9462b7f848c251322a6a376881050d209d4cf3d0d6c5218ec1880cb64f19bd64b73f09fd06818447f3dfd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/llfuse-${VERSION}"
+ WEB_SITE="https://code.google.com/p/python-llfuse/";
+ LICENSE[0]=LGPL
+ ENTERED=20140525
+ SHORT="a set of Python bindings for the low level FUSE API"
+cat << EOF
+LLFUSE is a set of Python bindings for the low level FUSE API.
+EOF
diff --git a/python-pypi/python-llfuse/HISTORY
b/python-pypi/python-llfuse/HISTORY
new file mode 100644
index 0000000..09bf331
--- /dev/null
+++ b/python-pypi/python-llfuse/HISTORY
@@ -0,0 +1,3 @@
+2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/python-magic/DEPENDS
b/python-pypi/python-magic/DEPENDS
new file mode 100755
index 0000000..e4ea57a
--- /dev/null
+++ b/python-pypi/python-magic/DEPENDS
@@ -0,0 +1 @@
+depends PYTHON
diff --git a/python-pypi/python-magic/DETAILS
b/python-pypi/python-magic/DETAILS
new file mode 100755
index 0000000..484d2af
--- /dev/null
+++ b/python-pypi/python-magic/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=python-magic
+ VERSION=0.4.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:66c3a7a3120ea360422fe422c373a403a21be674f8df213a80ce83b02051cc1f0d0a2aaa7b4d512194e6914d801062036bdfa5155ead350dde154725808944f6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://pypi.python.org/pypi/python-magic/";
+ LICENSE[0]="PSF"
+ ENTERED=20140909
+ KEYWORDS=""
+ SHORT="File type identification using libmagic"
+cat << EOF
+This module uses ctypes to access the libmagic file type identification
+library. It makes use of the local magic database and supports both textual
+and MIME-type output.
+EOF
diff --git a/python-pypi/python-magic/HISTORY
b/python-pypi/python-magic/HISTORY
new file mode 100644
index 0000000..0e01eac
--- /dev/null
+++ b/python-pypi/python-magic/HISTORY
@@ -0,0 +1,2 @@
+2014-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/python-pypi/pyxattr/DETAILS b/python-pypi/pyxattr/DETAILS
index eddeb66..17d9bd0 100755
--- a/python-pypi/pyxattr/DETAILS
+++ b/python-pypi/pyxattr/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyxattr
- VERSION=0.5.2
-
SOURCE_HASH=sha512:8dfe6583b1bb54c1674ca90ea99ad50d7ad51b858a1f40bfd4a3660fcba71b59540e5957bb601d816e82c9fec91985394f51193e5a2452c4b1b27cb5edf51e2f
+ VERSION=0.5.3
+
SOURCE_HASH=sha512:ac1aa227ab9980e0b05bf71ac4466e8747791a0d5ea30d404359526ca32e6846ad9d4ef72208ff9c7a8208d91ffa309feebe7eab818ef2dc3ae1a5e9414ffeaa
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://pyxattr.k1024.org/
diff --git a/python-pypi/pyxattr/HISTORY b/python-pypi/pyxattr/HISTORY
index 6b0e509..28a73af 100644
--- a/python-pypi/pyxattr/HISTORY
+++ b/python-pypi/pyxattr/HISTORY
@@ -1,3 +1,6 @@
+2014-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.3
+
2014-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.2
* PRE_BUILD: added, suppress error messages
diff --git a/python-pypi/rbtools/DETAILS b/python-pypi/rbtools/DETAILS
index 5758d34..5c3e512 100755
--- a/python-pypi/rbtools/DETAILS
+++ b/python-pypi/rbtools/DETAILS
@@ -1,8 +1,8 @@
SPELL=rbtools
SPELLX=RBTools
- VERSION=0.5.7
+ VERSION=0.6.2
VX=`echo ${VERSION} | cut -d. -f-2`
-
SOURCE_HASH=sha512:4db528d8f1a8c4d0d140d039af43fb42e7bdcf3a0efd495ddf5e6072cfff226554a545576d19e7a1b76d8a737cf558ca9162ef51991fd017bae19e2ac9590840
+
SOURCE_HASH=sha512:c490ba5d961caf8fd0613fe22b724ab918a38d955c3fcef7d2e9004aa59b6ac4b84c10fe0af8e15dd1f57f5e9a7735eaf2dc2191c7ed7523b13ab56b65bc28cc
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://downloads.reviewboard.org/releases/$SPELLX/$VX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/rbtools/HISTORY b/python-pypi/rbtools/HISTORY
index ff26eae..24e3865 100644
--- a/python-pypi/rbtools/HISTORY
+++ b/python-pypi/rbtools/HISTORY
@@ -1,3 +1,6 @@
+2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.2
+
2014-03-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.7
spell created
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 d16a44c..f87ac3b 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
SPELL=scons
- VERSION=2.2.0
-
SOURCE_HASH=sha512:b1910c2faf9bf888e32f90c567a5c3fe4b7066f48a3457639570868f02075e9d3ef20d0315d5bab5940576987bacdaa0f675aaf8f5bdb1efb1a0806cb0153738
+ 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 e1b5ec1..352d97e 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,9 @@
+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
+
2012-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.0

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/DETAILS b/python-pypi/scrapely/DETAILS
index 9f8b5ef..153e83d 100755
--- a/python-pypi/scrapely/DETAILS
+++ b/python-pypi/scrapely/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=scrapely
if [[ $SCRAPELY_BRANCH == scm ]]; then
- if [[ "$SCRAPELY_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE_IGNORE=volatile
SOURCE_URL[0]=git://github.com/scrapy/$SPELL.git:$SPELL-scm
SOURCE=$SPELL-scm.tar.bz2
diff --git a/python-pypi/scrapely/HISTORY b/python-pypi/scrapely/HISTORY
index 874d6db..da0ffa6 100644
--- a/python-pypi/scrapely/HISTORY
+++ b/python-pypi/scrapely/HISTORY
@@ -1,2 +1,8 @@
+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
+
2011-11-12 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: spell created
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 a9807f7..f4cedfc 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,8 +1,8 @@
SPELL=setuptools
- VERSION=3.3
-
SOURCE_HASH=sha512:586b219c0f760a1aadb1348086559ede0726a348aff95d5130ed89809c217b186b40e22c02d7af3896442a76845e4c4b950881f41d2f2fa13d0f71726eb8e9c5
+ VERSION=5.7
+
SOURCE_HASH=sha512:2fd5ae00acf8b3224e4fb741a6d0d1af42e63cf924839c3e4f71d7e1f6cece72d85fed27cee65a406dcfc30741f74d3b76bc802d3a425b2909a0806f9fd1b781
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/s/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pypi.python.org/pypi/setuptools
LICENSE[0]="PSF"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index ca1b43b..9289324 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,25 @@
+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
+
+2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.2
+ * DETAILS: version 5.2
+
+2014-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.1
+
+2014-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.6
+
+2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5
+
+2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.1
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.3

diff --git a/python-pypi/six/DETAILS b/python-pypi/six/DETAILS
index da11efc..ca74a9e 100755
--- a/python-pypi/six/DETAILS
+++ b/python-pypi/six/DETAILS
@@ -1,6 +1,6 @@
SPELL=six
- VERSION=1.6.1
-
SOURCE_HASH=sha512:bd925295964696dc8632eb0b9d6632f25d4b461fefceb470d2bb537e98b0db9dddf9c2abb363657451b950572e91f1ab5973d12739781823f9b845abe5061057
+ VERSION=1.7.3
+
SOURCE_HASH=sha512:d8937dd2ad7e75e022ae7b334043bf83c194dc0d9c4deb65a79cdbd11dd63bc08f7d147deb0a77df1487861fc0a724959477deefcac9e57818880acc1cf0b737
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/six/HISTORY b/python-pypi/six/HISTORY
index 1ab11e2..a2e1993 100644
--- a/python-pypi/six/HISTORY
+++ b/python-pypi/six/HISTORY
@@ -1,3 +1,6 @@
+2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.3
+
2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.1

diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index fef1266..5553415 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.9.4
-
SOURCE_HASH=sha512:0a497de001c2f26663c16798c2be41b040f79b1463e3fb1a51205a14976bc92795abc6a0fbf4d42790a8041760103c58cb03ce0ea1d5973f84d092c0b86cc1e7
+ VERSION=0.9.7
+
SOURCE_HASH=sha512:dac79eccb971589eb0fabffbfe731bb31cd58e6ec1309aaea22679d030b82be0f1096635edecdbde2d6cf2374778ecd0f888a22f9c69ee71e50bea41856b4190
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index a31526c..696df4a 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,9 @@
+2014-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.7
+
+2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.6
+
2014-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.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/python-pypi/virtualenv/DEPENDS b/python-pypi/virtualenv/DEPENDS
index 503782e..e440941 100755
--- a/python-pypi/virtualenv/DEPENDS
+++ b/python-pypi/virtualenv/DEPENDS
@@ -1,2 +1,2 @@
-depends python &&
+depends PYTHON &&
depends SETUPTOOLS
diff --git a/python-pypi/virtualenv/DETAILS b/python-pypi/virtualenv/DETAILS
index ca848a2..77599d8 100755
--- a/python-pypi/virtualenv/DETAILS
+++ b/python-pypi/virtualenv/DETAILS
@@ -1,6 +1,6 @@
SPELL=virtualenv
- VERSION=1.8.4
-
SOURCE_HASH=sha512:2c485bc2ade615a1d397174be85f607605f1c97267ce38ec5a7b208a3d5f17b9abc456dc32154f2a5d21ebe1f7d82032b28deb66dd230bad2e69d9c72761e975
+ VERSION=1.11.4
+
SOURCE_HASH=sha512:92747102f90dcb1bc7143c04bcad2e881e988c85c1f052ffb71fd3dc00f05bfcda16280dff793f385fc692b60e50b4eb9543c7e59e47a4cf36709b0e85f20201
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/v/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/virtualenv/HISTORY b/python-pypi/virtualenv/HISTORY
index c19a140..f686eb1 100644
--- a/python-pypi/virtualenv/HISTORY
+++ b/python-pypi/virtualenv/HISTORY
@@ -1,3 +1,7 @@
+2014-04-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.11.4
+ * DEPENDS: switched to PYTHON (python3 supported)
+
2013-01-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.4

diff --git a/python-pypi/xlrd/DETAILS b/python-pypi/xlrd/DETAILS
index e895488..681558f 100755
--- a/python-pypi/xlrd/DETAILS
+++ b/python-pypi/xlrd/DETAILS
@@ -1,6 +1,6 @@
SPELL=xlrd
- VERSION=0.9.2
-
SOURCE_HASH=sha512:876822957fd99f0e5791f7512d822589d4abd91ad203d3362b014f69b17b551530442e0df36167b3c2d443a20ee637c162f990f7abaabffd9b1924793cf18189
+ VERSION=0.9.3
+
SOURCE_HASH=sha512:8b1480b1b0eb40435c33e6494e3f1c960d97a4e5a7f5a30d1b418485a88e4c6d2721501646eb129d9fce0bcd775aee50b866807b26da77b5c2d35d977bb247d0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/xlrd
diff --git a/python-pypi/xlrd/HISTORY b/python-pypi/xlrd/HISTORY
index c8c7ab3..3cf3203 100644
--- a/python-pypi/xlrd/HISTORY
+++ b/python-pypi/xlrd/HISTORY
@@ -1,3 +1,6 @@
+2014-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.3
+
2013-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.2
* DEPENDS: fix python3 usage
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..813f550 100755
--- a/ruby-raa/ruby-2.0/DEPENDS
+++ b/ruby-raa/ruby-2.0/DEPENDS
@@ -1,6 +1,8 @@
+depends libffi &&
+
optional_depends doxygen "" "--disable-install-doc" "install documentation"
&&
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" &&
+optional_depends tk "" "" "for tk support"
diff --git a/ruby-raa/ruby-2.0/DETAILS b/ruby-raa/ruby-2.0/DETAILS
index 4c13824..5507a8b 100755
--- a/ruby-raa/ruby-2.0/DETAILS
+++ b/ruby-raa/ruby-2.0/DETAILS
@@ -1,8 +1,8 @@
SPELL=ruby-2.0
PACKAGE=ruby
- VERSION=2.0.0-p353
-
SOURCE_HASH=sha512:52aa64c5991e61cc49c2062672554353bc88ab563da93a1d1591257153c2f6d8de02417a33d7a585eb0102f1079a993e46671fb6c97c62eac8615de567b575f2
- SECURITY_PATCH=2
+ VERSION=2.0.0-p576
+
SOURCE_HASH=sha512:e089cca4867cd9c715f4f37e40a1db9af6ba0c74b47e79568121bb980476f8877a87ccb848b973381edb4667c0c73165f5e1761f60db839e67f6326302dbd864
+ SECURITY_PATCH=3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$PACKAGE-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE
diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY
index d2f1414..6c4e90e 100644
--- a/ruby-raa/ruby-2.0/HISTORY
+++ b/ruby-raa/ruby-2.0/HISTORY
@@ -1,3 +1,13 @@
+2014-09-26 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 2.0.0-p576
+ SECURITY_PATCH++ fixes CVE-2014-2525
+
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libffi
+
+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/DETAILS b/ruby-raa/ruby-2.1/DETAILS
index 307d63e..f2d14d3 100755
--- a/ruby-raa/ruby-2.1/DETAILS
+++ b/ruby-raa/ruby-2.1/DETAILS
@@ -1,7 +1,7 @@
SPELL=ruby-2.1
PACKAGE=ruby
- VERSION=2.1.1
-
SOURCE_HASH=sha512:9850bdb785e87705e72f302822a530d8552fbeb739d59a408786e892d007ee0077271bf148e3928d85d30570dfae951142434ada6cc238e208d0cb12de32c21f
+ VERSION=2.1.2
+
SOURCE_HASH=sha512:51594ecee8ef6ad45e4a835d7671d11c126826fdaaeddfd361a6640bf30077e22212ee00342fe705c564225f637f8d692572c56b553a188bba507499b55d8843
SECURITY_PATCH=0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$PACKAGE-$VERSION.tar.bz2
diff --git a/ruby-raa/ruby-2.1/HISTORY b/ruby-raa/ruby-2.1/HISTORY
index 9f0e504..aebd46d 100644
--- a/ruby-raa/ruby-2.1/HISTORY
+++ b/ruby-raa/ruby-2.1/HISTORY
@@ -1,3 +1,9 @@
+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
+
2014-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.1

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-libs/itk/BUILD b/science-libs/itk/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/science-libs/itk/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/science-libs/itk/DEPENDS b/science-libs/itk/DEPENDS
new file mode 100755
index 0000000..60dd614
--- /dev/null
+++ b/science-libs/itk/DEPENDS
@@ -0,0 +1 @@
+depends cmake
diff --git a/science-libs/itk/DETAILS b/science-libs/itk/DETAILS
new file mode 100755
index 0000000..5d970a6
--- /dev/null
+++ b/science-libs/itk/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=itk
+ VERSION=4.6.0
+ SOURCE="InsightToolkit-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/4.6/${SOURCE}
+
SOURCE_HASH=sha512:bed0d009b47f635a1af54f185d31123c58b64f1d10d7459d54e5806e158dc9eef2ff0ff0be341d1b74603c07477d40f8c34d6f7850147448148661352b41a010
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/InsightToolkit-${VERSION}"
+ WEB_SITE="http://www.itk.org/";
+ LICENSE[0]="apache-2.0"
+ ENTERED=20140925
+ KEYWORDS=""
+ SHORT="toolkit for performing registration and segmentation"
+cat << EOF
+ITK is an open-source software toolkit for performing registration and
+segmentation. Segmentation is the process of identifying and classifying
+data found in a digitally sampled representation. Typically the sampled
+representation is an image acquired from such medical instrumentation as CT,
+MRI or ultrasound scanners. Registration is the task of aligning or
developing
+correspondences between data. For example, in the medical environment, a
+CT scan may be aligned with a MRI scan in order to combine the information
+contained in both.
+EOF
diff --git a/science-libs/itk/HISTORY b/science-libs/itk/HISTORY
new file mode 100644
index 0000000..a6d391e
--- /dev/null
+++ b/science-libs/itk/HISTORY
@@ -0,0 +1,2 @@
+2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD
index 23466e0..67e73c2 100755
--- a/science-libs/vtk/BUILD
+++ b/science-libs/vtk/BUILD
@@ -1,70 +1,20 @@
-export VTK_DATA_ROOT=/usr/share/vtk/VTKData &&
-export VTK_INSTALL_PATH=/usr &&
-export CMAKE_INSTALL_PREFIX=/usr &&
-
-cmake . &&
-sedit "s/^CMAKE_INSTALL_PREFIX:PATH=.*$/CMAKE_INSTALL_PREFIX:PATH=\/usr/"
CMakeCache.txt &&
-sedit "s/BUILD_SHARED_LIBS\:BOOL=OFF/BUILD_SHARED_LIBS\:BOOL=ON/"
CMakeCache.txt &&
-sedit "s/CMAKE_BUILD_TYPE:STRING=/&Release/" CMakeCache.txt
&&
-sedit "s/BUILD_EXAMPLES\:BOOL=OFF/BUILD_EXAMPLES\:BOOL=ON/" CMakeCache.txt
&&
-sedit "s/VTK_USE_HYBRID\:BOOL=OFF/VTK_USE_HYBRID\:BOOL=ON/" CMakeCache.txt
&&
-sedit
"s/CMAKE_CXX_FLAGS_RELEASE\:STRING=-O3/CMAKE_CXX_FLAGS_RELEASE\:STRING=$CFLAGS/"
CMakeCache.txt &&
-
-#Use java.
-if echo $OPTS| grep -q "with-java" ; then
- sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-if echo $OPTS| grep -q "with-python"; then
- sedit "s/Python language.\" OFF/Python language.\" ON/" CMakeLists.txt
-fi &&
-
-if echo $OPTS| grep -q "with-tcl"; then
- sedit "s/TCL language.\" OFF/TCL language.\" ON/" CMakeLists.txt
-fi &&
-
-if echo $OPTS| grep -q "with-doxygen" ; then
- sedit "s/BUILD_DOCUMENTATION\:BOOL=OFF/BUILD_DOCUMENTATION\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's expat library.
-if echo $OPTS| grep -q "with-expat" ; then
- sedit "s/VTK_USE_SYSTEM_EXPAT\:BOOL=OFF/VTK_USE_SYSTEM_EXPAT\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's jpeg library.
-if echo $OPTS| grep -q "with-jpeg" ; then
- sedit "s/VTK_USE_SYSTEM_JPEG\:BOOL=OFF/VTK_USE_SYSTEM_JPEG\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's png library.
-if echo $OPTS| grep -q "with-libpng" ; then
- sedit "s/VTK_USE_SYSTEM_PNG\:BOOL=OFF/VTK_USE_SYSTEM_PNG\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's tiff library.
-if echo $OPTS| grep -q "with-tiff" ; then
- sedit "s/VTK_USE_SYSTEM_TIFF\:BOOL=OFF/VTK_USE_SYSTEM_TIFF\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's zlib library.
-if echo $OPTS| grep -q "with-zlib" ; then
- sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-make
-
-# java is a little broken for now
-# if echo $OPTS| grep -q "with-java" ; then
-# if spell_ok j2sdk ; then export JAVA_HOME=/usr/java/j2sdk;
-# elif spell_ok j2sdk-bin ; then export JAVA_HOME=/usr/lib/j2sdk1.4.1 ;
-# fi &&
-# sedit "s/Java language.\" OFF/Java language.\" ON/" CMakeLists.txt &&
-# stupid thing fails first time on purpose ! so don't use && OK !
-# cmake .
-# sedit
"s:^JAVA_AWT_INCLUDE_PATH\:PATH=.*$:JAVA_AWT_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_AWT_LIBRARY\:FILEPATH=.*$:JAVA_AWT_LIBRARY\:FILEPATH=$JAVA_HOME\/jre\/lib\/i386\/libawt.so:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_INCLUDE_PATH\:PATH=.*$:JAVA_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_INCLUDE_PATH2\:PATH=.*$:JAVA_INCLUDE_PATH2\:PATH=$JAVA_HOME\/include\/linux:"
CMakeCache.txt
-# fi &&
-
+CFLAGS="${CFLAGS//-ffast-math}" &&
+CXXFLAGS="${CXXFLAGS//-ffast-math}" &&
+
+OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" &&
+
+# Building examples fails on VTK 6.1.0
+#OPTS+=' -DBUILD_EXAMPLES=ON'
+
+# Java is a little broken for now
+# if echo $OPTS | grep -q VTK_WRAP_JAVA=ON; then
+# if [ -z "$JAVA_HOME" -a -f /etc/profile.d/java.sh ]; then
+# . /etc/profile.d/java.sh
+# fi &&
+# OPTS+=" -DJAVA_INCLUDE_PATH=$JAVA_HOME/include"
+# OPTS+=" -DJAVA_INCLUDE_PATH2=$JAVA_HOME/include/linux"
+# OPTS+=" -DJAVA_AWT_INCLUDE_PATH=$JAVA_HOME/include"
+# OPTS+=" -DJAVA_AWT_LIBRARY=$JAVA_HOME/jre/lib/i386/libawt.so"
+# fi
+
+cmake_build
diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS
index 53c4c3b..b2e086a 100755
--- a/science-libs/vtk/DEPENDS
+++ b/science-libs/vtk/DEPENDS
@@ -1,45 +1,41 @@
-depends cmake &&
-depends xorg-libs &&
-depends tk &&
-
-#optional_depends 'JAVA' 'with-java' 'Wrap VTK classes into the JAVA
language' 'z-rejected' &&
-
-optional_depends python \
- "with-python" \
- "" \
- "Wrap VTK classes into the Python language" &&
-
-optional_depends tcl \
- "with-tcl" \
- "" \
- "Wrap VTK classes into the tcl language" &&
-
-optional_depends zlib \
- "with-zlib" \
- "" \
- "Use the system's zlib library" &&
-
-optional_depends tiff \
- "with-tiff" \
- "" \
- "Use the system's tiff library" &&
-
-optional_depends JPEG \
- "with-jpeg" \
- "" \
- "Use the system's jpeg library" &&
-
-optional_depends libpng \
- "with-libpng" \
- "" \
- "Use the system's libpng library" &&
-
-optional_depends expat \
- "with-expat" \
- "" \
- "Use the system's expat library" &&
-
-optional_depends doxygen \
- "with-doxygen" \
- "" \
+optdep() {
+ local o="$3"
+ [ "$o" ] || o=$(tr a-z A-Z <<< "$1")
+ optional_depends "$1" -D"$2"_"$o"=O{N,FF} "$4"
+}
+
+optsyslib() {
+ optdep "$1" WITH_SYSTEM "$2" "Use system's $1 library"
+}
+
+optwrap() {
+ optdep "$1" VTK_WRAP "$2" "Wrap VTK classes into the $1 language"
+}
+
+depends cmake &&
+depends xorg-libs &&
+depends tk &&
+
+#optwrap JAVA &&
+optwrap python &&
+optwrap tcl &&
+
+optsyslib zlib &&
+optsyslib tiff &&
+optsyslib JPEG &&
+optsyslib libpng PNG &&
+optsyslib expat &&
+optsyslib libxml2 &&
+optsyslib freetype2 FREETYPE &&
+optsyslib gl2ps &&
+optsyslib hdf5 &&
+optsyslib netcdf &&
+optsyslib libtheora OGGTHEORA &&
+
+#optsyslib jsoncpp &&
+#optsyslib libproj4 &&
+#optsyslib xdmf2 &&
+
+optional_depends doxygen \
+ -DBUILD_DOCUMENTATION=O{N,FF} \
"build documentation"
diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS
index 57ae1f6..e52186c 100755
--- a/science-libs/vtk/DETAILS
+++ b/science-libs/vtk/DETAILS
@@ -1,11 +1,11 @@
SPELL=vtk
- VERSION=5.10.0
- SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK
- SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:4}/$SOURCE
- WEB_SITE=http://public.kitware.com/VTK
- LICENSE[0]=http://public.kitware.com/VTK/copyright.php
-
SOURCE_HASH=sha512:8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554
+ VERSION=6.1.0
+ SOURCE=VTK-$VERSION.tar.gz
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION
+ SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE
+ WEB_SITE=http://www.vtk.org/
+ LICENSE[0]=modified-bsd
+
SOURCE_HASH=sha512:3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
ENTERED=20020606
KEYWORDS="science libs"
SHORT="library for visualization, image processing, 3D graphics"
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index a62468b..9b0a867 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,11 @@
+2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE, SOURCE_DIRECTORY, WEB_SITE and LICENSE
+ Disabled building examples
+ Remove -ffast-math CFLAG (makes internal sqlite build fail)
+ updated spell to 6.1.0
+ * BUILD, DEPENDS: Replace custom code by cmake_build
+ * DEPENDS: Added missing dependencies
+
2012-10-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.10.0

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/science/gdal/DEPENDS b/science/gdal/DEPENDS
index 083a51c..a28a30a 100755
--- a/science/gdal/DEPENDS
+++ b/science/gdal/DEPENDS
@@ -4,7 +4,7 @@ depends -sub CXX gcc &&
depends libgeotiff "--with-geotiff=yes" &&
depends libpng "--with-png" &&
depends JPEG "--with-jpeg"&&
-depends giflib "--with-gif" &&
+depends GIFLIB "--with-gif" &&
optional_depends cfitsio \
"--with-cfitsio" \
"--with-cfitsio=no" \
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 0dc9eb6..1135a10 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.2

diff --git a/science/gpsbabel/DETAILS b/science/gpsbabel/DETAILS
index d7e9b13..a0de22a 100755
--- a/science/gpsbabel/DETAILS
+++ b/science/gpsbabel/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gpsbabel
if [[ $GPSBABEL_BRANCH == "scm" ]]; then
- if [[ $ELINKS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE="$SPELL-scm.tar.bz2"

SOURCE_URL[0]="svn_http://${SPELL}.googlecode.com/svn/trunk/gpsbabel:$SPELL-scm";
FORCE_DOWNLOAD=on
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index 978ea8d..19e52de 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: remove dependency on system zlib as it is incompatible
with gpsbabel
diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index 3aefc2f..d59bfa1 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
SPELL=qlandkarte-gt
- VERSION=1.7.6
+ VERSION=1.7.7
SOURCE="qlandkartegt-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarte%20GT%20${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:15c96a04979666ccafe9badeed5a6973fdeb49339a707adf20b06d76292d5f23042f541276bc7fc1b390d70a3f5db033f749d2bed30e348c472196622dd3c275
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:c55885703821ae835cbf4b914da2510aa377fe6d6a4cec79266408806ceb17d3316e520daf062bb3390f42b148751e0d9feb06258ca47ad9cda8c6e9311ad6f3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
WEB_SITE="http://www.qlandkarte.org/";
LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index f9e4928..03ed325 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2014-07-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.7
+
2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.6

diff --git a/security-libs/linux-pam/BUILD b/security-libs/linux-pam/BUILD
index 9e833c2..548966a 100755
--- a/security-libs/linux-pam/BUILD
+++ b/security-libs/linux-pam/BUILD
@@ -12,5 +12,4 @@ export PS2PDF=no
$OPTS &&
sedit "s/examples//" Makefile &&
sedit "s/read yes//" conf/install_conf &&
-make_single &&
make
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index dac999b..a74ad64 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -1,13 +1,16 @@
depends flex &&
-depends autoconf &&
depends cracklib &&
depends gnupg &&
depends smgl-fhs &&
+depends pkgconfig &&

if [ "${PAM_DOCS}" == "y" ]; then
depends texlive &&
depends linuxdoc-tools
-fi
+fi &&

+optional_depends db '--enable-db=db' '--enable-db=no' 'database
backend' &&
+optional_depends gettext '--enable-nls' '--disable-nls' 'NLS support'
&&
optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
-optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support"
+optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support" &&
+optional_depends libtirpc '' '' 'RPC protocol, for NIS support'
diff --git a/security-libs/linux-pam/DETAILS b/security-libs/linux-pam/DETAILS
index d3d63ef..c7aefd1 100755
--- a/security-libs/linux-pam/DETAILS
+++ b/security-libs/linux-pam/DETAILS
@@ -1,22 +1,11 @@
SPELL=linux-pam
- VERSION=1.1.6
+ VERSION=1.1.8
+
SOURCE_HASH=sha512:245785ab4e187ceaab6393967352c8d2a2319c64e1e83285d0251cc02995dc2edab8e3001301b6d9f6774c441b7557d9caf4dfdf94c7cd5d44aa53ae759d9e5d
SECURITY_PATCH=3
SOURCE=Linux-PAM-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Linux-PAM-$VERSION
- SOURCE_URL[0]=http://fedorahosted.org/releases/l/i/linux-pam/$SOURCE
-# SOURCE_URL[0]=$KERNEL_URL/pub/linux/libs/pam/library/$SOURCE
-# SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/library/$SOURCE
-
-# SOURCE2=$SOURCE.sign
-# SOURCE2_URL[0]=$KERNEL_URL/pub/linux/libs/pam/library/$SOURCE2
-# SOURCE2_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/library/$SOURCE2
-
-# SOURCE_GPG=kernel.gpg:$SOURCE2
-# SOURCE2_IGNORE=signature
-
- WEB_SITE=http://www.us.kernel.org/pub/linux/libs/pam
+ SOURCE_URL[0]=http://linux-pam.org/library/$SOURCE
+ WEB_SITE=http://linux-pam.org
ENTERED=20010922
LICENSE[0]=GPL
PATCHLEVEL=0
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 2215f18..4832be0 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,13 @@
+2014-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add libtirpc
+
+2014-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.8
+ new website & url
+ * DEPENDS: add optional gettext, db
+ add pkgconfig, remove autoconf
+ * BUILD: remove make_single
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.6
Upstream MD5/SHA1 not posted for 1.1.6
diff --git a/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig
b/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig
deleted file mode 100644
index 4707a7b..0000000
Binary files a/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig and
/dev/null differ
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/fwknop/DETAILS b/security/fwknop/DETAILS
index 0e53554..fc5d454 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,5 +1,5 @@
SPELL=fwknop
- VERSION=2.6.0
+ VERSION=2.6.3
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index db53b14..219cced 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +1,12 @@
+2014-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.3
+
+2014-04-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.2
+
+2014-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.1
+
2014-03-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.0

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/knock/DETAILS b/security/knock/DETAILS
index 8a749da..d2185d9 100755
--- a/security/knock/DETAILS
+++ b/security/knock/DETAILS
@@ -1,11 +1,11 @@
SPELL=knock
- VERSION=0.6
+ VERSION=0.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.zeroflux.org/proj/$SPELL/files/$SOURCE
WEB_SITE=http://www.zeroflux.org/projects/knock
ENTERED=20060529
-
SOURCE_HASH=sha512:79179fe0358abfeb001b787522154b5045f9dd679e8b6bea0f375a064e56ed5166c20dee094b42d56338afdf19041c94f4c86b8d5d385d1cc02ca525c1b73714
+
SOURCE_HASH=sha512:eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
LICENSE[0]=GPL
GATHER_DOCS=off
SHORT="port-knocking server and client"
diff --git a/security/knock/HISTORY b/security/knock/HISTORY
index 01e1724..816345f 100644
--- a/security/knock/HISTORY
+++ b/security/knock/HISTORY
@@ -1,3 +1,8 @@
+2014-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7
+ * INSTALL, init.d/knock.conf: removed man1 -> man8
+ * PRE_BUILD: removed
+
2013-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6
* DEPENDS: made libpcap optional
diff --git a/security/knock/INSTALL b/security/knock/INSTALL
index 2e30521..e3021a8 100755
--- a/security/knock/INSTALL
+++ b/security/knock/INSTALL
@@ -3,7 +3,4 @@ default_install &&
if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/knock.conf" \
"$INSTALL_ROOT/etc/sysconfig/knock"
-fi &&
-
-install -vm 755 -d "$INSTALL_ROOT/usr/share/man/man8" &&
-install -vm 644 "doc/knockd.8" "$INSTALL_ROOT/usr/share/man/man8"
+fi
diff --git a/security/knock/PRE_BUILD b/security/knock/PRE_BUILD
deleted file mode 100755
index 3245823..0000000
--- a/security/knock/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# knockd(1) -> knockd(8)
-mv doc/knockd.1 doc/knockd.8 &&
-sedit "s:knockd 1:knockd 8:" doc/knockd.8
-sedit "s:knockd\.1:knockd\.8:" Makefile.in
diff --git a/security/knock/init.d/knock.conf
b/security/knock/init.d/knock.conf
index 2924313..d1e9017 100644
--- a/security/knock/init.d/knock.conf
+++ b/security/knock/init.d/knock.conf
@@ -1,3 +1,3 @@
-# For the arguments and description see knockd(8)
+# For the arguments and description see knockd(1)

KNOCKD_ARGS=""
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index aa61854..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 \
@@ -34,7 +34,7 @@ optional_depends libdnet \
"--with-libdnet=included" \
"use external dnet lib?" &&

-optional_depends lua51 \
+optional_depends LUA \
"--with-liblua=$INSTALL_ROOT/usr" \
"--with-liblua=included" \
"use external Lua lib?"
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index ee608750..0f91cc8 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,5 +1,5 @@
SPELL=nmap
- VERSION=6.40
+ VERSION=6.47
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
# SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_HASH=sha512:b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b
+
SOURCE_HASH=sha512:f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296
WEB_SITE=http://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 94caf92..3402bdb 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,16 @@
+2014-09-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.47
+
+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
+
2013-08-20 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails to build with -Wl,--as-needed in LDFLAGS

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/BUILD b/security/wireshark/BUILD
index ef8bf7b..efea309 100755
--- a/security/wireshark/BUILD
+++ b/security/wireshark/BUILD
@@ -1,3 +1,3 @@
-OPTS="$WIRESHARK_OPTS $OPTS" &&
+OPTS="--with-qt=no $WIRESHARK_OPTS $OPTS" &&

default_build
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index b4272d1..880fcfd 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -2,9 +2,15 @@ depends glibc &&
depends glib2 &&
depends libpcap &&

-optional_depends gtk+2 \
- "--enable-wireshark" "--disable-wireshark" \
- "for GTK+2 GUI support" &&
+optional_depends gtk+3 \
+ "--with-gtk3=yes" "--with-gtk3=no" \
+ "for GTK+3 GUI support" &&
+
+if ! is_depends_enabled $SPELL gtk+3; then
+ optional_depends gtk+2 \
+ "--with-gtk2=yes" "--with-gtk2=no" \
+ "for GTK+2 GUI support"
+fi &&

optional_depends zlib \
"--with-zlib" "--without-zlib" \
@@ -14,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/DETAILS b/security/wireshark/DETAILS
index fb2bb8b..8526ba8 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.10.5
- SECURITY_PATCH=47
+ VERSION=1.12.1
+ SECURITY_PATCH=49
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:c72d8f23d3018ece52ccebbaa49f6a389e57ce5ab6df93d26f82888b8ed6fb29dd3caf4f5cb022f153f9589261f5666f7bacaf14b2d64b10f56c4e8ef9cc43e7
+
SOURCE_HASH=sha512:840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 6d29c6f..3ba2e0c 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,17 @@
+2014-09-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.1
+
+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
+ * BUILD: added --with-qt=no temporarily
+
+2014-04-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.10.7, SECURITY_PATCH=48
+
2014-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.10.5

diff --git a/shell-term-fm/abduco/BUILD b/shell-term-fm/abduco/BUILD
new file mode 100755
index 0000000..f8acf95
--- /dev/null
+++ b/shell-term-fm/abduco/BUILD
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+make
diff --git a/shell-term-fm/abduco/DETAILS b/shell-term-fm/abduco/DETAILS
new file mode 100755
index 0000000..8623069
--- /dev/null
+++ b/shell-term-fm/abduco/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=abduco
+ VERSION=0.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.brain-dump.org/projects/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:42fbe02bf2a69bbfc91be36830a70daae5ed934877f1fc36808fe13bce52010d8094254a13292f97e1c6b196e8fca6e0835799c4d626865e21ad7ac6716340d6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.brain-dump.org/projects/abduco/";
+ LICENSE[0]="ISC"
+ ENTERED=20140913
+ KEYWORDS=""
+ SHORT="session {at,de}tach support"
+cat << EOF
+abduco provides session management i.e. it allows programs to be run
+independently from its controlling terminal. That is programs can be
detached,
+run in the background, and then later reattached. Together with dvtm it
+provides a simpler and cleaner alternative to tmux or screen.
+
+abduco is in many ways very similar to dtach but is actively maintained,
+contains no legacy code, provides a few additional features, has a cleaner,
+more robust implementation and is distributed under the ISC license.
+EOF
diff --git a/shell-term-fm/abduco/HISTORY b/shell-term-fm/abduco/HISTORY
new file mode 100644
index 0000000..a3901dd
--- /dev/null
+++ b/shell-term-fm/abduco/HISTORY
@@ -0,0 +1,2 @@
+2014-09-13 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: spell created
diff --git a/shell-term-fm/abduco/INSTALL b/shell-term-fm/abduco/INSTALL
new file mode 100755
index 0000000..5e011c6
--- /dev/null
+++ b/shell-term-fm/abduco/INSTALL
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+make DESTDIR="$INSTALL_ROOT" PREFIX=/usr install
diff --git a/shell-term-fm/bash/DEPENDS b/shell-term-fm/bash/DEPENDS
index 2df54f9..35d9cac 100755
--- a/shell-term-fm/bash/DEPENDS
+++ b/shell-term-fm/bash/DEPENDS
@@ -1,5 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends gnupg &&
depends "readline" "--with-installed-readline" &&
depends "ncurses" "--with-curses"
depends smgl-fhs &&
-depends autoconf
+depends autoconf &&
+
+if spell_ok readline && is_version_less $(installed_version readline) 6.3;
then
+ force_depends readline
+fi
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index 0f74ff8..c26644b 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,7 +1,7 @@
SPELL=bash
- VERSION=4.2
- SECURITY_PATCH=2
- BASH_PATCHLEVEL=045
+ VERSION=4.3
+ SECURITY_PATCH=6
+ BASH_PATCHLEVEL=028
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=$SPELL-doc-3.2.tar.gz
@@ -17,7 +17,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE4_IGNORE=signature
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
ENTERED=20010922
- PATCHLEVEL=0
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Bourne Again SHell for the GNU operating system"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 3d2a17d..84f73c2 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,27 @@
+2014-10-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (final ShellShock fixes for CVE-2014-6277
+ and CVE-2014-6278 found by Michal Zalewski)
+ * DEPENDS: bash 4.3 strictly relies on readline 6.3
+ * patches/bash43-028: added, official patch with src line replacement
+
+2014-09-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, patches/bash43-027: add the latest patch against ShellShock
+ issues; SECURITY_PATCH++
+
+2014-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, CVE-2014-7169.diff: remove unofficial patch
+ * DETAILS, patches/bash43-026 add upstream fix for CVE 2014 7169
+
+2014-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD, CVE-2014-7169.diff: fix CVE 2014 7169
+
+2014-09-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD: version 4.3 patchlevel 25
+ * patches/bash-42-*: removed
+ * patches/bash-43-{001..025}: add patches for patchlevel 25
+ * DETAILS: SECURITY_PATCH++, this fixes CVE-2014-6271
+
2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: SECURITY_PATCH++, introduce variable BASH_PATCHLEVEL
* PRE_BUILD: use variable BASH_PATCHLEVEL to determine which
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 1e09873..d3aa1ef 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -4,7 +4,7 @@ unpack_file 3 &&

for i in $(seq -w 1 $BASH_PATCHLEVEL); do
message "${MESSAGE_COLOR}applying patch bash42-$i ...${DEFAULT_COLOR}" &&
- patch -p0 < $SPELL_DIRECTORY/patches/bash42-$i
+ patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i
done &&

if [[ "$BASH_NI_LOGIN" == y ]]; then
diff --git a/shell-term-fm/bash/patches/bash42-001
b/shell-term-fm/bash/patches/bash42-001
deleted file mode 100644
index 547aaa0..0000000
--- a/shell-term-fm/bash/patches/bash42-001
+++ /dev/null
@@ -1,78 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-001
-
-Bug-Reported-by: Juergen Daubert <jue AT jue.li>
-Bug-Reference-ID: <20110214175132.GA19813 AT jue.netz>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html
-
-Bug-Description:
-
-When running in Posix mode, bash does not correctly expand the right-hand
-side of a double-quoted word expansion containing single quotes.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500
---- subst.c 2011-02-19 00:00:00.000000000 -0500
-***************
-*** 1380,1387 ****
-
- /* The handling of dolbrace_state needs to agree with the code in
parse.y:
-! parse_matched_pair() */
-! dolbrace_state = 0;
-! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
-! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE :
DOLBRACE_PARAM;
-
- i = *sindex;
---- 1380,1389 ----
-
- /* The handling of dolbrace_state needs to agree with the code in
parse.y:
-! parse_matched_pair(). The different initial value is to handle the
-! case where this function is called to parse the word in
-! ${param op word} (SX_WORD). */
-! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM;
-! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags &
SX_POSIXEXP))
-! dolbrace_state = DOLBRACE_QUOTE;
-
- i = *sindex;
-***************
-*** 7177,7181 ****
- /* Extract the contents of the ${ ... } expansion
- according to the Posix.2 rules. */
-! value = extract_dollar_brace_string (string, &sindex, quoted, (c ==
'%' || c == '#') ? SX_POSIXEXP : 0);
- if (string[sindex] == RBRACE)
- sindex++;
---- 7181,7185 ----
- /* Extract the contents of the ${ ... } expansion
- according to the Posix.2 rules. */
-! value = extract_dollar_brace_string (string, &sindex, quoted, (c ==
'%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ?
SX_POSIXEXP|SX_WORD : SX_WORD);
- if (string[sindex] == RBRACE)
- sindex++;
-*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500
---- subst.h 2011-02-16 21:12:09.000000000 -0500
-***************
-*** 57,60 ****
---- 57,61 ----
- #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */
- #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal
expansions in extract_dollar_brace_string */
-+ #define SX_WORD 0x0200 /* extracting word in ${param op
word} */
-
- /* Remove backslashes which are quoting backquotes from STRING. Modifies
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 0
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-002
b/shell-term-fm/bash/patches/bash42-002
deleted file mode 100644
index 077c7e0..0000000
--- a/shell-term-fm/bash/patches/bash42-002
+++ /dev/null
@@ -1,60 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-002
-
-Bug-Reported-by: Clark J. Wang <dearvoid AT gmail.com>
-Bug-Reference-ID:
<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
-
-Bug-Description:
-
-The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
-entire line.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000
-0500
---- lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500
-***************
-*** 1115,1119 ****
- _rl_vi_last_motion = c;
- RL_UNSETSTATE (RL_STATE_VIMOTION);
-! return (0);
- }
- #if defined (READLINE_CALLBACKS)
---- 1115,1119 ----
- _rl_vi_last_motion = c;
- RL_UNSETSTATE (RL_STATE_VIMOTION);
-! return (vidomove_dispatch (m));
- }
- #if defined (READLINE_CALLBACKS)
-*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06
12:18:58.000000000 -0400
---- lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500
-***************
-*** 149,152 ****
---- 149,155 ----
- /* Should handle everything, including cleanup, numeric arguments,
- and turning off RL_STATE_VIMOTION */
-+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+ _rl_internal_char_cleanup ();
-+
- return;
- }
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
-
diff --git a/shell-term-fm/bash/patches/bash42-003
b/shell-term-fm/bash/patches/bash42-003
deleted file mode 100644
index c488e96..0000000
--- a/shell-term-fm/bash/patches/bash42-003
+++ /dev/null
@@ -1,318 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-003
-
-Bug-Reported-by: Clark J. Wang <dearvoid AT gmail.com>
-Bug-Reference-ID:
<AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html
-
-Bug-Description:
-
-When using the pattern replacement and pattern removal word expansions, bash
-miscalculates the possible match length in the presence of an unescaped left
-bracket without a closing right bracket, resulting in a failure to match
-the pattern.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000
-0500
---- lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500
-***************
-*** 78,83 ****
- size_t wmax;
- {
-! wchar_t wc, *wbrack;
-! int matlen, t, in_cclass, in_collsym, in_equiv;
-
- if (*wpat == 0)
---- 78,83 ----
- size_t wmax;
- {
-! wchar_t wc;
-! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
-
- if (*wpat == 0)
-***************
-*** 119,123 ****
- case L'[':
- /* scan for ending `]', skipping over embedded [:...:] */
-! wbrack = wpat;
- wc = *wpat++;
- do
---- 119,123 ----
- case L'[':
- /* scan for ending `]', skipping over embedded [:...:] */
-! bracklen = 1;
- wc = *wpat++;
- do
-***************
-*** 125,140 ****
- if (wc == 0)
- {
-! matlen += wpat - wbrack - 1; /* incremented below */
-! break;
- }
- else if (wc == L'\\')
- {
-! wc = *wpat++;
-! if (*wpat == 0)
-! break;
- }
- else if (wc == L'[' && *wpat == L':') /* character class */
- {
- wpat++;
- in_cclass = 1;
- }
---- 125,148 ----
- if (wc == 0)
- {
-! wpat--; /* back up to NUL */
-! matlen += bracklen;
-! goto bad_bracket;
- }
- else if (wc == L'\\')
- {
-! /* *wpat == backslash-escaped character */
-! bracklen++;
-! /* If the backslash or backslash-escape ends the string,
-! bail. The ++wpat skips over the backslash escape */
-! if (*wpat == 0 || *++wpat == 0)
-! {
-! matlen += bracklen;
-! goto bad_bracket;
-! }
- }
- else if (wc == L'[' && *wpat == L':') /* character class */
- {
- wpat++;
-+ bracklen++;
- in_cclass = 1;
- }
-***************
-*** 142,145 ****
---- 150,154 ----
- {
- wpat++;
-+ bracklen++;
- in_cclass = 0;
- }
-***************
-*** 147,152 ****
- {
- wpat++;
- if (*wpat == L']') /* right bracket can appear as
collating symbol */
-! wpat++;
- in_collsym = 1;
- }
---- 156,165 ----
- {
- wpat++;
-+ bracklen++;
- if (*wpat == L']') /* right bracket can appear as
collating symbol */
-! {
-! wpat++;
-! bracklen++;
-! }
- in_collsym = 1;
- }
-***************
-*** 154,157 ****
---- 167,171 ----
- {
- wpat++;
-+ bracklen++;
- in_collsym = 0;
- }
-***************
-*** 159,164 ****
- {
- wpat++;
- if (*wpat == L']') /* right bracket can appear as
equivalence class */
-! wpat++;
- in_equiv = 1;
- }
---- 173,182 ----
- {
- wpat++;
-+ bracklen++;
- if (*wpat == L']') /* right bracket can appear as
equivalence class */
-! {
-! wpat++;
-! bracklen++;
-! }
- in_equiv = 1;
- }
-***************
-*** 166,174 ****
---- 184,196 ----
- {
- wpat++;
-+ bracklen++;
- in_equiv = 0;
- }
-+ else
-+ bracklen++;
- }
- while ((wc = *wpat++) != L']');
- matlen++; /* bracket expression can only match one char
*/
-+ bad_bracket:
- break;
- }
-***************
-*** 214,219 ****
- size_t max;
- {
-! char c, *brack;
-! int matlen, t, in_cclass, in_collsym, in_equiv;
-
- if (*pat == 0)
---- 236,241 ----
- size_t max;
- {
-! char c;
-! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
-
- if (*pat == 0)
-***************
-*** 255,259 ****
- case '[':
- /* scan for ending `]', skipping over embedded [:...:] */
-! brack = pat;
- c = *pat++;
- do
---- 277,281 ----
- case '[':
- /* scan for ending `]', skipping over embedded [:...:] */
-! bracklen = 1;
- c = *pat++;
- do
-***************
-*** 261,276 ****
- if (c == 0)
- {
-! matlen += pat - brack - 1; /* incremented below */
-! break;
- }
- else if (c == '\\')
- {
-! c = *pat++;
-! if (*pat == 0)
-! break;
- }
- else if (c == '[' && *pat == ':') /* character class */
- {
- pat++;
- in_cclass = 1;
- }
---- 283,306 ----
- if (c == 0)
- {
-! pat--; /* back up to NUL */
-! matlen += bracklen;
-! goto bad_bracket;
- }
- else if (c == '\\')
- {
-! /* *pat == backslash-escaped character */
-! bracklen++;
-! /* If the backslash or backslash-escape ends the string,
-! bail. The ++pat skips over the backslash escape */
-! if (*pat == 0 || *++pat == 0)
-! {
-! matlen += bracklen;
-! goto bad_bracket;
-! }
- }
- else if (c == '[' && *pat == ':') /* character class */
- {
- pat++;
-+ bracklen++;
- in_cclass = 1;
- }
-***************
-*** 278,281 ****
---- 308,312 ----
- {
- pat++;
-+ bracklen++;
- in_cclass = 0;
- }
-***************
-*** 283,288 ****
- {
- pat++;
- if (*pat == ']') /* right bracket can appear as
collating symbol */
-! pat++;
- in_collsym = 1;
- }
---- 314,323 ----
- {
- pat++;
-+ bracklen++;
- if (*pat == ']') /* right bracket can appear as
collating symbol */
-! {
-! pat++;
-! bracklen++;
-! }
- in_collsym = 1;
- }
-***************
-*** 290,293 ****
---- 325,329 ----
- {
- pat++;
-+ bracklen++;
- in_collsym = 0;
- }
-***************
-*** 295,300 ****
- {
- pat++;
- if (*pat == ']') /* right bracket can appear as
equivalence class */
-! pat++;
- in_equiv = 1;
- }
---- 331,340 ----
- {
- pat++;
-+ bracklen++;
- if (*pat == ']') /* right bracket can appear as
equivalence class */
-! {
-! pat++;
-! bracklen++;
-! }
- in_equiv = 1;
- }
-***************
-*** 302,310 ****
---- 342,354 ----
- {
- pat++;
-+ bracklen++;
- in_equiv = 0;
- }
-+ else
-+ bracklen++;
- }
- while ((c = *pat++) != ']');
- matlen++; /* bracket expression can only match one char
*/
-+ bad_bracket:
- break;
- }
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-004
b/shell-term-fm/bash/patches/bash42-004
deleted file mode 100644
index fe29f82..0000000
--- a/shell-term-fm/bash/patches/bash42-004
+++ /dev/null
@@ -1,53 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-004
-
-Bug-Reported-by: Mike Frysinger <vapier AT gentoo.org>
-Bug-Reference-ID: <201102182106.17834.vapier AT gentoo.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html
-
-Bug-Description:
-
-When used in contexts where word splitting and quote removal were not
-performed, such as pattern removal or pattern substitution, empty strings
-(either literal or resulting from quoted variables that were unset or
-null) were not matched correctly, resulting in failure.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500
---- subst.c 2011-02-18 22:30:13.000000000 -0500
-***************
-*** 3373,3379 ****
- if (string == 0 || *string == '\0')
- return (WORD_LIST *)NULL;
-
-! td.flags = 0;
- td.word = string;
- tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p,
has_dollar_at);
- return (tresult);
---- 3373,3379 ----
- if (string == 0 || *string == '\0')
- return (WORD_LIST *)NULL;
-
-! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */
- td.word = string;
- tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p,
has_dollar_at);
- return (tresult);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-005
b/shell-term-fm/bash/patches/bash42-005
deleted file mode 100644
index 3ca9fc1..0000000
--- a/shell-term-fm/bash/patches/bash42-005
+++ /dev/null
@@ -1,131 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-005
-
-Bug-Reported-by: Dennis Williamson <dennistwilliamson AT gmail.com>
-Bug-Reference-ID:
<AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html
-
-Bug-Description:
-
-Systems that use tzset() to set the local timezone require the TZ variable
-to be in the environment. Bash must make sure the environment has been
-modified with any updated value for TZ before calling tzset(). This
-affects prompt string expansions and the `%T' printf conversion specification
-on systems that do not allow bash to supply a replacement for getenv(3).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500
---- variables.h 2011-02-19 19:57:12.000000000 -0500
-***************
-*** 314,317 ****
---- 314,318 ----
- extern void sort_variables __P((SHELL_VAR **));
-
-+ extern int chkexport __P((char *));
- extern void maybe_make_export_env __P((void));
- extern void update_export_env_inplace __P((char *, int, char *));
-*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500
---- variables.c 2011-02-19 20:04:50.000000000 -0500
-***************
-*** 3654,3657 ****
---- 3654,3673 ----
- }
-
-+ int
-+ chkexport (name)
-+ char *name;
-+ {
-+ SHELL_VAR *v;
-+
-+ v = find_variable (name);
-+ if (exported_p (v))
-+ {
-+ array_needs_making = 1;
-+ maybe_make_export_env ();
-+ return 1;
-+ }
-+ return 0;
-+ }
-+
- void
- maybe_make_export_env ()
-***************
-*** 4215,4219 ****
- { "TEXTDOMAINDIR", sv_locale },
-
-! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
- { "TZ", sv_tz },
- #endif
---- 4231,4235 ----
- { "TEXTDOMAINDIR", sv_locale },
-
-! #if defined (HAVE_TZSET)
- { "TZ", sv_tz },
- #endif
-***************
-*** 4559,4568 ****
- #endif /* HISTORY */
-
-! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
- void
- sv_tz (name)
- char *name;
- {
-! tzset ();
- }
- #endif
---- 4575,4585 ----
- #endif /* HISTORY */
-
-! #if defined (HAVE_TZSET)
- void
- sv_tz (name)
- char *name;
- {
-! if (chkexport (name))
-! tzset ();
- }
- #endif
-*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500
---- parse.y 2011-02-19 20:05:00.000000000 -0500
-***************
-*** 5136,5139 ****
---- 5136,5142 ----
- /* Make the current time/date into a string. */
- (void) time (&the_time);
-+ #if defined (HAVE_TZSET)
-+ sv_tz ("TZ"); /* XXX -- just make sure */
-+ #endif
- tm = localtime (&the_time);
-
-*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000
-0500
---- builtins/printf.def 2011-02-19 20:05:04.000000000 -0500
-***************
-*** 466,469 ****
---- 466,472 ----
- else
- secs = arg;
-+ #if defined (HAVE_TZSET)
-+ sv_tz ("TZ"); /* XXX -- just make sure */
-+ #endif
- tm = localtime (&secs);
- n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-006
b/shell-term-fm/bash/patches/bash42-006
deleted file mode 100644
index be6e49c..0000000
--- a/shell-term-fm/bash/patches/bash42-006
+++ /dev/null
@@ -1,46 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-006
-
-Bug-Reported-by: Allan McRae <allan AT archlinux.org>
-Bug-Reference-ID: <4D6D0D0B.50908 AT archlinux.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html
-
-Bug-Description:
-
-A problem with bash42-005 caused it to dump core if TZ was unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500
---- variables.c 2011-03-01 10:13:04.000000000 -0500
-***************
-*** 3661,3665 ****
-
- v = find_variable (name);
-! if (exported_p (v))
- {
- array_needs_making = 1;
---- 3661,3665 ----
-
- v = find_variable (name);
-! if (v && exported_p (v))
- {
- array_needs_making = 1;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-007
b/shell-term-fm/bash/patches/bash42-007
deleted file mode 100644
index d16156e..0000000
--- a/shell-term-fm/bash/patches/bash42-007
+++ /dev/null
@@ -1,46 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-007
-
-Bug-Reported-by: Matthias Klose <doko AT debian.org>
-Bug-Reference-ID: <4D6FD2AC.1010500 AT debian.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html
-
-Bug-Description:
-
-When used in contexts where word splitting and quote removal were not
-performed, such as case statement word expansion, empty strings
-(either literal or resulting from quoted variables that were unset or
-null) were not expanded correctly, resulting in failure.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500
---- subst.c 2011-03-03 14:08:23.000000000 -0500
-***************
-*** 4609,4614 ****
---- 4611,4617 ----
- if (ifs_firstc == 0)
- #endif
- word->flags |= W_NOSPLIT;
-+ word->flags |= W_NOSPLIT2;
- result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int
*)NULL);
- expand_no_split_dollar_star = 0;
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-008
b/shell-term-fm/bash/patches/bash42-008
deleted file mode 100644
index 631abbd..0000000
--- a/shell-term-fm/bash/patches/bash42-008
+++ /dev/null
@@ -1,74 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-008
-
-Bug-Reported-by: Doug McMahon <mc2man AT optonline.net>
-Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html
-
-Bug-Description:
-
-Bash-4.2 does not attempt to save the shell history on receipt of a
-terminating signal that is handled synchronously. Unfortunately, the
-`close' button on most X11 terminal emulators sends SIGHUP, which
-kills the shell.
-
-This is a very small patch to save the history in the case that an
-interactive shell receives a SIGHUP or SIGTERM while in readline and
-reading a command.
-
-The next version of bash will do this differently.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010
---- sig.c Tue Mar 8 21:28:32 2011
-***************
-*** 47,50 ****
---- 47,51 ----
- #if defined (READLINE)
- # include "bashline.h"
-+ # include <readline/readline.h>
- #endif
-
-***************
-*** 63,66 ****
---- 64,68 ----
- extern int history_lines_this_session;
- #endif
-+ extern int no_line_editing;
-
- extern void initialize_siglist ();
-***************
-*** 506,510 ****
- #if defined (HISTORY)
- /* XXX - will inhibit history file being written */
-! history_lines_this_session = 0;
- #endif
- terminate_immediately = 0;
---- 508,515 ----
- #if defined (HISTORY)
- /* XXX - will inhibit history file being written */
-! # if defined (READLINE)
-! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP &&
sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
-! # endif
-! history_lines_this_session = 0;
- #endif
- terminate_immediately = 0;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-009
b/shell-term-fm/bash/patches/bash42-009
deleted file mode 100644
index 83a7e2c..0000000
--- a/shell-term-fm/bash/patches/bash42-009
+++ /dev/null
@@ -1,82 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-009
-
-Bug-Reported-by: <piuma AT piumalab.org>
-Bug-Reference-ID: <4DAAC0DB.7060606 AT piumalab.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html
-
-Bug-Description:
-
-Under certain circumstances, running `fc -l' two times in succession with a
-relative history offset at the end of the history will result in an incorrect
-calculation of the last history entry and a seg fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000
-0400
---- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400
-***************
-*** 305,309 ****
-
- /* XXX */
-! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist]
== 0)
- while (last_hist >= 0 && hlist[last_hist] == 0)
- last_hist--;
---- 305,309 ----
-
- /* XXX */
-! if (i == last_hist && hlist[last_hist] == 0)
- while (last_hist >= 0 && hlist[last_hist] == 0)
- last_hist--;
-***************
-*** 476,480 ****
- {
- int sign, n, clen, rh;
-! register int i, j;
- register char *s;
-
---- 476,480 ----
- {
- int sign, n, clen, rh;
-! register int i, j, last_hist;
- register char *s;
-
-***************
-*** 496,500 ****
- calculation as if it were on. */
- rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) &&
enable_history_list);
-! i -= rh + hist_last_line_added;
-
- /* No specification defaults to most recent command. */
---- 496,508 ----
- calculation as if it were on. */
- rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) &&
enable_history_list);
-! last_hist = i - rh - hist_last_line_added;
-!
-! if (i == last_hist && hlist[last_hist] == 0)
-! while (last_hist >= 0 && hlist[last_hist] == 0)
-! last_hist--;
-! if (last_hist < 0)
-! return (-1);
-!
-! i = last_hist;
-
- /* No specification defaults to most recent command. */
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-010
b/shell-term-fm/bash/patches/bash42-010
deleted file mode 100644
index e408abd..0000000
--- a/shell-term-fm/bash/patches/bash42-010
+++ /dev/null
@@ -1,61 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-010
-
-Bug-Reported-by: Mike Frysinger <vapier AT gentoo.org>
-Bug-Reference-ID: <201104122356.20160.vapier AT gentoo.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html
-
-Bug-Description:
-
-Bash did not correctly print/reproduce here documents attached to commands
-inside compound commands such as arithmetic for loops and user-specified
-subshells. This affected the execution of such commands inside a shell
-function when the function definition is saved and later restored using
-`.' or `eval'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400
---- print_cmd.c 2011-04-14 10:43:18.000000000 -0400
-***************
-*** 316,319 ****
---- 317,321 ----
- skip_this_indent++;
- make_command_string_internal (command->value.Subshell->command);
-+ PRINT_DEFERRED_HEREDOCS ("");
- cprintf (" )");
- break;
-***************
-*** 593,596 ****
---- 606,610 ----
- indentation += indentation_amount;
- make_command_string_internal (arith_for_command->action);
-+ PRINT_DEFERRED_HEREDOCS ("");
- semicolon ();
- indentation -= indentation_amount;
-***************
-*** 654,657 ****
---- 668,672 ----
-
- make_command_string_internal (group_command->command);
-+ PRINT_DEFERRED_HEREDOCS ("");
-
- if (inside_function_def)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-011
b/shell-term-fm/bash/patches/bash42-011
deleted file mode 100644
index 26fdf65..0000000
--- a/shell-term-fm/bash/patches/bash42-011
+++ /dev/null
@@ -1,46 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-011
-
-Bug-Reported-by: "David Parks" <davidparks21 AT yahoo.com>
-Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html
-
-Bug-Description:
-
-Overwriting a value in an associative array causes the memory allocated to
-store the key on the second and subsequent assignments to leak.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/assoc.c 2009-08-05 20:19:40.000000000 -0400
---- assoc.c 2011-10-04 20:23:07.000000000 -0400
-***************
-*** 78,81 ****
---- 78,86 ----
- if (b == 0)
- return -1;
-+ /* If we are overwriting an existing element's value, we're not going to
-+ use the key. Nothing in the array assignment code path frees the key
-+ string, so we can free it here to avoid a memory leak. */
-+ if (b->key != key)
-+ free (key);
- FREE (b->data);
- b->data = value ? savestring (value) : (char *)0;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-012
b/shell-term-fm/bash/patches/bash42-012
deleted file mode 100644
index 70f0a56..0000000
--- a/shell-term-fm/bash/patches/bash42-012
+++ /dev/null
@@ -1,151 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-012
-
-Bug-Reported-by: Rui Santos <rsantos AT grupopie.com>
-Bug-Reference-ID: <4E04C6D0.2020507 AT grupopie.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html
-
-Bug-Description:
-
-When calling the parser to recursively parse a command substitution within
-an arithmetic expansion, the shell overwrote the saved shell input line and
-associated state, resulting in a garbled command.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/parse.y 2011-02-26 19:19:05.000000000 -0500
---- parse.y 2011-06-24 20:08:22.000000000 -0400
-***************
-*** 3843,3846 ****
---- 3849,3853 ----
- {
- sh_parser_state_t ps;
-+ sh_input_line_state_t ls;
- int orig_ind, nc, sflags;
- char *ret, *s, *ep, *ostring;
-***************
-*** 3850,3857 ****
---- 3857,3866 ----
- ostring = string;
-
-+ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'",
shell_input_line_size, shell_input_line);*/
- sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE;
- if (flags & SX_NOLONGJMP)
- sflags |= SEVAL_NOLONGJMP;
- save_parser_state (&ps);
-+ save_input_line_state (&ls);
-
- /*(*/
-***************
-*** 3862,3865 ****
---- 3871,3876 ----
- restore_parser_state (&ps);
- reset_parser ();
-+ /* reset_parser clears shell_input_line and associated variables */
-+ restore_input_line_state (&ls);
- if (interactive)
- token_to_read = 0;
-***************
-*** 5909,5912 ****
---- 5920,5929 ----
- ps->echo_input_at_read = echo_input_at_read;
-
-+ ps->token = token;
-+ ps->token_buffer_size = token_buffer_size;
-+ /* Force reallocation on next call to read_token_word */
-+ token = 0;
-+ token_buffer_size = 0;
-+
- return (ps);
- }
-***************
-*** 5950,5953 ****
---- 5967,6006 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+
-+ FREE (token);
-+ token = ps->token;
-+ token_buffer_size = ps->token_buffer_size;
-+ }
-+
-+ sh_input_line_state_t *
-+ save_input_line_state (ls)
-+ sh_input_line_state_t *ls;
-+ {
-+ if (ls == 0)
-+ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t));
-+ if (ls == 0)
-+ return ((sh_input_line_state_t *)NULL);
-+
-+ ls->input_line = shell_input_line;
-+ ls->input_line_size = shell_input_line_size;
-+ ls->input_line_len = shell_input_line_len;
-+ ls->input_line_index = shell_input_line_index;
-+
-+ /* force reallocation */
-+ shell_input_line = 0;
-+ shell_input_line_size = shell_input_line_len = shell_input_line_index =
0;
-+ }
-+
-+ void
-+ restore_input_line_state (ls)
-+ sh_input_line_state_t *ls;
-+ {
-+ FREE (shell_input_line);
-+ shell_input_line = ls->input_line;
-+ shell_input_line_size = ls->input_line_size;
-+ shell_input_line_len = ls->input_line_len;
-+ shell_input_line_index = ls->input_line_index;
-+
-+ set_line_mbstate ();
- }
-
-*** ../bash-4.2-patched/shell.h 2011-01-06 22:16:55.000000000 -0500
---- shell.h 2011-06-24 19:12:25.000000000 -0400
-***************
-*** 137,140 ****
---- 139,145 ----
- int *token_state;
-
-+ char *token;
-+ int token_buffer_size;
-+
- /* input line state -- line number saved elsewhere */
- int input_line_terminator;
-***************
-*** 167,171 ****
---- 172,186 ----
- } sh_parser_state_t;
-
-+ typedef struct _sh_input_line_state_t {
-+ char *input_line;
-+ int input_line_index;
-+ int input_line_size;
-+ int input_line_len;
-+ } sh_input_line_state_t;
-+
- /* Let's try declaring these here. */
- extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
- extern void restore_parser_state __P((sh_parser_state_t *));
-+
-+ extern sh_input_line_state_t *save_input_line_state
__P((sh_input_line_state_t *));
-+ extern void restore_input_line_state __P((sh_input_line_state_t *));
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-013
b/shell-term-fm/bash/patches/bash42-013
deleted file mode 100644
index 5bb186b..0000000
--- a/shell-term-fm/bash/patches/bash42-013
+++ /dev/null
@@ -1,52 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-013
-
-Bug-Reported-by: Marten Wikstrom <marten.wikstrom AT keystream.se>
-Bug-Reference-ID: <BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html
-
-Bug-Description:
-
-An off-by-one error caused the shell to skip over CTLNUL characters,
-which are used internally to mark quoted null strings. The effect
-was to have stray 0x7f characters left after expanding words like
-""""""""aa.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500
---- subst.c 2011-05-11 11:23:33.000000000 -0400
-***************
-*** 3707,3711 ****
- }
- else if (string[i] == CTLNUL)
-! i++;
-
- prev_i = i;
---- 3710,3717 ----
- }
- else if (string[i] == CTLNUL)
-! {
-! i++;
-! continue;
-! }
-
- prev_i = i;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-014
b/shell-term-fm/bash/patches/bash42-014
deleted file mode 100644
index a43271c..0000000
--- a/shell-term-fm/bash/patches/bash42-014
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-014
-
-Bug-Reported-by: Shawn Bohrer <sbohrer AT rgmadvisors.com>
-Bug-Reference-ID: <20110504152320.6E8F28130527 AT dev1.rgmadvisors.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html
-
-Bug-Description:
-
-The regular expression matching operator did not correctly match
-expressions with an embedded ^A.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/pathexp.c 2010-08-13 23:21:57.000000000 -0400
---- pathexp.c 2011-05-05 16:40:58.000000000 -0400
-***************
-*** 197,201 ****
- if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
- continue;
-! if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
- continue;
- temp[j++] = '\\';
---- 197,201 ----
- if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
- continue;
-! if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char
(pathname[i+1]) == 0)
- continue;
- temp[j++] = '\\';
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-015
b/shell-term-fm/bash/patches/bash42-015
deleted file mode 100644
index 8655873..0000000
--- a/shell-term-fm/bash/patches/bash42-015
+++ /dev/null
@@ -1,81 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-015
-
-Bug-Reported-by: <dnade.ext AT orange-ftgroup.com>
-Bug-Reference-ID:
<728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D AT PUEXCB2B.nanterre.francetelecom.fr>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html
-
-Bug-Description:
-
-When in a context where arithmetic evaluation is not taking place, the
-evaluator should not check for division by 0.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/expr.c 2010-12-21 11:12:13.000000000 -0500
---- expr.c 2011-08-02 20:58:28.000000000 -0400
-***************
-*** 477,480 ****
---- 481,492 ----
- if (special)
- {
-+ if ((op == DIV || op == MOD) && value == 0)
-+ {
-+ if (noeval == 0)
-+ evalerror (_("division by 0"));
-+ else
-+ value = 1;
-+ }
-+
- switch (op)
- {
-***************
-*** 483,493 ****
- break;
- case DIV:
-- if (value == 0)
-- evalerror (_("division by 0"));
- lvalue /= value;
- break;
- case MOD:
-- if (value == 0)
-- evalerror (_("division by 0"));
- lvalue %= value;
- break;
---- 495,501 ----
-***************
-*** 805,809 ****
-
- if (((op == DIV) || (op == MOD)) && (val2 == 0))
-! evalerror (_("division by 0"));
-
- if (op == MUL)
---- 813,822 ----
-
- if (((op == DIV) || (op == MOD)) && (val2 == 0))
-! {
-! if (noeval == 0)
-! evalerror (_("division by 0"));
-! else
-! val2 = 1;
-! }
-
- if (op == MUL)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-016
b/shell-term-fm/bash/patches/bash42-016
deleted file mode 100644
index 4602588..0000000
--- a/shell-term-fm/bash/patches/bash42-016
+++ /dev/null
@@ -1,46 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-016
-
-Bug-Reported-by: Martin von Gagern <Martin.vGagern AT gmx.net>
-Bug-Reference-ID: <4E43AD9E.8060501 AT gmx.net>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html
-
-Bug-Description:
-
-Bash should not check for mail while executing the `eval' builtin.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/parse.y Fri Feb 25 12:07:41 2011
---- parse.y Thu Aug 11 19:02:26 2011
-***************
-*** 2500,2504 ****
- is the mail alarm reset; nothing takes place in check_mail ()
- except the checking of mail. Please don't change this. */
-! if (prompt_is_ps1 && time_to_check_mail ())
- {
- check_mail ();
---- 2498,2502 ----
- is the mail alarm reset; nothing takes place in check_mail ()
- except the checking of mail. Please don't change this. */
-! if (prompt_is_ps1 && parse_and_execute_level == 0 &&
time_to_check_mail ())
- {
- check_mail ();
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-017
b/shell-term-fm/bash/patches/bash42-017
deleted file mode 100644
index 010ed1e..0000000
--- a/shell-term-fm/bash/patches/bash42-017
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-017
-
-Bug-Reported-by: Curtis Doty <Curtis AT GreenKey.net>
-Bug-Reference-ID: <20110621035324.A4F70849F59 AT mx1.iParadigms.net>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html
-
-Bug-Description:
-
-Using `read -a foo' where foo was an already-declared associative array
-caused the shell to die with a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000
-0500
---- builtins/read.def 2011-06-21 10:31:02.000000000 -0400
-***************
-*** 643,646 ****
---- 642,651 ----
- return EXECUTION_FAILURE; /* readonly or noassign */
- }
-+ if (assoc_p (var))
-+ {
-+ builtin_error (_("%s: cannot convert associative to indexed
array"), arrayname);
-+ xfree (input_string);
-+ return EXECUTION_FAILURE; /* existing associative array */
-+ }
- array_flush (array_cell (var));
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-018
b/shell-term-fm/bash/patches/bash42-018
deleted file mode 100644
index 5d11dce..0000000
--- a/shell-term-fm/bash/patches/bash42-018
+++ /dev/null
@@ -1,74 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-018
-
-Bug-Reported-by: Thomas Cort <tcort AT minix3.org>
-Bug-Reference-ID: <BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
-
-Bug-Description:
-
-Bash fails to compile unless JOB_CONTROL is defined.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/execute_cmd.c 2011-02-09 17:32:25.000000000 -0500
---- execute_cmd.c 2011-11-06 15:12:48.000000000 -0500
-***************
-*** 2197,2200 ****
---- 2315,2319 ----
- cmd->flags |= CMD_IGNORE_RETURN;
-
-+ #if defined (JOB_CONTROL)
- lastpipe_flag = 0;
- begin_unwind_frame ("lastpipe-exec");
-***************
-*** 2216,2228 ****
- add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
- }
-! cmd->flags |= CMD_LASTPIPE;
- }
- if (prev >= 0)
- add_unwind_protect (close, prev);
-
- exec_result = execute_command_internal (cmd, asynchronous, prev,
pipe_out, fds_to_close);
-
- if (lstdin > 0)
- restore_stdin (lstdin);
-
- if (prev >= 0)
---- 2335,2351 ----
- add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
- }
-! if (cmd)
-! cmd->flags |= CMD_LASTPIPE;
- }
- if (prev >= 0)
- add_unwind_protect (close, prev);
-+ #endif
-
- exec_result = execute_command_internal (cmd, asynchronous, prev,
pipe_out, fds_to_close);
-
-+ #if defined (JOB_CONTROL)
- if (lstdin > 0)
- restore_stdin (lstdin);
-+ #endif
-
- if (prev >= 0)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-019
b/shell-term-fm/bash/patches/bash42-019
deleted file mode 100644
index 5fce40a..0000000
--- a/shell-term-fm/bash/patches/bash42-019
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-019
-
-Bug-Reported-by: Diego Augusto Molina <diegoaugustomolina AT gmail.com>
-Bug-Reference-ID:
<CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA AT mail.gmail.com>
-Bug-Reference-URL:
lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html
-
-Bug-Description:
-
-Using `declare' with attributes and an invalid array variable name or
-assignment reference resulted in a segmentation fault instead of a
-declaration error.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/declare.def 2010-05-30 18:25:21.000000000
-0400
---- builtins/declare.def 2011-09-15 15:20:20.000000000 -0400
-***************
-*** 514,517 ****
---- 514,522 ----
- var = assign_array_element (name, value, 0); /* XXX - not
aflags */
- *subscript_start = '\0';
-+ if (var == 0) /* some kind of assignment error */
-+ {
-+ assign_error++;
-+ NEXT_VARIABLE ();
-+ }
- }
- else if (simple_array_assign)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-020
b/shell-term-fm/bash/patches/bash42-020
deleted file mode 100644
index a1dd044..0000000
--- a/shell-term-fm/bash/patches/bash42-020
+++ /dev/null
@@ -1,60 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-020
-
-Bug-Reported-by: Vincent Sheffer <vince.sheffer AT apisphere.com>
-Bug-Reference-ID: <F13C1C4F-C44C-4071-BFED-4BB6D13CF92F AT apisphere.com>
-Bug-Reference-URL:
https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html
-
-Bug-Description:
-
-The shared object helper script needs to be updated for Mac OS X 10.7
-(Lion, darwin11).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000
-0400
---- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400
-***************
-*** 158,162 ****
-
- # Darwin/MacOS X
-! darwin[89]*|darwin10*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
---- 172,176 ----
-
- # Darwin/MacOS X
-! darwin[89]*|darwin1[012]*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
-***************
-*** 187,191 ****
-
- case "${host_os}" in
-! darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;;
---- 201,205 ----
-
- case "${host_os}" in
-! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only
`/usr/bin/arch` -install_name $(libdir)/$@ -current_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-021
b/shell-term-fm/bash/patches/bash42-021
deleted file mode 100644
index b6153c7..0000000
--- a/shell-term-fm/bash/patches/bash42-021
+++ /dev/null
@@ -1,61 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-021
-
-Bug-Reported-by: Dan Douglas <ormaaj AT gmail.com>
-Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html
-
-Bug-Description:
-
-Using `read -N' to assign values to an array can result in NUL values being
-assigned to some array elements. These values cause seg faults when
referenced
-later.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000
-0500
---- builtins/read.def 2011-12-19 19:52:12.000000000 -0500
-***************
-*** 738,742 ****
- }
- else
-! var = bind_read_variable (varname, t);
- }
- else
---- 775,779 ----
- }
- else
-! var = bind_read_variable (varname, t ? t : "");
- }
- else
-***************
-*** 799,803 ****
- }
- else
-! var = bind_read_variable (list->word->word, input_string);
-
- if (var)
---- 836,840 ----
- }
- else
-! var = bind_read_variable (list->word->word, input_string ?
input_string : "");
-
- if (var)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-022
b/shell-term-fm/bash/patches/bash42-022
deleted file mode 100644
index 0067b13..0000000
--- a/shell-term-fm/bash/patches/bash42-022
+++ /dev/null
@@ -1,61 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-022
-
-Bug-Reported-by: Gregory Margo <gmargo AT pacbell.net>
-Bug-Reference-ID: <20110727174529.GA3333 AT pacbell.net>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html
-
-Bug-Description:
-
-The return value from lseek is `off_t'. This can cause corrupted return
-values when the file offset is greater than 2**31 - 1.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009
---- lib/sh/zread.c Thu Jul 28 18:16:53 2011
-***************
-*** 161,166 ****
- int fd;
- {
-! off_t off;
-! int r;
-
- off = lused - lind;
---- 161,165 ----
- int fd;
- {
-! off_t off, r;
-
- off = lused - lind;
-***************
-*** 169,173 ****
- r = lseek (fd, -off, SEEK_CUR);
-
-! if (r >= 0)
- lused = lind = 0;
- }
---- 168,172 ----
- r = lseek (fd, -off, SEEK_CUR);
-
-! if (r != -1)
- lused = lind = 0;
- }
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-023
b/shell-term-fm/bash/patches/bash42-023
deleted file mode 100644
index 4f204ef..0000000
--- a/shell-term-fm/bash/patches/bash42-023
+++ /dev/null
@@ -1,62 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-023
-
-Bug-Reported-by: Ewan Mellor <Ewan.Mellor AT eu.citrix.com>
-Bug-Reference-ID:
<6005BE083BF501439A84DC3523BAC82DC4B964FD12 AT LONPMAILBOX01.citrite.net>
-Bug-Reference-URL:
-
-Bug-Description:
-
-Under some circumstances, an exit trap triggered by a bad substitution
-error when errexit is enabled will cause the shell to exit with an
-incorrect exit status (0).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500
---- subst.c 2012-02-08 13:36:28.000000000 -0500
-***************
-*** 7275,7278 ****
---- 7281,7285 ----
- case '\0':
- bad_substitution:
-+ last_command_exit_value = EXECUTION_FAILURE;
- report_error (_("%s: bad substitution"), string ? string : "??");
- FREE (value);
-*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400
---- error.c 2012-02-25 15:54:40.000000000 -0500
-***************
-*** 201,205 ****
- va_end (args);
- if (exit_immediately_on_error)
-! exit_shell (1);
- }
-
---- 201,209 ----
- va_end (args);
- if (exit_immediately_on_error)
-! {
-! if (last_command_exit_value == 0)
-! last_command_exit_value = 1;
-! exit_shell (last_command_exit_value);
-! }
- }
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-024
b/shell-term-fm/bash/patches/bash42-024
deleted file mode 100644
index b7b1158..0000000
--- a/shell-term-fm/bash/patches/bash42-024
+++ /dev/null
@@ -1,45 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-024
-
-Bug-Reported-by: Jim Avera <james_avera AT yahoo.com>
-Bug-Reference-ID: <4F29E07A.80405 AT yahoo.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html
-
-Bug-Description:
-
-When `printf -v' is used to set an array element, the format string contains
-`%b', and the corresponding argument is the empty string, the buffer used
-to store the value to be assigned can be NULL, which results in NUL being
-assigned to the array element. This causes a seg fault when it's used later.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000
-0500
---- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500
-***************
-*** 256,259 ****
---- 257,262 ----
- {
- vflag = 1;
-+ if (vbsize == 0)
-+ vbuf = xmalloc (vbsize = 16);
- vblen = 0;
- if (vbuf)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-025
b/shell-term-fm/bash/patches/bash42-025
deleted file mode 100644
index 34ac343..0000000
--- a/shell-term-fm/bash/patches/bash42-025
+++ /dev/null
@@ -1,143 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-025
-
-Bug-Reported-by: Bill Gradwohl <bill AT ycc.com>
-Bug-Reference-ID:
<CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html
-
-Bug-Description:
-
-When used in a shell function, `declare -g -a array=(compound assignment)'
-creates a local variable instead of a global one.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400
---- command.h 2012-04-01 12:38:35.000000000 -0400
-***************
-*** 98,101 ****
---- 98,102 ----
- #define W_ASSIGNASSOC 0x400000 /* word looks like
associative array assignment */
- #define W_ARRAYIND 0x800000 /* word is an array index being
expanded */
-+ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to
declare (declare/typeset -g) */
-
- /* Possible values for subshell_environment */
-*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500
---- execute_cmd.c 2012-04-01 12:42:03.000000000 -0400
-***************
-*** 3581,3585 ****
- WORD_LIST *w;
- struct builtin *b;
-! int assoc;
-
- if (words == 0)
---- 3581,3585 ----
- WORD_LIST *w;
- struct builtin *b;
-! int assoc, global;
-
- if (words == 0)
-***************
-*** 3587,3591 ****
-
- b = 0;
-! assoc = 0;
-
- for (w = words; w; w = w->next)
---- 3587,3591 ----
-
- b = 0;
-! assoc = global = 0;
-
- for (w = words; w; w = w->next)
-***************
-*** 3604,3607 ****
---- 3604,3609 ----
- if (assoc)
- w->word->flags |= W_ASSIGNASSOC;
-+ if (global)
-+ w->word->flags |= W_ASSNGLOBAL;
- #endif
- }
-***************
-*** 3609,3613 ****
- /* Note that we saw an associative array option to a builtin that takes
- assignment statements. This is a bit of a kludge. */
-! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A'))
- {
- if (b == 0)
---- 3611,3618 ----
- /* Note that we saw an associative array option to a builtin that takes
- assignment statements. This is a bit of a kludge. */
-! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') ||
strchr (w->word->word+1, 'g')))
-! #else
-! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
-! #endif
- {
- if (b == 0)
-***************
-*** 3619,3626 ****
- words->word->flags |= W_ASSNBLTIN;
- }
-! if (words->word->flags & W_ASSNBLTIN)
- assoc = 1;
- }
-- #endif
- }
-
---- 3624,3632 ----
- words->word->flags |= W_ASSNBLTIN;
- }
-! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1,
'A'))
- assoc = 1;
-+ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1,
'g'))
-+ global = 1;
- }
- }
-
-*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400
---- subst.c 2012-04-01 12:38:35.000000000 -0400
-***************
-*** 367,370 ****
---- 367,375 ----
- fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : "");
- }
-+ if (f & W_ASSNGLOBAL)
-+ {
-+ f &= ~W_ASSNGLOBAL;
-+ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : "");
-+ }
- if (f & W_COMPASSIGN)
- {
-***************
-*** 2804,2808 ****
- else if (assign_list)
- {
-! if (word->flags & W_ASSIGNARG)
- aflags |= ASS_MKLOCAL;
- if (word->flags & W_ASSIGNASSOC)
---- 2809,2813 ----
- else if (assign_list)
- {
-! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0)
- aflags |= ASS_MKLOCAL;
- if (word->flags & W_ASSIGNASSOC)
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-026
b/shell-term-fm/bash/patches/bash42-026
deleted file mode 100644
index e15d748..0000000
--- a/shell-term-fm/bash/patches/bash42-026
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-026
-
-Bug-Reported-by: Greg Wooledge <wooledg AT eeg.ccf.org>
-Bug-Reference-ID: <20120425180443.GO22241 AT eeg.ccf.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html
-
-Bug-Description:
-
-The `lastpipe' option does not behave correctly on machines where the
-open file limit is less than 256.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500
---- execute_cmd.c 2012-04-26 11:09:30.000000000 -0400
-***************
-*** 2206,2210 ****
- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out ==
NO_PIPE && prev > 0)
- {
-! lstdin = move_to_high_fd (0, 0, 255);
- if (lstdin > 0)
- {
---- 2325,2329 ----
- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out ==
NO_PIPE && prev > 0)
- {
-! lstdin = move_to_high_fd (0, 1, -1);
- if (lstdin > 0)
- {
-***************
-*** 2252,2256 ****
---- 2371,2377 ----
- }
-
-+ #if defined (JOB_CONTROL)
- discard_unwind_frame ("lastpipe-exec");
-+ #endif
-
- return (exec_result);
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-027
b/shell-term-fm/bash/patches/bash42-027
deleted file mode 100644
index c0c5d3f..0000000
--- a/shell-term-fm/bash/patches/bash42-027
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-027
-
-Bug-Reported-by: Mike Frysinger <vapier AT gentoo.org>
-Bug-Reference-ID: <201204211243.30163.vapier AT gentoo.org>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html
-
-Bug-Description:
-
-When the `extglob' shell option is enabled, pattern substitution does not
-work correctly in the presence of multibyte characters.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400
---- subst.c 2012-04-22 16:19:10.000000000 -0400
-***************
-*** 4167,4171 ****
- #if defined (EXTENDED_GLOB)
- if (extended_glob)
-! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' &&
wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
- #endif
-
---- 4167,4171 ----
- #if defined (EXTENDED_GLOB)
- if (extended_glob)
-! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' &&
wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
- #endif
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-028
b/shell-term-fm/bash/patches/bash42-028
deleted file mode 100644
index fa3be3b..0000000
--- a/shell-term-fm/bash/patches/bash42-028
+++ /dev/null
@@ -1,52 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-028
-
-Bug-Reported-by: Mark Edgar <medgar123 AT gmail.com>
-Bug-Reference-ID:
<CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html
-
-Bug-Description:
-
-When using a word expansion for which the right hand side is evaluated,
-certain expansions of quoted null strings include spurious ^? characters.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400
---- subst.c 2012-03-20 19:30:13.000000000 -0400
-***************
-*** 5810,5813 ****
---- 5810,5823 ----
- if (qdollaratp && ((hasdol && quoted) || l->next))
- *qdollaratp = 1;
-+ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word
is
-+ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
-+ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
-+ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
-+ (which is more paranoia than anything else), we need to return the
-+ quoted null string and set the flags to indicate it. */
-+ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) &&
QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags &
W_HASQUOTEDNULL))
-+ {
-+ w->flags |= W_HASQUOTEDNULL;
-+ }
- dispose_words (l);
- }
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 28
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-029
b/shell-term-fm/bash/patches/bash42-029
deleted file mode 100644
index c51704c..0000000
--- a/shell-term-fm/bash/patches/bash42-029
+++ /dev/null
@@ -1,524 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-029
-
-Bug-Reported-by: "Michael Kalisz" <michael AT kalisz.homelinux.net>
-Bug-Reference-ID:
<50241.78.69.11.112.1298585641.squirrel AT kalisz.homelinux.net>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html
-
-Bug-Description:
-
-Bash-4.2 tries to leave completed directory names as the user typed them,
-without expanding them to a full pathname. One effect of this is that
-shell variables used in pathnames being completed (e.g., $HOME) are left
-unchanged, but the `$' is quoted by readline because it is a special
-character to the shell.
-
-This patch introduces two things:
-
-1. A new shell option, `direxpand', which, if set, attempts to emulate the
- bash-4.1 behavior of expanding words to full pathnames during
- completion;
-2. A set of heuristics that reduce the number of times special characters
- such as `$' are quoted when the directory name is not expanded.
-
-Patch (apply with `patch -p0'):
-
-diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c
-*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500
---- ./bashline.c 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 122,125 ****
---- 122,128 ----
- static int bash_push_line __P((void));
-
-+ static rl_icppfunc_t *save_directory_hook __P((void));
-+ static void reset_directory_hook __P((rl_icppfunc_t *));
-+
- static void cleanup_expansion_error __P((void));
- static void maybe_make_readline_line __P((char *));
-***************
-*** 244,251 ****
---- 247,261 ----
- int dircomplete_spelling = 0;
-
-+ /* Expand directory names during word/filename completion. */
-+ int dircomplete_expand = 0;
-+ int dircomplete_expand_relpath = 0;
-+
- static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
- static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
- /* )) */
-
-+ static const char *default_filename_quote_characters = "
\t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
-+ static char *custom_filename_quote_characters = 0;
-+
- static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
-
-***************
-*** 502,506 ****
- /* Tell the completer that we might want to follow symbolic links or
- do other expansion on directory names. */
-! rl_directory_rewrite_hook = bash_directory_completion_hook;
-
- rl_filename_rewrite_hook = bash_filename_rewrite_hook;
---- 512,516 ----
- /* Tell the completer that we might want to follow symbolic links or
- do other expansion on directory names. */
-! set_directory_hook ();
-
- rl_filename_rewrite_hook = bash_filename_rewrite_hook;
-***************
-*** 530,534 ****
-
- /* characters that need to be quoted when appearing in filenames. */
-! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
-
- rl_filename_quoting_function = bash_quote_filename;
---- 540,544 ----
-
- /* characters that need to be quoted when appearing in filenames. */
-! rl_filename_quote_characters = default_filename_quote_characters;
-
- rl_filename_quoting_function = bash_quote_filename;
-***************
-*** 565,570 ****
- rl_attempted_completion_function = attempt_shell_completion;
- rl_completion_entry_function = NULL;
-- rl_directory_rewrite_hook = bash_directory_completion_hook;
- rl_ignore_some_completions_function = filename_completion_ignore;
- }
-
---- 575,582 ----
- rl_attempted_completion_function = attempt_shell_completion;
- rl_completion_entry_function = NULL;
- rl_ignore_some_completions_function = filename_completion_ignore;
-+ rl_filename_quote_characters = default_filename_quote_characters;
-+
-+ set_directory_hook ();
- }
-
-***************
-*** 1280,1283 ****
---- 1292,1298 ----
- rl_ignore_some_completions_function = filename_completion_ignore;
-
-+ rl_filename_quote_characters = default_filename_quote_characters;
-+ set_directory_hook ();
-+
- /* Determine if this could be a command word. It is if it appears at
- the start of the line (ignoring preceding whitespace), or if it
-***************
-*** 1592,1595 ****
---- 1607,1616 ----
- else
- {
-+ if (dircomplete_expand && dot_or_dotdot (filename_hint))
-+ {
-+ dircomplete_expand = 0;
-+ set_directory_hook ();
-+ dircomplete_expand = 1;
-+ }
- mapping_over = 4;
- goto inner;
-***************
-*** 1792,1795 ****
---- 1813,1819 ----
- inner:
- val = rl_filename_completion_function (filename_hint, istate);
-+ if (mapping_over == 4 && dircomplete_expand)
-+ set_directory_hook ();
-+
- istate = 1;
-
-***************
-*** 2694,2697 ****
---- 2718,2767 ----
- }
-
-+ /* Functions to save and restore the appropriate directory hook */
-+ /* This is not static so the shopt code can call it */
-+ void
-+ set_directory_hook ()
-+ {
-+ if (dircomplete_expand)
-+ {
-+ rl_directory_completion_hook = bash_directory_completion_hook;
-+ rl_directory_rewrite_hook = (rl_icppfunc_t *)0;
-+ }
-+ else
-+ {
-+ rl_directory_rewrite_hook = bash_directory_completion_hook;
-+ rl_directory_completion_hook = (rl_icppfunc_t *)0;
-+ }
-+ }
-+
-+ static rl_icppfunc_t *
-+ save_directory_hook ()
-+ {
-+ rl_icppfunc_t *ret;
-+
-+ if (dircomplete_expand)
-+ {
-+ ret = rl_directory_completion_hook;
-+ rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
-+ }
-+ else
-+ {
-+ ret = rl_directory_rewrite_hook;
-+ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
-+ }
-+
-+ return ret;
-+ }
-+
-+ static void
-+ restore_directory_hook (hookf)
-+ rl_icppfunc_t *hookf;
-+ {
-+ if (dircomplete_expand)
-+ rl_directory_completion_hook = hookf;
-+ else
-+ rl_directory_rewrite_hook = hookf;
-+ }
-+
- /* Handle symbolic link references and other directory name
- expansions while hacking completion. This should return 1 if it
modifies
-***************
-*** 2703,2720 ****
- {
- char *local_dirname, *new_dirname, *t;
-! int return_value, should_expand_dirname;
- WORD_LIST *wl;
- struct stat sb;
-
-! return_value = should_expand_dirname = 0;
- local_dirname = *dirname;
-
-! if (mbschr (local_dirname, '$'))
-! should_expand_dirname = 1;
- else
- {
- t = mbschr (local_dirname, '`');
- if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`")
== 0)
-! should_expand_dirname = 1;
- }
-
---- 2773,2801 ----
- {
- char *local_dirname, *new_dirname, *t;
-! int return_value, should_expand_dirname, nextch, closer;
- WORD_LIST *wl;
- struct stat sb;
-
-! return_value = should_expand_dirname = nextch = closer = 0;
- local_dirname = *dirname;
-
-! if (t = mbschr (local_dirname, '$'))
-! {
-! should_expand_dirname = '$';
-! nextch = t[1];
-! /* Deliberately does not handle the deprecated $[...] arithmetic
-! expansion syntax */
-! if (nextch == '(')
-! closer = ')';
-! else if (nextch == '{')
-! closer = '}';
-! else
-! nextch = 0;
-! }
- else
- {
- t = mbschr (local_dirname, '`');
- if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`")
== 0)
-! should_expand_dirname = '`';
- }
-
-***************
-*** 2740,2743 ****
---- 2821,2841 ----
- dispose_words (wl);
- local_dirname = *dirname;
-+ /* XXX - change rl_filename_quote_characters here based on
-+ should_expand_dirname/nextch/closer. This is the only place
-+ custom_filename_quote_characters is modified. */
-+ if (rl_filename_quote_characters && *rl_filename_quote_characters)
-+ {
-+ int i, j, c;
-+ i = strlen (default_filename_quote_characters);
-+ custom_filename_quote_characters = xrealloc
(custom_filename_quote_characters, i+1);
-+ for (i = j = 0; c = default_filename_quote_characters[i]; i++)
-+ {
-+ if (c == should_expand_dirname || c == nextch || c ==
closer)
-+ continue;
-+ custom_filename_quote_characters[j++] = c;
-+ }
-+ custom_filename_quote_characters[j] = '\0';
-+ rl_filename_quote_characters = custom_filename_quote_characters;
-+ }
- }
- else
-***************
-*** 2759,2762 ****
---- 2857,2871 ----
- }
-
-+ /* no_symbolic_links == 0 -> use (default) logical view of the file
system.
-+ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the
-+ current directory (./).
-+ local_dirname[0] == '.' && local_dirname[1] == 0 means relative
pathnames
-+ in the current directory (e.g., lib/sh).
-+ XXX - should we do spelling correction on these? */
-+
-+ /* This is test as it was in bash-4.2: skip relative pathnames in current
-+ directory. Change test to
-+ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] !=
'/'))
-+ if we want to skip paths beginning with ./ also. */
- if (no_symbolic_links == 0 && (local_dirname[0] != '.' ||
local_dirname[1]))
- {
-***************
-*** 2764,2767 ****
---- 2873,2885 ----
- int len1, len2;
-
-+ /* If we have a relative path
-+ (local_dirname[0] != '/' && local_dirname[0] != '.')
-+ that is canonical after appending it to the current directory, then
-+ temp1 = temp2+'/'
-+ That is,
-+ strcmp (temp1, temp2) == 0
-+ after adding a slash to temp2 below. It should be safe to not
-+ change those.
-+ */
- t = get_working_directory ("symlink-hook");
- temp1 = make_absolute (local_dirname, t);
-***************
-*** 2798,2802 ****
- }
- }
-! return_value |= STREQ (local_dirname, temp2) == 0;
- free (local_dirname);
- *dirname = temp2;
---- 2916,2928 ----
- }
- }
-!
-! /* dircomplete_expand_relpath == 0 means we want to leave relative
-! pathnames that are unchanged by canonicalization alone.
-! *local_dirname != '/' && *local_dirname != '.' == relative pathname
-! (consistent with general.c:absolute_pathname())
-! temp1 == temp2 (after appending a slash to temp2) means the pathname
-! is not changed by canonicalization as described above. */
-! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' &&
local_dirname[0] != '.') && STREQ (temp1, temp2) == 0))
-! return_value |= STREQ (local_dirname, temp2) == 0;
- free (local_dirname);
- *dirname = temp2;
-***************
-*** 3003,3012 ****
- orig_func = rl_completion_entry_function;
- orig_attempt_func = rl_attempted_completion_function;
-- orig_dir_func = rl_directory_rewrite_hook;
- orig_ignore_func = rl_ignore_some_completions_function;
- orig_rl_completer_word_break_characters =
rl_completer_word_break_characters;
- rl_completion_entry_function = rl_filename_completion_function;
- rl_attempted_completion_function = (rl_completion_func_t *)NULL;
-- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
- rl_ignore_some_completions_function = filename_completion_ignore;
- rl_completer_word_break_characters = " \t\n\"\'";
---- 3129,3139 ----
- orig_func = rl_completion_entry_function;
- orig_attempt_func = rl_attempted_completion_function;
- orig_ignore_func = rl_ignore_some_completions_function;
- orig_rl_completer_word_break_characters =
rl_completer_word_break_characters;
-+
-+ orig_dir_func = save_directory_hook ();
-+
- rl_completion_entry_function = rl_filename_completion_function;
- rl_attempted_completion_function = (rl_completion_func_t *)NULL;
- rl_ignore_some_completions_function = filename_completion_ignore;
- rl_completer_word_break_characters = " \t\n\"\'";
-***************
-*** 3016,3023 ****
- rl_completion_entry_function = orig_func;
- rl_attempted_completion_function = orig_attempt_func;
-- rl_directory_rewrite_hook = orig_dir_func;
- rl_ignore_some_completions_function = orig_ignore_func;
- rl_completer_word_break_characters =
orig_rl_completer_word_break_characters;
-
- return r;
- }
---- 3143,3151 ----
- rl_completion_entry_function = orig_func;
- rl_attempted_completion_function = orig_attempt_func;
- rl_ignore_some_completions_function = orig_ignore_func;
- rl_completer_word_break_characters =
orig_rl_completer_word_break_characters;
-
-+ restore_directory_hook (orig_dir_func);
-+
- return r;
- }
-diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h
-*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500
---- ./bashline.h 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 34,41 ****
---- 34,46 ----
- extern int bash_re_edit __P((char *));
-
-+ extern void bashline_set_event_hook __P((void));
-+ extern void bashline_reset_event_hook __P((void));
-+
- extern int bind_keyseq_to_unix_command __P((char *));
-
- extern char **bash_default_completion __P((const char *, int, int, int,
int));
-
-+ void set_directory_hook __P((void));
-+
- /* Used by programmable completion code. */
- extern char *command_word_completion_function __P((const char *, int));
-diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def
-*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000
-0400
---- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 62,65 ****
---- 62,69 ----
- #include "bashgetopt.h"
-
-+ #if defined (READLINE)
-+ # include "../bashline.h"
-+ #endif
-+
- #if defined (HISTORY)
- # include "../bashhist.h"
-***************
-*** 95,99 ****
- extern int no_empty_command_completion;
- extern int force_fignore;
-! extern int dircomplete_spelling;
-
- extern int enable_hostname_completion __P((int));
---- 99,103 ----
- extern int no_empty_command_completion;
- extern int force_fignore;
-! extern int dircomplete_spelling, dircomplete_expand;
-
- extern int enable_hostname_completion __P((int));
-***************
-*** 122,125 ****
---- 126,133 ----
- #endif
-
-+ #if defined (READLINE)
-+ static int shopt_set_complete_direxpand __P((char *, int));
-+ #endif
-+
- static int shopt_login_shell;
- static int shopt_compat31;
-***************
-*** 151,154 ****
---- 159,163 ----
- { "compat41", &shopt_compat41, set_compatibility_level },
- #if defined (READLINE)
-+ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
- { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
- #endif
-***************
-*** 536,539 ****
---- 545,559 ----
- }
-
-+ #if defined (READLINE)
-+ static int
-+ shopt_set_complete_direxpand (option_name, mode)
-+ char *option_name;
-+ int mode;
-+ {
-+ set_directory_hook ();
-+ return 0;
-+ }
-+ #endif
-+
- #if defined (RESTRICTED_SHELL)
- /* Don't allow the value of restricted_shell to be modified. */
-Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf
differ
-diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1
-*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500
---- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 8949,8952 ****
---- 8949,8962 ----
- The default bash behavior remains as in previous versions.
- .TP 8
-+ .B direxpand
-+ If set,
-+ .B bash
-+ replaces directory names with the results of word expansion when performing
-+ filename completion. This changes the contents of the readline editing
-+ buffer.
-+ If not set,
-+ .B bash
-+ attempts to preserve what the user typed.
-+ .TP 8
- .B dirspell
- If set,
-diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi
-*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000
-0500
---- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 4536,4539 ****
---- 4536,4546 ----
- The default Bash behavior remains as in previous versions.
-
-+ @item direxpand
-+ If set, Bash
-+ replaces directory names with the results of word expansion when performing
-+ filename completion. This changes the contents of the readline editing
-+ buffer.
-+ If not set, Bash attempts to preserve what the user typed.
-+
- @item dirspell
- If set, Bash
-diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right
-*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000
-0400
---- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400
-***************
-*** 13,16 ****
---- 13,17 ----
- shopt -u compat40
- shopt -u compat41
-+ shopt -u direxpand
- shopt -u dirspell
- shopt -u dotglob
-***************
-*** 69,72 ****
---- 70,74 ----
- shopt -u compat40
- shopt -u compat41
-+ shopt -u direxpand
- shopt -u dirspell
- shopt -u dotglob
-***************
-*** 102,105 ****
---- 104,108 ----
- compat40 off
- compat41 off
-+ direxpand off
- dirspell off
- dotglob off
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 28
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 29
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-030
b/shell-term-fm/bash/patches/bash42-030
deleted file mode 100644
index 261a619..0000000
--- a/shell-term-fm/bash/patches/bash42-030
+++ /dev/null
@@ -1,178 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-030
-
-Bug-Reported-by: Roman Rakus <rrakus AT redhat.com>
-Bug-Reference-ID: <4D7DD91E.7040808 AT redhat.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html
-
-Bug-Description:
-
-When attempting to glob strings in a multibyte locale, and those strings
-contain invalid multibyte characters that cause mbsnrtowcs to return 0,
-the globbing code loops infinitely.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000
-0400
---- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400
-***************
-*** 36,39 ****
---- 36,41 ----
- #if HANDLE_MULTIBYTE
-
-+ #define WSBUF_INC 32
-+
- #ifndef FREE
- # define FREE(x) do { if (x) free (x); } while (0)
-***************
-*** 149,153 ****
- size_t wcnum; /* Number of wide characters in WSBUF */
- mbstate_t state; /* Conversion State */
-! size_t wcslength; /* Number of wide characters produced by the
conversion. */
- const char *end_or_backslash;
- size_t nms; /* Number of multibyte characters to convert at one
time. */
---- 151,155 ----
- size_t wcnum; /* Number of wide characters in WSBUF */
- mbstate_t state; /* Conversion State */
-! size_t n, wcslength; /* Number of wide characters produced by the
conversion. */
- const char *end_or_backslash;
- size_t nms; /* Number of multibyte characters to convert at one
time. */
-***************
-*** 172,176 ****
- tmp_p = p;
- tmp_state = state;
-! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
-
- /* Conversion failed. */
---- 174,189 ----
- tmp_p = p;
- tmp_state = state;
-!
-! if (nms == 0 && *p == '\\') /* special initial case */
-! nms = wcslength = 1;
-! else
-! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state);
-!
-! if (wcslength == 0)
-! {
-! tmp_p = p; /* will need below */
-! tmp_state = state;
-! wcslength = 1; /* take a single byte */
-! }
-
- /* Conversion failed. */
-***************
-*** 187,191 ****
- wchar_t *wstmp;
-
-! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the
potential L'\\' */
-
- wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
---- 200,205 ----
- wchar_t *wstmp;
-
-! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the
potential L'\\' */
-! wsbuf_size += WSBUF_INC;
-
- wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
-***************
-*** 200,207 ****
-
- /* Perform the conversion. This is assumed to return 'wcslength'.
-! * It may set 'p' to NULL. */
-! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
-
-! wcnum += wcslength;
-
- if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
---- 214,229 ----
-
- /* Perform the conversion. This is assumed to return 'wcslength'.
-! It may set 'p' to NULL. */
-! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
-
-! /* Compensate for taking single byte on wcs conversion failure
above. */
-! if (wcslength == 1 && (n == 0 || n == (size_t)-1))
-! {
-! state = tmp_state;
-! p = tmp_p;
-! wsbuf[wcnum++] = *p++;
-! }
-! else
-! wcnum += wcslength;
-
- if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
-***************
-*** 231,236 ****
- of DESTP and INDICESP are NULL. */
-
-- #define WSBUF_INC 32
--
- size_t
- xdupmbstowcs (destp, indicesp, src)
---- 253,256 ----
-*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000
-0500
---- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400
-***************
-*** 201,206 ****
- size_t pat_n, dn_n;
-
- pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
-! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
-
- ret = 0;
---- 201,209 ----
- size_t pat_n, dn_n;
-
-+ pat_wc = dn_wc = (wchar_t *)NULL;
-+
- pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
-! if (pat_n != (size_t)-1)
-! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
-
- ret = 0;
-***************
-*** 222,225 ****
---- 225,230 ----
- ret = 1;
- }
-+ else
-+ ret = skipname (pat, dname, flags);
-
- FREE (pat_wc);
-***************
-*** 267,272 ****
- n = xdupmbstowcs (&wpathname, NULL, pathname);
- if (n == (size_t) -1)
-! /* Something wrong. */
-! return;
- orig_wpathname = wpathname;
-
---- 272,280 ----
- n = xdupmbstowcs (&wpathname, NULL, pathname);
- if (n == (size_t) -1)
-! {
-! /* Something wrong. Fall back to single-byte */
-! udequote_pathname (pathname);
-! return;
-! }
- orig_wpathname = wpathname;
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 29
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 30
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-031
b/shell-term-fm/bash/patches/bash42-031
deleted file mode 100644
index 419d447..0000000
--- a/shell-term-fm/bash/patches/bash42-031
+++ /dev/null
@@ -1,80 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-031
-
-Bug-Reported-by: Max Horn <max AT quendi.de>
-Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5 AT quendi.de>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html
-
-Bug-Description:
-
-A change between bash-4.1 and bash-4.2 to prevent the readline input hook
-from being called too frequently had the side effect of causing delays
-when reading pasted input on systems such as Mac OS X. This patch fixes
-those delays while retaining the bash-4.2 behavior.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000
-0400
---- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400
-***************
-*** 410,414 ****
- rl_read_key ()
- {
-! int c;
-
- rl_key_sequence_length++;
---- 412,416 ----
- rl_read_key ()
- {
-! int c, r;
-
- rl_key_sequence_length++;
-***************
-*** 430,441 ****
- while (rl_event_hook)
- {
-! if (rl_gather_tyi () < 0) /* XXX - EIO */
- {
- rl_done = 1;
- return ('\n');
- }
- RL_CHECK_SIGNALS ();
-- if (rl_get_char (&c) != 0)
-- break;
- if (rl_done) /* XXX - experimental */
- return ('\n');
---- 432,447 ----
- while (rl_event_hook)
- {
-! if (rl_get_char (&c) != 0)
-! break;
-!
-! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
- {
- rl_done = 1;
- return ('\n');
- }
-+ else if (r == 1) /* read something */
-+ continue;
-+
- RL_CHECK_SIGNALS ();
- if (rl_done) /* XXX - experimental */
- return ('\n');
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 30
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 31
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-032
b/shell-term-fm/bash/patches/bash42-032
deleted file mode 100644
index d4f25ca..0000000
--- a/shell-term-fm/bash/patches/bash42-032
+++ /dev/null
@@ -1,75 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-032
-
-Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann AT orga-systems.com>
-Bug-Reference-ID:
<OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39 AT orga-systems.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html
-
-Bug-Description:
-
-Bash-4.2 has problems with DEL characters in the expanded value of variables
-used in the same quoted string as variables that expand to nothing.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400
---- subst.c 2012-05-07 16:06:35.000000000 -0400
-***************
-*** 8152,8155 ****
---- 8152,8163 ----
- dispose_word_desc (tword);
-
-+ /* Kill quoted nulls; we will add them back at the end of
-+ expand_word_internal if nothing else in the string */
-+ if (had_quoted_null && temp && QUOTED_NULL (temp))
-+ {
-+ FREE (temp);
-+ temp = (char *)NULL;
-+ }
-+
- goto add_string;
- break;
-***************
-*** 8556,8560 ****
- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
- tword->flags |= W_QUOTED;
-! if (had_quoted_null)
- tword->flags |= W_HASQUOTEDNULL;
- list = make_word_list (tword, (WORD_LIST *)NULL);
---- 8564,8568 ----
- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
- tword->flags |= W_QUOTED;
-! if (had_quoted_null && QUOTED_NULL (istring))
- tword->flags |= W_HASQUOTEDNULL;
- list = make_word_list (tword, (WORD_LIST *)NULL);
-***************
-*** 8587,8591 ****
- if (word->flags & W_NOEXPAND)
- tword->flags |= W_NOEXPAND;
-! if (had_quoted_null)
- tword->flags |= W_HASQUOTEDNULL; /* XXX */
- list = make_word_list (tword, (WORD_LIST *)NULL);
---- 8595,8599 ----
- if (word->flags & W_NOEXPAND)
- tword->flags |= W_NOEXPAND;
-! if (had_quoted_null && QUOTED_NULL (istring))
- tword->flags |= W_HASQUOTEDNULL; /* XXX */
- list = make_word_list (tword, (WORD_LIST *)NULL);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 31
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 32
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-033
b/shell-term-fm/bash/patches/bash42-033
deleted file mode 100644
index e58d728..0000000
--- a/shell-term-fm/bash/patches/bash42-033
+++ /dev/null
@@ -1,57 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-033
-
-Bug-Reported-by: David Leverton <levertond AT googlemail.com>
-Bug-Reference-ID: <4FCCE737.1060603 AT googlemail.com>
-Bug-Reference-URL:
-
-Bug-Description:
-
-Bash uses a static buffer when expanding the /dev/fd prefix for the test
-and conditional commands, among other uses, when it should use a dynamic
-buffer to avoid buffer overflow.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000
-0500
---- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400
-***************
-*** 83,86 ****
---- 83,88 ----
- struct stat *finfo;
- {
-+ static char *pbuf = 0;
-+
- if (*path == '\0')
- {
-***************
-*** 107,111 ****
- On most systems, with the notable exception of linux, this is
- effectively a no-op. */
-! char pbuf[32];
- strcpy (pbuf, DEV_FD_PREFIX);
- strcat (pbuf, path + 8);
---- 109,113 ----
- On most systems, with the notable exception of linux, this is
- effectively a no-op. */
-! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
- strcpy (pbuf, DEV_FD_PREFIX);
- strcat (pbuf, path + 8);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 32
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 33
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-034
b/shell-term-fm/bash/patches/bash42-034
deleted file mode 100644
index e4f05e1..0000000
--- a/shell-term-fm/bash/patches/bash42-034
+++ /dev/null
@@ -1,46 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-034
-
-Bug-Reported-by: "Davide Brini" <dave_br AT gmx.com>
-Bug-Reference-ID:
<20120604164154.69781EC04B AT imaps.oficinas.atrapalo.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html
-
-Bug-Description:
-
-In bash-4.2, the history code would inappropriately add a semicolon to
-multi-line compound array assignments when adding them to the history.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500
---- parse.y 2012-06-07 12:48:47.000000000 -0400
-***************
-*** 4900,4905 ****
---- 4916,4924 ----
- return (current_command_line_count == 2 ? "\n" : "");
- }
-
-+ if (parser_state & PST_COMPASSIGN)
-+ return (" ");
-+
- /* First, handle some special cases. */
- /*(*/
- /* If we just read `()', assume it's a function definition, and don't
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 33
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 34
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-035
b/shell-term-fm/bash/patches/bash42-035
deleted file mode 100644
index 6f0be6f..0000000
--- a/shell-term-fm/bash/patches/bash42-035
+++ /dev/null
@@ -1,66 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-035
-
-Bug-Reported-by: Dan Douglas <ormaaj AT gmail.com>
-Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html
-
-Bug-Description:
-
-When given a number of lines to read, `mapfile -n lines' reads one too many.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000
-0400
---- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400
-***************
-*** 196,206 ****
- interrupt_immediately++;
- for (array_index = origin, line_count = 1;
-! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
-! array_index++, line_count++)
- {
-- /* Have we exceeded # of lines to store? */
-- if (line_count_goal != 0 && line_count > line_count_goal)
-- break;
--
- /* Remove trailing newlines? */
- if (flags & MAPF_CHOP)
---- 196,202 ----
- interrupt_immediately++;
- for (array_index = origin, line_count = 1;
-! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
-! array_index++)
- {
- /* Remove trailing newlines? */
- if (flags & MAPF_CHOP)
-***************
-*** 218,221 ****
---- 214,222 ----
-
- bind_array_element (entry, array_index, line, 0);
-+
-+ /* Have we exceeded # of lines to store? */
-+ line_count++;
-+ if (line_count_goal != 0 && line_count > line_count_goal)
-+ break;
- }
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 34
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 35
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-036
b/shell-term-fm/bash/patches/bash42-036
deleted file mode 100644
index 73fac40..0000000
--- a/shell-term-fm/bash/patches/bash42-036
+++ /dev/null
@@ -1,92 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-036
-
-Bug-Reported-by: gregrwm <backuppc-users AT whitleymott.net>
-Bug-Reference-ID:
<CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html
-
-Bug-Description:
-
-Bash-4.2 produces incorrect word splitting results when expanding
-double-quoted $@ in the same string as and adjacent to other variable
-expansions. The $@ should be split, the other expansions should not.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400
---- subst.c 2012-07-08 21:19:32.000000000 -0400
-***************
-*** 7923,7927 ****
- /* State flags */
- int had_quoted_null;
-! int has_dollar_at;
- int tflag;
- int pflags; /* flags passed to param_expand */
---- 7923,7927 ----
- /* State flags */
- int had_quoted_null;
-! int has_dollar_at, temp_has_dollar_at;
- int tflag;
- int pflags; /* flags passed to param_expand */
-***************
-*** 8128,8138 ****
- *expanded_something = 1;
-
-! has_dollar_at = 0;
- pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
- if (word->flags & W_NOSPLIT2)
- pflags |= PF_NOSPLIT2;
- tword = param_expand (string, &sindex, quoted, expanded_something,
-! &has_dollar_at, &quoted_dollar_at,
- &had_quoted_null, pflags);
-
- if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
---- 8128,8139 ----
- *expanded_something = 1;
-
-! temp_has_dollar_at = 0;
- pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
- if (word->flags & W_NOSPLIT2)
- pflags |= PF_NOSPLIT2;
- tword = param_expand (string, &sindex, quoted, expanded_something,
-! &temp_has_dollar_at, &quoted_dollar_at,
- &had_quoted_null, pflags);
-+ has_dollar_at += temp_has_dollar_at;
-
- if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
-***************
-*** 8275,8281 ****
- temp = (char *)NULL;
-
-! has_dollar_at = 0;
- /* Need to get W_HASQUOTEDNULL flag through this function. */
-! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0,
&has_dollar_at, (int *)NULL);
-
- if (list == &expand_word_error || list == &expand_word_fatal)
---- 8276,8283 ----
- temp = (char *)NULL;
-
-! temp_has_dollar_at = 0; /* XXX */
- /* Need to get W_HASQUOTEDNULL flag through this function. */
-! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0,
&temp_has_dollar_at, (int *)NULL);
-! has_dollar_at += temp_has_dollar_at;
-
- if (list == &expand_word_error || list == &expand_word_fatal)
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 35
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 36
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-037
b/shell-term-fm/bash/patches/bash42-037
deleted file mode 100644
index a12b8a7..0000000
--- a/shell-term-fm/bash/patches/bash42-037
+++ /dev/null
@@ -1,112 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-037
-
-Bug-Reported-by: Jakub Filak
-Bug-Reference-ID:
-Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289
-
-Bug-Description:
-
-Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy'
-commands leads to an infinite loop.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000
-0500
---- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400
-***************
-*** 1235,1243 ****
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-! else if (vi_redoing)
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
---- 1297,1313 ----
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing) /* handle redoing `dd' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
-***************
-*** 1317,1325 ****
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-! else if (vi_redoing)
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
---- 1387,1403 ----
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing) /* handle redoing `cc' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
-***************
-*** 1378,1381 ****
---- 1456,1472 ----
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ r = rl_domove_motion_callback (_rl_vimvcxt);
-+ }
-+ else if (vi_redoing) /* handle redoing `yy' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 36
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 37
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-038
b/shell-term-fm/bash/patches/bash42-038
deleted file mode 100644
index 411e4dd..0000000
--- a/shell-term-fm/bash/patches/bash42-038
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-038
-
-Bug-Reported-by: armandsl AT gmail.com
-Bug-Reference-ID: <20120822112810.8D14920040 AT windmill.latviatours.lv>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-08/msg00049.html
-
-Bug-Description:
-
-If a backslash-newline (which is removed) with no other input is given as
-input to `read', the shell tries to dereference a null pointer and seg
faults.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/read.def 2012-03-11 17:52:44.000000000
-0400
---- builtins/read.def 2012-08-22 11:53:09.000000000 -0400
-***************
-*** 792,796 ****
- #endif
-
-! if (saw_escape)
- {
- t = dequote_string (input_string);
---- 847,851 ----
- #endif
-
-! if (saw_escape && input_string && *input_string)
- {
- t = dequote_string (input_string);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 37
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 38
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-039
b/shell-term-fm/bash/patches/bash42-039
deleted file mode 100644
index 21457af..0000000
--- a/shell-term-fm/bash/patches/bash42-039
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-039
-
-Bug-Reported-by: Dan Douglas <ormaaj AT gmail.com>
-Bug-Reference-ID: <1498458.MpVlmOXDB7@smorgbox>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-09/msg00008.html
-
-Bug-Description:
-
-Under certain circumstances, bash attempts to expand variables in arithmetic
-expressions even when evaluation is being suppressed.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/expr.c 2011-11-21 18:03:35.000000000 -0500
---- expr.c 2012-09-09 16:31:18.000000000 -0400
-***************
-*** 1010,1013 ****
---- 1073,1082 ----
- #endif
-
-+ /*itrace("expr_streval: %s: noeval = %d", tok, noeval);*/
-+ /* If we are suppressing evaluation, just short-circuit here instead of
-+ going through the rest of the evaluator. */
-+ if (noeval)
-+ return (0);
-+
- /* [[[[[ */
- #if defined (ARRAY_VARS)
-***************
-*** 1183,1186 ****
---- 1256,1263 ----
-
- *cp = '\0';
-+ /* XXX - watch out for pointer aliasing issues here */
-+ if (curlval.tokstr && curlval.tokstr == tokstr)
-+ init_lvalue (&curlval);
-+
- FREE (tokstr);
- tokstr = savestring (tp);
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 38
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 39
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-040
b/shell-term-fm/bash/patches/bash42-040
deleted file mode 100644
index 1de0fe3..0000000
--- a/shell-term-fm/bash/patches/bash42-040
+++ /dev/null
@@ -1,56 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-040
-
-Bug-Reported-by: Andrey Zaitsev <jstcdr AT gmail.com>
-Bug-Reference-ID:
<CAEZVQT5PJ1Mb_Zh8LT5qz8sv+-9Q6hGfQ5DU9ZxdJ+gV7xBUaQ AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00144.html
-
-Bug-Description:
-
-Output redirection applied to builtin commands missed I/O errors if
-they happened when the file descriptor was closed, rather than on write
-(e.g., like with an out-of-space error on a remote NFS file system).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/redir.c 2011-01-02 16:00:31.000000000 -0500
---- redir.c 2012-04-24 20:42:12.000000000 -0400
-***************
-*** 1092,1099 ****
- #if defined (BUFFERED_INPUT)
- check_bash_input (redirector);
-! close_buffered_fd (redirector);
- #else /* !BUFFERED_INPUT */
-! close (redirector);
- #endif /* !BUFFERED_INPUT */
- }
- break;
---- 1092,1101 ----
- #if defined (BUFFERED_INPUT)
- check_bash_input (redirector);
-! r = close_buffered_fd (redirector);
- #else /* !BUFFERED_INPUT */
-! r = close (redirector);
- #endif /* !BUFFERED_INPUT */
-+ if (r < 0 && (flags & RX_INTERNAL) && (errno == EIO || errno ==
ENOSPC))
-+ REDIRECTION_ERROR (r, errno, -1);
- }
- break;
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 39
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 40
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-041
b/shell-term-fm/bash/patches/bash42-041
deleted file mode 100644
index 37d4ac7..0000000
--- a/shell-term-fm/bash/patches/bash42-041
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-041
-
-Bug-Reported-by: Andrey Borzenkov <arvidjaar AT gmail.com>
-Bug-Reference-ID: <20121202205200.2134478e AT opensuse.site>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-12/msg00008.html
-
-Bug-Description:
-
-Process substitution incorrectly inherited a flag that inhibited using the
-(local) temporary environment for variable lookups if it was providing
-the filename to a redirection. The intent the flag is to enforce the
-Posix command expansion ordering rules.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/subst.c 2012-07-14 15:53:20.000000000 -0400
---- subst.c 2012-12-02 22:26:54.000000000 -0500
-***************
-*** 5125,5128 ****
---- 5129,5136 ----
- #endif /* HAVE_DEV_FD */
-
-+ /* subshells shouldn't have this flag, which controls using the temporary
-+ environment for variable lookups. */
-+ expanding_redir = 0;
-+
- result = parse_and_execute (string, "process substitution",
(SEVAL_NONINT|SEVAL_NOHIST));
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 40
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 41
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-042
b/shell-term-fm/bash/patches/bash42-042
deleted file mode 100644
index 1ce0cae..0000000
--- a/shell-term-fm/bash/patches/bash42-042
+++ /dev/null
@@ -1,57 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-042
-
-Bug-Reported-by: Adam Pippin <adam AT gp-inc.ca>
-Bug-Reference-ID:
<CAPYbNHr6ucZFOoWsRdUJj6KP3Ju0j1bkESa_cmb7iU+kZwdVpg AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00087.html
-
-Bug-Description:
-
-Compilation failed after specifying the `--enable-minimal-config' option to
-configure (more specifically, specifying `--disable-alias').
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/parse.y 2012-07-08 21:53:33.000000000 -0400
---- parse.y 2012-10-14 20:20:34.000000000 -0400
-***************
-*** 2394,2397 ****
---- 2392,2396 ----
- to consume the quoted newline and move to the next character in
- the expansion. */
-+ #if defined (ALIAS)
- if (expanding_alias () && shell_input_line[shell_input_line_index+1]
== '\0')
- {
-***************
-*** 2404,2408 ****
- goto next_alias_char; /* and get next character */
- }
-! else
- goto restart_read;
- }
---- 2403,2408 ----
- goto next_alias_char; /* and get next character */
- }
-! else
-! #endif
- goto restart_read;
- }
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 41
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 42
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-043
b/shell-term-fm/bash/patches/bash42-043
deleted file mode 100644
index b25a5ee..0000000
--- a/shell-term-fm/bash/patches/bash42-043
+++ /dev/null
@@ -1,65 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-043
-
-Bug-Reported-by: konsolebox <konsolebox AT gmail.com>
-Bug-Reference-ID:
<CAJnmqwZuGKLgMsMwxRK4LL+2NN+HgvmKzrnode99QBGrcgX1Lw AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2013-01/msg00138.html
-
-Bug-Description:
-
-When SIGCHLD is trapped, and a SIGCHLD trap handler runs when a pending
-`read -t' invocation times out and generates SIGALRM, bash can crash with
-a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/builtins/read.def 2012-10-31 21:22:51.000517000
-0400
---- builtins/read.def 2013-01-25 10:28:16.000038000 -0500
-***************
-*** 386,393 ****
- /* Tricky. The top of the unwind-protect stack is the free of
- input_string. We want to run all the rest and use input_string,
-! so we have to remove it from the stack. */
-! remove_unwind_protect ();
-! run_unwind_frame ("read_builtin");
- input_string[i] = '\0'; /* make sure it's terminated */
- retval = 128+SIGALRM;
- goto assign_vars;
---- 386,403 ----
- /* Tricky. The top of the unwind-protect stack is the free of
- input_string. We want to run all the rest and use input_string,
-! so we have to save input_string temporarily, run the unwind-
-! protects, then restore input_string so we can use it later. */
-!
- input_string[i] = '\0'; /* make sure it's terminated */
-+ if (i == 0)
-+ {
-+ t = (char *)xmalloc (1);
-+ t[0] = 0;
-+ }
-+ else
-+ t = savestring (input_string);
-+
-+ run_unwind_frame ("read_builtin");
-+ input_string = t;
- retval = 128+SIGALRM;
- goto assign_vars;
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 42
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 43
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-044
b/shell-term-fm/bash/patches/bash42-044
deleted file mode 100644
index e5bf283..0000000
--- a/shell-term-fm/bash/patches/bash42-044
+++ /dev/null
@@ -1,70 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-044
-
-Bug-Reported-by: "Dashing" <dashing AT hushmail.com>
-Bug-Reference-ID: <20130211175049.D90786F446 AT smtp.hushmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2013-02/msg00030.html
-
-Bug-Description:
-
-When converting a multibyte string to a wide character string as part of
-pattern matching, bash does not handle the end of the string correctly,
-causing the search for the NUL to go beyond the end of the string and
-reference random memory. Depending on the contents of that memory, bash
-can produce errors or crash.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2012-07-08 21:53:19.000000000
-0400
---- lib/glob/xmbsrtowcs.c 2013-02-12 12:00:39.000000000 -0500
-***************
-*** 217,220 ****
---- 217,226 ----
- n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
-
-+ if (n == 0 && p == 0)
-+ {
-+ wsbuf[wcnum] = L'\0';
-+ break;
-+ }
-+
- /* Compensate for taking single byte on wcs conversion failure
above. */
- if (wcslength == 1 && (n == 0 || n == (size_t)-1))
-***************
-*** 222,226 ****
- state = tmp_state;
- p = tmp_p;
-! wsbuf[wcnum++] = *p++;
- }
- else
---- 228,238 ----
- state = tmp_state;
- p = tmp_p;
-! wsbuf[wcnum] = *p;
-! if (*p == 0)
-! break;
-! else
-! {
-! wcnum++; p++;
-! }
- }
- else
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 43
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 44
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-045
b/shell-term-fm/bash/patches/bash42-045
deleted file mode 100644
index e0f8559..0000000
--- a/shell-term-fm/bash/patches/bash42-045
+++ /dev/null
@@ -1,53 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.2
-Patch-ID: bash42-045
-
-Bug-Reported-by: Stephane Chazelas <stephane.chazelas AT gmail.com>
-Bug-Reference-ID: <20130218195539.GA9620 AT chaz.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2013-02/msg00080.html
-
-Bug-Description:
-
-The <&n- and >&n- redirections, which move one file descriptor to another,
-leave the file descriptor closed when applied to builtins or compound
-commands.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.2-patched/redir.c 2013-01-30 11:56:09.000000000 -0500
---- redir.c 2013-02-19 09:38:36.000000000 -0500
-***************
-*** 1008,1011 ****
---- 1008,1021 ----
- REDIRECTION_ERROR (r, errno, -1);
- }
-+ if ((flags & RX_UNDOABLE) && (ri == r_move_input || ri ==
r_move_output))
-+ {
-+ /* r_move_input and r_move_output add an additional close()
-+ that needs to be undone */
-+ if (fcntl (redirector, F_GETFD, 0) != -1)
-+ {
-+ r = add_undo_redirect (redir_fd, r_close_this, -1);
-+ REDIRECTION_ERROR (r, errno, -1);
-+ }
-+ }
- #if defined (BUFFERED_INPUT)
- check_bash_input (redirector);
-
-*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
---- patchlevel.h Thu Feb 24 21:41:34 2011
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 44
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 45
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-001
b/shell-term-fm/bash/patches/bash43-001
new file mode 100644
index 0000000..ea1c6b2
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-001
@@ -0,0 +1,58 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-001
+
+Bug-Reported-by: NBaH <nbah AT sfr.fr>
+Bug-Reference-ID: <ler0b5$iu9$1 AT speranza.aioe.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00092.html
+
+Bug-Description:
+
+A missing check for a valid option prevented `test -R' from working. There
+is another problem that causes bash to look up the wrong variable name when
+processing the argument to `test -R'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500
+--- test.c 2014-02-28 21:22:44.000000000 -0500
+***************
+*** 647,652 ****
+
+ case 'R':
+! v = find_variable (arg);
+! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)
? TRUE : FALSE);
+ }
+
+--- 647,652 ----
+
+ case 'R':
+! v = find_variable_noref (arg);
+! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p
(v)) ? TRUE : FALSE);
+ }
+
+***************
+*** 724,727 ****
+--- 724,728 ----
+ case 'u': case 'v': case 'w': case 'x': case 'z':
+ case 'G': case 'L': case 'O': case 'S': case 'N':
++ case 'R':
+ return (1);
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-002
b/shell-term-fm/bash/patches/bash43-002
new file mode 100644
index 0000000..735b7b8
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-002
@@ -0,0 +1,62 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-002
+
+Bug-Reported-by: Moe Tunes <moetunes42 AT gmail.com>
+Bug-Reference-ID: <53103F49.3070100 AT gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00086.html
+
+Bug-Description:
+
+A change to save state while running the DEBUG trap caused pipelines to hang
+on systems which need process group synchronization while building pipelines.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500
+--- trap.c 2014-02-28 09:51:43.000000000 -0500
+***************
+*** 921,925 ****
+
+ #if defined (JOB_CONTROL)
+! save_pipeline (1); /* XXX only provides one save level */
+ #endif
+
+--- 921,926 ----
+
+ #if defined (JOB_CONTROL)
+! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
+! save_pipeline (1); /* XXX only provides one save level */
+ #endif
+
+***************
+*** 941,945 ****
+
+ #if defined (JOB_CONTROL)
+! restore_pipeline (1);
+ #endif
+
+--- 942,947 ----
+
+ #if defined (JOB_CONTROL)
+! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
+! restore_pipeline (1);
+ #endif
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-003
b/shell-term-fm/bash/patches/bash43-003
new file mode 100644
index 0000000..0f32f41
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-003
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-003
+
+Bug-Reported-by: Anatol Pomozov <anatol.pomozov AT gmail.com>
+Bug-Reference-ID:
<CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
+
+Bug-Description:
+
+When in callback mode, some readline commands can cause readline to seg
+fault by passing invalid contexts to callback functions.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000
-0400
+--- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400
+***************
+*** 745,749 ****
+
+ RL_CHECK_SIGNALS ();
+! if (r == 0) /* success! */
+ {
+ _rl_keyseq_chain_dispose ();
+--- 745,750 ----
+
+ RL_CHECK_SIGNALS ();
+! /* We only treat values < 0 specially to simulate recursion. */
+! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /*
success! or failure! */
+ {
+ _rl_keyseq_chain_dispose ();
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-004
b/shell-term-fm/bash/patches/bash43-004
new file mode 100644
index 0000000..010f04a
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-004
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-004
+
+Bug-Reported-by: Daan van Rossum <daan AT flash.uchicago.edu>
+Bug-Reference-ID: <20140307072523.GA14250 AT flash.uchicago.edu>
+Bug-Reference-URL:
+
+Bug-Description:
+
+The `.' command in vi mode cannot undo multi-key commands beginning with
+`c', `d', and `y' (command plus motion specifier).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000
-0400
+--- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500
+***************
+*** 965,969 ****
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! rl_key_sequence_length == 1 && /* XXX */
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+--- 965,969 ----
+ if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
+ key != ANYOTHERKEY &&
+! _rl_dispatching_keymap == vi_movement_keymap &&
+ _rl_vi_textmod_command (key))
+ _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-005
b/shell-term-fm/bash/patches/bash43-005
new file mode 100644
index 0000000..bcd4069
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-005
@@ -0,0 +1,63 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-005
+
+Bug-Reported-by: David Sines <dave.gma AT googlemail.com>
+Bug-Reference-ID:
<CAO3BAa_CK_Rgkhdfzs+NJ4KFYdB9qW3pvXQK0xLCi6GMmDU8bw AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00037.html
+
+Bug-Description:
+
+When in Posix mode, bash did not correctly interpret the ANSI-C-style
+$'...' quoting mechanism when performing pattern substitution word
+expansions within double quotes.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/parse.y 2014-02-11 09:42:10.000000000 -0500
+--- parse.y 2014-03-07 20:57:15.000000000 -0500
+***************
+*** 3399,3403 ****
+ unescaped double-quotes or single-quotes, if any, shall occur." */
+ /* This was changed in Austin Group Interp 221 */
+! if MBTEST(posixly_correct && shell_compatibility_level > 41 &&
dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags &
P_DOLBRACE) && ch == '\'')
+ continue;
+
+--- 3399,3403 ----
+ unescaped double-quotes or single-quotes, if any, shall occur." */
+ /* This was changed in Austin Group Interp 221 */
+! if MBTEST(posixly_correct && shell_compatibility_level > 41 &&
dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 &&
(flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
+ continue;
+
+*** ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500
+--- y.tab.c 2014-03-28 10:41:15.000000000 -0400
+***************
+*** 5711,5715 ****
+ unescaped double-quotes or single-quotes, if any, shall occur." */
+ /* This was changed in Austin Group Interp 221 */
+! if MBTEST(posixly_correct && shell_compatibility_level > 41 &&
dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags &
P_DOLBRACE) && ch == '\'')
+ continue;
+
+--- 5711,5715 ----
+ unescaped double-quotes or single-quotes, if any, shall occur." */
+ /* This was changed in Austin Group Interp 221 */
+! if MBTEST(posixly_correct && shell_compatibility_level > 41 &&
dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 &&
(flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
+ continue;
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-006
b/shell-term-fm/bash/patches/bash43-006
new file mode 100644
index 0000000..24ff057
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-006
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-006
+
+Bug-Reported-by: Eduardo A . Bustamante Lopez <dualbus AT gmail.com>
+Bug-Reference-ID: <20140228170013.GA16015 AT dualbus.me>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00091.html
+
+Bug-Description:
+
+A shell that started with job control active but was not interactive left
+the terminal in the wrong process group when exiting, causing its parent
+shell to get a stop signal when it attempted to read from the terminal.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/jobs.c 2014-01-10 09:05:34.000000000 -0500
+--- jobs.c 2014-03-02 18:05:09.000000000 -0500
+***************
+*** 4375,4379 ****
+ end_job_control ()
+ {
+! if (interactive_shell) /* XXX - should it be interactive? */
+ {
+ terminate_stopped_jobs ();
+--- 4375,4379 ----
+ end_job_control ()
+ {
+! if (interactive_shell || job_control) /* XXX - should it be
just job_control? */
+ {
+ terminate_stopped_jobs ();
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-007
b/shell-term-fm/bash/patches/bash43-007
new file mode 100644
index 0000000..0d62c9e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-007
@@ -0,0 +1,50 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-007
+
+Bug-Reported-by: geir.hauge AT gmail.com
+Bug-Reference-ID: <20140318093650.B181C1C5B0B AT gina.itea.ntnu.no>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html
+
+Bug-Description:
+
+Using compound assignments for associative arrays like
+
+assoc=( [x]= [y]=bar )
+
+left the value corresponding to the key `x' NULL. This caused subsequent
+lookups to interpret it as unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/arrayfunc.c 2013-08-02 16:19:59.000000000 -0400
+--- arrayfunc.c 2014-03-18 11:08:15.000000000 -0400
+***************
+*** 598,601 ****
+--- 598,606 ----
+ {
+ val = expand_assignment_string_to_string (val, 0);
++ if (val == 0)
++ {
++ val = (char *)xmalloc (1);
++ val[0] = '\0'; /* like do_assignment_internal */
++ }
+ free_val = 1;
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-008
b/shell-term-fm/bash/patches/bash43-008
new file mode 100644
index 0000000..0ae7c95
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-008
@@ -0,0 +1,188 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-008
+
+Bug-Reported-by: Stephane Chazelas <stephane.chazelas AT gmail.com>
+Bug-Reference-ID: <20140318135901.GB22158 AT chaz.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00098.html
+
+Bug-Description:
+
+Some extended glob patterns incorrectly matched filenames with a leading
+dot, regardless of the setting of the `dotglob' option.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3/lib/glob/gmisc.c 2013-10-28 14:45:25.000000000 -0400
+--- lib/glob/gmisc.c 2014-03-19 09:16:08.000000000 -0400
+***************
+*** 211,214 ****
+--- 211,215 ----
+ case '!':
+ case '@':
++ case '?':
+ return (pat[1] == LPAREN);
+ default:
+*** ../bash-4.3/lib/glob/glob.c 2014-01-31 21:43:51.000000000 -0500
+--- lib/glob/glob.c 2014-03-20 09:01:26.000000000 -0400
+***************
+*** 180,202 ****
+ int flags;
+ {
+! char *pp, *pe, *t;
+! int n, r;
+
+ pp = pat + 2;
+! pe = pp + strlen (pp) - 1; /*(*/
+! if (*pe != ')')
+! return 0;
+! if ((t = strchr (pp, '|')) == 0) /* easy case first */
+ {
+ *pe = '\0';
+ r = skipname (pp, dname, flags); /*(*/
+ *pe = ')';
+ return r;
+ }
+ while (t = glob_patscan (pp, pe, '|'))
+ {
+ n = t[-1];
+ t[-1] = '\0';
+ r = skipname (pp, dname, flags);
+ t[-1] = n;
+ if (r == 0) /* if any pattern says not skip, we don't skip */
+--- 180,215 ----
+ int flags;
+ {
+! char *pp, *pe, *t, *se;
+! int n, r, negate;
+
++ negate = *pat == '!';
+ pp = pat + 2;
+! se = pp + strlen (pp) - 1; /* end of string */
+! pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
+! /* we should check for invalid extglob pattern here */
+! /* if pe != se we have more of the pattern at the end of the extglob
+! pattern. Check the easy case first ( */
+! if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
+ {
+ *pe = '\0';
++ #if defined (HANDLE_MULTIBYTE)
++ r = mbskipname (pp, dname, flags);
++ #else
+ r = skipname (pp, dname, flags); /*(*/
++ #endif
+ *pe = ')';
+ return r;
+ }
++
++ /* check every subpattern */
+ while (t = glob_patscan (pp, pe, '|'))
+ {
+ n = t[-1];
+ t[-1] = '\0';
++ #if defined (HANDLE_MULTIBYTE)
++ r = mbskipname (pp, dname, flags);
++ #else
+ r = skipname (pp, dname, flags);
++ #endif
+ t[-1] = n;
+ if (r == 0) /* if any pattern says not skip, we don't skip */
+***************
+*** 205,219 ****
+ } /*(*/
+
+! if (pp == pe) /* glob_patscan might find end of pattern */
+ return r;
+
+! *pe = '\0';
+! # if defined (HANDLE_MULTIBYTE)
+! r = mbskipname (pp, dname, flags); /*(*/
+! # else
+! r = skipname (pp, dname, flags); /*(*/
+! # endif
+! *pe = ')';
+! return r;
+ }
+ #endif
+--- 218,227 ----
+ } /*(*/
+
+! /* glob_patscan might find end of pattern */
+! if (pp == se)
+ return r;
+
+! /* but if it doesn't then we didn't match a leading dot */
+! return 0;
+ }
+ #endif
+***************
+*** 278,289 ****
+ {
+ #if EXTENDED_GLOB
+! wchar_t *pp, *pe, *t, n;
+! int r;
+
+ pp = pat + 2;
+! pe = pp + wcslen (pp) - 1; /*(*/
+! if (*pe != L')')
+! return 0;
+! if ((t = wcschr (pp, L'|')) == 0)
+ {
+ *pe = L'\0';
+--- 286,298 ----
+ {
+ #if EXTENDED_GLOB
+! wchar_t *pp, *pe, *t, n, *se;
+! int r, negate;
+
++ negate = *pat == L'!';
+ pp = pat + 2;
+! se = pp + wcslen (pp) - 1; /*(*/
+! pe = glob_patscan_wc (pp, se, 0);
+!
+! if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0)
+ {
+ *pe = L'\0';
+***************
+*** 292,295 ****
+--- 301,306 ----
+ return r;
+ }
++
++ /* check every subpattern */
+ while (t = glob_patscan_wc (pp, pe, '|'))
+ {
+***************
+*** 306,313 ****
+ return r;
+
+! *pe = L'\0';
+! r = wchkname (pp, dname); /*(*/
+! *pe = L')';
+! return r;
+ #else
+ return (wchkname (pat, dname));
+--- 317,322 ----
+ return r;
+
+! /* but if it doesn't then we didn't match a leading dot */
+! return 0;
+ #else
+ return (wchkname (pat, dname));
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-009
b/shell-term-fm/bash/patches/bash43-009
new file mode 100644
index 0000000..015835c
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-009
@@ -0,0 +1,64 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-009
+
+Bug-Reported-by: Matthias Klose <doko AT debian.org>
+Bug-Reference-ID: <53346FC8.6090005 AT debian.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00171.html
+
+Bug-Description:
+
+There is a problem with unsigned sign extension when attempting to reallocate
+the input line when it is fewer than 3 characters long and there has been a
+history expansion. The sign extension causes the shell to not reallocate the
+line, which results in a segmentation fault when it writes past the end.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/parse.y 2014-02-11 09:42:10.000000000 -0500
+--- parse.y 2014-03-27 16:33:29.000000000 -0400
+***************
+*** 2425,2429 ****
+ if (shell_input_line_terminator != EOF)
+ {
+! if (shell_input_line_size < SIZE_MAX && shell_input_line_len >
shell_input_line_size - 3)
+ shell_input_line = (char *)xrealloc (shell_input_line,
+ 1 + (shell_input_line_size += 2));
+--- 2425,2429 ----
+ if (shell_input_line_terminator != EOF)
+ {
+! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 >
shell_input_line_size))
+ shell_input_line = (char *)xrealloc (shell_input_line,
+ 1 + (shell_input_line_size += 2));
+*** ../bash-4.3-patched/y.tab.c 2014-03-28 11:17:06.000000000 -0400
+--- y.tab.c 2014-04-07 11:48:31.000000000 -0400
+***************
+*** 4737,4741 ****
+ if (shell_input_line_terminator != EOF)
+ {
+! if (shell_input_line_size < SIZE_MAX && shell_input_line_len >
shell_input_line_size - 3)
+ shell_input_line = (char *)xrealloc (shell_input_line,
+ 1 + (shell_input_line_size += 2));
+--- 4737,4741 ----
+ if (shell_input_line_terminator != EOF)
+ {
+! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 >
shell_input_line_size))
+ shell_input_line = (char *)xrealloc (shell_input_line,
+ 1 + (shell_input_line_size += 2));
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-010
b/shell-term-fm/bash/patches/bash43-010
new file mode 100644
index 0000000..835a96e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-010
@@ -0,0 +1,157 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-010
+
+Bug-Reported-by: Albert Shih <Albert.Shih AT obspm.fr>
+Bug-Reference-ID: Wed, 5 Mar 2014 23:01:40 +0100
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00028.html
+
+Bug-Description:
+
+Patch (apply with `patch -p0'):
+
+This patch changes the behavior of programmable completion to compensate
+for two assumptions made by the bash-completion package. Bash-4.3 changed
+to dequote the argument to programmable completion only under certain
+circumstances, to make the behavior of compgen more consistent when run
+from the command line -- closer to the behavior when run by a shell function
+run as part of programmable completion. Bash-completion can pass quoted
+arguments to compgen when the original word to be completed was not quoted,
+expecting programmable completion to dequote the word before attempting
+completion.
+
+This patch fixes two cases:
+
+1. An empty string that bash-completion passes to compgen as a quoted null
+ string ('').
+
+2. An unquoted word that bash-completion quotes using single quotes or
+ backslashes before passing it to compgen.
+
+In these cases, since readline did not detect a quote character in the
original
+word to be completed, bash-4.3
+
+*** ../bash-4.3/externs.h 2014-01-02 14:58:20.000000000 -0500
+--- externs.h 2014-03-13 14:42:57.000000000 -0400
+***************
+*** 325,328 ****
+--- 325,329 ----
+ extern char *sh_backslash_quote_for_double_quotes __P((char *));
+ extern int sh_contains_shell_metas __P((char *));
++ extern int sh_contains_quotes __P((char *));
+
+ /* declarations for functions defined in lib/sh/spell.c */
+*** ../bash-4.3/lib/sh/shquote.c 2013-03-31 21:53:32.000000000 -0400
+--- lib/sh/shquote.c 2014-03-13 14:42:57.000000000 -0400
+***************
+*** 312,313 ****
+--- 312,327 ----
+ return (0);
+ }
++
++ int
++ sh_contains_quotes (string)
++ char *string;
++ {
++ char *s;
++
++ for (s = string; s && *s; s++)
++ {
++ if (*s == '\'' || *s == '"' || *s == '\\')
++ return 1;
++ }
++ return 0;
++ }
+*** ../bash-4.3/pcomplete.c 2013-08-26 15:23:45.000000000 -0400
+--- pcomplete.c 2014-03-25 17:23:23.000000000 -0400
+***************
+*** 184,187 ****
+--- 184,188 ----
+ COMPSPEC *pcomp_curcs;
+ const char *pcomp_curcmd;
++ const char *pcomp_curtxt;
+
+ #ifdef DEBUG
+***************
+*** 754,757 ****
+--- 755,784 ----
+ dfn = (*rl_filename_dequoting_function) ((char *)text,
rl_completion_quote_character);
+ }
++ /* Intended to solve a mismatched assumption by bash-completion. If
++ the text to be completed is empty, but bash-completion turns it into
++ a quoted string ('') assuming that this code will dequote it before
++ calling readline, do the dequoting. */
++ else if (iscompgen && iscompleting &&
++ pcomp_curtxt && *pcomp_curtxt == 0 &&
++ text && (*text == '\'' || *text == '"') && text[1] == text[0]
&& text[2] == 0 &&
++ rl_filename_dequoting_function)
++ dfn = (*rl_filename_dequoting_function) ((char *)text,
rl_completion_quote_character);
++ /* Another mismatched assumption by bash-completion. If compgen is
being
++ run as part of bash-completion, and the argument to compgen
is not
++ the same as the word originally passed to the programmable
completion
++ code, dequote the argument if it has quote characters. It's
an
++ attempt to detect when bash-completion is quoting its
filename
++ argument before calling compgen. */
++ /* We could check whether gen_shell_function_matches is in the call
++ stack by checking whether the gen-shell-function-matches tag is in
++ the unwind-protect stack, but there's no function to do that yet.
++ We could simply check whether we're executing in a function by
++ checking variable_context, and may end up doing that. */
++ else if (iscompgen && iscompleting && rl_filename_dequoting_function
&&
++ pcomp_curtxt && text &&
++ STREQ (pcomp_curtxt, text) == 0 &&
++ variable_context &&
++ sh_contains_quotes (text)) /* guess */
++ dfn = (*rl_filename_dequoting_function) ((char *)text,
rl_completion_quote_character);
+ else
+ dfn = savestring (text);
+***************
+*** 1523,1527 ****
+ {
+ COMPSPEC *cs, *oldcs;
+! const char *oldcmd;
+ STRINGLIST *ret;
+
+--- 1550,1554 ----
+ {
+ COMPSPEC *cs, *oldcs;
+! const char *oldcmd, *oldtxt;
+ STRINGLIST *ret;
+
+***************
+*** 1546,1552 ****
+--- 1573,1581 ----
+ oldcs = pcomp_curcs;
+ oldcmd = pcomp_curcmd;
++ oldtxt = pcomp_curtxt;
+
+ pcomp_curcs = cs;
+ pcomp_curcmd = cmd;
++ pcomp_curtxt = word;
+
+ ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
+***************
+*** 1554,1557 ****
+--- 1583,1587 ----
+ pcomp_curcs = oldcs;
+ pcomp_curcmd = oldcmd;
++ pcomp_curtxt = oldtxt;
+
+ /* We need to conditionally handle setting *retryp here */
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-011
b/shell-term-fm/bash/patches/bash43-011
new file mode 100644
index 0000000..cdc1572
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-011
@@ -0,0 +1,49 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-011
+
+Bug-Reported-by: Egmont Koblinger <egmont AT gmail.com>
+Bug-Reference-ID:
<CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
+
+Bug-Description:
+
+The signal handling changes to bash and readline (to avoid running any code
+in a signal handler context) cause the cursor to be placed on the wrong
+line of a multi-line command after a ^C interrupts editing.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/lib/readline/display.c 2013-12-27 13:10:56.000000000
-0500
+--- lib/readline/display.c 2014-03-27 11:52:45.000000000 -0400
+***************
+*** 2678,2682 ****
+ if (_rl_echoing_p)
+ {
+! _rl_move_vert (_rl_vis_botlin);
+ _rl_vis_botlin = 0;
+ fflush (rl_outstream);
+--- 2678,2683 ----
+ if (_rl_echoing_p)
+ {
+! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
+! _rl_move_vert (_rl_vis_botlin);
+ _rl_vis_botlin = 0;
+ fflush (rl_outstream);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-012
b/shell-term-fm/bash/patches/bash43-012
new file mode 100644
index 0000000..176fa15
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-012
@@ -0,0 +1,43 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-012
+
+Bug-Reported-by: Eduardo A. Bustamante López<dualbus AT gmail.com>
+Bug-Reference-ID: <5346B54C.4070205 AT case.edu>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00051.html
+
+Bug-Description:
+
+When a SIGCHLD trap runs a command containing a shell builtin while
+a script is running `wait' to wait for all running children to complete,
+the SIGCHLD trap will not be run once for each child that terminates.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/jobs.c 2014-03-28 10:54:19.000000000 -0400
+--- jobs.c 2014-04-15 08:47:03.000000000 -0400
+***************
+*** 3598,3601 ****
+--- 3598,3602 ----
+ unwind_protect_pointer (the_pipeline);
+ unwind_protect_pointer (subst_assign_varlist);
++ unwind_protect_pointer (this_shell_builtin);
+
+ /* We have to add the commands this way because they will be run
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-013
b/shell-term-fm/bash/patches/bash43-013
new file mode 100644
index 0000000..8f4006b
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-013
@@ -0,0 +1,66 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-013
+
+Bug-Reported-by: <Trond.Endrestol AT ximalas.info>
+Bug-Reference-ID:
<alpine.BSF.2.03.1404192114310.1973 AT enterprise.ximalas.info>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
+
+Bug-Description:
+
+Using reverse-i-search when horizontal scrolling is enabled does not
redisplay
+the entire line containing the successful search results.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/lib/readline/display.c 2014-04-08 18:19:36.000000000
-0400
+--- lib/readline/display.c 2014-04-20 18:32:52.000000000 -0400
+***************
+*** 1638,1642 ****
+ the spot of first difference is before the end of the invisible chars,
+ lendiff needs to be adjusted. */
+! if (current_line == 0 && !_rl_horizontal_scroll_mode &&
+ current_invis_chars != visible_wrap_offset)
+ {
+--- 1638,1642 ----
+ the spot of first difference is before the end of the invisible chars,
+ lendiff needs to be adjusted. */
+! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
+ current_invis_chars != visible_wrap_offset)
+ {
+***************
+*** 1826,1831 ****
+ _rl_last_c_pos += bytes_to_insert;
+
+ if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
+! goto clear_rest_of_line;
+ }
+ }
+--- 1826,1836 ----
+ _rl_last_c_pos += bytes_to_insert;
+
++ /* XXX - we only want to do this if we are at the end of the
line
++ so we move there with _rl_move_cursor_relative */
+ if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
+! {
+! _rl_move_cursor_relative (ne-new, new);
+! goto clear_rest_of_line;
+! }
+ }
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-014
b/shell-term-fm/bash/patches/bash43-014
new file mode 100644
index 0000000..f837196
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-014
@@ -0,0 +1,102 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-014
+
+Bug-Reported-by: Greg Wooledge <wooledg AT eeg.ccf.org>
+Bug-Reference-ID: <20140418202123.GB7660 AT eeg.ccf.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html
+
+Bug-Description:
+
+Under certain circumstances, $@ is expanded incorrectly in contexts where
+word splitting is not performed.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/subst.c 2014-01-23 16:26:37.000000000 -0500
+--- subst.c 2014-04-19 15:41:26.000000000 -0400
+***************
+*** 3249,3254 ****
+--- 3249,3256 ----
+ return ((char *)NULL);
+
++ expand_no_split_dollar_star = 1;
+ w->flags |= W_NOSPLIT2;
+ l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);
++ expand_no_split_dollar_star = 0;
+ if (l)
+ {
+***************
+*** 7848,7851 ****
+--- 7850,7857 ----
+ according to POSIX.2, this expands to a list of the positional
+ parameters no matter what IFS is set to. */
++ /* XXX - what to do when in a context where word splitting is not
++ performed? Even when IFS is not the default, posix seems to imply
++ that we behave like unquoted $* ? Maybe we should use PF_NOSPLIT2
++ here. */
+ temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ?
(quoted|Q_DOUBLE_QUOTES) : quoted);
+
+***************
+*** 8817,8820 ****
+--- 8823,8827 ----
+ {
+ char *ifs_chars;
++ char *tstring;
+
+ ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char
*)NULL;
+***************
+*** 8831,8834 ****
+--- 8838,8865 ----
+ if (split_on_spaces)
+ list = list_string (istring, " ", 1); /* XXX quoted == 1? */
++ /* If we have $@ (has_dollar_at != 0) and we are in a context where
we
++ don't want to split the result (W_NOSPLIT2), and we are not quoted,
++ we have already separated the arguments with the first character of
++ $IFS. In this case, we want to return a list with a single word
++ with the separator possibly replaced with a space (it's what other
++ shells seem to do).
++ quoted_dollar_at is internal to this function and is set if we are
++ passed an argument that is unquoted (quoted == 0) but we encounter a
++ double-quoted $@ while expanding it. */
++ else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars &&
quoted == 0 && (word->flags & W_NOSPLIT2))
++ {
++ /* Only split and rejoin if we have to */
++ if (*ifs_chars && *ifs_chars != ' ')
++ {
++ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
++ tstring = string_list (list);
++ }
++ else
++ tstring = istring;
++ tword = make_bare_word (tstring);
++ if (tstring != istring)
++ free (tstring);
++ goto set_word_flags;
++ }
+ else if (has_dollar_at && ifs_chars)
+ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
+***************
+*** 8836,8839 ****
+--- 8867,8871 ----
+ {
+ tword = make_bare_word (istring);
++ set_word_flags:
+ if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state
== WHOLLY_QUOTED))
+ tword->flags |= W_QUOTED;
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-015
b/shell-term-fm/bash/patches/bash43-015
new file mode 100644
index 0000000..9c4e5ea
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-015
@@ -0,0 +1,58 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-015
+
+Bug-Reported-by: Clark Wang <dearvoid AT gmail.com>
+Bug-Reference-ID:
<CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html
+
+Bug-Description:
+
+When completing directory names, the directory name is dequoted twice.
+This causes problems for directories with single and double quotes in
+their names.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500
+--- bashline.c 2014-04-25 14:57:52.000000000 -0400
+***************
+*** 4168,4174 ****
+
+ qc = rl_dispatching ? rl_completion_quote_character : 0;
+! dfn = bash_dequote_filename ((char *)text, qc);
+ m1 = rl_completion_matches (dfn, rl_filename_completion_function);
+! free (dfn);
+
+ if (m1 == 0 || m1[0] == 0)
+--- 4209,4222 ----
+
+ qc = rl_dispatching ? rl_completion_quote_character : 0;
+! /* If rl_completion_found_quote != 0, rl_completion_matches will call the
+! filename dequoting function, causing the directory name to be dequoted
+! twice. */
+! if (rl_dispatching && rl_completion_found_quote == 0)
+! dfn = bash_dequote_filename ((char *)text, qc);
+! else
+! dfn = (char *)text;
+ m1 = rl_completion_matches (dfn, rl_filename_completion_function);
+! if (dfn != text)
+! free (dfn);
+
+ if (m1 == 0 || m1[0] == 0)
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-016
b/shell-term-fm/bash/patches/bash43-016
new file mode 100644
index 0000000..882d593
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-016
@@ -0,0 +1,132 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-016
+
+Bug-Reported-by: Pierre Gaston <pierre.gaston AT gmail.com>
+Bug-Reference-ID:
<CAPSX3sTCD61k1VQLJ5r-LWzEt+e7Xc-fxXmwn2u8EA5gJJej8Q AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00100.html
+
+Bug-Description:
+
+An extended glob pattern containing a slash (`/') causes the globbing code
+to misinterpret it as a directory separator.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/lib/glob/glob.c 2014-03-28 10:54:23.000000000
-0400
+--- lib/glob/glob.c 2014-05-02 10:24:28.000000000 -0400
+***************
+*** 124,127 ****
+--- 124,129 ----
+ extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));
+
++ extern char *glob_dirscan __P((char *, int));
++
+ /* Compile `glob_loop.c' for single-byte characters. */
+ #define CHAR unsigned char
+***************
+*** 188,191 ****
+--- 190,196 ----
+ pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
+ /* we should check for invalid extglob pattern here */
++ if (pe == 0)
++ return 0;
++
+ /* if pe != se we have more of the pattern at the end of the extglob
+ pattern. Check the easy case first ( */
+***************
+*** 1016,1020 ****
+ char **result;
+ unsigned int result_size;
+! char *directory_name, *filename, *dname;
+ unsigned int directory_len;
+ int free_dirname; /* flag */
+--- 1021,1025 ----
+ char **result;
+ unsigned int result_size;
+! char *directory_name, *filename, *dname, *fn;
+ unsigned int directory_len;
+ int free_dirname; /* flag */
+***************
+*** 1032,1035 ****
+--- 1037,1052 ----
+ /* Find the filename. */
+ filename = strrchr (pathname, '/');
++ #if defined (EXTENDED_GLOB)
++ if (filename && extended_glob)
++ {
++ fn = glob_dirscan (pathname, '/');
++ #if DEBUG_MATCHING
++ if (fn != filename)
++ fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename
(%s)\n", fn ? fn : "(null)", filename);
++ #endif
++ filename = fn;
++ }
++ #endif
++
+ if (filename == NULL)
+ {
+*** ../bash-4.3-patched/lib/glob/gmisc.c 2014-03-28 10:54:23.000000000
-0400
+--- lib/glob/gmisc.c 2014-05-02 09:35:57.000000000 -0400
+***************
+*** 43,46 ****
+--- 43,48 ----
+ #define WRPAREN L')'
+
++ extern char *glob_patscan __P((char *, char *, int));
++
+ /* Return 1 of the first character of WSTRING could match the first
+ character of pattern WPAT. Wide character version. */
+***************
+*** 376,377 ****
+--- 378,410 ----
+ return matlen;
+ }
++
++ /* Skip characters in PAT and return the final occurrence of DIRSEP. This
++ is only called when extended_glob is set, so we have to skip over
extglob
++ patterns x(...) */
++ char *
++ glob_dirscan (pat, dirsep)
++ char *pat;
++ int dirsep;
++ {
++ char *p, *d, *pe, *se;
++
++ d = pe = se = 0;
++ for (p = pat; p && *p; p++)
++ {
++ if (extglob_pattern_p (p))
++ {
++ if (se == 0)
++ se = p + strlen (p) - 1;
++ pe = glob_patscan (p + 2, se, 0);
++ if (pe == 0)
++ continue;
++ else if (*pe == 0)
++ break;
++ p = pe - 1; /* will do increment above */
++ continue;
++ }
++ if (*p == dirsep)
++ d = p;
++ }
++ return d;
++ }
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-017
b/shell-term-fm/bash/patches/bash43-017
new file mode 100644
index 0000000..4016fb9
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-017
@@ -0,0 +1,51 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-017
+
+Bug-Reported-by: Dan Douglas <ormaaj AT gmail.com>
+Bug-Reference-ID: <7781746.RhfoTROLxF@smorgbox>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00026.html
+
+Bug-Description:
+
+The code that creates local variables should not clear the `invisible'
+attribute when returning an existing local variable. Let the code that
+actually assigns a value clear it.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/variables.c 2014-02-14 11:55:12.000000000 -0500
+--- variables.c 2014-05-07 10:53:57.000000000 -0400
+***************
+*** 2198,2205 ****
+ old_var = find_variable (name);
+ if (old_var && local_p (old_var) && old_var->context == variable_context)
+! {
+! VUNSETATTR (old_var, att_invisible); /* XXX */
+! return (old_var);
+! }
+
+ was_tmpvar = old_var && tempvar_p (old_var);
+--- 2260,2264 ----
+ old_var = find_variable (name);
+ if (old_var && local_p (old_var) && old_var->context == variable_context)
+! return (old_var);
+
+ was_tmpvar = old_var && tempvar_p (old_var);
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-018
b/shell-term-fm/bash/patches/bash43-018
new file mode 100644
index 0000000..39499f6
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-018
@@ -0,0 +1,44 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-018
+
+Bug-Reported-by: Geir Hauge <geir.hauge AT gmail.com>
+Bug-Reference-ID:
<CAO-BiTLOvfPXDypg61jcBausADrxUKJejakV2WTWP26cW0=rgA AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00040.html
+
+Bug-Description:
+
+When assigning an array variable using the compound assignment syntax,
+but using `declare' with the rhs of the compound assignment quoted, the
+shell did not mark the variable as visible after successfully performing
+the assignment.
+
+Patch (apply with `patch -p0'):
+*** ../bash-4.3-patched/arrayfunc.c 2014-03-28 10:54:21.000000000 -0400
+--- arrayfunc.c 2014-05-12 11:19:00.000000000 -0400
+***************
+*** 180,183 ****
+--- 180,184 ----
+ FREE (newval);
+
++ VUNSETATTR (entry, att_invisible); /* no longer invisible */
+ return (entry);
+ }
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-019
b/shell-term-fm/bash/patches/bash43-019
new file mode 100644
index 0000000..a93714b
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-019
@@ -0,0 +1,84 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-019
+
+Bug-Reported-by: John Lenton
+Bug-Reference-ID:
+Bug-Reference-URL:
https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476
+
+Bug-Description:
+
+The -t timeout option to `read' does not work when the -e option is used.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/lib/readline/input.c 2014-01-10 15:07:08.000000000
-0500
+--- lib/readline/input.c 2014-05-22 18:40:59.000000000 -0400
+***************
+*** 535,540 ****
+--- 538,551 ----
+ else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
+ return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
++ /* keyboard-generated signals of interest */
+ else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
+ RL_CHECK_SIGNALS ();
++ /* non-keyboard-generated signals of interest */
++ else if (_rl_caught_signal == SIGALRM
++ #if defined (SIGVTALRM)
++ || _rl_caught_signal == SIGVTALRM
++ #endif
++ )
++ RL_CHECK_SIGNALS ();
+
+ if (rl_signal_event_hook)
+*** ../bash-4.3-patched/builtins/read.def 2013-09-02 11:54:00.000000000
-0400
+--- builtins/read.def 2014-05-08 11:43:35.000000000 -0400
+***************
+*** 443,447 ****
+ #if defined (READLINE)
+ if (edit)
+! add_unwind_protect (reset_attempted_completion_function, (char
*)NULL);
+ #endif
+ falarm (tmsec, tmusec);
+--- 443,450 ----
+ #if defined (READLINE)
+ if (edit)
+! {
+! add_unwind_protect (reset_attempted_completion_function, (char
*)NULL);
+! add_unwind_protect (bashline_reset_event_hook, (char *)NULL);
+! }
+ #endif
+ falarm (tmsec, tmusec);
+***************
+*** 1022,1025 ****
+--- 1025,1029 ----
+ old_attempted_completion_function = rl_attempted_completion_function;
+ rl_attempted_completion_function = (rl_completion_func_t *)NULL;
++ bashline_set_event_hook ();
+ if (itext)
+ {
+***************
+*** 1033,1036 ****
+--- 1037,1041 ----
+ rl_attempted_completion_function = old_attempted_completion_function;
+ old_attempted_completion_function = (rl_completion_func_t *)NULL;
++ bashline_reset_event_hook ();
+
+ if (ret == 0)
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-020
b/shell-term-fm/bash/patches/bash43-020
new file mode 100644
index 0000000..5f533ef
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-020
@@ -0,0 +1,110 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-020
+
+Bug-Reported-by: Jared Yanovich <slovichon AT gmail.com>
+Bug-Reference-ID: <20140417073654.GB26875 AT nightderanger.psc.edu>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00065.html
+
+Bug-Description:
+
+When PS2 contains a command substitution, here-documents entered in an
+interactive shell can sometimes cause a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
+--- shell.h 2014-06-03 09:24:28.000000000 -0400
+***************
+*** 169,173 ****
+ int expand_aliases;
+ int echo_input_at_read;
+!
+ } sh_parser_state_t;
+
+--- 169,174 ----
+ int expand_aliases;
+ int echo_input_at_read;
+! int need_here_doc;
+!
+ } sh_parser_state_t;
+
+*** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
+--- parse.y 2014-04-30 09:27:59.000000000 -0400
+***************
+*** 2643,2647 ****
+
+ r = 0;
+! while (need_here_doc)
+ {
+ parser_state |= PST_HEREDOC;
+--- 2643,2647 ----
+
+ r = 0;
+! while (need_here_doc > 0)
+ {
+ parser_state |= PST_HEREDOC;
+***************
+*** 6076,6079 ****
+--- 6076,6080 ----
+ ps->expand_aliases = expand_aliases;
+ ps->echo_input_at_read = echo_input_at_read;
++ ps->need_here_doc = need_here_doc;
+
+ ps->token = token;
+***************
+*** 6124,6127 ****
+--- 6125,6129 ----
+ expand_aliases = ps->expand_aliases;
+ echo_input_at_read = ps->echo_input_at_read;
++ need_here_doc = ps->need_here_doc;
+
+ FREE (token);
+*** ../bash-4.3-patched/y.tab.c 2014-04-07 11:56:12.000000000 -0400
+--- y.tab.c 2014-07-30 09:55:57.000000000 -0400
+***************
+*** 4955,4959 ****
+
+ r = 0;
+! while (need_here_doc)
+ {
+ parser_state |= PST_HEREDOC;
+--- 5151,5155 ----
+
+ r = 0;
+! while (need_here_doc > 0)
+ {
+ parser_state |= PST_HEREDOC;
+***************
+*** 8388,8391 ****
+--- 8584,8588 ----
+ ps->expand_aliases = expand_aliases;
+ ps->echo_input_at_read = echo_input_at_read;
++ ps->need_here_doc = need_here_doc;
+
+ ps->token = token;
+***************
+*** 8436,8439 ****
+--- 8633,8637 ----
+ expand_aliases = ps->expand_aliases;
+ echo_input_at_read = ps->echo_input_at_read;
++ need_here_doc = ps->need_here_doc;
+
+ FREE (token);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-021
b/shell-term-fm/bash/patches/bash43-021
new file mode 100644
index 0000000..fd1c945
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-021
@@ -0,0 +1,52 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-021
+
+Bug-Reported-by: Jared Yanovich <slovichon AT gmail.com>
+Bug-Reference-ID: <20140625225019.GJ17044 AT nightderanger.psc.edu>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
+
+Bug-Description:
+
+When the readline `revert-all-at-newline' option is set, pressing newline
+when the current line is one retrieved from history results in a double free
+and a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/lib/readline/misc.c 2012-09-01 18:03:11.000000000
-0400
+--- lib/readline/misc.c 2014-06-30 13:41:19.000000000 -0400
+***************
+*** 462,465 ****
+--- 462,466 ----
+ /* Set up rl_line_buffer and other variables from history entry */
+ rl_replace_from_history (entry, 0); /* entry->line is now current
*/
++ entry->data = 0; /* entry->data is now current
undo list */
+ /* Undo all changes to this history entry */
+ while (rl_undo_list)
+***************
+*** 469,473 ****
+ FREE (entry->line);
+ entry->line = savestring (rl_line_buffer);
+- entry->data = 0;
+ }
+ entry = previous_history ();
+--- 470,473 ----
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-022
b/shell-term-fm/bash/patches/bash43-022
new file mode 100644
index 0000000..7ce39ec
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-022
@@ -0,0 +1,56 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-022
+
+Bug-Reported-by: scorp.dev.null AT gmail.com
+Bug-Reference-ID: <E1WxXw8-0007iE-Bi@pcm14>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00061.html
+
+Bug-Description:
+
+Using nested pipelines within loops with the `lastpipe' option set can result
+in a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500
+--- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400
+***************
+*** 2410,2414 ****
+ lstdin = wait_for (lastpid);
+ #if defined (JOB_CONTROL)
+! exec_result = job_exit_status (lastpipe_jid);
+ #endif
+ unfreeze_jobs_list ();
+--- 2425,2438 ----
+ lstdin = wait_for (lastpid);
+ #if defined (JOB_CONTROL)
+! /* If wait_for removes the job from the jobs table, use result of
last
+! command as pipeline's exit status as usual. The jobs list can get
+! frozen and unfrozen at inconvenient times if there are multiple
pipelines
+! running simultaneously. */
+! if (INVALID_JOB (lastpipe_jid) == 0)
+! exec_result = job_exit_status (lastpipe_jid);
+! else if (pipefail_opt)
+! exec_result = exec_result | lstdin; /* XXX */
+! /* otherwise we use exec_result */
+!
+ #endif
+ unfreeze_jobs_list ();
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-023
b/shell-term-fm/bash/patches/bash43-023
new file mode 100644
index 0000000..d1e4e9d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-023
@@ -0,0 +1,104 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-023
+
+Bug-Reported-by: Tim Friske <me AT timfriske.com>
+Bug-Reference-ID:
<CAM1RzOcOR9zzC2i+aeES6LtbHNHoOV+0pZEYPrqxv_QAii-RXA AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00056.html
+
+Bug-Description:
+
+Bash does not correctly parse process substitution constructs that contain
+unbalanced parentheses as part of the contained command.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
+--- subst.h 2014-07-20 17:25:01.000000000 -0400
+***************
+*** 83,87 ****
+ Start extracting at (SINDEX) as if we had just seen "<(".
+ Make (SINDEX) get the position just after the matching ")". */
+! extern char *extract_process_subst __P((char *, char *, int *));
+ #endif /* PROCESS_SUBSTITUTION */
+
+--- 83,87 ----
+ Start extracting at (SINDEX) as if we had just seen "<(".
+ Make (SINDEX) get the position just after the matching ")". */
+! extern char *extract_process_subst __P((char *, char *, int *, int));
+ #endif /* PROCESS_SUBSTITUTION */
+
+*** ../bash-4.3-patched/subst.c 2014-05-15 08:26:45.000000000 -0400
+--- subst.c 2014-07-20 17:26:44.000000000 -0400
+***************
+*** 1193,1202 ****
+ Make (SINDEX) get the position of the matching ")". */ /*))*/
+ char *
+! extract_process_subst (string, starter, sindex)
+ char *string;
+ char *starter;
+ int *sindex;
+ {
+ return (extract_delimited_string (string, sindex, starter, "(", ")",
SX_COMMAND));
+ }
+ #endif /* PROCESS_SUBSTITUTION */
+--- 1193,1208 ----
+ Make (SINDEX) get the position of the matching ")". */ /*))*/
+ char *
+! extract_process_subst (string, starter, sindex, xflags)
+ char *string;
+ char *starter;
+ int *sindex;
++ int xflags;
+ {
++ #if 0
+ return (extract_delimited_string (string, sindex, starter, "(", ")",
SX_COMMAND));
++ #else
++ xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0);
++ return (xparse_dolparen (string, string+*sindex, sindex, xflags));
++ #endif
+ }
+ #endif /* PROCESS_SUBSTITUTION */
+***************
+*** 1786,1790 ****
+ if (string[si] == '\0')
+ CQ_RETURN(si);
+! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(",
&si);
+ free (temp); /* no SX_ALLOC here */
+ i = si;
+--- 1792,1796 ----
+ if (string[si] == '\0')
+ CQ_RETURN(si);
+! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(",
&si, 0);
+ free (temp); /* no SX_ALLOC here */
+ i = si;
+***************
+*** 8250,8254 ****
+ t_index = sindex + 1; /* skip past both '<' and LPAREN */
+
+! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(",
&t_index); /*))*/
+ sindex = t_index;
+
+--- 8256,8260 ----
+ t_index = sindex + 1; /* skip past both '<' and LPAREN */
+
+! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(",
&t_index, 0); /*))*/
+ sindex = t_index;
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-024
b/shell-term-fm/bash/patches/bash43-024
new file mode 100644
index 0000000..a24b8fb
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-024
@@ -0,0 +1,54 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-024
+
+Bug-Reported-by: Corentin Peuvrel <cpeuvrel AT pom-monitoring.com>
+Bug-Reference-ID: <53CE9E5D.6050203 AT pom-monitoring.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html
+
+Bug-Description:
+
+Indirect variable references do not work correctly if the reference
+variable expands to an array reference using a subscript other than 0
+(e.g., foo='bar[1]' ; echo ${!foo}).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/subst.c 2014-06-03 09:32:44.000000000 -0400
+--- subst.c 2014-07-23 09:58:19.000000000 -0400
+***************
+*** 7375,7379 ****
+
+ if (want_indir)
+! tdesc = parameter_brace_expand_indir (name + 1, var_is_special,
quoted, quoted_dollar_atp, contains_dollar_at);
+ else
+ tdesc = parameter_brace_expand_word (name, var_is_special, quoted,
PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
+--- 7445,7455 ----
+
+ if (want_indir)
+! {
+! tdesc = parameter_brace_expand_indir (name + 1, var_is_special,
quoted, quoted_dollar_atp, contains_dollar_at);
+! /* Turn off the W_ARRAYIND flag because there is no way for this
function
+! to return the index we're supposed to be using. */
+! if (tdesc && tdesc->flags)
+! tdesc->flags &= ~W_ARRAYIND;
+! }
+ else
+ tdesc = parameter_brace_expand_word (name, var_is_special, quoted,
PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-025
b/shell-term-fm/bash/patches/bash43-025
new file mode 100644
index 0000000..721aca0
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-025
@@ -0,0 +1,123 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-025
+
+Bug-Reported-by: Stephane Chazelas <stephane.chazelas AT gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Under certain circumstances, bash will execute user code while processing the
+environment for exported function definitions.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/builtins/common.h 2013-07-08 16:54:47.000000000
-0400
+--- builtins/common.h 2014-09-12 14:25:47.000000000 -0400
+***************
+*** 34,37 ****
+--- 49,54 ----
+ #define SEVAL_PARSEONLY 0x020
+ #define SEVAL_NOLONGJMP 0x040
++ #define SEVAL_FUNCDEF 0x080 /* only allow function
definitions */
++ #define SEVAL_ONECMD 0x100 /* only allow a single command */
+
+ /* Flags for describe_command, shared between type.def and command.def */
+*** ../bash-4.3-patched/builtins/evalstring.c 2014-02-11 09:42:10.000000000
-0500
+--- builtins/evalstring.c 2014-09-14 14:15:13.000000000 -0400
+***************
+*** 309,312 ****
+--- 313,324 ----
+ struct fd_bitmap *bitmap;
+
++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
++ {
++ internal_warning ("%s: ignoring function definition
attempt", from_file);
++ should_jump_to_top_level = 0;
++ last_result = last_command_exit_value = EX_BADUSAGE;
++ break;
++ }
++
+ bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
+ begin_unwind_frame ("pe_dispose");
+***************
+*** 369,372 ****
+--- 381,387 ----
+ dispose_fd_bitmap (bitmap);
+ discard_unwind_frame ("pe_dispose");
++
++ if (flags & SEVAL_ONECMD)
++ break;
+ }
+ }
+*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
+--- variables.c 2014-09-14 14:23:35.000000000 -0400
+***************
+*** 359,369 ****
+ strcpy (temp_string + char_index + 1, string);
+
+! if (posixly_correct == 0 || legal_identifier (name))
+! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
+!
+! /* Ancient backwards compatibility. Old versions of bash exported
+! functions like name()=() {...} */
+! if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
+! name[char_index - 2] = '\0';
+
+ if (temp_var = find_function (name))
+--- 364,372 ----
+ strcpy (temp_string + char_index + 1, string);
+
+! /* Don't import function names that are invalid identifiers from the
+! environment, though we still allow them to be defined as shell
+! variables. */
+! if (legal_identifier (name))
+! parse_and_execute (temp_string, name,
SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
+
+ if (temp_var = find_function (name))
+***************
+*** 382,389 ****
+ report_error (_("error importing function definition for
`%s'"), name);
+ }
+-
+- /* ( */
+- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
+- name[char_index - 2] = '('; /* ) */
+ }
+ #if defined (ARRAY_VARS)
+--- 385,388 ----
+*** ../bash-4.3-patched/subst.c 2014-08-11 11:16:35.000000000 -0400
+--- subst.c 2014-09-12 15:31:04.000000000 -0400
+***************
+*** 8048,8052 ****
+ goto return0;
+ }
+! else if (var = find_variable_last_nameref (temp1))
+ {
+ temp = nameref_cell (var);
+--- 8118,8124 ----
+ goto return0;
+ }
+! else if (var && (invisible_p (var) || var_isset (var) == 0))
+! temp = (char *)NULL;
+! else if ((var = find_variable_last_nameref (temp1)) && var_isset
(var) && invisible_p (var) == 0)
+ {
+ temp = nameref_cell (var);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-026
b/shell-term-fm/bash/patches/bash43-026
new file mode 100644
index 0000000..e48141b
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-026
@@ -0,0 +1,60 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-026
+
+Bug-Reported-by: Tavis Ormandy <taviso () cmpxchg8b com>
+Bug-Reference-ID:
+Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929
+
+Bug-Description:
+
+Under certain circumstances, bash can incorrectly save a lookahead character
and
+return it on a subsequent call, even when reading a new line.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3.25/parse.y 2014-07-30 10:14:31.000000000 -0400
+--- parse.y 2014-09-25 20:20:21.000000000 -0400
+***************
+*** 2954,2957 ****
+--- 2954,2959 ----
+ word_desc_to_read = (WORD_DESC *)NULL;
+
++ eol_ungetc_lookahead = 0;
++
+ current_token = '\n'; /* XXX */
+ last_read_token = '\n';
+*** ../bash-4.3.25/y.tab.c 2014-07-30 10:14:32.000000000 -0400
+--- y.tab.c 2014-09-25 20:21:48.000000000 -0400
+***************
+*** 5266,5269 ****
+--- 5266,5271 ----
+ word_desc_to_read = (WORD_DESC *)NULL;
+
++ eol_ungetc_lookahead = 0;
++
+ current_token = '\n'; /* XXX */
+ last_read_token = '\n';
+***************
+*** 8540,8542 ****
+ }
+ #endif /* HANDLE_MULTIBYTE */
+-
+--- 8542,8543 ----
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 26
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-027
b/shell-term-fm/bash/patches/bash43-027
new file mode 100644
index 0000000..ef48bd8
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-027
@@ -0,0 +1,221 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-027
+
+Bug-Reported-by: Florian Weimer <fweimer AT redhat.com>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+This patch changes the encoding bash uses for exported functions to avoid
+clashes with shell variables and to avoid depending only on an environment
+variable's contents to determine whether or not to interpret it as a shell
+function.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3.26/variables.c 2014-09-25 23:02:18.000000000 -0400
+--- variables.c 2014-09-27 20:52:04.000000000 -0400
+***************
+*** 84,87 ****
+--- 84,92 ----
+ #define ifsname(s) ((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' &&
(s)[3] == '\0')
+
++ #define BASHFUNC_PREFIX "BASH_FUNC_"
++ #define BASHFUNC_PREFLEN 10 /* == strlen(BASHFUNC_PREFIX */
++ #define BASHFUNC_SUFFIX "%%"
++ #define BASHFUNC_SUFFLEN 2 /* == strlen(BASHFUNC_SUFFIX) */
++
+ extern char **environ;
+
+***************
+*** 280,284 ****
+ static void dispose_temporary_env __P((sh_free_func_t *));
+
+! static inline char *mk_env_string __P((const char *, const char *));
+ static char **make_env_array_from_var_list __P((SHELL_VAR **));
+ static char **make_var_export_array __P((VAR_CONTEXT *));
+--- 285,289 ----
+ static void dispose_temporary_env __P((sh_free_func_t *));
+
+! static inline char *mk_env_string __P((const char *, const char *, int));
+ static char **make_env_array_from_var_list __P((SHELL_VAR **));
+ static char **make_var_export_array __P((VAR_CONTEXT *));
+***************
+*** 350,369 ****
+ /* If exported function, define it now. Don't import functions from
+ the environment in privileged mode. */
+! if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {",
string, 4))
+ {
+ string_length = strlen (string);
+! temp_string = (char *)xmalloc (3 + string_length + char_index);
+
+! strcpy (temp_string, name);
+! temp_string[char_index] = ' ';
+! strcpy (temp_string + char_index + 1, string);
+
+ /* Don't import function names that are invalid identifiers from the
+ environment, though we still allow them to be defined as shell
+ variables. */
+! if (legal_identifier (name))
+! parse_and_execute (temp_string, name,
SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
+
+! if (temp_var = find_function (name))
+ {
+ VSETATTR (temp_var, (att_exported|att_imported));
+--- 355,385 ----
+ /* If exported function, define it now. Don't import functions from
+ the environment in privileged mode. */
+! if (privmode == 0 && read_but_dont_execute == 0 &&
+! STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
+! STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
+! STREQN ("() {", string, 4))
+ {
++ size_t namelen;
++ char *tname; /* desired imported function name */
++
++ namelen = char_index - BASHFUNC_PREFLEN - BASHFUNC_SUFFLEN;
++
++ tname = name + BASHFUNC_PREFLEN; /* start of func name */
++ tname[namelen] = '\0'; /* now tname == func name */
++
+ string_length = strlen (string);
+! temp_string = (char *)xmalloc (namelen + string_length + 2);
+
+! memcpy (temp_string, tname, namelen);
+! temp_string[namelen] = ' ';
+! memcpy (temp_string + namelen + 1, string, string_length + 1);
+
+ /* Don't import function names that are invalid identifiers from the
+ environment, though we still allow them to be defined as shell
+ variables. */
+! if (absolute_program (tname) == 0 && (posixly_correct == 0 ||
legal_identifier (tname)))
+! parse_and_execute (temp_string, tname,
SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
+
+! if (temp_var = find_function (tname))
+ {
+ VSETATTR (temp_var, (att_exported|att_imported));
+***************
+*** 378,383 ****
+ }
+ last_command_exit_value = 1;
+! report_error (_("error importing function definition for
`%s'"), name);
+ }
+ }
+ #if defined (ARRAY_VARS)
+--- 394,402 ----
+ }
+ last_command_exit_value = 1;
+! report_error (_("error importing function definition for
`%s'"), tname);
+ }
++
++ /* Restore original suffix */
++ tname[namelen] = BASHFUNC_SUFFIX[0];
+ }
+ #if defined (ARRAY_VARS)
+***************
+*** 2955,2959 ****
+
+ INVALIDATE_EXPORTSTR (var);
+! var->exportstr = mk_env_string (name, value);
+
+ array_needs_making = 1;
+--- 2974,2978 ----
+
+ INVALIDATE_EXPORTSTR (var);
+! var->exportstr = mk_env_string (name, value, 0);
+
+ array_needs_making = 1;
+***************
+*** 3853,3871 ****
+
+ static inline char *
+! mk_env_string (name, value)
+ const char *name, *value;
+ {
+! int name_len, value_len;
+! char *p;
+
+ name_len = strlen (name);
+ value_len = STRLEN (value);
+! p = (char *)xmalloc (2 + name_len + value_len);
+! strcpy (p, name);
+! p[name_len] = '=';
+ if (value && *value)
+! strcpy (p + name_len + 1, value);
+ else
+! p[name_len + 1] = '\0';
+ return (p);
+ }
+--- 3872,3911 ----
+
+ static inline char *
+! mk_env_string (name, value, isfunc)
+ const char *name, *value;
++ int isfunc;
+ {
+! size_t name_len, value_len;
+! char *p, *q;
+
+ name_len = strlen (name);
+ value_len = STRLEN (value);
+!
+! /* If we are exporting a shell function, construct the encoded function
+! name. */
+! if (isfunc && value)
+! {
+! p = (char *)xmalloc (BASHFUNC_PREFLEN + name_len + BASHFUNC_SUFFLEN
+ value_len + 2);
+! q = p;
+! memcpy (q, BASHFUNC_PREFIX, BASHFUNC_PREFLEN);
+! q += BASHFUNC_PREFLEN;
+! memcpy (q, name, name_len);
+! q += name_len;
+! memcpy (q, BASHFUNC_SUFFIX, BASHFUNC_SUFFLEN);
+! q += BASHFUNC_SUFFLEN;
+! }
+! else
+! {
+! p = (char *)xmalloc (2 + name_len + value_len);
+! memcpy (p, name, name_len);
+! q = p + name_len;
+! }
+!
+! q[0] = '=';
+ if (value && *value)
+! memcpy (q + 1, value, value_len + 1);
+ else
+! q[1] = '\0';
+!
+ return (p);
+ }
+***************
+*** 3953,3957 ****
+ using the cached exportstr... */
+ list[list_index] = USE_EXPORTSTR ? savestring (value)
+! : mk_env_string (var->name, value);
+
+ if (USE_EXPORTSTR == 0)
+--- 3993,3997 ----
+ using the cached exportstr... */
+ list[list_index] = USE_EXPORTSTR ? savestring (value)
+! : mk_env_string (var->name, value,
function_p (var));
+
+ if (USE_EXPORTSTR == 0)
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 26
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 27
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-028
b/shell-term-fm/bash/patches/bash43-028
new file mode 100644
index 0000000..074c727
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-028
@@ -0,0 +1,2252 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-028
+
+Bug-Reported-by: Florian Weimer <fweimer AT redhat.com>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+There are two local buffer overflows in parse.y that can cause the shell
+to dump core when given many here-documents attached to a single command
+or many nested loops.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/parse.y 2014-09-25 23:02:35.000000000 -0400
+--- parse.y 2014-09-29 16:47:03.000000000 -0400
+***************
+*** 169,172 ****
+--- 169,175 ----
+ static int reserved_word_acceptable __P((int));
+ static int yylex __P((void));
++
++ static void push_heredoc __P((REDIRECT *));
++ static char *mk_alexpansion __P((char *));
+ static int alias_expand_token __P((char *));
+ static int time_command_acceptable __P((void));
+***************
+*** 266,270 ****
+ /* Variables to manage the task of reading here documents, because we need
to
+ defer the reading until after a complete command has been collected. */
+! static REDIRECT *redir_stack[10];
+ int need_here_doc;
+
+--- 269,275 ----
+ /* Variables to manage the task of reading here documents, because we need
to
+ defer the reading until after a complete command has been collected. */
+! #define HEREDOC_MAX 16
+!
+! static REDIRECT *redir_stack[HEREDOC_MAX];
+ int need_here_doc;
+
+***************
+*** 308,312 ****
+ index is decremented after a case, select, or for command is parsed. */
+ #define MAX_CASE_NEST 128
+! static int word_lineno[MAX_CASE_NEST];
+ static int word_top = -1;
+
+--- 313,317 ----
+ index is decremented after a case, select, or for command is parsed. */
+ #define MAX_CASE_NEST 128
+! static int word_lineno[MAX_CASE_NEST+1];
+ static int word_top = -1;
+
+***************
+*** 521,525 ****
+ redir.filename = $2;
+ $$ = make_redirection (source, r_reading_until,
redir, 0);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | NUMBER LESS_LESS WORD
+--- 526,530 ----
+ redir.filename = $2;
+ $$ = make_redirection (source, r_reading_until,
redir, 0);
+! push_heredoc ($$);
+ }
+ | NUMBER LESS_LESS WORD
+***************
+*** 528,532 ****
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until,
redir, 0);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | REDIR_WORD LESS_LESS WORD
+--- 533,537 ----
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until,
redir, 0);
+! push_heredoc ($$);
+ }
+ | REDIR_WORD LESS_LESS WORD
+***************
+*** 535,539 ****
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until,
redir, REDIR_VARASSIGN);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | LESS_LESS_MINUS WORD
+--- 540,544 ----
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until,
redir, REDIR_VARASSIGN);
+! push_heredoc ($$);
+ }
+ | LESS_LESS_MINUS WORD
+***************
+*** 542,546 ****
+ redir.filename = $2;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | NUMBER LESS_LESS_MINUS WORD
+--- 547,551 ----
+ redir.filename = $2;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! push_heredoc ($$);
+ }
+ | NUMBER LESS_LESS_MINUS WORD
+***************
+*** 549,553 ****
+ redir.filename = $3;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | REDIR_WORD LESS_LESS_MINUS WORD
+--- 554,558 ----
+ redir.filename = $3;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! push_heredoc ($$);
+ }
+ | REDIR_WORD LESS_LESS_MINUS WORD
+***************
+*** 556,560 ****
+ redir.filename = $3;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, REDIR_VARASSIGN);
+! redir_stack[need_here_doc++] = $$;
+ }
+ | LESS_LESS_LESS WORD
+--- 561,565 ----
+ redir.filename = $3;
+ $$ = make_redirection (source,
r_deblank_reading_until, redir, REDIR_VARASSIGN);
+! push_heredoc ($$);
+ }
+ | LESS_LESS_LESS WORD
+***************
+*** 2637,2640 ****
+--- 2642,2660 ----
+ static int esacs_needed_count;
+
++ static void
++ push_heredoc (r)
++ REDIRECT *r;
++ {
++ if (need_here_doc >= HEREDOC_MAX)
++ {
++ last_command_exit_value = EX_BADUSAGE;
++ need_here_doc = 0;
++ report_syntax_error (_("maximum here-document count exceeded"));
++ reset_parser ();
++ exit_shell (last_command_exit_value);
++ }
++ redir_stack[need_here_doc++] = r;
++ }
++
+ void
+ gather_here_documents ()
+*** ../bash-4.3.27/y.tab.c 2014-09-25 23:02:35.000000000 -0400
+--- y.tab.c 2014-09-30 20:03:03.000000000 -0400
+***************
+*** 320,323 ****
+--- 320,326 ----
+ static int reserved_word_acceptable __P((int));
+ static int yylex __P((void));
++
++ static void push_heredoc __P((REDIRECT *));
++ static char *mk_alexpansion __P((char *));
+ static int alias_expand_token __P((char *));
+ static int time_command_acceptable __P((void));
+***************
+*** 417,421 ****
+ /* Variables to manage the task of reading here documents, because we need
to
+ defer the reading until after a complete command has been collected. */
+! static REDIRECT *redir_stack[10];
+ int need_here_doc;
+
+--- 420,426 ----
+ /* Variables to manage the task of reading here documents, because we need
to
+ defer the reading until after a complete command has been collected. */
+! #define HEREDOC_MAX 16
+!
+! static REDIRECT *redir_stack[HEREDOC_MAX];
+ int need_here_doc;
+
+***************
+*** 459,463 ****
+ index is decremented after a case, select, or for command is parsed. */
+ #define MAX_CASE_NEST 128
+! static int word_lineno[MAX_CASE_NEST];
+ static int word_top = -1;
+
+--- 464,468 ----
+ index is decremented after a case, select, or for command is parsed. */
+ #define MAX_CASE_NEST 128
+! static int word_lineno[MAX_CASE_NEST+1];
+ static int word_top = -1;
+
+***************
+*** 493,497 ****
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+ typedef union YYSTYPE
+! #line 324 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ WORD_DESC *word; /* the word that we read. */
+--- 498,502 ----
+ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+ typedef union YYSTYPE
+! #line 329 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ WORD_DESC *word; /* the word that we read. */
+***************
+*** 504,508 ****
+ }
+ /* Line 193 of yacc.c. */
+! #line 507 "y.tab.c"
+ YYSTYPE;
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+--- 509,513 ----
+ }
+ /* Line 193 of yacc.c. */
+! #line 512 "y.tab.c"
+ YYSTYPE;
+ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
+***************
+*** 517,521 ****
+
+ /* Line 216 of yacc.c. */
+! #line 520 "y.tab.c"
+
+ #ifdef short
+--- 522,526 ----
+
+ /* Line 216 of yacc.c. */
+! #line 525 "y.tab.c"
+
+ #ifdef short
+***************
+*** 887,907 ****
+ static const yytype_uint16 yyrline[] =
+ {
+! 0, 377, 377, 388, 397, 412, 422, 424, 428, 434,
+! 440, 446, 452, 458, 464, 470, 476, 482, 488, 494,
+! 500, 506, 512, 518, 525, 532, 539, 546, 553, 560,
+! 566, 572, 578, 584, 590, 596, 602, 608, 614, 620,
+! 626, 632, 638, 644, 650, 656, 662, 668, 674, 680,
+! 686, 692, 700, 702, 704, 708, 712, 723, 725, 729,
+! 731, 733, 749, 751, 755, 757, 759, 761, 763, 765,
+! 767, 769, 771, 773, 775, 779, 784, 789, 794, 799,
+! 804, 809, 814, 821, 826, 831, 836, 843, 848, 853,
+! 858, 863, 868, 875, 880, 885, 892, 895, 898, 902,
+! 904, 935, 942, 947, 964, 969, 986, 993, 995, 997,
+! 1002, 1006, 1010, 1014, 1016, 1018, 1022, 1023, 1027, 1029,
+! 1031, 1033, 1037, 1039, 1041, 1043, 1045, 1047, 1051, 1053,
+! 1062, 1070, 1071, 1077, 1078, 1085, 1089, 1091, 1093, 1100,
+! 1102, 1104, 1108, 1109, 1112, 1114, 1116, 1120, 1121, 1130,
+! 1143, 1159, 1174, 1176, 1178, 1185, 1188, 1192, 1194, 1200,
+! 1206, 1223, 1243, 1245, 1268, 1272, 1274, 1276
+ };
+ #endif
+--- 892,912 ----
+ static const yytype_uint16 yyrline[] =
+ {
+! 0, 382, 382, 393, 402, 417, 427, 429, 433, 439,
+! 445, 451, 457, 463, 469, 475, 481, 487, 493, 499,
+! 505, 511, 517, 523, 530, 537, 544, 551, 558, 565,
+! 571, 577, 583, 589, 595, 601, 607, 613, 619, 625,
+! 631, 637, 643, 649, 655, 661, 667, 673, 679, 685,
+! 691, 697, 705, 707, 709, 713, 717, 728, 730, 734,
+! 736, 738, 754, 756, 760, 762, 764, 766, 768, 770,
+! 772, 774, 776, 778, 780, 784, 789, 794, 799, 804,
+! 809, 814, 819, 826, 831, 836, 841, 848, 853, 858,
+! 863, 868, 873, 880, 885, 890, 897, 900, 903, 907,
+! 909, 940, 947, 952, 969, 974, 991, 998, 1000, 1002,
+! 1007, 1011, 1015, 1019, 1021, 1023, 1027, 1028, 1032, 1034,
+! 1036, 1038, 1042, 1044, 1046, 1048, 1050, 1052, 1056, 1058,
+! 1067, 1075, 1076, 1082, 1083, 1090, 1094, 1096, 1098, 1105,
+! 1107, 1109, 1113, 1114, 1117, 1119, 1121, 1125, 1126, 1135,
+! 1148, 1164, 1179, 1181, 1183, 1190, 1193, 1197, 1199, 1205,
+! 1211, 1228, 1248, 1250, 1273, 1277, 1279, 1281
+ };
+ #endif
+***************
+*** 2094,2098 ****
+ {
+ case 2:
+! #line 378 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of regular command. Discard the error
+--- 2099,2103 ----
+ {
+ case 2:
+! #line 383 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of regular command. Discard the error
+***************
+*** 2108,2112 ****
+
+ case 3:
+! #line 389 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of regular command, but not a very
+--- 2113,2117 ----
+
+ case 3:
+! #line 394 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of regular command, but not a very
+***************
+*** 2120,2124 ****
+
+ case 4:
+! #line 398 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Error during parsing. Return NULL command. */
+--- 2125,2129 ----
+
+ case 4:
+! #line 403 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Error during parsing. Return NULL command. */
+***************
+*** 2138,2142 ****
+
+ case 5:
+! #line 413 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of EOF seen by itself. Do ignoreeof or
+--- 2143,2147 ----
+
+ case 5:
+! #line 418 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Case of EOF seen by itself. Do ignoreeof or
+***************
+*** 2149,2163 ****
+
+ case 6:
+! #line 423 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word),
(WORD_LIST *)NULL); }
+ break;
+
+ case 7:
+! #line 425 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word),
(yyvsp[(1) - (2)].word_list)); }
+ break;
+
+ case 8:
+! #line 429 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2154,2168 ----
+
+ case 6:
+! #line 428 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word),
(WORD_LIST *)NULL); }
+ break;
+
+ case 7:
+! #line 430 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word),
(yyvsp[(1) - (2)].word_list)); }
+ break;
+
+ case 8:
+! #line 434 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2168,2172 ****
+
+ case 9:
+! #line 435 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2173,2177 ----
+
+ case 9:
+! #line 440 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2177,2181 ****
+
+ case 10:
+! #line 441 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2182,2186 ----
+
+ case 10:
+! #line 446 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2186,2190 ****
+
+ case 11:
+! #line 447 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2191,2195 ----
+
+ case 11:
+! #line 452 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2195,2199 ****
+
+ case 12:
+! #line 453 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2200,2204 ----
+
+ case 12:
+! #line 458 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2204,2208 ****
+
+ case 13:
+! #line 459 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2209,2213 ----
+
+ case 13:
+! #line 464 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2213,2217 ****
+
+ case 14:
+! #line 465 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2218,2222 ----
+
+ case 14:
+! #line 470 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2222,2226 ****
+
+ case 15:
+! #line 471 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2227,2231 ----
+
+ case 15:
+! #line 476 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2231,2235 ****
+
+ case 16:
+! #line 477 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2236,2240 ----
+
+ case 16:
+! #line 482 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2240,2244 ****
+
+ case 17:
+! #line 483 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2245,2249 ----
+
+ case 17:
+! #line 488 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2249,2253 ****
+
+ case 18:
+! #line 489 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2254,2258 ----
+
+ case 18:
+! #line 494 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2258,2262 ****
+
+ case 19:
+! #line 495 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2263,2267 ----
+
+ case 19:
+! #line 500 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2267,2271 ****
+
+ case 20:
+! #line 501 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2272,2276 ----
+
+ case 20:
+! #line 506 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2276,2280 ****
+
+ case 21:
+! #line 507 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2281,2285 ----
+
+ case 21:
+! #line 512 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2285,2289 ****
+
+ case 22:
+! #line 513 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2290,2294 ----
+
+ case 22:
+! #line 518 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2294,2358 ****
+
+ case 23:
+! #line 519 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+ redir.filename = (yyvsp[(2) - (2)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 24:
+! #line 526 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 25:
+! #line 533 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, REDIR_VARASSIGN);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 26:
+! #line 540 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+ redir.filename = (yyvsp[(2) - (2)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 27:
+! #line 547 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 28:
+! #line 554 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, REDIR_VARASSIGN);
+! redir_stack[need_here_doc++] = (yyval.redirect);
+ }
+ break;
+
+ case 29:
+! #line 561 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2299,2363 ----
+
+ case 23:
+! #line 524 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+ redir.filename = (yyvsp[(2) - (2)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, 0);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 24:
+! #line 531 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, 0);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 25:
+! #line 538 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_reading_until, redir, REDIR_VARASSIGN);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 26:
+! #line 545 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+ redir.filename = (yyvsp[(2) - (2)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 27:
+! #line 552 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, 0);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 28:
+! #line 559 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+ redir.filename = (yyvsp[(3) - (3)].word);
+ (yyval.redirect) = make_redirection (source,
r_deblank_reading_until, redir, REDIR_VARASSIGN);
+! push_heredoc ((yyval.redirect));
+ }
+ break;
+
+ case 29:
+! #line 566 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2363,2367 ****
+
+ case 30:
+! #line 567 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2368,2372 ----
+
+ case 30:
+! #line 572 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2372,2376 ****
+
+ case 31:
+! #line 573 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2377,2381 ----
+
+ case 31:
+! #line 578 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2381,2385 ****
+
+ case 32:
+! #line 579 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2386,2390 ----
+
+ case 32:
+! #line 584 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2390,2394 ****
+
+ case 33:
+! #line 585 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2395,2399 ----
+
+ case 33:
+! #line 590 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2399,2403 ****
+
+ case 34:
+! #line 591 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2404,2408 ----
+
+ case 34:
+! #line 596 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2408,2412 ****
+
+ case 35:
+! #line 597 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2413,2417 ----
+
+ case 35:
+! #line 602 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2417,2421 ****
+
+ case 36:
+! #line 603 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2422,2426 ----
+
+ case 36:
+! #line 608 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2426,2430 ****
+
+ case 37:
+! #line 609 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2431,2435 ----
+
+ case 37:
+! #line 614 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2435,2439 ****
+
+ case 38:
+! #line 615 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2440,2444 ----
+
+ case 38:
+! #line 620 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2444,2448 ****
+
+ case 39:
+! #line 621 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2449,2453 ----
+
+ case 39:
+! #line 626 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2453,2457 ****
+
+ case 40:
+! #line 627 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2458,2462 ----
+
+ case 40:
+! #line 632 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2462,2466 ****
+
+ case 41:
+! #line 633 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2467,2471 ----
+
+ case 41:
+! #line 638 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2471,2475 ****
+
+ case 42:
+! #line 639 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2476,2480 ----
+
+ case 42:
+! #line 644 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2480,2484 ****
+
+ case 43:
+! #line 645 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2485,2489 ----
+
+ case 43:
+! #line 650 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2489,2493 ****
+
+ case 44:
+! #line 651 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2494,2498 ----
+
+ case 44:
+! #line 656 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2498,2502 ****
+
+ case 45:
+! #line 657 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2503,2507 ----
+
+ case 45:
+! #line 662 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2507,2511 ****
+
+ case 46:
+! #line 663 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2512,2516 ----
+
+ case 46:
+! #line 668 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2516,2520 ****
+
+ case 47:
+! #line 669 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+--- 2521,2525 ----
+
+ case 47:
+! #line 674 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 0;
+***************
+*** 2525,2529 ****
+
+ case 48:
+! #line 675 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+--- 2530,2534 ----
+
+ case 48:
+! #line 680 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = (yyvsp[(1) - (3)].number);
+***************
+*** 2534,2538 ****
+
+ case 49:
+! #line 681 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+--- 2539,2543 ----
+
+ case 49:
+! #line 686 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.filename = (yyvsp[(1) - (3)].word);
+***************
+*** 2543,2547 ****
+
+ case 50:
+! #line 687 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2548,2552 ----
+
+ case 50:
+! #line 692 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2552,2556 ****
+
+ case 51:
+! #line 693 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+--- 2557,2561 ----
+
+ case 51:
+! #line 698 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ source.dest = 1;
+***************
+*** 2561,2580 ****
+
+ case 52:
+! #line 701 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).word = (yyvsp[(1) - (1)].word);
(yyval.element).redirect = 0; }
+ break;
+
+ case 53:
+! #line 703 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).word = (yyvsp[(1) - (1)].word);
(yyval.element).redirect = 0; }
+ break;
+
+ case 54:
+! #line 705 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect);
(yyval.element).word = 0; }
+ break;
+
+ case 55:
+! #line 709 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
+--- 2566,2585 ----
+
+ case 52:
+! #line 706 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).word = (yyvsp[(1) - (1)].word);
(yyval.element).redirect = 0; }
+ break;
+
+ case 53:
+! #line 708 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).word = (yyvsp[(1) - (1)].word);
(yyval.element).redirect = 0; }
+ break;
+
+ case 54:
+! #line 710 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect);
(yyval.element).word = 0; }
+ break;
+
+ case 55:
+! #line 714 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
+***************
+*** 2583,2587 ****
+
+ case 56:
+! #line 713 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ register REDIRECT *t;
+--- 2588,2592 ----
+
+ case 56:
+! #line 718 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ register REDIRECT *t;
+***************
+*** 2595,2619 ****
+
+ case 57:
+! #line 724 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element),
(COMMAND *)NULL); }
+ break;
+
+ case 58:
+! #line 726 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element),
(yyvsp[(1) - (2)].command)); }
+ break;
+
+ case 59:
+! #line 730 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command));
}
+ break;
+
+ case 60:
+! #line 732 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 61:
+! #line 734 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+--- 2600,2624 ----
+
+ case 57:
+! #line 729 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element),
(COMMAND *)NULL); }
+ break;
+
+ case 58:
+! #line 731 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element),
(yyvsp[(1) - (2)].command)); }
+ break;
+
+ case 59:
+! #line 735 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command));
}
+ break;
+
+ case 60:
+! #line 737 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 61:
+! #line 739 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+***************
+*** 2634,2703 ****
+
+ case 62:
+! #line 750 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 63:
+! #line 752 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 64:
+! #line 756 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 65:
+! #line 758 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 66:
+! #line 760 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command)); }
+ break;
+
+ case 67:
+! #line 762 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command)); }
+ break;
+
+ case 68:
+! #line 764 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 69:
+! #line 766 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 70:
+! #line 768 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 71:
+! #line 770 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 72:
+! #line 772 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 73:
+! #line 774 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 74:
+! #line 776 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 75:
+! #line 780 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+--- 2639,2708 ----
+
+ case 62:
+! #line 755 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 63:
+! #line 757 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 64:
+! #line 761 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 65:
+! #line 763 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 66:
+! #line 765 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command)); }
+ break;
+
+ case 67:
+! #line 767 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command)); }
+ break;
+
+ case 68:
+! #line 769 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 69:
+! #line 771 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 70:
+! #line 773 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 71:
+! #line 775 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 72:
+! #line 777 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 73:
+! #line 779 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 74:
+! #line 781 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 75:
+! #line 785 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+***************
+*** 2707,2711 ****
+
+ case 76:
+! #line 785 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+--- 2712,2716 ----
+
+ case 76:
+! #line 790 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+***************
+*** 2715,2719 ****
+
+ case 77:
+! #line 790 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+--- 2720,2724 ----
+
+ case 77:
+! #line 795 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+***************
+*** 2723,2727 ****
+
+ case 78:
+! #line 795 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+--- 2728,2732 ----
+
+ case 78:
+! #line 800 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+***************
+*** 2731,2735 ****
+
+ case 79:
+! #line 800 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+--- 2736,2740 ----
+
+ case 79:
+! #line 805 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+***************
+*** 2739,2743 ****
+
+ case 80:
+! #line 805 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+--- 2744,2748 ----
+
+ case 80:
+! #line 810 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+***************
+*** 2747,2751 ****
+
+ case 81:
+! #line 810 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command),
word_lineno[word_top]);
+--- 2752,2756 ----
+
+ case 81:
+! #line 815 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command),
word_lineno[word_top]);
+***************
+*** 2755,2759 ****
+
+ case 82:
+! #line 815 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command),
word_lineno[word_top]);
+--- 2760,2764 ----
+
+ case 82:
+! #line 820 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_for_command ((yyvsp[(2) -
(9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command),
word_lineno[word_top]);
+***************
+*** 2763,2767 ****
+
+ case 83:
+! #line 822 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
+--- 2768,2772 ----
+
+ case 83:
+! #line 827 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
+***************
+*** 2771,2775 ****
+
+ case 84:
+! #line 827 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
+--- 2776,2780 ----
+
+ case 84:
+! #line 832 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
+***************
+*** 2779,2783 ****
+
+ case 85:
+! #line 832 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
+--- 2784,2788 ----
+
+ case 85:
+! #line 837 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
+***************
+*** 2787,2791 ****
+
+ case 86:
+! #line 837 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
+--- 2792,2796 ----
+
+ case 86:
+! #line 842 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_arith_for_command
((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
+***************
+*** 2795,2799 ****
+
+ case 87:
+! #line 844 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+--- 2800,2804 ----
+
+ case 87:
+! #line 849 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+***************
+*** 2803,2807 ****
+
+ case 88:
+! #line 849 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+--- 2808,2812 ----
+
+ case 88:
+! #line 854 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) -
(6)].command), word_lineno[word_top]);
+***************
+*** 2811,2815 ****
+
+ case 89:
+! #line 854 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+--- 2816,2820 ----
+
+ case 89:
+! #line 859 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+***************
+*** 2819,2823 ****
+
+ case 90:
+! #line 859 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+--- 2824,2828 ----
+
+ case 90:
+! #line 864 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) -
(7)].command), word_lineno[word_top]);
+***************
+*** 2827,2831 ****
+
+ case 91:
+! #line 864 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+--- 2832,2836 ----
+
+ case 91:
+! #line 869 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+***************
+*** 2835,2839 ****
+
+ case 92:
+! #line 869 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+--- 2840,2844 ----
+
+ case 92:
+! #line 874 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_select_command ((yyvsp[(2) -
(10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *),
(yyvsp[(9) - (10)].command), word_lineno[word_top]);
+***************
+*** 2843,2847 ****
+
+ case 93:
+! #line 876 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
+--- 2848,2852 ----
+
+ case 93:
+! #line 881 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
+***************
+*** 2851,2855 ****
+
+ case 94:
+! #line 881 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
+--- 2856,2860 ----
+
+ case 94:
+! #line 886 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
+***************
+*** 2859,2863 ****
+
+ case 95:
+! #line 886 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
+--- 2864,2868 ----
+
+ case 95:
+! #line 891 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_case_command ((yyvsp[(2) -
(6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
+***************
+*** 2867,2891 ****
+
+ case 96:
+! #line 893 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word),
(yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
+ break;
+
+ case 97:
+! #line 896 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word),
(yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
+ break;
+
+ case 98:
+! #line 899 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word),
(yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
+ break;
+
+ case 99:
+! #line 903 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 100:
+! #line 905 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+--- 2872,2896 ----
+
+ case 96:
+! #line 898 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word),
(yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
+ break;
+
+ case 97:
+! #line 901 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word),
(yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
+ break;
+
+ case 98:
+! #line 904 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word),
(yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
+ break;
+
+ case 99:
+! #line 908 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 100:
+! #line 910 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+***************
+*** 2919,2923 ****
+
+ case 101:
+! #line 936 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_subshell_command ((yyvsp[(2)
- (3)].command));
+--- 2924,2928 ----
+
+ case 101:
+! #line 941 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_subshell_command ((yyvsp[(2)
- (3)].command));
+***************
+*** 2927,2931 ****
+
+ case 102:
+! #line 943 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ("COPROC",
(yyvsp[(2) - (2)].command));
+--- 2932,2936 ----
+
+ case 102:
+! #line 948 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ("COPROC",
(yyvsp[(2) - (2)].command));
+***************
+*** 2935,2939 ****
+
+ case 103:
+! #line 948 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+--- 2940,2944 ----
+
+ case 103:
+! #line 953 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+***************
+*** 2955,2959 ****
+
+ case 104:
+! #line 965 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ((yyvsp[(2) -
(3)].word)->word, (yyvsp[(3) - (3)].command));
+--- 2960,2964 ----
+
+ case 104:
+! #line 970 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ((yyvsp[(2) -
(3)].word)->word, (yyvsp[(3) - (3)].command));
+***************
+*** 2963,2967 ****
+
+ case 105:
+! #line 970 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+--- 2968,2972 ----
+
+ case 105:
+! #line 975 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ COMMAND *tc;
+***************
+*** 2983,2987 ****
+
+ case 106:
+! #line 987 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ("COPROC",
clean_simple_command ((yyvsp[(2) - (2)].command)));
+--- 2988,2992 ----
+
+ case 106:
+! #line 992 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = make_coproc_command ("COPROC",
clean_simple_command ((yyvsp[(2) - (2)].command)));
+***************
+*** 2991,3105 ****
+
+ case 107:
+! #line 994 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
+ break;
+
+ case 108:
+! #line 996 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command),
(yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
+ break;
+
+ case 109:
+! #line 998 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command),
(yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
+ break;
+
+ case 110:
+! #line 1003 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
+ break;
+
+ case 111:
+! #line 1007 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list));
}
+ break;
+
+ case 112:
+! #line 1011 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(2) - (3)].command); }
+ break;
+
+ case 113:
+! #line 1015 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command),
(yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
+ break;
+
+ case 114:
+! #line 1017 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command),
(yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
+ break;
+
+ case 115:
+! #line 1019 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
+ break;
+
+ case 117:
+! #line 1024 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern);
(yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
+ break;
+
+ case 118:
+! #line 1028 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list),
(yyvsp[(4) - (4)].command)); }
+ break;
+
+ case 119:
+! #line 1030 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list),
(COMMAND *)NULL); }
+ break;
+
+ case 120:
+! #line 1032 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list),
(yyvsp[(5) - (5)].command)); }
+ break;
+
+ case 121:
+! #line 1034 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list),
(COMMAND *)NULL); }
+ break;
+
+ case 122:
+! #line 1038 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 123:
+! #line 1040 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern);
(yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 124:
+! #line 1042 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH;
(yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 125:
+! #line 1044 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2)
- (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) =
(yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 126:
+! #line 1046 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT;
(yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 127:
+! #line 1048 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) -
(3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) =
(yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 128:
+! #line 1052 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word),
(WORD_LIST *)NULL); }
+ break;
+
+ case 129:
+! #line 1054 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word),
(yyvsp[(1) - (3)].word_list)); }
+ break;
+
+ case 130:
+! #line 1063 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(2) - (2)].command);
+--- 2996,3110 ----
+
+ case 107:
+! #line 999 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
+ break;
+
+ case 108:
+! #line 1001 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command),
(yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
+ break;
+
+ case 109:
+! #line 1003 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command),
(yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
+ break;
+
+ case 110:
+! #line 1008 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
+ break;
+
+ case 111:
+! #line 1012 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list));
}
+ break;
+
+ case 112:
+! #line 1016 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(2) - (3)].command); }
+ break;
+
+ case 113:
+! #line 1020 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command),
(yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
+ break;
+
+ case 114:
+! #line 1022 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command),
(yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
+ break;
+
+ case 115:
+! #line 1024 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command),
(yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
+ break;
+
+ case 117:
+! #line 1029 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern);
(yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
+ break;
+
+ case 118:
+! #line 1033 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list),
(yyvsp[(4) - (4)].command)); }
+ break;
+
+ case 119:
+! #line 1035 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list),
(COMMAND *)NULL); }
+ break;
+
+ case 120:
+! #line 1037 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list),
(yyvsp[(5) - (5)].command)); }
+ break;
+
+ case 121:
+! #line 1039 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list),
(COMMAND *)NULL); }
+ break;
+
+ case 122:
+! #line 1043 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 123:
+! #line 1045 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern);
(yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 124:
+! #line 1047 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH;
(yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 125:
+! #line 1049 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2)
- (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) =
(yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 126:
+! #line 1051 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT;
(yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
+ break;
+
+ case 127:
+! #line 1053 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) -
(3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) =
(yyvsp[(2) - (3)].pattern); }
+ break;
+
+ case 128:
+! #line 1057 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word),
(WORD_LIST *)NULL); }
+ break;
+
+ case 129:
+! #line 1059 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word),
(yyvsp[(1) - (3)].word_list)); }
+ break;
+
+ case 130:
+! #line 1068 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(2) - (2)].command);
+***************
+*** 3110,3114 ****
+
+ case 132:
+! #line 1072 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(2) - (2)].command);
+--- 3115,3119 ----
+
+ case 132:
+! #line 1077 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(2) - (2)].command);
+***************
+*** 3117,3121 ****
+
+ case 134:
+! #line 1079 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (3)].command)->type ==
cm_connection)
+--- 3122,3126 ----
+
+ case 134:
+! #line 1084 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (3)].command)->type ==
cm_connection)
+***************
+*** 3127,3141 ****
+
+ case 136:
+! #line 1090 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), AND_AND); }
+ break;
+
+ case 137:
+! #line 1092 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), OR_OR); }
+ break;
+
+ case 138:
+! #line 1094 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (4)].command)->type ==
cm_connection)
+--- 3132,3146 ----
+
+ case 136:
+! #line 1095 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), AND_AND); }
+ break;
+
+ case 137:
+! #line 1097 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), OR_OR); }
+ break;
+
+ case 138:
+! #line 1099 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (4)].command)->type ==
cm_connection)
+***************
+*** 3147,3181 ****
+
+ case 139:
+! #line 1101 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), ';'); }
+ break;
+
+ case 140:
+! #line 1103 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), ';'); }
+ break;
+
+ case 141:
+! #line 1105 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 144:
+! #line 1113 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = '\n'; }
+ break;
+
+ case 145:
+! #line 1115 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = ';'; }
+ break;
+
+ case 146:
+! #line 1117 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = yacc_EOF; }
+ break;
+
+ case 149:
+! #line 1131 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(1) - (1)].command);
+--- 3152,3186 ----
+
+ case 139:
+! #line 1106 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), ';'); }
+ break;
+
+ case 140:
+! #line 1108 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), ';'); }
+ break;
+
+ case 141:
+! #line 1110 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 144:
+! #line 1118 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = '\n'; }
+ break;
+
+ case 145:
+! #line 1120 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = ';'; }
+ break;
+
+ case 146:
+! #line 1122 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = yacc_EOF; }
+ break;
+
+ case 149:
+! #line 1136 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(1) - (1)].command);
+***************
+*** 3193,3197 ****
+
+ case 150:
+! #line 1144 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (2)].command)->type ==
cm_connection)
+--- 3198,3202 ----
+
+ case 150:
+! #line 1149 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (2)].command)->type ==
cm_connection)
+***************
+*** 3212,3216 ****
+
+ case 151:
+! #line 1160 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(1) - (2)].command);
+--- 3217,3221 ----
+
+ case 151:
+! #line 1165 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ (yyval.command) = (yyvsp[(1) - (2)].command);
+***************
+*** 3228,3242 ****
+
+ case 152:
+! #line 1175 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), AND_AND); }
+ break;
+
+ case 153:
+! #line 1177 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), OR_OR); }
+ break;
+
+ case 154:
+! #line 1179 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (3)].command)->type ==
cm_connection)
+--- 3233,3247 ----
+
+ case 152:
+! #line 1180 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), AND_AND); }
+ break;
+
+ case 153:
+! #line 1182 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), OR_OR); }
+ break;
+
+ case 154:
+! #line 1184 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(1) - (3)].command)->type ==
cm_connection)
+***************
+*** 3248,3267 ****
+
+ case 155:
+! #line 1186 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command),
(yyvsp[(3) - (3)].command), ';'); }
+ break;
+
+ case 156:
+! #line 1189 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 157:
+! #line 1193 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 158:
+! #line 1195 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(2) - (2)].command))
+--- 3253,3272 ----
+
+ case 155:
+! #line 1191 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command),
(yyvsp[(3) - (3)].command), ';'); }
+ break;
+
+ case 156:
+! #line 1194 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 157:
+! #line 1198 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 158:
+! #line 1200 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(2) - (2)].command))
+***************
+*** 3272,3276 ****
+
+ case 159:
+! #line 1201 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(2) - (2)].command))
+--- 3277,3281 ----
+
+ case 159:
+! #line 1206 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ if ((yyvsp[(2) - (2)].command))
+***************
+*** 3281,3285 ****
+
+ case 160:
+! #line 1207 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ ELEMENT x;
+--- 3286,3290 ----
+
+ case 160:
+! #line 1212 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ ELEMENT x;
+***************
+*** 3301,3305 ****
+
+ case 161:
+! #line 1224 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ ELEMENT x;
+--- 3306,3310 ----
+
+ case 161:
+! #line 1229 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ ELEMENT x;
+***************
+*** 3322,3331 ****
+
+ case 162:
+! #line 1244 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), '|'); }
+ break;
+
+ case 163:
+! #line 1246 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2
*/
+--- 3327,3336 ----
+
+ case 162:
+! #line 1249 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command),
(yyvsp[(4) - (4)].command), '|'); }
+ break;
+
+ case 163:
+! #line 1251 "/usr/homes/chet/src/bash/src/parse.y"
+ {
+ /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2
*/
+***************
+*** 3353,3372 ****
+
+ case 164:
+! #line 1269 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 165:
+! #line 1273 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE; }
+ break;
+
+ case 166:
+! #line 1275 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
+ break;
+
+ case 167:
+! #line 1277 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
+ break;
+--- 3358,3377 ----
+
+ case 164:
+! #line 1274 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.command) = (yyvsp[(1) - (1)].command); }
+ break;
+
+ case 165:
+! #line 1278 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE; }
+ break;
+
+ case 166:
+! #line 1280 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
+ break;
+
+ case 167:
+! #line 1282 "/usr/homes/chet/src/bash/src/parse.y"
+ { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
+ break;
+***************
+*** 3374,3378 ****
+
+ /* Line 1267 of yacc.c. */
+! #line 3377 "y.tab.c"
+ default: break;
+ }
+--- 3379,3383 ----
+
+ /* Line 1267 of yacc.c. */
+! #line 3382 "y.tab.c"
+ default: break;
+ }
+***************
+*** 3588,3592 ****
+
+
+! #line 1279 "/usr/homes/chet/src/bash/src/parse.y"
+
+
+--- 3593,3597 ----
+
+
+! #line 1284 "/usr/homes/chet/src/bash/src/parse.y"
+
+
+***************
+*** 4949,4952 ****
+--- 4954,4972 ----
+ static int esacs_needed_count;
+
++ static void
++ push_heredoc (r)
++ REDIRECT *r;
++ {
++ if (need_here_doc >= HEREDOC_MAX)
++ {
++ last_command_exit_value = EX_BADUSAGE;
++ need_here_doc = 0;
++ report_syntax_error (_("maximum here-document count exceeded"));
++ reset_parser ();
++ exit_shell (last_command_exit_value);
++ }
++ redir_stack[need_here_doc++] = r;
++ }
++
+ void
+ gather_here_documents ()
+***************
+*** 8542,8543 ****
+--- 8562,8564 ----
+ }
+ #endif /* HANDLE_MULTIBYTE */
++
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 27
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 28
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/busybox/BUILD b/shell-term-fm/busybox/BUILD
index 8f58e6d..6dfecc1 100755
--- a/shell-term-fm/busybox/BUILD
+++ b/shell-term-fm/busybox/BUILD
@@ -1 +1 @@
-make
+default_build_make
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index 2e560d1..34f1213 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,28 +1,38 @@
SPELL=busybox
- VERSION=1.20.2
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
- SOURCE2=$SPELL-$VERSION-sys-resource.patch
-
SOURCE2_HASH=sha512:52341d96d6d9fd9d0835b8ceba6d130840358cf1a7af4e647f77a5cf61ee61ec1fb86cb20d850d88d3e6026462a5f074e2076f0b93cb3545532298e8d5361f89
+ VERSION=1.22.1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80
SOURCE_URL[0]=http://www.busybox.net/downloads/$SOURCE
+
+ SOURCE2=$SPELL-$VERSION-ash.patch
+
SOURCE2_HASH=sha512:297736a2b41badba50a64881e20778e05c9df5f6fed5cbe45cf8c5a31e5486a5fe85ce00897c2ef0c60787cc33467f03fc586f39945f513a7caeaea57aafc8d7
SOURCE2_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE2
+
+ SOURCE3=$SPELL-$VERSION-date.patch
+
SOURCE3_HASH=sha512:0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34
+ SOURCE3_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE3
+
+ SOURCE4=$SPELL-$VERSION-iplink.patch
+
SOURCE4_HASH=sha512:f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889
+ SOURCE4_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE4
+
+ SOURCE5=$SPELL-$VERSION-nc.patch
+
SOURCE5_HASH=sha512:9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f
+ SOURCE5_URL[0]=http://www.busybox.net/downloads/fixes-$VERSION/$SOURCE5
+
WEB_SITE=http://www.busybox.net
ENTERED=20011020
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Statically linked rescue shell"
cat << EOF
-BusyBox combines tiny versions of many common
-UNIX utilities into a single small executable.
-It provides minimalist replacements for most
-of the utilities you usually find in GNU
-fileutils, shellutils, etc. The utilities in
-BusyBox generally have fewer options than their
-full-featured GNU cousins; however, the options
-that are included provide the expected
-functionality and behave very much like their
-GNU counterparts. BusyBox provides a fairly
-complete POSIX environment for any small or
-embedded system.
+BusyBox combines tiny versions of many common UNIX utilities into a single
+small executable. It provides minimalist replacements for most of the
utilities
+you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox
+generally have fewer options than their full-featured GNU cousins; however,
the
+options that are included provide the expected functionality and behave very
+much like their GNU counterparts. BusyBox provides a fairly complete POSIX
+environment for any small or embedded system.
EOF
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index cbbed69..d7fff07 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2014-07-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, busybox.config: version 1.22.1
+ * INSTALL: install build-time config file to /usr/share/busybox for
+ reference
+ * BUILD: use default_build_make
+
2013-05-10 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS, busybox.config: version 1.20.2
* DETAILS, PRE_BUILD: patch for building with current glibc
diff --git a/shell-term-fm/busybox/INSTALL b/shell-term-fm/busybox/INSTALL
index 24048e5..61aed19 100755
--- a/shell-term-fm/busybox/INSTALL
+++ b/shell-term-fm/busybox/INSTALL
@@ -1,4 +1,5 @@
-install -vm 755 busybox ${INSTALL_ROOT}/sbin
+install -vm 755 busybox ${INSTALL_ROOT}/sbin &&
+install -vDm 644 .config ${INSTALL_ROOT}/usr/share/busybox/busybox.config

#
# This one is needed only when symlinks needed ...
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index b39190a..d9e73d3 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -4,11 +4,14 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

patch -p1 < "$SOURCE_CACHE/$SOURCE2" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE3" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE4" &&
+patch -p1 < "$SOURCE_CACHE/$SOURCE5" &&

if [ -f $CONFIG_CACHE/busybox.config ]; then
cp ${CONFIG_CACHE}/busybox.config .config
else
- cp ${SCRIPT_DIRECTORY}/busybox.config .config
+ cp ${SCRIPT_DIRECTORY}/busybox.config .config
fi &&

if [[ "$BB_CONFIG" = "y" ]] && [[ $RECONFIGURE ]] ; then
diff --git a/shell-term-fm/busybox/busybox.config
b/shell-term-fm/busybox/busybox.config
index a3020ca..de40be2 100644
--- a/shell-term-fm/busybox/busybox.config
+++ b/shell-term-fm/busybox/busybox.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Fri May 10 22:20:46 2013
+# Busybox version: 1.22.1
+# Sat Jul 19 21:24:57 2014
#
CONFIG_HAVE_DOT_CONFIG=y

@@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@@ -54,7 +55,7 @@ CONFIG_FEATURE_HAVE_RPC=y
#
# Build Options
#
-# CONFIG_STATIC is not set
+CONFIG_STATIC=y
# CONFIG_PIE is not set
# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
@@ -96,6 +97,7 @@ CONFIG_FEATURE_SYSTEMD=y
CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_USE_TERMIOS=y
@@ -133,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_GZ=y
# CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
# CONFIG_FEATURE_AR_CREATE is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_GUNZIP=y
CONFIG_BUNZIP2=y
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
CONFIG_BZIP2=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
@@ -141,14 +150,13 @@ CONFIG_FEATURE_CPIO_P=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
CONFIG_GZIP=y
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
CONFIG_GZIP_FAST=0
CONFIG_LZOP=y
# CONFIG_LZOP_COMPR_HIGH is not set
-CONFIG_RPM2CPIO=y
CONFIG_RPM=y
+CONFIG_RPM2CPIO=y
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_AUTODETECT=y
@@ -161,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
CONFIG_UNZIP=y

#
@@ -184,6 +186,7 @@ CONFIG_GROUPS=y
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
CONFIG_FEATURE_TOUCH_SUSV3=y
CONFIG_TR=y
CONFIG_FEATURE_TR_CLASSES=y
@@ -263,6 +266,7 @@ CONFIG_SEQ=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -310,7 +314,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
CONFIG_FEATURE_HUMAN_READABLE=y

#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y

@@ -360,7 +364,16 @@ CONFIG_WHICH=y
#
# Editors
#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
CONFIG_PATCH=y
+CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
# CONFIG_FEATURE_VI_8BIT is not set
@@ -375,15 +388,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
CONFIG_FEATURE_ALLOW_EXEC=y

#
@@ -526,6 +530,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
# Linux System Utilities
#
CONFIG_BLOCKDEV=y
+CONFIG_FSTRIM=y
CONFIG_MDEV=y
CONFIG_FEATURE_MDEV_CONF=y
CONFIG_FEATURE_MDEV_RENAME=y
@@ -612,23 +617,27 @@ CONFIG_VOLUMEID=y
#
# Filesystem/Volume identification
#
-CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_F2FS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y
-CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
-CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_NILFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
CONFIG_FEATURE_VOLUMEID_SYSV=y
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_XFS=y

#
# Miscellaneous Utilities
@@ -646,6 +655,7 @@ CONFIG_FEATURE_LESS_DASHCMD=y
CONFIG_FEATURE_LESS_LINENUMS=y
CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y
+# CONFIG_RFKILL is not set
CONFIG_SETSERIAL=y
CONFIG_UBIATTACH=y
CONFIG_UBIDETACH=y
@@ -653,6 +663,7 @@ CONFIG_UBIMKVOL=y
CONFIG_UBIRMVOL=y
CONFIG_UBIRSVOL=y
CONFIG_UBIUPDATEVOL=y
+CONFIG_WALL=y
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -709,7 +720,6 @@ CONFIG_MOUNTPOINT=y
CONFIG_MT=y
CONFIG_RAIDAUTORUN=y
CONFIG_READAHEAD=y
-# CONFIG_RFKILL is not set
CONFIG_RUNLEVEL=y
CONFIG_RX=y
CONFIG_SETSID=y
@@ -720,7 +730,6 @@ CONFIG_TIME=y
CONFIG_TIMEOUT=y
CONFIG_TTYSIZE=y
CONFIG_VOLNAME=y
-CONFIG_WALL=y
CONFIG_WATCHDOG=y

#
@@ -898,6 +907,13 @@ CONFIG_POWERTOP=y
CONFIG_PSTREE=y
CONFIG_PWDX=y
CONFIG_SMEMCAP=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
CONFIG_UPTIME=y
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_FREE=y
@@ -918,13 +934,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-CONFIG_FEATURE_TOP_DECIMALS=y
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_WATCH=y

@@ -1019,6 +1028,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_FEATURE_KMSG_SYSLOG=y
CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
CONFIG_FEATURE_KLOGD_KLOGCTL=y
CONFIG_LOGGER=y
diff --git a/shell-term-fm/byobu/DEPENDS b/shell-term-fm/byobu/DEPENDS
new file mode 100755
index 0000000..26ce3d1
--- /dev/null
+++ b/shell-term-fm/byobu/DEPENDS
@@ -0,0 +1 @@
+optional_depends newt '' '' 'required by the byobu-config utility'
diff --git a/shell-term-fm/byobu/DETAILS b/shell-term-fm/byobu/DETAILS
new file mode 100755
index 0000000..c46bd13
--- /dev/null
+++ b/shell-term-fm/byobu/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=byobu
+ VERSION=5.86
+ SOURCE="${SPELL}_$VERSION.orig.tar.gz"
+
SOURCE_URL[0]="https://launchpad.net/$SPELL/trunk/$VERSION/+download/$SOURCE";
+
SOURCE_HASH=sha512:e811423714427ae8d781428a225344fa8909584cdb8d369645a00fea12da2740cbb18ca55e7e587d03eb3074b107576b8e9dd3eb5c36b0d01c2b31d77d559ceb
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://byobu.co";
+ LICENSE[0]="GPLv3"
+ ENTERED=20140913
+ KEYWORDS=""
+ SHORT="text based window manager and terminal multiplexer"
+cat << EOF
+Byobu is an elegant enhancement of the otherwise functional, plain, practical
+GNU Screen. Byobu includes an enhanced profile, configuration utilities, and
+system status notifications for the GNU screen window manager as well as the
+Tmux terminal multiplexer.
+EOF
diff --git a/shell-term-fm/byobu/HISTORY b/shell-term-fm/byobu/HISTORY
new file mode 100644
index 0000000..beec32c
--- /dev/null
+++ b/shell-term-fm/byobu/HISTORY
@@ -0,0 +1,6 @@
+2014-09-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE
+
+2014-09-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
+ * DEPENDS: Optionally depends on newt for byobu-config
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/mc/DETAILS b/shell-term-fm/mc/DETAILS
index f2ed9c2..7032354 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,8 +1,8 @@
SPELL=mc
- VERSION=4.8.11
-
SOURCE_HASH=sha512:d36308b88f587f80d51728cd9c6f35237156a32af85a4f915ba1d4689acfb560183a788261137ef59893bb9ce01e4a6f41c7d3c20f0937c3b0d1423b0a3e1872
+ VERSION=4.8.13
+
SOURCE_HASH=sha512:556047072cc1d22a911cfb3cc82b03d204881f2773e06a8fe2020ecfbd4ffa491e1c710ca2124b9f3b219cd73f2b732a4bfad1671f095c1768864704514b067f
PATCHLEVEL=0
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://www.midnight-commander.org/downloads/$SOURCE
WEB_SITE=http://www.midnight-commander.org/
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 08bce47..79d0f4a 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,10 @@
+2014-09-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.13
+
+2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.8.12
+ * PRE_BUILD, mc-4.8.11-ncurses_build_fix.patch: deleted
+
2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, mc-4.8.11-ncurses_build_fix.patch: fix incompatibility
with ncurses, patch from gentoo
diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
deleted file mode 100755
index ef5ca1a..0000000
--- a/shell-term-fm/mc/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/mc-4.8.11-ncurses_build_fix.patch
diff --git a/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
b/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
deleted file mode 100644
index 0d986eb..0000000
--- a/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/tty/key.c
-===================================================================
---- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
-+++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
-@@ -1947,4 +1947,5 @@
- {
- int c;
-+ static int flag = 0; /* Return value from select */
- #ifdef HAVE_LIBGPM
- static struct Gpm_Event ev; /* Mouse event */
-@@ -1979,5 +1980,4 @@
- {
- int nfd;
-- static int flag = 0; /* Return value from select */
- fd_set select_set;
-
-Index: lib/tty/tty-ncurses.c
-===================================================================
---- lib/tty/tty-ncurses.c (revision
bb65b467900ea9eb1f7867c059fd26fac86c747c)
-+++ lib/tty/tty-ncurses.c (revision
21bf5d2dde704fd9ae90d991ce1279ba925897c9)
-@@ -50,4 +50,5 @@
- #include "tty.h"
- #include "color-internal.h"
-+#include "key.h"
- #include "mouse.h"
- #include "win.h"
-@@ -531,4 +532,5 @@
- {
- int res;
-+ unsigned char str[UTF8_CHAR_LEN + 1];
-
- res = g_unichar_to_utf8 (c, (char *) str);
-@@ -541,5 +543,4 @@
- else
- {
-- unsigned char str[UTF8_CHAR_LEN + 1];
- const char *s;
-
diff --git a/shell-term-fm/mksh/DETAILS b/shell-term-fm/mksh/DETAILS
index 912d21d..ff870ef 100755
--- a/shell-term-fm/mksh/DETAILS
+++ b/shell-term-fm/mksh/DETAILS
@@ -1,12 +1,12 @@
SPELL=mksh
- VERSION=R48b
+ VERSION=R50b
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://www.mirbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
SOURCE_URL[1]=http://pub.allbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
WEB_SITE=http://www.mirbsd.org/mksh.htm
ENTERED=20060928
-
SOURCE_HASH=sha512:7096c4cd56f623a378cf3fb22b9bb8f21445de68f4207f493f21c17fd8330e8ff6d715233b9d7f5a6508cc629cbb06d66943ad32a47b36352c5565280a6b792b
+
SOURCE_HASH=sha512:0170401d0722575dd81f853b6730b008171fe57cd7e6df7d1d401db28e318a2b9f654676160148cb2443237bfa42d0efcfbc16e52715dc6425e192569e3fa286
# I suggest to add this to the list (shortname MIROS or MIRBSD please)
LICENSE[0]=http://mirbsd.de/MirOS-Licence
SHORT="MirBSD Korn Shell"
diff --git a/shell-term-fm/mksh/HISTORY b/shell-term-fm/mksh/HISTORY
index fd0ae97..a3db4d0 100644
--- a/shell-term-fm/mksh/HISTORY
+++ b/shell-term-fm/mksh/HISTORY
@@ -1,3 +1,9 @@
+2014-09-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to R50b
+
+2014-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to R50
+
2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to R48b

diff --git a/shell-term-fm/pcmanfm/DEPENDS b/shell-term-fm/pcmanfm/DEPENDS
index d31c93c..eb8e3a9 100755
--- a/shell-term-fm/pcmanfm/DEPENDS
+++ b/shell-term-fm/pcmanfm/DEPENDS
@@ -1,8 +1,13 @@
depends atk &&
depends glib2 &&
-depends gtk+2 &&
depends libfm &&
depends libpng &&
depends libx11 &&
depends menu-cache &&
-depends pango
+depends pango &&
+
+if is_depends_enabled libfm gtk+3; then
+ depends gtk+2 '--with-gtk=3'
+else
+ depends gtk+2 '--with-gtk=2'
+fi
diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index 79c1b1c..4eff43c 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,13 +1,13 @@
SPELL=pcmanfm
- VERSION=1.2.0
+ VERSION=1.2.1
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${SOURCE}
-
SOURCE_HASH=sha512:933fd6b2566c03ee32f13a9552fd9458d7ccc2afbb355e4fbad2634b501538e7428480a37fe915fa357a4bc1b7224b7ee97b35d472cc8f4487975ff4c47602ea
+
SOURCE_HASH=sha512:931b89ed3ec9fc86bf91b0bd5ea1119e72948a9882029fd3ab21b9c1ba6df3e6361304fd10391eb59145debf932b87a9fecd826f77b59121ff59d38bc6aba0bb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
ENTERED=20070108
- SHORT="A fast and lightweight file manager developed with GTK+ 2."
+ SHORT="fast and lightweight file manager developed with GTK+"
cat << EOF
PCMan File Manager is a very fast and lightweight file manager which features
tabbed browsing.
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index a316a49..0ea92d1 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,3 +1,7 @@
+2014-07-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.1
+ * DEPENDS: handle gtk+2/3 dependency
+
2014-02-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0, gz -> xz

diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index ebcab41..0eab532 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -1,5 +1,6 @@
-depends openssl &&
-depends libx11 &&
+depends libx11 &&
+depends libxrandr &&
+depends SSL &&

if list_find $RDESKTOP_SOUND alsa; then
depends alsa-lib
diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index 5068cc7..177825c 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -1,10 +1,10 @@
SPELL=rdesktop
- VERSION=1.8.1
+ VERSION=1.8.2
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$VERSION/$SOURCE/download
-
SOURCE_HASH=sha512:31f13bf644ef16939a8c6c12709b89f59b0de276cc113c5e43ba505c5a352f515fdd1302c32f3095caca66796c9a15d574374391b4a67745fa505512499ed071
+
SOURCE_HASH=sha512:45b3e3220bcb2584cdfa3139c5b38775d55ab3c6c4cb6e46e4032965f5dc546682a733b5764760f20b7b6f40bb412ef0f67509f1344e69b342bbf9e9aca45bcf
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
LICENSE[0]=GPL3
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 05b0afd..9588711 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,12 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libxrandr
+
+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
+
2013-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing optional deps -- libgssglue, pcsc-lite

diff --git a/shell-term-fm/rxvt-unicode/BUILD
b/shell-term-fm/rxvt-unicode/BUILD
index 3da66b5..e76c3ad 100755
--- a/shell-term-fm/rxvt-unicode/BUILD
+++ b/shell-term-fm/rxvt-unicode/BUILD
@@ -1,2 +1,14 @@
-OPTS="$OPTS --enable-everything" &&
+OPTS="$OPTS --enable-mousewheel --enable-slipwheeling" &&
+OPTS="$OPTS $URXVT_256COLORS" &&
+OPTS="$OPTS $URXVT_UNICODE3" &&
+OPTS="$OPTS $URXVT_COMBINING" &&
+OPTS="$OPTS $URXVT_FONT_STYLES" &&
+OPTS="$OPTS $URXVT_FADING" &&
+OPTS="$OPTS $URXVT_ISO14755" &&
+OPTS="$OPTS $URXVT_FRILLS" &&
+OPTS="$OPTS $URXVT_KEEP_SCROLLING" &&
+OPTS="$OPTS $URXVT_SELECTION_SCROLLING" &&
+OPTS="$OPTS $URXVT_SMART_RESIZE" &&
+OPTS="$OPTS $URXVT_TEXT_BLINK" &&
+OPTS="$OPTS $URXVT_POINTER_BLANK" &&
default_build
diff --git a/shell-term-fm/rxvt-unicode/CONFIGURE
b/shell-term-fm/rxvt-unicode/CONFIGURE
new file mode 100755
index 0000000..5dd42ae
--- /dev/null
+++ b/shell-term-fm/rxvt-unicode/CONFIGURE
@@ -0,0 +1,60 @@
+config_query_option URXVT_256COLORS \
+ "Enable support for 256 colors?" \
+ y \
+ "--enable-256-color" \
+ "--disable-256-color" &&
+config_query_option URXVT_UNICODE3 \
+ "Use 21 instead of 16 bits to represent unicode
characters?" \
+ y \
+ "--enable-unicode3" \
+ "--disable-unicode3" &&
+config_query_option URXVT_COMBINING \
+ "enable composition of base and combining characters?" \
+ y \
+ "--enable-combining" \
+ "--disable-combining" &&
+config_query_option URXVT_FONT_STYLES \
+ "enable bold and italic font support?" \
+ y \
+ "--enable-font-styles" \
+ "--disable-font-styles" &&
+config_query_option URXVT_FADING \
+ "enable colors fading when off focus?" \
+ y \
+ "--enable-fading" \
+ "--disable-fading" &&
+config_query_option URXVT_ISO14755 \
+ "enable support for extended ISO 14755 modes (unicode
codepoint input methods)?" \
+ y \
+ "--enable-iso14755" \
+ "--disable-iso14755" &&
+config_query_option URXVT_FRILLS \
+ "enable support for rarely used features?" \
+ y \
+ "--enable-frills" \
+ "--disable-frills" &&
+config_query_option URXVT_KEEP_SCROLLING \
+ "enable continual scrolling on scrollbar arrow press" \
+ y \
+ "--enable-keepscrolling" \
+ "--disable-keepscrolling" &&
+config_query_option URXVT_SELECTION_SCROLLING \
+ "enable scrolling during selections?" \
+ y \
+ "--enable-selectionscrolling" \
+ "--disable-selectionscrolling" &&
+config_query_option URXVT_SMART_RESIZE \
+ "enable smart growth/shrink behaviour?" \
+ y \
+ "--enable-smart-resize" \
+ "--disable-smart-resize" &&
+config_query_option URXVT_TEXT_BLINK \
+ "enable blinking text?" \
+ y \
+ "--enable-text-blink" \
+ "--disable-text-blink" &&
+config_query_option URXVT_POINTER_BLANK \
+ "enable pointer blanking when typing or inactive?" \
+ y \
+ "--enable-pointer-blank" \
+ "--disable-pointer-blank"
diff --git a/shell-term-fm/rxvt-unicode/DEPENDS
b/shell-term-fm/rxvt-unicode/DEPENDS
index 07c451f..4996206 100755
--- a/shell-term-fm/rxvt-unicode/DEPENDS
+++ b/shell-term-fm/rxvt-unicode/DEPENDS
@@ -1,6 +1,7 @@
depends -sub CXX gcc &&
depends libx11 &&
depends libxrender &&
+depends xproto &&

optional_depends gdk-pixbuf2 \
"--enable-pixbuf" \
diff --git a/shell-term-fm/rxvt-unicode/DETAILS
b/shell-term-fm/rxvt-unicode/DETAILS
index 9894182..d16ebcd 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
SPELL=rxvt-unicode
- VERSION=9.19
-
SOURCE_HASH=sha512:357f2b9a299b816264e8cece3200338369399e4f760622daec1520d05c75e93d44e2dee3351c8e31765ab8f2218dbb9d239960ae8112e2f75d988785373d7f26
+ VERSION=9.20
+
SOURCE_HASH=sha512:39e1574f7b7034c07ab2e836bb77e0fb0536830df873cc54e6c7583be5e20d36dea3fe0fc889283f163530c77534a3a55de227ee0a8f03564d0f030e60461ff9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://dist.schmorp.de/$SPELL/$SOURCE
diff --git a/shell-term-fm/rxvt-unicode/HISTORY
b/shell-term-fm/rxvt-unicode/HISTORY
index 5e4255b..5d88669 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,13 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFIGURE: clarify what extended ISO 14755 modes means
+
+2014-06-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on xproto
+ * CONFIGURE, BUILD: make features configurable
+
+2014-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.20
+
2013-11-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 9.19
* PRE_BUILD, fix-tabber-perl-5.18-ext.diff: removed
diff --git a/shell-term-fm/screen/DETAILS b/shell-term-fm/screen/DETAILS
index 4247a4d..190786e 100755
--- a/shell-term-fm/screen/DETAILS
+++ b/shell-term-fm/screen/DETAILS
@@ -1,12 +1,12 @@
SPELL=screen
- VERSION=4.0.3
+ VERSION=4.2.1
PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/utilities/${SPELL}/${SOURCE}
SOURCE_URL[1]=ftp://ftp.sourcemage.sk/sources/${SOURCE}
SOURCE_URL[2]=$GNU_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338
+
SOURCE_HASH=sha512:30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710
WEB_SITE=http://www.gnu.org/software/screen
ENTERED=20010922
SECURITY_PATCH=1
diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY
index d8efa5d..c0d1e6a 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,3 +1,7 @@
+2014-08-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 4.2.1!
+ (now hopefully supporting TERM=rxvt-unicode-256color)
+
2008-08-22 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: prevented the link against libelf, it's not needed.
diff --git a/shell-term-fm/shared-mime-info/DETAILS
b/shell-term-fm/shared-mime-info/DETAILS
index dc5cb13..032bd6f 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
SPELL=shared-mime-info
- VERSION=1.2
-
SOURCE_HASH=sha512:25888c2500e21a9dfdb189e7f48edf409523e0c1566d1f5b0d61eaf4faa4bcb83eca5f56d6d2ab03e44d5d4a0cc4504a566b9c773c8a634c0798f7560fe83d4c
+ VERSION=1.3
+
SOURCE_HASH=sha512:ef74f71e877a9117ca796e0425ffdc0a47200b543c9989c9952d59d5a4c8ed9d086c1f5b73af343b7e59d8080d1813b5c2fe2896fe619f753af315460136fb5d
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY
b/shell-term-fm/shared-mime-info/HISTORY
index ffa08fa..b168065 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,6 @@
+2014-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3
+
2013-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2

diff --git a/shell-term-fm/spacefm/DEPENDS b/shell-term-fm/spacefm/DEPENDS
index 3a43084..79fb84c 100755
--- a/shell-term-fm/spacefm/DEPENDS
+++ b/shell-term-fm/spacefm/DEPENDS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/FUNCTIONS" &&

depends bash &&
-depends udev &&
+depends UDEV &&

depends $SPACEFM_GTK "--with-${SPACEFM_GTK/gtk+/gtk}" &&

diff --git a/shell-term-fm/spacefm/HISTORY b/shell-term-fm/spacefm/HISTORY
index ee3a59b..eb3fa17 100644
--- a/shell-term-fm/spacefm/HISTORY
+++ b/shell-term-fm/spacefm/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on UDEV instead of udev
+
2014-04-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.4

diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 328b5a4..632936e 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -1,9 +1,9 @@
SPELL=st
- VERSION=0.4.1
+ VERSION=0.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dl.suckless.org/st/$SOURCE
-
SOURCE_HASH=sha512:06a75cdf7d22c64c1331276b0f58577c3c42c1c2edcb41a33a3c37f7b65bd284a3b006dd94e0dc081f42f028dd18b60f278e8b3f33a1cf6611b1398bff80df7d
+
SOURCE_HASH=sha512:fb5d3b6dfb56f35c60a83164d0da2aef67d9fc23b81fdd7c26b9a618c92524a601db5fc4149a3a5054ca3306ecc80e104fa629ecb1516c047a726012237c83d5
WEB_SITE=http://st.suckless.org/
ENTERED=20130208
LICENSE[0]=MIT
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index 2b119a3..4255bf0 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,10 @@
+2014-07-12 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/st-0.5-hidexcursor.diff:
+ Add patch to hide X cursor when typing.
+
+2014-07-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.5
+
2013-11-21 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Add missing dependencies

diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index c59a232..886a469 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -1,3 +1,10 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit "s:/local::" config.mk
+sedit "s:/local::" config.mk &&
+
+for i in "$SPELL_DIRECTORY"/patches/*; do
+ desc="$(sed -nr '/^Subject: /!d;s@[^ ]* *(\[[A-Za-z0-9 ]*\] *)*@@;p;q'
"$i")" &&
+ if query "Apply ${i##*/} ($desc)?" n; then
+ patch -sp1 -i "$i"
+ fi
+done
diff --git a/shell-term-fm/st/patches/st-0.5-hidexcursor.diff
b/shell-term-fm/st/patches/st-0.5-hidexcursor.diff
new file mode 100644
index 0000000..3bbe602
--- /dev/null
+++ b/shell-term-fm/st/patches/st-0.5-hidexcursor.diff
@@ -0,0 +1,96 @@
+From d081963fc75e1656f5ee4305947384a00b9e5f39 Mon Sep 17 00:00:00 2001
+From: Colona <colona AT ycc.fr>
+Date: Mon, 9 Jun 2014 00:55:54 -0700
+Subject: [PATCH] Hide X cursor when typing.
+
+Hide the X cursor when typing in the terminal. The cursor is displayed again
+when the mouse is moved.
+---
+ st.c | 33 +++++++++++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 6 deletions(-)
+
+diff --git a/st.c b/st.c
+index 392f12d..52deb92 100644
+--- a/st.c
++++ b/st.c
+@@ -248,6 +248,8 @@ typedef struct {
+ Draw draw;
+ Visual *vis;
+ XSetWindowAttributes attrs;
++ Cursor cursor, bcursor; /* visible and blank cursors */
++ bool cursorstate; /* is cursor currently visible */
+ int scr;
+ bool isfixed; /* is fixed geometry? */
+ int fx, fy, fw, fh; /* fixed geometry */
+@@ -1112,6 +1114,13 @@ void
+ bmotion(XEvent *e) {
+ int oldey, oldex, oldsby, oldsey;
+
++ if(!xw.cursorstate) {
++ XDefineCursor(xw.dpy, xw.win, xw.cursor);
++ xw.cursorstate = true;
++ if(!IS_SET(MODE_MOUSEMANY))
++ xsetpointermotion(0);
++ }
++
+ if(IS_SET(MODE_MOUSE)) {
+ mousereport(e);
+ return;
+@@ -2984,10 +2993,12 @@ xzoom(const Arg *arg) {
+ void
+ xinit(void) {
+ XGCValues gcvalues;
+- Cursor cursor;
+ Window parent;
+ int sw, sh;
+ pid_t thispid = getpid();
++ XColor xcwhite = {.red = 0xffff, .green = 0xffff, .blue = 0xffff};
++ XColor xcblack = {.red = 0x0000, .green = 0x0000, .blue = 0x0000};
++ Pixmap blankpm;
+
+ if(!(xw.dpy = XOpenDisplay(NULL)))
+ die("Can't open display\n");
+@@ -3071,11 +3082,13 @@ xinit(void) {
+ die("XCreateIC failed. Could not obtain input method.\n");
+
+ /* white cursor, black outline */
+- cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+- XDefineCursor(xw.dpy, xw.win, cursor);
+- XRecolorCursor(xw.dpy, cursor,
+- &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
+- &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
++ xw.cursor = XCreateFontCursor(xw.dpy, XC_xterm);
++ XDefineCursor(xw.dpy, xw.win, xw.cursor);
++ XRecolorCursor(xw.dpy, xw.cursor, &xcwhite, &xcblack);
++ xw.cursorstate = true;
++ blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
++ xw.bcursor = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
++
&xcblack, &xcblack, 0, 0);
+
+ xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+ xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+@@ -3537,6 +3550,8 @@ unmap(XEvent *ev) {
+
+ void
+ xsetpointermotion(int set) {
++ if(!set && !xw.cursorstate)
++ return;
+ MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
+ XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
+ }
+@@ -3630,6 +3645,12 @@ kpress(XEvent *ev) {
+ Status status;
+ Shortcut *bp;
+
++ if(xw.cursorstate) {
++ XDefineCursor(xw.dpy, xw.win, xw.bcursor);
++ xsetpointermotion(1);
++ xw.cursorstate = false;
++ }
++
+ if(IS_SET(MODE_KBDLOCK))
+ return;
+
+--
+2.0.0
+
diff --git a/shell-term-fm/tilda/DETAILS b/shell-term-fm/tilda/DETAILS
index fa3ca01..ec0b302 100755
--- a/shell-term-fm/tilda/DETAILS
+++ b/shell-term-fm/tilda/DETAILS
@@ -1,8 +1,8 @@
SPELL=tilda
- VERSION=1.1.11
+ VERSION=1.1.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[1]=https://github.com/lanoxx/$SPELL/archive/$SOURCE
-
SOURCE_HASH=sha512:c8334e96aa4d1c90a472a2a0b4d514c8b653700d7d99fd275c770eb2424b519b8065b154e0669be292927fcebea46e1bec132d0234d72e99e40b7df4516a1951
+
SOURCE_HASH=sha512:433bbda26aa599cf8d2e247bc36126a7bc6e77820f706c852210698becfcfa01b78b2d44b852eee79ae5f62ea0e422732a8415e9cfb4f6ddfc96d21363a1881d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$SPELL-$VERSION"
WEB_SITE=https://github.com/lanoxx/tilda/
ENTERED=20050818
diff --git a/shell-term-fm/tilda/HISTORY b/shell-term-fm/tilda/HISTORY
index aba0f7c..0d3bc42 100644
--- a/shell-term-fm/tilda/HISTORY
+++ b/shell-term-fm/tilda/HISTORY
@@ -1,3 +1,10 @@
+2014-09-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.13
+ * focus.patch: dropped, fixed by upstream
+
+2014-06-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.12
+
2014-01-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.11; new website/source url/source
check
* DEPENDS: added missing dependencies
diff --git a/shell-term-fm/tilda/PRE_BUILD b/shell-term-fm/tilda/PRE_BUILD
index b43b23d..c45840a 100755
--- a/shell-term-fm/tilda/PRE_BUILD
+++ b/shell-term-fm/tilda/PRE_BUILD
@@ -1,9 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# fix from issue #18
-patch -p0 < "$SPELL_DIRECTORY/focus.patch" &&
-
if [[ $TILDA_CUSTOM_CURSOR == y ]]; then
patch -p0 < "$SPELL_DIRECTORY/cursor.patch"
fi &&
diff --git a/shell-term-fm/tilda/focus.patch b/shell-term-fm/tilda/focus.patch
deleted file mode 100644
index f0ea6ef..0000000
--- a/shell-term-fm/tilda/focus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tilda_window.c.orig 2013-12-13 19:58:24.000000000 +0400
-+++ src/tilda_window.c 2014-01-29 17:59:07.000000000 +0400
-@@ -316,7 +316,7 @@
-
- tilda_window *tw = TILDA_WINDOW(data);
- stop_auto_hide_tick(tw);
-- if (tw->disable_auto_hide == FALSE)
-+ if (tw->disable_auto_hide == TRUE)
- tilda_window_set_active(tw);
- }
-
diff --git a/shell-term-fm/tmux/DETAILS b/shell-term-fm/tmux/DETAILS
index 84bc7c4..f2ad644 100755
--- a/shell-term-fm/tmux/DETAILS
+++ b/shell-term-fm/tmux/DETAILS
@@ -1,9 +1,9 @@
SPELL=tmux
- VERSION=1.8
+ VERSION=1.9a
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#
SOURCE_HASH=sha512:d2002858ab6c974e6a6c7dc31db20cd6271170cba9e7314216dfcea6670ae09c5112a4313b77bd21d14a906c89723fc9f6c20cea528e7320e2857ec4d71c725b
+
SOURCE_HASH=sha512:842984638dc1f7364c03393187379598f35679d535d911d5df4016944d6032e61a1bf840d7d339c6e99b30c55581d470acca85ab6ee5799b8927d18c0e9a91df
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://tmux.sourceforge.net/
LICENSE[0]=BSD
diff --git a/shell-term-fm/tmux/HISTORY b/shell-term-fm/tmux/HISTORY
index a9c39a1..0bda711 100644
--- a/shell-term-fm/tmux/HISTORY
+++ b/shell-term-fm/tmux/HISTORY
@@ -1,3 +1,6 @@
+2014-07-27 Justin Boffemmyer <flux AT sourcemage.org>
+ * DETAILS: updated to 1.9a
+
2013-07-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.8

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/tty-clock/DETAILS b/shell-term-fm/tty-clock/DETAILS
index d973920..2c41141 100755
--- a/shell-term-fm/tty-clock/DETAILS
+++ b/shell-term-fm/tty-clock/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=tty-clock
-if [[ ${TTY_CLOCK_AUTOUPDATE} == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=scm
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-scm.tar.bz2"
SOURCE_URL[0]=git://github.com/xorg62/${SPELL}.git:${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
diff --git a/shell-term-fm/tty-clock/HISTORY b/shell-term-fm/tty-clock/HISTORY
index 5293fad..3728a87 100644
--- a/shell-term-fm/tty-clock/HISTORY
+++ b/shell-term-fm/tty-clock/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2010-03-07 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS, DETAILS, CONFIGURE, BUILD, INSTALL: spell created

diff --git a/shell-term-fm/vifm/BUILD b/shell-term-fm/vifm/BUILD
new file mode 100755
index 0000000..5e4b78e
--- /dev/null
+++ b/shell-term-fm/vifm/BUILD
@@ -0,0 +1,3 @@
+OPTS="$VIFM_OPTS $OPTS" &&
+
+default_build
diff --git a/shell-term-fm/vifm/CONFIGURE b/shell-term-fm/vifm/CONFIGURE
new file mode 100755
index 0000000..ad2f14f
--- /dev/null
+++ b/shell-term-fm/vifm/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option VIFM_OPTS "Enable remote command sending (insecure)?" n \
+ "--enable-remote-cmds" \
+ "--disable-remote-cmds"
diff --git a/shell-term-fm/vifm/DETAILS b/shell-term-fm/vifm/DETAILS
index e39b807..712f1ea 100755
--- a/shell-term-fm/vifm/DETAILS
+++ b/shell-term-fm/vifm/DETAILS
@@ -1,8 +1,8 @@
SPELL=vifm
- VERSION=0.7.6
+ VERSION=0.7.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:8a280d6c4cdef27b34c0865be4a26c5cb98c433a1b01418af230649e6868091fd987c5d75a77b8137fcb44b5c6178e5894f4ccc107d7c8d173146f9b605a45b6
+
SOURCE_HASH=sha512:a95ee365a287c06515c5541ce67e609dacb8b8640f0fec5b33bd3794a8f8445fd8052e5bbd42bda0d23f9c5b5e5591978412bcea0c7ceb6ab403fa271e219455
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://vifm.sourceforge.net/
LICENSE[0]=GPL
diff --git a/shell-term-fm/vifm/HISTORY b/shell-term-fm/vifm/HISTORY
index b80d2dc..41537cc 100644
--- a/shell-term-fm/vifm/HISTORY
+++ b/shell-term-fm/vifm/HISTORY
@@ -1,3 +1,7 @@
+2014-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ * BUILD, CONFIGURE: added, for additional options
+
2013-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.6

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/shell-term-fm/zsh/BUILD b/shell-term-fm/zsh/BUILD
index b60780b..771e0ff 100755
--- a/shell-term-fm/zsh/BUILD
+++ b/shell-term-fm/zsh/BUILD
@@ -1,3 +1,4 @@
OPTS="$ZSH_OPTS --bindir=/bin $OPTS" &&
make_single &&
-default_build
+default_build &&
+make_normal
diff --git a/shell-term-fm/zsh/DEPENDS b/shell-term-fm/zsh/DEPENDS
index 3af93a7..d467ea1 100755
--- a/shell-term-fm/zsh/DEPENDS
+++ b/shell-term-fm/zsh/DEPENDS
@@ -2,4 +2,6 @@ optional_depends pcre "--enable-pcre" "--disable-pcre" \
"enable the search for the pcre library" &&
optional_depends libcap "--enable-cap" "--disable-cap" \
"enable search for linux capabilites" &&
+optional_depends gdbm "--enable-gdbm" "--disable-gdbm" \
+ "enable gdbm database bindings" &&
depends ncurses
diff --git a/shell-term-fm/zsh/HISTORY b/shell-term-fm/zsh/HISTORY
index f22f6c1..92f098c 100644
--- a/shell-term-fm/zsh/HISTORY
+++ b/shell-term-fm/zsh/HISTORY
@@ -1,3 +1,7 @@
+2014-05-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add optional dependency on gdbm
+ * BUILD: make_normal after default_build
+
2014-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.0.5

diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index 844a158..c198950 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -7,7 +7,7 @@ depends dialog &&
depends diffutils &&
depends file &&
depends findutils &&
-depends gawk &&
+depends AWK &&
depends gcc &&
depends glibc &&
depends gnupg &&
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index c97042e..023f802 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=castfs
if [[ $CASTFS_BRANCH == scm ]]
then
- if [[ $CASTFS_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
SOURCE_URL=git://repo.or.cz/castfs.git
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 45c74b4..7f8d0cc 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-11-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL+=1; don't do useless doc'ing

diff --git a/smgl/guru-tools/DETAILS b/smgl/guru-tools/DETAILS
index 05ced3f..f2f2c72 100755
--- a/smgl/guru-tools/DETAILS
+++ b/smgl/guru-tools/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=guru-tools
if [[ "$GURU_TOOLS_BRANCH" = scm ]]; then
- if [[ "$GURU_TOOLS_AUTOUPDATE" = y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-scm.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-scm
FORCE_DOWNLOAD=on
diff --git a/smgl/guru-tools/HISTORY b/smgl/guru-tools/HISTORY
index 529fddc..558b04b 100644
--- a/smgl/guru-tools/HISTORY
+++ b/smgl/guru-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Bor Kraljič <pyrobor AT ver.si>
* PREPARE, DETAILS: added git version as scm branch
* DEPENDS: depend on git if using git scm branch
diff --git a/smgl/iana-etc/DEPENDS b/smgl/iana-etc/DEPENDS
index 1cc2b62..00fc96c 100755
--- a/smgl/iana-etc/DEPENDS
+++ b/smgl/iana-etc/DEPENDS
@@ -1,3 +1,3 @@
-depends gawk &&
+depends AWK &&
depends gnupg &&
depends smgl-fhs
diff --git a/smgl/quill/DETAILS b/smgl/quill/DETAILS
index 0b0145a..eddd1e5 100755
--- a/smgl/quill/DETAILS
+++ b/smgl/quill/DETAILS
@@ -1,12 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=quill
if [[ $QUILL_BRANCH == scm ]]
then
- if [[ $QUILL_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
SOURCE_URL=git://scm.sourcemage.org/smgl/misc/${SPELL}.git:${SPELL}-git
diff --git a/smgl/quill/HISTORY b/smgl/quill/HISTORY
index 6e720d2..ca3c8d7 100644
--- a/smgl/quill/HISTORY
+++ b/smgl/quill/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-05-22 Ismael Luceno <ismael AT sourcemage.org>
* INSTALL: Add support for make-based install

diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS
index 1890d64..3d9fa61 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -1,5 +1,6 @@
SPELL=simpleinit-msb
VERSION=1.3
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 4caf329..c643641 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,9 @@
+2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * simpleinit-poweroff.patch: added, to fix critical segfault on
invoking
+ from Xen (as a guest HVM DomU)
+
2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply simpleinit-ftbfs-define-enoictlcmd.patch
* simpleinit-ftbfs-define-enoictlcmd.patch: Define ENOIOCTLCMD for
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 0855fbe..ef5f755 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -7,6 +7,7 @@ patch -p0 < "$SPELL_DIRECTORY/simpleinit-msb-crypt.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-selinux.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-poweroff.patch" &&
message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" &&

diff --git a/smgl/simpleinit-msb/simpleinit-poweroff.patch
b/smgl/simpleinit-msb/simpleinit-poweroff.patch
new file mode 100644
index 0000000..315d325
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-poweroff.patch
@@ -0,0 +1,15 @@
+--- login-utils/shutdown.c.orig 2014-06-25 15:09:23.000000000 +0400
++++ login-utils/shutdown.c 2014-06-25 15:11:12.534462171 +0400
+@@ -210,10 +210,10 @@
+ prog = argv[0];
+ if((ptr = strrchr(argv[0], '/'))) prog = ++ptr;
+
+- /* All names (halt, reboot, fasthalt, fastboot, shutdown)
++ /* All names (halt, poweroff, reboot, fasthalt, fastboot, shutdown)
+ refer to the same program with the same options,
+ only the defaults differ. */
+- if(!strcmp("halt", prog)) {
++ if(!strcmp("halt", prog) || !strcmp("poweroff", prog)) {
+ opt_reboot = 0;
+ opt_quiet = 1;
+ opt_fast = 0;
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 6cf9afc..f0cdc08 100755
--- a/utils/acpid2/DETAILS
+++ b/utils/acpid2/DETAILS
@@ -1,7 +1,7 @@
SPELL=acpid2
SPELLX=acpid
- VERSION=2.0.20
-
SOURCE_HASH=sha512:f1c1a91cd5db45c1da6b3f698671bb55b629eb149e09a680cc061a7cf921499f8486ce471d4789dd98f548247ecf1afffc0127fdfb120b3d3adfe0cfa35d172b
+ 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 4447590..8643282 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,3 +1,6 @@
+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/anyrename/DEPENDS b/utils/anyrename/DEPENDS
index d76809b..15708f5 100755
--- a/utils/anyrename/DEPENDS
+++ b/utils/anyrename/DEPENDS
@@ -28,7 +28,7 @@ optional_depends imagemagick \
"" \
"" \
"for renaming images (png, jpg...)" &&
-optional_depends giflib \
+optional_depends GIFLIB \
"" \
"" \
"for renaming gif files" &&
diff --git a/utils/anyrename/HISTORY b/utils/anyrename/HISTORY
index 62ec07f..e81eb75 100644
--- a/utils/anyrename/HISTORY
+++ b/utils/anyrename/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2008-07-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: depends on giflib, provider deprecated

diff --git a/utils/bibletime4/DETAILS b/utils/bibletime4/DETAILS
index 568028d..29fe0b8 100755
--- a/utils/bibletime4/DETAILS
+++ b/utils/bibletime4/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=bibletime4
SPELLX=bibletime
if [[ $BIBLETIME4_BRANCH == scm ]]; then
- if [[ $BIBLETIME4_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=git://gitorious.org/$SPELLX/$SPELLX.git
SOURCE_IGNORE=volatile
diff --git a/utils/bibletime4/HISTORY b/utils/bibletime4/HISTORY
index 05ecbeb..5102611 100644
--- a/utils/bibletime4/HISTORY
+++ b/utils/bibletime4/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-10-13 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS, PREPARE: release version to 2.9.2, add git version

diff --git a/utils/binwalk/BUILD b/utils/binwalk/BUILD
deleted file mode 100755
index ed9b1c7..0000000
--- a/utils/binwalk/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd src &&
-default_build
diff --git a/utils/binwalk/DETAILS b/utils/binwalk/DETAILS
index e26a681..981089d 100755
--- a/utils/binwalk/DETAILS
+++ b/utils/binwalk/DETAILS
@@ -1,8 +1,8 @@
SPELL=binwalk
- VERSION=0.4.5
+ VERSION=2.0.1
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://binwalk.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:1670ca6c00857b9e7af0d58fcf5bb2b85bbfc79c605ff2910a78f29d246493608ccd74e35e078fe88cd50778dbf1fb4e98c5eabcfc9e4300265e3003079823b7
+ SOURCE_URL[0]=https://github.com/devttys0/$SPELL/archive/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:de223f61a0a212469c21b8e36d02cadc83f1cdb96a0f6114490d15d8dc12c93a86b46ef74379acb96b32b305e75ca66e940d7a18a8dc3b5036ebe8946dcca0f3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://code.google.com/p/binwalk/
LICENSE[0]=MIT
diff --git a/utils/binwalk/HISTORY b/utils/binwalk/HISTORY
index 6ab4e28..58168eb 100644
--- a/utils/binwalk/HISTORY
+++ b/utils/binwalk/HISTORY
@@ -1,2 +1,7 @@
+2014-09-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.0.1
+ * BUILD: Removed, not needed anymore
+
2012-12-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD: spell created, version 0.4.5
diff --git a/utils/chrpath/DETAILS b/utils/chrpath/DETAILS
index 9c54484..1ce714a 100755
--- a/utils/chrpath/DETAILS
+++ b/utils/chrpath/DETAILS
@@ -1,8 +1,8 @@
SPELL=chrpath
- VERSION=0.14
+ VERSION=0.16
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3648/${SOURCE}
-
SOURCE_HASH=sha512:ef37972c2af58238d8dcaa0b9558acf67bae751fe2f2aedbea9079383d762902c7e051d08a9f14623643fcf598fab7e019762a1fb3781147bccce5971754a816
+
SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/3979/${SOURCE}
+
SOURCE_HASH=sha512:aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://directory.fsf.org/wiki/Chrpath";
LICENSE[0]=GPL
diff --git a/utils/chrpath/HISTORY b/utils/chrpath/HISTORY
index 443ec88..3f957ab 100644
--- a/utils/chrpath/HISTORY
+++ b/utils/chrpath/HISTORY
@@ -1,3 +1,6 @@
+2014-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.16
+
2012-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: spell created

diff --git a/utils/consolekit/DEPENDS b/utils/consolekit/DEPENDS
index cae0407..1a3f8d0 100755
--- a/utils/consolekit/DEPENDS
+++ b/utils/consolekit/DEPENDS
@@ -2,7 +2,7 @@ depends dbus-glib &&
depends libx11 &&
depends pkgconfig &&
optional_depends policykit '' '' 'PolicyKit support' &&
-optional_depends linux-pam '' '' 'PAM support' &&
+optional_depends linux-pam '--enable-pam-module' '' 'PAM support' &&

depends dbus &&
depends glib2 &&
diff --git a/utils/consolekit/DETAILS b/utils/consolekit/DETAILS
index 7064c27..e330f2d 100755
--- a/utils/consolekit/DETAILS
+++ b/utils/consolekit/DETAILS
@@ -1,9 +1,9 @@
SPELL=consolekit
SPELLX=ConsoleKit
- VERSION=0.4.5
+ VERSION=0.4.6
+
SOURCE_HASH=sha512:54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d
PATCHLEVEL=1
-
SOURCE_HASH=sha512:9f969aeb2199810f73cdf111c7af38231d09b1c04d71209b2fa9c3ab7d39e3ca018b6aa0088abf1fafbf19550d2f844eeee8b3e298970959af1c88a7b366be80
- SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELLX/dist/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.freedesktop.org/wiki/Software/ConsoleKit
diff --git a/utils/consolekit/HISTORY b/utils/consolekit/HISTORY
index d55cd81..f6f1840 100644
--- a/utils/consolekit/HISTORY
+++ b/utils/consolekit/HISTORY
@@ -1,3 +1,7 @@
+2014-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.6
+ * DEPENDS: --enable-pam-module
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: PATCH_LEVEL -> PATCHLEVEL

diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 461c07a..2d05eee 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=coreutils
- VERSION=8.22
+ VERSION=8.23
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 949ad0e..d2d42dd 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,6 @@
+2014-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.23
+
2013-12-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8.22

diff --git a/utils/crosstool-ng/DETAILS b/utils/crosstool-ng/DETAILS
index 0abb2e9..5f31f3c 100755
--- a/utils/crosstool-ng/DETAILS
+++ b/utils/crosstool-ng/DETAILS
@@ -1,8 +1,8 @@
SPELL=crosstool-ng
- VERSION=1.13.2
+ VERSION=1.20.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://crosstool-ng.org/download/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:86ac9f036a6cff4f0f3d5bb49d4a4b917d4d8c38a6bdabee392e8efc1ccefd779587bb943f125a671f0f0e358a97f357cf955c01513fd576db7ecbc0438ba2d6
+
SOURCE_HASH=sha512:42aa93fbdfb2daa9055d7aeba7539a59960caad9d674fb3ca8ed74353da75a49a799896777cf9511a54b4d47de0cb5d206fd7c5200f19067f9c8090a46b39653
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://crosstool-ng.org";
LICENSE[0]=GPL
diff --git a/utils/crosstool-ng/HISTORY b/utils/crosstool-ng/HISTORY
index 332b014..f9d7952 100644
--- a/utils/crosstool-ng/HISTORY
+++ b/utils/crosstool-ng/HISTORY
@@ -1,3 +1,6 @@
+2014-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.20.0
+
2012-01-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.13.2

diff --git a/utils/dbus-c++/DEPENDS b/utils/dbus-c++/DEPENDS
index 23a9286..663c953 100755
--- a/utils/dbus-c++/DEPENDS
+++ b/utils/dbus-c++/DEPENDS
@@ -1,3 +1,7 @@
+# Sorcery tells me that I please install git ...
+# why doesn't it just do it?
+# I need to discuss with SMGL folks.
+depends git &&
depends -sub CXX gcc &&
depends dbus &&
depends expat &&
@@ -7,6 +11,8 @@ optional_depends glib2 \
"--disable-glib" \
"Enable glib support?" &&

+# Not optional anymore, I presume? The configure bails out without.
+#depends ecore &&
optional_depends ecore \
"--enable-ecore" \
"--disable-ecore" \
diff --git a/utils/dbus-c++/DETAILS b/utils/dbus-c++/DETAILS
index 482c3e3..dee703e 100755
--- a/utils/dbus-c++/DETAILS
+++ b/utils/dbus-c++/DETAILS
@@ -1,13 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dbus-c++
- if [[ $DBUS_CPP_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- else
- VERSION=git
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- fi
SOURCE_URL[0]=git://gitorious.org/dbus-cplusplus/mainline.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index 3bc8335..e687104 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,9 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * unistd.patch, PRE_BUILD: gimme standard headers, proper bootstrap
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch and get_scm_version
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: apply configure.ac patch

diff --git a/utils/dbus-c++/PREPARE b/utils/dbus-c++/PREPARE
index 10728e7..86a5079 100755
--- a/utils/dbus-c++/PREPARE
+++ b/utils/dbus-c++/PREPARE
@@ -1,2 +1,2 @@
-config_query DBUS_CPP_AUTOUPDATE "Automatically update on every system
update?" n
-
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD
index 5a39be9..74f9121 100755
--- a/utils/dbus-c++/PRE_BUILD
+++ b/utils/dbus-c++/PRE_BUILD
@@ -3,7 +3,8 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

patch -p1 < $SPELL_DIRECTORY/configure.patch &&
+patch -p1 < $SPELL_DIRECTORY/unistd.patch &&

-NOCONFIGURE=Y ./autogen.sh
+./bootstrap


diff --git a/utils/dbus-c++/unistd.patch b/utils/dbus-c++/unistd.patch
new file mode 100644
index 0000000..23026c0
--- /dev/null
+++ b/utils/dbus-c++/unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp
+index 0cc65c3..5776971 100644
+--- a/src/eventloop-integration.cpp
++++ b/src/eventloop-integration.cpp
+@@ -38,6 +38,7 @@
+ #include <cassert>
+ #include <sys/poll.h>
+ #include <fcntl.h>
++#include <unistd.h>
+
+ using namespace DBus;
+ using namespace std;
diff --git a/utils/dbus-mono/DETAILS b/utils/dbus-mono/DETAILS
index 27559db..d063d48 100755
--- a/utils/dbus-mono/DETAILS
+++ b/utils/dbus-mono/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dbus-mono
-if [[ "$DBUS_MONO_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
-else
- VERSION=git
-fi
SOURCE=${SPELL}-git.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-git
SOURCE_URL=git://anongit.freedesktop.org/git/dbus/dbus-mono:dbus-mono
diff --git a/utils/dbus-mono/HISTORY b/utils/dbus-mono/HISTORY
index 8501a3a..f870321 100644
--- a/utils/dbus-mono/HISTORY
+++ b/utils/dbus-mono/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2007-03-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: beautified

diff --git a/utils/dbus-mono/PREPARE b/utils/dbus-mono/PREPARE
index fa7d4a4..86a5079 100755
--- a/utils/dbus-mono/PREPARE
+++ b/utils/dbus-mono/PREPARE
@@ -1 +1,2 @@
-config_query DBUS_MONO_AUTOUPDATE "Autoupdate git repository on every cast?"
n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 0582a27..4c20b14 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,7 +1,7 @@
SPELL=dbus
- VERSION=1.8.0
-
SOURCE_HASH=sha512:39b1c294abe25e80d741a294b67a9691337cc71f69f8db03e4e6588512a94de2b772b74ae5cb35fa91da812293f0cf392cb51823ebe3c21f7f9ea99287d0655f
- SECURITY_PATCH=9
+ VERSION=1.8.8
+
SOURCE_HASH=sha512:99e7e05347666e95f3ccaf3f19500b59a5e509cdb9489c11f47ed4f139d3bc8e21adcf48cbb5c4f0de1661e831d60634eb7b6b76cc080d32091b63c732ebe391
+ SECURITY_PATCH=12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 7cf11b4..0892caf 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,17 @@
+2014-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.8
+ SECURITY++, fixes CVE-2014-3635, CVE-2014-3636, CVE-2014-3637,
CVE-2014-3638, CVE-2014-3639
+
+2014-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.6, SECURITY_PATCH=11
+
+2014-06-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.4
+ SECURITY++, fixes CVE-2014-3477
+
+2014-05-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.2
+
2014-01-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.0

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/desktop-file-utils/DETAILS
b/utils/desktop-file-utils/DETAILS
index af4eb07..416f996 100755
--- a/utils/desktop-file-utils/DETAILS
+++ b/utils/desktop-file-utils/DETAILS
@@ -1,9 +1,9 @@
SPELL=desktop-file-utils
- VERSION=0.21
+ VERSION=0.22
+
SOURCE_HASH=sha512:26c1f0da44e4d3fc286640084ad1fad0595fc94edb5d2edd2a4d8cbed0aea4e409aa1a610cbba372f8e540188b62aed764fc7fdecddefbcfeeaedd1d19e3d20a
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
-
SOURCE_HASH=sha512:c7372d820e996eef72e85c7190c7f7cce61a3e08ebc348822013d1b28971db294242ce108d8f5e8e6c7539f9044619511d2bba0459a319bddbe5e5cf5d8665aa
WEB_SITE=http://www.freedesktop.org/
ENTERED=20031028
LICENSE=GPL
diff --git a/utils/desktop-file-utils/HISTORY
b/utils/desktop-file-utils/HISTORY
index f01d4ee..61e42eb 100644
--- a/utils/desktop-file-utils/HISTORY
+++ b/utils/desktop-file-utils/HISTORY
@@ -1,3 +1,6 @@
+204-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.22
+
2013-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.21

diff --git a/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig
b/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig
deleted file mode 100644
index 3fa3597..0000000
Binary files a/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig
and /dev/null differ
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/direvent/DETAILS b/utils/direvent/DETAILS
new file mode 100755
index 0000000..cd4fa52
--- /dev/null
+++ b/utils/direvent/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=direvent
+ VERSION=5.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
+ SOURCE_GPG=gnu.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=http://www.gnu.org/software/direvent/
+ ENTERED=20140907
+ LICENSE[0]=GPL
+ SHORT="directory event monitoring daemon"
+cat << EOF
+GNU Direvent monitors events in the file system directories. For each event
+that occurs in a set of pre-configured directories, the program calls
+an external program associated with it, supplying it with the information
about
+the event and the location within the file system where it occured.
+EOF
diff --git a/utils/direvent/HISTORY b/utils/direvent/HISTORY
new file mode 100644
index 0000000..329798f
--- /dev/null
+++ b/utils/direvent/HISTORY
@@ -0,0 +1,2 @@
+2014-09-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: spell created, version 5.0
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index d135deb..b8e6709 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,6 @@
SPELL=file
- VERSION=5.16
-
SOURCE_HASH=sha512:21c5747bc6973697b7ca2ec5613b3b2f321ad1b6b7c6258a7c302509b7ff73436ebed8e5508fd68fbd49448feefe6a5431a646ae807056aea52cbb22836e3a9b
+ VERSION=5.19
+
SOURCE_HASH=sha512:f897454f731b013634f38c02c927d7fb5d0660d5b1a81b7bf614da244558dd64ae44ab35ffc6a5e634a7f670ee287c0e87c70e44266c3123e0d1b73fa303c6ed
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 4c29d8b..c8a3296 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,9 @@
+2014-08-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.19
+
+2014-03-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.18
+
2013-12-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.16

diff --git a/utils/flashrom/DETAILS b/utils/flashrom/DETAILS
index be61bfd..3ca8d43 100755
--- a/utils/flashrom/DETAILS
+++ b/utils/flashrom/DETAILS
@@ -1,21 +1,17 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=flashrom
if [[ ${FLASHROM_BRANCH} == scm ]]
then
- if [[ $FLASHROM_AUTOUPDATE = y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2
SOURCE_URL[0]=svn://coreboot.org/flashrom/trunk:${SOURCE%.tar.bz2}
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
- VERSION=0.9.5.2
+ VERSION=0.9.7
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://download.flashrom.org/releases/$SOURCE
-
SOURCE_HASH=sha512:cfbf00302fb804832d5bf63621b0fa2eb548981c2a208e0bb55a1fd04248744314028dc353dc7ad1b2f66480617683a265f47af15141d458ae442a83174b9bb0
+
SOURCE_HASH=sha512:a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e
fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.bz2}
WEB_SITE=http://flashrom.org/Flashrom
diff --git a/utils/flashrom/HISTORY b/utils/flashrom/HISTORY
index e725e99..07044fd 100644
--- a/utils/flashrom/HISTORY
+++ b/utils/flashrom/HISTORY
@@ -1,3 +1,9 @@
+2014-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.7
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-05-12 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.9.5.2
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/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index bf1f6d1..324bf26 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -1,21 +1,18 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=gnuplot
if [[ $GNUPLOT_BRANCH == scm ]]; then
- if [[ $GNUPLOT_AUTOUPDATE == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.6.3
+ VERSION=4.6.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:8bb7af550c0847e65e041bd5bb6dc8cd3cee1e43a5306a7f9af0b5c82067bbe24a7f19c93914c88e4f08f2eee509773964e574e415710bbf99501e0cd3dad7e7
+
SOURCE_HASH=sha512:5a9c55d664105242aaf6356e707094a7dd5a80ba8d836bc7b3ce8836bcf5d2a57174d38220ea9efc58fa04f3c5f7d680ca5023482cff1a62b93549ff0530c47d
fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index a79dd19..312bb80 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,10 @@
+2014-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.6.5
+ * PRE_BUILD, gnuplot-4.6.2-texinfo-5.patch: remove obsolete patch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-08-22 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: fix for CVS branch

diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 6bbc086..4e9ad8f 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -3,9 +3,6 @@ cd "$SOURCE_DIRECTORY" &&
# Fix build that thinks we are cross-compiling.
# Hopefully fixed in gnuplot 4.7 .
patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
-if [[ ! $GNUPLOT_BRANCH == scm ]]; then
- patch -p1 < "$SPELL_DIRECTORY/gnuplot-4.6.2-texinfo-5.patch"
-fi &&

if [[ $GNUPLOT_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
diff --git a/utils/gnuplot/gnuplot-4.6.2-texinfo-5.patch
b/utils/gnuplot/gnuplot-4.6.2-texinfo-5.patch
deleted file mode 100644
index cbee884..0000000
--- a/utils/gnuplot/gnuplot-4.6.2-texinfo-5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnuplot-4.6.2/docs/gnuplot.texi.orig 2013-04-01 19:38:21.648653518 +0100
-+++ gnuplot-4.6.2/docs/gnuplot.texi 2013-04-01 19:38:46.081652090 +0100
-@@ -17650,6 +17650,7 @@
- @end menu
-
- @node aed767, aifm, complete_list_of_terminals, complete_list_of_terminals
-+@raisesections
- @subsubsection aed767
-
- @c ?commands set terminal aed767
-
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index d0cea70..bff1d44 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.18
+ VERSION=2.20
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index a879b8c..633480b 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,9 @@
+2014-06-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.20
+
+2014-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.19
+
2014-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.18

diff --git a/utils/gstopwatch/BUILD b/utils/gstopwatch/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/utils/gstopwatch/BUILD
@@ -0,0 +1 @@
+make
diff --git a/utils/gstopwatch/DEPENDS b/utils/gstopwatch/DEPENDS
new file mode 100755
index 0000000..cbbb394
--- /dev/null
+++ b/utils/gstopwatch/DEPENDS
@@ -0,0 +1,2 @@
+depends gtk+3 &&
+depends git
diff --git a/utils/gstopwatch/DETAILS b/utils/gstopwatch/DETAILS
new file mode 100755
index 0000000..d7a2ab3
--- /dev/null
+++ b/utils/gstopwatch/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=gstopwatch
+ VERSION=scm
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://github.com/mutantturkey/$SPELL/
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=https://github.com/mutantturkey/gstopwatch/
+ ENTERED=20140618
+ LICENSE[0]=GPL
+ SHORT="simple stopwatch, written in GTK3"
+cat << EOF
+gstopwatch is a simple stopwatch, written in GTK3.
+EOF
diff --git a/utils/gstopwatch/HISTORY b/utils/gstopwatch/HISTORY
new file mode 100644
index 0000000..b532761
--- /dev/null
+++ b/utils/gstopwatch/HISTORY
@@ -0,0 +1,2 @@
+2014-06-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_}BUILD, INSTALL: created spell
diff --git a/utils/gstopwatch/INSTALL b/utils/gstopwatch/INSTALL
new file mode 100755
index 0000000..7bf1215
--- /dev/null
+++ b/utils/gstopwatch/INSTALL
@@ -0,0 +1 @@
+make PREFIX="$INSTALL_ROOT/usr" install
diff --git a/utils/gstopwatch/PRE_BUILD b/utils/gstopwatch/PRE_BUILD
new file mode 100755
index 0000000..4dd4649
--- /dev/null
+++ b/utils/gstopwatch/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:CFLAGS +=.*:CFLAGS += $CFLAGS:" Makefile
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 1f3b569..b81ae84 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -1,9 +1,9 @@
depends dbus-glib &&
-depends gawk &&
+depends AWK &&
depends glib2 &&
depends intltool &&
depends libtool &&
-depends udev '--with-udev-prefix=/etc' &&
+depends UDEV '--with-udev-prefix=/etc' &&
depends xml-parser-expat &&
depends pkgconfig &&
depends util-linux &&
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 4241a5e..ede6d86 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on UDEV instead of udev
+
2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply glibc-2.17.patch
* glibc-2.17.patch: Added from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701432
diff --git a/utils/hercules/DEPENDS b/utils/hercules/DEPENDS
index 6f15e2f..d9fac37 100755
--- a/utils/hercules/DEPENDS
+++ b/utils/hercules/DEPENDS
@@ -4,7 +4,7 @@ fi
depends autoconf &&
depends automake &&
depends flex &&
-depends gawk &&
+depends AWK &&
depends gcc &&
depends gettext &&
depends grep &&
diff --git a/utils/htop/DETAILS b/utils/htop/DETAILS
index bfa79e6..5d923f3 100755
--- a/utils/htop/DETAILS
+++ b/utils/htop/DETAILS
@@ -1,11 +1,11 @@
SPELL=htop
- VERSION=1.0.2
+ VERSION=1.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://htop.sourceforge.net/
+ SOURCE_URL[0]=http://hisham.hm/htop/releases/$VERSION/htop-$VERSION.tar.gz
+ WEB_SITE=http://hisham.hm/htop/
ENTERED=20050218
-
SOURCE_HASH=sha512:50ae0e8ace862520c01a707b3cf9a19591dc1081f6fc38c7fdccc81e36dd94b3cbe9db00cbb90f782c22d9b73f22526e24d04fad8368c6f2a7de0c58f9d92191
+
SOURCE_HASH=sha512:4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="an interactive process viewer for Linux"
diff --git a/utils/htop/HISTORY b/utils/htop/HISTORY
index d434066..ec63848 100644
--- a/utils/htop/HISTORY
+++ b/utils/htop/HISTORY
@@ -1,3 +1,6 @@
+2014-04-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.3, WEB_SITE and SOURCE_URL[0] updated
+
2012-11-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.2

diff --git a/utils/iozone/DETAILS b/utils/iozone/DETAILS
index e0b68bd..f64e422 100755
--- a/utils/iozone/DETAILS
+++ b/utils/iozone/DETAILS
@@ -1,9 +1,10 @@
SPELL=iozone
- VERSION=3_397
+ VERSION=3_424
SOURCE="${SPELL}${VERSION}.tar"
SOURCE_URL[0]=http://www.${SPELL}.org/src/current/${SOURCE}
-
SOURCE_HASH=sha512:e154b56735c922173e7cf23344fa0a478982d202b3b831fd605481f69a77295281be121aa57a0164dc12edf5975f231339f6516da5c40906586d48ebacec7c23
+
SOURCE_HASH=sha512:3caad63bd388785983fb5d722c5713edde4131d7f4e2c882cc6578d19953d78f81514609e44da7583cf94290cf33cc76ff5020edf3669f8a017e9f6cc7d6002e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}${VERSION}"
+ GATHER_DOCS=off
WEB_SITE="http://www.iozone.org/";
LICENSE[0]=GPL
ENTERED=20100723
diff --git a/utils/iozone/HISTORY b/utils/iozone/HISTORY
index 3ed93df..79aa626 100644
--- a/utils/iozone/HISTORY
+++ b/utils/iozone/HISTORY
@@ -1,3 +1,7 @@
+2014-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3_424; don't do useless doc'ing
+ * INSTALL: verbosity++; install fileop and pit_server
+
2011-05-20 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3_397

diff --git a/utils/iozone/INSTALL b/utils/iozone/INSTALL
index c7b5003..cc37cf9 100755
--- a/utils/iozone/INSTALL
+++ b/utils/iozone/INSTALL
@@ -1,4 +1,4 @@
cd ${SOURCE_DIRECTORY}/src/current &&
-install -m755 iozone ${INSTALL_ROOT}/usr/bin &&
+install -vm755 iozone fileop pit_server ${INSTALL_ROOT}/usr/bin &&
cd ${SOURCE_DIRECTORY}/docs &&
-install -m644 iozone.1 ${INSTALL_ROOT}/usr/share/man/man1
+install -vm644 iozone.1 ${INSTALL_ROOT}/usr/share/man/man1
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/kbd/DEPENDS b/utils/kbd/DEPENDS
index e413cf7..3861054 100755
--- a/utils/kbd/DEPENDS
+++ b/utils/kbd/DEPENDS
@@ -2,11 +2,9 @@ depends gnupg &&
depends smgl-fhs &&
depends autoconf &&
depends automake &&
+depends check &&

-optional_depends linux-pam \
- "--enable-vlock" \
- "--disable-vlock" \
- "build vlock" &&
+optional_depends linux-pam "" "--disable-vlock" "build vlock" &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index f752645..5f4f036 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -1,10 +1,10 @@
SPELL=kbd
- VERSION=1.15.5
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.0.2
+
SOURCE_HASH=sha512:8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa
+# PATCHLEVEL=1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=ftp://ftp.altlinux.org/pub/people/legion/$SPELL/$SOURCE
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/$SOURCE
WEB_SITE=http://freshmeat.net/projects/kbd/
ENTERED=20011113
LICENSE[0]=GPL
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index a0ff9a6..1b32178 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,9 @@
+2014-09-03 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version 2.0.2
+ download from KERNEL_URL
+ * DEPENDS: add check, update flags
+ * *.patch, PRE_BUILD:: deleted
+
2013-01-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch; quoting paths
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
deleted file mode 100755
index 72586bd..0000000
--- a/utils/kbd/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < "$SPELL_DIRECTORY/loadkeys.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/fgconsole-serial.patch" &&
-autoreconf
diff --git a/utils/kbd/fgconsole-serial.patch
b/utils/kbd/fgconsole-serial.patch
deleted file mode 100644
index d3ac176..0000000
--- a/utils/kbd/fgconsole-serial.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kbd-1.15.orig/src/fgconsole.c kbd-1.15/src/fgconsole.c
---- kbd-1.15.orig/src/fgconsole.c 2009-02-06 22:13:57.437214875 -0800
-+++ kbd-1.15/src/fgconsole.c 2009-02-06 22:15:17.832978146 -0800
-@@ -6,6 +6,7 @@
- #include <sys/ioctl.h>
- #include <getopt.h>
- #include <linux/vt.h>
-+#include <linux/types.h>
- #include <linux/serial.h>
- #include "getfd.h"
- #include "nls.h"
diff --git a/utils/kbd/loadkeys.patch b/utils/kbd/loadkeys.patch
deleted file mode 100644
index 1de6e9f..0000000
--- a/utils/kbd/loadkeys.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/loadkeys.analyze.l.orig
-+++ src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To to|To|TO
- char *s = xstrndup(yytext+1,
strlen(yytext)-2);
- /* use static pathname to store *s ? */
- open_include(s);
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- }
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} {
- yyerror(_("expected filename between
quotes"));
-@@ -323,7 +325,7 @@ To to|To|TO
- }
- {Eol} {
- line_nr++;
-- if (state_ptr > 0) {
-+ while (state_ptr > 0) {
- yy_pop_state();
- state_ptr--;
- }
-@@ -428,8 +430,10 @@ To to|To|TO
- }
- <STR>\" {
- *p = '\0';
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- return(STRLITERAL);
- }
- . {
---
-1.7.3.3
-
diff --git a/utils/lxc/DETAILS b/utils/lxc/DETAILS
new file mode 100755
index 0000000..ba7c444
--- /dev/null
+++ b/utils/lxc/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=lxc
+ VERSION=1.0.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://linuxcontainers.org/downloads/${SOURCE}
+
SOURCE_HASH=sha512:a2a0700bc29c92f34b8fb0806d1f05467e0433e84dc06c1c8b8db58a34969df48d452771ffff1ea9f865883adef765c896c5be6237108c0ce474b9d7e41c218a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://linuxcontainers.org/";
+ LICENSE[0]="LGPLv2.1+"
+ ENTERED=20140924
+ KEYWORDS=""
+ SHORT="Userspace tools for the Linux kernel containers"
+cat << EOF
+LXC is a userspace interface for the Linux kernel containment features.
+Through a powerful API and simple tools, it lets Linux users easily create
+and manage system or application containers. Features
+
+Current LXC uses the following kernel features to contain processes:
+* Kernel namespaces (ipc, uts, mount, pid, network and user)
+* Apparmor and SELinux profiles
+* Seccomp policies
+* Chroots (using pivot_root)
+* Kernel capabilities
+* Control groups (cgroups)
+
+As such, LXC is often considered as something in the middle between a chroot
+on steroids and a full fledged virtual machine. The goal of LXC is to create
+an environment as close as possible as a standard Linux installation but
+without the need for a separate kernel.
+EOF
diff --git a/utils/lxc/HISTORY b/utils/lxc/HISTORY
new file mode 100644
index 0000000..22a06ef
--- /dev/null
+++ b/utils/lxc/HISTORY
@@ -0,0 +1,2 @@
+2014-09-24 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
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/openmoko-dfu-util/DETAILS b/utils/openmoko-dfu-util/DETAILS
index bcbef39..173002c 100755
--- a/utils/openmoko-dfu-util/DETAILS
+++ b/utils/openmoko-dfu-util/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=openmoko-dfu-util
-if [[ "$OPENMOKO_DFU_UTIL_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="dfu-util-${VERSION}.tar.bz2"
SOURCE_HINTS=no-check-certificate
SOURCE_URL[0]=git://git.openezx.org/dfu-util.git:$SPELL
diff --git a/utils/openmoko-dfu-util/HISTORY b/utils/openmoko-dfu-util/HISTORY
index e49a27b..1a75398 100644
--- a/utils/openmoko-dfu-util/HISTORY
+++ b/utils/openmoko-dfu-util/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/utils/powertop/DETAILS b/utils/powertop/DETAILS
index 3091df8..8e1ae2c 100755
--- a/utils/powertop/DETAILS
+++ b/utils/powertop/DETAILS
@@ -1,9 +1,9 @@
SPELL=powertop
- VERSION=2.3
-
SOURCE_HASH=sha512:e30251be4b7e83438f57660b098f3e79c549c583a817af4749005a1971c51f8890f231427a5ab0780a159f01e71703b06640aa4399dc7e9a1e8f415a5bfe4363
+ VERSION=2.6.1
+
SOURCE_HASH=sha512:85a9835954ab469fd93dcf77439eec545475be8f1e584bd070b9170ea45f935088c14edae1530538d290b0e10caddb70540e17453fe9ee1335b2218fd939d63f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=https://01.org/powertop/sites/default/files/downloads/${SOURCE}
+
SOURCE_URL[0]=https://01.org/sites/default/files/downloads/${SPELL}/${SOURCE}
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL2
WEB_SITE=https://01.org/powertop/
diff --git a/utils/powertop/HISTORY b/utils/powertop/HISTORY
index 1c668f9..2f78f5d 100644
--- a/utils/powertop/HISTORY
+++ b/utils/powertop/HISTORY
@@ -1,3 +1,6 @@
+2014-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.1
+
2013-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.3

diff --git a/utils/pv/DETAILS b/utils/pv/DETAILS
index 179e26c..b932bef 100755
--- a/utils/pv/DETAILS
+++ b/utils/pv/DETAILS
@@ -1,5 +1,5 @@
SPELL=pv
- VERSION=1.4.12
+ VERSION=1.5.3
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.txt
SOURCE_URL[0]=http://www.ivarch.com/programs/sources/${SOURCE}
diff --git a/utils/pv/HISTORY b/utils/pv/HISTORY
index a894322..fcb0ad4 100644
--- a/utils/pv/HISTORY
+++ b/utils/pv/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.3
+
2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.12

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 8a56ca8..4b74671 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -11,4 +11,5 @@ cd "${SOURCE_DIRECTORY}" &&
$QEMU_TPM \
$OPTS &&

-make
+# Pass down ARFLAGS to workaround a bug in QEMU's build system
+ARFLAGS=rv make
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index cfd6f3d..0ae7de6 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Pass down ARFLAGS=rv, to workaround buildsystem bug
+
2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on nss
* *SUB_DEPENDS: Allow forcing dependency on nss
diff --git a/utils/renouveau/DETAILS b/utils/renouveau/DETAILS
index 66362cc..721f5ac 100755
--- a/utils/renouveau/DETAILS
+++ b/utils/renouveau/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=renouveau
- if [[ "$RENOUVEAU_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT nouveau.cvs.sourceforge.net:/cvsroot/nouveau:$SPELL
SOURCE_IGNORE=volatile
diff --git a/utils/renouveau/HISTORY b/utils/renouveau/HISTORY
index a2ce740..ea50b3d 100644
--- a/utils/renouveau/HISTORY
+++ b/utils/renouveau/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/utils/run-parts/BUILD b/utils/run-parts/BUILD
deleted file mode 100755
index 975dfae..0000000
--- a/utils/run-parts/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-./configure --prefix="$INSTALL_ROOT/usr" \
- --sysconfdir="$INSTALL_ROOT/etc" \
- --localstatedir="$INSTALL_ROOT/var" \
- --mandir="$INSTALL_ROOT/usr/share/man" \
- --infodir="$INSTALL_ROOT/usr/share/info" \
- $OPTS &&
-
-make run-parts
diff --git a/utils/run-parts/DETAILS b/utils/run-parts/DETAILS
index 94aca99..d038585 100755
--- a/utils/run-parts/DETAILS
+++ b/utils/run-parts/DETAILS
@@ -1,9 +1,9 @@
SPELL=run-parts
- VERSION=3.4.4
+ VERSION=4.4
+
SOURCE_HASH=sha512:78c51a7da586c6f23bf40810fd9bcaedc90648e6043c199f347cf5772f9c83ab646f22c2746ba6eddd7df8d6a31b01dc25f5bcb21a53a173aa5549138d14a9ca
SOURCE=debianutils_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/debianutils-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/d/debianutils/$SOURCE
-
SOURCE_HASH=sha512:5a3d10621478c5cd795771d1a2ccf144ec43cf67194d93c2e579cd18b7ab8b8e73962391f70b958fb1f38936d4f8446ed09243dfe3c51cca709e1e2bc9fe266a
WEB_SITE=http://packages.debian.org/testing/base/debianutils
GATHER_DOCS=off
ENTERED=20040925
diff --git a/utils/run-parts/HISTORY b/utils/run-parts/HISTORY
index 9e51e74..89e67f2 100644
--- a/utils/run-parts/HISTORY
+++ b/utils/run-parts/HISTORY
@@ -1,3 +1,7 @@
+2014-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4
+ * BUILD: deleted
+
2011-05-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.4

diff --git a/utils/schroot/DETAILS b/utils/schroot/DETAILS
index 0051cc4..3569e1b 100755
--- a/utils/schroot/DETAILS
+++ b/utils/schroot/DETAILS
@@ -1,6 +1,6 @@
SPELL=schroot
- VERSION=1.6.5
-
SOURCE_HASH=sha512:2f7285f9e76fff8db2a9a7cd66f4d06c2c19662f812c3b3108be45bbc6a67bee63b39b56235e257ab226c35efdba6b50a2e2511a618c32d76da10a0d7843fe90
+ VERSION=1.6.10
+
SOURCE_HASH=sha512:25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
PATCHLEVEL=1
# SOURCE_GPG=gurus.gpg:$SOURCE.sign:WORKS_FOR_ME
SOURCE=${SPELL}_$VERSION.orig.tar.xz
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index b427f96..94c76f8 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,6 @@
+2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.10
+
2013-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.5
* BUILD: fix link with latest gettext
diff --git a/utils/smem/DETAILS b/utils/smem/DETAILS
index 1d85550..348c32c 100755
--- a/utils/smem/DETAILS
+++ b/utils/smem/DETAILS
@@ -1,8 +1,8 @@
SPELL=smem
- VERSION=1.3
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/smem/download/$SOURCE
-
SOURCE_HASH=sha512:e9c177aeec8b660492f3ac4d67ac35f24f477262d2e3ccd6e1eea8d86d432c723ee01bb9186f63a46d23527ed8410a21d671c68ebe60778182d67622bcca99c0
+
SOURCE_HASH=sha512:2740b9ebede8e742e3d01f5f2e7a77a4d3ed04bee78585a904d07c299ea5a77be135dd5b6626abfdebcf2742b9004035443d3faeca04ca9b59c603f74708af9b
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.selenic.com/smem/
DOCS="COPYING"
diff --git a/utils/smem/HISTORY b/utils/smem/HISTORY
index 3ae5d1c..971b762 100644
--- a/utils/smem/HISTORY
+++ b/utils/smem/HISTORY
@@ -1,3 +1,6 @@
+2014-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4
+
2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3

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/supermin/DEPENDS b/utils/supermin/DEPENDS
index d820be7..decd607 100755
--- a/utils/supermin/DEPENDS
+++ b/utils/supermin/DEPENDS
@@ -1,7 +1,7 @@
depends automake &&
depends e2fsprogs &&
depends findlib &&
-depends gawk &&
+depends AWK &&
depends ocaml &&
depends zlib &&

diff --git a/utils/syslog-ng/DEPENDS b/utils/syslog-ng/DEPENDS
index 785afda..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' &&
@@ -23,4 +23,12 @@ optional_depends libcap \
optional_depends tcp_wrappers \
'--enable-tcp-wrapper' \
'--disable-tcp-wrapper' \
- 'tcp-wrapper support'
+ 'tcp-wrapper support' &&
+optional_depends json-c \
+ '--enable-json' \
+ '--disable-json' \
+ 'JSON support' &&
+optional_depends PYTHON \
+ '--enable-amqp' \
+ '--disable-amqp' \
+ 'AMQP support'
diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS
index df65b4f..4ee867e 100755
--- a/utils/syslog-ng/DETAILS
+++ b/utils/syslog-ng/DETAILS
@@ -1,6 +1,6 @@
SPELL=syslog-ng
- VERSION=3.5.3
-
SOURCE_HASH=sha512:b09229573fa964e584ff43377388357339ffd5ca47c8820df8b11bb8c04b58b06ef86de7e2486c61e9e9d34c09d891e89be1fb4d474427c421fc0bcb02309907
+ VERSION=3.5.4.1
+
SOURCE_HASH=sha512:4068b1e1fc6ef52075002c9306885cb3b70d5e681077dd2bff7c5dfd83885f4967c9246692c0e886343269cdd5f02b2416999e5e381a076354da96bc7dc13766
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.balabit.com/downloads/files/syslog-ng/sources/$VERSION/source/$SOURCE
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 33fbe19..c834db2 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.5.4.1
+
2014-02-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.5.3

diff --git a/utils/taskwarrior/BUILD b/utils/taskwarrior/BUILD
index 1bbe43a..e013b8d 100755
--- a/utils/taskwarrior/BUILD
+++ b/utils/taskwarrior/BUILD
@@ -1,5 +1 @@
-# needed else fails to find the dynamic loader
-if is_depends_enabled $SPELL lua ; then
- CXXFLAGS="-ldl $CXXFLAGS"
-fi &&
cmake_build
diff --git a/utils/taskwarrior/DEPENDS b/utils/taskwarrior/DEPENDS
index e76415f..8fc6b20 100755
--- a/utils/taskwarrior/DEPENDS
+++ b/utils/taskwarrior/DEPENDS
@@ -1,4 +1,13 @@
depends ncurses &&
depends cmake &&
+depends util-linux &&

-optional_depends lua "" "" "for Lua support
(${PROBLEM_COLOR}EXPERIMENTAL${DEFAULT_COLOR})"
+optional_depends readline \
+ "-DREADLINE_FOUND=1" \
+ "-DREADLINE_FOUND=0" \
+ "for readline support in task shell" &&
+
+optional_depends gnutls \
+ "-DGNUTLS_FOUND=1" \
+ "-DGNUTLS_FOUND=0" \
+ "for Sync support in communication with task server"
diff --git a/utils/taskwarrior/DETAILS b/utils/taskwarrior/DETAILS
index 44db6ef..dae2476 100755
--- a/utils/taskwarrior/DETAILS
+++ b/utils/taskwarrior/DETAILS
@@ -1,9 +1,11 @@
SPELL=taskwarrior
VERSION=2.3.0
+ PATCHLEVEL=1
SOURCE="task-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.taskwarrior.org/download/${SOURCE}

SOURCE_HASH=sha512:9a17ec79735800edb6b5b4c6eede6ef62e8374a80a4f566b967e8ee45883e0d3533d4c3643a858f12adf6b9021fb8c9d54cae7620ca4749cf4237f0235e1d483
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/task-${VERSION}"
+ DOC_DIRS=""
WEB_SITE="http://www.taskwarrior.org";
LICENSE[0]="GPLv2"
ENTERED=20101110
diff --git a/utils/taskwarrior/HISTORY b/utils/taskwarrior/HISTORY
index c0ecbfe..20980f7 100644
--- a/utils/taskwarrior/HISTORY
+++ b/utils/taskwarrior/HISTORY
@@ -1,3 +1,9 @@
+2014-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1; don't duplicate docs
+ * DEPENDS: added new missing required util-linux dependency; removed
+ deprecated lua (since 2.2.0); added missing optional dependencies
+ * BUILD: removed workaround for lua
+
2014-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.3.0

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/util-linux/DETAILS b/utils/util-linux/DETAILS
index 951c9df..40f14bd 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -12,8 +12,8 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.24
-
SOURCE_HASH=sha512:9e1945646a64420226e5af4546022ee604fdba89f91ee474b941075fa55cc2c0d8731e485ef39d2a18e85e81f924790437656b75f1944512629817e4af4191d7
+ VERSION=2.24.2
+
SOURCE_HASH=sha512:a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240
SECURITY_PATCH=2
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index bc566a3..c0ce2ee 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2014-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version to 2.24.2
+
2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated aes version to 2.24; updated aes patch to 20131026
* BUILD: readability++; disable nologin (provided by shadow); disable
diff --git a/utils/vbtracetool/DETAILS b/utils/vbtracetool/DETAILS
index 00fba08..830fd25 100755
--- a/utils/vbtracetool/DETAILS
+++ b/utils/vbtracetool/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=vbtracetool
- if [[ "$VBTRACETOOL_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://people.freedesktop.org/~stuart/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
diff --git a/utils/vbtracetool/HISTORY b/utils/vbtracetool/HISTORY
index 5c1ac27..4398e1b 100644
--- a/utils/vbtracetool/HISTORY
+++ b/utils/vbtracetool/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/utils/xdg-user-dirs/DETAILS b/utils/xdg-user-dirs/DETAILS
new file mode 100755
index 0000000..dddeb4c
--- /dev/null
+++ b/utils/xdg-user-dirs/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=xdg-user-dirs
+ VERSION=0.15
+
SOURCE_HASH=sha512:2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=http://user-dirs.freedesktop.org/releases/${SOURCE}
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
+ ENTERED=20070416
+ KEYWORDS="theme gnome2 libs"
+ SHORT="Tool to help manage well known user directories"
+cat << EOF
+Freedesktop.org
+xdg-user-dirs is a tool to help manage well known user directories like the
+desktop folder and the music folder. It also handles localization (i.e.
+translation) of the filenames.
+EOF
diff --git a/utils/xdg-user-dirs/HISTORY b/utils/xdg-user-dirs/HISTORY
new file mode 100644
index 0000000..32d5a10
--- /dev/null
+++ b/utils/xdg-user-dirs/HISTORY
@@ -0,0 +1,12 @@
+20`4-09-21 TreeveJelbrt <treeve AT sourcemage.org>
+ * DETAILS: version 0.15
+
+2008-03-14 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.10
+
+2007-09-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.9
+
+2007-04-16 Robin Cook <rcook AT wyrms.net>
+ * Initial Spell 0.6, DETAILS, HISTORY
+
diff --git a/utils/xen-tools/DETAILS b/utils/xen-tools/DETAILS
index 91518c5..84d265e 100755
--- a/utils/xen-tools/DETAILS
+++ b/utils/xen-tools/DETAILS
@@ -2,6 +2,6 @@
VERSION=0
PATCHLEVEL=9999
SHORT="deprecated"
- cat << EOF
+cat << EOF
deprecated spell [replaced by xen]
- EOF
+EOF
diff --git a/utils/xen/BUILD b/utils/xen/BUILD
index e930828..69e3147 100755
--- a/utils/xen/BUILD
+++ b/utils/xen/BUILD
@@ -2,6 +2,7 @@ unset LDFLAGS &&
unset CFLAGS &&

cd "$SOURCE_DIRECTORY" &&
+./configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
make xen tools &&

if [[ $XEN_STUBDOM == y ]]; then
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/DETAILS b/utils/xen/DETAILS
index 4d2729c..7b0c90e 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,5 +1,5 @@
SPELL=xen
- VERSION=4.1.6.1
+ VERSION=4.4.0
SECURITY_PATCH=9
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 587916a..cb81a05 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,13 @@
+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
+
+2014-07-06 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.0
+ * PRE_BUILD: Run the subdirs' configure scripts
+
2013-10-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.1.6.1; SECURITY_PATCH++

diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index ced22dc..8f99cfc 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,10 +1,12 @@
SPELL=youtube-dl
- VERSION=2014.03.18.1
- SOURCE=$SPELL
+ VERSION=2014.09.04.3
+ SOURCE=$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=youtube-dl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://youtube-dl.org/downloads/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:cd24484342e8a6e7f6a41957e78dc14e952b8e00d448c2d88f16a70680945d3fa65ace4132b00951953ada5c3d3f787e1e5fa931019cb281309e2269f1e91188
- FORCE_DOWNLOAD=on
+ SOURCE_URL=http://youtube-dl.org/downloads/$VERSION/$SPELL
+ SOURCE2_URL=$SOURCE_URL.sig
LICENSE[0]=BSD
KEYWORDS="utils"
WEB_SITE=http://rg3.github.com/youtube-dl/
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index d1a676e..f5fa5ae 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,15 @@
+2014-09-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 2014.09.04.3
+ * DETAILS, INSTALL: Switch to versioned source files. Downside is that
+ fallback mirrors need to add the version to the file name, too.
Upside is
+ that mirroring of specific versions to keep the stable grimoire
working
+ is possible at all. Note: There are versioned tarballs on the
upstream site,
+ but they contain much more than just the youtube-dl script.
+ * youtube-dl.gpg: add upstream keys
+
+2014-07-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2014.07.25.1
+
2014-03-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2014.03.18.1

diff --git a/utils/youtube-dl/INSTALL b/utils/youtube-dl/INSTALL
index 949e88c..51372fa 100755
--- a/utils/youtube-dl/INSTALL
+++ b/utils/youtube-dl/INSTALL
@@ -1,2 +1,2 @@
install -m 0755 -o root -g root $SOURCE_CACHE/$SOURCE \
- $INSTALL_ROOT/usr/bin/$SOURCE
+ $INSTALL_ROOT/usr/bin/$SPELL
diff --git a/utils/youtube-dl/youtube-dl.gpg b/utils/youtube-dl/youtube-dl.gpg
new file mode 100644
index 0000000..7add2fb
Binary files /dev/null and b/utils/youtube-dl/youtube-dl.gpg differ
diff --git a/video-libs/gst-libav-1.0/DEPENDS
b/video-libs/gst-libav-1.0/DEPENDS
index 097058b..3832fd7 100755
--- a/video-libs/gst-libav-1.0/DEPENDS
+++ b/video-libs/gst-libav-1.0/DEPENDS
@@ -1,2 +1,3 @@
depends gstreamer-1.0 &&
-depends gst-plugins-base-1.0
+depends gst-plugins-base-1.0 &&
+depends LIBAVCODEC '--with-system-libav'
diff --git a/video-libs/gst-libav-1.0/DETAILS
b/video-libs/gst-libav-1.0/DETAILS
index 31ff900..5b4089c 100755
--- a/video-libs/gst-libav-1.0/DETAILS
+++ b/video-libs/gst-libav-1.0/DETAILS
@@ -1,9 +1,10 @@
SPELL=gst-libav-1.0
- VERSION=1.2.2
+ VERSION=1.4.3
+
SOURCE_HASH=sha512:687a2a00a076a246104fd6ca90d0f16ced5d86eea3d2b6603f3525db1735ffcc94887895a5b4a93bd0bbdbb9743e185f0b447353f6dd6819cfa299c0b38b44f4
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-libav-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-libav-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-libav/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org
ENTERED=20121005
diff --git a/video-libs/gst-libav-1.0/HISTORY
b/video-libs/gst-libav-1.0/HISTORY
index 7add929..5b0dacf 100644
--- a/video-libs/gst-libav-1.0/HISTORY
+++ b/video-libs/gst-libav-1.0/HISTORY
@@ -1,3 +1,7 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.3
+ * DEPENDS: add LIBAVCODEC
+
2013-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git a/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig
b/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig
deleted file mode 100644
index ca85b34..0000000
Binary files a/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig and
/dev/null differ
diff --git a/video-libs/gst-plugins-bad-1.0/DETAILS
b/video-libs/gst-plugins-bad-1.0/DETAILS
index 6049f81..7b0cd8f 100755
--- a/video-libs/gst-plugins-bad-1.0/DETAILS
+++ b/video-libs/gst-plugins-bad-1.0/DETAILS
@@ -1,9 +1,10 @@
SPELL=gst-plugins-bad-1.0
- VERSION=1.2.2
+ VERSION=1.4.3
+
SOURCE_HASH=sha512:5a5de7df2af09580bf502325c397f82a36e72b7ab1de04aa2254490299e90cdd4262d9de60de2a9be8eb044c406b469be7bedd236cc362e5b5ee46f517629ade
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-bad-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-bad-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-bad/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org
ENTERED=20121005
diff --git a/video-libs/gst-plugins-bad-1.0/HISTORY
b/video-libs/gst-plugins-bad-1.0/HISTORY
index 6b7a7e6..fb603aa 100644
--- a/video-libs/gst-plugins-bad-1.0/HISTORY
+++ b/video-libs/gst-plugins-bad-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.3
+
2013-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig
b/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig
deleted file mode 100644
index 76cc068..0000000
Binary files
a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig and
/dev/null differ
diff --git a/video-libs/gst-plugins-base-1.0/DETAILS
b/video-libs/gst-plugins-base-1.0/DETAILS
index bfd0d0f..71cc4aa 100755
--- a/video-libs/gst-plugins-base-1.0/DETAILS
+++ b/video-libs/gst-plugins-base-1.0/DETAILS
@@ -1,9 +1,10 @@
SPELL=gst-plugins-base-1.0
- VERSION=1.2.2
+ VERSION=1.4.3
+
SOURCE_HASH=sha512:9ec8b48a8e6a31923d7f3786ef79145bc1465a28bc5ee4853f40f2dd79f71b7a244039c706fe3c8879084dc4a32a8112d4163e537aab9bad48471af83758c300
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-base-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-base-$VERSION

SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-base/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org
ENTERED=20121005
diff --git a/video-libs/gst-plugins-base-1.0/HISTORY
b/video-libs/gst-plugins-base-1.0/HISTORY
index da9083f..08dc074 100644
--- a/video-libs/gst-plugins-base-1.0/HISTORY
+++ b/video-libs/gst-plugins-base-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.3
+
2013-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git
a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig
b/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig
deleted file mode 100644
index a489285..0000000
Binary files
a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig and
/dev/null differ
diff --git a/video-libs/gst-plugins-base/DEPENDS
b/video-libs/gst-plugins-base/DEPENDS
index c1580bc..764d4f8 100755
--- a/video-libs/gst-plugins-base/DEPENDS
+++ b/video-libs/gst-plugins-base/DEPENDS
@@ -5,6 +5,9 @@ optional_depends libx11
\
"--enable-x --enable-xvideo --enable-xshm" \
"--disable-x --disable-xvideo --disable-xshm" \
"for X11 video output" &&
+if is_depends_enabled $SPELL libx11; then
+ depends libxdmcp
+fi &&
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
diff --git a/video-libs/gst-plugins-base/HISTORY
b/video-libs/gst-plugins-base/HISTORY
index 64dcb0f..85f9374 100644
--- a/video-libs/gst-plugins-base/HISTORY
+++ b/video-libs/gst-plugins-base/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on libxdmcp if the dependency on libx11 is enabled
+
2012-03-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.36

diff --git a/video-libs/gst-plugins-good-1.0/DETAILS
b/video-libs/gst-plugins-good-1.0/DETAILS
index f7a8fe0..6524a08 100755
--- a/video-libs/gst-plugins-good-1.0/DETAILS
+++ b/video-libs/gst-plugins-good-1.0/DETAILS
@@ -1,9 +1,10 @@
SPELL=gst-plugins-good-1.0
- VERSION=1.2.2
+ VERSION=1.4.3
+
SOURCE_HASH=sha512:6689613e1282809b7821c20063ff9daf5eb5d52f668a771701e052227b03a05196bb4dcae097e52244daeb6444c675971ca72b862c2fced224b8cdaa5a8d2d0c
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-good-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gst-plugins-good-$VERSION"

SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-good/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org/
ENTERED=20121005
diff --git a/video-libs/gst-plugins-good-1.0/HISTORY
b/video-libs/gst-plugins-good-1.0/HISTORY
index edac300..4b60a02 100644
--- a/video-libs/gst-plugins-good-1.0/HISTORY
+++ b/video-libs/gst-plugins-good-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.3
+
2013-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git
a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig
b/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig
deleted file mode 100644
index be24188..0000000
Binary files
a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig and
/dev/null differ
diff --git a/video-libs/gstreamer-1.0/DETAILS
b/video-libs/gstreamer-1.0/DETAILS
index d8d5754..a7baf8e 100755
--- a/video-libs/gstreamer-1.0/DETAILS
+++ b/video-libs/gstreamer-1.0/DETAILS
@@ -1,9 +1,9 @@
SPELL=gstreamer-1.0
- VERSION=1.2.2
+ VERSION=1.4.3
+
SOURCE_HASH=sha512:804a497ffbf4a69739dc302eebabdc3044dfc9aff277e5d5c776ca8d181fd37655ac0f9444899986dca98762dfe7619279e7c9b8a8abe6914d071268f4c9b345
SOURCE=gstreamer-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gstreamer-$VERSION"
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gstreamer/$SOURCE
-
SOURCE_HASH=sha512:ee032d68fbb368741d7e0db60bb0ec10fc1bd831e21cf171634f2f74b373c2c5149a8e98889186eac49954fdd34cf5ca161b7cead13bcc75425b4f3984131d53
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org/
ENTERED=20120930
diff --git a/video-libs/gstreamer-1.0/HISTORY
b/video-libs/gstreamer-1.0/HISTORY
index b09c5aa..a7fcd11 100644
--- a/video-libs/gstreamer-1.0/HISTORY
+++ b/video-libs/gstreamer-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.3
+
2013-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.2

diff --git a/video-libs/libdvbpsi/DETAILS b/video-libs/libdvbpsi/DETAILS
index a92f13b..52e91cb 100755
--- a/video-libs/libdvbpsi/DETAILS
+++ b/video-libs/libdvbpsi/DETAILS
@@ -1,6 +1,6 @@
SPELL=libdvbpsi
- VERSION=1.1.2
-
SOURCE_HASH=sha512:9102157467b5b1d1cc42574ce0b6e250974a138ad402eff6707fed1656aeefc19ccff8b041cfef8dd10d8ca3914e83272c0683aa8e7cb59970e619db65eb6167
+ VERSION=1.2.0
+
SOURCE_HASH=sha512:951db13f5645d4d6a160719fc6ac97fd31a32d5d17cb8e26db94702e65b6fac3d4e7a99c3c417e09fe5ce33f3b0c0ef86206c77b36816dcd8a3bd5b0bb4a9684
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/$SPELL/$VERSION/$SOURCE
diff --git a/video-libs/libdvbpsi/HISTORY b/video-libs/libdvbpsi/HISTORY
index e73bb06..605ed00 100644
--- a/video-libs/libdvbpsi/HISTORY
+++ b/video-libs/libdvbpsi/HISTORY
@@ -1,3 +1,6 @@
+2014-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.0
+
2013-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.2

diff --git a/video-libs/libdvdnav/DETAILS b/video-libs/libdvdnav/DETAILS
index aacd74b..ef55e12 100755
--- a/video-libs/libdvdnav/DETAILS
+++ b/video-libs/libdvdnav/DETAILS
@@ -1,7 +1,7 @@
SPELL=libdvdnav
- VERSION=4.2.0
-
SOURCE_HASH=sha512:f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=4.2.1
+
SOURCE_HASH=sha512:3b7b18069b77a5a48ff5ad74f823b88f5dbf5058f11737ffef9d388d755616a581688c95dc1c3d9ab2377bce1dafaf53c9d46981a12588e6b3d8b70ce582e756
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dvdnav.mplayerhq.hu/releases/$SOURCE
WEB_SITE=http://mplayerhq.hu/
diff --git a/video-libs/libdvdnav/HISTORY b/video-libs/libdvdnav/HISTORY
index bd4ba41..9c3bb4e 100644
--- a/video-libs/libdvdnav/HISTORY
+++ b/video-libs/libdvdnav/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.2.1
+
2012-10-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.2.0

diff --git a/video-libs/libdvdread/DETAILS b/video-libs/libdvdread/DETAILS
index 708261d..b541b6d 100755
--- a/video-libs/libdvdread/DETAILS
+++ b/video-libs/libdvdread/DETAILS
@@ -1,8 +1,8 @@
SPELL=libdvdread
- VERSION=4.2.0
-
SOURCE_HASH=sha512:192802a05f4b6561bd3d85ea54a29861d98ec947a5eeaa45a8d53389744c31570ee5dbdf3fbd0645ea8e6b254795e39d0948d54849dad99252155db00501b21f
+ VERSION=4.2.1
+
SOURCE_HASH=sha512:80738a70068c83fbd309ffd7335485909812ad0cd862df25ca041b8fb302428be0fc9e678aaeafe529b7652f8b1435e406d8aee3504e939fd29a7e45bd7d8139
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dvdnav.mplayerhq.hu/releases/$SOURCE
WEB_SITE=http://www.mplayerhq.hu/
diff --git a/video-libs/libdvdread/HISTORY b/video-libs/libdvdread/HISTORY
index 49aaed5..c0f2b10 100644
--- a/video-libs/libdvdread/HISTORY
+++ b/video-libs/libdvdread/HISTORY
@@ -1,3 +1,6 @@
+2014-04-10 Treeve Jelbert <treeve AT ourcemage.org>
+ * DETAILS: version 4.2.1
+
2012-10-25 Treeve Jelbert <treeve AT ourcemage.org>
* DETAILS: version 4.2.0
new url
diff --git a/video-libs/libiec61883/DETAILS b/video-libs/libiec61883/DETAILS
index 0efd838..16c7f32 100755
--- a/video-libs/libiec61883/DETAILS
+++ b/video-libs/libiec61883/DETAILS
@@ -1,6 +1,6 @@
SPELL=libiec61883
VERSION=1.2.0
-
SOURCE_HASH=sha512:7dc8a186635cba112769e36bf812221aa535641ffe5534c3b05b882fd20eab3a41cfde2fb6466490a7548e8bb45d91792f48f3190dfed671c1945281368c3762
+
SOURCE_HASH=sha512:303391dc5d75298039f51bcb9c53061f5ada92210c81dfe860994c05e8e03d6d9d1a662fad780d5766c17a8aade665d996ab3454fc93bc06981a3832e6de4066
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL
diff --git a/video-libs/libiec61883/HISTORY b/video-libs/libiec61883/HISTORY
index 26302c4..1e85e7f 100644
--- a/video-libs/libiec61883/HISTORY
+++ b/video-libs/libiec61883/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: hash sum changed, no old source to compare:-/
+
2009-12-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed to working SOURCE_URL[0]

diff --git a/video-libs/libmms/DEPENDS b/video-libs/libmms/DEPENDS
index c123523..349aba1 100755
--- a/video-libs/libmms/DEPENDS
+++ b/video-libs/libmms/DEPENDS
@@ -1 +1,2 @@
-depends glib2
+depends glib2 &&
+depends pcre
diff --git a/video-libs/libmms/HISTORY b/video-libs/libmms/HISTORY
index e78bdef..8d42733 100644
--- a/video-libs/libmms/HISTORY
+++ b/video-libs/libmms/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: pcre
+
2011-01-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.2

diff --git a/video-libs/libvpx/DETAILS b/video-libs/libvpx/DETAILS
index 30aadea..ae274c2 100755
--- a/video-libs/libvpx/DETAILS
+++ b/video-libs/libvpx/DETAILS
@@ -1,6 +1,6 @@
SPELL=libvpx
- VERSION=1.2.0
-
SOURCE_HASH=sha512:364c672f3a8059d3329c4dd674ff72c94bf257ee397015a8e6be9090ad19f76f9b965bb709663f17795098bd379ad60a0d71dd31cc55f0b1d3a1d99b839209b8
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b
SOURCE=$SPELL-v$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-v$VERSION
SOURCE_URL[0]=http://webm.googlecode.com/files/$SOURCE
diff --git a/video-libs/libvpx/HISTORY b/video-libs/libvpx/HISTORY
index b81112c..66a4523 100644
--- a/video-libs/libvpx/HISTORY
+++ b/video-libs/libvpx/HISTORY
@@ -1,3 +1,6 @@
+2014-09-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.0
+
2013-12-01 Javier Vasquez <j.e.vasquez.v AT gmail.com>
* DETAILS: 1.2.0
* BUILD: more build options
diff --git a/video-libs/smpeg/DETAILS b/video-libs/smpeg/DETAILS
index 6dd2810..ab070ff 100755
--- a/video-libs/smpeg/DETAILS
+++ b/video-libs/smpeg/DETAILS
@@ -2,7 +2,8 @@
VERSION=0.4.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://mirrors.sunsite.dk/lokigames/open-source/smpeg/$SOURCE
+
SOURCE_URL[0]=ftp://ftp.tu-clausthal.de/pub/linux/gentoo/distfiles/${SOURCE}
+
SOURCE_URL[1]=http://ftp.uni-erlangen.de/pub/mirrors/gentoo/distfiles/${SOURCE}
WEB_SITE=http://icculus.org/smpeg/
ENTERED=20010922

SOURCE_HASH=sha512:d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
diff --git a/video-libs/smpeg/HISTORY b/video-libs/smpeg/HISTORY
index 2b9a613..e43b693 100644
--- a/video-libs/smpeg/HISTORY
+++ b/video-libs/smpeg/HISTORY
@@ -1,3 +1,6 @@
+2014-05-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL
+
2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix WEB_SITE

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/animata/DETAILS b/video/animata/DETAILS
index 6156317..855bcf4 100755
--- a/video/animata/DETAILS
+++ b/video/animata/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=animata
-if test "$ANIMATA_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://animata.googlecode.com/svn/trunk:animata-svn
diff --git a/video/animata/HISTORY b/video/animata/HISTORY
index ba4d010..7599aec 100644
--- a/video/animata/HISTORY
+++ b/video/animata/HISTORY
@@ -1,2 +1,5 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-11-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD, BUILD, INSTALL: spell created
diff --git a/video/bino/DETAILS b/video/bino/DETAILS
index 5a887ca..c4bbf1d 100755
--- a/video/bino/DETAILS
+++ b/video/bino/DETAILS
@@ -1,11 +1,11 @@
SPELL=bino
- VERSION=1.4.4
+ VERSION=1.6.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/bino/$SOURCE
WEB_SITE=http://bino3d.org/
ENTERED=20110124
-
SOURCE_HASH=sha512:6bd8351889b920cff1c23b7287a1055705ac038bfadd1678d111980a586de25b7388f2316c721dfb68da64397842bb53201fa2af14f53b83ed23e0b16ce62249
+
SOURCE_HASH=sha512:029e1150ddeaba62187877927ec90965b529602057e8a308d441c5856e3cb2fa86c0f7a18dce3df47836372a7779f11a9e9561c9af7c4af70db992f0ba307ba9
LICENSE[0]=GPL
SHORT="3D video player with multi-display support"
cat << EOF
diff --git a/video/bino/HISTORY b/video/bino/HISTORY
index 8103ec9..4591c01 100644
--- a/video/bino/HISTORY
+++ b/video/bino/HISTORY
@@ -1,3 +1,6 @@
+2014-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.0
+
2014-02-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.4

diff --git a/video/dvdauthor/DETAILS b/video/dvdauthor/DETAILS
index e70e851..1c8fa68 100755
--- a/video/dvdauthor/DETAILS
+++ b/video/dvdauthor/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=dvdauthor
if [ "$DVDAUTHOR_BRANCH" == "scm" ]; then
- if [ "$DVDAUTHOR_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://github.com/ldo/dvdauthor
diff --git a/video/dvdauthor/HISTORY b/video/dvdauthor/HISTORY
index 4d4798a..28f53b6 100644
--- a/video/dvdauthor/HISTORY
+++ b/video/dvdauthor/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-01-15 Robin Cook <rcook AT wyrms.net>
* PREPARE: added for option for scm build
* DETAILS: updated to 0.7.1 and anded for scm build
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 8ee4fff..7eafcf3 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,7 +1,7 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=2.2
- SECURITY_PATCH=14
+ VERSION=2.3.2
+ SECURITY_PATCH=15
else
VERSION=0.7.16
SECURITY_PATCH=11
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index ecf829d..6600112 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,23 @@
+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
+
+2014-06-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.2.4, SECURITY_PATCH++, fixes CVE-2014-4610
+
+2014-06-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.3
+
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2
* CONFIGURE: add option for Blackmagick Decklink output
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/minitube/0001-remove-reference-to-missing-translations.patch
b/video/minitube/0001-remove-reference-to-missing-translations.patch
deleted file mode 100644
index 6387299..0000000
--- a/video/minitube/0001-remove-reference-to-missing-translations.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b29dc22706248b20149f49d672cc0f30eec6e90d Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 22 Dec 2013 13:32:57 +0100
-Subject: [PATCH] remove reference to missing translations
-
----
- locale/locale.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/locale/locale.pri b/locale/locale.pri
-index 925d63a..60568a8 100644
---- a/locale/locale.pri
-+++ b/locale/locale.pri
-@@ -4,7 +4,7 @@ INCLUDEPATH += $$PWD
- DEPENDPATH += $$PWD
-
- # ls -1 *.ts | tr '\n' ' '
--TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts
de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts
gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts
pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts
uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts
-+TRANSLATIONS += ar.ts ast.ts bg_BG.ts ca.ts cs_CZ.ts da.ts de_DE.ts el.ts
en.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hu.ts ia.ts
it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt_BR.ts ro.ts ru.ts
sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts zh_CN.ts zh_TW.ts
- isEmpty(QMAKE_LRELEASE) {
- win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
---
-1.8.5.2
-
diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 193e087..43ad4ca 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -1,21 +1,18 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=minitube
if [[ "${MINITUBE_BRANCH}" == "scm" ]] ; then
- if [[ "${MINITUBE_AUTOUPDATE}" == "y" ]] ; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
SOURCE_URL[0]=git://gitorious.org/minitube/minitube.git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=2.1.5
+ VERSION=2.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
- XSOURCE_HASH="22c172f9e1152a150f03a718c7de39109e9e4b0f"
+ XSOURCE_HASH="2a3d885e15917370e1602d7eef6bb8e1a9222f5d"

SOURCE_URL[0]="https://gitorious.org/minitube/minitube/archive/${XSOURCE_HASH}.tar.gz";
-
SOURCE_HASH=sha512:a1f0cf58c976192559c7eeef2beb301477a9510ee701f5963323a72688dfc6927d0624794ffd78f7b8aa9ba415dc65656b1fcdd335238988a3155afb50948eaa
+
SOURCE_HASH=sha512:0ee6dd7c8c889c97845acc494c69a16521f90997594fb478265eaaee5101c3f39310eef492bebf3ef9020c91b8ef26f71897fa41039a571fbba6fd75786b2796
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${SPELL}"
fi
WEB_SITE="http://flavio.tordini.org/minitube";
diff --git a/video/minitube/HISTORY b/video/minitube/HISTORY
index ee01c80..dfd938c 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,11 @@
+2014-07-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2
+ * PRE_BUILD, 0001-remove-reference-to-missing-translations.patch:
+ removed
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.5
* PRE_BUILD, 0001-remove-reference-to-missing-translations.patch:
diff --git a/video/minitube/PRE_BUILD b/video/minitube/PRE_BUILD
deleted file mode 100755
index 9ac66bb..0000000
--- a/video/minitube/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
"${SPELL_DIRECTORY}/0001-remove-reference-to-missing-translations.patch"
diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index c29d967..a80fed5 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mlt
if [[ $MLT_BRANCH == scm ]];then
- if [[ "$MLT_AUTOUPDATE" == "y" ]]; then
- VERSION=-$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE_IGNORE=volatile
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://mltframework.org/mlt.git:mlt-git
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index b15f56d..0b73b57 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-09-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to version 0.9.0

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index cfdf360..4e70752 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -22,6 +22,10 @@ fi &&

optional_depends libvorbis "--disable-tremor-internal
--extra-libs=-lvorbisenc" "" "to use external libvorbis to play ogg/vorbis
audio" &&

+if is_depends_enabled $SPELL libvorbis; then
+ depends libogg
+fi &&
+
optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC
decoding" &&

# audio codecs
@@ -60,7 +64,13 @@ optional_depends pulseaudio "" "--disable-pulse" "for
pulseaudio audio output"
optional_depends svgalib "" "--disable-svga" "for svgalib video output" &&
optional_depends xorg-server "--enable-x11" "--disable-x11" "for X11 output
support" &&
if is_depends_enabled $SPELL xorg-server; then
- depends -sub "DPMS" xorg-server
+ depends -sub "DPMS" xorg-server &&
+ depends libx11 &&
+ depends libxext &&
+ depends libxinerama &&
+ depends libxxf86dga &&
+ depends libxxf86vm &&
+ depends MESALIB
fi &&

optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support"
&&
@@ -74,7 +84,7 @@ optional_depends aalib "" "--disable-aa" "for aalib
(ascii) video output" &&
optional_depends libggi "" "--disable-ggi" "for GGI video output" &&

# image support
-optional_depends giflib "" "--disable-gif" "to output to .gif files" &&
+optional_depends GIFLIB "" "--disable-gif" "to output to .gif files" &&
optional_depends libpng "" "--disable-png" "to output to .png files" &&
optional_depends JPEG "" "--disable-jpeg" "to output to .jpeg files" &&

diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 21799a5..1db1594 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mplayer
if [[ $MPLAYER_BRANCH == scm ]]; then
- if [[ $MPLAYER_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-svn.tar.bz2
SOURCE_URL[0]=svn://svn.mplayerhq.hu/mplayer/trunk/:$SPELL-svn
SOURCE_IGNORE=volatile
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 7acaadd..795843b 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,12 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-05-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.1, SECURITY_PATCH=4

diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index 8b4c123..79d7717 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -65,7 +65,7 @@ optional_depends directfb "" "--disable-directfb" "for
direct framebuffer suppo
optional_depends libcaca "" "--disable-caca" "for colored ASCII video
output" &&

# image support
-optional_depends giflib "" "--disable-gif" "to output to .gif files" &&
+optional_depends GIFLIB "" "--disable-gif" "to output to .gif files" &&
optional_depends libpng "" "--disable-png" "to output to .png files" &&
optional_depends JPEG "" "--disable-jpeg" "to output to .jpeg files" &&

diff --git a/video/mplayer2/DETAILS b/video/mplayer2/DETAILS
index 018512a..37637a3 100755
--- a/video/mplayer2/DETAILS
+++ b/video/mplayer2/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=mplayer2
if [ "$MPLAYER2_BRANCH" == "scm" ]; then
- if [ "$MPLAYER2_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.mplayer2.org/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
index fd9a4d3..385f2a1 100644
--- a/video/mplayer2/HISTORY
+++ b/video/mplayer2/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2012-11-04 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, CONFIGURE, DEPENDS: fixed the scm build
* INSTALL: install no man pages for scm branch
diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE
index 305d101..796487a 100755
--- a/video/mpv/CONFIGURE
+++ b/video/mpv/CONFIGURE
@@ -1,9 +1,25 @@
default_configure &&

config_query_option MPV_OPTS "Compile-in debugging information?" y \
- "" \
+ "--enable-debug-build" \
"--disable-debug-build" &&

-config_query_option MPV_OPTS "Enable VCD (VideoCD) support?" y \
- "" \
- "--disable-vcd"
+config_query_option MPV_OPTS "Enable Joystick input support?" n \
+ "--enable-joystick" \
+ "--disable-joystick" &&
+
+config_query_option MPV_OPTS "Enable encoding functionality?" y \
+ "--enable-encoding" \
+ "--disable-encoding" &&
+
+config_query_option MPV_OPTS "Enable DVB (Digital Video Broadcast) support?"
y \
+ "--enable-dvb" \
+ "--disable-dvb" &&
+
+if list_find "$MPV_OPTS" "--enable-dvb"; then
+ config_query_option MPV_OPTS "Enable DVB input module?" y \
+ "--enable-dvbin" \
+ "--disable-dvbin"
+else
+ list_add MPV_OPTS "--disable-dvbin"
+fi
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index ca181ae..107a31e 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -2,23 +2,24 @@ depends perl &&
depends python &&
depends -sub STABLE ffmpeg &&

+optional_depends lua \
+ "--enable-lua" \
+ "--disable-lua" \
+ "for Lua scripting support" &&
+
optional_depends docutils \
- "" \
- "--disable-manpage" \
+ "--enable-manpage-build" \
+ "--disable-manpage-build" \
"to build and install manpage" &&

optional_depends texlive \
- "" \
- "--disable-pdf" \
+ "--enable-pdf-build" \
+ "--disable-pdf-build" \
"to build and install PDF manual" &&

-# WARNING: --enable-* flags are strictly forbidden to add in places where
-# they don't exist; it breaks adding proper LDFLAGS and makes configure
-# script choose bad decisions on dependencies
-
# audio output
optional_depends alsa-lib \
- "" \
+ "--enable-alsa" \
"--disable-alsa" \
"for ALSA audio output" &&

@@ -29,116 +30,119 @@ optional_depends oss \
"for OSS4 audio output" &&

optional_depends pulseaudio \
- "" \
+ "--enable-pulse" \
"--disable-pulse" \
"for Pulseaudio audio output" &&

optional_depends portaudio19 \
- "" \
+ "--enable-portaudio" \
"--disable-portaudio" \
"for PortAudio audio output" &&

optional_depends JACK-DRIVER \
- "" \
+ "--enable-jack" \
"--disable-jack" \
"for JACK audio output" &&

optional_depends openal \
"--enable-openal" \
- "" \
+ "--disable-openal" \
"for OpenAL audio output" &&

optional_depends sdl \
- "--enable-sdl" \
- "" \
+ "--enable-sdl1" \
+ "--disable-sdl1" \
"for SDL audio output" &&

-# TODO: add sdl2 spell
-#optional_depends sdl2 \
-# "--enable-sdl2" \
-# "" \
-# "for SDL 2.0+ audio and video output" &&
+optional_depends sdl2 \
+ "--enable-sdl2" \
+ "--disable-sdl2" \
+ "for SDL 2.0+ audio and video output" &&

# video output
optional_depends OPENGL \
- "" \
+ "--enable-gl" \
"--disable-gl" \
"for OpenGL video output" &&

optional_depends libcaca \
- "" \
+ "--enable-caca" \
"--disable-caca" \
"for CACA video output" &&

optional_depends libx11 \
- "" \
+ "--enable-x11" \
"--disable-x11" \
"for X11 video output" &&

if is_depends_enabled $SPELL libx11; then
- depends libxext &&
+ optional_depends libxext \
+ "--enable-xext" \
+ "--disable-xext" \
+ "for X extensions" &&

optional_depends libxxf86vm \
- "" \
+ "--enable-xf86vm" \
"--disable-xf86vm" \
"for X video mode extensions" &&

optional_depends libvdpau \
- "" \
+ "--enable-vdpau" \
"--disable-vdpau" \
"for VDPAU acceleration" &&

optional_depends libxv \
- "" \
+ "--enable-xv" \
"--disable-xv" \
"for Xv video output" &&

optional_depends libxinerama \
- "" \
+ "--enable-xinerama" \
"--disable-xinerama" \
"for Xinerama support"
else
- list_add MPV_OPTS "--disable-vm" &&
+ list_add MPV_OPTS "--disable-xf86vm" &&
list_add MPV_OPTS "--disable-vdpau" &&
list_add MPV_OPTS "--disable-xv" &&
- list_add MPV_OPTS "--disable-xinerama"
+ list_add MPV_OPTS "--disable-xinerama" &&
+ list_add MPV_OPTS "--disable-xext"
fi &&

optional_depends libxscrnsaver \
- "" \
+ "--enable-xss" \
"--disable-xss" \
"for screensaver support via xss" &&

# codecs
optional_depends JPEG \
- "" \
+ "--enable-jpeg" \
"--disable-jpeg" \
"for JPEG input/output support" &&

optional_depends libcdio \
- "" \
+ "--enable-cdda" \
"--disable-cdda" \
"for cdda support" &&

optional_depends ladspa \
- "" \
+ "--enable-ladspa" \
"--disable-ladspa" \
"for LADSPA plugin support" &&

optional_depends MPG123 \
- "" \
+ "--enable-mpg123" \
"--disable-mpg123" \
"for libmpg123 MP3 decoding support" &&

# features
optional_depends lirc \
- "" \
+ "--enable-lirc" \
"--disable-lirc" \
"for LIRC (remote control) support" &&

if is_depends_enabled $SPELL libx11; then
optional_depends xproto \
- "" \
+ "--enable-xf86xk" \
"--disable-xf86xk" \
"for multimedia keys support"
else
@@ -146,14 +150,14 @@ else
fi &&

optional_depends v4l-utils \
- "" \
+ "--enable-radio --enable-radio-v4l2" \
"--disable-radio --disable-radio-v4l2" \
"for Video4Linux2 radio interface" &&

if is_depends_enabled $SPELL v4l-utils; then
if is_depends_enabled $SPELL alsa-lib || is_depends_enabled $SPELL oss;
then
config_query_option MPV_OPTS "Enable radio capture (through
PCI/line-in)?" n \
- "" \
+ "--enable-radio-capture" \
"--disable-radio-capture"
else
list_add MPV_OPTS "--disable-radio-capture"
@@ -161,70 +165,70 @@ if is_depends_enabled $SPELL v4l-utils; then
fi &&

optional_depends v4l-utils \
- "" \
+ "--enable-tv --enable-tv-v4l2" \
"--disable-tv --disable-tv-v4l2" \
"for Video4Linux2 TV interface (TV/DVB grabbers)" &&

if is_depends_enabled $SPELL v4l-utils; then
config_query_option MPV_OPTS "Enable Video4Linux2 MPEG PVR?" y \
- "" \
+ "--enable-pvr" \
"--disable-pvr"
else
list_add MPV_OPTS "--disable-pvr"
fi &&

optional_depends samba \
- "" \
+ "--enable-libsmbclient" \
"--disable-libsmbclient" \
"for Samba (SMB) input support" &&

if is_depends_enabled $SPELL samba; then
- depends openssl
+ depends SSL
fi &&

optional_depends libquvi \
- "" \
+ "--enable-libquvi4" \
"--disable-libquvi4" \
"for parsing media stream URLs via libquvi 0.4.x" &&

optional_depends lcms2 \
- "" \
+ "--enable-lcms2" \
"--disable-lcms2" \
"for LCMS2 support" &&

-optional_depends LUA \
- "" \
- "--disable-lua" \
- "for Lua scripting support" &&
-
optional_depends libbluray \
- "" \
+ "--enable-libbluray" \
"--disable-libbluray" \
"for Blu-ray support" &&

optional_depends libdvdread \
- "" \
+ "--enable-dvdread" \
"--disable-dvdread" \
"for reading scrambled (CSS) DVDs" &&

optional_depends libdvdnav \
- "" \
+ "--enable-dvdnav" \
"--disable-dvdnav" \
"for dvd navigation support" &&

+optional_depends libguess \
+ "--enable-libguess" \
+ "--disable-libguess" \
+ "for charset discovery and conversion using libguess" &&
+
optional_depends enca \
- "" \
+ "--enable-enca" \
"--disable-enca" \
"for ENCA charset oracle library support" &&

optional_depends libass \
- "" \
+ "--enable-libass" \
"--disable-libass" \
"for subtitle rendering" &&

if is_depends_enabled $SPELL libass; then
config_query_option MPV_OPTS "Enable libass OSD rendering?" y \
- "" \
+ "--enable-libass-osd" \
"--disable-libass-osd"
else
list_add MPV_OPTS "--disable-libass-osd"
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 85f4776..6a57e92 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpv
- VERSION=0.3.7
+ VERSION=0.6.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCEX=v${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/${SOURCEX}
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:452128df418e50c19cf86041decf77202082fc82997aee36ae95e5c0d447dd1e30fcbe9c28d6ec52b0415252b74791152ec485ddc918a1f010d9cc7b9a0f4b29
+
SOURCE_HASH=sha512:b66a48d33f4f1df0492544854d43db4abff332675503a31b82f35d3f5a62f9718d842f1ba1c280e5b049bf022077c0886ee2cfcff2c1b6b96728c62e73d65cc2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/*
$DOCS"
WEB_SITE=http://mpv.io/
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index e5a07a5..391314b 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,30 @@
+2014-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.0
+
+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
+
+2014-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.11
+
+2014-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.10
+
+2014-05-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.9
+
+2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.8
+ * DEPENDS: lua is _optional_; updated/added flags; updated xf86vm
flag;
+ libxext becomes optional; added libguess, sdl2 optional deps
+ * CONFIGURE: added missing flags, new configure options
+
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on lua instead of LUA
+
2014-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.7
* BUILD, CONFIGURE, DEPENDS, INSTALL, PRE_BUILD: switch to waf
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/v4l-utils/DETAILS b/video/v4l-utils/DETAILS
index 2c776a8..643067c 100755
--- a/video/v4l-utils/DETAILS
+++ b/video/v4l-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=v4l-utils
- VERSION=1.0.1
-
SOURCE_HASH=sha512:2d107fccaa62841828c92fa19dbcc6cb7dea59f4315e683c9384dd91a3ca9df4940ede06c7b5732b1005550810428d150d9d33b1a2199b118ba69c683bb031cc
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:d70f2ea53b7e687aaafb3d59ba5d4d045ecbac731926f37cdd40f1d9d41ac14250055d1caa55dd2602bf86b2b80210ab63cc44208cc94570ebbcb48a70e067a5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://linuxtv.org/downloads/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index bb3ba3d..4cc46f2 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,6 @@
+2014-07-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.1
+
2014-02-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.1

diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 1d2ca84..89cfe83 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -67,10 +67,10 @@ optional_depends "fribidi" \
"--disable-fribidi" \
"for bidirectional subtitle rendering support" &&

-optional_depends OPENGL \
- "--enable-glx" \
- "-opengl --disable-glx" \
- "for OpenGL video output" &&
+optional_depends OPENGL \
+ "--enable-glx" \
+ "--disable-glx" \
+ "for OpenGL video output" &&

optional_depends "sdl" \
"--enable-sdl" \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index ce0cd7e..f8533cd 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,5 +1,5 @@
SPELL=vlc
- VERSION=2.1.3
+ VERSION=2.1.5
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE2=$SOURCE.asc
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index ea6058b..b620024 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,10 @@
+2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.1.5
+ * DEPENDS: -opengl option removed, does not exist
+
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.4
+
2014-02-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.1.3

diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
index 1f218c9..029a2a6 100755
--- a/video/xbmc/DEPENDS
+++ b/video/xbmc/DEPENDS
@@ -102,7 +102,7 @@ depends libmpeg2 &&
depends libass &&
depends flac &&
depends wavpack &&
-depends gawk &&
+depends AWK &&
depends gperf &&
depends nasm &&
optional_depends cwiid \
@@ -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/DETAILS b/video/xbmc/DETAILS
index 5e8b900..a425e1a 100755
--- a/video/xbmc/DETAILS
+++ b/video/xbmc/DETAILS
@@ -1,9 +1,9 @@
SPELL=xbmc
- VERSION=12.2
+ VERSION=13.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://mirrors.${SPELL}.org/releases/source/${SOURCE}
-
SOURCE_HASH=sha512:d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+
SOURCE_HASH=sha512:83a514410748b05da4c626caff34fec7b6b26a8bdea9f158e1c75721d3a47d36eb1f97ed4c162f6c2472a97f658e3b5285c1e0b144bfb4f654932586eee4d1c8
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-Gotham"
WEB_SITE="http://xbmc.org";
LICENSE[0]=GPL
ENTERED=20101225
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index 0a3c108..a64d4e8 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,15 @@
+2014-09-14 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 13.2
+
+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
+
+2014-05-11 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 13.0_r2 Gotham
+
2013-10-26 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS, DEPENDS: version 12.2

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/windowmanagers/afterstep/DEPENDS
b/windowmanagers/afterstep/DEPENDS
index 6f53f2e..0f4c63a 100755
--- a/windowmanagers/afterstep/DEPENDS
+++ b/windowmanagers/afterstep/DEPENDS
@@ -16,7 +16,7 @@ optional_depends OPENGL '--enable-glx' \
optional_depends JPEG '--with-jpeg' '--without-jpeg' \
'For JPEG image support' &&

-optional_depends giflib '--with-gif' '--without-gif' \
+optional_depends GIFLIB '--with-gif' '--without-gif' \
'For GIF image support' &&

optional_depends tiff '--with-tiff' '--without-tiff' \
diff --git a/windowmanagers/afterstep/HISTORY
b/windowmanagers/afterstep/HISTORY
index 0c1b973..92e1ff4 100644
--- a/windowmanagers/afterstep/HISTORY
+++ b/windowmanagers/afterstep/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/windowmanagers/amiwm/BUILD b/windowmanagers/amiwm/BUILD
new file mode 100755
index 0000000..de33b68
--- /dev/null
+++ b/windowmanagers/amiwm/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/windowmanagers/amiwm/HISTORY b/windowmanagers/amiwm/HISTORY
index 9638e6d..35d9227 100644
--- a/windowmanagers/amiwm/HISTORY
+++ b/windowmanagers/amiwm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: make_single
+
2012-03-28 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD: spell created

diff --git a/windowmanagers/blackbox/DETAILS b/windowmanagers/blackbox/DETAILS
index c2455b3..e647c91 100755
--- a/windowmanagers/blackbox/DETAILS
+++ b/windowmanagers/blackbox/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=blackbox
if [[ $BLACKBOX_BRANCH == scm ]]; then
- if [[ $BLACKBOX_AUTOUPDATE == y ]] ; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-cvs-snapshot.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
SOURCE_URL[0]=http://blackboxwm.sourceforge.net/$SOURCE
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index 57990dc..2f248c6 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-08-19 Remko van der Vossen <wich AT sourcemagr.org>
* DEPENDS: replace xorg-libs with individual libraries
* DETAILS: use new style source forge url
diff --git a/windowmanagers/dvtm/DETAILS b/windowmanagers/dvtm/DETAILS
index 3074f4f..2b12036 100755
--- a/windowmanagers/dvtm/DETAILS
+++ b/windowmanagers/dvtm/DETAILS
@@ -1,8 +1,8 @@
SPELL=dvtm
- VERSION=0.5.2
+ VERSION=0.12
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://brain-dump.org/projects/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:317542759dace7ffe50d10fd47270790fd69142c13582b16731ee1e41e1d7f3a3104b93e37fc7bb33ddbac3a582c5674320893f6c114e6ad88286d2e6f896b5c
+
SOURCE_HASH=sha512:2a95194c2f5413566c3565e8fc21d5ecf248bd5530f21ab0a29206e83bf2ac30711f9ce820d34a7305ad0ef59717056f0a9b3b80532a5dd9878bf52abbc9e7f2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://brain-dump.org/projects/dvtm/";
LICENSE[0]=MIT
diff --git a/windowmanagers/dvtm/HISTORY b/windowmanagers/dvtm/HISTORY
index 85487cb..af7fd0d 100644
--- a/windowmanagers/dvtm/HISTORY
+++ b/windowmanagers/dvtm/HISTORY
@@ -1,3 +1,6 @@
+2014-09-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.12
+
2010-03-31 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.5.2

diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 2c8685c..f42efa8 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fluxbox
if [[ $FLUXBOX_BRANCH == scm ]]; then
- if [[ $FLUXBOX_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.fluxbox.org/fluxbox.git:fluxbox
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index cd32350..2ae7b0b 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.5

diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index c45004c..f6589ad 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=fvwm
if [[ "${FVWM_BRANCH}" == "scm" ]] ; then
- if [[ "${FVWM_AUTOUPDATE}" == "y" ]] ; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=fvwm-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/fvwm-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous:guest AT cvs.fvwm.org:/home/cvs/fvwm:fvwm
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index e288daa..38bef69 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2013-02-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.5

diff --git a/windowmanagers/herbstluftwm/DETAILS
b/windowmanagers/herbstluftwm/DETAILS
index 22c6672..f298e6e 100755
--- a/windowmanagers/herbstluftwm/DETAILS
+++ b/windowmanagers/herbstluftwm/DETAILS
@@ -1,8 +1,8 @@
SPELL=herbstluftwm
- VERSION=0.5.1
+ VERSION=0.6.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.org/tarballs/${SOURCE}
-
SOURCE_HASH=sha512:f31d2eff15f95d62b0beeff8ced88551bd01b63edfd92f358b57a04b850505beefbe1fae53c6e6c24b2407e03966b57c1ce1ef8e11d333efe8165f3abe141747
+
SOURCE_HASH=sha512:3fa70a285e21c9e0717f3301227b2fcc578e819c50d2bf380311253db2f5c864d6e42020b8b278ba4e555b5d75e0572144e06c0e8f2a395155415a4902a95421
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://herbstluftwm.org";
LICENSE[0]=BSD
diff --git a/windowmanagers/herbstluftwm/HISTORY
b/windowmanagers/herbstluftwm/HISTORY
index 878de57..6d01674 100644
--- a/windowmanagers/herbstluftwm/HISTORY
+++ b/windowmanagers/herbstluftwm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.6.2
+
2013-06-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, PRE_BUILD, DEPENDS, DETAILS: spell created

diff --git a/windowmanagers/openbox/DETAILS b/windowmanagers/openbox/DETAILS
index ac9e647..9d16c48 100755
--- a/windowmanagers/openbox/DETAILS
+++ b/windowmanagers/openbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=openbox
- VERSION=3.5.0
+ VERSION=3.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://openbox.org/dist/openbox/$SOURCE
-
SOURCE_HASH=sha512:208d2641e171eca5fae0a2104a9b3c6d685293b4d66a18c0c2900df267453911b8738ef239fd84656b41440a0568279de67b9af798a6457b7716b1aab14704b5
+
SOURCE_HASH=sha512:89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d
WEB_SITE=http://www.openbox.org
ENTERED=20030126
LICENSE[0]=GPL
diff --git a/windowmanagers/openbox/HISTORY b/windowmanagers/openbox/HISTORY
index c65d0da..67d81f2 100644
--- a/windowmanagers/openbox/HISTORY
+++ b/windowmanagers/openbox/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.2
+
2011-08-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 3.5.0
* DEPENDS: requires subdependency X for pango,
diff --git a/windowmanagers/windowmaker/DEPENDS
b/windowmanagers/windowmaker/DEPENDS
index d266fba..9c5a94d 100755
--- a/windowmanagers/windowmaker/DEPENDS
+++ b/windowmanagers/windowmaker/DEPENDS
@@ -17,7 +17,7 @@ optional_depends JPEG \
'--enable-jpeg' '--disable-jpeg' \
"Enable JPEG image support?" &&

-optional_depends giflib \
+optional_depends GIFLIB \
'--enable-gif' '--disable-gif' \
"Enable GIF image support?" &&

diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index eee998a..a108de9 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2013-02-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.95.4

diff --git a/windowmanagers/wmii/DETAILS b/windowmanagers/wmii/DETAILS
index 0fb0599..b5ef103 100755
--- a/windowmanagers/wmii/DETAILS
+++ b/windowmanagers/wmii/DETAILS
@@ -1,11 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL="wmii"
if [[ ${WMII_BRANCH} == scm ]]; then
- if [[ ${WMII_AUTOUPDATE} == "y" ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=scm
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-scm.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.bz2}
SOURCE_URL[0]=hg_http://hg.suckless.org/wmii:${SOURCE%.tar.bz2}
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index e23efb6..39fd361 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DOWNLOAD, PREPARE, DETAILS: Use prepare_select_branch

diff --git a/windowmanagers/xmonad/BUILD b/windowmanagers/xmonad/BUILD
index de96a0c..27ba77d 100755
--- a/windowmanagers/xmonad/BUILD
+++ b/windowmanagers/xmonad/BUILD
@@ -1,2 +1 @@
-runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr &&
-runhaskell Setup.lhs build
+true
diff --git a/windowmanagers/xmonad/DEPENDS b/windowmanagers/xmonad/DEPENDS
index daac485..2e29874 100755
--- a/windowmanagers/xmonad/DEPENDS
+++ b/windowmanagers/xmonad/DEPENDS
@@ -1,5 +1 @@
-depends ghc &&
-depends haskell-x11 &&
-depends haskell-mtl &&
-depends haskell-utf8-string &&
-depends haskell-extensible-exceptions
+depends haskell-xmonad
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index d50c82e..ef28997 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,20 +1,7 @@
- SPELL=xmonad
- VERSION=0.11
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://xmonad.org";
- LICENSE[0]=BSD3
- ENTERED=20070812
- SHORT="a lightweight X11 window manager"
-cat << EOF
-Xmonad is a minimalist tiling window manager for X, written in Haskell.
Windows
-are managed using automatic layout algorithms, which can be dynamically
-reconfigured. At any time windows are arranged so as to maximise the use of
-screen real estate. All features of the window manager are accessible purely
-from the keyboard: a mouse is entirely optional. Xmonad is configured in
-Haskell, and custom layout algorithms may be implemented by the user in
-config files. A principle of Xmonad is predictability: the user should know
-in advance precisely the window arrangement that will result from any action.
-EOF
+ SPELL=xmonad
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by haskell-xmonad]
+ EOF
diff --git a/windowmanagers/xmonad/DOWNLOAD b/windowmanagers/xmonad/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/windowmanagers/xmonad/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 7d43624..cedd0de 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,8 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [integrate into the grimoire's haskell build
facilities]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2013-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: install manpage

diff --git a/windowmanagers/xmonad/INSTALL b/windowmanagers/xmonad/INSTALL
index fcce801..27ba77d 100755
--- a/windowmanagers/xmonad/INSTALL
+++ b/windowmanagers/xmonad/INSTALL
@@ -1,5 +1 @@
-runhaskell Setup.lhs install &&
-SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL} &&
-mkdir -vp $SHARE_DIR &&
-cp -v xmonad.cabal $SHARE_DIR &&
-install -m644 ${SOURCE_DIRECTORY}/man/xmonad.1
${INSTALL_ROOT}/usr/share/man/man1/
+true
diff --git a/windowmanagers/xmonad/POST_REMOVE
b/windowmanagers/xmonad/POST_REMOVE
deleted file mode 100755
index bf7211f..0000000
--- a/windowmanagers/xmonad/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg unregister xmonad
diff --git a/windowmanagers/xmonad/POST_RESURRECT
b/windowmanagers/xmonad/POST_RESURRECT
deleted file mode 100755
index b057515..0000000
--- a/windowmanagers/xmonad/POST_RESURRECT
+++ /dev/null
@@ -1,16 +0,0 @@
-# We need to restore package.conf and package.conf.old after resurrection.
-# Also we need to register package with ghc-pkg.
-
-message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-if [ -f ${GHC_DIR}/package.conf.old.bak ] ; then
- mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
-fi
-
-message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
-CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad.cabal
-ghc-pkg register --force-files $CABAL_FILE
-message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg expose xmonad
diff --git a/windowmanagers/xmonad/PRE_BUILD b/windowmanagers/xmonad/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/windowmanagers/xmonad/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/windowmanagers/xmonad/PRE_RESURRECT
b/windowmanagers/xmonad/PRE_RESURRECT
deleted file mode 100755
index 9ab1156..0000000
--- a/windowmanagers/xmonad/PRE_RESURRECT
+++ /dev/null
@@ -1,9 +0,0 @@
-# We need to backup package.conf and package.conf.old before resurrection
-
-message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-if [ -f ${GHC_DIR}/package.conf.old ] ; then
- cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
-fi
diff --git a/windowmanagers/xmonad/TRIGGERS b/windowmanagers/xmonad/TRIGGERS
new file mode 100755
index 0000000..dc742f8
--- /dev/null
+++ b/windowmanagers/xmonad/TRIGGERS
@@ -0,0 +1 @@
+on_cast xmonad dispel_self
diff --git a/wm-addons/cairo-dock-plugins/DETAILS
b/wm-addons/cairo-dock-plugins/DETAILS
index 67145e2..732b5a3 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock-plugins
- VERSION=3.3.0
+ VERSION=3.3.2
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock-plugins/HISTORY
b/wm-addons/cairo-dock-plugins/HISTORY
index 794f928..96d13c4 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.3.2
+
2013-10-16 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.3.0

diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index 4487ac9..e77965f 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock
- VERSION=3.3.0
+ VERSION=3.3.2
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index c6c50b0..1a879b2 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.3.2
+
2013-10-16 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.3.0

diff --git a/wm-addons/obvious/DETAILS b/wm-addons/obvious/DETAILS
index 0ccddf9..24c0a80 100755
--- a/wm-addons/obvious/DETAILS
+++ b/wm-addons/obvious/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=obvious
-if [ "$OBVIOUS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=git://git.mercenariesguild.net/${SPELL}.git:${SPELL}-git
SOURCE_IGNORE=volatile
diff --git a/wm-addons/obvious/HISTORY b/wm-addons/obvious/HISTORY
index 3352758..03a8421 100644
--- a/wm-addons/obvious/HISTORY
+++ b/wm-addons/obvious/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2009-11-02 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added missing dependency on git
* TRIGGERS: added trigger on awesome, to make sure the widgets stay
working
diff --git a/wm-addons/obvious/PREPARE b/wm-addons/obvious/PREPARE
index bf979af..86a5079 100755
--- a/wm-addons/obvious/PREPARE
+++ b/wm-addons/obvious/PREPARE
@@ -1,3 +1,2 @@
-config_query OBVIOUS_AUTOUPDATE \
- "Automatically update on every system update?" y
-
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/wm-addons/slock/DEPENDS b/wm-addons/slock/DEPENDS
new file mode 100755
index 0000000..7295b07
--- /dev/null
+++ b/wm-addons/slock/DEPENDS
@@ -0,0 +1,2 @@
+depends libx11 &&
+depends libxext
diff --git a/wm-addons/slock/HISTORY b/wm-addons/slock/HISTORY
index 2f73fce..340ae4f 100644
--- a/wm-addons/slock/HISTORY
+++ b/wm-addons/slock/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libx11, libxext
+
2009-08-24 Donald Johnson <ltdonny AT gmail.com>
* DETAILS: Updated source

diff --git a/wm-addons/wdm/DEPENDS b/wm-addons/wdm/DEPENDS
index 6016ebc..fa575f0 100755
--- a/wm-addons/wdm/DEPENDS
+++ b/wm-addons/wdm/DEPENDS
@@ -21,7 +21,7 @@ optional_depends JPEG \
"--disable-jpeg" \
"for JPEG graphics support" &&

-optional_depends giflib \
+optional_depends GIFLIB \
"--enable-gif" \
"--disable-gif" \
"for GIF graphics support" &&
diff --git a/wm-addons/wdm/HISTORY b/wm-addons/wdm/HISTORY
index dbb401f..5f9be04 100644
--- a/wm-addons/wdm/HISTORY
+++ b/wm-addons/wdm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/wm-addons/wicked/DETAILS b/wm-addons/wicked/DETAILS
index 9529de8..649ac68 100755
--- a/wm-addons/wicked/DETAILS
+++ b/wm-addons/wicked/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=wicked
-if [ "$WICKED_AUTOUPDATE" = 'y' ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=git://git.glacicle.com/awesome/wicked.git:$SPELL-$VERSION
SOURCE_IGNORE=volatile
diff --git a/wm-addons/wicked/HISTORY b/wm-addons/wicked/HISTORY
index 7d661f4..2df5bc2 100644
--- a/wm-addons/wicked/HISTORY
+++ b/wm-addons/wicked/HISTORY
@@ -1,3 +1,9 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: Use prepare_select_branch
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2008-10-06 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,DEPENDS,PREPARE,INSTALL,BUILD: spell created

diff --git a/wm-addons/wicked/PREPARE b/wm-addons/wicked/PREPARE
index b08a26f..86a5079 100755
--- a/wm-addons/wicked/PREPARE
+++ b/wm-addons/wicked/PREPARE
@@ -1 +1,2 @@
-config_query WICKED_AUTOUPDATE "Automatically update on every system
update?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch
diff --git a/wm-addons/xmonad-contrib/BUILD b/wm-addons/xmonad-contrib/BUILD
index de96a0c..27ba77d 100755
--- a/wm-addons/xmonad-contrib/BUILD
+++ b/wm-addons/xmonad-contrib/BUILD
@@ -1,2 +1 @@
-runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr &&
-runhaskell Setup.lhs build
+true
diff --git a/wm-addons/xmonad-contrib/DEPENDS
b/wm-addons/xmonad-contrib/DEPENDS
index 6ca2034..95d5c21 100755
--- a/wm-addons/xmonad-contrib/DEPENDS
+++ b/wm-addons/xmonad-contrib/DEPENDS
@@ -1,7 +1 @@
-depends ghc &&
-depends haskell-x11 &&
-depends haskell-mtl &&
-depends haskell-utf8-string &&
-depends haskell-random &&
-depends haskell-extensible-exceptions &&
-depends xmonad
+depends haskell-xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/DETAILS
b/wm-addons/xmonad-contrib/DETAILS
index b128246..1397d9f 100755
--- a/wm-addons/xmonad-contrib/DETAILS
+++ b/wm-addons/xmonad-contrib/DETAILS
@@ -1,16 +1,7 @@
- SPELL=xmonad-contrib
- VERSION=0.11.2
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://xmonad.org";
- LICENSE[0]=BSD3
- ENTERED=20071212
- SHORT="third party extensions for xmonad"
-cat << EOF
-A huge library of extensions to xmonad is available. These scripts provide
new
-layout algorithms, key bindings, window tabbing, emulation of other window
-managers and more. A stable version of the extension library is available
with
-each xmonad release.
-EOF
+ SPELL=xmonad-contrib
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by haskell-xmonad-contrib]
+ EOF
diff --git a/wm-addons/xmonad-contrib/DOWNLOAD
b/wm-addons/xmonad-contrib/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/wm-addons/xmonad-contrib/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/wm-addons/xmonad-contrib/HISTORY
b/wm-addons/xmonad-contrib/HISTORY
index 2e8b121..3e59bca 100644
--- a/wm-addons/xmonad-contrib/HISTORY
+++ b/wm-addons/xmonad-contrib/HISTORY
@@ -1,3 +1,11 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [renamed to haskell-xmonad-contrib]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.3
+
2013-09-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.2

diff --git a/wm-addons/xmonad-contrib/INSTALL
b/wm-addons/xmonad-contrib/INSTALL
index b288692..27ba77d 100755
--- a/wm-addons/xmonad-contrib/INSTALL
+++ b/wm-addons/xmonad-contrib/INSTALL
@@ -1,4 +1 @@
-runhaskell Setup.lhs install &&
-SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL} &&
-mkdir -vp $SHARE_DIR &&
-cp -v xmonad-contrib.cabal $SHARE_DIR
+true
diff --git a/wm-addons/xmonad-contrib/POST_REMOVE
b/wm-addons/xmonad-contrib/POST_REMOVE
deleted file mode 100755
index a4709be..0000000
--- a/wm-addons/xmonad-contrib/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg unregister xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/POST_RESURRECT
b/wm-addons/xmonad-contrib/POST_RESURRECT
deleted file mode 100755
index b4befb1..0000000
--- a/wm-addons/xmonad-contrib/POST_RESURRECT
+++ /dev/null
@@ -1,14 +0,0 @@
-# We need to restore package.conf and package.conf.old after resurrection.
-# Also we need to register package with ghc-pkg.
-
-message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
-
-message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
-CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad-contrib.cabal
-ghc-pkg register --force-files $CABAL_FILE
-message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg expose xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/PRE_BUILD
b/wm-addons/xmonad-contrib/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/wm-addons/xmonad-contrib/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/wm-addons/xmonad-contrib/PRE_RESURRECT
b/wm-addons/xmonad-contrib/PRE_RESURRECT
deleted file mode 100755
index 96595c8..0000000
--- a/wm-addons/xmonad-contrib/PRE_RESURRECT
+++ /dev/null
@@ -1,7 +0,0 @@
-# We need to backup package.conf and package.conf.old before resurrection
-
-message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
diff --git a/wm-addons/xmonad-contrib/TRIGGERS
b/wm-addons/xmonad-contrib/TRIGGERS
new file mode 100755
index 0000000..decebb9
--- /dev/null
+++ b/wm-addons/xmonad-contrib/TRIGGERS
@@ -0,0 +1 @@
+on_cast xmonad-contrib dispel_self
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index b3063c6..fe1b6cf 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -36,6 +36,8 @@ optional_depends libx11 \
"for Xlib surface backend feature" &&

if is_depends_enabled $SPELL libx11; then
+ depends xextproto &&
+ depends libxext &&
optional_depends libxrender \
"--enable-xlib-xrender" \
"--disable-xlib-xrender" \
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index fa0d086..c44f1da 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,17 +1,28 @@
+. ${GRIMOIRE}/FUNCTIONS &&
SPELL=cairo
-if [[ $CAIRO_DEVEL == y ]]; then
+case "$CAIRO_BRANCH" in
+ scm)
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://anongit.freedesktop.org/git/cairo:cairo-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;
+
+ devel)
VERSION=1.12.16

SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-#
SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

-else
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+
+ stable)
VERSION=1.12.16

SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f

SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+esac
WEB_SITE=http://cairographics.org/
LICENSE[0]=MIT
ENTERED=20040617
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 05bd795..5938739 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,16 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing libxext
+
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: xextproto
+
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation
+
+2014-07-04 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch
+
2013-09-12 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.12.16

diff --git a/x11-libs/cairo/PREPARE b/x11-libs/cairo/PREPARE
index 8f9397f..40600f7 100755
--- a/x11-libs/cairo/PREPARE
+++ b/x11-libs/cairo/PREPARE
@@ -1 +1,2 @@
-config_query CAIRO_DEVEL "Build devel (unstable) version?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 682b8e2..d77360e 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,4 +1,11 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-# http://bugs.gentoo.org/show_bug.cgi?id=336696
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$CAIRO_BRANCH" == "scm" ]]; then
+ NOCONFIGURE=1 ./autogen.sh
+else
+ # http://bugs.gentoo.org/show_bug.cgi?id=336696
+ patch -p1 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch" &&
+ # http://sourceforge.net/p/mingw-w64/bugs/396/
+ patch -p1 < "$SPELL_DIRECTORY/cairo-broken-lto-build.patch"
+fi
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 15cc31b..32d996d 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 15cc31b..32d996d 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
GOBJ) is_depends_enabled $SPELL glib2;;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 1a1e7d7..8edd371 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
- CAIRO_DEVEL="y" ;;
+ CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
+ [[ "$CAIRO_BRANCH" == "scm" ]] ||
CAIRO_BRANCH="devel";;
PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
depends libxcb "--enable-xcb";;
diff --git a/x11-libs/cairo/cairo-broken-lto-build.patch
b/x11-libs/cairo/cairo-broken-lto-build.patch
new file mode 100644
index 0000000..8cb0f50
--- /dev/null
+++ b/x11-libs/cairo/cairo-broken-lto-build.patch
@@ -0,0 +1,26 @@
+diff -ru cairo-1.12.16.orig/build/configure.ac.warnings
cairo-1.12.16/build/configure.ac.warnings
+--- cairo-1.12.16.orig/build/configure.ac.warnings 2013-08-26
17:07:21.000000000 +0200
++++ cairo-1.12.16/build/configure.ac.warnings 2014-08-08 08:13:14.566163013
+0200
+@@ -39,7 +39,7 @@
+ dnl -flto working really needs a test link, not just a compile
+
+ safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
+ AC_TRY_LINK([],[
+ int main(int argc, char **argv) { return 0; }
+ ],[],[
+Only in cairo-1.12.16/build: configure.ac.warnings.orig
+diff -ru cairo-1.12.16.orig/configure cairo-1.12.16/configure
+--- cairo-1.12.16.orig/configure 2013-08-26 19:00:41.000000000 +0200
++++ cairo-1.12.16/configure 2014-08-08 08:15:19.576158790 +0200
+@@ -18147,7 +18147,7 @@
+
+
+ safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+Only in cairo-1.12.16: configure.orig
diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS
index 01deb2c..cb81d8e 100755
--- a/x11-libs/fontconfig/DEPENDS
+++ b/x11-libs/fontconfig/DEPENDS
@@ -1,8 +1,12 @@
-depends pkgconfig &&
-depends freetype2 &&
depends automake &&
-depends libtool &&
depends expat &&
+depends freetype2 &&
+depends glib2 &&
+depends harfbuzz &&
+depends libpng &&
+depends libtool &&
+depends pcre &&
+depends pkgconfig &&

optional_depends docbook-utils \
"--enable-docs" \
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index d0cfabe..5172d25 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -1,6 +1,6 @@
SPELL=fontconfig
- VERSION=2.11.0
-
SOURCE_HASH=sha512:167061981f094060a684809110ac7c3a5bd0e7724427186b499351b25f8f28a3e03fa9aa0ab6db686347673b066fc97f0b27d6e4bfea5f44194244741637c256
+ VERSION=2.11.1
+
SOURCE_HASH=sha512:acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.fontconfig.org/release/$SOURCE
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index 8630b9f..e38f52c 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
+2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.11.1
+
2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.11.0

diff --git a/x11-libs/libafterimage/DEPENDS b/x11-libs/libafterimage/DEPENDS
index 3eb4884..dc6f094 100755
--- a/x11-libs/libafterimage/DEPENDS
+++ b/x11-libs/libafterimage/DEPENDS
@@ -24,7 +24,7 @@ optional_depends tiff
\
"Support tiff image format?" &&

if [[ $LIBAFTERSTEP_GIF == y ]]; then
- optional_depends giflib \
+ optional_depends GIFLIB \
"--with-gif --without-builtin-ungif" \
"--with-builtin-ungif" \
"Use external gif library?"
diff --git a/x11-libs/libafterimage/HISTORY b/x11-libs/libafterimage/HISTORY
index 4c82bf9..e54fe9a 100644
--- a/x11-libs/libafterimage/HISTORY
+++ b/x11-libs/libafterimage/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 79aa4b2..b4f815e 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -1,6 +1,7 @@
depends bison &&
depends flex &&
-depends giflib &&
+depends gettext &&
+depends GIFLIB &&

if [[ $WINE_BRANCH == scm ]]; then
depends git
@@ -78,6 +79,10 @@ optional_depends libxslt \
'--without-xslt --without-xml' \
'for a functional Microsoft XML (MSXML) implementation' &&

+if is_depends_enabled $SPELL libxslt; then
+ depends libxml2
+fi &&
+
optional_depends MSTTF \
'' \
'' \
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 4109c8b..728bffd 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=wine
if [[ $WINE_BRANCH == scm ]]; then
- if [[ $WINE_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://source.winehq.org/git/wine.git:wine-git
SOURCE_IGNORE=volatile
@@ -12,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.7.13
+ VERSION=1.7.27
else
VERSION=1.6.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index aa17405..65f0241 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,4 +1,46 @@
-2014-0224 Treeve Jelbert <treeve AT sourcemage.org>
+2014-09-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.27 (devel)
+
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: gettext, libxml2
+
+2014-09-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.26 (devel)
+
+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)
+
+2014-07-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.22 (devel)
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-06-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.21 (devel)
+
+2014-06-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.20 (devel)
+
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
+2014-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.19 (devel)
+
+2014-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.18 (devel)
+
+2014-04-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.17 (devel)
+
+2014-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.13 (devel)

2013-11-26 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/x11-toolkits/fltk2/DEPENDS b/x11-toolkits/fltk2/DEPENDS
index d2e12e9..c45971f 100755
--- a/x11-toolkits/fltk2/DEPENDS
+++ b/x11-toolkits/fltk2/DEPENDS
@@ -1,7 +1,7 @@
depends -sub CXX gcc &&
depends libx11 &&

-optional_depends mesalib "--enable-gl=yes" "--enable-gl=no" \
+optional_depends MESALIB "--enable-gl=yes" "--enable-gl=no" \
"for OpenGL support" &&
optional_depends JPEG "--enable-jpeg" "--disable-jpeg" \
"to use the system JPEG library" &&
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 1210038..1888eb4 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
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/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 0495de6..fd39d0c 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,12 +1,25 @@
-depends glib2
-depends gdk-pixbuf2 &&
depends atk &&
-depends pango &&
depends -sub "PDF PS SVG X" cairo &&
+depends expat &&
+depends fontconfig &&
+depends freetype2 &&
+depends gdk-pixbuf2 &&
+depends glib2 &&
+depends harfbuzz &&
+depends libffi &&
+depends libpng &&
+depends libpthread-stubs &&
depends libsm &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
depends libxext &&
depends libxcursor &&
depends libxrender &&
+depends pango &&
+depends pcre &&
+depends pixman &&

optional_depends gobject-introspection \
"--enable-introspection=yes" \
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index e40da5b..87e87d6 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,6 +1,6 @@
SPELL=gtk+2
- VERSION=2.24.22
-
SOURCE_HASH=sha512:be17f877eda8dd80c063dfaa0d1db2efbcdf699550bb740718b809d132a4e75cc074a53d9a03529f079a3d51527fb0841092d702f6d2afb92333b2c7ebb45993
+ VERSION=2.24.24
+
SOURCE_HASH=sha512:75dbeb9aa3546e6fd2861e1d352fa347f6163b25f8292680d53fe13c73c310d90b447fab1ba3bada9e878a1f7c4cef3e279460a698e0282bd13b495606614765
SOURCE=gtk+-$VERSION.tar.xz
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index acee01c..2d20a25 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,9 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
+2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.24.24
+
2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.24.22

diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index f1b44a8..f158088 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,13 +1,12 @@
SPELL=gtk+3
if [[ $GTK_VER == devel ]];then
- VERSION=3.8.8
- SOURCE=gtk+-$VERSION.tar.xz
-
SOURCE_HASH=sha512:8a76abd7872e4c3b82b7e5aea2d058db0bd3ed9a8e7a071399d44136e57596171843e073e4158f169dec3a9aa04d50a5739458109b85510c358a4819b1486e32
+ VERSION=3.13.6
+
SOURCE_HASH=sha512:66013f44f23846e43f6dd169367a9f1c4738c6563ce525dc2d3b28430d9534c042b5a986ecc49ef1fcfe3a1d8ed162438083204d650f700153ef2bc3082ebde1
else
- VERSION=3.8.8
- SOURCE=gtk+-$VERSION.tar.xz
-
SOURCE_HASH=sha512:8a76abd7872e4c3b82b7e5aea2d058db0bd3ed9a8e7a071399d44136e57596171843e073e4158f169dec3a9aa04d50a5739458109b85510c358a4819b1486e32
+ VERSION=3.13.6
+
SOURCE_HASH=sha512:66013f44f23846e43f6dd169367a9f1c4738c6563ce525dc2d3b28430d9534c042b5a986ecc49ef1fcfe3a1d8ed162438083204d650f700153ef2bc3082ebde1
fi
+ SOURCE=gtk+-$VERSION.tar.xz
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$BRANCH/$SOURCE
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index f62c0c1..dc06163 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,12 @@
+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
+
+2014-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.12.2
+
2013-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.8.8

diff --git a/x11-toolkits/qt4/CVE-2014-0190.patch
b/x11-toolkits/qt4/CVE-2014-0190.patch
new file mode 100644
index 0000000..e97ee7b
--- /dev/null
+++ b/x11-toolkits/qt4/CVE-2014-0190.patch
@@ -0,0 +1,32 @@
+Don't crash on broken GIF images
+
+Broken GIF images could set invalid width and height
+values inside the image, leading to Qt creating a null
+QImage for it. In that case we need to abort decoding
+the image and return an error.
+
+Initial patch by Rich Moore.
+
+Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
+
+Task-number: QTBUG-38367
+Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
+Security-advisory: CVE-2014-0190
+
+diff -up
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
+---
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
2014-04-10 13:37:12.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
2014-04-24 15:58:54.515862458 -0500
+@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
+ memset(bits, 0, image->byteCount());
+ }
+
++ // Check if the previous attempt to create the image
failed. If it
++ // did then the image is broken and we should give up.
++ if (image->isNull()) {
++ state = Error;
++ return -1;
++ }
++
+ disposePrevious(image);
+ disposed = false;
+
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/DETAILS b/x11-toolkits/qt4/DETAILS
index 50cbcad..c18ebf7 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,11 +2,11 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.5
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb
+ VERSION=4.8.6
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692
SOURCE=$SPELLX-$VERSION.tar.gz
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION

SOURCE_URL[0]=http://download.qt-project.org/official_releases/qt/4.8/$VERSION/$SOURCE
WEB_SITE=http://qt-project.org/
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 7bf8270..1856f55 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,13 @@
+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
+ * PRE_BUILD, CVE-2014-0190.patch: security patch from Arch added
+
2013-07-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Apply boost.patch
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 5b4e4a7..dd7ef9f 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,9 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-message "${MESSAGE_COLOR}Fix moc using boost headers...${DEFAULT_COLOR}" &&
-patch "${SOURCE_DIRECTORY}"/src/tools/moc/main.cpp \
- "${SPELL_DIRECTORY}"/boost.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2014-0190.patch &&

sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&

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/qt4/boost.patch b/x11-toolkits/qt4/boost.patch
deleted file mode 100644
index bf30552..0000000
--- a/x11-toolkits/qt4/boost.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Modified from
https://build.opensuse.org/package/view_file/openSUSE:Factory/libqt4?file=fix-moc-from-choking-on-boost-headers.patch&rev=94537fcad086b40817f06d56bf3d3a2c
-# using information from https://bugreports.qt-project.org/browse/QTBUG-22829
---- qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.orig
2013-07-12 15:18:04.079264426 -0700
-+++ qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp 2013-07-12
15:24:35.581197919 -0700
-@@ -188,8 +188,10 @@
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-
-- // Workaround a bug while parsing the
boost/type_traits/has_operator.hpp header. See QTBUG-22829
-+ // Workaround a bug while parsing the
boost/type_traits/has_operator.hpp header. See QTBUG-22829
(https://bugreports.qt-project.org/browse/QTBUG-22829)
- pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+ pp.macros["BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"];
-
- QByteArray filename;
- QByteArray output;
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-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch

b/x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch
new file mode 100644
index 0000000..eec9c35
--- /dev/null
+++
b/x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch
@@ -0,0 +1,39 @@
+From 48fc738b16964ddd1fcc057c3558500694f4ac47 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sun, 14 Sep 2014 19:30:04 +0200
+Subject: [PATCH] remove -fvisibility-inlines-hidden from CXXFLAGS
+
+---
+ build/aclocal/visibility.m4 | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/aclocal/visibility.m4 b/build/aclocal/visibility.m4
+index 05f9b80..61f2160 100644
+--- a/build/aclocal/visibility.m4
++++ b/build/aclocal/visibility.m4
+@@ -30,7 +30,7 @@ AC_DEFUN([WX_VISIBILITY],
+ AC_REQUIRE([AC_PROG_CC])
+ if test -n "$GCC"; then
+ CFLAGS_VISIBILITY="-fvisibility=hidden"
+- CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
++ CXXFLAGS_VISIBILITY="-fvisibility=hidden"
+ AC_MSG_CHECKING([for symbols visibility support])
+ AC_CACHE_VAL(wx_cv_cc_visibility, [
+ wx_save_CXXFLAGS="$CXXFLAGS"
+diff --git a/configure b/configure
+index c7291e2..5275d33 100755
+--- a/configure
++++ b/configure
+@@ -28904,7 +28904,7 @@ $as_echo "$wx_cv_version_script" >&6; }
+
+ if test -n "$GCC"; then
+ CFLAGS_VISIBILITY="-fvisibility=hidden"
+- CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
++ CXXFLAGS_VISIBILITY="-fvisibility=hidden"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbols
visibility support" >&5
+ $as_echo_n "checking for symbols visibility support... " >&6; }
+ if ${wx_cv_cc_visibility+:} false; then :
+--
+2.1.0
+
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index e70c2ca..67031e3 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,11 +1,11 @@
SPELL=wxgtk-new
SPELLX=wxGTK
SPELLX=wxWidgets
- VERSION=2.9.5
-
SOURCE_HASH=sha512:556be3739a503397dea6a6f3c04a0ee7e9724bd3eada86611ac69a32208b32bcd067b885a89a593ae41de070fafcee912000d46029443b91a9540575abd09986
+ VERSION=3.0.1
+
SOURCE_HASH=sha512:5934442fbb77f50e2cb234ee2218e5f61e4757202b28da53f0b8a28dd499eeefca4cb8375359e42aeca2a93f8b24435ac4299da300303c9d9436bfba0cae6cd5
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
- SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/${VERSION}/${SOURCE}
SOURCE_URL[1]=http://biolpc22.york.ac.uk/pub/${VERSION}/$SOURCE
LICENSE[0]=http://www.wxwidgets.org/licence3.txt
WEB_SITE=http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index f2f6868..1a498f0 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,10 @@
+2014-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD,
0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch:
+ fix linker error triggered in spells using wxgtk-new
+
+2014-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.0.1
+
2013-10-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.9.5

diff --git a/x11-toolkits/wxgtk-new/PRE_BUILD
b/x11-toolkits/wxgtk-new/PRE_BUILD
new file mode 100755
index 0000000..e8922f9
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 <
$SPELL_DIRECTORY/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 002ef6a..36a6323 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -18,10 +18,14 @@ optional_depends pcre '--with-regex=sys' \
'--with-regex=builtin' \
'do not use pcre for advanced features' &&

-optional_depends mesalib \
+optional_depends MESALIB \
'--with-opengl' \
'--without-opengl' \
'for OpenGL support' &&
+if is_depends_enabled $SPELL mesalib-1x; then
+ # New mesalib has it separated out.
+ depends glu
+fi &&
optional_depends expat \
'--with-expat' \
'--without-expat' \
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index ff3d10a..f58a948 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2014-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: ... and when MESALIB is mesalib-1x, depends on glu
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 2.8.12.1, add dependencies on libsm and
libxinerama,
use wxPython sources as these are more recent and contain the
complete
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 668fb44..86f4bb7 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.9.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889
LICENSE[0]=BSD
LICENSE[1]=GPL
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index dd78c4c..8425689 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,15 @@
+2014-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * PRE_BUILD,
+ conky-1.8.1-utf8-scroll.patch,
+ conky-1.9.0-apcupsd.patch,
+ conky-1.9.0-default-graph-size.patch,
+ conky-1.9.0-diskio-dmmajor.patch,
+ conky-1.9.0-lines-fix.patch,
+ conky-1.9.0-ncurses.patch,
+ conky-1.9.0-update-when-message-count-decreases.patch:
+ add bug fixes from gentoo
+
2013-02-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE: add optional support for hdd temperature, per task
IO stats and IPv4 port monitoring
diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
new file mode 100755
index 0000000..5398005
--- /dev/null
+++ b/x11/conky/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.8.1-utf8-scroll.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-ncurses.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-lines-fix.patch &&
+patch -p1 <
${SPELL_DIRECTORY}/conky-1.9.0-update-when-message-count-decreases.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-apcupsd.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-default-graph-size.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-diskio-dmmajor.patch
diff --git a/x11/conky/conky-1.8.1-utf8-scroll.patch
b/x11/conky/conky-1.8.1-utf8-scroll.patch
new file mode 100644
index 0000000..8b9e1e8
--- /dev/null
+++ b/x11/conky/conky-1.8.1-utf8-scroll.patch
@@ -0,0 +1,104 @@
+From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe AT aidecoe.name>
+Date: Fri, 11 Nov 2011 11:27:43 +0100
+Subject: [PATCH] Make scroll UTF-8 aware. Fixes bug #3134941.
+
+---
+ src/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/src/scroll.c b/src/scroll.c
+index f78f807..738db0d 100644
+--- a/src/scroll.c
++++ b/src/scroll.c
+@@ -34,12 +34,33 @@
+
+ struct scroll_data {
+ char *text;
++ unsigned int show_orig;
+ unsigned int show;
+ unsigned int step;
+ unsigned int start;
+ long resetcolor;
+ };
+
++int utf8_charlen(char c) {
++ unsigned char uc = (unsigned char) c;
++ int len = 0;
++
++ if ((uc & 0x80) == 0)
++ return 1;
++
++ while ((uc & 0x80) != 0) {
++ ++len;
++ uc <<= 1;
++ }
++
++ return (len > 0 && len <= 4) ? len : -1;
++}
++
++int is_utf8_char_tail(char c) {
++ unsigned char uc = (unsigned char) c;
++ return (uc & 0xc0) == 0x80;
++}
++
+ void parse_scroll_arg(struct text_object *obj, const char *arg, void
*free_at_crash)
+ {
+ struct scroll_data *sd;
+@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const
char *arg, void *free_at_cr
+ sd->step = 1;
+ }
+ sd->text = malloc(strlen(arg + n1) + sd->show + 1);
++ // sd->show value may change when there are UTF-8 chars to be shown,
so
++ // save its origin value
++ sd->show_orig = sd->show;
+
+ if (strlen(arg) > sd->show) {
+ for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
+- sd->text[n2] = ' ';
++ sd->text[n2] = ' ';
+ }
+ sd->text[n2] = 0;
+ }
+ else
+- sd->text[0] = 0;
++ sd->text[0] = 0;
+
+ strcat(sd->text, arg + n1);
+ sd->start = 0;
+@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int
p_max_size, struct infor
+ {
+ struct scroll_data *sd = obj->data.opaque;
+ unsigned int j, colorchanges = 0, frontcolorchanges = 0,
visibcolorchanges = 0, strend;
++ int charlen = 0;
++ unsigned int utf8lenfix = 0;
+ char *pwithcolors;
+ char buf[max_user_text];
+
++ sd->show = sd->show_orig;
++
+ if (!sd)
+ return;
+
+@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int
p_max_size, struct infor
+ while(*(buf + sd->start) == SPECIAL_CHAR) {
+ sd->start++;
+ }
++ //skip parts of UTF-8 character which messes up display
++ while(is_utf8_char_tail(*(buf + sd->start))) {
++ sd->start++;
++ }
++ //extend length to be shown for wide characters
++ j = 0;
++ while(j < sd->show + visibcolorchanges + utf8lenfix) {
++ charlen = utf8_charlen(*(buf + sd->start + j));
++ utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
++ j += charlen;
++ }
++ sd->show = sd->show_orig + utf8lenfix;
+ //place all chars that should be visible in p, including colorchanges
+ for(j=0; j < sd->show + visibcolorchanges; j++) {
+ p[j] = *(buf + sd->start + j);
+--
+1.7.8.rc1
+
diff --git a/x11/conky/conky-1.9.0-apcupsd.patch
b/x11/conky/conky-1.9.0-apcupsd.patch
new file mode 100644
index 0000000..9161fbc
--- /dev/null
+++ b/x11/conky/conky-1.9.0-apcupsd.patch
@@ -0,0 +1,106 @@
+Description: Fix broken apcupsd support in Conky 1.8.1
+ Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
+ support. This is a workaround until upstream properly addresses this issue.
+From: Brian Derr <bderrly AT gmail.com>
+Forwarded: http://sourceforge.net/support/tracker.php?aid=3083859
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495
+Last-Update: 2011-12-02
+
+--- a/src/apcupsd.c
++++ b/src/apcupsd.c
+@@ -154,7 +154,7 @@
+ //
+ // Conky update function for apcupsd data
+ //
+-int update_apcupsd(void) {
++void update_apcupsd(void) {
+
+ int i;
+ APCUPSD_S apc;
+@@ -164,41 +164,44 @@
+ memcpy(apc.items[i], "N/A", 4); // including \0
+
+ do {
+- struct addrinfo hints;
+- struct addrinfo *ai, *rp;
+- int res;
++ struct hostent* he = 0;
++ struct sockaddr_in addr;
+ short sz = 0;
+- char portbuf[8];
++#ifdef HAVE_GETHOSTBYNAME_R
++ struct hostent he_mem;
++ int he_errno;
++ char hostbuff[2048];
++#endif
+ //
+ // connect to apcupsd daemon
+ //
+- memset(&hints, 0, sizeof(struct addrinfo));
+- hints.ai_family = AF_UNSPEC;
+- hints.ai_socktype = SOCK_STREAM;
+- hints.ai_flags = 0;
+- hints.ai_protocol = 0;
+- snprintf(portbuf, 8, "%d", info.apcupsd.port);
+- res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai);
+- if (res != 0) {
+- NORM_ERR("APCUPSD getaddrinfo: %s",
gai_strerror(res));
++ sock = socket(AF_INET, SOCK_STREAM, 0);
++ if (sock < 0) {
++ perror("socket");
+ break;
+ }
+- for (rp = ai; rp != NULL; rp = rp->ai_next) {
+- sock = socket(rp->ai_family, rp->ai_socktype,
rp->ai_protocol);
+- if (sock == -1) {
+- continue;
+- }
+- if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1)
{
+- break;
+- }
+- close(sock);
++#ifdef HAVE_GETHOSTBYNAME_R
++ if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff,
sizeof(hostbuff), &he, &he_errno) || !he ) {
++ NORM_ERR("APCUPSD gethostbyname_r: %s",
hstrerror(h_errno));
++ break;
++ }
++#else /* HAVE_GETHOSTBYNAME_R */
++ he = gethostbyname(info.apcupsd.host);
++ if (!he) {
++ herror("gethostbyname");
++ break;
+ }
+- freeaddrinfo(ai);
+- if (rp == NULL) {
++#endif /* HAVE_GETHOSTBYNAME_R */
++
++ memset(&addr, 0, sizeof(addr));
++ addr.sin_family = AF_INET;
++ addr.sin_port = info.apcupsd.port;
++ memcpy(&addr.sin_addr, he->h_addr, he->h_length);
++ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct
sockaddr)) < 0) {
+ // no error reporting, the daemon is probably not
running
+ break;
+ }
+-
++
+ //
+ // send status request - "status" - 6B
+ //
+@@ -222,5 +225,5 @@
+ // "atomically" copy the data into working set
+ //
+ memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items));
+- return 0;
++ return;
+ }
+--- a/src/apcupsd.h
++++ b/src/apcupsd.h
+@@ -49,6 +49,6 @@
+ } APCUPSD_S, *PAPCUPSD_S;
+
+ /* Service routine for the conky main thread */
+-int update_apcupsd(void);
++void update_apcupsd(void);
+
+ #endif /*APCUPSD_H_*/
diff --git a/x11/conky/conky-1.9.0-default-graph-size.patch
b/x11/conky/conky-1.9.0-default-graph-size.patch
new file mode 100644
index 0000000..02f64e3
--- /dev/null
+++ b/x11/conky/conky-1.9.0-default-graph-size.patch
@@ -0,0 +1,18 @@
+diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
+--- conky-1.9.0/src/specials.c 2012-05-03 22:13:47.000000000 +0100
++++ conky-1.9.0/src/specials.c 2013-02-27 21:16:15.856669451 +0000
+@@ -186,12 +186,12 @@
+ g->scale = defscale;
+ if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height,
&g->width, &g->first_colour, &g->last_colour) == 5) {
+ return strndup(buf, text_buffer_size);
+ }
+ buf[0] = '\0';
+- g->height = 25;
+- g->width = 0;
++ g->height = default_graph_height;
++ g->width = default_graph_width;
+ if (sscanf(args, "%x %x %u", &g->first_colour,
&g->last_colour, &g->scale) == 3) {
+ return NULL;
+ }
+ g->scale = defscale;
+ if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour)
== 2) {
diff --git a/x11/conky/conky-1.9.0-diskio-dmmajor.patch
b/x11/conky/conky-1.9.0-diskio-dmmajor.patch
new file mode 100644
index 0000000..754f9dc
--- /dev/null
+++ b/x11/conky/conky-1.9.0-diskio-dmmajor.patch
@@ -0,0 +1,25 @@
+diff --git a/src/linux.c b/src/linux.c
+index ce5f733..bbf8dc5 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -80,6 +80,10 @@
+ #define NBD_MAJOR 43
+ #endif
+
++#if !defined(DM_MAJOR)
++#define DM_MAJOR 253
++#endif
++
+ #ifdef HAVE_IWLIB
+ #include <iwlib.h>
+ #endif
+@@ -2336,7 +2340,8 @@ int update_diskio(void)
+ *
+ * XXX: ignore devices which are part of a SW RAID (MD_MAJOR)
*/
+ if (col_count == 5 && major != LVM_BLK_MAJOR && major !=
NBD_MAJOR
+- && major != RAMDISK_MAJOR && major !=
LOOP_MAJOR) {
++ && major != RAMDISK_MAJOR && major !=
LOOP_MAJOR
++ && major != DM_MAJOR ) {
+ /* check needed for kernel >= 2.6.31, see sf #2942117
*/
+ if (is_disk(devbuf)) {
+ total_reads += reads;
diff --git a/x11/conky/conky-1.9.0-lines-fix.patch
b/x11/conky/conky-1.9.0-lines-fix.patch
new file mode 100644
index 0000000..de48ab9
--- /dev/null
+++ b/x11/conky/conky-1.9.0-lines-fix.patch
@@ -0,0 +1,36 @@
+diff -urN old/src/conky.c new/src/conky.c
+--- old/src/conky.c 2012-05-03 23:22:21.000000000 +0200
++++ new/src/conky.c 2012-08-15 00:06:59.256311301 +0200
+@@ -3065,12 +3065,26 @@
+ og = g;
+ }
+
+- /* this is mugfugly,
but it works */
+- XDrawLine(display,
window.drawable, window.gc,
+-
cur_x + i + 1,
+-
specials[special_index].dotgraph ? og : by + h,
+-
cur_x + i + 1,
+- g);
++ if
(specials[special_index].dotgraph) {
++ if (og == g) {
++
XDrawPoint(display, window.drawable,
++
window.gc, cur_x + i + 1, g);
++ } else {
++
XDrawLine(display, window.drawable, window.gc,
++
cur_x + i + 1,
++
og,
++
cur_x + i + 1,
++
g);
++ }
++ } else {
++ /* this is
mugfugly, but it works */
++
XDrawLine(display, window.drawable, window.gc,
++
cur_x + i + 1,
++
by + h,
++
cur_x + i + 1,
++
g);
++ }
++
+ ++j;
+ }
+ if (tmpcolour)
free(tmpcolour);
diff --git a/x11/conky/conky-1.9.0-ncurses.patch
b/x11/conky/conky-1.9.0-ncurses.patch
new file mode 100644
index 0000000..91043ed
--- /dev/null
+++ b/x11/conky/conky-1.9.0-ncurses.patch
@@ -0,0 +1,31 @@
+From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo AT centrum.sk>
+Date: Fri, 13 Jul 2012 13:41:09 +0200
+Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net
#3541329)
+
+---
+ src/conky.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conky.c b/src/conky.c
+index c5b4bed..17fe1a7 100644
+--- a/src/conky.c
++++ b/src/conky.c
+@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
+ OBJ(cpu) {
+ if (cur->cpu_usage) {
+ if (obj->data.i > info.cpu_count) {
+- static bool warned = false;
++ static int warned = 0;
+ if(!warned) {
+ NORM_ERR("obj->data.i
%i info.cpu_count %i",
+
obj->data.i, info.cpu_count);
+ NORM_ERR("attempting
to use more CPUs than you have!");
+- warned = true;
++ warned = 1;
+ }
+ } else {
+ percent_print(p, p_max_size,
+--
+1.7.0.4
+
diff --git a/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
b/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
new file mode 100644
index 0000000..dd422c5
--- /dev/null
+++ b/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
@@ -0,0 +1,75 @@
+diff --git a/src/mail.c b/src/mail.c
+index 7f60ba3..882b7c8 100644
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s
*mail)
+
+ void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen,
unsigned long old_messages)
+ {
+- if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
+- || (mail->messages > old_messages &&
mail->unseen > 0))) {
++ /*
++ * Georg Hopp (2012-12-23):
++ * Well, i will read mails from time to time and i want the unseen
++ * count to be reduced when they are read...so, this seems wrong.
++ * Try a better one.... :)
++ */
++ if (strlen(mail->command) > 1
++ && (mail->unseen != old_unseen
++ || mail->messages != old_messages)) {
+ // new mail goodie
+ if (system(mail->command) == -1) {
+ perror("system()");
+@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
+ if (strlen(recvbuf) > 2) {
+ unsigned long messages,
recent = 0;
+ char *buf = recvbuf;
+- char force_check = 0;
++ char force_check = 1;
+ buf = strstr(buf, "EXISTS");
+ while (buf && strlen(buf) > 1
&& strstr(buf + 1, "EXISTS")) {
+ buf = strstr(buf + 1,
"EXISTS");
+@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
+ }
+ if (sscanf(buf, "*
%lu EXISTS\r\n", &messages) == 1) {
+
timed_thread_lock(mail->p_timed_thread);
+- if
(mail->messages != messages) {
+-
force_check = 1;
+- }
++ force_check =
1;
+
timed_thread_unlock(mail->p_timed_thread);
+ }
+ }
+@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
+ * something other than 0, or
we had a timeout
+ */
+ buf = recvbuf;
+- if (recent > 0 || (buf &&
strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
++ if (recent > 0
++ || (buf &&
strstr(buf, " FETCH "))
++ || (buf &&
strstr(buf, " EXPUNGE "))
++ ||
fetchtimeout.tv_sec == 0 || force_check) {
+ // re-check messages
and unseen
+ if
(imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
+ fail++;
+@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
+ fail++;
+ break;
+ }
++
imap_unseen_command(mail, old_unseen, old_messages);
++ old_unseen =
mail->unseen;
++ old_messages =
mail->messages;
+ strncpy(sendbuf, "a5
IDLE\r\n", MAXDATASIZE);
+ if
(imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
+ fail++;
+@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
+ fail++;
+ break;
+ }
+- imap_unseen_command(mail, old_unseen,
old_messages);
+ fail = 0;
+- old_unseen = mail->unseen;
+- old_messages = mail->messages;
+ }
+ if (fail) break;
+ } else {
diff --git a/x11/freenx/DETAILS b/x11/freenx/DETAILS
index f628ba9..a6134d3 100755
--- a/x11/freenx/DETAILS
+++ b/x11/freenx/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=freenx
if [[ "$FREENX_BRANCH" == "scm" ]]; then
- if [[ "$FREENX_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.freenx.berlios.de:/cvsroot/freenx:$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
diff --git a/x11/freenx/HISTORY b/x11/freenx/HISTORY
index e5bdd08..99b4bfd 100644
--- a/x11/freenx/HISTORY
+++ b/x11/freenx/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-04-02 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: fixed typo

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/lightdm/DEPENDS b/x11/lightdm/DEPENDS
index bcfb0ea..6bc3c5a 100755
--- a/x11/lightdm/DEPENDS
+++ b/x11/lightdm/DEPENDS
@@ -1,4 +1,5 @@
depends dbus &&
+depends libgcrypt &&
depends linux-pam &&
depends libxklavier &&
depends -sub XEPHYR xorg-server &&
diff --git a/x11/lightdm/DETAILS b/x11/lightdm/DETAILS
index 5cfa381..3f22bf9 100755
--- a/x11/lightdm/DETAILS
+++ b/x11/lightdm/DETAILS
@@ -1,9 +1,8 @@
SPELL=lightdm
- VERSION=1.7.0
+ VERSION=1.8.0
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=http://launchpad.net/${SPELL}/1.8/$VERSION/+download/${SOURCE}
-#
SOURCE_HASH=sha512:e7a7fab1ad3b717e8c9de48e0337985ccbca5c3850697d59c910ed0a2418339207a1111e197f0f7a2a2b0ad6800373681c29d8f683e4a5ee3ae74a72b51e9da2
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:770c92d28c9f76def517e1b4fed962b1852b0796e3068d2e6bbbe9ff4ba1182bbbc5148c4961b19e4f3ed2e5a943dd513d05fa74459a9a28ed1871bc6319fe64
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/lightdm";
LICENSE[0]=GPL3/LGPL3
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index 4046b28..06706e9 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated to 1.8.0 (removed sig)
+
2013-06-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.0, 1.5.1 no longer compiles
* DEPENDS: Optionally depends on gettext
diff --git a/x11/lightdm/lightdm-1.7.0.tar.xz.sig
b/x11/lightdm/lightdm-1.7.0.tar.xz.sig
deleted file mode 100644
index 0080099..0000000
Binary files a/x11/lightdm/lightdm-1.7.0.tar.xz.sig and /dev/null differ
diff --git a/x11/slim/BUILD b/x11/slim/BUILD
index e013b8d..91fa455 100755
--- a/x11/slim/BUILD
+++ b/x11/slim/BUILD
@@ -1 +1,5 @@
+OPTS="-DFREETYPE_INCLUDE_DIRS=$INSTALL_ROOT/usr/include \
+ -DFREETYPE_INCLUDE_DIR_freetype2=$INSTALL_ROOT/usr/include/freetype2 \
+ $OPTS" &&
+
cmake_build
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 00a89a0..1a36376 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,6 @@
+2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed build with recent freetype2/cmake
+
2013-10-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.6
* PRE_BUILD: apply patch
diff --git a/x11/transset/DETAILS b/x11/transset/DETAILS
index 827a767..35b6ba5 100755
--- a/x11/transset/DETAILS
+++ b/x11/transset/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=transset
-if [ "$TRANSSET_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=cvs
-fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
SOURCE_URL[0]=cvs://:pserver:anoncvs AT freedesktop.org:/cvs/xapps:$SPELL
diff --git a/x11/transset/HISTORY b/x11/transset/HISTORY
index 263cfac..4a750b3 100644
--- a/x11/transset/HISTORY
+++ b/x11/transset/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch

diff --git a/x11/unclutter/DEPENDS b/x11/unclutter/DEPENDS
new file mode 100755
index 0000000..6b7403c
--- /dev/null
+++ b/x11/unclutter/DEPENDS
@@ -0,0 +1,3 @@
+depends imake &&
+depends libxext &&
+depends libx11
diff --git a/x11/unclutter/DETAILS b/x11/unclutter/DETAILS
index 3f077f1..d3f6454 100755
--- a/x11/unclutter/DETAILS
+++ b/x11/unclutter/DETAILS
@@ -1,8 +1,8 @@
SPELL=unclutter
VERSION=8
- SOURCE=$SPELL-$VERSION.tar.Z
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=http://www.ibiblio.org/pub/X11/contrib/utilities/$SOURCE
+ SOURCE_URL[0]=http://www.ibiblio.org/pub/X11/contrib/utilities/$SOURCE

SOURCE_HASH=sha512:9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
WEB_SITE=http://www.ibiblio.org
ENTERED=20010924
diff --git a/x11/unclutter/HISTORY b/x11/unclutter/HISTORY
index 25cf671..4670e8e 100644
--- a/x11/unclutter/HISTORY
+++ b/x11/unclutter/HISTORY
@@ -1,3 +1,7 @@
+2014-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on imake, libx11 and libxext
+ * DETAILS: fix SOURCE_URL[0]
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

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/x11/xclip/DETAILS b/x11/xclip/DETAILS
index 1eadeb3..c39140e 100755
--- a/x11/xclip/DETAILS
+++ b/x11/xclip/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORCE_URL/$SPELL/$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:6c769878004c02d87b9eca2b33dc34edb40acc59be767a6481f207a74d52fca3725a040b0c8deffa1419b687bd73cf3124a090413c06787c0dd137b0ede795e0
WEB_SITE=http://xclip.sourceforge.net/
ENTERED=20020630
diff --git a/x11/xclip/HISTORY b/x11/xclip/HISTORY
index 54edecd..9be3930 100644
--- a/x11/xclip/HISTORY
+++ b/x11/xclip/HISTORY
@@ -1,3 +1,6 @@
+2014-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
2009-11-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.12

diff --git a/x11/xlockmore/DEPENDS b/x11/xlockmore/DEPENDS
index 216547d..f08f6ac 100755
--- a/x11/xlockmore/DEPENDS
+++ b/x11/xlockmore/DEPENDS
@@ -1,7 +1,7 @@
depends libx11 &&

if list_find $XLOCKMORE_OPTS "--disable-blank-only"; then
- optional_depends mesalib \
+ optional_depends MESALIB \
"--with-mesa" \
"--without-mesa" \
"for Mesa 3D modes" &&
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index 6881c6e..c26d475 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD, CONFIGURE: deprecate XLOCKMORE_BO
* DEPENDS: added missing dependencies (required: libx11; optional:
diff --git a/x11/xplanet/DEPENDS b/x11/xplanet/DEPENDS
index 9807e53..602c80a 100755
--- a/x11/xplanet/DEPENDS
+++ b/x11/xplanet/DEPENDS
@@ -1,6 +1,6 @@
depends freetype2 &&

-optional_depends "giflib" \
+optional_depends "GIFLIB" \
"--with-gif" \
"" \
"to enable GIF support" &&
diff --git a/x11/xplanet/HISTORY b/x11/xplanet/HISTORY
index 85772a0..5dd00dc 100644
--- a/x11/xplanet/HISTORY
+++ b/x11/xplanet/HISTORY
@@ -1,3 +1,6 @@
+2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: giflib => GIFLIB
+
2014-01-26 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch for newest giflib

diff --git a/xfce/garcon/DEPENDS b/xfce/garcon/DEPENDS
index c7d17c2..485910a 100755
--- a/xfce/garcon/DEPENDS
+++ b/xfce/garcon/DEPENDS
@@ -1,5 +1,5 @@
depends glib2 &&
-
+depends libxfce4util &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/xfce/garcon/HISTORY b/xfce/garcon/HISTORY
index 4f439d3..6d515fa 100644
--- a/xfce/garcon/HISTORY
+++ b/xfce/garcon/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libxfce4util
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.2.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/libxfce4util/DEPENDS b/xfce/libxfce4util/DEPENDS
index c7d17c2..817208d 100755
--- a/xfce/libxfce4util/DEPENDS
+++ b/xfce/libxfce4util/DEPENDS
@@ -1,4 +1,5 @@
depends glib2 &&
+depends intltool &&

optional_depends gettext \
"--enable-nls" \
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index ff50040..030b575 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: intltool
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.10.1
SOURCE matches upstream posted SHA1
diff --git a/xfce/ristretto/DEPENDS b/xfce/ristretto/DEPENDS
index 81014cf..4d0bec2 100755
--- a/xfce/ristretto/DEPENDS
+++ b/xfce/ristretto/DEPENDS
@@ -1,10 +1,10 @@
depends dbus-glib &&
depends gtk+2 &&
+depends xfconf &&
depends libxfce4util &&
depends libxfcegui4 &&
depends libexif &&
-depends thunar &&
-depends thunar-vfs &&
+depends cairo &&

optional_depends gettext \
"--enable-nls" \
diff --git a/xfce/ristretto/HISTORY b/xfce/ristretto/HISTORY
index 4e555a9..d9c427a 100644
--- a/xfce/ristretto/HISTORY
+++ b/xfce/ristretto/HISTORY
@@ -1,3 +1,6 @@
+2014-04-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: renewed dependencies
+
2012-11-30 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added tumbler suggest dep

diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index b2e36c5..8b1c123 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=xfburn
if [[ $XFBURN_BRANCH == scm ]]; then
- if [[ $XFBURN_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
+ VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git_http://git.xfce.org/apps/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index e1f6e70..1dc49a6 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2012-07-26 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: apply glib232.patch to stable branch only

diff --git a/xorg-app/appres/DEPENDS b/xorg-app/appres/DEPENDS
index 3524174..b521700 100755
--- a/xorg-app/appres/DEPENDS
+++ b/xorg-app/appres/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends util-macros &&
depends libx11 &&
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-app/bdftopcf/DEPENDS b/xorg-app/bdftopcf/DEPENDS
index f1e3646..f01b26b 100755
--- a/xorg-app/bdftopcf/DEPENDS
+++ b/xorg-app/bdftopcf/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends util-macros &&
depends fontsproto &&
diff --git a/xorg-app/beforelight/DEPENDS b/xorg-app/beforelight/DEPENDS
index 3501c5f..54f3863 100755
--- a/xorg-app/beforelight/DEPENDS
+++ b/xorg-app/beforelight/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends util-macros &&
depends libx11 &&
diff --git a/xorg-app/bitmap/DEPENDS b/xorg-app/bitmap/DEPENDS
index ea0598c..ebb4b8f 100755
--- a/xorg-app/bitmap/DEPENDS
+++ b/xorg-app/bitmap/DEPENDS
@@ -1,8 +1,9 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends util-macros &&
depends libx11 &&
depends libxmu &&
+depends libxt &&
depends libxaw &&
depends xbitmaps &&
sub_depends libxaw XAW7
diff --git a/xorg-app/bitmap/HISTORY b/xorg-app/bitmap/HISTORY
index b817390..92fb615 100644
--- a/xorg-app/bitmap/HISTORY
+++ b/xorg-app/bitmap/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing depends libxt
+
2010-10-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.5

diff --git a/xorg-app/editres/DEPENDS b/xorg-app/editres/DEPENDS
index 0ccab0a..d62128e 100755
--- a/xorg-app/editres/DEPENDS
+++ b/xorg-app/editres/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends util-macros &&
depends -sub XAW7 libxaw &&
diff --git a/xorg-app/x11perf/DEPENDS b/xorg-app/x11perf/DEPENDS
index 499be0c..d99f641 100755
--- a/xorg-app/x11perf/DEPENDS
+++ b/xorg-app/x11perf/DEPENDS
@@ -1,3 +1,6 @@
-depends util-macros &&
depends libx11 &&
-depends libxmu
+depends libxext &&
+depends libxft &&
+depends libxmu &&
+depends libxrender &&
+depends util-macros
diff --git a/xorg-app/x11perf/HISTORY b/xorg-app/x11perf/HISTORY
index 4658f3b..1e0e92d 100644
--- a/xorg-app/x11perf/HISTORY
+++ b/xorg-app/x11perf/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2011-03-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.5.3
SOURCE matches upstream posted SHA1
diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index 4e79dff..8590226 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -1,28 +1,35 @@
-depends libxau &&
-depends libxaw &&
-depends libxdmcp &&
-depends libxt &&
-depends util-macros &&
-depends xproto &&
+depends libice &&
+depends libpthread-stubs &&
+depends libsm &&
+depends libx11 &&
+depends libxau &&
+depends libxaw &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxmu &&
+depends libxt &&
+depends util-macros &&
+depends xproto &&

-optional_depends libxft \
- '--with-xft' \
- '--without-xft' \
+optional_depends libxft \
+ '--with-xft' \
+ '--without-xft' \
'for Xft font rendering' &&

-optional_depends libxinerama \
- "" \
- "" \
- "Someone needs to describe this nicely." &&
+optional_depends libxinerama \
+ "" \
+ "" \
+ "for multi-display extended desktop support" &&

-optional_depends libxpm \
- "" \
- "" \
- "Someone needs to describe this nicely." &&
+optional_depends libxpm \
+ "" \
+ "" \
+ "for XPM greeter logo support" &&

-optional_depends linux-pam \
- '--with-pam' \
- '--without-pam' \
+optional_depends linux-pam \
+ '--with-pam' \
+ '--without-pam' \
'for Pluggable Authentication Module support' &&

optional_depends libselinux \
@@ -30,7 +37,7 @@ optional_depends libselinux \
"--without-selinux" \
"for Security Enhanced Linux support" &&

-suggest_depends xrdb \
- "" \
- "" \
+suggest_depends xrdb \
+ "" \
+ "" \
"for a customizable login window"
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index 948a85c..b4e70e9 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,7 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+ * DEPENDS: proper optional dependency descriptions
+
2013-03-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.11
* PRE_BUILD,
0001-use-X-s-default-authentication-mechanism-instead-of-.patch:
diff --git a/xorg-app/xdpyinfo/DETAILS b/xorg-app/xdpyinfo/DETAILS
index 4d431d8..07df0e2 100755
--- a/xorg-app/xdpyinfo/DETAILS
+++ b/xorg-app/xdpyinfo/DETAILS
@@ -1,9 +1,9 @@
SPELL=xdpyinfo
- VERSION=1.2.0
+ VERSION=1.3.1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-#
SOURCE_HASH=sha512:4dd89b1be496da7f90ab00ee0bfbf4dc1d6d09262988bd83434aa6bfe7f4afc37583730c64f5ce1b2f2f295a226431e565a718c9366396354d8ccdf017792958
+
SOURCE_HASH=sha512:1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-app/xdpyinfo/HISTORY b/xorg-app/xdpyinfo/HISTORY
index 9112c43..81e846e 100644
--- a/xorg-app/xdpyinfo/HISTORY
+++ b/xorg-app/xdpyinfo/HISTORY
@@ -1,3 +1,6 @@
+2014-07-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.1
+
2011-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0

diff --git a/xorg-app/xdpyinfo/xdpyinfo-1.2.0.tar.bz2.sig
b/xorg-app/xdpyinfo/xdpyinfo-1.2.0.tar.bz2.sig
deleted file mode 100644
index dbdb4c8..0000000
Binary files a/xorg-app/xdpyinfo/xdpyinfo-1.2.0.tar.bz2.sig and /dev/null
differ
diff --git a/xorg-app/xdriinfo/DEPENDS b/xorg-app/xdriinfo/DEPENDS
index 35a467a..27dd67b 100755
--- a/xorg-app/xdriinfo/DEPENDS
+++ b/xorg-app/xdriinfo/DEPENDS
@@ -1,4 +1,4 @@
depends util-macros &&
depends libx11 &&
depends glproto &&
-depends mesalib
+depends MESALIB
diff --git a/xorg-app/xdriinfo/HISTORY b/xorg-app/xdriinfo/HISTORY
index c739f6f..e1efa9e 100644
--- a/xorg-app/xdriinfo/HISTORY
+++ b/xorg-app/xdriinfo/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2011-03-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.4
SOURCE matches upstream posted SHA1
diff --git a/xorg-app/xfd/BUILD b/xorg-app/xfd/BUILD
new file mode 100755
index 0000000..a2d47ac
--- /dev/null
+++ b/xorg-app/xfd/BUILD
@@ -0,0 +1 @@
+LIBS+="-lXmu -lXrender" default_build
diff --git a/xorg-app/xfd/DEPENDS b/xorg-app/xfd/DEPENDS
index 201472b..d9a29d6 100755
--- a/xorg-app/xfd/DEPENDS
+++ b/xorg-app/xfd/DEPENDS
@@ -2,4 +2,6 @@ depends util-macros &&
depends -sub XAW7 libxaw &&
depends libxft &&
depends freetype2 &&
-depends fontconfig
+depends fontconfig &&
+depends libxmu &&
+depends libxrender
diff --git a/xorg-app/xfd/HISTORY b/xorg-app/xfd/HISTORY
index acf253c..7569d0f 100644
--- a/xorg-app/xfd/HISTORY
+++ b/xorg-app/xfd/HISTORY
@@ -1,3 +1,6 @@
+2014-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, BUILD: add dependencies on libXrender and libXmu
+
2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: killing of XPrint
* DETAILS: patchlevel++
diff --git a/xorg-app/xfontsel/DEPENDS b/xorg-app/xfontsel/DEPENDS
index 340ffef..f001b21 100755
--- a/xorg-app/xfontsel/DEPENDS
+++ b/xorg-app/xfontsel/DEPENDS
@@ -1,2 +1,5 @@
-depends util-macros &&
-depends -sub XAW7 libxaw
+depends libx11 &&
+depends -sub XAW7 libxaw &&
+depends libxmu &&
+depends libxt &&
+depends util-macros
diff --git a/xorg-app/xfontsel/HISTORY b/xorg-app/xfontsel/HISTORY
index a88071f..6d0e657 100644
--- a/xorg-app/xfontsel/HISTORY
+++ b/xorg-app/xfontsel/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.4

diff --git a/xorg-app/xlsclients/DETAILS b/xorg-app/xlsclients/DETAILS
index 1fc59d1..dacefb5 100755
--- a/xorg-app/xlsclients/DETAILS
+++ b/xorg-app/xlsclients/DETAILS
@@ -1,8 +1,8 @@
SPELL=xlsclients
- VERSION=1.1.0
+ VERSION=1.1.3
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+
SOURCE_HASH=sha512:4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-app/xlsclients/HISTORY b/xorg-app/xlsclients/HISTORY
index f577461..5cbcaa9 100644
--- a/xorg-app/xlsclients/HISTORY
+++ b/xorg-app/xlsclients/HISTORY
@@ -1,3 +1,6 @@
+2014-06-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.3
+
2010-06-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.0
SOURCE matches upstream posted SHA1
diff --git a/xorg-app/xlsclients/xlsclients-1.1.0.tar.bz2.sig
b/xorg-app/xlsclients/xlsclients-1.1.0.tar.bz2.sig
deleted file mode 100644
index b8efbc4..0000000
Binary files a/xorg-app/xlsclients/xlsclients-1.1.0.tar.bz2.sig and /dev/null
differ
diff --git a/xorg-data/xbitmaps/DEPENDS b/xorg-data/xbitmaps/DEPENDS
index 1b65df7..11ee0d0 100755
--- a/xorg-data/xbitmaps/DEPENDS
+++ b/xorg-data/xbitmaps/DEPENDS
@@ -1,2 +1,2 @@
-depends gawk &&
+depends AWK &&
depends util-macros
diff --git a/xorg-driver/wizardpen/DETAILS b/xorg-driver/wizardpen/DETAILS
index f638e5d..0a063e1 100755
--- a/xorg-driver/wizardpen/DETAILS
+++ b/xorg-driver/wizardpen/DETAILS
@@ -1,9 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=wizardpen
-if [[ "$WIZARDPEN_AUTOUPDATE" = y ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=trunk
-fi
+ VERSION=$(get_scm_version)
SOURCE="wizardpen-trunk.tar.bz2"
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
diff --git a/xorg-driver/wizardpen/HISTORY b/xorg-driver/wizardpen/HISTORY
index b8eb237..fd12b60 100644
--- a/xorg-driver/wizardpen/HISTORY
+++ b/xorg-driver/wizardpen/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: Use prepare_select_branch

diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 136be16..8da7dd9 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -1,18 +1,22 @@
depends -sub "RADEON" libdrm &&
+depends libpciaccess &&
+depends libpthread-stubs &&
+depends pixman &&
depends util-macros &&
depends xineramaproto &&
-depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+depends xproto &&
+
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&

-if [[ "$ATI_SCM" = y ]]; then
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
+ depends glamor &&
depends git
fi &&

if is_depends_enabled $SPELL mesalib ; then
-sub_depends mesalib DRI
+ sub_depends mesalib DRI
fi
-
diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index 30dba9f..ba041e0 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -1,11 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=xf86-video-ati
-if [[ $ATI_SCM == y ]]; then
- if [[ $ATI_AUTO == y ]]; then
- VERSION=$(date +%Y%m%d)
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
- else
- VERSION=scm
- fi
SOURCE=$SPELL-scm.tar.bz2

SOURCE_URL[0]="git://anongit.freedesktop.org/git/xorg/driver/$SPELL:$SPELL-scm"
SOURCE_IGNORE=volatile
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index 5b44ef7..5c20197 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,16 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-05-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: SCM branch depends on glamor
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-02-25 Ismael Luceno <ismael.luceno AT gmail.com>
* PRE_BUILD: Fix call to autogen.sh

diff --git a/xorg-driver/xf86-video-ati/PREPARE
b/xorg-driver/xf86-video-ati/PREPARE
index 52b01af..ba63470 100755
--- a/xorg-driver/xf86-video-ati/PREPARE
+++ b/xorg-driver/xf86-video-ati/PREPARE
@@ -1,5 +1,2 @@
-config_query ATI_SCM "Do you want SCM version" n &&
-if [[ $ATI_SCM == y ]]; then
- config_query ATI_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?"
n
-fi
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD
b/xorg-driver/xf86-video-ati/PRE_BUILD
index aad493a..faba109 100755
--- a/xorg-driver/xf86-video-ati/PRE_BUILD
+++ b/xorg-driver/xf86-video-ati/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [[ $ATI_SCM == y ]] ; then
+if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/xorg-driver/xf86-video-glint/DEPENDS
b/xorg-driver/xf86-video-glint/DEPENDS
index a51187e..325e1a5 100755
--- a/xorg-driver/xf86-video-glint/DEPENDS
+++ b/xorg-driver/xf86-video-glint/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-glint/HISTORY
b/xorg-driver/xf86-video-glint/HISTORY
index 64222a6..6d9f43a 100644
--- a/xorg-driver/xf86-video-glint/HISTORY
+++ b/xorg-driver/xf86-video-glint/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2.4
SOURCE matches upstream posted MD5
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index e5fd00f..faff51f 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

diff --git a/xorg-driver/xf86-video-mga/DEPENDS
b/xorg-driver/xf86-video-mga/DEPENDS
index a51187e..325e1a5 100755
--- a/xorg-driver/xf86-video-mga/DEPENDS
+++ b/xorg-driver/xf86-video-mga/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-mga/HISTORY
b/xorg-driver/xf86-video-mga/HISTORY
index 761efc6..b317eea 100644
--- a/xorg-driver/xf86-video-mga/HISTORY
+++ b/xorg-driver/xf86-video-mga/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.13
SOURCE matches upstream posted SHA1
diff --git a/xorg-driver/xf86-video-openchrome/DEPENDS
b/xorg-driver/xf86-video-openchrome/DEPENDS
index 92d51e4a..928092d 100755
--- a/xorg-driver/xf86-video-openchrome/DEPENDS
+++ b/xorg-driver/xf86-video-openchrome/DEPENDS
@@ -7,7 +7,7 @@ if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
depends subversion
fi &&

-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-openchrome/DETAILS
b/xorg-driver/xf86-video-openchrome/DETAILS
index 8f79272..c4a6d7e 100755
--- a/xorg-driver/xf86-video-openchrome/DETAILS
+++ b/xorg-driver/xf86-video-openchrome/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=xf86-video-openchrome
if [[ $XF86_VIDEO_OPENCHROME_BRANCH == scm ]]; then
- if [[ "$XF86_VIDEO_OPENCHROME_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
+ VERSION=$(get_scm_version)
SOURCE=${SPELL}-svn.tar.bz2
SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.openchrome.org/svn/trunk:$SPELL
diff --git a/xorg-driver/xf86-video-openchrome/HISTORY
b/xorg-driver/xf86-video-openchrome/HISTORY
index 92492cf..65776c1 100644
--- a/xorg-driver/xf86-video-openchrome/HISTORY
+++ b/xorg-driver/xf86-video-openchrome/HISTORY
@@ -1,3 +1,9 @@
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch

diff --git a/xorg-driver/xf86-video-r128/DEPENDS
b/xorg-driver/xf86-video-r128/DEPENDS
index a51187e..325e1a5 100755
--- a/xorg-driver/xf86-video-r128/DEPENDS
+++ b/xorg-driver/xf86-video-r128/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-r128/HISTORY
b/xorg-driver/xf86-video-r128/HISTORY
index aa28d0a..9c637a5 100644
--- a/xorg-driver/xf86-video-r128/HISTORY
+++ b/xorg-driver/xf86-video-r128/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.8.1
SOURCE matches upstream posted MD5
diff --git a/xorg-driver/xf86-video-sis/DEPENDS
b/xorg-driver/xf86-video-sis/DEPENDS
index 2b33821..9b173af 100755
--- a/xorg-driver/xf86-video-sis/DEPENDS
+++ b/xorg-driver/xf86-video-sis/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-sis/HISTORY
b/xorg-driver/xf86-video-sis/HISTORY
index 318754d..29b7753 100644
--- a/xorg-driver/xf86-video-sis/HISTORY
+++ b/xorg-driver/xf86-video-sis/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.10.3
SOURCE matches upstream posted SHA1
diff --git a/xorg-driver/xf86-video-tdfx/DEPENDS
b/xorg-driver/xf86-video-tdfx/DEPENDS
index 2b33821..9b173af 100755
--- a/xorg-driver/xf86-video-tdfx/DEPENDS
+++ b/xorg-driver/xf86-video-tdfx/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-tdfx/HISTORY
b/xorg-driver/xf86-video-tdfx/HISTORY
index 076edef..1ff292d 100644
--- a/xorg-driver/xf86-video-tdfx/HISTORY
+++ b/xorg-driver/xf86-video-tdfx/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.3
SOURCE matches upstream posted MD5
diff --git a/xorg-driver/xf86-video-via/DEPENDS
b/xorg-driver/xf86-video-via/DEPENDS
index b4e9d94..9bc878e 100755
--- a/xorg-driver/xf86-video-via/DEPENDS
+++ b/xorg-driver/xf86-video-via/DEPENDS
@@ -3,7 +3,7 @@ depends xproto &&
depends xorg-server &&
depends libdrm &&
depends libxvmc &&
-optional_depends mesalib \
+optional_depends MESALIB \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-via/HISTORY
b/xorg-driver/xf86-video-via/HISTORY
index d070737..a93132c 100644
--- a/xorg-driver/xf86-video-via/HISTORY
+++ b/xorg-driver/xf86-video-via/HISTORY
@@ -1,3 +1,6 @@
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2008-06-28 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: removed nonexistant is_depends_enabled.function sourcing

diff --git a/xorg-extras/xterm/DEPENDS b/xorg-extras/xterm/DEPENDS
index 4697753..8db8ac0 100755
--- a/xorg-extras/xterm/DEPENDS
+++ b/xorg-extras/xterm/DEPENDS
@@ -1,11 +1,11 @@
depends fontconfig &&
-depends freetype2 &&
depends libice &&
depends libsm &&
depends libx11 "--with-x" &&
depends libxaw &&
depends libxext &&
depends libxft &&
+depends libxpm &&
depends libxmu &&
depends libxrender &&
depends libxt &&
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index 1fb8e4c..a4de659 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,7 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: freetype2 was both hard and optional dep
+ depends libxpm
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 287

diff --git a/xorg-lib/libdmx/DEPENDS b/xorg-lib/libdmx/DEPENDS
index 85b09a9..d337b569 100755
--- a/xorg-lib/libdmx/DEPENDS
+++ b/xorg-lib/libdmx/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libfontenc/DEPENDS b/xorg-lib/libfontenc/DEPENDS
index 60d5bc3..166e91d 100755
--- a/xorg-lib/libfontenc/DEPENDS
+++ b/xorg-lib/libfontenc/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends libtool &&
diff --git a/xorg-lib/libfs/DEPENDS b/xorg-lib/libfs/DEPENDS
index 07bb920..99bd249 100755
--- a/xorg-lib/libfs/DEPENDS
+++ b/xorg-lib/libfs/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends zlib &&
diff --git a/xorg-lib/libice/DEPENDS b/xorg-lib/libice/DEPENDS
index 71bc1f2..c1fe4d3 100755
--- a/xorg-lib/libice/DEPENDS
+++ b/xorg-lib/libice/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends libtool &&
diff --git a/xorg-lib/liblbxutil/DEPENDS b/xorg-lib/liblbxutil/DEPENDS
index a4357ea..d37f383 100755
--- a/xorg-lib/liblbxutil/DEPENDS
+++ b/xorg-lib/liblbxutil/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends libtool &&
diff --git a/xorg-lib/liboldx/DEPENDS b/xorg-lib/liboldx/DEPENDS
index 1b77961..85c3c2b 100755
--- a/xorg-lib/liboldx/DEPENDS
+++ b/xorg-lib/liboldx/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libsm/DEPENDS b/xorg-lib/libsm/DEPENDS
index cadaee5..1ea1843 100755
--- a/xorg-lib/libsm/DEPENDS
+++ b/xorg-lib/libsm/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libx11/DEPENDS b/xorg-lib/libx11/DEPENDS
index b417f12..d266fd5 100755
--- a/xorg-lib/libx11/DEPENDS
+++ b/xorg-lib/libx11/DEPENDS
@@ -1,5 +1,5 @@
depends util-macros &&
-depends gawk &&
+depends AWK &&
depends libtool &&
depends pkgconfig &&
depends bigreqsproto &&
@@ -12,6 +12,7 @@ depends inputproto &&
depends libxau &&
depends libxdmcp &&
depends libxcb &&
+depends libpthread-stubs &&

optional_depends groff '--enable-specs' '--disable-specs' 'specification
docs' &&

diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index ea0c185..ef2bee5 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libpthread-stubs
+
2013-11-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.4.3
* CONFIGURE: Disable i18n option, breaks XIM + UTF-8
diff --git a/xorg-lib/libxau/DEPENDS b/xorg-lib/libxau/DEPENDS
index 92e1251..051ce25 100755
--- a/xorg-lib/libxau/DEPENDS
+++ b/xorg-lib/libxau/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends -sub CXX gcc &&
depends libtool &&
depends pkgconfig &&
diff --git a/xorg-lib/libxaw/DEPENDS b/xorg-lib/libxaw/DEPENDS
index 6b4a520..b406853 100755
--- a/xorg-lib/libxaw/DEPENDS
+++ b/xorg-lib/libxaw/DEPENDS
@@ -1,16 +1,22 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
+depends AWK &&
+depends pkgconfig &&
+depends libtool &&
+depends util-macros &&

if list_find "$LIBXAW_OPTS" "--enable-xaw6" ||
list_find "$LIBXAW_OPTS" "--enable-xaw7"; then
- depends xproto &&
- depends libx11 &&
- depends libxext &&
- depends libxt &&
- depends libxmu &&
- depends xextproto
+ depends libice &&
+ depends libpthread-stubs &&
+ depends libsm &&
+ depends libx11 &&
+ depends libxau &&
+ depends libxcb &&
+ depends libxdmcp &&
+ depends libxext &&
+ depends libxmu &&
+ depends libxt &&
+ depends xextproto &&
+ depends xproto
fi &&

if list_find "$LIBXAW_OPTS" "--enable-xaw7"; then
diff --git a/xorg-lib/libxaw/HISTORY b/xorg-lib/libxaw/HISTORY
index 11c9d47..3e7a6a3 100644
--- a/xorg-lib/libxaw/HISTORY
+++ b/xorg-lib/libxaw/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing X11 dependencies
+
2011-01-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.9

diff --git a/xorg-lib/libxcb/DEPENDS b/xorg-lib/libxcb/DEPENDS
index eeb999a..c619832 100755
--- a/xorg-lib/libxcb/DEPENDS
+++ b/xorg-lib/libxcb/DEPENDS
@@ -1,16 +1,17 @@
-depends xcb-proto &&
-local xcb_version=$(installed_version xcb-proto) &&
-if [[ $xcb_version == 1.2 ]] || [[ $xcb_version == 1.0 || $xcb_version ==
0.9.93 ]]; then
- force_depends xcb-proto
-fi &&
-depends libpthread-stubs &&
-depends automake &&
depends autoconf &&
+depends automake &&
depends pkgconfig &&
+depends libpthread-stubs &&
depends libtool &&
-depends libxslt &&
depends libxau &&
+depends libxdmcp &&
+depends libxslt &&
depends util-macros &&
+depends xcb-proto &&
+local xcb_version=$(installed_version xcb-proto) &&
+if [[ $xcb_version == 1.2 ]] || [[ $xcb_version == 1.0 || $xcb_version ==
0.9.93 ]]; then
+ force_depends xcb-proto
+fi &&

optional_depends doxygen \
'' \
diff --git a/xorg-lib/libxcb/HISTORY b/xorg-lib/libxcb/HISTORY
index ecfbdb0..acd212f 100644
--- a/xorg-lib/libxcb/HISTORY
+++ b/xorg-lib/libxcb/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libxdmcp
+
2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7
SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxcomposite/DEPENDS b/xorg-lib/libxcomposite/DEPENDS
index 85cb938..2d3c83e 100755
--- a/xorg-lib/libxcomposite/DEPENDS
+++ b/xorg-lib/libxcomposite/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends compositeproto &&
-depends fixesproto &&
-depends libx11 &&
-depends libxfixes &&
-depends libxext
+depends AWK &&
+depends compositeproto &&
+depends fixesproto &&
+depends pkgconfig &&
+depends libtool &&
+depends libpthread-stubs &&
+depends libxau &&
+depends libx11 &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxfixes &&
+depends libxext &&
+depends util-macros
diff --git a/xorg-lib/libxcomposite/HISTORY b/xorg-lib/libxcomposite/HISTORY
index e8520a2..242fcbc 100644
--- a/xorg-lib/libxcomposite/HISTORY
+++ b/xorg-lib/libxcomposite/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing dependencies
+
2010-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.3

diff --git a/xorg-lib/libxcursor/DEPENDS b/xorg-lib/libxcursor/DEPENDS
index f616b85..dfa5fc6 100755
--- a/xorg-lib/libxcursor/DEPENDS
+++ b/xorg-lib/libxcursor/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends fixesproto &&
-depends libxrender &&
-depends libxfixes &&
-depends libx11
+depends AWK &&
+depends fixesproto &&
+depends pkgconfig &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxfixes &&
+depends libxrender &&
+depends util-macros
diff --git a/xorg-lib/libxcursor/HISTORY b/xorg-lib/libxcursor/HISTORY
index 78330de..843debc 100644
--- a/xorg-lib/libxcursor/HISTORY
+++ b/xorg-lib/libxcursor/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing dependencies
+
2010-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.11

diff --git a/xorg-lib/libxdamage/DEPENDS b/xorg-lib/libxdamage/DEPENDS
index 080339e..e9c3e2b 100755
--- a/xorg-lib/libxdamage/DEPENDS
+++ b/xorg-lib/libxdamage/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends damageproto &&
-depends fixesproto &&
-depends xextproto &&
-depends libx11 &&
-depends libxfixes
+depends AWK &&
+depends damageproto &&
+depends fixesproto &&
+depends pkgconfig &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxfixes &&
+depends util-macros &&
+depends xextproto
diff --git a/xorg-lib/libxdamage/HISTORY b/xorg-lib/libxdamage/HISTORY
index d4c78ef..ed08aaa 100644
--- a/xorg-lib/libxdamage/HISTORY
+++ b/xorg-lib/libxdamage/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing dependencies
+
2010-06-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.3
SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxdmcp/DEPENDS b/xorg-lib/libxdmcp/DEPENDS
index 92e1251..051ce25 100755
--- a/xorg-lib/libxdmcp/DEPENDS
+++ b/xorg-lib/libxdmcp/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends -sub CXX gcc &&
depends libtool &&
depends pkgconfig &&
diff --git a/xorg-lib/libxevie/DEPENDS b/xorg-lib/libxevie/DEPENDS
index 69104d6..e4fba76 100755
--- a/xorg-lib/libxevie/DEPENDS
+++ b/xorg-lib/libxevie/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxext/DEPENDS b/xorg-lib/libxext/DEPENDS
index 285f73e..7f534f6 100755
--- a/xorg-lib/libxext/DEPENDS
+++ b/xorg-lib/libxext/DEPENDS
@@ -1,8 +1,11 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends libx11 &&
-depends xextproto &&
-depends libxau
+depends AWK &&
+depends pkgconfig &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends util-macros &&
+depends xextproto &&
+depends xproto
diff --git a/xorg-lib/libxext/HISTORY b/xorg-lib/libxext/HISTORY
index 4500eb4..22d2671 100644
--- a/xorg-lib/libxext/HISTORY
+++ b/xorg-lib/libxext/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: libpthread-stubs, libxcb, libxdmcp
+
2010-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.0

diff --git a/xorg-lib/libxfixes/DEPENDS b/xorg-lib/libxfixes/DEPENDS
index ae88176..2784933 100755
--- a/xorg-lib/libxfixes/DEPENDS
+++ b/xorg-lib/libxfixes/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends fixesproto &&
-depends xextproto &&
-depends libx11
+depends AWK &&
+depends fixesproto &&
+depends pkgconfig &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends xextproto &&
+depends xproto &&
+depends util-macros
diff --git a/xorg-lib/libxfixes/HISTORY b/xorg-lib/libxfixes/HISTORY
index ad344c9..b411576 100644
--- a/xorg-lib/libxfixes/HISTORY
+++ b/xorg-lib/libxfixes/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing dependencies
+
2011-03-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 5.0
SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxfont/DEPENDS b/xorg-lib/libxfont/DEPENDS
index da6a078..35a6e69 100755
--- a/xorg-lib/libxfont/DEPENDS
+++ b/xorg-lib/libxfont/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends zlib &&
diff --git a/xorg-lib/libxfontcache/DEPENDS b/xorg-lib/libxfontcache/DEPENDS
index d08ae41..25c8f8d 100755
--- a/xorg-lib/libxfontcache/DEPENDS
+++ b/xorg-lib/libxfontcache/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxft/DEPENDS b/xorg-lib/libxft/DEPENDS
index 56307a3..046ddb5 100755
--- a/xorg-lib/libxft/DEPENDS
+++ b/xorg-lib/libxft/DEPENDS
@@ -1,8 +1,18 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends zlib &&
-depends freetype2 &&
-depends fontconfig &&
-depends util-macros &&
-depends libxrender
+depends AWK &&
+depends expat &&
+depends freetype2 &&
+depends fontconfig &&
+depends glib2 &&
+depends harfbuzz &&
+depends libpng &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxrender &&
+depends pcre &&
+depends pkgconfig &&
+depends util-macros &&
+depends zlib
diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY
index 36182f5..1435268 100644
--- a/xorg-lib/libxft/HISTORY
+++ b/xorg-lib/libxft/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/xorg-lib/libxi/DEPENDS b/xorg-lib/libxi/DEPENDS
index 8ee9e84..95e7a26 100755
--- a/xorg-lib/libxi/DEPENDS
+++ b/xorg-lib/libxi/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends xextproto &&
-depends inputproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends inputproto &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xproto
diff --git a/xorg-lib/libxi/HISTORY b/xorg-lib/libxi/HISTORY
index ee4af64..2acae34 100644
--- a/xorg-lib/libxi/HISTORY
+++ b/xorg-lib/libxi/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing dependencies
+
2011-03-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2

diff --git a/xorg-lib/libxinerama/DEPENDS b/xorg-lib/libxinerama/DEPENDS
index c94e332..6a31abd 100755
--- a/xorg-lib/libxinerama/DEPENDS
+++ b/xorg-lib/libxinerama/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xextproto &&
-depends xineramaproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xineramaproto
diff --git a/xorg-lib/libxinerama/HISTORY b/xorg-lib/libxinerama/HISTORY
index 988713d..f967042 100644
--- a/xorg-lib/libxinerama/HISTORY
+++ b/xorg-lib/libxinerama/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1

diff --git a/xorg-lib/libxkbfile/DEPENDS b/xorg-lib/libxkbfile/DEPENDS
index afb3605..82db2bb 100755
--- a/xorg-lib/libxkbfile/DEPENDS
+++ b/xorg-lib/libxkbfile/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends kbproto &&
-depends xextproto &&
-depends xproto &&
-depends libx11
+depends AWK &&
+depends kbproto &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xproto
diff --git a/xorg-lib/libxkbfile/HISTORY b/xorg-lib/libxkbfile/HISTORY
index 22d5540..870dbc7 100644
--- a/xorg-lib/libxkbfile/HISTORY
+++ b/xorg-lib/libxkbfile/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.7

diff --git a/xorg-lib/libxkbui/DEPENDS b/xorg-lib/libxkbui/DEPENDS
index 1a31818..deeeb0e 100755
--- a/xorg-lib/libxkbui/DEPENDS
+++ b/xorg-lib/libxkbui/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxmu/DEPENDS b/xorg-lib/libxmu/DEPENDS
index 258c441..6198708 100755
--- a/xorg-lib/libxmu/DEPENDS
+++ b/xorg-lib/libxmu/DEPENDS
@@ -1,7 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends libx11 &&
-depends libxt &&
-depends libxext
+depends AWK &&
+depends libice &&
+depends libpthread-stubs &&
+depends libsm &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxt &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros
diff --git a/xorg-lib/libxmu/HISTORY b/xorg-lib/libxmu/HISTORY
index 1b461d4..57dfc52 100644
--- a/xorg-lib/libxmu/HISTORY
+++ b/xorg-lib/libxmu/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE: remove "--disable-IPv6" from LIBXMU_OPTS

diff --git a/xorg-lib/libxp/DEPENDS b/xorg-lib/libxp/DEPENDS
index 155adb2..d8fd489 100755
--- a/xorg-lib/libxp/DEPENDS
+++ b/xorg-lib/libxp/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxpm/DEPENDS b/xorg-lib/libxpm/DEPENDS
index e09baa0..094d360 100755
--- a/xorg-lib/libxpm/DEPENDS
+++ b/xorg-lib/libxpm/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends libxt &&
-depends libxext &&
-depends xproto &&
-depends libx11
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxt &&
+depends pkgconfig &&
+depends util-macros &&
+depends xproto
diff --git a/xorg-lib/libxpm/HISTORY b/xorg-lib/libxpm/HISTORY
index b8a1567..1fd993c 100644
--- a/xorg-lib/libxpm/HISTORY
+++ b/xorg-lib/libxpm/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT souremage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT souremage.org>
* DETAILS: version 3.5.9

diff --git a/xorg-lib/libxrandr/DEPENDS b/xorg-lib/libxrandr/DEPENDS
index 63e7059..1ebefe2 100755
--- a/xorg-lib/libxrandr/DEPENDS
+++ b/xorg-lib/libxrandr/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends randrproto &&
-depends renderproto &&
-depends libx11 &&
-depends libxext &&
-depends libxrender
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxrender &&
+depends pkgconfig &&
+depends randrproto &&
+depends renderproto &&
+depends util-macros
diff --git a/xorg-lib/libxrandr/HISTORY b/xorg-lib/libxrandr/HISTORY
index 152d4c5..97e8f9b 100644
--- a/xorg-lib/libxrandr/HISTORY
+++ b/xorg-lib/libxrandr/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.3.1

diff --git a/xorg-lib/libxrender/DEPENDS b/xorg-lib/libxrender/DEPENDS
index 66a9ae2..44c02d4 100755
--- a/xorg-lib/libxrender/DEPENDS
+++ b/xorg-lib/libxrender/DEPENDS
@@ -1,6 +1,10 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends renderproto &&
-depends libx11
+depends AWK &&
+depends pkgconfig &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends renderproto &&
+depends util-macros
diff --git a/xorg-lib/libxrender/HISTORY b/xorg-lib/libxrender/HISTORY
index bf34961..4e3ec13 100644
--- a/xorg-lib/libxrender/HISTORY
+++ b/xorg-lib/libxrender/HISTORY
@@ -1,3 +1,6 @@
+2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: added missing dependencies
+
2010-06-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.9.6
SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxres/DEPENDS b/xorg-lib/libxres/DEPENDS
index 170a7f6..288b5d0 100755
--- a/xorg-lib/libxres/DEPENDS
+++ b/xorg-lib/libxres/DEPENDS
@@ -1,7 +1,11 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends resourceproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends resourceproto &&
+depends util-macros
diff --git a/xorg-lib/libxres/HISTORY b/xorg-lib/libxres/HISTORY
index b7a43a2..a6c598e 100644
--- a/xorg-lib/libxres/HISTORY
+++ b/xorg-lib/libxres/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.5

diff --git a/xorg-lib/libxscrnsaver/DEPENDS b/xorg-lib/libxscrnsaver/DEPENDS
index f2e9e23..05fe127 100755
--- a/xorg-lib/libxscrnsaver/DEPENDS
+++ b/xorg-lib/libxscrnsaver/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxt/DEPENDS b/xorg-lib/libxt/DEPENDS
index be88b7b..08bedfd 100755
--- a/xorg-lib/libxt/DEPENDS
+++ b/xorg-lib/libxt/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxtrap/DEPENDS b/xorg-lib/libxtrap/DEPENDS
index c94d858..5383751 100755
--- a/xorg-lib/libxtrap/DEPENDS
+++ b/xorg-lib/libxtrap/DEPENDS
@@ -1,4 +1,4 @@
-depends gawk &&
+depends AWK &&
depends pkgconfig &&
depends libtool &&
depends util-macros &&
diff --git a/xorg-lib/libxtst/DEPENDS b/xorg-lib/libxtst/DEPENDS
index b6a3d73..717af53 100755
--- a/xorg-lib/libxtst/DEPENDS
+++ b/xorg-lib/libxtst/DEPENDS
@@ -1,10 +1,14 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends recordproto &&
-depends xextproto &&
-depends inputproto &&
-depends libx11 &&
-depends libxext &&
-depends libxi
+depends AWK &&
+depends inputproto &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxi &&
+depends pkgconfig &&
+depends recordproto &&
+depends util-macros &&
+depends xextproto
diff --git a/xorg-lib/libxtst/HISTORY b/xorg-lib/libxtst/HISTORY
index ef308e0..52d08c3 100644
--- a/xorg-lib/libxtst/HISTORY
+++ b/xorg-lib/libxtst/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.0

diff --git a/xorg-lib/libxv/DEPENDS b/xorg-lib/libxv/DEPENDS
index 495c98f..95e4570 100755
--- a/xorg-lib/libxv/DEPENDS
+++ b/xorg-lib/libxv/DEPENDS
@@ -1,8 +1,12 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xextproto &&
-depends videoproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends videoproto &&
+depends xextproto
diff --git a/xorg-lib/libxv/HISTORY b/xorg-lib/libxv/HISTORY
index 1e19fc0..10447c1 100644
--- a/xorg-lib/libxv/HISTORY
+++ b/xorg-lib/libxv/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.6

diff --git a/xorg-lib/libxvmc/DEPENDS b/xorg-lib/libxvmc/DEPENDS
index 42b9f38..0ded9a7 100755
--- a/xorg-lib/libxvmc/DEPENDS
+++ b/xorg-lib/libxvmc/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xextproto &&
-depends videoproto &&
-depends libx11 &&
-depends libxext &&
-depends libxv
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends libxv &&
+depends pkgconfig &&
+depends util-macros &&
+depends videoproto &&
+depends xextproto
diff --git a/xorg-lib/libxvmc/HISTORY b/xorg-lib/libxvmc/HISTORY
index 44db2e5..92084a8 100644
--- a/xorg-lib/libxvmc/HISTORY
+++ b/xorg-lib/libxvmc/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-09-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.6

diff --git a/xorg-lib/libxxf86dga/DEPENDS b/xorg-lib/libxxf86dga/DEPENDS
index f7cd625..89c7704 100755
--- a/xorg-lib/libxxf86dga/DEPENDS
+++ b/xorg-lib/libxxf86dga/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends xextproto &&
-depends xf86dgaproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xf86dgaproto &&
+depends xproto
diff --git a/xorg-lib/libxxf86dga/HISTORY b/xorg-lib/libxxf86dga/HISTORY
index cc29800..bf717cd 100644
--- a/xorg-lib/libxxf86dga/HISTORY
+++ b/xorg-lib/libxxf86dga/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.2

diff --git a/xorg-lib/libxxf86misc/DEPENDS b/xorg-lib/libxxf86misc/DEPENDS
index c91b472..bc623e8 100755
--- a/xorg-lib/libxxf86misc/DEPENDS
+++ b/xorg-lib/libxxf86misc/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends xextproto &&
-depends xf86miscproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xf86miscproto &&
+depends xproto
diff --git a/xorg-lib/libxxf86misc/HISTORY b/xorg-lib/libxxf86misc/HISTORY
index e643126..febcca5 100644
--- a/xorg-lib/libxxf86misc/HISTORY
+++ b/xorg-lib/libxxf86misc/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2011-03-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.3
SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxxf86vm/DEPENDS b/xorg-lib/libxxf86vm/DEPENDS
index 01d9c7c..7c81748 100755
--- a/xorg-lib/libxxf86vm/DEPENDS
+++ b/xorg-lib/libxxf86vm/DEPENDS
@@ -1,9 +1,13 @@
-depends gawk &&
-depends pkgconfig &&
-depends libtool &&
-depends util-macros &&
-depends xproto &&
-depends xextproto &&
-depends xf86vidmodeproto &&
-depends libx11 &&
-depends libxext
+depends AWK &&
+depends libpthread-stubs &&
+depends libtool &&
+depends libx11 &&
+depends libxau &&
+depends libxcb &&
+depends libxdmcp &&
+depends libxext &&
+depends pkgconfig &&
+depends util-macros &&
+depends xextproto &&
+depends xf86vidmodeproto &&
+depends xproto
diff --git a/xorg-lib/libxxf86vm/HISTORY b/xorg-lib/libxxf86vm/HISTORY
index 91a82a7..0b10cf7 100644
--- a/xorg-lib/libxxf86vm/HISTORY
+++ b/xorg-lib/libxxf86vm/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: missing depends
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1

diff --git a/xorg-proto/applewmproto/DEPENDS b/xorg-proto/applewmproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/applewmproto/DEPENDS
+++ b/xorg-proto/applewmproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/bigreqsproto/DEPENDS b/xorg-proto/bigreqsproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/bigreqsproto/DEPENDS
+++ b/xorg-proto/bigreqsproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/compositeproto/DEPENDS
b/xorg-proto/compositeproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/compositeproto/DEPENDS
+++ b/xorg-proto/compositeproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/damageproto/DEPENDS b/xorg-proto/damageproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/damageproto/DEPENDS
+++ b/xorg-proto/damageproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/dmxproto/DEPENDS b/xorg-proto/dmxproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/dmxproto/DEPENDS
+++ b/xorg-proto/dmxproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/dri2proto/DEPENDS b/xorg-proto/dri2proto/DEPENDS
index bc6dc20..442c17f 100755
--- a/xorg-proto/dri2proto/DEPENDS
+++ b/xorg-proto/dri2proto/DEPENDS
@@ -1,5 +1,5 @@
. $GRIMOIRE/FUNCTIONS
depends util-macros &&
simple_version_check_force_depends util-macros 12 2 &&
-depends gawk
+depends AWK

diff --git a/xorg-proto/evieext/DEPENDS b/xorg-proto/evieext/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/evieext/DEPENDS
+++ b/xorg-proto/evieext/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/fixesproto/DEPENDS b/xorg-proto/fixesproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/fixesproto/DEPENDS
+++ b/xorg-proto/fixesproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/fontcacheproto/DEPENDS
b/xorg-proto/fontcacheproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/fontcacheproto/DEPENDS
+++ b/xorg-proto/fontcacheproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/fontsproto/DEPENDS b/xorg-proto/fontsproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/fontsproto/DEPENDS
+++ b/xorg-proto/fontsproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/glproto/DEPENDS b/xorg-proto/glproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/glproto/DEPENDS
+++ b/xorg-proto/glproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/inputproto/DEPENDS b/xorg-proto/inputproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/inputproto/DEPENDS
+++ b/xorg-proto/inputproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/kbproto/DEPENDS b/xorg-proto/kbproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/kbproto/DEPENDS
+++ b/xorg-proto/kbproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/printproto/DEPENDS b/xorg-proto/printproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/printproto/DEPENDS
+++ b/xorg-proto/printproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/randrproto/DEPENDS b/xorg-proto/randrproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/randrproto/DEPENDS
+++ b/xorg-proto/randrproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/recordproto/DEPENDS b/xorg-proto/recordproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/recordproto/DEPENDS
+++ b/xorg-proto/recordproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/renderproto/DEPENDS b/xorg-proto/renderproto/DEPENDS
index 5d210d6..8adbe8d 100755
--- a/xorg-proto/renderproto/DEPENDS
+++ b/xorg-proto/renderproto/DEPENDS
@@ -1,3 +1,3 @@
depends xproto &&
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/resourceproto/DEPENDS
b/xorg-proto/resourceproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/resourceproto/DEPENDS
+++ b/xorg-proto/resourceproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/scrnsaverproto/DEPENDS
b/xorg-proto/scrnsaverproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/scrnsaverproto/DEPENDS
+++ b/xorg-proto/scrnsaverproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/trapproto/DEPENDS b/xorg-proto/trapproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/trapproto/DEPENDS
+++ b/xorg-proto/trapproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/videoproto/DEPENDS b/xorg-proto/videoproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/videoproto/DEPENDS
+++ b/xorg-proto/videoproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/windowswmproto/DEPENDS
b/xorg-proto/windowswmproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/windowswmproto/DEPENDS
+++ b/xorg-proto/windowswmproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xcmiscproto/DEPENDS b/xorg-proto/xcmiscproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xcmiscproto/DEPENDS
+++ b/xorg-proto/xcmiscproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xextproto/DEPENDS b/xorg-proto/xextproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xextproto/DEPENDS
+++ b/xorg-proto/xextproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86bigfontproto/DEPENDS
b/xorg-proto/xf86bigfontproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86bigfontproto/DEPENDS
+++ b/xorg-proto/xf86bigfontproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86dgaproto/DEPENDS b/xorg-proto/xf86dgaproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86dgaproto/DEPENDS
+++ b/xorg-proto/xf86dgaproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86driproto/DEPENDS b/xorg-proto/xf86driproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86driproto/DEPENDS
+++ b/xorg-proto/xf86driproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86miscproto/DEPENDS
b/xorg-proto/xf86miscproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86miscproto/DEPENDS
+++ b/xorg-proto/xf86miscproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86rushproto/DEPENDS
b/xorg-proto/xf86rushproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86rushproto/DEPENDS
+++ b/xorg-proto/xf86rushproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xf86vidmodeproto/DEPENDS
b/xorg-proto/xf86vidmodeproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xf86vidmodeproto/DEPENDS
+++ b/xorg-proto/xf86vidmodeproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xineramaproto/DEPENDS
b/xorg-proto/xineramaproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xineramaproto/DEPENDS
+++ b/xorg-proto/xineramaproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xproto/DEPENDS b/xorg-proto/xproto/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xproto/DEPENDS
+++ b/xorg-proto/xproto/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
diff --git a/xorg-proto/xproxymanagementprotocol/DEPENDS
b/xorg-proto/xproxymanagementprotocol/DEPENDS
index 18ecac5..e585ab8 100755
--- a/xorg-proto/xproxymanagementprotocol/DEPENDS
+++ b/xorg-proto/xproxymanagementprotocol/DEPENDS
@@ -1,2 +1,2 @@
depends util-macros &&
-depends gawk
+depends AWK
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 1a4692e..d5756c3 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -138,14 +138,14 @@ depends bison &&
depends flex &&
depends pkgconfig &&
depends libtool &&
-depends gawk &&
-depends mesalib &&
+depends AWK &&
+depends MESALIB &&
depends rgb &&
depends font-cursor-misc &&
depends font-misc-misc &&
depends font-alias &&
depends libpciaccess &&
-depends openssl &&
+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 c7a17f9..15c80fb 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,11 @@
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: mesalib => MESALIB
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV




  • [SM-Commit] GIT changes to devel-icu grimoire by Treeve Jelbert (e2d554eced24128dc91ac0c269427dd1586d8514), Treeve Jelbert, 10/02/2014

Archive powered by MHonArc 2.6.24.

Top of Page