sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1314529ca87d4f2094e8299336ee34be6a7da5b2)

From: Bor Kraljič <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1314529ca87d4f2094e8299336ee34be6a7da5b2)
Date: Wed, 31 Aug 2011 02:15:20 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 23 +
apache.gpg |binary
audio-players/eawpats/BUILD | 11
audio-players/eawpats/CONFLICTS | 1
audio-players/eawpats/DETAILS | 11
audio-players/eawpats/HISTORY | 5
audio-players/eawpats/INSTALL | 1
audio-players/eawpats/PRE_BUILD | 1
audio-players/eawpats/UP_TRIGGERS | 2
audio-players/timidity-cvs/DEPENDS | 2
audio-players/timidity-cvs/HISTORY | 3
audio-players/timidity/DEPENDS | 2
audio-players/timidity/HISTORY | 3
audio-players/wildmidi/BUILD | 2
audio-players/wildmidi/DEPENDS | 4
audio-players/wildmidi/DETAILS | 14
audio-players/wildmidi/HISTORY | 3
audio-soft/freepats/BUILD | 1
audio-soft/freepats/DETAILS | 13
audio-soft/freepats/HISTORY | 3
audio-soft/freepats/INSTALL | 3
dev/null |binary
devel/tig/DETAILS | 4
devel/tig/HISTORY | 3
disk/udev/BUILD | 2
disk/udev/HISTORY | 3
doc/pstoedit/DETAILS | 4
doc/pstoedit/HISTORY | 4
doc/pstoedit/PRE_BUILD | 5
ftp/wget/DETAILS | 3
ftp/wget/HISTORY | 3
gnome2-apps/empathy/DEPENDS | 6
gnome2-apps/empathy/HISTORY | 3
graphics-libs/libemf/DEPENDS | 1
graphics-libs/libemf/DETAILS | 17
graphics-libs/libemf/HISTORY | 3
graphics-libs/libemf/PRE_BUILD | 4
http/apache22/DETAILS | 4
http/apache22/HISTORY | 3
http/tinyproxy/BUILD | 5
http/tinyproxy/HISTORY | 3
http/tinyproxy/INSTALL | 2
http/webkitgtk/DETAILS | 8
http/webkitgtk/HISTORY | 3
http/webkitgtk3/DETAILS | 4
http/webkitgtk3/HISTORY | 3
kde4-apps/FUNCTIONS | 2
kde4-bindings/FUNCTIONS | 4
kde4-edu/FUNCTIONS | 2
kde4-look/FUNCTIONS | 2
kde4/FUNCTIONS | 2
kde4/kde4-l10n/BUILD | 2
kde4/kde4-l10n/HISTORY | 3
kde4/kde4-profile/HISTORY | 3
kde4/kde4-profile/kde4.desktop | 4
kde4/kdebase-workspace4/HISTORY | 3
kde4/kdebase-workspace4/init.d/kdm4 | 2
kde4/kdebase-workspace4/kde4.desktop | 4
kde4/kdebase-workspace4/kde4.sh | 2
kde4/kdelibs4/CONFLICTS | 177
++++++++++
kde4/kdelibs4/HISTORY | 7
kde4/kdelibs4/PRE_BUILD | 9
kde4/kdelibs4/UP_TRIGGERS | 12
kernels/linux/HISTORY | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.32.46 | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.33.19 | 6
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.4 | 6
kernels/linux/latest.defaults | 2
libs/libatomic_ops/DETAILS | 9
libs/libatomic_ops/HISTORY | 4
mail/claws-mail-extra-plugins/CONFIGURE | 1
mail/claws-mail-extra-plugins/DETAILS | 2
mail/claws-mail-extra-plugins/HISTORY | 4
mail/claws-mail/DETAILS | 2
mail/claws-mail/HISTORY | 4
mail/claws-mail/PRE_BUILD | 3
mail/claws-mail/claws-notify-crash.patch | 18 -
mail/thunderbird/DETAILS | 2
mail/thunderbird/HISTORY | 3
net/iptraf-ng/CONFLICTS | 1
net/iptraf-ng/DEPENDS | 1
net/iptraf-ng/DETAILS | 24 +
net/iptraf-ng/HISTORY | 3
net/wicd/BUILD | 2
net/wicd/HISTORY | 3
perl-cpan/digest-hmac/DEPENDS | 3
perl-cpan/digest-hmac/DETAILS | 18 -
perl-cpan/digest-hmac/HISTORY | 4
perl-cpan/filehandle-unget/DEPENDS | 3
perl-cpan/filehandle-unget/HISTORY | 3
perl-cpan/mail-internet/DEPENDS | 3
perl-cpan/mail-internet/HISTORY | 3
perl-cpan/mime-tools/DEPENDS | 3
perl-cpan/mime-tools/HISTORY | 3
perl-cpan/net-dns/DEPENDS | 4
perl-cpan/net-dns/HISTORY | 4
perl-cpan/razor-agents/DEPENDS | 5
perl-cpan/razor-agents/HISTORY | 3
php-pear/php/DETAILS | 3
php-pear/php/HISTORY | 3
python-pypi/bzr/DETAILS | 2
python-pypi/bzr/HISTORY | 3
python-pypi/bzrtools/DETAILS | 4
python-pypi/bzrtools/HISTORY | 3
python-pypi/sqlalchemy/DETAILS | 9
python-pypi/sqlalchemy/HISTORY | 3
shell-term-fm/mc/DETAILS | 2
shell-term-fm/mc/HISTORY | 3
utils/kexec-tools/BUILD | 3
utils/kexec-tools/DEPENDS | 14
utils/kexec-tools/DETAILS | 1
utils/kexec-tools/HISTORY | 6
utils/kexec-tools/PRE_BUILD | 4
utils/qemu/BUILD | 1
utils/qemu/HISTORY | 5
utils/qemu/archs | 71 ++--
utils/strigi/HISTORY | 3
utils/strigi/strigi.sh | 2
windowmanagers/ede/DEPENDS | 2
windowmanagers/ede/DETAILS | 17
windowmanagers/ede/HISTORY | 3
windowmanagers/fvwm/CONFIGURE | 6
windowmanagers/fvwm/DEPENDS | 96 +++--
windowmanagers/fvwm/DETAILS | 15
windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2 | 0
windowmanagers/fvwm/HISTORY | 8
windowmanagers/fvwm/PREPARE | 3
windowmanagers/fvwm/PRE_BUILD | 10
wm-addons/xxkb/DETAILS | 1
wm-addons/xxkb/HISTORY | 4
wm-addons/xxkb/INSTALL | 3
x11-toolkits/efltk/BUILD | 3
x11-toolkits/efltk/DEPENDS | 24 -
x11-toolkits/efltk/DETAILS | 15
x11-toolkits/efltk/HISTORY | 13
x11/xautolock/BUILD | 2
x11/xautolock/HISTORY | 3
xorg-util/xorg-cf-files/DETAILS | 1
xorg-util/xorg-cf-files/HISTORY | 5
xorg-util/xorg-cf-files/PRE_BUILD | 1
xorg-util/xorg-cf-files/man-path.patch | 11
141 files changed, 707 insertions(+), 303 deletions(-)

New commits:
commit 1e0d9a55315a72ea4cc9354a8dbc73076b8460a6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

strigi: removed /opt/kde4/share

commit 76849e8ed5eea583d8575cbc2e2500b72e27bef3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

wicd: /opt/kde4 -> /usr

commit b41d9a2083834c67418ed420506ba1ca5192e2df
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: added trigger to recast everything that depedns on kdelibs4

commit 62568a8b27658673c7456f4370bfbbaef364852c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdebase-workspace4: /opt/kde4 -> /usr

commit adc13a96856d12e218388eb0baa10a992f8b9bc8
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-profile: /opt/kde4 -> /usr

commit 23729ee0497a019c05049e9cabe7380b9a512d97
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-l10n: /opt/kde4 -> /usr

commit 175dcd8ef8f94335b1470030d1ba30c6af1bd194
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

{kde4-apps,kde4-bindings,kde4-edu,kde4-look,kde4}/FUNCTIONS: /opt/kde4 ->
/usr

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

apache.gpg: added 791485A8 public key (Jim Jagielski (Release Signing
Key) <jim AT apache.org>)

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

webkitgtk3 1.4.3

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

webkitgtk 1.4.3

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

wget: => 1.13.3

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

apache22: => 2.2.20 (security)

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

tinyproxy: don't trash config file on installwatch-based setups

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

net/iptraf-ng - 1.0.2 new spell

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

bzrtools: => 2.4.0

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

bzr: => 2.4.0

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

libatomic_ops: => 7.1

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

xautolock: removed dirty hack before build

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

xxkb: install manual page

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

xorg-cf-files: corrected man path dir

commit 5dde308ab0fb7afc1b3196e34cd6e0118b256443
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fvwm: versions 2.6.2 and 2.7.0, completed DEPENDS, removed patch for 2.5

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

qemu: corrected config path and refreshed archlist

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

udev: in Soviet Russia abouter tests triple times

commit 3a8558ce923a2bc328cc3924df552109f97d4fad
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

Revert "util-linux 2.20"

This reverts commit 888c83b328bb9a236082c212622ca76b6384e806.

Release highlights
------------------
agetty(8):
- mingetty features have been merged to agetty

agetty now needs ttyX in /etc/initttab without /dev :
Aug 30 07:17:39 [agetty] /dev//dev/tty1: No such file or directory

