Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4519be00d8ebe7e8b69e69f6b7ee5940c330f4f9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4519be00d8ebe7e8b69e69f6b7ee5940c330f4f9)
  • Date: Sun, 10 Feb 2013 17:11:45 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 15 +
audio-soft/easytag/DETAILS | 2
audio-soft/easytag/HISTORY | 3
database/mariadb/BUILD | 2
database/mariadb/DETAILS | 10 +
database/mariadb/EXPORTS | 1
database/mariadb/HISTORY | 11 +
database/mariadb/INSTALL | 3
database/mariadb/PREPARE | 16 ++
database/mariadb/REPAIR^all^EXPORTS | 1
database/postgresql/CONFIGURE | 5
database/postgresql/DEPENDS | 10 +
database/postgresql/DETAILS | 9 -
database/postgresql/HISTORY | 6
dev/null |binary
devel/bluefish/DEPENDS | 30 +++
devel/bluefish/DETAILS | 27 +--
devel/bluefish/HISTORY | 5
devel/git/DETAILS | 8 -
devel/git/HISTORY | 6
devel/heimdall/BUILD | 2
devel/heimdall/DETAILS | 2
devel/heimdall/HISTORY | 3
disk/gdisk/DETAILS | 4
disk/gdisk/HISTORY | 3
doc/evince/DEPENDS | 5
doc/evince/HISTORY | 3
fonts-x11/ttf-roboto/BUILD | 1
fonts-x11/ttf-roboto/DEPENDS | 1
fonts-x11/ttf-roboto/DETAILS | 19 ++
fonts-x11/ttf-roboto/HISTORY | 3
fonts-x11/ttf-roboto/INSTALL | 3
fonts-x11/ttf-roboto/PRE_BUILD | 3
gnome2-libs/glib2/DEPENDS | 17 +-
gnome2-libs/glib2/HISTORY | 3
gnome2-libs/gnome-common2/DETAILS | 2
gnome2-libs/gnome-common2/HISTORY | 5
gnome2-libs/gnome-common2/INSTALL | 3
gnome2-libs/gnome-common2/gnome-common-3.4.0.1.tar.xz.sig | 0
gnome2-libs/gnome-common2/gnome-common-3.7.4.tar.xz.sig |binary
gnu/gcc/HISTORY | 4
gnu/gcc/PRE_BUILD | 6
graphics-libs/gtkglext/DEPENDS | 12 +
graphics-libs/gtkglext/HISTORY | 6
graphics-libs/gtkglext/PRE_BUILD | 4
graphics-libs/libgxps/DEPENDS | 49 ++++++
graphics-libs/libgxps/DETAILS | 20 ++
graphics-libs/libgxps/HISTORY | 9 +
graphics-libs/libgxps/PREPARE | 2
graphics-libs/libgxps/PRE_BUILD | 6
graphics/gimp/DETAILS | 8 -
graphics/gimp/HISTORY | 3
http/apache22/DEPENDS | 2
http/apache22/HISTORY | 3
http/midori/DEPENDS | 47 ++++--
http/midori/HISTORY | 3
kde4-apps/kwave4/DEPENDS | 9 -
kde4-apps/kwave4/DETAILS | 4
kde4-apps/kwave4/HISTORY | 4
libs/apr/DETAILS | 2
libs/apr/HISTORY | 3
libs/rasqal/DETAILS | 2
libs/rasqal/HISTORY | 3
libs/redland/DETAILS | 2
libs/redland/HISTORY | 3
libs/tevent/BUILD | 2
libs/tevent/DEPENDS | 1
libs/tevent/DETAILS | 17 +-
libs/tevent/HISTORY | 7
libs/tevent/INSTALL | 2
libs/tevent/PREPARE | 2
libs/tevent/PRE_BUILD | 12 +
net/dhcpcd/DETAILS | 4
net/dhcpcd/HISTORY | 3
net/nsd/BUILD | 4
net/nsd/CONFIGURE | 39 +++++
net/nsd/DETAILS | 4
net/nsd/HISTORY | 5
net/samba4/BUILD | 9 -
net/samba4/CONFIGURE | 18 +-
net/samba4/DEPENDS | 106
++++++++------
net/samba4/DETAILS | 13 +
net/samba4/HISTORY | 14 +
net/samba4/PRE_BUILD | 13 +
net/samba4/samba-4.0.0alpha7.tar.gz.sig | 0
python-pypi/mercurial/DETAILS | 4
python-pypi/mercurial/HISTORY | 3
python-pypi/pudb/DEPENDS | 6
python-pypi/pudb/DETAILS | 19 ++
python-pypi/pudb/HISTORY | 6
samba.gpg |binary
shell-term-fm/st/BUILD | 1
shell-term-fm/st/DEPENDS | 1
shell-term-fm/st/DETAILS | 13 +
shell-term-fm/st/HISTORY | 2
shell-term-fm/st/PRE_BUILD | 3
video/ffmpeg/DETAILS | 4
video/ffmpeg/HISTORY | 3
video/v4l-utils/HISTORY | 3
video/v4l-utils/INSTALL | 3
windowmanagers/fluxbox/BUILD | 6
windowmanagers/fluxbox/CONFIGURE | 22 ++
windowmanagers/fluxbox/DEPENDS | 6
windowmanagers/fluxbox/DETAILS | 2
windowmanagers/fluxbox/HISTORY | 12 +
windowmanagers/fluxbox/PRE_BUILD | 5
windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig | 0
windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig |binary
windowmanagers/fluxbox/fribidi.patch | 8 -
windowmanagers/fluxbox/size_t.patch | 70 ---------
windowmanagers/i3/DETAILS | 2
windowmanagers/i3/HISTORY | 3
windowmanagers/i3/PRE_BUILD | 5
xfce/orage/DETAILS | 5
xfce/orage/HISTORY | 3
115 files changed, 696 insertions(+), 267 deletions(-)

New commits:
commit 2e2c77292065858e787f129bfd88b7f1d63c5f46
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fluxbox: => 1.3.4

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

Revert "Revert "fluxbox: fixed fribidi detection, when built with glib
support""

This reverts commit 1e09c9d8a9583dcecf71359e443bf1bec493976f.

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

Revert "Revert "fluxbox: => 1.3.3""

This reverts commit 60e712464e0fdceb08529d690435a7cf1158ebd7.

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

midori: rewritten dependency tree

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

libgxps: added missing &&

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

evince: added missing libgxps dependency

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

libgxps: => 0.2.2

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

gnome-common2: => 3.7.4

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

ffmpeg 1.0.4, SECURITY_PATCH=14

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

rasqal: => 0.9.30

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

redland: => 1.0.16

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

pudb: new spell, full-screen, console-based Python debugger

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

v4l-utils: fixed multijob build

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

apache22: fixed requirement of LDAP subdependency in apr-util

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

easytag - new website

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

kwave4: => 0.8.10-1

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

apr: marked previous update a security one

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

glib2: fixed circular dependency with gamin

commit b395d9bd33313a1dcbd3fcbe35fcb79ecc38d9a4
Author: Javier Vasquez <j.e.vasquez.v AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gcc: fixed patching for non-Go installations

Signed-off-by: Vlad Glagolev <stealth AT sourcemage.org>

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

git: => 1.8.1.3

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

gtkglext: added missing dependencies

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

gdisk: => 0.8.6

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

dhcpcd: => 5.6.7

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

mercurial: => 2.5.1

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

mariadb: added 5.3 branch

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

bluefish: => 2.2.4

commit 6b88d7e9450bcca6686da4f5841c0193d1d383cd
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

i3: forgot to add PRE_BUILD

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

i3: => 4.4

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

nsd: => 3.2.15

commit db4c319bbb6a3b00159907385281f17315470dd8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

heimdall: update spell to 1.4.1RC2

commit 9e429f27c456bcfe2f1a7752c34bc4a17b5551b8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

fonts-x11/ttf-roboto: new spell, a family of sans-serif fonts

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

orage: => 4.8.4

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

git: => 1.8.1.2

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

postgresql: => 9.2.3 (security)

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

samba4: stable => 4.0.2
updated SOURCE_URLs
changed to upstream gpg verification

* CONFIGURE: added config query for AD DC and updated ADS query
added query for winbind, swat, quotas, utmp, automount, and
dnsupdate
* DEPENDS: added optional_depends acl (forced for AD DC), krb5, openldap
avahi, sendfile, libaio, dmapi, libxlsst, docbook-xsl
re-enabled optional_depends linux-pam, cups, SYSTEM-LOGGER
removed readline, sqlite configure flags (no-longer explicitly
listed, but still optional)
* PRE_BUILD: uncompress gz file to verify tarball
* BUILD: added CONFIGURE options, fix build for stable

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

tevent: remove git version, add stable 0.9.17
git version removed because it checks out entire samba4 and it was broken
* DEPENDS: removed depends git
* PRE_BUILD: uncompress gz to verify tarball
* BUILD, INSTALL, PREPARE: removed

commit 05634a3e9178228c2189307ba2be3514ff140259
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

samba.gpg: added with keys 6568B7EA "Samba Distribution Verification Key
<samba-bugs AT samba.org>" and 13084025 "Samba Library Distribution Key
<samba-bugs AT samba.org>"
for samba and related spells

also added to changelog the key I added to kernel.gpg yesterday

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

shell-term-fm/st: new spell, simple terminal

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

gimp 2.8.4

