Skip to Content.
Sympa Menu

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

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 (fbb9e5c23b7a2da08fe821577827c143e732c78b)
  • Date: Mon, 12 Apr 2010 21:27:02 -0500

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

ChangeLog |
28 +
FUNCTIONS |
179 +++-------
audio-creation/nted/DETAILS |
9
audio-creation/nted/HISTORY |
4
audio-libs/libifp/CONFIGURE |
2
audio-libs/libifp/HISTORY |
3
audio-libs/libifp/INSTALL |
2
audio-libs/openal-soft/DETAILS |
4
audio-libs/openal-soft/HISTORY |
3
audio-libs/taglib/DETAILS |
4
audio-libs/taglib/HISTORY |
3
audio-soft/idjc/DEPENDS |
32 +
audio-soft/idjc/DETAILS |
15
database/mysql/mysql.gpg |
0
database/openrpt/DETAILS |
4
database/openrpt/HISTORY |
3
database/postgresql/FINAL |
2
database/postgresql/HISTORY |
3
dev/null
|binary
devel/git/DEPENDS |
5
devel/git/HISTORY |
4
disk/attr/DETAILS |
2
disk/attr/HISTORY |
3
disk/btrfs-progs/BUILD |
3
disk/btrfs-progs/HISTORY |
3
disk/libburn/DETAILS |
4
disk/libburn/HISTORY |
3
disk/mtools/DETAILS |
4
disk/mtools/HISTORY |
3
disk/nilfs-utils/DETAILS |
4
disk/nilfs-utils/HISTORY |
3
disk/ntfs-3g/DETAILS |
1
disk/ntfs-3g/HISTORY |
4
disk/ntfs-3g/PRE_BUILD |
5
disk/partimage-ng/DEPENDS |
10
disk/partimage-ng/DETAILS |
19 -
disk/partimage-ng/HISTORY |
8
disk/partimage-ng/PREPARE |
7
disk/partimage-ng/PRE_BUILD |
22 -
disk/partimage-ng/e2fs.diff |
23 -
disk/partimage-ng/hal.diff |
52 --
disk/partimage-ng/ntfs.diff |
27 -
disk/quota/DETAILS |
2
disk/quota/HISTORY |
3
disk/quota/quota-3.16.tar.gz.sig |
0
disk/quota/quota-4.00-pre1.tar.gz.sig
|binary
disk/udisks/DETAILS |
7
disk/udisks/HISTORY |
3
ftp-libs/MAINTAINER |
2
ftp-libs/curlpp/DEPENDS |
1
ftp-libs/curlpp/DETAILS |
12
ftp-libs/curlpp/HISTORY |
4
ftp-libs/dclib/DETAILS |
9
ftp-libs/dclib/HISTORY |
5
ftp-libs/rb-libtorrent/DETAILS |
4
ftp-libs/rb-libtorrent/HISTORY |
3
gnome2-apps/epiphany/DETAILS |
4
gnome2-apps/epiphany/HISTORY |
3
gnome2-apps/epiphany/epiphany-2.30.0.tar.bz2.sig |
0
gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig
|binary
gnome2-apps/evolution/DEPENDS |
8
gnome2-apps/evolution/HISTORY |
5
gnome2-apps/gtg/DEPENDS |
4
gnome2-apps/gtg/DETAILS |
6
gnome2-apps/gtg/HISTORY |
6
gnome2-libs/glibmm/HISTORY |
4
gnome2-libs/glibmm/REPAIR^none^PRE_SUB_DEPENDS |
5
gnome2-libs/glibmm/SUB_DEPENDS |
1
gnome2-libs/gnome-mag/DEPENDS |
10
gnome2-libs/gnome-mag/HISTORY |
5
gnome2-libs/gnome-panel/DEPENDS |
1
gnome2-libs/gnome-panel/HISTORY |
3
gnome2-libs/gnome-python-desktop/HISTORY |
3
gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS |
1
gnome2-libs/gnome-python-desktop/REPAIR^all^PRE_SUB_DEPENDS |
6
gnome2-libs/gnome-python-desktop/SUB_DEPENDS |
2
gnome2-libs/gobject-introspection/DETAILS |
2
gnome2-libs/gobject-introspection/HISTORY |
3
gnome2-libs/gobject-introspection/gobject-introspection-0.6.7.tar.bz2.sig |
0
gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
|binary
gnome2-libs/libgsf/DETAILS |
2
gnome2-libs/libgsf/HISTORY |
3
gnome2-libs/libgsf/libgsf-1.14.17.tar.bz2.sig |
0
gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
|binary
gnome2-libs/liboobs/DEPENDS |
11
gnome2-libs/liboobs/HISTORY |
3
gnome2-libs/metacity/DETAILS |
2
gnome2-libs/metacity/HISTORY |
3
gnome2-libs/metacity/metacity-2.30.0.tar.gz.sig |
0
gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig
|binary
graphics-libs/geglmm/DEPENDS |
3
graphics-libs/geglmm/DETAILS |
14
graphics-libs/geglmm/HISTORY |
3
graphics-libs/geglmm/geglmm-0.1.0.tar.bz2.sig
|binary
graphics-libs/mesalib/DEPENDS |
7
graphics-libs/mesalib/HISTORY |
5
graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS |
31 -
graphics-libs/opencv/DEPENDS |
6
graphics-libs/opencv/DETAILS |
6
graphics-libs/opencv/HISTORY |
7
graphics/gocr/BUILD |
2
graphics/gocr/DETAILS |
4
graphics/gocr/HISTORY |
4
graphics/imagemagick/DETAILS |
2
graphics/imagemagick/HISTORY |
3
graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig |
0
graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig
|binary
graphics/unpaper/DETAILS |
6
graphics/unpaper/HISTORY |
4
graphics/unpaper/PRE_BUILD |
3
gurus.gpg
|binary
http/apache/BUILD |
14
http/apache/CONFLICTS |
8
http/apache/DEPENDS |
7
http/apache/DETAILS |
29 -
http/apache/DOWNLOAD |
1
http/apache/HISTORY |
9
http/apache/INSTALL |
1
http/apache/PRE_BUILD |
4
http/apache/PROVIDES |
3
http/apache/TRIGGERS |
1
http/apache/apache_1.3.41_glic.patch |
105 -----
http/apache/init.d/apache |
54 ---
http/apache1/BUILD |
13
http/apache1/CONFLICTS |
9
http/apache1/DEPENDS |
6
http/apache1/DETAILS |
22 +
http/apache1/HISTORY |
153 ++++++++
http/apache1/PRE_BUILD |
3
http/apache1/PROVIDES |
3
http/apache1/apache_1.3.41_glic.patch |
105 +++++
http/apache1/init.d/apache |
54 +++
http/gnash/DEPENDS |
8
http/gnash/HISTORY |
3
http/lighttpd/BUILD |
3
http/lighttpd/CONFIGURE |
8
http/lighttpd/DEPENDS |
5
http/lighttpd/HISTORY |
4
kde-apps/kdsl/FINAL |
2
kde-apps/kdsl/HISTORY |
3
kde4-support/grantlee/DEPENDS |
4
kde4-support/grantlee/DETAILS |
14
kde4-support/grantlee/HISTORY |
7
kde4/kdebase4-runtime/DEPENDS |
1
kde4/kdebase4-runtime/HISTORY |
3
kde4/kdebase4/DEPENDS |
1
kde4/kdebase4/HISTORY |
3
kde4/kdelibs4/DEPENDS |
2
kde4/kdelibs4/HISTORY |
3
kernels/ath5k/BUILD |
4
kernels/ath5k/HISTORY |
3
kernels/ath5k/INSTALL |
6
kernels/bluez-kernel/BUILD |
2
kernels/bluez-kernel/HISTORY |
3
kernels/cloop/BUILD |
2
kernels/cloop/HISTORY |
3
kernels/dazuko/BUILD |
4
kernels/dazuko/HISTORY |
3
kernels/kqemu/BUILD |
4
kernels/kqemu/HISTORY |
3
kernels/madwifi/BUILD |
4
kernels/madwifi/HISTORY |
3
kernels/madwifi/INSTALL |
6
kernels/ndiswrapper/BUILD |
2
kernels/ndiswrapper/HISTORY |
3
kernels/ndiswrapper/INSTALL |
2
kernels/splashutils/HISTORY |
3
kernels/splashutils/PRE_BUILD |
2
kernels/virtualbox-module/BUILD |
2
kernels/virtualbox-module/HISTORY |
3
libs/klibc/HISTORY |
3
libs/klibc/PRE_BUILD |
2
libs/libmpc/DEPENDS |
2
libs/libmpc/DETAILS |
15
libs/libmpc/HISTORY |
3
libs/libmpc/INSTALL |
2
libs/libtirpc/DEPENDS |
2
libs/libtirpc/DETAILS |
15
libs/libtirpc/HISTORY |
3
libs/tbb/BUILD |
2
libs/tbb/DEPENDS |
2
libs/tbb/DETAILS |
7
libs/tbb/HISTORY |
5
libs/yasm/DETAILS |
4
libs/yasm/HISTORY |
3
mail/drac/DEPENDS |
6
mail/drac/HISTORY |
3
mail/fetchmail/DETAILS |
2
mail/fetchmail/HISTORY |
3
mobile/mumpot/DEPENDS |
7
mobile/mumpot/DETAILS |
15
mobile/mumpot/HISTORY |
3
mysql.gpg
|binary
net/bridge-utils/BUILD |
2
net/bridge-utils/HISTORY |
3
net/monit/DETAILS |
12
net/monit/HISTORY |
3
net/netkit-bootparamd/DEPENDS |
2
net/netkit-bootparamd/HISTORY |
3
net/nfs-utils/DEPENDS |
2
net/nfs-utils/HISTORY |
3
net/portmap/CONFLICTS |
1
net/portmap/HISTORY |
4
net/portmap/PROVIDES |
1
net/pump/DETAILS |
4
net/pump/HISTORY |
3
net/rpcbind/CONFLICTS |
1
net/rpcbind/DEPENDS |
2
net/rpcbind/DETAILS |
16
net/rpcbind/HISTORY |
3
net/rpcbind/PROVIDES |
1
net/rpcbind/init.d/rpcbind |
7
net/ypbind-mt/DEPENDS |
2
net/ypbind-mt/HISTORY |
3
news/liferea/DEPENDS |
14
news/liferea/HISTORY |
4
odbc-drivers/myodbc/BUILD |
15
odbc-drivers/myodbc/DEPENDS |
6
odbc-drivers/myodbc/DETAILS |
21 -
odbc-drivers/myodbc/FINAL |
2
odbc-drivers/myodbc/HISTORY |
6
odbc-drivers/myodbc/POST_RESURRECT |
2
odbc-drivers/myodbc/PRE_REMOVE |
2
php-pear/php/BUILD |
2
php-pear/php/DETAILS |
17
php-pear/php/HISTORY |
4
php-pear/php/PREPARE |
1
python-pypi/obfuscate/DETAILS |
4
python-pypi/obfuscate/HISTORY |
3
python-pypi/scons/DETAILS |
4
python-pypi/scons/HISTORY |
3
python-pypi/sqlobject/DETAILS |
4
python-pypi/sqlobject/HISTORY |
3
science-libs/glpk/DETAILS |
2
science-libs/glpk/HISTORY |
3
utils/avahi/HISTORY |
6
utils/avahi/PRE_SUB_DEPENDS |
18 -
utils/avahi/REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS |
15
utils/fam/DEPENDS |
8
utils/fam/HISTORY |
3
utils/fbgetty/DETAILS |
3
utils/fbgetty/HISTORY |
4
utils/fbgetty/PRE_BUILD |
6
utils/hercules/DETAILS |
6
utils/hercules/HISTORY |
4
utils/kbd/DETAILS |
4
utils/kbd/HISTORY |
3
utils/rsyslog/DETAILS |
2
utils/rsyslog/HISTORY |
3
utils/smartmontools/DETAILS |
4
utils/smartmontools/HISTORY |
3
video-libs/libraw1394/DETAILS |
4
video-libs/libraw1394/HISTORY |
3
windowmanagers/awesome/DEPENDS |
11
windowmanagers/awesome/HISTORY |
3
wm-addons/cairo-dock-plugins/DETAILS |
6
wm-addons/cairo-dock-plugins/HISTORY |
3
wm-addons/cairo-dock/DETAILS |
6
wm-addons/cairo-dock/HISTORY |
3
x11-toolkits/gtk+2/DEPENDS |
10
x11-toolkits/gtk+2/HISTORY |
6
x11-toolkits/gtk+2/PRE_BUILD |
5
262 files changed, 1276 insertions(+), 720 deletions(-)

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

mobile/mumpot: new spell, a mapping and routing application

commit f5b8e26f02f8fd956e6955fe81e3acabb488ea63
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gnome-panel: depends on libcanberra with GTK, bug 15665

commit 9a9eefe9e5bd0d170dd22fd6d41e9dca9b1b2f24
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

kdelibs4: depends on hal, bug 15666

commit 4eff1f66fde8c913a5c77bcd97d08af8befbcc4f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

geglmm: new spell, C++ bindings for gegl

commit 90c22e28ec6acce63f381f484a04bf2b64af08d1
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

idjc: new spell, Internet DJ Console

commit 424cf3d07d80d2d776dc1c11c4e749755bc88606
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gtk+2: always requires cairo with SVG, bug 15664

commit dc3f3cf3e4b885982fc0f0315bc2d2c7458c926d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

attr: fixed SOURCE_HASH, bug 15663

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

libraw1394: => 2.0.5

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

scons: => 1.3.0

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

gocr: => 0.48

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

unpaper: => 0.3

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

grantlee: => v0.1.0

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

opencv - set depends flags for cmake

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

tbb: => 30_20100310

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

opencv: => 2.1.0

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

sqlobject: => 0.12.3

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

openrpt: => 3.1.1

commit 409242bd10cdb463845c6b261b1bdce1839c0474
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

odbc-drivers/myodbc: updated to 5.1.6; changed spell files to accomodate
for newer version

commit 7882b1c55a71428ffd48fa16ff7c19a3787393c5
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

database/mysql: mysql.gpg moved to top-level grimoire directory

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

obfuscate 0.2.2

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

smartmontools: => 5.39.1

commit 0d79d51ddff06c5ed3caf6ff2aa755bf751500e9
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Fixed indentation

commit b9d6afb245d518181b602aa262057ba079e38c3a
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: make the i var used by get_kernel_config_ver local

commit 29584f4d1abcefe1ee6c21edef1e4a8533747424
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ChangeLog: fix

commit 194768ee664269e507c1918ab93fc65674caa86c
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

libifp: Fix kernel path

commit 38a24fbb5512e477bd9cf6b27364c79118d14fc7
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

kdsl: Fix kernel path

commit 5d5073b2a2a354b506b1b51ed0ed28764988eeae
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ath5k: Fix kernel headers path

commit 7218d6709d2511a9a31b4fbd589c949eb2cd40f2
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

bluez-kernel: Fix kernel headers path

commit 183d03424f99d0a4cec4c5a15ac4cf3f7196e853
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

dazuko: Fix kernel headers path

commit 5e870aa0a5179a2eded36df5ca84be5bd8eb7f44
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

cloop: Fix kernel headers path

commit 32aa784ffeb82f06c0cb2c16a3180f3784e4d3ee
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

madwifi: Fix kernel headers path

commit f99a0a8fc4e18d8c4af7393c6fa548166d64a022
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

ndiswrapper: Fix kernel headers path

commit 7509dba11d8ee611de29f9c681ec9939c390459a
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

splashutils: Fix kernel headers path

commit 3ef4012efa551bafa4d7e2c00cb91c5493dfc695
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

virtualbox-module: Fix kernel headers path

commit 04b8a6961cc144b4f90e7441bd89852caf02e2bd
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

klibc: Fix kernel headers path

commit 075c67dff5461ba1852757f2d80997c222c98231
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

bridge-utils: Fix kernel headers path

commit 697e4792a617828824239b08614064ce0c6f2687
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Improve code reuse for get_*_kernel_config()

commit ad86ae3b98bda7a536fde9f33d9d9ca57a49a845
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: make get_running_kernel_config() get kernel version from
get_running_kernel_version()

commit 26280553276ecc25e80e7140915e1b704de83115
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Remove duplicated code

commit 94e8948fa4a578af25f5c8cfa4b1369cf5b5631e
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

FUNCTIONS: Improved get_running_kernel_config()

And make it use the more standard /lib/modules path to get the kernel
config.

commit 15e5abc6df0fe8ba0487e916c89e8a84e145b730
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

hercules: update to 3.07 and move SOURCE_URL

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

gobject-introspection 0.6.9

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

gnash needs pygtk2 if python is enabled

checking for python extension module directory...
${exec_prefix}/lib/python2.6/site-packages
checking for pygobject-codegen-2.0... /usr/bin/pygobject-codegen-2.0
checking for PYGTK... configure: error: Package requirements (pygtk-2.0)
were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

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

gnash: docbook-utils -> docbook2x

ERROR: No DocBook2X tools installed!
Either install it from http://docbook2x.sourceforge.net
...
or configure without --enable-docbook

commit eefc43189e177c9903f65f787adb994facbf109d
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

avahi: Fixed PRE_SUB_DEPENDS for howl and libdns_sd compatibility

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

kbd: => 1.15.2

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

partimage-ng: => bzr

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

ntfs-3g - fix ntfstime.h file

commit f7e866c87190ffd33935be8d46fac60cd4470914
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

database/postgresql: changed URL in FINAL to the HowTo on our wiki

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

Revert "mesalib: Move sub_depends into a -sub"

This reverts commit d8dc7a713afc8944783136c5ae364d3222a7dec8.

libxcb isn't libx11, oversight

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

metacity 2.30.1

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

fetchmail 6.3.16

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

libgsf 1.14.18

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

nilfs-utils 2.0.18

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

udisks 1.0.1, SECURITY_PATCH=1, CVE-2010-1149

commit dd8eab597a906d34b25a90419e411b239d459ff3
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

wm-addons/cairo-dock-plugins: Amended history entry to reflect change to
WEB_SITE

commit 2904db1ca60ca2066bd301a9f6cf5ae29ba3abe8
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

wm-addons/cairo-dock: Amended history entry to reflect change to WEB_SITE

commit 2c72e3088dcd217b3b18d7114c294617c71742e5
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

nted: Updated to version 1.9.22. Wouldn't summon old version.

commit e37579abba2efa35ff41a13443f570a30aab52c8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libs/libmpc: new; arithmetic of complex numbers; needed for gcc 4.5

commit 214cb441300760c58fc16856fb221a4ae1b39b75
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

imagemagick: Updated to version 6.6.1-1

commit f9aec710fa04cf6898faab71d503ed65dec0d85a
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

epiphany: Updated to version 2.30.2

commit 248d276b01f84eacce61f36d806f6ab6f16fea16
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

wm-addos/cairo-dock: Version bump to 2.1.3-8
wm-addos/cairo-dock-plugins: Version bump to 2.1.3-8

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

mtools: => 4.0.13

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

kdebase4- - not depend imake

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

kdebase4-runtime - not depend imake

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

mesalib - does not need imake

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

taglib: => 1.6.2

commit 92dc0488cf73d90c8a27dfe403988c4cbb7886c1
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gnome-python-desktop: added handler for PANEL subdependency

commit 2f6ccdab9e72135ab31e495ae2f0c37f2946f261
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gnome-mag: depends on libbonobo, dbus-glib,
for colorblind applet depends on pygtk2, pygobject,
gnome-python2,
subdepends on gnome-python-desktop with gnomepanel module,
removed dependency on gnome-desktop

commit cd89db4def6221705671ec12c1449a1cf3fc25b2
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

liboobs: optionaly depends on hal,
fixed a typo

commit 34f58811661e622609c067db4435e26561c83322
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

ftp-libs/rb-libtorrent: Updated spell to 0.15.0

commit 4d9d74c88793e6cdc1cbc451a2e1960d12f63e52
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

ftp-libs/rb-libtorrent: Updated to 0.15.0

commit abdc8c1d21f65f1aeb7e68d0e4697cbc614feefe
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

ftp-libs/dclib: Updated to 0.3.13, fixed SOURCE_URL and WEB_URL

commit e5f1f3fa33bb057fa17f17899f1cd1fd3e6fcdc8
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

libs/libtirpc: remnant from copying the spell files from rpcbind for a
base, removing

commit 25d30fbdf58ff5c6f35df33cbe94a943888abff2
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

ftp-libs/curlpp: Update to 0.7.3, add boost dependency

commit c22ca1951fb2b0d4719d2b4080571acd6e319af0
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

gurus.gpg: Adding my key with updated expiration

commit 33724577130a3af134a9cd71be88ef8e7c87737e
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

evolution: removed libbonobo, ibbonoboui, libgnomeui, libglade2, and
libprintui

commit 773e0a57c13ae7dedfc4abf411044d95e4e856ed
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gtg: => 0.2.3
fixed SOURCE_URL
added depends on python and runtime_depends on xset

commit 901106f63584fb298461e4d4af4a9e429b6600e7
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

fbgetty: removed gcc41 patch, added patch from archlinux instead which
adds a header

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

libburn: => 0.8.0

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

glpk: => 4.43

commit 7d747924b8b46f95a7fc14bc10d5d6e9af4f7994
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

http/apache: Fixed DEPENDS to depend on APACHE provider

commit 3906d28fc00677d3eb6b3ef01d2aaed35e6fa4a8
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

http/apache: apache deprecated and renamed to apache1 for Bug #13532

