Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (14973c07cf4c3fca9bda6f6c4622b48617661923)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (14973c07cf4c3fca9bda6f6c4622b48617661923)
  • Date: Fri, 28 Mar 2008 23:35:01 -0500

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

ChangeLog
| 20
archive/lzma-utils/DETAILS
| 9
archive/lzma-utils/HISTORY
| 5
archive/lzma-utils/lzma-4.32.5.tar.gz.sig
|binary
archive/tar/HISTORY
| 5
archive/tar/PRE_BUILD
| 5
archive/tar/gcc43.patch
| 36
audio-creation/MAINTAINER
| 1
audio-creation/ardour2/BUILD
| 14
audio-creation/ardour2/CONFIGURE
| 45
audio-creation/ardour2/DEPENDS
| 28
audio-creation/ardour2/DETAILS
| 6
audio-creation/ardour2/HISTORY
| 5
audio-creation/ardour2/PRE_BUILD
| 4
audio-creation/espeak/DETAILS
| 4
audio-creation/espeak/HISTORY
| 3
audio-drivers/MAINTAINER
| 1
audio-drivers/jackdmp/BUILD
| 4
audio-drivers/jackdmp/CONFIGURE
| 2
audio-drivers/jackdmp/HISTORY
| 7
audio-libs/MAINTAINER
| 1
audio-libs/flac/HISTORY
| 5
audio-libs/flac/PRE_BUILD
| 3
audio-libs/flac/gcc43.patch
| 21
audio-libs/id3lib/DEPENDS
| 3
audio-libs/id3lib/HISTORY
| 7
audio-libs/id3lib/PRE_BUILD
| 8
audio-libs/id3lib/gcc43.patch
| 86
audio-libs/libao/DETAILS
| 4
audio-libs/libao/HISTORY
| 3
audio-libs/liblo/DETAILS
| 8
audio-libs/liblo/HISTORY
| 3
audio-libs/libmusicbrainz/HISTORY
| 6
audio-libs/libmusicbrainz/PRE_BUILD
| 3
audio-libs/libmusicbrainz/gcc43.patch
| 60
audio-libs/libofa/HISTORY
| 4
audio-libs/libofa/PRE_BUILD
| 5
audio-libs/libofa/gcc43.patch
| 33
audio-libs/liboggz/DEPENDS
| 1
audio-libs/liboggz/DETAILS
| 17
audio-libs/liboggz/HISTORY
| 2
audio-libs/rubberband/DEPENDS
| 6
audio-libs/rubberband/DETAILS
| 15
audio-libs/rubberband/HISTORY
| 2
audio-libs/soundtouch/CONFIGURE
| 4
audio-libs/soundtouch/DEPENDS
| 2
audio-libs/soundtouch/DETAILS
| 3
audio-libs/soundtouch/HISTORY
| 3
audio-libs/soundtouch/PRE_BUILD
| 7
audio-plugins/MAINTAINER
| 1
audio-plugins/vamp-plugin-sdk/BUILD
| 7
audio-plugins/vamp-plugin-sdk/CONFIGURE
| 1
audio-plugins/vamp-plugin-sdk/DEPENDS
| 4
audio-plugins/vamp-plugin-sdk/DETAILS
| 10
audio-plugins/vamp-plugin-sdk/HISTORY
| 10
audio-plugins/vamp-plugin-sdk/INSTALL
| 15
audio-plugins/vamp-plugin-sdk/PRE_BUILD
| 12
audio-soft/MAINTAINER
| 1
collab/subversion/DEPENDS
| 11
collab/subversion/HISTORY
| 3
crypto/cryptsetup-luks/DETAILS
| 4
crypto/cryptsetup-luks/HISTORY
| 3
crypto/cyrus-sasl/DEPENDS
| 9
crypto/cyrus-sasl/HISTORY
| 3
crypto/gnupg-exp/DETAILS
| 2
crypto/gnupg-exp/HISTORY
| 3
crypto/gnupg/DETAILS
| 2
crypto/gnupg/HISTORY
| 3
crypto/gnutls/DEPENDS
| 7
crypto/gnutls/HISTORY
| 3
crypto/gsasl/DETAILS
| 16
crypto/gsasl/HISTORY
| 6
crypto/krb5/DEPENDS
| 18
crypto/krb5/DETAILS
| 2
crypto/krb5/HISTORY
| 12
crypto/krb5/PRE_BUILD
| 8
crypto/krb5/UP_TRIGGERS
| 13
crypto/krb5/system-et.patch
| 1364 ++++++++
crypto/openssh/DEPENDS
| 9
crypto/openssh/HISTORY
| 3
database/firebird/DETAILS
| 21
database/firebird/HISTORY
| 5
database/openrpt/DETAILS
| 5
database/openrpt/HISTORY
| 6
database/openrpt/PRE_BUILD
| 9
database/postgresql/DETAILS
| 4
database/postgresql/HISTORY
| 3
dev/null
|binary
devel/bisonc++/DETAILS
| 6
devel/bisonc++/HISTORY
| 3
devel/bobcat/DETAILS
| 4
devel/bobcat/HISTORY
| 3
devel/git/DEPENDS
| 12
devel/git/DETAILS
| 2
devel/git/HISTORY
| 8
devel/git/INSTALL
| 15
devel/guile/DETAILS
| 7
devel/guile/HISTORY
| 7
devel/guile/PRE_BUILD
| 3
devel/guile/gcc43.patch
| 91
devel/tcl/HISTORY
| 4
devel/tcl/UP_TRIGGERS
| 15
disk/e2fsprogs/HISTORY
| 6
disk/e2fsprogs/TRIGGERS
| 4
disk/gparted/DEPENDS
| 3
disk/gparted/DETAILS
| 6
disk/gparted/HISTORY
| 4
disk/quota/DETAILS
| 10
disk/quota/HISTORY
| 4
disk/quota/quota-3.16.tar.gz.sig
|binary
disk/reiserfsprogs/HISTORY
| 3
disk/reiserfsprogs/INSTALL
| 3
disk/udev/DETAILS
| 5
disk/udev/HISTORY
| 6
doc/mnemosyne/DETAILS
| 4
doc/mnemosyne/HISTORY
| 3
doc/openjade/PRE_BUILD
| 3
doc/openjade/gcc43.patch
| 11
doc/yodl/DETAILS
| 5
doc/yodl/HISTORY
| 3
e-17/bang/DETAILS
| 2
e-17/bang/HISTORY
| 3
editors/gle/BUILD
| 5
editors/gle/DEPENDS
| 21
editors/gle/DETAILS
| 4
editors/gle/GLE-4.0.12-src.zip.sig
| 0
editors/gle/GLE-4.1.2-src.zip.sig
|binary
editors/gle/HISTORY
| 9
editors/gle/INSTALL
| 10
editors/gle/PRE_BUILD
| 8
ftp-libs/libtorrent/HISTORY
| 7
ftp-libs/libtorrent/PRE_BUILD
| 8
ftp-libs/libtorrent/gcc43.patch
| 111
ftp/rtorrent/HISTORY
| 7
ftp/rtorrent/PRE_BUILD
| 3
ftp/rtorrent/gcc43.patch
| 81
ftp/wget/BUILD
| 1
ftp/wget/DETAILS
| 9
ftp/wget/HISTORY
| 3
gnome2-apps/gnome-system-tools/DETAILS
| 13
gnome2-apps/gnome-system-tools/HISTORY
| 3
gnome2-apps/gramps/DEPENDS
| 1
gnome2-apps/gramps/DETAILS
| 4
gnome2-apps/gramps/HISTORY
| 4
gnome2-libs/gnome-audio2/DETAILS
| 3
gnome2-libs/gnome-audio2/HISTORY
| 3
gnome2-libs/gnome-audio2/gnome-audio-2.0.0.tar.gz.sig
| 0
gnome2-libs/gnome-audio2/gnome-audio-2.22.0.tar.gz.sig
|binary
gnome2-libs/gnome-games-extra-data/DETAILS
| 2
gnome2-libs/gnome-games-extra-data/HISTORY
| 3
gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
| 0
gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.22.0.tar.bz2.sig
|binary
gnome2-libs/gnome-python-extras/DEPENDS
| 3
gnome2-libs/gnome-python-extras/HISTORY
| 3
gnome2-libs/gtk-doc/DETAILS
| 2
gnome2-libs/gtk-doc/HISTORY
| 3
gnome2-libs/gtk-doc/gtk-doc-1.10.tar.bz2.sig
|binary
gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
| 0
gnu/gcc/DEPENDS
| 8
gnu/gcc/DETAILS
| 5
gnu/gcc/HISTORY
| 5
graphics-libs/sane-backends/HISTORY
| 3
graphics-libs/sane-backends/INSTALL
| 3
graphics/inkscape/DEPENDS
| 1
graphics/inkscape/HISTORY
| 3
graphics/openexr/HISTORY
| 5
graphics/openexr/PRE_BUILD
| 3
graphics/openexr/gcc43.patch
| 26
http/firefox/HISTORY
| 5
http/firefox/PRE_BUILD
| 1
http/firefox/gcc43.patch
| 1618 ++++++++++
http/mozilla/HISTORY
| 5
http/mozilla/PRE_BUILD
| 3
http/mozilla/mimemult.patch
| 14
kde4-apps/ktorrent4/DETAILS
| 4
kde4-apps/ktorrent4/HISTORY
| 3
kernel.gpg
|binary
kernels/linux/HISTORY
| 8
kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
| 5
kernels/linux/info/patches/maintenance_patches/patch-2.6.24.4
| 6
kernels/linux/info/patches/realtime_patches/patch-2.6.24.4-rt4
| 7
kernels/linux/latest.defaults
| 6
libs/boost/PRE_BUILD
| 4
libs/boost/gcc43.patch
| 255 +
libs/libcap/BUILD
| 4
libs/libcap/DETAILS
| 16
libs/libcap/HISTORY
| 15
libs/libcap/INSTALL
| 1
libs/libcap/PRE_BUILD
| 12
libs/libcap/UP_TRIGGERS
| 16
libs/libofx/HISTORY
| 5
libs/libofx/PRE_BUILD
| 4
libs/libofx/gcc43.patch
| 157
libs/neon/DEPENDS
| 3
libs/neon/HISTORY
| 3
lua-forge/lgui/DETAILS
| 4
lua-forge/lgui/HISTORY
| 3
lua-forge/luafilesystem/DETAILS
| 2
lua-forge/luafilesystem/HISTORY
| 3
mail/thunderbird/HISTORY
| 5
mail/thunderbird/PRE_BUILD
| 2
mail/thunderbird/gcc43.patch
| 1618 ++++++++++
mail/tkrat/DETAILS
| 5
mail/tkrat/HISTORY
| 6
mail/tkrat/PRE_BUILD
| 2
mail/tkrat/tkmanagegeometry.patch
| 20
net/iptraf/HISTORY
| 4
net/iptraf/PRE_BUILD
| 3
net/iptraf/iptraf-3.0.0-headerfix.patch
| 25
net/nfs-utils/DEPENDS
| 5
net/nfs-utils/DETAILS
| 2
net/nfs-utils/HISTORY
| 10
net/nfs-utils/init.d/nfs
| 2
net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig
| 0
net/nfs-utils/nfs-utils-1.1.2.tar.gz.sig
|binary
net/portmap/HISTORY
| 5
net/portmap/PRE_BUILD
| 3
net/portmap/tcp_wrapper_disable.patch
| 11
net/samba/DEPENDS
| 8
net/samba/HISTORY
| 17
net/samba/PRE_BUILD
| 2
net/samba/libcap.patch
| 52
net/wpa_supplicant/HISTORY
| 5
net/wpa_supplicant/PRE_BUILD
| 2
net/wpa_supplicant/gcc43.patch
| 38
perl-cpan/params-validate/DETAILS
| 4
perl-cpan/params-validate/HISTORY
| 3
perl-cpan/perl-cairo/DETAILS
| 4
perl-cpan/perl-cairo/HISTORY
| 3
perl-cpan/perl-extutils-pkgconfig/DETAILS
| 6
perl-cpan/perl-extutils-pkgconfig/HISTORY
| 4
perl-cpan/perl-glib/DETAILS
| 4
perl-cpan/perl-glib/HISTORY
| 3
perl-cpan/perl-gtk2/DETAILS
| 4
perl-cpan/perl-gtk2/HISTORY
| 3
perl-cpan/xml-writer/DETAILS
| 4
perl-cpan/xml-writer/HISTORY
| 3
printer/ghostscript/DEPENDS
| 5
printer/ghostscript/HISTORY
| 3
python-pypi/kaa-base/DETAILS
| 4
python-pypi/kaa-base/HISTORY
| 3
python-pypi/kaa-metadata/DETAILS
| 4
python-pypi/kaa-metadata/HISTORY
| 3
python-pypi/mercurial/DETAILS
| 7
python-pypi/mercurial/HISTORY
| 4
python-pypi/stgit/DETAILS
| 2
python-pypi/stgit/HISTORY
| 3
python-pypi/stgit/stgit-0.14.2.tar.gz.sig
|binary
python-pypi/stgit/stgit-0.5.tar.gz.sig
| 0
shell-term-fm/pcmanfm/DETAILS
| 4
shell-term-fm/pcmanfm/HISTORY
| 3
smgl/guru-tools/DETAILS
| 2
smgl/guru-tools/HISTORY
| 5
smgl/guru-tools/smgl-cherry-pick
| 5
spelling/aspell/HISTORY
| 7
spelling/aspell/PRE_BUILD
| 4
spelling/aspell/gcc43.patch
| 157
spelling/aspell/templateinstantiations.patch
| 8
telephony/twinkle/DETAILS
| 10
telephony/twinkle/HISTORY
| 9
utils/bluez-utils/BUILD
| 3
utils/bluez-utils/CONFIGURE
| 1
utils/bluez-utils/HISTORY
| 5
utils/bluez-utils/init.d/bluetooth
| 66
utils/dbus/BUILD
| 6
utils/dbus/DEPENDS
| 12
utils/dbus/HISTORY
| 5
utils/dbus/INSTALL
| 6
utils/desktop-file-utils/DETAILS
| 2
utils/desktop-file-utils/HISTORY
| 3
utils/desktop-file-utils/PRE_BUILD
| 5
utils/desktop-file-utils/desktop-file-utils-0.14.tar.gz.sig
| 0
utils/desktop-file-utils/desktop-file-utils-0.15.tar.gz.sig
|binary
utils/hal-info/DETAILS
| 4
utils/hal-info/HISTORY
| 3
utils/memtest86+/DETAILS
| 4
utils/memtest86+/HISTORY
| 3
utils/smartmontools/DETAILS
| 4
utils/smartmontools/HISTORY
| 3
utils/sunbird/HISTORY
| 5
utils/sunbird/PRE_BUILD
| 1
utils/sunbird/gcc43.patch
| 1618 ++++++++++
video/freevo/DEPENDS
| 26
video/freevo/DETAILS
| 4
video/freevo/HISTORY
| 6
video/freevo/PRE_BUILD
| 2
video/lxdvdrip/HISTORY
| 7
video/lxdvdrip/PRE_BUILD
| 5
video/lxdvdrip/lxdvdrip-1.70-makefile.patch
| 18
video/lxdvdrip/lxdvdrip-1.70-vamps-makefile.patch
| 13
video/lxdvdrip/systools.c.patch
| 10
video/mplayer/DEPENDS
| 2
video/mplayer/HISTORY
| 4
video/totem/DETAILS
| 7
video/totem/HISTORY
| 3
windowmanagers/awesome/DEPENDS
| 12
windowmanagers/awesome/DETAILS
| 26
windowmanagers/awesome/HISTORY
| 3
windowmanagers/awesome/INSTALL
| 2
windowmanagers/awesome/awesome-2.2.tar.bz2.sig
|binary
windowmanagers/awesome/awesome.desktop
| 8
windowmanagers/awesome/startawesome
| 22
x11-libs/fontconfig/DETAILS
| 4
x11-libs/fontconfig/HISTORY
| 3
x11-libs/wine/DETAILS
| 2
x11-libs/wine/HISTORY
| 3
x11-toolkits/fltk/DETAILS
| 4
x11-toolkits/fltk/HISTORY
| 3
x11-toolkits/gtk+2/DEPENDS
| 17
x11-toolkits/gtk+2/HISTORY
| 3
x11/conky/DEPENDS
| 9
x11/conky/DETAILS
| 16
x11/conky/HISTORY
| 4
x11/conky/PRE_BUILD
| 4
x11/conky/conky-1.4.9.tar.gz.sig
| 0
x11/conky/conky-1.5.0.tar.gz.sig
|binary
x11/xscreensaver/DETAILS
| 4
x11/xscreensaver/HISTORY
| 10
xfce/ristretto/DEPENDS
| 12
xfce/ristretto/DETAILS
| 4
xfce/ristretto/HISTORY
| 3
xfce/xfdesktop/HISTORY
| 3
xfce/xfdesktop/PRE_BUILD
| 5
323 files changed, 8782 insertions(+), 422 deletions(-)

New commits:
commit 14973c07cf4c3fca9bda6f6c4622b48617661923
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gcc: Reset PATCHLEVEL to default

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

gcc: Force mpfr >= 2.3.0

commit 9d5deabe402b9dbb929d94615e99f4e8c22c5473
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnupg 1.4.9

commit 5e0b538489d9f52a6702929e32ef612f6397beeb
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nfs-utils: fix broken stop function

commit ae9a0b81d6616aea8651dd4aa743d5825953ea33
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnupg-exp 2.0.9

commit 13ac01ac9e93496dc9a06139456911a6e6bcd265
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"gparted-0.3.6"

commit 8bc52a55403782e7fd8fb9a995e669d65b979463
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mercurial: => 1.0

commit e6cf4633fc1df24e11f29feab8b86b926a216ec4
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

totem: cleaned up long desc (80-col)

commit 801ffed9cdd3616de548b3a9f87544960f80cc90
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-system-tools: cleaned up long desc (80-col; added some spacing)

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

gnome-python-extras: There is no libgksuui spell

commit 90348885db1c15740d0a5709a67ed8337c1e85a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"fontconfig-2.5.91"

commit 81fedf4e5ab9c926f8bcd5323d83e3304703d258
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"gramps-3.0.0"

commit 8ae9423e17000817e0f2556cb1849029cb8d2a1b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wget: => 1.11.1

commit 0838e74143fdd3096356662482d9d7384cbc74d9
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Eric Sandall <sandalle AT sourcemage.org>

doc/mnemosyne: version 1.0.1.1

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

awesome: Added a dwm-based window manager with many layouts

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

linux: Latest git patch is 2.6.25-rc6-git7

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

linux: Latest RT is 2.6.24.4-rt4

commit a180c3574e5897870afb5aabd228186cb5e48720
Author: Robin Cook <rcook AT wyrms.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-games-extra-data: updated to 2.22.0

commit 784719cd21198311812e62f4523282dfc6cdc827
Author: Robin Cook <rcook AT wyrms.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-doc: updated to 1.10

commit 147c75f48b6ac464a604c261e13e8e55e36c8322
Author: Robin Cook <rcook AT wyrms.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-audio2: updated to 2.22.0

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

stgit: Updated to 0.14.2

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

stgit: Remove old signature

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

linux: Updated latest maintenance to 2.6.24.4

commit f3d5a3067e3f836277ec7cb37a08fc3daa950620
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

espeak 1.36.02

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

samba: Apply patch to use proper capget after libcap update

commit b3593207cbf15d8c31d79882406c9d003a887710
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cryptsetup-luks 1.0.6

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

mplayer: Depends on libcap

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

samba: Depends on libcap

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

gtk+2: Depends on e2fsprogs for libcom_err

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

libcap: Use :0:4 to match the entire VERSION (2.08)

commit b2ac782509ca03cf454388e926878bb447ca2e37
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sane-backends - installl some extra files

commit cb74589c4c9f351f0ce1574bdb9c437dc1f9f5f1
Author: David Kowis <dkowis AT shlrm.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xscreensaver: Updated to 5.05, removing patch that doesn't fix the issue

commit 0cf8dc740a426cc7c448d10b18a862fd8575fd6d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"ktorrent4-3.0.1"

commit 5c30e50bd0d2694c392fe07a34fd7c775d316c12
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

freevo - update depends

commit fff6ae8322658c1d0d89500cf02a1ef281e0c2b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"freevo-1.8.0"

commit f78d60835b03887f477cf5adb27f1815bdcfba8d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"kaa-metadata-0.7.3"

commit 34ece3c9a87e0a2acbf634e0a208b7a9b7201fa0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"kaa-base-0.4.0"

commit acb1f8926b4f2c69852dfed24d10447959ae2859
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"firebird-2.0.3.12981-1"

commit 907db2c6af1272c06b726957f409443bd9438fef
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"openrpt-2.3.0"

commit 9e65065ccc1b3ad5005b854fcad6a7d9002f17c3
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

dbus: Fixed docs install.

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

git: Optionally depend on vim and install syntax highlighting if so

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

git: Optionally depend on bash-completion and install script if so

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

git: Updated to 1.5.5.rc1

commit c81ca2e2f9816c9b68f21f2a201d7c343195b4e6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ristretto: => 0.0.18

commit 60e8357dc3bd2aea26ed66f7fdd549f79b0a9496
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ardour2: returned identation + added FFT_ANALYSIS option

commit 43f373ba6c97ab98afe2a6495edf1d4b7e4679ce
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Added myself into MAINTAINER of audio-{creation,drivers,libs,plugins,soft}

commit 99d9aee8b79c56388404afb8e75e0716f8ba31a2
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jackdmp: Changed JACKDMP_MIMIC option default to y so that the default
build is actually jack-compatible.

commit c3ef421ee43bac2b0333b6622efe6a8d73286391
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ardour2: some simple fixes + clean up

commit ae5852c409aba39740b4964114d7041303de9db1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

soundtouch: automake-1.9 => automake

commit 8954babdcec6c36b7d1eea3a3bea7b17d074ba41
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

liblo: => 0.24

commit 1cc8469cdfe1651b2f723c746a698a9147c63565
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jackdmp: fixed multijob build

commit 05c12413febb04282e83fecdf66e8da2975158d5
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xfce/xfdesktop: added PRE_BUILD to fix menu plugin crash

commit aa6d0e96db07d10caf2360990d3dfad8d015919d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libcap: fixed install prefix

commit fcd0af05e25cef06bda8ee3ca0968ee711700490
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libcap: compilation fixes + DETAILS clean up

commit cd48908e13215ccc0d07476c8646e8af534d75c0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libcap - forgotten
files

commit 0f4a7e89e6969f0dfe00c3f5915eb7cb4f54a479
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"libcap-2.08"

commit 9354a96749c05409a4f0175e479f5ec4344b4458
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

update kernel.gpg

commit 1b946ca247a7a0aef5fb734647c853e6f096675b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

conky: => 1.5.0

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

xscreensaver: Patch from Javier to fix compilation with latest gtk+2.
Fixes Bug #14387

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

rtorrent: Added patch to compile against gcc 4.3.0

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

libtorrent: Fix location where I grabbed the patch

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

libtorrent: Added patch to compile with gcc 4.3.0

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

libmusicbrainz: Added patch to build with gcc 4.3.0

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

libofx: Added a patch to compile with gcc 4.3.0

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

openexr: Added patch to compile with gcc 4.3.0

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

mozilla: Added patch to fix compilation with gcc4 (found with 4.3.0)

commit 83711914c2702223c2426ea2fc163753009cb250
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

twinkle: fixed whatever I screwed up, including putting Ismael's history
entry back in.

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

libofa: Added patch to compile with gcc 4.3.0

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

flac: Added a patch to compile with gcc 4.3.0

commit d91eba01a1fc66504011546732e0d1e3ad4327d8
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Eric Sandall <sandalle AT sourcemage.org>

net/nfs-utils: Undid inadvertent removal of HISTORY lines

commit e125daf2862e9889223777fbd7fbd8562ff9028e
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

twinkle: really break description lines at column 80 ;)

commit 125b0e843eacf3717e36437612119001426d6599
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

tkrat: version => 2.1.5 and patch to compile with current tk

commit 7959137a0093134148c4ed95381552615910669c
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gsasl 0.2.25

commit 49d95af12bde9306afe1b8eb551ae7e8e9c8c5dd
Author: Robert Figura <template AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pcmanfm: fixed HISTORY

commit eac0aab342d7e5d1fcc4bec693dbd50ee2d33bf6
Author: Robert Figura <template AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pcmanfm-0.3.6.2

commit 0ce1d94124d21bc826275228b7e5cee9dfa3a5b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

"libao-0.8.8"

commit 61c8d9775b3060b5796c36afe4fd7745e46a1d5e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

twinkle: break description lines at column 80

commit 93a65532d897bbe2cdc61acbfe3cad20f81c4d8e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

/memtest86+-2.01

commit 02daa28d1d3e95efe3929c8a6d29125a15f4850d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

fltk-1.1.8rc3

commit b592056ca574203b6d3d6f28f2e562f96bbe87a7
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gsasl: 80-column cleanup for long desc

commit db69a389205fe0b8a664f3e55ce63cf099e698a8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

bisonc++-2.4.1

commit 8cc55f135baf9f0e3bed1ca26c917d2c080f240b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

bobcat-1.17.2

commit 7200d44417c620570d7a3a02cf5d6547ed278028
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

yodl-2.12.1

commit 16ffd08465cc37d93a38b49bba9e1c1749f819b5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xml-writer-0.604

commit 46d71f83415a6bd25bacec1b43370dcd14193ef8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

params-validate-0.89

commit d2ec810672a3442a86af0e2fa67cf30fce7faab5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl-extutils-pkgconfig-1.11

commit 280a074d5c88a83eb994477487710c3eef678468
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl-cairo-1.045

commit dab764a1cc1979fdc6fda718d40dadb35a1eede5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl-gtk2-1.181

commit b0168f3dd79b4ce17f3ec92ef8db1d96fda8c435
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl-glib-1.181

commit 87df0857cdeb2d26ce9b8719484ad88de902a842
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

luafilesystem: fixed upstream url

commit 04463718f47333996761d8ecda672f13ea4abd46
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

liboggz: New spell, library which simplifies Ogg file and stream reading
and writing.

commit 90cf2bae2ac00a4e4f845721023dee4026b3b692
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

bluez-utils: renewed the script, enabled SDP daemon selection

commit ffe0981a8e66a32c0f9665ffc3377ab0ac85b5de
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

smartmontools-5.38

commit 5b2e9dfb718d954f2253d2293ea0a9036a00b2b7
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rubberband: New spell, audio timestretching library.

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

thunderbird: Added patch to compile with gcc 4.3.0

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

sunbird: Added patch to compile with gcc 4.3.0

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

firefox: Apply patch to compile with gcc 4.3.0

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

ghostscript: Depends on e2fsprogs for libcom_err

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

neon: Depends on e2fsprogs for libcom_err

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

e2fsprogs: Recast after krb5 removes compile_et, which they both installed

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

cyrus-sasl: Depends on e2fsprogs for libcom_err

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

openssh: Depends on e2fsprogs for libcom_err

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

subversion: Depends on e2fsprogs for libcom_err

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

krb5: e2fsprogs and krb5 both provide libcom_err, but e2fsprogs is
considered the standard version, so have krb5 use that and then rebuild all
packages which used krb5's libcom_err.so.3.0 to use e2fsprogs' libcom_err.so.2

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

samba: Depends on e2fsprogs for libcom_err

commit 03dbdaed3d640bd9bdb194d610e7ca5ece4601a2
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vamp-plugin-sdk 1.2

commit fb7f6d4545415287e91a4fd2412e3062abda1393
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

twinkle-1.2

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

openjade: Add patch to compile with gcc 4.3.0

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

wpa_supplicant: Add patch for old, stable, and devel to compile with gcc
4.3.0

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

wpa_supplicant: Add patches to compile with gcc 4.3.0

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

id3lib: Add patch to compile with gcc 4.3.0

commit 7f1230f751b4b10a20b9b52de054fcf7cd011470
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lgui: => 0.7.0

commit 811eb1b11fa7bac6b520f12cb3a0134565c35943
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Eric Sandall <sandalle AT sourcemage.org>

graphics/inkscape: now depends on boost

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

gle: Updated to 4.1.2 (works with gcc 4.3.0 now)

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

boost: Added patch to compile with gcc 4.3.0

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

tar: Patch to build against gcc 4.3.0

commit 5c4c4280407ddf66e94f4e46ff51d6ea366aaa5c
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Eric Sandall <sandalle AT sourcemage.org>

/net/nfs-utils: optionally depends on tcp_wrappers

commit 6ef00a9398f768f56b7e4acc98551f7c7fb64349
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

udev: added UPSTREAM_KEY, removed forgotten PATCHLEVEL after updating to
the new version..

commit faa7aea8f99a97b419f4ee23310950fbc147938e
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Eric Sandall <sandalle AT sourcemage.org>

net/portmap: added patch to enable compiling without tcp_wrappers

commit 01cb79e4aa168fa9300fc6f0a4d76eaa1955bdc6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

smgl-cherry-pick: propagate the changes

commit a45543c6312c564c7eb7608ae4fd72987339a7b2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

smgl-cherry-pick: warn about needing to be in the top dir

commit 38d790fad591c6e780407f40d2afde9ba0a9fdd3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

smgl-cherry-pick: fixed omission of new files

commit d2da6420674b20d36327454727da5d8dfb87a17e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

udev-119

commit 674db88644c98f955c8b9fd747cca9c1255fb2bd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hal-info-20080317

commit 87b22bee1df4e1c3eb84bf49abf1ad45c0d94143
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine-0.9.58

commit 60b65d78bd0e2899b3821433b547c4908dd7403f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

postgresql-8.3.1

commit ace6cbd9fc3c7a2aa1640ebbf5d4170048571b00
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

desktop-file-utils: => 0.15

commit b2302f686a0a6fc1a9e4558f85dd4490ab397d76
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

net/iptraf: added a patch to make iptraf compile

commit 38d3d188b68c1a27c2f17e55fa0392c68963b275
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

video/lxdvdrip: made it compile again

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

gnutls: Optionally depends on guile

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

guile: Fix for gcc 4.3.0 (and gnutls using guile with gcc 4.3.0)

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

nfs-utils: Updated to 1.1.2

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

quota: Updated to 3.16

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

lzma-utils: Updated to 4.32.5 (now compiles with gcc 4.3.0)

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

tcl: Check for version changes and triger casts. Fixes Bug #14235

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

bang: Website URL changed

commit 8654aa6efae2afede362b1051f9bfed2489e6262
Author: David Kowis <dkowis AT shlrm.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

reiserfsprogs: fixed the glitch where it didn't install fsck.reiserfs

diff --git a/ChangeLog b/ChangeLog
index 1dd114d..316091f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * windowmanagers/awesome: Added a dwm-based window manager with many
+ layouts
+
+2008-03-23 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-creation, audio-drivers, audio-libs, audio-plugins,
+ audio-soft: Added myself into MAINTAINER. I left Unet's
+ name in place, but his last commit was 2007-07-20.
+
+2008-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * kernel.gpg: add Andrew Morgan D41A6DF2
+
+2008-03-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * audio-libs/rubberband: New spell, audio timestretching library.
+ * audio-libs/liboggz: New spell, library which simplifies Ogg
+ file and stream reading and writing.
+
+2008-03-22 Robert Figura <template AT sourcemage.org>
+ * shell-term-fm/pcmanfm: version bump to 0.3.6.2
+
2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
* utils/youtube-dl: Added a python script to download YouTube videos

diff --git a/archive/lzma-utils/DETAILS b/archive/lzma-utils/DETAILS
index a34edbe..ce64ae2 100755
--- a/archive/lzma-utils/DETAILS
+++ b/archive/lzma-utils/DETAILS
@@ -1,11 +1,12 @@
SPELL=lzma-utils
- VERSION=4.32.0beta3
+ VERSION=4.32.5
SOURCE="lzma-$VERSION.tar.gz"
- SOURCE_URL[0]=http://tukaani.org/lzma/$SOURCE
-
SOURCE_HASH=sha512:9cfc5dbafa8c936d92c44d9e3c73f78e83e730f967b1332f7e6f2c9b19a4b8f5290efc1dd4b6c857f04c486e1ce0955027705182637639ee5222d2e20f508fe9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lzma-$VERSION"
- WEB_SITE=http://tukaani.org/lzma/
+ SOURCE_URL[0]=http://tukaani.org/lzma/$SOURCE
+#
SOURCE_HASH=sha512:9cfc5dbafa8c936d92c44d9e3c73f78e83e730f967b1332f7e6f2c9b19a4b8f5290efc1dd4b6c857f04c486e1ce0955027705182637639ee5222d2e20f508fe9
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
+ WEB_SITE=http://tukaani.org/lzma/
ENTERED=20061010
SHORT="A commandline LZMA compressor and other utilities."
cat << EOF
diff --git a/archive/lzma-utils/HISTORY b/archive/lzma-utils/HISTORY
index 5cbd8ed..1480f6f 100644
--- a/archive/lzma-utils/HISTORY
+++ b/archive/lzma-utils/HISTORY
@@ -1,2 +1,7 @@
+2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 4.32.5
+ Now compiles with gcc 4.3.0
+
2006-10-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, HISTORY: created spell
+
diff --git a/archive/lzma-utils/lzma-4.32.5.tar.gz.sig
b/archive/lzma-utils/lzma-4.32.5.tar.gz.sig
new file mode 100644
index 0000000..364d040
Binary files /dev/null and b/archive/lzma-utils/lzma-4.32.5.tar.gz.sig differ
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index d14f728..1f1d6ea 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,8 @@
+2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Fix compilation with gcc 4.3.0
+ From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452096
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: removed is_depends_enabled.function reference

diff --git a/archive/tar/PRE_BUILD b/archive/tar/PRE_BUILD
index abfe13d..03e5f96 100755
--- a/archive/tar/PRE_BUILD
+++ b/archive/tar/PRE_BUILD
@@ -1,9 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&

if is_depends_enabled $SPELL lzma-utils; then
patch -p1 < $SPELL_DIRECTORY/tar_lzma.diff
-fi &&
-
-cd $SOURCE_DIRECTORY
+fi
diff --git a/archive/tar/gcc43.patch b/archive/tar/gcc43.patch
new file mode 100644
index 0000000..fc2dcd6
--- /dev/null
+++ b/archive/tar/gcc43.patch
@@ -0,0 +1,36 @@
+#
+# From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452096
+#
+--- tar-1.19.orig/lib/argp-fmtstream.h
++++ tar-1.19/lib/argp-fmtstream.h
+@@ -198,7 +198,11 @@
+ #endif
+
+ #ifndef ARGP_FS_EI
+-#define ARGP_FS_EI extern inline
++ #if defined __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
+only in patch2:
+unchanged:
+--- tar-1.19.orig/lib/argp.h
++++ tar-1.19/lib/argp.h
+@@ -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
+
diff --git a/audio-creation/MAINTAINER b/audio-creation/MAINTAINER
index 8fec8ae..dd18169 100644
--- a/audio-creation/MAINTAINER
+++ b/audio-creation/MAINTAINER
@@ -1 +1,2 @@
+Juuso "iuso" Alasuutari <iuso AT sourcemage.org>
Unet <unet AT sourcemage.org>
diff --git a/audio-creation/ardour2/BUILD b/audio-creation/ardour2/BUILD
index f65bcf4..0a1257d 100755
--- a/audio-creation/ardour2/BUILD
+++ b/audio-creation/ardour2/BUILD
@@ -1,9 +1,5 @@
-scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
- $ARDOUR2_SURFACES $ARDOUR2_FFT_ANALYSIS $ARDOUR2_OLDFONTS
-
-#
-# SYSLIBS option is broken in 2.3.1
-#
-#scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
-# $ARDOUR2_SYSLIBS $ARDOUR2_SURFACES \
-# $ARDOUR2_FFT_ANALYSIS $ARDOUR2_OLDFONTS
+scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
+ $ARDOUR2_SYSLIBS \
+ $ARDOUR2_SURFACES \
+ $ARDOUR2_OLDFONTS \
+ $ARDOUR2_FFT_ANALYSIS
diff --git a/audio-creation/ardour2/CONFIGURE
b/audio-creation/ardour2/CONFIGURE
index fd96f2e..3f58852 100755
--- a/audio-creation/ardour2/CONFIGURE
+++ b/audio-creation/ardour2/CONFIGURE
@@ -1,23 +1,26 @@
-#
-# SYSLIBS option is broken in 2.3.1
-#
-#message "${MESSAGE_COLOR} Warning: using system libraries cancels" \
-# "all support from Ardour developers!$DEFAULT_COLOR" &&
-#
-#config_query_option ARDOUR2_SYSLIBS \
-# "Use system libraries instead of internal ones?" \
-# n \
-# "SYSLIBS=1" \
-# "SYSLIBS=0" &&
+message "${MESSAGE_COLOR} Warning: using system libraries cancels" \
+ "all support from Ardour developers!$DEFAULT_COLOR" &&

-config_query_option ARDOUR2_SURFACES \
- "Build with support for control surfaces?" \
- y \
- "SURFACES=1" \
- "SURFACES=0" &&
+config_query_option ARDOUR2_SYSLIBS \
+ "Use system libraries instead of internal ones?" \
+ n \
+ "SYSLIBS=1" \
+ "SYSLIBS=0" &&

-config_query_option ARDOUR2_OLDFONTS \
- "Use old school font sizes?" \
- n \
- "OLDFONTS=1" \
- "OLDFONTS=0"
+config_query_option ARDOUR2_SURFACES \
+ "Build with support for control surfaces?" \
+ y \
+ "SURFACES=1" \
+ "SURFACES=0" &&
+
+config_query_option ARDOUR2_FFT_ANALYSIS \
+ "Include FFT analysis window?" \
+ y \
+ "FFT_ANALYSIS=1" \
+ "FFT_ANALYSIS=0" &&
+
+config_query_option ARDOUR2_OLDFONTS \
+ "Use old school font sizes?" \
+ n \
+ "OLDFONTS=1" \
+ "OLDFONTS=0"
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 5e0c935..9e89c63 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -16,19 +16,14 @@ depends boost &&
depends alsa-lib &&
depends libsamplerate &&
depends fftw &&
+depends JACK-DRIVER &&

