diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 530cc28..71ed09d 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,8 @@
+2011-10-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 3.0.4
+ * PREPARE: add 3.0 branch (new stable)
+ * DEPENDS: add LZMA, nettle for 3.0 branch
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 66848fc..d26b8a4 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -13,4 +13,4 @@ if [ "$GNUTLS_OLD" == "n" ]; then
persistent_remove GNUTLS_OLD
fi
-config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6 2.8 2.10 2.12
+config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 1.0 1.2 1.4 1.6 2.0 2.2 2.4 2.6 2.8 2.10 2.12 3.0
diff --git a/devel/libtool/DETAILS b/devel/libtool/DETAILS
index d48f480..6d035b0 100755
--- a/devel/libtool/DETAILS
+++ b/devel/libtool/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtool
- VERSION=2.4
+ VERSION=2.4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/libtool/HISTORY b/devel/libtool/HISTORY
index 9303004..42812db 100644
--- a/devel/libtool/HISTORY
+++ b/devel/libtool/HISTORY
@@ -1,3 +1,6 @@
+2011-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.2
+
2010-09-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index b74b860..b4c9025 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2011-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, gtls.patch: add upstream path for gnutls-3.x
+
2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 7.22.0
diff --git a/ftp/curl/PRE_BUILD b/ftp/curl/PRE_BUILD
new file mode 100755
index 0000000..2b3766c
--- /dev/null
+++ b/ftp/curl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gtls.patch
diff --git a/ftp/curl/gtls.patch b/ftp/curl/gtls.patch
new file mode 100644
index 0000000..3fa097d
--- /dev/null
+++ b/ftp/curl/gtls.patch
@@ -0,0 +1,14 @@
+--- a/lib/gtls.c
++++ b/lib/gtls.c
+@@ -476,8 +476,10 @@ gtls_connect_step1(struct connectdata *conn,
+ gnutls_transport_set_push_function(session, Curl_gtls_push);
+ gnutls_transport_set_pull_function(session, Curl_gtls_pull);
+
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+ /* lowat must be set to zero when using custom push and pull functions. */
+ gnutls_transport_set_lowat(session, 0);
++#endif
+
+ /* This might be a reconnect, so we check for a session ID in the cache
+ to speed up things */
+
diff --git a/gnome2-apps/gnome-bluetooth/DEPENDS
b/gnome2-apps/gnome-bluetooth/DEPENDS
index f0ade84..4321e87 100755
--- a/gnome2-apps/gnome-bluetooth/DEPENDS
+++ b/gnome2-apps/gnome-bluetooth/DEPENDS
@@ -1,6 +1,6 @@
depends glib2 &&
depends gtk+2 &&
-
+depends gnome-control-center &&
depends bluez &&
optional_depends gobject-introspection \
diff --git a/gnome2-apps/gnome-bluetooth/HISTORY
b/gnome2-apps/gnome-bluetooth/HISTORY
index c9bf14c..a58afc3 100644
--- a/gnome2-apps/gnome-bluetooth/HISTORY
+++ b/gnome2-apps/gnome-bluetooth/HISTORY
@@ -1,3 +1,6 @@
+2011-10-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing dep on gnome-control-center
+
2011-05-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.1
diff --git a/gnome2-apps/gxneur/DETAILS b/gnome2-apps/gxneur/DETAILS
index abd13f1..9a83789 100755
--- a/gnome2-apps/gxneur/DETAILS
+++ b/gnome2-apps/gxneur/DETAILS
@@ -1,8 +1,8 @@
SPELL=gxneur
- VERSION=0.11.1
+ VERSION=0.13.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dists.xneur.ru/release-${VERSION}/tgz/${SOURCE}
-
SOURCE_HASH=sha512:73e79b6b7bcfdc0f2805722ec327ba430a7e83588ea13db09607242e3e5b1d7482334301ad22d1600251e5be7e6187f3e3245166e0da920ac32c939f926e2b28
+
SOURCE_HASH=sha512:f856ea1bf0ed98dd59bf82b1cc414a30a8096302eead596c336fe634966cc76a4a25146cf7da600cc50fe6a047004740285cc1ec8822f926ab1cd32f4663e1ab
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://xneur.ru/
LICENSE[0]=GPL
diff --git a/gnome2-apps/gxneur/HISTORY b/gnome2-apps/gxneur/HISTORY
index 5622d26..5f772f0 100644
--- a/gnome2-apps/gxneur/HISTORY
+++ b/gnome2-apps/gxneur/HISTORY
@@ -1,3 +1,7 @@
+2011-10-18 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated spell to 0.13.0
+ * PRE_BUILDD: added to remove -Wall from default CFLAGS
+
2011-01-18 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated spell to 0.11.1