summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjan Bouter2009-08-01 20:27:53 +0200
committerArjan Bouter2009-08-01 20:27:53 +0200
commit15506458953d993406f053f5e940358b853b4c21 (patch)
tree5d55eb4293d9e83591951e1fcb0965dbffc8c140
parentbb596c3746144685faef4299d5442f597096b207 (diff)
parent631da1e80286503b358f44613bd18dbe8426be4b (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog6
-rwxr-xr-xaudio-creation/ardour2/DEPENDS1
-rwxr-xr-xaudio-creation/ardour2/DETAILS4
-rw-r--r--audio-creation/ardour2/HISTORY10
-rwxr-xr-xaudio-creation/ardour2/PRE_BUILD4
-rw-r--r--audio-creation/ardour2/libsndfile-ext.patch28
-rwxr-xr-xaudio-drivers/jack2/DEPENDS4
-rwxr-xr-xaudio-drivers/jack2/DETAILS4
-rw-r--r--audio-drivers/jack2/HISTORY4
-rwxr-xr-xaudio-drivers/libffado/DETAILS19
-rw-r--r--audio-drivers/libffado/HISTORY4
-rwxr-xr-xaudio-drivers/libffado/PREPARE3
-rwxr-xr-xchat-im/psi/DETAILS8
-rw-r--r--chat-im/psi/HISTORY3
-rwxr-xr-xdatabase/firebird/DETAILS6
-rw-r--r--database/firebird/HISTORY7
-rwxr-xr-xdatabase/firebird/PRE_BUILD2
-rw-r--r--database/firebird/fb2.5.patch.bz2bin4491 -> 4216 bytes
-rwxr-xr-xdevel/ghc/DETAILS8
-rw-r--r--devel/ghc/HISTORY3
-rwxr-xr-xgraphics-libs/mesalib/DEPENDS2
-rw-r--r--graphics-libs/mesalib/HISTORY8
-rwxr-xr-xgraphics-libs/mesalib/PRE_BUILD1
-rwxr-xr-xgraphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS31
-rwxr-xr-xhttp/webkitgtk/DETAILS4
-rw-r--r--http/webkitgtk/HISTORY3
-rwxr-xr-xkde4/kdepim4-runtime/CONFIGURE1
-rwxr-xr-xkde4/kdepim4-runtime/DEPENDS6
-rwxr-xr-xkde4/kdepim4-runtime/DETAILS36
-rw-r--r--kde4/kdepim4-runtime/HISTORY5
-rwxr-xr-xkde4/kdepim4-runtime/TRIGGERS1
-rwxr-xr-xlibs/cdk/DEPENDS3
-rwxr-xr-xlibs/cdk/DETAILS20
-rw-r--r--libs/cdk/HISTORY5
-rwxr-xr-xlibs/libdrm/BUILD3
-rwxr-xr-xlibs/libdrm/CONFIGURE1
-rw-r--r--libs/libdrm/HISTORY3
-rwxr-xr-xutils/clamz/DEPENDS3
-rwxr-xr-xutils/clamz/DETAILS17
-rw-r--r--utils/clamz/HISTORY3
-rwxr-xr-xxorg-lib/xtrans/DETAILS4
-rw-r--r--xorg-lib/xtrans/HISTORY4
-rw-r--r--xorg-lib/xtrans/xtrans-1.2.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-xserver/xorg-server/DETAILS5
-rw-r--r--xorg-xserver/xorg-server/HISTORY4
-rw-r--r--xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sigbin0 -> 287 bytes
46 files changed, 241 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index 63f4824b31..6625968041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-01 Thomas Orgis <sobukus@sourcemage.org>
+ * utils/clamz: new spell; Amazon MP3 downloader replacement
+
+2009-08-01 Treeve Jelbert <treeve@sourcemage.org>
+ * kde4/kdepim4-runtime: new spell, bits split from kdepim4
+
2009-07-31 Arjan Bouter <abouter@sourcemage.org>
* accounts,groups: added tss account and pkcs11 + tss groups
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 58c622eefd..7d97cea736 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -16,6 +16,7 @@ depends aubio &&
depends liblo &&
depends alsa-lib &&
depends libsamplerate &&
+depends libsndfile &&
depends fftw &&
depends JACK-DRIVER &&
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 93c73b6be4..e1bb74aa2f 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -1,6 +1,6 @@
SPELL=ardour2
- VERSION=2.8
- SOURCE_HASH=sha512:b83c1a07e87a47b327f29ce30f694f7d3a94e67e5e7f5088dc31a323fe81745ac6a38d090634eebe0a0b5e7a7becfd06a6039c895dc981d773ec7818d39752ff
+ VERSION=2.8.2
+ SOURCE_HASH=sha512:fc41d08b7d5af34ec63e389e70ef87665b63c143fb610dba4f7f3046c033e325be85325229250a0bf46b201bb76367fb60cfda6cdfc3ecca7ade9269e5696fb1
SOURCE=ardour-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
# that does not work anymore... they want to force manual downloads:-(
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index e7c0849de9..0cdae7c521 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,13 @@
+2009-08-01 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: quoting paths, cleaned up
+ * DEPENDS: added missing libsndfile dep
+ * libsndfile-ext.patch: updated for the new version
+
+2009-08-01 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS: updated spell to 2.8.2
+ * PRE_BUILD: Do not apply external libsndfile patch, it needs fixing
+ (sorry, Vlad - I hope you manage to do it)
+
2009-04-23 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: switch to self-hosted mirror since automatic download does not work anymore
diff --git a/audio-creation/ardour2/PRE_BUILD b/audio-creation/ardour2/PRE_BUILD
index c17abc7f2a..47c3af173d 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -1,5 +1,5 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
patch -p0 < "$SPELL_DIRECTORY/mime.patch" &&
patch -p0 < "$SPELL_DIRECTORY/libsndfile-ext.patch" &&
diff --git a/audio-creation/ardour2/libsndfile-ext.patch b/audio-creation/ardour2/libsndfile-ext.patch
index cb9c29a6ee..e9aa73ca6c 100644
--- a/audio-creation/ardour2/libsndfile-ext.patch
+++ b/audio-creation/ardour2/libsndfile-ext.patch
@@ -1,17 +1,13 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -459,8 +459,8 @@ libraries = { }
+--- SConstruct.orig 2009-07-20 19:55:10.000000000 +0400
++++ SConstruct 2009-08-01 16:08:33.746802538 +0400
+@@ -1077,14 +1077,16 @@
+ libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
+ libraries['libgnomecanvasmm'] = LibraryInfo()
+ libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
++ libraries['sndfile-ardour'] = LibraryInfo()
++ libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile')
- libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
-
--#libraries['sndfile'] = LibraryInfo()
--#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
-+libraries['sndfile-ardour'] = LibraryInfo()
-+libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile')
-
- libraries['lrdf'] = LibraryInfo()
- libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
-@@ -861,9 +861,9 @@ if env['SYSLIBS']:
+ #
# cannot use system one for the time being
#
@@ -19,12 +15,12 @@
- LIBPATH='#libs/libsndfile',
- CPPPATH=['#libs/libsndfile/src'])
+# libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-+# LIBPATH='#libs/libsndfile',
-+# CPPPATH=['#libs/libsndfile/src'])
++# LIBPATH='#libs/libsndfile',
++# CPPPATH=['#libs/libsndfile/src'])
# libraries['libglademm'] = LibraryInfo()
# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
-@@ -883,7 +883,6 @@ if env['SYSLIBS']:
+@@ -1105,7 +1107,6 @@
]
subdirs = [
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index 63a26fe283..62f6f66e2f 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -16,5 +16,5 @@ optional_depends doxygen \
optional_depends dbus \
"--dbus" \
- "" \
- "to enable the D-Bus control interface"
+ "--classic" \
+ "to enable the D-Bus control interface (instead of classic jackd!)"
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 3fea686a6e..9805ff05cc 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -11,10 +11,10 @@ if [[ $JACK2_VCS == y ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=1.9.2
+ VERSION=1.9.3
SOURCE=jack-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.grame.fr/~letz/$SOURCE
- SOURCE_HASH=sha512:f6cb521a600dbefd608ef73e6cee2b63119925765e9a038fccecfecf35273b0254bcbbc5362e4e28d3302cc3765a5f98f03546d2d5cc133d6f71952852b82979
+ SOURCE_HASH=sha512:b276f7f430bae1b8ca7dad917202a95527efcba5eb6e73f579921aee54e0c7e0b3bf2dcf04a0f252e1b175f15326c306639c9fdb95e89b3513f775c25af24891
SOURCE_DIRECTORY="$BUILD_DIRECTORY/jack-$VERSION"
fi
WEB_SITE=http://jackaudio.org/
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index b12aeac954..e405b1c3ae 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS: updated spell to 1.9.3
+ * DEPENDS: switch between classic and dbus, explicitly
+
2009-04-14 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.9.2
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index 965b52facc..90b38bec78 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -1,15 +1,22 @@
SPELL=libffado
-if [[ $FFADO_VCS_AUTOUPDATE == y ]]
-then
+if [[ "$FFADO_VCS" == y ]]; then
+ if [[ "$FFADO_VCS_AUTOUPDATE" == y ]]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_URL=svn_http://subversion.ffado.org/ffado/branches/libffado-2.0:$SPELL-svn
- SOURCE_IGNORE=volatile
+ SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+else
+ VERSION=2.0-rc2
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL="http://www.ffado.org/files/$SOURCE"
+ SOURCE_HASH=sha512:ba5444621bc82d03b53f71f987430975f204decfbf635128b4e070bce93e9f70a2301bcea21205bf5538ad29f93422607fed9129f9589462b2ac0a5b28353341
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://www.ffado.org
ENTERED=20080713
LICENSE[0]=GPL
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 9e7745cbbb..90d3f071e6 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS, PREPARE: Added new release candidate as "stable" version,
+ svn as option; no testing on alpha: that patch may vanish...
+
2008-11-24 Thomas Orgis <sobukus@sourcemage.org>
* PRE_BUILD, libffado-dbus.mainloop.qt.patch: patch not needed anymore
diff --git a/audio-drivers/libffado/PREPARE b/audio-drivers/libffado/PREPARE
index b2217e5f5c..aee38b2df6 100755
--- a/audio-drivers/libffado/PREPARE
+++ b/audio-drivers/libffado/PREPARE
@@ -1,2 +1,5 @@
+config_query FFADO_VCS "Build development version?" n
+if [[ $FFADO_VCS = y ]]; then
config_query FFADO_VCS_AUTOUPDATE \
"Automatically update on every system update?" n
+fi
diff --git a/chat-im/psi/DETAILS b/chat-im/psi/DETAILS
index aa3c377519..9d4462a1c9 100755
--- a/chat-im/psi/DETAILS
+++ b/chat-im/psi/DETAILS
@@ -1,19 +1,19 @@
SPELL=psi
if [ "$DEVEL" == "y" ]; then
- VERSION=0.13-rc3
+ VERSION=0.13
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:36af4adddec3d82abcb1ab405f862bd38c1121f9212e0d40b678585fd3422af4d11ab3e6d757d4a83cd6fd0985bf4687ca8278896060ae29306709c425289ce4
+ SOURCE_HASH=sha512:b16af634fea70242dcf578c898a66d1040f0f5bc2c7f6367f8454bdfa0bd8688587ef6b167e66a8722c1336892f28d6d0fe4af71506cf3cf500b8752df459dc5
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
else
- VERSION=0.12.1
+ VERSION=0.13
SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:03835ab10d2e392fd84897e8b47fcb555f22ddea62847bef08d5426b8bb727598fc2560a8ebf9b698ec8289258b195d7c59704426d0a6cee4b7b37fb9036097c
+ SOURCE_HASH=sha512:b16af634fea70242dcf578c898a66d1040f0f5bc2c7f6367f8454bdfa0bd8688587ef6b167e66a8722c1336892f28d6d0fe4af71506cf3cf500b8752df459dc5
fi
WEB_SITE=http://psi-im.org/
LICENSE=GPL
diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY
index 36dff86599..84a028dcef 100644
--- a/chat-im/psi/HISTORY
+++ b/chat-im/psi/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated stable and devel to 0.13
+
2009-07-11 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated devel to 0.13-rc3
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 320b2f798e..3c66f1deb8 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,9 +1,10 @@
SPELL=firebird
case $FB_VER in
2.5)
- VERSION=2.5.0.23247-Beta1
- SOURCE_HASH=sha512:c7ef2d5d1e031465df317bc30436971c7ba4357c286e022da2a74c30f2d39159aba8129324da674a942b5d3d259318b5f75514637e6f8501ab144d7964d3cef3
+ VERSION=2.5.0.24643-Beta2
+ SOURCE_HASH=sha512:816144a2baac37d077864f7d809c3b0b2351703e4ab0a034b33fe51e8e1593fb3ddc12454ab249cab9f227360443c526f5d6c92eba2d69aa75d743354dc46c7d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
+ SECURITY_PATCH=1
;;
2.0)
VERSION=2.0.5.13206-0
@@ -14,6 +15,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
VERSION=2.1.3.18185-0.RC2
SOURCE_HASH=sha512:b1e8b8e5d95b03b4ed2242d9f662f29a328e0bd45917b29840ecc25d5c8b4e7da9708d2e8697e1246be0cc6983fbf1bc13a5fd8328d5033468af3216b2ecb48f
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/\.RC?/}
+ SECURITY_PATCH=1
;;
esac
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 38b1b23173..1e5567ed61 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,10 @@
+2009-08-01 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.5.0.24643-Beta2
+ * fb2.5.patch.bz2: updated
+ * PRE_BUILD: don't delete supplied extern/binreloc
+ * DETAILS: set SECURITY_PATCH=1 for 2.5 & 2.1 versions
+ CVE-2009-2620 <http://www.coresecurity.com/content/firebird-sql-dos>
+
2009-07-25 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.1.3.18185-0.RC2
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index b2a5ac4fe1..379216f5b9 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -12,7 +12,7 @@
# tree /opt/firebird
# remove supplied ICU & editline packages
- rm -rf extern &&
+ rm -rf extern/{SfIO,btyacc,editline,icu} &&
# fix for gcc4 and smgl issues
#apply patches
bzcat ${SPELL_DIRECTORY}/fb${FB_VER}.patch.bz2 | patch -p1 &&
diff --git a/database/firebird/fb2.5.patch.bz2 b/database/firebird/fb2.5.patch.bz2
index 43f3b1d0a2..05f2d072c7 100644
--- a/database/firebird/fb2.5.patch.bz2
+++ b/database/firebird/fb2.5.patch.bz2
Binary files differ
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index c3cf8681f1..246f4fd713 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,17 +1,17 @@
SPELL=ghc
- VERSION=6.10.3
+ VERSION=6.10.4
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.haskell.org/ghc/dist/$VERSION/$SOURCE
- SOURCE_HASH=sha512:7a96a2a194827100035513528bfaab474ad6969db6de04ca9e6ad003b45c0f24de8c70ee39c96ac911f81930a70a4fbb0e890e9ce319505f3282a8e9a9f90d7b
+ SOURCE_HASH=sha512:8f5e448d4dc25cb665a30597a1a46c7bdada91ea19508caec110cc1c8508864e321ae6640c33bb6243d82e31f27c9f0f22012e7432e445806337dc1b534ee413
if [[ ! -x /usr/bin/ghc ]] ; then
ARCH="$(uname -m)"
[[ "$ARCH" = i686 ]] && ARCH=i386
SOURCE2=$SPELL-$VERSION-$ARCH-unknown-linux-n.tar.bz2
SOURCE2_URL[0]=http://www.haskell.org/ghc/dist/$VERSION/$SOURCE2
- SOURCE2_HASH=sha512:37b50b41f7c3073898eda8dd9c3d51b445c0044bf1a54830869e4ac9201299c4ef64c7c565ec00927b301f1f2acd214efccb1397c3ced19187be7bfe542cfa73
- [ "$ARCH" = "x86_64" ] && SOURCE2_HASH=sha512:64e9399c24c6d94f70d85cc872928c883d5176bb25cdd637cd4fd20e8370c63b7a5dcc7ed2d36a08949604b2aa0c408b2f7b090ea0c248a703c8eeaaec49cf3f
+ SOURCE2_HASH=sha512:eab2a9880614c40dee37f06680480210eda3d97b32b5b71f551cd33228cfe00a46a7bf68c8c61fe35e46465dc96da4cd3e0487155651327ae8354a3c91421a6f
+ [ "$ARCH" = "x86_64" ] && SOURCE2_HASH=sha512:9a1d976368549cb51dd718221381ab82614abbc98e5c94f95db9a97b3b59327f78e6fa31ad5801350bff921396caa92e8b4579aedfa9b823bc1639844c725ae5
fi
LICENSE[0]=BSD
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 1c6f9e2ed1..63e29f9c3e 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Peng Chang (Charles) <chp@sourcemage.org>
+ * DETAILS: updated spell to 6.10.4
+
2009-06-08 Peng Chang (Charles) <chp@sourcemage.org>
* DETAILS: updated to 6.10.3
* BUILD: bootstrapping ghc needs more binaries than just ghc,
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 36e566982e..d2218987af 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,7 +16,7 @@ depends libxau &&
depends libxfixes &&
depends glproto &&
-if spell_ok libdrm && [[ $(installed_version libdrm) < 2.4.3 ]]; then
+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 ebc487c2cb..6243db604a 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,11 @@
+2009-07-31 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Bash does not support floating point arithmetic, reduce
+ to integer.
+ Need to use -lt instead of < for comparison otherwise stupid simple
+ math such as 2411 < 243 will be true, but 2411 < 241 will be false.
+ This fixes libdrm always being forced
+ * PRE_BUILD: autogen.sh only exists in GIT checkout so only fix there
+
2009-06-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 7.4.4
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index c668c6130f..1500359151 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -32,5 +32,6 @@ sedit "s:/X11R6::g" Makefile &&
if [[ $MESALIB_GIT == y ]]; then
cd "$SOURCE_DIRECTORY" &&
+ sedit "/.*configure.*/d" autogen.sh &&
./autogen.sh
fi
diff --git a/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS b/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
new file mode 100755
index 0000000000..6081a8e929
--- /dev/null
+++ b/graphics-libs/mesalib/REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS
@@ -0,0 +1,31 @@
+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/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index eda679b4e4..1354ff11d0 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -6,10 +6,10 @@ if [[ $WEBKITGTK_NIGHT == "y" ]]; then
SOURCE_HASH=sha512:a8f24a65484d46ff20fc45e6a4d057e973d39f2bb26fe2d458e11478543d073c6a761e77fe57e81c68a69267680ca9d52e6ac83a09dff0b4d0ab06f87c28d6dd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
else
- VERSION=1.1.11
+ VERSION=1.1.12
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
- SOURCE_HASH=sha512:04a8a9b2ea41bb4120455f2d0d75d04bdc29e316e1794a60668a636a60bf91c41c6f388338327c45fd80aceea58c1880dcaf2c17933338b169de78bc87212ff0
+ SOURCE_HASH=sha512:0cb1ad0ec289b2bc9747bb39001bd9ae1343b917cfdad3c97b0fe0e694639c7cd7f46b13ddf90be46bc5d02f74d5dd606c5648d044e001798a572e8593d3ace5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index a561ed1b7f..43c2611ee8 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated stable to 1.1.12
+
2009-07-22 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated devel to r46193
diff --git a/kde4/kdepim4-runtime/CONFIGURE b/kde4/kdepim4-runtime/CONFIGURE
new file mode 100755
index 0000000000..3e2e1ef447
--- /dev/null
+++ b/kde4/kdepim4-runtime/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdepim4-runtime/DEPENDS b/kde4/kdepim4-runtime/DEPENDS
new file mode 100755
index 0000000000..3a16e4619b
--- /dev/null
+++ b/kde4/kdepim4-runtime/DEPENDS
@@ -0,0 +1,6 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends kdepimlibs4
+#depends akonadi &&
+#depends libical &&
+#optional_depends openldap '' '' 'LDAP functionality' &&
+#optional_depends LIBSASL '' '' 'support authentication of logins'
diff --git a/kde4/kdepim4-runtime/DETAILS b/kde4/kdepim4-runtime/DETAILS
new file mode 100755
index 0000000000..ed08f2ed16
--- /dev/null
+++ b/kde4/kdepim4-runtime/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=kdepim4-runtime
+ SPELLX=${SPELL//4}
+persistent_read kdelibs4 KDE_VER KDE_VER
+persistent_read kdelibs4 KDE_VCS_AUTOUPDATE KDE_VCS_AUTOUPDATE
+if [[ $KDE_VER == devel ]]; then
+ if [[ $KDE_VCS_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE_IGNORE=volatile
+ SOURCE=$SPELLX-svn.tar.bz2
+ SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/KDE/$SPELLX:$SPELL
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-svn"
+ FORCE_DOWNLOAD=on
+else
+ if [[ "${KDE_VER}" == "unstable" ]];then
+ VERSION=4.2.98
+ SOURCE_HASH=sha512:a09bffef9c7dfcb8740a3a288a490ec167baf7aaf3db60114c747bbf3f53e138faa145423a02dfcafec38bfef218af44c041bc98d3c82dfab1c21ad3d91f4806
+ else
+ VERSION=na
+ SOURCE_HASH=sha512:na
+ fi
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION//svn??????}/src/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+fi
+ WEB_SITE=http://www.kde.org
+ ENTERED=20090801
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde4"
+ SHORT=""
+cat << EOF
+kde runtime support for PIM
+EOF
diff --git a/kde4/kdepim4-runtime/HISTORY b/kde4/kdepim4-runtime/HISTORY
new file mode 100644
index 0000000000..da1dc54419
--- /dev/null
+++ b/kde4/kdepim4-runtime/HISTORY
@@ -0,0 +1,5 @@
+2009-08-01 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.2.98 (unstable only)
+ spell created
+ contains some stuff which was previously in kdepim4
+
diff --git a/kde4/kdepim4-runtime/TRIGGERS b/kde4/kdepim4-runtime/TRIGGERS
new file mode 100755
index 0000000000..8508632dac
--- /dev/null
+++ b/kde4/kdepim4-runtime/TRIGGERS
@@ -0,0 +1 @@
+on_cast qt4 check_self
diff --git a/libs/cdk/DEPENDS b/libs/cdk/DEPENDS
index 855acf25ee..5d87e9721d 100755
--- a/libs/cdk/DEPENDS
+++ b/libs/cdk/DEPENDS
@@ -1 +1,2 @@
-depends ncurses '--with-ncurses'
+depends ncurses '--with-ncurses'
+depends libtool '--with-libtool'
diff --git a/libs/cdk/DETAILS b/libs/cdk/DETAILS
index ce4af0d906..20acbcdbd9 100755
--- a/libs/cdk/DETAILS
+++ b/libs/cdk/DETAILS
@@ -1,14 +1,12 @@
- SPELL=cdk
- VERSION=5.0-20060507
- SOURCE_HASH=sha512:77dc6588ff85d2840459b3cb6def61b26276b40416897c195fed7a5e8dcd8a33d8e9e36ba21a36fce8829b9829d316d869ab7ae877add629d4111faf1256341d
- SOURCE=$SPELL-$VERSION.tgz
- SOURCE_URL[0]=ftp://invisible-island.net/cdk/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://dickey.his.com/cdk/cdk.html
- DISTCC_HOSTS=
- CCACHE=off
- ENTERED=20041014
- LICENSE[0]=BSD
+ SPELL="cdk"
+ VERSION="5.0-20090215"
+ SOURCE_HASH="sha512:1afb61c37bf3fd84c33d6a2db9684a8546b71fde7d28b42a921082fc5ab5451b1beef3e6d4cfee6ae7569c37fc2c3a7dbc56228e823de0f1ec072aad881970ec"
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]="ftp://invisible-island.net/cdk/$SOURCE"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tgz}"
+ WEB_SITE="http://invisible-island.net/cdk/cdk.html"
+ ENTERED="20041014"
+ LICENSE[0]="BSD"
KEYWORDS="libs"
SHORT="C based curses widget library"
cat << EOF
diff --git a/libs/cdk/HISTORY b/libs/cdk/HISTORY
index 2cb5117e92..e887f5d8fb 100644
--- a/libs/cdk/HISTORY
+++ b/libs/cdk/HISTORY
@@ -1,3 +1,8 @@
+2009-08-01 Quentin Rameau <quinq@sourcemage.org>
+ * DETAILS: updated to version 5.0-20090215
+ * DEPENDS: added dependency for libtool
+ * BUILD: removed
+
2006-07-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 5.0-20060507, removed BUILD_API and UPDATED
diff --git a/libs/libdrm/BUILD b/libs/libdrm/BUILD
index 7af045b7df..d499a9fb2f 100755
--- a/libs/libdrm/BUILD
+++ b/libs/libdrm/BUILD
@@ -1,4 +1,7 @@
if [[ $LIBDRM_NV == y ]]; then
OPTS="--enable-nouveau-experimental-api $OPTS"
fi &&
+if [[ $LIBDRM_RADEON == y ]]; then
+OPTS="--enable-radeon-experimental-api $OPTS"
+fi &&
default_build
diff --git a/libs/libdrm/CONFIGURE b/libs/libdrm/CONFIGURE
index 782baf8477..75d732512e 100755
--- a/libs/libdrm/CONFIGURE
+++ b/libs/libdrm/CONFIGURE
@@ -1,3 +1,4 @@
if [[ $LIBDRM_VCS == y ]]; then
config_query LIBDRM_NV 'enable experimental nouveau api?' n
+ config_query LIBDRM_RADEON 'enable experimental radeon api?' n
fi
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index ba96b02f7f..a7883e981d 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Treeve Jelbert <treeve@sourcemage.org>
+ * CONFIGURE, BUILD: add experimental radeon support
+
2009-05-15 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.4.11
diff --git a/utils/clamz/DEPENDS b/utils/clamz/DEPENDS
new file mode 100755
index 0000000000..bc6e72bb65
--- /dev/null
+++ b/utils/clamz/DEPENDS
@@ -0,0 +1,3 @@
+depends curl &&
+depends libgcrypt &&
+depends expat
diff --git a/utils/clamz/DETAILS b/utils/clamz/DETAILS
new file mode 100755
index 0000000000..9a3ba8a7c6
--- /dev/null
+++ b/utils/clamz/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=clamz
+ VERSION=0.2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+ SOURCE_HASH=sha512:aed2bfafb52ccb20dae9bbc53286ee45b9afeeece13d375774be5e8aa3b5fd7d0d0e4dfcd83394649e2ac047a89d68b66b3d3de99c4178fece3e069cad6adf29
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/clamz/"
+ LICENSE[0]=GPL
+ ENTERED=20090801
+ SHORT="Command-line replacement for the amazon music downloader."
+cat << EOF
+Clamz is a little command-line program to download MP3 files from Amazon.com's
+music store. It is intended to serve as a substitute for Amazon's official
+MP3 Downloader, which is not free software (and therefore is only available
+in binary form for a limited set of platforms.) Clamz can be used to download
+either individual songs or complete albums that you have purchased from Amazon.
+EOF
diff --git a/utils/clamz/HISTORY b/utils/clamz/HISTORY
new file mode 100644
index 0000000000..03312418cb
--- /dev/null
+++ b/utils/clamz/HISTORY
@@ -0,0 +1,3 @@
+2009-08-01 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS, DEPENDS: spell created
+
diff --git a/xorg-lib/xtrans/DETAILS b/xorg-lib/xtrans/DETAILS
index c9f2d82a36..bd443ba6aa 100755
--- a/xorg-lib/xtrans/DETAILS
+++ b/xorg-lib/xtrans/DETAILS
@@ -1,11 +1,11 @@
SPELL=xtrans
PKG=xtrans
- VERSION=1.2.3
+ VERSION=1.2.4
XORG_VER=X11R7.0
SOURCE=${PKG}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
# SOURCE_HASH=sha512:1c6f84ed2f8cd3dec7bcfff71e15d93edaa7e25c22cf67ac9e48cf158b5867f90e6ce39355b8fc1e8b8699c46c7f5ecf428bcc0c58b44edb66843c9047e85002
- SOURCE_HASH=sha512:9aefb29200ef1349d7c4401b9ea945e84f6a11cad108340931ff0a6bf1ff82aad100ea01782fe4c4d7977881460e9413686058dd0c989dceaded71e818acc69c
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
diff --git a/xorg-lib/xtrans/HISTORY b/xorg-lib/xtrans/HISTORY
index 2f0eec727b..0d422c0309 100644
--- a/xorg-lib/xtrans/HISTORY
+++ b/xorg-lib/xtrans/HISTORY
@@ -1,3 +1,7 @@
+2009-07-31 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.2.4
+ SOURCE matches upstream posted MD5
+
2009-01-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: updated spell to 1.2.3
diff --git a/xorg-lib/xtrans/xtrans-1.2.4.tar.bz2.sig b/xorg-lib/xtrans/xtrans-1.2.4.tar.bz2.sig
new file mode 100644
index 0000000000..66e19934f4
--- /dev/null
+++ b/xorg-lib/xtrans/xtrans-1.2.4.tar.bz2.sig
Binary files differ
diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index c2bdd107e0..4335b6cb06 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,8 +1,9 @@
SPELL=xorg-server
- VERSION=1.6.2
+ VERSION=1.6.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
- SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
+# SOURCE_HASH=sha512:66dcc6b26ab7d1e24814c5e650cbb5942ec9d20642cebe82cb4a66e4d7a6cdd472573c17d769a490e0426b826e98774f98a61459ad078fedf4abe38f79e189fc
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 58c12d6483..dd0761ed42 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.6.3
+ SOURCE matches upstream posted MD5
+
2009-07-20 Eric Sandall <sandalle@sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing libxf86config if
required (Bug #15299)
diff --git a/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig b/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig
new file mode 100644
index 0000000000..19ea6889a1
--- /dev/null
+++ b/xorg-xserver/xorg-server/xorg-server-1.6.3.tar.bz2.sig
Binary files differ