with our /etc/inittab it is not possible to login on console :-(
ssh works of course

we should probably remove /dev from our /etc/inittab, need some testing

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

util-linux 2.20

commit a85d182e27cf7a306ce81ebc265982050afa66d4
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 2.6.32.46

commit 9f57c15b54f5060ca06b6b16393a3d6cb55bebbb
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 2.6.33.19

commit 24f4c48cae5904aa14050d4680f2f35a2e7f5ff2
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

linux 3.0.4

commit 29a040c46e1bd180999b046395b23135eedc7bb2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: added all the spells that depend on kde3 kdelibs

commit cd22bbf3b2fca6c93da50de87deae39a890d3286
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wildmidi: new spell, simple software synth

commit f48fb4c7c0a4dbf34f1c2ea24e6398e09db57a6f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

empathy: made evolution-data-server optional

commit af6aeeb3f8dc17d7ee2c1b48bfe22b0b30107506
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

timidity-cvs: switch from eawpats to freepats

commit ddd06a097eaea64cd9b272fcfa78e30af6e35eeb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

timidity: switch from eawpats to freepats

commit edda61a6ea172d41f0a964d4939a435317fb54e7
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

freepats: new spell, midi patchset. replaces eawpats

commit 8ace26ccad8f67c72c51dafd2345017a79d098c3
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

eawpats: deprecated in favour of freepats

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

mail-internet: removed unneeded dependencies

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

filehandle-unget: removed unneeded dependencies

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

mime-tools: removed unneeded dependencies

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

digest-hmac: removed unneeded dependencies

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

razor-agents: removed unneeded dependencies

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

net-dns: removed unneeded dependencies

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

php: apply the latest suhosin patch for legacy PHP branch

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

tig 0.18

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

claws-mail-extra-plugins 3.7.10

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

mc: corrected source url to make it downloadable via wget

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

claws-mail 3.7.10

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

pstoedit 3.60

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

graphics-libs/libemf: new spell, library for generating Enhanced
Metafiles

commit c9bf457fca6685dfc80d4babd2b0f8b00dbc6ad0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

thunderbird: updated version to 6.0

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

kexec-tools: fixed kernel load on 64-bit systems

commit 2950a3931bbe9ab0add23feac57120d1645b616b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

efltk: removed, it didn't build for a very long time

commit 14a5750766d75a65744cd9fa425f3ee9e7cce879
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

ede: dropped this spell as it hasn't been able to build for a long time

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

sqlalchemy: => 0.7.2

diff --git a/ChangeLog b/ChangeLog
index 562f217..472fc9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * {kde4-apps,kde4-bindings,kde4-edu,kde4-look,kde4}/FUNCTIONS:
/opt/kde4 -> /usr
+
+2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * apache.gpg: added 791485A8 public key (Jim Jagielski (Release
Signing
+ Key) <jim AT apache.org>)
+
+2011-08-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * net/iptraf-ng: new spell
+ IP traffic monitor
+
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * graphics-libs/libemf: new spell
+ library for generating Enhanced Metafiles
+
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * windowmanagers/ede: removed spell, it did not build for a long time
+ * x11-toolkits/efltk: removed spell, it did not build for a long time
+ * audio-soft/freepats: new spell, midi patchset
+ * audio-players/eawpats: deprecated in favour of freepats
+ * audio-players/wildmidi: new spell, simple midi synth
+>>>>>>> master
+
2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* gnu.gpg: added public key 4AE55E93 (Tristan Gingold
<gingold AT adacore.com>), required for binutils
diff --git a/apache.gpg b/apache.gpg
index 8cc9399..7c7efad 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/audio-players/eawpats/BUILD b/audio-players/eawpats/BUILD
index ea595aa..27ba77d 100755
--- a/audio-players/eawpats/BUILD
+++ b/audio-players/eawpats/BUILD
@@ -1,10 +1 @@
-(
-rm -rf /usr/share/timidity &&
-mkdir -p /usr/share/timidity &&
-cp -R /usr/src/eawpats12/* /usr/share/timidity/ &&
-
-rm -rf eawpats12/ &&
-
-echo "Should work now... Enjoy a new MIDI experience :)"
-
-) > $C_FIFO 2>&1
+true
diff --git a/audio-players/eawpats/CONFLICTS b/audio-players/eawpats/CONFLICTS
new file mode 100755
index 0000000..0b1a0e6
--- /dev/null
+++ b/audio-players/eawpats/CONFLICTS
@@ -0,0 +1 @@
+conflicts eawpats y
diff --git a/audio-players/eawpats/DETAILS b/audio-players/eawpats/DETAILS
index 81c6fd9..9c70750 100755
--- a/audio-players/eawpats/DETAILS
+++ b/audio-players/eawpats/DETAILS
@@ -1,16 +1,13 @@
SPELL=eawpats
- VERSION=12
- SOURCE=$SPELL$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
-SOURCE_URL[0]=ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/$SOURCE
+ VERSION=deprecated
WEB_SITE=http://www.stardate.bc.ca/eawpatches/html/default.htm
ENTERED=20020515
UPDATED=20021203
-
SOURCE_HASH=sha512:32dd04288e9ea40ffcc1899f00943a52216f93b432ec82ac0171970806f723bd883b42fcdcfbb5c5b6c13f25b93cfc287cb925e8c13c4707d44a0c0725f20666
LICENSE[0]=http://www.stardate.bc.ca/eawpatches/html/default.htm
- KEYWORDS="players audio"
- BUILD_API=1
+ KEYWORDS="players audio midi"
SHORT="Sound bank for TiMidity++"
+ PATCHLEVEL=1
+ ARCHIVE=off
cat << EOF
These are the best Gravis Ultrasound(*)-compatible patch files
available.
diff --git a/audio-players/eawpats/HISTORY b/audio-players/eawpats/HISTORY
index 0d1cc63..5cea73c 100644
--- a/audio-players/eawpats/HISTORY
+++ b/audio-players/eawpats/HISTORY
@@ -1,3 +1,8 @@
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * deprecated spell in favour of freepats.
+ eawpats homepage does not exist anymore and
+ freepats contains the original eawpats soundfonts.
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/audio-players/eawpats/INSTALL b/audio-players/eawpats/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/eawpats/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-players/eawpats/PRE_BUILD b/audio-players/eawpats/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/eawpats/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-players/eawpats/UP_TRIGGERS
b/audio-players/eawpats/UP_TRIGGERS
new file mode 100755
index 0000000..828b2fa
--- /dev/null
+++ b/audio-players/eawpats/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger eawpats dispel_self
+up_trigger freepats cast_self
diff --git a/audio-players/timidity-cvs/DEPENDS
b/audio-players/timidity-cvs/DEPENDS
index c9ad161..eba7511 100755
--- a/audio-players/timidity-cvs/DEPENDS
+++ b/audio-players/timidity-cvs/DEPENDS
@@ -1,5 +1,5 @@
depends CVS &&
-depends eawpats &&
+depends freepats &&
depends alsa-lib &&

AUDIO="--enable-audio=alsa" &&
diff --git a/audio-players/timidity-cvs/HISTORY
b/audio-players/timidity-cvs/HISTORY
index 215e7c0..af6afff 100644
--- a/audio-players/timidity-cvs/HISTORY
+++ b/audio-players/timidity-cvs/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switch from eawpats to freepats
+
2010-10-21 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL

diff --git a/audio-players/timidity/DEPENDS b/audio-players/timidity/DEPENDS
index 85eb074..ca6c1bb 100755
--- a/audio-players/timidity/DEPENDS
+++ b/audio-players/timidity/DEPENDS
@@ -1,4 +1,4 @@
-depends eawpats &&
+depends freepats &&

# note: the --audio-* switches aren't real configure switches, they're
# parsed out into a different variable in BUILD
diff --git a/audio-players/timidity/HISTORY b/audio-players/timidity/HISTORY
index 2360151..646c28f 100644
--- a/audio-players/timidity/HISTORY
+++ b/audio-players/timidity/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switch from eawpats to freepats
+
2010-09-27 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: fix dependency on emacsen

diff --git a/audio-players/wildmidi/BUILD b/audio-players/wildmidi/BUILD
new file mode 100755
index 0000000..2dbf468
--- /dev/null
+++ b/audio-players/wildmidi/BUILD
@@ -0,0 +1,2 @@
+OPTS="${OPTS} --with-wildmidi-cfg=/etc/wildmidi.cfg" &&
+default_build
diff --git a/audio-players/wildmidi/DEPENDS b/audio-players/wildmidi/DEPENDS
new file mode 100755
index 0000000..4d3d3a6
--- /dev/null
+++ b/audio-players/wildmidi/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends oss '--with-oss' '' 'use OSS instead of ALSA for playback?'
&&
+if ! is_depends_enabled $SPELL oss; then
+ depends alsa-lib
+fi
diff --git a/audio-players/wildmidi/DETAILS b/audio-players/wildmidi/DETAILS
new file mode 100755
index 0000000..da2a4b0
--- /dev/null
+++ b/audio-players/wildmidi/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=wildmidi
+ VERSION=0.2.3.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:8f9ca00114f763154117d173906842151f468d03fed522ab4ff4af28a320c4fe1dc5d553c553380a69c3f8ca353e1585cce204f28e9fde76cba1f6500789cb77
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://wildmidi.sourceforge.net/";
+ LICENSE[0]=GPL/LGPL
+ ENTERED=20110829
+ SHORT="simple software midi player"
+cat << EOF
+WildMIDI is a simple software midi player which has a core softsynth library
+that can be use with other applications.
+EOF
diff --git a/audio-players/wildmidi/HISTORY b/audio-players/wildmidi/HISTORY
new file mode 100644
index 0000000..7f77db7
--- /dev/null
+++ b/audio-players/wildmidi/HISTORY
@@ -0,0 +1,3 @@
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, DETAILS, DEPENDS: spell created
+
diff --git a/audio-soft/freepats/BUILD b/audio-soft/freepats/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-soft/freepats/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-soft/freepats/DETAILS b/audio-soft/freepats/DETAILS
new file mode 100755
index 0000000..d9b88fc
--- /dev/null
+++ b/audio-soft/freepats/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=freepats
+ VERSION=20060219
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://${SPELL}.zenvoid.org/${SOURCE}
+
SOURCE_HASH=sha512:6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://freepats.zenvoid.org/";
+ LICENSE[0]=GPL
+ ENTERED=20110829
+ SHORT="midi patchset"
+cat << EOF
+A free and open set of instrument patches, to be used by softsynths.
+EOF
diff --git a/audio-soft/freepats/HISTORY b/audio-soft/freepats/HISTORY
new file mode 100644
index 0000000..6b7e3b9
--- /dev/null
+++ b/audio-soft/freepats/HISTORY
@@ -0,0 +1,3 @@
+2011-08-29 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL: spell created
+
diff --git a/audio-soft/freepats/INSTALL b/audio-soft/freepats/INSTALL
new file mode 100755
index 0000000..8d5b320
--- /dev/null
+++ b/audio-soft/freepats/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p "${INSTALL_ROOT}/usr/share/freepats" &&
+cd "${SOURCE_DIRECTORY}" &&
+cp -r ./* "${INSTALL_ROOT}/usr/share/freepats/"
diff --git a/devel/tig/DETAILS b/devel/tig/DETAILS
index a8bfb10..1e55ec1 100755
--- a/devel/tig/DETAILS
+++ b/devel/tig/DETAILS
@@ -1,8 +1,8 @@
SPELL=tig
- VERSION=0.17
+ VERSION=0.18
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://jonas.nitro.dk/${SPELL}/releases/${SOURCE}
-
SOURCE_HASH=sha512:5f718cc41fe8cfb2904a170785034d93c7e63a80d4f78c6f1ee7e8092adf45028bf6fc7253b3a912bd75dfac5388d79450759592ad3614ac7630af2118701e70
+
SOURCE_HASH=sha512:83142fff0229c0ae509071a6185ef3f861d48b84ed5e3dda1d7114b4df040e711c918e81bbd31bdfb3c9f78a9623feaba8df1fe5f23ebf80c8228167fedab8b9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://jonas.nitro.dk/tig/";
LICENSE[0]=GPL
diff --git a/devel/tig/HISTORY b/devel/tig/HISTORY
index 3ceea88..ef949b7 100644
--- a/devel/tig/HISTORY
+++ b/devel/tig/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.18
+
2011-03-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.17

diff --git a/disk/udev/BUILD b/disk/udev/BUILD
index 4f92773..7114acc 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -8,7 +8,7 @@ OPTS="--prefix=$INSTALL_ROOT/usr \
if [[ "${UDEV_HWDB}" = '--enable-hwdb' ]]; then
if [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'hwdata' ]]; then
OPTS="$OPTS --with-usb-ids-path=/usr/share/hwdata/usb.ids"
- elif [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'usbids' ]]; then
+ elif [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'usbutils' ]]; then
OPTS="$OPTS --with-usb-ids-path=/usr/share/usb.ids"
else
message "${PROBLEM_COLOR}unknown USBIDS provider, you are on your
own.${DEFAULT_COLOR}"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 0f83070..aea9a4b 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: killed another typo
+
2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 173

diff --git a/doc/pstoedit/DETAILS b/doc/pstoedit/DETAILS
index 2d2a32b..a324de8 100755
--- a/doc/pstoedit/DETAILS
+++ b/doc/pstoedit/DETAILS
@@ -1,6 +1,6 @@
SPELL=pstoedit
- VERSION=3.50
-
SOURCE_HASH=sha512:2da0df61828f6ca46c1e66ca1dd372e9373594375c61c9b30ee848aa952712720dee14da2134ec62398e3e6224123993c0b2406c5c1b39c55a51ddb0b55fb8fb
+ VERSION=3.60
+
SOURCE_HASH=sha512:925a3f41612e0e557c384eb0d1616ab33d4829f04bef4cafd851b828267596f582559cf8bcc4b65922d55b6fcc4fd9593148e17d4de15409290e683fbd2336ff
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/pstoedit/HISTORY b/doc/pstoedit/HISTORY
index a1fbcc1..cc19834 100644
--- a/doc/pstoedit/HISTORY
+++ b/doc/pstoedit/HISTORY
@@ -1,3 +1,7 @@
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.60
+ * PRE_BUILD: removed
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/doc/pstoedit/PRE_BUILD b/doc/pstoedit/PRE_BUILD
deleted file mode 100755
index 2c5f096..0000000
--- a/doc/pstoedit/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i -r '3i#include <cstring>' src/cppcomp.h &&
-sed -i -r '3i#include <cstdlib>' src/cppcomp.h &&
-sed -i -r '3i#include <cstdio>' src/cppcomp.h
diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index 4f12b38..a68601f 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,7 +1,6 @@
SPELL=wget
- VERSION=1.13.1
+ VERSION=1.13.3
SECURITY_PATCH=1
- PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_GPG=wget.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 2a92a64..a5a2f17 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.13.3
+
2011-08-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.13.1
* CONFIGURE, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS, BUILD:
diff --git a/gnome2-apps/empathy/DEPENDS b/gnome2-apps/empathy/DEPENDS
index b4ef727..0049959 100755
--- a/gnome2-apps/empathy/DEPENDS
+++ b/gnome2-apps/empathy/DEPENDS
@@ -5,11 +5,15 @@ depends gnome-doc-utils &&
depends -sub "GTK" libcanberra &&
depends gst-plugins-base &&
depends libnotify &&
-depends evolution-data-server &&
depends unique &&
depends folks &&
depends telepathy-logger &&

+optional_depends evolution-data-server \
+ "--with-eds" \
+ "--without-eds" \
+ "for Evolution addressbook" &&
+
optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
diff --git a/gnome2-apps/empathy/HISTORY b/gnome2-apps/empathy/HISTORY
index 0d52d1c..ee23ad9 100644
--- a/gnome2-apps/empathy/HISTORY
+++ b/gnome2-apps/empathy/HISTORY
@@ -1,3 +1,6 @@
+2011-08-28 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made evolution-data-server optional
+
2010-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/graphics-libs/libemf/DEPENDS b/graphics-libs/libemf/DEPENDS
new file mode 100755
index 0000000..5584a0a
--- /dev/null
+++ b/graphics-libs/libemf/DEPENDS
@@ -0,0 +1 @@
+depends autoconf
diff --git a/graphics-libs/libemf/DETAILS b/graphics-libs/libemf/DETAILS
new file mode 100755
index 0000000..4be7f1e
--- /dev/null
+++ b/graphics-libs/libemf/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libemf
+ VERSION=1.0.4
+ SOURCE=libEMF-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/libEMF-$VERSION"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
+ LICENSE[0]=GPL
+ WEB_SITE=http://libemf.sourceforge.net/
+ ENTERED=20110829
+ SHORT="library for generating Enhanced Metafiles"
+cat << EOF
+libEMF is a library for generating Enhanced Metafiles on systems which
+don't natively support the ECMA-234 Graphics Device Interface
+(GDI). The library is intended to be used as a driver for other
+graphics programs such as Grace or gnuplot. Therefore, it implements a
+very limited subset of the GDI.
+EOF
diff --git a/graphics-libs/libemf/HISTORY b/graphics-libs/libemf/HISTORY
new file mode 100644
index 0000000..1510ff1
--- /dev/null
+++ b/graphics-libs/libemf/HISTORY
@@ -0,0 +1,3 @@
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD: spell created, version 1.0.4
+
diff --git a/graphics-libs/libemf/PRE_BUILD b/graphics-libs/libemf/PRE_BUILD
new file mode 100755
index 0000000..f99d3af
--- /dev/null
+++ b/graphics-libs/libemf/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+autoreconf -i
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index ab402eb..6d9f5d8 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.19
- SECURITY_PATCH=12
+ VERSION=2.2.20
+ SECURITY_PATCH=13
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 09d50bb..b583274 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.20; SECURITY_PATCH++ (CVE-2011-3192)
+
2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: force LDAP version of apr-util if any ldap module is
selected

diff --git a/http/tinyproxy/BUILD b/http/tinyproxy/BUILD
index b8ff48f..0f732ea 100755
--- a/http/tinyproxy/BUILD
+++ b/http/tinyproxy/BUILD
@@ -1,3 +1,6 @@
OPTS="$TINYPROXY_OPTS $OPTS" &&

-default_build
+default_build &&
+
+# don't trash config file in /etc
+sed -i "{N;s:\n\tetc \\\::}" Makefile.am
diff --git a/http/tinyproxy/HISTORY b/http/tinyproxy/HISTORY
index ed6809a..132efc2 100644
--- a/http/tinyproxy/HISTORY
+++ b/http/tinyproxy/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, INSTALL: don't trash config file on installwatch-based setups
+
2011-08-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.3; SECURITY_PATCH++

diff --git a/http/tinyproxy/INSTALL b/http/tinyproxy/INSTALL
index 2b78280..3620dc6 100755
--- a/http/tinyproxy/INSTALL
+++ b/http/tinyproxy/INSTALL
@@ -1,3 +1,5 @@
default_install &&

+install_config_file "etc/tinyproxy.conf" "$INSTALL_ROOT/etc/tinyproxy.conf"
&&
+
install -d -o nobody -g nogroup -vm 755 "$INSTALL_ROOT/var/run/tinyproxy"
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 0a2c750..215249c 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,16 +1,16 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.4.2
+ VERSION=1.4.3
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:53981d9177281c8a8784fecf070334af3f2febd7818c7517c4aed1efd45dbefdf34496d8313215255069b58aa8819be4d8dcd93a9c0ca505599e16f3f46e89b1
+
SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.4.2
+ VERSION=1.4.3
SECURITY_PATCH=4
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:53981d9177281c8a8784fecf070334af3f2febd7818c7517c4aed1efd45dbefdf34496d8313215255069b58aa8819be4d8dcd93a9c0ca505599e16f3f46e89b1
+
SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 4a6431b..3f5f8d5 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.3
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 5847c90..a897df1 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk3
- VERSION=1.4.2
+ VERSION=1.4.3
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:53981d9177281c8a8784fecf070334af3f2febd7818c7517c4aed1efd45dbefdf34496d8313215255069b58aa8819be4d8dcd93a9c0ca505599e16f3f46e89b1
+
SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
WEB_SITE=http://webkitgtk.org/
GATHER_DOCS=off
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index e07513d..d934b13 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.3
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index f928a2e..8dc9049 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -3,7 +3,7 @@ prepare_environment() {
PATH="$QTDIR/bin/qt4:$PATH" &&

persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
diff --git a/kde4-bindings/FUNCTIONS b/kde4-bindings/FUNCTIONS
index 35f31c8..cfbb824 100755
--- a/kde4-bindings/FUNCTIONS
+++ b/kde4-bindings/FUNCTIONS
@@ -1,6 +1,6 @@
default_build() {
persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
@@ -21,7 +21,7 @@ prepare_environment() {
PATH="$QTDIR/bin:$PATH" &&

# persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
diff --git a/kde4-edu/FUNCTIONS b/kde4-edu/FUNCTIONS
index 829bcf7..2a74baa 100755
--- a/kde4-edu/FUNCTIONS
+++ b/kde4-edu/FUNCTIONS
@@ -1,6 +1,6 @@
default_build() {
persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
diff --git a/kde4-look/FUNCTIONS b/kde4-look/FUNCTIONS
index 303fe79..1a08d82 100755
--- a/kde4-look/FUNCTIONS
+++ b/kde4-look/FUNCTIONS
@@ -3,7 +3,7 @@ prepare_environment() {
PATH="$QTDIR/bin/qt4:$PATH" &&

persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&

PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 43d3e69..7d1aa4d 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,6 +1,6 @@
default_build() {
persistent_add KDE4DIR &&
- KDE4DIR="$INSTALL_ROOT/opt/kde4" &&
+ KDE4DIR="$INSTALL_ROOT/usr" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
diff --git a/kde4/kde4-l10n/BUILD b/kde4/kde4-l10n/BUILD
index 58ec720..dbe1530 100755
--- a/kde4/kde4-l10n/BUILD
+++ b/kde4/kde4-l10n/BUILD
@@ -2,7 +2,7 @@ QTDIR=$INSTALL_ROOT/usr &&
PATH=$QTDIR/bin/qt4:$PATH &&

persistent_add KDE4DIR &&
-KDE4DIR=$INSTALL_ROOT/opt/kde4 &&
+KDE4DIR=$INSTALL_ROOT/usr &&

PATH=$KDE4DIR/bin:$PATH &&
LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index bd347e3..7aab94b 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD: /opt/kde4 -> /usr
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE: fixed get_kdelanguages to use SOURCE_IGNORE=volatile
instead of MD5[0]=IGNORE (fixes #89)
diff --git a/kde4/kde4-profile/HISTORY b/kde4/kde4-profile/HISTORY
index 7f66dda..5d42764 100644
--- a/kde4/kde4-profile/HISTORY
+++ b/kde4/kde4-profile/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * kde4.desktop: /opt/kde4 -> /usr
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: fixed few things for kde4.7 update

diff --git a/kde4/kde4-profile/kde4.desktop b/kde4/kde4-profile/kde4.desktop
index c99ebbc..16923b6 100755
--- a/kde4/kde4-profile/kde4.desktop
+++ b/kde4/kde4-profile/kde4.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=KDE4
Comment=This session logs you into KDE4
-Exec=/opt/kde4/bin/startkde
-TryExec=/opt/kde4/bin/startkde
+Exec=/usr/bin/startkde
+TryExec=/usr/bin/startkde
Icon=
Type=Application
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 95a5730..784c297 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * init.d/kdm4,kde4.desktop,kde4.sh: /opt/kde4 -> /usr
+
2011-08-18 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: added qimageblitz

diff --git a/kde4/kdebase-workspace4/init.d/kdm4
b/kde4/kdebase-workspace4/init.d/kdm4
index 0fea853..20cdd47 100755
--- a/kde4/kdebase-workspace4/init.d/kdm4
+++ b/kde4/kdebase-workspace4/init.d/kdm4
@@ -1,6 +1,6 @@
#!/bin/bash

-PROGRAM=/opt/kde4/bin/kdm
+PROGRAM=/usr/bin/kdm
RUNLEVEL=5
PROVIDES=display_manager
NEEDS="smgl-messagebus"
diff --git a/kde4/kdebase-workspace4/kde4.desktop
b/kde4/kdebase-workspace4/kde4.desktop
index 7f49c0e..7ac7b35 100644
--- a/kde4/kdebase-workspace4/kde4.desktop
+++ b/kde4/kdebase-workspace4/kde4.desktop
@@ -2,8 +2,8 @@
Encoding=UTF-8
Name=KDE4
Comment=This session logs you into KDE4
-Exec=/opt/kde4/bin/startkde
-TryExec=/opt/kde4/bin/startkde
+Exec=/usr/bin/startkde
+TryExec=/usr/bin/startkde
# no icon yet, only the top three are currently used
Icon=
Type=Application
diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh
index 1be9028..22d3980 100644
--- a/kde4/kdebase-workspace4/kde4.sh
+++ b/kde4/kdebase-workspace4/kde4.sh
@@ -3,7 +3,7 @@ if [ "$USER" != "root" ];then
# setup KDE4 environment for SMGL

export PATH=/usr/bin/qt4:$PATH
-export KDEDIR=/opt/kde4
+export KDEDIR=$INSTALL_ROOT/usr
export KDEDIRS=$KDEDIR
export KDE_DATA_DIRS=$KDEDIR/share
export PATH=$KDEDIR/bin:$PATH
diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 1ccb050..85760f0 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -9,3 +9,180 @@ if spell_ok kdebase-workspace4 && [[ "$(installed_version
kdebase-workspace4|cut
then
conflicts kdebase-workspace4 y
fi
+
+#
+# Conflict with all the spells that depend on kdelibs (from kde3)
+#
+conflicts klamav y
+conflicts rosegarden y
+conflicts sonik y
+conflicts amarok y
+conflicts kmess y
+conflicts arson y
+conflicts k3b y
+conflicts mount-iso y
+conflicts qtella y
+conflicts potracegui y
+conflicts showimg y
+conflicts skim y
+conflicts apollon y
+conflicts basket y
+conflicts bibletime y
+conflicts cdbakeoven y
+conflicts f4l y
+conflicts kalva y
+conflicts karchiver y
+conflicts kasablanca y
+conflicts kbiff y
+conflicts kchm y
+conflicts kconnections y
+conflicts kdar y
+conflicts kdbg y
+conflicts kdebluetooth y
+conflicts kdesvn y
+conflicts kdetv y
+conflicts kdevelop y
+conflicts kdsl y
+conflicts kgraphviewer y
+conflicts khacc y
+conflicts kile y
+conflicts klear y
+conflicts kmatrix3d y
+conflicts kmobiletools y
+conflicts knemo y
+conflicts knetfilter y
+conflicts knoda y
+conflicts konverter y
+conflicts kradio y
+conflicts krecipes y
+conflicts ksambaplugin y
+conflicts ksensors y
+conflicts ksetisaver y
+conflicts kssh y
+conflicts maxemumtvguide y
+conflicts pixieplus y
+conflicts tellico y
+conflicts umbrello y
+conflicts wlassistant y
+conflicts kde-i18n y
+conflicts kde-profile y
+conflicts kdeaccessibility y
+conflicts kdeaddons y
+conflicts kdeartwork y
+conflicts kdebase y
+conflicts kdeedu y
+conflicts kdegames y
+conflicts kdegames y
+conflicts kdegraphics y
+conflicts kdemultimedia y
+conflicts kdepim y
+conflicts kdesdk y
+conflicts kdetoys y
+conflicts kdeutils y
+conflicts kdewebdev y
+conflicts baghira y
+conflicts flatknifty y
+conflicts kbfx y
+conflicts kfiresaver3d y
+conflicts polyester y
+conflicts superkaramba y
+conflicts yakuake4 y
+conflicts libopensync-plugin-kdepim y
+conflicts kst y
+conflicts pgcalc2 y
+conflicts qalculate-kde y
+conflicts ksorcery y
+conflicts kaffeine y
+conflicts kavi2svcd y
+conflicts kdenlive y
+conflicts kmenc15 y
+conflicts kmplayer y
+conflicts ksubeditor y
+conflicts ksubtile y
+conflicts okle y
+conflicts lineak_xosdplugin y
+conflicts qtgtk y
+conflicts akregator y
+conflicts basket y
+conflicts bibletime y
+conflicts digikam y
+conflicts f4l y
+conflicts filelight y
+conflicts gwenview y
+conflicts k9copy y
+conflicts kalva y
+conflicts kasablanca y
+conflicts katapult y
+conflicts kbarcode y
+conflicts kchm y
+conflicts kchmviewer y
+conflicts kconnections y
+conflicts kcpufreq y
+conflicts kdbg y
+conflicts kdetv y
+conflicts kdevelop y
+conflicts kdiff3 y
+conflicts kftpgrabber y
+conflicts khacc y
+conflicts kid3 y
+conflicts kile y
+conflicts kipi-plugins y
+conflicts kiso y
+conflicts klibido y
+conflicts kmatrix3d y
+conflicts kmldonkey y
+conflicts kmyfirewall y
+conflicts kmymoney2 y
+conflicts knemo y
+conflicts knetfilter y
+conflicts knetstats y
+conflicts koffice y
+conflicts komparator y
+conflicts kompose y
+conflicts konversation y
+conflicts kphotoalbum y
+conflicts kplayer y
+conflicts kpowersave y
+conflicts krename y
+conflicts krusader y
+conflicts ksniffer y
+conflicts ksquirrel-libs y
+conflicts ksquirrel y
+conflicts ksynaptics y
+conflicts ktechlab y
+conflicts ktorrent y
+conflicts kuftp y
+conflicts kvpnc y
+conflicts kwave y
+conflicts kwlan y
+conflicts libkdcraw y
+conflicts libkexif y
+conflicts libkexiv2 y
+conflicts libkipi y
+conflicts lineak_kdeplugins y
+conflicts soundkonverter y
+conflicts transkode y
+conflicts umbrello y
+conflicts kde-i18n y
+conflicts kdeaccessibility y
+conflicts kdeaddons y
+conflicts kdeadmin y
+conflicts kdeartwork y
+conflicts kdebase y
+conflicts kdebindings y
+conflicts kdeedu y
+conflicts kdegames y
+conflicts kdegraphics y
+conflicts kdelibs y
+conflicts kdemultimedia y
+conflicts kdenetwork y
+conflicts kdepim y
+conflicts kdesdk y
+conflicts kdetoys y
+conflicts kdeutils y
+conflicts kdewebdev y
+conflicts baghira y
+conflicts flatknifty y
+conflicts kdmtheme y
+conflicts kxdocker y
+conflicts polyester y
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 4418544..e702d77 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,10 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * UP_TRIGGERS: added trigger to recast everything that depedns on
kdelibs4
+ * PRE_BUILD: commented now unneeded sedits
+
+2011-08-29 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: added all the spells that depend on kde3 kdelibs
+
2011-08-12 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: fixed minor typo (removeble -> removable)

diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
index a73791e..7b97f1a 100755
--- a/kde4/kdelibs4/PRE_BUILD
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -1,8 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# we install kde in /opt/kde4 but config file should go to /etc
-sedit "s:\${CMAKE_INSTALL_PREFIX}/etc:$INSTALL_ROOT/etc:" \
- cmake/modules/FindKDE4Internal.cmake &&
-sedit "s:\${CMAKE_INSTALL_PREFIX}/etc:$INSTALL_ROOT/etc:" \
- cmake/modules/FindPyKDE4.cmake &&
+#sedit "s:\${CMAKE_INSTALL_PREFIX}/etc:$INSTALL_ROOT/etc:" \
+# cmake/modules/FindKDE4Internal.cmake &&
+#sedit "s:\${CMAKE_INSTALL_PREFIX}/etc:$INSTALL_ROOT/etc:" \
+# cmake/modules/FindPyKDE4.cmake &&
+# we install kde4 in /usr now
sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt
diff --git a/kde4/kdelibs4/UP_TRIGGERS b/kde4/kdelibs4/UP_TRIGGERS
index 9f90f3a..7ac4263 100755
--- a/kde4/kdelibs4/UP_TRIGGERS
+++ b/kde4/kdelibs4/UP_TRIGGERS
@@ -9,3 +9,15 @@ if $(gaze from /opt/kde4/include/nepomuk/resource.h|grep -q
kdebase-workspace4-4
then
up_trigger kdebase-workspace4 cast_self
fi
+
+
+#
+# We moved kde from /opt/kde4 to /usr. now we must rebuild all spells
+# that depend on kde being in /opt/kde4
+#
+if $(gaze from /opt/kde4 |grep -q kdelibs); then
+ LL=`grep :kde.*4.*:on: /var/state/sorcery/depends|cut -d: -f1|sort|uniq`
+ for spell in $LL;do
+ up_trigger $spell cast_self
+ done
+fi
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 7520bd5..71ae33d 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2011-08-30 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.0.4
+ * info/patches/maintenance_patches_3/patch-3.0.4: added
+ * info/patches/maintenance_patches/patch-2.6.33.19: added
+ * info/patches/maintenance_patches/patch-2.6.32.46: added
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* nsa_patches/2.6.1{2,3}-selinux1.patch: use nsa.gpg instead of
selinux.gpg
* selinux.gpg: removed. It only contained the same key as nsa.gpg
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.46
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.46
new file mode 100755
index 0000000..ca5ca7f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.46
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.46"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.19
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.19
new file mode 100755
index 0000000..e052637
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.19
@@ -0,0 +1,6 @@
+appliedkernels="2.6.33"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.4
new file mode 100755
index 0000000..ffa0b61
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.4
@@ -0,0 +1,6 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index d1bf20d..001c66a 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.0
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.0.3
+LATEST_maintenance_patches_3=patch-3.0.4
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/libatomic_ops/DETAILS b/libs/libatomic_ops/DETAILS
index b2d7851..d1c1bc9 100755
--- a/libs/libatomic_ops/DETAILS
+++ b/libs/libatomic_ops/DETAILS
@@ -1,10 +1,11 @@
SPELL=libatomic_ops
- VERSION=1.2
+ VERSION=7.1
+
SOURCE_HASH=sha512:3123457e939e3e02729ad15bb293d2ff358d7157a2772be53769500982bed89a0eda27d9c375e05a6a4c84a3fd7f05aec19ae8064426143c7e773a851b293909
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.hpl.hp.com/research/linux/atomic_ops/download/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ivmai-libatomic_ops-3bb7644
+ SOURCE_URL[0]=https://github.com/ivmai/libatomic_ops/tarball/gc7_1
WEB_SITE=http://www.hpl.hp.com/research/linux/atomic_ops/
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MIT
ENTERED=20071016
SHORT="atomic memory update operations"
diff --git a/libs/libatomic_ops/HISTORY b/libs/libatomic_ops/HISTORY
index 9f3e93b..48c9918 100644
--- a/libs/libatomic_ops/HISTORY
+++ b/libs/libatomic_ops/HISTORY
@@ -1,3 +1,7 @@
+2011-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.1
+ new url
+
2007-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS, HISTORY: created this spell

diff --git a/mail/claws-mail-extra-plugins/CONFIGURE
b/mail/claws-mail-extra-plugins/CONFIGURE
index 90ff2b4..9f2fc85 100755
--- a/mail/claws-mail-extra-plugins/CONFIGURE
+++ b/mail/claws-mail-extra-plugins/CONFIGURE
@@ -8,6 +8,7 @@ SYLPHEED_CLAWS_EXTRA_PLUGINS="acpi_notifier \
clamd \
fancy \
fetchinfo-plugin \
+ gdata_plugin \
geolocation_plugin \
gtkhtml2_viewer \
mailmbox \
diff --git a/mail/claws-mail-extra-plugins/DETAILS
b/mail/claws-mail-extra-plugins/DETAILS
index 8739493..891d70f 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail-extra-plugins
- VERSION=3.7.9
+ VERSION=3.7.10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
SOURCE2=${SOURCE}.asc
diff --git a/mail/claws-mail-extra-plugins/HISTORY
b/mail/claws-mail-extra-plugins/HISTORY
index bf60191..89a7af9 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.7.10
+ * CONFIGURE: +gdata_plugin
+
2011-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.7.9

diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index fed16de..727c4c4 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
SPELL=claws-mail
- VERSION=3.7.9
+ VERSION=3.7.10
SECURITY_PATCH=1
PATCHLEVEL=0
SOURCE=$SPELL-${VERSION}.tar.bz2
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index ca75c1c..d066170 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2011-08-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.7.10
+ * PRE_BUILD, claws-notify-crash.patch: removed, fixed upstream
+
2011-07-13 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, claws-notify-crash.patch: added patch from arch to work
with startup-notification 0.12
diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
deleted file mode 100755
index 417374d..0000000
--- a/mail/claws-mail/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/claws-notify-crash.patch
diff --git a/mail/claws-mail/claws-notify-crash.patch
b/mail/claws-mail/claws-notify-crash.patch
deleted file mode 100644
index e1d4eb6..0000000
--- a/mail/claws-mail/claws-notify-crash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/main.c
-===================================================================
-RCS file: //claws/src/main.c,v
-retrieving revision 1.115.2.237
-retrieving revision 1.115.2.238
-diff -u -r1.115.2.237 -r1.115.2.238
---- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237
-+++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238
-@@ -331,7 +331,7 @@
- gtk_widget_show(hack);
- }
-
-- xdisplay = gdk_display_get_default();
-+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
- sn_display = sn_display_new(xdisplay,
- sn_error_trap_push,
- sn_error_trap_pop);
-
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 1759406..7f258f8 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=5.0
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 2aab2c8..b1fffb6 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2011-06-29 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6.0
+
2011-08-07 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 5.0
* PRE_BUILD: Updated directory name
diff --git a/net/iptraf-ng/CONFLICTS b/net/iptraf-ng/CONFLICTS
new file mode 100755
index 0000000..a28e251
--- /dev/null
+++ b/net/iptraf-ng/CONFLICTS
@@ -0,0 +1 @@
+conflicts iptraf
diff --git a/net/iptraf-ng/DEPENDS b/net/iptraf-ng/DEPENDS
new file mode 100755
index 0000000..bf27309
--- /dev/null
+++ b/net/iptraf-ng/DEPENDS
@@ -0,0 +1 @@
+depends ncurses
diff --git a/net/iptraf-ng/DETAILS b/net/iptraf-ng/DETAILS
new file mode 100755
index 0000000..f5f598b
--- /dev/null
+++ b/net/iptraf-ng/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=iptraf-ng
+ VERSION=1.0.2
+
SOURCE_HASH=sha512:8b9c8d58d8b866c8866b5a9d20ba3c380ca680eb76b5f7fc806b9b7286a3671b3fb85b8a052139e5b4dbee3b3ee666b39dd69d7689b8f9261940a9b3c75ec795
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://fedorahosted.org/iptraf-ng
+ SOURCE_URL[0]=https://fedorahosted.org/releases/i/p/iptraf-ng/$SOURCE
+ ENTERED=20110830
+ KEYWORDS="net"
+ SHORT="IPTraf-ng is a console-based network statistics utility"
+cat << EOF
+IPTraf-ng is a console-based network monitoring utility. IPTraf-ng gathers
data like TCP
+connection packet and byte counts, interface statistics and activity
indicators, TCP/UDP
+traffic breakdowns, and LAN station packet and byte counts. IPTraf-ng
features include an IP
+traffic monitor which shows TCP flag information, packet and byte counts,
ICMP details, OSPF
+packet types, and oversized IP packet warnings; interface statistics showing
IP, TCP, UDP,
+ICMP, non-IP and other IP packet counts, IP checksum errors, interface
activity and packet
+size counts; a TCP and UDP service monitor showing counts of incoming and
outgoing packets
+for common TCP and UDP application ports, a LAN statistics module that
discovers active hosts
+and displays statistics about their activity; TCP, UDP and other protocol
display filters so you
+can view just the traffic you want; logging; support for Ethernet, FDDI,
ISDN, SLIP, PPP, and
+loopback interfaces; and utilization of the built-in raw socket interface of
the Linux kernel,
+so it can be used on a wide variety of supported network cards
+EOF
diff --git a/net/iptraf-ng/HISTORY b/net/iptraf-ng/HISTORY
new file mode 100644
index 0000000..4b41c49
--- /dev/null
+++ b/net/iptraf-ng/HISTORY
@@ -0,0 +1,3 @@
+2011-08-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+ spell created
diff --git a/net/wicd/BUILD b/net/wicd/BUILD
index 5e11156..f328587 100755
--- a/net/wicd/BUILD
+++ b/net/wicd/BUILD
@@ -19,7 +19,7 @@ OPTS="--lib=${INSTALL_ROOT}/usr/lib/${SPELL}/ \
if [[ $WICD_KDEVER == "3.x" ]]; then
OPTS="--kdedir=`${INSTALL_ROOT}/usr/bin/kde-config
--prefix`/share/applications/kde/ $OPTS"
elif [[ $WICD_KDEVER == "4.x" ]]; then
- KDE4_PREFIX=`${INSTALL_ROOT}/opt/kde4/bin/kde4-config --prefix` &&
+ KDE4_PREFIX=`${INSTALL_ROOT}/usr/bin/kde4-config --prefix` &&
OPTS="--kdedir=${KDE4_PREFIX}/share/applications/kde4/ $OPTS" &&
OPTS="--autostart=${KDE4_PREFIX}/etc/xdg/autostart/ $OPTS"
else
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index 5297272..bb3ffa5 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD: /opt/kde4 -> /usr
+
2011-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* DEPENDS: corrected dependencies and flags
diff --git a/perl-cpan/digest-hmac/DEPENDS b/perl-cpan/digest-hmac/DEPENDS
index 19f5f65..a715811 100755
--- a/perl-cpan/digest-hmac/DEPENDS
+++ b/perl-cpan/digest-hmac/DEPENDS
@@ -1,3 +1,2 @@
-depends perl &&
-depends digest-md5 &&
+depends perl &&
depends digest-sha1
diff --git a/perl-cpan/digest-hmac/DETAILS b/perl-cpan/digest-hmac/DETAILS
index 7e84bed..069a1cb 100755
--- a/perl-cpan/digest-hmac/DETAILS
+++ b/perl-cpan/digest-hmac/DETAILS
@@ -1,19 +1,17 @@
SPELL=digest-hmac
+ SPELLX=Digest-HMAC
VERSION=1.01
- SOURCE=Digest-HMAC-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Digest-HMAC-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/G/GA/GAAS/$SOURCE

SOURCE_HASH=sha512:62aa81983210889966ecc71a21d49554733a8939fe366321ccf19a7f9c80ff4f2fe6998ad8f7ed33a391838b40a82d64784005fed99763298e84e08bc3849d1a
LICENSE=ART
WEB_SITE="http://search.cpan.org/search?module=Digest::HMAC";
ENTERED=20020403
KEYWORDS="perl"
- SHORT=" HMAC message integrity check"
+ SHORT="HMAC message integrity check"
cat << EOF
-
-HMAC is used for message integrity checks between two par�
-ties that share a secret key, and works in combination
-with some other Digest algorithm, usually MD5 or SHA-1.
-The HMAC mechanism is described in RFC 2104.
-
+HMAC is used for message integrity checks between two parties that share a
+secret key, and works in combination with some other Digest algorithm,
usually
+MD5 or SHA-1. The HMAC mechanism is described in RFC 2104.
EOF
diff --git a/perl-cpan/digest-hmac/HISTORY b/perl-cpan/digest-hmac/HISTORY
index ea8f92f..613b071 100644
--- a/perl-cpan/digest-hmac/HISTORY
+++ b/perl-cpan/digest-hmac/HISTORY
@@ -1,3 +1,7 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected descriptions; cleaned up; quoting paths
+ * DEPENDS: removed unneeded dependencies
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/perl-cpan/filehandle-unget/DEPENDS
b/perl-cpan/filehandle-unget/DEPENDS
index e77a9d1..6826bc7 100755
--- a/perl-cpan/filehandle-unget/DEPENDS
+++ b/perl-cpan/filehandle-unget/DEPENDS
@@ -1,2 +1 @@
-depends perl &&
-depends scalar-list-utils
+depends perl
diff --git a/perl-cpan/filehandle-unget/HISTORY
b/perl-cpan/filehandle-unget/HISTORY
index 4ed2105..85e2691 100644
--- a/perl-cpan/filehandle-unget/HISTORY
+++ b/perl-cpan/filehandle-unget/HISTORY
@@ -1,2 +1,5 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: only Perl is required now
+
2011-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: spell created
diff --git a/perl-cpan/mail-internet/DEPENDS b/perl-cpan/mail-internet/DEPENDS
index 07c1b53..6826bc7 100755
--- a/perl-cpan/mail-internet/DEPENDS
+++ b/perl-cpan/mail-internet/DEPENDS
@@ -1,2 +1 @@
-depends perl &&
-depends bundle-libnet
+depends perl
diff --git a/perl-cpan/mail-internet/HISTORY b/perl-cpan/mail-internet/HISTORY
index a3435a0..95ab44f 100644
--- a/perl-cpan/mail-internet/HISTORY
+++ b/perl-cpan/mail-internet/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed unneeded dependencies
+
2011-07-06 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 2.08

diff --git a/perl-cpan/mime-tools/DEPENDS b/perl-cpan/mime-tools/DEPENDS
index a444c05..e39ba8c 100755
--- a/perl-cpan/mime-tools/DEPENDS
+++ b/perl-cpan/mime-tools/DEPENDS
@@ -1,4 +1,3 @@
depends perl &&
depends io-stringy &&
-depends mail-internet &&
-depends mime-base64
+depends mail-internet
diff --git a/perl-cpan/mime-tools/HISTORY b/perl-cpan/mime-tools/HISTORY
index 54fb8ee..b44cd52 100644
--- a/perl-cpan/mime-tools/HISTORY
+++ b/perl-cpan/mime-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed unneeded dependencies
+
2008-07-01 David Kowis <dkowis AT shlrm.org>
* DETAILS: Changed SOURCE_URL[0] extension
updated spell to 5.427
diff --git a/perl-cpan/net-dns/DEPENDS b/perl-cpan/net-dns/DEPENDS
index 9d50dda..3922b85 100755
--- a/perl-cpan/net-dns/DEPENDS
+++ b/perl-cpan/net-dns/DEPENDS
@@ -1,4 +1,2 @@
depends perl &&
-depends digest-hmac &&
-depends mime-base64 &&
-depends test-simple
+depends digest-hmac
diff --git a/perl-cpan/net-dns/HISTORY b/perl-cpan/net-dns/HISTORY
index 36fb9cb..d8dc771 100644
--- a/perl-cpan/net-dns/HISTORY
+++ b/perl-cpan/net-dns/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: are now parts of Perl itself
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless
* DETAILS: updated to 0.62, fixed url
@@ -80,4 +83,3 @@

2002-03-13 Lyon Lemmens <redlemon AT knoware.nl>
* All files: Initial version
-
diff --git a/perl-cpan/razor-agents/DEPENDS b/perl-cpan/razor-agents/DEPENDS
index a7027e0..584cf0f 100755
--- a/perl-cpan/razor-agents/DEPENDS
+++ b/perl-cpan/razor-agents/DEPENDS
@@ -1,8 +1,7 @@
+depends perl &&
depends net-ping &&
depends net-dns &&
-depends time-hires &&
depends digest-sha1 &&
depends mail-internet &&
depends uri &&
-depends digest-nilsimsa &&
-depends mime-base64
+depends digest-nilsimsa
diff --git a/perl-cpan/razor-agents/HISTORY b/perl-cpan/razor-agents/HISTORY
index 1ece2ff..4ff5c28 100644
--- a/perl-cpan/razor-agents/HISTORY
+++ b/perl-cpan/razor-agents/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed unneeded dependencies
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: useless

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 513b795..a5bc870 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -26,8 +26,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
+ VERSIONX=5.2.16
VERSION2=0.9.7
- SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
+ SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
SOURCE3=$SOURCE2.sig
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index bf2ddba..5025371 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: suhosin patch 5.2.16 applies fine for PHP 5.2.17
+
2011-08-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.3.8, SECURITY_PATCH=14
* DETAILS: sha512 updated
diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index bb10f39..b913de2 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,5 +1,5 @@
SPELL=bzr
- VERSION=2.3.4
+ VERSION=2.4.0
VX=`echo $VERSION|cut -c-3`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 8aa6311..797ce71 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,6 @@
+2011-08-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.0
+
2011-07-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.4

diff --git a/python-pypi/bzrtools/DETAILS b/python-pypi/bzrtools/DETAILS
index a79f4a1..ae20683 100755
--- a/python-pypi/bzrtools/DETAILS
+++ b/python-pypi/bzrtools/DETAILS
@@ -1,9 +1,9 @@
SPELL=bzrtools
- VERSION=2.3.0
+ VERSION=2.4.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_URL[0]=http://launchpad.net/bzrtools/trunk/$VERSION/+download/$SOURCE
+
SOURCE_URL[0]=http://launchpad.net/bzrtools/stable/$VERSION/+download/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=canonical.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/python-pypi/bzrtools/HISTORY b/python-pypi/bzrtools/HISTORY
index 5cd162d..66a221d 100644
--- a/python-pypi/bzrtools/HISTORY
+++ b/python-pypi/bzrtools/HISTORY
@@ -1,3 +1,6 @@
+2011-08-30 Treeve Jelbert <treeve AT souremage.org>
+ * DETAILS: version 2.4.0
+
2011-02-08 Treeve Jelbert <treeve AT souremage.org>
* DETAILS: version 2.3.0

diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index f87683e..eebbe38 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,16 +1,15 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.7.1
-
SOURCE_HASH=sha512:d7cea32b2aebf42182f2fc63fbc761bc0cd1545af479a7207ad8277305ba32e0c22fa01c4c95d76dd8fdab44adc02a7f483064bfe6c7a9ef119492fbb57d46ba
+ VERSION=0.7.2
+
SOURCE_HASH=sha512:e5ca0f44d1d9d56443275f2f8c34c02df72b8da815abd58deefbc7d0bfb3acaa328ff5fdb2912a40d71e99588ed5daceb33912a1ad811196eaa4f9c46fa9db8c
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
-
SOURCE_URL[0]="http://www.python.org/pypi/packages/source/S/$CHEESESHOP_PKG/$SOURCE";
+
SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
WEB_SITE=http://www.sqlalchemy.org/
LICENSE[0]='LGPL'
- UPDATED=20070721
KEYWORDS="python database"
- SHORT='An object-relational mapper for Python'
+ SHORT='object-relational mapper for Python'
cat << EOF
SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives
application developers the full power and flexibility of SQL.
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 1238f2e..4a505a9 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.2; fixed SOURCE_URL[0]
+
2011-06-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.1

diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index af02ff6..e998039 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -2,7 +2,7 @@
VERSION=4.7.5.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.midnight-commander.org/downloads/$SOURCE
+ SOURCE_URL[0]=https://www.midnight-commander.org/downloads/$SOURCE
WEB_SITE=http://www.midnight-commander.org/
ENTERED=20010922

SOURCE_HASH=sha512:9b0f2addb168a5152803f234aad16a67351873a8565852a69d5b68cb3292c0d8e4267b83d29d928101d1cc5fa913b6490d03f567ad4e3a8302e796326ddc2f9f
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index de834b3..e07ad41 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected source url to make it downloadable via wget
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE_HINTS=no-check-certificate otherwise download
fails with aria

diff --git a/utils/kexec-tools/BUILD b/utils/kexec-tools/BUILD
new file mode 100755
index 0000000..6032744
--- /dev/null
+++ b/utils/kexec-tools/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="${CFLAGS/-fPIC /}" &&
+
+default_build
diff --git a/utils/kexec-tools/DEPENDS b/utils/kexec-tools/DEPENDS
new file mode 100755
index 0000000..ee27e0f
--- /dev/null
+++ b/utils/kexec-tools/DEPENDS
@@ -0,0 +1,14 @@
+optional_depends zlib \
+ "--with-zlib" \
+ "--without-zlib" \
+ "for zlib support" &&
+
+optional_depends xz-utils \
+ "--with-lzma" \
+ "--without-lzma" \
+ "for LZMA support" &&
+
+optional_depends xen-tools \
+ "--with-xen" \
+ "--without-xen" \
+ "for extended Xen support"
diff --git a/utils/kexec-tools/DETAILS b/utils/kexec-tools/DETAILS
index c1c4135..0d6e2fb 100755
--- a/utils/kexec-tools/DETAILS
+++ b/utils/kexec-tools/DETAILS
@@ -1,5 +1,6 @@
SPELL=kexec-tools
VERSION=2.0.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/kexec/$SOURCE
diff --git a/utils/kexec-tools/HISTORY b/utils/kexec-tools/HISTORY
index 65446ee..9cc663c 100644
--- a/utils/kexec-tools/HISTORY
+++ b/utils/kexec-tools/HISTORY
@@ -1,3 +1,9 @@
+2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS: added, for optional dependencies
+ * BUILD: added, to fix kernel load on 64-bit systems
+ * PRE_BUILD: added, to fix compilation with modern GCC
+
2010-10-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.2; fixed source url, website
converted to upstream signature checking
diff --git a/utils/kexec-tools/PRE_BUILD b/utils/kexec-tools/PRE_BUILD
new file mode 100755
index 0000000..9ea5c5e
--- /dev/null
+++ b/utils/kexec-tools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i "s:--no-undefined::" purgatory/Makefile
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 0962926..2689dd5 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -3,6 +3,7 @@ message "${MESSAGE_COLOR}Target list:
$QEMU_ARCHS${DEFAULT_COLOR}" &&
cd "${SOURCE_DIRECTORY}" &&

./configure --prefix="$INSTALL_ROOT/usr" \
+ --sysconfdir="$INSTALL_ROOT/etc" \
--target-list="$QEMU_ARCHS" \
--audio-drv-list="$QEMU_AUDIO" \
--audio-card-list="$QEMU_CARDS" \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 3d110bf..1d5af69 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: added sysconfdir path
+ * archs: renewed supported archlist
+
2011-08-17 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* cflags.patch: added, to fix compilation on i486 (missing space in
flags)
diff --git a/utils/qemu/archs b/utils/qemu/archs
index 1b295fe..a062278 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,32 +1,41 @@
-alpha-linux-user alpha on
-i386-linux-user i386 on
-arm-linux-user arm on
-armeb-linux-user armeb on
-cris-linux-user cris on
-m68k-linux-user m68k on
-mips-linux-user mips on
-mipsel-linux-user mipsel on
-ppc-linux-user ppc on
-ppc64-linux-user ppc64 on
-ppc64abi32-linux-user ppc64abi32 on
-sparc-linux-user sparc on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sh4-linux-user sh4 on
-sh4eb-linux-user sh4eb on
-x86_64-linux-user x86_64 on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc64-softmmu ppc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
-mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips64-softmmu mips64-softmmu on
+alpha-linux-user alpha on
+armeb-linux-user armeb on
+arm-linux-user arm on
+cris-linux-user cris on
+i386-linux-user i386 on
+m68k-linux-user m68k on
+microblazeel-linux-user microblazeel on
+microblaze-linux-user microblaze on
+mipsel-linux-user mipsel on
+mips-linux-user mips on
+ppc64abi32-linux-user ppc64abi32 on
+ppc64-linux-user ppc64 on
+ppc-linux-user ppc on
+s390x-linux-user s390x on
+sh4eb-linux-user sh4eb on
+sh4-linux-user sh4 on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sparc-linux-user sparc on
+unicore32-linux-user unicore32 on
+x86_64-linux-user x86_64 on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblazeel-softmmu microblazeel-softmmu on
+microblaze-softmmu microblaze-softmmu on
mips64el-softmmu mips64el-softmmu on
-arm-softmmu arm-softmmu on
-m68k-softmmu m68k-softmmu on
-cris-softmmu cris-softmmu on
-sh4-softmmu sh4-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
+mips64-softmmu mips64-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips-softmmu mips-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc-softmmu ppc-softmmu on
+s390x-softmmu s390x-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
+sh4-softmmu sh4-softmmu on
+sparc64-softmmu sparc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index e83dbda..4a0342a 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,6 @@
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * strigi.sh: removed /opt/kde4/share
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/strigi/strigi.sh b/utils/strigi/strigi.sh
index dd291a5..43162b8 100755
--- a/utils/strigi/strigi.sh
+++ b/utils/strigi/strigi.sh
@@ -1,3 +1,3 @@
#!/bin/sh
#set environment for using strigi
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde4/share:/usr/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share
diff --git a/windowmanagers/ede/DEPENDS b/windowmanagers/ede/DEPENDS
deleted file mode 100755
index 64875a1..0000000
--- a/windowmanagers/ede/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends xorg-libs &&
-depends efltk
diff --git a/windowmanagers/ede/DETAILS b/windowmanagers/ede/DETAILS
deleted file mode 100755
index 1a88d9e..0000000
--- a/windowmanagers/ede/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
- SPELL=ede
- VERSION=1.2
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:16a15ae396c247e55f018e62c4dda12140c845cbad248929757cd25f178dbdf5604c506c466c745e7405b7def2ef430bc2dd6295c857f9be43f20e0a53ac5932
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
- WEB_SITE="http://equinox-project.org/";
- LICENSE[0]=GPL
- ENTERED=20090423
- SHORT="Equinox Desktop Environment"
-cat << EOF
-Equinox Desktop Environment (shortly EDE) is small desktop environment, built
-to be simple and fast. It is based on modified FLTK library (called
-extended FLTK or just eFLTK).
-Comparing to other desktop environments, EDE is much faster and smaller in
-memory space (EDE's window manager use less memory than xterm).
-EOF
diff --git a/windowmanagers/ede/HISTORY b/windowmanagers/ede/HISTORY
deleted file mode 100644
index 83f77d3..0000000
--- a/windowmanagers/ede/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2009-04-23 Julien _kaze_ ROZO <julien AT rozo.org>
- * DEPENDS, DETAILS, HISTORY: created this spell
-
diff --git a/windowmanagers/fvwm/CONFIGURE b/windowmanagers/fvwm/CONFIGURE
deleted file mode 100755
index 81e2817..0000000
--- a/windowmanagers/fvwm/CONFIGURE
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ ! "${FVWM_RELEASE}" = "stable" ]; then
- config_query_option FVWM_OPTS \
- "Enable NLS?" y \
- "--enable-nls" \
- "--disable-nls"
-fi
diff --git a/windowmanagers/fvwm/DEPENDS b/windowmanagers/fvwm/DEPENDS
index 46cf666..aee80f0 100755
--- a/windowmanagers/fvwm/DEPENDS
+++ b/windowmanagers/fvwm/DEPENDS
@@ -1,6 +1,57 @@
depends xorg-libs &&
depends zlib &&
depends netpbm &&
+# please keep optional_depends in the same order as configure --help
+# to help spot future changes
+optional_depends dmalloc \
+ "--enable-dmalloc" \
+ "--disable-dmalloc" \
+ "for dmalloc debugging (don't)" &&
+optional_depends electricfence \
+ "--enable-efence" \
+ "--disable-efemce" \
+ "for electric fence debugging (don't)" &&
+
+optional_depends libsm \
+ "--enable-sm" \
+ "--disable-sm" \
+ "Enable session Managment?" &&
+optional_depends libxext \
+ "--enable-shape --enable-shm" \
+ "--disable-shape --disable-shm" \
+ "Enable shaped window and shared memory support?" &&
+optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "Enable xinerama support?" &&
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "Enable Xrender alpha-blend rendering?" &&
+optional_depends libxcursor \
+ "--enable-xcursor" \
+ "--disable-xcursor" \
+ "Enable XCursor support" &&
+optional_depends libxft \
+ "--enable-xft" \
+ "--disable-xft" \
+ "XFT Support" &&
+optional_depends librsvg2 \
+ "--enable-rsvg" \
+ "--disable-rsvg" \
+ "SVG Support" &&
+optional_depends fribidi \
+ "--enable-bidi" \
+ "--disable-bidi" \
+ "bidirectional writing support (currently broken?)" &&
+optional_depends perl \
+ "--enable-perllib" \
+ "--disable-perllib" \
+ "install the fvwm perl library?" &&
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "enable native language support?" &&
optional_depends libstroke \
"" \
"" \
@@ -9,6 +60,10 @@ optional_depends gtk+ \
"" \
"--disable-gtk" \
"With GTK support for FvwmGtk?" &&
+if is_depends_enabled $SPELL gtk+ ; then
+ depends imlib
+fi &&
+
optional_depends gnome-libs \
"--with-gnome" \
"--with-gnome=no" \
@@ -17,53 +72,14 @@ optional_depends readline \
"--with-readline-library --without-termcap-library" \
"--without-readline-library" \
"line editing/history" &&
-optional_depends libsm \
- "--enable-sm" \
- "--disable-sm" \
- "Enable session Managment?" &&
-optional_depends libxext \
- "--enable-shape" \
- "--disable-shape" \
- "Enable shaped window support?" &&
-optional_depends libxinerama \
- "--enable-xinerama" \
- "--disable-xinerama" \
- "Enable xinerama support?" &&
-optional_depends libxrender \
- "--enable-xrender" \
- "--disable-xrender" \
- "Enable Xrender alpha-blend rendering?" &&
optional_depends rplay \
"--enable-rplay" \
"--without-rplay-library" \
"support sound" &&
-
-if [ ! "${FVWM_RELEASE}" = "stable" ]; then
- optional_depends libxcursor \
- "--enable-xcursor" \
- "--disable-xcursor" \
- "Enable XCursor support" &&
- optional_depends librsvg2 \
- "--enable-rsvg" \
- "--disable-rsvg" \
- "SVG Support" &&
- optional_depends libxft \
- "--enable-xft" \
- "--disable-xft" \
- "XFT Support" &&
- optional_depends perl \
- "--enable-perllib" \
- "--disable-perllib" \
- "install perl bindings" &&
- optional_depends fribidi \
- "--enable-bidi" \
- "--disable-bidi" \
- "bidirectional writing support" &&
- optional_depends libpng \
+optional_depends libpng \
"" \
"--without-png-library" \
"png image support"
-fi &&

if [ "${FVWM_RELEASE}" = "cvs" ]; then
depends CVS &&
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index 571c844..cb1ec73 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -1,9 +1,4 @@
SPELL=fvwm
-
-# first test tree sets versions and hashes, different for each version
-# second test tree sets sources, directories and urls, same for devel and
stable
-# different for cvs
-
if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then

if [[ "${FVWM_CVS_AUTOUPDATE}" == "y" ]] ; then
@@ -17,15 +12,15 @@ if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then
FORCE_DOWNLOAD=on

elif [[ "${FVWM_RELEASE}" == "unstable" ]] ; then
- VERSION=2.5.30
-
SOURCE_HASH=sha512:246a6ba0e9088771ef7d33edb5b77d2969e09ddea60666fb6f3b08b76e856e1ceca5e3511108893466dd633e958227f9af263ae9b52f2907dcc2e3efe1fce679
+ VERSION=2.7.0
+
SOURCE_HASH=sha512:45ca6ff8c4303e11a916aeeedbef070066e216804be165a6fc36129314927818efe720024b69eb248a0a7884ca869cf47854a4ecfad7bdfaeb9b392c0bd2d6a1
else
- VERSION=2.4.20
-
SOURCE_HASH=sha512:6704f3204a9850628da2bf53acd8afca64368d0a744a91a4200fe17212deaecc92f1616457f8a43bcc8f01a5d6a2159928526eac3d66af7c00a4f39a2c875501
+ VERSION=2.6.2
+
SOURCE_HASH=sha512:25cce9d4081be91f97b60e5bb15cda856adb9081b19e8d9746e5618ecb2579b80656cca3e3eb0ea07ce2401e4c9386cae4ad62029f4df84968933d4203cf6c7b
fi

if [[ "${FVWM_RELEASE}" != "cvs" ]] ; then
- SOURCE=fvwm-${VERSION}.tar.gz
+ SOURCE=fvwm-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-${VERSION}
SOURCE_URL[0]=ftp://ftp.fvwm.org/pub/fvwm/version-2/${SOURCE}
else
diff --git a/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2
b/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2
deleted file mode 100644
index 43692bb..0000000
Binary files a/windowmanagers/fvwm/FlatSeparators-2.5.26.patch.bz2 and
/dev/null differ
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index ce99376..6b1c798 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,11 @@
+2011-08-30 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: versions 2.6.2 and 2.7.0
+ * DEPENDS: added perl, depend on imlib when gtk is enabled,
+ added a warning about fribidi being broken.
+ * PREPARE: removed patch for 2.5.x
+ * PRE_BUILD: removed, obsolete
+ * CONFIGURE: removed, NLS support (through gettext) is an optional
dep,
+
2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: unstable 2.5.30, removed png configure option when
it's enabled (no longer valid)
diff --git a/windowmanagers/fvwm/PREPARE b/windowmanagers/fvwm/PREPARE
index c1576ef..7fffbee 100755
--- a/windowmanagers/fvwm/PREPARE
+++ b/windowmanagers/fvwm/PREPARE
@@ -6,6 +6,3 @@ config_query_list FVWM_RELEASE "Which release would you like
to build?" stable u
if [[ "${FVWM_RELEASE}" == "cvs" ]]
then config_query FVWM_CVS_AUTOUPDATE "Update on every system update?" n
fi
-if [[ "$FVWM_RELEASE" == "unstable" ]]; then
- config_query FVWM_PATCHSET "apply the flat separators patch?" n
-fi
diff --git a/windowmanagers/fvwm/PRE_BUILD b/windowmanagers/fvwm/PRE_BUILD
deleted file mode 100755
index 8884143..0000000
--- a/windowmanagers/fvwm/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-Patch() {
- message "${MESSAGE_COLOR}applying ${FILE_COLOR}$1${DEFAULT_COLOR}" &&
- patch -p0 < "$1" || return 1
-}
-default_pre_build &&
-if [[ "$FVWM_RELEASE" == "unstable" ]] &&
- [[ "$FVWM_PATCHSET" == "y" ]]; then
- cd ${SOURCE_DIRECTORY} &&
- bzcat ${SCRIPT_DIRECTORY}/FlatSeparators-2.5.26.patch.bz2 | patch -p0
-fi
diff --git a/wm-addons/xxkb/DETAILS b/wm-addons/xxkb/DETAILS
index 6017f1d..259d9ce 100755
--- a/wm-addons/xxkb/DETAILS
+++ b/wm-addons/xxkb/DETAILS
@@ -1,5 +1,6 @@
SPELL=xxkb
VERSION=1.11
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 901ca23..109255d 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,2 +1,6 @@
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: install manual page, too
+
2010-11-15 Vlad Glagolev <stealth AT sourcemage.org>
* {PRE_}BUILD, DEPENDS, DETAILS, imake.patch: spell created
diff --git a/wm-addons/xxkb/INSTALL b/wm-addons/xxkb/INSTALL
new file mode 100755
index 0000000..c3317dc
--- /dev/null
+++ b/wm-addons/xxkb/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+make install.man
diff --git a/x11-toolkits/efltk/BUILD b/x11-toolkits/efltk/BUILD
deleted file mode 100755
index f638416..0000000
--- a/x11-toolkits/efltk/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-# ODBC support is broken at the moment
-OPTS="--disable-unixODBC $OPTS" &&
-default_build
diff --git a/x11-toolkits/efltk/DEPENDS b/x11-toolkits/efltk/DEPENDS
deleted file mode 100755
index 09a1467..0000000
--- a/x11-toolkits/efltk/DEPENDS
+++ /dev/null
@@ -1,24 +0,0 @@
-depends -sub CXX gcc &&
-depends libpng &&
-depends JPEG &&
-
-optional_depends OPENGL \
- "--enable-opengl" \
- "--disable-opengl" \
- "for OpenGL support" &&
-
-optional_depends MYSQL \
- "--enable-mysql" \
- "--disable-mysql" \
- "for MySQL support" &&
-
-# ODBC support is broken at the moment
-#optional_depends unixodbc \
-# "--enable-unixODBC" \
-# "--disable-unixODBC" \
-# "for UnixODBC support" &&
-
-optional_depends libxft \
- "--enable-xft" \
- "--disable-xft" \
- "for anti-aliased fonts support"
diff --git a/x11-toolkits/efltk/DETAILS b/x11-toolkits/efltk/DETAILS
deleted file mode 100755
index f958513..0000000
--- a/x11-toolkits/efltk/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=efltk
- VERSION=2.0.8
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=${SOURCEFORGE_URL}/ede/${SOURCE}
-
SOURCE_HASH=sha512:9a87260a65d53e703ee48491c06b60b20bc3dfc12aa4a6f3e08999368d865945ea7f94a60d17c3d47cee496c0b06efb7ec9a594db23a345db5cb7aa879148e4f
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
- WEB_SITE="http://equinox-project.org/";
- LICENSE[0]=LGPL
- ENTERED=20090423
- SHORT="a fast light graphical toolkit for X11"
-cat << EOF
-EFltk is a LGPL'd C++ graphical user interface toolkit for X.
-It is basedon FLTK2 and is currently developed by Equinox Desktop
-Environment Team.
-EOF
diff --git a/x11-toolkits/efltk/HISTORY b/x11-toolkits/efltk/HISTORY
deleted file mode 100644
index 258ba3d..0000000
--- a/x11-toolkits/efltk/HISTORY
+++ /dev/null
@@ -1,13 +0,0 @@
-2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: changed dependency on g++ to dependency on gcc with
- sub-depends on CXX (scripted)
-
-2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
- * DEPENDS: jpeg -> JPEG
-
-2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
- * DEPENDS: updated mysql dependency to MYSQL provider
-
-2009-04-23 Julien _kaze_ ROZO <julien AT rozo.org>
- * BUILD, DEPENDS, DETAILS, HISTORY: created this spell
-
diff --git a/x11/xautolock/BUILD b/x11/xautolock/BUILD
index a8db802..3725a6f 100755
--- a/x11/xautolock/BUILD
+++ b/x11/xautolock/BUILD
@@ -1,5 +1,3 @@
xmkmf -a &&

-sed -i "s:usr/man:usr/share/man:" Makefile &&
-
make
diff --git a/x11/xautolock/HISTORY b/x11/xautolock/HISTORY
index 649e143..05bb9e4 100644
--- a/x11/xautolock/HISTORY
+++ b/x11/xautolock/HISTORY
@@ -1,3 +1,6 @@
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: removed dirty hack
+
2008-06-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2, removed UPDATED, useless # version,
renewed keywords, added some docs
diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS
index bec4c89..5237455 100755
--- a/xorg-util/xorg-cf-files/DETAILS
+++ b/xorg-util/xorg-cf-files/DETAILS
@@ -1,5 +1,6 @@
SPELL=xorg-cf-files
VERSION=1.0.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 7ceaa24..d425e1f 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,8 @@
+2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply the patch
+ * man-path.patch: added, to correct general man path directory
+
2011-01-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.4

diff --git a/xorg-util/xorg-cf-files/PRE_BUILD
b/xorg-util/xorg-cf-files/PRE_BUILD
index 40345a0..2469702 100755
--- a/xorg-util/xorg-cf-files/PRE_BUILD
+++ b/xorg-util/xorg-cf-files/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" &&
patch -p1 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
+patch -p0 < "$SPELL_DIRECTORY/man-path.patch" &&
sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def
diff --git a/xorg-util/xorg-cf-files/man-path.patch
b/xorg-util/xorg-cf-files/man-path.patch
new file mode 100644
index 0000000..b0e6d67
--- /dev/null
+++ b/xorg-util/xorg-cf-files/man-path.patch
@@ -0,0 +1,11 @@
+--- Imake.tmpl.orig 2009-10-17 01:45:42.000000000 +0400
++++ Imake.tmpl 2011-08-30 15:33:37.808819997 +0400
+@@ -890,7 +890,7 @@
+ #endif
+ #ifndef ManDirectoryRoot
+ #ifdef ProjectRoot
+-#define ManDirectoryRoot Concat(ProjectRoot,/man)
++#define ManDirectoryRoot Concat(ProjectRoot,/share/man)
+ #else
+ #define ManDirectoryRoot SystemManDirectory
+ #endif

[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (1314529ca87d4f2094e8299336ee34be6a7da5b2), Bor Kraljič, 08/31/2011