diff --git a/ChangeLog b/ChangeLog
index 9472891..b4e6b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/pudb: new spell, full-screen, console-based Python
debugger
+
+2013-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * fonts-x11/ttf-roboto: new spell, a family of sans-serif fonts
+
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * samba.gpg: added with keys 6568B7EA "Samba Distribution Verification
+ Key <samba-bugs AT samba.org>" and 13084025 "Samba Library Distribution
+ Key <samba-bugs AT samba.org>"
+ * kernel.gpg: added key 1DCF2659 "Marcel Holtmann
<marcel AT holtmann.org>"
+
+2013-02-08 Ladislav Hagara <hgr AT vabo.cz>
+ * shell-term-fm/st: new spell, simple terminal
+
2013-02-07 Vlad Glagolev <stealth AT sourcemage.org>
* net/ssocks: new spell, RFC-compilant socks5 server and client

diff --git a/audio-soft/easytag/DETAILS b/audio-soft/easytag/DETAILS
index 4d73a45..9f35aa2 100755
--- a/audio-soft/easytag/DETAILS
+++ b/audio-soft/easytag/DETAILS
@@ -6,7 +6,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=GPL
- WEB_SITE=http://easytag.sourceforge.net/
+ WEB_SITE=http://projects.gnome.org/easytag/
KEYWORDS="tools audio"
ENTERED=20020115
SHORT="Utility for maintaining audio file Tags"
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index 6323548..c7cca2b 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: new website, moved to gnome
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: PATCH_LEVEL -> PATCHLEVEL

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index b0c48e8..47781f2 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -24,4 +24,4 @@ OPTS="--with-mysqld-user=mariadb \
default_build &&

LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make pkglibdir=${TRACK_ROOT}/usr/lib
+make
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 788e7c7..7111b30 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,15 +1,21 @@
SPELL=mariadb
+if [[ $MARIADB_BRANCH == 5.3 ]]; then
+ VERSION=5.3.12
+
SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
+else
VERSION=5.2.14
SECURITY_PATCH=3
+ PATCHLEVEL=1
+
SOURCE_HASH=sha512:b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
+fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[3]=http://mirrors.supportex.net/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
LICENSE[0]=GPL
- WEB_SITE=http://askmonty.org/wiki/MariaDB
+ WEB_SITE=https://mariadb.org/
KEYWORDS="sql database"
ENTERED=20100402
SHORT="backward compatible, drop-in replacement branch of the
MySQL(r) database server"
diff --git a/database/mariadb/EXPORTS b/database/mariadb/EXPORTS
new file mode 100755
index 0000000..ecc8c23
--- /dev/null
+++ b/database/mariadb/EXPORTS
@@ -0,0 +1 @@
+MARIADB_BRANCH
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index c7a801d..70c5fbd 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,6 +1,13 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added 5.3 branch; PATCHLEVEL=1 for 5.2 branch to set
+ MARIADB_BRANCH in tablet for further usage; updated website
+ * BUILD, INSTALL: use default pkglibdir (fixes 5.3 branch build), puts
+ mysql modules into isolated place in a system
+ * PREPARE: added branching framework
+ * {REPAIR^all^,}EXPORTS: added, to export MARIADB_BRANCH
+
2013-02-01 Sukneet Basuta <sukneet AT sourcemage.org>
- * BUILD: build with -with-readline until system readline support
- fixed
+ * BUILD: build with --with-readline until system readline support
fixed

2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.14; SECURITY_PATCH++
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 1bf093d..9c90b69 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,5 +1,4 @@
-make pkglibdir="${TRACK_ROOT}/usr/lib" \
- benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
testroot="${TRACK_ROOT}/usr/share/mysql" \
install &&

diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index c605187..cb0d439 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -1,2 +1,18 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+
+#
+# This block is required for proper configuration procedure for users with
5.2
+# branch installed after adding multiversion functionality to the spell and
+# prevents previous branch from resetting to a new default value on ``cast
-r''
+#
+persistent_read $SPELL MARIADB_BRANCH MARIADB_BRANCH || true &&
+
+if [[ -z "$MARIADB_BRANCH" ]]; then
+ persistent_add MARIADB_BRANCH &&
+ local MARIADB_BRANCH="5.2"
+fi &&
+
+prepare_select_branch 5.3 5.2 &&
+
config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/REPAIR^all^EXPORTS
b/database/mariadb/REPAIR^all^EXPORTS
new file mode 100755
index 0000000..ecc8c23
--- /dev/null
+++ b/database/mariadb/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+MARIADB_BRANCH
diff --git a/database/postgresql/CONFIGURE b/database/postgresql/CONFIGURE
index 50acd4a..bdce0fb 100755
--- a/database/postgresql/CONFIGURE
+++ b/database/postgresql/CONFIGURE
@@ -1,7 +1,6 @@
-# No && because the line below will fail if there's no postgresql installed
-OLDVERSION=$(installed_version $SPELL)
+spell_ok $SPELL && local OLDVERSION="$(installed_version $SPELL)" || return 0

-if spell_ok $SPELL && [[ ${OLDVERSION%.*} != ${VERSION%.*} ]]; then
+if [[ ${OLDVERSION%.*} != ${VERSION%.*} ]]; then
message "${PROBLEM_COLOR}" &&
message "You are about to upgrade (downgrade) your PostgreSQL installation
to a" &&
message "different major version, please be aware that a database
repository will only" &&
diff --git a/database/postgresql/DEPENDS b/database/postgresql/DEPENDS
index abdbf02..b0482e6 100755
--- a/database/postgresql/DEPENDS
+++ b/database/postgresql/DEPENDS
@@ -1,3 +1,8 @@
+optional_depends gettext \
+ "--with-nls" \
+ "--without-nls" \
+ "for Native Language Support" &&
+
optional_depends tcl \
"--with-tcl" \
"--without-tcl" \
@@ -18,6 +23,11 @@ optional_depends linux-pam \
"--without-pam" \
"for PAM authentication" &&

+optional_depends libselinux \
+ "--with-selinux" \
+ "--without-selinux" \
+ "for SELinux support" &&
+
optional_depends krb5 \
"--with-krb5" \
"--without-krb5" \
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 9413ac7..88ab434 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,11 +1,10 @@
SPELL=postgresql
- VERSION=9.2.2
-
SOURCE_HASH=sha512:147690b168838b7d45cc805882cb6ef628cbf656ff115d32ab76c4ad38b06aa00223f728bf0e5befcdd27cc4e27a917493d857f1f29006952f0ff07da6615808
+ VERSION=9.2.3
+
SOURCE_HASH=sha512:e2520ae03f3cac3effed6e8e45900f6718a944c9a3c90d856819caaeeb6ba9b2324744c18a37b8e9bc5d7e63abab5b84f20259b797fd81ace0040a578f87aad8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
-
SOURCE_URL[1]=ftp://ftp10.us.postgresql.org/pub/$SPELL/source/v$VERSION/$SOURCE
-
SOURCE_URL[2]=ftp://ftp9.de.postgresql.org/unix/databases/postgresql/source/v${VERSION}/${SOURCE}
+
SOURCE_URL[1]=ftp://ftp9.de.postgresql.org/unix/databases/postgresql/source/v${VERSION}/${SOURCE}

if [[ $PGSQL_CLUSTER == y ]]; then
CLUSTER_VERSION=1.9.0rc5
@@ -16,7 +15,7 @@ fi

WEB_SITE=http://www.postgresql.org/
GATHER_DOCS=off
- SECURITY_PATCH=12
+ SECURITY_PATCH=13
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index bf71677..553f256 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,9 @@
+2013-02-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.2.3; SECURITY_PATCH++ (CVE-2013-0255);
+ removed outdated mirror
+ * DEPENDS: added optional dependencies on gettext and libselinux
+ * CONFIGURE: use better logic for installed version
+
2012-12-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.2.2

diff --git a/devel/bluefish/DEPENDS b/devel/bluefish/DEPENDS
index 4c6f5c0..c035eaa 100755
--- a/devel/bluefish/DEPENDS
+++ b/devel/bluefish/DEPENDS
@@ -3,15 +3,33 @@ depends pcre &&
if [[ $BLUEFISH_UNSTABLE == y ]]; then
depends gtk+2
else
- if spell_ok gtk+2 && spell_ok gtk+3; then
- optional_depends gtk+2 "--with-gtk2" "" "to use gtk2 even if gtk3 is
available"
- elif spell_ok gtk+2 && ! spell_ok gtk+3; then
- depends gtk+2 '--with-gtk2'
+ if spell_ok gtk+2 && ! spell_ok gtk+3 || \
+ ! spell_ok gtk+2 && ! spell_ok gtk+3; then
+ optional_depends gtk+3 \
+ "--without-gtk2" \
+ "--with-gtk2" \
+ "to use gtk3 instead of gtk2" &&
+
+ if ! is_depends_enabled $SPELL gtk+3; then
+ depends gtk+2
+ fi
else
- depends gtk+3
+ optional_depends gtk+2 \
+ "--with-gtk2" \
+ "--without-gtk2" \
+ "to use gtk2 even if gtk3 is available" &&
+
+ if ! is_depends_enabled $SPELL gtk+2; then
+ depends gtk+3
+ fi
fi
fi &&

+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "to use Native Language Support" &&
+
optional_depends gucharmap "" "" "for the character map plugin" &&