-#
-# SYSLIBS option is broken in 2.3.1
-#
-#if [[ $ARDOUR2_SYSLIBS == 'SYSLIBS=1' ]]
-#then
-# depends libsigc++3 &&
-# depends gtkmm2 &&
-# depends libgnomecanvasmm &&
-# depends soundtouch
-#fi &&
-
-depends JACK-DRIVER &&
+if [[ $ARDOUR2_SYSLIBS == "SYSLIBS=1" ]]; then
+ depends libsigc++3 &&
+ depends gtkmm2 &&
+ depends libgnomecanvasmm &&
+ depends soundtouch
+fi &&

# slv2 >= 0.6.0 (SVN version) required
#optional_depends slv2 \
@@ -36,17 +31,12 @@ depends JACK-DRIVER &&
# "LV2=0" \
# "for LV2 plugin support" &&

-optional_depends fftw \
- "FFT_ANALYSIS=1" \
- "FFT_ANALYSIS=0" \
- "to include FFT analysis window" &&
-
optional_depends libusb \
"TRANZPORT=1" \
- "TRANZPORT=0" \
+ "TRANZPORT=0" \
"for TranzPort controller support" &&

optional_depends gettext \
"NLS=1" \
- "NLS=0" \
+ "NLS=0" \
"for internationalization support"
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 061ec62..0de01cc 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -2,13 +2,13 @@
VERSION=2.3.1

SOURCE_HASH=sha512:f02c863ad4691700456dc17434be9d7c6b69cf224efc59b1b84d47082b13f803c47d00b2c80e8952b003d8a723a581251598c13f60415b08bc84ebf99fc13658
SOURCE=ardour-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-${VERSION:0:3}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ardour-${VERSION:0:3}
SOURCE_URL[0]=http://ardour.org/files/releases/$SOURCE
- WEB_SITE=http://ardour.org
+ WEB_SITE=http://ardour.org/
ENTERED=20070829
LICENSE[0]=GPL
KEYWORDS="disk editors audio"
- SHORT="A multi-track, professional Digital Audio Workstation."
+ SHORT="A multi-track, professional Digital Audio Workstation"
cat << EOF
Ardour is a digital audio workstation. You can use it to record, edit and mix
multi-track audio. You can produce your own CDs, mix video soundtracks, or
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 421ecea..6466c97 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fftw is not optional
+ * PRE_BUILD: fixed SoundTouch detection
+ * BUILD, CONFIGURE: SYSLIBS OK, added FFT_ANALYSIS option
+
2008-02-26 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 2.3.1.
* DEPENDS: Added depends fftw, added commented-out optional_depends
diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
new file mode 100755
index 0000000..ad6591f
--- /dev/null
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:libSoundTouch:soundtouch-1.0:" SConstruct
diff --git a/audio-creation/espeak/DETAILS b/audio-creation/espeak/DETAILS
index 75564fd..692de80 100755
--- a/audio-creation/espeak/DETAILS
+++ b/audio-creation/espeak/DETAILS
@@ -1,8 +1,8 @@
SPELL=espeak
- VERSION=1.36
+ VERSION=1.36.02
SOURCE=espeak-${VERSION}-source.zip
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e141432c90fa4ca7f687b9ef5d0c901a15f0dc6028c4757d89a0b814c3483a17b7df1fcff8025751909025f6ba93b4a048ce6afa1dfbf1d7144b48f192dd2766
+
SOURCE_HASH=sha512:cf851999b499b943b9439a6d7d71458619adeeaf5556133e7ed07c3653993af4c68b1c1d777b042354506ac887782f50ec89d8b898b4d3d3426ee1fab102a731
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/espeak-${VERSION}-source
WEB_SITE=http://espeak.sourceforge.net/
LICENSE[0]=GPL
diff --git a/audio-creation/espeak/HISTORY b/audio-creation/espeak/HISTORY
index aa14b8d..db7a148 100644
--- a/audio-creation/espeak/HISTORY
+++ b/audio-creation/espeak/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.36.02
+
2008-03-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.36

diff --git a/audio-drivers/MAINTAINER b/audio-drivers/MAINTAINER
index 8fec8ae..dd18169 100644
--- a/audio-drivers/MAINTAINER
+++ b/audio-drivers/MAINTAINER
@@ -1 +1,2 @@
+Juuso "iuso" Alasuutari <iuso AT sourcemage.org>
Unet <unet AT sourcemage.org>
diff --git a/audio-drivers/jackdmp/BUILD b/audio-drivers/jackdmp/BUILD
index 17c2b1d..519f0db 100755
--- a/audio-drivers/jackdmp/BUILD
+++ b/audio-drivers/jackdmp/BUILD
@@ -1,7 +1,9 @@
if [[ $JACKDMP_VCS != y ]]
then
cd "$SOURCE_DIRECTORY/${SPELL}_$VERSION/src/linux" &&
- make
+ make_single &&
+ make &&
+ make_normal
else
cd "$SOURCE_DIRECTORY" &&
scons $JACKDMP_EXAMPLES $JACKDMP_MIMIC $OPTS \
diff --git a/audio-drivers/jackdmp/CONFIGURE b/audio-drivers/jackdmp/CONFIGURE
index 4030f56..14475e6 100755
--- a/audio-drivers/jackdmp/CONFIGURE
+++ b/audio-drivers/jackdmp/CONFIGURE
@@ -10,7 +10,7 @@ else
"BUILD_EXAMPLES=no INSTALL_EXAMPLES=no"

config_query_option JACKDMP_MIMIC \
- "Mimic \"normal\" JACK's installation layout?" n \
+ "Mimic \"normal\" JACK's installation layout?" y \
"FULL_MIMIC=yes" \
"FULL_MIMIC=no"
fi
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 5380f62..4dd70c2 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,10 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed multijob build
+
+2008-03-23 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Changed JACKDMP_MIMIC default to y because the
+ n option doesn't actually yield a jack-compatible install.
+
2008-03-18 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS, PREPARE, CONFIGURE, DEPENDS, CONFLICTS, PRE_BUILD,
BUILD, INSTALL: Added a 'control' SVN branch option, switched
diff --git a/audio-libs/MAINTAINER b/audio-libs/MAINTAINER
index 8fec8ae..dd18169 100644
--- a/audio-libs/MAINTAINER
+++ b/audio-libs/MAINTAINER
@@ -1 +1,2 @@
+Juuso "iuso" Alasuutari <iuso AT sourcemage.org>
Unet <unet AT sourcemage.org>
diff --git a/audio-libs/flac/HISTORY b/audio-libs/flac/HISTORY
index afe6961..49d2ca8 100644
--- a/audio-libs/flac/HISTORY
+++ b/audio-libs/flac/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From
http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1&view=markup
+
2007-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.1

diff --git a/audio-libs/flac/PRE_BUILD b/audio-libs/flac/PRE_BUILD
new file mode 100755
index 0000000..fd825db
--- /dev/null
+++ b/audio-libs/flac/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/examples/cpp/encode/file/main.cpp \
+ $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/audio-libs/flac/gcc43.patch b/audio-libs/flac/gcc43.patch
new file mode 100644
index 0000000..bf41c70
--- /dev/null
+++ b/audio-libs/flac/gcc43.patch
@@ -0,0 +1,21 @@
+#
+# From
http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1&view=markup
+#
+Sun Nov 18 19:31:35 2007 UTC (4 months ago) by aballier
+Branch: MAIN
+CVS Tags: HEAD
+
+fix building with gcc 4.3, thanks to Ryan Hill <dirtyepic AT gentoo.org>, bug
#199579
+(Portage version: 2.1.3.19)
+
+diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp
flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13
09:58:03.000000000 -0600
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18
12:59:45.000000000 -0600
+@@ -30,6 +30,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+
diff --git a/audio-libs/id3lib/DEPENDS b/audio-libs/id3lib/DEPENDS
index fd0b0eb..ea5d621 100755
--- a/audio-libs/id3lib/DEPENDS
+++ b/audio-libs/id3lib/DEPENDS
@@ -1 +1,2 @@
-depends g++
+depends autoconf &&
+depends g++
diff --git a/audio-libs/id3lib/HISTORY b/audio-libs/id3lib/HISTORY
index c5544a2..950798f 100644
--- a/audio-libs/id3lib/HISTORY
+++ b/audio-libs/id3lib/HISTORY
@@ -1,3 +1,10 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on autoconf to regenerate configure after
gcc43.patch
+ * PRE_BUILD: Apply gcc43.patch
+ Run autoconf to regenerate configure
+ * gcc43.patch: Patch to build with gcc 4.3.0
+ From http://bugs.gentoo.org/show_bug.cgi?id=212455
+
2007-03-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: added, g++