commit 17fd6ddaeccbcb500d6a8349a04cb0e8b49a9082
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>

git: fixed bug 15652

http://bugs.sourcemage.org/show_bug.cgi?id=15652
Makes python an optional dependency for the git_remote_helpers

commit d4f296d7ee5f6a40a49b5efb6835906af7b49c2f
Author: Ismael Luceno <ismael.luceno AT gmail.com>
Commit: Ismael Luceno <ismael.luceno AT gmail.com>

kqemu: use the standard way to find kernel sources

commit 63385d5eddc9f138fac19ce5b18155e9ec25b51c
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/rsyslog: updated devel branch to 5.5.3

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

yasm: => 1.0.0

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

kde4-support/grantlee - new spell

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

openal-soft: => 1.12.854

commit 9f07ee1258c6e4dd1f22a779e2226f981be3b328
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

liferea: fixed typo

commit 54ee6c2dde801f02c4ff1fefe9a887a71f55cd8d
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

liferea: added dependency on glib2, pango, libxslt, libsoup,
optionaly depends on libsm,
removed optional dependency on gnutls

commit f9a7e9b500d0116d26c762b667b18e264fcccd02
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

glibmm: added a repair file, added a persistent_add FULLDOCS to
SUB_DEPENDS

commit 1894a48bedd310473a1eb4dde521bbdd88a0cbe5
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

liboobs: added dependency on glib2, fixed gtk-doc option

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