optional_depends enchant \
@@ -22,4 +40,4 @@ optional_depends enchant \
optional_depends python \
"--enable-python" \
"--disable-python" \
- "for python integration (HIGHLY EXPERIMENTAL)"
+ "for zen-coding plugin"
diff --git a/devel/bluefish/DETAILS b/devel/bluefish/DETAILS
index c071ae3..6fcb1b8 100755
--- a/devel/bluefish/DETAILS
+++ b/devel/bluefish/DETAILS
@@ -1,27 +1,24 @@
SPELL=bluefish
if [[ $BLUEFISH_UNSTABLE == y ]]; then
VERSION=1.3.8
+ BRANCH=devel
SOURCE=$SPELL-unstable-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-unstable-$VERSION"
- SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/devel/source/$SOURCE
- SOURCE_URL[1]=http://bluefish.mrball.net/devel/source/$SOURCE
- SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:fd1e6fdd50f1d0d29944e1d5564861cb5ed6dacb6a1255f48053dad203c905314161d39041a62d4a6847bba4e3afb46a9e53e848d6dcde73ae11afe40223fbc9
else
- VERSION=2.2.3
-
SOURCE_HASH=sha512:92fc251728a4fc0404b27c52f6d8f143158d6e6625001d645ffa18c4c8e18a83826ca399deb966a7cdc0bd145c3c21eac6c0fdba5a84dd90c388985aabfa8538
+ VERSION=2.2.4
+ BRANCH=stable
SOURCE=$SPELL-$VERSION.tar.bz2
-# SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/stable/source/$SOURCE
- SOURCE_URL[1]=ftp://ftp.ratisbona.com/pub/$SPELL/stable/source/$SOURCE
- SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-# SOURCE2_URL[0]=$SOURCE_URL.sign
-# SOURCE2_URL[1]=${SOURCE_URL[1]}.sign
-# SOURCE2_URL[2]=${SOURCE_URL[2]}.sign
-# SOURCE2_IGNORE=signature
-# SOURCE_GPG=bluefish.gpg:$SOURCE2:UPSTREAM_KEY
fi
+ SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/$BRANCH/source/$SOURCE
+ SOURCE_URL[1]=http://bluefish.mrball.net/$BRANCH/source/$SOURCE
+ SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=bluefish.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://bluefish.openoffice.nl/
ENTERED=20011106
LICENSE[0]=GPL
diff --git a/devel/bluefish/HISTORY b/devel/bluefish/HISTORY
index 91d133b..2f811ef 100644
--- a/devel/bluefish/HISTORY
+++ b/devel/bluefish/HISTORY
@@ -1,3 +1,8 @@
+2013-02-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.4; switched back to upstream gpg check
+ * DEPENDS: updated python dependency description; added more choice
for
+ GTK+ version selection; added gettext optional dependency
+
2012-06-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.3

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 0554f70..a3a11a9 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.8.1
+ VERSION=1.8.1.3
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:dab54534c200413ae45726dad7aab53f2debe5642f4e613ae3d9901a08a918a66c6ba531a779ea0c73240b38158f071a7e98b9da3c4add33beb7fd37b9eeebcd
+
SOURCE_HASH=sha512:52e4db6caecd403da7af1b7b59cf14a4b86de23d61e592a7410c9ecd3b62c28288d40d8f76744a20b1e3b7ddc9d7ca3799b05801055a21a98ce070f5987b70c1
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:45b2aca5953dad6786e8f42c7989131d39c97c69d483c5cded361bb0f80bf8583aa04baa576c0066225ffe28164cbf4068761c33b9c5fde991544f501e789045
+
SOURCE3_HASH=sha512:5ae20d1e212e6762d02ccbac138fbabff1e4431083589a074662789eb23e5393558f01fa96d20d80f6679e4e3ac941105202730d01a6d093677507166d1db42f
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:d8ffbbd5c9655620ce23a2916f6227ba9435f2b5fb26f9a61d6fe1a780cddeb0a7be13559677dc8e18bb90b7cc2b5be5386743b135c119c9faa44114b2fa849b
+
SOURCE5_HASH=sha512:9f8b0cf36cb7da07e6a0bde2c091505a4d7af8f952858abec15d813b266c6d620d255eeb4b02789da5726795a4c8463bc013b40ea06b3f873029d7fb67ce568d
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 28d4db2..55da9a0 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.1.3
+
+2013-02-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.1.2
+
2013-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.1

diff --git a/devel/heimdall/BUILD b/devel/heimdall/BUILD
index 4429cf9..812ff2e 100755
--- a/devel/heimdall/BUILD
+++ b/devel/heimdall/BUILD
@@ -9,8 +9,6 @@ for i in libpit heimdall; do
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info $OPTS &&
- # Issue #23, fixed in 1.4
- sed -ie '/^ sudo/d' Makefile &&
make &&
cd .. || exit
done
diff --git a/devel/heimdall/DETAILS b/devel/heimdall/DETAILS
index 101ca74..b858bfc 100755
--- a/devel/heimdall/DETAILS
+++ b/devel/heimdall/DETAILS
@@ -1,5 +1,5 @@
SPELL=heimdall
- VERSION=1.3.1
+ VERSION=1.4.1RC2
SOURCE="$SPELL.tar.bz2"
SOURCE_URL[0]=git://github.com/Benjamin-Dobell/Heimdall.git:$SPELL
SOURCE_IGNORE=volatile
diff --git a/devel/heimdall/HISTORY b/devel/heimdall/HISTORY
index f6a85a8..e054b0d 100644
--- a/devel/heimdall/HISTORY
+++ b/devel/heimdall/HISTORY
@@ -1,3 +1,6 @@
+2013-02-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.1RC2
+
2013-01-07 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/disk/gdisk/DETAILS b/disk/gdisk/DETAILS
index 7946b6e..d16fe27 100755
--- a/disk/gdisk/DETAILS
+++ b/disk/gdisk/DETAILS
@@ -1,10 +1,10 @@
SPELL=gdisk
SPELLX=gptfdisk
- VERSION=0.8.5
+ VERSION=0.8.6
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:d16038507bc5f0f5dd17888fb1508c9bd92d51d80e4a842d4868b4da3ed8799c96b66d21a68f58e5d94b69a7e5717b7c8985a44d51b16bcfbe9c992f5f79d2ad
+
SOURCE_HASH=sha512:ad73e644c664f04524e984d1ab39f006f49c3bd62529ecb982f0dd09ba6aeeeee3f146e22398e03e7fabf25eabe7506ff1db35e90863b3494fdd54a5262d9800
WEB_SITE=http://www.rodsbooks.com/gdisk/
ENTERED=20091207
LICENSE[0]=GPL
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index 4448a8b..4cd01ea 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.6
+
2012-06-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.5

diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index ea48694..5b1b937 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -23,6 +23,11 @@ optional_depends poppler \
"--disable-pdf" \
"Enable PDF support?" &&

+optional_depends libgxps \
+ "--enable-xps" \
+ "--disable-xps" \
+ "Enable XPS support?" &&
+
optional_depends libspectre \
"--enable-ps" \
"--disable-ps" \
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 689975d..d880e7d 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing libgxps dependency
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: PATCH_LEVEL -> PATCHLEVEL