diff --git a/audio-libs/id3lib/PRE_BUILD b/audio-libs/id3lib/PRE_BUILD
index d5a1ae0..90aa360 100755
--- a/audio-libs/id3lib/PRE_BUILD
+++ b/audio-libs/id3lib/PRE_BUILD
@@ -1,5 +1,9 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+autoconf &&
+
if [[ "${ID3LIB_UNICODE}" == "y" ]] ; then
verify_file 2 &&
- patch -p1 -d ${SOURCE_DIRECTORY} < ${SOURCE_CACHE}/${SOURCE2}
+ patch -p1 < ${SOURCE_CACHE}/${SOURCE2}
fi
diff --git a/audio-libs/id3lib/gcc43.patch b/audio-libs/id3lib/gcc43.patch
new file mode 100644
index 0000000..f4c8179
--- /dev/null
+++ b/audio-libs/id3lib/gcc43.patch
@@ -0,0 +1,86 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=212455
+#
+diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
+--- id3lib-3.8.3-orig/configure.in 2008-03-05 18:03:25.000000000 -0600
++++ id3lib-3.8.3/configure.in 2008-03-05 18:15:42.000000000 -0600
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS( \
+ string \
+- iomanip.h \
+ ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+
+diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h
id3lib-3.8.3/include/id3/id3lib_strings.h
+--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05
18:19:46.000000000 -0600
++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000
-0600
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+
+ #include <string>
++#include <cstring>
+
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER
> 1000))
+ namespace std
+diff -Naur id3lib-3.8.3-orig/include/id3/writers.h
id3lib-3.8.3/include/id3/writers.h
+--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600
+@@ -30,7 +30,7 @@
+
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <string.h>
+
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
+diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp
id3lib-3.8.3/examples/demo_convert.cpp
+--- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01
18:23:00.000000000 -0600
++++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000
-0600
+@@ -84,7 +84,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ flags_t ulFlag = ID3TT_ALL;
+ gengetopt_args_info args;
+diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp
id3lib-3.8.3/examples/demo_info.cpp
+--- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000
-0600
+@@ -309,7 +309,7 @@
+
+ #define DEBUG
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ ID3D_INIT_DOUT();
+
+diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp
id3lib-3.8.3/examples/demo_tag.cpp
+--- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600
+@@ -46,7 +46,7 @@
+ os << "v2";
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
+diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp
id3lib-3.8.3/examples/demo_copy.cpp
+--- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000
-0600
++++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000
-0600
+@@ -81,7 +81,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main( int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
+
diff --git a/audio-libs/libao/DETAILS b/audio-libs/libao/DETAILS
index 0b16ac2..434948b 100755
--- a/audio-libs/libao/DETAILS
+++ b/audio-libs/libao/DETAILS
@@ -1,5 +1,6 @@
SPELL=libao
- VERSION=0.8.6
+ VERSION=0.8.8
+
SOURCE_HASH=sha512:0e7c2ee965754796c0b1ccc9562a4d336c7ec26e7a19baa598c9bff0f021898e95c3dfdb2db38d8dead24940bd4b69385410bba67269ab3615064d91df6da521
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.xiph.org/releases/ao/$SOURCE
@@ -7,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20010922
UPDATED=20020725
LICENSE[0]=LGPL
- SOURCE_HASH=sha1:2050e008ffcfd6803e2c2c03c7d5f469b6d8379e
DOCS="CHANGES COPYING README"
KEYWORDS="audio libs"
SHORT="libao is a way to easily add cross-platform audio output
to your program."
diff --git a/audio-libs/libao/HISTORY b/audio-libs/libao/HISTORY
index b4c873c..0996381 100644
--- a/audio-libs/libao/HISTORY
+++ b/audio-libs/libao/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.8
+
2007-03-29 David Kowis <dkowis AT shlrm.org>
* DEPENDS: added dependency on g++

diff --git a/audio-libs/liblo/DETAILS b/audio-libs/liblo/DETAILS
index 678da21..9ef7acc 100755
--- a/audio-libs/liblo/DETAILS
+++ b/audio-libs/liblo/DETAILS
@@ -1,13 +1,13 @@
SPELL=liblo
- VERSION=0.23
+ VERSION=0.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d982ce9003fd16d892c869452a6d2d0d00a32c5daa78fec56235c4dd5d81c81d13420ec200745cc7336978cae07eec6a9063d733c17ee9142c7f7946723884ad
+
SOURCE_HASH=sha512:138b04749827bc3e038df23e94e229b508c84dfd4fa416f3d89649b09d462a071e628d5600bac5abeea8f33cfa34755153e1716e01ae52761a0e5d6f1e7eac15
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://liblo.sf.net
+ WEB_SITE=http://liblo.sf.net/
ENTERED=20070723
LICENSE[0]=GPL
- SHORT="Lightweight OSC implementation."
+ SHORT="Lightweight OSC implementation"
cat << EOF
Liblo is a lightweight library that provides an easy to use implementation
of
the OSC protocol (see http://www.cnmat.berkeley.edu/OpenSoundControl/ for
diff --git a/audio-libs/liblo/HISTORY b/audio-libs/liblo/HISTORY
index f2ff3e5..7cfb164 100644
--- a/audio-libs/liblo/HISTORY
+++ b/audio-libs/liblo/HISTORY
@@ -1,3 +1,6 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.24
+
2006-07-27 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Removed UPDATED & BUILD_API, edited descriptions.
* CONFIGURE: Added, prompt for IPV6.
diff --git a/audio-libs/libmusicbrainz/HISTORY
b/audio-libs/libmusicbrainz/HISTORY
index 59e591f..80ecb6a 100644
--- a/audio-libs/libmusicbrainz/HISTORY
+++ b/audio-libs/libmusicbrainz/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile against gcc 4.3.0
+ From http://bugs.gentoo.org/show_bug.cgi?id=202472
+
2007-07-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.5

@@ -42,3 +47,4 @@

2002-06-12 Unet <unet AT sourcemage.org>
* Created this.
+
diff --git a/audio-libs/libmusicbrainz/PRE_BUILD
b/audio-libs/libmusicbrainz/PRE_BUILD
new file mode 100755
index 0000000..7528467
--- /dev/null
+++ b/audio-libs/libmusicbrainz/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/audio-libs/libmusicbrainz/gcc43.patch
b/audio-libs/libmusicbrainz/gcc43.patch
new file mode 100644
index 0000000..6b626e7
--- /dev/null
+++ b/audio-libs/libmusicbrainz/gcc43.patch
@@ -0,0 +1,60 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=202472
+#
+diff -Naur libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp
libmusicbrainz-2.1.4/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp 2003-10-16
16:21:10.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/c_wrapper.cpp 2007-12-16 09:45:21.000000000
-0600
+@@ -24,6 +24,7 @@
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
++#include <cstring>
+
+ extern "C"
+ {
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp
libmusicbrainz-2.1.4/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comhttpsocket.cpp 2007-12-16 09:46:28.000000000
-0600
+@@ -20,6 +20,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <assert.h>
++#include <cstring>
+
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comsocket.cpp
libmusicbrainz-2.1.4/lib/comsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comsocket.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comsocket.cpp 2007-12-16 09:46:08.000000000
-0600
+@@ -37,6 +37,7 @@
+ #include <netinet/tcp.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <cstring>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/http.cpp
libmusicbrainz-2.1.4/lib/http.cpp
+--- libmusicbrainz-2.1.4-orig/lib/http.cpp 2007-12-16 09:52:48.000000000
-0600
++++ libmusicbrainz-2.1.4/lib/http.cpp 2007-12-16 09:52:36.000000000 -0600
+@@ -31,6 +31,8 @@
+ #endif
+ #include <fcntl.h>
+ #include <errno.h>
++#include <cstring>
++#include <cstdlib>
+
+ #ifdef WIN32
+ #include <winsock.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/sigclient.cpp
libmusicbrainz-2.1.4/lib/sigclient.cpp
+--- libmusicbrainz-2.1.4-orig/lib/sigclient.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/sigclient.cpp 2007-12-16 09:54:48.000000000
-0600
+@@ -33,6 +33,8 @@
+ #pragma warning(disable:4786)
+ #endif
+
++#include <cstring>
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+
diff --git a/audio-libs/libofa/HISTORY b/audio-libs/libofa/HISTORY
index bc6e88f..370f251 100644
--- a/audio-libs/libofa/HISTORY
+++ b/audio-libs/libofa/HISTORY
@@ -1,3 +1,7 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to build with gcc 4.3.0
+
2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.3
* PRE_BUILD, tnt.diff: apply upstream patch
diff --git a/audio-libs/libofa/PRE_BUILD b/audio-libs/libofa/PRE_BUILD
index fe8ace5..6eae4b2 100755
--- a/audio-libs/libofa/PRE_BUILD
+++ b/audio-libs/libofa/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gcc43.patch &&
patch -p0 < $SPELL_DIRECTORY/tnt.diff
diff --git a/audio-libs/libofa/gcc43.patch b/audio-libs/libofa/gcc43.patch
new file mode 100644
index 0000000..eaf2af6
--- /dev/null
+++ b/audio-libs/libofa/gcc43.patch
@@ -0,0 +1,33 @@
+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 2008-03-22 16:33:04.564088179
-0700
++++ libofa-0.9.3/examples/example.cpp 2008-03-22 16:37:08.077087589 -0700
+@@ -7,6 +7,7 @@
+
+ -------------------------------------------------------------------*/
+
++#include <cstring>
+ #include "protocol.h"
+
+ AudioData* loadWaveFile(char *file);
+diff -Naur libofa-0.9.3.orig/examples/protocol.cpp
libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp 2008-03-22 16:33:04.564088179
-0700
++++ libofa-0.9.3/examples/protocol.cpp 2008-03-22 16:38:42.205088364 -0700
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <cstring>
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+diff -Naur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp 2008-03-22 16:33:04.565088992
-0700
++++ libofa-0.9.3/lib/signal_op.cpp 2008-03-22 16:36:53.076089354 -0700
+@@ -13,6 +13,7 @@
+
+
+ #include <math.h>
++#include <cstdlib>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
+ #include "error_op.h"
diff --git a/audio-libs/liboggz/DEPENDS b/audio-libs/liboggz/DEPENDS
new file mode 100755
index 0000000..f3e41a9
--- /dev/null
+++ b/audio-libs/liboggz/DEPENDS
@@ -0,0 +1 @@
+depends libogg
diff --git a/audio-libs/liboggz/DETAILS b/audio-libs/liboggz/DETAILS
new file mode 100755
index 0000000..7f3746e
--- /dev/null
+++ b/audio-libs/liboggz/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=liboggz
+ VERSION=0.9.7
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL=http://www.annodex.net/software/$SPELL/download/$SOURCE
+
SOURCE_HASH=sha512:8ac33720a1b2932755ba78f9e1a41a4b3e4681f46d8136399f738d0371f65236d54d60226362723a10e7c7386037aebd9a9931a81bc52f8eb34a2675f9fc34c5
+ WEB_SITE=http://www.annodex.net/software/liboggz/index.html
+ ENTERED=20080322
+ LICENSE[0]=BSD
+ KEYWORDS="audio libs"
+ SHORT="A C library providing a simple interface for the Ogg
format"
+cat << EOF
+Liboggz is a C library providing a simple programming interface for reading
+and writing Ogg files and streams. Ogg is an interleaving data container
+developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
+EOF
diff --git a/audio-libs/liboggz/HISTORY b/audio-libs/liboggz/HISTORY
new file mode 100644
index 0000000..585c9f9
--- /dev/null
+++ b/audio-libs/liboggz/HISTORY
@@ -0,0 +1,2 @@
+2008-03-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS: Created spell.
diff --git a/audio-libs/rubberband/DEPENDS b/audio-libs/rubberband/DEPENDS
new file mode 100755
index 0000000..d8fcad2
--- /dev/null
+++ b/audio-libs/rubberband/DEPENDS
@@ -0,0 +1,6 @@
+depends g++ &&
+depends fftw &&
+depends ladspa &&
+depends libsndfile &&
+depends libsamplerate &&
+depends vamp-plugin-sdk
diff --git a/audio-libs/rubberband/DETAILS b/audio-libs/rubberband/DETAILS
new file mode 100755
index 0000000..0512215
--- /dev/null
+++ b/audio-libs/rubberband/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=rubberband
+ VERSION=1.0.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL=http://www.breakfastquay.com/rubberband/files/$SOURCE
+
SOURCE_HASH=sha512:bfc8159e172820195f3917fa08497c154ce59c7d7c461830da32140f50390e0a660bc0591b775bb23d2149131275dc30a7d1a06299d847528ece98afc9665d59
+ WEB_SITE=http://www.breakfastquay.com/rubberband/
+ ENTERED=20080322
+ LICENSE[0]=GPL
+ KEYWORDS="audio libs"
+ SHORT="An audio time-stretching and pitch-shifting library and
utility program"
+cat << EOF
+Rubber Band is a library and utility program that permits you to change
+the tempo and pitch of an audio recording independently of one another.
+EOF
diff --git a/audio-libs/rubberband/HISTORY b/audio-libs/rubberband/HISTORY
new file mode 100644
index 0000000..585c9f9
--- /dev/null
+++ b/audio-libs/rubberband/HISTORY
@@ -0,0 +1,2 @@
+2008-03-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS, DEPENDS: Created spell.
diff --git a/audio-libs/soundtouch/CONFIGURE b/audio-libs/soundtouch/CONFIGURE
index 9b6d43b..6ad0fe8 100755
--- a/audio-libs/soundtouch/CONFIGURE
+++ b/audio-libs/soundtouch/CONFIGURE
@@ -1 +1,3 @@
-config_query_option ST_FLOAT 'Do you want to use float samples instead of
integers (will allow wired compilation)?' y '--disable-integer-samples'
'--enable-integer-samples'
+config_query_option ST_FLOAT \
+ 'Use float samples instead of integers (will allow wired compilation)?' y \
+ '--disable-integer-samples' '--enable-integer-samples'
diff --git a/audio-libs/soundtouch/DEPENDS b/audio-libs/soundtouch/DEPENDS
index a597a0c..c79afef 100755
--- a/audio-libs/soundtouch/DEPENDS
+++ b/audio-libs/soundtouch/DEPENDS
@@ -1,2 +1,2 @@
depends g++ &&
-depends automake-1.9
+depends automake
diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index f9fe51b..ec709c8 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.surina.net/soundtouch/
ENTERED=20051112
LICENSE[0]=LGPL
@@ -19,5 +19,4 @@ than original, without affecting the sound pitch.
tempo or speed.
* Playback Rate : Changes both the sound tempo and pitch, as if an LP disc
was played at wrong RPM rate.
-
EOF
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 710cb40..113305b 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,6 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, PRE_BUILD: automake-1.9 => automake
+
2007-04-13 Elisamuel Resto <ryuji AT mages.ath.cx>
* DEPENDS: Added a depend on automake-1.9 [Bug #13705]

diff --git a/audio-libs/soundtouch/PRE_BUILD b/audio-libs/soundtouch/PRE_BUILD
new file mode 100755
index 0000000..faed420
--- /dev/null
+++ b/audio-libs/soundtouch/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+for i in config.guess config.sub depcomp install-sh missing
+do
+ ln -sf $TRACK_ROOT/usr/share/automake/$i config/$i
+done
diff --git a/audio-plugins/MAINTAINER b/audio-plugins/MAINTAINER
index 8fec8ae..dd18169 100644
--- a/audio-plugins/MAINTAINER
+++ b/audio-plugins/MAINTAINER
@@ -1 +1,2 @@
+Juuso "iuso" Alasuutari <iuso AT sourcemage.org>
Unet <unet AT sourcemage.org>
diff --git a/audio-plugins/vamp-plugin-sdk/BUILD
b/audio-plugins/vamp-plugin-sdk/BUILD
index 8f58e6d..e3e502c 100755
--- a/audio-plugins/vamp-plugin-sdk/BUILD
+++ b/audio-plugins/vamp-plugin-sdk/BUILD
@@ -1 +1,6 @@
-make
+make &&
+
+if is_depends_enabled $SPELL doxygen
+then
+ doxygen
+fi
diff --git a/audio-plugins/vamp-plugin-sdk/CONFIGURE
b/audio-plugins/vamp-plugin-sdk/CONFIGURE
new file mode 100755
index 0000000..1eeacd4
--- /dev/null
+++ b/audio-plugins/vamp-plugin-sdk/CONFIGURE
@@ -0,0 +1 @@
+config_query VAMP_EXAMPLES "Build example plugins?" y
diff --git a/audio-plugins/vamp-plugin-sdk/DEPENDS
b/audio-plugins/vamp-plugin-sdk/DEPENDS
new file mode 100755
index 0000000..807ea15
--- /dev/null
+++ b/audio-plugins/vamp-plugin-sdk/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends doxygen \
+ "" \
+ "" \
+ "to build developer documentation"
diff --git a/audio-plugins/vamp-plugin-sdk/DETAILS
b/audio-plugins/vamp-plugin-sdk/DETAILS
index d116a56..4d2cd58 100755
--- a/audio-plugins/vamp-plugin-sdk/DETAILS
+++ b/audio-plugins/vamp-plugin-sdk/DETAILS
@@ -1,13 +1,13 @@
SPELL=vamp-plugin-sdk
- VERSION=1.1b
+ VERSION=1.2
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:b1085f62755c94f262d4fb7c5aa50cf9046802acae5ad9411eaf472e134260121f1337e3f39fc204c900495bfc1ed674e83610e543c9035ac1714adf334b6187
- SOURCE_URL[0]=$SOURCEFORGE_URL/vamp/${SOURCE}
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-v$VERSION
+
SOURCE_HASH=sha512:92985aa97231388b9bbb1d31a11e7eaf96ca28da2afaa3f5e23d477035a95a6654c08d0df3a66dcea14da11e63b17e7a840a5b113d032054429401b498bd5dda
+ SOURCE_URL[0]=$SOURCEFORGE_URL/vamp/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.vamp-plugins.org/
ENTERED=20080218
LICENSE[0]=BSD
- SHORT="Audio analysis plug-ins"
+ SHORT="An audio analysis plug-in system & SDK"
cat << EOF
Vamp is an audio processing plugin system for plugins that extract
descriptive
information from audio data — typically referred to as audio analysis plugins
diff --git a/audio-plugins/vamp-plugin-sdk/HISTORY
b/audio-plugins/vamp-plugin-sdk/HISTORY
index 3d31bb6..117b44f 100644
--- a/audio-plugins/vamp-plugin-sdk/HISTORY
+++ b/audio-plugins/vamp-plugin-sdk/HISTORY
@@ -1,2 +1,12 @@
+2008-03-22 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.2.
+ * CONFIGURE: Added, query about example plugin installation.
+ * DEPENDS: Added, optional_depends doxygen.
+ * PRE_BUILD: Added, insert INSTALL_ROOT into Makefile, sed
+ the Makefile if example plugins not selected.
+ * BUILD: Build docs if doxygen is selected.
+ * INSTALL: Added, create plugin dir, install example plugins if
+ option selected, install docs if doxygen selected.
+
2008-02-18 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS, BUILD, HISTORY: created spell
diff --git a/audio-plugins/vamp-plugin-sdk/INSTALL
b/audio-plugins/vamp-plugin-sdk/INSTALL
new file mode 100755
index 0000000..8926308
--- /dev/null
+++ b/audio-plugins/vamp-plugin-sdk/INSTALL
@@ -0,0 +1,15 @@
+default_install &&
+
+mkdir -p "$INSTALL_ROOT/usr/lib/vamp/" &&
+
+if [[ $VAMP_EXAMPLES == y ]]
+then
+ cp "$SOURCE_DIRECTORY/examples/"*.so "$INSTALL_ROOT/usr/lib/vamp/"
+fi &&
+
+if is_depends_enabled $SPELL doxygen
+then
+ mkdir -p "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
+ cp -r "$SOURCE_DIRECTORY/doc/html/" \
+ "$INSTALL_ROOT/usr/share/doc/$SPELL/"
+fi
diff --git a/audio-plugins/vamp-plugin-sdk/PRE_BUILD
b/audio-plugins/vamp-plugin-sdk/PRE_BUILD
new file mode 100755
index 0000000..d20da71
--- /dev/null
+++ b/audio-plugins/vamp-plugin-sdk/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Use INSTALL_ROOT
+sed -i "s|/usr|\"$INSTALL_ROOT/usr\"|" Makefile
+
+# Remove 'plugins' and 'test' targets if examples not selected
+if [[ $VAMP_EXAMPLES != y ]]
+then
+ sed -i "s|\(^all:.*\)plugins|\1|" Makefile &&
+ sed -i "s|\(^all:.*\)test|\1|" Makefile
+fi
diff --git a/audio-soft/MAINTAINER b/audio-soft/MAINTAINER
index 8fec8ae..dd18169 100644
--- a/audio-soft/MAINTAINER
+++ b/audio-soft/MAINTAINER
@@ -1 +1,2 @@
+Juuso "iuso" Alasuutari <iuso AT sourcemage.org>
Unet <unet AT sourcemage.org>
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 3e83a36..56a0ea1 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -1,8 +1,9 @@
-depends autoconf &&
-depends libtool &&
-depends bison &&
-depends APR '--with-apr=/usr' &&
-depends APU '--with-apr-util=/usr' &&
+depends APR '--with-apr=/usr' &&
+depends APU '--with-apr-util=/usr' &&
+depends autoconf &&
+depends bison &&
+depends e2fsprogs &&
+depends libtool &&

if [[ "$SVN_HEAD" == y ]]; then
depends python
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 93a237d..45a344e 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err
+
2007-12-22 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.4.6

diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index 46b8360..0d04e22 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
SPELL=cryptsetup-luks
- VERSION=1.0.5
+ VERSION=1.0.6
SOURCE=cryptsetup-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE_URL[0]=http://luks.endorphin.org/source/$SOURCE
-
SOURCE_HASH=sha512:bb4144a72a5d4ce5804fa539dedd8ab8d4fa34a0725513ad1c2a7eb0948fcb255825f730755ed188ecc5463036071569db98bea77dc4e449df916e459804d30b
+
SOURCE_HASH=sha512:deed2c603bfba3b26eb1cab65d880eb9fd69dc4aabc9e8fa2bf78de0879ecd5ddb03c4c6bd9c0ec166d2d5e87a13bb370e6e46d50f5dd246522e81bf75380e1b
WEB_SITE=http://luks.endorphin.org/
ENTERED=20060117
LICENSE[0]=GPL
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 3215f27..c65091a 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.6
+
2007-09-22 David Brown <dmlb2000 AT gmail.com>
* BUILD: added building of static cryptsetup for initrd's
* FINAL: added removal of static build environment
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 84c667b..7f440f4 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -1,7 +1,8 @@
-depends automake &&
-depends autoconf &&
-depends libmcrypt &&
-depends groff &&
+depends automake &&
+depends autoconf &&
+depends e2fsprogs &&
+depends groff &&
+depends libmcrypt &&

optional_depends openssl '--with-openssl=/bin' '--without-openssl' 'for
OpenSSL' &&

diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index f7bba40..a390a66 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs from libcom_err
+
2008-02-06 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails with multiple make jobs

diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 0893846..0530ad1 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-exp
- VERSION=2.0.8
+ VERSION=2.0.9
SECURITY_PATCH=4
PATCHLEVEL=0

diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index 0bb530d..56ccbed 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2008-03-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.9
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* TRIGGERS: removed is_depends_enabled.function reference

diff --git a/crypto/gnupg/DETAILS b/crypto/gnupg/DETAILS
index c67b4d8..7d81c86 100755
--- a/crypto/gnupg/DETAILS
+++ b/crypto/gnupg/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg
- VERSION=1.4.8
+ VERSION=1.4.9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 4be6ba6..9df5cd9 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,6 @@
+2008-03-27 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.9
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* TRIGGERS: removed is_depends_enabled.function reference

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index f928be4..772068c 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -20,4 +20,9 @@ optional_depends "lzo" \
optional_depends "libcfg+" \
"--without-included-libcfg" \
"--with-included-libcfg" \
- "to use external libcfg+"
+ "to use external libcfg+" &&
+
+optional_depends "guile" \
+ "--enable-guile" \
+ "--disable-guile" \
+ "for GNU Guile bindings"
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 6b751a0..7e94418 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on guile
+
2008-03-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.2, make 2.2 default GNUTLS_BRANCH

diff --git a/crypto/gsasl/DETAILS b/crypto/gsasl/DETAILS
index 6fbed1f..cd8d51d 100755
--- a/crypto/gsasl/DETAILS
+++ b/crypto/gsasl/DETAILS
@@ -1,17 +1,25 @@
SPELL=gsasl
- VERSION=0.2.21
+ VERSION=0.2.25
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://josefsson.org/gsasl/releases/$SOURCE
SOURCE_URL[1]=ftp://alpha.gnu.org/pub/gnu/gsasl/$SOURCE
-
SOURCE_HASH=sha512:4ca3772fe361e8c77c8a1e765b88ba4e9767b07df58d8ff420eabe88779c55d8d6f1c0311f30002140ad52d665de6f9cfff5f0055e2e48b1c7e8dd4b12b8ddaf
+
SOURCE_HASH=sha512:12a4a17afe837e979ba4c334ae59c10aa19f6098d4c784dfa0e582d3ae2da544e9943047799f89f00e7a376062d79eee290a8f057bdc9a52880081f11ab96ea1
WEB_SITE=http://www.gnu.org/software/gsasl/
ENTERED=20030901
LICENSE[0]=GPL
KEYWORDS="crypto"
SHORT="GNU SASL"
cat << EOF
-GNU SASL is an implementation of the Simple Authentication and Security
Layer framework and a few common SASL mechanisms. SASL is used by network
servers (e.g., IMAP, SMTP) to request authentication from clients, and in
clients to authenticate against servers.
+GNU SASL is an implementation of the Simple Authentication and Security
+Layer framework and a few common SASL mechanisms. SASL is used by network
+servers (e.g., IMAP, SMTP) to request authentication from clients, and in
+clients to authenticate against servers.

-GNU SASL contains a library (libgsasl), a command line utility (gsasl) to
access the library from the shell, and a manual. The library includes support
for the SASL framework (with authentication functions and application data
privacy and integrity functions) and at least partial support for the
CRAM-MD5, EXTERNAL, GSSAPI, ANONYMOUS, PLAIN, SECURID, DIGEST-MD5, LOGIN,
NTLM and KERBEROS_V5 mechanisms.
+GNU SASL contains a library (libgsasl), a command line utility (gsasl) to
+access the library from the shell, and a manual. The library includes
+support for the SASL framework (with authentication functions and
+application data privacy and integrity functions) and at least partial
+support for the CRAM-MD5, EXTERNAL, GSSAPI, ANONYMOUS, PLAIN, SECURID,
+DIGEST-MD5, LOGIN, NTLM and KERBEROS_V5 mechanisms.
EOF
diff --git a/crypto/gsasl/HISTORY b/crypto/gsasl/HISTORY
index fdd72bf..3a756a8 100644
--- a/crypto/gsasl/HISTORY
+++ b/crypto/gsasl/HISTORY
@@ -1,3 +1,9 @@
+2008-03-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.25
+
+2008-03-22 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: 80-column cleanup
+
2007-09-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.21

diff --git a/crypto/krb5/DEPENDS b/crypto/krb5/DEPENDS
index 295a118..3355852 100755
--- a/crypto/krb5/DEPENDS
+++ b/crypto/krb5/DEPENDS
@@ -1,11 +1,13 @@
-depends perl &&
-depends bison &&
+depends bison &&
+depends e2fsprogs '--with-system-et --with-system-ss' &&
+depends perl &&

-optional_depends "linux-pam" \
- "" \
- "" \
+optional_depends "linux-pam" \
+ "" \
+ "" \
"for PAM support" &&
-optional_depends "tcl" \
- "--with-tcl" \
- "" \
+
+optional_depends "tcl" \
+ "--with-tcl" \
+ "" \
"for running test programs"
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index c59075c..99a6069 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.6/krb5-1.6/doc/krb5-install.html#Copyright
- PATCHLEVEL=0
+ PATCHLEVEL=1
SECURITY_PATCH=5
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index dd94714..b472674 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,15 @@
+2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * DEPENDS: Depend on e2fsprogs for the standard libcom_err and libss
+ Use system et (libcom_err) and libss instead of building krb5's
broken
+ one. For an extensive discussion, see
+ http://forums.gentoo.org/viewtopic-t-348311.html
+ * PRE_BUILD: Apply system-et.patch
+ * system-et.patch: Added to use et (libcom_err) and libss from
e2fsprogs
+ * UP_TRIGGERS: Recast packages depending on krb5 which used the
non-standard
+ libcom_err.so.3 from krb5 instead of the standard libcom_err.so.2
from
+ e2fsprogs. Remove this after two stable releases (around 2006-06-01)
+
2007-11-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3
* BUILD, MITKRB5-SA-2007-006.txt: removed patch
diff --git a/crypto/krb5/PRE_BUILD b/crypto/krb5/PRE_BUILD
index 71447c0..00caa9e 100755
--- a/crypto/krb5/PRE_BUILD
+++ b/crypto/krb5/PRE_BUILD
@@ -1,5 +1,7 @@
-mk_source_dir &&
-cd $SOURCE_DIRECTORY &&
+mk_source_dir &&
+cd $SOURCE_DIRECTORY &&

unpack_file &&
-tar xzf ${SOURCE_RAW}
+tar xzf ${SOURCE_RAW} &&
+cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
+patch -p1 < $SCRIPT_DIRECTORY/system-et.patch
diff --git a/crypto/krb5/UP_TRIGGERS b/crypto/krb5/UP_TRIGGERS
new file mode 100755
index 0000000..a7c7e04
--- /dev/null
+++ b/crypto/krb5/UP_TRIGGERS
@@ -0,0 +1,13 @@
+#
+# 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
new file mode 100644
index 0000000..b8f7f3a
--- /dev/null
+++ b/crypto/krb5/system-et.patch
@@ -0,0 +1,1364 @@
+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/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 06a89e1..44d4fea 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -1,7 +1,8 @@
-depends gnupg &&
-depends openssl &&
-depends smgl-fhs &&
-depends zlib &&
+depends e2fsprogs &&
+depends gnupg &&
+depends openssl &&
+depends smgl-fhs &&
+depends zlib &&

optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 15a6899..a4b9286 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err
+
2007-09-05 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 4.7p1. Remvoed non-working SOURCE_URL[1]

diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 3ca96ab..eac8135 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,34 +1,23 @@
SPELL=firebird
case $FB_VER in
-# cvs)
-# VERSION=snapshot
-# SOURCE=${SPELL}-$VERSION.tar.bz2
-#
SFCVS=cvs://:pserver:anonymous AT firebird.cvs.sourceforge.net:/cvsroot
-# SOURCE_URL[0]=$SFCVS/firebird:firebird2:HEAD
-# SOURCE_IGNORE=volatile
-# FORCE_DOWNLOAD=on
-#;;
2.1)
VERSION=2.1.0.17755-ReleaseCandidate2
- SOURCE=${SPELL/f/F}-$VERSION.tar.bz2

SOURCE_HASH=sha512:d1b79a378027884ffd96bfaf7c9de620d7101727b24a9546df37080d694ecaab5b05cd3793aad5ba11fa01afa28a038af1d6a99f25c8bfb1256801928ac2a1a2
- SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
-# SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
;;
*)
VERSION=2.0.3.12981-1
- SOURCE=${SPELL/f/F}-$VERSION.tar.bz2

SOURCE_HASH=sha512:ac1df5587c106ee3ac602c5ff927a9073574424a02aac9d3c81fd3119fea4e68a93208541cf2aa395b499a20ee59aa654be7815e8db4d2ab09fc66bd3329dfa9
- SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-RC?/}
;;
esac
+ SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
+# SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION}
WEB_SITE=http://www.firebirdsql.org
LICENSE=IDPL
ENTERED=20031111
PATCHLEVEL=2
- DOCS=""
+ GATHER_DOCS=off
KEYWORDS="database engine"
SHORT="a very powerful relational dbms"
cat << EOF
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index c499c46..108a028 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,8 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: use GATHER_DOCS=off
+ this prevents installing two copies of docs
+ also some general cleanup
+
2008-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* init.d/firebird2: fix for latest su
move -l option to end
diff --git a/database/openrpt/DETAILS b/database/openrpt/DETAILS
index 1848687..ba63913 100755
--- a/database/openrpt/DETAILS
+++ b/database/openrpt/DETAILS
@@ -1,11 +1,10 @@
SPELL=openrpt
- VERSION=2.2.0
-
SOURCE_HASH=sha512:fbee5dbacf89e8981c02446c7faaa6c26618b7c64692d75a2537e7472b7bd2b9adc13ccee394463cbfe627b61c190a13fa171bb413e6f6b34a8a69ca86b6fc73
+ VERSION=2.3.0
+
SOURCE_HASH=sha512:ddf91257eb2924f1e8b94134f62aeedac94690f4e0f8a86f5d539cd70f4cb0803fcc98641156738ce97d8ee786601bcc93756fd37abd855cf5f88b78e3a8a5a9
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-source
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://www.openrpt.com/
- PATCHLEVEL=1
LICENSE[0]=LGPL
ENTERED=20070120
KEYWORDS="database reporting"
diff --git a/database/openrpt/HISTORY b/database/openrpt/HISTORY
index 8074009..a0ca421 100644
--- a/database/openrpt/HISTORY
+++ b/database/openrpt/HISTORY
@@ -1,5 +1,9 @@
+2008-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.0
+ * PRE_BUILD: fix missing libraries during link
+
2007-07-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.1.0
+ * DETAILS: version 2.2.0
licence chnage -> LGPL

2007-06-27 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/database/openrpt/PRE_BUILD b/database/openrpt/PRE_BUILD
index abbcc0d..de75aa7 100755
--- a/database/openrpt/PRE_BUILD
+++ b/database/openrpt/PRE_BUILD
@@ -2,4 +2,11 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
# use dynamic libraries
sed -i -e "s/staticlib//" common/common.pro OpenRPT/renderer/renderer.pro \
- OpenRPT/wrtembed/wrtembed.pro
+ OpenRPT/wrtembed/wrtembed.pro &&
+# fix for missing library during link
+sed -i -e "/^TEMPLATE/ a\
+LIBS += -L../../lib -lcommon
+" OpenRPT/renderer/renderer.pro &&
+sed -i -e "/^TEMPLATE/ a\
+LIBS += -L../../lib -lcommon -lrenderer
+" OpenRPT/wrtembed/wrtembed.pro
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 5cd76b6..6927d8a 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=8.3.0
-
SOURCE_HASH=sha512:e1b96be11f6782da4a03906b63c722dd002a51ba999a6b36c3833c09b0492fdbc895d34c12a8f3b0cd06b7e6b0b9f0a88340780ebd6df0a4bf80af7b5279d082
+ VERSION=8.3.1
+
SOURCE_HASH=sha512:2f3046542c3d39c8e08aaa025b8f38339c12578aa3aca82a59c9e4178a9d4f47eb7a04a15bc3a58259a81e69e0c4f0763e0c78cdd9adb636c2c1f509384e6f0d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=v$VERSION/$SOURCE
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 4c278c7..4d0c641 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2008-03-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: Updated to 8.3.1
+
2008-03-18 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: cleanup, filter -ffast-math from CFLAGS

diff --git a/devel/bisonc++/DETAILS b/devel/bisonc++/DETAILS
index 06a6c72..5bb1ec5 100755
--- a/devel/bisonc++/DETAILS
+++ b/devel/bisonc++/DETAILS
@@ -1,11 +1,9 @@
SPELL=bisonc++
- VERSION=2.2.0
-
SOURCE_HASH=sha512:0748b421bb81fa3e363a28d5c45a71a6a2bea5a1703173b5a6866f02d3c5edb6cfe1daecc17e2547ca01a1c771d6f8a63a507bdf8593289de2a3b5fecc7a627c
+ VERSION=2.4.1
+
SOURCE_HASH=sha512:24b9176cfb07c291ae20c5ded5872144624144d5e21c08ddb0f50082672e47728406d2e9731d4c96d1fb1bb7a43f5e3634529508af32b6b0dd216591191da0d2
SOURCE=${SPELL}_${VERSION//-?/}.orig.tar.gz
-# SOURCE2=${SPELL}_${VERSION}.diff.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION//-?}
SOURCE_URL[0]=$SOURCEFORGE_URL/bisoncpp/$SOURCE
-# SOURCE2_URL[0]=$SOURCEFORGE_URL/bisoncpp/$SOURCE2
WEB_SITE=http://bisoncpp.SourceForge.net
LICENSE[0]=GPL
ENTERED=20060704
diff --git a/devel/bisonc++/HISTORY b/devel/bisonc++/HISTORY
index 872bea8..0b63f6e 100644
--- a/devel/bisonc++/HISTORY
+++ b/devel/bisonc++/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.1
+
2007-09-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.0

diff --git a/devel/bobcat/DETAILS b/devel/bobcat/DETAILS
index baee3f2..c4e9664 100755
--- a/devel/bobcat/DETAILS
+++ b/devel/bobcat/DETAILS
@@ -1,6 +1,6 @@
SPELL=bobcat
- VERSION=1.16.0
-
SOURCE_HASH=sha512:c15db4447ecec1e447217ba9c6a415c764afa4acc0ceb7820aa6c72a80aaa89729bcdfee5c539bca4a21559cf3e0143d7f18f2aa517d1c8661dacaf22802a89b
+ VERSION=1.17.2
+
SOURCE_HASH=sha512:a2bc6a1da1d330935d0c5faa975a54c0ce075f093bdb4a7318ba23a35d2e8776248c171fc3904775183f3b3a0d9a1fcb8ad1c4d397399c8a9c7936d9436664ab
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index 92dadb0..ffdb5e4 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.17.2
+
2007-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.16.0

diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 1f1d930..1ebb241 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -10,6 +10,11 @@ if [[ "$GIT_SVN" == "y" ]]; then
depends uri
fi &&

+optional_depends bash-completion \
+ '' \
+ '' \
+ 'for bash completion of Git commands' &&
+
optional_depends curl \
'--with-curl' \
'--without-curl' \
@@ -51,4 +56,9 @@ optional_depends tk
\
if is_depends_enabled $SPELL perl
then
depends perl-error
-fi
+fi &&
+
+optional_depends vim \
+ '' \
+ '' \
+ 'for Git commit message syntax highlighting'
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 85cbe88..4c4e849 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.5.4.4
+ VERSION=1.5.5.rc1
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 b859a02..d5feb12 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,11 @@
+2008-03-23 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.5.5.rc1
+ * DEPENDS: Optionally depend on bash-completion
+ Optionally depend on vim for syntax highlighting
+ * INSTALL: If depending on bash-completion, install bash-completion
+ script
+ If depending on vim, install git commit syntax highlighting for vim
+
2008-03-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.5.4.4

diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index 6230496..2554243 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -24,4 +24,17 @@ case $GIT_DOC in
git_install_manpages &&
git_install_htmldocs
;;
-esac
+esac &&
+
+if is_depends_enabled $SPELL bash-completion
+then
+ cp $SOURCE_DIRECTORY/contrib/completion/git-completion.bash \
+ $INSTALL_ROOT/etc/bash_completion.d/git-completion
+fi &&
+
+if is_depends_enabled $SPELL vim
+then
+ VIM_VERSION=$(installed_version vim)
+ cp $SOURCE_DIRECTORY/contrib/vim/syntax/gitcommit.vim \
+ $INSTALL_ROOT/usr/share/vim/vim${VIM_VERSION/./}/syntax
+fi
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index e4af8ad..0a2c2a9 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -5,12 +5,13 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
- SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
SOURCE2_IGNORE=signature
- WEB_SITE=http://www.gnu.org/software/guile
- ENTERED=20010922
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
LICENSE[0]=LGPL
+ PATCHLEVE=1
+ WEB_SITE=http://www.gnu.org/software/guile
KEYWORDS="devel"
+ ENTERED=20010922
SHORT="Portable, embeddable Scheme implementation"
cat << EOF
Guile is a portable, embeddable Scheme implementation written in C.
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 0295731..6ed24e1 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,10 @@
+2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Increment PATCHLEVEL to have this patch applied (for
gnutls)
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to work with gcc 4.3.0 (also fixes gnutls
building
+ against guile with gcc 4.3.0)
+ From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466778
+
2007-08-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added libtool #13933

diff --git a/devel/guile/PRE_BUILD b/devel/guile/PRE_BUILD
new file mode 100755
index 0000000..395873b
--- /dev/null
+++ b/devel/guile/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/devel/guile/gcc43.patch b/devel/guile/gcc43.patch
new file mode 100644
index 0000000..0c93942
--- /dev/null
+++ b/devel/guile/gcc43.patch
@@ -0,0 +1,91 @@
+#
+# Fix for gnutls compiling with guile 1.8 with gcc 4.3.0
+#
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.c
guile-1.8-1.8.3+1/libguile/c-tokenize.c
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.c 2007-06-13
22:00:56.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.c 2008-02-23 01:40:11.000000000
+0000
+@@ -579,6 +579,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#define YY_NO_INPUT
++
+ int yylex(void);
+
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex
guile-1.8-1.8.3+1/libguile/c-tokenize.lex
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex 2007-05-09
20:22:03.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.lex 2008-02-23 01:39:42.000000000
+0000
+@@ -18,7 +18,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++
++#define YY_NO_INPUT
++
+ int yylex(void);
+
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/inline.h
guile-1.8-1.8.3+1/libguile/inline.h
+--- guile-1.8-1.8.3+1.old/libguile/inline.h 2007-05-09 20:22:03.000000000
+0000
++++ guile-1.8-1.8.3+1/libguile/inline.h 2008-02-23 01:43:22.000000000
+0000
+@@ -55,6 +55,12 @@
+ extern unsigned scm_newcell2_count;
+ extern unsigned scm_newcell_count;
+
++#ifdef __GNUC_STDC_INLINE__
++#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
++#else
++#define SCM_C_GNU_INLINE SCM_C_INLINE
++#endif
++
+ #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
+ /* definitely inlining */
+ #ifdef __GNUC__
+@@ -62,7 +68,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_cell (scm_t_bits car, scm_t_bits cdr)
+@@ -138,7 +144,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_double_cell (scm_t_bits car, scm_t_bits cbr,
+@@ -213,7 +219,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
+@@ -228,7 +234,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ void
+ scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
+@@ -243,7 +249,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ int
+ scm_is_pair (SCM x)
+
diff --git a/devel/tcl/HISTORY b/devel/tcl/HISTORY
index 141f578..78a14c2 100644
--- a/devel/tcl/HISTORY
+++ b/devel/tcl/HISTORY
@@ -1,3 +1,7 @@
+2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
+ * UP_TRIGGERS: Check for version changes and trigger casts
+ Fixes Bug #14235
+
2008-02-10 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated stable to 8.5.1

diff --git a/devel/tcl/UP_TRIGGERS b/devel/tcl/UP_TRIGGERS
new file mode 100755
index 0000000..902d7b1
--- /dev/null
+++ b/devel/tcl/UP_TRIGGERS
@@ -0,0 +1,15 @@
+# up_trigger everything on major version updates as most stuff links to
libtcl
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of libtcl..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libtcl${OLD_SPELL_VERSION:0:3}.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 1aeb36d..d270953 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * TRIGGERS: When krb5 is cast, rebuild e2fsprogs so that
+ /usr/bin/compile_et is put back (both e2fsprogs and krb5 install it)
+ Remove this trigger after two stable releases (around 2006-06-01)
+
2008-03-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.40.8

@@ -143,3 +148,4 @@
package is dual licensed under both
Updated Version to 1.27 per Marc Greene's <eru AT subdimension.com>
notification
+
diff --git a/disk/e2fsprogs/TRIGGERS b/disk/e2fsprogs/TRIGGERS
index c397841..b1f7603 100755
--- a/disk/e2fsprogs/TRIGGERS
+++ b/disk/e2fsprogs/TRIGGERS
@@ -1 +1,5 @@
on_cast glibc cast_self
+#
+# Remove krb5 trigger after 2006-06-01
+#
+on_cast krb5 cast_self
diff --git a/disk/gparted/DEPENDS b/disk/gparted/DEPENDS
index 369def3..1f7e65a 100755
--- a/disk/gparted/DEPENDS
+++ b/disk/gparted/DEPENDS
@@ -2,4 +2,5 @@ depends g++ &&
depends xml-parser-expat &&
depends parted &&
depends udev &&
-depends gtkmm2
+depends gtkmm2 &&
+suggest_depends mtools '' '' 'full volume label support'
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index 52cc234..7c52412 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,7 +1,7 @@
SPELL=gparted
- VERSION=0.3.5
-
SOURCE_HASH=sha512:de05f44de93d4285fcdfd223070d0fa3a62e650634810a4277da58c404feffd524a18c8386ac0a8f3939fbde75dcd4494ff63d60a1a12b0cad75b58bd8e71236
- SOURCE=${SPELL}-${VERSION}.tar.bz2
+ VERSION=0.3.6
+
SOURCE_HASH=sha512:928c8b38a9abfeb4909eac1a71b82c48fb17e7d9bbd49e0ada431ee9485634a7280fc20d83ddbf28ba1585a7ef696577f8d8b8f31b614ba52a56e6e7020c1e4a
+ SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 77696e2..386cc05 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,7 @@
+2008-03-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.6
+ * DEPENDS: add suggest mtools, for full volume label support
+
2008-02-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.5

diff --git a/disk/quota/DETAILS b/disk/quota/DETAILS
index 2d58ff6..9bea2f9 100755
--- a/disk/quota/DETAILS
+++ b/disk/quota/DETAILS
@@ -1,14 +1,14 @@
SPELL=quota
- VERSION=3.12
+ VERSION=3.16
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-tools
SOURCE_URL[0]=$SOURCEFORGE_URL/linuxquota/$SOURCE
-
SOURCE_HASH=sha512:396af0d9c4b79c3a8be66e3879eb9c67b2e028490ab714bec0980d8b7aeb5584ce3cc6037b88363206f3ef79c1300db7eb873de6ca8ee50d50cf4b19905a8344
- WEB_SITE=http://sourceforge.net/projects/linuxquota/
- ENTERED=20020911
- UPDATED=20030822
+#
SOURCE_HASH=sha512:396af0d9c4b79c3a8be66e3879eb9c67b2e028490ab714bec0980d8b7aeb5584ce3cc6037b88363206f3ef79c1300db7eb873de6ca8ee50d50cf4b19905a8344
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=BSD
+ WEB_SITE=http://sourceforge.net/projects/linuxquota/
KEYWORDS="disk"
+ ENTERED=20020911
SHORT="Tools and patches for the linux Diskquota system"
cat << EOF
Tools and patches for the Linux Diskquota system as part of the Linux kernel.
diff --git a/disk/quota/HISTORY b/disk/quota/HISTORY
index e9af9dc..ee95aa6 100644
--- a/disk/quota/HISTORY
+++ b/disk/quota/HISTORY
@@ -1,3 +1,7 @@
+2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.16
+ Removed UPDATED
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/disk/quota/quota-3.16.tar.gz.sig
b/disk/quota/quota-3.16.tar.gz.sig
new file mode 100644
index 0000000..9f52475
Binary files /dev/null and b/disk/quota/quota-3.16.tar.gz.sig differ
diff --git a/disk/reiserfsprogs/HISTORY b/disk/reiserfsprogs/HISTORY
index 09e99ee..f0bc69d 100644
--- a/disk/reiserfsprogs/HISTORY
+++ b/disk/reiserfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2008-03-20 David Kowis <dkowis AT shlrm.org>
+ * INSTALL: removed, as the symlinking isn't necessary anymore
+
2007-09-27 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.6.20

diff --git a/disk/reiserfsprogs/INSTALL b/disk/reiserfsprogs/INSTALL
deleted file mode 100755
index dd8b53c..0000000
--- a/disk/reiserfsprogs/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-ln -sf ${INSTALL_ROOT}/sbin/reiserfsck \
- ${INSTALL_ROOT}/sbin/fsck.reiserfs
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index f5ff784..fe53e44 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,13 +1,12 @@
SPELL=udev
- VERSION=118
- PATCHLEVEL=0
+ VERSION=119
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/hotplug/$SOURCE
SOURCE2_URL=$SOURCE_URL.sign
SOURCE2_IGNORE=signature
- SOURCE_GPG="kernel.gpg:$SOURCE.sign"
+ SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY

WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20030725
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index d8f0d7b..6072643 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,9 @@
+2008-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: UPSTREAM_KEY
+
+2008-03-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 119
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* UP_TRIGGERS: removed is_depends_enabled.function reference

diff --git a/doc/mnemosyne/DETAILS b/doc/mnemosyne/DETAILS
index 886ad64..8fe076f 100755
--- a/doc/mnemosyne/DETAILS
+++ b/doc/mnemosyne/DETAILS
@@ -1,10 +1,10 @@
SPELL=mnemosyne
- VERSION=1.0.1
+ VERSION=1.0.1.1
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.mnemosyne-proj.org/
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL-proj/$SOURCE
-
SOURCE_HASH=sha512:877d11445238cfcbac27d3a743e6a571c501679da7c322875ed9ebf6865d5376517134884dd51be3c55cbcd91af01793339b899a5b43d1a4cbd920234682b1db
+
SOURCE_HASH=sha512:6b51bad00a04bdb4d304c4cb18feeaccc5b4a397f4290e33851c51d3e5f36ec8db6d05e8713635aabf4ac40ce67b7cecbcea5f63f7f215be78ce585a43b2c85a
LICENSE[0]=GPL
ENTERED=20071230
KEYWORDS="flashcards memorization"
diff --git a/doc/mnemosyne/HISTORY b/doc/mnemosyne/HISTORY
index ff8f0a0..4eaacec 100644
--- a/doc/mnemosyne/HISTORY
+++ b/doc/mnemosyne/HISTORY
@@ -1,3 +1,6 @@
+2008-03-25 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: Version 1.0.1.1
+
2008-03-16 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: Version 1.0.1, new URL

diff --git a/doc/openjade/PRE_BUILD b/doc/openjade/PRE_BUILD
new file mode 100755
index 0000000..4ba8b92
--- /dev/null
+++ b/doc/openjade/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/style/MultiLineInlineNote.cxx \
+ $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/doc/openjade/gcc43.patch b/doc/openjade/gcc43.patch
new file mode 100644
index 0000000..e4442f0
--- /dev/null
+++ b/doc/openjade/gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naur openjade-1.3.3-pre1.patch/style/MultiLineInlineNote.cxx
openjade-1.3.3-pre1/style/MultiLineInlineNote.cxx
+--- openjade-1.3.3-pre1.patch/style/MultiLineInlineNote.cxx 2008-03-22
01:23:23.555052185 -0700
++++ openjade-1.3.3-pre1/style/MultiLineInlineNote.cxx 2008-03-22
01:23:47.845025472 -0700
+@@ -1,6 +1,6 @@
+
+ #include "MultiLineInlineNote.h"
+-#include <iostream.h>
++#include <iostream>
+
+ #ifdef DSSSL_NAMESPACE
+ namespace DSSSL_NAMESPACE {
diff --git a/doc/yodl/DETAILS b/doc/yodl/DETAILS
index a88d1d7..97a65c8 100755
--- a/doc/yodl/DETAILS
+++ b/doc/yodl/DETAILS
@@ -1,13 +1,12 @@
SPELL=yodl
- VERSION=2.11
-
SOURCE_HASH=sha512:821a3486dd4b0a6fbdf4663d71223a881aace4fe3ee015edbb895a40eb2b71421798ebe2aea8667c63c84e348eb72b24b2cccc2fab4cfc36444ba6465812b56e
+ VERSION=2.12.1
+
SOURCE_HASH=sha512:f7bf257dbc30fbfb7e9ab8e233d8cb80356fd6de71f85116e32ddf49b517029ab5d48082263132fceee4ba9d128fbbe402afb2a3fefa49dc91330e82793c2c6a
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://$SPELL.SourceForge.net
LICENSE[0]=GPL
ENTERED=20060916
- PATCHLEVEL=1
KEYWORDS="documentation tool"
SHORT="documentation tool"
cat << EOF
diff --git a/doc/yodl/HISTORY b/doc/yodl/HISTORY
index a874e66..2b93c84 100644
--- a/doc/yodl/HISTORY
+++ b/doc/yodl/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.12.1
+
2007-03-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.11

diff --git a/e-17/bang/DETAILS b/e-17/bang/DETAILS
index 34a2c4b..fed6cae 100755
--- a/e-17/bang/DETAILS
+++ b/e-17/bang/DETAILS
@@ -5,7 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gurumeditation.it/blog/wp-content/uploads/$SOURCE
LICENSE[0]=BSD
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- WEB_SITE=http://www.gurumeditation.it/coding/bang
+ WEB_SITE=http://www.gurumeditation.it/blog/?p=15
KEYWORDS="enlightenment e17 wm window-manager 3D"
ENTERED=20080124
SHORT='E17 module for OpenGL Composite effects'
diff --git a/e-17/bang/HISTORY b/e-17/bang/HISTORY
index f2dd58e..652e90e 100644
--- a/e-17/bang/HISTORY
+++ b/e-17/bang/HISTORY
@@ -1,3 +1,6 @@
+2008-03-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: WEB_SITE changed to http://www.gurumeditation.it/blog/?p=15
+
2008-02-27 Dale E. Edmons <linuxfan AT sourcemage.org>
* DETAILS: Modified KEYWORDS.

diff --git a/editors/gle/BUILD b/editors/gle/BUILD
index 764df60..cb3cab1 100755
--- a/editors/gle/BUILD
+++ b/editors/gle/BUILD
@@ -1,3 +1,2 @@
- sedit "s/-O2/$CFLAGS/" config.gcc &&
- sedit "s/\/usr/${INSTALL_ROOT}\/usr/" config.gcc &&
- make -f Makefile.gcc
+OPTS="--with-qt=no $OPTS" &&
+default_build
diff --git a/editors/gle/DEPENDS b/editors/gle/DEPENDS
index 2bc42d3..4196272 100755
--- a/editors/gle/DEPENDS
+++ b/editors/gle/DEPENDS
@@ -1,2 +1,19 @@
-depends boost &&
-depends tiff
+depends boost &&
+depends g++ &&
+depends pkgconfig &&
+depends zlib '--with-z=yes' &&
+
+optional_depends jpeg \
+ '--with-jpeg=yes' \
+ '--with-jpeg=no' \
+ 'for JPEG image support' &&
+
+optional_depends libpng \
+ '--with-png=yes' \
+ '--with-png=no' \
+ 'for PNG image support' &&
+
+optional_depends tiff \
+ '--with-tiff=yes' \
+ '--with-tiff=no' \
+ 'for TIFF image support'
diff --git a/editors/gle/DETAILS b/editors/gle/DETAILS
index 3aa56c7..8e2494e 100755
--- a/editors/gle/DETAILS
+++ b/editors/gle/DETAILS
@@ -1,5 +1,5 @@
SPELL=gle
- VERSION=4.0.12
+ VERSION=4.1.2
SOURCE=GLE-${VERSION}-src.zip
SOURCE2=GLEusersguide.ps.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION:0:1}
@@ -8,9 +8,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION:0:1}
SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
SOURCE2_GPG=gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME
LICENSE[0]=GPL
+ KEYWORDS="editors"
WEB_SITE=http://glx.sourceforge.net
ENTERED=20020513
- KEYWORDS="editors"
SHORT='High-quality graphics package for scientists'
cat << EOF
GLE (interactive Graphics Language Editor) is a high-quality graphics package
diff --git a/editors/gle/GLE-4.0.12-src.zip.sig
b/editors/gle/GLE-4.0.12-src.zip.sig
deleted file mode 100644
index 6c86143..0000000
Binary files a/editors/gle/GLE-4.0.12-src.zip.sig and /dev/null differ
diff --git a/editors/gle/GLE-4.1.2-src.zip.sig
b/editors/gle/GLE-4.1.2-src.zip.sig
new file mode 100644
index 0000000..25794ff
Binary files /dev/null and b/editors/gle/GLE-4.1.2-src.zip.sig differ
diff --git a/editors/gle/HISTORY b/editors/gle/HISTORY
index f3e79e0..a742510 100644
--- a/editors/gle/HISTORY
+++ b/editors/gle/HISTORY
@@ -1,3 +1,12 @@
+2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 4.1.2
+ Now works with gcc 4.3.0
+ * PRE_BUILD: Moved sedits to PRE_BUILD, now uses ./configure
+ Use default_pre_build and then unpacke SOURCE2
+ * BUILD: Moved sedits to PRE_BUILD, now uses ./configure
+ Disable QT4 support (fails to compile)
+ * INSTALL: Install documentation to usr/share/doc/gle
+
2007-01-04 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Install-rootify
Check if $INSTALL_ROOT/usr/doc is a directory before trying to copy
diff --git a/editors/gle/INSTALL b/editors/gle/INSTALL
index 443186f..b3994be 100755
--- a/editors/gle/INSTALL
+++ b/editors/gle/INSTALL
@@ -1,7 +1,3 @@
-make -f Makefile.gcc install &&
-
-if [[ ! -d $INSTALL_ROOT/usr/doc ]]; then
- mkdir -p $INSTALL_ROOT/usr/doc
-fi &&
-
-cp $SOURCE_CACHE/$SOURCE2 $INSTALL_ROOT/usr/doc
+make install &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL &&
+cp $SOURCE_CACHE/$SOURCE2 $INSTALL_ROOT/usr/share/doc/$SPELL
diff --git a/editors/gle/PRE_BUILD b/editors/gle/PRE_BUILD
index 6f703c8..e22651e 100755
--- a/editors/gle/PRE_BUILD
+++ b/editors/gle/PRE_BUILD
@@ -1,3 +1,5 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-unpack_file 2
+default_pre_build &&
+unpack_file 2 &&
+
+sedit "s/-O2/$CFLAGS/" $SOURCE_DIRECTORY/config.gcc &&
+sedit "s/\/usr/${INSTALL_ROOT}\/usr/" $SOURCE_DIRECTORY/config.gcc
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index ed91408..9c731f7 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,6 +1,11 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch to fix compilation with gcc 4.3.0
+ From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* PRE_BUILD, rm CONFIGURE, dht.diff, PRE_SUB_DEPENDS, and SUB_DEPENDS
- because dht support now built-in.
+ because dht support now built-in.

2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.12.0
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index 8d44878..302a723 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,5 +1,5 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
# fix problems on amd64 with libtool versions (bug #13943)
-./autogen.sh
-
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+./autogen.sh
diff --git a/ftp-libs/libtorrent/gcc43.patch b/ftp-libs/libtorrent/gcc43.patch
new file mode 100644
index 0000000..7d26e29
--- /dev/null
+++ b/ftp-libs/libtorrent/gcc43.patch
@@ -0,0 +1,111 @@
+#
+# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+#
+[Libtorrent-devel] fix building with gcc 4.3 and above
+Serge Belyshev belyshev at depni.sinp.msu.ru
+Fri Feb 29 07:30:00 UTC 2008
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
+do not build anymore. Fixed by the following patches, for libtorrent:
+
+Index: libtorrent-0.12.0/rak/functional.h
+===================================================================
+--- libtorrent-0.12.0.orig/rak/functional.h
++++ libtorrent-0.12.0/rak/functional.h
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
+
++#include <stddef.h>
+ #include <functional>
+
+ namespace rak {
+Index: libtorrent-0.12.0/src/data/chunk.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/data/chunk.cc
++++ libtorrent-0.12.0/src/data/chunk.cc
+@@ -38,6 +38,7 @@
+
+ #include <algorithm>
+ #include <functional>
++#include <cstring>
+
+ #include "torrent/exceptions.h"
+
+Index: libtorrent-0.12.0/src/data/chunk_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/data/chunk_list.h
++++ libtorrent-0.12.0/src/data/chunk_list.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_DATA_CHUNK_LIST_H
+
+ #include <vector>
++#include <string>
+ #include <rak/error_number.h>
+ #include <rak/functional.h>
+
+Index: libtorrent-0.12.0/src/net/address_list.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/net/address_list.cc
++++ libtorrent-0.12.0/src/net/address_list.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <rak/functional.h>
++#include <algorithm>
+
+ #include "download/download_info.h" // for SocketAddressCompact
+
+Index: libtorrent-0.12.0/src/torrent/data/file_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/data/file_list.h
++++ libtorrent-0.12.0/src/torrent/data/file_list.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_FILE_LIST_H
+
+ #include <vector>
++#include <cstdlib>
+ #include <torrent/common.h>
+ #include <torrent/bitfield.h>
+ #include <torrent/path.h>
+Index: libtorrent-0.12.0/src/torrent/exceptions.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/exceptions.cc
++++ libtorrent-0.12.0/src/torrent/exceptions.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstring>
+
+ #include "exceptions.h"
+
+Index: libtorrent-0.12.0/src/torrent/tracker_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/tracker_list.h
++++ libtorrent-0.12.0/src/torrent/tracker_list.h
+@@ -40,6 +40,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <torrent/common.h>
++#include <string>
+
+ namespace torrent {
+
+Index: libtorrent-0.12.0/src/utils/diffie_hellman.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/utils/diffie_hellman.cc
++++ libtorrent-0.12.0/src/utils/diffie_hellman.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <string>
++#include <cstring>
+
+ #ifdef USE_OPENSSL
+ #include <openssl/bn.h>
+
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index b00379d..40d32a5 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,6 +1,11 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to fix compilation with gcc 4.3.0
+ From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DEPENDS, rm CONFIGURE, PRE_BUILD, dht.diff: not needed anymore
- because dht support now built-in
+ because dht support now built-in

2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.8.0
diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
new file mode 100755
index 0000000..7528467
--- /dev/null
+++ b/ftp/rtorrent/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/ftp/rtorrent/gcc43.patch b/ftp/rtorrent/gcc43.patch
new file mode 100644
index 0000000..17eeee6
--- /dev/null
+++ b/ftp/rtorrent/gcc43.patch
@@ -0,0 +1,81 @@
+#
+# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+#
+[Libtorrent-devel] fix building with gcc 4.3 and above
+Serge Belyshev belyshev at depni.sinp.msu.ru
+Fri Feb 29 07:30:00 UTC 2008
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
+do not build anymore. Fixed by the following patches, for libtorrent:
+
+Index: rtorrent-0.8.0/rak/functional.h
+===================================================================
+--- rtorrent-0.8.0.orig/rak/functional.h
++++ rtorrent-0.8.0/rak/functional.h
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
+
++#include <stddef.h>
+ #include <functional>
+
+ namespace rak {
+Index: rtorrent-0.8.0/src/command_ui.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/command_ui.cc
++++ rtorrent-0.8.0/src/command_ui.cc
+@@ -39,6 +39,7 @@
+ #include <rak/functional.h>
+ #include <rak/functional_fun.h>
+ #include <sigc++/adaptors/bind.h>
++#include <ctime>
+
+ #include "core/manager.h"
+ #include "core/view_manager.h"
+Index: rtorrent-0.8.0/src/display/text_element_value.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/display/text_element_value.cc
++++ rtorrent-0.8.0/src/display/text_element_value.cc
+@@ -38,6 +38,7 @@
+
+ #include "globals.h"
+ #include "text_element_value.h"
++#include <ctime>
+
+ namespace display {
+
+Index: rtorrent-0.8.0/src/rpc/exec_file.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/rpc/exec_file.cc
++++ rtorrent-0.8.0/src/rpc/exec_file.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <string>
++#include <cstring>
+ #include <unistd.h>
+ #include <rak/path.h>
+ #include <sys/types.h>
+Index: rtorrent-0.8.0/src/rpc/parse.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/rpc/parse.cc
++++ rtorrent-0.8.0/src/rpc/parse.cc
+@@ -39,6 +39,7 @@
+ #include <locale>
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
++#include <cstring>
+
+ #include "parse.h"
+
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+More information about the Libtorrent-devel mailing list
+
diff --git a/ftp/wget/BUILD b/ftp/wget/BUILD
index 03250a3..8ef856d 100755
--- a/ftp/wget/BUILD
+++ b/ftp/wget/BUILD
@@ -13,4 +13,3 @@ fi &&
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
make DESTDIR=$INSTALL_ROOT
-
diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index 6cd8dad..4a84c1c 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,16 +1,13 @@
SPELL=wget
- VERSION=1.11
-
+ VERSION=1.11.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE_GPG="wget.gpg:$SOURCE.sig:UPSTREAM_KEY"
-
+ SOURCE_GPG=wget.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_IGNORE=signature
-
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://sunsite.dk/wget/
+ WEB_SITE=http://www.gnu.org/software/wget/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="web ftp"
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 8775015..6e9198f 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,6 @@
+2008-03-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.11.1
+
2008-01-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.11
* wget.gpg: added 4A1B4EB1 from
diff --git a/gnome2-apps/gnome-system-tools/DETAILS
b/gnome2-apps/gnome-system-tools/DETAILS
index 3fbc247..c9187ee 100755
--- a/gnome2-apps/gnome-system-tools/DETAILS
+++ b/gnome2-apps/gnome-system-tools/DETAILS
@@ -11,16 +11,19 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
KEYWORDS="gnome2"
SHORT='GST are an integrated set of tools for the computer
administration'
cat << EOF
-Formerly known as the Ximian Setup Tools, the GST are a fully integrated set
of tools
-aimed to make easy the job that means the computer administration on an UNIX
or Linux
-system. They're thought to help from the new Linux or UNIX user to the system
-administrators. The GNOME System Tools are free software, licensed under the
terms of
-the GNU General Public License.
+Formerly known as the Ximian Setup Tools, the GST are a fully integrated
+set of tools aimed to make easy the job that means the computer
+administration on an UNIX or Linux system. They're thought to help from the
+new Linux or UNIX user to the system administrators. The GNOME System Tools
+are free software, licensed under the terms of the GNU General Public
+License.
+
Its main advantages are:
* Full integration with the new GNOME Control Center.
* An user-friendly interface to carry out the main administration tasks.
* The use of a common user interface in every system.
* A common structure that makes easy the development of new system tools.
+
Nowadays there are tools for managing:
* Users and groups
* Date and time
diff --git a/gnome2-apps/gnome-system-tools/HISTORY
b/gnome2-apps/gnome-system-tools/HISTORY
index df1176a..663904d 100644
--- a/gnome2-apps/gnome-system-tools/HISTORY
+++ b/gnome2-apps/gnome-system-tools/HISTORY
@@ -1,3 +1,6 @@
+2008-03-26 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: cleaned up long desc (80-col; added some spacing)
+
2008-03-19 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: depneds -> depends, thanks Belxjander. :)

diff --git a/gnome2-apps/gramps/DEPENDS b/gnome2-apps/gramps/DEPENDS
index f997c82..a67eae7 100755
--- a/gnome2-apps/gramps/DEPENDS
+++ b/gnome2-apps/gramps/DEPENDS
@@ -4,7 +4,6 @@ depends -sub NUMPY pygtk2 &&
depends gnome-python2 &&
depends rarian &&
depends librsvg2 &&
-depends gnome-doc-utils &&

suggest_depends reportlab "" "" "create PDF documents" &&

diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 83011aa..b5501a2 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gramps
- VERSION=2.2.10
-
SOURCE_HASH=sha512:8744561aec66fcbae691119d964bca246d8162d690d207a8e6077134c2a8c722523e61aca784d9959a8312bd63c891e148a6deaa2ed5c1e4ac0625d7df415e7c
+ VERSION=3.0.0
+
SOURCE_HASH=sha512:00a779cf33421f8500acc471a6cbd58178d1805db221b37709f0abbc85023a045896e9b31e70eacf49cf48baedd9217055a69b3677fb5a0267a4e5019baa9711
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index ab4833c..364f267 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,7 @@
+2008-03-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0
+ * DEPENDS: remove gnome-doc-utils
+
2008-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.10

diff --git a/gnome2-libs/gnome-audio2/DETAILS
b/gnome2-libs/gnome-audio2/DETAILS
index aa257dd..84858ed 100755
--- a/gnome2-libs/gnome-audio2/DETAILS
+++ b/gnome2-libs/gnome-audio2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-audio2
- VERSION=2.0.0
+ VERSION=2.22.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-audio-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-audio-$VERSION
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-audio-$VERSION
LICENSE[0]=PD
WEB_SITE=http://www.gnome.org
ENTERED=20010922
- UPDATED=20030710
KEYWORDS="audio gnome2 libs"
SHORT="This package contains a collection of sounds for use with
Gnome."
cat << EOF
diff --git a/gnome2-libs/gnome-audio2/HISTORY
b/gnome2-libs/gnome-audio2/HISTORY
index 08019c1..5ab2668 100644
--- a/gnome2-libs/gnome-audio2/HISTORY
+++ b/gnome2-libs/gnome-audio2/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.22.0
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/gnome2-libs/gnome-audio2/gnome-audio-2.0.0.tar.gz.sig
b/gnome2-libs/gnome-audio2/gnome-audio-2.0.0.tar.gz.sig
deleted file mode 100644
index 46d2a13..0000000
Binary files a/gnome2-libs/gnome-audio2/gnome-audio-2.0.0.tar.gz.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-audio2/gnome-audio-2.22.0.tar.gz.sig
b/gnome2-libs/gnome-audio2/gnome-audio-2.22.0.tar.gz.sig
new file mode 100644
index 0000000..5c58cc3
Binary files /dev/null and
b/gnome2-libs/gnome-audio2/gnome-audio-2.22.0.tar.gz.sig differ
diff --git a/gnome2-libs/gnome-games-extra-data/DETAILS
b/gnome2-libs/gnome-games-extra-data/DETAILS
index 6d6ff71..e71653e 100755
--- a/gnome2-libs/gnome-games-extra-data/DETAILS
+++ b/gnome2-libs/gnome-games-extra-data/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-games-extra-data
- VERSION=2.20.0
+ VERSION=2.22.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-games-extra-data/HISTORY
b/gnome2-libs/gnome-games-extra-data/HISTORY
index 0998719..a083b4d 100644
--- a/gnome2-libs/gnome-games-extra-data/HISTORY
+++ b/gnome2-libs/gnome-games-extra-data/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 2.22.0
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0

diff --git
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig

b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
deleted file mode 100644
index 24ca2ac..0000000
Binary files
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.20.0.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.22.0.tar.bz2.sig

b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.22.0.tar.bz2.sig
new file mode 100644
index 0000000..26b8580
Binary files /dev/null and
b/gnome2-libs/gnome-games-extra-data/gnome-games-extra-data-2.22.0.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-python-extras/DEPENDS
b/gnome2-libs/gnome-python-extras/DEPENDS
index be466de..2aa96ba 100755
--- a/gnome2-libs/gnome-python-extras/DEPENDS
+++ b/gnome2-libs/gnome-python-extras/DEPENDS
@@ -3,5 +3,4 @@ optional_depends gtkhtml2 "" "" "for gtkhtml2
python module" &&
optional_depends GECKO "" "" "for gtkmozembed python module"
&&
optional_depends gtkspell "" "" "for gtkspell python module"
&&
optional_depends gdl "" "" "for gdl python module"
&&
-optional_depends libgksu "" "" "for gksu python module"
&&
-optional_depends libgksuui "" "" "for gksu.ui python module"
+optional_depends libgksu "" "" "for gksu python module"
diff --git a/gnome2-libs/gnome-python-extras/HISTORY
b/gnome2-libs/gnome-python-extras/HISTORY
index b63c04c..703dd4a 100644
--- a/gnome2-libs/gnome-python-extras/HISTORY
+++ b/gnome2-libs/gnome-python-extras/HISTORY
@@ -1,3 +1,6 @@
+2008-03-25 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: There is no libgksuui spell
+
2007-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.19.1

diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index 6f222c2..ada8247 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-doc
- VERSION=1.9
+ VERSION=1.10
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index b0ab023..716bd4d 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.10
+
2007-10-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.9

diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.10.tar.bz2.sig
b/gnome2-libs/gtk-doc/gtk-doc-1.10.tar.bz2.sig
new file mode 100644
index 0000000..f5916c8
Binary files /dev/null and b/gnome2-libs/gtk-doc/gtk-doc-1.10.tar.bz2.sig
differ
diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
b/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig
deleted file mode 100644
index 827ac07..0000000
Binary files a/gnome2-libs/gtk-doc/gtk-doc-1.9.tar.bz2.sig and /dev/null
differ
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 2573dfb..6ad4823 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,6 +1,14 @@
+. $GRIMOIRE/libcompat &&
+
depends diffutils &&
depends gmp &&
depends gnupg &&
depends mpfr &&
+
+if [[ "$(installed_version mpfr|sed 's:\.::g')" < 230 ]]
+then
+ force_depends mpfr
+fi &&
+
depends smgl-fhs &&
depends smgl-archspecs
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index a7413e8..a20ebaf 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -10,11 +10,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://gcc.gnu.org/
- ENTERED=20040420
- DOCS="$DOCS INSTALL"
- PATCHLEVEL=1
KEYWORDS="compiler"
+ ENTERED=20040420
SHORT="the GNU C compiler"
+ DOCS="$DOCS INSTALL"
cat << EOF
The GNU C compiler and the core of the GNU compiler collection.
EOF
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 0d9b1fb..0530fd4 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2008-03-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Reset PATCHLEVEL=0 (removed PATCHLEVEL)
+ * DEPENDS: GCC requires mpfr 2.3.0 or newer to work, so force mpfr
+ being built if it is not >= 2.3.0
+
2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.3.0
* DEPENDS: Depends on gmp and mpfr
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index fab5494..35f8dd3 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: yet more sanei*.h files
+
2008-02-27 David Kowis <dkowis AT shlrm.org>
* INSTALL: fixed broken mkdir. Needs -p!

diff --git a/graphics-libs/sane-backends/INSTALL
b/graphics-libs/sane-backends/INSTALL
index b8d4edb..6313014 100755
--- a/graphics-libs/sane-backends/INSTALL
+++ b/graphics-libs/sane-backends/INSTALL
@@ -1,8 +1,7 @@
mkdir -p ${INSTALL_ROOT}/etc/sane.d &&
default_install &&
cd $SOURCE_DIRECTORY &&
-cp include/sane/sane{i,i_config,i_backend}.h \
- ${INSTALL_ROOT}/usr/include/sane &&
+cp include/sane/sanei*.h ${INSTALL_ROOT}/usr/include/sane &&
if spell_ok hotplug;then
mkdir -p $INSTALL_ROOT/etc/hotplug/usb &&
install_config_file tools/hotplug/libsane.usermap \
diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index b6c5e79..df46ccd 100755
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -1,4 +1,5 @@
depends g++ &&
+depends boost &&
depends gtkmm2 &&
depends libxml2 &&
depends libxslt &&
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index eeb05b9..07a4272 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DEPENDS: Now depends on boost
+
2008-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: upstream key added, gz => bz2 to reduce DLable size

diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 21dee38..f33ecd9 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From http://bugs.gentoo.org/show_bug.cgi?id=212435
+
2007-12-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[1]
converted to upstream signature checking
diff --git a/graphics/openexr/PRE_BUILD b/graphics/openexr/PRE_BUILD
new file mode 100755
index 0000000..7528467
--- /dev/null
+++ b/graphics/openexr/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/graphics/openexr/gcc43.patch b/graphics/openexr/gcc43.patch
new file mode 100644
index 0000000..47d39fd
--- /dev/null
+++ b/graphics/openexr/gcc43.patch
@@ -0,0 +1,26 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=212435
+#
+diff -Naur openexr-1.6.1-orig/exrenvmap/main.cpp
openexr-1.6.1/exrenvmap/main.cpp
+--- openexr-1.6.1-orig/exrenvmap/main.cpp 2007-04-24 19:07:51.000000000
-0600
++++ openexr-1.6.1/exrenvmap/main.cpp 2008-01-12 20:28:56.000000000 -0600
+@@ -43,6 +43,7 @@
+ #include <makeLatLongMap.h>
+ #include <ImfEnvmap.h>
+ #include <iostream>
++#include <cstring>
+ #include <exception>
+ #include <stdlib.h>
+
+diff -Naur openexr-1.6.1-orig/exrmaketiled/main.cpp
openexr-1.6.1/exrmaketiled/main.cpp
+--- openexr-1.6.1-orig/exrmaketiled/main.cpp 2007-04-24 19:08:45.000000000
-0600
++++ openexr-1.6.1/exrmaketiled/main.cpp 2008-01-12 20:28:14.000000000
-0600
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <exception>
+ #include <string>
++#include <cstring>
+ #include <stdlib.h>
+
+ using namespace Imf;
+
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a328266..69a4665 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch for non-CVS
+ * gcc43.patch: Apply patch to compile with gcc 4.3.0
+ From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+
2008-03-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Updated devel to version 3.0 beta 4

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 4d060c9..7c77597 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -4,6 +4,7 @@ unpack_file '' &&
cd mozilla &&

if [ "$FIREFOX_CVS" == "n" ]; then
+ patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
fi &&
diff --git a/http/firefox/gcc43.patch b/http/firefox/gcc43.patch
new file mode 100644
index 0000000..6bda134
--- /dev/null
+++ b/http/firefox/gcc43.patch
@@ -0,0 +1,1618 @@
+#
+# From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+#
+Index: xpcom/obsolete/component/nsFileSpecImpl.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.cpp
+diff -N xpcom/obsolete/component/nsFileSpecImpl.cpp
+--- xpcom/obsolete/component/nsFileSpecImpl.cpp 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,857 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Pierre Phaneuf <pp AT ludusdesign.com>
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles
alone.
+-
+-#include "nsIFileStream.h"
+-#include "nsFileStream.h"
+-
+-#include "nsILocalFile.h"
+-
+-#include "prmem.h"
+-
+-NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
+-
+-#ifdef NS_DEBUG
+-#define TEST_OUT_PTR(p) \
+- if (!(p)) \
+- return NS_ERROR_NULL_POINTER;
+-#else
+-#define TEST_OUT_PTR(p)
+-#endif
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+- : mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
+-//----------------------------------------------------------------------------------------
+- : mFileSpec(inSpec)
+- , mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::~nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- CloseStream();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-/* static */
+-nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec,
nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return it->QueryInterface(NS_GET_IID(nsIFileSpec), (void **) result);
+-} // nsFileSpecImpl::MakeInterface
+-
+-#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
+-//----------------------------------------------------------------------------------------
+-{
+- if (original) {
+- nsresult rv = ((nsIFileSpec *)original)->GetFileSpec( &mFileSpec);
+- if (NS_SUCCEEDED( rv))
+- return mFileSpec.Error();
+- else
+- return( rv);
+- }
+- else
+- return( NS_ERROR_FAILURE);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
+- PRBool *_retval)
+-{
+- *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aURLString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFileURL url(mFileSpec);
+- *aURLString = nsCRT::strdup(url.GetURLString());
+- if (!*aURLString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-} // nsFileSpecImpl::GetURLString
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFileURL(aURLString);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char *
*aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aUnixStyleFilePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFilePath path(mFileSpec);
+- *aUnixStyleFilePath = nsCRT::strdup((const char*) path);
+- if (!*aUnixStyleFilePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char *
aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFilePath(aUnixStyleFilePath);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char *
*aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aPersistentDescriptorString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsPersistentFileDescriptor desc(mFileSpec);
+- nsCAutoString data;
+- desc.GetData(data);
+- *aPersistentDescriptorString = ToNewCString(data);
+- if (!*aPersistentDescriptorString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char *
aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsPersistentFileDescriptor desc(mFileSpec);
+- desc.SetData(nsDependentCString(aPersistentDescriptorString));
+- mFileSpec = desc;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNativePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- *aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
+- if (!*aNativePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aNativePath;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNSPRPath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsNSPRPath path(mFileSpec);
+- *aNSPRPath = nsCRT::strdup((const char*) path);
+- if (!*aNSPRPath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Error()
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Valid();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- *_retval = mFileSpec.Failed();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aLeafName)
+- *aLeafName = mFileSpec.GetLeafName();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.SetLeafName(aLeafName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aParent)
+- nsFileSpec parent;
+- mFileSpec.GetParent(parent);
+- return MakeInterface(parent, aParent);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char
*suggestedName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique(suggestedName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aModDate)
+- nsFileSpec::TimeStamp stamp;
+- mFileSpec.GetModDate(stamp);
+- *aModDate = stamp;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool
*_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.ModDateChanged(oldStamp);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsDirectory();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsFile();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Exists();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsHidden();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsSymlink();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
+-//----------------------------------------------------------------------------------------
+-{
+- PRBool ignore;
+- return mFileSpec.ResolveSymlink(ignore);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSize)
+- *aFileSize = mFileSpec.GetFileSize();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64
*aDiskSpaceAvailable)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aDiskSpaceAvailable)
+- *aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char
*relativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec += relativePath;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Touch()
+-//----------------------------------------------------------------------------------------
+-{
+- // create an empty file, like the UNIX touch command.
+- nsresult rv;
+- rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- rv = CloseStream();
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CreateDir()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.CreateDir();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Delete(PRBool aRecursive)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.Delete(aRecursive);
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Truncate(PRInt32 aNewLength)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Truncate(aNewLength);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Rename(newLeafName);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.CopyToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.MoveToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Execute(args);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- nsresult result =
NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
+- if (NS_SUCCEEDED(result))
+- result =
NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CloseStream()
+-//----------------------------------------------------------------------------------------
+-{
+- NS_IF_RELEASE(mInputStream);
+- NS_IF_RELEASE(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = (mInputStream || mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mInputStream;
+- NS_IF_ADDREF(mInputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mOutputStream;
+- NS_IF_ADDREF(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 count;
+- rv = Write(inString, PL_strlen(inString), &count);
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = nsnull;
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 theSize;
+- rv = GetFileSize((PRUint32*)&theSize);
+- if (NS_SUCCEEDED(rv))
+- rv = Read(_retval, theSize, &theSize);
+- if (NS_SUCCEEDED(rv))
+- (*_retval)[theSize] = 0;
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSpec)
+- *aFileSpec = mFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Equals(nsIFileSpec *spec, PRBool *result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv;
+-
+- if (!result || !spec) return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpec otherSpec;
+-
+- rv = spec->GetFileSpec(&otherSpec);
+- if (NS_FAILED(rv)) return rv;
+-
+- if (mFileSpec == otherSpec) {
+- *result = PR_TRUE;
+- }
+- else {
+- *result = PR_FALSE;
+- }
+-
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.eof();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount,
PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- TEST_OUT_PTR(buffer)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*buffer)
+- *buffer = (char*)PR_Malloc(requestedCount + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.read(*buffer, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize,
PRBool *wasTruncated)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(wasTruncated)
+- TEST_OUT_PTR(line)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*line)
+- *line = (char*)PR_Malloc(bufferSize + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *wasTruncated = !s.readline(*line, bufferSize);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32
requestedCount, PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- //if (!mOutputStream)
+- // return NS_ERROR_NULL_POINTER;
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv))
+- return rv;
+- }
+- nsOutputFileStream s(mOutputStream);
+- *_retval = s.write(data, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Flush()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mOutputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsOutputFileStream s(mOutputStream);
+- s.flush();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult result = NS_OK;
+- if (mOutputStream)
+- {
+- nsOutputFileStream os(mOutputStream);
+- os.seek(offset);
+- result = os.error();
+- }
+- if (NS_SUCCEEDED(result) && mInputStream)
+- {
+- nsInputFileStream is(mInputStream);
+- is.seek(offset);
+- result = is.error();
+- }
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.tell();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::EndLine()
+-//----------------------------------------------------------------------------------------
+-{
+- nsOutputFileStream s(mOutputStream);
+- s << nsEndl;
+- return s.error();
+-}
+-
+-NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+- : mDirectoryIterator(nsnull)
+-{
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool
resolveSymlink)
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+- mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent),
resolveSymlink);
+- if (!mDirectoryIterator)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- *_retval = mDirectoryIterator->Exists();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- (*mDirectoryIterator)++;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec *
*aCurrentSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(),
aCurrentSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Create(nsISupports* outer, const
nsIID& aIID, void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID,
void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpecImpl* it = new nsFileSpecImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec
**result)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!result)
+- return NS_ERROR_NULL_POINTER;
+-
+- return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpec(nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec),
(void**)result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecFromIFile(nsIFile *aFile, nsIFileSpec **result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = nsFileSpecImpl::Create(nsnull,
NS_GET_IID(nsIFileSpec), (void**)result);
+- if (NS_FAILED(rv)) return rv;
+-
+- nsCAutoString path;
+- rv = aFile->GetNativePath(path);
+- if (NS_FAILED(rv)) return rv;
+-
+- rv = (*result)->SetNativePath(path.get());
+- if (NS_FAILED(rv))
+- NS_RELEASE(*result);
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsDirectoryIteratorImpl::Create(nsnull,
NS_GET_IID(nsIDirectoryIterator), (void**)result);
+-}
+Index: xpcom/obsolete/component/nsFileSpecImpl.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.h
+diff -N xpcom/obsolete/component/nsFileSpecImpl.h
+--- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000
1.3
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,116 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#ifndef _FILESPECIMPL_H_
+-#define _FILESPECIMPL_H_
+-
+-#include "nscore.h"
+-#include "nsIFileSpec.h"
+-#include "nsFileSpec.h"
+-
+-//========================================================================================
+-class nsFileSpecImpl
+-//========================================================================================
+- : public nsIFileSpec
+-{
+-
+- public:
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_DECL_NSIFILESPEC
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+- //----------------------
+- // Implementation
+- //----------------------
+-
+- nsFileSpecImpl();
+- nsFileSpecImpl(const nsFileSpec& inSpec);
+- static nsresult MakeInterface(const nsFileSpec& inSpec, nsIFileSpec**
outSpec);
+-
+- //----------------------
+- // Data
+- //----------------------
+-
+- nsFileSpec
mFileSpec;
+- nsIInputStream* mInputStream;
+- nsIOutputStream* mOutputStream;
+-
+-private:
+- ~nsFileSpecImpl();
+-}; // class nsFileSpecImpl
+-
+-//========================================================================================
+-class nsDirectoryIteratorImpl
+-//========================================================================================
+- : public nsIDirectoryIterator
+-{
+-
+-public:
+-
+- nsDirectoryIteratorImpl();
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_IMETHOD Init(nsIFileSpec *parent, PRBool resolveSymlink);
+-
+- NS_IMETHOD Exists(PRBool *_retval);
+-
+- NS_IMETHOD Next();
+-
+- NS_IMETHOD GetCurrentSpec(nsIFileSpec * *aCurrentSpec);
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+-private:
+- ~nsDirectoryIteratorImpl();
+-
+-protected:
+- nsDirectoryIterator*
mDirectoryIterator;
+-}; // class nsDirectoryIteratorImpl
+-
+-#endif // _FILESPECIMPL_H_
+Index: xpcom/obsolete/component/nsIRegistry.idl
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistry.idl
+diff -N xpcom/obsolete/component/nsIRegistry.idl
+--- xpcom/obsolete/component/nsIRegistry.idl 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,186 +0,0 @@
+-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org Code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1999
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#include "nsISupports.idl"
+-#include "nsIEnumerator.idl"
+-
+-interface nsIFile;
+-
+-typedef PRUint32 nsRegistryKey;
+-typedef long nsWellKnownRegistry;
+-
+-[scriptable,uuid(5D41A440-8E37-11d2-8059-00600811A9C3)]
+-interface nsIRegistry : nsISupports
+-{
+- const long None = 0;
+- const long Users = 1;
+- const long Common = 2;
+- const long CurrentUser = 3;
+-
+- const long ApplicationComponentRegistry = 1;
+- const long ApplicationRegistry = 2;
+-
+- // Dont use this one. This for internal use only.
+- const long ApplicationCustomRegistry = -1;
+-
+- void open(in nsIFile regFile);
+- void openWellKnownRegistry(in nsWellKnownRegistry regid);
+-
+- void flush();
+- boolean isOpen();
+-
+- nsRegistryKey addKey(in nsRegistryKey baseKey, in wstring keyname);
+- nsRegistryKey getKey(in nsRegistryKey baseKey, in wstring keyname);
+- void removeKey(in nsRegistryKey baseKey, in wstring keyname);
+-
+- wstring getString(in nsRegistryKey baseKey, in wstring valname);
+- void setString(in nsRegistryKey baseKey, in wstring valname, in wstring
value);
+-
+- string getStringUTF8(in nsRegistryKey baseKey, in string path);
+- void setStringUTF8(in nsRegistryKey baseKey, in string path, in string
value);
+-
+- void getBytesUTF8(in nsRegistryKey baseKey, in string path, out
PRUint32 length, [retval, array, size_is(length)] out PRUint8 valueArray);
+- void setBytesUTF8(in nsRegistryKey baseKey, in string path, in PRUint32
length, [array, size_is(length)] in PRUint8 valueArray);
+- PRInt32 getInt(in nsRegistryKey baseKey, in string path);
+- void setInt(in nsRegistryKey baseKey, in string path, in PRInt32 value);
+- PRInt64 getLongLong(in nsRegistryKey baseKey, in string path);
+- void setLongLong(in nsRegistryKey baseKey, in string path, inout
PRInt64 value);
+-
+- /**
+- * addSubtree() and friends need to be renamed to addKeyUTF8().
+- * If you are using these forms make sure you pass UTF8 data
+- */
+- nsRegistryKey addSubtree(in nsRegistryKey baseKey, in string path);
+- void removeSubtree(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtree(in nsRegistryKey baseKey, in string path);
+-
+- nsRegistryKey addSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- void removeSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtreeRaw(in nsRegistryKey baseKey, in string path);
+-
+- nsIEnumerator enumerateSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateAllSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateValues(in nsRegistryKey baseKey);
+-
+- const unsigned long String = 1;
+- const unsigned long Int32 = 2;
+- const unsigned long Bytes = 3;
+- const unsigned long File = 4;
+-
+- unsigned long getValueType(in nsRegistryKey baseKey, in string path);
+- PRUint32 getValueLength(in nsRegistryKey baseKey, in string path);
+- void deleteValue(in nsRegistryKey baseKey, in string path);
+-
+- /**
+- * escapeKey() takes arbitrary binary data and converts it into
+- * valid ASCII which can be used as registry key or value names
+- */
+- void escapeKey([array, size_is(length)] in PRUint8 key, in PRUint32
terminator, inout PRUint32 length, [retval, array, size_is(length)] out
PRUint8 escaped);
+- void unescapeKey([array, size_is(length)] in PRUint8 escaped, in
PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)]
out PRUint8 key);
+-
+- attribute string currentUserName;
+-
+- void pack();
+-};
+-
+-[scriptable, uuid(8cecf236-1dd2-11b2-893c-f9848956eaec)]
+-interface nsIRegistryEnumerator : nsIEnumerator
+-{
+- void currentItemInPlaceUTF8(out nsRegistryKey key,
+- [shared, retval] out string item);
+-};
+-
+-[scriptable, uuid(D1B54831-AC07-11d2-805E-00600811A9C3)]
+-interface nsIRegistryNode : nsISupports
+-{
+- readonly attribute string nameUTF8;
+- readonly attribute wstring name;
+- readonly attribute nsRegistryKey key;
+-};
+-
+-[scriptable,uuid(5316C380-B2F8-11d2-A374-0080C6F80E4B)]
+-interface nsIRegistryValue : nsISupports
+-{
+- readonly attribute wstring name;
+- readonly attribute string nameUTF8;
+- readonly attribute unsigned long type;
+- readonly attribute PRUint32 length;
+-};
+-
+-[uuid(3A15FC88-7A61-4Ab4-8E58-31E95fAB3DA8)]
+-/**
+- * It sucks that nsIRegistry has to always allocate and return
+- * strings. nsIRegistryGetter adds in interfaces for non allocating getters
+- * to registry values.
+- */
+-interface nsIRegistryGetter : nsISupports
+-{
+- /**
+- * Get a string value of attribute valname in widestring or utf8 format
+- *
+- * @return
+- * NS_OK on success.
+- * buf has the string value copied into it. length is NOT changed.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in chars including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various failure codes otherwise. buf and length wont be updated.
+- */
+- void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout char buf, inout PRUint32 length);
+-
+- /**
+- * Get a a byte array value of attribute valname
+- *
+- * @return
+- * NS_OK on success. buf has the string value copied into it.
+- * length is updated to actual number of bytes copied into buf.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in PRUint8s including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various other failure codes otherwise. buf and length wont be
updated.
+- */
+- void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout PRUint8 buf, inout PRUint32 length);
+-};
+-
+-%{ C++
+-#include "nsIRegistryUtils.h"
+-%}
+Index: xpcom/obsolete/component/nsIRegistryUtils.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistryUtils.h
+diff -N xpcom/obsolete/component/nsIRegistryUtils.h
+--- xpcom/obsolete/component/nsIRegistryUtils.h 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,63 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#ifndef __nsIRegistryUtils_h
+-#define __nsIRegistryUtils_h
+-
+-#define NS_REGISTRY_CONTRACTID "@mozilla.org/registry;1"
+-#define NS_REGISTRY_CLASSNAME "Mozilla Registry"
+-/* be761f00-a3b0-11d2-996c-0080c7cb1081 */
+-#define NS_REGISTRY_CID \
+-{ \
+- 0xbe761f00, \
+- 0xa3b0, \
+- 0x11d2, \
+- {0x99, 0x6c, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} \
+-}
+-
+-/*------------------------------- Error Codes
----------------------------------
+-------------------------------------------------------------------------------*/
+-#define NS_ERROR_REG_BADTYPE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 1 )
+-#define NS_ERROR_REG_NO_MORE NS_ERROR_GENERATE_SUCCESS(
NS_ERROR_MODULE_REG, 2 )
+-#define NS_ERROR_REG_NOT_FOUND NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 3 )
+-#define NS_ERROR_REG_NOFILE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 4 )
+-#define NS_ERROR_REG_BUFFER_TOO_SMALL NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 5 )
+-#define NS_ERROR_REG_NAME_TOO_LONG NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 6 )
+-#define NS_ERROR_REG_NO_PATH NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 7 )
+-#define NS_ERROR_REG_READ_ONLY NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 8 )
+-#define NS_ERROR_REG_BAD_UTF8 NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 9 )
+-
+-#endif
+Index: xpcom/obsolete/component/regExport.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/regExport.cpp
+diff -N xpcom/obsolete/component/regExport.cpp
+--- xpcom/obsolete/component/regExport.cpp 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,357 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include <stdio.h>
+-
+-#include "nsIServiceManager.h"
+-#include "nsIComponentManager.h"
+-#include "nsCOMPtr.h"
+-#include "nsIRegistry.h"
+-#include "nsIEnumerator.h"
+-#include "nsILocalFile.h"
+-#include "nsDependentString.h"
+-#include "prmem.h"
+-#include "plstr.h"
+-#include "nsMemory.h"
+-
+-static void display( nsIRegistry *reg, nsRegistryKey root, const char *name
);
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root );
+-static void printString( const char *value, int indent );
+-
+-int main( int argc, char *argv[] ) {
+-
+-
+-#ifdef __MWERKS__
+- // Hack in some arguments. A NULL registry name is supposed to tell
libreg
+- // to use the default registry (which does seem to work).
+- argc = 1;
+- const char* myArgs[] =
+- {
+- "regExport"
+- };
+- argv = const_cast<char**>(myArgs);
+-#endif
+-
+- nsresult rv;
+-
+- // Initialize XPCOM
+- nsIServiceManager *servMgr = NULL;
+- rv = NS_InitXPCOM2(&servMgr, NULL, NULL);
+- if (NS_FAILED(rv))
+- {
+- // Cannot initialize XPCOM
+- printf("Cannot initialize XPCOM. Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+- {
+- // Get the component manager
+- static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
+- nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
+- if (NS_FAILED(rv))
+- {
+- // Cant get component manager
+- printf("Cannot get component manager from service manager..
Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+-
+- nsIRegistry *reg;
+-
+- if (argc>1) {
+- // Create the registry
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening registry file %s, rv=0x%08X\n",
argv[1] , (int)rv );
+- return rv;
+- }
+- // Open it against the input file name.
+- nsCOMPtr<nsILocalFile> regFile;
+- rv = NS_NewNativeLocalFile( nsDependentCString(argv[1]),
PR_FALSE, getter_AddRefs(regFile) );
+- if ( NS_FAILED(rv) ) {
+- printf( "Error instantiating local file for %s,
rv=0x%08X\n", argv[1], (int)rv );
+- return rv;
+- }
+-
+- rv = reg->Open( regFile );
+-
+- if ( rv == NS_OK )
+- {
+- printf( "Registry %s opened OK.\n", argv[1] );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- else
+- {
+- // Called with no arguments. Print both the default registry
and
+- // the components registry. We already printed the default
regsitry.
+- // So just do the component registry.
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+-
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening creating registry instance,
rv=0x%08X\n", (int)rv );
+- return rv;
+- }
+- rv =
reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+- if ( rv == NS_ERROR_REG_BADTYPE ) {
+- printf( "\n\n\nThere is no <Application Component
Registry>\n" );
+- }
+- else if ( rv == NS_OK ) {
+-
+- printf( "\n\n\nRegistry %s opened OK.\n", "<Application
Component Registry>\n" );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- }
+- NS_ShutdownXPCOM( servMgr );
+-
+- return rv;
+-}
+-
+-void display( nsIRegistry *reg, nsRegistryKey root, const char *rootName ) {
+- // Print out key name.
+- printf( "%s\n", rootName );
+-
+- // Make sure it isn't a "root" key.
+- if ( root != nsIRegistry::Common
+- &&
+- root != nsIRegistry::Users
+- &&
+- root != nsIRegistry::CurrentUser ) {
+- // Print values stored under this key.
+- displayValues( reg, root );
+- }
+-
+- // Enumerate all subkeys (immediately) under the given node.
+- nsIEnumerator *keys;
+- nsresult rv = reg->EnumerateSubtrees( root, &keys );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Set enumerator to beginning.
+- rv = keys->First();
+- // Enumerate subkeys till done.
+- while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) {
+- nsISupports *base;
+- rv = keys->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryNode *node;
+- nsIID nodeIID = NS_IREGISTRYNODE_IID;
+- rv = base->QueryInterface( nodeIID, (void**)&node );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = node->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Build complete name.
+- char *fullName = new char[ PL_strlen(rootName) +
PL_strlen(name) + 5 ];
+- PL_strcpy( fullName, rootName );
+- PL_strcat( fullName, " - " );
+- PL_strcat( fullName, name );
+- // Display contents under this subkey.
+- nsRegistryKey key;
+- rv = reg->GetSubtreeRaw( root, name, &key );
+- if ( rv == NS_OK ) {
+- display( reg, key, fullName );
+- printf( "\n" );
+- } else {
+- printf( "Error getting key, rv=0x%08X\n",
(int)rv );
+- }
+- delete [] fullName;
+- } else {
+- printf( "Error getting subtree name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- node->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = keys->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- }
+- }
+- // Release key enumerator.
+- keys->Release();
+- } else {
+- printf( "Error creating enumerator for %s, root=0x%08X,
rv=0x%08X\n",
+- rootName, (int)root, (int)rv );
+- }
+- return;
+-}
+-
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root ) {
+- // Emumerate values at this registry location.
+- nsIEnumerator *values;
+- nsresult rv = reg->EnumerateValues( root, &values );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Go to beginning.
+- rv = values->First();
+-
+- // Enumerate values till done.
+- while( rv == NS_OK && (NS_OK != values->IsDone()) ) {
+- nsISupports *base;
+- rv = values->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryValue *value;
+- nsIID valueIID = NS_IREGISTRYVALUE_IID;
+- rv = base->QueryInterface( valueIID, (void**)&value );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = value->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Print name:
+- printf( "\t\t%s", name );
+- // Get info about this value.
+- PRUint32 type;
+- rv = reg->GetValueType( root, name, &type );
+- if ( rv == NS_OK ) {
+- // Print value contents.
+- switch ( type ) {
+- case nsIRegistry::String: {
+- char *strValue;
+- rv = reg->GetStringUTF8( root,
name, &strValue );
+- if ( rv == NS_OK ) {
+- printString( strValue,
strlen(name) );
+- nsMemory::Free( strValue );
+- } else {
+- printf( "\t Error getting
string value, rv=0x%08X", (int)rv );
+- }
+- }
+- break;
+-
+- case nsIRegistry::Int32:
+- {
+- PRInt32 val = 0;
+- rv = reg->GetInt( root, name, &val
);
+- if (NS_SUCCEEDED(rv)) {
+- printf( "\t= Int32 [%d, 0x%x]",
val, val);
+- }
+- else {
+- printf( "\t Error getting int32
value, rv=%08X", (int)rv);
+- }
+- }
+- break;
+-
+- case nsIRegistry::Bytes:
+- printf( "\t= Bytes" );
+- break;
+-
+- case nsIRegistry::File:
+- printf( "\t= File (?)" );
+- break;
+-
+- default:
+- printf( "\t= ? (unknown type=0x%02X)",
(int)type );
+- break;
+- }
+- } else {
+- printf( "\t= ? (error getting value,
rv=0x%08X)", (int)rv );
+- }
+- printf("\n");
+- nsMemory::Free( name );
+- } else {
+- printf( "Error getting value name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- value->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = values->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- break;
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- break;
+- }
+- }
+-
+- values->Release();
+- } else {
+- printf( "\t\tError enumerating values, rv=0x%08X\n", (int)rv );
+- }
+- return;
+-}
+-
+-static void printString( const char *value, int /*indent*/ ) {
+- // For now, just dump contents.
+- printf( "\t = %s", value );
+- return;
+-}
+
diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
index 34a8c97..5dd5e7d 100644
--- a/http/mozilla/HISTORY
+++ b/http/mozilla/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply mimemult.patch for gcc4*
+ * mimemult.patch: Fix compilation (found with gcc 4.3.0)
+ From http://mail-index.netbsd.org/pkgsrc-bugs/2006/07/19/0000.html
+
2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated Enigmail to 0.93.2
PATCHLEVEL=1
diff --git a/http/mozilla/PRE_BUILD b/http/mozilla/PRE_BUILD
index bbfc663..0988fdd 100755
--- a/http/mozilla/PRE_BUILD
+++ b/http/mozilla/PRE_BUILD
@@ -10,7 +10,8 @@ patch -p0 < $SCRIPT_DIRECTORY/libreg-standalone.diff &&
patch -p1 < $SCRIPT_DIRECTORY/freetype.patch &&

if use_gcc ^4; then
- patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
+ patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
+ patch -p0 < $SCRIPT_DIRECTORY/mimemult.patch
fi &&

# fixes a broken upstream Makefile.in
diff --git a/http/mozilla/mimemult.patch b/http/mozilla/mimemult.patch
new file mode 100644
index 0000000..46c6434
--- /dev/null
+++ b/http/mozilla/mimemult.patch
@@ -0,0 +1,14 @@
+#
+# From http://mail-index.netbsd.org/pkgsrc-bugs/2006/07/19/0000.html
+#
+--- mailnews/mime/src/mimeeobj.h.~1.3.~ 2001-09-29 05:07:42.000000000
+0900
++++ mailnews/mime/src/mimeeobj.h 2006-07-19 08:38:25.000000000 +0900
+@@ -54,7 +54,7 @@
+ MimeLeafClass leaf;
+ };
+
+-extern MimeExternalObjectClass mimeExternalObjectClass;
++extern "C" MimeExternalObjectClass mimeExternalObjectClass;
+
+ struct MimeExternalObject {
+ MimeLeaf leaf;
diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index fc92f48..f95a4a1 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktorrent4
- VERSION=3.0.0
-
SOURCE_HASH=sha512:f50d7a8647eb239cc2ea83d07791e20315920477f307769524a1b4133873ecadd50133ec47840d846a5ab9dd5d90e2525cc76abb5a05caaf871ccd46f418a0bc
+ VERSION=3.0.1
+
SOURCE_HASH=sha512:79b01a4fd2d4fe193c4ab1a938d11c15e9e841d7e6fa04414cf2cc257309112506b232ea26d6e9c7e57f99b5213b4dcd3d945cd25d50d94071c93d3fcefe05f9
SOURCE=${SPELL//4}-$VERSION.tar.bz2
# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 7d0a13f..8337d43 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.1
+
2008-02-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.0

diff --git a/kernel.gpg b/kernel.gpg
index 838c46b..143148f 100644
Binary files a/kernel.gpg and b/kernel.gpg differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 48236a8..2b5c522 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,4 +1,12 @@
2008-03-19 Eric Sandall <sandalle AT sourcemage.org>
+ * latest.defaults: Latest maintenance to patch-2.6.24.4
+ Latest realtime is 2.6.24.4-rt4
+ Latest git patch is 2.6.25-rc6-git7
+ * info/patches/maintenance_patches/patch-2.6.24.4: Added
+ * info/patches/realtime_patches/patch-2.6.24.4-rt4: Added
+ * info/patches/git_patches/patch-2.6.25-rc6-git7: Added
+
+2008-03-19 Eric Sandall <sandalle AT sourcemage.org>
* latest.defaults: Latest PRE_2_6 is 2.6.25-rc6
* info/patches/PRE_2_6/patch-2.6.25-rc6: Added

diff --git a/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
b/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
new file mode 100755
index 0000000..cb7362a
--- /dev/null
+++ b/kernels/linux/info/patches/git_patches/patch-2.6.25-rc6-git7
@@ -0,0 +1,5 @@
+appliedkernels="2.6.24"
+depends="patch-2.6.25-rc6"
+patchversion="${depends/patch-/}-git7"
+source="patch-${patchversion}.bz2"
+source_url="$KERNEL_URL/pub/linux/kernel/v2.6/snapshots/${source}"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.24.4
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.24.4
new file mode 100755
index 0000000..3c913ca
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.24.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.24"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.24.4-rt4
b/kernels/linux/info/patches/realtime_patches/patch-2.6.24.4-rt4
new file mode 100755
index 0000000..9b88524
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.24.4-rt4
@@ -0,0 +1,7 @@
+appliedkernels="2.6.24"
+depends="patch-2.6.24.4"
+patchversion="${depends/patch-/}-rt4"
+source="patch-${patchversion}.bz2"
+source_url="http://www.kernel.org/pub/linux/kernel/projects/rt/${source}";
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 992c768..0f7915f 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,7 +1,7 @@
LATEST_2_6=2.6.24
LATEST_PRE_2_6=patch-2.6.25-rc6
-LATEST_maintenance_patches=patch-2.6.24.3
-LATEST_git_patches=patch-2.6.12-rc5-git8
+LATEST_maintenance_patches=patch-2.6.24.4
+LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
LATEST_mm_patches=2.6.25-rc5-mm1
@@ -16,4 +16,4 @@ LATEST_ck_server_patches=patch-2.6.22-cks1
LATEST_cko_patches=patch-2.6.12-cko3
LATEST_as_patches=patch-2.6.10-as7
LATEST_love_patches=2.6.12-love1
-LATEST_realtime_patches=patch-2.6.24-rt1
+LATEST_realtime_patches=patch-2.6.24.4-rt4
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000..d2decbc
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/libs/boost/gcc43.patch b/libs/boost/gcc43.patch
new file mode 100644
index 0000000..43b842d
--- /dev/null
+++ b/libs/boost/gcc43.patch
@@ -0,0 +1,255 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=210427
+#
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp
boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp
2005-12-11 00:12:51.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision
history.
+
+ #include <cstddef> // std::size_t
++#include <climits>
+ #include <boost/config.hpp>
+
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp
boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp
2006-02-11 23:43:06.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision
history.
+
+ #include <cstddef> // size_t
++#include <climits>
+ #include <string>
+
+ #include <boost/config.hpp>
+diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp
boost_1_34_1/boost/date_time/date_facet.hpp
+--- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05
16:10:50.000000000 -0500
++++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -429,7 +429,7 @@
+ typedef std::basic_string<CharT> string_type;
+ typedef CharT char_type;
+ typedef boost::date_time::period_parser<date_type, CharT>
period_parser_type;
+- typedef special_values_parser<date_type,CharT>
special_values_parser_type;
++ typedef boost::date_time::special_values_parser<date_type,CharT>
special_values_parser_type;
+ typedef std::vector<std::basic_string<CharT> > input_collection_type;
+ typedef format_date_parser<date_type, CharT> format_date_parser_type;
+ // date_generators stuff goes here
+diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/tz_db_base.hpp
boost_1_34_1/boost/date_time/tz_db_base.hpp
+--- boost_1_34_1-ORIGINAL/boost/date_time/tz_db_base.hpp 2005-10-23
15:15:06.000000000 -0500
++++ boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -158,7 +158,7 @@
+ typedef typename time_zone_type::base_type time_zone_base_type;
+ typedef typename time_zone_type::time_duration_type
time_duration_type;
+ typedef time_zone_names_base<char_type> time_zone_names;
+- typedef dst_adjustment_offsets<time_duration_type>
dst_adjustment_offsets;
++ typedef boost::date_time::dst_adjustment_offsets<time_duration_type>
dst_adjustment_offsets;
+ typedef std::basic_string<char_type> string_type;
+
+ //! Constructs an empty database
+diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp
boost_1_34_1/boost/mpl/zip_view.hpp
+--- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02
10:40:42.000000000 -0500
++++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -37,7 +37,7 @@
+ typedef zip_iterator<
+ typename transform1<
+ IteratorSeq
+- , next<_1>
++ , boost::mpl::next<_1>
+ >::type
+ > next;
+ };
+@@ -48,8 +48,8 @@
+ struct zip_view
+ {
+ private:
+- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
+- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
++ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type
first_ones_;
++ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type
last_ones_;
+
+ public:
+ typedef nested_begin_end_tag tag;
+diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp
boost_1_34_1/boost/python/detail/def_helper.hpp
+--- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15
20:00:28.000000000 -0500
++++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -155,7 +155,7 @@
+ , T3 const&
+ , T4 const&
+ , default_call_policies
+- , keywords<0>
++ , boost::python::detail::keywords<0>
+ , char const*
+ , void(not_specified::*)() // A function pointer type which is
never an
+ // appropriate default implementation
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp
boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp
2006-07-16 11:06:38.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -24,6 +24,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+
+ namespace re_detail{
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp
boost_1_34_1/boost/regex/v4/basic_regex.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05
12:28:18.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ #ifdef BOOST_MSVC
+ #pragma warning(push)
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp
boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp
2006-12-20 11:19:05.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp
boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15
05:09:44.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -41,6 +41,7 @@
+
+ #include <istream>
+ #include <ios>
++#include <climits>
+
+ #ifdef BOOST_HAS_ABI_HEADERS
+ # include BOOST_ABI_PREFIX
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp
boost_1_34_1/boost/regex/v4/perl_matcher.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp 2006-10-18
07:55:30.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -18,6 +18,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp
boost_1_34_1/boost/regex/v4/regex_split.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp 2005-01-21
11:22:38.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -21,6 +21,8 @@
+ #ifndef BOOST_REGEX_SPLIT_HPP
+ #define BOOST_REGEX_SPLIT_HPP
+
++#include <climits>
++
+ namespace boost{
+
+ #ifdef BOOST_HAS_ABI_HEADERS
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp
boost_1_34_1/boost/regex/v4/states.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp 2005-09-20
07:01:25.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/states.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp
boost_1_34_1/boost/serialization/collection_traits.hpp
+--- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp
2005-06-21 00:19:04.000000000 -0500
++++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-03-03
03:09:49.000000000 -0600
+@@ -22,6 +22,7 @@
+ // compiles recognize the same set of primitive types, the possibility
+ // exists for archives to be non-portable if class information for primitive
+ // types is included. This is addressed by the following macros.
++#include <climits>
+ #include <boost/config.hpp>
+ #include <boost/mpl/integral_c.hpp>
+ #include <boost/mpl/integral_c_tag.hpp>
+diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp
boost_1_34_1/boost/spirit/phoenix/operators.hpp
+--- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp 2006-08-25
11:27:30.000000000 -0500
++++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -24,6 +24,7 @@
+ #include <boost/spirit/phoenix/composite.hpp>
+ #include <boost/config.hpp>
+ #include <boost/mpl/if.hpp>
++#include <climits>
+
+
///////////////////////////////////////////////////////////////////////////////
+ namespace phoenix {
+diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/tree/impl/tree_to_xml.ipp
boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp
+--- boost_1_34_1-ORIGINAL/boost/spirit/tree/impl/tree_to_xml.ipp
2006-12-02 12:13:23.000000000 -0600
++++ boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp 2008-03-03
03:08:59.000000000 -0600
+@@ -14,6 +14,7 @@
+ #include <cstdio>
+ #include <cstdarg>
+ #include <locale>
++#include <cstring>
+
+ #include <map>
+ #include <iostream>
+diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp
boost_1_34_1/boost/test/test_tools.hpp
+--- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp 2007-02-22
11:57:29.000000000 -0600
++++ boost_1_34_1/boost/test/test_tools.hpp 2008-03-03 03:08:59.000000000
-0600
+@@ -42,6 +42,7 @@
+ #include <boost/mpl/or.hpp>
+
+ // STL
++#include <climits>
+ #include <cstddef> // for std::size_t
+ #include <iosfwd>
+
+diff -aNru
boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+--- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
2006-12-20 10:38:24.000000000 -0600
++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
2008-03-03 03:08:59.000000000 -0600
+@@ -16,6 +16,7 @@
+ #include <string>
+ #include <cstdio>
+ #include <cstdarg>
++#include <cstring>
+ #if defined(BOOST_SPIRIT_DEBUG)
+ #include <iostream>
+ #endif // defined(BOOST_SPIRIT_DEBUG)
+diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp
boost_1_34_1/boost/wave/util/flex_string.hpp
+--- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp 2006-04-25
12:21:01.000000000 -0500
++++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-03-03
03:08:59.000000000 -0600
+@@ -94,6 +94,7 @@
+ #include <limits>
+ #include <stdexcept>
+ #include <cstddef>
++#include <cstring>
+
+ // this must occur after all of the includes and before any code appears
+ #ifdef BOOST_HAS_ABI_HEADERS
+diff -aNru boost_1_34_1-ORIGINAL/libs/spirit/test/numerics_tests.cpp
boost_1_34_1/libs/spirit/test/numerics_tests.cpp
+--- boost_1_34_1-ORIGINAL/libs/spirit/test/numerics_tests.cpp 2006-02-28
16:56:32.000000000 -0600
++++ boost_1_34_1/libs/spirit/test/numerics_tests.cpp 2008-03-03
03:08:59.000000000 -0600
+@@ -11,6 +11,7 @@
+ #include <boost/spirit/actor/assign_actor.hpp>
+ #include <iostream>
+ #include <boost/detail/lightweight_test.hpp>
++#include <climits>
+
+ using namespace std;
+ using namespace boost::spirit;
+diff -aNru boost_1_34_1-ORIGINAL/tools/quickbook/detail/utils.cpp
boost_1_34_1/tools/quickbook/detail/utils.cpp
+--- boost_1_34_1-ORIGINAL/tools/quickbook/detail/utils.cpp 2006-02-01
21:57:36.000000000 -0600
++++ boost_1_34_1/tools/quickbook/detail/utils.cpp 2008-03-03
03:08:59.000000000 -0600
+@@ -8,6 +8,7 @@
+ http://www.boost.org/LICENSE_1_0.txt)
+
=============================================================================*/
+ #include "./utils.hpp"
++#include <cstring>
+ #include <cctype>
+ #include <boost/spirit/core.hpp>
+
diff --git a/libs/libcap/BUILD b/libs/libcap/BUILD
index ffa51e7..546c955 100755
--- a/libs/libcap/BUILD
+++ b/libs/libcap/BUILD
@@ -1,7 +1,3 @@
# fails to compile on non amd64 with PIC, bug #9087
disable_pic &&
-sedit 's:man_prefix=.*:man_prefix=$(prefix)/share:' Make.Rules &&
-# note that, yes indeed, they typo'd the extra S
-sedit "s:^COPTFLAGS=.*:COPTFLAG=${CFLAGS}:" Make.Rules &&
-sedit "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" Make.Rules &&
make
diff --git a/libs/libcap/DETAILS b/libs/libcap/DETAILS
index 656ec54..44fb668 100755
--- a/libs/libcap/DETAILS
+++ b/libs/libcap/DETAILS
@@ -1,18 +1,12 @@
SPELL=libcap
-source $GRIMOIRE/FUNCTIONS
-KVER=$(get_kernel_version | cut -c-3)
-if [[ $KVER == 2.4 ]];then
- VERSION=1.10
-else
- VERSION=1.97
-fi
+ VERSION=2.08
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-${KVER}/$SOURCE
SOURCE2=$SOURCE.sign
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
- SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
+
SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sign
+ SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://sourceforge.net/projects/linux-privs/
ENTERED=20040330
diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index ef1f272..612b8d6 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,18 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * UP_TRIGGERS: ${VERSION:0:3} only matches 2.0, not 2.08, use :0:4
+
+2008-03-23 Vlad Glagolev <stealth AT Sourcemage.org>
+ * DETAILS: cleaned up
+ * PRE_BUILD: fixed the bug during compilation (about indent),
+ simplified sed lines, fixed install prefix broken by update to 2.08
+
+2008-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.08
+ this version supports both 2.4 and 2.6 kernels
+ * PRE_BUILD: added, fix glibc problem
+ * BUILD: move sedit to PRE_BUILD
+ * UP_TRIGGERS: added
+
2007-08-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: use get_kernel_version
works even if linux spell is not installed
diff --git a/libs/libcap/INSTALL b/libs/libcap/INSTALL
new file mode 100755
index 0000000..4ac8ba7
--- /dev/null
+++ b/libs/libcap/INSTALL
@@ -0,0 +1 @@
+prefix=$INSTALL_ROOT/usr make install
diff --git a/libs/libcap/PRE_BUILD b/libs/libcap/PRE_BUILD
new file mode 100755
index 0000000..bd9691c
--- /dev/null
+++ b/libs/libcap/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# note that, yes indeed, they typo'd the extra S
+sed -i "s:^COPTFLAGS=.*:COPTFLAG=${CFLAGS}:; \
+ s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" Make.Rules &&
+
+# fix for glibc changes
+sed -i "s:attr/:sys/:" libcap/cap_file.c &&
+
+# there's no indent for gperf..
+sed -i "s:indent -kr ::" libcap/Makefile
diff --git a/libs/libcap/UP_TRIGGERS b/libs/libcap/UP_TRIGGERS
new file mode 100755
index 0000000..f908ae4
--- /dev/null
+++ b/libs/libcap/UP_TRIGGERS
@@ -0,0 +1,16 @@
+# up_trigger everything on major version updates as most stuff links to
libcap.so.1
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
+ message "This is a possibly incompatible update of libcap..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libcap\(\|_cxx\).so.1"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/libs/libofx/HISTORY b/libs/libofx/HISTORY
index c4c1d48..e858986 100644
--- a/libs/libofx/HISTORY
+++ b/libs/libofx/HISTORY
@@ -1,3 +1,7 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * gcc43.patch: Added a modified patch to build with gcc 4.3.0
+ From
http://lists4.opensuse.org/opensuse-commit/2007-11/msg00393.html
+
2007-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.3

@@ -53,3 +57,4 @@

2003-03-02 Jose Bernardo Silva <josebernardo1 AT yahoo.com>
* First go at this one... :-)
+
diff --git a/libs/libofx/PRE_BUILD b/libs/libofx/PRE_BUILD
index 29f3c16..4b85747 100755
--- a/libs/libofx/PRE_BUILD
+++ b/libs/libofx/PRE_BUILD
@@ -3,6 +3,6 @@ cd $SOURCE_DIRECTORY &&

if [ "${LIBOFX_CVS}" == "y" ]; then
NOCONFIGURE="ON" ./autogen.sh
-#else
-# patch -p0 < $SCRIPT_DIRECTORY/explicit-qualification.patch
+else
+ patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
fi
diff --git a/libs/libofx/gcc43.patch b/libs/libofx/gcc43.patch
new file mode 100644
index 0000000..2b7bf2e
--- /dev/null
+++ b/libs/libofx/gcc43.patch
@@ -0,0 +1,157 @@
+#
+# Modfied from
http://lists4.opensuse.org/opensuse-commit/2007-11/msg00393.html
+#
+diff -Naur libofx-0.8.3.orig/lib/context.hh libofx-0.8.3/lib/context.hh
+--- libofx-0.8.3.orig/lib/context.hh 2008-03-22 16:46:56.140089316 -0700
++++ libofx-0.8.3/lib/context.hh 2008-03-22 16:50:19.762089412 -0700
+@@ -13,8 +13,9 @@
+
+ #ifndef CONTEXT_H
+ #define CONTEXT_H
+-#include <string.h>
+-#include <time.h> // for time_t
++#include <string>
++#include <cstring>
++#include <ctime> // for time_t
+ #include "libofx.h"
+ #include "ParserEventGeneratorKit.h"
+
+diff -Naur libofx-0.8.3.orig/lib/getopt.c libofx-0.8.3/lib/getopt.c
+--- libofx-0.8.3.orig/lib/getopt.c 2008-03-22 16:46:56.138090763 -0700
++++ libofx-0.8.3/lib/getopt.c 2008-03-22 16:51:35.755087850 -0700
+@@ -39,7 +39,8 @@
+ # endif
+ #endif
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstlib>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+@@ -65,14 +66,14 @@
+ #ifdef __GNU_LIBRARY__
+ /* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
+-# include <stdlib.h>
++# include <cstdlib>
+ # include <unistd.h>
+ #endif /* GNU C library. */
+
+ #ifdef VMS
+ # include <unixlib.h>
+ # if HAVE_STRING_H - 0
+-# include <string.h>
++# include <cstring>
+ # endif
+ #endif
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_container_transaction.cpp
libofx-0.8.3/lib/ofx_container_transaction.cpp
+--- libofx-0.8.3.orig/lib/ofx_container_transaction.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_container_transaction.cpp 2008-03-22
16:51:55.572087807 -0700
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include <string>
++#include <cstdlib>
+ #include "messages.hh"
+ #include "libofx.h"
+ #include "ofx_containers.hh"
+diff -Naur libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp
libofx-0.8.3/lib/ofx_request_accountinfo.cpp
+--- libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp 2008-03-22
16:52:57.719088277 -0700
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include <string>
++#include <cstdlib>
+ #include "libofx.h"
+ #include "ofx_request_accountinfo.hh"
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_request.cpp
libofx-0.8.3/lib/ofx_request.cpp
+--- libofx-0.8.3.orig/lib/ofx_request.cpp 2008-03-22 16:46:56.137089391
-0700
++++ libofx-0.8.3/lib/ofx_request.cpp 2008-03-22 16:52:45.584088317 -0700
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstring>
+ #include <string>
+ #include "messages.hh"
+ #include "libofx.h"
+diff -Naur libofx-0.8.3.orig/lib/ofx_request_statement.cpp
libofx-0.8.3/lib/ofx_request_statement.cpp
+--- libofx-0.8.3.orig/lib/ofx_request_statement.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_request_statement.cpp 2008-03-22 16:53:23.258088668
-0700
+@@ -22,6 +22,8 @@
+ #endif
+
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ #include "libofx.h"
+ #include "ofx_utilities.hh"
+ #include "ofx_request_statement.hh"
+diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.cpp
libofx-0.8.3/lib/ofx_utilities.cpp
+--- libofx-0.8.3.orig/lib/ofx_utilities.cpp 2008-03-22 16:46:56.138090763
-0700
++++ libofx-0.8.3/lib/ofx_utilities.cpp 2008-03-22 16:54:01.984088246 -0700
+@@ -19,9 +19,11 @@
+ #include <iostream>
+ #include "ParserEventGeneratorKit.h"
+ #include "SGMLApplication.h"
+-#include <time.h>
++#include <ctime>
+ #include <string>
+-#include <locale.h>
++#include <cstring>
++#include <clocale>
++#include <cstdlib>
+ #include "messages.hh"
+ #include "ofx_utilities.hh"
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.hh
libofx-0.8.3/lib/ofx_utilities.hh
+--- libofx-0.8.3.orig/lib/ofx_utilities.hh 2008-03-22 16:46:56.140089316
-0700
++++ libofx-0.8.3/lib/ofx_utilities.hh 2008-03-22 16:54:20.736087907 -0700
+@@ -17,8 +17,9 @@
+
***************************************************************************/
+ #ifndef OFX_UTIL_H
+ #define OFX_UTIL_H
+-#include <string.h>
+-#include <time.h> // for time_t
++#include <string>
++#include <cstring>
++#include <ctime> // for time_t
+ #include "ParserEventGeneratorKit.h"
+ using namespace std;
+ /* This file contains various simple functions for type conversion & al */
+diff -Naur libofx-0.8.3.orig/ofxconnect/cmdline.c
libofx-0.8.3/ofxconnect/cmdline.c
+--- libofx-0.8.3.orig/ofxconnect/cmdline.c 2008-03-22 16:46:56.063088460
-0700
++++ libofx-0.8.3/ofxconnect/cmdline.c 2008-03-22 16:54:41.572088480 -0700
+@@ -9,9 +9,9 @@
+ */
+
+
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+
+ /* If we use autoconf. */
+ #ifdef HAVE_CONFIG_H
+diff -Naur libofx-0.8.3.orig/ofxdump/ofxdump.cpp
libofx-0.8.3/ofxdump/ofxdump.cpp
+--- libofx-0.8.3.orig/ofxdump/ofxdump.cpp 2008-03-22 16:46:56.063088460
-0700
++++ libofx-0.8.3/ofxdump/ofxdump.cpp 2008-03-22 16:55:19.420088363 -0700
+@@ -30,8 +30,11 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <string>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include "libofx.h"
+-#include <stdio.h> /* for printf() */
++#include <cstdio> /* for printf() */
+ #include <config.h> /* Include config constants, e.g., VERSION TF
*/
+ #include <errno.h>
+
diff --git a/libs/neon/DEPENDS b/libs/neon/DEPENDS
index 385fe0d..703bc1f 100755
--- a/libs/neon/DEPENDS
+++ b/libs/neon/DEPENDS
@@ -1,5 +1,6 @@
-depends zlib '--with-zlib' &&
+depends e2fsprogs &&
depends libxml2 '--with-libxml2' &&
+depends zlib '--with-zlib' &&

# TODO also supports --with-ssl=gnutls
optional_depends openssl \
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index 444b29a..da99b9c 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err
+
2007-07-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.26.4

diff --git a/lua-forge/lgui/DETAILS b/lua-forge/lgui/DETAILS
index 52c208a..636c46b 100755
--- a/lua-forge/lgui/DETAILS
+++ b/lua-forge/lgui/DETAILS
@@ -1,8 +1,8 @@
SPELL=lgui
- VERSION=0.6.0
+ VERSION=0.7.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.tuxfamily.org/oproj/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c6a1561a9e82249afbed59694fa7d211b4a8498135d098e9b3cd1b00b34f07d5601726c0d5c1da79164c7ddcc3f7fd3e28eaf57864a349f64efb8b4fe731b646
+
SOURCE_HASH=sha512:b232721c0100b1de8456ef670548e4f72bc98e79c56450ba709900b5e69ae7108a2844d9c600f747dfdd3fe0f55804a72a1851b3198ea7561bed00c982473b18
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://oproj.tuxfamily.org/index.php?n=Projects.Lgui
LICENSE[0]=LGPL
diff --git a/lua-forge/lgui/HISTORY b/lua-forge/lgui/HISTORY
index f9a3127..e1bfd3f 100644
--- a/lua-forge/lgui/HISTORY
+++ b/lua-forge/lgui/HISTORY
@@ -1,2 +1,5 @@
+2008-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.0
+
2008-03-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS, BUILD, INSTALL: spell created
diff --git a/lua-forge/luafilesystem/DETAILS b/lua-forge/luafilesystem/DETAILS
index 6f4cc9b..7979c71 100755
--- a/lua-forge/luafilesystem/DETAILS
+++ b/lua-forge/luafilesystem/DETAILS
@@ -1,7 +1,7 @@
SPELL=luafilesystem
VERSION=1.4.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://luaforge.net/frs/download.php/2679/$SOURCE
+ SOURCE_URL[0]=http://luaforge.net/frs/download.php/3158/$SOURCE

SOURCE_HASH=sha512:b612862f147f86145f3c51d8f675c444c21b07b62d48432c91b58895bec837fd9e26f8d35d9c2048e94dc75fd49351d841d0e783e865ab2833ae951036a38c3c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.keplerproject.org/luafilesystem/
diff --git a/lua-forge/luafilesystem/HISTORY b/lua-forge/luafilesystem/HISTORY
index 225f375..7765151 100644
--- a/lua-forge/luafilesystem/HISTORY
+++ b/lua-forge/luafilesystem/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: fixed source url
+
2008-03-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated to 1.4.0

diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index af6810c..3ed3d78 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to enable compilation with gcc 4.3.0
+ From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+
2008-02-27 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.0.0.12, SECURITY_PATCH=11

diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 9e3013f..c9eda68 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&

+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
cp mail/config/mozconfig .mozconfig &&

if [ "$BUILD_ENIGMAIL" = "y" ]; then
diff --git a/mail/thunderbird/gcc43.patch b/mail/thunderbird/gcc43.patch
new file mode 100644
index 0000000..6bda134
--- /dev/null
+++ b/mail/thunderbird/gcc43.patch
@@ -0,0 +1,1618 @@
+#
+# From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+#
+Index: xpcom/obsolete/component/nsFileSpecImpl.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.cpp
+diff -N xpcom/obsolete/component/nsFileSpecImpl.cpp
+--- xpcom/obsolete/component/nsFileSpecImpl.cpp 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,857 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Pierre Phaneuf <pp AT ludusdesign.com>
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles
alone.
+-
+-#include "nsIFileStream.h"
+-#include "nsFileStream.h"
+-
+-#include "nsILocalFile.h"
+-
+-#include "prmem.h"
+-
+-NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
+-
+-#ifdef NS_DEBUG
+-#define TEST_OUT_PTR(p) \
+- if (!(p)) \
+- return NS_ERROR_NULL_POINTER;
+-#else
+-#define TEST_OUT_PTR(p)
+-#endif
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+- : mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
+-//----------------------------------------------------------------------------------------
+- : mFileSpec(inSpec)
+- , mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::~nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- CloseStream();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-/* static */
+-nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec,
nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return it->QueryInterface(NS_GET_IID(nsIFileSpec), (void **) result);
+-} // nsFileSpecImpl::MakeInterface
+-
+-#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
+-//----------------------------------------------------------------------------------------
+-{
+- if (original) {
+- nsresult rv = ((nsIFileSpec *)original)->GetFileSpec( &mFileSpec);
+- if (NS_SUCCEEDED( rv))
+- return mFileSpec.Error();
+- else
+- return( rv);
+- }
+- else
+- return( NS_ERROR_FAILURE);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
+- PRBool *_retval)
+-{
+- *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aURLString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFileURL url(mFileSpec);
+- *aURLString = nsCRT::strdup(url.GetURLString());
+- if (!*aURLString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-} // nsFileSpecImpl::GetURLString
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFileURL(aURLString);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char *
*aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aUnixStyleFilePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFilePath path(mFileSpec);
+- *aUnixStyleFilePath = nsCRT::strdup((const char*) path);
+- if (!*aUnixStyleFilePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char *
aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFilePath(aUnixStyleFilePath);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char *
*aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aPersistentDescriptorString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsPersistentFileDescriptor desc(mFileSpec);
+- nsCAutoString data;
+- desc.GetData(data);
+- *aPersistentDescriptorString = ToNewCString(data);
+- if (!*aPersistentDescriptorString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char *
aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsPersistentFileDescriptor desc(mFileSpec);
+- desc.SetData(nsDependentCString(aPersistentDescriptorString));
+- mFileSpec = desc;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNativePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- *aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
+- if (!*aNativePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aNativePath;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNSPRPath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsNSPRPath path(mFileSpec);
+- *aNSPRPath = nsCRT::strdup((const char*) path);
+- if (!*aNSPRPath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Error()
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Valid();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- *_retval = mFileSpec.Failed();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aLeafName)
+- *aLeafName = mFileSpec.GetLeafName();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.SetLeafName(aLeafName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aParent)
+- nsFileSpec parent;
+- mFileSpec.GetParent(parent);
+- return MakeInterface(parent, aParent);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char
*suggestedName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique(suggestedName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aModDate)
+- nsFileSpec::TimeStamp stamp;
+- mFileSpec.GetModDate(stamp);
+- *aModDate = stamp;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool
*_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.ModDateChanged(oldStamp);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsDirectory();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsFile();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Exists();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsHidden();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsSymlink();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
+-//----------------------------------------------------------------------------------------
+-{
+- PRBool ignore;
+- return mFileSpec.ResolveSymlink(ignore);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSize)
+- *aFileSize = mFileSpec.GetFileSize();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64
*aDiskSpaceAvailable)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aDiskSpaceAvailable)
+- *aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char
*relativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec += relativePath;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Touch()
+-//----------------------------------------------------------------------------------------
+-{
+- // create an empty file, like the UNIX touch command.
+- nsresult rv;
+- rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- rv = CloseStream();
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CreateDir()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.CreateDir();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Delete(PRBool aRecursive)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.Delete(aRecursive);
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Truncate(PRInt32 aNewLength)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Truncate(aNewLength);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Rename(newLeafName);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.CopyToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.MoveToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Execute(args);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- nsresult result =
NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
+- if (NS_SUCCEEDED(result))
+- result =
NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CloseStream()
+-//----------------------------------------------------------------------------------------
+-{
+- NS_IF_RELEASE(mInputStream);
+- NS_IF_RELEASE(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = (mInputStream || mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mInputStream;
+- NS_IF_ADDREF(mInputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mOutputStream;
+- NS_IF_ADDREF(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 count;
+- rv = Write(inString, PL_strlen(inString), &count);
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = nsnull;
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 theSize;
+- rv = GetFileSize((PRUint32*)&theSize);
+- if (NS_SUCCEEDED(rv))
+- rv = Read(_retval, theSize, &theSize);
+- if (NS_SUCCEEDED(rv))
+- (*_retval)[theSize] = 0;
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSpec)
+- *aFileSpec = mFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Equals(nsIFileSpec *spec, PRBool *result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv;
+-
+- if (!result || !spec) return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpec otherSpec;
+-
+- rv = spec->GetFileSpec(&otherSpec);
+- if (NS_FAILED(rv)) return rv;
+-
+- if (mFileSpec == otherSpec) {
+- *result = PR_TRUE;
+- }
+- else {
+- *result = PR_FALSE;
+- }
+-
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.eof();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount,
PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- TEST_OUT_PTR(buffer)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*buffer)
+- *buffer = (char*)PR_Malloc(requestedCount + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.read(*buffer, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize,
PRBool *wasTruncated)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(wasTruncated)
+- TEST_OUT_PTR(line)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*line)
+- *line = (char*)PR_Malloc(bufferSize + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *wasTruncated = !s.readline(*line, bufferSize);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32
requestedCount, PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- //if (!mOutputStream)
+- // return NS_ERROR_NULL_POINTER;
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv))
+- return rv;
+- }
+- nsOutputFileStream s(mOutputStream);
+- *_retval = s.write(data, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Flush()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mOutputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsOutputFileStream s(mOutputStream);
+- s.flush();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult result = NS_OK;
+- if (mOutputStream)
+- {
+- nsOutputFileStream os(mOutputStream);
+- os.seek(offset);
+- result = os.error();
+- }
+- if (NS_SUCCEEDED(result) && mInputStream)
+- {
+- nsInputFileStream is(mInputStream);
+- is.seek(offset);
+- result = is.error();
+- }
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.tell();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::EndLine()
+-//----------------------------------------------------------------------------------------
+-{
+- nsOutputFileStream s(mOutputStream);
+- s << nsEndl;
+- return s.error();
+-}
+-
+-NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+- : mDirectoryIterator(nsnull)
+-{
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool
resolveSymlink)
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+- mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent),
resolveSymlink);
+- if (!mDirectoryIterator)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- *_retval = mDirectoryIterator->Exists();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- (*mDirectoryIterator)++;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec *
*aCurrentSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(),
aCurrentSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Create(nsISupports* outer, const
nsIID& aIID, void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID,
void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpecImpl* it = new nsFileSpecImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec
**result)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!result)
+- return NS_ERROR_NULL_POINTER;
+-
+- return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpec(nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec),
(void**)result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecFromIFile(nsIFile *aFile, nsIFileSpec **result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = nsFileSpecImpl::Create(nsnull,
NS_GET_IID(nsIFileSpec), (void**)result);
+- if (NS_FAILED(rv)) return rv;
+-
+- nsCAutoString path;
+- rv = aFile->GetNativePath(path);
+- if (NS_FAILED(rv)) return rv;
+-
+- rv = (*result)->SetNativePath(path.get());
+- if (NS_FAILED(rv))
+- NS_RELEASE(*result);
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsDirectoryIteratorImpl::Create(nsnull,
NS_GET_IID(nsIDirectoryIterator), (void**)result);
+-}
+Index: xpcom/obsolete/component/nsFileSpecImpl.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.h
+diff -N xpcom/obsolete/component/nsFileSpecImpl.h
+--- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000
1.3
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,116 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#ifndef _FILESPECIMPL_H_
+-#define _FILESPECIMPL_H_
+-
+-#include "nscore.h"
+-#include "nsIFileSpec.h"
+-#include "nsFileSpec.h"
+-
+-//========================================================================================
+-class nsFileSpecImpl
+-//========================================================================================
+- : public nsIFileSpec
+-{
+-
+- public:
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_DECL_NSIFILESPEC
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+- //----------------------
+- // Implementation
+- //----------------------
+-
+- nsFileSpecImpl();
+- nsFileSpecImpl(const nsFileSpec& inSpec);
+- static nsresult MakeInterface(const nsFileSpec& inSpec, nsIFileSpec**
outSpec);
+-
+- //----------------------
+- // Data
+- //----------------------
+-
+- nsFileSpec
mFileSpec;
+- nsIInputStream* mInputStream;
+- nsIOutputStream* mOutputStream;
+-
+-private:
+- ~nsFileSpecImpl();
+-}; // class nsFileSpecImpl
+-
+-//========================================================================================
+-class nsDirectoryIteratorImpl
+-//========================================================================================
+- : public nsIDirectoryIterator
+-{
+-
+-public:
+-
+- nsDirectoryIteratorImpl();
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_IMETHOD Init(nsIFileSpec *parent, PRBool resolveSymlink);
+-
+- NS_IMETHOD Exists(PRBool *_retval);
+-
+- NS_IMETHOD Next();
+-
+- NS_IMETHOD GetCurrentSpec(nsIFileSpec * *aCurrentSpec);
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+-private:
+- ~nsDirectoryIteratorImpl();
+-
+-protected:
+- nsDirectoryIterator*
mDirectoryIterator;
+-}; // class nsDirectoryIteratorImpl
+-
+-#endif // _FILESPECIMPL_H_
+Index: xpcom/obsolete/component/nsIRegistry.idl
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistry.idl
+diff -N xpcom/obsolete/component/nsIRegistry.idl
+--- xpcom/obsolete/component/nsIRegistry.idl 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,186 +0,0 @@
+-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org Code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1999
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#include "nsISupports.idl"
+-#include "nsIEnumerator.idl"
+-
+-interface nsIFile;
+-
+-typedef PRUint32 nsRegistryKey;
+-typedef long nsWellKnownRegistry;
+-
+-[scriptable,uuid(5D41A440-8E37-11d2-8059-00600811A9C3)]
+-interface nsIRegistry : nsISupports
+-{
+- const long None = 0;
+- const long Users = 1;
+- const long Common = 2;
+- const long CurrentUser = 3;
+-
+- const long ApplicationComponentRegistry = 1;
+- const long ApplicationRegistry = 2;
+-
+- // Dont use this one. This for internal use only.
+- const long ApplicationCustomRegistry = -1;
+-
+- void open(in nsIFile regFile);
+- void openWellKnownRegistry(in nsWellKnownRegistry regid);
+-
+- void flush();
+- boolean isOpen();
+-
+- nsRegistryKey addKey(in nsRegistryKey baseKey, in wstring keyname);
+- nsRegistryKey getKey(in nsRegistryKey baseKey, in wstring keyname);
+- void removeKey(in nsRegistryKey baseKey, in wstring keyname);
+-
+- wstring getString(in nsRegistryKey baseKey, in wstring valname);
+- void setString(in nsRegistryKey baseKey, in wstring valname, in wstring
value);
+-
+- string getStringUTF8(in nsRegistryKey baseKey, in string path);
+- void setStringUTF8(in nsRegistryKey baseKey, in string path, in string
value);
+-
+- void getBytesUTF8(in nsRegistryKey baseKey, in string path, out
PRUint32 length, [retval, array, size_is(length)] out PRUint8 valueArray);
+- void setBytesUTF8(in nsRegistryKey baseKey, in string path, in PRUint32
length, [array, size_is(length)] in PRUint8 valueArray);
+- PRInt32 getInt(in nsRegistryKey baseKey, in string path);
+- void setInt(in nsRegistryKey baseKey, in string path, in PRInt32 value);
+- PRInt64 getLongLong(in nsRegistryKey baseKey, in string path);
+- void setLongLong(in nsRegistryKey baseKey, in string path, inout
PRInt64 value);
+-
+- /**
+- * addSubtree() and friends need to be renamed to addKeyUTF8().
+- * If you are using these forms make sure you pass UTF8 data
+- */
+- nsRegistryKey addSubtree(in nsRegistryKey baseKey, in string path);
+- void removeSubtree(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtree(in nsRegistryKey baseKey, in string path);
+-
+- nsRegistryKey addSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- void removeSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtreeRaw(in nsRegistryKey baseKey, in string path);
+-
+- nsIEnumerator enumerateSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateAllSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateValues(in nsRegistryKey baseKey);
+-
+- const unsigned long String = 1;
+- const unsigned long Int32 = 2;
+- const unsigned long Bytes = 3;
+- const unsigned long File = 4;
+-
+- unsigned long getValueType(in nsRegistryKey baseKey, in string path);
+- PRUint32 getValueLength(in nsRegistryKey baseKey, in string path);
+- void deleteValue(in nsRegistryKey baseKey, in string path);
+-
+- /**
+- * escapeKey() takes arbitrary binary data and converts it into
+- * valid ASCII which can be used as registry key or value names
+- */
+- void escapeKey([array, size_is(length)] in PRUint8 key, in PRUint32
terminator, inout PRUint32 length, [retval, array, size_is(length)] out
PRUint8 escaped);
+- void unescapeKey([array, size_is(length)] in PRUint8 escaped, in
PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)]
out PRUint8 key);
+-
+- attribute string currentUserName;
+-
+- void pack();
+-};
+-
+-[scriptable, uuid(8cecf236-1dd2-11b2-893c-f9848956eaec)]
+-interface nsIRegistryEnumerator : nsIEnumerator
+-{
+- void currentItemInPlaceUTF8(out nsRegistryKey key,
+- [shared, retval] out string item);
+-};
+-
+-[scriptable, uuid(D1B54831-AC07-11d2-805E-00600811A9C3)]
+-interface nsIRegistryNode : nsISupports
+-{
+- readonly attribute string nameUTF8;
+- readonly attribute wstring name;
+- readonly attribute nsRegistryKey key;
+-};
+-
+-[scriptable,uuid(5316C380-B2F8-11d2-A374-0080C6F80E4B)]
+-interface nsIRegistryValue : nsISupports
+-{
+- readonly attribute wstring name;
+- readonly attribute string nameUTF8;
+- readonly attribute unsigned long type;
+- readonly attribute PRUint32 length;
+-};
+-
+-[uuid(3A15FC88-7A61-4Ab4-8E58-31E95fAB3DA8)]
+-/**
+- * It sucks that nsIRegistry has to always allocate and return
+- * strings. nsIRegistryGetter adds in interfaces for non allocating getters
+- * to registry values.
+- */
+-interface nsIRegistryGetter : nsISupports
+-{
+- /**
+- * Get a string value of attribute valname in widestring or utf8 format
+- *
+- * @return
+- * NS_OK on success.
+- * buf has the string value copied into it. length is NOT changed.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in chars including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various failure codes otherwise. buf and length wont be updated.
+- */
+- void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout char buf, inout PRUint32 length);
+-
+- /**
+- * Get a a byte array value of attribute valname
+- *
+- * @return
+- * NS_OK on success. buf has the string value copied into it.
+- * length is updated to actual number of bytes copied into buf.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in PRUint8s including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various other failure codes otherwise. buf and length wont be
updated.
+- */
+- void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout PRUint8 buf, inout PRUint32 length);
+-};
+-
+-%{ C++
+-#include "nsIRegistryUtils.h"
+-%}
+Index: xpcom/obsolete/component/nsIRegistryUtils.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistryUtils.h
+diff -N xpcom/obsolete/component/nsIRegistryUtils.h
+--- xpcom/obsolete/component/nsIRegistryUtils.h 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,63 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#ifndef __nsIRegistryUtils_h
+-#define __nsIRegistryUtils_h
+-
+-#define NS_REGISTRY_CONTRACTID "@mozilla.org/registry;1"
+-#define NS_REGISTRY_CLASSNAME "Mozilla Registry"
+-/* be761f00-a3b0-11d2-996c-0080c7cb1081 */
+-#define NS_REGISTRY_CID \
+-{ \
+- 0xbe761f00, \
+- 0xa3b0, \
+- 0x11d2, \
+- {0x99, 0x6c, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} \
+-}
+-
+-/*------------------------------- Error Codes
----------------------------------
+-------------------------------------------------------------------------------*/
+-#define NS_ERROR_REG_BADTYPE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 1 )
+-#define NS_ERROR_REG_NO_MORE NS_ERROR_GENERATE_SUCCESS(
NS_ERROR_MODULE_REG, 2 )
+-#define NS_ERROR_REG_NOT_FOUND NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 3 )
+-#define NS_ERROR_REG_NOFILE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 4 )
+-#define NS_ERROR_REG_BUFFER_TOO_SMALL NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 5 )
+-#define NS_ERROR_REG_NAME_TOO_LONG NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 6 )
+-#define NS_ERROR_REG_NO_PATH NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 7 )
+-#define NS_ERROR_REG_READ_ONLY NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 8 )
+-#define NS_ERROR_REG_BAD_UTF8 NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 9 )
+-
+-#endif
+Index: xpcom/obsolete/component/regExport.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/regExport.cpp
+diff -N xpcom/obsolete/component/regExport.cpp
+--- xpcom/obsolete/component/regExport.cpp 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,357 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include <stdio.h>
+-
+-#include "nsIServiceManager.h"
+-#include "nsIComponentManager.h"
+-#include "nsCOMPtr.h"
+-#include "nsIRegistry.h"
+-#include "nsIEnumerator.h"
+-#include "nsILocalFile.h"
+-#include "nsDependentString.h"
+-#include "prmem.h"
+-#include "plstr.h"
+-#include "nsMemory.h"
+-
+-static void display( nsIRegistry *reg, nsRegistryKey root, const char *name
);
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root );
+-static void printString( const char *value, int indent );
+-
+-int main( int argc, char *argv[] ) {
+-
+-
+-#ifdef __MWERKS__
+- // Hack in some arguments. A NULL registry name is supposed to tell
libreg
+- // to use the default registry (which does seem to work).
+- argc = 1;
+- const char* myArgs[] =
+- {
+- "regExport"
+- };
+- argv = const_cast<char**>(myArgs);
+-#endif
+-
+- nsresult rv;
+-
+- // Initialize XPCOM
+- nsIServiceManager *servMgr = NULL;
+- rv = NS_InitXPCOM2(&servMgr, NULL, NULL);
+- if (NS_FAILED(rv))
+- {
+- // Cannot initialize XPCOM
+- printf("Cannot initialize XPCOM. Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+- {
+- // Get the component manager
+- static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
+- nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
+- if (NS_FAILED(rv))
+- {
+- // Cant get component manager
+- printf("Cannot get component manager from service manager..
Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+-
+- nsIRegistry *reg;
+-
+- if (argc>1) {
+- // Create the registry
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening registry file %s, rv=0x%08X\n",
argv[1] , (int)rv );
+- return rv;
+- }
+- // Open it against the input file name.
+- nsCOMPtr<nsILocalFile> regFile;
+- rv = NS_NewNativeLocalFile( nsDependentCString(argv[1]),
PR_FALSE, getter_AddRefs(regFile) );
+- if ( NS_FAILED(rv) ) {
+- printf( "Error instantiating local file for %s,
rv=0x%08X\n", argv[1], (int)rv );
+- return rv;
+- }
+-
+- rv = reg->Open( regFile );
+-
+- if ( rv == NS_OK )
+- {
+- printf( "Registry %s opened OK.\n", argv[1] );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- else
+- {
+- // Called with no arguments. Print both the default registry
and
+- // the components registry. We already printed the default
regsitry.
+- // So just do the component registry.
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+-
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening creating registry instance,
rv=0x%08X\n", (int)rv );
+- return rv;
+- }
+- rv =
reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+- if ( rv == NS_ERROR_REG_BADTYPE ) {
+- printf( "\n\n\nThere is no <Application Component
Registry>\n" );
+- }
+- else if ( rv == NS_OK ) {
+-
+- printf( "\n\n\nRegistry %s opened OK.\n", "<Application
Component Registry>\n" );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- }
+- NS_ShutdownXPCOM( servMgr );
+-
+- return rv;
+-}
+-
+-void display( nsIRegistry *reg, nsRegistryKey root, const char *rootName ) {
+- // Print out key name.
+- printf( "%s\n", rootName );
+-
+- // Make sure it isn't a "root" key.
+- if ( root != nsIRegistry::Common
+- &&
+- root != nsIRegistry::Users
+- &&
+- root != nsIRegistry::CurrentUser ) {
+- // Print values stored under this key.
+- displayValues( reg, root );
+- }
+-
+- // Enumerate all subkeys (immediately) under the given node.
+- nsIEnumerator *keys;
+- nsresult rv = reg->EnumerateSubtrees( root, &keys );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Set enumerator to beginning.
+- rv = keys->First();
+- // Enumerate subkeys till done.
+- while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) {
+- nsISupports *base;
+- rv = keys->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryNode *node;
+- nsIID nodeIID = NS_IREGISTRYNODE_IID;
+- rv = base->QueryInterface( nodeIID, (void**)&node );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = node->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Build complete name.
+- char *fullName = new char[ PL_strlen(rootName) +
PL_strlen(name) + 5 ];
+- PL_strcpy( fullName, rootName );
+- PL_strcat( fullName, " - " );
+- PL_strcat( fullName, name );
+- // Display contents under this subkey.
+- nsRegistryKey key;
+- rv = reg->GetSubtreeRaw( root, name, &key );
+- if ( rv == NS_OK ) {
+- display( reg, key, fullName );
+- printf( "\n" );
+- } else {
+- printf( "Error getting key, rv=0x%08X\n",
(int)rv );
+- }
+- delete [] fullName;
+- } else {
+- printf( "Error getting subtree name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- node->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = keys->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- }
+- }
+- // Release key enumerator.
+- keys->Release();
+- } else {
+- printf( "Error creating enumerator for %s, root=0x%08X,
rv=0x%08X\n",
+- rootName, (int)root, (int)rv );
+- }
+- return;
+-}
+-
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root ) {
+- // Emumerate values at this registry location.
+- nsIEnumerator *values;
+- nsresult rv = reg->EnumerateValues( root, &values );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Go to beginning.
+- rv = values->First();
+-
+- // Enumerate values till done.
+- while( rv == NS_OK && (NS_OK != values->IsDone()) ) {
+- nsISupports *base;
+- rv = values->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryValue *value;
+- nsIID valueIID = NS_IREGISTRYVALUE_IID;
+- rv = base->QueryInterface( valueIID, (void**)&value );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = value->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Print name:
+- printf( "\t\t%s", name );
+- // Get info about this value.
+- PRUint32 type;
+- rv = reg->GetValueType( root, name, &type );
+- if ( rv == NS_OK ) {
+- // Print value contents.
+- switch ( type ) {
+- case nsIRegistry::String: {
+- char *strValue;
+- rv = reg->GetStringUTF8( root,
name, &strValue );
+- if ( rv == NS_OK ) {
+- printString( strValue,
strlen(name) );
+- nsMemory::Free( strValue );
+- } else {
+- printf( "\t Error getting
string value, rv=0x%08X", (int)rv );
+- }
+- }
+- break;
+-
+- case nsIRegistry::Int32:
+- {
+- PRInt32 val = 0;
+- rv = reg->GetInt( root, name, &val
);
+- if (NS_SUCCEEDED(rv)) {
+- printf( "\t= Int32 [%d, 0x%x]",
val, val);
+- }
+- else {
+- printf( "\t Error getting int32
value, rv=%08X", (int)rv);
+- }
+- }
+- break;
+-
+- case nsIRegistry::Bytes:
+- printf( "\t= Bytes" );
+- break;
+-
+- case nsIRegistry::File:
+- printf( "\t= File (?)" );
+- break;
+-
+- default:
+- printf( "\t= ? (unknown type=0x%02X)",
(int)type );
+- break;
+- }
+- } else {
+- printf( "\t= ? (error getting value,
rv=0x%08X)", (int)rv );
+- }
+- printf("\n");
+- nsMemory::Free( name );
+- } else {
+- printf( "Error getting value name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- value->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = values->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- break;
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- break;
+- }
+- }
+-
+- values->Release();
+- } else {
+- printf( "\t\tError enumerating values, rv=0x%08X\n", (int)rv );
+- }
+- return;
+-}
+-
+-static void printString( const char *value, int /*indent*/ ) {
+- // For now, just dump contents.
+- printf( "\t = %s", value );
+- return;
+-}
+
diff --git a/mail/tkrat/DETAILS b/mail/tkrat/DETAILS
index 35ececb..8d04a82 100755
--- a/mail/tkrat/DETAILS
+++ b/mail/tkrat/DETAILS
@@ -1,11 +1,10 @@
SPELL=tkrat
- VERSION=2.1.4
+ VERSION=2.1.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.tkrat.org/downloads/stable/$SOURCE
SOURCE_URL[1]=ftp://ftp.tkrat.org/pub/tkrat/$SOURCE
-
SOURCE_URL[2]=ftp://download.sourcemage.org/pub/linux/distributions/sourcemage/mirror/$SOURCE
-
SOURCE_HASH=sha512:3ff085b2a0f7b0f1c6b60d16413f08e4bd4a04d1f4bad8235e7ec6795102f8480a5e2ae950b4f48093a7dd2c627b0866e17420a51859a1763de2fa7da5d95cc0
+
SOURCE_HASH=sha512:8df678b6634349656485ef8e071948d181b1da18b922d0bb4f51563ba652575c462930730019706f7885c60bdaa9a5710f9d0c7f3531221a72a1be67bf61b555
WEB_SITE=http://www.tkrat.org
ENTERED=20020309
LICENSE[0]=http://www.tkrat.org
diff --git a/mail/tkrat/HISTORY b/mail/tkrat/HISTORY
index 61ad4ae..beb8a03 100644
--- a/mail/tkrat/HISTORY
+++ b/mail/tkrat/HISTORY
@@ -1,3 +1,9 @@
+2008-03-22 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: version 2.1.5;
+ removed SOURCE_URL[2] (was ftp://download.sourcemage.org/...)
+ * PRE_BUILD: Added, patch to compile with newer tk versions.
+ * tkmanagegeometry.patch: Added.
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/mail/tkrat/PRE_BUILD b/mail/tkrat/PRE_BUILD
new file mode 100755
index 0000000..3310ec8
--- /dev/null
+++ b/mail/tkrat/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p0 < $SPELL_DIRECTORY/tkmanagegeometry.patch
diff --git a/mail/tkrat/tkmanagegeometry.patch
b/mail/tkrat/tkmanagegeometry.patch
new file mode 100644
index 0000000..a23335e
--- /dev/null
+++ b/mail/tkrat/tkmanagegeometry.patch
@@ -0,0 +1,20 @@
+--- tkrat-2.1.5/lib/ratDummy.c.orig 2008-03-22 20:44:31.000000000 +0000
++++ tkrat-2.1.5/lib/ratDummy.c 2008-03-22 21:10:39.000000000 +0000
+@@ -11,6 +11,7 @@
+ * COPYRIGHT, included with this distribution.
+ */
+
++#define Tk_ManageGeometry_TCL_DECLARED
+ #include <tk.h>
+ #ifndef CONST84
+ # define CONST84
+--- tkrat-2.1.5/util/rat_dummy.c.orig 2008-03-22 21:02:32.000000000 +0000
++++ tkrat-2.1.5/util/rat_dummy.c 2008-03-22 21:10:42.000000000 +0000
+@@ -11,6 +11,7 @@
+ * COPYRIGHT, included with this distribution.
+ */
+
++#define Tk_ManageGeometry_TCL_DECLARED
+ #include <tk.h>
+
+ #ifndef CONST84
diff --git a/net/iptraf/HISTORY b/net/iptraf/HISTORY
index 76a8e7f..16bc89c 100644
--- a/net/iptraf/HISTORY
+++ b/net/iptraf/HISTORY
@@ -1,3 +1,7 @@
+2008-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, iptraf-3.0.0-headerfix.patch: added a patch from
+ gentoo to make iptraf compile
+
2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* slightly modified patch from Renan Merour fixing #11506:
* DETAILS: Version bump to 3.0.0
diff --git a/net/iptraf/PRE_BUILD b/net/iptraf/PRE_BUILD
index 6cfb1c5..c5512ea 100755
--- a/net/iptraf/PRE_BUILD
+++ b/net/iptraf/PRE_BUILD
@@ -3,4 +3,5 @@ cd $SOURCE_DIRECTORY/src &&
local KVER=$(get_kernel_version) &&
if [[ ${KVER:0:3} == 2.6 ]]; then
patch -p2 < ${SPELL_DIRECTORY}/iptraf_headers.patch
-fi
+fi &&
+patch -p2 < $SCRIPT_DIRECTORY/iptraf-3.0.0-headerfix.patch
diff --git a/net/iptraf/iptraf-3.0.0-headerfix.patch
b/net/iptraf/iptraf-3.0.0-headerfix.patch
new file mode 100644
index 0000000..604d63e
--- /dev/null
+++ b/net/iptraf/iptraf-3.0.0-headerfix.patch
@@ -0,0 +1,25 @@
+diff -Naur iptraf-3.0.0-minus/src/othptab.c iptraf-3.0.0/src/othptab.c
+--- iptraf-3.0.0-minus/src/othptab.c 2006-09-27 03:30:33.000000000 +0200
++++ iptraf-3.0.0/src/othptab.c 2006-09-27 03:34:24.000000000 +0200
+@@ -17,6 +17,7 @@
+ ***/
+
+ #include <asm/types.h>
++#include <sys/types.h>
+ #include <linux/if_ether.h>
+ #include <winops.h>
+ #include "arphdr.h"
+diff -Naur iptraf-3.0.0-minus/src/tr.c iptraf-3.0.0/src/tr.c
+--- iptraf-3.0.0-minus/src/tr.c 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/tr.c 2006-09-27 03:32:54.000000000 +0200
+@@ -7,8 +7,8 @@
+ */
+
+ #include <asm/types.h>
+-#include <linux/if_tr.h>
+ #include <netinet/in.h>
++#include <linux/if_tr.h>
+
+ unsigned int get_tr_ip_offset(unsigned char *pkt)
+ {
+
diff --git a/net/nfs-utils/DEPENDS b/net/nfs-utils/DEPENDS
index db9ef59..819ea8f 100755
--- a/net/nfs-utils/DEPENDS
+++ b/net/nfs-utils/DEPENDS
@@ -3,6 +3,11 @@ depends gnupg &&
depends portmap &&
depends smgl-fhs

+optional_depends tcp_wrappers \
+ "--with-tcp-wrappers" \
+ "--without-tcp-wrappers" \
+ "for TCP wrapper based access control"
+
#
# See http://www.citi.umich.edu/projects/nfsv4/linux/ for NFSv4 support
#
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index c6dcab7..d6a2901 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=nfs-utils
- VERSION=1.1.1
+ VERSION=1.1.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index ebbe416..262fdc7 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,13 @@
+2008-03-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * init.d/nfs: remove kernel nfsd on shutdown else it fails to
+ restart correctly afterwards
+
+2008-03-21 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: optionally depends on tcp wrappers
+
+2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.2
+
2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.1

diff --git a/net/nfs-utils/init.d/nfs b/net/nfs-utils/init.d/nfs
index fa2aa56..4be5452 100644
--- a/net/nfs-utils/init.d/nfs
+++ b/net/nfs-utils/init.d/nfs
@@ -73,6 +73,8 @@ stop()
else
echo "not killing kernel $d (PID $kpid)"
fi
+ echo "Removing kernel nfsd"
+ /usr/sbin/rpc.nfsd 0
done
}

diff --git a/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig
b/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig
deleted file mode 100644
index 67b4540..0000000
Binary files a/net/nfs-utils/nfs-utils-1.1.1.tar.gz.sig and /dev/null differ
diff --git a/net/nfs-utils/nfs-utils-1.1.2.tar.gz.sig
b/net/nfs-utils/nfs-utils-1.1.2.tar.gz.sig
new file mode 100644
index 0000000..0bccd20
Binary files /dev/null and b/net/nfs-utils/nfs-utils-1.1.2.tar.gz.sig differ
diff --git a/net/portmap/HISTORY b/net/portmap/HISTORY
index 2d86d49..4f853b2 100644
--- a/net/portmap/HISTORY
+++ b/net/portmap/HISTORY
@@ -1,3 +1,8 @@
+2008-03-21 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, tcp_wrapper_disable.patch: Patch to enable compilation
+ without tcp_wrappers, obtained from upstream git (missing header
+ compile error otherwise)
+
2008-03-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.0 (first release in 10 years! :))
Removed UPDATED
diff --git a/net/portmap/PRE_BUILD b/net/portmap/PRE_BUILD
index 87b604a..75375b1 100755
--- a/net/portmap/PRE_BUILD
+++ b/net/portmap/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sedit "s/const char \*what/__const char \*what/" portmap.c
+sedit "s/const char \*what/__const char \*what/" portmap.c &&
+patch -p1 < $SPELL_DIRECTORY/tcp_wrapper_disable.patch
diff --git a/net/portmap/tcp_wrapper_disable.patch
b/net/portmap/tcp_wrapper_disable.patch
new file mode 100644
index 0000000..ee73106
--- /dev/null
+++ b/net/portmap/tcp_wrapper_disable.patch
@@ -0,0 +1,11 @@
+--- a/pmap_check.c
++++ b/pmap_check.c
+@@ -44,7 +44,9 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
++#ifdef HOSTS_ACCESS
+ #include <tcpd.h>
++#endif
+ #include <arpa/inet.h>
+ #include <grp.h>
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index 43ec0c7..9f06102 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -1,3 +1,7 @@
+depends e2fsprogs &&
+depends libcap &&
+depends popt "--without-included-popt" &&
+
if [[ "$SAMBA_AD" == "y" ]]; then
depends openldap "--with-ldap" &&
depends krb5 "--with-krb5 --with-ads"
@@ -5,11 +9,9 @@ else
optional_depends openldap \
"--with-ldap" \
"--without-ldap" \
- "for LDAP support"
+ "for LDAP support"
fi &&

-depends popt "--without-included-popt" &&
-
optional_depends readline \
"--with-readline" \
"--without-readline" \
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 4c7496c..1c2ca75 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,12 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libcap
+ * PRE_BUILD: Apply libcap.patch
+ * libcap.patch: Fix conflicting declarations of capget
+ From http://bugs.gentoo.org/show_bug.cgi?id=210527
+
+2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err and libss
+
2008-03-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.0.28a
* samba.gpg: Removed, they only sign the uncompressed .tar :(
@@ -57,7 +66,7 @@
2007-05-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.35
SECURITY_PATCH++
- o CVE-2007-2444
+ o CVE-2007-2444
Local SID/Name translation bug can result in
user privilege elevation
o CVE-2007-2446
@@ -123,7 +132,7 @@
* DEPENDS: Changed to CUPS from cups

2006-06-09 Unet <unet AT sourcemage.org>
- * CONFIGURE, BUILD, DETAILS, INSTALL, PRE_BUILD: Added support
+ * CONFIGURE, BUILD, DETAILS, INSTALL, PRE_BUILD: Added support
for samba-vscan

2006-03-30 George Sherwood <george AT beernabeer.com>
@@ -388,7 +397,7 @@
* DETAILS: vers. inc. to 2.2.7a

2002-12-09 Eric Schabell <eschabell AT sourcemage.org>
- * init.d/samba.sh: Added, removed xinetd startup as it was borked,
+ * init.d/samba.sh: Added, removed xinetd startup as it was borked,
* POST_REMOVE,BUILD: Added,modified to install and remove
symlinks correctly, UPDATE filed bumped for correct install,
fixes bugs #1536 and #1705.
@@ -436,7 +445,7 @@
Changed LICENSE to LICENSE[0]

2002-08-07 Eric Schabell <eschabell AT sourcemage.org>
- * DETAILS: Added two new urls, removed samba.org,
+ * DETAILS: Added two new urls, removed samba.org,
fixes bug #556.

2002-07-05 Jeff Schmidt <jschmidt AT fnal.gov>
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 0292bd6..dd1e6db 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < $SCRIPT_DIRECTORY/libcap.patch &&
+
sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/libcap.patch b/net/samba/libcap.patch
new file mode 100644
index 0000000..d097173
--- /dev/null
+++ b/net/samba/libcap.patch
@@ -0,0 +1,52 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=210527
+#
+Revision: 1.1 - (download) (annotate)
+Wed Feb 20 20:02:54 2008 UTC (4 weeks, 5 days ago) by dev-zero
+Branch: MAIN
+CVS Tags: HEAD
+
+Added patches to fix bugs #210527 and #210662 and the broken-readdir
detection.
+(Portage version: 2.1.4.4)
+
+diff -Naurb samba-3.0.28.orig/source/configure.in
samba-3.0.28/source/configure.in
+--- samba-3.0.28.orig/source/configure.in 2007-11-21 04:58:01.000000000
+0100
++++ samba-3.0.28/source/configure.in 2008-02-20 14:31:05.167709211 +0100
+@@ -2663,6 +2663,7 @@
+ if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
+ AC_DEFINE(HAVE_POSIX_CAPABILITIES, 1,
+ [Whether POSIX capabilities are available])
++ AC_CHECK_DECLS([capget], , , [#include <sys/capability.h>])
+ else
+ LIBS=$ac_save_LIBS
+ fi
+diff -Naurb samba-3.0.28.orig/source/include/config.h.in
samba-3.0.28/source/include/config.h.in
+--- samba-3.0.28.orig/source/include/config.h.in 2007-12-10
17:04:29.000000000 +0100
++++ samba-3.0.28/source/include/config.h.in 2008-02-20 14:32:41.246837408
+0100
+@@ -1211,6 +1211,9 @@
+ /* Whether POSIX capabilities are available */
+ #undef HAVE_POSIX_CAPABILITIES
+
++/* Whether the capget (and capset) function is available (libcap-2.x has
it) */
++#undef HAVE_DECL_CAPGET
++
+ /* Whether posix_fadvise is available */
+ #undef HAVE_POSIX_FADVISE
+
+diff -Naurb samba-3.0.28.orig/source/smbd/oplock_linux.c
samba-3.0.28/source/smbd/oplock_linux.c
+--- samba-3.0.28.orig/source/smbd/oplock_linux.c 2007-11-15
04:15:04.000000000 +0100
++++ samba-3.0.28/source/smbd/oplock_linux.c 2008-02-20 14:31:48.327720338
+0100
+@@ -34,10 +34,12 @@
+ uint32 inheritable;
+ } data;
+
++#if defined HAVE_DECL_CAPGET && !HAVE_DECL_CAPGET
+ extern int capget(struct cap_user_header * hdrp,
+ struct cap_user_data * datap);
+ extern int capset(struct cap_user_header * hdrp,
+ const struct cap_user_data * datap);
++#endif
+
+ static SIG_ATOMIC_T signals_received;
+ #define FD_PENDING_SIZE 100
+
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index ac5ef5e..9ac7fdf 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From http://w1.fi/bugz/show_bug.cgi?id=251
+
2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 0.5.10
Updated old to 0.4.11
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 4a7be62..ed32b48 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -5,6 +5,8 @@ else
cd "$SOURCE_DIRECTORY"
fi &&

+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
sed -i "s|/local||g" Makefile &&

# Dynamic EAP target borks install.
diff --git a/net/wpa_supplicant/gcc43.patch b/net/wpa_supplicant/gcc43.patch
new file mode 100644
index 0000000..0903bea
--- /dev/null
+++ b/net/wpa_supplicant/gcc43.patch
@@ -0,0 +1,38 @@
+#
+# From http://w1.fi/bugz/show_bug.cgi?id=251
+#
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/networkconfig.ui.h
wpa_supplicant-0.5.8/wpa_gui/networkconfig.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/networkconfig.ui.h 2006-12-09
18:38:48.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/networkconfig.ui.h 2007-12-31
18:36:06.000000000 -0600
+@@ -10,6 +10,7 @@
+ ** destructor.
+
*****************************************************************************/
+
++#include <stdlib.h>
+
+ enum {
+ AUTH_NONE = 0,
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/userdatarequest.ui.h
wpa_supplicant-0.5.8/wpa_gui/userdatarequest.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/userdatarequest.ui.h 2005-06-05
10:19:57.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/userdatarequest.ui.h 2007-12-31
18:34:57.000000000 -0600
+@@ -10,6 +10,8 @@
+ ** destructor.
+
*****************************************************************************/
+
++#include <stdlib.h>
++
+ int UserDataRequest::setParams(WpaGui *_wpagui, const char *reqMsg)
+ {
+ char *tmp, *pos, *pos2;
+diff -Naur wpa_supplicant-0.5.8-orig/wpa_gui/wpagui.ui.h
wpa_supplicant-0.5.8/wpa_gui/wpagui.ui.h
+--- wpa_supplicant-0.5.8-orig/wpa_gui/wpagui.ui.h 2007-03-24
20:09:57.000000000 -0600
++++ wpa_supplicant-0.5.8/wpa_gui/wpagui.ui.h 2007-12-31 18:34:23.000000000
-0600
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #endif
+
++#include <stdlib.h>
+
+ void WpaGui::init()
+ {
+
diff --git a/perl-cpan/params-validate/DETAILS
b/perl-cpan/params-validate/DETAILS
index b145ec2..069347b 100755
--- a/perl-cpan/params-validate/DETAILS
+++ b/perl-cpan/params-validate/DETAILS
@@ -1,9 +1,9 @@
SPELL=params-validate
- VERSION=0.88
+ VERSION=0.89
+
SOURCE_HASH=sha512:e343e56574cfc129d63f6316ddab6a67d597e9ebd1d0943b33e5e1711d2531f36e548f693f24749c943db464d7e30845ab14a8fb1b66da3c90ad576c47c96596
SOURCE=Params-Validate-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Params-Validate-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/D/DR/DROLSKY/$SOURCE
-
SOURCE_HASH=sha512:ae3e6a8508c82f8ce947e73e42faa0568c9dc1f5d674d546f8898da7e3a45033c8a927581f4e83dbf45e9b786cae616435c6f9c44b99c78a188161c6cbed7c18
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=Basic::Queue";
ENTERED=20040506
diff --git a/perl-cpan/params-validate/HISTORY
b/perl-cpan/params-validate/HISTORY
index 4da15b5..9ba4c94 100644
--- a/perl-cpan/params-validate/HISTORY
+++ b/perl-cpan/params-validate/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treev AT pi.be>
+ * DETAILS: version 0.89
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/perl-cairo/DETAILS b/perl-cpan/perl-cairo/DETAILS
index eadb6c5..3d178a1 100755
--- a/perl-cpan/perl-cairo/DETAILS
+++ b/perl-cpan/perl-cairo/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-cairo
SNAME=Cairo
- VERSION=1.043
-
SOURCE_HASH=sha512:64d98afa9bb1acd08342fd064a0cff516636cc89a6d92dbb793248dfc4d5d2c825b64564f9af75ac13036afc39de8902acf097806342aece65c97df469bc0bf7
+ VERSION=1.045
+
SOURCE_HASH=sha512:39fe32c06c6696cc4a23fa86ba9088acc75a3877660c461b532ac8cd86e594d1a6b66ed3e567b204c8d3598cd99e6f89fe3a3458a3154e1484231e9d27f304c8
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-cairo/HISTORY b/perl-cpan/perl-cairo/HISTORY
index b68d401..d0ffbbf 100644
--- a/perl-cpan/perl-cairo/HISTORY
+++ b/perl-cpan/perl-cairo/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.045
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/perl-extutils-pkgconfig/DETAILS
b/perl-cpan/perl-extutils-pkgconfig/DETAILS
index 54bce91..e31708c 100755
--- a/perl-cpan/perl-extutils-pkgconfig/DETAILS
+++ b/perl-cpan/perl-extutils-pkgconfig/DETAILS
@@ -1,12 +1,12 @@
SPELL=perl-extutils-pkgconfig
SNAME=ExtUtils-PkgConfig
- VERSION=1.08
+ VERSION=1.11
+
SOURCE_HASH=sha512:f5dc334670955690ca1756e919d1a3e2eb035ccd26dd36260556dbab8dcf6ea2d932fbffb96a0f5d6846f67caa75f66625119652fba5d93da7815fcb9475d8a6
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/ML/MLEHMANN/$SOURCE
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TS/TSCH/$SOURCE
WEB_SITE=http://search.cpan.org/~mlehmann/ExtUtils-PkgConfig/
ENTERED=20040706
-
SOURCE_HASH=sha512:09345a8103759aa9910f3eb726b315511a0c85ada4de9484277d200ca1456e62a92630b64131f903d2774e0387ae0d5220f29352a9a9b82a39a433bcd0e893e0
LICENSE[0]=GPL
KEYWORDS="perl"
SHORT="simplistic interface to pkg-config"
diff --git a/perl-cpan/perl-extutils-pkgconfig/HISTORY
b/perl-cpan/perl-extutils-pkgconfig/HISTORY
index 38e4ab9..ae11b53 100644
--- a/perl-cpan/perl-extutils-pkgconfig/HISTORY
+++ b/perl-cpan/perl-extutils-pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11
+ new url
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up, updated to 1.08
* BUILD: useless
diff --git a/perl-cpan/perl-glib/DETAILS b/perl-cpan/perl-glib/DETAILS
index 98466e4..806bbf4 100755
--- a/perl-cpan/perl-glib/DETAILS
+++ b/perl-cpan/perl-glib/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-glib
SNAME=Glib
- VERSION=1.162
-
SOURCE_HASH=sha512:448c1524095c1a46ef36b1eb3a4884a42292fbd5a3af4ceb6111aecd12e315ce3b086387fe7241352f98e24515c71e1fbd59785ebb2c90157c953839d56ca8a3
+ VERSION=1.181
+
SOURCE_HASH=sha512:ab0c6aa47b4f6830a4e800d75a336d7e9fca297f234f2ccc7b2c687a0e04f44db86d98139d1524dc25b5048a04b9d6a816325e7005dcc72dbbb1e84c0c1f3bd8
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-glib/HISTORY b/perl-cpan/perl-glib/HISTORY
index a5650e9..840ed68 100644
--- a/perl-cpan/perl-glib/HISTORY
+++ b/perl-cpan/perl-glib/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.181
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/perl-gtk2/DETAILS b/perl-cpan/perl-gtk2/DETAILS
index bb304e7..8765b01 100755
--- a/perl-cpan/perl-gtk2/DETAILS
+++ b/perl-cpan/perl-gtk2/DETAILS
@@ -1,7 +1,7 @@
SPELL=perl-gtk2
SNAME=Gtk2
- VERSION=1.162
-
SOURCE_HASH=sha512:415bf10a0c32aadf45268e98df92e27efb76437ee4e6acf2eb76720ac054d4d00c2830c3856d3bb81e196a776b741df96c48492da16730ae8df03bcc40caf8fc
+ VERSION=1.181
+
SOURCE_HASH=sha512:f2766d4cb1d71f88fd668ada44d1129ead26418a72b48f6b0979ffb26012ef8595f1f97da20d1a2621d4718f0df466b5d2da51e1c5a44bd5ef3a1dba83f75fc2
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gtk2-perl/$SOURCE
diff --git a/perl-cpan/perl-gtk2/HISTORY b/perl-cpan/perl-gtk2/HISTORY
index 4cca4f2..6f2acd5 100644
--- a/perl-cpan/perl-gtk2/HISTORY
+++ b/perl-cpan/perl-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 1.181
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/xml-writer/DETAILS b/perl-cpan/xml-writer/DETAILS
index 0c66406..bf68332 100755
--- a/perl-cpan/xml-writer/DETAILS
+++ b/perl-cpan/xml-writer/DETAILS
@@ -1,6 +1,6 @@
SPELL=xml-writer
- VERSION=0.603
-
SOURCE_HASH=sha512:cf01c98b34578173b4249c503be044ec7c077cc318bd09213ffe72f2221df54d5fb8fa4328173773572b8f2bfc05cce6b614dac0de0b37395ca7e5fbdaa98e75
+ VERSION=0.604
+
SOURCE_HASH=sha512:3d2e6fb95e9b8e5aae7d06be86a884339fe6341983c068a69f6ca03e150f18833bb8eac9f478f9b88040b615e077e1b91eac99a22fe47b7ca4a0958ebfb814e4
SOURCE=XML-Writer-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Writer-$VERSION
WEB_SITE=http://xml-writer-perl.berlios.de/
diff --git a/perl-cpan/xml-writer/HISTORY b/perl-cpan/xml-writer/HISTORY
index 5931c37..5892d1b 100644
--- a/perl-cpan/xml-writer/HISTORY
+++ b/perl-cpan/xml-writer/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.604
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up
* BUILD: useless
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 11ef6b5..78aefe0 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,7 +1,8 @@
+depends e2fsprogs &&
+depends ghostscript-fonts-std &&
+depends jpeg &&
depends libpng &&
depends zlib &&
-depends jpeg &&
-depends ghostscript-fonts-std &&

if [[ "$GS_LIBGS" == y ]]; then
optional_depends gtk+2 '--enable-gtk' \
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 0b585fe..55a3180 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err
+
2008-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added make_single, make_normal

diff --git a/python-pypi/kaa-base/DETAILS b/python-pypi/kaa-base/DETAILS
index 93df944..9d750ee 100755
--- a/python-pypi/kaa-base/DETAILS
+++ b/python-pypi/kaa-base/DETAILS
@@ -1,6 +1,6 @@
SPELL=kaa-base
- VERSION=0.3.0
-
SOURCE_HASH=sha512:1fccd79ce9f2333511205ad257ff34c65a73d82e8d4660227c89961d2212ab6a854c53f217e39591fb9cebe24a17021106080dae5d24cefb8d5f88f8bffffb2b
+ VERSION=0.4.0
+
SOURCE_HASH=sha512:17bd0bf80126b90b1dcee814fbb37b875f1bc0cbeb8c63e55e32a3bda52562c81abb9bf538f0a0a165830d7fd14c544de2072b9bb8762fbb597fa9322ac28e4c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/freevo/$SOURCE
diff --git a/python-pypi/kaa-base/HISTORY b/python-pypi/kaa-base/HISTORY
index 504d79a..55215df 100644
--- a/python-pypi/kaa-base/HISTORY
+++ b/python-pypi/kaa-base/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0
+
2008-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.0

diff --git a/python-pypi/kaa-metadata/DETAILS
b/python-pypi/kaa-metadata/DETAILS
index c262b61..975aa00 100755
--- a/python-pypi/kaa-metadata/DETAILS
+++ b/python-pypi/kaa-metadata/DETAILS
@@ -1,6 +1,6 @@
SPELL=kaa-metadata
- VERSION=0.7.2
-
SOURCE_HASH=sha512:c4439dade7b65b39baec37962284493002f0d7fc441df985f71b5b979230ae73de44f96396e0c7dccf67bf65751c3f54f0f96ea56609bce65d4274a42807ebed
+ VERSION=0.7.3
+
SOURCE_HASH=sha512:edaed86b21ad3077ad2b4a8036f2ae691cd788faba36d7f1a6c258584831c1877bfbab125d57c1bfc6cfbdba9da736fed4a590d017c38eae8377594082a2ea9a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/freevo/$SOURCE
diff --git a/python-pypi/kaa-metadata/HISTORY
b/python-pypi/kaa-metadata/HISTORY
index 256bd04..41b0f87 100644
--- a/python-pypi/kaa-metadata/HISTORY
+++ b/python-pypi/kaa-metadata/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
2008-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.2

diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 584facc..fcb257d 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,7 +1,8 @@
+
SPELL=mercurial
- VERSION=0.9.5
+ VERSION=1.0
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:2d2afa41e5b49d31511bd7cbb0d8938d8e45aceb7dba9ac7adba5a6feb0a9cc14490b350f9a3bdf72bbf62f1f07a627c0600e5c853889a903ac46591391e357c
+
SOURCE_HASH=sha512:658bd24d07c4e390f7c71ccf8dcaf2e4061415fb32b8404bb8541fa3e3a629dcb582fcdea447a491cfb3221d5cf1e36cc5c2fc74ce525cfe12a68dca18aa81c6
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

@@ -13,7 +14,7 @@ fi

LICENSE[0]=GPL
KEYWORDS="scm python devel"
- WEB_SITE=http://selenic.com/mercurial
+ WEB_SITE=http://www.selenic.com/mercurial/
ENTERED=20050820
SHORT="A fast distributed SCM"
cat << EOF
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 4adf44a..d671f4a 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,7 @@
+2008-03-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0
+ fixed WEB_SITE
+
2008-01-16 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added pygtk2 as a req dep (for gtools support)
* PRE_BUILD: copying of gtools.py
diff --git a/python-pypi/stgit/DETAILS b/python-pypi/stgit/DETAILS
index b4388ea..0788125 100755
--- a/python-pypi/stgit/DETAILS
+++ b/python-pypi/stgit/DETAILS
@@ -1,5 +1,5 @@
SPELL=stgit
- VERSION=0.10
+ VERSION=0.14.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=http://homepage.ntlworld.com/cmarinas/stgit/$SOURCE
diff --git a/python-pypi/stgit/HISTORY b/python-pypi/stgit/HISTORY
index 7b6f877..e983cd1 100644
--- a/python-pypi/stgit/HISTORY
+++ b/python-pypi/stgit/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.14.2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/python-pypi/stgit/stgit-0.14.2.tar.gz.sig
b/python-pypi/stgit/stgit-0.14.2.tar.gz.sig
new file mode 100644
index 0000000..3be2305
Binary files /dev/null and b/python-pypi/stgit/stgit-0.14.2.tar.gz.sig differ
diff --git a/python-pypi/stgit/stgit-0.5.tar.gz.sig
b/python-pypi/stgit/stgit-0.5.tar.gz.sig
deleted file mode 100644
index 7fcdac5..0000000
Binary files a/python-pypi/stgit/stgit-0.5.tar.gz.sig and /dev/null differ
diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index e2eaf09..9047dfe 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=pcmanfm
- VERSION=0.3.2.2
+ VERSION=0.3.6.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:c526f6d2f5b89bde60d5ba613df6aba7b448caf0b0a92689d03df2941e6686d303de893d2a26cd5183bf3162049c09c7cda6bf32800d61ececc5124be6ff7b23
+
SOURCE_HASH=sha512:e998d596dd67101c9eb78ad9fb6bffcd2b134e454d489af0bd7e6eae757803e4ffc13791cff660153cf83a7fec1e6f747ca5c304552a031314c464fbbc1d9c68
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://pcmanfm.sourceforge.net/
LICENSE[0]=GPL
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index 538d2e7..0cd4ced 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,2 +1,5 @@
+2008-03-22 Robert Figura <template AT sourcemage.org>
+ * DETAILS, HISTORY: version bup to 0.3.6.2
2007-01-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
+
diff --git a/smgl/guru-tools/DETAILS b/smgl/guru-tools/DETAILS
index b606dc1..8405dec 100755
--- a/smgl/guru-tools/DETAILS
+++ b/smgl/guru-tools/DETAILS
@@ -5,7 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/distro/misc/$SOURCE

SOURCE_HASH=sha512:69ad77d49c3a9f1f58fff98792c624f8f5f55592a6346c9297e7ba05ff91a50433b7832fe8eccd31e18ce6a797d09a1cc420c779a2ebaf40d4e38846d3b67aa9
WEB_SITE=http://www.sourcemage.org
- PATCHLEVEL=1
+ PATCHLEVEL=2
ENTERED=20030602
LICENSE=GPL
KEYWORDS="smgl"
diff --git a/smgl/guru-tools/HISTORY b/smgl/guru-tools/HISTORY
index cf0307c..6a96e22 100644
--- a/smgl/guru-tools/HISTORY
+++ b/smgl/guru-tools/HISTORY
@@ -1,3 +1,8 @@
+2008-03-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * smgl-cherry-pick: fixed omission of new files
+ warn about needing to be in the top dir
+
2008-03-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: added missing $

diff --git a/smgl/guru-tools/smgl-cherry-pick
b/smgl/guru-tools/smgl-cherry-pick
index 7a3d1a0..52f19a9 100755
--- a/smgl/guru-tools/smgl-cherry-pick
+++ b/smgl/guru-tools/smgl-cherry-pick
@@ -7,6 +7,7 @@
rc=0
commit=$1
[[ -z $commit ]] && echo no commit specified && exit 100
+[[ -f ChangeLog ]] || { echo run me from the top dir; exit 99; }

# check if commit diff does not contain a HISTORY/ChangeLog header
# it also must contain diff changes (this enables merging of bins)
@@ -24,8 +25,10 @@ else
for diff in xx*; do
if ! grep -q "+++.*\(HISTORY\|ChangeLog\)" $diff; then
if ! grep -q "^Binary file" $diff; then
+ file=$(sed -n '/^+++ / s,^[^/]*/,,p' $diff)
patch -p1 < $diff
new_rc=$?
+ git add "$file"
[[ $rc == 0 ]] && rc=$new_rc
else
file=$(sed -n '/^diff --git/ { s,^[^/]*/,,; s, .*$,,p} ' $diff)
@@ -34,6 +37,7 @@ else
echo "Warning, nonexsitent file: $file"
else # new or updated file
git show $commit:"$file" > "$file"
+ git add "$file"
fi
fi
echo
@@ -81,6 +85,7 @@ else

cat $diff $file > $file.new
mv $file.new $file
+ git add $file # needed when cherrypicking new spells
echo
fi
done
diff --git a/spelling/aspell/HISTORY b/spelling/aspell/HISTORY
index da85e1b..a6d0540 100644
--- a/spelling/aspell/HISTORY
+++ b/spelling/aspell/HISTORY
@@ -1,3 +1,10 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
+ * templateinstantiations.patch: Patch to compile after gcc43.patch
+ is applied. From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.3-templateinstantiations.patch
+
2007-03-31 David Brown <dmlb2000 AT gmail.com>
* POST_INSTALL: removed not needed anymore

diff --git a/spelling/aspell/PRE_BUILD b/spelling/aspell/PRE_BUILD
new file mode 100755
index 0000000..8335061
--- /dev/null
+++ b/spelling/aspell/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/templateinstantiations.patch
diff --git a/spelling/aspell/gcc43.patch b/spelling/aspell/gcc43.patch
new file mode 100644
index 0000000..c898dea
--- /dev/null
+++ b/spelling/aspell/gcc43.patch
@@ -0,0 +1,157 @@
+#
+# From
http://kambing.ui.edu/gentoo-portage/app-text/aspell/files/aspell-0.60.5-gcc-4.3.patch
+#
+diff -Naur aspell-0.60.5-orig/common/convert.cpp
aspell-0.60.5/common/convert.cpp
+--- aspell-0.60.5-orig/common/convert.cpp 2006-11-18 02:36:01.000000000
-0600
++++ aspell-0.60.5/common/convert.cpp 2007-12-29 11:17:11.000000000 -0600
+@@ -238,7 +238,7 @@
+ }
+
+ template <class T>
+- static void free_norm_table(NormTable<T> * d)
++ void free_norm_table(NormTable<T> * d)
+ {
+ for (T * cur = d->data; cur != d->end; ++cur) {
+ if (cur->sub_table)
+diff -Naur aspell-0.60.5-orig/common/string.hpp
aspell-0.60.5/common/string.hpp
+--- aspell-0.60.5-orig/common/string.hpp 2004-11-29 11:50:05.000000000
-0600
++++ aspell-0.60.5/common/string.hpp 2007-12-29 11:17:11.000000000 -0600
+@@ -129,10 +129,10 @@
+ }
+
+ char & operator[] (size_t pos) {return begin_[pos];}
+- const char operator[] (size_t pos) const {return begin_[pos];}
++ char operator[] (size_t pos) const {return begin_[pos];}
+
+ char & back() {return end_[-1];}
+- const char back() const {return end_[-1];}
++ char back() const {return end_[-1];}
+
+ void clear() {end_ = begin_;}
+
+@@ -492,7 +492,7 @@
+
+ namespace std
+ {
+- template<> static inline void swap(acommon::String & x, acommon::String &
y) {return x.swap(y);}
++ template<> inline void swap(acommon::String & x, acommon::String & y)
{return x.swap(y);}
+ }
+
+ #endif
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.cpp
aspell-0.60.5/modules/speller/default/affix.cpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.cpp 2006-01-21
08:27:54.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.cpp 2007-12-29
11:17:11.000000000 -0600
+@@ -193,7 +193,7 @@
+ typedef const Conds * Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+- hash<const char *> hfun;
++ acommon::hash<const char *> hfun;
+ size_t hash(const char * s) {return hfun(s);}
+ bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
+ const char * key(const Conds * c) {return c->str;}
+diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.hpp
aspell-0.60.5/modules/speller/default/affix.hpp
+--- aspell-0.60.5-orig/modules/speller/default/affix.hpp 2004-11-29
11:50:06.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/affix.hpp 2007-12-29
11:17:11.000000000 -0600
+@@ -107,7 +107,7 @@
+ {
+ return expand(word,aff,buf,0);
+ }
+- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
++ WordAff * expand_suffix(ParmString word, const unsigned char * aff,
+ ObjStack &, int limit = INT_MAX,
+ unsigned char * new_aff = 0, WordAff * * * l =
0,
+ ParmString orig_word = 0) const;
+diff -Naur aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp
aspell-0.60.5/modules/speller/default/readonly_ws.cpp
+--- aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp 2006-11-18
03:17:19.000000000 -0600
++++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp 2007-12-29
11:17:11.000000000 -0600
+@@ -726,7 +726,7 @@
+ struct WordLookupParms {
+ const char * block_begin;
+ WordLookupParms() {}
+- typedef Vector<u32int> Vector;
++ typedef acommon::Vector<u32int> Vector;
+ typedef u32int Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+diff -Naur aspell-0.60.5-orig/prog/aspell.cpp aspell-0.60.5/prog/aspell.cpp
+--- aspell-0.60.5-orig/prog/aspell.cpp 2006-12-19 04:51:08.000000000 -0600
++++ aspell-0.60.5/prog/aspell.cpp 2007-12-29 11:18:10.000000000 -0600
+@@ -239,6 +239,14 @@
+ return i;
+ }
+
++static void line_buffer() {
++#ifndef WIN32
++ // set up stdin and stdout to be line buffered
++ assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
++ assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
++#endif
++}
++
+ Conv dconv;
+ Conv uiconv;
+
+@@ -686,11 +694,7 @@
+
+ void pipe()
+ {
+-#ifndef WIN32
+- // set up stdin and stdout to be line buffered
+- assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
+- assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+-#endif
++ line_buffer();
+
+ bool terse_mode = true;
+ bool do_time = options->retrieve_bool("time");
+@@ -1651,6 +1655,7 @@
+ Conv oconv(setup_conv(lang, options));
+ String word;
+ String sl;
++ line_buffer();
+ while (CIN.getline(word)) {
+ const char * w = iconv(word);
+ lang->LangImpl::to_soundslike(sl, w);
+@@ -1675,6 +1680,7 @@
+ Conv oconv(setup_conv(lang, options));
+ String word;
+ GuessInfo gi;
++ line_buffer();
+ while (CIN.getline(word)) {
+ lang->munch(iconv(word), &gi);
+ COUT << word;
+@@ -1713,6 +1719,7 @@
+ String word, buf;
+ ObjStack exp_buf;
+ WordAff * exp_list;
++ line_buffer();
+ while (CIN.getline(word)) {
+ buf = word;
+ char * w = iconv(buf.mstr(), buf.size());
+@@ -1799,6 +1806,7 @@
+ String word;
+ String base;
+ String affs;
++ line_buffer();
+ while (CIN.getline(word)) {
+ word = iconv(word);
+
+@@ -1882,7 +1890,7 @@
+ typedef SML_WordEntry Value;
+ typedef const char * Key;
+ static const bool is_multi = false;
+- hash<const char *> hash;
++ acommon::hash<const char *> hash;
+ bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+ Key key(const Value & v) {return v.word;}
+ };
+@@ -2033,7 +2041,7 @@
+ typedef CML_Entry Value;
+ typedef const char * Key;
+ static const bool is_multi = true;
+- hash<const char *> hash;
++ acommon::hash<const char *> hash;
+ bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
+ Key key(const Value & v) {return v.word;}
+ };
diff --git a/spelling/aspell/templateinstantiations.patch
b/spelling/aspell/templateinstantiations.patch
new file mode 100644
index 0000000..a533f9e
--- /dev/null
+++ b/spelling/aspell/templateinstantiations.patch
@@ -0,0 +1,8 @@
+--- common/string_map.cpp~ 2004-07-15 12:58:58.000000000 +0200
++++ common/string_map.cpp 2005-07-19 14:31:42.000000000 +0200
+@@ -82,3 +82,5 @@
+ }
+ }
+
++template class acommon::HashTable<acommon::StringMap::Parms>;
++template class acommon::BlockSList<acommon::StringPair>;
diff --git a/telephony/twinkle/DETAILS b/telephony/twinkle/DETAILS
index 57be5e2..1cc9f9e 100755
--- a/telephony/twinkle/DETAILS
+++ b/telephony/twinkle/DETAILS
@@ -1,6 +1,6 @@
SPELL=twinkle
- VERSION=1.1
-
SOURCE_HASH=sha512:2980a5d37b7b24b7f1141bcbb3ac70067243d0b2602999a4cee664651ccecfbdad87b3d4b9976b20edcd1c12eb223f73abe3cc7e69190613d9863bcc052da301
+ VERSION=1.2
+
SOURCE_HASH=sha512:5c8ce32848ed9f5828f6e1b5869bf1160f813337606b56be2d03722414cba8d2c9bb1e1f85b65e1bd372de3b7c7450d4b26e3d008c6ce4557d0904a1bcece5b0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.twinklephone.com/
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="telephony"
SHORT="a soft phone for your voice over IP communcations"
cat << EOF
-Twinkle is a soft phone for your voice over IP communcations using the SIP
protocol. You can
-use it for direct IP phone to IP phone communication or in a network using a
SIP proxy to route
-your calls.
+Twinkle is a soft phone for your voice over IP communcations using the SIP
+protocol. You can use it for direct IP phone to IP phone communication or
+in a network using a SIP proxy to route your calls.
EOF
diff --git a/telephony/twinkle/HISTORY b/telephony/twinkle/HISTORY
index ef190b6..85d6ce6 100644
--- a/telephony/twinkle/HISTORY
+++ b/telephony/twinkle/HISTORY
@@ -1,3 +1,12 @@
+2008-03-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: break description lines at column 80.
+
+2008-03-22 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: clean up description
+
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2
+
2007-07-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1

diff --git a/utils/bluez-utils/BUILD b/utils/bluez-utils/BUILD
new file mode 100755
index 0000000..dd93c74
--- /dev/null
+++ b/utils/bluez-utils/BUILD
@@ -0,0 +1,3 @@
+OPTS="$OPTS $SDPD" &&
+
+default_build
diff --git a/utils/bluez-utils/CONFIGURE b/utils/bluez-utils/CONFIGURE
new file mode 100755
index 0000000..1938a68
--- /dev/null
+++ b/utils/bluez-utils/CONFIGURE
@@ -0,0 +1 @@
+config_query_option SDPD "Enable SDP daemon?" y "--enable-sdpd" ""
diff --git a/utils/bluez-utils/HISTORY b/utils/bluez-utils/HISTORY
index d24adcd..ff72b79 100644
--- a/utils/bluez-utils/HISTORY
+++ b/utils/bluez-utils/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * init.d/bluetooth: renewed the script (removed useless stuff, fixed
+ the bug about double-running of bluetooth service to remove a
warning)
+ * BUILD, CONFIGURE: enabled sdpd selection
+
2008-03-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 3.28

diff --git a/utils/bluez-utils/init.d/bluetooth
b/utils/bluez-utils/init.d/bluetooth
index 6d78490..4304ba2 100755
--- a/utils/bluez-utils/init.d/bluetooth
+++ b/utils/bluez-utils/init.d/bluetooth
@@ -1,57 +1,42 @@
#!/bin/sh
-#
-# bluetooth Bluetooth subsystem starting and stopping
-#
-# chkconfig: 345 25 90
-# description: Bluetooth subsystem
-# SMGL-script-version=20030714
-# SMGL-START:S:S25
-# SMGL-STOP:0 6:K90
-#
-# Source function library.
-#. /etc/init.d/functions
-. /etc/init.d/smgl_init
-
-# Source Bluetooth configuration.
-#. /etc/sysconfig/bluetooth

-prog="Bluetooth"
PROGRAM=/usr/sbin/hcid
RUNLEVEL=3
NEEDS="+local_fs"
-
UART_CONF="/etc/bluetooth/uart"

-start_uarts()
-{
+. /etc/init.d/smgl_init
+
+start_uarts() {
[ -f /sbin/hciattach -a -f $UART_CONF ] || return
grep -v '^#' $UART_CONF | while read i; do
/usr/sbin/hciattach $i
done
}

-stop_uarts()
-{
+stop_uarts() {
killproc hciattach > /dev/null 2>&1
}

-start()
-{
- echo $"Starting $prog: "
- loadproc $PROGRAM
+start() {
+ echo "Starting $NAME..."
+ $PROGRAM
+ evaluate_retval

if [ -x /usr/sbin/sdpd ]; then
- loadproc /usr/sbin/sdpd
+ echo "Running sdpd..."
+ /usr/sbin/sdpd
+ evaluate_retval
fi

start_uarts
+
[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
touch /var/lock/subsys/bluetooth
}

-stop()
-{
- echo $"Shutting down $prog: "
+stop() {
+ echo "Shutting down $NAME..."
killproc hcid

if [ -x /usr/sbin/sdpd ]; then
@@ -62,23 +47,10 @@ stop()
rm -f /var/lock/subsys/bluetooth
}

-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- stop
- start
- ;;
- condrestart)
+condrestart() {
[ -e /var/lock/subsys/bluetooth ] && (stop; start)
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
- exit 1
-esac
+}

-exit 0
+usage() {
+ echo "Usage $0 {start|stop|restart|condrestart}"
+}
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 49c7246..3fe0422 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -5,4 +5,8 @@ fi &&
create_account messagebus &&
make_single &&
default_build &&
-make_normal
+make_normal &&
+
+if is_depends_enabled $SPELL doxygen; then
+ doxygen
+fi
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 7c5e5f1..46f15e5 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -4,14 +4,14 @@ depends expat '--with-xml=expat' &&
optional_depends X11-LIBS \
'-with-x11' \
'-without-x11' \
- 'X11 support' &&
+ 'for X11 support' &&

optional_depends doxygen \
'--enable-doxygen-docs' \
'--disable-doxygen-docs' \
- 'Build DOXYGEN documentation' &&
+ 'to build API documentation' &&

-optional_depends xmlto \
- '--enable-xml-docs' \
- '--disable-xml-docs' \
- 'Build XML Documentation'
+optional_depends xmlto \
+ '--enable-xml-docs' \
+ '--disable-xml-docs' \
+ 'to build docs in XML format'
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 14d291d..e306022 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,8 @@
+2008-03-23 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Corrected depends query wording.
+ * BUILD: Build docs if doxygen selected.
+ * INSTALL: Added, install docs if doxygen selected.
+
2008-03-05 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE: Removed
* DEPENDS: Only seems to work with expat, not libxml2
diff --git a/utils/dbus/INSTALL b/utils/dbus/INSTALL
new file mode 100755
index 0000000..c1015a6
--- /dev/null
+++ b/utils/dbus/INSTALL
@@ -0,0 +1,6 @@
+default_install &&
+
+if is_depends_enabled $SPELL doxygen; then
+ mkdir -p "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
+ cp -r "$SOURCE_DIRECTORY"/doc/api/* "$INSTALL_ROOT/usr/share/doc/$SPELL/"
+fi
diff --git a/utils/desktop-file-utils/DETAILS
b/utils/desktop-file-utils/DETAILS
index 5ac4275..08b461d 100755
--- a/utils/desktop-file-utils/DETAILS
+++ b/utils/desktop-file-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=desktop-file-utils
- VERSION=0.14
+ VERSION=0.15
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/utils/desktop-file-utils/HISTORY
b/utils/desktop-file-utils/HISTORY
index 1981138..a811145 100644
--- a/utils/desktop-file-utils/HISTORY
+++ b/utils/desktop-file-utils/HISTORY
@@ -1,3 +1,6 @@
+2008-03-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.15
+
2007-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0], updated spell to 0.14

diff --git a/utils/desktop-file-utils/PRE_BUILD
b/utils/desktop-file-utils/PRE_BUILD
index 4d2fffd..dec0c31 100755
--- a/utils/desktop-file-utils/PRE_BUILD
+++ b/utils/desktop-file-utils/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
# disable emacs, bug #8924
cd $SOURCE_DIRECTORY &&
-sedit 's/EMACS = @EMACS@/EMACS = no/' Makefile.in &&
-sedit 's/EMACS = @EMACS@/EMACS = no/' misc/Makefile.in &&
-sedit 's/EMACS = @EMACS@/EMACS = no/' src/Makefile.in
+sed -i "s:EMACS = @EMACS@:EMACS = no:" Makefile.in misc/Makefile.in \
+ src/Makefile.in
diff --git a/utils/desktop-file-utils/desktop-file-utils-0.14.tar.gz.sig
b/utils/desktop-file-utils/desktop-file-utils-0.14.tar.gz.sig
deleted file mode 100644
index 5efaa9e..0000000
Binary files a/utils/desktop-file-utils/desktop-file-utils-0.14.tar.gz.sig
and /dev/null differ
diff --git a/utils/desktop-file-utils/desktop-file-utils-0.15.tar.gz.sig
b/utils/desktop-file-utils/desktop-file-utils-0.15.tar.gz.sig
new file mode 100644
index 0000000..7a3cd17
Binary files /dev/null and
b/utils/desktop-file-utils/desktop-file-utils-0.15.tar.gz.sig differ
diff --git a/utils/hal-info/DETAILS b/utils/hal-info/DETAILS
index 6ea0df3..4225cab 100755
--- a/utils/hal-info/DETAILS
+++ b/utils/hal-info/DETAILS
@@ -1,6 +1,6 @@
SPELL=hal-info
- VERSION=20080313
-
SOURCE_HASH=sha512:8d07e141238bf52a5e78d1143761888476ebf5f8edd0cd2f765b0ede8fc81aa4770578af2a604879533525c1aea4119eee07bcfe7a9b44918d848bd82db2285f
+ VERSION=20080317
+
SOURCE_HASH=sha512:8295bb1910f9f46d68cce5bdc4ee1b6c3b388d84c5b4db7d9b2c05b6f96769cbe336ab46d44f715c7da3b9f1877097d688c415fd307d9a245c07ca07b7f8239d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
diff --git a/utils/hal-info/HISTORY b/utils/hal-info/HISTORY
index da2db32..049eabc 100644
--- a/utils/hal-info/HISTORY
+++ b/utils/hal-info/HISTORY
@@ -1,3 +1,6 @@
+2008-03-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20080317
+
2008-03-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20080313

diff --git a/utils/memtest86+/DETAILS b/utils/memtest86+/DETAILS
index 7b05eaf..95d24da 100755
--- a/utils/memtest86+/DETAILS
+++ b/utils/memtest86+/DETAILS
@@ -1,6 +1,6 @@
SPELL=memtest86+
- VERSION=2.00
-
SOURCE_HASH=sha512:8df56724569bfdce5b68b1675aaaab9b9c5b4c3caee73854d8a886834cab06a16cabc6c2c8180ffa038c8efb48f19e2acc118e7ccb51bf043db3ba409199ab74
+ VERSION=2.01
+
SOURCE_HASH=sha512:fb8fd8f7e3f597701a031189c18bd95247fe1fc936838359411a32a24fb8845a0012ebd2e02bb399fad1fab0f493dbe475a3e646c272d10e6343af4646d8347b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.memtest.org
diff --git a/utils/memtest86+/HISTORY b/utils/memtest86+/HISTORY
index a0efa5c..8a632a5 100644
--- a/utils/memtest86+/HISTORY
+++ b/utils/memtest86+/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.01
+
2008-02-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.00

diff --git a/utils/smartmontools/DETAILS b/utils/smartmontools/DETAILS
index 759f112..dc6c380 100755
--- a/utils/smartmontools/DETAILS
+++ b/utils/smartmontools/DETAILS
@@ -1,8 +1,8 @@
SPELL=smartmontools
- VERSION=5.37
+ VERSION=5.38
+
SOURCE_HASH=sha512:8ddeacc61e2e8273a0f14021d7024964bf9c8873ab0903fe341d43310d396e0013a051089a6ea52ea247eee50ba2d79cb1e3819cc4188ccdba4a395a1d55f3c2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/smartmontools/${SOURCE}
-
SOURCE_HASH=sha512:502410de660287da4df0a14cb58015d25224d9b9f8d6d2099213238d8363a4824458aca6916130cb4a5444389c17184267250ed1a67e2dafbdcd150aabac4eff
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://smartmontools.sourceforge.net/
ENTERED=20040808
diff --git a/utils/smartmontools/HISTORY b/utils/smartmontools/HISTORY
index 8971b45..3ec1c1d 100644
--- a/utils/smartmontools/HISTORY
+++ b/utils/smartmontools/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.38
+
2008-02-17 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: cleaned up long desc.

diff --git a/utils/sunbird/HISTORY b/utils/sunbird/HISTORY
index 0e702f3..b3ca002 100644
--- a/utils/sunbird/HISTORY
+++ b/utils/sunbird/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile with gcc 4.3.0
+ From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+
2008-03-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 0.7
* cairo-fixes.patch: added to fix a compile error
diff --git a/utils/sunbird/PRE_BUILD b/utils/sunbird/PRE_BUILD
index 98e402f..5d9f210 100755
--- a/utils/sunbird/PRE_BUILD
+++ b/utils/sunbird/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
patch -p0 < $SCRIPT_DIRECTORY/000_add-missing-LDFLAGS.patch &&
patch -p1 < $SCRIPT_DIRECTORY/032_firefox-2.0_ppc64-1.patch &&
patch -p1 < $SCRIPT_DIRECTORY/033_firefox-2.0_ppc_powerpc.patch &&
diff --git a/utils/sunbird/gcc43.patch b/utils/sunbird/gcc43.patch
new file mode 100644
index 0000000..6bda134
--- /dev/null
+++ b/utils/sunbird/gcc43.patch
@@ -0,0 +1,1618 @@
+#
+# From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
+#
+Index: xpcom/obsolete/component/nsFileSpecImpl.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.cpp
+diff -N xpcom/obsolete/component/nsFileSpecImpl.cpp
+--- xpcom/obsolete/component/nsFileSpecImpl.cpp 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,857 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- * Pierre Phaneuf <pp AT ludusdesign.com>
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles
alone.
+-
+-#include "nsIFileStream.h"
+-#include "nsFileStream.h"
+-
+-#include "nsILocalFile.h"
+-
+-#include "prmem.h"
+-
+-NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
+-
+-#ifdef NS_DEBUG
+-#define TEST_OUT_PTR(p) \
+- if (!(p)) \
+- return NS_ERROR_NULL_POINTER;
+-#else
+-#define TEST_OUT_PTR(p)
+-#endif
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+- : mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
+-//----------------------------------------------------------------------------------------
+- : mFileSpec(inSpec)
+- , mInputStream(nsnull)
+- , mOutputStream(nsnull)
+-{
+-// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
+-
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsFileSpecImpl::~nsFileSpecImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- CloseStream();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-/* static */
+-nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec,
nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return it->QueryInterface(NS_GET_IID(nsIFileSpec), (void **) result);
+-} // nsFileSpecImpl::MakeInterface
+-
+-#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
+-//----------------------------------------------------------------------------------------
+-{
+- if (original) {
+- nsresult rv = ((nsIFileSpec *)original)->GetFileSpec( &mFileSpec);
+- if (NS_SUCCEEDED( rv))
+- return mFileSpec.Error();
+- else
+- return( rv);
+- }
+- else
+- return( NS_ERROR_FAILURE);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
+- PRBool *_retval)
+-{
+- *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aURLString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFileURL url(mFileSpec);
+- *aURLString = nsCRT::strdup(url.GetURLString());
+- if (!*aURLString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-} // nsFileSpecImpl::GetURLString
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFileURL(aURLString);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char *
*aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aUnixStyleFilePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsFilePath path(mFileSpec);
+- *aUnixStyleFilePath = nsCRT::strdup((const char*) path);
+- if (!*aUnixStyleFilePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char *
aUnixStyleFilePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = nsFilePath(aUnixStyleFilePath);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char *
*aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aPersistentDescriptorString)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsPersistentFileDescriptor desc(mFileSpec);
+- nsCAutoString data;
+- desc.GetData(data);
+- *aPersistentDescriptorString = ToNewCString(data);
+- if (!*aPersistentDescriptorString)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char *
aPersistentDescriptorString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsPersistentFileDescriptor desc(mFileSpec);
+- desc.SetData(nsDependentCString(aPersistentDescriptorString));
+- mFileSpec = desc;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNativePath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- *aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
+- if (!*aNativePath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aNativePath;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aNSPRPath)
+- if (mFileSpec.Failed())
+- return mFileSpec.Error();
+- nsNSPRPath path(mFileSpec);
+- *aNSPRPath = nsCRT::strdup((const char*) path);
+- if (!*aNSPRPath)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Error()
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Valid();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- *_retval = mFileSpec.Failed();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aLeafName)
+- *aLeafName = mFileSpec.GetLeafName();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.SetLeafName(aLeafName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aParent)
+- nsFileSpec parent;
+- mFileSpec.GetParent(parent);
+- return MakeInterface(parent, aParent);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char
*suggestedName)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.MakeUnique(suggestedName);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aModDate)
+- nsFileSpec::TimeStamp stamp;
+- mFileSpec.GetModDate(stamp);
+- *aModDate = stamp;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool
*_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.ModDateChanged(oldStamp);
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsDirectory();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsFile();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.Exists();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsHidden();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = mFileSpec.IsSymlink();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
+-//----------------------------------------------------------------------------------------
+-{
+- PRBool ignore;
+- return mFileSpec.ResolveSymlink(ignore);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSize)
+- *aFileSize = mFileSpec.GetFileSize();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64
*aDiskSpaceAvailable)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aDiskSpaceAvailable)
+- *aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char
*relativePath)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec += relativePath;
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Touch()
+-//----------------------------------------------------------------------------------------
+-{
+- // create an empty file, like the UNIX touch command.
+- nsresult rv;
+- rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- rv = CloseStream();
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CreateDir()
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.CreateDir();
+- return mFileSpec.Error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Delete(PRBool aRecursive)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec.Delete(aRecursive);
+- return mFileSpec.Error();
+-}
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Truncate(PRInt32 aNewLength)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Truncate(aNewLength);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Rename(newLeafName);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.CopyToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.MoveToDir(FILESPEC(newParentDir));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
+-//----------------------------------------------------------------------------------------
+-{
+- return mFileSpec.Execute(args);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream,
mFileSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
+-//----------------------------------------------------------------------------------------
+-{
+- if (mInputStream || mOutputStream)
+- return NS_ERROR_FAILURE;
+- nsresult result =
NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
+- if (NS_SUCCEEDED(result))
+- result =
NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::CloseStream()
+-//----------------------------------------------------------------------------------------
+-{
+- NS_IF_RELEASE(mInputStream);
+- NS_IF_RELEASE(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = (mInputStream || mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mInputStream;
+- NS_IF_ADDREF(mInputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- }
+- *_retval = mOutputStream;
+- NS_IF_ADDREF(mOutputStream);
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 count;
+- rv = Write(inString, PL_strlen(inString), &count);
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- *_retval = nsnull;
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- PRInt32 theSize;
+- rv = GetFileSize((PRUint32*)&theSize);
+- if (NS_SUCCEEDED(rv))
+- rv = Read(_retval, theSize, &theSize);
+- if (NS_SUCCEEDED(rv))
+- (*_retval)[theSize] = 0;
+- nsresult rv2 = CloseStream();
+- return NS_FAILED(rv) ? rv : rv2;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(aFileSpec)
+- *aFileSpec = mFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Equals(nsIFileSpec *spec, PRBool *result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv;
+-
+- if (!result || !spec) return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpec otherSpec;
+-
+- rv = spec->GetFileSpec(&otherSpec);
+- if (NS_FAILED(rv)) return rv;
+-
+- if (mFileSpec == otherSpec) {
+- *result = PR_TRUE;
+- }
+- else {
+- *result = PR_FALSE;
+- }
+-
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- mFileSpec = aFileSpec;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.eof();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount,
PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- TEST_OUT_PTR(buffer)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*buffer)
+- *buffer = (char*)PR_Malloc(requestedCount + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.read(*buffer, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize,
PRBool *wasTruncated)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(wasTruncated)
+- TEST_OUT_PTR(line)
+- if (!mInputStream) {
+- nsresult rv = OpenStreamForReading();
+- if (NS_FAILED(rv)) return rv;
+- }
+- if (!*line)
+- *line = (char*)PR_Malloc(bufferSize + 1);
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *wasTruncated = !s.readline(*line, bufferSize);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32
requestedCount, PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- //if (!mOutputStream)
+- // return NS_ERROR_NULL_POINTER;
+- if (!mOutputStream) {
+- nsresult rv = OpenStreamForWriting();
+- if (NS_FAILED(rv))
+- return rv;
+- }
+- nsOutputFileStream s(mOutputStream);
+- *_retval = s.write(data, requestedCount);
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Flush()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mOutputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsOutputFileStream s(mOutputStream);
+- s.flush();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult result = NS_OK;
+- if (mOutputStream)
+- {
+- nsOutputFileStream os(mOutputStream);
+- os.seek(offset);
+- result = os.error();
+- }
+- if (NS_SUCCEEDED(result) && mInputStream)
+- {
+- nsInputFileStream is(mInputStream);
+- is.seek(offset);
+- result = is.error();
+- }
+- return result;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mInputStream)
+- return NS_ERROR_NULL_POINTER;
+- nsInputFileStream s(mInputStream);
+- *_retval = s.tell();
+- return s.error();
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::EndLine()
+-//----------------------------------------------------------------------------------------
+-{
+- nsOutputFileStream s(mOutputStream);
+- s << nsEndl;
+- return s.error();
+-}
+-
+-NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+- : mDirectoryIterator(nsnull)
+-{
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool
resolveSymlink)
+-//----------------------------------------------------------------------------------------
+-{
+- delete mDirectoryIterator;
+- mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent),
resolveSymlink);
+- if (!mDirectoryIterator)
+- return NS_ERROR_OUT_OF_MEMORY;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
+-//----------------------------------------------------------------------------------------
+-{
+- TEST_OUT_PTR(_retval)
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- *_retval = mDirectoryIterator->Exists();
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- (*mDirectoryIterator)++;
+- return NS_OK;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec *
*aCurrentSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!mDirectoryIterator)
+- return NS_ERROR_NULL_POINTER;
+- return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(),
aCurrentSpec);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsDirectoryIteratorImpl::Create(nsISupports* outer, const
nsIID& aIID, void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-NS_IMETHODIMP nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID,
void* *aIFileSpec)
+-//----------------------------------------------------------------------------------------
+-{
+- if (aIFileSpec == NULL)
+- return NS_ERROR_NULL_POINTER;
+-
+- nsFileSpecImpl* it = new nsFileSpecImpl;
+- if (!it)
+- return NS_ERROR_OUT_OF_MEMORY;
+-
+- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
+- if (NS_FAILED(rv))
+- {
+- delete it;
+- return rv;
+- }
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec
**result)
+-//----------------------------------------------------------------------------------------
+-{
+- if (!result)
+- return NS_ERROR_NULL_POINTER;
+-
+- return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpec(nsIFileSpec** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec),
(void**)result);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewFileSpecFromIFile(nsIFile *aFile, nsIFileSpec **result)
+-//----------------------------------------------------------------------------------------
+-{
+- nsresult rv = nsFileSpecImpl::Create(nsnull,
NS_GET_IID(nsIFileSpec), (void**)result);
+- if (NS_FAILED(rv)) return rv;
+-
+- nsCAutoString path;
+- rv = aFile->GetNativePath(path);
+- if (NS_FAILED(rv)) return rv;
+-
+- rv = (*result)->SetNativePath(path.get());
+- if (NS_FAILED(rv))
+- NS_RELEASE(*result);
+- return rv;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
+-//----------------------------------------------------------------------------------------
+-{
+- return nsDirectoryIteratorImpl::Create(nsnull,
NS_GET_IID(nsIDirectoryIterator), (void**)result);
+-}
+Index: xpcom/obsolete/component/nsFileSpecImpl.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsFileSpecImpl.h
+diff -N xpcom/obsolete/component/nsFileSpecImpl.h
+--- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000
1.3
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,116 +0,0 @@
+-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#ifndef _FILESPECIMPL_H_
+-#define _FILESPECIMPL_H_
+-
+-#include "nscore.h"
+-#include "nsIFileSpec.h"
+-#include "nsFileSpec.h"
+-
+-//========================================================================================
+-class nsFileSpecImpl
+-//========================================================================================
+- : public nsIFileSpec
+-{
+-
+- public:
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_DECL_NSIFILESPEC
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+- //----------------------
+- // Implementation
+- //----------------------
+-
+- nsFileSpecImpl();
+- nsFileSpecImpl(const nsFileSpec& inSpec);
+- static nsresult MakeInterface(const nsFileSpec& inSpec, nsIFileSpec**
outSpec);
+-
+- //----------------------
+- // Data
+- //----------------------
+-
+- nsFileSpec
mFileSpec;
+- nsIInputStream* mInputStream;
+- nsIOutputStream* mOutputStream;
+-
+-private:
+- ~nsFileSpecImpl();
+-}; // class nsFileSpecImpl
+-
+-//========================================================================================
+-class nsDirectoryIteratorImpl
+-//========================================================================================
+- : public nsIDirectoryIterator
+-{
+-
+-public:
+-
+- nsDirectoryIteratorImpl();
+-
+- NS_DECL_ISUPPORTS
+-
+- NS_IMETHOD Init(nsIFileSpec *parent, PRBool resolveSymlink);
+-
+- NS_IMETHOD Exists(PRBool *_retval);
+-
+- NS_IMETHOD Next();
+-
+- NS_IMETHOD GetCurrentSpec(nsIFileSpec * *aCurrentSpec);
+-
+- //----------------------
+- // COM Cruft
+- //----------------------
+-
+- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
+-
+-private:
+- ~nsDirectoryIteratorImpl();
+-
+-protected:
+- nsDirectoryIterator*
mDirectoryIterator;
+-}; // class nsDirectoryIteratorImpl
+-
+-#endif // _FILESPECIMPL_H_
+Index: xpcom/obsolete/component/nsIRegistry.idl
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistry.idl
+diff -N xpcom/obsolete/component/nsIRegistry.idl
+--- xpcom/obsolete/component/nsIRegistry.idl 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,186 +0,0 @@
+-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org Code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1999
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#include "nsISupports.idl"
+-#include "nsIEnumerator.idl"
+-
+-interface nsIFile;
+-
+-typedef PRUint32 nsRegistryKey;
+-typedef long nsWellKnownRegistry;
+-
+-[scriptable,uuid(5D41A440-8E37-11d2-8059-00600811A9C3)]
+-interface nsIRegistry : nsISupports
+-{
+- const long None = 0;
+- const long Users = 1;
+- const long Common = 2;
+- const long CurrentUser = 3;
+-
+- const long ApplicationComponentRegistry = 1;
+- const long ApplicationRegistry = 2;
+-
+- // Dont use this one. This for internal use only.
+- const long ApplicationCustomRegistry = -1;
+-
+- void open(in nsIFile regFile);
+- void openWellKnownRegistry(in nsWellKnownRegistry regid);
+-
+- void flush();
+- boolean isOpen();
+-
+- nsRegistryKey addKey(in nsRegistryKey baseKey, in wstring keyname);
+- nsRegistryKey getKey(in nsRegistryKey baseKey, in wstring keyname);
+- void removeKey(in nsRegistryKey baseKey, in wstring keyname);
+-
+- wstring getString(in nsRegistryKey baseKey, in wstring valname);
+- void setString(in nsRegistryKey baseKey, in wstring valname, in wstring
value);
+-
+- string getStringUTF8(in nsRegistryKey baseKey, in string path);
+- void setStringUTF8(in nsRegistryKey baseKey, in string path, in string
value);
+-
+- void getBytesUTF8(in nsRegistryKey baseKey, in string path, out
PRUint32 length, [retval, array, size_is(length)] out PRUint8 valueArray);
+- void setBytesUTF8(in nsRegistryKey baseKey, in string path, in PRUint32
length, [array, size_is(length)] in PRUint8 valueArray);
+- PRInt32 getInt(in nsRegistryKey baseKey, in string path);
+- void setInt(in nsRegistryKey baseKey, in string path, in PRInt32 value);
+- PRInt64 getLongLong(in nsRegistryKey baseKey, in string path);
+- void setLongLong(in nsRegistryKey baseKey, in string path, inout
PRInt64 value);
+-
+- /**
+- * addSubtree() and friends need to be renamed to addKeyUTF8().
+- * If you are using these forms make sure you pass UTF8 data
+- */
+- nsRegistryKey addSubtree(in nsRegistryKey baseKey, in string path);
+- void removeSubtree(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtree(in nsRegistryKey baseKey, in string path);
+-
+- nsRegistryKey addSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- void removeSubtreeRaw(in nsRegistryKey baseKey, in string path);
+- nsRegistryKey getSubtreeRaw(in nsRegistryKey baseKey, in string path);
+-
+- nsIEnumerator enumerateSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateAllSubtrees(in nsRegistryKey baseKey);
+- nsIEnumerator enumerateValues(in nsRegistryKey baseKey);
+-
+- const unsigned long String = 1;
+- const unsigned long Int32 = 2;
+- const unsigned long Bytes = 3;
+- const unsigned long File = 4;
+-
+- unsigned long getValueType(in nsRegistryKey baseKey, in string path);
+- PRUint32 getValueLength(in nsRegistryKey baseKey, in string path);
+- void deleteValue(in nsRegistryKey baseKey, in string path);
+-
+- /**
+- * escapeKey() takes arbitrary binary data and converts it into
+- * valid ASCII which can be used as registry key or value names
+- */
+- void escapeKey([array, size_is(length)] in PRUint8 key, in PRUint32
terminator, inout PRUint32 length, [retval, array, size_is(length)] out
PRUint8 escaped);
+- void unescapeKey([array, size_is(length)] in PRUint8 escaped, in
PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)]
out PRUint8 key);
+-
+- attribute string currentUserName;
+-
+- void pack();
+-};
+-
+-[scriptable, uuid(8cecf236-1dd2-11b2-893c-f9848956eaec)]
+-interface nsIRegistryEnumerator : nsIEnumerator
+-{
+- void currentItemInPlaceUTF8(out nsRegistryKey key,
+- [shared, retval] out string item);
+-};
+-
+-[scriptable, uuid(D1B54831-AC07-11d2-805E-00600811A9C3)]
+-interface nsIRegistryNode : nsISupports
+-{
+- readonly attribute string nameUTF8;
+- readonly attribute wstring name;
+- readonly attribute nsRegistryKey key;
+-};
+-
+-[scriptable,uuid(5316C380-B2F8-11d2-A374-0080C6F80E4B)]
+-interface nsIRegistryValue : nsISupports
+-{
+- readonly attribute wstring name;
+- readonly attribute string nameUTF8;
+- readonly attribute unsigned long type;
+- readonly attribute PRUint32 length;
+-};
+-
+-[uuid(3A15FC88-7A61-4Ab4-8E58-31E95fAB3DA8)]
+-/**
+- * It sucks that nsIRegistry has to always allocate and return
+- * strings. nsIRegistryGetter adds in interfaces for non allocating getters
+- * to registry values.
+- */
+-interface nsIRegistryGetter : nsISupports
+-{
+- /**
+- * Get a string value of attribute valname in widestring or utf8 format
+- *
+- * @return
+- * NS_OK on success.
+- * buf has the string value copied into it. length is NOT changed.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in chars including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various failure codes otherwise. buf and length wont be updated.
+- */
+- void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout char buf, inout PRUint32 length);
+-
+- /**
+- * Get a a byte array value of attribute valname
+- *
+- * @return
+- * NS_OK on success. buf has the string value copied into it.
+- * length is updated to actual number of bytes copied into buf.
+- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
+- * length is updated to actual length in PRUint8s including
+- * terminating NULL and buf will be unchanged.
+- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
+- * length undefined.
+- * various other failure codes otherwise. buf and length wont be
updated.
+- */
+- void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
+- inout PRUint8 buf, inout PRUint32 length);
+-};
+-
+-%{ C++
+-#include "nsIRegistryUtils.h"
+-%}
+Index: xpcom/obsolete/component/nsIRegistryUtils.h
+===================================================================
+RCS file: xpcom/obsolete/component/nsIRegistryUtils.h
+diff -N xpcom/obsolete/component/nsIRegistryUtils.h
+--- xpcom/obsolete/component/nsIRegistryUtils.h 18 Apr 2004 14:18:15
-0000 1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,63 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-#ifndef __nsIRegistryUtils_h
+-#define __nsIRegistryUtils_h
+-
+-#define NS_REGISTRY_CONTRACTID "@mozilla.org/registry;1"
+-#define NS_REGISTRY_CLASSNAME "Mozilla Registry"
+-/* be761f00-a3b0-11d2-996c-0080c7cb1081 */
+-#define NS_REGISTRY_CID \
+-{ \
+- 0xbe761f00, \
+- 0xa3b0, \
+- 0x11d2, \
+- {0x99, 0x6c, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} \
+-}
+-
+-/*------------------------------- Error Codes
----------------------------------
+-------------------------------------------------------------------------------*/
+-#define NS_ERROR_REG_BADTYPE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 1 )
+-#define NS_ERROR_REG_NO_MORE NS_ERROR_GENERATE_SUCCESS(
NS_ERROR_MODULE_REG, 2 )
+-#define NS_ERROR_REG_NOT_FOUND NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 3 )
+-#define NS_ERROR_REG_NOFILE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 4 )
+-#define NS_ERROR_REG_BUFFER_TOO_SMALL NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 5 )
+-#define NS_ERROR_REG_NAME_TOO_LONG NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 6 )
+-#define NS_ERROR_REG_NO_PATH NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 7 )
+-#define NS_ERROR_REG_READ_ONLY NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 8 )
+-#define NS_ERROR_REG_BAD_UTF8 NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 9 )
+-
+-#endif
+Index: xpcom/obsolete/component/regExport.cpp
+===================================================================
+RCS file: xpcom/obsolete/component/regExport.cpp
+diff -N xpcom/obsolete/component/regExport.cpp
+--- xpcom/obsolete/component/regExport.cpp 18 Apr 2004 14:18:15 -0000
1.2
++++ /dev/null 1 Jan 1970 00:00:00 -0000
+@@ -1,357 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
+-/* ***** BEGIN LICENSE BLOCK *****
+- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+- *
+- * The contents of this file are subject to the Mozilla Public License
Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS"
basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is mozilla.org code.
+- *
+- * The Initial Developer of the Original Code is
+- * Netscape Communications Corporation.
+- * Portions created by the Initial Developer are Copyright (C) 1998
+- * the Initial Developer. All Rights Reserved.
+- *
+- * Contributor(s):
+- *
+- * Alternatively, the contents of this file may be used under the terms of
+- * either of the GNU General Public License Version 2 or later (the "GPL"),
+- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+- * in which case the provisions of the GPL or the LGPL are applicable
instead
+- * of those above. If you wish to allow use of your version of this file
only
+- * under the terms of either the GPL or the LGPL, and not to allow others to
+- * use your version of this file under the terms of the MPL, indicate your
+- * decision by deleting the provisions above and replace them with the
notice
+- * and other provisions required by the GPL or the LGPL. If you do not
delete
+- * the provisions above, a recipient may use your version of this file under
+- * the terms of any one of the MPL, the GPL or the LGPL.
+- *
+- * ***** END LICENSE BLOCK ***** */
+-
+-#include <stdio.h>
+-
+-#include "nsIServiceManager.h"
+-#include "nsIComponentManager.h"
+-#include "nsCOMPtr.h"
+-#include "nsIRegistry.h"
+-#include "nsIEnumerator.h"
+-#include "nsILocalFile.h"
+-#include "nsDependentString.h"
+-#include "prmem.h"
+-#include "plstr.h"
+-#include "nsMemory.h"
+-
+-static void display( nsIRegistry *reg, nsRegistryKey root, const char *name
);
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root );
+-static void printString( const char *value, int indent );
+-
+-int main( int argc, char *argv[] ) {
+-
+-
+-#ifdef __MWERKS__
+- // Hack in some arguments. A NULL registry name is supposed to tell
libreg
+- // to use the default registry (which does seem to work).
+- argc = 1;
+- const char* myArgs[] =
+- {
+- "regExport"
+- };
+- argv = const_cast<char**>(myArgs);
+-#endif
+-
+- nsresult rv;
+-
+- // Initialize XPCOM
+- nsIServiceManager *servMgr = NULL;
+- rv = NS_InitXPCOM2(&servMgr, NULL, NULL);
+- if (NS_FAILED(rv))
+- {
+- // Cannot initialize XPCOM
+- printf("Cannot initialize XPCOM. Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+- {
+- // Get the component manager
+- static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
+- nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
+- if (NS_FAILED(rv))
+- {
+- // Cant get component manager
+- printf("Cannot get component manager from service manager..
Exit. [rv=0x%08X]\n", (int)rv);
+- exit(-1);
+- }
+-
+- nsIRegistry *reg;
+-
+- if (argc>1) {
+- // Create the registry
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening registry file %s, rv=0x%08X\n",
argv[1] , (int)rv );
+- return rv;
+- }
+- // Open it against the input file name.
+- nsCOMPtr<nsILocalFile> regFile;
+- rv = NS_NewNativeLocalFile( nsDependentCString(argv[1]),
PR_FALSE, getter_AddRefs(regFile) );
+- if ( NS_FAILED(rv) ) {
+- printf( "Error instantiating local file for %s,
rv=0x%08X\n", argv[1], (int)rv );
+- return rv;
+- }
+-
+- rv = reg->Open( regFile );
+-
+- if ( rv == NS_OK )
+- {
+- printf( "Registry %s opened OK.\n", argv[1] );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- else
+- {
+- // Called with no arguments. Print both the default registry
and
+- // the components registry. We already printed the default
regsitry.
+- // So just do the component registry.
+- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
+- NS_GET_IID(nsIRegistry),
+- (void **) &reg);
+-
+- // Check result.
+- if ( NS_FAILED(rv) )
+- {
+- printf( "Error opening creating registry instance,
rv=0x%08X\n", (int)rv );
+- return rv;
+- }
+- rv =
reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+- if ( rv == NS_ERROR_REG_BADTYPE ) {
+- printf( "\n\n\nThere is no <Application Component
Registry>\n" );
+- }
+- else if ( rv == NS_OK ) {
+-
+- printf( "\n\n\nRegistry %s opened OK.\n", "<Application
Component Registry>\n" );
+-
+- // Recurse over all 3 branches.
+- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
+- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
+- }
+- NS_RELEASE(reg);
+- }
+- }
+- NS_ShutdownXPCOM( servMgr );
+-
+- return rv;
+-}
+-
+-void display( nsIRegistry *reg, nsRegistryKey root, const char *rootName ) {
+- // Print out key name.
+- printf( "%s\n", rootName );
+-
+- // Make sure it isn't a "root" key.
+- if ( root != nsIRegistry::Common
+- &&
+- root != nsIRegistry::Users
+- &&
+- root != nsIRegistry::CurrentUser ) {
+- // Print values stored under this key.
+- displayValues( reg, root );
+- }
+-
+- // Enumerate all subkeys (immediately) under the given node.
+- nsIEnumerator *keys;
+- nsresult rv = reg->EnumerateSubtrees( root, &keys );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Set enumerator to beginning.
+- rv = keys->First();
+- // Enumerate subkeys till done.
+- while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) {
+- nsISupports *base;
+- rv = keys->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryNode *node;
+- nsIID nodeIID = NS_IREGISTRYNODE_IID;
+- rv = base->QueryInterface( nodeIID, (void**)&node );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = node->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Build complete name.
+- char *fullName = new char[ PL_strlen(rootName) +
PL_strlen(name) + 5 ];
+- PL_strcpy( fullName, rootName );
+- PL_strcat( fullName, " - " );
+- PL_strcat( fullName, name );
+- // Display contents under this subkey.
+- nsRegistryKey key;
+- rv = reg->GetSubtreeRaw( root, name, &key );
+- if ( rv == NS_OK ) {
+- display( reg, key, fullName );
+- printf( "\n" );
+- } else {
+- printf( "Error getting key, rv=0x%08X\n",
(int)rv );
+- }
+- delete [] fullName;
+- } else {
+- printf( "Error getting subtree name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- node->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = keys->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- }
+- }
+- // Release key enumerator.
+- keys->Release();
+- } else {
+- printf( "Error creating enumerator for %s, root=0x%08X,
rv=0x%08X\n",
+- rootName, (int)root, (int)rv );
+- }
+- return;
+-}
+-
+-static void displayValues( nsIRegistry *reg, nsRegistryKey root ) {
+- // Emumerate values at this registry location.
+- nsIEnumerator *values;
+- nsresult rv = reg->EnumerateValues( root, &values );
+-
+- // Check result.
+- if ( rv == NS_OK ) {
+- // Go to beginning.
+- rv = values->First();
+-
+- // Enumerate values till done.
+- while( rv == NS_OK && (NS_OK != values->IsDone()) ) {
+- nsISupports *base;
+- rv = values->CurrentItem( &base );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Get specific interface.
+- nsIRegistryValue *value;
+- nsIID valueIID = NS_IREGISTRYVALUE_IID;
+- rv = base->QueryInterface( valueIID, (void**)&value );
+- // Test that result.
+- if ( rv == NS_OK ) {
+- // Get node name.
+- char *name;
+- rv = value->GetNameUTF8( &name );
+- // Test result.
+- if ( rv == NS_OK ) {
+- // Print name:
+- printf( "\t\t%s", name );
+- // Get info about this value.
+- PRUint32 type;
+- rv = reg->GetValueType( root, name, &type );
+- if ( rv == NS_OK ) {
+- // Print value contents.
+- switch ( type ) {
+- case nsIRegistry::String: {
+- char *strValue;
+- rv = reg->GetStringUTF8( root,
name, &strValue );
+- if ( rv == NS_OK ) {
+- printString( strValue,
strlen(name) );
+- nsMemory::Free( strValue );
+- } else {
+- printf( "\t Error getting
string value, rv=0x%08X", (int)rv );
+- }
+- }
+- break;
+-
+- case nsIRegistry::Int32:
+- {
+- PRInt32 val = 0;
+- rv = reg->GetInt( root, name, &val
);
+- if (NS_SUCCEEDED(rv)) {
+- printf( "\t= Int32 [%d, 0x%x]",
val, val);
+- }
+- else {
+- printf( "\t Error getting int32
value, rv=%08X", (int)rv);
+- }
+- }
+- break;
+-
+- case nsIRegistry::Bytes:
+- printf( "\t= Bytes" );
+- break;
+-
+- case nsIRegistry::File:
+- printf( "\t= File (?)" );
+- break;
+-
+- default:
+- printf( "\t= ? (unknown type=0x%02X)",
(int)type );
+- break;
+- }
+- } else {
+- printf( "\t= ? (error getting value,
rv=0x%08X)", (int)rv );
+- }
+- printf("\n");
+- nsMemory::Free( name );
+- } else {
+- printf( "Error getting value name, rv=0x%08X\n",
(int)rv );
+- }
+- // Release node.
+- value->Release();
+- } else {
+- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
+- }
+- // Release item.
+- base->Release();
+-
+- // Advance to next key.
+- rv = values->Next();
+- // Check result.
+- if ( NS_SUCCEEDED( rv ) ) {
+- } else {
+- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
+- break;
+- }
+- } else {
+- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
+- break;
+- }
+- }
+-
+- values->Release();
+- } else {
+- printf( "\t\tError enumerating values, rv=0x%08X\n", (int)rv );
+- }
+- return;
+-}
+-
+-static void printString( const char *value, int /*indent*/ ) {
+- // For now, just dump contents.
+- printf( "\t = %s", value );
+- return;
+-}
+
diff --git a/video/freevo/DEPENDS b/video/freevo/DEPENDS
index 3a16b3a..4c04f94 100755
--- a/video/freevo/DEPENDS
+++ b/video/freevo/DEPENDS
@@ -4,26 +4,10 @@ depends kaa-imlib2 &&
depends beautifulsoup &&
depends freetype2 &&
depends twisted &&
-depends pygame &&
-sub_depends pygame NUMERIC &&
depends pyxml &&
depends libexif &&
-optional_depends mplayer \
- "" \
- "" \
- "for mplayer support" &&
-
-optional_depends xine-ui \
- "" \
- "" \
- "for xine user interface" &&
-
-optional_depends pylirc \
- "" \
- "" \
- "for remote control support" &&
-
-optional_depends alsa-utils \
- '' \
- '' \
- 'alsa mixer support'
+optional_depends -sub NUMERIC pygame '' '' 'games support' &&
+suggest_depends mplayer '' '' 'use MPlayer' &&
+suggest_depends xine-ui '' '' 'xine user interfac' &&
+suggest_depends pylirc '' '' 'remote control support' &&
+suggest_depends alsa-utils '' '' 'alsa mixer support'
diff --git a/video/freevo/DETAILS b/video/freevo/DETAILS
index 725bcb7..7ad6de8 100755
--- a/video/freevo/DETAILS
+++ b/video/freevo/DETAILS
@@ -1,6 +1,6 @@
SPELL=freevo
- VERSION=1.7.6.1
-
SOURCE_HASH=sha512:f8562990ac4137042bfd9657bffb3b5f38bc02c3809a528cb798de67fbfa0c6fe2ba87b3cc0a6a2f65fbc11bc456ebba4dd27b4975202859835858893414f9b8
+ VERSION=1.8.0
+
SOURCE_HASH=sha512:d93da159858c9fe65d1a321971f43245ccf8922ce95cdb7f99e26c6b6335abf67bd3912d6d4d60bec9945df8097d5e26f34027bc774369882a48d8e48a574fcc
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/$SOURCE
diff --git a/video/freevo/HISTORY b/video/freevo/HISTORY
index f1a2410..45de4d2 100644
--- a/video/freevo/HISTORY
+++ b/video/freevo/HISTORY
@@ -1,3 +1,9 @@
+2008-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.0
+ * DEPENDS: optionals -> suggests
+ pygame is optional
+ * PRE_BUILD: disable check for pygame
+
2008-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.6.1

diff --git a/video/freevo/PRE_BUILD b/video/freevo/PRE_BUILD
index 08774db..0c76276 100755
--- a/video/freevo/PRE_BUILD
+++ b/video/freevo/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i "/Image/D" setup.py
+sed -i "/Image/D;/pygame/D" setup.py
diff --git a/video/lxdvdrip/HISTORY b/video/lxdvdrip/HISTORY
index db2a035..b00fff6 100644
--- a/video/lxdvdrip/HISTORY
+++ b/video/lxdvdrip/HISTORY
@@ -1,3 +1,10 @@
+2008-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, lxdvdrip-1.70-makefile.patch,
+ lxdvdrip-1.70-vamps-makefile.patch, systools.c.patch:
+ added two patches from gentoo to make the Makefile honor our
+ compiler and CFLAGS, added one patch that adds a missing
+ header to systools.c
+
2007-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.70
* PRE_BUILD, Makefile.patch: removed patch
diff --git a/video/lxdvdrip/PRE_BUILD b/video/lxdvdrip/PRE_BUILD
index c39884f..c12bcf1 100755
--- a/video/lxdvdrip/PRE_BUILD
+++ b/video/lxdvdrip/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit "s:INSTALLDIR = /usr/local:INSTALLDIR = $INSTALL_ROOT/usr:" \
- $SOURCE_DIRECTORY/Makefile
+ $SOURCE_DIRECTORY/Makefile &&
+patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-makefile.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-vamps-makefile.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/systools.c.patch
diff --git a/video/lxdvdrip/lxdvdrip-1.70-makefile.patch
b/video/lxdvdrip/lxdvdrip-1.70-makefile.patch
new file mode 100644
index 0000000..af2bb7f
--- /dev/null
+++ b/video/lxdvdrip/lxdvdrip-1.70-makefile.patch
@@ -0,0 +1,18 @@
+Index: lxdvdrip/Makefile
+===================================================================
+--- lxdvdrip.orig/Makefile
++++ lxdvdrip/Makefile
+@@ -4,11 +4,8 @@ HINWEIS1 = 'Check the configuration file
+ HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
+
+ all:
+- gcc -g -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c
streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c
dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c
+- gcc -g -lm -o lxac3scan lxac3scan.c
+- cd vamps && make && cd ..
+- cd dvdbackup && make && cd ..
+- cd buffer && make && cd ..
++ $(CC) $(CFLAGS) $(LDFLAGS) -o lxdvdrip lxdvdrip.c streamanalyze.c
ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c
dvdcopy.c requant.c cputest.c tcmemcpy.c -lm -ldvdread -ldvdnav -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) -o lxac3scan lxac3scan.c -lm
+
+ clean:
+ rm -f lxdvdrip lxac3scan *.o
diff --git a/video/lxdvdrip/lxdvdrip-1.70-vamps-makefile.patch
b/video/lxdvdrip/lxdvdrip-1.70-vamps-makefile.patch
new file mode 100644
index 0000000..e2fb877
--- /dev/null
+++ b/video/lxdvdrip/lxdvdrip-1.70-vamps-makefile.patch
@@ -0,0 +1,13 @@
+Index: lxdvdrip/vamps/Makefile
+===================================================================
+--- lxdvdrip.orig/vamps/Makefile
++++ lxdvdrip/vamps/Makefile
+@@ -21,7 +21,7 @@ CC = gcc
+ CFLAGS ?= -O2 -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 \
+ -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS += -Wall
+-LDFLAGS += -s
++LDFLAGS +=
+ LOADLIBES += -lm -lpthread -ldvdread
+
+ INSTALL ?= install
diff --git a/video/lxdvdrip/systools.c.patch b/video/lxdvdrip/systools.c.patch
new file mode 100644
index 0000000..fde4bbf
--- /dev/null
+++ b/video/lxdvdrip/systools.c.patch
@@ -0,0 +1,10 @@
+--- systools.c.orig 2008-03-21 12:25:50.431537550 +0100
++++ systools.c 2008-03-21 12:26:03.129470734 +0100
+@@ -26,6 +26,7 @@ COMMENTAIRE :
+ #include <sys/wait.h>
+ #include <linux/cdrom.h>
+ #include <ctype.h>
++#include <limits.h>
+
+ char ** environ;
+ #define SH_PATH "/bin/sh"
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 0b35e22..253ea94 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -1,3 +1,5 @@
+depends libcap &&
+
if [ "$MPLAYER_GUI" == "gtk+" ]
then depends gtk+ '--enable-gui --enable-gtk1' &&
depends mplayer-gui
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 9427320..e70687d 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on libcap
+
2008-03-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD, demux_audio_fix_20080129.diff,
demux_mov_fix_20080129.diff, stream_cddb_fix_20080120.diff,
@@ -509,3 +512,4 @@
2002-04-23 Eric Schabell <eric AT schabell.com>
* HISTORY: Added this History file
* DETAILS: version 0.90.pre1.
+
diff --git a/video/totem/DETAILS b/video/totem/DETAILS
index d7e6d82..af305a6 100755
--- a/video/totem/DETAILS
+++ b/video/totem/DETAILS
@@ -12,7 +12,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="gnome player video"
SHORT="totem is a gnome media player based on xine or gstreamer"
cat << EOF
-Totem is simple movie player for the Gnome desktop which can use xine or
gstreamer.
-It features a simple playlist, a full-screen mode, seek and volume
-controls, as well as a pretty complete keyboard navigation and a browser
plugin.
+Totem is simple movie player for the Gnome desktop which can use xine or
+gstreamer. It features a simple playlist, a full-screen mode, seek and
+volume controls, as well as a pretty complete keyboard navigation and a
+browser plugin.
EOF
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index f7cc290..c69bc5e 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2008-03-26 Ethan Grammatikidis <eekee57 AT fastmail.fm>
+ * DETAILS: Cleaned up long desc (80-col)
+
2008-03-14 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.0

diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
new file mode 100755
index 0000000..6b84586
--- /dev/null
+++ b/windowmanagers/awesome/DEPENDS
@@ -0,0 +1,12 @@
+depends cairo &&
+depends confuse &&
+depends pkgconfig &&
+depends X11-LIBS &&
+
+. $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs; then
+ depends libxft &&
+ depends libxinerama &&
+ depends libxrandr
+fi
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
new file mode 100755
index 0000000..918d78b
--- /dev/null
+++ b/windowmanagers/awesome/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=awesome
+ VERSION=2.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ LICENSE[0]=MIT
+ KEYWORDS="windowmanagers"
+ WEB_SITE=http://awesome.naquadah.org/
+ ENTERED=20080324
+ SHORT='A dwm-based window manager with many layouts'
+cat << EOF
+awesome is a floating and tiling window manager initialy based on a dwm code
+rewriting. It's extremely fast, small, dynamic and awesome.
+
+Windows can be managed in several layouts: tiled, maximized, dwindle, spiral,
+floating. Each layout can be applied on the fly, optimizing the environment
for
+the application in use and the task performed.
+
+Managing windows in tiled mode assures that no space will be wasted on your
+screen. No gaps, no overlap. Other layouts can be used for different purpose.
+
+If you do not want to use the tiling management, you can use the floating
+layout wich will let you organize your windows as you wish, like any other
+window manager.
+EOF
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
new file mode 100644
index 0000000..c1af47b
--- /dev/null
+++ b/windowmanagers/awesome/HISTORY
@@ -0,0 +1,3 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, DEPENDS, INSTALL, startawesome, awesome.desktop: Created
+
diff --git a/windowmanagers/awesome/INSTALL b/windowmanagers/awesome/INSTALL
new file mode 100755
index 0000000..88255cc
--- /dev/null
+++ b/windowmanagers/awesome/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install_wmfiles
diff --git a/windowmanagers/awesome/awesome-2.2.tar.bz2.sig
b/windowmanagers/awesome/awesome-2.2.tar.bz2.sig
new file mode 100644
index 0000000..840e2db
Binary files /dev/null and b/windowmanagers/awesome/awesome-2.2.tar.bz2.sig
differ
diff --git a/windowmanagers/awesome/awesome.desktop
b/windowmanagers/awesome/awesome.desktop
new file mode 100644
index 0000000..e81d069
--- /dev/null
+++ b/windowmanagers/awesome/awesome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=awesome
+Comment=This session logs you into Awesome
+Exec=startawesome
+TryExec=startawesome
+Icon=
+Type=Application
diff --git a/windowmanagers/awesome/startawesome
b/windowmanagers/awesome/startawesome
new file mode 100644
index 0000000..c5ece3c
--- /dev/null
+++ b/windowmanagers/awesome/startawesome
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# startawesome
+#
+# Copyright (C) 2008 Eric Sandall <sandalle AT sourcemage.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+exec awesome
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index 05782e5..de269d8 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -1,10 +1,10 @@
SPELL=fontconfig
- VERSION=2.4.2
+ VERSION=2.5.91
+
SOURCE_HASH=sha512:f24905f5a5d4c962cfdf1ba3bd1b16e96e034b43a9c6fab92ba0d94ca975265bec8402ae8bef49681b2542e22f4bcb5841b2c906ac1de1857ea14eaf9226a56a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.fontconfig.org/release/$SOURCE
WEB_SITE=http://www.fontconfig.org/
-
SOURCE_HASH=sha512:287252b61c40fb5909775a75c2a51164b3eaaaf14c7343d52c4ed4038b25f60c87bdf25c710bd4fd4cf96da751a4574a6df445e8b2507f5e70229647ea638e1f
LICENSE[0]=X11
ENTERED=20020909
SHORT="Library for configuring and customizing font access"
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index ed56fcd..2e0999b 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.91
+
2007-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.2

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 2123845..1e647d0 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -11,7 +11,7 @@ if [[ $WINE_VCS == y ]]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=1
else
- VERSION=0.9.57
+ VERSION=0.9.58
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index c8de7cd..2c8871a 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2008-03-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.58
+
2008-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.57
* PRE_BUILD, ncurses.utf8.patch: deleted, no longer needed
diff --git a/x11-toolkits/fltk/DETAILS b/x11-toolkits/fltk/DETAILS
index 005a3d7..ce551d4 100755
--- a/x11-toolkits/fltk/DETAILS
+++ b/x11-toolkits/fltk/DETAILS
@@ -1,6 +1,6 @@
SPELL=fltk
- VERSION=1.1.8rc2
-
SOURCE_HASH=sha512:6963a9b97e9fcd11fe865ff44318353c6d82a80965530828ddeea9cacdac8ddb556d15fb994bdf730cc221fb2c8bb1862cb3d27a9d3c4f1c420b3a1499c6ed37
+ VERSION=1.1.8rc3
+
SOURCE_HASH=sha512:f83f022dd0957619cc85141ed9e80c0074d55bf00a628793b6cdece7b7a24371ca6afc66d2b78c7cbe0f1e079c550072b03b254d41a05c885ee08ce26cd67bb8
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index b32233e..2887c1d 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,6 @@
+2008-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.8rc3
+
2008-03-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.8rc2

diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 78a1dd6..1175fac 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,11 +1,12 @@
-depends X11-LIBS &&
-depends glib2 &&
-depends atk &&
-depends pango &&
-depends libpng &&
-depends jpeg &&
-depends tiff &&
-depends cairo &&
+depends atk &&
+depends cairo &&
+depends e2fsprogs &&
+depends glib2 &&
+depends jpeg &&
+depends libpng &&
+depends pango &&
+depends tiff &&
+depends X11-LIBS &&

source $GRIMOIRE/FUNCTIONS &&

diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index d54736e..34bb016 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on e2fsprogs for libcom_err
+
2008-03-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.12.9
Fixed SOURCE_URL[1]
diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index 0f5cfba..390160e 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1,6 +1,5 @@
-depends X11-LIBS &&
+depends X11-LIBS &&

-optional_depends wireless_tools \
- '--enable-wlan' \
- '--disable-wlan' \
- 'for Wireless support'
+optional_depends wireless_tools \
+ "--enable-wlan" "--disable-wlan" \
+ "for Wireless support"
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 2d300a2..3af77f1 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,15 +1,15 @@
SPELL=conky
- VERSION=1.4.9
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+ VERSION=1.5.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=BSD
KEYWORDS="x11"
WEB_SITE=http://conky.sourceforge.net/
ENTERED=20051018
- SHORT="an advanced, highly configurable system monitor for X."
+ SHORT="advanced, highly configurable system monitor for X"
cat << EOF
-conky is system monitor for X originally based on the torsmo code, but more
-kickass.
+conky is system monitor for X originally based on the torsmo code, but
+more kickass.
EOF
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index fe5d212..c054807 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,7 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.0
+ * PRE_BUILD: fixed route.h header
+
2007-11-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.9

diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
new file mode 100755
index 0000000..059773d
--- /dev/null
+++ b/x11/conky/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:linux/route:net/route:" src/linux.c
diff --git a/x11/conky/conky-1.4.9.tar.gz.sig
b/x11/conky/conky-1.4.9.tar.gz.sig
deleted file mode 100644
index c19f6a0..0000000
Binary files a/x11/conky/conky-1.4.9.tar.gz.sig and /dev/null differ
diff --git a/x11/conky/conky-1.5.0.tar.gz.sig
b/x11/conky/conky-1.5.0.tar.gz.sig
new file mode 100644
index 0000000..5f4bf40
Binary files /dev/null and b/x11/conky/conky-1.5.0.tar.gz.sig differ
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index 8077432..c0303b7 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,10 +1,10 @@
SPELL=xscreensaver
- VERSION=5.03
+ VERSION=5.05
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
-
SOURCE_HASH=sha512:05aca46a2c9f7fd7092aded265a4776abc5ba65443fe419104c353ea442005e0fa9d361003170bcf5066cb52fdd59f049ea6e18c8d218938e4a50d8d9043bec9
+
SOURCE_HASH=sha512:74ba44a7a6b3338ec7aba70f5d7da7161275584c5e4ee1543c6057cde9ae08bfd916096982f256383ef077beb3e3b1064c4deb24915beb20740d7ad7c8a665bf
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 1be2e9e..1fa607b 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,13 @@
+2008-03-24 David Kowis <dkowis AT shlrm.org>
+ * PRE_BUILD, demo-Gtk.patch: Removed
+ * DETAILS: version to 5.05, fixing bug that previous patch supposedly
+ fixed
+
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply demo-Gtk.patch
+ * demo-Gtk.patch: Patch written by Javier to fix compilation with
+ latest gtk+2. Fixes Bug #14387
+
2007-07-23 David Brown <dmlb2000 AT gmail.com>
* DETAILS: 5.03

diff --git a/xfce/ristretto/DEPENDS b/xfce/ristretto/DEPENDS
index 2ea3806..14671ab 100755
--- a/xfce/ristretto/DEPENDS
+++ b/xfce/ristretto/DEPENDS
@@ -1,6 +1,6 @@
-depends dbus-glib &&
-depends gtk+2 &&
-depends libxfce4util &&
-depends libxfcegui4 &&
-depends libexif &&
-depends thunar
+depends dbus-glib &&
+depends gtk+2 &&
+depends libxfce4util &&
+depends libxfcegui4 &&
+depends libexif &&
+depends thunar
diff --git a/xfce/ristretto/DETAILS b/xfce/ristretto/DETAILS
index 9e96327..aa8f9e6 100755
--- a/xfce/ristretto/DETAILS
+++ b/xfce/ristretto/DETAILS
@@ -1,8 +1,8 @@
SPELL=ristretto
- VERSION=0.0.17
+ VERSION=0.0.18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:49d46998edf916d77989482455beef6f9b9c99b56edc50403f3a0ef340c2e5e81eee1a9daf53f6a3ededd426850ba62f20e7d45012fd4c80fe919cf4c38c9aa3
+
SOURCE_HASH=sha512:5d5fe0b63541708caa4f42ff5e8a7926904510b4dfb66594bb9150c82d11260d68f3f40b125dfe148ca58fc50add20dd57f3c8c8d5841f1e3ca7404deb5aff3e
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://goodies.xfce.org/projects/applications/ristretto/
LICENSE[0]=GPL
diff --git a/xfce/ristretto/HISTORY b/xfce/ristretto/HISTORY
index 8523ae1..f684d0b 100644
--- a/xfce/ristretto/HISTORY
+++ b/xfce/ristretto/HISTORY
@@ -1,3 +1,6 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.0.18
+
2008-03-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.0.17

diff --git a/xfce/xfdesktop/HISTORY b/xfce/xfdesktop/HISTORY
index 89528e7..676d3cb 100644
--- a/xfce/xfdesktop/HISTORY
+++ b/xfce/xfdesktop/HISTORY
@@ -1,3 +1,6 @@
+2008-03-23 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: added to fix menu plugin crash
+
2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
* DEPENDS: cleaned up
diff --git a/xfce/xfdesktop/PRE_BUILD b/xfce/xfdesktop/PRE_BUILD
new file mode 100755
index 0000000..1b7a34f
--- /dev/null
+++ b/xfce/xfdesktop/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit "s:G_INLINE_FUNC void desktop_menuspec_path_free:void
desktop_menuspec_path_free:" \
+modules/menu/desktop-menuspec.h



  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (14973c07cf4c3fca9bda6f6c4622b48617661923), Eric Sandall, 03/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page