evolution: Depends on libcanberra built with GTK (Bug #15654)

commit f19dd09a5e8431b410d581dea8777c2b9d6c2b46
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/pump: updated debian patchlevel to 7, PATCHLEVEL++

commit 1782c83e79ea67674592573f006b27a387f95291
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/fam: changed portmap dependency to PORT-MAPPER provider

commit 1fb52579e7f0a3e0bc16dd844b5fc21e2e57e14f
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

mail/drac: changed portmap dependency to PORT-MAPPER provider

commit fc1968197e49a5fbe0791c4317b9e100dc07ecf0
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/netkit-bootparamd: changed portmap dependency to PORT-MAPPER provider

commit a93b6ae5a385311a040187acc834345286e9bed5
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/ypbind-mt: changed portmap dependency to PORT-MAPPER provider

commit 40df6e22424e6d963eded2b5bc2f5136ef201510
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/nfs-utils: changed portmap dependency to PORT-MAPPER provider

commit 2f29a8796b021df9f4afa442b373b00a7ecfb944
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/portmap: provide PORT-MAPPER

commit 1f58bb4a32351cb20aee172f50e9bf238480a21d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/portmap: conflict with rpcbind

commit 3b83b0f737b3add617e2b89b778d59ddd2e7a09e
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/rpcbind: new spell, portmap replacement which supports RPC over
various protocols

commit cc078705d2a4d4fd00eab1aacae3a33868e58b19
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

libs/libtirpc: new spell, Transport Independent RPC library (SunRPC
replacement)

commit fcf2d21138e2e24dc3ed1ccd2a58b1695db082f5
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

http/lighttpd: added WebDAV lock query (default: yes) if WebDAV support
is requested. SQLite dep called if enabled, since its what uses it (locking)

commit bf49daba1be835eb016b09ea54389c7319738219
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

http/lighttpd: OPTS was not being populated correctly (webdav support
never compiled)

commit 8839f3335ec2304e5285634fccea1035ddc7d869
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/monit: updated to 5.1.1

commit b9198f2a13ae6865b1ad0f0f432980c9ea2f030d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: suhosin was updated to 0.9.9.1 and now works with php 5.3

commit 7a591016bf10297a5bda4bf6bc4718fc2da022d2
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: SQLite extension build fails if -ffast-math is enabled
(DBMS spells filter it)

commit cbcea556ab5d008882e82d3b6e971b1dace9fb1a
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

disk/quota: updated to 4.00-pre1

commit 7b56b1be7afe7a57c2fae478c8683c4ee1a2fdd6
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

disk/btrfs-progs: build the btrfs-convert tool

commit 0351f1de1eb6501f51dc925c459e7a67fbcefcb8
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

windowmanagers/awesome: Added optional dependency on luadoc

commit d4ae87591ba5ffabf071ed02de641906c271cdc2
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: Mark Bainter <mbainter AT sourcemage.org>

ftp-libs: Added myself as the Maintainer of this section

diff --git a/ChangeLog b/ChangeLog
index b828178..921f922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * mobile/mumpot: new spell, a mapping and routing application
+
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * graphics-libs/geglmm: new spell, C++ bindings for gegl
+
+2010-04-12 Ismael Luceno <ismael AT sourcemage.org>
+ * audio-soft/idjc: new spell, Internet DJ Console
+
+2010-04-12 Elisamuel Resto <ryuji AT sourcemage.org>
+ * database/mysql: mysql.gpg move to top-level grimoire directory
+
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: Removed duplicated code and improved
get_*_kernel_config()
+
+2010-04-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libs/libmpc: arithmetic of complex numbers; needed for gcc 4.5
+
+2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
+ * http/apache: spell deprecated [renamed to apache1] for Bug #13532
+
+2010-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-support/grantlee: new spell, theming engine for strings
+
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * libs/libtirpc: new spell, Transport Independent RPC library (SunRPC
replacement)
+ * net/rpcbind: new spell, portmap replacement which supports RPC over
various protocols
+
2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
* libs/upower: new spell, abstraction for enumerating power devices

diff --git a/FUNCTIONS b/FUNCTIONS
index adbf3cf..b745deb 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -308,23 +308,23 @@ function mozilla_remove_nspr_nss() {
#-------------------------------------------------------------------------
function get_kernel_version()
{
- local KVER=$(installed_version linux)
- if [[ $KVER ]] ; then
- echo $KVER
- else
- KVER=$(installed_version linux-new)
- if [[ $KVER ]] ; then
- echo $KVER
- else
- KVER=$(grep version /usr/src/linux/.config | cut -d:
-f2 | cut -d ' ' -f2)
- if [ $KVER ] && [ -d "/lib/modules/${KVER}/build" ] ;
then
- echo $KVER
- else
- KVER=$(uname -r)
- echo $KVER
- fi
- fi
- fi
+ local KVER=$(installed_version linux)
+ if [[ $KVER ]] ; then
+ echo $KVER
+ else
+ KVER=$(installed_version linux-new)
+ if [[ $KVER ]] ; then
+ echo $KVER
+ else
+ KVER=$(grep version /usr/src/linux/.config | cut -d: -f2 | cut -d ' '
-f2)
+ if [ $KVER ] && [ -d "/lib/modules/${KVER}/build" ] ; then
+ echo $KVER
+ else
+ KVER=$(uname -r)
+ echo $KVER
+ fi
+ fi
+ fi
}

#---------------------------------------------------------------------------
@@ -335,16 +335,16 @@ function get_kernel_version()
#--------------------------------------------------------------------------
function invoke_uname_change()
{
- if [[ $(installed_version unamechange) ]] ; then
- export UNAME_CHANGE_SYSNAME=$(uname -s)
- export UNAME_CHANGE_NODENAME=$(uname -n)
- export UNAME_CHANGE_RELEASE=$(uname -r)
- export UNAME_CHANGE_VERSION=$(uname -v)
- export UNAME_CHANGE_MACHINE=$(uname -m)
- export UNAME_CHANGE_DOMAINNAME=$(uname -o)
-
- export LD_PRELOAD="${LD_PRELOAD} /usr/lib/unamechange.so"
- fi
+ if [[ $(installed_version unamechange) ]] ; then
+ export UNAME_CHANGE_SYSNAME=$(uname -s)
+ export UNAME_CHANGE_NODENAME=$(uname -n)
+ export UNAME_CHANGE_RELEASE=$(uname -r)
+ export UNAME_CHANGE_VERSION=$(uname -v)
+ export UNAME_CHANGE_MACHINE=$(uname -m)
+ export UNAME_CHANGE_DOMAINNAME=$(uname -o)
+
+ export LD_PRELOAD="${LD_PRELOAD} /usr/lib/unamechange.so"
+ fi
}

#-------------------------------------------------------------------------
@@ -354,44 +354,53 @@ function invoke_uname_change()
#-------------------------------------------------------------------------
function devoke_uname_change()
{
- if [[ $(installed_version unamechange) ]] ; then
- unset UNAME_CHANGE_SYSNAME
- unset UNAME_CHANGE_NODENAME
- unset UNAME_CHANGE_RELEASE
- unset UNAME_CHANGE_VERSION
- unset UNAME_CHANGE_MACHINE
- unset UNAME_CHANGE_DOMAINNAME
-
- export LD_PRELOAD="${LD_PRELOAD/\/usr\/lib\/unamechange.so/}"
- fi
+ if [[ $(installed_version unamechange) ]] ; then
+ unset UNAME_CHANGE_SYSNAME
+ unset UNAME_CHANGE_NODENAME
+ unset UNAME_CHANGE_RELEASE
+ unset UNAME_CHANGE_VERSION
+ unset UNAME_CHANGE_MACHINE
+ unset UNAME_CHANGE_DOMAINNAME
+
+ export LD_PRELOAD="${LD_PRELOAD/\/usr\/lib\/unamechange.so/}"
+ fi
}

#-----------------------------------------------------------------------
-## Get the running kernel config status of a some part of the kernel
-## given by $1. Used for spells that don't have linux triggers
+## Get the kernel config status of the kernel option specified by $2.
+## Kernel version is given by $1.
+##
+## If a configure file is found print the requested config status (if
+## any) and return 0, otherwise return 1.
+##-----------------------------------------------------------------------
+function get_kernel_config_ver()
+{
+ local i
+ for i in /proc/config /boot/config-"$1" /lib/modules/"$1"/build/.config
+ do
+ if [ -f "$i" ]; then
+ cat "$i" && break
+ elif [ -f "$i.gz" ]; then
+ zcat "$i.gz" && break
+ elif [ -f "$i.bz2" ]; then
+ bzcat "$i.bz2" && break
+ elif [ -f "$i.xz" ]; then
+ xzcat "$i.xz" && break
+ elif [ -f "$i.lzma" ]; then
+ xzcat "$i.lzma" && break
+ fi
+ done | grep "^$2=" | awk -F= '{ if ($2) { print $2 }; exit (!$2) }'
+}
+
+#-----------------------------------------------------------------------
+## Get the running kernel config status of the running kernel option
+## given by $1.
##
-## $1 string Config variable to look for
+## See also: get_specified_kernel_config
#-----------------------------------------------------------------------
function get_running_kernel_config()
{
- local KVER
- # use proc interface because even inside a uname change invoke this
- # still returns the version of the running kernel
- if [ -f /proc/sys/kernel/osrelease ] ; then
- KVER=$(cat /proc/sys/kernel/osrelease)
- else
- # apparently you don't have proc mount
- KVER=$(uname -r)
- fi
- if [ -f /proc/config.gz ] ; then
- echo $(zgrep "^$1=" /proc/config.gz | awk -F= '{ print $2 }')
- elif [ -f /boot/config-$KVER ] ; then
- echo $(grep "^$1=" /boot/config-$KVER | awk -F= '{ print $2
}')
- elif [ -f /usr/src/linux-$KVER/.config ] ; then
- echo $(grep "^$1=" /usr/src/linux-$KVER/.config | awk -F= '{
print $2 }')
- else
- echo "-1"
- fi
+ get_kernel_config_ver $(get_running_kernel_version) "$1"
}

#-------------------------------------------------------------------------
@@ -402,14 +411,7 @@ function get_running_kernel_config()
#-------------------------------------------------------------------------
function get_sorcery_kernel_config()
{
- local KVER=$(get_kernel_version)
- if [ -f /boot/config-$KVER ] ; then
- echo $(grep "^$1=" /boot/config-$KVER | awk -F= '{ print $2
}')
- elif [ -f /usr/src/linux-$KVER/.config ] ; then
- echo $(grep "^$1=" /usr/src/linux-$KVER/.config | awk -F= '{
print $2 }')
- else
- echo "-1"
- fi
+ get_kernel_config_ver $(get_kernel_version) || echo "-1"
}


@@ -590,31 +592,6 @@ function get_sorcery_kernel_version()
}

#-----------------------------------------------------------------------
-## Print the kernel config status of the running kernel for the option
-## defined in $1.
-## If a configure file is found print the requested config status (if
-## any) and return 0, otherwise return 1.
-#-----------------------------------------------------------------------
-function get_running_kernel_config()
-{
- if [[ -f /proc/config.gz ]]
- then
- zgrep "^$1=" /proc/config.gz | cut -d= -f2
- else
- local KVER="$(get_running_kernel_version)"
- if [[ -f "/boot/config-$KVER" ]]
- then
- grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$KVER/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
- else
- return 1
- fi
- fi
-}
-
-#-----------------------------------------------------------------------
## Print the kernel config status of the installed linux spell for the
## option defined in $1.
## If the linux spell is installed and a configure file is found print
@@ -626,15 +603,7 @@ function get_sorcery_kernel_config()
local KVER="$(installed_version linux)"
if [[ $KVER ]]
then
- if [[ -f "/boot/config-$KVER" ]]
- then
- grep "^$1=" "/boot/config-$KVER" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$KVER/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$KVER/.config" | cut -d= -f2
- else
- return 1
- fi
+ get_kernel_config_ver "$KVER" "$1"
else
return 1
fi
@@ -651,15 +620,7 @@ function get_kernel_config()
{
if [[ $USE_KERNEL_VERSION ]]
then
- if [[ -f "/boot/config-$USE_KERNEL_VERSION" ]]
- then
- grep "^$1=" "/boot/config-$USE_KERNEL_VERSION" | cut -d= -f2
- elif [[ -f "/usr/src/linux-$USE_KERNEL_VERSION/.config" ]]
- then
- grep "^$1=" "/usr/src/linux-$USE_KERNEL_VERSION/.config" | cut -d= -f2
- else
- return 1
- fi
+ get_kernel_config_ver "$USE_KERNEL_VERSION" "$1"
else
get_sorcery_kernel_config "$1" || get_running_kernel_config "$1"
fi
diff --git a/audio-creation/nted/DETAILS b/audio-creation/nted/DETAILS
index a5fd0fc..0c6a8af 100755
--- a/audio-creation/nted/DETAILS
+++ b/audio-creation/nted/DETAILS
@@ -1,14 +1,15 @@
SPELL=nted
- VERSION=1.4.17
+ VERSION=1.9.22
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/$SOURCE
+
SOURCE_URL[0]=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/$SOURCE

WEB_SITE=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
-
SOURCE_HASH=sha512:6796107fc203d03d6e9c596c23a10e6419fd31845880a3f48169112d3fdfcd1a3df7b7ac8e19753c05f52b54ae9e47e02aa81c442ccd290df7a30b7368041d18
+
SOURCE_HASH=sha512:302f3bb31e7ada9b22aef9db9639fd660cf085f1160ec90e7c0b7d9ec7abcb0004c873d03f18301fa33d1ebb964e8a7df38a871e22ab10aea58b0e9db843f884
ENTERED=20081219
LICENSE[0]=GPL
KEYWORDS="editors audio"
SHORT="a graphical musical score editor"
cat << EOF
-WYSIWYG musical score editor, including multiple voices, guitar chords, drum
notes, MIDI playback...
+WYSIWYG musical score editor, including multiple voices, guitar chords,
+drum notes, MIDI playback...
EOF
diff --git a/audio-creation/nted/HISTORY b/audio-creation/nted/HISTORY
index 7c12af9..d9f76af 100644
--- a/audio-creation/nted/HISTORY
+++ b/audio-creation/nted/HISTORY
@@ -1,2 +1,6 @@
+2010-04-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.9.22. Fixed SOURCE_URL[0]
+ Fixed long description wrap
+
2008-12-19 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: created spell
diff --git a/audio-libs/libifp/CONFIGURE b/audio-libs/libifp/CONFIGURE
index 23de165..1c286d4 100755
--- a/audio-libs/libifp/CONFIGURE
+++ b/audio-libs/libifp/CONFIGURE
@@ -2,5 +2,5 @@
if spell_ok linux; then
config_query_option KERMOD_OPTS \
"Build the kernel module ?" n \
- "--with-kmodule=${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)"
"--without-kmodule"
+
"--with-kmodule=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build"
"--without-kmodule"
fi
diff --git a/audio-libs/libifp/HISTORY b/audio-libs/libifp/HISTORY
index 06a3001..3e823ca 100644
--- a/audio-libs/libifp/HISTORY
+++ b/audio-libs/libifp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, INSTALL: Fix kernel path
+
2008-08-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, INSTALL: spell created

diff --git a/audio-libs/libifp/INSTALL b/audio-libs/libifp/INSTALL
index d8312de..e6848ba 100755
--- a/audio-libs/libifp/INSTALL
+++ b/audio-libs/libifp/INSTALL
@@ -3,5 +3,5 @@ make install &&

# install the kernel module
if [[ $KERMOD_OPTS == --with-kmodule* ]]; then
- make -C ${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)
M=${SOURCE_DIRECTORY}/kbuild modules_install
+ make -C ${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build
M=${SOURCE_DIRECTORY}/kbuild modules_install
fi
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index 3dd7ca8..7fcd734 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,6 +1,6 @@
SPELL=openal-soft
- VERSION=1.11.753
-
SOURCE_HASH=sha512:f6d8b775b789e4d1cd8d1c8322f61d1d28ca6c10333bda1141472c4488703d81501ed8ca9d33452671ccf8384fe76a3c862dde04c99b22eb60c0b8d40bd52cff
+ VERSION=1.12.854
+
SOURCE_HASH=sha512:44f3bb11156bda2df3e035506e67fd750716c51f414cbc58fdfb547cad63c01303b5a7a1ae5ae493321c2eef509f55050c333d53c775ddd78add33f36b2a150f
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index 0de281c..b2e2161 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12.854
+
2010-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11.753

diff --git a/audio-libs/taglib/DETAILS b/audio-libs/taglib/DETAILS
index 2f68e68..59352ce 100755
--- a/audio-libs/taglib/DETAILS
+++ b/audio-libs/taglib/DETAILS
@@ -1,6 +1,6 @@
SPELL=taglib
- VERSION=1.6.1
-
SOURCE_HASH=sha512:6641979de20a1d41c9f83a1b99f9ddfaf4e013ab8dc73d003b701fd3a911f169734429f347191941445df4431d6fa408b901fbd8721951bdb639442c602529c7
+ VERSION=1.6.2
+
SOURCE_HASH=sha512:81e070a39ec77fb9566570f642b25baa38784ffb7c7cd44f274e7b1419e8bb637fb93cc7dc3cda43dbd3a852940a7a894be60c34d87b7151fbc41cf7539001fe
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://ktown.kde.org/~wheeler/files/src/$SOURCE
diff --git a/audio-libs/taglib/HISTORY b/audio-libs/taglib/HISTORY
index 63d266a..c8bc601 100644
--- a/audio-libs/taglib/HISTORY
+++ b/audio-libs/taglib/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.2
+
2009-11-03 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.6.1
fixed long description wrap
diff --git a/audio-soft/idjc/DEPENDS b/audio-soft/idjc/DEPENDS
new file mode 100755
index 0000000..8f5709b
--- /dev/null
+++ b/audio-soft/idjc/DEPENDS
@@ -0,0 +1,32 @@
+depends python &&
+depends jack &&
+depends pygtk2 &&
+depends vorbis-tools &&
+depends libsndfile &&
+depends libsamplerate &&
+depends libshout &&
+depends mutagen &&
+optional_depends lame \
+ "--with-lame" \
+ "--without-lame" \
+ "MPEG Layer-III encoding support" &&
+optional_depends eyed3 \
+ "--with-eyed3t" \
+ "--without-eyed3" \
+ "ID3 metadata tagging support" &&
+optional_depends faad2 \
+ "--with-faad2" \
+ "--without-faad2" \
+ "M4A playback support" &&
+optional_depends libmad \
+ "--with-libmad" \
+ "--without-libmad" \
+ "MPEG2 Layer-III playback support" &&
+optional_depends LIBAVCODEC \
+ "--with-ffmpeg" \
+ "--without-ffmpeg" \
+ "Windows Media Audio playback support" &&
+optional_depends flac \
+ "--with-flac" \
+ "--without-flac" \
+ "FLAC playback support"
diff --git a/audio-soft/idjc/DETAILS b/audio-soft/idjc/DETAILS
new file mode 100755
index 0000000..463a8d2
--- /dev/null
+++ b/audio-soft/idjc/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=idjc
+ VERSION=0.8.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:76db0f391215031490aead69bbc677e60b0725df05f120e1b61d794e539bc8b6360967a20a017f03a214f23b2f47bf29bd6cb646f95651e2fe72e77fad64e00d
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.onlymeok.nildram.co.uk/
+ ENTERED=20100412
+ KEYWORDS="streaming tools audio"
+ SHORT="Internet DJ Console icecast client"
+cat << EOF
+A graphical icecast client with two media players, a jingles player,
crossfader,
+ogg and mp3 streaming, shutoff timer, aux input.
+EOF
diff --git a/database/mysql/mysql.gpg b/database/mysql/mysql.gpg
deleted file mode 100644
index 142cd63..0000000
Binary files a/database/mysql/mysql.gpg and /dev/null differ
diff --git a/database/openrpt/DETAILS b/database/openrpt/DETAILS
index 8f9fd51..156fb9b 100755
--- a/database/openrpt/DETAILS
+++ b/database/openrpt/DETAILS
@@ -1,6 +1,6 @@
SPELL=openrpt
- VERSION=3.1.0
-
SOURCE_HASH=sha512:84960597117bc0d7e9d13cd1e3f6ce823661066d134f2c2bfffdd635b11f9f8ef7390194ed09ff9cba58283875cde055496888fcad0ef862c951c66d5f6895bb
+ VERSION=3.1.1
+
SOURCE_HASH=sha512:cdafeae9626552389d3a7722f1cc393e7cc44c3979f33fa6d3588dfb0d32114f4cdb1a8362c21db9904339f4f9b2e95a5c041e362ad4db1160a2d13805cda04e
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-source
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/database/openrpt/HISTORY b/database/openrpt/HISTORY
index ac7c743..3ad6d56 100644
--- a/database/openrpt/HISTORY
+++ b/database/openrpt/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.1
+
2009-10-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.0

diff --git a/database/postgresql/FINAL b/database/postgresql/FINAL
index b9ced55..3aa766a 100755
--- a/database/postgresql/FINAL
+++ b/database/postgresql/FINAL
@@ -7,6 +7,6 @@ if is_depends_enabled $SPELL openssl; then
fi &&

message "${MESSAGE_COLOR}" &&
-message "See the PostgreSQL HOWTO at
http://wiki.sourcemage.org/HOWTO-Postgresql if you" &&
+message "See the PostgreSQL HOWTO at http://sourcemage.org/HowTo/Postgresql
if you" &&
message "need help setting up PostgreSQL." &&
message "${DEFAULT_COLOR}"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 474977c..eb731f7 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Elisamuel Resto <ryuji AT sourcemage.org>
+ * FINAL: changed URL to the HowTo on our wiki
+
2010-03-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8.4.3, SECURITY_PATCH=7

diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 76628e9..e14a372 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -25,6 +25,11 @@ optional_depends tk \
"--without-tcltk" \
"for interactive GUI and graphical history browser" &&

+optional_depends python \
+ "" \
+ "--without-python" \
+ "for git_remote_helpers end users don't typically use
these. (see git's man page and look for the helper commands)" &&
+
suggest_depends dbd-sqlite "" "" "for git-cvsserver" &&
suggest_depends bash-completion "" "" "for bash completion of Git commands"
&&
suggest_depends rsync "" "" "for syncing repos with rsync"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 6c9b63e..b194095 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,7 @@
+2010-04-09 David Kowis <dkowis AT shlrm.org>
+ * DEPENDS: added optional dependency on python
+ Noted what you'd lose if you don't include python
+
2010-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.0.4

diff --git a/disk/attr/DETAILS b/disk/attr/DETAILS
index 4da245a..dc30c41 100755
--- a/disk/attr/DETAILS
+++ b/disk/attr/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://mirror.lihnidos.org/GNU/savannah/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:9b02b7799ca1250b285b8bb65f38ab221cd6a76d16808e507cc5bbba229746bedb6409c49a6ecf18b0cffc269c75deca9b352b19d4cb7256a38f67b8a8fa55af
+
SOURCE_HASH=sha512:dcb759f042296881e12463c76bc53c7c5ca2d158834777c6502a3d24ab34f8100d3a5974eabb73b7ccad98ca0413918401f63301e4a5ba61cef1d0d483257371
WEB_SITE=http://oss.sgi.com/projects/xfs/
ENTERED=20020219
LICENSE[0]=GPL
diff --git a/disk/attr/HISTORY b/disk/attr/HISTORY
index 16e88fc..436f0d4 100644
--- a/disk/attr/HISTORY
+++ b/disk/attr/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_HASH, bug #15663
+
2010-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: corrected source url

diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
index 8f58e6d..73e18c2 100755
--- a/disk/btrfs-progs/BUILD
+++ b/disk/btrfs-progs/BUILD
@@ -1 +1,2 @@
-make
+make &&
+make convert
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 4512316..2f7835a 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD: also build btrfs-convert
+
2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.19
* PRE_BUILD: fixed mandir
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 502ac64..aaf5eb7 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBBURN_SVN == y ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
else
- VERSION=0.7.8
-
SOURCE_HASH=sha512:196634fac03b4a88c8442df5fc84fd04f785543636305991265be639fcfcf44e84677449dabb7aea859c78e136084aea6ae212d82b9298749a33254ccb946598
+ VERSION=0.8.0
+
SOURCE_HASH=sha512:1772a0d934fc2cee3f654eb0e2712779ac810c9d09606057f1e7b2c3f9f7b12eb5c433abc74beb9f5c143a9393e186e48eec063acbfdeaceca6f647ef1cb792c
SOURCE=$SPELL-$VERSION.pl00.tar.gz
SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index d540ab3..f9f30db 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2010-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.0
+
2010-03-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.8

diff --git a/disk/mtools/DETAILS b/disk/mtools/DETAILS
index 12880dc..d921a75 100755
--- a/disk/mtools/DETAILS
+++ b/disk/mtools/DETAILS
@@ -1,6 +1,6 @@
SPELL=mtools
- VERSION=4.0.12
-
SOURCE_HASH=sha512:b805c04a7c0dadab9a6e13161f63a6ed737e3d317ce9662487b45ac8298a4afb5e07d1b70058f1562cb92aca26dc905b38116fb051875a15193c053db064e553
+ VERSION=4.0.13
+
SOURCE_HASH=sha512:b8bc838f5174adcf876bc527ea922b055c5c0a48e64628645a3d0e88286ebca8db281edc4f91b83edb8793f1aba1a4fc05403d4d2724d995cf07490395c33f91
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/disk/mtools/HISTORY b/disk/mtools/HISTORY
index e80a0d5..be8d157 100644
--- a/disk/mtools/HISTORY
+++ b/disk/mtools/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.13
+
2010-01-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.0.12

diff --git a/disk/nilfs-utils/DETAILS b/disk/nilfs-utils/DETAILS
index 81480c9..2e10824 100755
--- a/disk/nilfs-utils/DETAILS
+++ b/disk/nilfs-utils/DETAILS
@@ -1,10 +1,10 @@
SPELL=nilfs-utils
- VERSION=2.0.17
+ VERSION=2.0.18
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.nilfs.org/download/$SOURCE
-
SOURCE_HASH=sha512:e4bac6e3a09fbd7eeb0afc88515c3dd4d11ae829f8ff3672606f11ed5d8bc54c506b8ace51bc82ce0d1fc33a0358fcca7c62e9fbb808d1ddeb758fbae1e900c3
+
SOURCE_HASH=sha512:eeca98724a07c2ad56af7e84c6e085d997a8baedcefdc5358c5b86dd1ad92827a7204e42871808bab844c5bccc615ebfce6ba8290f0672aadbf4cf67aad69ef4
WEB_SITE=http://www.nilfs.org/
ENTERED=20090603
LICENSE[0]=GPL
diff --git a/disk/nilfs-utils/HISTORY b/disk/nilfs-utils/HISTORY
index 896f63e..876e172 100644
--- a/disk/nilfs-utils/HISTORY
+++ b/disk/nilfs-utils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.18
+
2010-03-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.0.17

diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index cd8630c..fa36e4a 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,5 +1,6 @@
SPELL=ntfs-3g
VERSION=2010.3.6
+ PATCHLEVEL=1

SOURCE_HASH=sha512:babc7aaeb823aba400e4f0750073b8bd3aa5e2b84927c1c5975cc5daaa12290b747b3d0c350d95ebb1e8cc644354c86a0621e4e469883dc0a37583fcd935475d
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 073879c..6146cff 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,7 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to avoid a duplicate definition of timespec with
glibc-2.11.1
+
2010-03-15 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE: added, optionally enable ACL or /etc/mtab support.
* DEPENDS: added a message explaining the fuse optional dependency
diff --git a/disk/ntfs-3g/PRE_BUILD b/disk/ntfs-3g/PRE_BUILD
new file mode 100755
index 0000000..5b688ba
--- /dev/null
+++ b/disk/ntfs-3g/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# avoid duplicate defination of timespec with glibc-2.11.1
+#patch -p0 -i $SPELL_DIRECTORY/nt.diff
+sed -i '/^struct/,/}/D' include/ntfs-3g/ntfstime.h
diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index a312d33..dacc9a4 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -1,14 +1,10 @@
if [[ $PART_VCS == y ]];then
- depends bzr &&
- depends boost &&
- depends $PART_NTFS &&
- depends pkgconfig &&
- optional_depends hal '' '-DNO_HAL=1' 'CD detection'
-else
- depends ntfsprogs
+ depends bzr
fi &&
depends cmake &&
depends g++ &&
depends parted &&
+depends boost &&
+depends $PART_NTFS &&
depends e2fsprogs

diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index 7d9da14..f51b7af 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -1,17 +1,16 @@
SPELL=partimage-ng
-if [[ $PART_VCS == y ]];then
- VERSION=vcs
+#if [[ $PART_VCS == y ]];then
+ VERSION=bzr
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=lp:~gene-czarc/partimage-ng/devel-gc2
+ SOURCE_URL[0]=lp:~vonami/partimage-ng/trunk
SOURCE_IGNORE=volatile
- PATCHLEVEL=1
# FORCE_DOWNL=on
-else
- VERSION=r80
-
SOURCE_HASH=sha512:7e2642fb957f58f9c17e50918b5d8a78266e56686fb0bb5cff6c2cc789b0835738d07c7f23c891a82098641a473c2646a9a12180315db683c14de24b52396cfd
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
-fi
+#else
+# VERSION=r80
+# SOURCE_HASH=sha512:
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_URL[0]=http://launchpad.net/partimage-ng/devel/$VERSION/+download/$SOURCE
+#fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://launchpad.net/partimage-ng
LICENSE[0]=GPL
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 6a58f4b..0a4c0a4 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,11 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: switch to latest devel branch
+ no tarball yet
+ this version uses a different format for its backup files
+ * PRE_BUILD, {hal,ntfs}.diff: deleted
+ * DEPENDS: rearrange
+ * PREPARE: give warning message
+
2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* ntfs.diff: added
diff --git a/disk/partimage-ng/PREPARE b/disk/partimage-ng/PREPARE
index bdfbabd..9d177c1 100755
--- a/disk/partimage-ng/PREPARE
+++ b/disk/partimage-ng/PREPARE
@@ -1,2 +1,7 @@
-config_query PART_VCS 'use VCS version?' n
+if spell_ok $SPELL;then
+ if [[ `installed_version $SPELL` != bzr ]];then
+ message ${PROBLEM_COLOR}Beware - archive format has changed -old backups
will be unusable!${DEFAULT_COLOR}
+ fi
+fi &&
+config_query PART_VCS 'use BZR version?' y

diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD
deleted file mode 100755
index 172b63a..0000000
--- a/disk/partimage-ng/PRE_BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $PART_VCS == y ]];then
- if spell_ok ntfs-3g;then
-# make hal optional
- patch -p1 -i $SPELL_DIRECTORY/hal.diff &&
-# fix nr of parameters used for ntfs-3g-2009.11.14
- patch -p1 -i $SPELL_DIRECTORY/ntfs.diff &&
- sed -i '/set(NTFS3G_PREFERRED/s/0/1/' src/CMakeLists.txt
- fi
-else
-# fix compile with recent e2fsprogs
- patch -p1 -i $SPELL_DIRECTORY/e2fs.diff &&
-# fix glibc problem
-sed -i -e '/<fcntl.h>/ a\
-#include <langinfo.h>
-' src/imager.cpp
-fi &&
-#fix gcc4.4 problem
-sed -i -e '/<cstdlib>/ a\
-#include <stdint.h>
-' src/fat32partition.cpp
diff --git a/disk/partimage-ng/e2fs.diff b/disk/partimage-ng/e2fs.diff
deleted file mode 100644
index 38e2809..0000000
--- a/disk/partimage-ng/e2fs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr partimage-ng.orig/src/CMakeLists.txt
partimage-ng/src/CMakeLists.txt
- # check C library; need macro def HAVE_STDARG_H for libntfs
-diff -uNr partimage-ng.orig/src/ext2partition.h
partimage-ng/src/ext2partition.h
---- partimage-ng.orig/src/ext2partition.h 2008-09-26 08:55:12.000000000
+0200
-+++ partimage-ng/src/ext2partition.h 2008-10-26 09:50:55.000000000 +0100
-@@ -19,6 +19,17 @@
- #define PARTIMAGENG_EXT2PARTITION
-
- #include <ext2fs/ext2fs.h>
-+struct ext2fs_struct_generic_bitmap {
-+ errcode_t magic;
-+ ext2_filsys fs;
-+ __u32 start, end;
-+ __u32 real_end;
-+ char * description;
-+ char * bitmap;
-+ errcode_t base_error_code;
-+ __u32 reserved[7];
-+};
-+
- #include <sys/types.h>
-
- #include "partition.h"
diff --git a/disk/partimage-ng/hal.diff b/disk/partimage-ng/hal.diff
deleted file mode 100644
index 504e856..0000000
--- a/disk/partimage-ng/hal.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -uNr partimage-ng/doc/CMakeLists.txt partimage-ng.cp/doc/CMakeLists.txt
---- partimage-ng/doc/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
-+++ partimage-ng.cp/doc/CMakeLists.txt 2009-11-16 16:58:11.000000000 +0100
-@@ -1,3 +1,6 @@
- # install man pages
- INSTALL(FILES partimage-ng.8 DESTINATION share/man/man8/)
-+if (NOT NO_HAL)
- INSTALL(FILES ping-cdcat.8 DESTINATION share/man/man8/)
-+endif (NOT NO_HAL)
-+
-diff -uNr partimage-ng/src/CMakeLists.txt partimage-ng.cp/src/CMakeLists.txt
---- partimage-ng/src/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
-+++ partimage-ng.cp/src/CMakeLists.txt 2009-11-16 16:57:32.000000000 +0100
-@@ -51,7 +51,6 @@
- FIND_PACKAGE(Ntfs)
- FIND_PACKAGE(Ntfs3g)
- FIND_PACKAGE(Parted REQUIRED)
--FIND_PACKAGE(Hal REQUIRED)
-
- # OK, figure out which ntfs library to use
- IF(NTFS3G_PREFERRED)
-@@ -101,20 +100,26 @@
- ENDIF (NTFS3G_PREFERRED AND NTFS3G_FOUND)
-
- # Directories
--INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} ${NTFS3G_INCLUDE_DIR})
--LINK_DIRECTORIES(${HAL_LIBRARY_DIR} ${NTFS3G_LIBRARY_DIR})
-+INCLUDE_DIRECTORIES(${NTFS3G_INCLUDE_DIR})
-+LINK_DIRECTORIES(${NTFS3G_LIBRARY_DIR})
-
- # add the main target
- ADD_EXECUTABLE(partimage-ng ${partimage_ng_src})
--ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
-
-
- # link target libraries
- TARGET_LINK_LIBRARIES(partimage-ng parted ext2fs ${NTFS_LIBRARIES})
--TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
-
-
- # install application and scripts
- INSTALL(TARGETS partimage-ng DESTINATION "sbin")
-+
-+if (NOT NO_HAL)
-+FIND_PACKAGE(Hal REQUIRED)
-+INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} )
-+LINK_DIRECTORIES(${HAL_LIBRARY_DIR} )
-+TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
-+ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
- INSTALL(TARGETS ping-cdcat DESTINATION "sbin")
-+endif (NOT NO_HAL)
-
diff --git a/disk/partimage-ng/ntfs.diff b/disk/partimage-ng/ntfs.diff
deleted file mode 100644
index 87d3a92..0000000
--- a/disk/partimage-ng/ntfs.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -uNr partimage-ng/src/ntfspartition_c.c
partimage-ng.cp/src/ntfspartition_c.c
---- partimage-ng/src/ntfspartition_c.c 2009-01-23 14:44:55.000000000 +0100
-+++ partimage-ng.cp/src/ntfspartition_c.c 2009-11-21 17:58:03.000000000
+0100
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <limits.h>
- #include <errno.h>
- #include <string.h>
- #ifdef PING_USE_NTFS3G
-@@ -320,13 +321,13 @@
- rl[1].lcn = -1;
- rl[1].length = 0;
-
-- old_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl_bad, 0);
-+ old_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl_bad, 0, INT_MAX);
- if ( old_mp_size <= 0 ) {
- fprintf(debugs(), "Cannot calculate the size of the old
mapping pairs\n");
- return 1;
- }
-
-- new_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl, 0);
-+ new_mp_size = ntfs_get_size_for_mapping_pairs((ntfs_volume
*)ntfs_vol, rl, 0, INT_MAX);
- if ( new_mp_size <= 0 ) {
- fprintf(debugs(), "Cannot calculate the size of the new
mapping pairs\n");
- return 1;
diff --git a/disk/quota/DETAILS b/disk/quota/DETAILS
index 9bea2f9..4affdeb 100755
--- a/disk/quota/DETAILS
+++ b/disk/quota/DETAILS
@@ -1,5 +1,5 @@
SPELL=quota
- VERSION=3.16
+ VERSION=4.00-pre1
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-tools
SOURCE_URL[0]=$SOURCEFORGE_URL/linuxquota/$SOURCE
diff --git a/disk/quota/HISTORY b/disk/quota/HISTORY
index ee95aa6..e80005f 100644
--- a/disk/quota/HISTORY
+++ b/disk/quota/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated to 4.00-pre1
+
2008-03-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.16
Removed UPDATED
diff --git a/disk/quota/quota-3.16.tar.gz.sig
b/disk/quota/quota-3.16.tar.gz.sig
deleted file mode 100644
index 9f52475..0000000
Binary files a/disk/quota/quota-3.16.tar.gz.sig and /dev/null differ
diff --git a/disk/quota/quota-4.00-pre1.tar.gz.sig
b/disk/quota/quota-4.00-pre1.tar.gz.sig
new file mode 100644
index 0000000..b54540f
Binary files /dev/null and b/disk/quota/quota-4.00-pre1.tar.gz.sig differ
diff --git a/disk/udisks/DETAILS b/disk/udisks/DETAILS
index eb3270a..8306b2b 100755
--- a/disk/udisks/DETAILS
+++ b/disk/udisks/DETAILS
@@ -1,9 +1,10 @@
SPELL=udisks
- VERSION=1.0.0
+ VERSION=1.0.1
+ SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://hal.freedesktop.org/releases/${SOURCE}
-
SOURCE_HASH=sha512:b3e34fd8531cffad597044550ca0a1926df3245e4191ec2b03ada359c343683086911e6465cbfe2700153963a1826cf80a8353dccae02eafb4fb4a82c66fae93
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.0"
+
SOURCE_HASH=sha512:7b1cb36ee1e3137275dd4d433708a033f8df89906802e3910487c7357ef6dc5398d659442e359f22727c67dfe510be87df3054c8d10075dc8105e5d105b15287
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks";
LICENSE[0]=GPL
ENTERED=20100303
diff --git a/disk/udisks/HISTORY b/disk/udisks/HISTORY
index ef134c1..b31becd 100644
--- a/disk/udisks/HISTORY
+++ b/disk/udisks/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.1, SECURITY_PATCH=1, CVE-2010-1149
+
2010-04-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/ftp-libs/MAINTAINER b/ftp-libs/MAINTAINER
index 73f6cfa..c0d6b49 100644
--- a/ftp-libs/MAINTAINER
+++ b/ftp-libs/MAINTAINER
@@ -1 +1 @@
-OPEN: Contact Arwed v. Merkatz <grimoire AT sourcemage.org> if interested.
+Mark Bainter (Shamgar) <mbainter AT sourcemage.org>
diff --git a/ftp-libs/curlpp/DEPENDS b/ftp-libs/curlpp/DEPENDS
index 3cd125d..6fb9144 100755
--- a/ftp-libs/curlpp/DEPENDS
+++ b/ftp-libs/curlpp/DEPENDS
@@ -1,2 +1,3 @@
depends libtool &&
+depends boost &&
depends curl
diff --git a/ftp-libs/curlpp/DETAILS b/ftp-libs/curlpp/DETAILS
index ad961f2..1a24216 100755
--- a/ftp-libs/curlpp/DETAILS
+++ b/ftp-libs/curlpp/DETAILS
@@ -1,11 +1,11 @@
SPELL=curlpp
- VERSION=0.7.0
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://rrette.com/files/curlpp/curlpp-0.7/$SOURCE
-
SOURCE_HASH=sha512:4cce7f783ce66b4f0748bbcd7ad9c7b2b91d6e90df65fda751e61d111b55c5444036d3fde1b12d31404d103759999b8dc584af38aba2ec3a0b2a18e15f47ffcc
+ VERSION=0.7.3
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+
SOURCE_URL[0]=http://curlpp.googlecode.com/files/${SPELL}-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:8c0209b74a191049262c29e2f3cd7dc4de44621d060453b553627884d042a11cba5cc76398c3e831f084cb3a69fd8ccab1ac3e12820d42e3d1188bba2d5070e9
LICENSE[0]=MIT
- WEB_SITE=http://curl.haxx.se/libcurl/cplusplus
+ WEB_SITE=http://curlpp.org/
ENTERED=20030630
KEYWORDS="ftp libs"
SHORT="Access and use libcurl using this C++ binding."
diff --git a/ftp-libs/curlpp/HISTORY b/ftp-libs/curlpp/HISTORY
index e6ba552..6a9b86c 100644
--- a/ftp-libs/curlpp/HISTORY
+++ b/ftp-libs/curlpp/HISTORY
@@ -1,3 +1,7 @@
+2010-04-09 Mark Bainter <mbainter AT sourcemage.org>
+ * DEPENDS: Added boost as a dependency
+ * DETAILS: updated spell to 0.7.3, new SOURCE_URL
+
2007-01-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.0, new SOURCE_URL

diff --git a/ftp-libs/dclib/DETAILS b/ftp-libs/dclib/DETAILS
index f576fab..1cc0700 100755
--- a/ftp-libs/dclib/DETAILS
+++ b/ftp-libs/dclib/DETAILS
@@ -1,14 +1,13 @@
SPELL=dclib
- VERSION=0.3.7
+ VERSION=0.3.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.berlios.de/dcgui/$SOURCE
- WEB_SITE=http://dc.ketelhot.de/
+
SOURCE_URL[0]=$SOURCEFORGE_URL/project/wxdcgui/dclib/$VERSION/$SPELL-$VERSION.tar.bz2
+ WEB_SITE=http://wxdcgui.sourceforge.net/
ENTERED=20020522
- UPDATED=20030217
LICENSE[0]=GPL
BUILD_API=2
-
SOURCE_HASH=sha512:87e33210f82dbd693255846feb35db430fd843dcee76685e89eac9c487a76b4262600dc38c64438c7faf9168388a70692b1eb591d554bc41f306dd0734c7ae15
+
SOURCE_HASH=sha512:2d211afbff4f54177f519301c93c4ee9834c7f6ce0821b2ac0718dab66c66fdc000f46f1ddc4bf057cf31a606cb3240d654704a2bb6f5e2fa74fb0b060273d80
KEYWORDS="ftp libs"
SHORT='direct connect 4 linux - library'
cat << EOF
diff --git a/ftp-libs/dclib/HISTORY b/ftp-libs/dclib/HISTORY
index cd6c800..dc0b1b6 100644
--- a/ftp-libs/dclib/HISTORY
+++ b/ftp-libs/dclib/HISTORY
@@ -1,3 +1,8 @@
+2010-04-09 Mark Bainter <mbainter AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.13
+ fixed WEB_SITE
+ fixed source URL
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/ftp-libs/rb-libtorrent/DETAILS b/ftp-libs/rb-libtorrent/DETAILS
index 2952028..6627840 100755
--- a/ftp-libs/rb-libtorrent/DETAILS
+++ b/ftp-libs/rb-libtorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=rb-libtorrent
- VERSION=0.14.9
+ VERSION=0.15.0
SOURCE=libtorrent-rasterbar-$VERSION.tar.gz
SOURCE_URL[0]=http://libtorrent.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:d8f9405a1858dcfd809a04c4ceec2f5bf0a187a9b75d12f668e5004ef31889ca445c3d2049e94756ba82a364fa5059dc01413e3c829b9312f10646dd14ebc000
+
SOURCE_HASH=sha512:1658c9eda3124a7010e6c8a9866adc0d8225e2db7e7faf949e3107f3baed29f563a61852585d6079b5895d136a375fda252d76c8c629561a408a64b5c12b2993
SOURCE_DIRECTORY="$BUILD_DIRECTORY/libtorrent-rasterbar-$VERSION"
WEB_SITE=http://www.rasterbar.com/products/libtorrent/
LICENSE=BSD
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index 33aeb19..4f47b72 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.0
+
2010-02-24 Skipinder <skipinder AT gmail.com>
* DETAILS: updated spell to 0.14.9; bug #15599

diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index bfbf503..7d3e974 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,8 +1,8 @@
SPELL=epiphany
if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
- VERSION=2.30.0
+ VERSION=2.30.2
else
- VERSION=2.30.0
+ VERSION=2.30.2
fi
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 479f801..8f00988 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.30.2
+
2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: no needs for devel webkitgtk, stable = devel now

diff --git a/gnome2-apps/epiphany/epiphany-2.30.0.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.30.0.tar.bz2.sig
deleted file mode 100644
index 8ff5f81..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.30.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig
new file mode 100644
index 0000000..5b66c2b
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.30.2.tar.bz2.sig
differ
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index a2fea6c..43e1a10 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -12,11 +12,7 @@ depends gtkhtml2 &&
depends gconf2 &&
depends atk &&
depends orbit2 &&
-depends libbonobo &&
-depends libbonoboui &&
-depends libglade2 &&
depends libgnomecanvas &&
-depends libgnomeui &&
depends evolution-data-server &&
depends gnome-icon-theme &&
depends libnotify &&
@@ -25,12 +21,10 @@ depends gstreamer &&
depends psmisc &&
depends libproxy &&
depends unique &&
-depends libcanberra &&
+depends -sub "GTK" libcanberra &&

optional_depends gnome-spell '' '' 'Enable spelling checker?' &&

-optional_depends libgnomeprintui '' '' 'Enable printing?' &&
-
optional_depends gnupg \
"" \
"" \
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 97c7f54..db6a93e 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,5 +1,10 @@
+2010-04-09 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: removed libbonobo, libbonoboui, libgnomeui,
+ libglade2, libgnomeprintui
+
2010-04-08 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on unique and libcanberra
+ Depends on libcanberra built with GTK (Bug #15654)

2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: disable pst-import plugin for now
diff --git a/gnome2-apps/gtg/DEPENDS b/gnome2-apps/gtg/DEPENDS
index 112d237..42de3d2 100755
--- a/gnome2-apps/gtg/DEPENDS
+++ b/gnome2-apps/gtg/DEPENDS
@@ -1,2 +1,4 @@
depends pyxdg &&
-depends configobj
+depends python &&
+depends configobj &&
+runtime_depends xset
diff --git a/gnome2-apps/gtg/DETAILS b/gnome2-apps/gtg/DETAILS
index 70b0b37..b3dcef9 100755
--- a/gnome2-apps/gtg/DETAILS
+++ b/gnome2-apps/gtg/DETAILS
@@ -1,8 +1,8 @@
SPELL=gtg
- VERSION=0.2
+ VERSION=0.2.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
-
SOURCE_HASH=sha512:36866c46c89771ad8c9623c4debf1bbe962dfe3f852a63034f879369fade401d8629336f1a40435502d8c162d0542e733d0bf2cb72ea44bbee8a1dea1a809ae9
+
SOURCE_URL[0]=http://launchpad.net/${SPELL}/${VERSION:0:3}/${VERSION}/+download/${SOURCE}
+
SOURCE_HASH=sha512:7d41e660810bcc4679cd06b704cc5d17dc61b12987c97ea2ff475cb14c5987dd661df6ef5e3f3ad4c6b3e4b11ab2d92d4a490cb0b9e281d24fe0ad2b5c82b942
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gtg.fritalk.com";
LICENSE[0]=GPL
diff --git a/gnome2-apps/gtg/HISTORY b/gnome2-apps/gtg/HISTORY
index 9c4bff0..36809a0 100644
--- a/gnome2-apps/gtg/HISTORY
+++ b/gnome2-apps/gtg/HISTORY
@@ -1,3 +1,9 @@
+2010-04-09 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.3
+ Fixed SOURCE_URL[0]
+ * DEPENDS: added depends on python
+ added runtime_depends on xset
+
2010-01-06 Finn Haedicke <finn AT sourcemage.org>
* DETAILS: updated to 0.2

diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 1ab3d2d..437fea0 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,7 @@
+2010-04-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * REPAIR^none^PRE_SUB_DEPENDS: added
+ * SUB_DEPENDS: added persistent_add FULLDOCS
+
2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: added DOC

diff --git a/gnome2-libs/glibmm/REPAIR^none^PRE_SUB_DEPENDS
b/gnome2-libs/glibmm/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100644
index 0000000..06cc9d6
--- /dev/null
+++ b/gnome2-libs/glibmm/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ DOC) if [[ $FULLDOCS == "y" ]]; then return 0; fi ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DE$
+ return 1;;
+esac
diff --git a/gnome2-libs/glibmm/SUB_DEPENDS b/gnome2-libs/glibmm/SUB_DEPENDS
index 8367c52..5c3689d 100755
--- a/gnome2-libs/glibmm/SUB_DEPENDS
+++ b/gnome2-libs/glibmm/SUB_DEPENDS
@@ -1,3 +1,4 @@
+persistent_add FULLDOCS
case $THIS_SUB_DEPENDS in
DOC) message "Documentation requested, forcing build" &&
FULLDOCS="y";;
diff --git a/gnome2-libs/gnome-mag/DEPENDS b/gnome2-libs/gnome-mag/DEPENDS
index fdaf4af..b6e2da2 100755
--- a/gnome2-libs/gnome-mag/DEPENDS
+++ b/gnome2-libs/gnome-mag/DEPENDS
@@ -11,9 +11,13 @@ depends orbit2 &&
depends gconf2 &&
depends at-spi &&
depends expat &&
+depends libbonobo &&
+depends dbus-glib &&

if [[ $GMAG_COLORBLIND == --enable-colorblind-applet=yes ]]; then
- depends gnome-python-desktop &&
- depends gnome-desktop &&
- depends colorblind
+ depends pygtk2 &&
+ depends pygobject &&
+ depends gnome-python2 &&
+ depends -sub PANEL gnome-python-desktop &&
+ depends colorblind
fi
diff --git a/gnome2-libs/gnome-mag/HISTORY b/gnome2-libs/gnome-mag/HISTORY
index 7e725d3..0f83c7a 100644
--- a/gnome2-libs/gnome-mag/HISTORY
+++ b/gnome2-libs/gnome-mag/HISTORY
@@ -1,3 +1,8 @@
+2010-04-10 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added libbonobo, dbus-glib, pygtk2, pygobject,
+ gnome-python2, removed gnome-desktop,
+ subdepends on gnome-python-desktop with gnomepanel module
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.16.1

diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index aadbdfe..bc10147 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -17,6 +17,7 @@ depends libgweather &&
depends libxml2 &&
depends gnome-vfs2 &&
depends gnome-doc-utils &&
+depends -sub GTK libcanberra &&

optional_depends evolution-data-server \
'--enable-eds' \
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index 38f7de3..7c73bf9 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on libcanberra with GTK, bug #15665
+
2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: removed libglade2, libgnome,
added gnome-doc-utils, added optional xrandr
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index ac3cb5b..8e99c51 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: now handles PANEL subdependency
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
index 24ee9ab..a496319 100755
--- a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
+ PANEL) if is_depends_enabled $SPELL gnome-panel; then return 0; fi;;
esac
return 1
diff --git a/gnome2-libs/gnome-python-desktop/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..a496319
--- /dev/null
+++ b/gnome2-libs/gnome-python-desktop/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
+ PANEL) if is_depends_enabled $SPELL gnome-panel; then return 0; fi;;
+esac
+return 1
diff --git a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
index 12ad4f0..751f16c 100755
--- a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) echo "gtkhtml2 bindings requested, forcing them."; depends
gtkhtml2;;
LIBRSVG2) echo "librsvg2 support requested, forcing it."; depends librsvg2
'--enable-rsvg';;
+ PANEL) message "gnomepanel module requested, forcing build.";
+ depends gnome-panel "--enable-applet";;
*) echo "unknown sub-depends!"; return 1;;
esac
diff --git a/gnome2-libs/gobject-introspection/DETAILS
b/gnome2-libs/gobject-introspection/DETAILS
index 43951f6..f6a981c 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,5 +1,5 @@
SPELL=gobject-introspection
- VERSION=0.6.7
+ VERSION=0.6.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/gobject-introspection/HISTORY
b/gnome2-libs/gobject-introspection/HISTORY
index 87b2cf5..3ddadc3 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.9
+
2009-12-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.7

diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.7.tar.bz2.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.7.tar.bz2.sig
deleted file mode 100644
index 74390e1..0000000
Binary files
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.7.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
new file mode 100644
index 0000000..2518352
Binary files /dev/null and
b/gnome2-libs/gobject-introspection/gobject-introspection-0.6.9.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgsf/DETAILS b/gnome2-libs/libgsf/DETAILS
index 560ec5f..63a9e62 100755
--- a/gnome2-libs/libgsf/DETAILS
+++ b/gnome2-libs/libgsf/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgsf
- VERSION=1.14.17
+ VERSION=1.14.18
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index 520e80d..74d7d8d 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.14.18
+
2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: removed optional pyorbit

diff --git a/gnome2-libs/libgsf/libgsf-1.14.17.tar.bz2.sig
b/gnome2-libs/libgsf/libgsf-1.14.17.tar.bz2.sig
deleted file mode 100644
index a11a3a2..0000000
Binary files a/gnome2-libs/libgsf/libgsf-1.14.17.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
b/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
new file mode 100644
index 0000000..3cbc843
Binary files /dev/null and b/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
differ
diff --git a/gnome2-libs/liboobs/DEPENDS b/gnome2-libs/liboobs/DEPENDS
index 469fad3..57c974d 100755
--- a/gnome2-libs/liboobs/DEPENDS
+++ b/gnome2-libs/liboobs/DEPENDS
@@ -1,8 +1,13 @@
+depends glib2 &&
depends system-tools-backends &&
depends dbus-glib &&

optional_depends gtk-doc \
- "--enable-doc" \
- "--disable-doc" \
- "Build documentation with gtk-doc"
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Build documentation with gtk-doc" &&

+optional_depends hal \
+ "--with-hal" \
+ "--without-hal" \
+ "for HAL support"
diff --git a/gnome2-libs/liboobs/HISTORY b/gnome2-libs/liboobs/HISTORY
index c3a19b2..ecb1c96 100644
--- a/gnome2-libs/liboobs/HISTORY
+++ b/gnome2-libs/liboobs/HISTORY
@@ -1,3 +1,6 @@
+2010-04-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added glib2, added optional hal, fixed gtk-doc option
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/metacity/DETAILS b/gnome2-libs/metacity/DETAILS
index 6c59126..3db5b33 100755
--- a/gnome2-libs/metacity/DETAILS
+++ b/gnome2-libs/metacity/DETAILS
@@ -1,5 +1,5 @@
SPELL=metacity
- VERSION=2.30.0
+ VERSION=2.30.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 182f1d0..322cf00 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.1
+
2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: removed libglade2, orbit2

diff --git a/gnome2-libs/metacity/metacity-2.30.0.tar.gz.sig
b/gnome2-libs/metacity/metacity-2.30.0.tar.gz.sig
deleted file mode 100644
index deaabdb..0000000
Binary files a/gnome2-libs/metacity/metacity-2.30.0.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig
b/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig
new file mode 100644
index 0000000..ac40f1a
Binary files /dev/null and b/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig
differ
diff --git a/graphics-libs/geglmm/DEPENDS b/graphics-libs/geglmm/DEPENDS
new file mode 100755
index 0000000..9d05294
--- /dev/null
+++ b/graphics-libs/geglmm/DEPENDS
@@ -0,0 +1,3 @@
+depends g++ &&
+depends glibmm &&
+depends gegl
diff --git a/graphics-libs/geglmm/DETAILS b/graphics-libs/geglmm/DETAILS
new file mode 100755
index 0000000..3e24758
--- /dev/null
+++ b/graphics-libs/geglmm/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=geglmm
+ VERSION=0.1.0
+ BRANCH=${VERSION%.*}
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ WEB_SITE=http://gegl.org/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=GPL
+ ENTERED=20100412
+ SHORT="C++ bindings for GEGL"
+cat << EOF
+This if libgeglmm, the C++ bindings for GEGL.
+EOF
diff --git a/graphics-libs/geglmm/HISTORY b/graphics-libs/geglmm/HISTORY
new file mode 100644
index 0000000..682c643
--- /dev/null
+++ b/graphics-libs/geglmm/HISTORY
@@ -0,0 +1,3 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS, HISTORY: created this spell
+
diff --git a/graphics-libs/geglmm/geglmm-0.1.0.tar.bz2.sig
b/graphics-libs/geglmm/geglmm-0.1.0.tar.bz2.sig
new file mode 100644
index 0000000..7c38fe2
Binary files /dev/null and b/graphics-libs/geglmm/geglmm-0.1.0.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 6c75262..2eddbf2 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -4,7 +4,6 @@ depends util-macros &&
depends gccmakedep &&
depends lndir &&
depends xorg-cf-files &&
-depends imake &&
depends makedepend &&
depends expat &&
depends libxdamage &&
@@ -16,11 +15,15 @@ depends libxau &&
depends libxfixes &&
depends glproto &&

-optional_depends -sub "XCB" libxcb \
+optional_depends libxcb \
'--enable-xcb' \
'--disable-xcb' \
'Enable XCB support?'

+if is_depends_enabled $SPELL libxcb;then
+ sub_depends libx11 XCB
+fi &&
+
if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243
]]; then
force_depends libdrm
fi &&
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index add8be9..7ee01c3 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,7 +1,10 @@
+2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove imake, not needed
+ * REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS: deleted
+
2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
* {PRE_,}SUB_DEPENDS: Allow requiring non-stable (e.g. for new
xf86-video-ati which needs the new KMS code)
- * DEPENDS: Move sub_depends into a -sub

2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated MESALIB_VER=developement to 7.8.1
diff --git
a/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
b/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
deleted file mode 100755
index 6081a8e..0000000
--- a/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
+++ /dev/null
@@ -1,31 +0,0 @@
-depends dri2proto &&
-depends libdrm &&
-depends util-macros &&
-depends gccmakedep &&
-depends lndir &&
-depends xorg-cf-files &&
-depends imake &&
-depends makedepend &&
-depends expat &&
-depends libxdamage &&
-depends libx11 &&
-depends libxext &&
-depends libxxf86vm &&
-depends libxt &&
-depends libxau &&
-depends libxfixes &&
-depends glproto &&
-
-optional_depends libxcb \
- '--enable-xcb' \
- '--disable-xcb' \
- 'Enable XCB support?'
-
-if spell_ok libdrm && [[ "$(installed_version libdrm|sed 's:.::g')" -lt
"243" ]]; then
- force_depends libdrm
-fi &&
-
-
-if [[ $MESALIB_GIT == y ]]; then
- depends git
-fi
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index a27831f..169f0dd 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -15,8 +15,8 @@ optional_depends jpeg '' '' 'JPEG support' &&
optional_depends jasper '' '' 'JPEG-2000 support' &&
optional_depends tiff '' '' 'TIFF support' &&
optional_depends python '' '' '' &&
-optional_depends swig '' '' '' &&
-optional_depends xine-lib '' '' '' &&
+optional_depends tbb '-DWITH_TBB=1' '' 'parallel processing
support' &&
+optional_depends xine-lib '-DWITH_XINE=1' '' 'Xine support' &&
+optional_depends libucil '-DWITH_UNICAP=1' '' '' &&
optional_depends libraw1394 '' '' '' &&
-optional_depends unicap '' '' '' &&
optional_depends gtk+2 '' '' ''
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 6af91e8..a4945ba 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,12 +1,12 @@
SPELL=opencv
SPELLX=OpenCV
- VERSION=2.0.0
-
SOURCE_HASH=sha512:88602f29b145fbc85f0d0f2068f810723449197dbcf13fb6622087ee0d2f7cec429f35235f7e19095010805771cf7cd9f1381cea4e6656ebbf2659adaa60c3c2
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:0440a3df73be382b0ee94a1da03c661eec664e5bd9b3dcdf80fe2fbebae369641bb1fee9ec3471e075ca16b94f232e492f9b1f5444b0176f2f073ced5818cc26
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/opencvlibrary/$SOURCE
WEB_SITE=http://opencv.willowgarage.com/wiki/
- LICENSE[0]=GPL
+ LICENSE[0]=BSD
ENTERED=20081112
KEYWORDS="graphics"
SHORT="real time computer vision"
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 5777e7c..4718918 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,10 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0
+ LICENSE = BSD
+ * DEPENDS: remove swig, unicap; add tbb
+ add libucil
+ specifically enable xine and tbb
+
2009-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.0
* PRE_BUILD: deleted
diff --git a/graphics/gocr/BUILD b/graphics/gocr/BUILD
deleted file mode 100755
index e0db157..0000000
--- a/graphics/gocr/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
- sed -i "s|@mandir@|/share/man|" man/Makefile.in &&
- default_build
diff --git a/graphics/gocr/DETAILS b/graphics/gocr/DETAILS
index 078d78b..3bb865e 100755
--- a/graphics/gocr/DETAILS
+++ b/graphics/gocr/DETAILS
@@ -1,6 +1,6 @@
SPELL=gocr
- VERSION=0.46
-
SOURCE_HASH=sha512:4772d3be509fe1010715ead5d7f39f4ac9436930e888859f3266f267b72ee086bc62ddb5ecc03c96771421a32c598481d8fc0efae0087f847646ad53af003b23
+ VERSION=0.48
+
SOURCE_HASH=sha512:53520c94b6991818482d0f6a5e3e7102f8530fd1215607b04e528244b697479d98669cfe4fd9098e5e1a2e5dd88c45f1edb1171c14adb798e811efd23bdada73
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/jocr/$SOURCE
diff --git a/graphics/gocr/HISTORY b/graphics/gocr/HISTORY
index 487ec96..813ccfb 100644
--- a/graphics/gocr/HISTORY
+++ b/graphics/gocr/HISTORY
@@ -1,3 +1,7 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.48
+ * BUILD: deleted
+
2008-10-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.46

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 5e73348..79869a9 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.6.0-10
+ VERSION=6.6.1-1
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 83bb624..303e956 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.6.1-1
+
2010-04-03 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.6.0-10