diff --git a/fonts-x11/ttf-roboto/BUILD b/fonts-x11/ttf-roboto/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/fonts-x11/ttf-roboto/BUILD
@@ -0,0 +1 @@
+true
diff --git a/fonts-x11/ttf-roboto/DEPENDS b/fonts-x11/ttf-roboto/DEPENDS
new file mode 100755
index 0000000..ebcc0be
--- /dev/null
+++ b/fonts-x11/ttf-roboto/DEPENDS
@@ -0,0 +1 @@
+. $SECTION_DIRECTORY/X11_DEPENDS
diff --git a/fonts-x11/ttf-roboto/DETAILS b/fonts-x11/ttf-roboto/DETAILS
new file mode 100755
index 0000000..811d0dd
--- /dev/null
+++ b/fonts-x11/ttf-roboto/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=ttf-roboto
+ VERSION=20120823
+ SOURCE="Roboto_Hinted_${VERSION}.zip"
+
SOURCE_URL[0]=http://commondatastorage.googleapis.com/androiddevelopers/design/${SOURCE}
+
SOURCE_HASH=sha512:ce4af34d0a23dd4076d033dcb03f17335eb83317da72b45257291be3aa34ff589405bfdfb768faca769d401a9091b63e5f195704ed69874d7d17289ca436a785
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://developer.android.com/design/style/typography.html";
+ LICENSE[0]=apache
+ ENTERED=20130208
+ SHORT="a sans-serif typeface introduced by google for the Ice
Cream Sandwich release of Android"
+cat << EOF
+The Android design language relies on traditional typographic tools such
+as scale, space, rhythm, and alignment with an underlying grid. Successful
+deployment of these tools is essential to help users quickly understand
+a screen of information. To support such use of typography, Ice Cream
+Sandwich introduced a new type family named Roboto, created specifically
+for the requirements of UI and high-resolution screens. The current TextView
+framework supports regular, bold, italic, and bold italic weights by default.
+EOF
diff --git a/fonts-x11/ttf-roboto/HISTORY b/fonts-x11/ttf-roboto/HISTORY
new file mode 100644
index 0000000..8201355
--- /dev/null
+++ b/fonts-x11/ttf-roboto/HISTORY
@@ -0,0 +1,3 @@
+2013-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
+
diff --git a/fonts-x11/ttf-roboto/INSTALL b/fonts-x11/ttf-roboto/INSTALL
new file mode 100755
index 0000000..68f210d
--- /dev/null
+++ b/fonts-x11/ttf-roboto/INSTALL
@@ -0,0 +1,3 @@
+install -m644 $SOURCE_DIRECTORY/*.ttf $INSTALL_ROOT/usr/share/fonts/TTF/ &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/ttf-roboto/ &&
+install -m644 $SOURCE_DIRECTORY/{COPYING.txt,RobotoSpecimenBook.pdf}
$INSTALL_ROOT/usr/share/doc/ttf-roboto/
diff --git a/fonts-x11/ttf-roboto/PRE_BUILD b/fonts-x11/ttf-roboto/PRE_BUILD
new file mode 100755
index 0000000..cdbb324
--- /dev/null
+++ b/fonts-x11/ttf-roboto/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file ''
diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 5683e65..b24ac4d 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -23,10 +23,19 @@ optional_depends gettext \
"--with-libiconv=no" \
"Build with gettext?" &&

-optional_depends FAM \
- "--enable-fam" \
- "--disable-fam" \
- "Build with file system monitoring" &&
+if spell_ok $SPELL; then
+ optional_depends FAM \
+ "--enable-fam" \
+ "--disable-fam" \
+ "Build with file system monitoring"
+else
+ message "${MESSAGE_COLOR}NOTE: spell $SPELL isn't installed yet, FAM
provider unavailable.${DEFAULT_COLOR}" &&
+
+ optional_depends fam \
+ "--enable-fam" \
+ "--disable-fam" \
+ "Build with file system monitoring"
+fi &&

optional_depends -sub UTFPROP pcre \
"--with-pcre=system" \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 8ee546a..bc02ceb 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed circular glib2 -> gamin -> glib2 dependency
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependency on FAM since it's already there
as an optional dependency
diff --git a/gnome2-libs/gnome-common2/DETAILS
b/gnome2-libs/gnome-common2/DETAILS
index 5a55c94..e290251 100755
--- a/gnome2-libs/gnome-common2/DETAILS
+++ b/gnome2-libs/gnome-common2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-common2
- VERSION=3.4.0.1
+ VERSION=3.7.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-common-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-common-$VERSION
diff --git a/gnome2-libs/gnome-common2/HISTORY
b/gnome2-libs/gnome-common2/HISTORY
index 4eae97a..f63d22d 100644
--- a/gnome2-libs/gnome-common2/HISTORY
+++ b/gnome2-libs/gnome-common2/HISTORY
@@ -1,3 +1,8 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.4 -- we have to use at least branch
3.7,
+ because it supports automake 1.13 and above
+ * INSTALL: added, to fix multijob build
+
2012-09-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.0.1
* PRE_BUILD, gnome-autogen.sh: removed
diff --git a/gnome2-libs/gnome-common2/INSTALL
b/gnome2-libs/gnome-common2/INSTALL
new file mode 100755
index 0000000..9d9a4c0
--- /dev/null
+++ b/gnome2-libs/gnome-common2/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/gnome2-libs/gnome-common2/gnome-common-3.4.0.1.tar.xz.sig
b/gnome2-libs/gnome-common2/gnome-common-3.4.0.1.tar.xz.sig
deleted file mode 100644
index a1a5b35..0000000
Binary files a/gnome2-libs/gnome-common2/gnome-common-3.4.0.1.tar.xz.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-common2/gnome-common-3.7.4.tar.xz.sig
b/gnome2-libs/gnome-common2/gnome-common-3.7.4.tar.xz.sig
new file mode 100644
index 0000000..e1d63cb
Binary files /dev/null and
b/gnome2-libs/gnome-common2/gnome-common-3.7.4.tar.xz.sig differ
diff --git a/gnu/gcc/EXPORTS b/gnu/gcc/EXPORTS
old mode 100644
new mode 100755
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 8a8b299..63fd4b4 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply go patch only if Go compiler was included into
build
+ * EXPORTS: chmod +x
+
2013-02-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* mksysinfo.patch: added, to fix header generation for libgo (included
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 228b361..841dca0 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -61,6 +61,10 @@ sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&

patch -p0 < "$SPELL_DIRECTORY/glibc216.patch" &&
patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/mksysinfo.patch" &&
+
+if list_find "$GCC_COMPILER" "go"; then
+ patch -p0 < "$SPELL_DIRECTORY/mksysinfo.patch"
+fi &&
+
patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch" &&
patch -p1 < "$SPELL_DIRECTORY/remove-libffi.patch"
diff --git a/graphics-libs/gtkglext/DEPENDS b/graphics-libs/gtkglext/DEPENDS
index a0e80ef..e44fc7b 100755
--- a/graphics-libs/gtkglext/DEPENDS
+++ b/graphics-libs/gtkglext/DEPENDS
@@ -1 +1,11 @@
-depends gtk+2
+depends gtk+2 &&
+depends -sub X pango &&
+depends pangox-compat &&
+depends libx11 &&
+depends libxext &&
+depends OPENGL &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation"
diff --git a/graphics-libs/gtkglext/HISTORY b/graphics-libs/gtkglext/HISTORY
index d7e3b5f..6ddff5a 100644
--- a/graphics-libs/gtkglext/HISTORY
+++ b/graphics-libs/gtkglext/HISTORY
@@ -1,3 +1,9 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing pangox-compat dependency (reported by wich@);
+ added other missing required and optional dependencies
+ * PRE_BUILD: apply a patch only if nvidia-like OpenGL implementation
was
+ selected
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/graphics-libs/gtkglext/PRE_BUILD
b/graphics-libs/gtkglext/PRE_BUILD
index 33df339..4f81fda 100755
--- a/graphics-libs/gtkglext/PRE_BUILD
+++ b/graphics-libs/gtkglext/PRE_BUILD
@@ -1,7 +1,9 @@
mk_source_dir $SOURCE_DIRECTORY &&
unpack_file &&
cd $SOURCE_DIRECTORY &&
-if spell_ok nvidia_driver; then
+
+if echo $(get_spell_provider $SPELL OPENGL) | grep -Eq "^nvidia_"; then
patch -p0 < $SCRIPT_DIRECTORY/glext.h.diff
fi &&
+
sedit "s/-DGTK_DISABLE_DEPRECATED//" gtk/Makefile.in
diff --git a/graphics-libs/libgxps/DEPENDS b/graphics-libs/libgxps/DEPENDS
index d91a2dc..f9f6205 100755
--- a/graphics-libs/libgxps/DEPENDS
+++ b/graphics-libs/libgxps/DEPENDS
@@ -1,2 +1,47 @@
-depends git &&
-depends libarchive
+depends glib2 &&
+depends cairo &&
+depends libarchive &&
+depends freetype2 &&
+
+if [[ $LIBGXPS_BRANCH == scm ]]; then
+ depends git &&
+ depends gnome-common2 &&
+ depends gtk-doc &&
+ depends gobject-introspection
+else
+ optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+ optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "to enable introspection"
+
+fi &&
+
+optional_depends libpng "" "" "to build xpstopng tool" &&
+optional_depends -sub PDF cairo "" "" "to build xpstopdf tool" &&
+optional_depends -sub PS cairo "" "" "to build xpstops tool" &&
+optional_depends -sub SVG cairo "" "" "to build xpstosvg tool" &&
+
+optional_depends man \
+ "--enable-man" \
+ "--disable-man" \
+ "to install tools man pages" &&
+
+optional_depends JPEG \
+ "--with-libjpeg" \
+ "--without-libjpeg" \
+ "for JPEG support" &&
+
+optional_depends tiff \
+ "--with-libtiff" \
+ "--without-libtiff" \
+ "for Tiff support" &&
+
+optional_depends lcms2 \
+ "--with-liblcms2" \
+ "--without-liblcms2" \
+ "for Little CMS 2 support"
diff --git a/graphics-libs/libgxps/DETAILS b/graphics-libs/libgxps/DETAILS
index 5590afa..61a2bfd 100755
--- a/graphics-libs/libgxps/DETAILS
+++ b/graphics-libs/libgxps/DETAILS
@@ -1,11 +1,25 @@
SPELL=libgxps
- VERSION=git
+if [[ $LIBGXPS_BRANCH == scm ]]; then
+ if [[ $LIBGXPS_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=git://git.gnome.org/libgxps
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://git.gnome.org/browse/libgxps
+else
+ VERSION=0.2.2
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+
SOURCE_HASH=sha512:96fa462cb4bba9cdba3d8cfe416199f8d956d17397e3514aa6168c7acc865a30e9347d8f9850f16a8c2a0a83dc83f7d7d2bd1806e27a2af0914ce53fed2b4467
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS="docs/reference/html"
+ DOCS="COPYING NEWS README"
+ WEB_SITE=https://live.gnome.org/libgxps
ENTERED=20110424
LICENSE[0]=GPL
SHORT="XPS Documents library"
diff --git a/graphics-libs/libgxps/HISTORY b/graphics-libs/libgxps/HISTORY
index 91046fe..880a0d2 100644
--- a/graphics-libs/libgxps/HISTORY
+++ b/graphics-libs/libgxps/HISTORY
@@ -1,3 +1,12 @@
+2013-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing ``&&''
+
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.2; renewed website
+ * PREPARE: added, to add branching framework
+ * DEPENDS: rewritten dependency tree from scratch
+ * PRE_BUILD: quoting paths; run autogen only for scm branch
+
2011-04-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PRE_BUILD: spell created

diff --git a/graphics-libs/libgxps/PREPARE b/graphics-libs/libgxps/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/graphics-libs/libgxps/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics-libs/libgxps/PRE_BUILD b/graphics-libs/libgxps/PRE_BUILD
index 1af1b77..66d0fe1 100755
--- a/graphics-libs/libgxps/PRE_BUILD
+++ b/graphics-libs/libgxps/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&

-NOCONFIGURE=ON ./autogen.sh
+if [[ $LIBGXPS_BRANCH == scm ]]; then
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 36221b7..47470ce 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,13 +1,13 @@
SPELL=gimp
if [[ $GIMP_DEVEL == y ]]; then
- VERSION=2.8.2
+ VERSION=2.8.4
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111
+
SOURCE_HASH=sha512:7a879bfdcec769495d61332980edf577ea0d37dbc84ef889239620bce7c458f17238a22884b1a063eddb1d1126c4241bf14dae81ace0134dff4a9e602046443b
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
else
- VERSION=2.8.2
+ VERSION=2.8.4
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111
+
SOURCE_HASH=sha512:7a879bfdcec769495d61332980edf577ea0d37dbc84ef889239620bce7c458f17238a22884b1a063eddb1d1126c4241bf14dae81ace0134dff4a9e602046443b
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 013e894..76b58d9 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2013-02-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8.4
+
2012-08-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.2

diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index 46d5d82..4bcae3c 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,7 +1,7 @@
depends apr &&
depends apr-util &&

-if list_find "$OPTS" "ldap"; then
+if echo "$OPTS" | grep -Eq "enable-(authnz-)?ldap"; then
depends -sub LDAP apr-util
fi &&

diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 20c3e79..7e4396d 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed requirement of LDAP subdependency in apr-util
+
2012-09-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.23; SECURITY_PATCH++
* PRE_BUILD, pcre830.patch: dropped, fixed by upstream
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index 689477e..205a859 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,18 +1,45 @@
-optional_depends gtk+3 '--enable-gtk3' '--disable-gtk3' \
- 'use GTK3 instead of GTK2?' &&
+depends libxml2 &&
+depends libsoup &&
+depends python &&
+depends sqlite &&
+depends vala &&
+
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "use GTK3 instead of GTK2?" &&
+
if is_depends_enabled $SPELL gtk+3 ; then
depends webkitgtk3
else
depends gtk+2 &&
depends webkitgtk
fi &&
-depends libxml2 &&
-depends python &&
-depends libnotify &&
-depends sqlite &&
-depends vala &&
-depends libzeitgeist &&

-optional_depends unique "" "" "provide libUnique support" &&
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for native language support" &&
+
+optional_depends libnotify \
+ "--enable-libnotify" \
+ "--disable-libnotify" \
+ "for notification support" &&
+
+optional_depends libzeitgeist \
+ "--enable-zeitgeist" \
+ "--disable-zeitgeist" \
+ "for Zeitgeist history integration" &&
+
+optional_depends unique \
+ "--enable-unique" \
+ "--disable-unique" \
+ "for single instance support" &&
+
+optional_depends gtk-doc \
+ "--enable-apidocs" \
+ "--disable-apidocs" \
+ "for API documentation" &&
+
optional_depends gnome-icon-theme "" "" "for all the icons" &&
-optional_depends docutils "" "" "enable user manual"
+optional_depends librsvg2 "" "" "for icon optimizations"
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 80a922f..703d38e 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2013-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: made libzeitgeist _optional_; rewritten dependency tree
+
2013-02-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.8
* DEPENDS: libzeitgeist added
diff --git a/kde4-apps/kwave4/DEPENDS b/kde4-apps/kwave4/DEPENDS
index e633c4b..7acbd26 100755
--- a/kde4-apps/kwave4/DEPENDS
+++ b/kde4-apps/kwave4/DEPENDS
@@ -4,9 +4,12 @@ depends fftw &&
depends audiofile &&
optional_depends alsa-lib '' '-DWITH_ALSA=OFF' 'playback/recording' &&
optional_depends flac '' '-DWITH_FLAC=OFF' 'FLAC import/export' &&
-optional_depends libvorbis '' '-DWITH_OGG=OFF' 'Ogg/Vorbis import/export)'
&&
-optional_depends fftw '' '-DWITH_GSL=OFF' 'Sonagram plugin / FFT' &&
-optional_depends libmad '' '-DWITH_MP3=OFF' 'MP3 import/export' &&
+optional_depends libvorbis '' '-DWITH_OGG_VORBIS=OFF' 'Ogg/Vorbis
import/export)' &&
+optional_depends opus '' '-DWITH_OGG_OPUS=OFF' 'Ogg/Opus
import/export)' &&
+optional_depends libmad '-DWITH_MP3=ON' '' 'MP3 import/export' &&
+if is_depends_enabled $SPELL libmad;then
+ depends id3lib
+fi &&
optional_depends pulseaudio '' '-DWITH_PULSEAUDIO=OFF' 'PulseAudio support'
&&
optional_depends libsamplerate '' '-DWITH_SAMPLERATE=OFF' 'Samplerate
support' &&
optional_depends phonon '-DWITH_PHONON=ON' '' 'Phonon support' &&
diff --git a/kde4-apps/kwave4/DETAILS b/kde4-apps/kwave4/DETAILS
index cd6b92b..49b071d 100755
--- a/kde4-apps/kwave4/DETAILS
+++ b/kde4-apps/kwave4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kwave4
SPELLX=kwave
- VERSION=0.8.9-1
-
SOURCE_HASH=sha512:93639956a7d2c2ebd626a63fe2ce807805c213825041daf7b080df4ea4aafc808fac89a1f286326bcfdb7bfe23636afa67c5446cf04d83f79671db8f6cc370fc
+ VERSION=0.8.10-1
+
SOURCE_HASH=sha512:c6421b9ccb03e198cffd745e7f77553014f9148930dfc09e59a5ff02ba5c36cd17ad2835f76033b3edd517f006bd164fd1def6fa0f7189177c62012acbfc380a
SOURCE=${SPELLX}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELLX}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELLX}-${VERSION//-?}
diff --git a/kde4-apps/kwave4/HISTORY b/kde4-apps/kwave4/HISTORY
index ba61bdf..5c433ae 100644
--- a/kde4-apps/kwave4/HISTORY
+++ b/kde4-apps/kwave4/HISTORY
@@ -1,3 +1,7 @@
+2013-02-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.10-1
+ * DEPENDS: adjust flags, add opus, id3lib
+
2012-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.9-1

diff --git a/libs/apr/DETAILS b/libs/apr/DETAILS
index 39d413a..ba7cbb1 100755
--- a/libs/apr/DETAILS
+++ b/libs/apr/DETAILS
@@ -1,6 +1,6 @@
SPELL=apr
VERSION=1.4.6
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
REPOS_URI="branches/${VERSION%.*}.x"
# APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY
index 0ed26fe..001a7c1 100644
--- a/libs/apr/HISTORY
+++ b/libs/apr/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: this was a security update (oCERT-2011-003),
SECURITY_PATCH++
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.6

diff --git a/libs/rasqal/DETAILS b/libs/rasqal/DETAILS
index aaa96ee..ff0cc94 100755
--- a/libs/rasqal/DETAILS
+++ b/libs/rasqal/DETAILS
@@ -1,5 +1,5 @@
SPELL=rasqal
- VERSION=0.9.29
+ VERSION=0.9.30
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://download.librdf.org/source/$SOURCE
diff --git a/libs/rasqal/HISTORY b/libs/rasqal/HISTORY
index 37d3c22..7878852 100644
--- a/libs/rasqal/HISTORY
+++ b/libs/rasqal/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.30
+
2012-05-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.29

diff --git a/libs/redland/DETAILS b/libs/redland/DETAILS
index 6abd0ad..23a084a 100755
--- a/libs/redland/DETAILS
+++ b/libs/redland/DETAILS
@@ -1,5 +1,5 @@
SPELL=redland
- VERSION=1.0.15
+ VERSION=1.0.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://download.librdf.org/source/$SOURCE
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index a1e7f79..b2ccdef 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.16
+
2010-12-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.15

diff --git a/libs/tevent/BUILD b/libs/tevent/BUILD
deleted file mode 100755
index f4182d2..0000000
--- a/libs/tevent/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-default_build
diff --git a/libs/tevent/DEPENDS b/libs/tevent/DEPENDS
index 5378411..db7cf51 100755
--- a/libs/tevent/DEPENDS
+++ b/libs/tevent/DEPENDS
@@ -1,2 +1 @@
-depends git &&
depends talloc
diff --git a/libs/tevent/DETAILS b/libs/tevent/DETAILS
index 0bd3edf..d3b4fa6 100755
--- a/libs/tevent/DETAILS
+++ b/libs/tevent/DETAILS
@@ -1,13 +1,12 @@
SPELL=tevent
-if [[ "$TEVENT_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
- SOURCE=samba4-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
- SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
- SOURCE_IGNORE=volatile
+ VERSION=0.9.17
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SPELL}-${VERSION}.tar.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://www.samba.org/ftp/tevent/$SOURCE
+ SOURCE2_URL[0]=http://www.samba.org/ftp/tevent/$SOURCE2
+ SOURCE_GPG=samba.gpg:$SOURCE2:UPSTREAM_KEY
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://ldb.samba.org/
KEYWORDS=""
diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY
index 64c1675..95eec09 100644
--- a/libs/tevent/HISTORY
+++ b/libs/tevent/HISTORY
@@ -1,3 +1,10 @@
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: remove git version, add stable 0.9.17
+ git version removed because it checks out entire samba4 and it was
broken
+ * DEPENDS: removed depends git
+ * PRE_BUILD: uncompress gz to verify tarball
+ * BUILD, INSTALL, PREPARE: removed
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: depends on git
* DETAILS, PREPARE: Use prepare_select_branch
diff --git a/libs/tevent/INSTALL b/libs/tevent/INSTALL
deleted file mode 100755
index e85c9fd..0000000
--- a/libs/tevent/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-default_install
diff --git a/libs/tevent/PREPARE b/libs/tevent/PREPARE
deleted file mode 100755
index f8b7d7e..0000000
--- a/libs/tevent/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
diff --git a/libs/tevent/PRE_BUILD b/libs/tevent/PRE_BUILD
index 008adea..d2974e5 100755
--- a/libs/tevent/PRE_BUILD
+++ b/libs/tevent/PRE_BUILD
@@ -1,4 +1,8 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-git checkout origin/v4-0-test &&
-NOCONFIGURE="on" ./autogen.sh
+message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+SOURCE_ORI=${SOURCE}
+SOURCE=${SOURCE/.gz}
+gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE
+default_pre_build
+message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}"
+rm $SOURCE
+SOURCE=${SOURCE_ORI}
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 8e90e9d..8c4ad48 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcpcd
- VERSION=5.6.6
-
SOURCE_HASH=sha512:55e5d8a818c421118c62fcea1cb259f15c8bafbb79f5d9b9d14c4099474fe25489189caa1025f2e07cd3a7446a794b4c757d9a28bea2c3e9bc1bc588d3d5e8dd
+ VERSION=5.6.7
+
SOURCE_HASH=sha512:6fdb3716c2e09208e9813642ab275f26f2a2fd96065531408e8ce33179398405c35f7d91c0f10cef71a2ece8b5179c6dcf9887eb6e59e2599be46ea338dc1023
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 18853f0..45ae1fd 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.6.7
+
2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.6.6

diff --git a/net/nsd/BUILD b/net/nsd/BUILD
index cb752cf..df40ad9 100755
--- a/net/nsd/BUILD
+++ b/net/nsd/BUILD
@@ -1,12 +1,12 @@
create_account nsd &&

-OPTS="--enable-bind8-stats \
- --with-ssl=$INSTALL_ROOT/usr \
+OPTS="--with-ssl=$INSTALL_ROOT/usr \
--with-pidfile=$INSTALL_ROOT/var/nsd/nsd.pid \
--with-zonesdir=$INSTALL_ROOT/var/nsd/zones \
--with-dbfile=$INSTALL_ROOT/var/db/nsd/nsd.db \
--with-difffile=$INSTALL_ROOT/var/db/nsd/ixfr.db \
--with-xfrdfile=$INSTALL_ROOT/var/nsd/xfrd.state \
+ $NSD_OPTS \
$OPTS" &&

default_build
diff --git a/net/nsd/CONFIGURE b/net/nsd/CONFIGURE
new file mode 100755
index 0000000..4595c11
--- /dev/null
+++ b/net/nsd/CONFIGURE
@@ -0,0 +1,39 @@
+config_query_option NSD_OPTS "Configure NSD as a root server?" n \
+ "--enable-root-server" \
+ "--disable-root-server" &&
+
+config_query_option NSD_OPTS "Enable IPv6 support?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
+config_query_option NSD_OPTS "Enable BIND8-like NSTATS & XSTATS?" n \
+ "--enable-bind8-stats" \
+ "--disable-bind8-stats" &&
+
+config_query_option NSD_OPTS "Enable rate limiting?" n \
+ "--enable-ratelimit" \
+ "--disable-ratelimit" &&
+
+config_query_option NSD_OPTS "Enable NSEC3 support?" y \
+ "--enable-nsec3" \
+ "--disable-nsec3" &&
+
+if list_find "$NSD_OPTS" "--enable-nsec3"; then
+ config_query_option NSD_OPTS "Enable NSEC3 full prehashing?" y \
+ "--enable-full-prehash" \
+ "--disable-full-prehash"
+else
+ list_add "NSD_OPTS" "--disable-full-prehash"
+fi &&
+
+config_query_option NSD_OPTS "Enable response minimization (less
truncation)?" y \
+ "--enable-minimal-responses" \
+ "--disable-minimal-responses" &&
+
+config_query_option NSD_OPTS "Use mmap instead of malloc
(${PROBLEM_COLOR}Experimental${QUERY_COLOR})?" n \
+ "--enable-mmap" \
+ "--disable-mmap" &&
+
+config_query_option NSD_OPTS "Maintain statistics per zone, instead of
global statistics?" n \
+ "--enable-zone-stats" \
+ "--disable-zone-stats"
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index 0fd24e1..3aa2df6 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
SPELL=nsd
- VERSION=3.2.14
+ VERSION=3.2.15
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:673b9b7d744b6336f0ae350a158b3cc7bdddb9c984d1c274a3b49962fb0fef3aac1e4911f4b7bed1688a1c09f40d98e1585c2a38b28b7d8086ca81e2e63b66d4
+
SOURCE_HASH=sha512:ed431f8b4ed2d28bba3ec05db7ea9d176b5be6daee4ca086a5bad65606c82abb15653ae6c664b3a32b88becf8a99f3aa6b447583af12ac677bd5dd84962b070b
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 439e389..2c4e2dd 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,8 @@
+2013-02-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.15
+ * DEPENDS: don't force BIND8-like stats; use NSD_OPTS
+ * CONFIGURE: added, for several options
+
2012-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.14

diff --git a/net/samba4/BUILD b/net/samba4/BUILD
index 2b4fced..d1b48b0 100755
--- a/net/samba4/BUILD
+++ b/net/samba4/BUILD
@@ -1,8 +1,11 @@
OPTS="--enable-fhs \
- $SAMBA4_PTHREADS \
+ $SAMBA4 \
$OPTS" &&

-cd $SOURCE_DIRECTORY/source4 &&
-make_single &&
+if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
+ cd $SOURCE_DIRECTORY/source4 &&
+ make_single
+fi &&
+
default_build &&
make_normal
diff --git a/net/samba4/CONFIGURE b/net/samba4/CONFIGURE
index e2b99da..d7a0fca 100755
--- a/net/samba4/CONFIGURE
+++ b/net/samba4/CONFIGURE
@@ -1,11 +1,9 @@
-#if spell_ok openldap &&
-# spell_ok krb5; then
-# config_query SAMBA_AD \
-# "Enable Active Directory Support ?\n(Requires openldap and krb5)" y
-#else
-# config_query SAMBA_AD \
-# "Enable Active Directory Support ?\n(Requires openldap and krb5)" n
-#fi
+config_query SAMBA_AD "Enable Active Directory Support?" n
+config_query SAMBA_ADDC "Enable Active Directory Domain Controller support?"
n

-config_query_option SAMBA4_PTHREADS 'Enable POSIX threads?' n \
- '--with-pthreads' '--without-pthreads'
+config_query_option SAMBA4 "Build with winbind support (allows Windows NT
domain users to appear as UNIX users?" y "--with-winbind" "--without-winbind"
+config_query_option SAMBA4 "Build the Samba Web Administration Tool (SWAT)?"
n "--with-swat" "--without-swat"
+config_query_option SAMBA4 "Enable quotas support?" y "--with-quotas"
"--without-quotas"
+config_query_option SAMBA4 "Build with utmp support?" y "--with-utmp"
"--without-utmp"
+config_query_option SAMBA4 "Build with automount support?" y
"--with-automount" "--without-automount"
+config_query_option SAMBA4 "Build with dnsupdate support?" y
"--with-dnsupdate" "--without-dnsupdate"
diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index 9a23884..8fabf65 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -1,52 +1,57 @@
-depends e2fsprogs &&
-depends libcap &&
-depends popt "--without-included-popt" &&
-depends python &&
-depends tevent &&
-
+depends e2fsprogs &&
+depends libcap &&
+depends popt &&
+depends PYTHON &&
+depends tevent &&
if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
depends git
fi &&

-#if [[ "$SAMBA_AD" == "y" ]]; then
-# depends openldap "--with-ldap" &&
-# depends krb5 "--with-krb5 --with-ads"
-#else
-# optional_depends openldap \
-# "--with-ldap" \
-# "--without-ldap" \
-# "for LDAP support"
-#fi &&
-
-optional_depends readline \
- "--with-readline" \
- "--without-readline" \
- "for readline support" &&
-
-#optional_depends linux-pam \
-# "--with-pam --with-pam_smbpass" \
-# "--without-pam" \
-# "To enable PAM authentication" &&
+if [[ "$SAMBA_ADDC" == "y" ]]; then
+ depends acl "--with-acl-support"
+else
+ optional_depends acl \
+ "--with-acl-support" \
+ "--without-acl-support" \
+ "for file system access control lists support" &&
+ optional_depends krb5 \
+ "--with-system-mitkrb5 --without-ad-dc" \
+ "--without-ad-dc" \
+ "to use system krb5"
+fi &&
+
+if [[ "$SAMBA_AD" == "y" ]]; then
+ depends openldap "--with-ldap --with-ads"
+else
+ optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for LDAP support"
+fi &&
+
+optional_depends readline "" "" "for readline support" &&
+
+optional_depends linux-pam \
+ "--with-pam --with-pam_smbpass" \
+ "--without-pam" \
+ "To enable PAM authentication" &&

optional_depends gnutls \
"--enable-gnutls" \
"--disable-gnutls" \
"for encrypted communication" &&

-#optional_depends CUPS \
-# "--enable-cups" \
-# "--disable-cups" \
-# "for Samba support in CUPS" &&
+optional_depends CUPS \
+ "--enable-cups" \
+ "--disable-cups" \
+ "for Samba support in CUPS" &&

-#optional_depends SYSTEM-LOGGER \
-# "--with-syslog" \
-# "--without-syslog" \
-# "enables logging though a syslog daemon"
+optional_depends SYSTEM-LOGGER \
+ "--with-syslog" \
+ "--without-syslog" \
+ "enables logging though a syslog daemon"

-optional_depends sqlite \
- '--with-sqlite3' \
- '--without-sqlite3' \
- 'for SQLite 3.x DB backend support' &&
+optional_depends sqlite '' '' 'for SQLite 3.x DB backend support' &&

optional_depends tdb \
'' \
@@ -56,4 +61,29 @@ optional_depends tdb \
optional_depends talloc
\
''
\
''
\
- 'for a hierarchical pool based memory allocator with
destructors'
+ 'for a hierarchical pool based memory allocator with
destructors' &&
+
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for avahi support" &&
+
+optional_depends sendfile \
+ "--enable-sendfile-support" \
+ "--disable-sendfile-support" \
+ "for sendfile support" &&
+
+optional_depends libaio \
+ "--with-aio-support" \
+ "--without-aio-support" \
+ "for asynchronous I/O support" &&
+
+optional_depends dmapi \
+ "--with-dmapi" \
+ "--without-dmapi" \
+ "for data management API for XFS Filesystem support" &&
+
+optional_depends libxslt "" "" "to build man pages and documentation" &&
+if is_depends_enabled $SPELL libxslt; then
+ depends docbook-xsl
+fi
diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index cc92c3b..dac8217 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -10,13 +10,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.samba.org/samba.git:$SPELL
SOURCE_IGNORE=volatile
else
- VERSION=4.0.0alpha7
+ VERSION=4.0.2
SOURCE=${SPELL/4}-$VERSION.tar.gz
+ SOURCE2=${SPELL/4}-${VERSION}.tar.asc
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/4}-$VERSION
- SOURCE_URL[0]=ftp://us5.samba.org/pub/samba-ftp/$SPELL/$SOURCE
- SOURCE_URL[1]=ftp://de3.samba.org/pub/samba/$SPELL/$SOURCE
- SOURCE_URL[2]=http://us1.samba.org/samba/ftp/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=http://www.samba.org/samba/ftp/stable/$SOURCE
+ SOURCE_URL[1]=http://ftp.samba.org/pub/samba/$SOURCE
+ SOURCE2_URL[0]=http://www.samba.org/samba/ftp/stable/$SOURCE2
+ SOURCE2_URL[1]=http://ftp.samba.org/pub/samba/$SOURCE2
+ SOURCE_GPG="samba.gpg:$SOURCE2:UPSTREAM_KEY"
fi
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 4da1f11..cafdd0b 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,17 @@
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: stable => 4.0.2
+ updated SOURCE_URLs
+ changed to upstream gpg verification
+ * CONFIGURE: added config query for AD DC and updated ADS query
+ added query for winbind, swat, quotas, utmp, automount, and
dnsupdate
+ * DEPENDS: added optional_depends acl (forced for AD DC), krb5,
openldap
+ avahi, sendfile, libaio, dmapi, libxlsst, docbook-xsl
+ re-enabled optional_depends linux-pam, cups, SYSTEM-LOGGER
+ removed readline, sqlite configure flags (no-longer explicitly
listed, but
+ still optional)
+ * PRE_BUILD: uncompress gz file to verify tarball
+ * BUILD: added CONFIGURE options, fix build for stable
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/net/samba4/PRE_BUILD b/net/samba4/PRE_BUILD
index 98b225d..ee39da5 100755
--- a/net/samba4/PRE_BUILD
+++ b/net/samba4/PRE_BUILD
@@ -1,6 +1,15 @@
-default_pre_build &&
+if [[ "$SAMBA4_BRANCH" != "scm" ]]; then
+ message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ SOURCE_ORI=${SOURCE}
+ SOURCE=${SOURCE/.gz}
+ gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE
+ default_pre_build
+ message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}"
+ rm $SOURCE
+ SOURCE=${SOURCE_ORI}

-if [[ "$SAMBA4_SCM" == "y" ]]; then
+else
+ default_pre_build &&
cd $SOURCE_DIRECTORY/source4 &&
NOCONFIGURE="on" ./autogen.sh
fi
diff --git a/net/samba4/samba-4.0.0alpha7.tar.gz.sig
b/net/samba4/samba-4.0.0alpha7.tar.gz.sig
deleted file mode 100644
index ca2a5eb..0000000
Binary files a/net/samba4/samba-4.0.0alpha7.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 5ae8558..bc6dc58 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.5
-
SOURCE_HASH=sha512:8c710faf257bb51b1f0214b6562508045586787089b3dce6ccbe1bab7cb7bb7ffc88b4660b6d6e6b7a3c54536c08b367071c9f2316c4d4671519d64a1171457a
+ VERSION=2.5.1
+
SOURCE_HASH=sha512:91693ca5f34934956a7c2c98bb69a5648b2a5660afd2ecf4a05035c5420450d42c194eeef0606d7683e267e4eaaaab414df23f30b34c88219bdd5c1a0f1f66ed
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 140f755..7799710 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.1
+
2013-02-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.5
new url
diff --git a/python-pypi/pudb/DEPENDS b/python-pypi/pudb/DEPENDS
new file mode 100755
index 0000000..994dd96
--- /dev/null
+++ b/python-pypi/pudb/DEPENDS
@@ -0,0 +1,6 @@
+depends python &&
+depends urwid &&
+depends pygments &&
+
+suggest_depends ipython "" "" "to use IPython as a shell in preferences" &&
+suggest_depends bpython "" "" "to use bpython as a shell in preferences"
diff --git a/python-pypi/pudb/DETAILS b/python-pypi/pudb/DETAILS
new file mode 100755
index 0000000..d9871b8
--- /dev/null
+++ b/python-pypi/pudb/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=pudb
+ VERSION=2012.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:d9a26a7eaf20b8c59bb453faf7aa698618ac10203ad487cc0791455ae7338c6e04d6ccf821d1e142f6d920bcf89f1f87ac10f4bbf93269b63578c95b44588c87
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://pypi.python.org/pypi/pudb
+ ENTERED=20130210
+ KEYWORDS="python devel"
+ SHORT="full-screen, console-based Python debugger"
+cat << EOF
+PuDB is a full-screen, console-based visual debugger for Python.
+
+Its goal is to provide all the niceties of modern GUI-based debuggers in a
more
+lightweight and keyboard-friendly package. PuDB allows you to debug code
right
+where you write and test it--in a terminal. If you've worked with the
excellent
+(but nowadays ancient) DOS-based Turbo Pascal or C tools, PuDB's UI might
look
+familiar.
+EOF
diff --git a/python-pypi/pudb/HISTORY b/python-pypi/pudb/HISTORY
new file mode 100644
index 0000000..8c145c7
--- /dev/null
+++ b/python-pypi/pudb/HISTORY
@@ -0,0 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2012.3
+ * DEPENDS: added suggest dependencies
+
+2010-09-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, DETAILS: created this spell
diff --git a/samba.gpg b/samba.gpg
new file mode 100644
index 0000000..7fb4d71
Binary files /dev/null and b/samba.gpg differ
diff --git a/shell-term-fm/st/BUILD b/shell-term-fm/st/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/shell-term-fm/st/BUILD
@@ -0,0 +1 @@
+make
diff --git a/shell-term-fm/st/DEPENDS b/shell-term-fm/st/DEPENDS
new file mode 100755
index 0000000..b555ae0
--- /dev/null
+++ b/shell-term-fm/st/DEPENDS
@@ -0,0 +1 @@
+depends libx11
diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
new file mode 100755
index 0000000..1ffe3ca
--- /dev/null
+++ b/shell-term-fm/st/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=st
+ VERSION=0.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://dl.suckless.org/st/$SOURCE
+
SOURCE_HASH=sha512:7ba515d68d0677c72ad696ad07a009337ae98f7ff79690f950a9a9edaa2ab1ec76a3ad39918d3070836f372d0de6216c6f5308a76a7e60063fc2f2a8f6fc325c
+ WEB_SITE=http://st.suckless.org/
+ ENTERED=20130208
+ LICENSE[0]=MIT
+ KEYWORDS="simple terminal"
+cat << EOF
+st is a simple terminal emulator.
+EOF
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
new file mode 100644
index 0000000..2e5c287
--- /dev/null
+++ b/shell-term-fm/st/HISTORY
@@ -0,0 +1,2 @@
+2013-02-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 0.3
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
new file mode 100755
index 0000000..c59a232
--- /dev/null
+++ b/shell-term-fm/st/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit "s:/local::" config.mk
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index ba0b22b..921a015 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,7 +1,7 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=1.0.3
- SECURITY_PATCH=13
+ VERSION=1.0.4
+ SECURITY_PATCH=14
else
VERSION=0.7.13
SECURITY_PATCH=11
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 723e9b6..afea4e3 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.4, SECURITY_PATCH=14
+
2013-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.3

diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index 89ed666..0d1f9c2 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * INSTALL: added, to fix multijob build
+
2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.1
* CONFLICTS, DEPENDS: added
diff --git a/video/v4l-utils/INSTALL b/video/v4l-utils/INSTALL
new file mode 100755
index 0000000..9d9a4c0
--- /dev/null
+++ b/video/v4l-utils/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index 3d8e291..c3bf9b1 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -2,6 +2,12 @@ if [[ $FLUXBOX_BRANCH == scm ]]; then
./autogen.sh
fi &&

+if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2;
then
+ CXXFLAGS="-I$INSTALL_ROOT/usr/include/glib-2.0 \
+ -I$INSTALL_ROOT/usr/lib/glib-2.0/include \
+ $CXXFLAGS"
+fi &&
+
OPTS="$FLUXBOX_OPTS $OPTS" &&

default_build
diff --git a/windowmanagers/fluxbox/CONFIGURE
b/windowmanagers/fluxbox/CONFIGURE
index b0a0dcc..8dc6a74 100755
--- a/windowmanagers/fluxbox/CONFIGURE
+++ b/windowmanagers/fluxbox/CONFIGURE
@@ -3,8 +3,14 @@ list_remove FLUXBOX_OPTS '--disable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-gnome' &&
list_remove FLUXBOX_OPTS '--disable-gnome' &&
+list_remove FLUXBOX_OPTS '--enable-randr1.2' &&
+list_remove FLUXBOX_OPTS '--disable-randr1.2' &&
+list_remove FLUXBOX_OPTS '--enable-newwmspec' &&
+list_remove FLUXBOX_OPTS '--disable-newwmspec' &&
+list_remove FLUXBOX_OPTS '--enable-timed-cache' &&
+list_remove FLUXBOX_OPTS '--disable-timed-cache' &&

-config_query FLUXBOX_CONF "Go through all (8) configuration options?" n
+config_query FLUXBOX_CONF "Go through all (9) configuration options?" n &&

if [[ $FLUXBOX_CONF == y ]]; then
config_query_option FLUXBOX_OPTS "include code for the Slit?" y \
@@ -23,17 +29,21 @@ if [[ $FLUXBOX_CONF == y ]]; then
"--enable-regexp" \
"--disable-regexp" &&

- config_query_option FLUXBOX_OPTS "include code for new WM Spec?" y \
- "--enable-newwmspec" \
- "--disable-newwmspec" &&
+ config_query_option FLUXBOX_OPTS "enable support for Extended Window
Manager Hints?" y \
+ "--enable-ewmh" \
+ "--disable-ewmh" &&

config_query_option FLUXBOX_OPTS "include verbose debugging code?" n \
"--enable-debug" \
"--disable-debug" &&

+ config_query_option FLUXBOX_OPTS "build programs used in testing fluxbox?"
n \
+ "--enable-test" \
+ "--disable-test" &&
+
config_query_option FLUXBOX_OPTS "use new timed pixmap cache?" y \
- "--enable-timed-cache" \
- "--disable-timed-cache" &&
+ "--enable-timedcache" \
+ "--disable-timedcache" &&

config_query_option FLUXBOX_OPTS "include Xmb (multibyte font, utf-8)
support?" y \
"--enable-xmb" \
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index da8aae5..fd3a5d0 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -47,12 +47,6 @@ optional_depends libxrandr \
"--disable-randr" \
"for X Randr extension support" &&

-if is_depends_enabled $SPELL libxrandr; then
- config_query_option FLUXBOX_OPTS "enable RANDR 1.2 support?" y \
- "--enable-randr1.2" \
- "--disable-randr1.2"
-fi &&
-
optional_depends fribidi \
"--enable-fribidi" \
"--disable-fribidi" \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 6008d69..fda3a02 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.3.2
+ VERSION=1.3.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index c40622a..0b31753 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,15 @@
+2013-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.4
+ * PRE_BUILD: force autoreconf when needed
+ * fribidi.patch: updated for new release
+
+2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.3
+ * CONFIGURE: dropped deprecated randr1.2 flags; fixed timedcache
flags;
+ added test flags; swapped deprecated flags with ewmh support
+ * BUILD: fixed fribidi detection, when built with glib support
+ * size_t.patch: dropped, fixed by upstream
+
2011-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2
* DEPENDS, CONFIGURE: renewed optional flags
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index 6f597d5..78e13e8 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -3,10 +3,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-# Version 1.3.2 needs this patch, git not anymore.
-[[ $FLUXBOX_GIT == y ]] || patch -p0 < "$SPELL_DIRECTORY/size_t.patch" &&
-
if is_depends_enabled $SPELL fribidi && is_version_less $(installed_version
fribidi) 0.19; then
patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
- autoreconf -i
+ autoreconf -fi
fi
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
deleted file mode 100644
index b3d3f00..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
new file mode 100644
index 0000000..323e1f8
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.3.4.tar.bz2.sig
differ
diff --git a/windowmanagers/fluxbox/fribidi.patch
b/windowmanagers/fluxbox/fribidi.patch
index 088269b..dcebbbd 100644
--- a/windowmanagers/fluxbox/fribidi.patch
+++ b/windowmanagers/fluxbox/fribidi.patch
@@ -1,6 +1,6 @@
---- configure.in.orig 2011-02-19 15:09:14.000000000 +0300
-+++ configure.in 2011-02-20 01:07:55.763381637 +0300
-@@ -613,7 +613,7 @@
+--- configure.ac.orig 2013-02-10 20:14:25.000000000 +0400
++++ configure.ac 2013-02-11 02:11:54.065894982 +0400
+@@ -517,7 +517,7 @@
AC_MSG_CHECKING([for fribidi/fribidi.h])
AC_TRY_COMPILE(
#include <fribidi/fribidi.h>
@@ -8,4 +8,4 @@
+ , FRIBIDI_VERSION,
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have
FRIBIDI])
- LIBS="$LIBS -lfribidi",
+ LIBS="-lfribidi $LIBS",
diff --git a/windowmanagers/fluxbox/size_t.patch
b/windowmanagers/fluxbox/size_t.patch
deleted file mode 100644
index cca7cd0..0000000
--- a/windowmanagers/fluxbox/size_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ru src/FbTk/LayerItem.hh ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh
---- src/FbTk/LayerItem.hh 2011-02-24 17:00:37.000000000 +0100
-+++ ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh 2011-04-11
07:37:09.000000000 +0200
-@@ -25,6 +25,7 @@
-
- #include "Layer.hh"
- #include "NotCopyable.hh"
-+#include <sys/types.h>
- #include <vector>
-
- namespace FbTk {
-diff -ru src/FbTk/MacroCommand.hh
../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh
---- src/FbTk/MacroCommand.hh 2009-10-04 21:45:38.000000000 +0200
-+++ ../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh 2011-04-11
07:35:02.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "Command.hh"
- #include "RefCount.hh"
-
-+#include <sys/types.h>
- #include <vector>
-
- namespace FbTk {
-diff -ru src/FbTk/Makefile.in ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in
---- src/FbTk/Makefile.in 2011-02-27 18:40:24.000000000 +0100
-+++ ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in 2011-04-10
23:35:33.000000000 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -ru src/FbTk/MultLayers.hh
../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh
---- src/FbTk/MultLayers.hh 2011-02-24 17:00:37.000000000 +0100
-+++ ../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh 2011-04-11
07:36:19.000000000 +0200
-@@ -23,6 +23,7 @@
- #ifndef FBTK_MULTLAYERS_HH
- #define FBTK_MULTLAYERS_HH
-
-+#include <sys/types.h>
- #include <vector>
-
- namespace FbTk {
-diff -ru src/Makefile.in ../fluxbox-1.3.1-size_t/src/Makefile.in
---- src/Makefile.in 2011-02-27 18:40:24.000000000 +0100
-+++ ../fluxbox-1.3.1-size_t/src/Makefile.in 2011-04-10 23:35:33.000000000
+0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -569,7 +569,7 @@
- # (which will cause the Makefiles to be regenerated when you run
`make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -594,7 +594,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-Only in ../fluxbox-1.3.1-size_t/src/: defaults.cc
diff --git a/windowmanagers/i3/DETAILS b/windowmanagers/i3/DETAILS
index 4c1dcd8..aaf25b6 100755
--- a/windowmanagers/i3/DETAILS
+++ b/windowmanagers/i3/DETAILS
@@ -1,5 +1,5 @@
SPELL=i3
- VERSION=4.3
+ VERSION=4.4
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://${SPELL}wm.org/downloads/${SOURCE}
diff --git a/windowmanagers/i3/HISTORY b/windowmanagers/i3/HISTORY
index 70c45cd..f15a962 100644
--- a/windowmanagers/i3/HISTORY
+++ b/windowmanagers/i3/HISTORY
@@ -1,3 +1,6 @@
+2013-02-09 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.4
+
2012-09-19 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 4.3
* DEPENDS: added optional_depends pango
diff --git a/windowmanagers/i3/PRE_BUILD b/windowmanagers/i3/PRE_BUILD
new file mode 100755
index 0000000..77820c1
--- /dev/null
+++ b/windowmanagers/i3/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+if ! is_depends_enabled $SPELL pango; then
+ sed -i 's/DPANGO_SUPPORT=1/DPANGO_SUPPORT=0/' $SOURCE_DIRECTORY/common.mk
+fi
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index cdd8f7c..256ce16 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,11 +1,10 @@
SPELL=orage
if [[ $ORAGE_STABLE == y ]]; then
- VERSION=4.8.3
- PATCHLEVEL=1
+ VERSION=4.8.4
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:5a7aea002bdbf9fef3e32e85dcb94315a1b13494689ae4add277ca053067d3192a7eb43538654148de75fc03e884df1de2d8f7a2593cadbdc687252f6941789f
+
SOURCE_HASH=sha512:a3dc10f16d9a002a95de0fa993b69a86dac174207f4ed1fbcf90030146a57b3a124e66e18a21b6fdd77673cb78ecadc9a618a1f755d8d9e4bf8aafa12926b38f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=4.5.91.1
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index 29b5d5e..eedc687 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,6 @@
+2013-02-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.4
+
2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dep; PATCHLEVEL=1




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4519be00d8ebe7e8b69e69f6b7ee5940c330f4f9), Vlad Glagolev, 02/10/2013

Archive powered by MHonArc 2.6.24.

Top of Page