summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-07-02 19:32:02 +0200
committerArwed von Merkatz2009-07-02 19:32:02 +0200
commit49cfbb0ff12ac609f8ff3ba65fd14f79687472ae (patch)
tree91ebd1df823acb0b398c08b0b9bdcab0445e14a0
parent98aa6284ae32027934bb8c4d379117ea3567f28f (diff)
parent05b24f2be299eff7a5bbe6c0e23610e9586be6e6 (diff)
Merge branch 'master' into stable-rc-0.34stable-rc-0.34
Conflicts: VERSION utils/util-linux/DETAILS utils/util-linux/HISTORY
-rw-r--r--ChangeLog99
-rwxr-xr-xaccounts1
-rwxr-xr-xantivirus/clamav/DETAILS2
-rw-r--r--antivirus/clamav/HISTORY3
-rwxr-xr-xarchive/cpio/DETAILS6
-rw-r--r--archive/cpio/HISTORY4
-rwxr-xr-xarchive/cpio/PRE_BUILD3
-rw-r--r--archive/cpio/gcc43.patch35
-rwxr-xr-xarchive/lzip/CONFLICTS1
-rwxr-xr-xarchive/lzip/DETAILS2
-rw-r--r--archive/lzip/HISTORY9
-rwxr-xr-xarchive/p7zip/DETAILS4
-rw-r--r--archive/p7zip/HISTORY3
-rwxr-xr-xarchive/xz-utils/CONFLICTS1
-rw-r--r--archive/xz-utils/HISTORY3
-rwxr-xr-xaudio-creation/aeolus/BUILD1
-rwxr-xr-xaudio-creation/aeolus/DEPENDS5
-rwxr-xr-xaudio-creation/aeolus/DETAILS24
-rw-r--r--audio-creation/aeolus/HISTORY4
-rwxr-xr-xaudio-creation/aeolus/INSTALL2
-rwxr-xr-xaudio-creation/aeolus/PRE_BUILD4
-rw-r--r--audio-creation/aeolus/aeolus.conf1
-rwxr-xr-xaudio-creation/stops/BUILD (renamed from gnome2-apps/gdeskcal/BUILD)0
-rwxr-xr-xaudio-creation/stops/DETAILS14
-rw-r--r--audio-creation/stops/HISTORY7
-rwxr-xr-xaudio-creation/stops/INSTALL7
-rw-r--r--audio-drivers/oss/HISTORY4
-rwxr-xr-xaudio-drivers/oss/PRE_BUILD5
-rw-r--r--audio-drivers/oss/nowerror.patch33
-rwxr-xr-xaudio-libs/clalsadrv/DETAILS10
-rw-r--r--audio-libs/clalsadrv/HISTORY3
-rw-r--r--audio-libs/faac/HISTORY3
-rwxr-xr-xaudio-libs/faac/PRE_BUILD3
-rw-r--r--audio-libs/libofa/HISTORY7
-rwxr-xr-xaudio-libs/libofa/PRE_BUILD7
-rw-r--r--audio-libs/libofa/libofa-0.9.3-gcc-4.4.patch17
-rwxr-xr-xaudio-libs/libogg/DETAILS5
-rw-r--r--audio-libs/libogg/HISTORY7
-rwxr-xr-xaudio-libs/libogg/PRE_BUILD5
-rwxr-xr-xaudio-libs/libvorbis/DETAILS8
-rw-r--r--audio-libs/libvorbis/HISTORY7
-rwxr-xr-xaudio-players/ario/CONFIGURE9
-rwxr-xr-xaudio-players/ario/DEPENDS29
-rwxr-xr-xaudio-players/ario/DETAILS12
-rw-r--r--audio-players/ario/HISTORY6
-rwxr-xr-xaudio-players/ario/PRE_BUILD15
-rwxr-xr-xaudio-players/banshee/DEPENDS1
-rw-r--r--audio-players/banshee/HISTORY3
-rwxr-xr-xaudio-players/mpd/BUILD3
-rwxr-xr-xaudio-players/mpd/DEPENDS48
-rwxr-xr-xaudio-players/mpd/DETAILS4
-rwxr-xr-xaudio-players/mpd/FINAL2
-rw-r--r--audio-players/mpd/HISTORY11
-rwxr-xr-xaudio-players/mpd/PRE_BUILD7
-rw-r--r--audio-players/mpd/init.d/mpd4
-rwxr-xr-xaudio-players/mpg123/CONFIGURE2
-rwxr-xr-xaudio-players/mpg123/DETAILS2
-rw-r--r--audio-players/mpg123/HISTORY11
-rwxr-xr-xaudio-players/pms/DEPENDS2
-rwxr-xr-xaudio-players/pms/DETAILS16
-rw-r--r--audio-players/pms/HISTORY3
-rwxr-xr-xaudio-players/rhythmbox/DETAILS2
-rw-r--r--audio-players/rhythmbox/HISTORY3
-rw-r--r--audio-players/rhythmbox/rhythmbox-0.12.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--audio-players/rhythmbox/rhythmbox-0.12.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xaudio-players/xmms2-scrobbler/BUILD2
-rwxr-xr-xaudio-players/xmms2-scrobbler/CONFIGURE1
-rwxr-xr-xaudio-players/xmms2-scrobbler/DEPENDS5
-rwxr-xr-xaudio-players/xmms2-scrobbler/DETAILS4
-rwxr-xr-xaudio-players/xmms2-scrobbler/FINAL10
-rw-r--r--audio-players/xmms2-scrobbler/HISTORY9
-rwxr-xr-xaudio-players/xmms2-scrobbler/INSTALL4
-rwxr-xr-xaudio-players/xmms2-scrobbler/PRE_BUILD5
-rwxr-xr-xaudio-plugins/audacious-plugins/BUILD2
-rwxr-xr-xaudio-plugins/audacious-plugins/CONFIGURE18
-rwxr-xr-xaudio-plugins/audacious-plugins/DEPENDS78
-rw-r--r--audio-plugins/audacious-plugins/HISTORY5
-rwxr-xr-xaudio-soft/feng/DEPENDS3
-rwxr-xr-xaudio-soft/feng/DETAILS4
-rw-r--r--audio-soft/feng/HISTORY4
-rw-r--r--audio-soft/musepack-tools/HISTORY3
-rwxr-xr-xaudio-soft/musepack-tools/PRE_BUILD12
-rwxr-xr-xaudio-soft/rockbox-utility/BUILD2
-rwxr-xr-xaudio-soft/rockbox-utility/DEPENDS1
-rwxr-xr-xaudio-soft/rockbox-utility/DETAILS14
-rw-r--r--audio-soft/rockbox-utility/HISTORY3
-rwxr-xr-xaudio-soft/rockbox-utility/INSTALL2
-rwxr-xr-xaudio-soft/sox/DETAILS1
-rw-r--r--audio-soft/sox/HISTORY4
-rwxr-xr-xaudio-soft/sox/PRE_BUILD4
-rw-r--r--audio-soft/sox/file-5.0.patch11
-rwxr-xr-xchat-im/ejabberd/DETAILS2
-rw-r--r--chat-im/ejabberd/HISTORY5
-rwxr-xr-xchat-im/ejabberd/PRE_BUILD3
-rw-r--r--chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch361
-rwxr-xr-xchat-im/gajim/DETAILS10
-rw-r--r--chat-im/gajim/HISTORY6
-rw-r--r--chat-im/gajim/gajim-0.12.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--chat-im/gajim/gajim-0.12.3.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xchat-im/pidgin/DETAILS2
-rw-r--r--chat-im/pidgin/HISTORY3
-rw-r--r--chat-im/pidgin/pidgin-2.5.6.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--chat-im/pidgin/pidgin-2.5.8.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xchat-im/psi/DETAILS4
-rw-r--r--chat-im/psi/HISTORY3
-rwxr-xr-xchat-im/purple-plugin-pack/DETAILS4
-rw-r--r--chat-im/purple-plugin-pack/HISTORY3
-rwxr-xr-x[-rw-r--r--]chat-irc/weechat/DETAILS0
-rwxr-xr-xchat-libs/libmsn/DETAILS4
-rw-r--r--chat-libs/libmsn/HISTORY6
-rwxr-xr-xcollab/chora/DETAILS2
-rw-r--r--collab/chora/HISTORY3
-rw-r--r--collab/chora/chora-h3-2.0.2.tar.gz.sigbin280 -> 0 bytes
-rw-r--r--collab/chora/chora-h3-2.1.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/dimp/DETAILS2
-rw-r--r--collab/dimp/HISTORY3
-rw-r--r--collab/dimp/dimp-h3-1.1.1.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--collab/dimp/dimp-h3-1.1.2.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/gollem/DETAILS2
-rw-r--r--collab/gollem/HISTORY3
-rw-r--r--collab/gollem/gollem-h3-1.0.4.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--collab/gollem/gollem-h3-1.1.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/horde/DETAILS3
-rw-r--r--collab/horde/HISTORY5
-rw-r--r--collab/horde/horde-3.3.4.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--collab/horde/horde-3.3.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xcollab/imp/DETAILS3
-rw-r--r--collab/imp/HISTORY5
-rw-r--r--collab/imp/imp-h3-4.3.2.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--collab/imp/imp-h3-4.3.4.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/kronolith/DETAILS2
-rw-r--r--collab/kronolith/HISTORY3
-rw-r--r--collab/kronolith/kronolith-h3-2.3.1.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--collab/kronolith/kronolith-h3-2.3.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xcollab/nag/DETAILS2
-rw-r--r--collab/nag/HISTORY3
-rw-r--r--collab/nag/nag-h3-2.3.1.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--collab/nag/nag-h3-2.3.2.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/passwd/DETAILS2
-rw-r--r--collab/passwd/HISTORY3
-rw-r--r--collab/passwd/passwd-h3-3.0.1.tar.gz.sigbin280 -> 0 bytes
-rw-r--r--collab/passwd/passwd-h3-3.1.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcollab/rapidsvn/DEPENDS2
-rwxr-xr-xcollab/rapidsvn/DETAILS4
-rw-r--r--collab/rapidsvn/HISTORY5
-rwxr-xr-xcollab/rapidsvn/PRE_BUILD8
-rw-r--r--collab/rapidsvn/patches/patch-src_add_action_cpp18
-rw-r--r--collab/rapidsvn/patches/patch-src_checkout_dlg_cpp11
-rw-r--r--collab/rapidsvn/patches/patch-src_export_dlg_cpp11
-rw-r--r--collab/rapidsvn/patches/patch-src_import_dlg_cpp12
-rw-r--r--collab/rapidsvn/patches/patch-src_listener_cpp12
-rw-r--r--collab/rapidsvn/patches/patch-src_log_dlg_cpp11
-rw-r--r--collab/rapidsvn/patches/patch-src_merge_dlg_cpp12
-rw-r--r--collab/rapidsvn/patches/patch-src_preferences_dlg_cpp16
-rw-r--r--collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp47
-rw-r--r--collab/rapidsvn/patches/patch-src_resolve_action_cpp18
-rwxr-xr-xcollab/subversion/DETAILS4
-rw-r--r--collab/subversion/HISTORY3
-rwxr-xr-xcollab/webmin/DETAILS4
-rw-r--r--collab/webmin/HISTORY3
-rwxr-xr-xcrypto/botan/DETAILS2
-rw-r--r--crypto/botan/HISTORY3
-rwxr-xr-xcrypto/ccrypt/DETAILS10
-rw-r--r--crypto/ccrypt/HISTORY3
-rwxr-xr-xcrypto/cryptmount/DETAILS2
-rw-r--r--crypto/cryptmount/HISTORY3
-rwxr-xr-xcrypto/dirmngr/DETAILS2
-rw-r--r--crypto/dirmngr/HISTORY3
-rwxr-xr-xcrypto/gnomint/DETAILS4
-rw-r--r--crypto/gnomint/HISTORY3
-rwxr-xr-xcrypto/gnupg-exp/DETAILS2
-rw-r--r--crypto/gnupg-exp/HISTORY3
-rwxr-xr-xcrypto/gnutls/DETAILS5
-rw-r--r--crypto/gnutls/HISTORY6
-rwxr-xr-xcrypto/gnutls/PREPARE2
-rwxr-xr-xcrypto/gpa/DETAILS6
-rw-r--r--crypto/gpa/HISTORY3
-rwxr-xr-xcrypto/gpgme/DETAILS4
-rw-r--r--crypto/gpgme/HISTORY3
-rwxr-xr-xcrypto/gpgme/PREPARE2
-rwxr-xr-xcrypto/gringotts/DETAILS4
-rw-r--r--crypto/gringotts/HISTORY3
-rwxr-xr-xcrypto/krb5/DETAILS10
-rw-r--r--crypto/krb5/HISTORY5
-rwxr-xr-xcrypto/krb5/PRE_BUILD2
-rwxr-xr-xcrypto/krb5/UP_TRIGGERS13
-rw-r--r--crypto/krb5/system-et.patch1364
-rw-r--r--crypto/krb5/system-et.patch.bz2bin0 -> 5625 bytes
-rwxr-xr-xcrypto/libksba/DETAILS2
-rw-r--r--crypto/libksba/HISTORY3
-rwxr-xr-xcrypto/loop-aes/DETAILS2
-rw-r--r--crypto/loop-aes/HISTORY3
-rwxr-xr-xcrypto/nettle/DETAILS4
-rw-r--r--crypto/nettle/HISTORY3
-rwxr-xr-xcrypto/openct/DETAILS4
-rw-r--r--crypto/openct/HISTORY4
-rwxr-xr-xcrypto/openct/INSTALL2
-rwxr-xr-xcrypto/pcsc-lite/DETAILS6
-rw-r--r--crypto/pcsc-lite/HISTORY3
-rwxr-xr-xcrypto/pinentry/DEPENDS7
-rwxr-xr-xcrypto/pinentry/DETAILS4
-rw-r--r--crypto/pinentry/HISTORY5
-rwxr-xr-xcrypto/pinentry/PRE_BUILD3
-rw-r--r--crypto/pinentry/g_mem_set_vtable.diff99
-rwxr-xr-xcrypto/scute/DETAILS4
-rw-r--r--crypto/scute/HISTORY4
-rw-r--r--crypto/scute/scute.gpgbin2551 -> 0 bytes
-rwxr-xr-xdatabase/dbd-sqlite/DETAILS4
-rw-r--r--database/dbd-sqlite/HISTORY3
-rwxr-xr-xdatabase/firebird/DETAILS4
-rw-r--r--database/firebird/HISTORY3
-rwxr-xr-xdatabase/flamerobin/DEPENDS9
-rwxr-xr-xdatabase/flamerobin/DETAILS15
-rw-r--r--database/flamerobin/HISTORY7
-rwxr-xr-xdatabase/flamerobin/PREPARE2
-rwxr-xr-xdatabase/mysql/DETAILS4
-rw-r--r--database/mysql/HISTORY12
-rwxr-xr-xdatabase/pgadmin3/DETAILS2
-rw-r--r--database/pgadmin3/HISTORY3
-rwxr-xr-xdatabase/sqlite/DETAILS4
-rw-r--r--database/sqlite/HISTORY6
-rwxr-xr-xdatabase/tokyocabinet/DETAILS4
-rw-r--r--database/tokyocabinet/HISTORY15
-rw-r--r--devel/automake-1.9/HISTORY3
-rwxr-xr-xdevel/automake-1.9/PRE_BUILD8
-rwxr-xr-xdevel/boo/DETAILS6
-rw-r--r--devel/boo/HISTORY3
-rwxr-xr-xdevel/cvs/DETAILS8
-rw-r--r--devel/cvs/HISTORY3
-rwxr-xr-xdevel/drscheme/DETAILS4
-rw-r--r--devel/drscheme/HISTORY3
-rwxr-xr-xdevel/erlang/DETAILS2
-rw-r--r--devel/erlang/HISTORY3
-rw-r--r--devel/erlang/otp_src_R13B.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--devel/erlang/otp_src_R13B01.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/falcon/DETAILS4
-rw-r--r--devel/falcon/HISTORY3
-rwxr-xr-xdevel/gcl/DEPENDS3
-rwxr-xr-xdevel/gcl/DETAILS23
-rw-r--r--devel/gcl/HISTORY10
-rwxr-xr-xdevel/gcl/PREPARE5
-rwxr-xr-xdevel/gcl/PRE_BUILD6
-rw-r--r--devel/gcl/USEGCC20
-rw-r--r--devel/gcl/suppress_pdf.patch23
-rwxr-xr-xdevel/ghc/BUILD2
-rwxr-xr-xdevel/ghc/DETAILS10
-rw-r--r--devel/ghc/HISTORY5
-rwxr-xr-xdevel/git/DETAILS2
-rw-r--r--devel/git/HISTORY6
-rwxr-xr-xdevel/make/DETAILS2
-rw-r--r--devel/make/HISTORY3
-rwxr-xr-xdevel/mono-basic/DEPENDS1
-rwxr-xr-xdevel/mono-basic/DETAILS13
-rw-r--r--devel/mono-basic/HISTORY5
-rwxr-xr-xdevel/mono-debugger/DETAILS2
-rw-r--r--devel/mono-debugger/HISTORY3
-rw-r--r--devel/mono-debugger/mono-debugger-2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/mono-debugger/mono-debugger-2.4.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/mono-tools/DEPENDS1
-rwxr-xr-xdevel/mono-tools/DETAILS2
-rw-r--r--devel/mono-tools/HISTORY4
-rw-r--r--devel/mono-tools/mono-tools-1.2.6.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/mono-tools/mono-tools-2.4.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/mono/CONFIGURE5
-rwxr-xr-xdevel/mono/DETAILS15
-rw-r--r--devel/mono/HISTORY10
-rwxr-xr-xdevel/mono/PREPARE1
-rwxr-xr-xdevel/monodevelop-debugger-gdb/DETAILS2
-rw-r--r--devel/monodevelop-debugger-gdb/HISTORY3
-rw-r--r--devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-1.9.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-2.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/monodevelop-debugger-mdb/DETAILS2
-rw-r--r--devel/monodevelop-debugger-mdb/HISTORY5
-rwxr-xr-xdevel/monodevelop-debugger-mdb/PRE_BUILD3
-rw-r--r--devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-1.9.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch478
-rw-r--r--devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/monodevelop/DEPENDS1
-rwxr-xr-xdevel/monodevelop/DETAILS2
-rw-r--r--devel/monodevelop/HISTORY4
-rw-r--r--devel/monodevelop/monodevelop-1.9.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/monodevelop/monodevelop-2.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xdevel/moon/BUILD2
-rwxr-xr-xdevel/moon/CONFIGURE7
-rwxr-xr-xdevel/moon/CONFLICTS1
-rwxr-xr-xdevel/moon/DEPENDS32
-rwxr-xr-xdevel/moon/DETAILS17
-rw-r--r--devel/moon/HISTORY2
-rwxr-xr-xdevel/moonlight/BUILD2
-rwxr-xr-xdevel/moonlight/CONFIGURE4
-rwxr-xr-xdevel/moonlight/CONFLICTS1
-rwxr-xr-xdevel/moonlight/DEPENDS33
-rwxr-xr-xdevel/moonlight/DETAILS17
-rw-r--r--devel/moonlight/HISTORY2
-rwxr-xr-xdevel/mzscheme/DETAILS4
-rw-r--r--devel/mzscheme/HISTORY3
-rwxr-xr-xdevel/nasm/DETAILS4
-rw-r--r--devel/nasm/HISTORY3
-rwxr-xr-xdevel/ocaml/DETAILS4
-rw-r--r--devel/ocaml/HISTORY3
-rwxr-xr-xdevel/oprofile/DEPENDS13
-rwxr-xr-xdevel/oprofile/DETAILS4
-rw-r--r--devel/oprofile/HISTORY6
-rwxr-xr-xdevel/oprofile/PRE_BUILD6
-rw-r--r--devel/oprofile/gcc-4.3.patch167
-rwxr-xr-xdevel/phpmyadmin/DETAILS4
-rw-r--r--devel/phpmyadmin/HISTORY6
-rwxr-xr-xdevel/python/DEPENDS1
-rw-r--r--devel/python/HISTORY3
-rwxr-xr-xdevel/qtscriptgenerator/BUILD12
-rwxr-xr-xdevel/qtscriptgenerator/DEPENDS1
-rwxr-xr-xdevel/qtscriptgenerator/DETAILS15
-rw-r--r--devel/qtscriptgenerator/HISTORY4
-rwxr-xr-xdevel/qtscriptgenerator/INSTALL2
-rwxr-xr-xdevel/qtscriptgenerator/PRE_BUILD3
-rw-r--r--devel/qtscriptgenerator/disable-phonon.patch11
-rwxr-xr-xdevel/sbcl/BUILD8
-rwxr-xr-xdevel/sbcl/DETAILS29
-rw-r--r--devel/sbcl/HISTORY12
-rwxr-xr-xdevel/sbcl/PRE_BUILD14
-rwxr-xr-xdevel/sbcl/PROVIDES1
-rw-r--r--devel/sbcl/sbcl-1.0.23-powerpc-linux-binary.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/sbcl/sbcl-1.0.23-source.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/sbcl/sbcl-1.0.23-x86-64-linux-binary.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--devel/sbcl/sbcl-1.0.23-x86-linux-binary.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xdisk/acetoneiso/BUILD2
-rwxr-xr-xdisk/acetoneiso/DEPENDS1
-rwxr-xr-xdisk/acetoneiso/DETAILS17
-rw-r--r--disk/acetoneiso/HISTORY3
-rw-r--r--disk/cdrkit/HISTORY7
-rwxr-xr-xdisk/cdrkit/PRE_BUILD3
-rwxr-xr-xdisk/cdrkit/UP_TRIGGERS4
-rw-r--r--disk/cdrkit/cdrkit-1.1.9-glibc-2.10.patch143
-rwxr-xr-xdisk/cdrtools/DETAILS1
-rw-r--r--disk/cdrtools/HISTORY5
-rwxr-xr-xdisk/cdrtools/UP_TRIGGERS4
-rwxr-xr-xdisk/ddrescue/DETAILS6
-rw-r--r--disk/ddrescue/HISTORY6
-rwxr-xr-xdisk/dvd+rw-tools/BUILD5
-rwxr-xr-xdisk/dvd+rw-tools/DETAILS1
-rw-r--r--disk/dvd+rw-tools/HISTORY5
-rw-r--r--disk/dvdrtools/HISTORY4
-rwxr-xr-xdisk/dvdrtools/UP_TRIGGERS4
-rwxr-xr-xdisk/e2fsprogs/DETAILS2
-rw-r--r--disk/e2fsprogs/HISTORY3
-rwxr-xr-xdisk/fuse/DETAILS4
-rw-r--r--disk/fuse/HISTORY3
-rwxr-xr-xdisk/fuseiso/DEPENDS1
-rwxr-xr-xdisk/fuseiso/DETAILS15
-rw-r--r--disk/fuseiso/HISTORY3
-rw-r--r--disk/genisoimage/HISTORY3
-rwxr-xr-xdisk/genisoimage/PRE_BUILD3
-rw-r--r--disk/genisoimage/cdrkit-1.1.9-glibc-2.10.patch143
-rw-r--r--disk/libburn/HISTORY4
-rwxr-xr-xdisk/libburn/UP_TRIGGERS4
-rwxr-xr-xdisk/libisoburn/DETAILS4
-rw-r--r--disk/libisoburn/HISTORY3
-rwxr-xr-xdisk/lvm/DETAILS4
-rw-r--r--disk/lvm/HISTORY3
-rwxr-xr-xdisk/mdadm/DETAILS2
-rw-r--r--disk/mdadm/HISTORY3
-rwxr-xr-xdisk/nilfs-utils/DETAILS15
-rw-r--r--disk/nilfs-utils/HISTORY3
-rwxr-xr-xdisk/rdiff-backup/DETAILS4
-rw-r--r--disk/rdiff-backup/HISTORY3
-rwxr-xr-xdisk/sg3_utils/DETAILS10
-rw-r--r--disk/sg3_utils/HISTORY6
-rwxr-xr-xdisk/udev/BUILD6
-rwxr-xr-xdisk/udev/CONFIGURE10
-rwxr-xr-xdisk/udev/DEPENDS5
-rwxr-xr-xdisk/udev/DETAILS4
-rw-r--r--disk/udev/HISTORY27
-rwxr-xr-xdisk/udev/INSTALL3
-rwxr-xr-xdisk/udev/PRE_BUILD2
-rwxr-xr-xdisplay/libggi/DEPENDS1
-rw-r--r--display/libggi/HISTORY3
-rwxr-xr-xdoc/evince/CONFIGURE4
-rwxr-xr-xdoc/evince/DEPENDS2
-rw-r--r--doc/evince/HISTORY3
-rwxr-xr-xe-16/e16-themes/DETAILS4
-rw-r--r--e-16/e16-themes/HISTORY3
-rwxr-xr-xe-16/e16/DETAILS4
-rw-r--r--e-16/e16/HISTORY3
-rwxr-xr-xe/imlib2/DEPENDS4
-rw-r--r--e/imlib2/HISTORY5
-rwxr-xr-xeditors/lyx/DETAILS4
-rw-r--r--editors/lyx/HISTORY3
-rwxr-xr-xeditors/sed/BUILD1
-rwxr-xr-xeditors/sed/DETAILS16
-rw-r--r--editors/sed/HISTORY4
-rwxr-xr-xftp-libs/libtorrent/DETAILS4
-rw-r--r--ftp-libs/libtorrent/HISTORY3
-rwxr-xr-xftp/filezilla/DEPENDS2
-rwxr-xr-xftp/filezilla/DETAILS4
-rw-r--r--ftp/filezilla/HISTORY12
-rwxr-xr-xftp/gnaughty/DEPENDS4
-rwxr-xr-xftp/gnaughty/DETAILS16
-rw-r--r--ftp/gnaughty/HISTORY3
-rwxr-xr-xftp/proftpd/DETAILS4
-rw-r--r--ftp/proftpd/HISTORY3
-rwxr-xr-xftp/rtorrent/DETAILS4
-rw-r--r--ftp/rtorrent/HISTORY3
-rwxr-xr-xftp/rtorrent/PRE_BUILD3
-rw-r--r--ftp/rtorrent/gcc44.patch109
-rwxr-xr-xftp/transmission/DETAILS2
-rw-r--r--ftp/transmission/HISTORY9
-rw-r--r--ftp/transmission/transmission-1.61.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--ftp/transmission/transmission-1.72.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/eog2/DETAILS4
-rw-r--r--gnome2-apps/eog2/HISTORY6
-rw-r--r--gnome2-apps/eog2/eog-2.26.0.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-apps/eog2/eog-2.26.3.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/epiphany/DETAILS4
-rw-r--r--gnome2-apps/epiphany/HISTORY9
-rw-r--r--gnome2-apps/epiphany/epiphany-2.26.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/epiphany/epiphany-2.26.3.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--gnome2-apps/epiphany/epiphany-2.27.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/epiphany/epiphany-2.27.3.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/file-roller/DETAILS2
-rw-r--r--gnome2-apps/file-roller/HISTORY3
-rw-r--r--gnome2-apps/file-roller/file-roller-2.26.0.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--gnome2-apps/file-roller/file-roller-2.26.2.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/gdeskcal/DEPENDS2
-rwxr-xr-xgnome2-apps/gdeskcal/DETAILS8
-rw-r--r--gnome2-apps/gdeskcal/HISTORY7
-rwxr-xr-xgnome2-apps/gdeskcal/INSTALL5
-rw-r--r--gnome2-apps/gdeskcal/gDeskCal-0_57_1.tar.gz.sigbin536 -> 0 bytes
-rwxr-xr-xgnome2-apps/glabels2/BUILD1
-rwxr-xr-xgnome2-apps/glabels2/DEPENDS13
-rwxr-xr-xgnome2-apps/glabels2/DETAILS22
-rwxr-xr-xgnome2-apps/glabels2/DOWNLOAD1
-rw-r--r--gnome2-apps/glabels2/HISTORY71
-rwxr-xr-xgnome2-apps/glabels2/INSTALL1
-rwxr-xr-xgnome2-apps/glabels2/PRE_BUILD1
-rwxr-xr-xgnome2-apps/glabels2/TRIGGERS1
-rw-r--r--gnome2-apps/glabels2/glabels-2.0.4.tar.gz.sigbin536 -> 0 bytes
-rwxr-xr-xgnome2-apps/glade3/DETAILS2
-rw-r--r--gnome2-apps/glade3/HISTORY12
-rw-r--r--gnome2-apps/glade3/glade3-3.6.3.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/glade3/glade3-3.6.7.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/gnome-color-chooser/DEPENDS2
-rwxr-xr-xgnome2-apps/gnome-color-chooser/DETAILS4
-rw-r--r--gnome2-apps/gnome-color-chooser/HISTORY4
-rwxr-xr-xgnome2-apps/gnome-do-plugins/DEPENDS3
-rwxr-xr-xgnome2-apps/gnome-do-plugins/DETAILS13
-rw-r--r--gnome2-apps/gnome-do-plugins/HISTORY5
-rwxr-xr-xgnome2-apps/gnome-do/DEPENDS3
-rwxr-xr-xgnome2-apps/gnome-do/DETAILS13
-rw-r--r--gnome2-apps/gnome-do/HISTORY5
-rw-r--r--gnome2-apps/gnome-mount/HISTORY5
-rwxr-xr-xgnome2-apps/gnome-mount/PRE_BUILD3
-rw-r--r--gnome2-apps/gnome-mount/header.patch11
-rwxr-xr-xgnome2-apps/gnumeric/DETAILS5
-rw-r--r--gnome2-apps/gnumeric/HISTORY3
-rw-r--r--gnome2-apps/gnumeric/gnumeric-1.9.8.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xgnome2-apps/gramps/DEPENDS3
-rwxr-xr-xgnome2-apps/gramps/DETAILS4
-rw-r--r--gnome2-apps/gramps/HISTORY6
-rwxr-xr-xgnome2-apps/pan/DEPENDS6
-rwxr-xr-xgnome2-apps/pan/DETAILS2
-rw-r--r--gnome2-apps/pan/HISTORY4
-rwxr-xr-xgnome2-libs/devicekit-disks/DEPENDS5
-rw-r--r--gnome2-libs/devicekit-disks/HISTORY3
-rwxr-xr-xgnome2-libs/devicekit-power/DETAILS4
-rw-r--r--gnome2-libs/devicekit-power/HISTORY3
-rwxr-xr-xgnome2-libs/enchant/DETAILS4
-rw-r--r--gnome2-libs/enchant/HISTORY3
-rw-r--r--gnome2-libs/enchant/enchant-1.4.2.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xgnome2-libs/evolution-data-server/CONFIGURE2
-rw-r--r--gnome2-libs/evolution-data-server/HISTORY3
-rwxr-xr-xgnome2-libs/glib2/DETAILS2
-rw-r--r--gnome2-libs/glib2/HISTORY3
-rw-r--r--gnome2-libs/glib2/glib-2.20.3.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/glib2/glib-2.20.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome-keyring-sharp/DEPENDS1
-rwxr-xr-xgnome2-libs/gnome-keyring-sharp/DETAILS13
-rw-r--r--gnome2-libs/gnome-keyring-sharp/HISTORY3
-rwxr-xr-xgnome2-libs/gnome-menus/DETAILS2
-rw-r--r--gnome2-libs/gnome-menus/HISTORY3
-rw-r--r--gnome2-libs/gnome-menus/gnome-menus-2.26.0.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-menus/gnome-menus-2.26.1.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome2-profile/DEPENDS101
-rw-r--r--gnome2-libs/gnome2-profile/HISTORY6
-rwxr-xr-xgnome2-libs/goffice-dev/DETAILS5
-rw-r--r--gnome2-libs/goffice-dev/HISTORY3
-rw-r--r--gnome2-libs/goffice-dev/goffice-0.7.7.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xgnome2-libs/gtksourceview/DETAILS5
-rw-r--r--gnome2-libs/gtksourceview/HISTORY3
-rw-r--r--gnome2-libs/gtksourceview/gtksourceview-2.6.2.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xgnome2-libs/libgsf/DETAILS2
-rw-r--r--gnome2-libs/libgsf/HISTORY3
-rw-r--r--gnome2-libs/libgsf/libgsf-1.14.14.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/libgsf/libgsf-1.14.15.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/murrine/DETAILS8
-rw-r--r--gnome2-libs/murrine/HISTORY6
-rwxr-xr-xgnome2-libs/pango/DETAILS2
-rw-r--r--gnome2-libs/pango/HISTORY3
-rw-r--r--gnome2-libs/pango/pango-1.24.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/pango/pango-1.24.3.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/policykit/DEPENDS4
-rw-r--r--gnome2-libs/policykit/HISTORY3
-rwxr-xr-xgnome2-libs/vino/DETAILS2
-rw-r--r--gnome2-libs/vino/HISTORY3
-rw-r--r--gnome2-libs/vino/vino-2.26.0.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-libs/vino/vino-2.26.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/vte/DETAILS2
-rw-r--r--gnome2-libs/vte/HISTORY6
-rw-r--r--gnome2-libs/vte/vte-0.20.3.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/vte/vte-0.20.5.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics-libs/jasper/DETAILS1
-rw-r--r--graphics-libs/jasper/HISTORY12
-rwxr-xr-xgraphics-libs/jasper/PRE_BUILD3
-rw-r--r--graphics-libs/jasper/jasper-memory-leak.patch28
-rw-r--r--graphics-libs/jasper/ubuntu.diff.bz2bin0 -> 9223 bytes
-rwxr-xr-xgraphics-libs/libcaca/BUILD6
-rwxr-xr-xgraphics-libs/libcaca/DEPENDS7
-rw-r--r--graphics-libs/libcaca/HISTORY4
-rwxr-xr-xgraphics-libs/liblqr/DEPENDS5
-rwxr-xr-xgraphics-libs/liblqr/DETAILS8
-rw-r--r--graphics-libs/liblqr/HISTORY4
-rwxr-xr-xgraphics-libs/libpng/DETAILS4
-rw-r--r--graphics-libs/libpng/HISTORY6
-rwxr-xr-xgraphics-libs/libpng/PRE_BUILD2
-rw-r--r--graphics-libs/libpng/libpng-1.2.31-apng.patch.bz2bin8404 -> 0 bytes
-rw-r--r--graphics-libs/libpng/libpng-1.2.37-apng.patch.gzbin0 -> 10253 bytes
-rwxr-xr-xgraphics-libs/mesalib/DETAILS4
-rw-r--r--graphics-libs/mesalib/HISTORY6
-rwxr-xr-xgraphics-libs/poppler/DEPENDS5
-rwxr-xr-xgraphics-libs/poppler/DETAILS4
-rw-r--r--graphics-libs/poppler/HISTORY4
-rwxr-xr-xgraphics-libs/pycairo/DETAILS2
-rw-r--r--graphics-libs/pycairo/HISTORY3
-rw-r--r--graphics-libs/pycairo/pycairo-1.8.4.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--graphics-libs/pycairo/pycairo-1.8.6.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics/exiv2/DETAILS4
-rw-r--r--graphics/exiv2/HISTORY3
-rwxr-xr-xgraphics/fontforge/DETAILS8
-rw-r--r--graphics/fontforge/HISTORY3
-rwxr-xr-xgraphics/geeqie/DETAILS4
-rw-r--r--graphics/geeqie/HISTORY3
-rwxr-xr-xgraphics/gscan2pdf/DETAILS4
-rw-r--r--graphics/gscan2pdf/HISTORY3
-rwxr-xr-xgraphics/imagemagick/DETAILS2
-rw-r--r--graphics/imagemagick/HISTORY15
-rw-r--r--graphics/imagemagick/ImageMagick-6.5.2-10.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--graphics/imagemagick/ImageMagick-6.5.4-2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics/kicad/BUILD6
-rwxr-xr-xgraphics/kicad/DEPENDS2
-rwxr-xr-xgraphics/kicad/DETAILS11
-rw-r--r--graphics/kicad/HISTORY7
-rwxr-xr-xgraphics/kicad/INSTALL2
-rw-r--r--graphics/kicad/kicad.patch17
-rwxr-xr-xgraphics/lcms/DETAILS6
-rw-r--r--graphics/lcms/HISTORY3
-rwxr-xr-xgraphics/mesademos/DETAILS2
-rw-r--r--graphics/mesademos/HISTORY6
-rw-r--r--graphics/mesademos/MesaDemos-7.4.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--graphics/mesademos/MesaDemos-7.4.4.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--graphics/mesademos/MesaLib-7.4.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--graphics/mesademos/MesaLib-7.4.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics/netpbm/DETAILS4
-rw-r--r--graphics/netpbm/HISTORY3
-rwxr-xr-xgraphics/wings3d/DETAILS2
-rw-r--r--graphics/wings3d/HISTORY3
-rw-r--r--graphics/wings3d/wings-1.0.1.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--graphics/wings3d/wings-1.0.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xgraphics/xaralx/DEPENDS2
-rw-r--r--graphics/xaralx/HISTORY3
-rwxr-xr-xgraphics/yafray/BUILD8
-rwxr-xr-xgraphics/yafray/DEPENDS10
-rwxr-xr-xgraphics/yafray/DETAILS14
-rw-r--r--graphics/yafray/HISTORY10
-rwxr-xr-xgraphics/yafray/PRE_BUILD2
-rw-r--r--graphics/yafray/gcc43.patch.gzbin869 -> 0 bytes
-rwxr-xr-xgroups1
-rwxr-xr-xhttp/arora/DETAILS4
-rw-r--r--http/arora/HISTORY3
-rwxr-xr-xhttp/cherokee/DETAILS4
-rw-r--r--http/cherokee/HISTORY15
-rwxr-xr-xhttp/firefox/DETAILS6
-rw-r--r--http/firefox/HISTORY22
-rwxr-xr-xhttp/firefox/INSTALL6
-rwxr-xr-xhttp/firefox/PRE_BUILD10
-rw-r--r--http/firefox/firefox-xulrunner.patch18
-rw-r--r--http/firefox/mozconfig31
-rw-r--r--http/firefox/mozconfig3126
-rwxr-xr-xhttp/lighttpd/DETAILS4
-rw-r--r--http/lighttpd/HISTORY5
-rw-r--r--http/lighttpd/fastcgi.patch26
-rwxr-xr-xhttp/seamonkey/DETAILS6
-rw-r--r--http/seamonkey/HISTORY3
-rwxr-xr-xhttp/squid/BUILD2
-rwxr-xr-xhttp/squid/DETAILS4
-rw-r--r--http/squid/HISTORY4
-rwxr-xr-xhttp/webkitgtk/DETAILS8
-rw-r--r--http/webkitgtk/HISTORY9
-rwxr-xr-xhttp/xulrunner/BUILD2
-rwxr-xr-xhttp/xulrunner/DETAILS6
-rw-r--r--http/xulrunner/HISTORY9
-rwxr-xr-xhttp/xulrunner/INSTALL2
-rwxr-xr-xhttp/xulrunner/PRE_BUILD2
-rwxr-xr-xi18n/uim/DEPENDS4
-rw-r--r--i18n/uim/HISTORY3
-rwxr-xr-xkde4-apps/amarok2/DEPENDS7
-rwxr-xr-xkde4-apps/amarok2/DETAILS5
-rw-r--r--kde4-apps/amarok2/HISTORY14
-rwxr-xr-xkde4-apps/amarok2/PRE_BUILD6
-rw-r--r--kde4-apps/amarok2/libgpod-0.7.0.patch36
-rw-r--r--kde4-apps/amarok2/qtscriptgenerator.patch13
-rw-r--r--kde4-apps/bibletime4/HISTORY3
-rwxr-xr-xkde4-apps/digikam4/DEPENDS6
-rwxr-xr-xkde4-apps/digikam4/DETAILS4
-rw-r--r--kde4-apps/digikam4/HISTORY9
-rwxr-xr-xkde4-apps/k9copy4/DETAILS4
-rw-r--r--kde4-apps/k9copy4/HISTORY3
-rwxr-xr-xkde4-apps/kdenlive4/DETAILS4
-rwxr-xr-xkde4-apps/kdenlive4/HISTORY3
-rwxr-xr-xkde4-apps/kdesvn4/DETAILS4
-rw-r--r--kde4-apps/kdesvn4/HISTORY3
-rwxr-xr-xkde4-apps/kmplayer4/DETAILS4
-rw-r--r--kde4-apps/kmplayer4/HISTORY3
-rwxr-xr-xkde4-apps/koffice2/DEPENDS1
-rwxr-xr-xkde4-apps/koffice2/DETAILS4
-rw-r--r--kde4-apps/koffice2/HISTORY8
-rwxr-xr-xkde4-apps/ktorrent4/DETAILS4
-rw-r--r--kde4-apps/ktorrent4/HISTORY3
-rwxr-xr-xkde4-apps/kwave4/DEPENDS2
-rwxr-xr-xkde4-apps/kwave4/DETAILS4
-rw-r--r--kde4-apps/kwave4/HISTORY4
-rwxr-xr-xkde4-apps/partitionmanager/DEPENDS1
-rwxr-xr-xkde4-apps/partitionmanager/DETAILS4
-rw-r--r--kde4-apps/partitionmanager/HISTORY4
-rw-r--r--kde4-apps/qtmpc/HISTORY6
-rwxr-xr-xkde4-apps/yakuake4/DETAILS4
-rw-r--r--kde4-apps/yakuake4/HISTORY3
-rwxr-xr-xkde4-support/akonadi/DETAILS4
-rw-r--r--kde4-support/akonadi/HISTORY6
-rwxr-xr-xkde4-support/soprano/DEPENDS6
-rwxr-xr-xkde4-support/soprano/DETAILS10
-rw-r--r--kde4-support/soprano/HISTORY8
-rwxr-xr-xkde4-support/soprano/PREPARE2
-rwxr-xr-xkde4/kde4-l10n/DETAILS4
-rw-r--r--kde4/kde4-l10n/HISTORY6
-rwxr-xr-xkde4/kde4-profile/DETAILS4
-rw-r--r--kde4/kde4-profile/HISTORY12
-rwxr-xr-xkde4/kdeaccessibility4/DETAILS8
-rw-r--r--kde4/kdeaccessibility4/HISTORY12
-rwxr-xr-xkde4/kdeadmin4/DETAILS8
-rw-r--r--kde4/kdeadmin4/HISTORY12
-rwxr-xr-xkde4/kdeartwork4/DETAILS8
-rw-r--r--kde4/kdeartwork4/HISTORY12
-rwxr-xr-xkde4/kdebase-workspace4/DETAILS8
-rw-r--r--kde4/kdebase-workspace4/HISTORY12
-rwxr-xr-xkde4/kdebase4-runtime/DETAILS8
-rw-r--r--kde4/kdebase4-runtime/HISTORY12
-rwxr-xr-xkde4/kdebase4/DETAILS8
-rw-r--r--kde4/kdebase4/HISTORY12
-rwxr-xr-xkde4/kdebindings4/DETAILS8
-rw-r--r--kde4/kdebindings4/HISTORY12
-rwxr-xr-xkde4/kdeedu4/DETAILS8
-rw-r--r--kde4/kdeedu4/HISTORY12
-rwxr-xr-xkde4/kdegames4/DETAILS8
-rw-r--r--kde4/kdegames4/HISTORY12
-rwxr-xr-xkde4/kdegraphics4/DETAILS8
-rw-r--r--kde4/kdegraphics4/HISTORY12
-rwxr-xr-xkde4/kdelibs4-experimental/CONFLICTS1
-rwxr-xr-xkde4/kdelibs4-experimental/DETAILS6
-rw-r--r--kde4/kdelibs4-experimental/HISTORY14
-rwxr-xr-xkde4/kdelibs4-experimental/TRIGGERS2
-rwxr-xr-xkde4/kdelibs4/DEPENDS2
-rwxr-xr-xkde4/kdelibs4/DETAILS8
-rw-r--r--kde4/kdelibs4/HISTORY15
-rwxr-xr-xkde4/kdemultimedia4/DETAILS8
-rw-r--r--kde4/kdemultimedia4/HISTORY12
-rwxr-xr-xkde4/kdenetwork4/DETAILS8
-rw-r--r--kde4/kdenetwork4/HISTORY12
-rwxr-xr-xkde4/kdepim4/DETAILS8
-rw-r--r--kde4/kdepim4/HISTORY12
-rwxr-xr-xkde4/kdepimlibs4/DETAILS8
-rw-r--r--kde4/kdepimlibs4/HISTORY12
-rwxr-xr-xkde4/kdeplasmoids4/DETAILS8
-rw-r--r--kde4/kdeplasmoids4/HISTORY12
-rwxr-xr-xkde4/kdesdk4/DETAILS8
-rw-r--r--kde4/kdesdk4/HISTORY12
-rwxr-xr-xkde4/kdetoys4/DETAILS8
-rw-r--r--kde4/kdetoys4/HISTORY12
-rwxr-xr-xkde4/kdeutils4/DETAILS8
-rw-r--r--kde4/kdeutils4/HISTORY12
-rwxr-xr-xkde4/kdevelop4/DETAILS10
-rw-r--r--kde4/kdevelop4/HISTORY3
-rwxr-xr-xkde4/kdevplatform4/DETAILS14
-rw-r--r--kde4/kdevplatform4/HISTORY4
-rwxr-xr-xkde4/kdevplatform4/PRE_BUILD3
-rwxr-xr-xkde4/kdewebdev4/DETAILS8
-rw-r--r--kde4/kdewebdev4/HISTORY12
-rwxr-xr-xkde4/oxygen-icons/DETAILS6
-rw-r--r--kde4/oxygen-icons/HISTORY9
-rwxr-xr-xkernels/kvm/DETAILS2
-rw-r--r--kernels/kvm/HISTORY3
-rw-r--r--kernels/kvm/kvm-86.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--kernels/kvm/kvm-87.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--kernels/linux/HISTORY12
-rwxr-xr-xkernels/linux/info/kernels/2.6.303
-rwxr-xr-xkernels/linux/info/patches/PRE_2_6/patch-2.6.305
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches/patch-2.6.27.256
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches/patch-2.6.29.56
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches/patch-2.6.305
-rw-r--r--kernels/linux/latest.defaults6
-rwxr-xr-xkernels/lm_sensors/DETAILS2
-rw-r--r--kernels/lm_sensors/HISTORY3
-rwxr-xr-xkernels/splashutils/DEPENDS1
-rw-r--r--kernels/splashutils/HISTORY3
-rwxr-xr-xkernels/virtualbox-module/DETAILS2
-rw-r--r--kernels/virtualbox-module/HISTORY3
-rwxr-xr-xlibs/apr-util/DETAILS2
-rw-r--r--libs/apr-util/HISTORY3
-rwxr-xr-xlibs/apr/DETAILS2
-rw-r--r--libs/apr/HISTORY3
-rwxr-xr-xlibs/boost/BUILD2
-rwxr-xr-xlibs/boost/DETAILS4
-rw-r--r--libs/boost/HISTORY5
-rwxr-xr-xlibs/boost/INSTALL2
-rwxr-xr-xlibs/boost/PRE_BUILD3
-rw-r--r--libs/boost/gcc44.diff14
-rwxr-xr-xlibs/bufferpool/DETAILS4
-rw-r--r--libs/bufferpool/HISTORY3
-rwxr-xr-xlibs/clthreads/BUILD1
-rwxr-xr-xlibs/clthreads/DEPENDS1
-rwxr-xr-xlibs/clthreads/DETAILS13
-rw-r--r--libs/clthreads/HISTORY5
-rwxr-xr-xlibs/clthreads/PRE_BUILD4
-rwxr-xr-xlibs/clxclient/BUILD1
-rwxr-xr-xlibs/clxclient/DEPENDS4
-rwxr-xr-xlibs/clxclient/DETAILS13
-rw-r--r--libs/clxclient/HISTORY3
-rwxr-xr-xlibs/clxclient/PRE_BUILD4
-rwxr-xr-xlibs/dietlibc/DETAILS10
-rw-r--r--libs/dietlibc/HISTORY3
-rwxr-xr-xlibs/dietlibc/PREPARE2
-rwxr-xr-xlibs/esdl/BUILD4
-rwxr-xr-xlibs/esdl/DETAILS6
-rw-r--r--libs/esdl/HISTORY4
-rw-r--r--libs/glibc/HISTORY3
-rwxr-xr-xlibs/glibc/init.d/nscd1
-rw-r--r--libs/gmime/HISTORY4
-rwxr-xr-xlibs/gmime/PRE_SUB_DEPENDS1
-rwxr-xr-xlibs/gmime/SUB_DEPENDS4
-rwxr-xr-xlibs/guilib/DETAILS1
-rw-r--r--libs/guilib/GUIlib-1.2.1.tar.gz.sigbin536 -> 287 bytes
-rw-r--r--libs/guilib/HISTORY3
-rwxr-xr-xlibs/icu/DETAILS9
-rw-r--r--libs/icu/HISTORY3
-rwxr-xr-xlibs/ipod-sharp/DEPENDS1
-rwxr-xr-xlibs/ipod-sharp/DETAILS2
-rw-r--r--libs/ipod-sharp/HISTORY4
-rw-r--r--libs/ipod-sharp/ipod-sharp-0.5.16.tar.gz.sigbin280 -> 0 bytes
-rw-r--r--libs/ipod-sharp/ipod-sharp-0.8.2.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xlibs/libedit/DETAILS4
-rw-r--r--libs/libedit/HISTORY3
-rwxr-xr-xlibs/libgdiplus/DETAILS4
-rw-r--r--libs/libgdiplus/HISTORY3
-rw-r--r--libs/libgdiplus/libgdiplus-2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--libs/libgdiplus/libgdiplus-2.4.2.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--libs/libnfsidmap/HISTORY3
-rw-r--r--libs/libnfsidmap/idmapd.conf2
-rwxr-xr-xlibs/libofx/DETAILS4
-rw-r--r--libs/libofx/HISTORY3
-rwxr-xr-xlibs/libsigsegv/DETAILS2
-rw-r--r--libs/libsigsegv/HISTORY3
-rwxr-xr-xlibs/libtasn1/DETAILS2
-rw-r--r--libs/libtasn1/HISTORY3
-rwxr-xr-xlibs/libusb-compat/DETAILS4
-rw-r--r--libs/libusb-compat/HISTORY3
-rwxr-xr-xlibs/libusb/DETAILS8
-rw-r--r--libs/libusb/HISTORY4
-rwxr-xr-xlibs/mono-zeroconf/DEPENDS1
-rwxr-xr-xlibs/mono-zeroconf/DETAILS17
-rw-r--r--libs/mono-zeroconf/HISTORY3
-rw-r--r--libs/mono-zeroconf/mono-zeroconf-0.9.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xlibs/nspr/DETAILS4
-rw-r--r--libs/nspr/HISTORY3
-rwxr-xr-xlibs/poco/DEPENDS4
-rwxr-xr-xlibs/poco/DETAILS4
-rw-r--r--libs/poco/HISTORY6
-rwxr-xr-xlibs/podsleuth/DEPENDS2
-rwxr-xr-xlibs/podsleuth/DETAILS27
-rw-r--r--libs/podsleuth/HISTORY4
-rwxr-xr-xlibs/podsleuth/PRE_BUILD4
-rw-r--r--libs/podsleuth/podsleuth-0.6.4.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--libs/podsleuth/podsleuth-sg3_utils.patch57
-rwxr-xr-xlibs/pyqt4/BUILD3
-rwxr-xr-xlibs/pyqt4/DETAILS10
-rw-r--r--libs/pyqt4/HISTORY10
-rwxr-xr-xlibs/sip/DETAILS4
-rw-r--r--libs/sip/HISTORY6
-rwxr-xr-xlibs/sword/DEPENDS12
-rwxr-xr-xlibs/sword/DETAILS6
-rw-r--r--libs/sword/HISTORY4
-rwxr-xr-xlibs/xapian-bindings/DETAILS4
-rw-r--r--libs/xapian-bindings/HISTORY3
-rwxr-xr-xlibs/xapian-core/DETAILS4
-rw-r--r--libs/xapian-core/HISTORY3
-rwxr-xr-xlxde/gpicview/DETAILS4
-rw-r--r--lxde/gpicview/HISTORY3
-rwxr-xr-xlxde/lxde-common/DETAILS4
-rw-r--r--lxde/lxde-common/HISTORY3
-rwxr-xr-xlxde/lxpanel/DETAILS4
-rw-r--r--lxde/lxpanel/HISTORY3
-rwxr-xr-xlxde/lxsession-lite/DETAILS8
-rw-r--r--lxde/lxsession-lite/HISTORY3
-rwxr-xr-xlxde/lxterminal/DETAILS4
-rw-r--r--lxde/lxterminal/HISTORY3
-rwxr-xr-xlxde/menu-cache/DETAILS4
-rw-r--r--lxde/menu-cache/HISTORY3
-rwxr-xr-xmail/alpine/DETAILS7
-rw-r--r--mail/alpine/HISTORY3
-rwxr-xr-xmail/dspam/DETAILS15
-rw-r--r--mail/dspam/HISTORY4
-rwxr-xr-xmail/dspam/PREPARE11
-rwxr-xr-xmail/getmail/DETAILS4
-rw-r--r--mail/getmail/HISTORY3
-rwxr-xr-xmail/postfix/BUILD11
-rwxr-xr-xmail/postfix/DEPENDS6
-rw-r--r--mail/postfix/HISTORY3
-rwxr-xr-xmail/thunderbird/DETAILS4
-rw-r--r--mail/thunderbird/HISTORY3
-rw-r--r--mobile/gpsd/BUILD4
-rwxr-xr-xmobile/gpsd/DETAILS5
-rw-r--r--mobile/gpsd/HISTORY4
-rw-r--r--mobile/gpsd/xorg.patch10
-rwxr-xr-xmobile/libsyncml/BUILD1
-rwxr-xr-xmobile/libsyncml/DEPENDS10
-rwxr-xr-xmobile/libsyncml/DETAILS6
-rw-r--r--mobile/libsyncml/HISTORY8
-rwxr-xr-xmobile/wifi-radar/DETAILS13
-rwxr-xr-xmobile/wifi-radar/HISTORY5
-rwxr-xr-xmobile/wifi-radar/PRE_BUILD2
-rw-r--r--mobile/wifi-radar/wifi-radar_Makefile.patch14
-rwxr-xr-xnet/bind-tools/DETAILS2
-rw-r--r--net/bind-tools/HISTORY3
-rwxr-xr-xnet/iptables/DETAILS2
-rw-r--r--net/iptables/HISTORY3
-rw-r--r--net/isc.gpgbin2422 -> 3660 bytes
-rwxr-xr-xnet/libproxy/DEPENDS2
-rw-r--r--net/libproxy/HISTORY3
-rwxr-xr-xnet/libupnp/DETAILS4
-rw-r--r--net/libupnp/HISTORY3
-rwxr-xr-xnet/netembryo/DETAILS4
-rw-r--r--net/netembryo/HISTORY3
-rwxr-xr-xnet/pump/DETAILS6
-rw-r--r--net/pump/HISTORY4
-rwxr-xr-xnet/pump/PRE_BUILD1
-rwxr-xr-xnet/samba/DETAILS6
-rw-r--r--net/samba/HISTORY6
-rwxr-xr-xnet/shorewall-common/DETAILS2
-rw-r--r--net/shorewall-common/HISTORY3
-rwxr-xr-xnet/shorewall-docs-html/DETAILS2
-rw-r--r--net/shorewall-docs-html/HISTORY3
-rwxr-xr-xnet/shorewall-docs-xml/DETAILS2
-rw-r--r--net/shorewall-docs-xml/HISTORY3
-rwxr-xr-xnet/shorewall-lite/DETAILS2
-rw-r--r--net/shorewall-lite/HISTORY3
-rwxr-xr-xnet/shorewall-perl/DETAILS2
-rw-r--r--net/shorewall-perl/HISTORY3
-rwxr-xr-xnet/shorewall-shell/DETAILS2
-rw-r--r--net/shorewall-shell/HISTORY3
-rwxr-xr-xnet/shorewall/DEPENDS1
-rwxr-xr-xnet/shorewall/DETAILS2
-rw-r--r--net/shorewall/HISTORY7
-rwxr-xr-xnet/shorewall6-lite/DETAILS2
-rw-r--r--net/shorewall6-lite/HISTORY3
-rwxr-xr-xnet/shorewall6/DETAILS2
-rw-r--r--net/shorewall6/HISTORY3
-rwxr-xr-xnet/strongswan/DEPENDS12
-rwxr-xr-xnet/strongswan/DETAILS5
-rw-r--r--net/strongswan/HISTORY5
-rwxr-xr-xnet/tor/DETAILS16
-rw-r--r--net/tor/HISTORY8
-rwxr-xr-xnet/ucarp/DETAILS6
-rw-r--r--net/ucarp/HISTORY3
-rwxr-xr-xnet/ushare/BUILD5
-rw-r--r--net/ushare/HISTORY3
-rwxr-xr-xnet/whois/DETAILS4
-rw-r--r--net/whois/HISTORY3
-rwxr-xr-xnet/wicd/DETAILS4
-rw-r--r--net/wicd/HISTORY6
-rwxr-xr-xnews/liferea/DETAILS2
-rw-r--r--news/liferea/HISTORY9
-rw-r--r--news/liferea/liferea-1.6.0-rc3.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--news/liferea/liferea-1.6.0-rc6.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xnews/snownews/BUILD6
-rwxr-xr-xnews/snownews/CONFIGURE1
-rwxr-xr-xnews/snownews/DEPENDS2
-rwxr-xr-xnews/snownews/DETAILS17
-rw-r--r--news/snownews/HISTORY6
-rwxr-xr-xperl-cpan/alien-wxwidgets/DEPENDS2
-rwxr-xr-xperl-cpan/alien-wxwidgets/DETAILS15
-rw-r--r--perl-cpan/alien-wxwidgets/HISTORY3
-rwxr-xr-xperl-cpan/dbd-pg/DETAILS4
-rw-r--r--perl-cpan/dbd-pg/HISTORY3
-rwxr-xr-xperl-cpan/dbd-pglite/DEPENDS4
-rwxr-xr-xperl-cpan/dbd-pglite/DETAILS15
-rw-r--r--perl-cpan/dbd-pglite/HISTORY3
-rwxr-xr-xperl-cpan/dbi/DETAILS4
-rw-r--r--perl-cpan/dbi/HISTORY3
-rwxr-xr-xperl-cpan/digest-md5/DETAILS4
-rw-r--r--perl-cpan/digest-md5/HISTORY3
-rwxr-xr-xperl-cpan/extutils-cbuilder/DETAILS5
-rw-r--r--perl-cpan/extutils-cbuilder/ExtUtils-CBuilder-0.18.tar.gz.sigbin536 -> 0 bytes
-rw-r--r--perl-cpan/extutils-cbuilder/HISTORY3
-rwxr-xr-xperl-cpan/html-parser/DETAILS4
-rw-r--r--perl-cpan/html-parser/HISTORY3
-rwxr-xr-xperl-cpan/ipc-run3/DETAILS6
-rw-r--r--perl-cpan/ipc-run3/HISTORY4
-rwxr-xr-xperl-cpan/lwp/DETAILS4
-rw-r--r--perl-cpan/lwp/HISTORY3
-rwxr-xr-xperl-cpan/mime-base64/DETAILS5
-rw-r--r--perl-cpan/mime-base64/HISTORY3
-rwxr-xr-xperl-cpan/term-readline-gnu/DETAILS7
-rw-r--r--perl-cpan/term-readline-gnu/HISTORY3
-rwxr-xr-xperl-cpan/wxperl/DEPENDS3
-rwxr-xr-xperl-cpan/wxperl/DETAILS4
-rw-r--r--perl-cpan/wxperl/HISTORY4
-rwxr-xr-xphp-pear/mnogosearch-php/BUILD5
-rwxr-xr-xphp-pear/mnogosearch-php/DEPENDS1
-rwxr-xr-xphp-pear/mnogosearch-php/DETAILS14
-rw-r--r--php-pear/mnogosearch-php/HISTORY2
-rwxr-xr-xphp-pear/mnogosearch-php/PRE_BUILD4
-rwxr-xr-xphp-pear/php/CONFIGURE3
-rwxr-xr-xphp-pear/php/DETAILS9
-rw-r--r--php-pear/php/HISTORY9
-rwxr-xr-xprinter/cups/DETAILS4
-rw-r--r--printer/cups/HISTORY3
-rwxr-xr-xprinter/glabels/DEPENDS2
-rw-r--r--printer/glabels/HISTORY3
-rwxr-xr-xprinter/gtklp/DEPENDS1
-rwxr-xr-xprinter/gtklp/DETAILS4
-rw-r--r--printer/gtklp/HISTORY5
-rwxr-xr-xprinter/gtklp/PRE_BUILD4
-rwxr-xr-xprinter/gutenprint/DETAILS4
-rwxr-xr-xprinter/gutenprint/FINAL4
-rw-r--r--printer/gutenprint/HISTORY9
-rwxr-xr-xprinter/hplip/DETAILS4
-rw-r--r--printer/hplip/HISTORY3
-rwxr-xr-xprinter/pycups/DETAILS2
-rw-r--r--printer/pycups/HISTORY3
-rwxr-xr-xprinter/zint/DETAILS4
-rw-r--r--printer/zint/HISTORY3
-rwxr-xr-xpython-devel/pywebkitgtk/DETAILS4
-rw-r--r--python-devel/pywebkitgtk/HISTORY3
-rwxr-xr-xpython-pypi/bzr/DETAILS6
-rw-r--r--python-pypi/bzr/HISTORY10
-rw-r--r--python-pypi/bzr/bzr.gpgbin92472 -> 103692 bytes
-rwxr-xr-xpython-pypi/bzrtools/DETAILS5
-rw-r--r--python-pypi/bzrtools/HISTORY6
-rwxr-xr-xpython-pypi/kaa-base/DETAILS4
-rw-r--r--python-pypi/kaa-base/HISTORY3
-rwxr-xr-xpython-pypi/kaa-metadata/DEPENDS4
-rwxr-xr-xpython-pypi/kaa-metadata/DETAILS4
-rw-r--r--python-pypi/kaa-metadata/HISTORY5
-rwxr-xr-xpython-pypi/kaa-metadata/PRE_BUILD4
-rwxr-xr-xpython-pypi/lxml/DETAILS2
-rw-r--r--python-pypi/lxml/HISTORY6
-rwxr-xr-xpython-pypi/mercurial/DETAILS4
-rw-r--r--python-pypi/mercurial/HISTORY3
-rwxr-xr-xpython-pypi/moinmoin/DETAILS6
-rw-r--r--python-pypi/moinmoin/HISTORY3
-rwxr-xr-xpython-pypi/mutagen/DETAILS6
-rw-r--r--python-pypi/mutagen/HISTORY3
-rwxr-xr-xpython-pypi/netaddr/DETAILS4
-rw-r--r--python-pypi/netaddr/HISTORY3
-rwxr-xr-xpython-pypi/pycurl/DETAILS4
-rw-r--r--python-pypi/pycurl/HISTORY3
-rwxr-xr-xpython-pypi/pyinotify/DETAILS1
-rw-r--r--python-pypi/pyinotify/HISTORY4
-rwxr-xr-xpython-pypi/pyinotify/PRE_BUILD3
-rw-r--r--python-pypi/pyinotify/pyinotify.patch17
-rwxr-xr-xpython-pypi/python-musicbrainz2/DETAILS4
-rw-r--r--python-pypi/python-musicbrainz2/HISTORY3
-rwxr-xr-xpython-pypi/pytz/DETAILS4
-rw-r--r--python-pypi/pytz/HISTORY6
-rwxr-xr-xpython-pypi/repoze.who/DETAILS4
-rw-r--r--python-pypi/repoze.who/HISTORY3
-rwxr-xr-xpython-pypi/system-config-printer/DETAILS2
-rw-r--r--python-pypi/system-config-printer/HISTORY3
-rwxr-xr-xpython-pypi/toscawidgets/DETAILS4
-rw-r--r--python-pypi/toscawidgets/HISTORY3
-rwxr-xr-xpython-pypi/zopeinterface/DETAILS4
-rw-r--r--python-pypi/zopeinterface/HISTORY3
-rwxr-xr-xruby-raa/ruby/DETAILS9
-rw-r--r--ruby-raa/ruby/HISTORY5
-rwxr-xr-xruby-raa/wxruby/DEPENDS2
-rwxr-xr-xruby-raa/wxruby/DETAILS6
-rw-r--r--ruby-raa/wxruby/HISTORY4
-rwxr-xr-xscience-libs/glpk/DETAILS5
-rw-r--r--science-libs/glpk/HISTORY3
-rwxr-xr-xscience/avogadro/DETAILS4
-rw-r--r--science/avogadro/HISTORY6
-rwxr-xr-xscience/boinc/BUILD3
-rwxr-xr-xscience/boinc/CONFIGURE5
-rwxr-xr-xscience/boinc/DETAILS6
-rw-r--r--science/boinc/HISTORY4
-rwxr-xr-xscience/gnofract4d/DETAILS4
-rw-r--r--science/gnofract4d/HISTORY3
-rwxr-xr-xscience/maxima/BUILD15
-rwxr-xr-xscience/maxima/DETAILS20
-rw-r--r--science/maxima/HISTORY5
-rw-r--r--science/maxima/maxima-5.15.0.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xscience/octave/DEPENDS5
-rwxr-xr-xscience/octave/DETAILS4
-rw-r--r--science/octave/HISTORY4
-rwxr-xr-xscience/viking/BUILD2
-rwxr-xr-xscience/viking/DEPENDS4
-rwxr-xr-xscience/viking/DETAILS4
-rw-r--r--science/viking/HISTORY6
-rwxr-xr-xsecurity-libs/linux-pam/DETAILS2
-rw-r--r--security-libs/linux-pam/HISTORY3
-rwxr-xr-xsecurity/base/BUILD1
-rwxr-xr-xsecurity/base/DEPENDS11
-rwxr-xr-xsecurity/base/DETAILS15
-rw-r--r--security/base/HISTORY3
-rwxr-xr-xsecurity/base/INSTALL9
-rwxr-xr-xsecurity/nmap/DETAILS2
-rw-r--r--security/nmap/HISTORY3
-rwxr-xr-xsecurity/pam-imap/DETAILS4
-rw-r--r--security/pam-imap/HISTORY4
-rwxr-xr-xsecurity/pam-imap/INSTALL1
-rwxr-xr-xsecurity/wipe/DETAILS6
-rw-r--r--security/wipe/HISTORY3
-rwxr-xr-xsecurity/wireshark/DETAILS4
-rw-r--r--security/wireshark/HISTORY3
-rwxr-xr-xshell-term-fm/mksh/DETAILS26
-rw-r--r--shell-term-fm/mksh/HISTORY3
-rwxr-xr-xshell-term-fm/mksh/PRE_BUILD2
-rwxr-xr-xshell-term-fm/pcmanfm/DETAILS6
-rw-r--r--shell-term-fm/pcmanfm/HISTORY3
-rwxr-xr-xshell-term-fm/rox/DEPENDS3
-rw-r--r--shell-term-fm/rox/HISTORY3
-rwxr-xr-xshell-term-fm/terminator/DETAILS7
-rw-r--r--shell-term-fm/terminator/HISTORY3
-rwxr-xr-xsmgl/linux-initramfs/FINAL3
-rw-r--r--smgl/linux-initramfs/HISTORY3
-rwxr-xr-xutils/bibletime4/BUILD2
-rwxr-xr-xutils/bibletime4/DEPENDS (renamed from kde4-apps/bibletime4/DEPENDS)3
-rwxr-xr-xutils/bibletime4/DETAILS (renamed from kde4-apps/bibletime4/DETAILS)4
-rw-r--r--utils/bibletime4/HISTORY8
-rwxr-xr-xutils/bochs/DETAILS4
-rw-r--r--utils/bochs/HISTORY3
-rwxr-xr-xutils/eggdbus/DEPENDS3
-rwxr-xr-xutils/eggdbus/DETAILS13
-rw-r--r--utils/eggdbus/HISTORY3
-rwxr-xr-xutils/findutils/DETAILS6
-rw-r--r--utils/findutils/HISTORY3
-rwxr-xr-xutils/htop/DETAILS4
-rw-r--r--utils/htop/HISTORY3
-rwxr-xr-xutils/iso-codes/DETAILS2
-rw-r--r--utils/iso-codes/HISTORY4
-rw-r--r--utils/iso-codes/iso-codes.gpgbin6737 -> 9627 bytes
-rwxr-xr-xutils/latencytop/DETAILS16
-rw-r--r--utils/latencytop/HISTORY3
-rwxr-xr-xutils/mnogosearch/BUILD6
-rwxr-xr-xutils/mnogosearch/CONFIGURE6
-rwxr-xr-xutils/mnogosearch/DEPENDS36
-rwxr-xr-xutils/mnogosearch/DETAILS17
-rw-r--r--utils/mnogosearch/HISTORY2
-rwxr-xr-xutils/mnogosearch/PRE_BUILD (renamed from http/lighttpd/PRE_BUILD)2
-rw-r--r--utils/mnogosearch/doc.patch25
-rwxr-xr-xutils/notify-sharp/DEPENDS1
-rwxr-xr-xutils/notify-sharp/DETAILS13
-rw-r--r--utils/notify-sharp/HISTORY3
-rwxr-xr-xutils/notify-sharp/PRE_BUILD (renamed from graphics/kicad/PRE_BUILD)2
-rwxr-xr-xutils/nss-ldapd/DETAILS2
-rw-r--r--utils/nss-ldapd/HISTORY3
-rwxr-xr-xutils/nut/DETAILS2
-rw-r--r--utils/nut/HISTORY3
-rwxr-xr-xutils/odt2txt/BUILD1
-rwxr-xr-xutils/odt2txt/DETAILS20
-rw-r--r--utils/odt2txt/HISTORY3
-rwxr-xr-xutils/plan9port/CONFIGURE1
-rwxr-xr-xutils/plan9port/DEPENDS6
-rwxr-xr-xutils/plan9port/DETAILS4
-rwxr-xr-xutils/plan9port/HISTORY10
-rwxr-xr-xutils/powertop/DETAILS4
-rw-r--r--utils/powertop/HISTORY3
-rwxr-xr-xutils/sudo/DEPENDS10
-rw-r--r--utils/sudo/HISTORY3
-rwxr-xr-xutils/syslinux/DETAILS2
-rw-r--r--utils/syslinux/HISTORY3
-rwxr-xr-xutils/usbutils/DETAILS6
-rw-r--r--utils/usbutils/HISTORY3
-rwxr-xr-xutils/virtualbox/DETAILS4
-rw-r--r--utils/virtualbox/HISTORY4
-rwxr-xr-xutils/virtualbox/PRE_BUILD6
-rwxr-xr-xutils/youtube-dl/DETAILS6
-rw-r--r--utils/youtube-dl/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-bad/DETAILS2
-rw-r--r--video-libs/gst-plugins-bad/HISTORY3
-rw-r--r--video-libs/gst-plugins-bad/gst-plugins-bad-0.10.12.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-bad/gst-plugins-bad-0.10.13.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-plugins-ugly/DETAILS2
-rw-r--r--video-libs/gst-plugins-ugly/HISTORY3
-rw-r--r--video-libs/gst-plugins-ugly/gst-plugins-ugly-0.10.11.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-ugly/gst-plugins-ugly-0.10.12.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/libquicktime/DETAILS4
-rw-r--r--video-libs/libquicktime/HISTORY3
-rwxr-xr-xvideo-libs/libtheora/DETAILS4
-rw-r--r--video-libs/libtheora/HISTORY3
-rwxr-xr-xvideo-libs/libv4l/DETAILS4
-rw-r--r--video-libs/libv4l/HISTORY3
-rwxr-xr-xvideo-libs/live/DETAILS4
-rw-r--r--video-libs/live/HISTORY3
-rwxr-xr-xvideo/gpac/DETAILS6
-rw-r--r--video/gpac/HISTORY3
-rwxr-xr-xvideo/guvcview/DETAILS4
-rw-r--r--video/guvcview/HISTORY3
-rwxr-xr-xvideo/lives/DETAILS4
-rw-r--r--video/lives/HISTORY3
-rwxr-xr-xvideo/minitube/BUILD2
-rwxr-xr-xvideo/minitube/DEPENDS2
-rwxr-xr-xvideo/minitube/DETAILS15
-rw-r--r--video/minitube/HISTORY3
-rwxr-xr-xvideo/minitube/INSTALL2
-rwxr-xr-xvideo/mkvtoolnix/DEPENDS11
-rw-r--r--video/mkvtoolnix/HISTORY7
-rwxr-xr-xvideo/mlt/DETAILS4
-rw-r--r--video/mlt/HISTORY3
-rw-r--r--video/vlc/HISTORY7
-rwxr-xr-xvideo/vlc/PRE_BUILD4
-rw-r--r--video/vlc/xulrunner.patch10
-rwxr-xr-xvideo/yaydl/BUILD1
-rwxr-xr-xvideo/yaydl/DEPENDS5
-rwxr-xr-xvideo/yaydl/DETAILS17
-rw-r--r--video/yaydl/HISTORY3
-rwxr-xr-xvideo/yaydl/INSTALL1
-rwxr-xr-xvideo/yaydl/PRE_BUILD3
-rwxr-xr-xwindowmanagers/fvwm/DETAILS33
-rw-r--r--windowmanagers/fvwm/HISTORY4
-rwxr-xr-xwindowmanagers/fvwm/PREPARE5
-rwxr-xr-xwindowmanagers/fvwm/PRE_BUILD8
-rwxr-xr-xwm-addons/avant-window-navigator/DETAILS4
-rw-r--r--wm-addons/avant-window-navigator/HISTORY3
-rwxr-xr-xwm-addons/cairo-dock-plugins/DEPENDS4
-rwxr-xr-xwm-addons/cairo-dock-plugins/DETAILS14
-rw-r--r--wm-addons/cairo-dock-plugins/HISTORY10
-rwxr-xr-xwm-addons/cairo-dock/DEPENDS3
-rwxr-xr-xwm-addons/cairo-dock/DETAILS13
-rw-r--r--wm-addons/cairo-dock/HISTORY9
-rwxr-xr-xx11-libs/cairo/DETAILS8
-rw-r--r--x11-libs/cairo/HISTORY3
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY6
-rw-r--r--x11-toolkits/fltk/HISTORY4
-rwxr-xr-xx11-toolkits/fltk/PRE_BUILD3
-rw-r--r--x11-toolkits/fltk/fltk-1.1.9-gcc44.patch12
-rwxr-xr-xx11-toolkits/fltk2/DETAILS4
-rw-r--r--x11-toolkits/fltk2/HISTORY5
-rwxr-xr-xx11-toolkits/fltk2/PRE_BUILD3
-rw-r--r--x11-toolkits/fltk2/fltk2-gcc44.patch11
-rwxr-xr-xx11-toolkits/gtk+2/DETAILS2
-rw-r--r--x11-toolkits/gtk+2/HISTORY6
-rw-r--r--x11-toolkits/gtk+2/gtk+-2.16.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--x11-toolkits/gtk+2/gtk+-2.16.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xx11-toolkits/lesstif/DETAILS11
-rw-r--r--x11-toolkits/lesstif/HISTORY5
-rwxr-xr-xx11-toolkits/pygtk2/DETAILS4
-rw-r--r--x11-toolkits/pygtk2/HISTORY3
-rw-r--r--x11-toolkits/pygtk2/pygtk-2.14.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--x11-toolkits/qt4/0279-svg-rendering-regression.diff10
-rwxr-xr-xx11-toolkits/qt4/DETAILS8
-rw-r--r--x11-toolkits/qt4/HISTORY6
-rwxr-xr-xx11-toolkits/qt4/PRE_BUILD4
-rwxr-xr-xx11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS15
-rwxr-xr-xx11-toolkits/qt4/REPAIR^all^SUB_DEPENDS52
-rw-r--r--x11-toolkits/qt4/odbc.patch18
-rwxr-xr-xx11-toolkits/wxgtk-new/BUILD26
-rwxr-xr-xx11-toolkits/wxgtk-new/CONFLICTS3
-rwxr-xr-xx11-toolkits/wxgtk-new/DEPENDS46
-rwxr-xr-xx11-toolkits/wxgtk-new/DETAILS22
-rw-r--r--x11-toolkits/wxgtk-new/HISTORY5
-rwxr-xr-xx11-toolkits/wxgtk-new/PROVIDES1
-rwxr-xr-xx11-toolkits/wxgtk-no-unicode/CONFLICTS3
-rw-r--r--x11-toolkits/wxgtk-no-unicode/HISTORY4
-rwxr-xr-xx11-toolkits/wxgtk-no-unicode/PROVIDES1
-rwxr-xr-xx11-toolkits/wxgtk/CONFLICTS1
-rw-r--r--x11-toolkits/wxgtk/HISTORY4
-rwxr-xr-xx11-toolkits/wxgtk/PROVIDES1
-rwxr-xr-xx11-toolkits/wxsvg/DEPENDS2
-rw-r--r--x11-toolkits/wxsvg/HISTORY3
-rwxr-xr-xx11/conky/DEPENDS14
-rwxr-xr-xx11/conky/DETAILS2
-rw-r--r--x11/conky/HISTORY8
-rw-r--r--x11/conky/conky-1.7.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--x11/conky/conky-1.7.1.1.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xx11/gkrellm2/DEPENDS7
-rw-r--r--x11/gkrellm2/HISTORY4
-rwxr-xr-xx11/gkrellm2/PRE_BUILD3
-rw-r--r--x11/gkrellm2/glibc-2.10.1.patch30
-rwxr-xr-xx11/merkaartor/BUILD1
-rwxr-xr-xx11/merkaartor/DEPENDS1
-rwxr-xr-xx11/merkaartor/DETAILS15
-rw-r--r--x11/merkaartor/HISTORY2
-rw-r--r--x11/stonx/HISTORY5
-rwxr-xr-xx11/stonx/PRE_BUILD4
-rw-r--r--x11/stonx/tail-feature-fix.patch11
-rwxr-xr-xx11/xchm/DEPENDS2
-rwxr-xr-xx11/xchm/DETAILS4
-rw-r--r--x11/xchm/HISTORY4
-rwxr-xr-xx11/xdaliclock/DETAILS4
-rw-r--r--x11/xdaliclock/HISTORY3
-rwxr-xr-xxfce-plugins/xfce4-clipman-plugin/DETAILS2
-rw-r--r--xfce-plugins/xfce4-clipman-plugin/HISTORY3
-rw-r--r--xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.0.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.0.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxfce-plugins/xfce4-screenshooter-plugin/DETAILS4
-rw-r--r--xfce-plugins/xfce4-screenshooter-plugin/HISTORY3
-rwxr-xr-xxfce-plugins/xfce4-weather-plugin/DETAILS2
-rw-r--r--xfce-plugins/xfce4-weather-plugin/HISTORY9
-rw-r--r--xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.6.2.tar.bz2.sigbin280 -> 0 bytes
-rw-r--r--xfce-plugins/xfce4-weather-plugin/xfce4-weather-plugin-0.7.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-app/bdftopcf/DEPENDS2
-rw-r--r--xorg-app/bdftopcf/HISTORY4
-rwxr-xr-xxorg-app/xfs/BUILD2
-rwxr-xr-xxorg-app/xfs/DEPENDS7
-rwxr-xr-xxorg-app/xfs/DETAILS11
-rw-r--r--xorg-app/xfs/HISTORY7
-rw-r--r--xorg-app/xfs/xfs-1.1.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-driver/xf86-video-vmware/DETAILS10
-rw-r--r--xorg-driver/xf86-video-vmware/HISTORY5
-rw-r--r--xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.5.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.6.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-lib/libfs/DETAILS1
-rw-r--r--xorg-lib/libfs/HISTORY3
-rwxr-xr-xxorg-lib/libxfont/CONFIGURE26
-rwxr-xr-xxorg-lib/libxfont/DEPENDS5
-rw-r--r--xorg-lib/libxfont/HISTORY8
-rwxr-xr-xxorg-lib/libxfont/PRE_SUB_DEPENDS13
-rw-r--r--xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS14
-rwxr-xr-xxorg-lib/libxfont/SUB_DEPENDS10
-rwxr-xr-xxorg-lib/pixman/DETAILS4
-rw-r--r--xorg-lib/pixman/HISTORY9
-rwxr-xr-xxorg-proto/dri2proto/DETAILS8
-rw-r--r--xorg-proto/dri2proto/HISTORY5
-rw-r--r--xorg-proto/dri2proto/dri2proto-2.1.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-proto/inputproto/DETAILS5
-rw-r--r--xorg-proto/inputproto/HISTORY4
-rw-r--r--xorg-proto/inputproto/inputproto-1.5.1.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-util/util-macros/DETAILS15
-rw-r--r--xorg-util/util-macros/HISTORY5
-rw-r--r--xorg-util/util-macros/util-macros-1.2.2.tar.bz2.sigbin0 -> 287 bytes
1249 files changed, 6058 insertions, 3615 deletions
diff --git a/ChangeLog b/ChangeLog
index f5c16d3b17..9ecfd35972 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+2009-07-02 Vlad Glagolev <stealth@sourcemage.org>
+ * utils/mnogosearch: new spell, full featured SQL-based hypertext search
+ engine
+ * php-pear/mnogosearch-php: new spell, PHP extension for mnoGoSearch
+
+2009-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * audio-creation/aeolus: new spell, a pipe organ emulator
+
+2009-07-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * libs/clthreads: new spell, a POSIX thread access package for
+ C++
+ * libs/clxclient: new spell, a C++ wrapper for libX11
+ * audio-creation/stops: new spell, organ stops for aeolus
+
+2009-06-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * audio-players/pms: new spell, a console mpd client
+
+2009-06-27 Bearcat M. Sandor <sourcemage@feline-soul.com>
+ * utils/odt2txt: new spell, convert OpenDocument text to plain
+ text
+
+2009-06-25 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * video/yaydl: new spell, Yet Another Youtube Downloader
+
+2009-06-25 Ladislav Hagara <hgr@vabo.cz>
+ * libs/podsleuth: new spell, a tool to discover detailed model
+ information about an Apple (TM) iPod (TM)
+ * libs/mono-zeroconf: new spell, a cross platform Zero Configuration
+ Networking library for Mono
+ * gnome2-libs/gnome-keyring-sharp: new spell, C# client library to
+ access the GNOME Keyring daemon
+ * utils/notify-sharp: new spell, C# client implementation for Desktop
+ Notifications
+ * gnome2-apps/gnome-do: new spell, an intelligent launcher tool
+ * gnome2-apps/gnome-do-plugins: new spell, plugins for gnome-do
+
+2009-06-24 Ladislav Hagara <hgr@vabo.cz>
+ * utils/eggdbus: new spell, D-Bus bindings for GObject
+
+2009-06-21 Treeve Jelbert <treeve@sourcemage.org>
+ * x11/merkaartor: new spell, edit openstreetmap data
+ submitted by Bor Kraljic <pyrobor@ver.si>
+
+2009-06-18 Treeve Jelbert <treeve@sourcemage.org>
+ * perl-cpan/dbd-pglite: new spell, PostgreSQL emulation mode for SQLite
+
+2009-06-17 Ladislav Hagara <hgr@vabo.cz>
+ * video/minitube: new spell, a native YouTube client
+
+2009-06-14 Arjan Bouter <abouter@sourcemage.org>
+ * devel/mono-basic: new spell, mono based VB
+ * devel/moon: new spell, silverlight for mono 2.4
+ * devel/moonlight: new spell, silverlight for mono 2.5/trunk
+ * security/base: new spell, snort log monitor
+
+2009-06-12 Vlad Glagolev <stealth@sourcemage.org>
+ * net/isc.gpg: added key 0B7BAE00 (Internet Systems Consortium, Inc.
+ (Signing key, 2009) <pgpkey2009@isc.org>)
+
+2009-06-12 Ladislav Hagara <hgr@vabo.cz>
+ * disk/acetoneiso: new spell, application to manage CD/DVD images
+ * disk/fuseiso: new spell, FUSE module to mount ISO filesystem images
+
+2009-06-09 Julien "_kaze_" ROZO <julien@rozo.org>
+ * audio-soft/rockbox-utility: new spell, automated installer for Rockbox
+
+2009-06-09 Julien "_kaze_" ROZO <julien@rozo.org>
+ * kde4-apps/bibletime4: moved to utils/bibletime4
+ * utils/bibletime4: moved from kde4-apps/bibletime
+
+2009-06-09 Treeve Jelbert <treeve@sourcemage.org>
+ * perl-cpan/alien-wxwidgets: new spell
+
+2009-06-08 Bearcat M. Sandor <sourcemage@feline-soul.com>
+ * cairo-dock: new spell, a cairo-based dock
+
+2009-06-08 Bearcat M. Sandor <sourcemage@feline-soul.com>
+ * cairo-dock-plugins: new spell, plugins for cairo-dock
+
+2009-06-08 Treeve Jelbert <treeve@sourcemage.org>
+ * x11-toolkits/wxgtk-new: new spell, for wxgtk-2.9
+ build process is so different that it is easier to split things
+
+2009-06-08 Bearcat M. Sandor <sourcemage@feline-soul.com>
+ * ftp/gnaughty: new spell, an automatic porn graber
+
+2009-06-06 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * accounts, groups: added oprofile
+
+2009-06-05 Julien "_kaze_" ROZO <julien@rozo.org>
+ * devel/qtscriptgenerator: new spell, a tool that generates Qt
+ bindings for Qt Script
+
+2009-06-03 Ladislav Hagara <hgr@vabo.cz>
+ * disk/nilfs-utils: new spell, a log-structured file system utils
+
+2009-06-03 Robert Figura <template@sourcemage.org>
+ * utils/latencytop: new spell, measure kernel and process latency
+
2009-06-01 Treeve Jelbert <treeve@sourcemage.org>
* kde4-apps/krename4: new spell, file renaming
diff --git a/accounts b/accounts
index d7fbb95789..94cf3dc48e 100755
--- a/accounts
+++ b/accounts
@@ -76,4 +76,5 @@ backuppc:162:166
pulse:163:167
nginx:164:170
halevt:165:172
+oprofile:166:173
nobody:65534:65534
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 8258e2acca..7c617d3598 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.95.1
+ VERSION=0.95.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 730e5b8bcb..ddd3bae547 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,6 @@
+2009-06-10 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.95.2
+
2009-04-08 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.95.1
diff --git a/archive/cpio/DETAILS b/archive/cpio/DETAILS
index 849a35c35e..ffb8e3f699 100755
--- a/archive/cpio/DETAILS
+++ b/archive/cpio/DETAILS
@@ -1,6 +1,6 @@
SPELL=cpio
- VERSION=2.9
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.10
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
- PATCHLEVEL=1
+ PATCHLEVEL=0
KEYWORDS="archive"
SHORT="Creates cpio archives and have rmt"
cat << EOF
diff --git a/archive/cpio/HISTORY b/archive/cpio/HISTORY
index a27e0b983b..22fc3abfe7 100644
--- a/archive/cpio/HISTORY
+++ b/archive/cpio/HISTORY
@@ -1,3 +1,7 @@
+2009-06-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.10, gz -> bz2
+ * PRE_BUILD, gcc43.patch: removed
+
2009-01-15 George Sherwood <gsherwood@sourcemage.org>
* PRE_REMOVE: Added to remove info files properly
* POST_REMOVE: Removed.
diff --git a/archive/cpio/PRE_BUILD b/archive/cpio/PRE_BUILD
deleted file mode 100755
index 1ecc0dc4f7..0000000000
--- a/archive/cpio/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/archive/cpio/gcc43.patch b/archive/cpio/gcc43.patch
deleted file mode 100644
index ee41c8d28c..0000000000
--- a/archive/cpio/gcc43.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Patch from Ladislav Michnovic:
-# from http://www.nabble.com/Patch%3A-compile-cpio-2.9-with-new-gcc-4.3-to12876731.html
-#
---- lib/argp.h.orig 2007-09-25 11:04:18.000000000 +0200
-+++ lib/argp.h 2007-09-25 11:06:24.000000000 +0200
-@@ -580,7 +580,11 @@
- # endif
-
- # ifndef ARGP_EI
--# define ARGP_EI extern __inline__
-+# if defined __GNUC_STDC_INLINE__
-+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
-+# else
-+# define ARGP_EI extern __inline__
-+# endif
- # endif
-
- ARGP_EI void
---- lib/argp-fmtstream.h.orig 2007-09-25 11:06:49.000000000 +0200
-+++ lib/argp-fmtstream.h 2007-09-25 11:07:35.000000000 +0200
-@@ -198,8 +198,12 @@
- #endif
-
- #ifndef ARGP_FS_EI
-+#ifdef __GNUC_STDC_INLINE__
-+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
-+#else
- #define ARGP_FS_EI extern inline
- #endif
-+#endif
-
- ARGP_FS_EI size_t
- __argp_fmtstream_write (argp_fmtstream_t __fs,
-
diff --git a/archive/lzip/CONFLICTS b/archive/lzip/CONFLICTS
new file mode 100755
index 0000000000..12987ce0c5
--- /dev/null
+++ b/archive/lzip/CONFLICTS
@@ -0,0 +1 @@
+conflicts xz-utils
diff --git a/archive/lzip/DETAILS b/archive/lzip/DETAILS
index 3eb49186de..9fa3ad2c9d 100755
--- a/archive/lzip/DETAILS
+++ b/archive/lzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=lzip
- VERSION=1.5
+ VERSION=1.7
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 549e6d53c4..c815cdd672 100644
--- a/archive/lzip/HISTORY
+++ b/archive/lzip/HISTORY
@@ -1,3 +1,12 @@
+2009-06-27 Treeve Jelbert <treeve@sourcemage.org>
+ * CONFLICTS: added, for xz-utils
+
+2009-06-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.7
+
+2009-06-23 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.6
+
2009-04-15 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.5
* lzip.gpg: added
diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index 84f67accb9..b9c17debc7 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -1,6 +1,6 @@
SPELL=p7zip
- VERSION=4.65
- SOURCE_HASH=sha512:ae4a48a959b03b519ff00df510194d4d5780c198c8f4fb907fd2e209728fb77db7baa85d3a5438ca5d94af37a8e736f7486f8cac1ba606cd56b917aed11dac85
+ VERSION=9.04
+ SOURCE_HASH=sha512:1bc81d0312341fe9c9c8ad002556046e9f944f35707f39410c88252736cec3793fb87d57f3e578c68512c3dd774b1de3a8987c90c363af7dfc7d3924e82ab277
SOURCE=${SPELL}_${VERSION}_src_all.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 4c7c6bf925..6d56b50aef 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,6 @@
+2009-06-08 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 9.04
+
2009-02-14 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.65
diff --git a/archive/xz-utils/CONFLICTS b/archive/xz-utils/CONFLICTS
index 2040ae7f49..98f127bed1 100755
--- a/archive/xz-utils/CONFLICTS
+++ b/archive/xz-utils/CONFLICTS
@@ -1 +1,2 @@
conflicts lzma-utils
+conflicts lzip
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index 831db61fe9..e8eb6b66c1 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,6 @@
+2009-06-27 Treeve Jelbert <treeve@sourcemage.org>
+ * CONFLICTS: add lzip (installs same files)
+
2009-03-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, CONFLICTS: spell created, version 4.999.8beta, #13176
diff --git a/audio-creation/aeolus/BUILD b/audio-creation/aeolus/BUILD
new file mode 100755
index 0000000000..8f58e6df93
--- /dev/null
+++ b/audio-creation/aeolus/BUILD
@@ -0,0 +1 @@
+make
diff --git a/audio-creation/aeolus/DEPENDS b/audio-creation/aeolus/DEPENDS
new file mode 100755
index 0000000000..9d493a3b2a
--- /dev/null
+++ b/audio-creation/aeolus/DEPENDS
@@ -0,0 +1,5 @@
+depends clxclient &&
+depends clthreads &&
+depends clalsadrv &&
+depends jack &&
+depends stops
diff --git a/audio-creation/aeolus/DETAILS b/audio-creation/aeolus/DETAILS
new file mode 100755
index 0000000000..d5458409ed
--- /dev/null
+++ b/audio-creation/aeolus/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=aeolus
+ VERSION=0.8.2
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/${SOURCE}
+ SOURCE_HASH=sha512:c34c8337d709bde2fa0e3dc16c777e6cba8a8c267a4d50cf9f777d510bfed14cdbded3cfccae1f463bfcc4132df010cd4ea8bd7c0e455bcdb85646fbdcacdba4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.kokkinizita.net/linuxaudio/aeolus/index.html"
+ LICENSE[0]=GPL
+ ENTERED=20090701
+ SHORT="a synthesised pipe organ emulator"
+cat << EOF
+Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that should be
+good enough to make an organist enjoy playing it. It is a software synthesiser
+optimised for this job, with possibly hundreds of controls for each stop,
+that enable the user to "voice" his instrument.
+
+Main features of the default instrument: three manuals and one pedal, five
+different temperaments, variable tuning, MIDI control of course, stereo,
+surround or Ambisonics output, flexible audio controls including a large
+church reverb.
+
+Aeolus is not very CPU-hungry, and should run without problems on a e.g. a
+1GHz, 256Mb machine.
+EOF
diff --git a/audio-creation/aeolus/HISTORY b/audio-creation/aeolus/HISTORY
new file mode 100644
index 0000000000..d4adefc36d
--- /dev/null
+++ b/audio-creation/aeolus/HISTORY
@@ -0,0 +1,4 @@
+2009-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD, aeolus.conf:
+ spell created
+
diff --git a/audio-creation/aeolus/INSTALL b/audio-creation/aeolus/INSTALL
new file mode 100755
index 0000000000..3226c1e15e
--- /dev/null
+++ b/audio-creation/aeolus/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install_config_file ${SPELL_DIRECTORY}/aeolus.conf /etc/aeolus.conf
diff --git a/audio-creation/aeolus/PRE_BUILD b/audio-creation/aeolus/PRE_BUILD
new file mode 100755
index 0000000000..120c5420f6
--- /dev/null
+++ b/audio-creation/aeolus/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sedit "s:PREFIX = .*:PREFIX = ${INSTALL_ROOT}/usr:" Makefile
diff --git a/audio-creation/aeolus/aeolus.conf b/audio-creation/aeolus/aeolus.conf
new file mode 100644
index 0000000000..501e870d53
--- /dev/null
+++ b/audio-creation/aeolus/aeolus.conf
@@ -0,0 +1 @@
+-u -A -S /usr/share/aeolus/stops-0.3.0
diff --git a/gnome2-apps/gdeskcal/BUILD b/audio-creation/stops/BUILD
index 27ba77ddaf..27ba77ddaf 100755
--- a/gnome2-apps/gdeskcal/BUILD
+++ b/audio-creation/stops/BUILD
diff --git a/audio-creation/stops/DETAILS b/audio-creation/stops/DETAILS
new file mode 100755
index 0000000000..6fbd6c64f3
--- /dev/null
+++ b/audio-creation/stops/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=stops
+ VERSION=0.3.0
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/${SOURCE}
+ SOURCE_HASH=sha512:a6572a42c6796aa08b9085bfc4cb9e252091310224a0b8867eaf5d41f399b2649744c357506ae5fb64a82018f0da702bacbdc7e96965a1116f08d0a248d28ad3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ PATCH_LEVEL=1
+ WEB_SITE="http://www.kokkinizita.net/linuxaudio/aeolus/index.html"
+ LICENSE[0]=GPL
+ ENTERED=20090701
+ SHORT="organ stops for aeolus"
+cat << EOF
+Organ stops for aeolus. These are needed so aeolus plays any sound at all.
+EOF
diff --git a/audio-creation/stops/HISTORY b/audio-creation/stops/HISTORY
new file mode 100644
index 0000000000..c750ff59f1
--- /dev/null
+++ b/audio-creation/stops/HISTORY
@@ -0,0 +1,7 @@
+2009-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * INSTALL: corrected file permissions
+ * DETAILS: PATCH_LEVEL++
+
+2009-07-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL: spell created
+
diff --git a/audio-creation/stops/INSTALL b/audio-creation/stops/INSTALL
new file mode 100755
index 0000000000..118ffceca0
--- /dev/null
+++ b/audio-creation/stops/INSTALL
@@ -0,0 +1,7 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/aeolus/${SPELL}-${VERSION} &&
+cd ${SOURCE_DIRECTORY} &&
+cp -R * ${INSTALL_ROOT}/usr/share/aeolus/${SPELL}-${VERSION} &&
+find ${INSTALL_ROOT}/usr/share/aeolus/${SPELL}-${VERSION} -type f -exec \
+ chmod 644 {} \; &&
+find ${INSTALL_ROOT}/usr/share/aeolus/${SPELL}-${VERSION} -type d -exec \
+ chmod 755 {} \;
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index d7dafce9e0..81a289f670 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,7 @@
+2009-06-05 Ethan Grammatikidis <eekee57@fastmail.fm>
+ * PRE_BUILD: changed patch to sed script
+ * nowerror.patch: removed
+
2009-03-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: updated OSS_BRANCH=stable to v4.1-build1051
* DEPENDS: missing bc as dependency
diff --git a/audio-drivers/oss/PRE_BUILD b/audio-drivers/oss/PRE_BUILD
index e5efc6a2bd..f8423431e4 100755
--- a/audio-drivers/oss/PRE_BUILD
+++ b/audio-drivers/oss/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&
if [[ $OSS_BRANCH != stable ]]; then
-patch -p0 < $SPELL_DIRECTORY/nowerror.patch
+ sed -i 's/-Werror//' \
+ setup/Linux/oss/build/install.sh \
+ setup/srcconf_linux.inc
fi
-
diff --git a/audio-drivers/oss/nowerror.patch b/audio-drivers/oss/nowerror.patch
deleted file mode 100644
index 80a7a65acb..0000000000
--- a/audio-drivers/oss/nowerror.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar setup.orig/Linux/oss/build/install.sh setup/Linux/oss/build/install.sh
---- setup.orig/Linux/oss/build/install.sh 2008-11-20 07:57:50.000000000 +0100
-+++ setup/Linux/oss/build/install.sh 2008-11-20 07:58:50.000000000 +0100
-@@ -336,7 +336,7 @@
-
- # Recompile libflashsupport.so if possible. Otherwise use the precompiled
- # version.
--(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall -Werror flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1
-+(cd $OSSLIBDIR/lib;gcc -m32 -shared -fPIC -O2 -Wall flashsupport.c -o $OSSLIBDIR/lib/libflashsupport.so) > /dev/null 2>&1
-
- if test ! -f $OSSLIBDIR/etc/userdefs
- then
-diff -Nuar setup.orig/srcconf_linux.inc setup/srcconf_linux.inc
---- setup.orig/srcconf_linux.inc 2008-11-20 07:57:50.000000000 +0100
-+++ setup/srcconf_linux.inc 2008-11-20 07:58:11.000000000 +0100
-@@ -26,7 +26,7 @@
- if (system(cmd)==0)
- {
- if (do_warning_checks)
-- strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall -Werror");
-+ strcpy(conf->OSflags, "-fno-common -fno-stack-protector -Wall");
- else
- strcpy(conf->OSflags, "-fno-common -fno-stack-protector");
- unlink("srcconf.o");
-@@ -34,7 +34,7 @@
- else
- {
- if (do_warning_checks)
-- strcpy(conf->OSflags, "-fno-common -Wall -Werror");
-+ strcpy(conf->OSflags, "-fno-common -Wall");
- else
- strcpy(conf->OSflags, "-fno-common");
- }
diff --git a/audio-libs/clalsadrv/DETAILS b/audio-libs/clalsadrv/DETAILS
index cf0e4b48a9..459d24ca4d 100755
--- a/audio-libs/clalsadrv/DETAILS
+++ b/audio-libs/clalsadrv/DETAILS
@@ -1,9 +1,9 @@
SPELL=clalsadrv
- VERSION=1.1.0
- SOURCE=$SPELL-$VERSION-1.tar.bz2
- SOURCE_URL[0]=http://users.skynet.be/solaris/linuxaudio/downloads/$SOURCE
- SOURCE_HASH=sha512:6715d06e700e4f489098bcb69955f96f6446e74a2a8a6af00fa879aaad0f095ff50d7af3cd2cfa753d75371a432a0eb652809b142bac0834dddafd3e1b1490fb
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=1.2.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE
+ SOURCE_HASH=sha512:a1b15551488d0bb597339804b36ed4cbb2459db24a3f71c1a068e3874eba10059668d358d8e0202b2964d3b80ed41d51f6db657614102a9a2b99597a7cd87106
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://users.skynet.be/solaris/linuxaudio/
LICENSE[0]=GPL
ENTERED=20060818
diff --git a/audio-libs/clalsadrv/HISTORY b/audio-libs/clalsadrv/HISTORY
index d9a3f1a172..db7c597aca 100644
--- a/audio-libs/clalsadrv/HISTORY
+++ b/audio-libs/clalsadrv/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 1.2.2
+
2006-08-18 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL, HISTORY: created
spell
diff --git a/audio-libs/faac/HISTORY b/audio-libs/faac/HISTORY
index 2731c3e01d..0157121f95 100644
--- a/audio-libs/faac/HISTORY
+++ b/audio-libs/faac/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Treeve Jelbert <treeve@sourcemage.org>
+ * PRE_BUILD: fix bug#15263
+
2009-02-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.28, updated SOURCE_DIRECTORY
diff --git a/audio-libs/faac/PRE_BUILD b/audio-libs/faac/PRE_BUILD
index 06e3ce1e25..3155df379f 100755
--- a/audio-libs/faac/PRE_BUILD
+++ b/audio-libs/faac/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# patch -p1 < ${SCRIPT_DIRECTORY}/mk.diff
+# fix for gcc-4.4.0
+sed -i "s/^char/const char/" common/mp4v2/mpeg4ip.h &&
chmod u+x ./bootstrap &&
/bin/sh ./bootstrap
diff --git a/audio-libs/libofa/HISTORY b/audio-libs/libofa/HISTORY
index 370f2512e0..22769de20b 100644
--- a/audio-libs/libofa/HISTORY
+++ b/audio-libs/libofa/HISTORY
@@ -1,3 +1,10 @@
+2009-06-09 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Apply libofa-0.9.3-gcc-4.4.patch
+ * libofa-0.9.3-gcc-4.4.patch: Based on patch provided at
+ http://bugs.gentoo.org/show_bug.cgi?id=265750
+ Modified to not depend on "#include <string.h>" being added as our
+ gcc43.patch adds "#include <cstring>" instead
+
2008-03-22 Eric Sandall <sandalle@sourcemage.org>
* PRE_BUILD: Apply gcc43.patch
* gcc43.patch: Patch to build with gcc 4.3.0
diff --git a/audio-libs/libofa/PRE_BUILD b/audio-libs/libofa/PRE_BUILD
index 6eae4b2ef6..9fb7906f76 100755
--- a/audio-libs/libofa/PRE_BUILD
+++ b/audio-libs/libofa/PRE_BUILD
@@ -1,4 +1,5 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/gcc43.patch &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gcc43.patch &&
+patch -p1 < $SPELL_DIRECTORY/libofa-0.9.3-gcc-4.4.patch &&
patch -p0 < $SPELL_DIRECTORY/tnt.diff
diff --git a/audio-libs/libofa/libofa-0.9.3-gcc-4.4.patch b/audio-libs/libofa/libofa-0.9.3-gcc-4.4.patch
new file mode 100644
index 0000000000..508b7828e8
--- /dev/null
+++ b/audio-libs/libofa/libofa-0.9.3-gcc-4.4.patch
@@ -0,0 +1,17 @@
+#
+# Based on patch provided at http://bugs.gentoo.org/show_bug.cgi?id=265750
+# Modified to not depend on "#include <string.h>" being added as our
+# gcc43.patch adds "#include <cstring>" instead
+#
+diff -Naur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp 2009-06-09 23:18:51.885408576 -0700
++++ libofa-0.9.3/examples/example.cpp 2009-06-09 23:19:36.701158519 -0700
+@@ -9,6 +9,8 @@
+
+ #include "protocol.h"
+
++#include <stdio.h>
++
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+
diff --git a/audio-libs/libogg/DETAILS b/audio-libs/libogg/DETAILS
index bbf5432435..f07fa8096c 100755
--- a/audio-libs/libogg/DETAILS
+++ b/audio-libs/libogg/DETAILS
@@ -1,12 +1,11 @@
SPELL=libogg
- VERSION=1.1.3
+ VERSION=1.1.4
+ SOURCE_HASH=sha512:96291b2c3ea4418a933bbdbbed29e53e40a542f549b9aa29dfb3ab4e5b6310bcc1f139d5514d8f58dac5399d3652cb09cf3de0fedeb5c682f51e0f9f3f623fd7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.xiph.org/releases/ogg/$SOURCE
- SOURCE_HASH=sha512:0ceb42f628e812602a269782615fd84b7219b7845436b7490cf46f05f953f824d3c2451b5c9557a70cfb78bd555d692e73bd66c34f6bcf74453e871e193ec785
WEB_SITE=http://www.xiph.org/ogg/
ENTERED=20010922
- UPDATED=20020726
LICENSE[0]=LGPL
KEYWORDS="audio libs"
SHORT="Bitstream and framing library for the Ogg project"
diff --git a/audio-libs/libogg/HISTORY b/audio-libs/libogg/HISTORY
index 4cafd0618c..488b2e5270 100644
--- a/audio-libs/libogg/HISTORY
+++ b/audio-libs/libogg/HISTORY
@@ -1,3 +1,10 @@
+2009-06-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.1.4
+
+2009-06-03 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.1.4rc1
+ * PRE_BUILD: deleted
+
2009-02-24 George Sherwood <gsherwood@sourcemage.org>
* PRE_BUILD: Added libtoolize -f due to new version of libtool
diff --git a/audio-libs/libogg/PRE_BUILD b/audio-libs/libogg/PRE_BUILD
deleted file mode 100755
index 7156fe8a49..0000000000
--- a/audio-libs/libogg/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-libtoolize -f &&
-aclocal &&
-autoconf
diff --git a/audio-libs/libvorbis/DETAILS b/audio-libs/libvorbis/DETAILS
index 67c5f3ae58..40829b9e7c 100755
--- a/audio-libs/libvorbis/DETAILS
+++ b/audio-libs/libvorbis/DETAILS
@@ -1,14 +1,14 @@
SPELL=libvorbis
- VERSION=1.2.0
- SOURCE_HASH=sha512:5ceba0a0bd60e7e7468940d1bb5c0a997e138b8e4507a8d5a234779a788003aae62390e9dd50847c07493977bec9316e899f760164e30c279e1c7e11ec4c8ec6
+ VERSION=1.2.2
+ SOURCE_HASH=sha512:788375d733bef0997b5d324ee50c8de84bcc36af5e82eebdb54eaa0f95d21717ec266241e91aeff8c412bcfc639fbaec824c512dea206258f95fb28bdd5af273
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.xiph.org/releases/vorbis/$SOURCE
WEB_SITE=http://www.xiph.org/vorbis/
ENTERED=20010922
LICENSE[0]=LGPL
KEYWORDS="codec audio libs"
- SHORT="Free high-quality lossy audio codec library"
+ SHORT="free high-quality lossy audio codec library"
cat << EOF
Ogg Vorbis is a high-quality lossy audio codec that is free of
intellectual property restrictions. libvorbis is the main vorbis codec
diff --git a/audio-libs/libvorbis/HISTORY b/audio-libs/libvorbis/HISTORY
index a39f4b964b..66259929b8 100644
--- a/audio-libs/libvorbis/HISTORY
+++ b/audio-libs/libvorbis/HISTORY
@@ -1,3 +1,9 @@
+2009-06-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.2.2
+
+2009-06-03 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.2.2rc1
+
2007-07-26 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.2.0
* PRE_BUILD: deleted
@@ -50,4 +56,3 @@
2002-06-12 Unet <unet@sourcemage.org>
* Created this.
-
diff --git a/audio-players/ario/CONFIGURE b/audio-players/ario/CONFIGURE
new file mode 100755
index 0000000000..4ef592c174
--- /dev/null
+++ b/audio-players/ario/CONFIGURE
@@ -0,0 +1,9 @@
+config_query ARIO_LIBRE "Do you want to use Libre.FM instead of Last.FM?" n &&
+config_query_option ARIO_OPTS "Enable MPD Idle support" n \
+ "--enable-mpdidle" "--disable-mpdidle" &&
+config_query_option ARIO_OPTS "Enable Playlists support" y \
+ "--enable-playlists" "--disable-playlists" &&\
+config_query_option ARIO_OPTS "Enable Egg Tray Icon" y \
+ "--enable-eggtrayicon" "--disable-eggtrayicon" &&
+config_query_option ARIO_OPTS "Enable search" y \
+ "--enable-search" "--disable-search"
diff --git a/audio-players/ario/DEPENDS b/audio-players/ario/DEPENDS
index b5ffe8ba32..7ac192477e 100755
--- a/audio-players/ario/DEPENDS
+++ b/audio-players/ario/DEPENDS
@@ -2,6 +2,29 @@ depends gtk+2 &&
depends glib2 &&
depends libglade2 &&
depends curl &&
-depends soup &&
-depends avahi &&
-depends dbus-glib
+depends libgcrypt &&
+depends gnutls &&
+depends libxml2 &&
+optional_depends soup "--enable-audioscrobbler" "--disable-audioscrobbler" \
+ "Enable Audioscrobbling support" &&
+optional_depends libnotify "--enable-notify" "--disable-notify" \
+ "Enable notify support" &&
+optional_depends avahi "--enable-avahi" "--disable-avahi" \
+ "Enable avahi support" &&
+optional_depends taglib "--enable-taglib" "--disable-taglib" \
+ "Enable taglib support" &&
+optional_depends dbus-glib "--enable-dbus" "--disable-dbus" \
+ "Enable D-BUS support" &&
+optional_depends python "--enable-python" "--disable-python" \
+ "Enable Python bindings and plugins support" &&
+if is_depends_enabled $SPELL python ; then
+optional_depends pygtk2 "" "" \
+ "Enable PyGTK support for plugins"
+fi #&&
+# disabled until upstream brings this up to the level
+# http://sourceforge.net/tracker/?func=detail&aid=2809422&group_id=197448&atid=961510
+#optional_depends xmms2 "--enable-xmms2" "--disable-xmms2" \
+# "Enable XMMS2 support" &&
+#if is_depends_enabled $SPELL xmms2 ; then
+#sub_depends xmms2 CLIENTLIB
+#fi
diff --git a/audio-players/ario/DETAILS b/audio-players/ario/DETAILS
index 5eff8f77a4..dbfd5275d2 100755
--- a/audio-players/ario/DETAILS
+++ b/audio-players/ario/DETAILS
@@ -1,16 +1,16 @@
SPELL=ario
- VERSION=1.1
+ VERSION=1.3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}-player/${SOURCE}
- SOURCE_HASH=sha512:97f0ecb5967c95d1267ab1446f80e924449c2544f414bd58c1581983db53043f86595f0fae97855d003b09c4ddf64cea1c2322c144233b3b6f99914d633350b1
+ SOURCE_HASH=sha512:da614604c5affe4b9228317a3543f50e68c82ebabc5becc7d4f458ead3223191289f8228963cefa59eaf82b034863d4336b29c69095eacfbfb3c34f13ede8f64
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE="http://ario-player.sourceforge.net"
LICENSE[0]=GPL
ENTERED=20080616
KEYWORDS="player audio"
- SHORT="GTK2 client for MPD"
+ SHORT="GTK2 client for XMMS2 or MPD"
cat << EOF
-Ario is a GTK2 client for MPD (Music player daemon). The interface used to
-browse the library is inspired by Rhythmbox but Ario aims to be much lighter
-and faster. It runs on Linux and Microsoft Windows.
+Ario is a GTK2 client for XMMS2 or MPD (Music player daemon). The interface
+used to browse the library is inspired by Rhythmbox but Ario aims to be much
+lighter and faster. It runs on Linux and Microsoft Windows.
EOF
diff --git a/audio-players/ario/HISTORY b/audio-players/ario/HISTORY
index 332342948c..919f9393a6 100644
--- a/audio-players/ario/HISTORY
+++ b/audio-players/ario/HISTORY
@@ -1,3 +1,9 @@
+2009-06-20 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * DETAILS: updated spell to 1.3
+ * DEPENDS: updated
+ * CONFIGURE: added
+ * PRE_BUILD: updated
+
2008-06-16 Pol Vinogradov <vin.public@gmail.com>
* DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/audio-players/ario/PRE_BUILD b/audio-players/ario/PRE_BUILD
index bc52ad1e5d..34d4533a4a 100755
--- a/audio-players/ario/PRE_BUILD
+++ b/audio-players/ario/PRE_BUILD
@@ -1,3 +1,12 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-cd ${SOURCE_DIRECTORY} &&
-unpack_file ''
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i -e "36i gio-2.0" configure.ac &&
+sed -i -e "28i#include <gio/gio.h>" src/servers/ario-xmms.c &&
+if [[ $ARIO_LIBRE == y ]] ; then
+sed -i -e "s:post.audioscrobbler.com:turtle.libre.fm:g" plugins/audioscrobbler/ario-audioscrobbler.c
+fi &&
+rm configure &&
+aclocal &&
+libtoolize -f &&
+autoconf
+
diff --git a/audio-players/banshee/DEPENDS b/audio-players/banshee/DEPENDS
index c071a0feab..a92959e969 100755
--- a/audio-players/banshee/DEPENDS
+++ b/audio-players/banshee/DEPENDS
@@ -1,5 +1,6 @@
depends mono &&
depends mono-addins &&
+depends mono-zeroconf &&
depends boo &&
depends taglib-sharp &&
depends hal &&
diff --git a/audio-players/banshee/HISTORY b/audio-players/banshee/HISTORY
index 8566027d65..74c491cd4a 100644
--- a/audio-players/banshee/HISTORY
+++ b/audio-players/banshee/HISTORY
@@ -1,3 +1,6 @@
+2009-06-25 Ladislav Hagara <hgr@vabo.cz>
+ * DEPENDS: added mono-zeroconf
+
2009-05-07 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1-1.4.3
* DEPENDS: Depends on libmtp
diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD
new file mode 100755
index 0000000000..ce64cb7bea
--- /dev/null
+++ b/audio-players/mpd/BUILD
@@ -0,0 +1,3 @@
+create_account musicdaemon &&
+
+default_build
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index 35dbd814a2..8fdd39192a 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -6,8 +6,8 @@ optional_depends libao \
"for libao support" &&
optional_depends libvorbis \
- "--enable-oggvorbis" \
- "--disable-oggvorbis" \
+ "--enable-vorbis" \
+ "--disable-vorbis" \
"for Ogg Vorbis support" &&
optional_depends libmpcdec \
@@ -46,8 +46,8 @@ optional_depends pulseaudio \
"for pulseaudio output support" &&
optional_depends libmad \
- "--enable-mp3" \
- "--disable-mp3" \
+ "--enable-mad" \
+ "--disable-mad" \
"to use libmad (for mp3 files support)" &&
optional_depends libid3tag \
@@ -56,36 +56,56 @@ optional_depends libid3tag \
"to use id3 tags" &&
optional_depends libmikmod \
- "--enable-mod" \
- "--disable-mod" \
- "for mod file support" &&
+ "--enable-mikmod" \
+ "--disable-mikmod" \
+ "for mod file support (libmikmod)" &&
+
+optional_depends libmodplug \
+ "--enable-modplug" \
+ "--disable-modplug" \
+ "for mod file support (libmodplug)" &&
optional_depends libsamplerate \
"--enable-lsr" \
"--disable-lsr" \
"for libsamplerate support" &&
+optional_depends libshout \
+ "--enable-shout" \
+ "--disable-shout" \
+ "for shoutcast streaming output support" &&
+
optional_depends wavpack \
"--enable-wavpack" \
"--disable-wavpack" \
"for WavPack support" &&
optional_depends lame \
- "--enable-lame" \
- "--disable-lame" \
- "for LAME support" &&
+ "--enable-lame-encoder" \
+ "--disable-lame-encoder" \
+ "for LAME encoder support" &&
optional_depends curl \
"--enable-curl" \
"--disable-curl" \
"for obtaining song data via HTTP support" &&
+optional_depends sqlite \
+ "--enable-sqlite" \
+ "--disable-sqlite" \
+ "for SQLite database support" &&
+
optional_depends LIBAVCODEC \
"--enable-ffmpeg" \
"--disable-ffmpeg" \
"for FFMPEG support" &&
-optional_depends avahi \
- '--with-zeroconf=avahi' \
- '--with-zeroconf=no' \
- 'for Zeroconf service discovery support'
+optional_depends libmms \
+ "--enable-mms" \
+ "--disable-mms" \
+ "for MMS protocol support" &&
+
+optional_depends avahi \
+ "--with-zeroconf=avahi" \
+ "--with-zeroconf=no" \
+ "for Zeroconf service discovery support"
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 723fc40e58..d66a9cd812 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.14.2
+ VERSION=0.15
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
- SOURCE_HASH=sha512:77912f89e06892830a063c96ecbc2cd95337d10f956c240ed0f62218ad3d8a08c0ac04a062e3d6044f510abcdaa9eecde1a3faa2321841ee35aa73fb6c38f79d
+ SOURCE_HASH=sha512:299154debb2977c757df35f4e595e114d708d23b40d2cf4fd52fd3d9acd02052e12f365ebfc542266f58d1288e3f557b137e1fb28da1b0ce6819d979c299d2b3
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/FINAL b/audio-players/mpd/FINAL
index 773d5de057..3f3ab113d4 100755
--- a/audio-players/mpd/FINAL
+++ b/audio-players/mpd/FINAL
@@ -3,7 +3,7 @@
if [[ $INIT_INSTALLED ]]; then
local MPD_LIB="${INSTALL_ROOT}/var/lib/mpd" &&
local MPD_DIRS="${MPD_LIB}/music ${MPD_LIB}/playlists" &&
- local MPD_FILES="${INSTALL_ROOT}/var/log/mpd.log ${INSTALL_ROOT}/var/log/mpd.error" &&
+ local MPD_FILES="${INSTALL_ROOT}/var/log/mpd.log" &&
for dir in "${MPD_LIB} ${MPD_DIRS}"; do
if [[ ! -r ${dir} ]]; then
mkdir -p ${dir} &&
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index ecb9187455..144cb957e1 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,14 @@
+2009-06-26 Vlad Glagolev <stealth@sourcemage.org>
+ * FINAL: mpd.error isn't used anymore, everything's in mpd.log since now
+
+2009-06-25 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.15
+ * DEPENDS: corrected flags, added sqlite, libmodplug, libshout, libmms
+ deps; cleaned up
+ * BUILD: added, to create account musicdaemon
+ * PRE_BUILD: removed, removed dirty hacks
+ * init.d/mpd: added arg for the config; fixed db file path
+
2009-03-02 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Optionally depends on avahi
diff --git a/audio-players/mpd/PRE_BUILD b/audio-players/mpd/PRE_BUILD
deleted file mode 100755
index c410252895..0000000000
--- a/audio-players/mpd/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $INIT_INSTALLED ]]; then
- create_account musicdaemon &&
- sed -i "s:/etc/mpd.conf:/etc/sysconfig/mpd:g" src/main.c
-fi
diff --git a/audio-players/mpd/init.d/mpd b/audio-players/mpd/init.d/mpd
index 55030b522c..251e79d712 100644
--- a/audio-players/mpd/init.d/mpd
+++ b/audio-players/mpd/init.d/mpd
@@ -1,10 +1,10 @@
#!/bin/bash
PROGRAM=/usr/bin/mpd
-ARGS=""
+ARGS="/etc/sysconfig/mpd"
RUNLEVEL=3
NEEDS=""
-MPD_DB="$(grep music_directory /etc/sysconfig/mpd | cut -d \" -f 2)/mpd.db"
+MPD_DB="$(grep db_file /etc/sysconfig/mpd | cut -d \" -f 2)"
[[ -z $MPD_DB ]] && ARGS="$ARGS --create-db"
diff --git a/audio-players/mpg123/CONFIGURE b/audio-players/mpg123/CONFIGURE
index e301c8fe50..bd0c0da8c9 100755
--- a/audio-players/mpg123/CONFIGURE
+++ b/audio-players/mpg123/CONFIGURE
@@ -1,4 +1,6 @@
. $GRIMOIRE/config_query_multi.function &&
+config_query_option MPG123_MODULES "Prefer highest accuracy for 16bit output (instead of highest speed)?" n \
+ --enable-int-quality --disable-int-quality &&
message "${MESSAGE_COLOR}Optimization is chosen automatically now, though you can force your will via custom spell options.$DEFAULT_COLOR" &&
config_query_option MPG123_MODULES "Build output modules?" y \
--enable-modules --disable-modules &&
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 6fd6a82753..4a1ad1014c 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.7.3
+ VERSION=1.8.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 d6b4862f28..33928fe679 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,14 @@
+2009-06-14 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS: bump to 1.8.1
+ * PRE_BUILD, configure-1.8.0.diff: not needed anymore (and didn't even work:-/)
+
+2009-06-11 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS: Update to 1.8.0
+ * CONFIGURE: add choice for 16 bit integer quality
+ * PRE_BUILD, configure-1.8.0.diff: fix for --enable-modules, which we cannot just omit
+ (it is stored by sorcery and does not disappear when changing CONFIGURE).
+ Next mpg123 release has this fixed.
+
2009-04-27 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: Update to 1.7.3 .
diff --git a/audio-players/pms/DEPENDS b/audio-players/pms/DEPENDS
new file mode 100755
index 0000000000..0094145388
--- /dev/null
+++ b/audio-players/pms/DEPENDS
@@ -0,0 +1,2 @@
+depends glib2 &&
+depends ncurses
diff --git a/audio-players/pms/DETAILS b/audio-players/pms/DETAILS
new file mode 100755
index 0000000000..f086c470ea
--- /dev/null
+++ b/audio-players/pms/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pms
+ VERSION=0.40.6
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:036a53f2a9544604a032b2523b4524528af7e5dbf835e7a2aec907943984a0bc53c9bc7cf6011da018823ef0656bf042e5ea9c41f34c4b3c8631a1845ec8b5f6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://pms.sourceforge.net"
+ LICENSE[0]=GPL
+ ENTERED=20090628
+ SHORT="a console client for mpd"
+cat << EOF
+Practical Music Search is an open source client for Music Player Daemon,
+written in C++ and ncurses. The target audience are power users who need
+an MPD client which is highly configurable and accessible. PMS features a
+simple but powerful interface, and runs on (at least) Linux and Mac OS X.
+EOF
diff --git a/audio-players/pms/HISTORY b/audio-players/pms/HISTORY
new file mode 100644
index 0000000000..f388dace53
--- /dev/null
+++ b/audio-players/pms/HISTORY
@@ -0,0 +1,3 @@
+2009-06-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/audio-players/rhythmbox/DETAILS b/audio-players/rhythmbox/DETAILS
index 9d1e99d1af..9aeafd08dc 100755
--- a/audio-players/rhythmbox/DETAILS
+++ b/audio-players/rhythmbox/DETAILS
@@ -1,5 +1,5 @@
SPELL=rhythmbox
- VERSION=0.12.1
+ VERSION=0.12.2
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-players/rhythmbox/HISTORY b/audio-players/rhythmbox/HISTORY
index 7a23999625..0e2bd7e321 100644
--- a/audio-players/rhythmbox/HISTORY
+++ b/audio-players/rhythmbox/HISTORY
@@ -1,3 +1,6 @@
+2009-06-03 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.12.2
+
2009-04-29 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.12.1
diff --git a/audio-players/rhythmbox/rhythmbox-0.12.1.tar.bz2.sig b/audio-players/rhythmbox/rhythmbox-0.12.1.tar.bz2.sig
deleted file mode 100644
index 5c88d2c354..0000000000
--- a/audio-players/rhythmbox/rhythmbox-0.12.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/audio-players/rhythmbox/rhythmbox-0.12.2.tar.bz2.sig b/audio-players/rhythmbox/rhythmbox-0.12.2.tar.bz2.sig
new file mode 100644
index 0000000000..08cb04ec7a
--- /dev/null
+++ b/audio-players/rhythmbox/rhythmbox-0.12.2.tar.bz2.sig
Binary files differ
diff --git a/audio-players/xmms2-scrobbler/BUILD b/audio-players/xmms2-scrobbler/BUILD
index 27ba77ddaf..a5eedec539 100755
--- a/audio-players/xmms2-scrobbler/BUILD
+++ b/audio-players/xmms2-scrobbler/BUILD
@@ -1 +1 @@
-true
+make PREFIX=$INSTALL_ROOT/usr
diff --git a/audio-players/xmms2-scrobbler/CONFIGURE b/audio-players/xmms2-scrobbler/CONFIGURE
new file mode 100755
index 0000000000..a484633e15
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/CONFIGURE
@@ -0,0 +1 @@
+config_query XMS2_LIBRE "Do you want to use Libre.FM instead of Last.FM?" n
diff --git a/audio-players/xmms2-scrobbler/DEPENDS b/audio-players/xmms2-scrobbler/DEPENDS
index 89cea2d46d..99800735a9 100755
--- a/audio-players/xmms2-scrobbler/DEPENDS
+++ b/audio-players/xmms2-scrobbler/DEPENDS
@@ -1,4 +1,3 @@
-depends rake &&
-depends event-loop &&
+depends curl &&
depends xmms2 &&
-sub_depends xmms2 CLIENTLIB_RUBY
+sub_depends xmms2 CLIENTLIB
diff --git a/audio-players/xmms2-scrobbler/DETAILS b/audio-players/xmms2-scrobbler/DETAILS
index f4dee6cdfc..4af0714c66 100755
--- a/audio-players/xmms2-scrobbler/DETAILS
+++ b/audio-players/xmms2-scrobbler/DETAILS
@@ -1,11 +1,11 @@
SPELL=xmms2-scrobbler
- VERSION=0.2.2
+ VERSION=0.3.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.code-monkey.de/pub/$SPELL/$SOURCE
WEB_SITE=http://code-monkey.de/pages/xmms2-scrobbler
ENTERED=20070224
- SOURCE_HASH=sha512:c4b3f9f94ea60e89fb8345569a6f3055e6109e6ad68f5c1a046bb61648bc4400f1c49c41514fc1daef3474b659a32a82e047c572e6862c111bea565db0de6eb3
+ SOURCE_HASH=sha512:c5797d60d9bca22e872b37f06503b32570320f77c565507aea21309a8db454fef3a4cea10fa2b403d95ba9e6b60ec607b2bbeda6f7f426047ebc5947ee9f0407
LICENSE[0]=BSD
SHORT="XMMS2-Scrobbler is an Audioscrobbler client for XMMS2"
cat << EOF
diff --git a/audio-players/xmms2-scrobbler/FINAL b/audio-players/xmms2-scrobbler/FINAL
index 615f99302d..2f0a5124a8 100755
--- a/audio-players/xmms2-scrobbler/FINAL
+++ b/audio-players/xmms2-scrobbler/FINAL
@@ -1,7 +1,3 @@
-message "********************************************************"
-message "* Copy the config template from *"
-message "* /usr/share/doc/xmms2-scrobbler/config.sample *"
-message "* to your proper xmms2 config dir *"
-message "* ~/.config/xmms2/clients/xmms2-scrobbler *"
-message "*and edit the parameters to get xmms2-scrobbler to work*"
-message "********************************************************"
+message "See the readme file in:" \
+"$INSTALL_ROOT/usr/share/doc/xmms2-scrobbler/README" \
+"On how to configure it"
diff --git a/audio-players/xmms2-scrobbler/HISTORY b/audio-players/xmms2-scrobbler/HISTORY
index 01c5bf6821..34154224e6 100644
--- a/audio-players/xmms2-scrobbler/HISTORY
+++ b/audio-players/xmms2-scrobbler/HISTORY
@@ -1,3 +1,12 @@
+2009-06-20 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * DETAILS: updated spell to 0.3.0
+ * BUILD: updated
+ * INSTALL: updated
+ * CONFIGURE: added for Libre.FM
+ * PRE_BUILD: added for Libre.FM
+ * DEPENDS: updated
+ * FINAL: updated
+
2008-08-23 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.2.2
diff --git a/audio-players/xmms2-scrobbler/INSTALL b/audio-players/xmms2-scrobbler/INSTALL
index 10f63583cf..4e9106dde8 100755
--- a/audio-players/xmms2-scrobbler/INSTALL
+++ b/audio-players/xmms2-scrobbler/INSTALL
@@ -1,3 +1 @@
-PREFIX=${INSTALL_ROOT}/usr rake install &&
-mkdir -vp /usr/share/doc/$SPELL &&
-message "user: your-username\npassword: your-password" > /usr/share/doc/$SPELL/config.sample
+make PREFIX=$INSTALL_ROOT/usr install
diff --git a/audio-players/xmms2-scrobbler/PRE_BUILD b/audio-players/xmms2-scrobbler/PRE_BUILD
new file mode 100755
index 0000000000..88c38fee22
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $XMS2_LIBRE == y ]] ; then
+sed -i -e "s:post.audioscrobbler.com:turtle.libre.fm:g" src/xmms2-scrobbler.c
+fi
diff --git a/audio-plugins/audacious-plugins/BUILD b/audio-plugins/audacious-plugins/BUILD
index 061b4347a1..9a99e9f750 100755
--- a/audio-plugins/audacious-plugins/BUILD
+++ b/audio-plugins/audacious-plugins/BUILD
@@ -1,2 +1,2 @@
-OPTS="--enable-ipv6 --enable-chardet $OPTS" &&
+OPTS="--enable-chardet $AUDACIOUS_IPV6 $AUDACIOUS_STATUS $AUDACIOUS_OSD $AUDACIOUS_COSD $OPTS" &&
default_build
diff --git a/audio-plugins/audacious-plugins/CONFIGURE b/audio-plugins/audacious-plugins/CONFIGURE
new file mode 100755
index 0000000000..69ab67e36a
--- /dev/null
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -0,0 +1,18 @@
+config_query_option AUDACIOUS_IPV6 \
+ 'for IPv6 support' n \
+ '--enable-ipv6' \
+ '--disable-ipv6' &&
+config_query_option AUDACIOUS_STATUS \
+ 'for a status icon' y \
+ '--enable-statusicon' \
+ '--disable-statusicon' &&
+config_query_option AUDACIOUS_OSD \
+ 'for OSD plugin' y \
+ '--enable-aosd' \
+ '--disable-aosd' &&
+if [[ "$AUDACIOUS_OSD" == '--enable-aosd' ]]; then
+ config_query_option AUDACIOUS_COSD \
+ 'for X Composite OSD plugin' y \
+ '--enable-aosd-xcomp' \
+ '--disable-aosd-xcomp'
+fi
diff --git a/audio-plugins/audacious-plugins/DEPENDS b/audio-plugins/audacious-plugins/DEPENDS
index f1dfc945ad..7d04a2d83b 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -1,17 +1,15 @@
depends audacious &&
-optional_depends libvorbis \
- "" \
- "--disable-vorbis" \
- "for vorbis support" &&
-optional_depends libogg \
- "" \
- "" \
- "for ogg support" &&
-optional_depends flac \
+# control plugins
+optional_depends xf86-input-evdev \
+ "--enable-evdevplug" \
+ "--disable-evdevplug" \
+ "for evdev support" &&
+optional_depends lirc \
"" \
- "--disable-flacng" \
- "for flac support" &&
+ "--disable-lirc" \
+ "for lirc support" &&
+# output plugins
optional_depends alsa-lib \
"" \
"--disable-alsa" \
@@ -24,10 +22,39 @@ optional_depends pulseaudio \
"" \
"--disable-pulse" \
"for pulseaudio support" &&
-optional_depends lirc \
+optional_depends JACK-DRIVER \
"" \
- "--disable-lirc" \
- "for lirc support" &&
+ "--disable-jack" \
+ "support for jack" &&
+optional_depends arts \
+ "" \
+ "--disable-arts" \
+ "support for arts" &&
+# filetype plugins
+optional_depends LIBAVCODEC \
+ "" \
+ "--disable-wma" \
+ "for WMA support" &&
+optional_depends libvorbis \
+ "" \
+ "--disable-vorbis --disable-filewriter_vorbis" \
+ "for vorbis support" &&
+optional_depends libogg \
+ "" \
+ "" \
+ "for ogg support" &&
+optional_depends flac \
+ "" \
+ "--disable-flacng --disable-filewriter_flac" \
+ "for flac support" &&
+optional_depends libmad \
+ "" \
+ "--disable-mp3" \
+ "for reading MP3 files" &&
+optional_depends lame \
+ "" \
+ "--disable-filewriter_mp3" \
+ "for MP3 filewriter" &&
optional_depends wavpack \
"" \
"--disable-wavpack" \
@@ -48,14 +75,6 @@ optional_depends musepack-tools \
"" \
"--disable-musepack" \
"support for musepack" &&
-optional_depends JACK-DRIVER \
- "" \
- "--disable-jack" \
- "support for jack" &&
-optional_depends arts \
- "" \
- "--disable-arts" \
- "support for arts" &&
optional_depends sidplay-libs \
"" \
"--disable-sid" \
@@ -68,11 +87,16 @@ optional_depends ttaenc \
"" \
"--disable-tta" \
"support for TrueAudio" &&
-optional_depends libmad \
- "" \
- "--disable-mp3" \
- "support for mp3 files" &&
+# other plugins
optional_depends neon \
"--enable-neon" \
"--disable-neon" \
- "for HTTP(s) transport (required for Icecast/Shoutcast) (EXPERIMENTAL)"
+ "for HTTP(s) transport (required for Icecast/Shoutcast) (EXPERIMENTAL)" &&
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-BUS support" &&
+optional_depends libmtp \
+ "" \
+ "--disable-mtp_up" \
+ "support for Media Transfer Protocol"
diff --git a/audio-plugins/audacious-plugins/HISTORY b/audio-plugins/audacious-plugins/HISTORY
index 34664d4e8f..b00e797633 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,8 @@
+2009-06-14 Arjan Bouter <abouter@sourcemage.org>
+ * BUILD, CONFIGURE: made ipv6 ,statusicon and
+ (composite-)osd optional
+ * DEPENDS: added some missing deps
+
2008-06-26 Elisamuel Resto <ryuji@sourcemage.org>
* DETAILS: updated to 1.5.1
* DEPENDS: lame -> libmad; replaced tabs; added neon
diff --git a/audio-soft/feng/DEPENDS b/audio-soft/feng/DEPENDS
index c6d5ffa7e5..006ccb7aa2 100755
--- a/audio-soft/feng/DEPENDS
+++ b/audio-soft/feng/DEPENDS
@@ -2,4 +2,5 @@ depends glib2 &&
depends ffmpeg-svn &&
depends netembryo &&
depends bufferpool &&
-depends libgcrypt
+depends libgcrypt &&
+depends libev
diff --git a/audio-soft/feng/DETAILS b/audio-soft/feng/DETAILS
index b6480bbea6..fd90741381 100755
--- a/audio-soft/feng/DETAILS
+++ b/audio-soft/feng/DETAILS
@@ -1,9 +1,9 @@
SPELL=feng
- VERSION=0.1.99.1
+ VERSION=0.2.0_rc1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://live.polito.it/files/downloads/feng/$SOURCE
- SOURCE_HASH=sha512:97d411d1bec0ff7fe94846d7c6b706a0360c77673a8ed9b5e30c1f1de2f331bbefae5ed29c08c04e351f0f726c61d5e4b03904bdaf01e5627ad276a03666bd39
+ SOURCE_HASH=sha512:189b6cd3a33106d98ef2e94112705bfa0e26fb4bdbb0a526f759f597fba23b5240897e49fa7a2487ce3077b6e1c691be1f53defdd9ab5439f39129faa598dc52
WEB_SITE=http://live.polito.it/projects/feng
LICENSE[0]=LGPL
ENTERED=20081114
diff --git a/audio-soft/feng/HISTORY b/audio-soft/feng/HISTORY
index 78c94d8a24..b4f5307941 100644
--- a/audio-soft/feng/HISTORY
+++ b/audio-soft/feng/HISTORY
@@ -1,2 +1,6 @@
+2009-06-08 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.2.0_rc1
+ * DEPENDS: added libev
+
2008-11-14 Arjan Bouter <abouter@sourcemage.org>
* DETAILS,DEPENDS,HISTORY: created spell
diff --git a/audio-soft/musepack-tools/HISTORY b/audio-soft/musepack-tools/HISTORY
index be990fc174..118d6b1c19 100644
--- a/audio-soft/musepack-tools/HISTORY
+++ b/audio-soft/musepack-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * PRE_BUILD: updated for x86_64
+
2008-12-04 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* BUILD, PRE_BUILD: changed for castability #14907
* Makefile.patch: added for castability
diff --git a/audio-soft/musepack-tools/PRE_BUILD b/audio-soft/musepack-tools/PRE_BUILD
index 9bd273e10b..d12d85fc0f 100755
--- a/audio-soft/musepack-tools/PRE_BUILD
+++ b/audio-soft/musepack-tools/PRE_BUILD
@@ -10,4 +10,14 @@ LDADD\ \ \ +=\ -lesd' Makefile
else
sed -i 's/#define USE_ESD_AUDIO/#undef\ USE_ESD_AUDIO/' mpp.h
fi &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/Makefile.patch
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/Makefile.patch &&
+# added else fails to build
+# http://bugs.gentoo.org/show_bug.cgi?id=188160
+if [[ "${SMGL_COMPAT_ARCHS[1]}" != "ia32" ]] ; then
+sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
+fi
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ; then
+sed -i 's/-f elf$/-f elf64/' Makefile
+fi
+
diff --git a/audio-soft/rockbox-utility/BUILD b/audio-soft/rockbox-utility/BUILD
new file mode 100755
index 0000000000..1f911e6eda
--- /dev/null
+++ b/audio-soft/rockbox-utility/BUILD
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/rbutil &&
+qt4_build
diff --git a/audio-soft/rockbox-utility/DEPENDS b/audio-soft/rockbox-utility/DEPENDS
new file mode 100755
index 0000000000..2e4e2ef0f7
--- /dev/null
+++ b/audio-soft/rockbox-utility/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/audio-soft/rockbox-utility/DETAILS b/audio-soft/rockbox-utility/DETAILS
new file mode 100755
index 0000000000..31e0bae0e2
--- /dev/null
+++ b/audio-soft/rockbox-utility/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=rockbox-utility
+ VERSION=1.2.1
+ SOURCE="rbutil-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://download.rockbox.org/rbutil/source/${SOURCE}
+ SOURCE_HASH=sha512:755fcca41e12fe099a200554887857d3c578f4798573332f4f1865aec7b439448d384d0413eef70b39b442ab2e232a02a52e170cbb5053545f21d80185fe19f3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rbutil-${VERSION}"
+ WEB_SITE="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
+ LICENSE[0]=GPL
+ ENTERED=20090529
+ SHORT="automated installer for Rockbox"
+cat << EOF
+rockbox-utility is the automated installer for Rockbox, an open source firmware
+for mp3 players.
+EOF
diff --git a/audio-soft/rockbox-utility/HISTORY b/audio-soft/rockbox-utility/HISTORY
new file mode 100644
index 0000000000..251b61642a
--- /dev/null
+++ b/audio-soft/rockbox-utility/HISTORY
@@ -0,0 +1,3 @@
+2009-06-09 Julien _kaze_ ROZO <julien@rozo.org>
+ * BUILD, DEPENDS, DETAILS, HISTORY, INSTALL: created this spell
+
diff --git a/audio-soft/rockbox-utility/INSTALL b/audio-soft/rockbox-utility/INSTALL
new file mode 100755
index 0000000000..de15f9740b
--- /dev/null
+++ b/audio-soft/rockbox-utility/INSTALL
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY &&
+install -m 755 rbutil/rbutilqt/rbutilqt ${INSTALL_ROOT}/usr/bin
diff --git a/audio-soft/sox/DETAILS b/audio-soft/sox/DETAILS
index 2825a4257f..46acd8adf9 100755
--- a/audio-soft/sox/DETAILS
+++ b/audio-soft/sox/DETAILS
@@ -1,5 +1,6 @@
SPELL=sox
VERSION=14.2.0
+ PATCHLEVEL=1
SOURCE_HASH=sha512:4dc92b8697df9d6ff260303eda78fda99805ca15e8ed4e55a1d82834fa5b67ad2178d5df1a9fb41d16fdb48f9758bb11eac290d6b786386ee6a79fdd3c99b4e2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index d79f2222b5..75df2cd36a 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,7 @@
+2009-06-09 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, file-5.0.patch: added, to fix mp3 mime-type recognition
+
2008-11-11 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 14.2.0; fixed descs; quoting the paths
* DEPENDS: improved readability; added lots of missing deps
diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
new file mode 100755
index 0000000000..1def27bb3d
--- /dev/null
+++ b/audio-soft/sox/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch"
diff --git a/audio-soft/sox/file-5.0.patch b/audio-soft/sox/file-5.0.patch
new file mode 100644
index 0000000000..7104b5e42c
--- /dev/null
+++ b/audio-soft/sox/file-5.0.patch
@@ -0,0 +1,11 @@
+--- src/mp3.c.orig 2008-11-02 21:54:31.000000000 +0100
++++ src/mp3.c 2009-02-25 11:48:53.000000000 +0100
+@@ -504,7 +504,7 @@
+
+ SOX_FORMAT_HANDLER(mp3)
+ {
+- static char const * const names[] = {"mp3", "mp2", "audio/mpeg", NULL};
++ static char const * const names[] = {"mp3", "mp2", "audio/mpeg", "audio/mpeg; charset=binary", NULL};
+ static unsigned const write_encodings[] = {
+ SOX_ENCODING_GSM, 0, 0};
+ static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
diff --git a/chat-im/ejabberd/DETAILS b/chat-im/ejabberd/DETAILS
index bf339318b9..b47eedc439 100755
--- a/chat-im/ejabberd/DETAILS
+++ b/chat-im/ejabberd/DETAILS
@@ -1,5 +1,5 @@
SPELL=ejabberd
- VERSION=2.0.3
+ VERSION=2.0.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.process-one.net/downloads/${SPELL}/${VERSION}/${SOURCE}
diff --git a/chat-im/ejabberd/HISTORY b/chat-im/ejabberd/HISTORY
index a31fc73c63..b19642e0fa 100644
--- a/chat-im/ejabberd/HISTORY
+++ b/chat-im/ejabberd/HISTORY
@@ -1,3 +1,8 @@
+2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * ejabberd-2.0.5-erlang-13.patch: make it usable with erlang r13
+ * DETAILS: updated spell to 2.0.5
+ * PRE_BUILD: added
+
2009-01-15 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 2.0.3
diff --git a/chat-im/ejabberd/PRE_BUILD b/chat-im/ejabberd/PRE_BUILD
new file mode 100755
index 0000000000..d812e4eaee
--- /dev/null
+++ b/chat-im/ejabberd/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src &&
+patch < $SPELL_DIRECTORY/ejabberd-2.0.5-erlang-13.patch
diff --git a/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch b/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch
new file mode 100644
index 0000000000..d52777ba31
--- /dev/null
+++ b/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch
@@ -0,0 +1,361 @@
+diff --git a/src/dynamic_compile.erl b/src/dynamic_compile.erl
+new file mode 100644
+index 0000000..1fe2dca
+--- /dev/null
++++ dynamic_compile.erl
+@@ -0,0 +1,268 @@
++%% Copyright (c) 2007
++%% Mats Cronqvist <mats.cronqvist@ericsson.com>
++%% Chris Newcombe <chris.newcombe@gmail.com>
++%% Jacob Vorreuter <jacob.vorreuter@gmail.com>
++%%
++%% Permission is hereby granted, free of charge, to any person
++%% obtaining a copy of this software and associated documentation
++%% files (the "Software"), to deal in the Software without
++%% restriction, including without limitation the rights to use,
++%% copy, modify, merge, publish, distribute, sublicense, and/or sell
++%% copies of the Software, and to permit persons to whom the
++%% Software is furnished to do so, subject to the following
++%% conditions:
++%%
++%% The above copyright notice and this permission notice shall be
++%% included in all copies or substantial portions of the Software.
++%%
++%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++%% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++%% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++%% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++%% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++%% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++%% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++%% OTHER DEALINGS IN THE SOFTWARE.
++
++%%%-------------------------------------------------------------------
++%%% File : dynamic_compile.erl
++%%% Description :
++%%% Authors : Mats Cronqvist <mats.cronqvist@ericsson.com>
++%%% Chris Newcombe <chris.newcombe@gmail.com>
++%%% Jacob Vorreuter <jacob.vorreuter@gmail.com>
++%%% TODO :
++%%% - add support for limit include-file depth (and prevent circular references)
++%%% prevent circular macro expansion set FILE correctly when -module() is found
++%%% -include_lib support $ENVVAR in include filenames
++%%% substitute-stringize (??MACRO)
++%%% -undef/-ifdef/-ifndef/-else/-endif
++%%% -file(File, Line)
++%%%-------------------------------------------------------------------
++-module(dynamic_compile).
++
++%% API
++-export([from_string/1, from_string/2]).
++
++-import(lists, [reverse/1, keyreplace/4]).
++
++%%====================================================================
++%% API
++%%====================================================================
++%%--------------------------------------------------------------------
++%% Function:
++%% Description:
++%% Returns a binary that can be used with
++%% code:load_binary(Module, ModuleFilenameForInternalRecords, Binary).
++%%--------------------------------------------------------------------
++from_string(CodeStr) ->
++ from_string(CodeStr, []).
++
++% takes Options as for compile:forms/2
++from_string(CodeStr, CompileFormsOptions) ->
++ %% Initialise the macro dictionary with the default predefined macros,
++ %% (adapted from epp.erl:predef_macros/1
++ Filename = "compiled_from_string",
++ %%Machine = list_to_atom(erlang:system_info(machine)),
++ Ms0 = dict:new(),
++ % Ms1 = dict:store('FILE', {[], "compiled_from_string"}, Ms0),
++ % Ms2 = dict:store('LINE', {[], 1}, Ms1), % actually we might add special code for this
++ % Ms3 = dict:store('MODULE', {[], undefined}, Ms2),
++ % Ms4 = dict:store('MODULE_STRING', {[], undefined}, Ms3),
++ % Ms5 = dict:store('MACHINE', {[], Machine}, Ms4),
++ % InitMD = dict:store(Machine, {[], true}, Ms5),
++ InitMD = Ms0,
++
++ %% From the docs for compile:forms:
++ %% When encountering an -include or -include_dir directive, the compiler searches for header files in the following directories:
++ %% 1. ".", the current working directory of the file server;
++ %% 2. the base name of the compiled file;
++ %% 3. the directories specified using the i option. The directory specified last is searched first.
++ %% In this case, #2 is meaningless.
++ IncludeSearchPath = ["." | reverse([Dir || {i, Dir} <- CompileFormsOptions])],
++ {RevForms, _OutMacroDict} = scan_and_parse(CodeStr, Filename, 1, [], InitMD, IncludeSearchPath),
++ Forms = reverse(RevForms),
++
++ %% note: 'binary' is forced as an implicit option, whether it is provided or not.
++ case compile:forms(Forms, CompileFormsOptions) of
++ {ok, ModuleName, CompiledCodeBinary} when is_binary(CompiledCodeBinary) ->
++ {ModuleName, CompiledCodeBinary};
++ {ok, ModuleName, CompiledCodeBinary, []} when is_binary(CompiledCodeBinary) -> % empty warnings list
++ {ModuleName, CompiledCodeBinary};
++ {ok, _ModuleName, _CompiledCodeBinary, Warnings} ->
++ throw({?MODULE, warnings, Warnings});
++ Other ->
++ throw({?MODULE, compile_forms, Other})
++ end.
++
++%%====================================================================
++%% Internal functions
++%%====================================================================
++%%% Code from Mats Cronqvist
++%%% See http://www.erlang.org/pipermail/erlang-questions/2007-March/025507.html
++%%%## 'scan_and_parse'
++%%%
++%%% basically we call the OTP scanner and parser (erl_scan and
++%%% erl_parse) line-by-line, but check each scanned line for (or
++%%% definitions of) macros before parsing.
++%% returns {ReverseForms, FinalMacroDict}
++scan_and_parse([], _CurrFilename, _CurrLine, RevForms, MacroDict, _IncludeSearchPath) ->
++ {RevForms, MacroDict};
++
++scan_and_parse(RemainingText, CurrFilename, CurrLine, RevForms, MacroDict, IncludeSearchPath) ->
++ case scanner(RemainingText, CurrLine, MacroDict) of
++ {tokens, NLine, NRemainingText, Toks} ->
++ {ok, Form} = erl_parse:parse_form(Toks),
++ scan_and_parse(NRemainingText, CurrFilename, NLine, [Form | RevForms], MacroDict, IncludeSearchPath);
++ {macro, NLine, NRemainingText, NMacroDict} ->
++ scan_and_parse(NRemainingText, CurrFilename, NLine, RevForms,NMacroDict, IncludeSearchPath);
++ {include, NLine, NRemainingText, IncludeFilename} ->
++ IncludeFileRemainingTextents = read_include_file(IncludeFilename, IncludeSearchPath),
++ %%io:format("include file ~p contents: ~n~p~nRemainingText = ~p~n", [IncludeFilename,IncludeFileRemainingTextents, RemainingText]),
++ %% Modify the FILE macro to reflect the filename
++ %%IncludeMacroDict = dict:store('FILE', {[],IncludeFilename}, MacroDict),
++ IncludeMacroDict = MacroDict,
++
++ %% Process the header file (inc. any nested header files)
++ {RevIncludeForms, IncludedMacroDict} = scan_and_parse(IncludeFileRemainingTextents, IncludeFilename, 1, [], IncludeMacroDict, IncludeSearchPath),
++ %io:format("include file results = ~p~n", [R]),
++ %% Restore the FILE macro in the NEW MacroDict (so we keep any macros defined in the header file)
++ %%NMacroDict = dict:store('FILE', {[],CurrFilename}, IncludedMacroDict),
++ NMacroDict = IncludedMacroDict,
++
++ %% Continue with the original file
++ scan_and_parse(NRemainingText, CurrFilename, NLine, RevIncludeForms ++ RevForms, NMacroDict, IncludeSearchPath);
++ done ->
++ scan_and_parse([], CurrFilename, CurrLine, RevForms, MacroDict, IncludeSearchPath)
++ end.
++
++scanner(Text, Line, MacroDict) ->
++ case erl_scan:tokens([],Text,Line) of
++ {done, {ok,Toks,NLine}, LeftOverChars} ->
++ case pre_proc(Toks, MacroDict) of
++ {tokens, NToks} -> {tokens, NLine, LeftOverChars, NToks};
++ {macro, NMacroDict} -> {macro, NLine, LeftOverChars, NMacroDict};
++ {include, Filename} -> {include, NLine, LeftOverChars, Filename}
++ end;
++ {more, _Continuation} ->
++ %% This is supposed to mean "term is not yet complete" (i.e. a '.' has
++ %% not been reached yet).
++ %% However, for some bizarre reason we also get this if there is a comment after the final '.' in a file.
++ %% So we check to see if Text only consists of comments.
++ case is_only_comments(Text) of
++ true ->
++ done;
++ false ->
++ throw({incomplete_term, Text, Line})
++ end
++ end.
++
++is_only_comments(Text) -> is_only_comments(Text, not_in_comment).
++
++is_only_comments([], _) -> true;
++is_only_comments([$ |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$\t |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$\n |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$% |T], not_in_comment) -> is_only_comments(T, in_comment); % found start of a comment
++is_only_comments(_, not_in_comment) -> false;
++% found any significant char NOT in a comment
++is_only_comments([$\n |T], in_comment) -> is_only_comments(T, not_in_comment); % found end of a comment
++is_only_comments([_ |T], in_comment) -> is_only_comments(T, in_comment). % skipping over in-comment chars
++
++%%%## 'pre-proc'
++%%%
++%%% have to implement a subset of the pre-processor, since epp insists
++%%% on running on a file.
++%%% only handles 2 cases;
++%% -define(MACRO, something).
++%% -define(MACRO(VAR1,VARN),{stuff,VAR1,more,stuff,VARN,extra,stuff}).
++pre_proc([{'-',_},{atom,_,define},{'(',_},{_,_,Name}|DefToks],MacroDict) ->
++ false = dict:is_key(Name, MacroDict),
++ case DefToks of
++ [{',',_} | Macro] ->
++ {macro, dict:store(Name, {[], macro_body_def(Macro, [])}, MacroDict)};
++ [{'(',_} | Macro] ->
++ {macro, dict:store(Name, macro_params_body_def(Macro, []), MacroDict)}
++ end;
++
++pre_proc([{'-',_}, {atom,_,include}, {'(',_}, {string,_,Filename}, {')',_}, {dot,_}], _MacroDict) ->
++ {include, Filename};
++
++pre_proc(Toks,MacroDict) ->
++ {tokens, subst_macros(Toks, MacroDict)}.
++
++macro_params_body_def([{')',_},{',',_} | Toks], RevParams) ->
++ {reverse(RevParams), macro_body_def(Toks, [])};
++macro_params_body_def([{var,_,Param} | Toks], RevParams) ->
++ macro_params_body_def(Toks, [Param | RevParams]);
++macro_params_body_def([{',',_}, {var,_,Param} | Toks], RevParams) ->
++ macro_params_body_def(Toks, [Param | RevParams]).
++
++macro_body_def([{')',_}, {dot,_}], RevMacroBodyToks) ->
++ reverse(RevMacroBodyToks);
++macro_body_def([Tok|Toks], RevMacroBodyToks) ->
++ macro_body_def(Toks, [Tok | RevMacroBodyToks]).
++
++subst_macros(Toks, MacroDict) ->
++ reverse(subst_macros_rev(Toks, MacroDict, [])).
++
++%% returns a reversed list of tokes
++subst_macros_rev([{'?',_}, {_,LineNum,'LINE'} | Toks], MacroDict, RevOutToks) ->
++ %% special-case for ?LINE, to avoid creating a new MacroDict for every line in the source file
++ subst_macros_rev(Toks, MacroDict, [{integer,LineNum,LineNum}] ++ RevOutToks);
++
++subst_macros_rev([{'?',_}, {_,_,Name}, {'(',_} = Paren | Toks], MacroDict, RevOutToks) ->
++ case dict:fetch(Name, MacroDict) of
++ {[], MacroValue} ->
++ %% This macro does not have any vars, so ignore the fact that the invocation is followed by "(...stuff"
++ %% Recursively expand any macro calls inside this macro's value
++ %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++ RevExpandedOtherMacrosToks = subst_macros_rev(MacroValue, MacroDict, []),
++ subst_macros_rev([Paren|Toks], MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks);
++ ParamsAndBody ->
++ %% This macro does have vars.
++ %% Collect all of the passe arguments, in an ordered list
++ {NToks, Arguments} = subst_macros_get_args(Toks, []),
++ %% Expand the varibles
++ ExpandedParamsToks = subst_macros_subst_args_for_vars(ParamsAndBody, Arguments),
++ %% Recursively expand any macro calls inside this macro's value
++ %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++ RevExpandedOtherMacrosToks = subst_macros_rev(ExpandedParamsToks, MacroDict, []),
++ subst_macros_rev(NToks, MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks)
++ end;
++
++subst_macros_rev([{'?',_}, {_,_,Name} | Toks], MacroDict, RevOutToks) ->
++ %% This macro invocation does not have arguments.
++ %% Therefore the definition should not have parameters
++ {[], MacroValue} = dict:fetch(Name, MacroDict),
++
++ %% Recursively expand any macro calls inside this macro's value
++ %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++ RevExpandedOtherMacrosToks = subst_macros_rev(MacroValue, MacroDict, []),
++ subst_macros_rev(Toks, MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks);
++
++subst_macros_rev([Tok|Toks], MacroDict, RevOutToks) ->
++subst_macros_rev(Toks, MacroDict, [Tok|RevOutToks]);
++subst_macros_rev([], _MacroDict, RevOutToks) -> RevOutToks.
++
++subst_macros_get_args([{')',_} | Toks], RevArgs) ->
++ {Toks, reverse(RevArgs)};
++subst_macros_get_args([{',',_}, {var,_,ArgName} | Toks], RevArgs) ->
++ subst_macros_get_args(Toks, [ArgName| RevArgs]);
++subst_macros_get_args([{var,_,ArgName} | Toks], RevArgs) ->
++ subst_macros_get_args(Toks, [ArgName | RevArgs]).
++
++subst_macros_subst_args_for_vars({[], BodyToks}, []) ->
++ BodyToks;
++subst_macros_subst_args_for_vars({[Param | Params], BodyToks}, [Arg|Args]) ->
++ NBodyToks = keyreplace(Param, 3, BodyToks, {var,1,Arg}),
++ subst_macros_subst_args_for_vars({Params, NBodyToks}, Args).
++
++read_include_file(Filename, IncludeSearchPath) ->
++ case file:path_open(IncludeSearchPath, Filename, [read, raw, binary]) of
++ {ok, IoDevice, FullName} ->
++ {ok, Data} = file:read(IoDevice, filelib:file_size(FullName)),
++ file:close(IoDevice),
++ binary_to_list(Data);
++ {error, Reason} ->
++ throw({failed_to_read_include_file, Reason, Filename, IncludeSearchPath})
++ end.
+\ No newline at end of file
+diff --git a/src/ejabberd.app b/src/ejabberd.app
+index 1ff41ec..7f0948f 100644
+--- ejabberd.app
++++ ejabberd.app
+@@ -115,7 +115,6 @@
+ nodetree_virtual,
+ p1_fsm,
+ p1_mnesia,
+- ram_file_io_server,
+ randoms,
+ sha,
+ shaper,
+diff --git a/src/ejabberd_loglevel.erl b/src/ejabberd_loglevel.erl
+index 3134d4d..2a34060 100644
+--- ejabberd_loglevel.erl
++++ ejabberd_loglevel.erl
+@@ -38,51 +38,30 @@
+ -define(LOGMODULE, "error_logger").
+
+ %% Error levels:
+-%% 0 -> No log
+-%% 1 -> Critical
+-%% 2 -> Error
+-%% 3 -> Warning
+-%% 4 -> Info
+-%% 5 -> Debug
++-define(LOG_LEVELS,[ {0, no_log, "No log"}
++ ,{1, critical, "Critical"}
++ ,{2, error, "Error"}
++ ,{3, warning, "Warning"}
++ ,{4, info, "Info"}
++ ,{5, debug, "Debug"}
++ ]).
++
++set(LogLevel) when is_atom(LogLevel) ->
++ set(level_to_integer(LogLevel));
+ set(Loglevel) when is_integer(Loglevel) ->
+- Forms = compile_string(?LOGMODULE, ejabberd_logger_src(Loglevel)),
+- load_logger(Forms, ?LOGMODULE, Loglevel);
++ try
++ {Mod,Code} = dynamic_compile:from_string(ejabberd_logger_src(Loglevel)),
++ code:load_binary(Mod, ?LOGMODULE ++ ".erl", Code)
++ catch
++ Type:Error -> ?CRITICAL_MSG("Error compiling logger (~p): ~p~n", [Type, Error])
++ end;
+ set(_) ->
+ exit("Loglevel must be an integer").
+-
+-%% --------------------------------------------------------------
+-%% Compile a string into a module and returns the binary
+-compile_string(Mod, Str) ->
+- Fname = Mod ++ ".erl",
+- {ok, Fd} = open_ram_file(Fname),
+- file:write(Fd, Str),
+- file:position(Fd, 0),
+- case epp_dodger:parse(Fd) of
+- {ok, Tree} ->
+- Forms = revert_tree(Tree),
+- close_ram_file(Fd),
+- Forms;
+- Error ->
+- close_ram_file(Fd),
+- Error
+- end.
+-
+-open_ram_file(Fname) ->
+- ram_file_io_server:start(self(), Fname, [read,write]).
+-
+-close_ram_file(Fd) ->
+- file:close(Fd).
+-
+-revert_tree(Tree) ->
+- [erl_syntax:revert(T) || T <- Tree].
+
+-load_logger(Forms, Mod, Loglevel) ->
+- Fname = Mod ++ ".erl",
+- case compile:forms(Forms, [binary, {d,'LOGLEVEL',Loglevel}]) of
+- {ok, M, Bin} ->
+- code:load_binary(M, Fname, Bin);
+- Error ->
+- ?CRITICAL_MSG("Error ~p~n", [Error])
++level_to_integer(Level) ->
++ case lists:keyfind(Level, 2, ?LOG_LEVELS) of
++ {Int, Level, _Desc} -> Int;
++ _ -> erlang:error({no_such_loglevel, Level})
+ end.
diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index 2e4d94290e..388c61ef73 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,5 @@
SPELL=gajim
- VERSION=0.12.1
+ VERSION=0.12.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[1]=http://www.gajim.org/downloads/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
@@ -10,10 +10,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
KEYWORDS="jabber messaging chat"
SHORT="Jabber client written in PyGTK"
cat << EOF
-Gajim is a Jabber client written in PyGTK.
-The goal of Gajim's developers is to provide a full featured
-and easy to use xmpp client for the GTK+ users. Gajim works
-nicely with GNOME, but does not require it to run.
+Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to
+provide a full featured and easy to use xmpp client for the GTK+ users. Gajim
+works nicely with GNOME, but does not require it to run.
+
Features:
* Tabbed chat windows
* Group chat support (with MUC protocol)
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 51c10b93fc..cf31474408 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,9 @@
+2009-06-12 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.12.3; fixed long desc
+
+2009-06-07 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 0.12.2
+
2008-12-21 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.12.1
diff --git a/chat-im/gajim/gajim-0.12.1.tar.bz2.sig b/chat-im/gajim/gajim-0.12.1.tar.bz2.sig
deleted file mode 100644
index c48e8bb9a3..0000000000
--- a/chat-im/gajim/gajim-0.12.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/chat-im/gajim/gajim-0.12.3.tar.bz2.sig b/chat-im/gajim/gajim-0.12.3.tar.bz2.sig
new file mode 100644
index 0000000000..54993246c5
--- /dev/null
+++ b/chat-im/gajim/gajim-0.12.3.tar.bz2.sig
Binary files differ
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index e51fc74a83..c826936502 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,5 +1,5 @@
SPELL=pidgin
- VERSION=2.5.6
+ VERSION=2.5.8
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 913acd75a3..cbdc66fbfa 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2009-06-29 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 2.5.8
+
2009-05-21 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 2.5.6
diff --git a/chat-im/pidgin/pidgin-2.5.6.tar.bz2.sig b/chat-im/pidgin/pidgin-2.5.6.tar.bz2.sig
deleted file mode 100644
index 1256d342e6..0000000000
--- a/chat-im/pidgin/pidgin-2.5.6.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/chat-im/pidgin/pidgin-2.5.8.tar.bz2.sig b/chat-im/pidgin/pidgin-2.5.8.tar.bz2.sig
new file mode 100644
index 0000000000..3ac9402d46
--- /dev/null
+++ b/chat-im/pidgin/pidgin-2.5.8.tar.bz2.sig
Binary files differ
diff --git a/chat-im/psi/DETAILS b/chat-im/psi/DETAILS
index 3447aa4652..472d01d717 100755
--- a/chat-im/psi/DETAILS
+++ b/chat-im/psi/DETAILS
@@ -1,9 +1,9 @@
SPELL=psi
if [ "$DEVEL" == "y" ]; then
- VERSION=0.13-rc1
+ VERSION=0.13-rc2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:eefe78ae91c4fc78f9154a9c451d2ac95227f0012cb3c82d0b951795d34d01b397633cec9ae1f8ddaf64c63f6d7da81b7c089214248c8e552982c686f5a319e2
+ SOURCE_HASH=sha512:ea1d390e748677de976a11e9ef9ff52f6064ea52dbb9aa8cbf8a3f11c4dbb4ae05b8dde5c604c9d67142b30a30568532d889de3e1640025c91c1a848a0660320
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
else
diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY
index f65ba4f6cf..570780cd4a 100644
--- a/chat-im/psi/HISTORY
+++ b/chat-im/psi/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated devel to 0.13-rc2
+
2009=05-23 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated devel to version 0.13-rc1
diff --git a/chat-im/purple-plugin-pack/DETAILS b/chat-im/purple-plugin-pack/DETAILS
index c36ee45510..0e7b96d3b5 100755
--- a/chat-im/purple-plugin-pack/DETAILS
+++ b/chat-im/purple-plugin-pack/DETAILS
@@ -1,8 +1,8 @@
SPELL=purple-plugin-pack
- VERSION=2.1.1
+ VERSION=2.5.1
SOURCE="purple-plugin_pack-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://downloads.guifications.org/plugins/Plugin%20Pack/${SOURCE}
- SOURCE_HASH=sha512:1d004826ca3f7d127ab3aafee02e3662ca21b197f4d74084433da9017557a19fd38502fa1165943e242e02088d23090bba931f2b037c27de2cae76dabdd14688
+ SOURCE_HASH=sha512:e60ba13d9cdbb581ad478ad8e03626d94baa06ad89eb508a9ad31b0d18e0800ed97e9b3fd5aa6158a9eb340465277db48a58c7a08e0ded64ed9aac1859fa0ac9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/purple-plugin_pack-${VERSION}"
WEB_SITE="http://plugins.guifications.org/trac/wiki/PluginPack"
LICENSE[0]=GPL
diff --git a/chat-im/purple-plugin-pack/HISTORY b/chat-im/purple-plugin-pack/HISTORY
index fcf1f8bdac..09aefa49ab 100644
--- a/chat-im/purple-plugin-pack/HISTORY
+++ b/chat-im/purple-plugin-pack/HISTORY
@@ -1,2 +1,5 @@
+2009-07-01 David Kowis <dkowis@shlrm.org>
+ * DETAILS: updated to latest version
+
2007-10-15 Lalo Martins <lalo@sourcemage.org>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 2b13b6dcb7..2b13b6dcb7 100644..100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
diff --git a/chat-libs/libmsn/DETAILS b/chat-libs/libmsn/DETAILS
index fb62e16ae2..7ecaa22242 100755
--- a/chat-libs/libmsn/DETAILS
+++ b/chat-libs/libmsn/DETAILS
@@ -1,6 +1,6 @@
SPELL=libmsn
- VERSION=4.0-beta4
- SOURCE_HASH=sha512:722aeddd34fa8f779f678645785d7dafc9ec869c2e47f2cb77f953ab3c5c30093e4b51f262d192fed6f7d647c35aa970f5104b602558b3eb55dfde631ed6c00a
+ VERSION=4.0-beta6
+ SOURCE_HASH=sha512:e7d19dd8eb665644844046d7baf5e47ba9d20e4934af5ee6053c91e6ba64ddf02b2da7cfe9c2bae6739520780cfbaf81d637e56cdc46eaebde6ada56fb2749f7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 3fa39b5974..684156f324 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,9 @@
+2009-06-11 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.0-beta6
+
+2009-06-04 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.0-beta5
+
2009-01-24 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.0-beta4
diff --git a/collab/chora/DETAILS b/collab/chora/DETAILS
index 58e4003329..f1e134442d 100755
--- a/collab/chora/DETAILS
+++ b/collab/chora/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.0.2
+ VERSION=2.1
# SOURCE_HASH='sha1:2effb206d251701d68b154fdda2c4d6aefeb30e9'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/collab/chora/HISTORY b/collab/chora/HISTORY
index d50344c559..1fbed3783a 100644
--- a/collab/chora/HISTORY
+++ b/collab/chora/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.1
+
2007-09-28 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.0.2
diff --git a/collab/chora/chora-h3-2.0.2.tar.gz.sig b/collab/chora/chora-h3-2.0.2.tar.gz.sig
deleted file mode 100644
index b914663e61..0000000000
--- a/collab/chora/chora-h3-2.0.2.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/chora/chora-h3-2.1.tar.gz.sig b/collab/chora/chora-h3-2.1.tar.gz.sig
new file mode 100644
index 0000000000..631f371ed4
--- /dev/null
+++ b/collab/chora/chora-h3-2.1.tar.gz.sig
Binary files differ
diff --git a/collab/dimp/DETAILS b/collab/dimp/DETAILS
index 0ac40ea765..23971b0ee1 100755
--- a/collab/dimp/DETAILS
+++ b/collab/dimp/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=1.1.1
+ VERSION=1.1.2
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-h3-$VERSION
diff --git a/collab/dimp/HISTORY b/collab/dimp/HISTORY
index 5e7623015a..26a0fc7917 100644
--- a/collab/dimp/HISTORY
+++ b/collab/dimp/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.1.2
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.1.1
diff --git a/collab/dimp/dimp-h3-1.1.1.tar.gz.sig b/collab/dimp/dimp-h3-1.1.1.tar.gz.sig
deleted file mode 100644
index 5834c491e7..0000000000
--- a/collab/dimp/dimp-h3-1.1.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/dimp/dimp-h3-1.1.2.tar.gz.sig b/collab/dimp/dimp-h3-1.1.2.tar.gz.sig
new file mode 100644
index 0000000000..9168bd71e2
--- /dev/null
+++ b/collab/dimp/dimp-h3-1.1.2.tar.gz.sig
Binary files differ
diff --git a/collab/gollem/DETAILS b/collab/gollem/DETAILS
index ccbe43060b..193c2a0b1c 100755
--- a/collab/gollem/DETAILS
+++ b/collab/gollem/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=1.0.4
+ VERSION=1.1
# SOURCE_HASH='sha512:2fcc973b787643ac173023a59f5ed020e7345ff45571e7d946a6484531a2e1603b8d4f32871695fb99200014c429c21bc24aedcbb80ce15f867af5c21ea306cf'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/collab/gollem/HISTORY b/collab/gollem/HISTORY
index c2676b4219..67161e9476 100644
--- a/collab/gollem/HISTORY
+++ b/collab/gollem/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.1
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.0.4
diff --git a/collab/gollem/gollem-h3-1.0.4.tar.gz.sig b/collab/gollem/gollem-h3-1.0.4.tar.gz.sig
deleted file mode 100644
index 50ce95f79b..0000000000
--- a/collab/gollem/gollem-h3-1.0.4.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/gollem/gollem-h3-1.1.tar.gz.sig b/collab/gollem/gollem-h3-1.1.tar.gz.sig
new file mode 100644
index 0000000000..3c7669431b
--- /dev/null
+++ b/collab/gollem/gollem-h3-1.1.tar.gz.sig
Binary files differ
diff --git a/collab/horde/DETAILS b/collab/horde/DETAILS
index 3db410b3a2..50472d2fde 100755
--- a/collab/horde/DETAILS
+++ b/collab/horde/DETAILS
@@ -10,7 +10,8 @@ if [[ "$HORDE_DEVEL" == 'y' ]]; then
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=3.3
+ VERSION=3.3.4
+ SECURITY_PATCH=1
#SOURCE_HASH='sha512:c11e9b95f9793be6fa38033147aeb5ba4d12e75af492ab9b2b7cdb5842472a4babfce5a21266fdea5f0fdc9edaed030ac3eec4b58c728b120cf15a18c2fc6886'
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/collab/horde/HISTORY b/collab/horde/HISTORY
index 8d8b7fcc91..1f92ff52c4 100644
--- a/collab/horde/HISTORY
+++ b/collab/horde/HISTORY
@@ -1,3 +1,8 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 3.3.4
+ SECURITY_PATCH++
+ See http://lists.horde.org/archives/announce/2009/000482.html
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.3
diff --git a/collab/horde/horde-3.3.4.tar.gz.sig b/collab/horde/horde-3.3.4.tar.gz.sig
new file mode 100644
index 0000000000..160d8dfdea
--- /dev/null
+++ b/collab/horde/horde-3.3.4.tar.gz.sig
Binary files differ
diff --git a/collab/horde/horde-3.3.tar.gz.sig b/collab/horde/horde-3.3.tar.gz.sig
deleted file mode 100644
index da8abf5e6b..0000000000
--- a/collab/horde/horde-3.3.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/imp/DETAILS b/collab/imp/DETAILS
index 06a238e2a4..1f4685a812 100755
--- a/collab/imp/DETAILS
+++ b/collab/imp/DETAILS
@@ -11,7 +11,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=4.3.2
+ VERSION=4.3.4
+ SECURITY_PATCH=1
#SOURCE_HASH='sha512:7ae835d7b356405164f8986c6fb62afff0b752e1d2bf821126a76c550622f8d67b9d766c8b8642ac54ff48bbd8e3d3097fc6b7e874a8389fb0dd527e1d8476d6'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/collab/imp/HISTORY b/collab/imp/HISTORY
index 97f093d48a..924a8497b9 100644
--- a/collab/imp/HISTORY
+++ b/collab/imp/HISTORY
@@ -1,3 +1,8 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 4.3.4
+ SECURITY_PATCH++ (for 4.3.2 -> 4.3.3)
+ See http://lists.horde.org/archives/announce/2009/000485.html
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 4.3.2
diff --git a/collab/imp/imp-h3-4.3.2.tar.gz.sig b/collab/imp/imp-h3-4.3.2.tar.gz.sig
deleted file mode 100644
index c1c7be1612..0000000000
--- a/collab/imp/imp-h3-4.3.2.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/imp/imp-h3-4.3.4.tar.gz.sig b/collab/imp/imp-h3-4.3.4.tar.gz.sig
new file mode 100644
index 0000000000..81e4293db5
--- /dev/null
+++ b/collab/imp/imp-h3-4.3.4.tar.gz.sig
Binary files differ
diff --git a/collab/kronolith/DETAILS b/collab/kronolith/DETAILS
index d0af4868d9..bfb7f03784 100755
--- a/collab/kronolith/DETAILS
+++ b/collab/kronolith/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.3
+ VERSION=2.3.1
#SOURCE_HASH='sha512:fe10d4d169b6ac657a742d8637fc1890e910599ef3832ce5d58cb59fe40550401055d97fb584c8657f773402a5f59960af14b4897cdb7ada534efdc2f73f35c8'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/collab/kronolith/HISTORY b/collab/kronolith/HISTORY
index 7853d7baac..88f2c4b0dc 100644
--- a/collab/kronolith/HISTORY
+++ b/collab/kronolith/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.3.1
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.3
diff --git a/collab/kronolith/kronolith-h3-2.3.1.tar.gz.sig b/collab/kronolith/kronolith-h3-2.3.1.tar.gz.sig
new file mode 100644
index 0000000000..984a134fe9
--- /dev/null
+++ b/collab/kronolith/kronolith-h3-2.3.1.tar.gz.sig
Binary files differ
diff --git a/collab/kronolith/kronolith-h3-2.3.tar.gz.sig b/collab/kronolith/kronolith-h3-2.3.tar.gz.sig
deleted file mode 100644
index 901fcb732b..0000000000
--- a/collab/kronolith/kronolith-h3-2.3.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/nag/DETAILS b/collab/nag/DETAILS
index 4c4d9f6b33..e9579c491a 100755
--- a/collab/nag/DETAILS
+++ b/collab/nag/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=2.3.1
+ VERSION=2.3.2
#SOURCE_HASH='sha512:b3930142ac29b969d6ad58cc5e44245f7aa207f440b3c19eb0501daa4bd2f806d73b0375b22daa6ad4db15d001f8c10cf5cdd5569d2b1d344d37ebc0f5c856c7'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/collab/nag/HISTORY b/collab/nag/HISTORY
index c48346e02b..b2524479a9 100644
--- a/collab/nag/HISTORY
+++ b/collab/nag/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.3.2
+
2009-01-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.3.1
diff --git a/collab/nag/nag-h3-2.3.1.tar.gz.sig b/collab/nag/nag-h3-2.3.1.tar.gz.sig
deleted file mode 100644
index aceb9b0197..0000000000
--- a/collab/nag/nag-h3-2.3.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/nag/nag-h3-2.3.2.tar.gz.sig b/collab/nag/nag-h3-2.3.2.tar.gz.sig
new file mode 100644
index 0000000000..88798d08b5
--- /dev/null
+++ b/collab/nag/nag-h3-2.3.2.tar.gz.sig
Binary files differ
diff --git a/collab/passwd/DETAILS b/collab/passwd/DETAILS
index ab061606dc..723213db28 100755
--- a/collab/passwd/DETAILS
+++ b/collab/passwd/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_IGNORE='volatile'
FORCE_DOWNLOAD='on'
else
- VERSION=3.0.1
+ VERSION=3.1
# SOURCE_HASH='sha1:254063b384f055f12b044ad7bed1704d06d68ff0'
SOURCE=$SPELL-h3-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/collab/passwd/HISTORY b/collab/passwd/HISTORY
index e9821726ae..585342af6f 100644
--- a/collab/passwd/HISTORY
+++ b/collab/passwd/HISTORY
@@ -1,3 +1,6 @@
+2009-07-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 3.1
+
2007-09-28 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.0.1
Removed UPDATED
diff --git a/collab/passwd/passwd-h3-3.0.1.tar.gz.sig b/collab/passwd/passwd-h3-3.0.1.tar.gz.sig
deleted file mode 100644
index 621df7942e..0000000000
--- a/collab/passwd/passwd-h3-3.0.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/collab/passwd/passwd-h3-3.1.tar.gz.sig b/collab/passwd/passwd-h3-3.1.tar.gz.sig
new file mode 100644
index 0000000000..379899d32c
--- /dev/null
+++ b/collab/passwd/passwd-h3-3.1.tar.gz.sig
Binary files differ
diff --git a/collab/rapidsvn/DEPENDS b/collab/rapidsvn/DEPENDS
index 6c83233aba..d5cec4f73d 100755
--- a/collab/rapidsvn/DEPENDS
+++ b/collab/rapidsvn/DEPENDS
@@ -1,6 +1,6 @@
depends subversion &&
depends apr-util &&
-depends wxgtk &&
+depends WXWIDGET &&
depends neon &&
depends apr &&
diff --git a/collab/rapidsvn/DETAILS b/collab/rapidsvn/DETAILS
index 55b1a4d51b..8a3a05c441 100755
--- a/collab/rapidsvn/DETAILS
+++ b/collab/rapidsvn/DETAILS
@@ -1,8 +1,8 @@
SPELL=rapidsvn
- VERSION=0.9.4
+ VERSION=0.9.8
+ SOURCE_HASH=sha512:e002d489ba453b749e742960b9cd0a148baadbb5a9bcb339fa87e2a346402911d10f6dfe3b4aa9d9e3271834d0c359b63b700b978cc38645c7fceb611cdb6829
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.rapidsvn.org/download/release/$VERSION/$SOURCE
- SOURCE_HASH=sha512:41c197e1aec1e27052f0700fffbd392e0b9c343898f78f17395e807b3ce3e68559720156e7dd32cc92b9cf4aaca1068f7ba418aa31121ce931c31fa84aa80ecf
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
LICENCE[1]=LGPL
diff --git a/collab/rapidsvn/HISTORY b/collab/rapidsvn/HISTORY
index 8f433c2414..f67c61fa48 100644
--- a/collab/rapidsvn/HISTORY
+++ b/collab/rapidsvn/HISTORY
@@ -1,3 +1,8 @@
+2009-06-09 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.8
+ * DEPENDS: wxgtk -> WXWIDGET
+ * PRE_BUILD, patches/*: deleted
+
2007-11-04 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated to 0.9.4, added sha512, cleaned up
* DEPENDS: fixed depends, added db, openssl
diff --git a/collab/rapidsvn/PRE_BUILD b/collab/rapidsvn/PRE_BUILD
deleted file mode 100755
index 7d3f5dfe67..0000000000
--- a/collab/rapidsvn/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ $(installed_version wxgtk | cut -c -3) == 2.8 ]]; then
- for p in $(ls ${SCRIPT_DIRECTORY}/patches); do
- patch -p0 < ${SCRIPT_DIRECTORY}/patches/$p
- done
-fi
diff --git a/collab/rapidsvn/patches/patch-src_add_action_cpp b/collab/rapidsvn/patches/patch-src_add_action_cpp
deleted file mode 100644
index fdb2972699..0000000000
--- a/collab/rapidsvn/patches/patch-src_add_action_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_add_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/add_action.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/add_action.cpp Mon Oct 8 13:01:47 2007
-@@ -23,11 +23,11 @@
- * ====================================================================
- */
-
--// svncpp
--#include "svncpp/client.hpp"
--
- // wxWidgets
- #include "wx/intl.h"
-+
-+// svncpp
-+#include "svncpp/client.hpp"
-
- // app
- #include "ids.hpp"
diff --git a/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp b/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
deleted file mode 100644
index 416339a6ea..0000000000
--- a/collab/rapidsvn/patches/patch-src_checkout_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_checkout_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/checkout_dlg.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/checkout_dlg.cpp Mon Oct 8 13:01:47 2007
-@@ -256,7 +256,6 @@ struct CheckoutDlg::Data (public)
-
- BEGIN_EVENT_TABLE (CheckoutDlg, wxDialog)
- EVT_BUTTON (ID_BUTTON_BROWSE, CheckoutDlg::OnBrowse)
-- EVT_BUTTON (wxID_OK, CheckoutDlg::OnOK)
- EVT_CHECKBOX (ID_USELATEST, CheckoutDlg::OnUseLatest)
- EVT_TEXT (-1, CheckoutDlg::OnText)
- // EVT_BUTTON (wxID_HELP, CheckoutDlg::OnHelp)
diff --git a/collab/rapidsvn/patches/patch-src_export_dlg_cpp b/collab/rapidsvn/patches/patch-src_export_dlg_cpp
deleted file mode 100644
index 1c15da6558..0000000000
--- a/collab/rapidsvn/patches/patch-src_export_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_export_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/export_dlg.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/export_dlg.cpp Mon Oct 8 13:01:47 2007
-@@ -295,7 +295,6 @@ struct ExportDlg::Data (public)
-
- BEGIN_EVENT_TABLE (ExportDlg, wxDialog)
- EVT_BUTTON (ID_BUTTON_BROWSE, ExportDlg::OnBrowse)
-- EVT_BUTTON (wxID_OK, ExportDlg::OnOK)
- EVT_CHECKBOX (ID_USE_LATEST, ExportDlg::OnUseLatest)
- EVT_CHECKBOX (ID_NOT_SPECIFIED, ExportDlg::OnNotSpecified)
- EVT_COMBOBOX (ID_NATIVE_EOL, ExportDlg::OnNativeEol)
diff --git a/collab/rapidsvn/patches/patch-src_import_dlg_cpp b/collab/rapidsvn/patches/patch-src_import_dlg_cpp
deleted file mode 100644
index ecf8e61b3a..0000000000
--- a/collab/rapidsvn/patches/patch-src_import_dlg_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_import_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/import_dlg.cpp.orig Mon Oct 8 13:03:12 2007
-+++ src/import_dlg.cpp Mon Oct 8 13:03:33 2007
-@@ -196,7 +196,7 @@ ImportDlg::OnOk (wxCommandEvent &event)
- }
- }
-
-- wxDialog::OnOK(event);
-+ wxDialog::EndModal (wxID_OK);
- }
-
- void
diff --git a/collab/rapidsvn/patches/patch-src_listener_cpp b/collab/rapidsvn/patches/patch-src_listener_cpp
deleted file mode 100644
index 2ae1a375c7..0000000000
--- a/collab/rapidsvn/patches/patch-src_listener_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_listener_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/listener.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/listener.cpp Mon Oct 8 13:01:47 2007
-@@ -253,7 +253,7 @@ struct Listener::Data (public)
- void
- handleEvent (wxCommandEvent & event)
- {
-- switch (event.m_id)
-+ switch (event.GetId ())
- {
- case SIG_GET_LOG_MSG:
- callbackGetLogMessage ();
diff --git a/collab/rapidsvn/patches/patch-src_log_dlg_cpp b/collab/rapidsvn/patches/patch-src_log_dlg_cpp
deleted file mode 100644
index ce71f89463..0000000000
--- a/collab/rapidsvn/patches/patch-src_log_dlg_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_log_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/log_dlg.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/log_dlg.cpp Mon Oct 8 13:01:47 2007
-@@ -32,6 +32,7 @@
- #include "wx/valgen.h"
- #include "wx/listctrl.h"
- #include "wx/splitter.h"
-+#include "wx/notebook.h"
-
-
- // svncpp
diff --git a/collab/rapidsvn/patches/patch-src_merge_dlg_cpp b/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
deleted file mode 100644
index 79e9e78878..0000000000
--- a/collab/rapidsvn/patches/patch-src_merge_dlg_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_merge_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/merge_dlg.cpp.orig Mon Oct 8 13:03:19 2007
-+++ src/merge_dlg.cpp Mon Oct 8 13:03:33 2007
-@@ -113,7 +113,7 @@ MergeDlg::OnOK (wxCommandEvent & event)
- }
- }
-
-- wxDialog::OnOK(event);
-+ wxDialog::EndModal (wxID_OK);
- }
-
- void
diff --git a/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp b/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
deleted file mode 100644
index 5d7cef45f9..0000000000
--- a/collab/rapidsvn/patches/patch-src_preferences_dlg_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_preferences_dlg_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/preferences_dlg.cpp.orig Mon Oct 8 13:03:28 2007
-+++ src/preferences_dlg.cpp Mon Oct 8 13:03:33 2007
-@@ -114,10 +114,8 @@ class ProgramsPanel : public wxPanel (public)
- */
- bool SelectExecutable (const wxString & title, wxTextCtrl * textCtrl)
- {
-- wxFileDialog dlg (this, title);
--
-- dlg.SetStyle (wxHIDE_READONLY | wxOPEN);
-- dlg.SetWildcard (EXECUTABLE_WILDCARD);
-+ wxFileDialog dlg (this, title, wxEmptyString, wxEmptyString,
-+ EXECUTABLE_WILDCARD, wxOPEN);
- dlg.SetPath (textCtrl->GetValue ());
-
- if (dlg.ShowModal () != wxID_OK)
diff --git a/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp b/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
deleted file mode 100644
index c3a49136a0..0000000000
--- a/collab/rapidsvn/patches/patch-src_rapidsvn_frame_cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$OpenBSD: patch-src_rapidsvn_frame_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/rapidsvn_frame.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/rapidsvn_frame.cpp Mon Oct 8 13:01:47 2007
-@@ -1150,7 +1150,7 @@ RapidSvnFrame::OnColumnReset (wxCommandEvent &)
- void
- RapidSvnFrame::OnColumn (wxCommandEvent & event)
- {
-- int eventId = event.m_id;
-+ int eventId = event.GetId ();
- int col = 0;
- while (col < FileListCtrl::COL_COUNT &&
- m->ColumnList[col].id != eventId)
-@@ -1192,7 +1192,7 @@ void
- RapidSvnFrame::OnColumnSorting (wxCommandEvent & event)
- {
- // we dont want to list FileListCtrl::COL_NAME/COL_PATH/... here
-- int col = event.m_id - ID_ColumnSort_Name;
-+ int col = event.GetId () - ID_ColumnSort_Name;
-
- m->listCtrl->SetSortColumn (col);
- m->listCtrl->SetSortAscending (true);
-@@ -1294,7 +1294,7 @@ RapidSvnFrame::OnInfo (wxCommandEvent & WXUNUSED (even
- void
- RapidSvnFrame::OnUpdateCommand (wxUpdateUIEvent & updateUIEvent)
- {
-- updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.m_id, GetSelectionActionFlags ()));
-+ updateUIEvent.Enable (ValidateIDActionFlags (updateUIEvent.GetId (), GetSelectionActionFlags ()));
- }
-
- void
-@@ -1514,13 +1514,13 @@ RapidSvnFrame::OnFileCommand (wxCommandEvent & event)
- {
- Action* action = NULL;
-
-- if ((event.m_id >= ID_Verb_Min) && (event.m_id <= ID_Verb_Max))
-+ if ((event.GetId () >= ID_Verb_Min) && (event.GetId () <= ID_Verb_Max))
- {
-- action = new ExternalProgramAction (this, event.m_id - ID_Verb_Min, false);
-+ action = new ExternalProgramAction (this, event.GetId () - ID_Verb_Min, false);
- }
- else
- {
-- switch (event.m_id)
-+ switch (event.GetId ())
- {
- case ID_Explore:
- action = new ExternalProgramAction (this, -1, true);
diff --git a/collab/rapidsvn/patches/patch-src_resolve_action_cpp b/collab/rapidsvn/patches/patch-src_resolve_action_cpp
deleted file mode 100644
index 5ce1921b0e..0000000000
--- a/collab/rapidsvn/patches/patch-src_resolve_action_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_resolve_action_cpp,v 1.1 2007/10/08 20:38:17 steven Exp $
---- src/resolve_action.cpp.orig Fri Dec 8 18:47:07 2006
-+++ src/resolve_action.cpp Mon Oct 8 13:01:47 2007
-@@ -23,11 +23,11 @@
- * ====================================================================
- */
-
--// svncpp
--#include "svncpp/client.hpp"
--
- // wxWidgets
- #include "wx/intl.h"
-+
-+// svncpp
-+#include "svncpp/client.hpp"
-
- // app
- #include "resolve_action.hpp"
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index d9419120db..69ce3c00c7 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.6.2
+ VERSION=1.6.3
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
else
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
- SOURCE_HASH=sha512:39c7c206133706e70ce968e795d0761ecfd474841c9f56c850d5211378435ccfd6528a2cc6e54d97fdc6eefd7f14ad24bbd49bb42cbef0b5208c8ea56e062a29
+ SOURCE_HASH=sha512:a11180e7d7fd0b488fc505b5afc5a15e1117947cba84526aacfce768868ecb852cc4bd4344094b804bf626937c494f140ac5c1a52ab91aaddfcfac04c3fbc606
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 03a2825950..1a43a25b58 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2009-06-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.6.3
+
2009-05-15 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: added sqlite #15228
diff --git a/collab/webmin/DETAILS b/collab/webmin/DETAILS
index c1b6db04b8..b1dfcd490c 100755
--- a/collab/webmin/DETAILS
+++ b/collab/webmin/DETAILS
@@ -1,9 +1,9 @@
SPELL=webmin
- VERSION=1.470
+ VERSION=1.480
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/webadmin/$SOURCE
- SOURCE_HASH=sha512:1423a3004aee4b0b0311e1818f5a16af480a7129c7bd024498469eddcf71d712df5b4aff46e36eb1bc604b975838c5d47a4541aa0a649de98244eef586b7e75d
+ SOURCE_HASH=sha512:95584635a24df62523d2717972299017919ea68fe957278f98a7677e09816959b610ce3d6a82867e67742b632cc987ae9696f054c7f2c8b53e29d1ba19136901
WEB_SITE=http://www.webmin.com/
ENTERED=20020415
ARCHIVE="off"
diff --git a/collab/webmin/HISTORY b/collab/webmin/HISTORY
index cb77dbccaa..7767f69a86 100644
--- a/collab/webmin/HISTORY
+++ b/collab/webmin/HISTORY
@@ -1,3 +1,6 @@
+2009-06-12 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 1.480
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
* init.d/webmin: made it non-sh, bug #13702
diff --git a/crypto/botan/DETAILS b/crypto/botan/DETAILS
index 0ffae5c394..962865cd8a 100755
--- a/crypto/botan/DETAILS
+++ b/crypto/botan/DETAILS
@@ -1,5 +1,5 @@
SPELL=botan
- VERSION=1.8.1
+ VERSION=1.8.2
SOURCE=Botan-$VERSION.tbz
SOURCE_URL[0]=http://files.randombit.net/botan/$SOURCE
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 9c17c8d1d2..d5b32d6e66 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,6 @@
+2009-06-07 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.8.2
+
2009-01-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.8.1
diff --git a/crypto/ccrypt/DETAILS b/crypto/ccrypt/DETAILS
index 9278fb7b9b..d1881fd5ae 100755
--- a/crypto/ccrypt/DETAILS
+++ b/crypto/ccrypt/DETAILS
@@ -1,14 +1,14 @@
SPELL=ccrypt
- VERSION=1.7
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://quasar.mathstat.uottawa.ca/~selinger/ccrypt/download/$SOURCE
- SOURCE_HASH=sha512:113cd35d17ddc42d94a4d16ba1ea0aa5460bc3df095dc01eee82d67c061d98e23f8b9ba103199a676b4020a0bb7b9ee59eee48678e81c5b26bc23f55ee6ca01a
- WEB_SITE=http://quasar.mathstat.uottawa.ca/~selinger/ccrypt/
+ SOURCE_URL[0]=http://www.mathstat.dal.ca/~selinger/ccrypt/download/$SOURCE
+ SOURCE_HASH=sha512:d3d9038b3a1d47ef7be37e83b99a5c341367cbe0b162623a5e985522a74948ca09c34ef3fa1317d8e4c1a0b202a1cdd47f69e09a0ac94364eaa92cae8144e0dd
+ WEB_SITE=http://www.mathstat.dal.ca/~selinger/ccrypt/
ENTERED=20020929
LICENSE[0]=GPL
KEYWORDS="streaming crypto"
- SHORT="ccrypt - secure encryption and decryption of files and streams"
+ SHORT="secure encryption and decryption of files and streams"
cat << EOF
ccrypt is a utility for encrypting and decrypting files
and streams. It was designed as a replacement for the
diff --git a/crypto/ccrypt/HISTORY b/crypto/ccrypt/HISTORY
index 0e46fa94f0..12c268342b 100644
--- a/crypto/ccrypt/HISTORY
+++ b/crypto/ccrypt/HISTORY
@@ -1,3 +1,6 @@
+2009-06-06 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.8, updated SHORT, WEB_SITE and SOURCE_URL[0]
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/crypto/cryptmount/DETAILS b/crypto/cryptmount/DETAILS
index bea3421aea..9655251df2 100755
--- a/crypto/cryptmount/DETAILS
+++ b/crypto/cryptmount/DETAILS
@@ -1,5 +1,5 @@
SPELL=cryptmount
- VERSION=4.0beta1
+ VERSION=4.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/crypto/cryptmount/HISTORY b/crypto/cryptmount/HISTORY
index 654c7f96a9..fe14bcb1bc 100644
--- a/crypto/cryptmount/HISTORY
+++ b/crypto/cryptmount/HISTORY
@@ -1,3 +1,6 @@
+2009-06-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 4.0
+
2009-03-17 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: converted to upstream signature checking
* B8CEF5E7.gpg: added gpg keyring
diff --git a/crypto/dirmngr/DETAILS b/crypto/dirmngr/DETAILS
index 7c2eb2b552..7674c9d021 100755
--- a/crypto/dirmngr/DETAILS
+++ b/crypto/dirmngr/DETAILS
@@ -1,5 +1,5 @@
SPELL=dirmngr
- VERSION=1.0.2
+ VERSION=1.0.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/dirmngr/HISTORY b/crypto/dirmngr/HISTORY
index bb81409b54..f8f2d008cf 100644
--- a/crypto/dirmngr/HISTORY
+++ b/crypto/dirmngr/HISTORY
@@ -1,3 +1,6 @@
+2009-06-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.3
+
2008-08-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.0.2
diff --git a/crypto/gnomint/DETAILS b/crypto/gnomint/DETAILS
index 3f10e5149d..8d0278517e 100755
--- a/crypto/gnomint/DETAILS
+++ b/crypto/gnomint/DETAILS
@@ -1,8 +1,8 @@
SPELL=gnomint
- VERSION=0.9.9
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:b2115116d6fbee8bcb6bd20362d7bd0c45a3074e0725af4655e8919c6c069b74cffd3857d7e2c8992854fb6ccdf1d1da3424dc7c0528ccba324ec23dbc81beb7
+ SOURCE_HASH=sha512:98da7a9e06323a740ad6cbb8d73e251ea66f310263a577077dccc21a494fce8936292eeead534f0d07bc87c7d14256babf80beca9ff7ab3fbe87540ac5418356
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://gnomint.sourceforge.net/
LICENSE[0]=GPL
diff --git a/crypto/gnomint/HISTORY b/crypto/gnomint/HISTORY
index 3c2550af35..1a7add64c9 100644
--- a/crypto/gnomint/HISTORY
+++ b/crypto/gnomint/HISTORY
@@ -1,3 +1,6 @@
+2009-06-03 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.0
+
2009-03-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.9
diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 2fc7d559ff..7e3d987204 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-exp
- VERSION=2.0.11
+ VERSION=2.0.12
SECURITY_PATCH=5
PATCHLEVEL=0
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index ca25959451..ff1b9e5090 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2009-06-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0.12
+
2009-03-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.11
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index d928d419be..35ffc49e57 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -59,6 +59,11 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_HASH=sha512:89f4763dec0f21aa90dd44a59b90a9715edb07daac16dc93441ba14de4a2107af432bd8d61c989206d370feb879448abd83704646a80de3ab29fefd55e3306db
;;
+ 2.8)
+ VERSION=2.8.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_HASH=sha512:af25a121ebcbdc376c40d49412995cb766c102b026761d8181ed8cae7cbda2ef7f268a47334321e1b0ed0ae5e1a95ca1a9603e1eb11b3cc7bb429657a31bbf48
+ ;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 059b965c3e..017b263530 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,9 @@
+2009-06-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.8.1
+
+2009-06-04 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, PREPARE: 2.8.0, added support for new stable 2.8 branch
+
2009-04-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.6.6, SECURITY_PATCH=6, GNUTLS-SA-2009-[123]
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 90c5277c03..47dabf6ffa 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -13,4 +13,4 @@ if [ "$GNUTLS_OLD" == "n" ]; then
persistent_remove GNUTLS_OLD
fi
-config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6
+config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6 2.8
diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index c9f1bdb04a..75ae747fdd 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -1,13 +1,13 @@
SPELL=gpa
- VERSION=0.8.0
+ VERSION=0.9.0
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://wald.intevation.org/frs/download.php/491/$SOURCE
+ SOURCE_URL[0]=http://wald.intevation.org/frs/download.php/603/$SOURCE
# SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/alpha/$SPELL/$SOURCE
SOURCE_GPG="GnuPG.gpg:$SOURCE.sig"
SOURCE2=$SOURCE.sig
- SOURCE2_URL[0]=http://wald.intevation.org/frs/download.php/492/$SOURCE2
+ SOURCE2_URL[0]=http://wald.intevation.org/frs/download.php/604/$SOURCE2
# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index ffae5bb505..9c9fc35f55 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2009-06-28 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.9.0
+
2008-09-12 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: depends on libassuan now
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index b141b7472b..f4a714056e 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -31,6 +31,10 @@ case $GPGME_BRANCH in
VERSION=1.1.8
SOURCE_HASH=sha512:855d835d8e48e89767eabe9c244d0583519ed7434d383ba9cde6baa08f23154f0fc5326d6c80e08654820ef034cf5c04952f1c53fd27bf2db3a302d4f7efdc97
;;
+ 1.2)
+ VERSION=1.2.0
+ SOURCE_HASH=sha512:ef91a8c19b93ed126f3347c09b7de22b472d9d5aa795755be014803130f4bbbfab991ecbd784eee5196f8d4853aa85addc3d5af19fe9ee0b7ae3037f42d91192
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 9227f20b3f..77f4bb0380 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2009-06-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, PREPARE: added 1.2 branch, version 1.2.0
+
2008-12-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.1.8
diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index 1d123bcf76..f31a70fb0f 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -13,4 +13,4 @@ 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
+config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?" DEFAULT 0.3 1.0 1.1 1.2
diff --git a/crypto/gringotts/DETAILS b/crypto/gringotts/DETAILS
index 320dcdf890..b52fd08b48 100755
--- a/crypto/gringotts/DETAILS
+++ b/crypto/gringotts/DETAILS
@@ -1,9 +1,9 @@
SPELL=gringotts
- VERSION=1.2.10pre2
+ VERSION=1.2.10
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:4977a771065ee2efe9526f331eabb4a6933dd70715814d9b3083b7d8cb33f4889b5dc45a36420185a08e677389aa0df43cb01d29873b291f47f3553133a18543
+ SOURCE_HASH=sha512:89dcd7fe483dede2870ba198075c3f4e61ad0885059a88924ddbc2daa4e814a4ea4cc2dfc269b45020203fb263b8a7874ce6c8e0193d3526f48708959dbc248e
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://gringotts.berlios.de/
diff --git a/crypto/gringotts/HISTORY b/crypto/gringotts/HISTORY
index a97e7e0075..88bd75a239 100644
--- a/crypto/gringotts/HISTORY
+++ b/crypto/gringotts/HISTORY
@@ -1,3 +1,6 @@
+2009-06-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.2.10
+
2008-09-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.2.10pre2
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 99a60692c5..f387d54e0b 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,14 +1,14 @@
SPELL=krb5
- VERSION=1.6.3
+ VERSION=1.7
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://web.mit.edu/kerberos/www/dist/krb5/1.6/$SOURCE
- SOURCE_HASH=sha512:5d1e00e54ddfa8cdba3e5ea6a78cccb1abf79433e24f3fcba88c812a8a630d907cab6b89adde73298cfc55f2fac6222d5cf3b836d0fe31268a57e4fde0fb8c27
+ SOURCE_URL[0]=http://web.mit.edu/kerberos/www/dist/krb5/$VERSION/$SOURCE
+ SOURCE_HASH=sha512:b99367af9592cbb3234b4af2ce503cf989a5e831cba5d99fd5cdb42bd1cc99f99f359d766749f51ef352807ebc0e551a071b78b553ebf9f9d8ea10b20cc4e93a
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215
- LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.6/krb5-1.6/doc/krb5-install.html#Copyright
- PATCHLEVEL=1
+ LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
+ PATCHLEVEL=0
SECURITY_PATCH=5
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index b4726742d6..333611d0f0 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,8 @@
+2009-06-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.7
+ * PRE_BUILD, system-et.patch: updated patch to 1.7 and compressed it
+ * UP_TRIGGERS: removed
+
2008-03-21 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: PATCHLEVEL++
* DEPENDS: Depend on e2fsprogs for the standard libcom_err and libss
diff --git a/crypto/krb5/PRE_BUILD b/crypto/krb5/PRE_BUILD
index 00caa9efe9..14960cee81 100755
--- a/crypto/krb5/PRE_BUILD
+++ b/crypto/krb5/PRE_BUILD
@@ -4,4 +4,4 @@ cd $SOURCE_DIRECTORY &&
unpack_file &&
tar xzf ${SOURCE_RAW} &&
cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
-patch -p1 < $SCRIPT_DIRECTORY/system-et.patch
+bzcat $SCRIPT_DIRECTORY/system-et.patch.bz2 | patch -p1
diff --git a/crypto/krb5/UP_TRIGGERS b/crypto/krb5/UP_TRIGGERS
deleted file mode 100755
index a7c7e04fc3..0000000000
--- a/crypto/krb5/UP_TRIGGERS
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Remove this UP_TRIGGERS after 2008-06-01
-#
-if [[ -f $INSTALL_ROOT/usr/lib/libcom_err.so.3.0 ]]; then
- if spell_ok $SPELL; then
- for each in $(show_up_depends $SPELL); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libcom_err.so.3"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi
diff --git a/crypto/krb5/system-et.patch b/crypto/krb5/system-et.patch
deleted file mode 100644
index b8f7f3ab93..0000000000
--- a/crypto/krb5/system-et.patch
+++ /dev/null
@@ -1,1364 +0,0 @@
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/compat_recv.c krb5-1.6.3/src/appl/bsd/compat_recv.c
---- krb5-1.6.3.orig/src/appl/bsd/compat_recv.c 2008-03-21 22:47:40.315090009 -0700
-+++ krb5-1.6.3/src/appl/bsd/compat_recv.c 2008-03-21 23:11:55.522085601 -0700
-@@ -41,7 +41,7 @@
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
- #endif
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <errno.h>
-
- #include <stdio.h>
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/krcp.c krb5-1.6.3/src/appl/bsd/krcp.c
---- krb5-1.6.3.orig/src/appl/bsd/krcp.c 2008-03-21 22:47:40.315090009 -0700
-+++ krb5-1.6.3/src/appl/bsd/krcp.c 2008-03-21 23:11:55.513078286 -0700
-@@ -70,7 +70,7 @@
- #ifdef KERBEROS
- #include <krb5.h>
- #include <k5-util.h>
--#include <com_err.h>
-+#include <et/com_err.h>
-
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/krlogin.c krb5-1.6.3/src/appl/bsd/krlogin.c
---- krb5-1.6.3.orig/src/appl/bsd/krlogin.c 2008-03-21 22:47:40.314091152 -0700
-+++ krb5-1.6.3/src/appl/bsd/krlogin.c 2008-03-21 23:11:55.500085875 -0700
-@@ -156,7 +156,7 @@
-
- #ifdef KERBEROS
- #include <krb5.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
- #endif
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/krlogind.c krb5-1.6.3/src/appl/bsd/krlogind.c
---- krb5-1.6.3.orig/src/appl/bsd/krlogind.c 2008-03-21 22:47:40.314091152 -0700
-+++ krb5-1.6.3/src/appl/bsd/krlogind.c 2008-03-21 23:11:55.484085719 -0700
-@@ -256,7 +256,7 @@
- Key_schedule v4_schedule;
- #endif
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "defines.h"
-
- #define SECURE_MESSAGE "This rlogin session is encrypting all data transmissions.\r\n"
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/krsh.c krb5-1.6.3/src/appl/bsd/krsh.c
---- krb5-1.6.3.orig/src/appl/bsd/krsh.c 2008-03-21 22:47:40.314091152 -0700
-+++ krb5-1.6.3/src/appl/bsd/krsh.c 2008-03-21 23:11:55.470085234 -0700
-@@ -63,7 +63,7 @@
-
- #ifdef KERBEROS
- #include <krb5.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
- #endif
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/krshd.c krb5-1.6.3/src/appl/bsd/krshd.c
---- krb5-1.6.3.orig/src/appl/bsd/krshd.c 2008-03-21 22:47:40.313091456 -0700
-+++ krb5-1.6.3/src/appl/bsd/krshd.c 2008-03-21 23:11:55.442085100 -0700
-@@ -161,7 +161,7 @@
-
- #ifdef KERBEROS
- #include <krb5.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include "loginpaths.h"
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/login.c krb5-1.6.3/src/appl/bsd/login.c
---- krb5-1.6.3.orig/src/appl/bsd/login.c 2008-03-21 22:47:40.314091152 -0700
-+++ krb5-1.6.3/src/appl/bsd/login.c 2008-03-21 23:11:55.460085485 -0700
-@@ -155,7 +155,7 @@
- /* #include "krb5.h" */
- /* need k5-int.h to get ->profile from krb5_context */
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "osconf.h"
- #endif /* KRB5_GET_TICKETS */
-
-diff -Naur krb5-1.6.3.orig/src/appl/bsd/v4rcp.c krb5-1.6.3/src/appl/bsd/v4rcp.c
---- krb5-1.6.3.orig/src/appl/bsd/v4rcp.c 2008-03-21 22:47:40.315090009 -0700
-+++ krb5-1.6.3/src/appl/bsd/v4rcp.c 2008-03-21 23:11:55.535085553 -0700
-@@ -37,7 +37,7 @@
- */
- #ifdef KERBEROS
- #include <krb5.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <k5-util.h>
- #endif
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/cleanup.c krb5-1.6.3/src/appl/libpty/cleanup.c
---- krb5-1.6.3.orig/src/appl/libpty/cleanup.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/cleanup.c 2008-03-21 23:11:55.588086175 -0700
-@@ -20,7 +20,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
- #ifdef HAVE_SYS_WAIT_H
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/getpty.c krb5-1.6.3/src/appl/libpty/getpty.c
---- krb5-1.6.3.orig/src/appl/libpty/getpty.c 2008-03-21 22:47:40.321090417 -0700
-+++ krb5-1.6.3/src/appl/libpty/getpty.c 2008-03-21 23:11:55.605086585 -0700
-@@ -20,7 +20,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/init.c krb5-1.6.3/src/appl/libpty/init.c
---- krb5-1.6.3.orig/src/appl/libpty/init.c 2008-03-21 22:47:40.322090113 -0700
-+++ krb5-1.6.3/src/appl/libpty/init.c 2008-03-21 23:11:55.633086160 -0700
-@@ -22,7 +22,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/init_slave.c krb5-1.6.3/src/appl/libpty/init_slave.c
---- krb5-1.6.3.orig/src/appl/libpty/init_slave.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/init_slave.c 2008-03-21 23:11:55.542085657 -0700
-@@ -19,7 +19,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/logwtmp.c krb5-1.6.3/src/appl/libpty/logwtmp.c
---- krb5-1.6.3.orig/src/appl/libpty/logwtmp.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/logwtmp.c 2008-03-21 23:11:55.570086628 -0700
-@@ -19,7 +19,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/open_ctty.c krb5-1.6.3/src/appl/libpty/open_ctty.c
---- krb5-1.6.3.orig/src/appl/libpty/open_ctty.c 2008-03-21 22:47:40.322090113 -0700
-+++ krb5-1.6.3/src/appl/libpty/open_ctty.c 2008-03-21 23:11:55.626086057 -0700
-@@ -19,7 +19,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/open_slave.c krb5-1.6.3/src/appl/libpty/open_slave.c
---- krb5-1.6.3.orig/src/appl/libpty/open_slave.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/open_slave.c 2008-03-21 23:11:55.549086039 -0700
-@@ -21,7 +21,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/pty_paranoia.c krb5-1.6.3/src/appl/libpty/pty_paranoia.c
---- krb5-1.6.3.orig/src/appl/libpty/pty_paranoia.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/pty_paranoia.c 2008-03-21 23:11:55.598085923 -0700
-@@ -184,7 +184,7 @@
- * non-root.
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
- #include <sys/wait.h>
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/sane_hostname.c krb5-1.6.3/src/appl/libpty/sane_hostname.c
---- krb5-1.6.3.orig/src/appl/libpty/sane_hostname.c 2008-03-21 22:47:40.321090417 -0700
-+++ krb5-1.6.3/src/appl/libpty/sane_hostname.c 2008-03-21 23:11:55.612085851 -0700
-@@ -20,7 +20,7 @@
- * express or implied warranty.
- *
- */
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "pty-int.h"
- #include <sys/socket.h>
- #include "libpty.h"
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/update_utmp.c krb5-1.6.3/src/appl/libpty/update_utmp.c
---- krb5-1.6.3.orig/src/appl/libpty/update_utmp.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/update_utmp.c 2008-03-21 23:11:55.581085793 -0700
-@@ -316,7 +316,7 @@
- * username both in utmp and wtmp.
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/update_wtmp.c krb5-1.6.3/src/appl/libpty/update_wtmp.c
---- krb5-1.6.3.orig/src/appl/libpty/update_wtmp.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/update_wtmp.c 2008-03-21 23:11:55.563086245 -0700
-@@ -19,7 +19,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/vhangup.c krb5-1.6.3/src/appl/libpty/vhangup.c
---- krb5-1.6.3.orig/src/appl/libpty/vhangup.c 2008-03-21 22:47:40.322090113 -0700
-+++ krb5-1.6.3/src/appl/libpty/vhangup.c 2008-03-21 23:11:55.619085674 -0700
-@@ -20,7 +20,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/libpty/void_assoc.c krb5-1.6.3/src/appl/libpty/void_assoc.c
---- krb5-1.6.3.orig/src/appl/libpty/void_assoc.c 2008-03-21 22:47:40.320089604 -0700
-+++ krb5-1.6.3/src/appl/libpty/void_assoc.c 2008-03-21 23:11:55.555085609 -0700
-@@ -20,7 +20,7 @@
- *
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "libpty.h"
- #include "pty-int.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/sample/sclient/sclient.c krb5-1.6.3/src/appl/sample/sclient/sclient.c
---- krb5-1.6.3.orig/src/appl/sample/sclient/sclient.c 2008-03-21 22:47:40.322090113 -0700
-+++ krb5-1.6.3/src/appl/sample/sclient/sclient.c 2008-03-21 23:11:55.649085478 -0700
-@@ -30,7 +30,7 @@
- */
-
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <stdio.h>
- #include <string.h>
-diff -Naur krb5-1.6.3.orig/src/appl/sample/sserver/sserver.c krb5-1.6.3/src/appl/sample/sserver/sserver.c
---- krb5-1.6.3.orig/src/appl/sample/sserver/sserver.c 2008-03-21 22:47:40.322090113 -0700
-+++ krb5-1.6.3/src/appl/sample/sserver/sserver.c 2008-03-21 23:11:55.641086517 -0700
-@@ -38,7 +38,7 @@
- */
-
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <stdio.h>
- #include <string.h>
-diff -Naur krb5-1.6.3.orig/src/appl/simple/client/sim_client.c krb5-1.6.3/src/appl/simple/client/sim_client.c
---- krb5-1.6.3.orig/src/appl/simple/client/sim_client.c 2008-03-21 22:47:40.311090669 -0700
-+++ krb5-1.6.3/src/appl/simple/client/sim_client.c 2008-03-21 23:11:55.416086313 -0700
-@@ -38,7 +38,7 @@
- #include <errno.h>
-
- #include <krb5.h>
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include "simple.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/simple/server/sim_server.c krb5-1.6.3/src/appl/simple/server/sim_server.c
---- krb5-1.6.3.orig/src/appl/simple/server/sim_server.c 2008-03-21 22:47:40.311090669 -0700
-+++ krb5-1.6.3/src/appl/simple/server/sim_server.c 2008-03-21 23:11:55.424086671 -0700
-@@ -41,7 +41,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
-
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include "simple.h"
-
-diff -Naur krb5-1.6.3.orig/src/appl/telnet/libtelnet/kerberos5.c krb5-1.6.3/src/appl/telnet/libtelnet/kerberos5.c
---- krb5-1.6.3.orig/src/appl/telnet/libtelnet/kerberos5.c 2008-03-21 22:47:40.308089906 -0700
-+++ krb5-1.6.3/src/appl/telnet/libtelnet/kerberos5.c 2008-03-21 23:11:55.380085822 -0700
-@@ -67,7 +67,7 @@
- #include <stdio.h>
- #include "krb5.h"
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <netdb.h>
- #include <ctype.h>
- #include <syslog.h>
-diff -Naur krb5-1.6.3.orig/src/appl/telnet/telnetd/sys_term.c krb5-1.6.3/src/appl/telnet/telnetd/sys_term.c
---- krb5-1.6.3.orig/src/appl/telnet/telnetd/sys_term.c 2008-03-21 22:47:40.310090135 -0700
-+++ krb5-1.6.3/src/appl/telnet/telnetd/sys_term.c 2008-03-21 23:11:55.393084937 -0700
-@@ -35,7 +35,7 @@
-
- #include "telnetd.h"
- #include "pathnames.h"
--#include <com_err.h>
-+#include <et/com_err.h>
-
- #ifndef LOGIN_PROGRAM
- #define LOGIN_PROGRAM _PATH_LOGIN
-diff -Naur krb5-1.6.3.orig/src/appl/telnet/telnetd/telnetd.c krb5-1.6.3/src/appl/telnet/telnetd/telnetd.c
---- krb5-1.6.3.orig/src/appl/telnet/telnetd/telnetd.c 2008-03-21 22:47:40.310090135 -0700
-+++ krb5-1.6.3/src/appl/telnet/telnetd/telnetd.c 2008-03-21 23:11:55.408084839 -0700
-@@ -58,7 +58,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <libpty.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #if defined(_SC_CRAY_SECURE_SYS)
- #include <sys/sysv.h>
- #include <sys/secdev.h>
-diff -Naur krb5-1.6.3.orig/src/appl/user_user/client.c krb5-1.6.3/src/appl/user_user/client.c
---- krb5-1.6.3.orig/src/appl/user_user/client.c 2008-03-21 22:47:40.302090616 -0700
-+++ krb5-1.6.3/src/appl/user_user/client.c 2008-03-21 23:11:55.368085566 -0700
-@@ -37,7 +37,7 @@
- #include <errno.h>
-
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- int main (argc, argv)
- int argc;
-diff -Naur krb5-1.6.3.orig/src/appl/user_user/server.c krb5-1.6.3/src/appl/user_user/server.c
---- krb5-1.6.3.orig/src/appl/user_user/server.c 2008-03-21 22:47:40.302090616 -0700
-+++ krb5-1.6.3/src/appl/user_user/server.c 2008-03-21 23:11:55.360085767 -0700
-@@ -40,7 +40,7 @@
-
- #include "port-sockets.h"
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- /* fd 0 is a tcp socket used to talk to the client */
-
-diff -Naur krb5-1.6.3.orig/src/clients/kdestroy/kdestroy.c krb5-1.6.3/src/clients/kdestroy/kdestroy.c
---- krb5-1.6.3.orig/src/clients/kdestroy/kdestroy.c 2008-03-21 22:47:40.298088482 -0700
-+++ krb5-1.6.3/src/clients/kdestroy/kdestroy.c 2008-03-21 23:11:55.274085975 -0700
-@@ -29,7 +29,7 @@
-
- #include "autoconf.h"
- #include <krb5.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <string.h>
- #include <stdio.h>
- #ifdef HAVE_UNISTD_H
-diff -Naur krb5-1.6.3.orig/src/clients/kinit/kinit.c krb5-1.6.3/src/clients/kinit/kinit.c
---- krb5-1.6.3.orig/src/clients/kinit/kinit.c 2008-03-21 22:47:40.296089091 -0700
-+++ krb5-1.6.3/src/clients/kinit/kinit.c 2008-03-21 23:11:55.248086071 -0700
-@@ -39,7 +39,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
--#include <com_err.h>
-+#include <et/com_err.h>
-
- #ifdef GETOPT_LONG
- #include <getopt.h>
-diff -Naur krb5-1.6.3.orig/src/clients/klist/klist.c krb5-1.6.3/src/clients/klist/klist.c
---- krb5-1.6.3.orig/src/clients/klist/klist.c 2008-03-21 22:47:40.297089345 -0700
-+++ krb5-1.6.3/src/clients/klist/klist.c 2008-03-21 23:11:55.267085872 -0700
-@@ -32,7 +32,7 @@
- #ifdef KRB5_KRB4_COMPAT
- #include <kerberosIV/krb.h>
- #endif
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdlib.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur krb5-1.6.3.orig/src/clients/ksu/ksu.h krb5-1.6.3/src/clients/ksu/ksu.h
---- krb5-1.6.3.orig/src/clients/ksu/ksu.h 2008-03-21 22:47:40.298088482 -0700
-+++ krb5-1.6.3/src/clients/ksu/ksu.h 2008-03-21 23:11:55.282085774 -0700
-@@ -28,14 +28,14 @@
- #include "k5-int.h"
- #include "k5-util.h"
- #include <stdio.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <sys/types.h>
- #include <sys/param.h>
- #include <pwd.h>
- #include <unistd.h>
- #include <string.h>
- #include <syslog.h>
--/* <stdarg.h> or <varargs.h> is already included by com_err.h. */
-+/* <stdarg.h> or <varargs.h> is already included by et/com_err.h. */
-
- #define NO_TARGET_FILE '.'
- #define SOURCE_USER_LOGIN "."
-diff -Naur krb5-1.6.3.orig/src/clients/kvno/kvno.c krb5-1.6.3/src/clients/kvno/kvno.c
---- krb5-1.6.3.orig/src/clients/kvno/kvno.c 2008-03-21 22:47:40.297089345 -0700
-+++ krb5-1.6.3/src/clients/kvno/kvno.c 2008-03-21 23:11:55.256085032 -0700
-@@ -57,7 +57,7 @@
- char *ccachestr, char *etypestr, char *keytab_name,
- char *sname);
-
--#include <com_err.h>
-+#include <et/com_err.h>
- static void extended_com_err_fn (const char *, errcode_t, const char *,
- va_list);
-
-diff -Naur krb5-1.6.3.orig/src/include/k5-int.h krb5-1.6.3/src/include/k5-int.h
---- krb5-1.6.3.orig/src/include/k5-int.h 2008-03-21 22:47:40.396088530 -0700
-+++ krb5-1.6.3/src/include/k5-int.h 2008-03-21 23:11:55.728085166 -0700
-@@ -1188,7 +1188,7 @@
- (krb5_context, krb5_pa_enc_ts *);
-
- /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "k5-plugin.h"
-
- struct _krb5_context {
-diff -Naur krb5-1.6.3.orig/src/kadmin/dbutil/dump.c krb5-1.6.3/src/kadmin/dbutil/dump.c
---- krb5-1.6.3.orig/src/kadmin/dbutil/dump.c 2008-03-21 22:47:40.289089826 -0700
-+++ krb5-1.6.3/src/kadmin/dbutil/dump.c 2008-03-21 23:11:55.159085238 -0700
-@@ -32,7 +32,7 @@
- #include <kadm5/admin.h>
- #include <kadm5/server_internal.h>
- #include <kdb.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include "kdb5_util.h"
- #if defined(HAVE_REGEX_H) && defined(HAVE_REGCOMP)
- #include <regex.h>
-diff -Naur krb5-1.6.3.orig/src/kadmin/dbutil/dumpv4.c krb5-1.6.3/src/kadmin/dbutil/dumpv4.c
---- krb5-1.6.3.orig/src/kadmin/dbutil/dumpv4.c 2008-03-21 22:47:40.288090130 -0700
-+++ krb5-1.6.3/src/kadmin/dbutil/dumpv4.c 2008-03-21 23:11:55.134085587 -0700
-@@ -56,7 +56,7 @@
- #ifdef KRB5_KRB4_COMPAT
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <des.h>
- #include <krb.h>
-diff -Naur krb5-1.6.3.orig/src/kadmin/dbutil/kdb5_destroy.c krb5-1.6.3/src/kadmin/dbutil/kdb5_destroy.c
---- krb5-1.6.3.orig/src/kadmin/dbutil/kdb5_destroy.c 2008-03-21 22:47:40.289089826 -0700
-+++ krb5-1.6.3/src/kadmin/dbutil/kdb5_destroy.c 2008-03-21 23:11:55.141086249 -0700
-@@ -31,7 +31,7 @@
-
- #include "k5-int.h"
- #include <stdio.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <kadm5/admin.h>
- #include <kdb.h>
- #include "kdb5_util.h"
-diff -Naur krb5-1.6.3.orig/src/kadmin/dbutil/kdb5_stash.c krb5-1.6.3/src/kadmin/dbutil/kdb5_stash.c
---- krb5-1.6.3.orig/src/kadmin/dbutil/kdb5_stash.c 2008-03-21 22:47:40.288090130 -0700
-+++ krb5-1.6.3/src/kadmin/dbutil/kdb5_stash.c 2008-03-21 23:11:55.124086398 -0700
-@@ -54,7 +54,7 @@
- */
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <kadm5/admin.h>
- #include <stdio.h>
- #include "kdb5_util.h"
-diff -Naur krb5-1.6.3.orig/src/kadmin/dbutil/loadv4.c krb5-1.6.3/src/kadmin/dbutil/loadv4.c
---- krb5-1.6.3.orig/src/kadmin/dbutil/loadv4.c 2008-03-21 22:47:40.288090130 -0700
-+++ krb5-1.6.3/src/kadmin/dbutil/loadv4.c 2008-03-21 23:11:55.116086040 -0700
-@@ -57,7 +57,7 @@
- #ifdef KRB5_KRB4_COMPAT
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <des.h>
- #include <krb.h>
-diff -Naur krb5-1.6.3.orig/src/kadmin/ktutil/ktutil.c krb5-1.6.3/src/kadmin/ktutil/ktutil.c
---- krb5-1.6.3.orig/src/kadmin/ktutil/ktutil.c 2008-03-21 22:47:40.285088809 -0700
-+++ krb5-1.6.3/src/kadmin/ktutil/ktutil.c 2008-03-21 23:11:55.104086342 -0700
-@@ -28,7 +28,7 @@
-
- #include "k5-int.h"
- #include "ktutil.h"
--#include <com_err.h>
-+#include <et/com_err.h>
- #include "adm_proto.h"
- #include <ss/ss.h>
- #include <stdio.h>
-diff -Naur krb5-1.6.3.orig/src/kadmin/testing/util/tcl_kadm5.c krb5-1.6.3/src/kadmin/testing/util/tcl_kadm5.c
---- krb5-1.6.3.orig/src/kadmin/testing/util/tcl_kadm5.c 2008-03-21 22:47:40.284089952 -0700
-+++ krb5-1.6.3/src/kadmin/testing/util/tcl_kadm5.c 2008-03-21 23:11:55.079085295 -0700
-@@ -8,7 +8,7 @@
- #endif
- #define USE_KADM5_API_VERSION 2
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <adb_err.h>
-diff -Naur krb5-1.6.3.orig/src/kadmin/testing/util/tcl_ovsec_kadm.c krb5-1.6.3/src/kadmin/testing/util/tcl_ovsec_kadm.c
---- krb5-1.6.3.orig/src/kadmin/testing/util/tcl_ovsec_kadm.c 2008-03-21 22:47:40.284089952 -0700
-+++ krb5-1.6.3/src/kadmin/testing/util/tcl_ovsec_kadm.c 2008-03-21 23:11:55.096084868 -0700
-@@ -8,7 +8,7 @@
- #endif
- #define USE_KADM5_API_VERSION 1
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <errno.h>
- #include <stdlib.h>
- #include "tcl_kadm5.h"
-diff -Naur krb5-1.6.3.orig/src/kdc/do_as_req.c krb5-1.6.3/src/kdc/do_as_req.c
---- krb5-1.6.3.orig/src/kdc/do_as_req.c 2008-03-21 22:47:40.299089015 -0700
-+++ krb5-1.6.3/src/kdc/do_as_req.c 2008-03-21 23:11:55.291085548 -0700
-@@ -28,7 +28,7 @@
- */
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <syslog.h>
- #ifdef HAVE_NETINET_IN_H
-diff -Naur krb5-1.6.3.orig/src/kdc/do_tgs_req.c krb5-1.6.3/src/kdc/do_tgs_req.c
---- krb5-1.6.3.orig/src/kdc/do_tgs_req.c 2008-03-21 22:47:40.300088432 -0700
-+++ krb5-1.6.3/src/kdc/do_tgs_req.c 2008-03-21 23:11:55.315085223 -0700
-@@ -28,7 +28,7 @@
- */
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <syslog.h>
- #ifdef HAVE_NETINET_IN_H
-diff -Naur krb5-1.6.3.orig/src/kdc/fakeka.c krb5-1.6.3/src/kdc/fakeka.c
---- krb5-1.6.3.orig/src/kdc/fakeka.c 2008-03-21 22:47:40.300088432 -0700
-+++ krb5-1.6.3/src/kdc/fakeka.c 2008-03-21 23:11:55.353085943 -0700
-@@ -48,7 +48,7 @@
-
- #include <krb5.h>
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <kerberosIV/krb.h>
- #include <kerberosIV/des.h>
-
-diff -Naur krb5-1.6.3.orig/src/kdc/kerberos_v4.c krb5-1.6.3/src/kdc/kerberos_v4.c
---- krb5-1.6.3.orig/src/kdc/kerberos_v4.c 2008-03-21 22:47:40.300088432 -0700
-+++ krb5-1.6.3/src/kdc/kerberos_v4.c 2008-03-21 23:11:55.328084617 -0700
-@@ -140,7 +140,7 @@
- /*
- * v5 include files:
- */
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "extern.h" /* to pick up master_princ */
-
- static krb5_data *response;
-diff -Naur krb5-1.6.3.orig/src/kdc/main.c krb5-1.6.3/src/kdc/main.c
---- krb5-1.6.3.orig/src/kdc/main.c 2008-03-21 22:47:40.300088432 -0700
-+++ krb5-1.6.3/src/kdc/main.c 2008-03-21 23:11:55.339085178 -0700
-@@ -33,7 +33,7 @@
- #include <netdb.h>
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "adm.h"
- #include "adm_proto.h"
- #include "kdc_util.h"
-diff -Naur krb5-1.6.3.orig/src/kdc/network.c krb5-1.6.3/src/kdc/network.c
---- krb5-1.6.3.orig/src/kdc/network.c 2008-03-21 22:47:40.299089015 -0700
-+++ krb5-1.6.3/src/kdc/network.c 2008-03-21 23:11:55.304085500 -0700
-@@ -27,7 +27,7 @@
- */
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "kdc_util.h"
- #include "extern.h"
- #include "kdc5_err.h"
-diff -Naur krb5-1.6.3.orig/src/krb524/k524init.c krb5-1.6.3/src/krb524/k524init.c
---- krb5-1.6.3.orig/src/krb524/k524init.c 2008-03-21 22:47:40.183088862 -0700
-+++ krb5-1.6.3/src/krb524/k524init.c 2008-03-21 23:11:54.849086055 -0700
-@@ -22,7 +22,7 @@
-
- #include "autoconf.h"
- #include <krb5.h>
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <stdio.h>
- #ifdef HAVE_UNISTD_H
-diff -Naur krb5-1.6.3.orig/src/krb524/krb524d.c krb5-1.6.3/src/krb524/krb524d.c
---- krb5-1.6.3.orig/src/krb524/krb524d.c 2008-03-21 22:47:40.183088862 -0700
-+++ krb5-1.6.3/src/krb524/krb524d.c 2008-03-21 23:11:54.841085418 -0700
-@@ -44,7 +44,7 @@
- #include <k5-int.h>
- #include <kadm5/admin.h>
- #include <adm_proto.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdarg.h>
-
- #include <assert.h>
-diff -Naur krb5-1.6.3.orig/src/krb524/test.c krb5-1.6.3/src/krb524/test.c
---- krb5-1.6.3.orig/src/krb524/test.c 2008-03-21 22:47:40.183088862 -0700
-+++ krb5-1.6.3/src/krb524/test.c 2008-03-21 23:11:54.857085853 -0700
-@@ -32,7 +32,7 @@
-
- #include <des.h>
- #include <krb.h>
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #define KEYSIZE 8
- #define CRED_BUFSIZ 2048
-diff -Naur krb5-1.6.3.orig/src/lib/crypto/des/destest.c krb5-1.6.3/src/lib/crypto/des/destest.c
---- krb5-1.6.3.orig/src/lib/crypto/des/destest.c 2008-03-21 22:47:40.262089667 -0700
-+++ krb5-1.6.3/src/lib/crypto/des/destest.c 2008-03-21 23:11:55.059085799 -0700
-@@ -55,7 +55,7 @@
- */
-
- #include "des_int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include <stdio.h>
-
-diff -Naur krb5-1.6.3.orig/src/lib/crypto/des/t_verify.c krb5-1.6.3/src/lib/crypto/des/t_verify.c
---- krb5-1.6.3.orig/src/lib/crypto/des/t_verify.c 2008-03-21 22:47:40.261090530 -0700
-+++ krb5-1.6.3/src/lib/crypto/des/t_verify.c 2008-03-21 23:11:55.051085721 -0700
-@@ -60,7 +60,7 @@
- #include "k5-int.h"
- #include "des_int.h"
- #include <stdio.h>
--#include "com_err.h"
-+#include "et/com_err.h"
-
- static void do_encrypt(unsigned char *, unsigned char *);
- static void do_decrypt(unsigned char *, unsigned char *);
-diff -Naur krb5-1.6.3.orig/src/lib/gssapi/generic/disp_com_err_status.c krb5-1.6.3/src/lib/gssapi/generic/disp_com_err_status.c
---- krb5-1.6.3.orig/src/lib/gssapi/generic/disp_com_err_status.c 2008-03-21 22:47:40.217091079 -0700
-+++ krb5-1.6.3/src/lib/gssapi/generic/disp_com_err_status.c 2008-03-21 23:11:55.036086377 -0700
-@@ -26,7 +26,7 @@
-
- #include "gssapiP_generic.h"
- #include "gss_libinit.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- /* XXXX internationalization!! */
-
-diff -Naur krb5-1.6.3.orig/src/lib/gssapi/krb5/disp_status.c krb5-1.6.3/src/lib/gssapi/krb5/disp_status.c
---- krb5-1.6.3.orig/src/lib/gssapi/krb5/disp_status.c 2008-03-21 22:47:40.227089151 -0700
-+++ krb5-1.6.3/src/lib/gssapi/krb5/disp_status.c 2008-03-21 23:11:55.043085922 -0700
-@@ -22,7 +22,7 @@
-
- #include "gssapiP_krb5.h"
- #include "gss_libinit.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- /* XXXX internationalization!! */
-
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/adb.h krb5-1.6.3/src/lib/kadm5/adb.h
---- krb5-1.6.3.orig/src/lib/kadm5/adb.h 2008-03-21 22:47:40.210090417 -0700
-+++ krb5-1.6.3/src/lib/kadm5/adb.h 2008-03-21 23:11:54.960085776 -0700
-@@ -17,7 +17,7 @@
- #include <db.h>
- #include <kadm5/admin.h>
- #include <kadm5/adb_err.h>
--#include <com_err.h>
-+#include <et/com_err.h>
-
- typedef long osa_adb_ret_t;
-
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/admin.h krb5-1.6.3/src/lib/kadm5/admin.h
---- krb5-1.6.3.orig/src/lib/kadm5/admin.h 2008-03-21 22:47:40.210090417 -0700
-+++ krb5-1.6.3/src/lib/kadm5/admin.h 2008-03-21 23:11:54.982085502 -0700
-@@ -41,7 +41,7 @@
- #include <gssrpc/rpc.h>
- #include <krb5.h>
- #include <kdb.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <kadm5/kadm_err.h>
- #include <kadm5/chpass_util_strings.h>
-
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/clnt/client_init.c krb5-1.6.3/src/lib/kadm5/clnt/client_init.c
---- krb5-1.6.3.orig/src/lib/kadm5/clnt/client_init.c 2008-03-21 22:47:40.210090417 -0700
-+++ krb5-1.6.3/src/lib/kadm5/clnt/client_init.c 2008-03-21 23:11:54.992085809 -0700
-@@ -35,7 +35,7 @@
- #include <memory.h>
- #endif
- #include <string.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/logger.c krb5-1.6.3/src/lib/kadm5/logger.c
---- krb5-1.6.3.orig/src/lib/kadm5/logger.c 2008-03-21 22:47:40.210090417 -0700
-+++ krb5-1.6.3/src/lib/kadm5/logger.c 2008-03-21 23:11:54.971085220 -0700
-@@ -33,7 +33,7 @@
- */
- #include "k5-int.h"
- #include "adm_proto.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <stdio.h>
- #include <ctype.h>
- #ifdef HAVE_SYSLOG_H
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/srv/server_init.c krb5-1.6.3/src/lib/kadm5/srv/server_init.c
---- krb5-1.6.3.orig/src/lib/kadm5/srv/server_init.c 2008-03-21 22:47:40.211089274 -0700
-+++ krb5-1.6.3/src/lib/kadm5/srv/server_init.c 2008-03-21 23:11:55.001085582 -0700
-@@ -12,7 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include "k5-int.h" /* needed for gssapiP_krb5.h */
- #include <kadm5/admin.h>
- #include <krb5.h>
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/unit-test/destroy-test.c krb5-1.6.3/src/lib/kadm5/unit-test/destroy-test.c
---- krb5-1.6.3.orig/src/lib/kadm5/unit-test/destroy-test.c 2008-03-21 22:47:40.215090012 -0700
-+++ krb5-1.6.3/src/lib/kadm5/unit-test/destroy-test.c 2008-03-21 23:11:55.028085182 -0700
-@@ -1,5 +1,5 @@
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdio.h>
- #include <krb5.h>
- #include <sys/socket.h>
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/unit-test/handle-test.c krb5-1.6.3/src/lib/kadm5/unit-test/handle-test.c
---- krb5-1.6.3.orig/src/lib/kadm5/unit-test/handle-test.c 2008-03-21 22:47:40.215090012 -0700
-+++ krb5-1.6.3/src/lib/kadm5/unit-test/handle-test.c 2008-03-21 23:11:55.015085788 -0700
-@@ -1,5 +1,5 @@
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdio.h>
- #include <krb5.h>
- #include <sys/socket.h>
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/unit-test/init-test.c krb5-1.6.3/src/lib/kadm5/unit-test/init-test.c
---- krb5-1.6.3.orig/src/lib/kadm5/unit-test/init-test.c 2008-03-21 22:47:40.214089199 -0700
-+++ krb5-1.6.3/src/lib/kadm5/unit-test/init-test.c 2008-03-21 23:11:55.008086523 -0700
-@@ -1,6 +1,6 @@
- #undef USE_KADM5_API_VERSION
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <krb5.h>
-diff -Naur krb5-1.6.3.orig/src/lib/kadm5/unit-test/randkey-test.c krb5-1.6.3/src/lib/kadm5/unit-test/randkey-test.c
---- krb5-1.6.3.orig/src/lib/kadm5/unit-test/randkey-test.c 2008-03-21 22:47:40.215090012 -0700
-+++ krb5-1.6.3/src/lib/kadm5/unit-test/randkey-test.c 2008-03-21 23:11:55.021085358 -0700
-@@ -1,5 +1,5 @@
- #include <kadm5/admin.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <stdio.h>
- #include <krb5.h>
- #include <sys/socket.h>
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/ccache/cc_mslsa.c krb5-1.6.3/src/lib/krb5/ccache/cc_mslsa.c
---- krb5-1.6.3.orig/src/lib/krb5/ccache/cc_mslsa.c 2008-03-21 22:47:40.188089574 -0700
-+++ krb5-1.6.3/src/lib/krb5/ccache/cc_mslsa.c 2008-03-21 23:11:54.886085124 -0700
-@@ -54,7 +54,7 @@
- #define _UNICODE
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "cc-int.h"
-
- #include <stdio.h>
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/ccache/t_cc.c krb5-1.6.3/src/lib/krb5/ccache/t_cc.c
---- krb5-1.6.3.orig/src/lib/krb5/ccache/t_cc.c 2008-03-21 22:47:40.188089574 -0700
-+++ krb5-1.6.3/src/lib/krb5/ccache/t_cc.c 2008-03-21 23:11:54.894085760 -0700
-@@ -34,7 +34,7 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #define KRB5_OK 0
-
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/gic_pwd.c krb5-1.6.3/src/lib/krb5/krb/gic_pwd.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/gic_pwd.c 2008-03-21 22:47:40.192089752 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/gic_pwd.c 2008-03-21 23:11:54.912085028 -0700
-@@ -1,5 +1,5 @@
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- static krb5_error_code
- krb5_get_as_key_password(
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/recvauth.c krb5-1.6.3/src/lib/krb5/krb/recvauth.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/recvauth.c 2008-03-21 22:47:40.194090261 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/recvauth.c 2008-03-21 23:11:54.920085106 -0700
-@@ -29,7 +29,7 @@
-
- #include "k5-int.h"
- #include "auth_con.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/sendauth.c krb5-1.6.3/src/lib/krb5/krb/sendauth.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/sendauth.c 2008-03-21 22:47:40.191089498 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/sendauth.c 2008-03-21 23:11:54.902086118 -0700
-@@ -29,7 +29,7 @@
-
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "auth_con.h"
- #include <errno.h>
- #include <stdio.h>
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/t_kerb.c krb5-1.6.3/src/lib/krb5/krb/t_kerb.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/t_kerb.c 2008-03-21 22:47:40.195089956 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/t_kerb.c 2008-03-21 23:11:54.945086153 -0700
-@@ -18,7 +18,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
--#include "com_err.h"
-+#include "et/com_err.h"
-
- void test_string_to_timestamp (krb5_context, char *);
- void test_425_conv_principal (krb5_context, char *, char*, char *);
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/t_ser.c krb5-1.6.3/src/lib/krb5/krb/t_ser.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/t_ser.c 2008-03-21 22:47:40.194090261 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/t_ser.c 2008-03-21 23:11:54.930085413 -0700
-@@ -29,7 +29,7 @@
- * t_ser.c - Test serialization.
- */
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "auth_con.h"
-
- #include <ctype.h>
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb/t_walk_rtree.c krb5-1.6.3/src/lib/krb5/krb/t_walk_rtree.c
---- krb5-1.6.3.orig/src/lib/krb5/krb/t_walk_rtree.c 2008-03-21 22:47:40.195089956 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb/t_walk_rtree.c 2008-03-21 23:11:54.938086050 -0700
-@@ -4,7 +4,7 @@
-
- #include "k5-int.h"
- #include <stdio.h>
--#include "com_err.h"
-+#include "et/com_err.h"
-
- int
- main(int argc, char **argv)
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/krb5_libinit.c krb5-1.6.3/src/lib/krb5/krb5_libinit.c
---- krb5-1.6.3.orig/src/lib/krb5/krb5_libinit.c 2008-03-21 22:47:40.187088761 -0700
-+++ krb5-1.6.3/src/lib/krb5/krb5_libinit.c 2008-03-21 23:11:54.864086236 -0700
-@@ -1,7 +1,7 @@
- #include <assert.h>
-
- #include "autoconf.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "k5-int.h"
- #include "krb5_err.h"
- #include "kv5m_err.h"
-diff -Naur krb5-1.6.3.orig/src/lib/krb5/os/t_locate_kdc.c krb5-1.6.3/src/lib/krb5/os/t_locate_kdc.c
---- krb5-1.6.3.orig/src/lib/krb5/os/t_locate_kdc.c 2008-03-21 22:47:40.199088738 -0700
-+++ krb5-1.6.3/src/lib/krb5/os/t_locate_kdc.c 2008-03-21 23:11:54.952085977 -0700
-@@ -2,7 +2,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include "port-sockets.h"
--#include <com_err.h>
-+#include <et/com_err.h>
-
- #define TEST
- #include "dnsglue.c"
-diff -Naur krb5-1.6.3.orig/src/plugins/kdb/db2/policy_db.h krb5-1.6.3/src/plugins/kdb/db2/policy_db.h
---- krb5-1.6.3.orig/src/plugins/kdb/db2/policy_db.h 2008-03-21 22:47:40.407089091 -0700
-+++ krb5-1.6.3/src/plugins/kdb/db2/policy_db.h 2008-03-21 23:11:55.736086362 -0700
-@@ -31,7 +31,7 @@
- #include <gssrpc/xdr.h>
- #include <db.h>
- #include "adb_err.h"
--#include <com_err.h>
-+#include <et/com_err.h>
-
- typedef long osa_adb_ret_t;
-
-diff -Naur krb5-1.6.3.orig/src/slave/kprop.c krb5-1.6.3/src/slave/kprop.c
---- krb5-1.6.3.orig/src/slave/kprop.c 2008-03-21 22:47:40.183088862 -0700
-+++ krb5-1.6.3/src/slave/kprop.c 2008-03-21 23:11:54.819084854 -0700
-@@ -43,7 +43,7 @@
- #include <fcntl.h>
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "kprop.h"
-
- #ifndef GETSOCKNAME_ARG3_TYPE
-diff -Naur krb5-1.6.3.orig/src/slave/kpropd.c krb5-1.6.3/src/slave/kpropd.c
---- krb5-1.6.3.orig/src/slave/kpropd.c 2008-03-21 22:47:40.183088862 -0700
-+++ krb5-1.6.3/src/slave/kpropd.c 2008-03-21 23:11:54.831085390 -0700
-@@ -77,7 +77,7 @@
- #include <syslog.h>
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <errno.h>
-
- #include "kprop.h"
-diff -Naur krb5-1.6.3.orig/src/tests/asn.1/krb5_decode_test.c krb5-1.6.3/src/tests/asn.1/krb5_decode_test.c
---- krb5-1.6.3.orig/src/tests/asn.1/krb5_decode_test.c 2008-03-21 22:47:40.295089395 -0700
-+++ krb5-1.6.3/src/tests/asn.1/krb5_decode_test.c 2008-03-21 23:11:55.224085558 -0700
-@@ -1,6 +1,6 @@
- #include "k5-int.h"
- #include "ktest.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "utility.h"
- #include "ktest_equal.h"
-
-diff -Naur krb5-1.6.3.orig/src/tests/asn.1/krb5_encode_test.c krb5-1.6.3/src/tests/asn.1/krb5_encode_test.c
---- krb5-1.6.3.orig/src/tests/asn.1/krb5_encode_test.c 2008-03-21 22:47:40.295089395 -0700
-+++ krb5-1.6.3/src/tests/asn.1/krb5_encode_test.c 2008-03-21 23:11:55.235085839 -0700
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "utility.h"
-
- #include "ktest.h"
-diff -Naur krb5-1.6.3.orig/src/tests/create/kdb5_mkdums.c krb5-1.6.3/src/tests/create/kdb5_mkdums.c
---- krb5-1.6.3.orig/src/tests/create/kdb5_mkdums.c 2008-03-21 22:47:40.294089421 -0700
-+++ krb5-1.6.3/src/tests/create/kdb5_mkdums.c 2008-03-21 23:11:55.208085401 -0700
-@@ -29,7 +29,7 @@
-
- #include "k5-int.h"
- #include "kdb.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <ss/ss.h>
- #include <stdio.h>
-
-diff -Naur krb5-1.6.3.orig/src/tests/dejagnu/t_inetd.c krb5-1.6.3/src/tests/dejagnu/t_inetd.c
---- krb5-1.6.3.orig/src/tests/dejagnu/t_inetd.c 2008-03-21 22:47:40.291089496 -0700
-+++ krb5-1.6.3/src/tests/dejagnu/t_inetd.c 2008-03-21 23:11:55.167085874 -0700
-@@ -53,7 +53,7 @@
- #include <unistd.h>
- #endif
-
--#include "com_err.h"
-+#include "et/com_err.h"
-
-
- char *progname;
-diff -Naur krb5-1.6.3.orig/src/tests/hammer/kdc5_hammer.c krb5-1.6.3/src/tests/hammer/kdc5_hammer.c
---- krb5-1.6.3.orig/src/tests/hammer/kdc5_hammer.c 2008-03-21 22:47:40.293089166 -0700
-+++ krb5-1.6.3/src/tests/hammer/kdc5_hammer.c 2008-03-21 23:11:55.190086134 -0700
-@@ -31,7 +31,7 @@
- #include <sys/time.h>
-
- #include "k5-int.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #define KRB5_DEFAULT_OPTIONS 0
- #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */
-diff -Naur krb5-1.6.3.orig/src/tests/threads/prof1.c krb5-1.6.3/src/tests/threads/prof1.c
---- krb5-1.6.3.orig/src/tests/threads/prof1.c 2008-03-21 22:47:40.293089166 -0700
-+++ krb5-1.6.3/src/tests/threads/prof1.c 2008-03-21 23:11:55.181086081 -0700
-@@ -7,7 +7,7 @@
- #include <time.h>
- #include <sys/time.h>
- #include <utime.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- #include <profile.h>
-
- int nthreads = 10;
-diff -Naur krb5-1.6.3.orig/src/tests/threads/t_rcache.c krb5-1.6.3/src/tests/threads/t_rcache.c
---- krb5-1.6.3.orig/src/tests/threads/t_rcache.c 2008-03-21 22:47:40.293089166 -0700
-+++ krb5-1.6.3/src/tests/threads/t_rcache.c 2008-03-21 23:11:55.174086536 -0700
-@@ -29,7 +29,7 @@
-
-
- #include <stdio.h>
--#include <com_err.h>
-+#include <et/com_err.h>
-
- #include "k5-int.h"
- #include <krb5.h>
-diff -Naur krb5-1.6.3.orig/src/tests/verify/kdb5_verify.c krb5-1.6.3/src/tests/verify/kdb5_verify.c
---- krb5-1.6.3.orig/src/tests/verify/kdb5_verify.c 2008-03-21 22:47:40.293089166 -0700
-+++ krb5-1.6.3/src/tests/verify/kdb5_verify.c 2008-03-21 23:11:55.199085907 -0700
-@@ -29,7 +29,7 @@
-
- #include "k5-int.h"
- #include "kdb.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include <ss/ss.h>
- #include <stdio.h>
-
-diff -Naur krb5-1.6.3.orig/src/util/et/com_err.3 krb5-1.6.3/src/util/et/com_err.3
---- krb5-1.6.3.orig/src/util/et/com_err.3 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/com_err.3 2008-03-21 23:11:54.752085703 -0700
-@@ -8,7 +8,7 @@
- com_err \- common error display routine
- .SH SYNOPSIS
- .nf
-- #include "com_err.h"
-+ #include "et/com_err.h"
- .PP
- void com_err (whoami, code, format, ...);
- const char *whoami;
-@@ -77,7 +77,7 @@
- used.
-
- The
--.B com_err.h
-+.B et/com_err.h
- header file should be included in any source file that uses routines
- from the
- .I com_err
-diff -Naur krb5-1.6.3.orig/src/util/et/com_err.c krb5-1.6.3/src/util/et/com_err.c
---- krb5-1.6.3.orig/src/util/et/com_err.c 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/com_err.c 2008-03-21 23:11:54.668086140 -0700
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <stdlib.h>
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "error_table.h"
-
- #if defined(_WIN32)
-diff -Naur krb5-1.6.3.orig/src/util/et/com_err.texinfo krb5-1.6.3/src/util/et/com_err.texinfo
---- krb5-1.6.3.orig/src/util/et/com_err.texinfo 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/com_err.texinfo 2008-03-21 23:11:54.731084834 -0700
-@@ -244,7 +244,7 @@
- @section Run-time support routines
-
- Any source file which uses the routines supplied with or produced by the
--com_err package should include the header file @file{<com_err.h>}. It
-+com_err package should include the header file @file{<et/com_err.h>}. It
- contains declarations and definitions which may be needed on some systems.
- (Some functions cannot be referenced properly without the return type
- declarations in this file. Some functions may work properly on most
-@@ -501,7 +501,7 @@
- @t{profiled} should be created to hold objects compiled for profiling.
- Running ``make all'' should then be sufficient to build the library and
- error-table compiler. The files @samp{libcom_err.a},
--@samp{libcom_err_p.a}, @samp{com_err.h}, and @samp{compile_et} should be
-+@samp{libcom_err_p.a}, @samp{et/com_err.h}, and @samp{compile_et} should be
- installed for use; @samp{com_err.3} and @samp{compile_et.1} can also be
- installed as manual pages.
-
-diff -Naur krb5-1.6.3.orig/src/util/et/error_message.c krb5-1.6.3/src/util/et/error_message.c
---- krb5-1.6.3.orig/src/util/et/error_message.c 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/error_message.c 2008-03-21 23:11:54.720085949 -0700
-@@ -25,7 +25,7 @@
- #include <stdlib.h>
- #endif
- #include <string.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "error_table.h"
- #include "k5-platform.h"
-
-diff -Naur krb5-1.6.3.orig/src/util/et/error_table.y krb5-1.6.3/src/util/et/error_table.y
---- krb5-1.6.3.orig/src/util/et/error_table.y 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/error_table.y 2008-03-21 23:11:54.712086430 -0700
-@@ -70,7 +70,7 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/time.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "internal.h"
- #include "error_table.h"
- #include "mit-sipb-copyright.h"
-diff -Naur krb5-1.6.3.orig/src/util/et/et_c.awk krb5-1.6.3/src/util/et/et_c.awk
---- krb5-1.6.3.orig/src/util/et/et_c.awk 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/et_c.awk 2008-03-21 23:11:54.683085763 -0700
-@@ -191,7 +191,7 @@
- print " 0" > outfile
- print "};" > outfile
- print "" > outfile
-- print "#include <com_err.h>" > outfile
-+ print "#include <et/com_err.h>" > outfile
- print "" > outfile
- if (tab_base_high == 0) {
- print "const struct error_table et_" table_name "_error_table = { text, " \
-diff -Naur krb5-1.6.3.orig/src/util/et/et_c.pl krb5-1.6.3/src/util/et/et_c.pl
---- krb5-1.6.3.orig/src/util/et/et_c.pl 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/et_c.pl 2008-03-21 23:11:54.760085222 -0700
-@@ -242,7 +242,7 @@
- &Pick('>', $outfile) &&
- (print $fh '');
- &Pick('>', $outfile) &&
-- (print $fh '#include <com_err.h>');
-+ (print $fh '#include <et/com_err.h>');
- &Pick('>', $outfile) &&
- (print $fh '');
- if ($tab_base_high == 0) {
-diff -Naur krb5-1.6.3.orig/src/util/et/et_h.awk krb5-1.6.3/src/util/et/et_h.awk
---- krb5-1.6.3.orig/src/util/et/et_h.awk 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/et_h.awk 2008-03-21 23:11:54.675085685 -0700
-@@ -111,7 +111,7 @@
- print " * This file is automatically generated; please do not edit it." > outfile
- print " */" > outfile
- print "" > outfile
-- print "#include <com_err.h>" > outfile
-+ print "#include <et/com_err.h>" > outfile
- print "" > outfile
- table_item_count = 0
- }
-diff -Naur krb5-1.6.3.orig/src/util/et/et_h.pl krb5-1.6.3/src/util/et/et_h.pl
---- krb5-1.6.3.orig/src/util/et/et_h.pl 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/et_h.pl 2008-03-21 23:11:54.697085690 -0700
-@@ -137,7 +137,7 @@
- &Pick('>', $outfile) &&
- (print $fh '');
- &Pick('>', $outfile) &&
-- (print $fh '#include <com_err.h>');
-+ (print $fh '#include <et/com_err.h>');
- &Pick('>', $outfile) &&
- (print $fh '');
- $table_item_count = 0;
-diff -Naur krb5-1.6.3.orig/src/util/et/et_name.c krb5-1.6.3/src/util/et/et_name.c
---- krb5-1.6.3.orig/src/util/et/et_name.c 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/et_name.c 2008-03-21 23:11:54.738085775 -0700
-@@ -19,7 +19,7 @@
- * provided "as is" without express or implied warranty.
- */
-
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "error_table.h"
-
- static const char char_set[] =
-diff -Naur krb5-1.6.3.orig/src/util/et/init_et.c krb5-1.6.3/src/util/et/init_et.c
---- krb5-1.6.3.orig/src/util/et/init_et.c 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/init_et.c 2008-03-21 23:11:54.705085768 -0700
-@@ -21,7 +21,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "error_table.h"
-
- #if 0
-diff -Naur krb5-1.6.3.orig/src/util/et/t_com_err.c krb5-1.6.3/src/util/et/t_com_err.c
---- krb5-1.6.3.orig/src/util/et/t_com_err.c 2008-03-21 22:47:40.176089317 -0700
-+++ krb5-1.6.3/src/util/et/t_com_err.c 2008-03-21 23:11:54.690085028 -0700
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "et1.h"
- #include "et2.h"
-
-diff -Naur krb5-1.6.3.orig/src/util/et/test_et.c krb5-1.6.3/src/util/et/test_et.c
---- krb5-1.6.3.orig/src/util/et/test_et.c 2008-03-21 22:47:40.177087616 -0700
-+++ krb5-1.6.3/src/util/et/test_et.c 2008-03-21 23:11:54.745085879 -0700
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <errno.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "test1.h"
- #include "test2.h"
- #include "autoconf.h"
-diff -Naur krb5-1.6.3.orig/src/util/profile/profile.swg krb5-1.6.3/src/util/profile/profile.swg
---- krb5-1.6.3.orig/src/util/profile/profile.swg 2008-03-21 22:47:40.178088987 -0700
-+++ krb5-1.6.3/src/util/profile/profile.swg 2008-03-21 23:11:54.776085378 -0700
-@@ -26,7 +26,7 @@
- * Input for wrapper generator program SWIG for profile routines.
- */
- #include <errno.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "profile.h"
-
- #ifdef SWIGTCL
-diff -Naur krb5-1.6.3.orig/src/util/profile/profile_tcl.c krb5-1.6.3/src/util/profile/profile_tcl.c
---- krb5-1.6.3.orig/src/util/profile/profile_tcl.c 2008-03-21 22:47:40.179088124 -0700
-+++ krb5-1.6.3/src/util/profile/profile_tcl.c 2008-03-21 23:11:54.794085763 -0700
-@@ -1096,7 +1096,7 @@
- * Input for wrapper generator program SWIG for profile routines.
- */
- #include <errno.h>
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "profile.h"
-
- #ifdef SWIGTCL
-diff -Naur krb5-1.6.3.orig/src/util/profile/prof_int.h krb5-1.6.3/src/util/profile/prof_int.h
---- krb5-1.6.3.orig/src/util/profile/prof_int.h 2008-03-21 22:47:40.178088987 -0700
-+++ krb5-1.6.3/src/util/profile/prof_int.h 2008-03-21 23:11:54.768085300 -0700
-@@ -12,7 +12,7 @@
-
- #include "k5-thread.h"
- #include "k5-platform.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "profile.h"
-
- typedef long prf_magic_t;
-diff -Naur krb5-1.6.3.orig/src/util/profile/test_profile.c krb5-1.6.3/src/util/profile/test_profile.c
---- krb5-1.6.3.orig/src/util/profile/test_profile.c 2008-03-21 22:47:40.179088124 -0700
-+++ krb5-1.6.3/src/util/profile/test_profile.c 2008-03-21 23:11:54.802086399 -0700
-@@ -11,7 +11,7 @@
- #endif
-
- #include "argv_parse.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- const char *program_name = "test_profile";
-
-diff -Naur krb5-1.6.3.orig/src/util/ss/error.c krb5-1.6.3/src/util/ss/error.c
---- krb5-1.6.3.orig/src/util/ss/error.c 2008-03-21 22:47:40.180089496 -0700
-+++ krb5-1.6.3/src/util/ss/error.c 2008-03-21 23:11:54.808085131 -0700
-@@ -8,7 +8,7 @@
- #include <stdio.h>
-
- #include "copyright.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #include "ss_internal.h"
-
- char * ss_name(sci_idx)
-diff -Naur krb5-1.6.3.orig/src/windows/cns/cns.h krb5-1.6.3/src/windows/cns/cns.h
---- krb5-1.6.3.orig/src/windows/cns/cns.h 2008-03-21 22:47:40.386090737 -0700
-+++ krb5-1.6.3/src/windows/cns/cns.h 2008-03-21 23:11:55.679086399 -0700
-@@ -25,7 +25,7 @@
- #include "winsock.h"
- #include "krb5.h"
- #include "krbini.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #define DEFAULT_TKT_LIFE 120 /* In 5 minute units */
- #define ANAME_SZ 40
-diff -Naur krb5-1.6.3.orig/src/windows/cns/kpasswd.c krb5-1.6.3/src/windows/cns/kpasswd.c
---- krb5-1.6.3.orig/src/windows/cns/kpasswd.c 2008-03-21 22:47:40.386090737 -0700
-+++ krb5-1.6.3/src/windows/cns/kpasswd.c 2008-03-21 23:11:55.685085410 -0700
-@@ -9,7 +9,7 @@
- #include <string.h>
-
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
-
- #include "cns.h"
-
-diff -Naur krb5-1.6.3.orig/src/windows/cns/tktlist.c krb5-1.6.3/src/windows/cns/tktlist.c
---- krb5-1.6.3.orig/src/windows/cns/tktlist.c 2008-03-21 22:47:40.385090203 -0700
-+++ krb5-1.6.3/src/windows/cns/tktlist.c 2008-03-21 23:11:55.671085204 -0700
-@@ -30,7 +30,7 @@
- #ifdef KRB5
- #include "winsock.h"
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #endif
-
- #include "cns.h"
-diff -Naur krb5-1.6.3.orig/src/windows/identity/plugins/krb4/errorfuncs.h krb5-1.6.3/src/windows/identity/plugins/krb4/errorfuncs.h
---- krb5-1.6.3.orig/src/windows/identity/plugins/krb4/errorfuncs.h 2008-03-21 22:47:40.381090583 -0700
-+++ krb5-1.6.3/src/windows/identity/plugins/krb4/errorfuncs.h 2008-03-21 23:11:55.663086522 -0700
-@@ -31,9 +31,9 @@
- and AFS plugins */
-
- #include <errno.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- /*
-- * This is a hack needed because the real com_err.h does
-+ * This is a hack needed because the real et/com_err.h does
- * not define err_func. We need it in the case where
- * we pull in the real com_err instead of the krb4
- * impostor.
-diff -Naur krb5-1.6.3.orig/src/windows/identity/plugins/krb5/errorfuncs.h krb5-1.6.3/src/windows/identity/plugins/krb5/errorfuncs.h
---- krb5-1.6.3.orig/src/windows/identity/plugins/krb5/errorfuncs.h 2008-03-21 22:47:40.378089262 -0700
-+++ krb5-1.6.3/src/windows/identity/plugins/krb5/errorfuncs.h 2008-03-21 23:11:55.656085023 -0700
-@@ -31,9 +31,9 @@
- and AFS plugins */
-
- #include <errno.h>
--#include <com_err.h>
-+#include <et/com_err.h>
- /*
-- * This is a hack needed because the real com_err.h does
-+ * This is a hack needed because the real et/com_err.h does
- * not define err_func. We need it in the case where
- * we pull in the real com_err instead of the krb4
- * impostor.
-diff -Naur krb5-1.6.3.orig/src/windows/wintel/auth.c krb5-1.6.3/src/windows/wintel/auth.c
---- krb5-1.6.3.orig/src/windows/wintel/auth.c 2008-03-21 22:47:40.392090027 -0700
-+++ krb5-1.6.3/src/windows/wintel/auth.c 2008-03-21 23:11:55.696085133 -0700
-@@ -13,7 +13,7 @@
- #include <time.h>
- #include <string.h>
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #endif
-
- #include "telnet.h"
-diff -Naur krb5-1.6.3.orig/src/windows/wintel/encrypt.c krb5-1.6.3/src/windows/wintel/encrypt.c
---- krb5-1.6.3.orig/src/windows/wintel/encrypt.c 2008-03-21 22:47:40.392090027 -0700
-+++ krb5-1.6.3/src/windows/wintel/encrypt.c 2008-03-21 23:11:55.707085136 -0700
-@@ -73,7 +73,7 @@
- #include <time.h>
- #include <string.h>
- #include "krb5.h"
--#include "com_err.h"
-+#include "et/com_err.h"
- #endif
-
- #include "telnet.h"
diff --git a/crypto/krb5/system-et.patch.bz2 b/crypto/krb5/system-et.patch.bz2
new file mode 100644
index 0000000000..93aef57832
--- /dev/null
+++ b/crypto/krb5/system-et.patch.bz2
Binary files differ
diff --git a/crypto/libksba/DETAILS b/crypto/libksba/DETAILS
index f9dcec8020..06fa307dd2 100755
--- a/crypto/libksba/DETAILS
+++ b/crypto/libksba/DETAILS
@@ -1,5 +1,5 @@
SPELL=libksba
- VERSION=1.0.5
+ VERSION=1.0.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libksba/$SOURCE
diff --git a/crypto/libksba/HISTORY b/crypto/libksba/HISTORY
index 9bbc5a6e5e..da5f6f24fa 100644
--- a/crypto/libksba/HISTORY
+++ b/crypto/libksba/HISTORY
@@ -1,3 +1,6 @@
+2009-06-07 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.6
+
2009-01-09 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.0.5
diff --git a/crypto/loop-aes/DETAILS b/crypto/loop-aes/DETAILS
index 984860ed4d..9ae1c3faa8 100755
--- a/crypto/loop-aes/DETAILS
+++ b/crypto/loop-aes/DETAILS
@@ -1,5 +1,5 @@
SPELL=loop-aes
- VERSION=3.2f
+ VERSION=3.2g
SOURCE=loop-AES-v$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/loop-AES-v$VERSION"
diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY
index 74d7221d2a..5400c40da0 100644
--- a/crypto/loop-aes/HISTORY
+++ b/crypto/loop-aes/HISTORY
@@ -1,3 +1,6 @@
+2009-06-26 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.2g
+
2009-03-25 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.2f
diff --git a/crypto/nettle/DETAILS b/crypto/nettle/DETAILS
index cac86fd8af..e082800e8d 100755
--- a/crypto/nettle/DETAILS
+++ b/crypto/nettle/DETAILS
@@ -1,9 +1,9 @@
SPELL=nettle
- VERSION=1.15
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.lysator.liu.se/~nisse/archive/$SOURCE
- SOURCE_HASH=sha512:90178ab6af3d7048aeba888d65d83f77823b800689713979ead8e5eeec51026bac183953d4421276e249c2bcbb26e9528ed304754c951147df8bdcf35a2c6596
+ SOURCE_HASH=sha512:3d171f2258faacbacf284453376ce33e6dddc2979ef75057fcb6b57a74282d42e70c1bdd71d0de1c410c0fcc8738e00cfa0f8f800b345acb1a42a2852616df2f
WEB_SITE=http://www.gnu.org/directory/security/crypt/nettle.html
ENTERED=20030909
LICENSE[0]=GPL
diff --git a/crypto/nettle/HISTORY b/crypto/nettle/HISTORY
index 6eb8ac4f11..97f03e9a37 100644
--- a/crypto/nettle/HISTORY
+++ b/crypto/nettle/HISTORY
@@ -1,3 +1,6 @@
+2009-06-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0
+
2007-02-28 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.15
diff --git a/crypto/openct/DETAILS b/crypto/openct/DETAILS
index 4685777ac2..50c4f3717d 100755
--- a/crypto/openct/DETAILS
+++ b/crypto/openct/DETAILS
@@ -1,10 +1,10 @@
SPELL=openct
- VERSION=0.6.15
+ VERSION=0.6.16
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.opensc-project.org/files/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:ae30139ae60422ed1ae26020913a2b6ce2242bf98d5cb6f55e01980bfbb5f1cd210afc142fb2ac2725083b7481699d1c9aa30a8027f8e839ccba78271d1bbfbd
+ SOURCE_HASH=sha512:fee942f2b7b46589c4e5ec9ee15d0812ce1ee511b98ee8f31a3ffc31919374080cbf4031fa4b88d77d733aefa158643c94a3bee35c27e128755b926e7280c024
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=BSD
diff --git a/crypto/openct/HISTORY b/crypto/openct/HISTORY
index c9f1e04948..d8eb2547d9 100644
--- a/crypto/openct/HISTORY
+++ b/crypto/openct/HISTORY
@@ -1,3 +1,7 @@
+2009-06-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.6.16
+ * INSTALL: added default_install
+
2009-03-03 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: added, for libusb, hal, pcsc-lite
* INSTALL: added, for hal
diff --git a/crypto/openct/INSTALL b/crypto/openct/INSTALL
index e80400a0b3..3b734e196e 100755
--- a/crypto/openct/INSTALL
+++ b/crypto/openct/INSTALL
@@ -1,3 +1,5 @@
+default_install &&
+
if is_depends_enabled $SPELL hal;then
DEST=$INSTALL_ROOT/usr/share/hal/fdi/information/10freedesktop &&
mkdir -p $DEST &&
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index ea1cf0f1ac..c689272cb6 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.5.3
- SOURCE_HASH=sha512:d3cfc1a3b8866dfb44f551de005c5339d270d9a1438fde0e520035b2f164b96eaad0b5fc301289020f47b5c301cc9d4ac29925a7ed26d4eda316373317519857
+ VERSION=1.5.4
+ SOURCE_HASH=sha512:a0d5580a747a2cd76be310f955b39b9245d59b3cc6671c1ddfef53608fa78f6db63d8dfb74be82e303f31dd61d20fcdf5e4a16d09cd42fc6536ab7bc5704f73a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3017/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3052/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 235174ba2e..4f5f5a9be0 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2009-06-28 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.5.4
+
2009-05-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.5.3
diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index cd7211ed1e..eef7e76029 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -11,4 +11,9 @@ optional_depends gtk+2 \
optional_depends qt-x11 \
"--with-qt-includes=/usr/include/qt --enable-pinentry-qt" \
"--disable-pinentry-qt" \
- "to build Qt pinentry"
+ "to build Qt pinentry" &&
+
+optional_depends qt4 \
+ "--with-qt-includes=/usr/include/Qt --enable-pinentry-qt4" \
+ "--disable-pinentry-qt4" \
+ "to build Qt4 pinentry"
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index 02e7abd595..dc085437c1 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,9 +1,9 @@
SPELL=pinentry
- VERSION=0.7.5
+ VERSION=0.7.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
- SOURCE_HASH=sha512:8f1b7dc68c84560d0fb0aff4738dc7a335be3af78c94a1d9a25298e43852de7de9d117ec8647679bfe5cf0739f5795eb8b0ce574a62c07ace631275a901d4243
+ SOURCE_HASH=sha512:86dedb45f33c17485307dba7c79e854bdd4f2d18e703f0bb209cffcf3ee7bc98d7f415db65b8ac6c088e10ace406026f1cceac119d12e65db2ca841ce4cbb5fa
WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html
ENTERED=20030326
LICENSE[0]=GPL
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index 6d1e295605..c4eaa2260b 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,8 @@
+2009-06-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.7.6
+ * DEPENDS: added optional_depends qt4
+ * PRE_BUILD, g_mem_set_vtable.diff: removed patch
+
2008-04-26 Eric Sandall <sandalle@sourcemage.org>
* PRE_BUILD: Apply g_mem_set_vtable.diff
* g_mem_set_vtable.diff: Upstream patch to fix Bug #14471
diff --git a/crypto/pinentry/PRE_BUILD b/crypto/pinentry/PRE_BUILD
deleted file mode 100755
index dbf098ff3b..0000000000
--- a/crypto/pinentry/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/g_mem_set_vtable.diff
diff --git a/crypto/pinentry/g_mem_set_vtable.diff b/crypto/pinentry/g_mem_set_vtable.diff
deleted file mode 100644
index 715328a64b..0000000000
--- a/crypto/pinentry/g_mem_set_vtable.diff
+++ /dev/null
@@ -1,99 +0,0 @@
-only in patch2:
-unchanged:
---- pinentry-0.7.5.orig/gtk+-2/gtksecentry.h
-+++ pinentry-0.7.5/gtk+-2/gtksecentry.h
-@@ -173,6 +173,11 @@
- gtk_secure_entry_get_layout_offsets(GtkSecureEntry * entry,
- gint * x, gint * y);
-
-+gpointer secentry_malloc(gsize size);
-+gpointer secentry_malloc0(gsize size);
-+gpointer secentry_realloc(gpointer mem, gsize size);
-+void secentry_free(gpointer mem);
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
-only in patch2:
-unchanged:
---- pinentry-0.7.5.orig/gtk+-2/gtksecentry.c
-+++ pinentry-0.7.5/gtk+-2/gtksecentry.c
-@@ -270,7 +270,7 @@
-
-
- gpointer
--g_malloc(gulong size)
-+secentry_malloc(gsize size)
- {
- gpointer p;
-
-@@ -282,13 +282,13 @@
- else
- p = (gpointer) malloc(size);
- if (!p)
-- g_error("could not allocate %ld bytes", size);
-+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
-
- return p;
- }
-
- gpointer
--g_malloc0(gulong size)
-+secentry_malloc0(gsize size)
- {
- gpointer p;
-
-@@ -302,13 +302,13 @@
- } else
- p = (gpointer) calloc(size, 1);
- if (!p)
-- g_error("could not allocate %ld bytes", size);
-+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
-
- return p;
- }
-
- gpointer
--g_realloc(gpointer mem, gulong size)
-+secentry_realloc(gpointer mem, gsize size)
- {
- gpointer p;
-
-@@ -332,13 +332,13 @@
- }
-
- if (!p)
-- g_error("could not reallocate %lu bytes", (gulong) size);
-+ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
-
- return p;
- }
-
- void
--g_free(gpointer mem)
-+secentry_free(gpointer mem)
- {
- if (mem) {
- if (m_is_secure(mem))
-only in patch2:
-unchanged:
---- pinentry-0.7.5.orig/gtk+-2/pinentry-gtk-2.c
-+++ pinentry-0.7.5/gtk+-2/pinentry-gtk-2.c
-@@ -473,6 +473,17 @@
- int
- main (int argc, char *argv[])
- {
-+ static GMemVTable secure = {
-+ secentry_malloc,
-+ secentry_realloc,
-+ secentry_free,
-+ NULL,
-+ NULL,
-+ NULL
-+ };
-+
-+ g_mem_set_vtable (&secure);
-+
- pinentry_init (PGMNAME);
-
- #ifdef FALLBACK_CURSES
diff --git a/crypto/scute/DETAILS b/crypto/scute/DETAILS
index 7f9589d1bc..53f530683e 100755
--- a/crypto/scute/DETAILS
+++ b/crypto/scute/DETAILS
@@ -1,9 +1,9 @@
SPELL=scute
- VERSION=1.2.0
+ VERSION=1.3.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/scute/$SOURCE
- SOURCE_GPG="scute.gpg:$SOURCE.sig"
+ SOURCE_GPG="GnuPG.gpg:$SOURCE.sig"
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
diff --git a/crypto/scute/HISTORY b/crypto/scute/HISTORY
index 3f00c3e555..c5230c7fbd 100644
--- a/crypto/scute/HISTORY
+++ b/crypto/scute/HISTORY
@@ -1,3 +1,7 @@
+2009-06-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.3.0, scute.gpg -> GnuPG.gpg
+ * scute.gpg: removed
+
2008-09-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.2.0, GnuPG.gpg -> scute.gpg
* scute.gpg: added with key FCD2A293
diff --git a/crypto/scute/scute.gpg b/crypto/scute/scute.gpg
deleted file mode 100644
index 805b755d92..0000000000
--- a/crypto/scute/scute.gpg
+++ /dev/null
Binary files differ
diff --git a/database/dbd-sqlite/DETAILS b/database/dbd-sqlite/DETAILS
index 156a6d8dc6..55cbd6ea33 100755
--- a/database/dbd-sqlite/DETAILS
+++ b/database/dbd-sqlite/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbd-sqlite
- VERSION=1.14
- SOURCE_HASH=sha512:2640ed4e829562c141b1ddd1e552ca1151e477adb879a0769cb663903a9ccf503c643789c98a5227ee5e38623843f5b8a911bb5189107ffa1a12197fc133e8c5
+ VERSION=1.25
+ SOURCE_HASH=sha512:e31b4ed226c0fc985dbbaee91b2b4721d877cccf5535e842c39df10a75cda340a9171393b747e488579241a7343bf98b93b6b5190ad56ae7cd4e44dfa2fcd95a
SOURCE=DBD-SQLite-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBD-SQLite-$VERSION
SOURCE_URL[0]=http://www.cpan.org/modules/by-module/DBD/$SOURCE
diff --git a/database/dbd-sqlite/HISTORY b/database/dbd-sqlite/HISTORY
index c7eba37906..6f15c91ac8 100644
--- a/database/dbd-sqlite/HISTORY
+++ b/database/dbd-sqlite/HISTORY
@@ -1,3 +1,6 @@
+2009-06-10 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.25
+
2008-10-11 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.14
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 8779f2905f..a3a9c110b4 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
;;
*)
- VERSION=2.1.2.18118-0
- SOURCE_HASH=sha512:77199a8e69b83dc44c1d97f07adea2a3ae828dd188eb2f08e6021291885c55ce1f7159a2c759a4470df158fb416c5c3eb2649e169d870fb06bc9f33eb3ac2153
+ VERSION=2.1.3.18156-0.RC1
+ SOURCE_HASH=sha512:8a3a780d9e9c8e4d66d85629ca4933c198b42a3e0564648d6d49549e1f3e53a9583cabfd0c9b0d18277d1455935af5ca69ccfd52dccfd27a2eb92a0e81f18512
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/\.RC?/}
;;
esac
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 0e598d0c52..c5fd759b0c 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,6 @@
+2009-06-25 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.1.3.18156-0.RC1
+
2009-05-25 Treeve Jelbert <treeve@sourcemage.org>
* fb2.*.patch.bz2: fix for gcc4.4 / icu-4.2 issues
diff --git a/database/flamerobin/DEPENDS b/database/flamerobin/DEPENDS
index c9e7efa02d..634e0015fa 100755
--- a/database/flamerobin/DEPENDS
+++ b/database/flamerobin/DEPENDS
@@ -1,5 +1,6 @@
depends firebird &&
-#depends ibpp &&
-#depends bakefile &&
-depends wxgtk
-
+depends g++ &&
+if [[ $FL_VER == svn ]];then
+ depends subversion
+fi &&
+depends WXWIDGET
diff --git a/database/flamerobin/DETAILS b/database/flamerobin/DETAILS
index 455e3a811a..d1ab41f6fc 100755
--- a/database/flamerobin/DETAILS
+++ b/database/flamerobin/DETAILS
@@ -1,14 +1,17 @@
SPELL=flamerobin
-#if [[ $FL_VER == snapshot ]];then
-# VERSION=0.9.0
-# SOURCE_HASH=sha512:
-#else
+if [[ $FL_VER == svn ]];then
+ VERSION=svn
+ SOURCE_IGNORE=volatile
+ SOURCE=$SPELL-$VERSION-src.tar.bz2
+ SOURCE_URL[0]=svn_https://flamerobin.svn.sourceforge.net/svnroot/$SPELL/trunk/$SPELL:$SPELL
+ FORCE_DOWNLOAD=on
+else
VERSION=0.9.2
SOURCE_HASH=sha512:76eeecae759ab7aec817a4775fe185f982f6f50f5dec850b1fbb00b56239807867fe36568592e313315c0f02364c1986d9691e84d5fced2aedd85571d239f2be
-#fi
SOURCE=$SPELL-$VERSION-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
WEB_SITE=http://www.flamerobin.org
LICENSE=EXPAT
DOCS=""
diff --git a/database/flamerobin/HISTORY b/database/flamerobin/HISTORY
index 97931cc176..45f1970a1d 100644
--- a/database/flamerobin/HISTORY
+++ b/database/flamerobin/HISTORY
@@ -1,3 +1,10 @@
+2009-06-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: add subversion
+
+2009-06-08 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: wxgtk -> WXWIDGET, add g++
+ * PREPARE, DETAILS: support svn version
+
2009-04-11 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.2
diff --git a/database/flamerobin/PREPARE b/database/flamerobin/PREPARE
index 4d11023862..f65fe0e69c 100755
--- a/database/flamerobin/PREPARE
+++ b/database/flamerobin/PREPARE
@@ -1 +1 @@
-config_query_list FL_VER 'which version to builld?' stable snapshot
+config_query_list FL_VER 'which version to build?' stable svn
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index de38ebf396..67bec8983e 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -1,9 +1,9 @@
SPELL=mysql
if [[ $OLD == y ]]; then
- VERSION=5.0.81
+ VERSION=5.0.83
SECURITY_PATCH=3
else
- VERSION=5.1.34
+ VERSION=5.1.36
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 72b07d27b1..6a2ec2aef8 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,15 @@
+2009-07-02 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated stable to version 5.1.36
+
+2009-06-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 5.0.83 [old]
+
+2009-06-06 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 5.1.35
+
+2009-06-06 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 5.0.82 [old]
+
2009-05-03 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 5.0.81 [old], cleaned up
* DEPENDS: cleaned up
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index d0fa7ac60a..5705886242 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
SPELL=pgadmin3
- VERSION=1.8.4
+ VERSION=1.10.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 616bd80743..fe1a02bb8f 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.10.0
+
2008-06-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.8.4
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 166985a957..b762b016fb 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,6 +1,6 @@
SPELL=sqlite
- VERSION=3.6.14.2
- SOURCE_HASH=sha512:803cf041d32c9c699cefd1f36970627f0da943ac503e06757f1c1efa9006e39d70411ea3ac365a10e1116339fdbd842ea52806b6a25b2fc119fc4ea5468c6a42
+ VERSION=3.6.16
+ SOURCE_HASH=sha512:ef3d52106e16d6f0b81a125add97808ccb7f1786564be2b4b798256c05434ec47c06439ec127ad6dec9bb039655fc05d922f88131a561c6396e2bdfeb63b3887
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index be33cf8069..43b18f4bca 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,9 @@
+2009-06-28 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.6.16
+
+2009-06-15 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.6.15
+
2009-05-26 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.6.14.2
diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index 2afa8ba824..99003ea14e 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,6 +1,6 @@
SPELL=tokyocabinet
- VERSION=1.4.23
- SOURCE_HASH=sha512:8f1bfa5e01f1a48b38492de00ae4a69daa3e742587a9da24d9ce0cc2696b9c7015a79b92dde734e12edf064b52a52609e29ce63ff2e587f4c59111694f7f0765
+ VERSION=1.4.28
+ SOURCE_HASH=sha512:091f399e609e293e395a055f6bae08e1df137edb7f5ea1bad1a9bed51ec736016a8fdb45860a7174fa55dea7d8cf8ece14e8fb9c5d56d6cc26e5bc72e844ecc5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index de452ec348..8038f6a8fc 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,18 @@
+2009-07-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.28
+
+2009-06-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.27
+
+2009-06-16 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.26
+
+2009-05-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.25
+
+2009-05-09 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.24
+
2009-05-25 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.23
diff --git a/devel/automake-1.9/HISTORY b/devel/automake-1.9/HISTORY
index 14ed1065c3..0c4c1e14dc 100644
--- a/devel/automake-1.9/HISTORY
+++ b/devel/automake-1.9/HISTORY
@@ -1,3 +1,6 @@
+2009-06-12 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Fix to build with latest autoconf/automake, 1.10 is no longer
+
2006-10-23 George Sherwood <george@beernabeer.com>
* all: Moved to new spell automake-1.9
diff --git a/devel/automake-1.9/PRE_BUILD b/devel/automake-1.9/PRE_BUILD
index 9dad031351..9a624d3514 100755
--- a/devel/automake-1.9/PRE_BUILD
+++ b/devel/automake-1.9/PRE_BUILD
@@ -1,10 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/versioning.patch &&
-# replace this with a plain 'automake'/'aclocal' after some time, it's
-# needed right now because the 'automake'/'aclocal' binary might have
-# been removed due to being previously tracked by one of the
-# automake-X.X spells
-aclocal-1.10 &&
-automake-1.10 &&
+aclocal &&
+automake &&
autoconf
diff --git a/devel/boo/DETAILS b/devel/boo/DETAILS
index bdf7cae69c..f7398399bf 100755
--- a/devel/boo/DETAILS
+++ b/devel/boo/DETAILS
@@ -1,8 +1,8 @@
SPELL=boo
- VERSION=0.9.0.3203
- SOURCE="${SPELL}-${VERSION}-2.tar.gz"
+ VERSION=0.9.1.3287
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://dist.codehaus.org/${SPELL}/distributions/${SOURCE}
- SOURCE_HASH=sha512:ddf4f0fa40b17dda2247170c8f1b83bb45f63ad05701104e7b67cb79f2d80b536f859d31b39e5f17e520efc3c0549cef329bfbae3da9825053f18f1098d8ab2e
+ SOURCE_HASH=sha512:13e412ddd4243ecb7f6ca2c4bfdf6b7f4e11a44645247805977ffaec589a7faf5fd19af109dc0f22298a889310cef3873150bab94eadce2eb4f1e671ccb87570
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://boo.codehaus.org"
LICENSE[0]=GPL
diff --git a/devel/boo/HISTORY b/devel/boo/HISTORY
index a993d5091e..2eab71a9a8 100644
--- a/devel/boo/HISTORY
+++ b/devel/boo/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.9.1.3287
+
2009-02-19 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to verison 0.9.0.3203. Fixed SOURCE & WEB_SITE.
diff --git a/devel/cvs/DETAILS b/devel/cvs/DETAILS
index 8df5e0b011..bd7c1f4019 100755
--- a/devel/cvs/DETAILS
+++ b/devel/cvs/DETAILS
@@ -3,14 +3,14 @@ if [ "$CVS_FEATURES" == "y" ]; then
VERSION=1.12.13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.sig
- SOURCE_URL=http://ftp.gnu.org/non-gnu/cvs/source/feature/$VERSION/$SOURCE
- SOURCE2_URL=http://ftp.gnu.org/non-gnu/cvs/source/feature/$VERSION/$SOURCE2
+ SOURCE_URL=$GNU_URL/non-gnu/cvs/source/feature/$VERSION/$SOURCE
+ SOURCE2_URL=$GNU_URL/non-gnu/cvs/source/feature/$VERSION/$SOURCE2
else
VERSION=1.11.23
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.sig
- SOURCE_URL=http://ftp.gnu.org/non-gnu/cvs/source/stable/$VERSION/$SOURCE
- SOURCE2_URL=http://ftp.gnu.org/non-gnu/cvs/source/stable/$VERSION/$SOURCE2
+ SOURCE_URL=$GNU_URL/non-gnu/cvs/source/stable/$VERSION/$SOURCE
+ SOURCE2_URL=$GNU_URL/non-gnu/cvs/source/stable/$VERSION/$SOURCE2
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_IGNORE=signature
diff --git a/devel/cvs/HISTORY b/devel/cvs/HISTORY
index f1aaac775a..82ef6dd3c5 100644
--- a/devel/cvs/HISTORY
+++ b/devel/cvs/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: use GNU_URL for downloads, much faster
+
2009-01-18 George Sherwood <gsherwood@sourcemage.org>
* POST_REMOVE: Deleted
* PRE_REMOVE: Added to properly delete info file from dir
diff --git a/devel/drscheme/DETAILS b/devel/drscheme/DETAILS
index 169a933576..cd557e5ddb 100755
--- a/devel/drscheme/DETAILS
+++ b/devel/drscheme/DETAILS
@@ -1,9 +1,9 @@
SPELL=drscheme
- VERSION=4.0
+ VERSION=4.2
SOURCE=plt-$VERSION-src-unix.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/plt-$VERSION
SOURCE_URL[0]=http://download.plt-scheme.org/bundles/$VERSION/plt/$SOURCE
- SOURCE_HASH=sha512:ae6082a7ae1071ed8a237b17b86f79d042a5cb50745919b280a167be3a2d2234092529bef89c72113fe6cbf3156a66d0b6a1bd6ec4faa541e95907073611e421
+ SOURCE_HASH=sha512:165d5c8181341132f3237bbe3001d5ef4a3206a50e0976e9bb3c22fc380629d8efdbaaa9a94537d9957f0ea3705bcfa25391f71d14210736d041b2e418b96da3
LICENSE[0]=LGPL
WEB_SITE=http://www.plt-scheme.org
ENTERED=20080614
diff --git a/devel/drscheme/HISTORY b/devel/drscheme/HISTORY
index 9908c13d89..dddc1bc585 100644
--- a/devel/drscheme/HISTORY
+++ b/devel/drscheme/HISTORY
@@ -1,2 +1,5 @@
+2009-06-30 Peng Chang (Charles) <chp@sourcemage.org>
+ * DETAILS: updated spell to 4.2
+
2008-06-16 Alexander Tsamutali <astsmtl@gmail.com>
* DETAILS, DEPENDS, CONFLICTS, BUILD, HISTORY: Created
diff --git a/devel/erlang/DETAILS b/devel/erlang/DETAILS
index 20c5c33eb0..a653400eec 100755
--- a/devel/erlang/DETAILS
+++ b/devel/erlang/DETAILS
@@ -1,5 +1,5 @@
SPELL=erlang
- VERSION=R13B
+ VERSION=R13B01
SOURCE=otp_src_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/otp_src_$VERSION
SOURCE_URL[0]=http://www.erlang.org/download/$SOURCE
diff --git a/devel/erlang/HISTORY b/devel/erlang/HISTORY
index 55626b3840..af2c6716da 100644
--- a/devel/erlang/HISTORY
+++ b/devel/erlang/HISTORY
@@ -1,3 +1,6 @@
+2009-06-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: R13B01
+
2009-04-25 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to R13B
diff --git a/devel/erlang/otp_src_R13B.tar.gz.sig b/devel/erlang/otp_src_R13B.tar.gz.sig
deleted file mode 100644
index ee888b6c4b..0000000000
--- a/devel/erlang/otp_src_R13B.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/devel/erlang/otp_src_R13B01.tar.gz.sig b/devel/erlang/otp_src_R13B01.tar.gz.sig
new file mode 100644
index 0000000000..55a1528cd0
--- /dev/null
+++ b/devel/erlang/otp_src_R13B01.tar.gz.sig
Binary files differ
diff --git a/devel/falcon/DETAILS b/devel/falcon/DETAILS
index 97fb703b93..cc6fe5eeae 100755
--- a/devel/falcon/DETAILS
+++ b/devel/falcon/DETAILS
@@ -1,7 +1,7 @@
SPELL=falcon
SPELLX=Falcon
- VERSION=0.9.1.8
- SOURCE_HASH=sha512:8dbe2c199cc63202a77fe6c0a33a9247da25214e92773207faf65aaf3f105793c2e66724f11dd8e59dc2a3bbc098654a869bb4624c7a0911df381a1805266513
+ VERSION=0.9.2
+ SOURCE_HASH=sha512:ff8da22c0195292a2aabea6691ab783f49213aaf49640fa719e455e501afa6bef31aa12ca949fd466fa53882167c5e79901d8a6e60cf36ec6e6634ef21d44322
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//.8}
WEB_SITE=http://www.falconpl.org/
diff --git a/devel/falcon/HISTORY b/devel/falcon/HISTORY
index 1bd262a771..f8884a9ed9 100644
--- a/devel/falcon/HISTORY
+++ b/devel/falcon/HISTORY
@@ -1,3 +1,6 @@
+2009-06-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.2
+
2009-05-21 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.1.8
diff --git a/devel/gcl/DEPENDS b/devel/gcl/DEPENDS
index 2cd1f05af4..e3331dd79c 100755
--- a/devel/gcl/DEPENDS
+++ b/devel/gcl/DEPENDS
@@ -11,4 +11,5 @@ optional_depends "tcl" \
optional_depends "tk" \
"--enable-tkconfig=$(gaze from tkConfig.sh | cut -d/ -f2-3)" \
"" \
- "For a GCL connection with the windowing tools of TK"
+ "For a GCL connection with the windowing tools of TK" &&
+optional_depends "tetex" "" "" "For generating dwdoc.pdf"
diff --git a/devel/gcl/DETAILS b/devel/gcl/DETAILS
index 2b5eac3e88..25a8b40924 100755
--- a/devel/gcl/DETAILS
+++ b/devel/gcl/DETAILS
@@ -1,12 +1,27 @@
SPELL=gcl
- VERSION=2.6.6
+if [ "$CVS" == "y" ]; then
+ if [ "$CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+ SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.savannah.gnu.org:/sources/gcl:gcl
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+else
+ VERSION=2.6.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.gnu.org/pub/gnu/gcl/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.gnu.org/pub/gnu/gcl/$SOURCE2
- SOURCE_GPG=gnu-verified.gpg:$SOURCE2
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+fi
WEB_SITE=http://www.gnu.org/software/gcl/gcl.html
ENTERED=20020312
UPDATED=20030907
diff --git a/devel/gcl/HISTORY b/devel/gcl/HISTORY
index 827919e3cf..8b1924665f 100644
--- a/devel/gcl/HISTORY
+++ b/devel/gcl/HISTORY
@@ -1,3 +1,13 @@
+2009-06-12 Peng Chang (Charles) <chp@sourcemage.org>
+ * DEPENDS: added optional_depends tetex
+ * PRE_BUILD: suppressed generating dwdoc.pdf if tetex is
+ not depended upon
+
+2009-06-11 Peng Chang (Charles) <chp@sourcemage.org>
+ * DETAILS: updated to 2.6.7, added cvs
+ * PREPARE: added cvs and warn that 2.6.7 may not compile
+ * PRE_BUILD: suppressed installing a not so useful pdf
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.
diff --git a/devel/gcl/PREPARE b/devel/gcl/PREPARE
new file mode 100755
index 0000000000..5aadf2614f
--- /dev/null
+++ b/devel/gcl/PREPARE
@@ -0,0 +1,5 @@
+echo "If you can build the stable version, please let us know!"
+config_query CVS "Use the CVS version?" y
+if [ "$CVS" == "y" ]; then
+ config_query CVS_AUTOUPDATE "Update to the latest CVS automatically on every cast?" n
+fi
diff --git a/devel/gcl/PRE_BUILD b/devel/gcl/PRE_BUILD
new file mode 100755
index 0000000000..105d834979
--- /dev/null
+++ b/devel/gcl/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if ! is_depends_enabled $SPELL tetex; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SCRIPT_DIRECTORY/suppress_pdf.patch
+fi
diff --git a/devel/gcl/USEGCC2 b/devel/gcl/USEGCC2
deleted file mode 100644
index e69de29bb2..0000000000
--- a/devel/gcl/USEGCC2
+++ /dev/null
diff --git a/devel/gcl/suppress_pdf.patch b/devel/gcl/suppress_pdf.patch
new file mode 100644
index 0000000000..491dfd67b1
--- /dev/null
+++ b/devel/gcl/suppress_pdf.patch
@@ -0,0 +1,23 @@
+Created by Peng Chang (Charles) <chp@sourcemage.org>
+diff -Nurp gcl-orig/xgcl-2/makefile gcl/xgcl-2/makefile
+--- gcl-orig/xgcl-2/makefile 2009-06-11 13:44:40.000000000 +0800
++++ gcl/xgcl-2/makefile 2009-06-11 13:47:50.000000000 +0800
+@@ -8,15 +8,15 @@ objects: $(LISP)
+ #saved_%: $(LISP)
+ # echo '(load "sysdef.lisp")(xlib::compile-xgcl)(xlib::save-xgcl "$@")' | $(LISP)
+
+-docs: dwdoc/dwdoccontents.html dwdoc.pdf
++docs: dwdoc/dwdoccontents.html
+
+ dwdoc/dwdoccontents.html: $(LISP)
+ mkdir -p $(@D) && \
+ cd $(@D) && \
+ echo '(load "../sysdef.lisp")(in-package :xlib)(defmacro while (test &rest forms) `(loop (unless ,test (return)) ,@forms))(load "../gcl_tohtml.lsp")(load "../gcl_index.lsp")(tohtml "../dwdoc.tex" "dwdoc")(with-open-file (s "dwdoccontents.html" :direction :output) (let ((*standard-output* s)) (xlib::makecont "../dwdoc.tex" 1 "dwdoc")))(with-open-file (s "dwdocindex.html" :direction :output) (let ((*standard-output* s)) (xlib::printindex indexdata "dwdoc")))' | ../$<
+
+-dwdoc.pdf: dwdoc.tex
+- pdflatex $<
++#dwdoc.pdf: dwdoc.tex
++# pdflatex $<
+
+ #dwdoc/index.html: dwdoc.tex
+ # latex2html $<
diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index c4aca83e66..759aa7c058 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -17,5 +17,5 @@ fi &&
cd $SPELL-$VERSION &&
-OPTS="$OPTS --with-ghc=$GHC_DIR/ghc" &&
+PATH="$GHC_DIR:$PATH" &&
default_build
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index 167a8b5504..c3cf8681f1 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,17 +1,17 @@
SPELL=ghc
- VERSION=6.10.1
+ VERSION=6.10.3
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.haskell.org/ghc/dist/$VERSION/$SOURCE
- SOURCE_HASH=sha512:5217892afffbf5761a938755b796137bddd8167833927fb1429887032eea3fc6f7333da55fd97f9dec75a7dc7f5ed1d8c5f34a797a8e3b922db5ee49296d5338
+ SOURCE_HASH=sha512:7a96a2a194827100035513528bfaab474ad6969db6de04ca9e6ad003b45c0f24de8c70ee39c96ac911f81930a70a4fbb0e890e9ce319505f3282a8e9a9f90d7b
if [[ ! -x /usr/bin/ghc ]] ; then
ARCH="$(uname -m)"
[[ "$ARCH" = i686 ]] && ARCH=i386
- SOURCE2=$SPELL-$VERSION-$ARCH-unknown-linux.tar.bz2
+ SOURCE2=$SPELL-$VERSION-$ARCH-unknown-linux-n.tar.bz2
SOURCE2_URL[0]=http://www.haskell.org/ghc/dist/$VERSION/$SOURCE2
- SOURCE2_HASH=sha512:ea3a639b05341d8d31e2cac771ec34e4c531644b7267e313314de7830a84e3674e4656be5e278ca92124ffb4ac414ecc56efb05e9b7e042cbd492caa78c145b3
- [ "$ARCH" = "x86_64" ] && SOURCE2_HASH=sha512:6c265d8b198e755a0126ec0687538ca4b51896d7639be2dcd7b8b88527b29d559b296a30d96d0c6decc7215ce4f6d64d70dd7cf42ea3764e298aba678f33156d
+ SOURCE2_HASH=sha512:37b50b41f7c3073898eda8dd9c3d51b445c0044bf1a54830869e4ac9201299c4ef64c7c565ec00927b301f1f2acd214efccb1397c3ced19187be7bfe542cfa73
+ [ "$ARCH" = "x86_64" ] && SOURCE2_HASH=sha512:64e9399c24c6d94f70d85cc872928c883d5176bb25cdd637cd4fd20e8370c63b7a5dcc7ed2d36a08949604b2aa0c408b2f7b090ea0c248a703c8eeaaec49cf3f
fi
LICENSE[0]=BSD
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index facd7b6ca6..1c6f9e2ed1 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,8 @@
+2009-06-08 Peng Chang (Charles) <chp@sourcemage.org>
+ * DETAILS: updated to 6.10.3
+ * BUILD: bootstrapping ghc needs more binaries than just ghc,
+ so temporarily set PATH as ada does
+
2009-03-17 Mark Bainter <mbainter@sourcemage.org>
* DETAILS: updated spell to 6.10.1
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 7b36f51196..8a520af08d 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.6.3.1
+ VERSION=1.6.3.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 622ac96db8..a5a1406b33 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2009-06-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.6.3.3
+
+2009-06-04 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.3.2
+
2009-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.6.3.1
diff --git a/devel/make/DETAILS b/devel/make/DETAILS
index 3f3c9be710..bf9d4c03bf 100755
--- a/devel/make/DETAILS
+++ b/devel/make/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
LICENSE[0]=GPL
- WEB_SITE=http://www.paulandlesley.org/gmake
+ WEB_SITE=http://www.gnu.org/software/make/make.html
ENTERED=20010922
UPDATED=20050721
KEYWORDS="devel"
diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index e810967d39..538c3fd71e 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,6 @@
+2009-06-18 Ethan Grammatikidis <eekee57@fastmail.fm>
+ * DETAILS: fixed WEB_SITE
+
2009-01-16 George Sherwood <gsherwood@sourcemage.org>
* POST_REMOVE: Deleted.
* PRE_REMOVE: Added to delete info dir entries
diff --git a/devel/mono-basic/DEPENDS b/devel/mono-basic/DEPENDS
new file mode 100755
index 0000000000..78057dd1b9
--- /dev/null
+++ b/devel/mono-basic/DEPENDS
@@ -0,0 +1 @@
+depends mono
diff --git a/devel/mono-basic/DETAILS b/devel/mono-basic/DETAILS
new file mode 100755
index 0000000000..53469198a4
--- /dev/null
+++ b/devel/mono-basic/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=mono-basic
+ VERSION=2.4.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:60b4d70338b383a5d196513dd346e28ad9180d145a337eee8e5918bb2e01f815356803383f83ef072d07bf1dbc12d842b47238be96a0f48f12512b3d5d8e06d1
+ WEB_SITE=http://www.mono-project.com
+ ENTERED=20090614
+ LICENSE[0]=LGPL
+ SHORT="Mono visual basic"
+cat << EOF
+Mono implementation of Microsoft's Visual basic
+EOF
diff --git a/devel/mono-basic/HISTORY b/devel/mono-basic/HISTORY
new file mode 100644
index 0000000000..7f3e3bb699
--- /dev/null
+++ b/devel/mono-basic/HISTORY
@@ -0,0 +1,5 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.4.2
+
+2009-06-14 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS, DETAILS: created spell
diff --git a/devel/mono-debugger/DETAILS b/devel/mono-debugger/DETAILS
index 7cfa769df8..fd445b26cf 100755
--- a/devel/mono-debugger/DETAILS
+++ b/devel/mono-debugger/DETAILS
@@ -1,5 +1,5 @@
SPELL=mono-debugger
- VERSION=2.0
+ VERSION=2.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/mono-debugger/HISTORY b/devel/mono-debugger/HISTORY
index 4d895ba87b..3d3749e2b0 100644
--- a/devel/mono-debugger/HISTORY
+++ b/devel/mono-debugger/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.4.2
+
2008-12-12 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.0
SOURCE is now .bz2
diff --git a/devel/mono-debugger/mono-debugger-2.0.tar.bz2.sig b/devel/mono-debugger/mono-debugger-2.0.tar.bz2.sig
deleted file mode 100644
index 78c4a4cf46..0000000000
--- a/devel/mono-debugger/mono-debugger-2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/devel/mono-debugger/mono-debugger-2.4.2.tar.bz2.sig b/devel/mono-debugger/mono-debugger-2.4.2.tar.bz2.sig
new file mode 100644
index 0000000000..e144181b19
--- /dev/null
+++ b/devel/mono-debugger/mono-debugger-2.4.2.tar.bz2.sig
Binary files differ
diff --git a/devel/mono-tools/DEPENDS b/devel/mono-tools/DEPENDS
index d59b90d2b9..64ad49a0d1 100755
--- a/devel/mono-tools/DEPENDS
+++ b/devel/mono-tools/DEPENDS
@@ -1,3 +1,2 @@
-depends monodoc &&
depends gtk-sharp-2 &&
depends gecko-sharp-2
diff --git a/devel/mono-tools/DETAILS b/devel/mono-tools/DETAILS
index d080be06a1..1ba82c1afd 100755
--- a/devel/mono-tools/DETAILS
+++ b/devel/mono-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=mono-tools
- VERSION=1.2.6
+ VERSION=2.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/mono-tools/HISTORY b/devel/mono-tools/HISTORY
index 4631a82689..2c4ca614fa 100644
--- a/devel/mono-tools/HISTORY
+++ b/devel/mono-tools/HISTORY
@@ -1,3 +1,7 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.4.2
+ * DEPENDS: removed monodoc
+
2008-01-31 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.2.6
SOURCE now compressed with bzip2
diff --git a/devel/mono-tools/mono-tools-1.2.6.tar.bz2.sig b/devel/mono-tools/mono-tools-1.2.6.tar.bz2.sig
deleted file mode 100644
index c5d2a70560..0000000000
--- a/devel/mono-tools/mono-tools-1.2.6.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/devel/mono-tools/mono-tools-2.4.2.tar.bz2.sig b/devel/mono-tools/mono-tools-2.4.2.tar.bz2.sig
new file mode 100644
index 0000000000..b3aa4899d1
--- /dev/null
+++ b/devel/mono-tools/mono-tools-2.4.2.tar.bz2.sig
Binary files differ
diff --git a/devel/mono/CONFIGURE b/devel/mono/CONFIGURE
new file mode 100755
index 0000000000..4dbf6926c4
--- /dev/null
+++ b/devel/mono/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_option MONO_MOON \
+ 'Enable moonlight support? (mono silverlight clone)' n \
+ '--with-moonlight=yes' \
+ '--with-moonlight=no'
+
diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS
index fefbfc0e07..b07bed1753 100755
--- a/devel/mono/DETAILS
+++ b/devel/mono/DETAILS
@@ -1,10 +1,17 @@
SPELL=mono
- VERSION=2.4
- BRANCH=`echo ${VERSION} | cut -f 1,2 -d .`
+if [[ "${MONO_TRUNK}" = 'y' ]]; then
+ VERSION=136068
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE}
+ SOURCE_HASH=sha512:d9873736067a396acb172ecb35d5c748b49c0fd4a89469f2cf9135bd919c9be4c9656edb1ae7d2783b42c2f87cbdd28042565ee81c9cd2f77616905a74d3d75e
+else
+ VERSION=2.4.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:afca82fbbeab5032338a8968c6801c94d5a9842c691a1238e1b84c1264d97ebf3c7c637bf2be80859841dad57471f0fe07234178f34de8025c8c6b44604ca204
+ SOURCE_HASH=sha512:dc2b6ee164031add282ec7bab84e87b8d9f33163e26198f396a65469fc7ed8c799af4bdbacfeff57bd8da2f6aa167710ec1d1d8b81877fe1ee16db4c1f1113d6
+fi
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.mono-project.com
ENTERED=20020625
LICENSE[0]=LGPL
diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY
index 01f8cca98a..2cdb0235b2 100644
--- a/devel/mono/HISTORY
+++ b/devel/mono/HISTORY
@@ -1,3 +1,13 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.4.2
+
+2009-06-15 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Switched order of ifelse
+
+2009-06-14 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: added trunk snapshot for moonlight testing,
+ can be removed when 2.5 is available
+
2009-03-29 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 2.4
diff --git a/devel/mono/PREPARE b/devel/mono/PREPARE
new file mode 100755
index 0000000000..bca9a135b1
--- /dev/null
+++ b/devel/mono/PREPARE
@@ -0,0 +1 @@
+config_query MONO_TRUNK 'Build the svn snapshot? (needed for moonlight)' n
diff --git a/devel/monodevelop-debugger-gdb/DETAILS b/devel/monodevelop-debugger-gdb/DETAILS
index 42e85cbe88..498d22d275 100755
--- a/devel/monodevelop-debugger-gdb/DETAILS
+++ b/devel/monodevelop-debugger-gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=monodevelop-debugger-gdb
- VERSION=1.9.1
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://go-mono.com/sources/$SPELL/$SOURCE
diff --git a/devel/monodevelop-debugger-gdb/HISTORY b/devel/monodevelop-debugger-gdb/HISTORY
index 01453b90f5..43774619db 100644
--- a/devel/monodevelop-debugger-gdb/HISTORY
+++ b/devel/monodevelop-debugger-gdb/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0
+
2008-12-12 Eric Sandall <eric@sandall.us>
* DETAILS, DEPENDS, BUILD: Created
diff --git a/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-1.9.1.tar.bz2.sig b/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-1.9.1.tar.bz2.sig
deleted file mode 100644
index e555541c72..0000000000
--- a/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-1.9.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-2.0.tar.bz2.sig b/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-2.0.tar.bz2.sig
new file mode 100644
index 0000000000..6ae9d6aceb
--- /dev/null
+++ b/devel/monodevelop-debugger-gdb/monodevelop-debugger-gdb-2.0.tar.bz2.sig
Binary files differ
diff --git a/devel/monodevelop-debugger-mdb/DETAILS b/devel/monodevelop-debugger-mdb/DETAILS
index 1d4cc3e95e..a5d1a1954c 100755
--- a/devel/monodevelop-debugger-mdb/DETAILS
+++ b/devel/monodevelop-debugger-mdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=monodevelop-debugger-mdb
- VERSION=1.9.1
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://go-mono.com/sources/$SPELL/$SOURCE
diff --git a/devel/monodevelop-debugger-mdb/HISTORY b/devel/monodevelop-debugger-mdb/HISTORY
index 01453b90f5..02ae985c3b 100644
--- a/devel/monodevelop-debugger-mdb/HISTORY
+++ b/devel/monodevelop-debugger-mdb/HISTORY
@@ -1,3 +1,8 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0
+ * PRE_BUILD, monodevelop-debugger-mdb-2.0-mono-2.4.2.patch: added patch
+ from Gentoo
+
2008-12-12 Eric Sandall <eric@sandall.us>
* DETAILS, DEPENDS, BUILD: Created
diff --git a/devel/monodevelop-debugger-mdb/PRE_BUILD b/devel/monodevelop-debugger-mdb/PRE_BUILD
new file mode 100755
index 0000000000..159c4b24d2
--- /dev/null
+++ b/devel/monodevelop-debugger-mdb/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
diff --git a/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-1.9.1.tar.bz2.sig b/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-1.9.1.tar.bz2.sig
deleted file mode 100644
index 5e04258f3a..0000000000
--- a/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-1.9.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch b/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
new file mode 100644
index 0000000000..9cff3ac3da
--- /dev/null
+++ b/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
@@ -0,0 +1,478 @@
+Index: Mono.Debugging.Server.Mdb/DebuggerServer.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/DebuggerServer.cs (revision 136420)
++++ Mono.Debugging.Server.Mdb/DebuggerServer.cs (revision 136421)
+@@ -39,6 +39,7 @@
+ Dictionary<int, ST.WaitCallback> breakUpdates = new Dictionary<int,ST.WaitCallback> ();
+ bool breakUpdateEventsQueued;
+
++ MdbAdaptor mdbAdaptor;
+ AsyncEvaluationTracker asyncEvaluationTracker;
+ RuntimeInvokeManager invokeManager;
+
+@@ -51,6 +52,7 @@
+ public DebuggerServer (IDebuggerController dc)
+ {
+ this.controller = dc;
++
+ MarshalByRefObject mbr = (MarshalByRefObject)controller;
+ ILease lease = mbr.GetLifetimeService() as ILease;
+ lease.Register(this);
+@@ -79,8 +81,18 @@
+ }
+ }
+
++ public MdbAdaptor MdbAdaptor {
++ get { return mdbAdaptor; }
++ }
++
+ #region IDebugger Members
+
++ public string InitializeMdb (string mdbVersion)
++ {
++ mdbAdaptor = MdbAdaptorFactory.CreateAdaptor (mdbVersion);
++ return mdbAdaptor.MdbVersion;
++ }
++
+ public void Run (DL.DebuggerStartInfo startInfo)
+ {
+ try {
+@@ -91,6 +103,7 @@
+
+ DebuggerConfiguration config = new DebuggerConfiguration ();
+ config.LoadConfiguration ();
++ mdbAdaptor.InitializeConfiguration (config);
+ debugger = new MD.Debugger (config);
+
+ debugger.ModuleLoadedEvent += OnModuleLoadedEvent;
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor.cs (revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor.cs (revision 136421)
+@@ -0,0 +1,62 @@
++//
++// MdbAdaptor.cs
++//
++// Author:
++// Lluis Sanchez Gual <lluis@novell.com>
++//
++// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using MDB=Mono.Debugger;
++using Mono.Debugging.Backend.Mdb;
++
++namespace DebuggerServer
++{
++ public abstract class MdbAdaptor
++ {
++ public MdbAdaptor ()
++ {
++ MdbVersion = "2.0";
++ }
++
++ public string MdbVersion { get; internal set; }
++
++ public virtual void SetupXsp (MDB.DebuggerConfiguration config)
++ {
++ ThrowNotSupported ("ASP.NET debugging not supported");
++ }
++
++ public virtual void InitializeBreakpoint (MDB.SourceBreakpoint bp)
++ {
++ }
++
++ public virtual void InitializeConfiguration (MDB.DebuggerConfiguration config)
++ {
++ }
++
++ public abstract void AbortThread (MDB.Thread thread, MDB.RuntimeInvokeResult result);
++
++ public void ThrowNotSupported (string feature)
++ {
++ throw new InvalidOperationException (feature + ". You need to install a more recent Mono Debugger version.");
++ }
++ }
++}
+Index: Mono.Debugging.Server.Mdb/Makefile
+===================================================================
+--- Mono.Debugging.Server.Mdb/Makefile (revision 136420)
++++ Mono.Debugging.Server.Mdb/Makefile (revision 136421)
+@@ -59,6 +59,8 @@
+ ICollectionAdaptor.cs \
+ IndexerValueReference.cs \
+ LiteralValueReference.cs \
++ MdbAdaptor.cs \
++ MdbAdaptorFactory.cs \
+ NamespaceValueReference.cs \
+ NRefactoryEvaluator.cs \
+ NullValueReference.cs \
+@@ -77,7 +79,9 @@
+
+ DATA_FILES =
+
+-RESOURCES =
++RESOURCES = \
++ MdbAdaptor-2-0.cs \
++ MdbAdaptor-2-4-2.cs
+
+ EXTRAS = \
+ ChangeLog
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs (revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs (revision 136421)
+@@ -0,0 +1,51 @@
++//
++// MdbAdaptor22.cs
++//
++// Author:
++// Lluis Sanchez Gual <lluis@novell.com>
++//
++// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using Mono.Debugger;
++
++namespace DebuggerServer
++{
++ public class MdbAdaptor_2_4_2: MdbAdaptor
++ {
++ public override void SetupXsp (DebuggerConfiguration config)
++ {
++ config.SetupXSP ();
++ config.StopOnManagedSignals = true;
++ }
++
++ public override void InitializeConfiguration (Mono.Debugger.DebuggerConfiguration config)
++ {
++ base.InitializeConfiguration (config);
++ config.RedirectOutput = true;
++ }
++
++ public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
++ {
++ result.Abort ();
++ }
++ }
++}
+Index: Mono.Debugging.Server.Mdb/ChangeLog
+===================================================================
+--- Mono.Debugging.Server.Mdb/ChangeLog (revision 136420)
++++ Mono.Debugging.Server.Mdb/ChangeLog (revision 136421)
+@@ -1,3 +1,16 @@
++2009-06-18 Lluis Sanchez Gual <lluis@novell.com>
++
++ * Makefile:
++ * MdbAdaptor.cs:
++ * MdbAdaptor-2-0.cs:
++ * DebuggerServer.cs:
++ * MdbAdaptor-2-4-2.cs:
++ * MdbAdaptorFactory.cs:
++ * RuntimeInvokeManager.cs:
++ * Mono.Debugging.Server.Mdb.csproj: Added support for mono
++ 2.4.2. Since the api changed, access to the changed methods
++ has to be done through a dynamically compiled adapter.
++
+ 2009-02-20 Lluis Sanchez Gual <lluis@novell.com>
+
+ * Mono.Debugging.Server.Mdb.csproj: Updated references.
+Index: Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs (revision 136420)
++++ Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs (revision 136421)
+@@ -52,9 +52,7 @@
+ lock (operationsToCancel) {
+ if (!aborted) {
+ aborted = true;
+- res.Abort ();
+- res.CompletedEvent.WaitOne ();
+- ctx.Thread.AbortInvocation ();
++ Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
+ WaitToStop (ctx.Thread);
+ }
+ }
+@@ -73,9 +71,7 @@
+ }
+ else
+ aborted = true;
+- res.Abort ();
+- res.CompletedEvent.WaitOne ();
+- ctx.Thread.AbortInvocation ();
++ Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
+ WaitToStop (ctx.Thread);
+ throw new TimeOutException ();
+ }
+Index: Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs (revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs (revision 136421)
+@@ -0,0 +1,128 @@
++//
++// MdbAdaptorFactory.cs
++//
++// Author:
++// Lluis Sanchez Gual <lluis@novell.com>
++//
++// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using System.Reflection;
++using System.Diagnostics;
++using System.IO;
++
++namespace DebuggerServer
++{
++ public static class MdbAdaptorFactory
++ {
++ // Bump this version number if any change is in MdbAdaptor or subclases
++ const int ApiVersion = 2;
++
++ static readonly string[] supportedVersions = new string[] {"2-4-2", "2-0"};
++
++ public static MdbAdaptor CreateAdaptor (string mdbVersion)
++ {
++ ProcessStartInfo pinfo = new ProcessStartInfo ();
++ pinfo.FileName = "gmcs";
++
++ if (mdbVersion != null) {
++ MdbAdaptor mdb = TryCreateAdaptor (pinfo, mdbVersion);
++ if (mdb == null)
++ throw new InvalidOperationException ("Unsupported MDB version");
++ return mdb;
++ }
++
++ foreach (string v in supportedVersions) {
++ MdbAdaptor mdb = TryCreateAdaptor (pinfo, v);
++ if (mdb != null)
++ return mdb;
++ }
++ throw new InvalidOperationException ("Unsupported MDB version");
++ }
++
++ static MdbAdaptor TryCreateAdaptor (ProcessStartInfo pinfo, string versions)
++ {
++ string[] versionsArray = versions.Split ('|');
++ string version = versionsArray [0];
++
++ string tmpPath = Path.GetTempPath ();
++ tmpPath = Path.Combine (tmpPath, "monodevelop-debugger-mdb");
++ if (!Directory.Exists (tmpPath))
++ Directory.CreateDirectory (tmpPath);
++
++ string outFile = Path.Combine (tmpPath, "adaptor-" + ApiVersion + "--" + version + ".dll");
++
++ string[] refAssemblies = new string [] {
++ typeof(MdbAdaptorFactory).Assembly.Location,
++ typeof(Mono.Debugger.Debugger).Assembly.Location,
++ typeof(Mono.Debugging.Client.DebuggerSession).Assembly.Location,
++ typeof(Mono.Debugging.Backend.Mdb.IDebuggerServer).Assembly.Location
++ };
++
++ DateTime refsTime = DateTime.MinValue;
++ foreach (string rasm in refAssemblies) {
++ DateTime t = File.GetLastWriteTime (rasm);
++ if (t > refsTime)
++ refsTime = t;
++ }
++
++ if (!File.Exists (outFile) || File.GetLastWriteTime (outFile) < refsTime) {
++ string args = "/t:library ";
++ args += "\"/out:" + outFile + "\" ";
++ foreach (string rasm in refAssemblies)
++ args += "\"/r:" + rasm + "\" ";
++
++ // Write the source code for all required classes
++ foreach (string ver in versionsArray) {
++ Stream s = typeof(MdbAdaptorFactory).Assembly.GetManifestResourceStream ("MdbAdaptor-" + ver + ".cs");
++ StreamReader sr = new StreamReader (s);
++ string txt = sr.ReadToEnd ();
++ sr.Close ();
++ s.Close ();
++
++ string csfile = Path.Combine (tmpPath, "adaptor-" + ver + ".cs");
++ File.WriteAllText (csfile, txt);
++ args += "\"" + csfile + "\" ";
++ }
++
++ pinfo.Arguments = args;
++ Process proc = Process.Start (pinfo);
++ proc.WaitForExit ();
++ if (proc.ExitCode != 0)
++ return null;
++ Console.WriteLine ("Generated: " + outFile);
++ }
++
++ Assembly asm = Assembly.LoadFrom (outFile);
++ Type at = asm.GetType ("DebuggerServer.MdbAdaptor_" + version.Replace ('-','_'));
++ if (at != null) {
++ try {
++ MdbAdaptor a = (MdbAdaptor) Activator.CreateInstance (at);
++ a.MdbVersion = version;
++ return a;
++ } catch {
++ // MDB version not really supported
++ }
++ }
++ return null;
++ }
++ }
++}
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs (revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs (revision 136421)
+@@ -0,0 +1,40 @@
++//
++// MdbAdaptor_2_0.cs
++//
++// Author:
++// Lluis Sanchez Gual <lluis@novell.com>
++//
++// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++
++namespace DebuggerServer
++{
++ public class MdbAdaptor_2_0: MdbAdaptor
++ {
++ public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
++ {
++ result.Abort ();
++ result.CompletedEvent.WaitOne ();
++ thread.AbortInvocation ();
++ }
++ }
++}
+Index: Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs
+===================================================================
+--- Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs (revision 136420)
++++ Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs (revision 136421)
+@@ -37,11 +37,13 @@
+ public class MonoDebuggerSession: DebuggerSession
+ {
+ DebuggerController controller;
++ static string detectedMdbVersion;
+
+ public void StartDebugger ()
+ {
+ controller = new DebuggerController (this, Frontend);
+ controller.StartDebugger ();
++ InitMdbVersion ();
+ }
+
+ public override void Dispose ()
+@@ -54,6 +56,12 @@
+ {
+ controller.DebuggerServer.Run (startInfo);
+ }
++
++ void InitMdbVersion ()
++ {
++ // Cache detected mdb versions, so version detection is done only once
++ detectedMdbVersion = controller.DebuggerServer.InitializeMdb (detectedMdbVersion);
++ }
+
+ protected override void OnAttachToProcess (int processId)
+ {
+Index: Mono.Debugging.Backend.Mdb/ChangeLog
+===================================================================
+--- Mono.Debugging.Backend.Mdb/ChangeLog (revision 136420)
++++ Mono.Debugging.Backend.Mdb/ChangeLog (revision 136421)
+@@ -1,3 +1,10 @@
++2009-06-18 Lluis Sanchez Gual <lluis@novell.com>
++
++ * IDebuggerServer.cs:
++ * MonoDebuggerSession.cs: Added support for mono 2.4.2. Since
++ the api changed, access to the changed methods has to be
++ done through a dynamically compiled adapter.
++
+ 2009-03-05 Lluis Sanchez Gual <lluis@novell.com>
+
+ * AssemblyInfo.cs:
+Index: Mono.Debugging.Backend.Mdb/IDebuggerServer.cs
+===================================================================
+--- Mono.Debugging.Backend.Mdb/IDebuggerServer.cs (revision 136420)
++++ Mono.Debugging.Backend.Mdb/IDebuggerServer.cs (revision 136421)
+@@ -32,6 +32,8 @@
+ {
+ public interface IDebuggerServer
+ {
++ string InitializeMdb (string mdbVersion);
++
+ void Run (DebuggerStartInfo startInfo);
+
+ void Stop ();
diff --git a/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.tar.bz2.sig b/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.tar.bz2.sig
new file mode 100644
index 0000000000..794285af65
--- /dev/null
+++ b/devel/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.tar.bz2.sig
Binary files differ
diff --git a/devel/monodevelop/DEPENDS b/devel/monodevelop/DEPENDS
index 7e4a2ca228..e87c06738a 100755
--- a/devel/monodevelop/DEPENDS
+++ b/devel/monodevelop/DEPENDS
@@ -1,6 +1,5 @@
depends gtk-sharp-2 &&
depends -sub GUI mono-addins &&
-depends monodoc &&
suggest_depends monodevelop-debugger-gdb 'for GNU debugger add-in' &&
suggest_depends monodevelop-debugger-mdb 'for managed debugger add-in'
diff --git a/devel/monodevelop/DETAILS b/devel/monodevelop/DETAILS
index 6650cd2541..b1b1765b8f 100755
--- a/devel/monodevelop/DETAILS
+++ b/devel/monodevelop/DETAILS
@@ -1,5 +1,5 @@
SPELL=monodevelop
- VERSION=1.9.1
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://go-mono.com/sources/$SPELL/$SOURCE
diff --git a/devel/monodevelop/HISTORY b/devel/monodevelop/HISTORY
index 9b2ea05268..7bd4239baf 100644
--- a/devel/monodevelop/HISTORY
+++ b/devel/monodevelop/HISTORY
@@ -1,3 +1,7 @@
+2009-06-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0
+ * DEPENDS: removed monodoc
+
2008-12-11 Eric Sandall <eric@sandall.us>
* DETAILS: Updated to 1.9.1
Yes, this is an alpha version, but the current "stable" has dependencies
diff --git a/devel/monodevelop/monodevelop-1.9.1.tar.bz2.sig b/devel/monodevelop/monodevelop-1.9.1.tar.bz2.sig
deleted file mode 100644
index 10f3cfa95f..0000000000
--- a/devel/monodevelop/monodevelop-1.9.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/devel/monodevelop/monodevelop-2.0.tar.bz2.sig b/devel/monodevelop/monodevelop-2.0.tar.bz2.sig
new file mode 100644
index 0000000000..9a28f7e98d
--- /dev/null
+++ b/devel/monodevelop/monodevelop-2.0.tar.bz2.sig
Binary files differ
diff --git a/devel/moon/BUILD b/devel/moon/BUILD
new file mode 100755
index 0000000000..c0e272603f
--- /dev/null
+++ b/devel/moon/BUILD
@@ -0,0 +1,2 @@
+OPTS="${OPTS} --with-managed=${MOON_MANAGED} ${MOON_BUUUGS}" &&
+default_build
diff --git a/devel/moon/CONFIGURE b/devel/moon/CONFIGURE
new file mode 100755
index 0000000000..f3705cace5
--- /dev/null
+++ b/devel/moon/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_option MOON_BUUUGS \
+ 'Enable Silverlight-1.0 bugs support? (really a configure option)' y \
+ '--with-compatibility-bugs=yes' \
+ '--with-compatibility-bugs=no' &&
+
+message "you can choose to enable managed code fully (yes/no), or only for the desktop or browser plug-in" &&
+config_query_list MOON_MANAGED 'Do you want to enable managed code?' yes no browser desktop
diff --git a/devel/moon/CONFLICTS b/devel/moon/CONFLICTS
new file mode 100755
index 0000000000..bdeb9f61ba
--- /dev/null
+++ b/devel/moon/CONFLICTS
@@ -0,0 +1 @@
+conflicts moonlight y
diff --git a/devel/moon/DEPENDS b/devel/moon/DEPENDS
new file mode 100755
index 0000000000..835cee614d
--- /dev/null
+++ b/devel/moon/DEPENDS
@@ -0,0 +1,32 @@
+depends mono &&
+
+# there are no configure options for the next 2 optional_depends
+optional_depends gtk-sharp-2 \
+ '' \
+ '' \
+ 'for silverlight 2 support?' &&
+
+optional_depends ndesk-dbus \
+ '' \
+ '' \
+ 'Enable Test Harness?' &&
+
+optional_depends LIBAVCODEC \
+ '--with-ffmpeg=yes' \
+ '--with-ffmpeg=no' \
+ 'Enable ffmpeg support?' &&
+
+optional_depends alsa-lib \
+ '--with-alsa=yes' \
+ '--with-alsa=no' \
+ 'Enable alsa support?' &&
+
+optional_depends pulseaudio \
+ '--with-pulse=yes' \
+ '--with-pulse=no' \
+ 'Enable pulse audio support?' &&
+
+optional_depends cairo \
+ '--with-cairo=system' \
+ '--with-cairo=embedded' \
+ 'Enable native cairo support?'
diff --git a/devel/moon/DETAILS b/devel/moon/DETAILS
new file mode 100755
index 0000000000..1dc3213816
--- /dev/null
+++ b/devel/moon/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=moon
+ VERSION=1.0.1
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:b7fee103c7ab14dd08ccdd40dc62f51b69226c3161ef2c846032aa0f9949dd5136371380841d7d7c769f873a6c68e95d8a8d98aa9e819656cb16119930d805b6
+ WEB_SITE=http://www.mono-project.com
+ ENTERED=20090614
+ LICENSE[0]="GPL/MS-PL/MIT"
+ SHORT="The Mono implementation of Microsoft Silverlight"
+cat << EOF
+Moonlight is an open source implementation of Silverlight (http://silverlight.net),
+primarily for Linux and other Unix/X11 based operating systems. In September of 2007,
+Microsoft and Novell announced a technical collaboration that includes access to
+Microsoft's test suites for Silverlight and the distribution of a Media Pack for
+Linux users that will contain licensed media codecs for video and audio.
+EOF
diff --git a/devel/moon/HISTORY b/devel/moon/HISTORY
new file mode 100644
index 0000000000..a1b52bc63e
--- /dev/null
+++ b/devel/moon/HISTORY
@@ -0,0 +1,2 @@
+2009-06-14 Arjan Bouter <abouter@sourcemage.org>
+ * BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS: created spell
diff --git a/devel/moonlight/BUILD b/devel/moonlight/BUILD
new file mode 100755
index 0000000000..9deb795bca
--- /dev/null
+++ b/devel/moonlight/BUILD
@@ -0,0 +1,2 @@
+OPTS="${OPTS} ${MOON_DESKTOP} --with-mcspath=/usr" &&
+default_build
diff --git a/devel/moonlight/CONFIGURE b/devel/moonlight/CONFIGURE
new file mode 100755
index 0000000000..8c54583f54
--- /dev/null
+++ b/devel/moonlight/CONFIGURE
@@ -0,0 +1,4 @@
+config_query_option MOON_DESKTOP \
+ 'Enable desktop app support?' y \
+ '' \
+ '--disable-desktop-support'
diff --git a/devel/moonlight/CONFLICTS b/devel/moonlight/CONFLICTS
new file mode 100755
index 0000000000..98d2c800be
--- /dev/null
+++ b/devel/moonlight/CONFLICTS
@@ -0,0 +1 @@
+conflicts moon