diff --git a/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig
deleted file mode 100644
index 6e23bb5..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig
new file mode 100644
index 0000000..5752d5f
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig differ
diff --git a/graphics/unpaper/DETAILS b/graphics/unpaper/DETAILS
index af2e1dd..72c89a9 100755
--- a/graphics/unpaper/DETAILS
+++ b/graphics/unpaper/DETAILS
@@ -1,8 +1,8 @@
SPELL=unpaper
- VERSION=0_2
- SOURCE="${SPELL}-${VERSION}.tgz"
+ VERSION=0.3
+
SOURCE_HASH=sha512:4ab5ff7ec7878f3320e714462e2b9f5b7c6605f19ce2d0369aef534fe5f04fed9bc364e77ced5e571759d0f62ad7b924dbc421632f251248a14f97764152eab9
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:9955db91a486f0c5a6178a17ce03619c1428f64d755056ee57c5842fc800b04dcc5085a858933fcee65b0222b74a5f5e67b080926a2594429cf746dceec25219
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://unpaper.berlios.de/";
LICENSE[0]=GPL
diff --git a/graphics/unpaper/HISTORY b/graphics/unpaper/HISTORY
index 4bf9723..bc29406 100644
--- a/graphics/unpaper/HISTORY
+++ b/graphics/unpaper/HISTORY
@@ -1,2 +1,6 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3
+ * PRE_BUILD: deleted
+
2007-08-25 George Sherwood <george AT beernabeer.com>
* DETAILS, HISTORY, BUILD, INSTALL, PRE_BUILD: created spell
diff --git a/graphics/unpaper/PRE_BUILD b/graphics/unpaper/PRE_BUILD
deleted file mode 100755
index 9eb27d1..0000000
--- a/graphics/unpaper/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file
\ No newline at end of file
diff --git a/gurus.gpg b/gurus.gpg
index fb091de..0360df4 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/http/apache/BUILD b/http/apache/BUILD
index 210aa41..27ba77d 100755
--- a/http/apache/BUILD
+++ b/http/apache/BUILD
@@ -1,13 +1 @@
-./configure --prefix=/usr \
- --sysconfdir=/etc/httpd \
- --localstatedir=/var \
- --logfiledir=/var/log/httpd \
- --proxycachedir=/var/cache/httpd \
- --runtimedir=/var/run/httpd \
- --enable-module=most \
- --enable-shared=max \
- --enable-module=mmap_static \
- --disable-module=auth_dbm \
- --with-layout=GNU \
- $OPTS &&
-make
+true
diff --git a/http/apache/CONFLICTS b/http/apache/CONFLICTS
deleted file mode 100755
index 9507f3f..0000000
--- a/http/apache/CONFLICTS
+++ /dev/null
@@ -1,8 +0,0 @@
-conflicts apache-mod_ssl &&
-conflicts apache2 &&
-conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
- conflicts xshttpd
-fi
diff --git a/http/apache/DEPENDS b/http/apache/DEPENDS
index 6e63efc..41c0af3 100755
--- a/http/apache/DEPENDS
+++ b/http/apache/DEPENDS
@@ -1,6 +1 @@
-optional_depends db '--enable-module=auth_db' '--disable-module=auth_db'
'for Berekely DB support' &&
-
-optional_depends 'gdbm' \
- '--enable-module=rewrite' \
- '--disable-module=rewrite' \
- 'for extensible hasing database routines'
+depends APACHE
diff --git a/http/apache/DETAILS b/http/apache/DETAILS
index 76206df..e8221ef 100755
--- a/http/apache/DETAILS
+++ b/http/apache/DETAILS
@@ -1,22 +1,7 @@
- SPELL=apache
- VERSION=1.3.41
- SECURITY_PATCH=3
- SOURCE=${SPELL}_$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
- SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
- SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
- SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
- SOURCE2_IGNORE=signature
- LICENSE[0]=APACHE
- WEB_SITE=http://httpd.apache.org/
- KEYWORDS="http"
- ENTERED=20010922
- SHORT="Apache HTTP Server"
-cat << EOF
-Apache is the world's most popular HTTP server, being quite possibly
-the best around in terms of functionality, efficiency, security and
-speed.
-EOF
+ SPELL=apache
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by apache1]
+ EOF
diff --git a/http/apache/DOWNLOAD b/http/apache/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/http/apache/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index 9e713ef..8725814 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,12 @@
+2010-04-09 Mark Bainter <mbainter AT sourcemage.org>
+ * DEPENDS: Upated to depend on APACHE provider
+
+2010-03-23 Mark Bainter <mbainter AT sourcemage.org>
+ * spell deprecated [renamed to apache1]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+ * Deprecated in preparation for turning apache into profile spell (Bug
#13532)
+
2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
* PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility

diff --git a/http/apache/INSTALL b/http/apache/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/http/apache/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/apache/PRE_BUILD b/http/apache/PRE_BUILD
index 42fa815..27ba77d 100755
--- a/http/apache/PRE_BUILD
+++ b/http/apache/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/apache_1.3.41_glic.patch
+true
diff --git a/http/apache/PROVIDES b/http/apache/PROVIDES
deleted file mode 100755
index 6dd2c89..0000000
--- a/http/apache/PROVIDES
+++ /dev/null
@@ -1,3 +0,0 @@
-WEBSERVER
-APACHE
-APACHE1
diff --git a/http/apache/TRIGGERS b/http/apache/TRIGGERS
new file mode 100755
index 0000000..a2943e5
--- /dev/null
+++ b/http/apache/TRIGGERS
@@ -0,0 +1 @@
+on_cast apache dispel_self
diff --git a/http/apache/apache_1.3.41_glic.patch
b/http/apache/apache_1.3.41_glic.patch
deleted file mode 100644
index 70b8829..0000000
--- a/http/apache/apache_1.3.41_glic.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur apache_1.3.41.orig/src/CHANGES apache_1.3.41/src/CHANGES
---- apache_1.3.41.orig/src/CHANGES 2009-09-04 03:25:47.985940104 +0200
-+++ apache_1.3.41/src/CHANGES 2009-09-04 03:38:00.517933711 +0200
-@@ -3838,7 +3838,7 @@
- response when we already know the final status, which is mighty
- useful for PUT responses that result in 302 or 401. [Roy Fielding]
-
-- *) Remove extra trailing whitespace from the getline results as part
-+ *) Remove extra trailing whitespace from the apache_getline results as
part
- of the protocol processing, which is extra nice because it works
- between continuation lines, is almost no cost in the normal case
- of no extra whitespace, and saves memory. [Roy Fielding]
-diff -Naur apache_1.3.41.orig/src/makefile.win apache_1.3.41/src/makefile.win
---- apache_1.3.41.orig/src/makefile.win 2009-09-04 03:25:47.977940271
+0200
-+++ apache_1.3.41/src/makefile.win 2009-09-04 03:38:00.629935291 +0200
-@@ -238,7 +238,7 @@
- dstfl = ARGV[2];
- serverroot = ARGV[3];
- gsub( /\\/, "/", serverroot );
-- while ( ( getline < srcfl ) > 0 ) {
-+ while ( ( apache_getline < srcfl ) > 0 ) {
- gsub( /@@ServerRoot@@/, serverroot );
- print $$0 > dstfl;
- }
-diff -Naur apache_1.3.41.orig/src/support/htdigest.c
apache_1.3.41/src/support/htdigest.c
---- apache_1.3.41.orig/src/support/htdigest.c 2009-09-04 03:25:47.961939627
+0200
-+++ apache_1.3.41/src/support/htdigest.c 2009-09-04 03:38:00.869950312
+0200
-@@ -71,7 +71,7 @@
- while ((line[y++] = line[x++]));
- }
-
--static int getline(char *s, int n, FILE *f)
-+static int apache_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-@@ -158,7 +158,7 @@
- {
- static char line[MAX_STRING_LEN];
-
-- while (!(getline(line, MAX_STRING_LEN, source))) {
-+ while (!(apache_getline(line, MAX_STRING_LEN, source))) {
- putline(target, line);
- }
- }
-@@ -216,7 +216,7 @@
- ap_cpystrn(realm, argv[2], sizeof(realm));
-
- found = 0;
-- while (!(getline(line, MAX_STRING_LEN, f))) {
-+ while (!(apache_getline(line, MAX_STRING_LEN, f))) {
- if (found || (line[0] == '#') || (!line[0])) {
- putline(tfp, line);
- continue;
-diff -Naur apache_1.3.41.orig/src/support/htpasswd.c
apache_1.3.41/src/support/htpasswd.c
---- apache_1.3.41.orig/src/support/htpasswd.c 2009-09-04 03:25:47.961939627
+0200
-+++ apache_1.3.41/src/support/htpasswd.c 2009-09-04 03:38:00.933935289
+0200
-@@ -98,7 +98,7 @@
- * Get a line of input from the user, not including any terminating
- * newline.
- */
--static int getline(char *s, int n, FILE *f)
-+static int apache_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-@@ -547,7 +547,7 @@
- char scratch[MAX_STRING_LEN];
-
- fpw = fopen(pwfilename, "r");
-- while (! (getline(line, sizeof(line), fpw))) {
-+ while (! (apache_getline(line, sizeof(line), fpw))) {
- char *colon;
-
- if ((line[0] == '#') || (line[0] == '\0')) {
-diff -Naur apache_1.3.41.orig/src/support/logresolve.c
apache_1.3.41/src/support/logresolve.c
---- apache_1.3.41.orig/src/support/logresolve.c 2009-09-04
03:25:47.961939627 +0200
-+++ apache_1.3.41/src/support/logresolve.c 2009-09-04 03:38:01.037948767
+0200
-@@ -71,7 +71,7 @@
- #endif /* !MPE && !WIN32*/
-
- static void cgethost(struct in_addr ipnum, char *string, int check);
--static int getline(char *s, int n);
-+static int apache_getline(char *s, int n);
- static void stats(FILE *output);
-
-
-@@ -278,7 +278,7 @@
- * gets a line from stdin
- */
-
--static int getline (char *s, int n)
-+static int apache_getline (char *s, int n)
- {
- char *cp;
-
-@@ -326,7 +326,7 @@
- for (i = 0; i < MAX_ERR + 2; i++)
- errors[i] = 0;
-
-- while (getline(line, MAXLINE)) {
-+ while (apache_getline(line, MAXLINE)) {
- if (line[0] == '\0')
- continue;
- entries++;
diff --git a/http/apache/init.d/apache b/http/apache/init.d/apache
deleted file mode 100755
index a6e87a1..0000000
--- a/http/apache/init.d/apache
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-PROGRAM=/bin/false
-RUNLEVEL=3
-NEEDS="+network +remote_fs"
-PIDFILE=/var/run/httpd/httpd.pid
-
-. /etc/init.d/smgl_init
-
-start()
-{
- [ ! -d /var/run/httpd ] && mkdir /var/run/httpd
- echo "Starting Apache web server..."
- /usr/sbin/apachectl start
- evaluate_retval
-}
-
-restart()
-{
- echo "Restarting Apache web server..."
- if [ -f $PIDFILE ]; then
- /usr/sbin/apachectl restart
- evaluate_retval
- else
- run_func start
- fi
-}
-
-stop()
-{
- echo "Stopping Apache web server..."
- /usr/sbin/apachectl stop
- evaluate_retval
-}
-
-status()
-{
- getpids httpd
- if [ -n "$pidlist" ]; then
- echo "Apache is running with Process ID(s) $pidlist"
- else
- if [ -f $PIDFILE ]; then
- echo "Apache is not running but $PIDFILE exists"
- return 1
- else
- echo "Apache is not running"
- fi
- fi
-}
-
-reload()
-{
- run_func restart
-}
diff --git a/http/apache1/BUILD b/http/apache1/BUILD
new file mode 100755
index 0000000..210aa41
--- /dev/null
+++ b/http/apache1/BUILD
@@ -0,0 +1,13 @@
+./configure --prefix=/usr \
+ --sysconfdir=/etc/httpd \
+ --localstatedir=/var \
+ --logfiledir=/var/log/httpd \
+ --proxycachedir=/var/cache/httpd \
+ --runtimedir=/var/run/httpd \
+ --enable-module=most \
+ --enable-shared=max \
+ --enable-module=mmap_static \
+ --disable-module=auth_dbm \
+ --with-layout=GNU \
+ $OPTS &&
+make
diff --git a/http/apache1/CONFLICTS b/http/apache1/CONFLICTS
new file mode 100755
index 0000000..6f5fbf0
--- /dev/null
+++ b/http/apache1/CONFLICTS
@@ -0,0 +1,9 @@
+conflicts apache &&
+conflicts apache-mod_ssl &&
+conflicts apache2 &&
+conflicts apache22 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache1/DEPENDS b/http/apache1/DEPENDS
new file mode 100755
index 0000000..6e63efc
--- /dev/null
+++ b/http/apache1/DEPENDS
@@ -0,0 +1,6 @@
+optional_depends db '--enable-module=auth_db' '--disable-module=auth_db'
'for Berekely DB support' &&
+
+optional_depends 'gdbm' \
+ '--enable-module=rewrite' \
+ '--disable-module=rewrite' \
+ 'for extensible hasing database routines'
diff --git a/http/apache1/DETAILS b/http/apache1/DETAILS
new file mode 100755
index 0000000..76206df
--- /dev/null
+++ b/http/apache1/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=apache
+ VERSION=1.3.41
+ SECURITY_PATCH=3
+ SOURCE=${SPELL}_$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
+ SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
+ SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
+ SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
+ SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
+ SOURCE2_IGNORE=signature
+ LICENSE[0]=APACHE
+ WEB_SITE=http://httpd.apache.org/
+ KEYWORDS="http"
+ ENTERED=20010922
+ SHORT="Apache HTTP Server"
+cat << EOF
+Apache is the world's most popular HTTP server, being quite possibly
+the best around in terms of functionality, efficiency, security and
+speed.
+EOF
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
new file mode 100644
index 0000000..c2c54c1
--- /dev/null
+++ b/http/apache1/HISTORY
@@ -0,0 +1,153 @@
+2010-03-23 Mark Bainter <mbainter AT sourcemage.org>
+ * Renamed from apache to apache1
+ * CONFLICTS: added apache (deprecated)
+
+2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
+ * PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility
+
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
+2008-01-25 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depend on gdbm (Bug #14241) for mod_rewrite
+
+2008-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.41, SECURITY_PATCH=3
+ http://httpd.apache.org/security/vulnerabilities_13.html
+
+2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Use upstream apache.gpg
+
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
+ CVE-2006-5752, CVE-2007-3304
+
+2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFLICTS: added apache22
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PROVIDES: [automated] Fixed invalid entries.
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-08-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 1.3.37
+
+2006-07-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Upgrade to 1.3.36
+
+2006-05-11 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.35.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-10-22 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.34.
+
+2005-04-17 George Sherwood <george AT beernabeer.com>
+ * PROVIDES: added APACHE1 (Bug 6705)
+
+2005-03-09 Sergey Lipnevich <sergey AT sourcemage.org>
+ * services: remove, no longer used.
+
+2004-10-31 Ladislav Hagara <hgr AT vabo.cz>
+ * BUILD: removed the && from the last line
+
+2004-10-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.3.33 (SECURITY FIX)
+ Added BUILD_API=2
+ * BUILD: Converted to BUILD_API 2
+
+2004-06-05 Jason Flatt <jflatt AT sourcemage.org>
+ * POST_INSTALL: Removed as it was still trying to start the init
+ script from the old init system.
+
+2004-04-15 Seth Woolley <seth AT tautology.org>
+ * DETAILS: updated to 1.3.31 for non-critical security updates
+
+2004-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PROVIDES: added provides APACHE, so WEBSERVER can be used more
+ generally for other web servers too
+
+2003-11-02 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: Upper-case provides
+ * HISTORY: Formatted to Guru Handbook
+
+2003-10-28 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.29.
+
+2003-08-22 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: Update UPDATED purely for test grimoire integration.
+
+2003-07-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * init.d/*: updated to new init system
+ * BUILD: no longer creates /var/run/http dir, the init script
+ takes care of this
+
+2003-07-18 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: Upgrade to 1.3.28.
+
+2003-06-29 Sergey Lipnevich <sergey AT sourcemage.org>
+ * CONFIGURE: set correct OPTS.
+ * Added a patch for Berkeley DB 4.1.
+ * POST_INSTALL: will check configuration before restarting.
+ Spell will not stop a running server.
+
+2003-05-01 Rob Verkuylen <rob AT verkuylen.net>
+ * init.d/*: Copied /init.d/apache.sh to /init.d/apache.sh
+ Step 1/3 in bug#: 3115
+
+2003-04-08 M.L. <mlubrano AT sourcemage.org>
+ * BUILD: Added $OPTS
+
+2003-02-25 Eric Schabell <eschabell AT sourcemage.org>
+ * Cleaned up installscript call, not needed.
+
+2003-02-24 Eric Schabell <eschabell AT sourcemage.org>
+ * BUILD: Updated and moved apache.sh to init.d script dir
+ for correct usage of init.d as now updated in devel grimoire.
+ runlevel links done automagically, see apache script headder
+ for runlevel settings.
+
+2002-01-08 Sergey Lipnevich <sergey AT sourcemage.org>
+ * apache.sh: Improved init script.
+ Copy init script only if none present.
+ * BUILD: Create /var/run/httpd directory.
+
+2002-09-01 Sergey Lipnevich <sergey AT sourcemage.org>
+ * BUILD: Updated to have --localstatedir=/var, fixing bug 701.
+
+2002-06-19 Eric Schabell <eric AT schabell.com>
+ * DETAILS: Security fix version increase, also changed UPDATE field
as this
+ should be applied on your box.
+
+2002-04-08 Eric Schabell <eric AT schabell.com>
+ * DETAILS: Reverted back to 1.3.24 due to bugs/complications with php
spell and
+ other user problems.
+
+2002-04-07 Eric Schabell <eric AT schabell.com>
+ * DETAILS: Updated version to 2.0.35:
+ * This is the initial, stable release of the Apache 2.0 series.
Compared
+ to the 1.3 series, Apache 2.0 offers higher performance, better
+ scalability, integrated SSL and WebDAV support, improved HTTP proxy
+ support, and I/O layering and filtering.
+
+2002-03-28 Eric Schabell <eric AT schabell.com>
+ * DETAILS: Added MAINTAINER line.
+
+2002-03-25 Eric Schabell <eric AT schabell.com>
+ * DETAILS: Updated version to 1.3.24:
+ The Apache Group is pleased to announce the release
+ of the 1.3.24 version of the Apache HTTP server.
+ Apache 1.3.24 is principally a security and bug fix
+ release. Of particular note is that 1.3.24 addresses
+ and fixes the issues noted in CAN-2002-0061 (mitre.org)
+ regarding escaping of command line args on Win32.
+ Apache 1.3.24 is the best version of Apache currently
+ available.
+
+2002-03-13 Eric Schabell <eric AT schabell.com>
+ * HISTORY: Added
+
diff --git a/http/apache1/PRE_BUILD b/http/apache1/PRE_BUILD
new file mode 100755
index 0000000..42fa815
--- /dev/null
+++ b/http/apache1/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/apache_1.3.41_glic.patch
diff --git a/http/apache1/PROVIDES b/http/apache1/PROVIDES
new file mode 100755
index 0000000..6dd2c89
--- /dev/null
+++ b/http/apache1/PROVIDES
@@ -0,0 +1,3 @@
+WEBSERVER
+APACHE
+APACHE1
diff --git a/http/apache1/apache_1.3.41_glic.patch
b/http/apache1/apache_1.3.41_glic.patch
new file mode 100644
index 0000000..70b8829
--- /dev/null
+++ b/http/apache1/apache_1.3.41_glic.patch
@@ -0,0 +1,105 @@
+diff -Naur apache_1.3.41.orig/src/CHANGES apache_1.3.41/src/CHANGES
+--- apache_1.3.41.orig/src/CHANGES 2009-09-04 03:25:47.985940104 +0200
++++ apache_1.3.41/src/CHANGES 2009-09-04 03:38:00.517933711 +0200
+@@ -3838,7 +3838,7 @@
+ response when we already know the final status, which is mighty
+ useful for PUT responses that result in 302 or 401. [Roy Fielding]
+
+- *) Remove extra trailing whitespace from the getline results as part
++ *) Remove extra trailing whitespace from the apache_getline results as
part
+ of the protocol processing, which is extra nice because it works
+ between continuation lines, is almost no cost in the normal case
+ of no extra whitespace, and saves memory. [Roy Fielding]
+diff -Naur apache_1.3.41.orig/src/makefile.win apache_1.3.41/src/makefile.win
+--- apache_1.3.41.orig/src/makefile.win 2009-09-04 03:25:47.977940271
+0200
++++ apache_1.3.41/src/makefile.win 2009-09-04 03:38:00.629935291 +0200
+@@ -238,7 +238,7 @@
+ dstfl = ARGV[2];
+ serverroot = ARGV[3];
+ gsub( /\\/, "/", serverroot );
+- while ( ( getline < srcfl ) > 0 ) {
++ while ( ( apache_getline < srcfl ) > 0 ) {
+ gsub( /@@ServerRoot@@/, serverroot );
+ print $$0 > dstfl;
+ }
+diff -Naur apache_1.3.41.orig/src/support/htdigest.c
apache_1.3.41/src/support/htdigest.c
+--- apache_1.3.41.orig/src/support/htdigest.c 2009-09-04 03:25:47.961939627
+0200
++++ apache_1.3.41/src/support/htdigest.c 2009-09-04 03:38:00.869950312
+0200
+@@ -71,7 +71,7 @@
+ while ((line[y++] = line[x++]));
+ }
+
+-static int getline(char *s, int n, FILE *f)
++static int apache_getline(char *s, int n, FILE *f)
+ {
+ register int i = 0;
+
+@@ -158,7 +158,7 @@
+ {
+ static char line[MAX_STRING_LEN];
+
+- while (!(getline(line, MAX_STRING_LEN, source))) {
++ while (!(apache_getline(line, MAX_STRING_LEN, source))) {
+ putline(target, line);
+ }
+ }
+@@ -216,7 +216,7 @@
+ ap_cpystrn(realm, argv[2], sizeof(realm));
+
+ found = 0;
+- while (!(getline(line, MAX_STRING_LEN, f))) {
++ while (!(apache_getline(line, MAX_STRING_LEN, f))) {
+ if (found || (line[0] == '#') || (!line[0])) {
+ putline(tfp, line);
+ continue;
+diff -Naur apache_1.3.41.orig/src/support/htpasswd.c
apache_1.3.41/src/support/htpasswd.c
+--- apache_1.3.41.orig/src/support/htpasswd.c 2009-09-04 03:25:47.961939627
+0200
++++ apache_1.3.41/src/support/htpasswd.c 2009-09-04 03:38:00.933935289
+0200
+@@ -98,7 +98,7 @@
+ * Get a line of input from the user, not including any terminating
+ * newline.
+ */
+-static int getline(char *s, int n, FILE *f)
++static int apache_getline(char *s, int n, FILE *f)
+ {
+ register int i = 0;
+
+@@ -547,7 +547,7 @@
+ char scratch[MAX_STRING_LEN];
+
+ fpw = fopen(pwfilename, "r");
+- while (! (getline(line, sizeof(line), fpw))) {
++ while (! (apache_getline(line, sizeof(line), fpw))) {
+ char *colon;
+
+ if ((line[0] == '#') || (line[0] == '\0')) {
+diff -Naur apache_1.3.41.orig/src/support/logresolve.c
apache_1.3.41/src/support/logresolve.c
+--- apache_1.3.41.orig/src/support/logresolve.c 2009-09-04
03:25:47.961939627 +0200
++++ apache_1.3.41/src/support/logresolve.c 2009-09-04 03:38:01.037948767
+0200
+@@ -71,7 +71,7 @@
+ #endif /* !MPE && !WIN32*/
+
+ static void cgethost(struct in_addr ipnum, char *string, int check);
+-static int getline(char *s, int n);
++static int apache_getline(char *s, int n);
+ static void stats(FILE *output);
+
+
+@@ -278,7 +278,7 @@
+ * gets a line from stdin
+ */
+
+-static int getline (char *s, int n)
++static int apache_getline (char *s, int n)
+ {
+ char *cp;
+
+@@ -326,7 +326,7 @@
+ for (i = 0; i < MAX_ERR + 2; i++)
+ errors[i] = 0;
+
+- while (getline(line, MAXLINE)) {
++ while (apache_getline(line, MAXLINE)) {
+ if (line[0] == '\0')
+ continue;
+ entries++;
diff --git a/http/apache1/init.d/apache b/http/apache1/init.d/apache
new file mode 100755
index 0000000..a6e87a1
--- /dev/null
+++ b/http/apache1/init.d/apache
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+PIDFILE=/var/run/httpd/httpd.pid
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ [ ! -d /var/run/httpd ] && mkdir /var/run/httpd
+ echo "Starting Apache web server..."
+ /usr/sbin/apachectl start
+ evaluate_retval
+}
+
+restart()
+{
+ echo "Restarting Apache web server..."
+ if [ -f $PIDFILE ]; then
+ /usr/sbin/apachectl restart
+ evaluate_retval
+ else
+ run_func start
+ fi
+}
+
+stop()
+{
+ echo "Stopping Apache web server..."
+ /usr/sbin/apachectl stop
+ evaluate_retval
+}
+
+status()
+{
+ getpids httpd
+ if [ -n "$pidlist" ]; then
+ echo "Apache is running with Process ID(s) $pidlist"
+ else
+ if [ -f $PIDFILE ]; then
+ echo "Apache is not running but $PIDFILE exists"
+ return 1
+ else
+ echo "Apache is not running"
+ fi
+ fi
+}
+
+reload()
+{
+ run_func restart
+}
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 1e390b0..754d2cc 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -94,7 +94,7 @@ optional_depends expat
\
'' \
'Enable support for Expat library.' &&

-optional_depends docbook-utils \
+optional_depends docbook2x \
"--enable-docbook" \
"--disable-docbook" \
"Enable support for building documentation" &&
@@ -112,4 +112,8 @@ optional_depends openssl
\
optional_depends python \
"--enable-python" \
"--disable-python" \
- "Enable python wrapper support"
+ "Enable python wrapper support" &&
+
+if is_depends_enabled $SPELL python; then
+ depends pygtk2
+fi
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 66f283f..36a3ba5 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: docbook-utils -> docbook2x, added pygtk2 #15660
+
2010-04-07 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: openssh -> libssh

diff --git a/http/lighttpd/BUILD b/http/lighttpd/BUILD
index 5fad8f8..44e4f99 100755
--- a/http/lighttpd/BUILD
+++ b/http/lighttpd/BUILD
@@ -1,3 +1,2 @@
-OPTS="--libdir=$INSTALL_ROOT/usr/lib/lighttpd $OPTS" &&
-
+OPTS="$OPTS --libdir=$INSTALL_ROOT/usr/lib/lighttpd $LIGHTTPD_OPTS" &&
default_build
diff --git a/http/lighttpd/CONFIGURE b/http/lighttpd/CONFIGURE
index bb050b2..7eb5cbd 100755
--- a/http/lighttpd/CONFIGURE
+++ b/http/lighttpd/CONFIGURE
@@ -1,3 +1,7 @@
config_query LIGHTTPD_EXTAUTH "Do you want to patch in external
authentication program support?" n &&
-config_query_option LIGHTTPD_OPTS "Do you want webdav support?" n \
- "--with-webdav-props" "--without-webdav-props"
+config_query_option LIGHTTPD_OPTS "Do you want WebDAV support?" n \
+ "--with-webdav-props" "--without-webdav-props" &&
+if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
+ config_query_option LIGHTTPD_OPTS "Do you want to enable WebDAV locking
support?" y \
+ "--with-webdav-locks" "--without-webdav-locks"
+fi
diff --git a/http/lighttpd/DEPENDS b/http/lighttpd/DEPENDS
index 87bb215..991f0fa 100755
--- a/http/lighttpd/DEPENDS
+++ b/http/lighttpd/DEPENDS
@@ -30,6 +30,9 @@ optional_depends libmemcache \
'memcache storage for mod_trigger_b4_dl' &&

if list_find "$LIGHTTPD_OPTS" "--with-webdav-props"; then
- depends sqlite &&
depends libxml2
+fi &&
+
+if list_find "$LIGHTTPD_OPTS" "--with-webdav-locks"; then
+ depends sqlite
fi
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index d273be1..af3a183 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,7 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD: OPTS was not being populated correctly (webdav support never
compiled)
+ * CONFIGURE, DEPENDS: WebDAV locks option added, and sqlite dep made
to pull if its enabled (default)
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/kde-apps/kdsl/FINAL b/kde-apps/kdsl/FINAL
index 24688b4..4db8b5c 100755
--- a/kde-apps/kdsl/FINAL
+++ b/kde-apps/kdsl/FINAL
@@ -3,7 +3,7 @@ cat <<EOF
you need to add users to the 'ppp' group in order to use this program

EOF
-if grep -e "CONFIG_PPP is not set" -q /usr/src/linux/.config ;then
+if grep -e "CONFIG_PPP is not set" -q
/lib/modules/$(get_kernel_version)/build/.config ;then
cat <<EOF
you will need to rebuild your kernel with PPP support

diff --git a/kde-apps/kdsl/HISTORY b/kde-apps/kdsl/HISTORY
index 08f4c52..fff603c 100644
--- a/kde-apps/kdsl/HISTORY
+++ b/kde-apps/kdsl/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * FINAL: Fix kernel path
+
2006-06-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/kde4-support/grantlee/DEPENDS b/kde4-support/grantlee/DEPENDS
new file mode 100755
index 0000000..f3eb975
--- /dev/null
+++ b/kde4-support/grantlee/DEPENDS
@@ -0,0 +1,4 @@
+depends g++ &&
+depends qt4 &&
+depends cmake
+
diff --git a/kde4-support/grantlee/DETAILS b/kde4-support/grantlee/DETAILS
new file mode 100755
index 0000000..cd77520
--- /dev/null
+++ b/kde4-support/grantlee/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=grantlee
+ VERSION=v0.1.0
+
SOURCE_HASH=sha512:b20946cfde9c9555f9e04ee7fbf8b5f0e559aee0c5eb189d1e6af1c2856d9887c2df38e2027fdd338df09f4681179cb7afd614b7f08fc6fe6b6ba1668518ff1b
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://downloads.grantlee.org/$SOURCE
+ WEB_SITE=http://www..grantlee.org
+ LICENSE[0]=GPL
+ ENTERED=20100409
+ KEYWORDS=""
+ SHORT="string template engine"
+cat << EOF
+Grantlee is a string template engine based on the Django template system and
written in Qt
+EOF
diff --git a/kde4-support/grantlee/HISTORY b/kde4-support/grantlee/HISTORY
new file mode 100644
index 0000000..7ce14e8
--- /dev/null
+++ b/kde4-support/grantlee/HISTORY
@@ -0,0 +1,7 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version v0.1.0
+
+2010-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version v0.1.0-rc1
+ spell created
+
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 7fde5a8..0375818 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -1,5 +1,4 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends imake &&
depends libxau &&
depends libxcomposite &&
depends libxcursor &&
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 121bc25..150e157 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove imake
+
2010-04-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.4.2

diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 3fb2862..ebdcd53 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -1,6 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&

-depends imake &&
depends libxau &&
depends libxcomposite &&
depends libxcursor &&
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 184792e..df555a4 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove imake
+
2010-04-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.4.2

diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index f1b54e0..4e6807c 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends jpeg &&
depends attica &&
-optional_depends hal '-DDONT_USE_HAL=0' '-DDONT_USE_HAL=1'
'hardware detection' &&
+depends hal &&
depends shared-desktop-ontologies &&
depends soprano &&
depends redland &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 61ef4d3..6bef99d 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: hal seems to be required now, bug #15666
+
2010-04-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.4.2

diff --git a/kernels/ath5k/BUILD b/kernels/ath5k/BUILD
index 53f6a79..ce2620c 100755
--- a/kernels/ath5k/BUILD
+++ b/kernels/ath5k/BUILD
@@ -1,3 +1,3 @@
-make_single &&
-make KERNELPATH=/usr/src/linux-$(get_kernel_version) &&
+make_single &&
+make KERNELPATH=/lib/modules/$(get_kernel_version)/build &&
make_normal
diff --git a/kernels/ath5k/HISTORY b/kernels/ath5k/HISTORY
index be80731..70e41a0 100644
--- a/kernels/ath5k/HISTORY
+++ b/kernels/ath5k/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2007-10-14 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, BUILD, INSTALL, TRIGGERS: Created

diff --git a/kernels/ath5k/INSTALL b/kernels/ath5k/INSTALL
index df1c58e..55e3cd6 100755
--- a/kernels/ath5k/INSTALL
+++ b/kernels/ath5k/INSTALL
@@ -1,4 +1,4 @@
-make BINDIR=$INSTALL_ROOT/usr/sbin \
- MANDIR=$INSTALL_ROOT/usr/share/man \
- KERNELPATH=/usr/src/linux-$(get_kernel_version) \
+make BINDIR=$INSTALL_ROOT/usr/sbin \
+ MANDIR=$INSTALL_ROOT/usr/share/man \
+ KERNELPATH=/lib/modules/$(get_kernel_version)/build \
install
diff --git a/kernels/bluez-kernel/BUILD b/kernels/bluez-kernel/BUILD
index 33dba19..eb11e29 100755
--- a/kernels/bluez-kernel/BUILD
+++ b/kernels/bluez-kernel/BUILD
@@ -11,7 +11,7 @@ C=`expr $C + 1`
done
}
(
-./configure --with-kernel=/usr/src/linux \
+./configure --with-kernel=/lib/modules/$(get_kernel_version)/build \
--prefix=/usr \
$OPTS &&
cd $SOURCE_DIRECTORY/drivers &&
diff --git a/kernels/bluez-kernel/HISTORY b/kernels/bluez-kernel/HISTORY
index 71ed4df..84512c1 100644
--- a/kernels/bluez-kernel/HISTORY
+++ b/kernels/bluez-kernel/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kernels/cloop/BUILD b/kernels/cloop/BUILD
index 2578a87..f8172ab 100755
--- a/kernels/cloop/BUILD
+++ b/kernels/cloop/BUILD
@@ -1 +1 @@
-make KERNEL_DIR=/usr/src/linux-$(get_kernel_version)
+make KERNEL_DIR=/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/cloop/HISTORY b/kernels/cloop/HISTORY
index 46ec22a..73337cc 100644
--- a/kernels/cloop/HISTORY
+++ b/kernels/cloop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kernels/dazuko/BUILD b/kernels/dazuko/BUILD
index 665ce94..9fc5ee6 100755
--- a/kernels/dazuko/BUILD
+++ b/kernels/dazuko/BUILD
@@ -1,4 +1,2 @@
-local KVERS &&
-KVERS=$(get_kernel_version) &&
-./configure --kernelsrcdir=/usr/src/linux-$KVERS $OPTS &&
+./configure --kernelsrcdir=/lib/modules/$(get_kernel_version)/build $OPTS &&
make
diff --git a/kernels/dazuko/HISTORY b/kernels/dazuko/HISTORY
index 6e7099c..300791f 100644
--- a/kernels/dazuko/HISTORY
+++ b/kernels/dazuko/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2008-09-05 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 2.3.5, fixed urls
* PREPARE: added warning and fail for recent kernels
diff --git a/kernels/kqemu/BUILD b/kernels/kqemu/BUILD
index 6a1a8c1..90ea1bd 100755
--- a/kernels/kqemu/BUILD
+++ b/kernels/kqemu/BUILD
@@ -1,5 +1,5 @@
-OPTS="--kernel-path=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version) \
- $OPTS" &&
+OPTS="--kernel-path=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build \
+ $OPTS" &&

make_single &&
default_build &&
diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index ab6101f..96bf38e 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,6 @@
+2010-04-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: use the standard way to find kernel sources
+
2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.0pre1; cleaned up
* BUILD: fixed multijob build
diff --git a/kernels/madwifi/BUILD b/kernels/madwifi/BUILD
index 53f6a79..ce2620c 100755
--- a/kernels/madwifi/BUILD
+++ b/kernels/madwifi/BUILD
@@ -1,3 +1,3 @@
-make_single &&
-make KERNELPATH=/usr/src/linux-$(get_kernel_version) &&
+make_single &&
+make KERNELPATH=/lib/modules/$(get_kernel_version)/build &&
make_normal
diff --git a/kernels/madwifi/HISTORY b/kernels/madwifi/HISTORY
index cf1c076..772ce12 100644
--- a/kernels/madwifi/HISTORY
+++ b/kernels/madwifi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2008-11-22 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated subversion SOURCE_URL. Bug 14890

diff --git a/kernels/madwifi/INSTALL b/kernels/madwifi/INSTALL
index df1c58e..7d18d2b 100755
--- a/kernels/madwifi/INSTALL
+++ b/kernels/madwifi/INSTALL
@@ -1,4 +1,4 @@
-make BINDIR=$INSTALL_ROOT/usr/sbin \
- MANDIR=$INSTALL_ROOT/usr/share/man \
- KERNELPATH=/usr/src/linux-$(get_kernel_version) \
+make BINDIR=$INSTALL_ROOT/usr/sbin \
+ MANDIR=$INSTALL_ROOT/usr/share/man \
+ KERNELPATH=/lib/modules$(get_kernel_version)/build \
install
diff --git a/kernels/ndiswrapper/BUILD b/kernels/ndiswrapper/BUILD
index 4627280..40ca1ba 100755
--- a/kernels/ndiswrapper/BUILD
+++ b/kernels/ndiswrapper/BUILD
@@ -1 +1 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 43dd37d..dcb89d3 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Fix kernel headers path
+
2010-02-01 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Only create ndiswrapper-svn if NDIS_SVN = y
* BUILD,INSTALL: Needs KBUILD to find the kernel
diff --git a/kernels/ndiswrapper/INSTALL b/kernels/ndiswrapper/INSTALL
index f84615e..8d5d5ca 100755
--- a/kernels/ndiswrapper/INSTALL
+++ b/kernels/ndiswrapper/INSTALL
@@ -1,2 +1,2 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)
mandir=${INSTALL_ROOT}/usr/share/man install &&
+make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
mandir=${INSTALL_ROOT}/usr/share/man install &&
mkdir -p /etc/ndiswrapper
diff --git a/kernels/splashutils/HISTORY b/kernels/splashutils/HISTORY
index 7e7cc82..cf9d4db 100644
--- a/kernels/splashutils/HISTORY
+++ b/kernels/splashutils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourecmage.org>
+ * PRE_BUILD: Fix kernel headers path
+
2009-06-14 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: removed dep on klibc

diff --git a/kernels/splashutils/PRE_BUILD b/kernels/splashutils/PRE_BUILD
index ec3cbc1..db3bf37 100755
--- a/kernels/splashutils/PRE_BUILD
+++ b/kernels/splashutils/PRE_BUILD
@@ -37,4 +37,4 @@ sedit "s:/lib:$TRACK_ROOT/lib:" config.h &&
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
-ln -s $TRACK_ROOT/usr/src/linux-$(get_kernel_version) linux
+ln -s $TRACK_ROOT/lib/modules/$(get_kernel_version)/build linux
diff --git a/kernels/virtualbox-module/BUILD b/kernels/virtualbox-module/BUILD
index 390be20..a34d649 100755
--- a/kernels/virtualbox-module/BUILD
+++ b/kernels/virtualbox-module/BUILD
@@ -1 +1 @@
-make KERN_DIR=${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)
+make KERN_DIR=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index 9f0e003..996942b 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT souremage.org>
+ * BUILD: Fix kernel headers path
+
2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.6

diff --git a/libs/klibc/HISTORY b/libs/klibc/HISTORY
index e7ad7db..82bc0c0 100644
--- a/libs/klibc/HISTORY
+++ b/libs/klibc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael.luceno AT gmail.com>
+ * PRE_BUILD: Fix kernel headers path
+
2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* PRE_BUILD: fixed the install path of the manpages

diff --git a/libs/klibc/PRE_BUILD b/libs/klibc/PRE_BUILD
index 6b8d00c..ae7d70e 100755
--- a/libs/klibc/PRE_BUILD
+++ b/libs/klibc/PRE_BUILD
@@ -15,4 +15,4 @@ sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile &&
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
-ln -s $TRACK_ROOT/usr/src/linux-$(get_kernel_version) linux
+ln -s $TRACK_ROOT/lib/modules/$(get_kernel_version)/build linux
diff --git a/libs/libmpc/DEPENDS b/libs/libmpc/DEPENDS
new file mode 100755
index 0000000..b29776c
--- /dev/null
+++ b/libs/libmpc/DEPENDS
@@ -0,0 +1,2 @@
+depends gmp &&
+depends mpfr
diff --git a/libs/libmpc/DETAILS b/libs/libmpc/DETAILS
new file mode 100755
index 0000000..1594199
--- /dev/null
+++ b/libs/libmpc/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=libmpc
+ VERSION=0.8.1
+ SOURCE="mpc-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://www.multiprecision.org/mpc/download/$SOURCE
+
SOURCE_HASH=sha512:14cb9ae3d33caed24d5ae648eed28b2e00ad047a8baeff25981129af88245b4def2948573d7a00d65c5bd34e53524aa6a7351b76703c9f888b41830c1a1daae2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/mpc-$VERSION"
+ WEB_SITE="http://www.multiprecision.org/index.php?prog=mpc";
+ LICENSE[0]="LGPL"
+ ENTERED=20100410
+ SHORT="library for the arithmetic of complex numbers"
+cat << EOF
+Mpc is a C library for the arithmetic of complex numbers with arbitrarily
+high precision and correct rounding of the result. It is built upon and
+follows the same principles as Mpfr.
+EOF
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
new file mode 100644
index 0000000..9974069
--- /dev/null
+++ b/libs/libmpc/HISTORY
@@ -0,0 +1,3 @@
+2010-04-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/libs/libmpc/INSTALL b/libs/libmpc/INSTALL
new file mode 100755
index 0000000..7edfbb9
--- /dev/null
+++ b/libs/libmpc/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+rm -r doc # remove the remaining build system cruft
diff --git a/libs/libtirpc/DEPENDS b/libs/libtirpc/DEPENDS
new file mode 100755
index 0000000..d967f39
--- /dev/null
+++ b/libs/libtirpc/DEPENDS
@@ -0,0 +1,2 @@
+depends glibc &&
+depends libgssglue '--enable-gss'
diff --git a/libs/libtirpc/DETAILS b/libs/libtirpc/DETAILS
new file mode 100755
index 0000000..ef027ff
--- /dev/null
+++ b/libs/libtirpc/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=libtirpc
+ VERSION=0.2.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]="${SOURCEFORGE_URL}/${SPELL}/${SOURCE}"
+
SOURCE_HASH=sha512:3dec4a12a08493dd61e16356e3f1cdb7c037a04468654b972514529054c4efce6fbb7add218c4ea9f9c56c4106107b80bdaa7b40120f97d4c455f51ec3b1693f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://sourceforge.net/projects/libtirpc/";
+ LICENSE[0]="BSD"
+ ENTERED=20100407
+ KEYWORDS="net rpc portmap"
+ SHORT="Transport Independent RPC library (SunRPC replacement)"
+
+cat << EOF
+Transport Independent RPC library (SunRPC replacement)
+EOF
diff --git a/libs/libtirpc/HISTORY b/libs/libtirpc/HISTORY
new file mode 100644
index 0000000..7a9c178
--- /dev/null
+++ b/libs/libtirpc/HISTORY
@@ -0,0 +1,3 @@
+2010-04-07 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS, DETAILS, PROVIDES: spell created
+
diff --git a/libs/tbb/BUILD b/libs/tbb/BUILD
index 8f58e6d..b6a3ae1 100755
--- a/libs/tbb/BUILD
+++ b/libs/tbb/BUILD
@@ -1 +1 @@
-make
+make -j${JOBS}
diff --git a/libs/tbb/DEPENDS b/libs/tbb/DEPENDS
index f66defa..fd0b0eb 100755
--- a/libs/tbb/DEPENDS
+++ b/libs/tbb/DEPENDS
@@ -1 +1 @@
-depends gcc
+depends g++
diff --git a/libs/tbb/DETAILS b/libs/tbb/DETAILS
index dc9d3fd..e3212a5 100755
--- a/libs/tbb/DETAILS
+++ b/libs/tbb/DETAILS
@@ -1,9 +1,10 @@
SPELL=tbb
- VERSION=21_20080605
-
SOURCE_HASH=sha512:a05b123687a9ca53a9ca95f1bcf77e0c6377150a38378e8dc9447efb50d07db8c805e2db74a13521a251132ecbf4785f625c4e505d7a4d59b37c40303906b0d6
+ VERSION=30_20100310
+ VX=3.0
+
SOURCE_HASH=sha512:b184cd93b55a873b2e29258dd2698d4d3a411024a6455bc62b1bb06c009d5f18704bd586894f62bb41a7c351cec74bf266f9175915ec29069f7485c88940f75b
SOURCE=${SPELL}${VERSION}oss_src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}${VERSION}oss
-
SOURCE_URL[0]=http://www.threadingbuildingblocks.org/uploads/77/111/2.1/$SOURCE
+
SOURCE_URL[0]=http://www.threadingbuildingblocks.org/uploads/77/148/$VX/$SOURCE
WEB_SITE=http://www.threadingbuildingblocks.org
ENTERED=20090925
LICENSE[0]=GPL
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index e1a0983..abd4d67 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,8 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 30_20100310
+ * BUILD: add -j parameter to make
+ * DEPENDS: gcc => g++
+
2009-09-25 David Kowis<dkowis AT shlrm.org>
* DETAILS, BUILD, INSTALL: Created intel thread building blocks spell
* DETAILS: knocked back to previous stable, because that's what's
needed
diff --git a/libs/yasm/DETAILS b/libs/yasm/DETAILS
index 308b4fb..d4f98ea 100755
--- a/libs/yasm/DETAILS
+++ b/libs/yasm/DETAILS
@@ -1,6 +1,6 @@
SPELL=yasm
- VERSION=0.8.0
-
SOURCE_HASH=sha512:52a825bf7089e55d56ee474dd077bb7e6c076e9979367c4d90e395140d1e3e908e0c5cc84969dbb65e16668059ec34480d62a8b9bdaaa400d7332caf3b711488
+ VERSION=1.0.0
+
SOURCE_HASH=sha512:e0242146876796dba3ecaa00e2a8917bd68adbaedd4b3441d3312c7b20f00357ec2888a242fdda4b40eae6e518d9f027ff297de2498fd1b1dd535f0c0279e027
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.tortall.net/projects/yasm/releases/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/libs/yasm/HISTORY b/libs/yasm/HISTORY
index c763f80..cac4e88 100644
--- a/libs/yasm/HISTORY
+++ b/libs/yasm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-09 Treeve Jelbert <>treeve AT sourcemage.org
+ * DETAILS: version 1.0.0
+
2009-04-11 Treeve Jelbert <>treeve AT sourcemage.org
* DETAILS: version 0.8.0

diff --git a/mail/drac/DEPENDS b/mail/drac/DEPENDS
index 96cbda8..1284b42 100755
--- a/mail/drac/DEPENDS
+++ b/mail/drac/DEPENDS
@@ -1,3 +1,3 @@
-depends portmap &&
-depends db &&
-depends MAIL-TRANSPORT-AGENT
+depends PORT-MAPPER &&
+depends db &&
+depends MAIL-TRANSPORT-AGENT
diff --git a/mail/drac/HISTORY b/mail/drac/HISTORY
index baa0d83..277b18f 100644
--- a/mail/drac/HISTORY
+++ b/mail/drac/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: changed portmap dependency to PORT-MAPPER provider
+
2008-02-06 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* DETAILS: Cleaned SHORT.

diff --git a/mail/fetchmail/DETAILS b/mail/fetchmail/DETAILS
index c547a28..9aa63ed 100755
--- a/mail/fetchmail/DETAILS
+++ b/mail/fetchmail/DETAILS
@@ -1,5 +1,5 @@
SPELL=fetchmail
- VERSION=6.3.14
+ VERSION=6.3.16
SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/mail/fetchmail/HISTORY b/mail/fetchmail/HISTORY
index abe3b1a..30ae22e 100644
--- a/mail/fetchmail/HISTORY
+++ b/mail/fetchmail/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.3.16
+
2010-02-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.3.14, SECURITY_PATCH=6, CVE-2010-0562

diff --git a/mobile/mumpot/DEPENDS b/mobile/mumpot/DEPENDS
new file mode 100755
index 0000000..c6079d5
--- /dev/null
+++ b/mobile/mumpot/DEPENDS
@@ -0,0 +1,7 @@
+depends gtk+2 &&
+depends gettext &&
+depends libxml2 &&
+depends curl &&
+depends bison &&
+depends g++ &&
+depends bluez-libs
diff --git a/mobile/mumpot/DETAILS b/mobile/mumpot/DETAILS
new file mode 100755
index 0000000..f970460
--- /dev/null
+++ b/mobile/mumpot/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=mumpot
+ VERSION=0.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE}
+
SOURCE_HASH=sha512:4f6dc72037fa11951d4e75c1b8498a3dca81c4e3a88dbef7b69e318cd632eaba49b726fa96fbc99afd53fe2fbd06d5a1cd28bfc0e920b7a9bce21ba7783a4dd6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.mumpot.org/";
+ LICENSE[0]=GPL
+ ENTERED=20100413
+ SHORT="a gtk mapping application"
+cat << EOF
+Mumpot is a gtk mapping application written by Andreas Kemnade with simple
+editing features (for editing OpenStreetMap data) mainly (but not only)
+for use with mobile linux equipped devices.
+EOF
diff --git a/mobile/mumpot/HISTORY b/mobile/mumpot/HISTORY
new file mode 100644
index 0000000..70e86cc
--- /dev/null
+++ b/mobile/mumpot/HISTORY
@@ -0,0 +1,3 @@
+2010-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/mysql.gpg b/mysql.gpg
new file mode 100644
index 0000000..142cd63
Binary files /dev/null and b/mysql.gpg differ
diff --git a/net/bridge-utils/BUILD b/net/bridge-utils/BUILD
index 6003e35..bebc18f 100755
--- a/net/bridge-utils/BUILD
+++ b/net/bridge-utils/BUILD
@@ -1,4 +1,4 @@
-OPTS="$OPTS --with-linux-headers=${INSTALL_ROOT}/usr/src/linux" &&
+OPTS="$OPTS
--with-linux-headers=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build"
&&
cd ${SOURCE_DIRECTORY} &&
aclocal &&
autoconf &&
diff --git a/net/bridge-utils/HISTORY b/net/bridge-utils/HISTORY
index 44137f8..0b71ba7 100644
--- a/net/bridge-utils/HISTORY
+++ b/net/bridge-utils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix kernel headers path
+
2009-09-24 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.4
* BUILD: added
diff --git a/net/monit/DETAILS b/net/monit/DETAILS
index 2c6d0fd..9e84cb3 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,10 +1,10 @@
SPELL=monit
- VERSION=4.10.1
-
SOURCE_HASH=sha512:750c93163edd0fc3db8aeef49c1f51c6e7e17bfad1386e10d9c0c29fe2d03e64f315fea8766e3b414030e482e882b85b196065e53b8def83cc88bc681dc020ec
- SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://www.tildeslash.com/monit/dist/${SOURCE}
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- WEB_SITE="http://www.tildeslash.com/monit/";
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:0e611709041e336e8cc345d6d671cf42b2a7c0a296184665696f935c27e04629e022371dd54fd744d1712a0ed95ccda265c56b27e9799e0b48e5c2f38cea72e0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]="http://mmonit.com/monit/dist/${SOURCE}";
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://mmonit.com/monit/";
LICENSE[0]=GPL
KEYWORDS="net"
SHORT="A utility for monitoring Unix system services"
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index 96c2ee7..dd379e7 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated to 5.1.1
+
2008-05-18 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 4.10.1; removed padding on SOURCE_HASH

diff --git a/net/netkit-bootparamd/DEPENDS b/net/netkit-bootparamd/DEPENDS
index 1fa29be..a9159c2 100755
--- a/net/netkit-bootparamd/DEPENDS
+++ b/net/netkit-bootparamd/DEPENDS
@@ -1 +1 @@
-depends portmap
+depends PORT-MAPPER
diff --git a/net/netkit-bootparamd/HISTORY b/net/netkit-bootparamd/HISTORY
index 792e3fc..d20f3fc 100644
--- a/net/netkit-bootparamd/HISTORY
+++ b/net/netkit-bootparamd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: changed portmap dependency to PORT-MAPPER provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/nfs-utils/DEPENDS b/net/nfs-utils/DEPENDS
index a680c6e..dc78600 100755
--- a/net/nfs-utils/DEPENDS
+++ b/net/nfs-utils/DEPENDS
@@ -1,6 +1,6 @@
depends gcc &&
depends gnupg &&
-depends portmap &&
+depends PORT-MAPPER &&
depends smgl-fhs

optional_depends tcp_wrappers \
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 4bc6544..eb8c280 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Rest <ryuji AT sourcemage.org>
+ * DEPENDS: changed portmap dependency to PORT-MAPPER provider
+
2009-04-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.6

diff --git a/net/portmap/CONFLICTS b/net/portmap/CONFLICTS
new file mode 100755
index 0000000..671362f
--- /dev/null
+++ b/net/portmap/CONFLICTS
@@ -0,0 +1 @@
+conflicts rpcbind
diff --git a/net/portmap/HISTORY b/net/portmap/HISTORY
index 4f853b2..58ae687 100644
--- a/net/portmap/HISTORY
+++ b/net/portmap/HISTORY
@@ -1,3 +1,7 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * CONFLICTS: conflict with rpcbind
+ * PROVIDES: provide PORT-MAPPER, along with rpcbind
+
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
diff --git a/net/portmap/PROVIDES b/net/portmap/PROVIDES
new file mode 100755
index 0000000..cb7cc02
--- /dev/null
+++ b/net/portmap/PROVIDES
@@ -0,0 +1 @@
+PORT-MAPPER
diff --git a/net/pump/DETAILS b/net/pump/DETAILS
index 01b56a1..63385f4 100755
--- a/net/pump/DETAILS
+++ b/net/pump/DETAILS
@@ -1,7 +1,7 @@
SPELL=pump
VERSION=0.8.24
- DEB_PL=5
- PATCHLEVEL=5
+ DEB_PL=7
+ PATCHLEVEL=6
SOURCE="${SPELL}_${VERSION}.orig.tar.gz"

SOURCE_HASH=sha512:b6956f0ab2a5fbcda2320efd454d21aee651816a13a55622e21dc3a29919aef7db7c9a8d71c3b37b1969f29cff37c67d313f763a17404652fb962bc54eabcb34
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/${SPELL}/${SOURCE}
diff --git a/net/pump/HISTORY b/net/pump/HISTORY
index 7a0c005..f112b7a 100644
--- a/net/pump/HISTORY
+++ b/net/pump/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: DEB_PL=7, PATCHLEVEL++
+
2009-06-05 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: DEB_PL=4, PATCHLEVEL++
* PRE_BUILD: we have the file hash, do the check!
diff --git a/net/rpcbind/CONFLICTS b/net/rpcbind/CONFLICTS
new file mode 100755
index 0000000..1ddfc4f
--- /dev/null
+++ b/net/rpcbind/CONFLICTS
@@ -0,0 +1 @@
+conflicts portmap
diff --git a/net/rpcbind/DEPENDS b/net/rpcbind/DEPENDS
new file mode 100755
index 0000000..f88e453
--- /dev/null
+++ b/net/rpcbind/DEPENDS
@@ -0,0 +1,2 @@
+depends glibc &&
+depends libtirpc
diff --git a/net/rpcbind/DETAILS b/net/rpcbind/DETAILS
new file mode 100755
index 0000000..93ba187
--- /dev/null
+++ b/net/rpcbind/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=rpcbind
+ VERSION=0.2.0
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]="${SOURCEFORGE_URL}/${SPELL}/${SOURCE}"
+
SOURCE_HASH=sha512:99e56c1877521c4df8288e88b88d9bb4d42c4e99d479fe61dc6e3f067f255dfc96ad894b2ddd425703b0d01ff1c9b362991507130dbd745a8088e6a2c7f29605
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://sourceforge.net/projects/rpcbind/";
+ LICENSE[0]="BSD"
+ ENTERED=20100407
+ KEYWORDS=""
+ SHORT="portmap replacement which supports RPC over various
protocols"
+
+cat << EOF
+The rpcbind utility is a portmap replacement which supports RPC over various
+protocols.
+EOF
diff --git a/net/rpcbind/HISTORY b/net/rpcbind/HISTORY
new file mode 100644
index 0000000..05573c6
--- /dev/null
+++ b/net/rpcbind/HISTORY
@@ -0,0 +1,3 @@
+2010-04-07 Elisamuel Resto <ryuji AT sourcemage.org>
+ * CONFLICTS, DEPENDS, DETAILS, PROVIDES: spell created
+
diff --git a/net/rpcbind/PROVIDES b/net/rpcbind/PROVIDES
new file mode 100755
index 0000000..cb7cc02
--- /dev/null
+++ b/net/rpcbind/PROVIDES
@@ -0,0 +1 @@
+PORT-MAPPER
diff --git a/net/rpcbind/init.d/rpcbind b/net/rpcbind/init.d/rpcbind
new file mode 100644
index 0000000..ba9083d
--- /dev/null
+++ b/net/rpcbind/init.d/rpcbind
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PROGRAM="/usr/bin/rpcbind"
+RUNLEVEL=3
+PROVIDES="portmap"
+
+. /etc/init.d/smgl_init
diff --git a/net/ypbind-mt/DEPENDS b/net/ypbind-mt/DEPENDS
index 1fa29be..a9159c2 100755
--- a/net/ypbind-mt/DEPENDS
+++ b/net/ypbind-mt/DEPENDS
@@ -1 +1 @@
-depends portmap
+depends PORT-MAPPER
diff --git a/net/ypbind-mt/HISTORY b/net/ypbind-mt/HISTORY
index 9b68637..e919093 100644
--- a/net/ypbind-mt/HISTORY
+++ b/net/ypbind-mt/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: changed portmap dependency to PORT-MAPPER provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 54eb4ca..4899b28 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -5,11 +5,11 @@ depends sqlite &&
depends libglade2 &&
depends webkitgtk &&
depends unique &&
+depends glib2 &&
+depends pango &&
+depends libxslt &&
+depends libsoup &&

-optional_depends gnutls \
- "--enable-gnutls" \
- "--disable-gnutls" \
- "for ssl/https support" &&
optional_depends libnotify \
"" \
"--disable-libnotify" \
@@ -18,7 +18,13 @@ optional_depends lua \
"" \
"--disable-lua" \
"for LUA scripting support" &&
+
optional_depends dbus \
"" \
"--disable-dbus" \
"for dbus support"
+
+optional_depends libsm \
+ "--enable-sm" \
+ "--disable-sm" \
+ "for X session management support"
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 69d0199..2f684b5 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,7 @@
+2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added glib2, pango, libxslt, libsoup, added optional libsm,
+ removed optional gnutls
+
2010-03-07 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 1.6.3

diff --git a/odbc-drivers/myodbc/BUILD b/odbc-drivers/myodbc/BUILD
index 2d643be..88c73de 100755
--- a/odbc-drivers/myodbc/BUILD
+++ b/odbc-drivers/myodbc/BUILD
@@ -1,4 +1,11 @@
-./configure --prefix=/usr \
- --with-unixODBC=/usr/include \
- $OPTS &&
-make
+OPTS="$OPTS --with-mysql-path=/usr" &&
+
+if is_depends_enabled $SPELL libiodbc; then
+ OPTS="$OPTS --with-iODBC=/usr"
+fi &&
+
+if is_depends_enabled $SPELL unixodbc; then
+ OPTS="$OPTS --with-unixODBC=/usr"
+fi &&
+
+default_build
diff --git a/odbc-drivers/myodbc/DEPENDS b/odbc-drivers/myodbc/DEPENDS
index 9467604..3ee2f1a 100755
--- a/odbc-drivers/myodbc/DEPENDS
+++ b/odbc-drivers/myodbc/DEPENDS
@@ -1,3 +1,3 @@
-depends MYSQL &&
-depends ODBC-MGR &&
-optional_depends qt-x11 "" "" "graphical interface"
+depends MYSQL &&
+depends ODBC-MGR &&
+optional_depends qt-x11 "--enable-gui" "--disable-gui" "graphical interface"
diff --git a/odbc-drivers/myodbc/DETAILS b/odbc-drivers/myodbc/DETAILS
index a80187c..addcb37 100755
--- a/odbc-drivers/myodbc/DETAILS
+++ b/odbc-drivers/myodbc/DETAILS
@@ -1,15 +1,22 @@
SPELL=myodbc
SPELLX=mysql-connector-odbc
- VERSION=3.51.23r998
-
SOURCE_HASH=sha512:db39b88a1cc492ffd96040481ae6f54262eaf679d4ddf65e7c63af87f2c7f10387df7ec92fd169ddde388b046f15bdb799a114917df6a1adcaf92bfa4f63e691
- SOURCE=$SPELLX-$VERSION.tar.gz
- FTP_NAME=Downloads/Connector-ODBC/3.51/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=ftp://mirrors.dotsrc.org/pub/mysql/$FTP_NAME
+ VERSION=5.1.6
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ MIRROR_DL_PATH="Downloads/Connector-ODBC/${VERSION:0:3}/${SOURCE}"
+ SOURCE_URL[0]=ftp://mirrors.dotsrc.org/mysql/$MIRROR_DL_PATH
+ SOURCE_URL[1]=http://mysql.he.net/$MIRROR_DL_PATH
+
SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.mysql.com/$MIRROR_DL_PATH
+ SOURCE2="$SPELLX-$VERSION.tar.gz.asc"
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="mysql.gpg:$SOURCE2:UPSTREAM_KEY"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.mysql.com
ENTERED=20030401
LICENSE[0]=GPL
- KEYWORDS="mysql database libs"
+ KEYWORDS="mysql database libs odbc"
SHORT="Connect to a MySQL database server using the ODBC database
API"
cat << EOF
MySQL Connector/ODBC (also known as MyODBC) allows you to connect to a MySQL
diff --git a/odbc-drivers/myodbc/FINAL b/odbc-drivers/myodbc/FINAL
index ab483e5..e435cc4 100755
--- a/odbc-drivers/myodbc/FINAL
+++ b/odbc-drivers/myodbc/FINAL
@@ -1 +1 @@
-myodbc3i -a -d -t"MySQL ODBC 3.51
Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
+myodbc-installer -d -a -n "MySQL ODBC 5.1.6 Driver" -t
"DRIVER=/usr/lib/libmyodbc5.so;SETUP=/usr/lib/libmyodbc5S.so"
diff --git a/odbc-drivers/myodbc/HISTORY b/odbc-drivers/myodbc/HISTORY
index a8cded7..e2d7729 100644
--- a/odbc-drivers/myodbc/HISTORY
+++ b/odbc-drivers/myodbc/HISTORY
@@ -1,3 +1,9 @@
+2010-04-12 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated version to 5.1.6; made use of upstream GPG key;
new SOURCE_URLs
+ * DEPENDS: changed the qt-x11 option (gui is enabled by default
otherwise)
+ * PRE_REMOVE, FINAL, POST_RESURRECT: changed to reflect new binary for
+ registering drivers and option changes
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/odbc-drivers/myodbc/POST_RESURRECT
b/odbc-drivers/myodbc/POST_RESURRECT
index ab483e5..e435cc4 100755
--- a/odbc-drivers/myodbc/POST_RESURRECT
+++ b/odbc-drivers/myodbc/POST_RESURRECT
@@ -1 +1 @@
-myodbc3i -a -d -t"MySQL ODBC 3.51
Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
+myodbc-installer -d -a -n "MySQL ODBC 5.1.6 Driver" -t
"DRIVER=/usr/lib/libmyodbc5.so;SETUP=/usr/lib/libmyodbc5S.so"
diff --git a/odbc-drivers/myodbc/PRE_REMOVE b/odbc-drivers/myodbc/PRE_REMOVE
index 8552902..6004f1c 100755
--- a/odbc-drivers/myodbc/PRE_REMOVE
+++ b/odbc-drivers/myodbc/PRE_REMOVE
@@ -1 +1 @@
-myodbc3i -r -d -t"MySQL ODBC 3.51 Driver"
+myodbc-installer -d -r -n "MySQL ODBC 5.1.6 Driver"
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 3c02aae..655ee2f 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -30,6 +30,8 @@ if [[ "${PHP5_GD}" == "internal" ]]; then
OPTS="--with-gd --enable-gd-native-ttf ${OPTS}"
fi &&

+CFLAGS="${CFLAGS//-ffast-math}" &&
+
OPTS=" --with-exec-dir=${INSTALL_ROOT}/usr/bin \
--with-config-file-path=${INSTALL_ROOT}/etc \
--disable-rpath \
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index fe1a56c..2400677 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -4,6 +4,15 @@ if [[ $PHP5_BRANCH == stable ]]; then

SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
+
+ if [[ $PHP5_SUHOSIN == y ]]; then
+ VERSION2=0.9.9.1
+ SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
+ SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
+ SOURCE3=$SOURCE2.sig
+ SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
+ SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
+ fi
elif [[ $PHP5_BRANCH == alpha ]]; then
VERSION=5.3.2

SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
@@ -15,14 +24,6 @@ elif [[ $PHP5_BRANCH == legacy ]]; then

SOURCE_HASH=sha512:6b099c7854dff5047b96ddd52a901ce67cae735142f10dda0ab0808a0d592c957b499d76f4c21d0050f1f6ae1d66fb2fecbd9840af170a97971ad41fdd626191
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
- if [[ $PHP5_SUHOSIN == y ]]; then
- VERSION2=0.9.7
- SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
- SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
- SOURCE3=$SOURCE2.sig
- SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
- SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
- fi
else
VERSION=5.3.2
SECURITY_PATCH=9
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index febd54b..abbbb60 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD: SQLite (and other DBMS's) dont like -ffast-math (in fact,
they filter it)
+ * PREPARE, DETAILS: suhosin was updated to 0.9.9.1 and now works with
php 5.3
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 99fb3b0..353276b 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -6,6 +6,5 @@ config_query_list PHP5_BRANCH "Which branch?" \

if [[ $PHP5_BRANCH != alpha ]] && [[ $PHP5_BRANCH != rc ]]; then
message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
- message "${MESSAGE_COLOR}Currently the Suhosin patchset forces version 5.2
of php${DEFAULT_COLOR}" &&
config_query PHP5_SUHOSIN "Do you want the Suhosin patchset enabled?" n
fi
diff --git a/python-pypi/obfuscate/DETAILS b/python-pypi/obfuscate/DETAILS
index 9bcb505..4111ad2 100755
--- a/python-pypi/obfuscate/DETAILS
+++ b/python-pypi/obfuscate/DETAILS
@@ -1,9 +1,9 @@
SPELL=obfuscate
- VERSION=0.2.2b
+ VERSION=0.2.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pypi.python.org/packages/source/o/obfuscate/$SOURCE
-
SOURCE_HASH=sha512:a525df1e1fd1088ec549d4c246371343349539df250ca8db46f344b090bf74394c49935e42f0bc4e00b10c1f5aa090d503f9cb6f5090d16586bd21c56bba9a52
+
SOURCE_HASH=sha512:c6c31c1fc3d6328bc093229a4f45b8994ce0d3776baebe257513d22354b224896e9017f7749b49b9f03b525e6f703b3b69db9500ae7a87bd150254cb303d0458
WEB_SITE=http://pypi.python.org/pypi/obfuscate/
ENTERED=20102022
LICENSE[0]=MIT
diff --git a/python-pypi/obfuscate/HISTORY b/python-pypi/obfuscate/HISTORY
index f02cf80..71b6468 100644
--- a/python-pypi/obfuscate/HISTORY
+++ b/python-pypi/obfuscate/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.2
+
2010-02-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS: spell created, version 0.2.2b

diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index 6005dfb..b20e4c1 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,6 +1,6 @@
SPELL=scons
- VERSION=1.2.0
-
SOURCE_HASH=sha512:7a2abb76fac88b9a2508a9e39b6097e326ba75d567c1522c8b580030164bb4b5791d52c500ab889d83cbf5211efef8e9f9fe800c363d9e264619ea995dcf637e
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:a2bf51e95f17bab64f75d645e5f391eefad6cac6b01edf07447da8b45aa1c9a8b5e9cebf70a236274ca02b3e124afebf3d1de8e5bfb41b4c4c150fc9730d4409
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index 686fe5b..65ebb5b 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0
+
2009-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0

diff --git a/python-pypi/sqlobject/DETAILS b/python-pypi/sqlobject/DETAILS
index c3df576..d56d5d8 100755
--- a/python-pypi/sqlobject/DETAILS
+++ b/python-pypi/sqlobject/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlobject
CHEESESHOP_PKG=SQLObject
- VERSION=0.12.2
-
SOURCE_HASH=sha512:397325fc863a307e8fcef7d31a033cc79ef88393b113c56aa94a0c277fc43497abd8e23cd4dd9848ae8ed564ff386f92f6e98d056d933e49f8dfa1b2e45bcc49
+ VERSION=0.12.3
+
SOURCE_HASH=sha512:f2d9e9df58283aca268819292decce4009262c6ad600dcdc17e4ab612214d9ac0d23cae7a1fefce23a216243390fb171ead32dfb8962a87d15814c9c30f059c1
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://pypi.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$CHEESESHOP_PKG-$VERSION"
diff --git a/python-pypi/sqlobject/HISTORY b/python-pypi/sqlobject/HISTORY
index c243857..6f9923a 100644
--- a/python-pypi/sqlobject/HISTORY
+++ b/python-pypi/sqlobject/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.12.3
+
2010-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.12.2

diff --git a/science-libs/glpk/DETAILS b/science-libs/glpk/DETAILS
index 8097847..d7969d7 100755
--- a/science-libs/glpk/DETAILS
+++ b/science-libs/glpk/DETAILS
@@ -1,5 +1,5 @@
SPELL=glpk
- VERSION=4.39
+ VERSION=4.43
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/science-libs/glpk/HISTORY b/science-libs/glpk/HISTORY
index 80150ac..6b30a99 100644
--- a/science-libs/glpk/HISTORY
+++ b/science-libs/glpk/HISTORY
@@ -1,3 +1,6 @@
+2010-04-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.43
+
2009-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.39

diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 8e9bd50..fcbb270 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,8 @@
+2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_SUB_DEPENDS,
+ REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS: Fixed
+ PRE_SUB_DEPENDS for howl and libdns_sd compatibility
+
2010-04-04 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, CONFIGURE: add options to install howl and libdns_sd
compatibility layers

@@ -100,4 +105,3 @@

2006-06-26 Pieter Lenaerts <e-type AT sourcemage.org>
* BUILD, DETAILS, DEPENDS, HISTORY: created spell
-
diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS
index 9d9392d..534017b 100755
--- a/utils/avahi/PRE_SUB_DEPENDS
+++ b/utils/avahi/PRE_SUB_DEPENDS
@@ -1,7 +1,15 @@
case $THIS_SUB_DEPENDS in
- MONO) if is_depends_enabled $SPELL mono; then return 0; fi;;
- QT3) if is_depends_enabled $SPELL qt-x11; then return 0; fi;;
- QT4) if is_depends_enabled $SPELL qt4; then return 0; fi;;
- GTK2) if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
-esac &&
+ MONO)
+ if is_depends_enabled $SPELL mono; then return 0; fi;;
+ QT3)
+ if is_depends_enabled $SPELL qt-x11; then return 0; fi;;
+ QT4)
+ if is_depends_enabled $SPELL qt4; then return 0; fi;;
+ GTK2)
+ if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+ COMPAT_LIBDNS_SD)
+ if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
+ COMPAT_HOWL)
+ if [[ "$AVAHI_COMPAT_HOWL" == y ]]; then return 0; fi;;
+esac &&
return 1
diff --git
a/utils/avahi/REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS
b/utils/avahi/REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..534017b
--- /dev/null
+++ b/utils/avahi/REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+ MONO)
+ if is_depends_enabled $SPELL mono; then return 0; fi;;
+ QT3)
+ if is_depends_enabled $SPELL qt-x11; then return 0; fi;;
+ QT4)
+ if is_depends_enabled $SPELL qt4; then return 0; fi;;
+ GTK2)
+ if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+ COMPAT_LIBDNS_SD)
+ if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
+ COMPAT_HOWL)
+ if [[ "$AVAHI_COMPAT_HOWL" == y ]]; then return 0; fi;;
+esac &&
+return 1
diff --git a/utils/fam/DEPENDS b/utils/fam/DEPENDS
index 5a3dc58..a3bea4b 100755
--- a/utils/fam/DEPENDS
+++ b/utils/fam/DEPENDS
@@ -1,4 +1,4 @@
-depends autoconf &&
-depends automake &&
-depends libtool &&
-depends portmap
+depends autoconf &&
+depends automake &&
+depends libtool &&
+depends PORT-MAPPER
diff --git a/utils/fam/HISTORY b/utils/fam/HISTORY
index 47a23be..5ae9c91 100644
--- a/utils/fam/HISTORY
+++ b/utils/fam/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: changed portmap dependency to PORT-MAPPER provider
+
2008-12-15 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Moved patch to PRE_BUILD
* PRE_BUILD: Added files for patches.
diff --git a/utils/fbgetty/DETAILS b/utils/fbgetty/DETAILS
index b3566ae..547a072 100755
--- a/utils/fbgetty/DETAILS
+++ b/utils/fbgetty/DETAILS
@@ -1,11 +1,8 @@
SPELL=fbgetty
VERSION=0.1.698
SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE2=${SPELL}-${VERSION}-gcc41.patch
SOURCE_URL[0]=http://projects.meuh.org/${SPELL}/downloads/${SOURCE}
-
SOURCE2_URL[0]=http://nest.homeunix.net/repos/portage/net-dialup/$SPELL/files/$SOURCE2

SOURCE_HASH=sha512:942304ac00ecfaad59419a0994331e59d91269ee015e3bd38faa85db0b205e6e88e1958b65e503f59b81f050a1e110aeea6534eecb3ba010096a6b5173fd1ac5
-
SOURCE2_HASH=sha512:a53e5f9e2880362d023d6fc017bd49d519c25ea3395f606f5dafccc52a72d80e18bf6cd345a732733e4f252c9e5fddbbf02dd63a2d4c6ee808073fc895be5a9f
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://projects.meuh.org/fbgetty/
ENTERED=20051216
diff --git a/utils/fbgetty/HISTORY b/utils/fbgetty/HISTORY
index 6a8a835..06d853d 100644
--- a/utils/fbgetty/HISTORY
+++ b/utils/fbgetty/HISTORY
@@ -1,3 +1,7 @@
+2010-04-09 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: removed gcc41 patch, using patch from archlinux, which
adds a header
+ * DETAILS: removed gcc41 patch, source url is dead
+
2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
* PROVIDES: added, provides GETTY

diff --git a/utils/fbgetty/PRE_BUILD b/utils/fbgetty/PRE_BUILD
index 4780b85..e9d7158 100755
--- a/utils/fbgetty/PRE_BUILD
+++ b/utils/fbgetty/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-verify_file 2 &&
-patch -p1 < $SOURCE_CACHE/fbgetty-0.1.698-gcc41.patch
+patch src/options.c <<EOF
+33a34
+> #include <stddef.h>
+EOF
diff --git a/utils/hercules/DETAILS b/utils/hercules/DETAILS
index 196572d..aaec4e9 100755
--- a/utils/hercules/DETAILS
+++ b/utils/hercules/DETAILS
@@ -1,10 +1,10 @@
SPELL=hercules
- VERSION=3.06
+ VERSION=3.07
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.hercules-390.org/$SOURCE
+ SOURCE_URL[0]=http://www.ibiblio.org/jmaynard/herc307/$SOURCE
WEB_SITE=http://www.hercules-390.org
-
SOURCE_HASH=sha512:a938c2be64094ca412fb9094942088e344aa67b0af324af674d4fff73c6e936ffc6e384a5edcb48d1c31439c55322bf5e6b2e7ea36e7e7c9e416d8522240b1c5
+
SOURCE_HASH=sha512:5e4e55e9a11f0b7e78daafe9f219243d298bbdeeaf35f82c862db0c9f0de24f553239d0b76acaf7673cf54d03278193c2f93df3fba410874f95dbf93b5bb0e64
ENTERED=20020411
KEYWORDS="emulator utils"
SHORT="Hercules is an IBM mainframe emulator (S/390)"
diff --git a/utils/hercules/HISTORY b/utils/hercules/HISTORY
index 64cee20..ebfc171 100644
--- a/utils/hercules/HISTORY
+++ b/utils/hercules/HISTORY
@@ -1,3 +1,7 @@
+2010-04-11 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: Update to 3.07
+ Change SOURCE_URL temporary new mirror
+
2010-01-19 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: update to 3.06

diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index 9c7cad0..62c6b45 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -1,9 +1,9 @@
SPELL=kbd
- VERSION=1.15.1
+ VERSION=1.15.2
+
SOURCE_HASH=sha512:8fd80e61699c6869a42e93a3c0833e054e3b8dfe9ec2999b2ba205b08b54ccb675af04eb75a2446ecdecc233e6dfa79f8475b11a75e3812a4afe4d3fc59c7b2e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.altlinux.org/pub/people/legion/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f5f8cd4673765e33dda57fb5dc6b0b478272717aff0cdf6408f9a92a56a62a1890b318b2e83b973d82d96a95629017a2c93d66ca886cb15595a6263f11ec6ad4
WEB_SITE=http://freshmeat.net/projects/kbd/
ENTERED=20011113
LICENSE[0]=GPL
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 0c8e9c8..8e09512 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-11 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version 1.15.2
+>
2009-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.15.1
* DEPENDS, PRE_BUILD: added autoconf
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index d0ef677..82a2827 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,7 +1,7 @@
SPELL=rsyslog

if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
- VERSION=5.5.2
+ VERSION=5.5.3
SECURITY_PATCH=1

SOURCE_HASH=sha512:3a95eca64f97322f36723fb8c602e86e54eb0f9d942696b5ff3428774a2741e102cc54562db7a515f2b2da52c85b9138ec63c0fd506f8374e57c21bbf1cc257c
elif [[ "${RSYSLOG_BRANCH}" == "v4stable" ]]; then
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 799a39a..b56e30c 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: devel branch updated to 5.5.3
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/utils/smartmontools/DETAILS b/utils/smartmontools/DETAILS
index ac457b1..31f720f 100755
--- a/utils/smartmontools/DETAILS
+++ b/utils/smartmontools/DETAILS
@@ -1,6 +1,6 @@
SPELL=smartmontools
- VERSION=5.39
-
SOURCE_HASH=sha512:8cc071e96488acad4361839eaad34cc4ba99fcac11c3269fe03ef3a8dcbe210d9f0f74de9a8ff8b3bb4bb30518621075ec947eab7e973cf1b19d84e2644724be
+ VERSION=5.39.1
+
SOURCE_HASH=sha512:e54c844dc71cee127cf026b9778dae6e9e2d79fed466911bce56b7491a5b3b8516a929e1a491408b5c6789bf581c53ab58e3fb513b1e224f9e530e29694413ed
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/smartmontools/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/smartmontools/HISTORY b/utils/smartmontools/HISTORY
index d64327a..444f07d 100644
--- a/utils/smartmontools/HISTORY
+++ b/utils/smartmontools/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.39.1
+
2009-12-12 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 5.39

diff --git a/video-libs/libraw1394/DETAILS b/video-libs/libraw1394/DETAILS
index 13bbbc3..54054b3 100755
--- a/video-libs/libraw1394/DETAILS
+++ b/video-libs/libraw1394/DETAILS
@@ -1,6 +1,6 @@
SPELL=libraw1394
- VERSION=2.0.4
-
SOURCE_HASH=sha512:bb4378193ea41c5bb74562b852e49ad59112cd56ca5621ea79f1a8d1a4348bf2b56c14b6f63697cb2effe87feb26b2a0e2667e234c2bcd7060147e1e0efcbd7a
+ VERSION=2.0.5
+
SOURCE_HASH=sha512:602b1e0280323683c88b7176a3228ca72c65de3eecdeee394a606cbe1d074921498ea088366f0a15644f70cdab5140d227f501f7689c722fe6c6ffa7e5b82144
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL
diff --git a/video-libs/libraw1394/HISTORY b/video-libs/libraw1394/HISTORY
index 5218185..a6d1caa 100644
--- a/video-libs/libraw1394/HISTORY
+++ b/video-libs/libraw1394/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.0.5
+
2009-12-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated SOURCE_URL & WEBSITE

diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
index 562a124..2af737c 100755
--- a/windowmanagers/awesome/DEPENDS
+++ b/windowmanagers/awesome/DEPENDS
@@ -17,11 +17,12 @@ depends startup-notification &&
depends imlib2 &&
depends libxdg-basedir &&

-optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&
+optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&

-optional_depends xmlto '' '' 'For manpage generation' &&
-optional_depends docbook-xsl '' '' 'For manpage generation' &&
-optional_depends asciidoc '' '' 'For manpage generation' &&
-optional_depends graphviz '' '' 'For the sourcecode reference' &&
+optional_depends xmlto '' '' 'For manpage generation' &&
+optional_depends docbook-xsl '' '' 'For manpage generation' &&
+optional_depends asciidoc '' '' 'For manpage generation' &&
+optional_depends luadoc '' '' 'For generating LUA API documentation' &&
+optional_depends graphviz '' '' 'For the sourcecode reference' &&
optional_depends doxygen '' '' 'For the sourcecode reference'

diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index db2c38c..040e1b3 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,4 +1,7 @@
2010-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: Added optional dependency on luadoc
+
+2010-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.4.4

2010-01-06 Arjan Bouter <abouter AT sourcemage.org>
diff --git a/wm-addons/cairo-dock-plugins/DETAILS
b/wm-addons/cairo-dock-plugins/DETAILS
index f5fb600..0506daf 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,10 +1,10 @@
SPELL=cairo-dock-plugins
- VERSION=2.1.2-4
+ VERSION=2.1.3-8
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
-
SOURCE_HASH=sha512:aa1be3763e05a07377d578b4468230c3cf52f8a628f1f85cc14a988c63eb927fe96432279234e1bba9a2cd7c758ad852f0641c7a9e0326f94f24dd52e2b1f760
+
SOURCE_HASH=sha512:f31c99d72fb644ded22d0902cd962ebe67b62c8619eae653e182fee451a365e7cbbbec2d87a595204d0112808fc16e776d443a1dd753daf30225393f8e3b26ae
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE=http://cairo-dock.org/
+ WEB_SITE=http://glx-dock.org/
LICENSE[0]=GPL
ENTERED=20090608
SHORT="a set of plugins for the cairo-dock"
diff --git a/wm-addons/cairo-dock-plugins/HISTORY
b/wm-addons/cairo-dock-plugins/HISTORY
index b043b91..c6e4a3e 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.3-8, updated WEB_SITE
+
2009-12-28 Finn Haedicke <finn AT sourcemage.org>
* DETAILS: updated spell to 2.1.2-4

diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index 4d37622..71c1400 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,10 +1,10 @@
SPELL=cairo-dock
- VERSION=2.1.3-3
+ VERSION=2.1.3-8
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
-
SOURCE_HASH=sha512:52ff4f72affba1b8e95a366ef5fd1f577a8d476f4b43d24876207839ba2079b29ffe56f371b6b00868a89095b681b61182d2fb1b36ff1e8a0aec47e2cbe8b6a3
+
SOURCE_HASH=sha512:bbdecf0977f3f071f5b1f8112af9bf0f9a7c2e349d127acb5895642ae338507496efad8a2c7a61a483d928e55e895c43f52d7fa7028138c689d2cab625d4db44
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://cairo-dock.org/";
+ WEB_SITE="http://glx-dock.org/";
LICENSE[0]=GPL
ENTERED=20090608
SHORT="A light, fully themable OSX-like dock for any Linux
desktop."
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index c2660e5..2026157 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.3-8, updated WEB_SITE
+
2010-01-16 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updated spell to 2.1.3-3
* DEPENDS: added librsvg and gtkglext
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 739b566..fa78872 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -1,20 +1,12 @@
depends glib2 &&
depends atk &&
depends pango &&
-depends -sub "PDF PS X" cairo &&
+depends -sub "PDF PS SVG X" cairo &&
depends libsm &&
depends libxext &&
depends libxcursor &&
depends libxrender &&

-if spell_ok $SPELL; then
- if spell_ok cairo; then
- # sub_depend on svg support in cair for file
- # print backend, requires this hack due to
- # circular dependency
- sub_depends cairo SVG
- fi
-fi &&
optional_depends libpng \
"--with-libpng" \
"--without-libpng" \
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 101a2bc..b7fef1d 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,9 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: always sub_depend on SVG in cairo, the circular dependency
+ is gone and it's required now, bug #15664
+ * PRE_BUILD: removed, not needed anymore because SVG in cairo is
+ always required to be there
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated GTK_VER=stable to 2.20.0

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
deleted file mode 100755
index 9cf74aa..0000000
--- a/x11-toolkits/gtk+2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-if [[ ! -f $INSTALL_ROOT/usr/include/cairo/cairo-svg.h ]]; then
-sed -i 's/SUBDIRS = file/SUBDIRS = /' modules/printbackends/Makefile.in
-fi



  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (fbb9e5c23b7a2da08fe821577827c143e732c78b), Eric Sandall, 04/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page