summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndraž Levstik2009-12-31 16:20:39 +0100
committerAndraž Levstik2009-12-31 16:20:39 +0100
commit885a7af4c85437cc15609476b936e8700307f727 (patch)
tree888eb75d35535e2f489b737b27708d7cc055aebc
parentb499d37d048d7f733c9d39bca8f0dcbe2c086908 (diff)
parent1fd90085a544d38d0edf5ffc5ebc1a47d21f3f0c (diff)
Merge branch 'master' of git+ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog133
-rwxr-xr-xFUNCTIONS12
-rwxr-xr-xaudio-libs/libmpdclient/DETAILS13
-rw-r--r--audio-libs/libmpdclient/HISTORY2
-rwxr-xr-xaudio-players/mpc/DETAILS4
-rw-r--r--audio-players/mpc/HISTORY3
-rwxr-xr-xaudio-players/mpd/DETAILS4
-rw-r--r--audio-players/mpd/HISTORY3
-rwxr-xr-xaudio-players/ncmpc/DEPENDS1
-rwxr-xr-xaudio-players/ncmpc/DETAILS10
-rw-r--r--audio-players/ncmpc/HISTORY5
-rwxr-xr-xaudio-players/ncmpc/PRE_BUILD4
-rw-r--r--audio-players/ncmpc/ncmpc-wide-char.patch20
-rw-r--r--audio-players/ncmpc/ru.po681
-rwxr-xr-xcollab/drupal/CONFIGURE2
-rw-r--r--collab/drupal/HISTORY2
-rwxr-xr-xcollab/drupal/INSTALL2
-rw-r--r--collab/drupal/drupal-6.3.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xcrypto/opensc/DETAILS4
-rw-r--r--crypto/opensc/HISTORY3
-rwxr-xr-xdatabase/mysql/DETAILS2
-rw-r--r--database/mysql/HISTORY3
-rwxr-xr-xdevel/gdb/DETAILS2
-rw-r--r--devel/gdb/HISTORY3
-rwxr-xr-xdevel/git/DETAILS2
-rw-r--r--devel/git/HISTORY3
-rwxr-xr-xdevel/scheme48/DETAILS6
-rw-r--r--devel/scheme48/HISTORY8
-rwxr-xr-xdevel/scheme48/INSTALL5
-rwxr-xr-xdevel/scheme48/PRE_BUILD4
-rw-r--r--devel/scheme48/haddr.patch14
-rwxr-xr-xdevel/xmlto/DETAILS2
-rw-r--r--devel/xmlto/HISTORY3
-rwxr-xr-xdisk/cdrtools/DETAILS4
-rw-r--r--disk/cdrtools/HISTORY3
-rwxr-xr-xeditors/gtkspell/DETAILS4
-rw-r--r--editors/gtkspell/HISTORY3
-rwxr-xr-xftp/aria2/DETAILS4
-rw-r--r--ftp/aria2/HISTORY3
-rwxr-xr-xgnome2-apps/accerciser/DETAILS2
-rw-r--r--gnome2-apps/accerciser/HISTORY3
-rw-r--r--gnome2-apps/accerciser/accerciser-1.2.0.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-apps/accerciser/accerciser-1.8.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/alacarte/DETAILS2
-rw-r--r--gnome2-apps/alacarte/HISTORY4
-rw-r--r--gnome2-apps/alacarte/alacarte-0.11.10.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-apps/alacarte/alacarte-0.12.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/gedit/DETAILS2
-rw-r--r--gnome2-apps/gedit/HISTORY3
-rw-r--r--gnome2-apps/gedit/gedit-2.28.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/gedit/gedit-2.28.3.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/gnome-system-tools/DETAILS2
-rw-r--r--gnome2-apps/gnome-system-tools/HISTORY3
-rw-r--r--gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/orca/DEPENDS7
-rwxr-xr-xgnome2-apps/orca/DETAILS2
-rw-r--r--gnome2-apps/orca/HISTORY4
-rw-r--r--gnome2-apps/orca/orca-2.28.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/orca/orca-2.28.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/vinagre/DETAILS2
-rw-r--r--gnome2-apps/vinagre/HISTORY3
-rw-r--r--gnome2-apps/vinagre/vinagre-2.28.0.1.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/vinagre/vinagre-2.28.1.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome-games2/DETAILS2
-rw-r--r--gnome2-libs/gnome-games2/HISTORY3
-rw-r--r--gnome2-libs/gnome-games2/gnome-games-2.28.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-games2/gnome-games-2.28.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome-mag/BUILD2
-rwxr-xr-xgnome2-libs/gnome-mag/CONFIGURE4
-rwxr-xr-xgnome2-libs/gnome-mag/DEPENDS7
-rwxr-xr-xgnome2-libs/gnome-mag/DETAILS2
-rw-r--r--gnome2-libs/gnome-mag/HISTORY4
-rw-r--r--gnome2-libs/gnome-mag/gnome-mag-0.15.5.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-mag/gnome-mag-0.15.9.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome2-user-docs/DETAILS2
-rw-r--r--gnome2-libs/gnome2-user-docs/HISTORY3
-rw-r--r--gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.2.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gtksourceview/DETAILS4
-rw-r--r--gnome2-libs/gtksourceview/HISTORY3
-rwxr-xr-xgnome2-libs/libgda4/DEPENDS18
-rwxr-xr-xgnome2-libs/libgda4/DETAILS17
-rw-r--r--gnome2-libs/libgda4/HISTORY3
-rwxr-xr-xgnome2-libs/vino/BUILD6
-rwxr-xr-xgnome2-libs/vino/CONFIGURE3
-rwxr-xr-xgnome2-libs/vino/DEPENDS7
-rwxr-xr-xgnome2-libs/vino/DETAILS2
-rw-r--r--gnome2-libs/vino/HISTORY5
-rw-r--r--gnome2-libs/vino/vino-2.28.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/vino/vino-2.28.1.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--gnu.gpgbin246926 -> 248237 bytes
-rwxr-xr-xgraphics-libs/libraw/DETAILS4
-rw-r--r--graphics-libs/libraw/HISTORY3
-rwxr-xr-xgraphics/dcraw/DETAILS4
-rw-r--r--graphics/dcraw/HISTORY3
-rwxr-xr-xlibs/glibc/DETAILS4
-rw-r--r--libs/glibc/HISTORY3
-rwxr-xr-xlibs/gwenhywfar/DETAILS10
-rw-r--r--libs/gwenhywfar/HISTORY3
-rwxr-xr-xlibs/neon/DETAILS2
-rw-r--r--libs/neon/HISTORY3
-rwxr-xr-xlibs/openmpi/DETAILS5
-rw-r--r--libs/openmpi/HISTORY4
-rwxr-xr-xnet/cacti/DETAILS5
-rw-r--r--net/cacti/HISTORY5
-rwxr-xr-xnet/cacti/PRE_BUILD12
-rw-r--r--net/cacti/patches/cross_site_fix.patch175
-rwxr-xr-xnet/ntop/BUILD3
-rwxr-xr-xnet/ntop/CONFIGURE2
-rwxr-xr-xnet/ntop/DEPENDS1
-rwxr-xr-xnet/ntop/DETAILS6
-rw-r--r--net/ntop/GeoIPASNum.dat.gz.sigbin0 -> 287 bytes
-rw-r--r--net/ntop/GeoLiteCity.dat.gz.sigbin0 -> 287 bytes
-rw-r--r--net/ntop/HISTORY11
-rwxr-xr-xnet/ntop/PRE_BUILD25
-rw-r--r--net/ntop/init.d/ntop4
-rw-r--r--net/ntop/init.d/ntop.conf12
-rw-r--r--net/ntop/systemgeoip.patch36
-rw-r--r--perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xperl-cpan/anyevent/DETAILS5
-rw-r--r--perl-cpan/anyevent/HISTORY3
-rwxr-xr-xperl-cpan/finance-quote/DETAILS4
-rw-r--r--perl-cpan/finance-quote/HISTORY3
-rwxr-xr-xpython-pypi/bpython/DEPENDS4
-rwxr-xr-xpython-pypi/bpython/DETAILS4
-rw-r--r--python-pypi/bpython/HISTORY7
-rwxr-xr-xscience/fraqtive/BUILD3
-rwxr-xr-xscience/fraqtive/DEPENDS1
-rwxr-xr-xscience/fraqtive/DETAILS17
-rw-r--r--science/fraqtive/HISTORY3
-rwxr-xr-xscience/fraqtive/PRE_BUILD3
-rwxr-xr-xscience/gkii/BUILD2
-rwxr-xr-xscience/gkii/DEPENDS3
-rwxr-xr-xscience/gkii/DETAILS14
-rw-r--r--science/gkii/HISTORY3
-rwxr-xr-xscience/gkii/PRE_BUILD3
-rwxr-xr-xsecurity-libs/linux-pam/DETAILS2
-rw-r--r--security-libs/linux-pam/HISTORY3
-rwxr-xr-xshell-term-fm/bash/DETAILS2
-rw-r--r--shell-term-fm/bash/HISTORY5
-rwxr-xr-xshell-term-fm/bash/PRE_BUILD2
-rw-r--r--shell-term-fm/bash/patches/bash40-03459
-rw-r--r--shell-term-fm/bash/patches/bash40-03562
-rwxr-xr-xshell-term-fm/rxvt-unicode/DETAILS4
-rw-r--r--shell-term-fm/rxvt-unicode/HISTORY3
-rwxr-xr-xshell-term-fm/terminator/DETAILS7
-rw-r--r--shell-term-fm/terminator/HISTORY3
-rwxr-xr-xutils/autogen/DEPENDS2
-rw-r--r--utils/autogen/HISTORY3
-rwxr-xr-xutils/gpm/DETAILS2
-rw-r--r--utils/gpm/HISTORY3
-rwxr-xr-xutils/nss-pam-ldapd/DETAILS2
-rw-r--r--utils/nss-pam-ldapd/HISTORY3
-rwxr-xr-xvideo-libs/libquicktime/DEPENDS2
-rw-r--r--video-libs/libquicktime/HISTORY3
-rwxr-xr-xx11/gkrellm2/DETAILS4
-rw-r--r--x11/gkrellm2/HISTORY4
-rwxr-xr-xx11/gkrellm2/PRE_BUILD5
-rw-r--r--x11/gkrellm2/glibc-2.10.1.patch30
-rwxr-xr-xxfce/xfce4-dict/DETAILS4
-rw-r--r--xfce/xfce4-dict/HISTORY3
-rw-r--r--xfce/xfce4-dict/xfce4-dict-0.5.3.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--xfce/xfce4-dict/xfce4-dict-0.6.0.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-driver/xf86-video-vmware/DETAILS2
-rw-r--r--xorg-driver/xf86-video-vmware/HISTORY8
-rwxr-xr-xxorg-driver/xf86-video-vmware/PRE_BUILD7
-rw-r--r--xorg-driver/xf86-video-vmware/vmware.patch78
-rw-r--r--xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xxorg-extras/xterm/DEPENDS20
-rw-r--r--xorg-extras/xterm/HISTORY7
172 files changed, 893 insertions, 1000 deletions
diff --git a/ChangeLog b/ChangeLog
index ca8ab66a9d..f6ba65b879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,24 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * audio-libs/libmpdclient: new spell
+ a library for interfacing Music Player Daemon (MPD)
+
+2009-12-30 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * gnome2-libs/libgda4: new spell,
+ data abstraction library based on GLib
+
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * gnu.gpg: added key DCF93944 (Petr Baudis <@suse.cz>) for glibc spell
+
+2009-12-29 Ladislav Hagara <hgr@vabo.cz>
+ * science/gkii: new spell, Mandelbrot and Julia Fractal image generator
+ * science/fraqtive: new spell, Mandelbrot family fractal generator
+
2009-12-26 Vasil Yonkov <spirtbrat@sourcemage.org>
- * gnome2-libs/seed: new spell, GObject JavaScriptCore bridge
- * gnome2-libs/gnome-js-common: new spell,
- Common modules for GNOME JavaScript interpreters
- * gnome2-libs/gir-repository: new spell,
- Library for handling GObject introspection data
+ * gnome2-libs/seed: new spell, GObject JavaScriptCore bridge
+ * gnome2-libs/gnome-js-common: new spell,
+ Common modules for GNOME JavaScript interpreters
+ * gnome2-libs/gir-repository: new spell,
+ Library for handling GObject introspection data
* gnome2-libs/gjs: new spell, Javascript Bindings for GNOME
2009-12-26 Vlad Glagolev <stealth@sourcemage.org>
@@ -24,8 +39,8 @@
2009-12-22 Eric Sandall <sandalle@sourcemage.org>
* mozilla.gpg: Added 0x6CE2996F
- Verified fromhttp://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
- and subkeys.pgp.net
+ Verified fromhttp://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
+ and subkeys.pgp.net
2009-12-18 Arjan Bouter <abouter@sourcemage.org>
* wm-addons/sawfish-pager: new spell, sawfish's native pager
@@ -40,7 +55,7 @@
2009-12-08 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org>
* libs/libsvdrp: new spell, an interface library to allow C programs
- to interact with a running VDR.
+ to interact with a running VDR.
2009-12-07 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org>
* e-17/eyelight: new spell, EFL based presentation tool
@@ -186,22 +201,22 @@
2009-10-03 Bearcat M. Sandor <sourcemage@feline-soul.com>
* telephony/telepathy-stream-engine: new spell, media streaming
- for telepathy
+ for telepathy
2009-10-03 Bearcat M. Sandor <sourcemage@feline-soul.com>
* telephony/telepathy-feed: new spell, galago feed for telepathy
2009-10-03 Bearcat M. Sandor <sourcemage@feline-soul.com>
* telephony/telepathy-salut: new spell, local xmpp connection
- manager for telepathy
+ manager for telepathy
2009-10-03 Bearcat M. Sandor <sourcemage@feline-soul.com>
* telephony/telepathy-idle: new spell, irc connection manager for
- telepathy
+ telepathy
2009-10-02 Bearcat M. Sandor <sourcemage@feline-soul.com>
* telephony/telepathy-farsight: new spell, farsight bindings for
- telepathy
+ telepathy
2009-10-01 Ethan Grammatikidis <eekee57@fastmail.fm>
* editors/vi: new spell, the traditional vi
@@ -557,11 +572,11 @@
* audio-soft/gnaural: Added a GTK+ programmable binaural-beat generator
2009-07-10 Bearcat M. Sandor <sourcemage@feline-soul.com>
- *video/transmageddon: new spell, video converter
+ * video/transmageddon: new spell, video converter
2009-07-07 Bearcat M. Sandor <sourcemage@feline-soul.com>
- *x11-toolkits/goocanvas: new spell, cairo canvas for gtk2+
- *python-devel/pygoocanvas: python bindings for goocanvas
+ * x11-toolkits/goocanvas: new spell, cairo canvas for gtk2+
+ * python-devel/pygoocanvas: python bindings for goocanvas
2009-07-07 Ladislav Hagara <hgr@vabo.cz>
* audio-libs/libtiger: new spell
@@ -596,20 +611,20 @@
2009-06-27 Bearcat M. Sandor <sourcemage@feline-soul.com>
* utils/odt2txt: new spell, convert OpenDocument text to plain
- text
+ text
2009-06-25 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
* video/yaydl: new spell, Yet Another Youtube Downloader
2009-06-25 Ladislav Hagara <hgr@vabo.cz>
* libs/podsleuth: new spell, a tool to discover detailed model
- information about an Apple (TM) iPod (TM)
+ information about an Apple (TM) iPod (TM)
* libs/mono-zeroconf: new spell, a cross platform Zero Configuration
- Networking library for Mono
+ Networking library for Mono
* gnome2-libs/gnome-keyring-sharp: new spell, C# client library to
- access the GNOME Keyring daemon
+ access the GNOME Keyring daemon
* utils/notify-sharp: new spell, C# client implementation for Desktop
- Notifications
+ Notifications
* gnome2-apps/gnome-do: new spell, an intelligent launcher tool
* gnome2-apps/gnome-do-plugins: new spell, plugins for gnome-do
@@ -831,7 +846,7 @@
2009-04-23 Ladislav Hagara <hgr@vabo.cz>
* shell-term-fm/eaglemode: new spell, a zoomable user interface with
- many plugin applications in a virtual cosmos
+ many plugin applications in a virtual cosmos
2009-04-22 Treeve Jelbert <treeve@sourcemage.org>
* antivirus/inoclam: new spell, antivirus monitor
@@ -979,7 +994,7 @@
2009-03-18 Bearcat M. Sandor <sorcery@feline-soul.com>
* gnome2-apps/gnome-color-chooser: new spell, a color your gtk
- themes on the fly
+ themes on the fly
2009-03-17 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* crypto/cryptmount: new spell, a utility which allows an ordinary user to
@@ -1746,7 +1761,7 @@
2008-09-28 Robin Cook <rcook@wyrms.net>
* gnome2-lib/policykit-gnome: new spell gnome interface for policykit
* gnome2-lib/libcanberra: new spell Implementation of the
- XDG Sound Theme and Name Spec
+ XDG Sound Theme and Name Spec
2008-09-28 Treeve Jelbert <treeve@sourcemage.org>
* python-pypi/bsddb3: new spell fix python support for newer db
@@ -2316,6 +2331,11 @@
framework for KDE)
* utils/pmtools: new spell, a collection of power management tools
+2008-08-09 Eric Sandall <sandalle@sourcemage.org>
+ * FUNCTIONS: install_www_files now installs to a versioned directory so as
+ not to overwrite older versions which (may) need to go through an
+ upgrade procedure first.
+
2008-08-09 Ethan Grammatikidis <eekee57@fastmail.fm>
* utils/fbmodes: new spell, Modeline calculator
@@ -2567,7 +2587,7 @@
2008-06-18 Ivan Lezhnjov Jr. <ivan.lezhnjov.jr@sourcemage.org>
* kde-look/qtcurve-gtk2: new spell, QT Widget style to unify GNOME/KDE
- applications' look
+ applications' look
* disk/bin2iso: new spell, a BIN to ISO converter
2008-06-18 Arjan Bouter <abouter@sourcemage.org>
@@ -3335,7 +3355,7 @@
* util/ndeks-dbus-glib: new spell, required for beagle
2008-01-26 Vlad Glagolev <stealth@sourcemage.org>
- * lua-forge/luaposix: new spell, POSIX library for Lua
+ * lua-forge/luaposix: new spell, POSIX library for Lua
* lua-forge/lua-imlib2: new spell, binding to the imlib2 image library
2008-01-24 Eric Sandall <sandalle@sourcemage.org>
@@ -4544,9 +4564,9 @@
2007-06-05 Eric Sandall <sandalle@sourcemage.org>
* fonts/redhat.gpg: RedHat's GPG key, verified via
- https://www.redhat.com/security/37017186.txt,
- https://www.redhat.com/security/team/key/#package, and
- http://keyserv.nic-se.se:11371/pks/lookup?op=get&search=0x5326810137017186
+ https://www.redhat.com/security/37017186.txt,
+ https://www.redhat.com/security/team/key/#package, and
+ http://keyserv.nic-se.se:11371/pks/lookup?op=get&search=0x5326810137017186
* fonts/liberation-fonts-ttf: RedHat's GPL'd Liberation font sets
2007-06-06 Pol Vinogradov <vin.public@gmail.com>
@@ -4573,7 +4593,7 @@
2007-05-31 Remko van der Vossen <wich@stack.nl>
* printer/paps: New spell
- UTF-8 to postscript converter with a Pango backend.
+ UTF-8 to postscript converter with a Pango backend.
2007-05-30 Juuso Alasuutari <iuso@sourcemage.org>
* security/polgen: New spell, SELinux policy generation toolkit.
@@ -5410,7 +5430,7 @@
2007-01-08 David Brown <dmlb2000@gmail.com>
* kernels/linux-initramfs: new spell for adding initial ramdisks to
- linux spell
+ linux spell
2007-01-04 Thomas Orgis <sobukus@sourcemage.org>
* doc/po4a: new spell, gettext for documentation...
@@ -6354,14 +6374,14 @@
2006-06-29 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* i18n/scim-chinese: move from z-rejected, was renamed to scim-pinyin
- and relicensed to GPL, 12717
+ and relicensed to GPL, 12717
* i18n/anthy: new spell; a Kanji conversion system for Japanese input
methods
* scim-anthy: new spell; scim Anthy back-end
* graphics/ipe: new spell; editor for creating figures in PDF or Postscript
* shell-term-fm/mlterm: new spell; a multilingual terminal emulator
* audio-players/snd123: new spell; libvlc-based command line audio player
- new spells curtesy of Remko van der Vossen (wich), thanks!
+ new spells curtesy of Remko van der Vossen (wich), thanks!
2006-06-28 Pieter Lenaerts <e-type@sourcemage.org>
* perl-cpan/file-desktopentry: new spell, find XDG files and dirs
@@ -7083,30 +7103,30 @@
2005-11-30 Pieter Lenaerts <e-type@sourcemage.org>
* spells from editors to new section spelling:aspell aspell-af
- aspell-am aspell-az aspell-be aspell-bg aspell-bn aspell-br aspell-ca
- aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el
- aspell-en aspell-eo aspell-es aspell-et aspell-fa aspell-fo aspell-fr
- aspell-ga aspell-gd aspell-gl aspell-gv aspell-he aspell-hi aspell-hr
- aspell-hsb aspell-hu aspell-ia aspell-id aspell-is aspell-it aspell-ku
- aspell-la aspell-lt aspell-lv aspell-mg aspell-mi aspell-mk aspell-mn
- aspell-mr aspell-ms aspell-mt aspell-nb aspell-nds aspell-nl aspell-nn
- aspell-no aspell-ny aspell-pl aspell-pt aspell-ro aspell-ru aspell-rw
- aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-ta aspell-tet
- aspell-tl aspell-tn aspell-tr aspell-uk aspell-uz aspell-vi aspell-wa
- aspell-yi aspell-zu babydics babytrans hunspell ispell ispell-czech
- ispell-english ooodi pspell spellutils
+ aspell-am aspell-az aspell-be aspell-bg aspell-bn aspell-br aspell-ca
+ aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el
+ aspell-en aspell-eo aspell-es aspell-et aspell-fa aspell-fo aspell-fr
+ aspell-ga aspell-gd aspell-gl aspell-gv aspell-he aspell-hi aspell-hr
+ aspell-hsb aspell-hu aspell-ia aspell-id aspell-is aspell-it aspell-ku
+ aspell-la aspell-lt aspell-lv aspell-mg aspell-mi aspell-mk aspell-mn
+ aspell-mr aspell-ms aspell-mt aspell-nb aspell-nds aspell-nl aspell-nn
+ aspell-no aspell-ny aspell-pl aspell-pt aspell-ro aspell-ru aspell-rw
+ aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-ta aspell-tet
+ aspell-tl aspell-tn aspell-tr aspell-uk aspell-uz aspell-vi aspell-wa
+ aspell-yi aspell-zu babydics babytrans hunspell ispell ispell-czech
+ ispell-english ooodi pspell spellutils
* spells from windowmanagers to wm-addons:alarm-applet allin1 asclock
- asmixer astime bbconf bbdate bbkeys bbmail bbpager bbppp bbrun bbsload
- bbsmount bbtime bubblemon-dockapp desklaunch deskmenu devilspie docker
- fbdesk fbpager fspanel iceme icewmconf idesk keylaunch libdockapp
- libdockapp4 menumaker mixer.app obconf ratpoison rootclock rootmem
- skippy ticker.app tpager twin vdesk volume volume2 wdm
- windowmaker-extra wmacpimon wmakerconf wmalbum wmapmload wmappl
- wmbatteries wmbiff wmbinclock wmcalclock wmclockmon wmclockmon
- wmcpuload wmcpuload wmctrl wmdrawer wmessage wmgtemp wmifinfo wmii
- wmix wmjmail wmjstock wmlongrun wmmaiload wmmemload wmmemmon
- wmmoonclock wmnd wmnetload wmpasman wmpop3 wmsensormon wmstock wmtop
- wmupmon wmusic wmwave wmweather wmweather+ wmwifi wmwork xp
+ asmixer astime bbconf bbdate bbkeys bbmail bbpager bbppp bbrun bbsload
+ bbsmount bbtime bubblemon-dockapp desklaunch deskmenu devilspie docker
+ fbdesk fbpager fspanel iceme icewmconf idesk keylaunch libdockapp
+ libdockapp4 menumaker mixer.app obconf ratpoison rootclock rootmem
+ skippy ticker.app tpager twin vdesk volume volume2 wdm
+ windowmaker-extra wmacpimon wmakerconf wmalbum wmapmload wmappl
+ wmbatteries wmbiff wmbinclock wmcalclock wmclockmon wmclockmon
+ wmcpuload wmcpuload wmctrl wmdrawer wmessage wmgtemp wmifinfo wmii
+ wmix wmjmail wmjstock wmlongrun wmmaiload wmmemload wmmemmon
+ wmmoonclock wmnd wmnetload wmpasman wmpop3 wmsensormon wmstock wmtop
+ wmupmon wmusic wmwave wmweather wmweather+ wmwifi wmwork xp
2005-11-29 Ladislav Hagara <hgr@vabo.cz>
* e/e_module-eloquence, e/e_module-screenshot: new E17 modules
@@ -8274,7 +8294,7 @@
2004-03-14 Arwed v. Merkatz <v.merkatz@gmx.net>
* utils/banshee-linux: removed banshee-linux spell, project is dead and
- vanished from the net
+ vanished from the net
2004-03-12 Eric Sandall <sandalle@sourcemage.org>
* java/jaf,jms,jmx,jdmk,jndi,java_xml_pack,javamail,jdbc-optional,jta:
@@ -8324,3 +8344,4 @@
full use of xfree86-devel or xfree86-libs or xdirectfb spells to
provide x11-{libs,server}. THE CATCH IS YOU MUST USE DEVEL SORCERY
OR YOU WILL GET NOTHING BUT ERRORS DURING CAST.
+
diff --git a/FUNCTIONS b/FUNCTIONS
index c18ebc3968..adbf3cf8f4 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -219,7 +219,7 @@ function get_install_www_files_dir ()
## @param Directory with files we might want to install
## @param Destination directory (optional)
##
-## Installs files to WWW_DEST ($INSTALL_ROOT/usr/share/www/$SPELL) and
+## Installs files to WWW_DEST ($INSTALL_ROOT/usr/share/www/$SPELL-$VERSION) and
## sets up proper www-data permissions
## Optionally the second parameter will override WWW_DATA (and make
## sure INSTALL_ROOT exists only once in the WWW_DATA)
@@ -232,7 +232,7 @@ function install_www_files ()
#
local WWW_DEST="$INSTALL_ROOT/${2/\$INSTALL_ROOT/}"
else
- local WWW_DEST="$INSTALL_ROOT$(get_install_www_files_dir)$SPELL"
+ local WWW_DEST="$INSTALL_ROOT$(get_install_www_files_dir)$SPELL-$VERSION"
fi &&
#
@@ -244,10 +244,10 @@ function install_www_files ()
# Make sure WWW_DEST exists
#
if [ ! -d "$WWW_DEST" ]; then
- if [ ! -d "${WWW_DEST/\/$SPELL/}" ]; then
- mkdir -p "${WWW_DEST/\/$SPELL/}" &&
- chmod 0755 "${WWW_DEST/\/$SPELL/}" &&
- chown www-data:www-data "${WWW_DEST/\/$SPELL/}"
+ if [ ! -d "${WWW_DEST/\/$SPELL-$VERSION/}" ]; then
+ mkdir -p "${WWW_DEST/\/$SPELL-$VERSION/}" &&
+ chmod 0755 "${WWW_DEST/\/$SPELL-$VERSION/}" &&
+ chown www-data:www-data "${WWW_DEST/\/$SPELL-$VERSION/}"
fi &&
mkdir -p "$WWW_DEST" &&
diff --git a/audio-libs/libmpdclient/DETAILS b/audio-libs/libmpdclient/DETAILS
new file mode 100755
index 0000000000..d1bdc27269
--- /dev/null
+++ b/audio-libs/libmpdclient/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=libmpdclient
+ VERSION=2.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
+ SOURCE_HASH=sha512:1dcfdd055e4897e2be4d0e8ff8680952ee8de94a1dee23615941dab230d8bdb2a995836a9d4d1f91db3912146b892cadaeb7a9102df574d3cfd4bcecd57812fd
+ WEB_SITE=http://mpd.wikia.com/wiki/ClientLib:libmpdclient
+ ENTERED=20091231
+ LICENSE[0]=GPL
+ SHORT="a library for interfacing Music Player Daemon (MPD)"
+cat << EOF
+This is a library for interfacing Music Player Daemon (MPD).
+EOF
diff --git a/audio-libs/libmpdclient/HISTORY b/audio-libs/libmpdclient/HISTORY
new file mode 100644
index 0000000000..69e1ea214c
--- /dev/null
+++ b/audio-libs/libmpdclient/HISTORY
@@ -0,0 +1,2 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: created this spell, version 2.1
diff --git a/audio-players/mpc/DETAILS b/audio-players/mpc/DETAILS
index 44b243ae85..bee26e879d 100755
--- a/audio-players/mpc/DETAILS
+++ b/audio-players/mpc/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpc
- VERSION=0.15
+ VERSION=0.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
WEB_SITE=http://www.musicpd.org
- SOURCE_HASH=sha512:434c83ee438319e9321055be763f2a71ef909599ecbee577645fc0c754c36580ccb46c4c416d0f54beaa1e992105490385c3a21da0c5d8eaa2a85d1dde5c9190
+ SOURCE_HASH=sha512:6a07a17aaf194ef38ba053ebb72e8b15da28a100f592bb15a7ca4b1685233dca4d44e6bd6389c581d12f32ba4fbdd288f74f493de14ad0db7299c84b03ac590c
LICENSE[0]=GPL
ENTERED=20040516
DOCS="AUTHORS COPYING ChangeLog README"
diff --git a/audio-players/mpc/HISTORY b/audio-players/mpc/HISTORY
index afa51e49d3..14413d86cc 100644
--- a/audio-players/mpc/HISTORY
+++ b/audio-players/mpc/HISTORY
@@ -1,3 +1,6 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.19
+
2009-02-17 Bearcat M. Sandor <sourcemage@feline-soul.com>
* DETAILS: updated to 0.15, changed SOURCE_URL to sourceforge as the original url looks unmaintained.
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index c400e7d48a..416bd331a5 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.15.6
+ VERSION=0.15.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
- SOURCE_HASH=sha512:b6a0d5791d24fbcdc052baa23ae657e484a3b3daed88b09962be29eec598ab17ef5951fdbd23d3e0aa6ca086d066e61e7af90ec97511cc1df6151d2e07d04f53
+ SOURCE_HASH=sha512:75baf576167d97b7515ef094c07e5612b6c24530112b21e9cc30cbee63d82be9ab42df9f0460ef6e2b074cf9d400dd449616a66178663a03aea3059e729e0fd1
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index d77eaf5079..f48cc217b9 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.15.7
+
2009-12-16 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org>
* init.d/mpd : Testing if db file exist instead of variable content
diff --git a/audio-players/ncmpc/DEPENDS b/audio-players/ncmpc/DEPENDS
index 0d413ce27d..3ca1b73d24 100755
--- a/audio-players/ncmpc/DEPENDS
+++ b/audio-players/ncmpc/DEPENDS
@@ -1,3 +1,4 @@
+depends libmpdclient &&
depends ncurses &&
depends glib2 &&
depends popt
diff --git a/audio-players/ncmpc/DETAILS b/audio-players/ncmpc/DETAILS
index c1530cdc4a..9728f4fc41 100755
--- a/audio-players/ncmpc/DETAILS
+++ b/audio-players/ncmpc/DETAILS
@@ -1,10 +1,10 @@
SPELL=ncmpc
- VERSION=0.11.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.16
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://mercury.chem.pitt.edu/~shank/$SOURCE
- SOURCE_HASH=sha512:c0d544d7a429cd4146d8b99128e1bb2b9d50b7b745a2606ad5d4fdc07bb69524b92c3b9776915aa0f99b395cde205384a957e0eb704fad76edcf437a2823d26e
- WEB_SITE=http://www.musicpd.org
+ SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
+ SOURCE_HASH=sha512:f530ac156a485eb3130c3450fb7e254f65aecb600ef19d9bf29cba205d9e22778e978453db49450a2aafa51b56c65c62514a700624a054515a9a39f9aea6aa12
+ WEB_SITE=http://mpd.wikia.com/wiki/Client:Ncmpc
ENTERED=20040516
LICENSE[0]=GPL
DOCS="AUTHORS COPYING ChangeLog NEWS README"
diff --git a/audio-players/ncmpc/HISTORY b/audio-players/ncmpc/HISTORY
index 60b9d8239d..ec141a1999 100644
--- a/audio-players/ncmpc/HISTORY
+++ b/audio-players/ncmpc/HISTORY
@@ -1,3 +1,8 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.16, new WEB_SITE and SOURCE_URL[0]
+ * DEPENDS: added libmpdclient
+ * PRE_BUILD, ncmpc-wide-char.patch, ru.po: removed
+
2008-10-21 Jeremy Blosser <jblosser-smgl@firinn.org>
* DEPENDS: Removed mpd as it doesn't have to be on localhost.
diff --git a/audio-players/ncmpc/PRE_BUILD b/audio-players/ncmpc/PRE_BUILD
deleted file mode 100755
index aadda8ab4f..0000000000
--- a/audio-players/ncmpc/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/ncmpc-wide-char.patch &&
-cp -v $SPELL_DIRECTORY/ru.po $SOURCE_DIRECTORY/po/
diff --git a/audio-players/ncmpc/ncmpc-wide-char.patch b/audio-players/ncmpc/ncmpc-wide-char.patch
deleted file mode 100644
index 7db74ed46a..0000000000
--- a/audio-players/ncmpc/ncmpc-wide-char.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ncmpc-0.11.1.orig/src/list_window.c ncmpc-0.11.1/src/list_window.c
---- ncmpc-0.11.1.orig/src/list_window.c 2005-01-23 18:37:42.000000000 +0100
-+++ ncmpc-0.11.1/src/list_window.c 2007-07-27 10:17:00.000000000 +0200
-@@ -196,7 +196,7 @@
- if( label )
- {
- int selected = lw->start+i == lw->selected;
-- size_t len = strlen(label);
-+ size_t len, y;
-
- if( highlight )
- colors_use(lw->w, COLOR_LIST_BOLD);
-@@ -207,6 +207,7 @@
- wattron(lw->w, A_REVERSE);
-
- waddnstr(lw->w, label, lw->cols);
-+ getyx(lw->w, y, len);
- if( fill && len<lw->cols )
- mvwhline(lw->w, i, len, ' ', lw->cols-len);
-
diff --git a/audio-players/ncmpc/ru.po b/audio-players/ncmpc/ru.po
deleted file mode 100644
index 71f7c03b04..0000000000
--- a/audio-players/ncmpc/ru.po
+++ /dev/null
@@ -1,681 +0,0 @@
-# Russian
-# Copyright (C) 2004 Kalle Wallin
-# This file is distributed under the same license as the ncmpc package.
-# Nikolay Pavlov <quetzal@roks.biz>, 2004.
-#, fuzzy
-# Modified by Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>
-msgid ""
-msgstr ""
-"Project-Id-Version: ncmpc 0.11.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 21:55+0100\n"
-"PO-Revision-Date: 2004-12-29 09:40+0200\n"
-"Last-Translator: Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>\n"
-"Language-Team: ru <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/ncmpc.h:36
-msgid "y"
-msgstr "y"
-
-#: src/ncmpc.h:37
-msgid "n"
-msgstr "n"
-
-#: src/main.c:133
-msgid "Exiting..."
-msgstr "..."
-
-#: src/main.c:266
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
-msgstr ": MPD %d.%d.%d ( 0.11.0).\n"
-
-#: src/main.c:318
-#, c-format
-msgid "Connecting to %s... [Press %s to abort]"
-msgstr " %s... [ %s ]"
-
-#: src/main.c:330
-#, c-format
-msgid "Connected to %s!"
-msgstr " %s!"
-
-#: src/screen.c:170
-msgid ":Help "
-msgstr ": "
-
-#: src/screen.c:174
-msgid ":Playlist "
-msgstr ": "
-
-#: src/screen.c:178
-msgid ":Browse "
-msgstr ": "
-
-#: src/screen.c:183
-msgid ":Search "
-msgstr ": "
-
-#: src/screen.c:188
-msgid "Volume n/a "
-msgstr " / "
-
-#: src/screen.c:192
-#, c-format
-msgid " Volume %d%%"
-msgstr " %d%%"
-
-#: src/screen.c:271
-msgid "Playing:"
-msgstr ":"
-
-#: src/screen.c:274
-msgid "[Paused]"
-msgstr "[]"
-
-#: src/screen.c:390 src/screen.c:499
-msgid "Error: Screen to small!\n"
-msgstr ": !\n"
-
-#: src/screen.c:644
-msgid "Repeat is on"
-msgstr " "
-
-#: src/screen.c:645
-msgid "Repeat is off"
-msgstr " "
-
-#: src/screen.c:648
-msgid "Random is on"
-msgstr " "
-
-#: src/screen.c:649
-msgid "Random is off"
-msgstr " "
-
-#: src/screen.c:652
-#, c-format
-msgid "Crossfade %d seconds"
-msgstr " %d "
-
-#: src/screen.c:655
-msgid "Database updated!"
-msgstr " !"
-
-#: src/screen.c:817
-msgid "Shuffled playlist!"
-msgstr " !"
-
-#: src/screen.c:821
-msgid "Cleared playlist!"
-msgstr " !"
-
-#: src/screen.c:839
-msgid "Database update started!"
-msgstr " !"
-
-#: src/screen.c:842 src/screen_file.c:673
-msgid "Database update running..."
-msgstr " ..."
-
-#: src/screen.c:855
-msgid "Find mode: Wrapped"
-msgstr " : "
-
-#: src/screen.c:856
-msgid "Find mode: Normal"
-msgstr " : "
-
-#: src/screen.c:861
-msgid "Auto center mode: On"
-msgstr " : ."
-
-#: src/screen.c:862
-msgid "Auto center mode: Off"
-msgstr " : ."
-
-#: src/screen_utils.c:38
-msgid "Find: "
-msgstr ": "
-
-#: src/screen_utils.c:39
-msgid "Find backward: "
-msgstr " : "
-
-#: src/screen_utils.c:165
-#, c-format
-msgid "Unable to find '%s'"
-msgstr " '%s'"
-
-#: src/screen_play.c:155
-msgid "Save playlist as: "
-msgstr " : "
-
-#: src/screen_play.c:185
-#, c-format
-msgid "Replace %s [%s/%s] ? "
-msgstr " %s [%s/%s] ? "
-
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
-msgid "Aborted!"
-msgstr "!"
-
-#. success
-#: src/screen_play.c:205
-#, c-format
-msgid "Saved %s"
-msgstr " %s"
-
-#: src/screen_play.c:269
-msgid "Add: "
-msgstr ": "
-
-#: src/screen_play.c:324
-msgid "Playlist"
-msgstr ""
-
-#: src/screen_play.c:326
-#, c-format
-msgid "Playlist on %s"
-msgstr " %s"
-
-#: src/screen_file.c:282
-#, c-format
-msgid "Loading playlist %s..."
-msgstr " %s..."
-
-#: src/screen_file.c:304
-msgid "You can only delete playlists!"
-msgstr " !"
-
-#: src/screen_file.c:311
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr " %s [%s/%s] ? "
-
-#: src/screen_file.c:327
-msgid "Playlist deleted!"
-msgstr " !"
-
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr " '%s' \n"
-
-#: src/screen_file.c:397
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr " %s...\n"
-
-#: src/screen_file.c:569
-#, c-format
-msgid "Browse: %s"
-msgstr ": %s"
-
-#: src/screen_file.c:658
-msgid "Screen updated!"
-msgstr " !"
-
-#: src/screen_file.c:665
-#, c-format
-msgid "Database update of %s started!"
-msgstr " %s "
-
-#: src/screen_search.c:50
-msgid "Title"
-msgstr ""
-
-#: src/screen_search.c:51
-msgid "Artist"
-msgstr ""
-
-#: src/screen_search.c:52
-msgid "Album"
-msgstr ""
-
-#: src/screen_search.c:53
-msgid "Filename"
-msgstr " "
-
-#: src/screen_search.c:114
-msgid "Search: "
-msgstr ": "
-
-#: src/screen_search.c:162
-#, c-format
-msgid "Press %s for a new search"
-msgstr " %s "
-
-#: src/screen_search.c:214
-#, c-format
-msgid "Search: Results for %s [%s]"
-msgstr " $s [$s]"
-
-#: src/screen_search.c:218
-#, c-format
-msgid "Search: Press %s for a new search [%s]"
-msgstr ": %s [%s]"
-
-#: src/screen_search.c:252
-#, c-format
-msgid "Search mode: %s"
-msgstr " : %s"
-
-#: src/screen_keydef.c:46
-msgid "===> Apply & Save key bindings "
-msgstr "===> "
-
-#: src/screen_keydef.c:47
-msgid "===> Apply key bindings "
-msgstr "===> "
-
-#: src/screen_keydef.c:76
-msgid "You have new key bindings!"
-msgstr " !"
-
-#: src/screen_keydef.c:79
-msgid "Keybindings unchanged."
-msgstr " ."
-
-#: src/screen_keydef.c:90
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
-msgstr ": ~/.ncmpc - %s"
-
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
-#, c-format
-msgid "Error: %s - %s"
-msgstr ": %s - %s"
-
-#: src/screen_keydef.c:108
-#, c-format
-msgid "Wrote %s"
-msgstr " %s"
-
-#: src/screen_keydef.c:136
-msgid "Deleted"
-msgstr ""
-
-#: src/screen_keydef.c:155
-#, c-format
-msgid "Enter new key for %s: "
-msgstr " %s"
-
-#: src/screen_keydef.c:168
-#, c-format
-msgid "Error: key %s is already used for %s"
-msgstr ": %s %s"
-
-#: src/screen_keydef.c:177
-#, c-format
-msgid "Assigned %s to %s"
-msgstr " %s %s"
-
-#: src/screen_keydef.c:220
-#, c-format
-msgid "%d. Add new key "
-msgstr "%d. "
-
-#: src/screen_keydef.c:267
-msgid "Welcome to the key editor!"
-msgstr " !"
-
-#: src/screen_keydef.c:283
-msgid "Note: Did you forget to 'Apply' your changes?"
-msgstr ": ?"
-
-#: src/screen_keydef.c:290
-msgid "Edit key bindings"
-msgstr " "
-
-#: src/screen_keydef.c:292
-#, c-format
-msgid "Edit keys for %s"
-msgstr " %s"
-
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr ""
-
-#: src/screen_help.c:43
-msgid "Keys - Movement"
-msgstr " - "
-
-#: src/screen_help.c:68
-msgid "Keys - Global"
-msgstr " - "
-
-#: src/screen_help.c:95
-msgid "Keys - Playlist screen"
-msgstr " - "
-
-#: src/screen_help.c:97
-msgid "Play"
-msgstr ""
-
-#: src/screen_help.c:100
-msgid "Move song up"
-msgstr " "
-
-#: src/screen_help.c:101
-msgid "Move song down"
-msgstr " "
-
-#: src/screen_help.c:104
-msgid "Center"
-msgstr ""
-
-#: src/screen_help.c:109
-msgid "Keys - Browse screen"
-msgstr " - "
-
-#: src/screen_help.c:111
-msgid "Enter directory/Select and play song"
-msgstr " / "
-
-#: src/screen_help.c:113
-msgid "Delete playlist"
-msgstr " "
-
-#: src/screen_help.c:119
-msgid "Keys - Search screen"
-msgstr " - "
-
-#: src/screen_help.c:121
-msgid "Search"
-msgstr ""
-
-#: src/screen_help.c:122
-msgid "Select and play"
-msgstr " "
-
-#: src/screen_help.c:208
-msgid "Help"
-msgstr ""
-
-#: src/command.c:70
-msgid "Key configuration screen"
-msgstr " "
-
-#: src/command.c:73
-msgid "Quit"
-msgstr ""
-
-#: src/command.c:77
-msgid "Move cursor up"
-msgstr " "
-
-#: src/command.c:79
-msgid "Move cursor down"
-msgstr " "
-
-#: src/command.c:81
-msgid "Home "
-msgstr " "
-
-#: src/command.c:83
-msgid "End "
-msgstr " "
-
-#: src/command.c:85
-msgid "Page up"
-msgstr " "
-
-#: src/command.c:87
-msgid "Page down"
-msgstr " "
-
-#: src/command.c:92
-msgid "Help screen"
-msgstr " "
-
-#: src/command.c:94
-msgid "Playlist screen"
-msgstr " "
-
-#: src/command.c:96
-msgid "Browse screen"
-msgstr " "
-
-#: src/command.c:101
-msgid "Play/Enter directory"
-msgstr "/ "
-
-#: src/command.c:103
-msgid "Pause"
-msgstr ""
-
-#: src/command.c:105
-msgid "Stop"
-msgstr ""
-
-#: src/command.c:107
-msgid "Next track"
-msgstr " "
-
-#: src/command.c:109
-msgid "Previous track"
-msgstr " "
-
-#: src/command.c:111
-msgid "Seek forward"
-msgstr " "
-
-#: src/command.c:113
-msgid "Seek backward"
-msgstr " "
-
-#: src/command.c:115
-msgid "Increase volume"
-msgstr " "
-
-#: src/command.c:117
-msgid "Decrease volume"
-msgstr " "
-
-#: src/command.c:119
-msgid "Select/deselect song in playlist"
-msgstr "/ "
-
-#: src/command.c:121
-msgid "Delete song from playlist"
-msgstr " "
-
-#: src/command.c:123
-msgid "Shuffle playlist"
-msgstr " "
-
-#: src/command.c:125
-msgid "Clear playlist"
-msgstr " "
-
-#: src/command.c:127
-msgid "Toggle repeat mode"
-msgstr "/ "
-
-#: src/command.c:129
-msgid "Toggle random mode"
-msgstr "/ "
-
-#: src/command.c:131
-msgid "Toggle crossfade mode"
-msgstr "/ "
-
-#: src/command.c:133
-msgid "Start a music database update"
-msgstr " "
-
-#: src/command.c:135
-msgid "Save playlist"
-msgstr " "
-
-#: src/command.c:137
-msgid "Add url/file to playlist"
-msgstr " url/ "
-
-#: src/command.c:142
-msgid "Move item up"
-msgstr " "
-
-#: src/command.c:144
-msgid "Move item down"
-msgstr " "
-
-#: src/command.c:146
-msgid "Update screen"
-msgstr " "
-
-#: src/command.c:151
-msgid "Toggle find mode"
-msgstr " "
-
-#: src/command.c:153
-msgid "Toggle auto center mode"
-msgstr "/ "
-
-#: src/command.c:158
-msgid "Next screen"
-msgstr " "
-
-#: src/command.c:160
-msgid "Previous screen"
-msgstr " "
-
-#: src/command.c:165
-msgid "Forward find"
-msgstr " "
-
-#: src/command.c:167
-msgid "Forward find next"
-msgstr " "
-
-#: src/command.c:169
-msgid "Backward find"
-msgstr " "
-
-#: src/command.c:171
-msgid "Backward find previous"
-msgstr " "
-
-#: src/command.c:177
-msgid "Search screen"
-msgstr " "
-
-#: src/command.c:179
-msgid "Change search mode"
-msgstr " "
-
-#: src/command.c:184
-msgid "Clock screen"
-msgstr " "
-
-#: src/command.c:206
-msgid "Undefined"
-msgstr " "
-
-#: src/command.c:208
-msgid "Space"
-msgstr ""
-
-#: src/command.c:210
-msgid "Enter"
-msgstr ""
-
-#: src/command.c:212
-msgid "Backspace"
-msgstr "Backspace"
-
-#: src/command.c:214
-msgid "Delete"
-msgstr "Delete"
-
-#: src/command.c:216
-msgid "Up"
-msgstr ""
-
-#: src/command.c:218
-msgid "Down"
-msgstr ""
-
-#: src/command.c:220
-msgid "Left"
-msgstr ""
-
-#: src/command.c:222
-msgid "Right"
-msgstr ""
-
-#: src/command.c:224
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:226
-msgid "End"
-msgstr "End"
-
-#: src/command.c:228
-msgid "PageDown"
-msgstr "PageDown"
-
-#: src/command.c:230
-msgid "PageUp"
-msgstr "PageUp"
-
-#: src/command.c:232
-msgid "Tab"
-msgstr "Tab"
-
-#: src/command.c:234
-msgid "Shift+Tab"
-msgstr "Shift+Tab"
-
-#: src/command.c:236
-msgid "Esc"
-msgstr "Esc"
-
-#: src/command.c:238
-msgid "Insert"
-msgstr "Insert"
-
-#: src/command.c:488
-#, c-format
-msgid "Key %s assigned to %s and %s (press %s for the key editor)"
-msgstr " %s %s %s (%s - )"
-
-#: src/command.c:495 src/command.c:502
-#, c-format
-msgid "Error: Key %s assigned to %s and %s !!!\n"
-msgstr ": %s %s %s !!!\n"
-
-#: src/colors.c:187
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr ": - %s\n"
-
-#: src/colors.c:232
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
-msgstr ": - %s\n"
-
-#: src/colors.c:267
-msgid "Terminal lacks support for changing colors!\n"
-msgstr " !\n"
-
-#: src/colors.c:284
-msgid "Terminal lacks color capabilities!\n"
-msgstr " !\n"
-
-#: src/support.c:168
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr ": %s"
-
-#: src/support.c:197
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr ": UTF-8"
-
-#~ msgid "Enter directory"
-#~ msgstr " "
diff --git a/collab/drupal/CONFIGURE b/collab/drupal/CONFIGURE
index 93ccf42604..d2acac222d 100755
--- a/collab/drupal/CONFIGURE
+++ b/collab/drupal/CONFIGURE
@@ -1,6 +1,6 @@
. $GRIMOIRE/FUNCTIONS &&
config_query_string DRUPAL_INSTALL_PATH \
- "What path do you wish to use for installation (the spell name will be added at the end)?" \
+ "What path do you wish to use for installation (the spell name and version will be added at the end)?" \
"usr/share/www" &&
config_query_list DRUPAL_DATABASE_ENGINE \
diff --git a/collab/drupal/HISTORY b/collab/drupal/HISTORY
index 899b18f7f3..54dae05668 100644
--- a/collab/drupal/HISTORY
+++ b/collab/drupal/HISTORY
@@ -8,6 +8,8 @@
2008-08-09 Eric Sandall <sandalle@sourcemage.org>
* DETAILS, PREPARE: Updated old version to 5.9
Updated new version to 6.3
+ * CONFIGURE, INSTALL: Install to versioned directory to not overwrite older
+ versions until they can be properly upgraded
2007-03-19 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 4.7.6 (Security update)
diff --git a/collab/drupal/INSTALL b/collab/drupal/INSTALL
index 21b52fa171..99af46e6d3 100755
--- a/collab/drupal/INSTALL
+++ b/collab/drupal/INSTALL
@@ -1,4 +1,4 @@
-install_www_files ./ ${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL} &&
+install_www_files ./ ${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}-${VERSION} &&
if [ "${DRUPAL_INSTALLED}" == "n" ]; then
if [ "${DRUPAL_CREATEDB}" == "y" ]; then
diff --git a/collab/drupal/drupal-6.3.tar.gz.sig b/collab/drupal/drupal-6.3.tar.gz.sig
new file mode 100644
index 0000000000..122475ed0a
--- /dev/null
+++ b/collab/drupal/drupal-6.3.tar.gz.sig
Binary files differ
diff --git a/crypto/opensc/DETAILS b/crypto/opensc/DETAILS
index ad7d964e5f..59404dda0a 100755
--- a/crypto/opensc/DETAILS
+++ b/crypto/opensc/DETAILS
@@ -1,11 +1,11 @@
SPELL=opensc
- VERSION=0.11.11
+ VERSION=0.11.12
SECURITY_PATCH=2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.opensc-project.org/files/opensc/${SOURCE}
- SOURCE_HASH=sha512:1b637de9aad502455e66a5282156a97db22ac6273930730d50d35efb5f49cfef243c78f45f50ba43bf3ddddbdc8af37a703f395105f45a2566519c19bd228a7d
+ SOURCE_HASH=sha512:7e03ccc6e053d0d6f154fc1608e5cf7923c369b7a95bc6223024050f76d89939783becfd01e22f52e6c9a64cea9954ff0dca9af517fb274d616541b829c7042c
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.opensc-project.org
diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index d321049c07..58bd618756 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.11.12
+
2009-11-17 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.11.11
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index dc029d1b04..c24f582e4a 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -1,6 +1,6 @@
SPELL=mysql
if [[ $OLD == y ]]; then
- VERSION=5.0.88
+ VERSION=5.0.89
SECURITY_PATCH=3
else
VERSION=5.1.41
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 377e979eb8..5597d5a278 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 5.0.89 [old]
+
2009-11-21 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated stable to 5.1.41
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index afc8829999..c65dae6096 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdb
- VERSION=7.0
+ VERSION=7.0.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index a17a24c7b1..82ed17ef92 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 7.0.1
+
2009-10-08 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: updated spell to 7.0
* CONFLICTS: removed, lost insight
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 4624aaa45b..c6747805ef 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.6.5.7
+ VERSION=1.6.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 87b9561bc6..583871b0f2 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.6
+
2009-12-17 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.5.7
diff --git a/devel/scheme48/DETAILS b/devel/scheme48/DETAILS
index cd47fe016d..c39b6707b0 100755
--- a/devel/scheme48/DETAILS
+++ b/devel/scheme48/DETAILS
@@ -1,9 +1,9 @@
SPELL=scheme48
- VERSION=1.3
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.s48.org/1.3/$SOURCE
- SOURCE_HASH=sha512:68c82d425e08fb3ff1db99af25ff3d9f1a8a29d0a9fa39c779a221db12a9ca29d54573e6b98bf0bfd27c2debc4abf308d26e8455db22f1ba3d68d2a4cca97e2f
+ SOURCE_URL[0]=http://www.s48.org/$VERSION/$SOURCE
+ SOURCE_HASH=sha512:1cae01ef1e282971ad0bad308a4d75fe24dcc629b09f711b54811d843f85f02cf3a728d19d44cdcc2699d071b27b2a0fb40c0ebb3a08db0f06a115e53e8b9e47
LICENSE[0]=BSD
WEB_SITE=http://www.s48.org
KEYWORDS="devel"
diff --git a/devel/scheme48/HISTORY b/devel/scheme48/HISTORY
index d4983fc0a9..eb8605a40a 100644
--- a/devel/scheme48/HISTORY
+++ b/devel/scheme48/HISTORY
@@ -1,3 +1,11 @@
+2009-12-30 Peng Chang (Charles) <chp@sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.8
+ * INSTALL: make_single
+ * haddr.patch: a simple hack to make it compile in POSIX,
+ reported upstream
+ * PRE_BUILD: apply the above patch
+
2006-10-05 Anton Brondz <dinolinux@sourcemage.org>
* DETAILS: updated to 1.3
diff --git a/devel/scheme48/INSTALL b/devel/scheme48/INSTALL
new file mode 100755
index 0000000000..a6b25e2957
--- /dev/null
+++ b/devel/scheme48/INSTALL
@@ -0,0 +1,5 @@
+cd $SOURCE_DIRECTORY &&
+
+make_single &&
+make install &&
+make_normal
diff --git a/devel/scheme48/PRE_BUILD b/devel/scheme48/PRE_BUILD
new file mode 100755
index 0000000000..4000b8d8be
--- /dev/null
+++ b/devel/scheme48/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/haddr.patch
diff --git a/devel/scheme48/haddr.patch b/devel/scheme48/haddr.patch
new file mode 100644
index 0000000000..39ac6e1c75
--- /dev/null
+++ b/devel/scheme48/haddr.patch
@@ -0,0 +1,14 @@
+diff -aurp scheme48-1.8.orig/c/unix/socket.c scheme48-1.8/c/unix/socket.c
+--- scheme48-1.8.orig/c/unix/socket.c 2008-01-14 15:06:41.000000000 +0800
++++ scheme48-1.8/c/unix/socket.c 2009-12-30 13:01:03.000000000 +0800
+@@ -29,6 +29,10 @@
+ /* Henry Cejtin says that 5 is the largest safe number for this. */
+ #define LISTEN_QUEUE_SIZE 5
+
++#ifndef h_addr
++ #define h_addr h_addr_list[0]
++#endif
++
+ extern void s48_init_socket(void);
+ static s48_value s48_socket(s48_value udp_p, s48_value input_p),
+ s48_bind(s48_value socket_channel, s48_value number),
diff --git a/devel/xmlto/DETAILS b/devel/xmlto/DETAILS
index 4a675874a9..cc433e6448 100755
--- a/devel/xmlto/DETAILS
+++ b/devel/xmlto/DETAILS
@@ -1,5 +1,5 @@
SPELL=xmlto
- VERSION=0.0.22
+ VERSION=0.0.23
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/xmlto/HISTORY b/devel/xmlto/HISTORY
index 9bef662e4a..287b774d8d 100644
--- a/devel/xmlto/HISTORY
+++ b/devel/xmlto/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.0.23
+
2009-05-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.0.22, SOURCE_URL[0] updated
diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index 9222447c64..b6878f8a36 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,12 +1,12 @@
SPELL=cdrtools
- VERSION=2.01.01a69
+ VERSION=2.01.01a70
# PATCHLEVEL=1
ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE}
# SOURCE_HASH=sha512:2d1a52c6d9e6fa751ce1e16f0fd30bece0e57c0b7148988da3f1c05dcd2a69d7f6f9f9a7880a92320f51e4b84dddeced03cd28ce3f27478ccc6c2853db98d786
- SOURCE_HASH=sha512:c273caead09c636959a056d11dc023f8723f6ec2a0b3bdd609a4332a5174c037dd31ca99be01b44f5b41fa995e80576354ec9395efa74bfd62a4ca7f06a79bfa
+ SOURCE_HASH=sha512:388abc087adfbe9ad6760ff1224060ae6400e7b723d5cb4b38a3a78baef60e8e83c25d4305d06f40f951f32701197044bdd2d90ecc3f9bf0675d351fcbd1198f
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
KEYWORDS="disk"
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index f8e384391d..f3b8c581ee 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 2.01.01a70
+
2009-12-03 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 2.01.01a69
Fixed long description wrap
diff --git a/editors/gtkspell/DETAILS b/editors/gtkspell/DETAILS
index 7e17bd2d0d..5973632f0c 100755
--- a/editors/gtkspell/DETAILS
+++ b/editors/gtkspell/DETAILS
@@ -1,9 +1,9 @@
SPELL=gtkspell
- VERSION=2.0.15
+ VERSION=2.0.16
SOURCE=gtkspell-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://gtkspell.sourceforge.net/download/$SOURCE
- SOURCE_HASH=sha512:470aaeecc6abdc6994f585d10c431196c1ef0d41813a8e15bf2941171ac689cb1a6ba2930b6c04c8633d49481704f90ecbba33349593975f137adec80b16fbef
+ SOURCE_HASH=sha512:7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
WEB_SITE=http://gtkspell.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20020922
diff --git a/editors/gtkspell/HISTORY b/editors/gtkspell/HISTORY
index a01881e84e..540d938280 100644
--- a/editors/gtkspell/HISTORY
+++ b/editors/gtkspell/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0.16
+
2008-12-04 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.0.15; fixed desc, website
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index d46499adbc..f9aa4e6c60 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=1.7.2
- SOURCE_HASH=sha512:bfc97c438454ce61244c583946c4ea87d5a0349ffc1a984f7535c2e144fda9fd2d8b9d47fb98fed459f163de05eb67f6a050516a9d73411d5a846817afac71c0
+ VERSION=1.8.0
+ SOURCE_HASH=sha512:5a336d752b672a69076b60291d81102868c69c6dd26533fee81c99f28f949fc5450f033608d723dcccb0a5cab5cba9c3c9fb44da3d1cc2cb664678649bab9494
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 26027c7eba..707a0b6805 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 Bor Kraljič <pyrobor@ver.si>
+ * DETAILS: updated spell to 1.8.0
+
2009-12-13 Bor Kraljič <pyrobor@ver.si>
* DETAILS: updated spell to 1.7.2
diff --git a/gnome2-apps/accerciser/DETAILS b/gnome2-apps/accerciser/DETAILS
index 7ba4900504..bcef73379c 100755
--- a/gnome2-apps/accerciser/DETAILS
+++ b/gnome2-apps/accerciser/DETAILS
@@ -1,5 +1,5 @@
SPELL=accerciser
- VERSION=1.2.0
+ VERSION=1.8.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/accerciser/HISTORY b/gnome2-apps/accerciser/HISTORY
index dd7281f943..ee1ac684e5 100644
--- a/gnome2-apps/accerciser/HISTORY
+++ b/gnome2-apps/accerciser/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+
2008-03-14 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 1.2.0
diff --git a/gnome2-apps/accerciser/accerciser-1.2.0.tar.bz2.sig b/gnome2-apps/accerciser/accerciser-1.2.0.tar.bz2.sig
deleted file mode 100644
index b964169d7b..0000000000
--- a/gnome2-apps/accerciser/accerciser-1.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/accerciser/accerciser-1.8.0.tar.bz2.sig b/gnome2-apps/accerciser/accerciser-1.8.0.tar.bz2.sig
new file mode 100644
index 0000000000..4e70c52625
--- /dev/null
+++ b/gnome2-apps/accerciser/accerciser-1.8.0.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/alacarte/DETAILS b/gnome2-apps/alacarte/DETAILS
index cd464b7f09..f0a2cab009 100755
--- a/gnome2-apps/alacarte/DETAILS
+++ b/gnome2-apps/alacarte/DETAILS
@@ -1,5 +1,5 @@
SPELL=alacarte
- VERSION=0.11.10
+ VERSION=0.12.4
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/alacarte/HISTORY b/gnome2-apps/alacarte/HISTORY
index 88c375558d..18a1b7c044 100644
--- a/gnome2-apps/alacarte/HISTORY
+++ b/gnome2-apps/alacarte/HISTORY
@@ -1,3 +1,7 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 0.12.4
+ fixed WEB_SITE
+
2009-03-28 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 0.11.10
diff --git a/gnome2-apps/alacarte/alacarte-0.11.10.tar.bz2.sig b/gnome2-apps/alacarte/alacarte-0.11.10.tar.bz2.sig
deleted file mode 100644
index 020fa2ad72..0000000000
--- a/gnome2-apps/alacarte/alacarte-0.11.10.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/alacarte/alacarte-0.12.4.tar.bz2.sig b/gnome2-apps/alacarte/alacarte-0.12.4.tar.bz2.sig
new file mode 100644
index 0000000000..dbd6d2e83f
--- /dev/null
+++ b/gnome2-apps/alacarte/alacarte-0.12.4.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index 5b5db2ab88..ceefc79055 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
SPELL=gedit
- VERSION=2.28.2
+ VERSION=2.28.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 929a190431..c08562faff 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.28.3
+
2009-11-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.2
* DEPENDS: removed libgnomeui, eel2, libglade2
diff --git a/gnome2-apps/gedit/gedit-2.28.2.tar.bz2.sig b/gnome2-apps/gedit/gedit-2.28.2.tar.bz2.sig
deleted file mode 100644
index 882ae8d20a..0000000000
--- a/gnome2-apps/gedit/gedit-2.28.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/gedit/gedit-2.28.3.tar.bz2.sig b/gnome2-apps/gedit/gedit-2.28.3.tar.bz2.sig
new file mode 100644
index 0000000000..c336fc880c
--- /dev/null
+++ b/gnome2-apps/gedit/gedit-2.28.3.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/gnome-system-tools/DETAILS b/gnome2-apps/gnome-system-tools/DETAILS
index ba096e56f8..579a53f78d 100755
--- a/gnome2-apps/gnome-system-tools/DETAILS
+++ b/gnome2-apps/gnome-system-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-system-tools
- VERSION=2.28.0
+ VERSION=2.28.2
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-apps/gnome-system-tools/HISTORY b/gnome2-apps/gnome-system-tools/HISTORY
index 04a01d1346..5df32ae576 100644
--- a/gnome2-apps/gnome-system-tools/HISTORY
+++ b/gnome2-apps/gnome-system-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.2
+
2009-11-23 Vasil Yonkov <spirtbrat@sourcemage.org>
* DEPENDS: removed libglade2, libgnomeui
diff --git a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.0.tar.bz2.sig b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.0.tar.bz2.sig
deleted file mode 100644
index 3b6ad1a1a1..0000000000
--- a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.2.tar.bz2.sig b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000000..7753b06452
--- /dev/null
+++ b/gnome2-apps/gnome-system-tools/gnome-system-tools-2.28.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/orca/DEPENDS b/gnome2-apps/orca/DEPENDS
index 74c30e47b6..250a502496 100755
--- a/gnome2-apps/orca/DEPENDS
+++ b/gnome2-apps/orca/DEPENDS
@@ -10,8 +10,5 @@ depends gnome-mag &&
depends python &&
depends pygtk2 &&
depends pyorbit &&
-depends gnome-python2
-
-
-
-
+depends gnome-python2 &&
+depends dbus-python
diff --git a/gnome2-apps/orca/DETAILS b/gnome2-apps/orca/DETAILS
index d3eb1bf487..f4f843df99 100755
--- a/gnome2-apps/orca/DETAILS
+++ b/gnome2-apps/orca/DETAILS
@@ -1,5 +1,5 @@
SPELL=orca
- VERSION=2.28.0
+ VERSION=2.28.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/orca/HISTORY b/gnome2-apps/orca/HISTORY
index 77a60475f3..dff61ae248 100644
--- a/gnome2-apps/orca/HISTORY
+++ b/gnome2-apps/orca/HISTORY
@@ -1,3 +1,7 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.2
+ * DEPENDS: added dbus-python
+
2009-09-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.0
diff --git a/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig b/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig
deleted file mode 100644
index 0bce0f383a..0000000000
--- a/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/orca/orca-2.28.2.tar.bz2.sig b/gnome2-apps/orca/orca-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000000..891b04d840
--- /dev/null
+++ b/gnome2-apps/orca/orca-2.28.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/vinagre/DETAILS b/gnome2-apps/vinagre/DETAILS
index 57f1b6e6f8..ccf4a6b2da 100755
--- a/gnome2-apps/vinagre/DETAILS
+++ b/gnome2-apps/vinagre/DETAILS
@@ -1,5 +1,5 @@
SPELL=vinagre
- VERSION=2.28.0.1
+ VERSION=2.28.1
BRANCH=$(echo $VERSION | cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$GNOME_URL/sources/vinagre/$BRANCH/$SOURCE
diff --git a/gnome2-apps/vinagre/HISTORY b/gnome2-apps/vinagre/HISTORY
index 453508337a..0ee54c20b8 100644
--- a/gnome2-apps/vinagre/HISTORY
+++ b/gnome2-apps/vinagre/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.1
+
2009-12-19 Vasil Yonkov <spirtbrat@sourcemage.org>
* DEPENDS: made avahi and gnome-panel optional
added gnome-doc-utils and gnome-keyring
diff --git a/gnome2-apps/vinagre/vinagre-2.28.0.1.tar.gz.sig b/gnome2-apps/vinagre/vinagre-2.28.0.1.tar.gz.sig
deleted file mode 100644
index 1e87f7294e..0000000000
--- a/gnome2-apps/vinagre/vinagre-2.28.0.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/vinagre/vinagre-2.28.1.tar.gz.sig b/gnome2-apps/vinagre/vinagre-2.28.1.tar.gz.sig
new file mode 100644
index 0000000000..1592b1408d
--- /dev/null
+++ b/gnome2-apps/vinagre/vinagre-2.28.1.tar.gz.sig
Binary files differ
diff --git a/gnome2-libs/gnome-games2/DETAILS b/gnome2-libs/gnome-games2/DETAILS
index f8c61a2b39..a7a5ca03da 100755
--- a/gnome2-libs/gnome-games2/DETAILS
+++ b/gnome2-libs/gnome-games2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-games2
- VERSION=2.28.1
+ VERSION=2.28.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-games-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-games-$VERSION
diff --git a/gnome2-libs/gnome-games2/HISTORY b/gnome2-libs/gnome-games2/HISTORY
index 0b2afacb47..10a3d23c4c 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.2
+
2009-12-05 Arwed v. Merkatz <v.merkatz@gmx.net>
* CONFIGURE: removed sound choices, only libcanberra works
* DEPENDS: removed sound choice code, optional_depends on libcanberra
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.28.1.tar.bz2.sig b/gnome2-libs/gnome-games2/gnome-games-2.28.1.tar.bz2.sig
deleted file mode 100644
index 71d782bb1d..0000000000
--- a/gnome2-libs/gnome-games2/gnome-games-2.28.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-games2/gnome-games-2.28.2.tar.bz2.sig b/gnome2-libs/gnome-games2/gnome-games-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000000..314176fc3e
--- /dev/null
+++ b/gnome2-libs/gnome-games2/gnome-games-2.28.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome-mag/BUILD b/gnome2-libs/gnome-mag/BUILD
new file mode 100755
index 0000000000..b268036767
--- /dev/null
+++ b/gnome2-libs/gnome-mag/BUILD
@@ -0,0 +1,2 @@
+OPTS="$GMAG_COLORBLIND $OPTS" &&
+default_build
diff --git a/gnome2-libs/gnome-mag/CONFIGURE b/gnome2-libs/gnome-mag/CONFIGURE
index 28c09c36dd..ddcf4ffa78 100755
--- a/gnome2-libs/gnome-mag/CONFIGURE
+++ b/gnome2-libs/gnome-mag/CONFIGURE
@@ -1 +1,3 @@
-config_query GMAG_COLORBLIND "Build colorblind applet?" n \ No newline at end of file
+config_query_option GMAG_COLORBLIND "Build colorblind applet?" y \
+ "--enable-colorblind-applet=yes" \
+ "--enable-colorblind-applet=no"
diff --git a/gnome2-libs/gnome-mag/DEPENDS b/gnome2-libs/gnome-mag/DEPENDS
index ae015da6a8..cfd06949e2 100755
--- a/gnome2-libs/gnome-mag/DEPENDS
+++ b/gnome2-libs/gnome-mag/DEPENDS
@@ -13,8 +13,7 @@ depends at-spi &&
depends expat &&
if [[ "$GMAG_COLORBLIND" == "y" ]]; then
- depends pygtk2 &&
- depends gnome-python2 &&
- depends gnome-desktop &&
- depends colorblind "--enable-colorblind-applet"
+ depends gnome-python-desktop &&
+ depends gnome-desktop &&
+ depends colorblind
fi
diff --git a/gnome2-libs/gnome-mag/DETAILS b/gnome2-libs/gnome-mag/DETAILS
index 20a8dc2194..8835aad998 100755
--- a/gnome2-libs/gnome-mag/DETAILS
+++ b/gnome2-libs/gnome-mag/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-mag
- VERSION=0.15.5
+ VERSION=0.15.9
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-mag/HISTORY b/gnome2-libs/gnome-mag/HISTORY
index ef0d15c775..8499c79f3c 100644
--- a/gnome2-libs/gnome-mag/HISTORY
+++ b/gnome2-libs/gnome-mag/HISTORY
@@ -1,3 +1,7 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 0.15.9
+ * BUILD, CONFIGURE, DEPENDS: fixed colorblind applet option
+
2009-03-26 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 0.15.5
diff --git a/gnome2-libs/gnome-mag/gnome-mag-0.15.5.tar.bz2.sig b/gnome2-libs/gnome-mag/gnome-mag-0.15.5.tar.bz2.sig
deleted file mode 100644
index af6272382a..0000000000
--- a/gnome2-libs/gnome-mag/gnome-mag-0.15.5.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-mag/gnome-mag-0.15.9.tar.bz2.sig b/gnome2-libs/gnome-mag/gnome-mag-0.15.9.tar.bz2.sig
new file mode 100644
index 0000000000..6cf5872977
--- /dev/null
+++ b/gnome2-libs/gnome-mag/gnome-mag-0.15.9.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome2-user-docs/DETAILS b/gnome2-libs/gnome2-user-docs/DETAILS
index 1184e7cf81..109732973d 100755
--- a/gnome2-libs/gnome2-user-docs/DETAILS
+++ b/gnome2-libs/gnome2-user-docs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome2-user-docs
- VERSION=2.28.1
+ VERSION=2.28.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gnome-user-docs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-user-docs-$VERSION
diff --git a/gnome2-libs/gnome2-user-docs/HISTORY b/gnome2-libs/gnome2-user-docs/HISTORY
index b29b318695..ca4cbe6b4a 100644
--- a/gnome2-libs/gnome2-user-docs/HISTORY
+++ b/gnome2-libs/gnome2-user-docs/HISTORY
@@ -1,3 +1,6 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.2
+
2009-11-22 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.1
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.1.tar.bz2.sig b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.1.tar.bz2.sig
deleted file mode 100644
index 1ed67136f5..0000000000
--- a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.2.tar.bz2.sig b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000000..6ca5d86753
--- /dev/null
+++ b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.28.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gtksourceview/DETAILS b/gnome2-libs/gtksourceview/DETAILS
index dd0352c1d5..9aaa8e33f8 100755
--- a/gnome2-libs/gtksourceview/DETAILS
+++ b/gnome2-libs/gtksourceview/DETAILS
@@ -1,6 +1,6 @@
SPELL=gtksourceview
- VERSION=2.8.1
- SOURCE_HASH=sha512:44ac7b12e7992e20443640ed0353403c16a2ea78d27c4ce0d21e0d0ca076c7209269e39bc392bdc25a984f056da41a997db022a5239c7df8db95398228b046e6
+ VERSION=2.8.2
+ SOURCE_HASH=sha512:d1a27fbceeb565e75e1be666759d197ec5e9696c73608ac0fae50909bbdccca16cb0a8f8977ab284ab65a88632929cb8d7b8042c44c775bf8cff51590f5578fa
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtksourceview/HISTORY b/gnome2-libs/gtksourceview/HISTORY
index 5b66335743..9cb9ee8910 100644
--- a/gnome2-libs/gtksourceview/HISTORY
+++ b/gnome2-libs/gtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.8.2
+
2009-10-01 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.8.1
diff --git a/gnome2-libs/libgda4/DEPENDS b/gnome2-libs/libgda4/DEPENDS
new file mode 100755
index 0000000000..af1a001fd0
--- /dev/null
+++ b/gnome2-libs/libgda4/DEPENDS
@@ -0,0 +1,18 @@
+depends glib2 &&
+depends libxml2 &&
+depends libxslt &&
+
+optional_depends gtk-doc \
+"--enable-gtk-doc" \
+"--disable-gtk-doc" \
+"to build documentation" &&
+
+optional_depends sqlite \
+"--enable-system-sqlite" \
+"--disable-system-sqlite" \
+"to use system sqlite" &&
+
+optional_depends libsoup \
+"--with-libsoup" \
+"--without-libsoup" \
+"to enable libsoup support"
diff --git a/gnome2-libs/libgda4/DETAILS b/gnome2-libs/libgda4/DETAILS
new file mode 100755
index 0000000000..e74bf11a18
--- /dev/null
+++ b/gnome2-libs/libgda4/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libgda4
+ VERSION=4.0.5
+ BRANCH=$(echo $VERSION|cut -d . -f 1,2)
+ SOURCE="libgda-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$GNOME_URL/sources/libgda/$BRANCH/$SOURCE
+ SOURCE_HASH=sha512:269eb3208a1f8f62f60d84236c7267e052d179261f31f93b93c8cde90b9c9eab663def56408b484b7a3fd110aa7f5a9c52517fc05d1a0a6c173907f608d77d93
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/libgda-${VERSION}"
+ WEB_SITE="http://www.gnome-db.org/"
+ LICENSE[0]=LGPL
+ ENTERED=20091230
+ SHORT="data abstraction library based on GLib"
+cat << EOF
+libgda is a (relatively small) database abstraction/access library integrated
+on the GLib object model. It can be used as a metadata extractor, to get
+information about all database objects in a common way, and as an ODBC-like
+wrapper to access data in different engines through an easier API.
+EOF
diff --git a/gnome2-libs/libgda4/HISTORY b/gnome2-libs/libgda4/HISTORY
new file mode 100644
index 0000000000..8bfcee23a3
--- /dev/null
+++ b/gnome2-libs/libgda4/HISTORY
@@ -0,0 +1,3 @@
+2009-12-30 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/gnome2-libs/vino/BUILD b/gnome2-libs/vino/BUILD
index cce5a54232..72a0e90c06 100755
--- a/gnome2-libs/vino/BUILD
+++ b/gnome2-libs/vino/BUILD
@@ -4,10 +4,4 @@ else
OPTS="$OPTS --disable-http-server"
fi &&
-if [ "$SESSIONMAN" == "y" ]; then
- OPTS="$OPTS --enable-session-support"
-else
- OPTS="$OPTS --disable-session-support"
-fi &&
-
default_build
diff --git a/gnome2-libs/vino/CONFIGURE b/gnome2-libs/vino/CONFIGURE
index b6335011a6..5576503274 100755
--- a/gnome2-libs/vino/CONFIGURE
+++ b/gnome2-libs/vino/CONFIGURE
@@ -1,2 +1,3 @@
config_query HTTPSERVER "Enable HTTP server for java applet client" n &&
-config_query SESSIONMAN "Enable session management utility" y
+config_query_option VINO_IP6 "Enable IPv6 support" y \
+ "--enable-ipv6" "--disable-ipv6"
diff --git a/gnome2-libs/vino/DEPENDS b/gnome2-libs/vino/DEPENDS
index ed1a2feb74..6d6bb9e1fa 100755
--- a/gnome2-libs/vino/DEPENDS
+++ b/gnome2-libs/vino/DEPENDS
@@ -32,5 +32,8 @@ optional_depends avahi \
"Enable avahi support?" &&
optional_depends unique \
"--enable-libunique" "--disable-libunique" \
- "Use the library unique to allow only one instance running"
-
+ "Use the library unique to allow only one instance running" &&
+optional_depends telepathy-glib \
+ "--enable-telepathy=yes" \
+ "--enable-telepathy=no" \
+ "to enable telepathy"
diff --git a/gnome2-libs/vino/DETAILS b/gnome2-libs/vino/DETAILS
index 2f4e426b15..ee1999ed0e 100755
--- a/gnome2-libs/vino/DETAILS
+++ b/gnome2-libs/vino/DETAILS
@@ -1,5 +1,5 @@
SPELL=vino
- VERSION=2.28.0
+ VERSION=2.28.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/vino/HISTORY b/gnome2-libs/vino/HISTORY
index 0d6c12ae5a..179999f20e 100644
--- a/gnome2-libs/vino/HISTORY
+++ b/gnome2-libs/vino/HISTORY
@@ -1,3 +1,8 @@
+2009-12-28 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DETAILS: updated spell to 2.28.1
+ * BUILD, CONFIGURE: removed SESSIONMAN, added IPv6
+ * DEPENDS: added telepathy-glib
+
2009-11-23 Vasil Yonkov <spirtbrat@sourcemage.org>
* DEPENDS: removed libglade2, libgnomeui
diff --git a/gnome2-libs/vino/vino-2.28.0.tar.bz2.sig b/gnome2-libs/vino/vino-2.28.0.tar.bz2.sig
deleted file mode 100644
index 423e7e84cd..0000000000
--- a/gnome2-libs/vino/vino-2.28.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/vino/vino-2.28.1.tar.bz2.sig b/gnome2-libs/vino/vino-2.28.1.tar.bz2.sig
new file mode 100644
index 0000000000..5014f7e756
--- /dev/null
+++ b/gnome2-libs/vino/vino-2.28.1.tar.bz2.sig
Binary files differ
diff --git a/gnu.gpg b/gnu.gpg
index 19204f773d..53018669b0 100644
--- a/gnu.gpg
+++ b/gnu.gpg
Binary files differ
diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index c87237b2eb..0592cd9909 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,7 +1,7 @@
SPELL=libraw
SPELLX=LibRaw
- VERSION=0.8.3
- SOURCE_HASH=sha512:6701f265fbfb461059933ecdc7682f63a69124ad6a16996e25871e95eac71426afbc048de6c2beb3866a80fd01d4851acb0486eee6c7b30290d90994aa05de72
+ VERSION=0.8.5
+ SOURCE_HASH=sha512:05b4830ea66c4347dfef743e1d27f10b1914574deefdca69d96e4f071f5e00f09da9a1bfd2e73a044124ee620fb40e58f73757bd9bbdd95b93c26452353ee420
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://www.libraw.org/
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index b160411190..23e8036ed2 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.8.5
+
2009-10-24 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.8.3
diff --git a/graphics/dcraw/DETAILS b/graphics/dcraw/DETAILS
index 1d4845774a..819fc7a74d 100755
--- a/graphics/dcraw/DETAILS
+++ b/graphics/dcraw/DETAILS
@@ -1,6 +1,6 @@
SPELL=dcraw
- VERSION=8.88
- SOURCE_HASH=sha512:7f1240b15c674ea4b362105efe0723b49164298431a7b21f32b0fbcdc8585152daea3a131377060ae986ceeb6951ae468e9775feffa8fb99f090762d76f7a2ab
+ VERSION=8.99
+ SOURCE_HASH=sha512:60f6b9e274d4ddc7778dc53c2694945a9eeb18d365dcd857d1e709342d7b19e3e2598003d0caef4a93e753ee46c75c26151a4deea59b30334cd1b08f86e8ed16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/dcraw
SOURCE_URL[0]=http://www.cybercom.net/~dcoffin/dcraw/archive/$SOURCE
diff --git a/graphics/dcraw/HISTORY b/graphics/dcraw/HISTORY
index 50beb8d12d..cb8568e1c5 100644
--- a/graphics/dcraw/HISTORY
+++ b/graphics/dcraw/HISTORY
@@ -1,3 +1,6 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 8.99
+
2008-09-30 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 8.88
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 1bdf4261fe..ac7a739fe3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
if [[ "$GLIBC_CVS" == "y" ]]; then
local GLIBC_VERSION
- GLIBC_VERSION=2.11
+ GLIBC_VERSION=2.11.1
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
@@ -33,7 +33,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
SOURCE_IGNORE=volatile
else
- VERSION=2.11
+ VERSION=2.11.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7524f5231c..3aaa8f988b 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.11.1
+
2009-12-15 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated default kernel headers to 2.6.32
diff --git a/libs/gwenhywfar/DETAILS b/libs/gwenhywfar/DETAILS
index cfd6048c4c..99d1793a44 100755
--- a/libs/gwenhywfar/DETAILS
+++ b/libs/gwenhywfar/DETAILS
@@ -1,11 +1,13 @@
SPELL=gwenhywfar
- VERSION=3.8.1
+ VERSION=3.11.1
+ VX=29
+ SOURCE_HASH=sha512:0eebf5b4256909c139e8d80a0db6fec449edeeab3e1c95f273015f6a4c714fa5102fc04bbf2d864ca1b57481b370c66c60505c427ca918f4c032c7fb8751fb39
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=22&file=01&dummy=$SOURCE"
+
+SOURCE_URL[0]="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${VX}&file=01&dummy=$SOURCE"
NO_CACHE="-O ${SOURCE}"
- SOURCE_HASH=sha512:5b77b2497a19fbd4517b28d3a381386fe43e07a7a9c3acdf088dae0f156c64d7eeb59bd66d920de45f9c26e827f0b2b78d55792159b39a34919aa4dee3c51e6f
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE=GPL
WEB_SITE=http://gwenhywfar.sourceforge.net/
diff --git a/libs/gwenhywfar/HISTORY b/libs/gwenhywfar/HISTORY
index 0629cdcba0..c39aa4af38 100644
--- a/libs/gwenhywfar/HISTORY
+++ b/libs/gwenhywfar/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.11.1
+
2009-05-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.8.1
diff --git a/libs/neon/DETAILS b/libs/neon/DETAILS
index 3c633030b0..7c8bbf0dae 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,5 +1,5 @@
SPELL=neon
- VERSION=0.29.1
+ VERSION=0.29.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index 7e151baf05..b61b35e0fe 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.29.2
+
2009-12-15 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.29.1
diff --git a/libs/openmpi/DETAILS b/libs/openmpi/DETAILS
index 7421e19975..7c348b351d 100755
--- a/libs/openmpi/DETAILS
+++ b/libs/openmpi/DETAILS
@@ -1,6 +1,7 @@
SPELL=openmpi
- VERSION=1.3.3
- SOURCE_HASH=sha512:d2796abc473388b5a4696a81fe2b953bfa8c526b624f7bb1a1e20cd477fe7008773b5ed84c033ea29fdc3652d18940a3609f06a947a9b9e60f077e72b8b4feb4
+ VERSION=1.4
+ SECURITY_PATCH=1
+ SOURCE_HASH=sha512:f81f9f886a9e4871be34739739012ba2afff04d56469b2377f736f1866824fadbcd6b2312d28dbd1f9ba75c968eb79312043fe256590b78b4ed57cab144c392b
VX=`echo $VERSION|cut -c-3`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/openmpi/HISTORY b/libs/openmpi/HISTORY
index 6fda6a12b8..a922885a39 100644
--- a/libs/openmpi/HISTORY
+++ b/libs/openmpi/HISTORY
@@ -1,3 +1,7 @@
+2009-12-29 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.4, SECURITY_PATCH=1
+ http://www.open-mpi.org/community/lists/announce/2009/12/0035.php
+
2009-09-02 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.3.3
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index c54bb7fdea..4fb7d2a659 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,11 +1,12 @@
SPELL=cacti
VERSION=0.8.7e
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
if [[ $CACTI_PA == y ]]; then
- VERSION_PA=2.5
+ VERSION_PA=2.6
SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.zip
SOURCE2_URL[0]=http://mirror.cactiusers.org/downloads/plugins/$SOURCE2
- SOURCE2_HASH=sha512:e9b5c4e914da84742940b8ef461c8621ba3ac0d1f7c1daea20628bbb27aac6fe4e01c3d55f25805bf612ab10c6fdd259feb3c835ad99c4ce8713ef145ad66c16
+ SOURCE2_HASH=sha512:0468d1d688f957b01e331dd554626fd2efb601fd6e78b170234925578c2da0d81e8c914854b99991b2a807315f20bdc2f49ff18965a5ed737d369ac2db107744
SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 864963725d..91e75829b8 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2009-12-28 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL=2; updated Plugin Architecture to 2.6
+ * PRE_BUILD: apply official patches first; corrected PA source dir
+ * patches/cross_site_fix.patch: added
+
2009-10-02 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, PRE{PARE,_BUILD}: added Plugin Architecture setup selection
* FINAL: added, to clean up 2nd src dir
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 64af94dc9f..12f877caf8 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -8,11 +8,11 @@ fi &&
cd "$SOURCE_DIRECTORY" &&
-if [[ $CACTI_PA == y ]]; then
- cat "$SOURCE_DIRECTORY2/pa.sql" >> cacti.sql &&
- patch -p1 < "$SOURCE_DIRECTORY2/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
-fi &&
-
for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
patch -p1 < $patch
-done
+done &&
+
+if [[ $CACTI_PA == y ]]; then
+ cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
+ patch -p1 < "$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
+fi
diff --git a/net/cacti/patches/cross_site_fix.patch b/net/cacti/patches/cross_site_fix.patch
new file mode 100644
index 0000000000..ddc9e2e8fa
--- /dev/null
+++ b/net/cacti/patches/cross_site_fix.patch
@@ -0,0 +1,175 @@
+--- cacti-0.8.7e/graph.php 2009-06-28 12:07:11.000000000 -0400
++++ cacti-0.8.7e-patched/graph.php 2009-11-21 23:10:16.000000000 -0500
+@@ -35,6 +35,8 @@
+ /* ================= input validation ================= */
+ input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$");
+ input_validate_input_number(get_request_var("local_graph_id"));
++input_validate_input_number(get_request_var("graph_end"));
++input_validate_input_number(get_request_var("graph_start"));
+ input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$");
+ /* ==================================================== */
+
+--- cacti-0.8.7e/include/top_graph_header.php 2009-06-28 12:07:11.000000000 -0400
++++ cacti-0.8.7e-patched/include/top_graph_header.php 2009-11-21 23:15:27.000000000 -0500
+@@ -58,7 +58,7 @@
+ if ($_SESSION["custom"]) {
+ print "<meta http-equiv=refresh content='99999'>\r\n";
+ }else{
+- print "<meta http-equiv=refresh content='" . read_graph_config_option("page_refresh") . "'>\r\n";
++ print "<meta http-equiv=refresh content='" . htmlspecialchars(read_graph_config_option("page_refresh"),ENT_QUOTES) . "'>\r\n";
+ }
+ }
+ ?>
+@@ -113,7 +113,7 @@
+ </tr>
+ <tr class="noprint">
+ <td bgcolor="#efefef" colspan="1" height="8" style="background-image: url(images/shadow_gray.gif); background-repeat: repeat-x; border-right: #aaaaaa 1px solid;">
+- <img src="images/transparent_line.gif" width="<?php print read_graph_config_option("default_dual_pane_width");?>" height="2" border="0"><br>
++ <img src="images/transparent_line.gif" width="<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>" height="2" border="0"><br>
+ </td>
+ <td bgcolor="#ffffff" colspan="1" height="8" style="background-image: url(images/shadow.gif); background-repeat: repeat-x;">
+
+@@ -144,7 +144,7 @@
+
+ <tr>
+ <?php if ((read_graph_config_option("default_tree_view_mode") == "2") && (($_REQUEST["action"] == "tree") || ((isset($_REQUEST["view_type"]) ? $_REQUEST["view_type"] : "") == "tree"))) { ?>
+- <td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print read_graph_config_option("default_dual_pane_width");?>' class='noprint'>
++ <td valign="top" style="padding: 5px; border-right: #aaaaaa 1px solid;" bgcolor='#efefef' width='<?php print htmlspecialchars(read_graph_config_option("default_dual_pane_width"));?>' class='noprint'>
+ <table border=0 cellpadding=0 cellspacing=0><tr><td><font size=-2><a style="font-size:7pt;text-decoration:none;color:silver" href="http://www.treemenu.net/" target=_blank></a></font></td></tr></table>
+ <?php grow_dhtml_trees(); ?>
+ <script type="text/javascript">initializeDocument();</script>
+--- cacti-0.8.7e/lib/html_form.php 2009-06-28 12:07:11.000000000 -0400
++++ cacti-0.8.7e-patched/lib/html_form.php 2009-11-21 23:15:40.000000000 -0500
+@@ -235,13 +235,21 @@
+
+ if (sizeof($items) > 0) {
+ foreach ($items as $item) {
+- print $item["name"] . "<br>";
++ print htmlspecialchars($item["name"],ENT_QUOTES) . "<br>";
+ }
+ }
+
+ break;
++ case 'font':
++ form_font_box($field_name, $field_array["value"],
++ ((isset($field_array["default"])) ? $field_array["default"] : ""),
++ $field_array["max_length"],
++ ((isset($field_array["size"])) ? $field_array["size"] : "40"), "text",
++ ((isset($field_array["form_id"])) ? $field_array["form_id"] : ""));
++
++ break;
+ default:
+- print "<em>" . $field_array["value"] . "</em>";
++ print "<em>" . htmlspecialchars($field_array["value"],ENT_QUOTES) . "</em>";
+
+ form_hidden_box($field_name, $field_array["value"], "");
+
+@@ -384,7 +392,7 @@
+ $form_previous_value = $form_default_value;
+ }
+
+- print "<input type='hidden' id='$form_name' name='$form_name' value='$form_previous_value'>\n";
++ print "<input type='hidden' id='$form_name' name='$form_name' value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>\n";
+ }
+
+ /* form_dropdown - draws a standard html dropdown box
+@@ -568,7 +576,7 @@
+ }
+ }
+
+- print ">". $array_display[$id];
++ print ">". htmlspecialchars($array_display[$id],ENT_QUOTES);
+ print "</option>\n";
+ }
+
+@@ -627,6 +635,65 @@
+ print "</select>\n";
+ }
+
++/* form_font_box - draws a standard html textbox and provides status of a fonts existence
++ @arg $form_name - the name of this form element
++ @arg $form_previous_value - the current value of this form element
++ @arg $form_default_value - the value of this form element to use if there is
++ no current value available
++ @arg $form_max_length - the maximum number of characters that can be entered
++ into this textbox
++ @arg $form_size - the size (width) of the textbox
++ @arg $type - the type of textbox, either 'text' or 'password'
++ @arg $current_id - used to determine if a current value for this form element
++ exists or not. a $current_id of '0' indicates that no current value exists,
++ a non-zero value indicates that a current value does exist */
++function form_font_box($form_name, $form_previous_value, $form_default_value, $form_max_length, $form_size = 30, $type = "text", $current_id = 0) {
++ if (($form_previous_value == "") && (empty($current_id))) {
++ $form_previous_value = $form_default_value;
++ }
++
++ print "<input type='$type'";
++
++ if (isset($_SESSION["sess_error_fields"])) {
++ if (!empty($_SESSION["sess_error_fields"][$form_name])) {
++ print "class='txtErrorTextBox'";
++ unset($_SESSION["sess_error_fields"][$form_name]);
++ }
++ }
++
++ if (isset($_SESSION["sess_field_values"])) {
++ if (!empty($_SESSION["sess_field_values"][$form_name])) {
++ $form_previous_value = $_SESSION["sess_field_values"][$form_name];
++ }
++ }
++
++ if (strlen($form_previous_value) == 0) { # no data: defaults are used; everythings fine
++ $extra_data = "";
++ } else {
++ if (read_config_option("rrdtool_version") == "rrd-1.3.x") { # rrdtool 1.3 uses fontconfig
++ $font = '"' . $form_previous_value . '"';
++ $out_array = array();
++ exec('fc-list ' . $font, $out_array);
++ if (sizeof($out_array) == 0) {
++ $extra_data = "<span style='color:red'><br>[" . "ERROR: FONT NOT FOUND" . "]</span>";
++ } else {
++ $extra_data = "<span style='color:green'><br>[" . "OK: FONT FOUND" . "]</span>";
++ }
++ } elseif (read_config_option("rrdtool_version") == "rrd-1.0.x" ||
++ read_config_option("rrdtool_version") == "rrd-1.2.x") { # rrdtool 1.0 and 1.2 use font files
++ if (is_file($form_previous_value)) {
++ $extra_data = "<span style='color:green'><br>[" . "OK: FILE FOUND" . "]</span>";
++ }else if (is_dir($form_previous_value)) {
++ $extra_data = "<span style='color:red'><br>[" . "ERROR: IS DIR" . "]</span>";
++ }else{
++ $extra_data = "<span style='color:red'><br>[" . "ERROR: FILE NOT FOUND" . "]</span>";
++ }
++ } # will be used for future versions of rrdtool
++ }
++
++ print " id='$form_name' name='$form_name' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : "") . " value='" . htmlspecialchars($form_previous_value, ENT_QUOTES) . "'>" . $extra_data;
++}
++
+ /* form_confirm - draws a table presenting the user with some choice and allowing
+ them to either proceed (delete) or cancel
+ @arg $body_text - the text to prompt the user with on this form
+--- cacti-0.8.7e/lib/timespan_settings.php 2009-06-28 12:07:11.000000000 -0400
++++ cacti-0.8.7e-patched/lib/timespan_settings.php 2009-11-21 23:15:49.000000000 -0500
+@@ -125,9 +125,9 @@
+ if (isset($_POST["date1"])) {
+ /* the dates have changed, therefore, I am now custom */
+ if (($_SESSION["sess_current_date1"] != $_POST["date1"]) || ($_SESSION["sess_current_date2"] != $_POST["date2"])) {
+- $timespan["current_value_date1"] = $_POST["date1"];
++ $timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
+ $timespan["begin_now"] =strtotime($timespan["current_value_date1"]);
+- $timespan["current_value_date2"] = $_POST["date2"];
++ $timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
+ $timespan["end_now"]=strtotime($timespan["current_value_date2"]);
+ $_SESSION["sess_current_timespan"] = GT_CUSTOM;
+ $_SESSION["custom"] = 1;
+@@ -135,8 +135,8 @@
+ }else {
+ /* the default button wasn't pushed */
+ if (!isset($_POST["button_clear_x"])) {
+- $timespan["current_value_date1"] = $_POST["date1"];
+- $timespan["current_value_date2"] = $_POST["date2"];
++ $timespan["current_value_date1"] = sanitize_search_string($_POST["date1"]);
++ $timespan["current_value_date2"] = sanitize_search_string($_POST["date2"]);
+ $timespan["begin_now"] = $_SESSION["sess_current_timespan_begin_now"];
+ $timespan["end_now"] = $_SESSION["sess_current_timespan_end_now"];
+
diff --git a/net/ntop/BUILD b/net/ntop/BUILD
index c6118890f1..bf828c0318 100755
--- a/net/ntop/BUILD
+++ b/net/ntop/BUILD
@@ -1,5 +1,4 @@
-OPTS="$NTOP_SSLV3 \
- --localstatedir=${INSTALL_ROOT}/var/cache \
+OPTS="--localstatedir=${INSTALL_ROOT}/var/cache \
$OPTS" &&
make_single &&
default_build
diff --git a/net/ntop/CONFIGURE b/net/ntop/CONFIGURE
deleted file mode 100755
index ea5783cc28..0000000000
--- a/net/ntop/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option NTOP_SSLV3 'Enable SSLv3 support?' y \
- '--enable-sslv3' '--disable-sslv3'
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index b3ba28a24d..5c7b206b11 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -1,6 +1,7 @@
depends autoconf &&
depends automake &&
depends gawk &&
+depends geoip &&
depends gd &&
depends gdbm &&
depends libtool &&
diff --git a/net/ntop/DETAILS b/net/ntop/DETAILS
index a0c9f7401c..c1bf1a77f4 100755
--- a/net/ntop/DETAILS
+++ b/net/ntop/DETAILS
@@ -1,10 +1,16 @@
SPELL=ntop
VERSION=3.3.9
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=GeoLiteCity.dat.gz
+ SOURCE3=GeoIPASNum.dat.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=http://www.maxmind.com/download/geoip/database/$SOURCE2
+ SOURCE3_URL[0]=http://www.maxmind.com/download/geoip/database/asnum/$SOURCE3
# SOURCE_HASH=sha512:6aeb2b7194376a7f04a64800ec272785d7ce57429c3931506506c28a809f3febff8df3ba50f432f198efb0e83553dc99c0824fe63af6574b63054ce8eec34d2e
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
+ SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
WEB_SITE=http://www.ntop.org/
KEYWORDS="net"
diff --git a/net/ntop/GeoIPASNum.dat.gz.sig b/net/ntop/GeoIPASNum.dat.gz.sig
new file mode 100644
index 0000000000..ec5484a671
--- /dev/null
+++ b/net/ntop/GeoIPASNum.dat.gz.sig
Binary files differ
diff --git a/net/ntop/GeoLiteCity.dat.gz.sig b/net/ntop/GeoLiteCity.dat.gz.sig
new file mode 100644
index 0000000000..f4635afd74
--- /dev/null
+++ b/net/ntop/GeoLiteCity.dat.gz.sig
Binary files differ
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 5d11adb2f6..8fbc353588 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,14 @@
+2009-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Add GeoLiteCity.dat.gz and GeoIPASNum.dat.gz SOURCEs
+ * DEPENDS: Depends on geoip
+ * CONFIGURE: SSLv3 is no longer configurable
+ * PRE_BUILD: Verify SOURCE2 and SOURCE3 before unpacking
+ Apply systemgeoip.patch
+ * BUILD: Remove passing NTOP_SSLV3
+ * systemgeoip.patch: Remove ntop internal geoip download/install
+ * init.d/ntop{,.conf}: Allow configuring interface merge
+ Allow enabling (default off) w3c HTML 4.01 output
+
2009-09-09 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on perl
diff --git a/net/ntop/PRE_BUILD b/net/ntop/PRE_BUILD
index f66000254d..624f34eedf 100755
--- a/net/ntop/PRE_BUILD
+++ b/net/ntop/PRE_BUILD
@@ -1,3 +1,24 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+verify_source "$SOURCE2" &&
+verify_source "$SOURCE3" &&
+cd $SOURCE_DIRECTORY &&
+
+#
+# Remove building of internal GeoIP
+#
+patch -p1 < $SPELL_DIRECTORY/systemgeoip.patch &&
+
+#
+# Unpack already downloaded GeoIP data
+#
+cp $SOURCE_CACHE/$SOURCE2 . &&
+cp $SOURCE_CACHE/$SOURCE3 . &&
+gunzip $SOURCE2 &&
+gunzip $SOURCE3 &&
+
+#
+# Fake GeoIP source as it's already installed
+#
+touch GeoIP.tar.gz &&
+
./autogen.sh --noconfig
diff --git a/net/ntop/init.d/ntop b/net/ntop/init.d/ntop
index 4624a68cd8..aaaba9f2e4 100644
--- a/net/ntop/init.d/ntop
+++ b/net/ntop/init.d/ntop
@@ -12,8 +12,8 @@ fi
PROGRAM=/usr/bin/ntop
NAME="ntop (using following interfaces: ${IFACES}"
-ARGS="-d -u ntop -w $HTTP_PORT -W $HTTPS_PORT \
- --use-syslog=daemon -i ${IFACES} -M"
+ARGS="-d -u ntop -w $HTTP_PORT -W $HTTPS_PORT ${W3C} \
+ --use-syslog=daemon -i ${IFACES} ${INTERFACE_MERGE}"
RUNLEVEL=3
NEEDS="+network +remote_fs"
diff --git a/net/ntop/init.d/ntop.conf b/net/ntop/init.d/ntop.conf
index cf994df05c..65202c5582 100644
--- a/net/ntop/init.d/ntop.conf
+++ b/net/ntop/init.d/ntop.conf
@@ -8,3 +8,15 @@ HTTP_PORT=0
# Which https port (SSL encrytion enabled) should ntop listen to? When set to 0
# then the https server is disabled (default: 3000)
HTTPS_PORT=3000
+
+# This option instructs ntop not to merge network interfaces together.
+# This means that ntop will collect statistics for each interface
+# and report them separately.
+INTERFACE_MERGE='--no-interface-merge'
+
+# By default, ntop generates displayable but not great html. There are a
+# number of tags we do not generate because they cause problems with older
+# browsers which are still commonly used or are important to look good on
+# real-world browsers. This flag tells ntop to generate 'BETTER' (but not
+# perfect) w3c compliant html 4.01 output.
+#W3C='--w3c'
diff --git a/net/ntop/systemgeoip.patch b/net/ntop/systemgeoip.patch
new file mode 100644
index 0000000000..5b1273bee9
--- /dev/null
+++ b/net/ntop/systemgeoip.patch
@@ -0,0 +1,36 @@
+diff -Naur ntop-3.3.9.orig/Makefile.am ntop-3.3.9/Makefile.am
+--- ntop-3.3.9.orig/Makefile.am 2009-12-30 12:37:37.007745774 -0800
++++ ntop-3.3.9/Makefile.am 2009-12-30 12:38:40.538426478 -0800
+@@ -270,8 +270,6 @@
+
+ install: install-recursive
+
+- cd @GEO_DIR@; make install
+-
+ @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+
+ @echo ""
+diff -Naur ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in
+--- ntop-3.3.9.orig/configure.in 2009-12-30 12:37:36.997426119 -0800
++++ ntop-3.3.9/configure.in 2009-12-30 12:39:44.841488896 -0800
+@@ -1916,10 +1916,8 @@
+ fi
+
+
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-GEO_IP="$GEO_DIR/libGeoIP/"
+-CFLAGS="$CFLAGS -I$GEO_IP"
+-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
++CFLAGS="$CFLAGS"
++LDFLAGS="$LDFLAGS -lGeoIP"
+
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+
+@@ -2084,7 +2082,6 @@
+ AC_SUBST(SO_VERSION_PATCH)
+ AC_SUBST(RRD_LIB)
+ AC_SUBST(RRD_INC)
+-AC_SUBST(GEO_DIR)
+
+ AC_CONFIG_FILES([Makefile])
+
diff --git a/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig b/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig
new file mode 100644
index 0000000000..d06e66d5ff
--- /dev/null
+++ b/perl-cpan/anyevent/AnyEvent-5.23.tar.gz.sig
Binary files differ
diff --git a/perl-cpan/anyevent/DETAILS b/perl-cpan/anyevent/DETAILS
index d9f3186b33..2926401d85 100755
--- a/perl-cpan/anyevent/DETAILS
+++ b/perl-cpan/anyevent/DETAILS
@@ -1,7 +1,8 @@
SPELL=anyevent
- VERSION=2.8
+ VERSION=5.23
SOURCE=AnyEvent-$VERSION.tar.gz
- SOURCE_HASH=sha512:847f689611749404c563a8c3087127da00219fc45b71bc5e01db3813f85eb5131005aff8c78656007e3e9be6460208f0e7c804f09316510bc5518ad1733ae032
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:847f689611749404c563a8c3087127da00219fc45b71bc5e01db3813f85eb5131005aff8c78656007e3e9be6460208f0e7c804f09316510bc5518ad1733ae032
SOURCE_DIRECTORY=$BUILD_DIRECTORY/AnyEvent-$VERSION
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/ML/MLEHMANN/$SOURCE
LICENSE=PERL
diff --git a/perl-cpan/anyevent/HISTORY b/perl-cpan/anyevent/HISTORY
index 15cb27e4c6..aa582c6b43 100644
--- a/perl-cpan/anyevent/HISTORY
+++ b/perl-cpan/anyevent/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 5.23
+
2008-01-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: cleaned up, updated to 2.8
* BUILD: useless
diff --git a/perl-cpan/finance-quote/DETAILS b/perl-cpan/finance-quote/DETAILS
index da5f985913..77f0f07f73 100755
--- a/perl-cpan/finance-quote/DETAILS
+++ b/perl-cpan/finance-quote/DETAILS
@@ -1,7 +1,7 @@
SPELL=finance-quote
SPELLX=Finance-Quote
- VERSION=1.16
- SOURCE_HASH=sha512:14842ef9a2964b005f74f72bf7814092ecd8025b62205e0ea9e4e5f4d87ec62034e0a432cde152354b1d38e60ff34279a45c76ed6e32a860d535536d2e1d91d0
+ VERSION=1.17
+ SOURCE_HASH=sha512:c55c8ebca493dafc9593e49f9fba48131fba6d7dd6bb956b6c6f6dbfefe579c73e24bab86d69fb4e088f8733d8fb9a236a87c52e9d77384c3609de004eb6c900
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/perl-cpan/finance-quote/HISTORY b/perl-cpan/finance-quote/HISTORY
index f3d62cf2a3..ba16e72a73 100644
--- a/perl-cpan/finance-quote/HISTORY
+++ b/perl-cpan/finance-quote/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.17
+
2009-05-25 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.16
diff --git a/python-pypi/bpython/DEPENDS b/python-pypi/bpython/DEPENDS
index a9322bea70..a76a9de7a5 100755
--- a/python-pypi/bpython/DEPENDS
+++ b/python-pypi/bpython/DEPENDS
@@ -1 +1,3 @@
-depends pygments
+depends pygments &&
+
+suggest_depends pygtk2 "" "" "for GTK interface support"
diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
index fa23515834..4e971baaef 100755
--- a/python-pypi/bpython/DETAILS
+++ b/python-pypi/bpython/DETAILS
@@ -1,8 +1,8 @@
SPELL=bpython
- VERSION=0.9.5.2
+ VERSION=0.9.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
- SOURCE_HASH=sha512:c87f19b4256987025b9b828b7d30b732532c14b84fdbd1a0bb6d1a0732da6b030d1adb4d7d66b9267aa1db73661ac644b68df95b1cb310bbef81638e5f72be24
+ SOURCE_HASH=sha512:6d67872a40e538e098c85ee8bf1c3c135b21f8c1f5e87e589190d1f0bfb6de5ae2ec392baa208b796450aa2bbce73a253bf34b22ceda2c1776543fd282cc958e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.bpython-interpreter.org/
LICENSE[0]=MIT
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
index 995a02495f..a4bc4b8dfa 100644
--- a/python-pypi/bpython/HISTORY
+++ b/python-pypi/bpython/HISTORY
@@ -1,3 +1,10 @@
+2009-12-31 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.9.6.2
+ * DEPENDS: added pygtk2 as suggest dep
+
+2009-12-30 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.9.6
+
2009-10-01 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.9.5.2
diff --git a/science/fraqtive/BUILD b/science/fraqtive/BUILD
new file mode 100755
index 0000000000..6b4b1c6955
--- /dev/null
+++ b/science/fraqtive/BUILD
@@ -0,0 +1,3 @@
+PATH="$QTDIR/bin/qt4:$PATH" &&
+./configure &&
+make
diff --git a/science/fraqtive/DEPENDS b/science/fraqtive/DEPENDS
new file mode 100755
index 0000000000..428f269928
--- /dev/null
+++ b/science/fraqtive/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/science/fraqtive/DETAILS b/science/fraqtive/DETAILS
new file mode 100755
index 0000000000..7257e8a8e3
--- /dev/null
+++ b/science/fraqtive/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=fraqtive
+ VERSION=0.4.5
+ SOURCE_HASH=sha512:08cc3967d410047e22e79474e055a8957e02c6e269460cf5bf3cd3df4ac07555fb5ea88c9cbc05a67f4c22a2b6ef96056fd76a9e63082bfaf317ecf96dd3a686
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://fraqtive.mimec.org/
+ LICENSE[0]=GPL
+ ENTERED=20091229
+ SHORT="Mandelbrot family fractal generator"
+cat << EOF
+Fraqtive is an open source, multi-platform generator of the Mandelbrot
+family fractals. It uses very fast algorithms supporting SSE2
+and multi-core processors. It generates high quality anti-aliased
+images and renders 3D scenes using OpenGL. It allows real-time
+navigation and dynamic generation of the Julia fractal preview.
+EOF
diff --git a/science/fraqtive/HISTORY b/science/fraqtive/HISTORY
new file mode 100644
index 0000000000..78c750bb1b
--- /dev/null
+++ b/science/fraqtive/HISTORY
@@ -0,0 +1,3 @@
+2009-12-29 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 0.4.5
+
diff --git a/science/fraqtive/PRE_BUILD b/science/fraqtive/PRE_BUILD
new file mode 100755
index 0000000000..2eb0abf8a7
--- /dev/null
+++ b/science/fraqtive/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "s:/usr/local:/usr:" configure
diff --git a/science/gkii/BUILD b/science/gkii/BUILD
new file mode 100755
index 0000000000..ee1e4ceb34
--- /dev/null
+++ b/science/gkii/BUILD
@@ -0,0 +1,2 @@
+cd src &&
+make
diff --git a/science/gkii/DEPENDS b/science/gkii/DEPENDS
new file mode 100755
index 0000000000..3bf86172b3
--- /dev/null
+++ b/science/gkii/DEPENDS
@@ -0,0 +1,3 @@
+depends gtk+2 &&
+depends libpng &&
+depends pkgconfig
diff --git a/science/gkii/DETAILS b/science/gkii/DETAILS
new file mode 100755
index 0000000000..efacc12cb3
--- /dev/null
+++ b/science/gkii/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=gkii
+ SPELLX=gkII
+ VERSION=0.4.7
+ SOURCE_HASH=sha512:64918d3d6f2c9b8c870712d732230d408c4bc1163e94dc4c9c91d0284221f50e836328c72389473d8bf6c456d8b4f1d2c5f7fbb24e00c12dabdcf5c901461c57
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.jwm-art.net/gkII/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE=http://www.jwm-art.net/gkII/
+ LICENSE[0]=GPL
+ ENTERED=20091229
+ SHORT="a Mandelbrot and Julia Fractal image generator with added mangling equations"
+cat << EOF
+A Mandelbrot and Julia Fractal image generator with added mangling equations.
+EOF
diff --git a/science/gkii/HISTORY b/science/gkii/HISTORY
new file mode 100644
index 0000000000..fec5c7121c
--- /dev/null
+++ b/science/gkii/HISTORY
@@ -0,0 +1,3 @@
+2009-12-29 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 0.4.7
+
diff --git a/science/gkii/PRE_BUILD b/science/gkii/PRE_BUILD
new file mode 100755
index 0000000000..e6f501475d
--- /dev/null
+++ b/science/gkii/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "s:/usr/local:/usr:" src/Makefile
diff --git a/security-libs/linux-pam/DETAILS b/security-libs/linux-pam/DETAILS
index 8f7553c5d6..10e713bb77 100755
--- a/security-libs/linux-pam/DETAILS
+++ b/security-libs/linux-pam/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-pam
- VERSION=1.1.0
+ VERSION=1.1.1
SECURITY_PATCH=1
SOURCE=Linux-PAM-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Linux-PAM-$VERSION
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 1a751ba51c..69373107da 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,6 @@
+2009-12-31 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.1.1
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
* DEPENDS: switch from tetex to texlive [auto]
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index e36f851afd..d9174d3ac8 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_IGNORE=signature
SOURCE4_IGNORE=signature
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
- PATCHLEVEL=5
+ PATCHLEVEL=6
ENTERED=20010922
LICENSE[0]=GPL2
KEYWORDS="console"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index bf94d2db2a..6ddbfeeab2 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,8 @@
+2009-12-30 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added upstream patches
+ * patches/bash40-034 to 035: Added upstream patches
+
2009-09-19 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Added upstream patches
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index fac26c1357..28c26f63d1 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -35,6 +35,8 @@ patch -p0 < $SPELL_DIRECTORY/patches/bash40-030 &&
patch -p0 < $SPELL_DIRECTORY/patches/bash40-031 &&
patch -p0 < $SPELL_DIRECTORY/patches/bash40-032 &&
patch -p0 < $SPELL_DIRECTORY/patches/bash40-033 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-034 &&
+patch -p0 < $SPELL_DIRECTORY/patches/bash40-035 &&
if [[ "$BASH_NI_LOGIN" == y ]]; then
message "${MESSAGE_COLOR}Defining NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
diff --git a/shell-term-fm/bash/patches/bash40-034 b/shell-term-fm/bash/patches/bash40-034
new file mode 100644
index 0000000000..bacb33ce19
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-034
@@ -0,0 +1,59 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-034
+
+Bug-Reported-by: Anders Kaseorg <andersk@mit.edu>
+Bug-Reference-ID: <1252856832.991059.8162.nullmailer@balanced-tree.mit.edu>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00043.html
+
+Bug-Description:
+
+When using the globstar option, bash incorrectly interprets wildcarded path
+components between a **/ and the last / as matching any path, even if the
+constructed path does not match any files.
+
+Patch:
+
+*** ../bash-4.0-patched/lib/glob/glob.c 2009-07-22 23:18:50.000000000 -0400
+--- lib/glob/glob.c 2009-09-18 17:53:25.000000000 -0400
+***************
+*** 920,928 ****
+ char **temp_results;
+
+ /* Scan directory even on a NULL filename. That way, `*h/'
+ returns only directories ending in `h', instead of all
+ files ending in `h' with a `/' appended. */
+ dname = directories[i];
+! dflags = flags & ~GX_MARKDIRS;
+ if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
+ dflags |= GX_ALLDIRS|GX_ADDCURDIR;
+--- 927,938 ----
+ char **temp_results;
+
++ /* XXX -- we've recursively scanned any directories resulting from
++ a `**', so turn off the flag. We turn it on again below if
++ filename is `**' */
+ /* Scan directory even on a NULL filename. That way, `*h/'
+ returns only directories ending in `h', instead of all
+ files ending in `h' with a `/' appended. */
+ dname = directories[i];
+! dflags = flags & ~(GX_MARKDIRS|GX_ALLDIRS|GX_ADDCURDIR);
+ if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
+ dflags |= GX_ALLDIRS|GX_ADDCURDIR;
+*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 33
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash40-035 b/shell-term-fm/bash/patches/bash40-035
new file mode 100644
index 0000000000..3b1af7505d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash40-035
@@ -0,0 +1,62 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.0
+Patch-ID: bash40-035
+
+Bug-Reported-by: Freddy Vulto <fvulto@gmail.com>
+Bug-Reference-ID: <e9c463930909171341p7cbe6e43pa3788ebbe3adec4d@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00044.html
+
+Bug-Description:
+
+Bash-4.0 incorrectly treated single and double quotes as delimiters rather
+than introducing quoted strings when splitting the line into words for
+programmable completion functions.
+
+Patch:
+
+*** ../bash-4.0-patched/pcomplete.c 2009-03-08 21:24:31.000000000 -0400
+--- pcomplete.c 2009-09-26 16:30:16.000000000 -0400
+***************
+*** 1176,1186 ****
+ WORD_LIST *ret;
+ char *delims;
+
+! #if 0
+! delims = "()<>;&| \t\n"; /* shell metacharacters break words */
+! #else
+! delims = rl_completer_word_break_characters;
+! #endif
+ ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp);
+ return (ret);
+ }
+--- 1176,1188 ----
+ WORD_LIST *ret;
+ char *delims;
++ int i, j;
+
+! delims = xmalloc (strlen (rl_completer_word_break_characters) + 1);
+! for (i = j = 0; rl_completer_word_break_characters[i]; i++)
+! if (rl_completer_word_break_characters[i] != '\'' && rl_completer_word_break_characters[i] != '"')
+! delims[j++] = rl_completer_word_break_characters[i];
+! delims[j] = '\0';
+ ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp);
++ free (delims);
+ return (ret);
+ }
+*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
+--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 35
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/rxvt-unicode/DETAILS b/shell-term-fm/rxvt-unicode/DETAILS
index 26ca15385b..03a14f5d91 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
SPELL=rxvt-unicode
- VERSION=9.06
- SOURCE_HASH=sha512:fa3754c92f2c06a467b1c1ff78f2ba5ea723239efb54dec0a004490d82e8d55e8734e3abedcd800f769d3c13f99046de87a5abd916d24818915092de902a943c
+ VERSION=9.07
+ SOURCE_HASH=sha512:1acdaa6863aeb7f9a861860a898a036900897cd351ed66db006b3612f8750ece042c913b08a125100bd4daad6525cf56246741fc37a49df5bf38b4382f8bd152
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://dist.schmorp.de/$SPELL/$SOURCE
diff --git a/shell-term-fm/rxvt-unicode/HISTORY b/shell-term-fm/rxvt-unicode/HISTORY
index a96e3d2fe9..06558e2655 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 9.07
+
2009-11-28 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: corrected dependencies -- killed xorg-libs, see #14699
* DETAILS: quoting paths
diff --git a/shell-term-fm/terminator/DETAILS b/shell-term-fm/terminator/DETAILS
index df61203ee0..9edeecb6c2 100755
--- a/shell-term-fm/terminator/DETAILS
+++ b/shell-term-fm/terminator/DETAILS
@@ -1,10 +1,9 @@
SPELL=terminator
- VERSION=0.13
+ VERSION=0.14
SOURCE=${SPELL}_$VERSION.tar.gz
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/$SOURCE
- SOURCE_HASH=sha512:603418c6bc5349dae63101b15ec59de3a1f6d81eb4b0cae8094f53958d9aff96f19a1e149db916a655585708e9f44146a69f8919ab5998d6953e44818340e3a0
-#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$VERSION"
+ SOURCE_HASH=sha512:967fe77c589c48eaadf60697b8238fe18fb5ec369b17d482cc8a6b96d3959ca2a991e8c9d635a34d4b5883fbad2dc6d2d33435d7007fba13a8e637ee039bb9b2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.tenshu.net/terminator/
LICENSE[0]=GPL
ENTERED=20090121
diff --git a/shell-term-fm/terminator/HISTORY b/shell-term-fm/terminator/HISTORY
index 1072f86d5e..89f7c85ec4 100644
--- a/shell-term-fm/terminator/HISTORY
+++ b/shell-term-fm/terminator/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.14, updated SOURCE_DIRECTORY
+
2009-06-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.13, updated SOURCE_DIRECTORY
diff --git a/utils/autogen/DEPENDS b/utils/autogen/DEPENDS
index c00eb7ff42..0847e8f71a 100755
--- a/utils/autogen/DEPENDS
+++ b/utils/autogen/DEPENDS
@@ -1,4 +1,2 @@
depends guile &&
-depends bison &&
-depends texlive &&
depends libxml2
diff --git a/utils/autogen/HISTORY b/utils/autogen/HISTORY
index e02e566ec9..37d7d0e395 100644
--- a/utils/autogen/HISTORY
+++ b/utils/autogen/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Vasil Yonkov <spirtbrat@sourcemage.org>
+ * DEPENDS: removed bison, texlive
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
* DEPENDS: switch from tetex to texlive [auto]
diff --git a/utils/gpm/DETAILS b/utils/gpm/DETAILS
index 50e2d7c60c..be592f5892 100755
--- a/utils/gpm/DETAILS
+++ b/utils/gpm/DETAILS
@@ -3,7 +3,7 @@
SOURCE_HASH=sha512:e47a9ad6e1f0fb98f9265963a3ab011e533d7cec6ce4a321c266ad33e8b0b15ef275367cdebc3dab8f398e236072f1416fb5bc5554cb3844b8e3bb576d0e312c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://linux.schottelius.org/gpm/archives/$SOURCE
+ SOURCE_URL[0]=http://www.nico.schottelius.org/software/gpm/archives/$SOURCE
WEB_SITE=http://linux.schottelius.org/gpm/
ENTERED=20011003
KEYWORDS="utils"
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index 8d06f5af46..f3802d2a7c 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: updated SOURCE_URL[0]
+
2009-07-03 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.20.6
diff --git a/utils/nss-pam-ldapd/DETAILS b/utils/nss-pam-ldapd/DETAILS
index f723a33683..ff5c7dc9d5 100755
--- a/utils/nss-pam-ldapd/DETAILS
+++ b/utils/nss-pam-ldapd/DETAILS
@@ -1,5 +1,5 @@
SPELL=nss-pam-ldapd
- VERSION=0.7.1
+ VERSION=0.7.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://arthurdejong.org/$SPELL/$SOURCE
diff --git a/utils/nss-pam-ldapd/HISTORY b/utils/nss-pam-ldapd/HISTORY
index 744c283591..d584a3bdb7 100644
--- a/utils/nss-pam-ldapd/HISTORY
+++ b/utils/nss-pam-ldapd/HISTORY
@@ -1,3 +1,6 @@
+2009-12-29 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.7.2
+
2009-10-20 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.7.1
diff --git a/video-libs/libquicktime/DEPENDS b/video-libs/libquicktime/DEPENDS
index 44f1d9166b..afa18fc179 100755
--- a/video-libs/libquicktime/DEPENDS
+++ b/video-libs/libquicktime/DEPENDS
@@ -1,5 +1,5 @@
optional_depends libavc1394 "" "" "for firewire support" &&
-optional_depends X11-LIBS \
+optional_depends xorg-libs \
"--with-x" \
"--without-x" \
"for X11 support" &&
diff --git a/video-libs/libquicktime/HISTORY b/video-libs/libquicktime/HISTORY
index bfc1cbbda8..078be1b91a 100644
--- a/video-libs/libquicktime/HISTORY
+++ b/video-libs/libquicktime/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: X11-LIBS -> xorg-libs
+
2009-11-12 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: completed most optional_depends options
diff --git a/x11/gkrellm2/DETAILS b/x11/gkrellm2/DETAILS
index a6caf0c21c..b31492e014 100755
--- a/x11/gkrellm2/DETAILS
+++ b/x11/gkrellm2/DETAILS
@@ -1,9 +1,9 @@
SPELL=gkrellm2
- VERSION=2.3.2
+ VERSION=2.3.3
SOURCE=gkrellm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gkrellm-$VERSION
SOURCE_URL[0]=http://members.dslextreme.com/users/billw/gkrellm/$SOURCE
- SOURCE_HASH=sha512:c155c612a2139f9653bd9287de563c0d629939b42c698ea83df84fa83dd09471ff14580cd350cdd75fcdd440f407ad93fe47018308175fd59d61b66c19e4a36a
+ SOURCE_HASH=sha512:cd34e84dbfc18b80c38813518150f7a0dd79b8d69e731e87cd269b8c4bfd0bf5ea966d0ec001b1482386ce49b4061bed0f09681381c72ab36902044c7e993ee9
WEB_SITE=http://www.gkrellm.net/
ENTERED=20011021
LICENSE[0]=GPLv3
diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index a8235a7d62..90bed227b2 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,7 @@
+2009-12-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.3.3
+ * PRE_BUILD, glibc-2.10.1.patch: removed
+
2009-07-21 Julien "_kaze_" ROZO <julien@rozo.org>
* PRE_BUILD: patch is only applied if client is requested
* glibc-2.10.1.patch: fixed tabs, don't know why it was no longer applying
diff --git a/x11/gkrellm2/PRE_BUILD b/x11/gkrellm2/PRE_BUILD
deleted file mode 100755
index 13acbd2277..0000000000
--- a/x11/gkrellm2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [ "$DAEMON_ONLY" = "n" ] ; then
- patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
-fi
diff --git a/x11/gkrellm2/glibc-2.10.1.patch b/x11/gkrellm2/glibc-2.10.1.patch
deleted file mode 100644
index b86a094384..0000000000
--- a/x11/gkrellm2/glibc-2.10.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur gkrellm-2.3.2.orig/src/client.c gkrellm-2.3.2/src/client.c
---- gkrellm-2.3.2.orig/src/client.c 2008-10-04 02:33:37.000000000 +0200
-+++ gkrellm-2.3.2/src/client.c 2009-07-21 10:03:07.000000000 +0200
-@@ -1620,7 +1620,7 @@
-
-
- static gint
--getline(gint fd, gchar *buf, gint len)
-+getline_(gint fd, gchar *buf, gint len)
- {
- fd_set read_fds;
- struct timeval tv;
-@@ -1714,7 +1714,7 @@
-
- while (1)
- {
-- rs=getline(fd, buf, sizeof(buf));
-+ rs=getline_(fd, buf, sizeof(buf));
- if(rs<0)
- return FALSE;
- if (!strcmp(buf, "</gkrellmd_setup>"))
-@@ -1732,7 +1732,7 @@
- table_size = sizeof(update_table) / sizeof(KeyTable);
- while (1)
- {
-- rs=getline(fd, buf, sizeof(buf));
-+ rs=getline_(fd, buf, sizeof(buf));
- if(rs<0)
- return FALSE;
- if (!strcmp(buf, "</initial_update>"))
diff --git a/xfce/xfce4-dict/DETAILS b/xfce/xfce4-dict/DETAILS
index e03cc9dafb..645dc645d7 100755
--- a/xfce/xfce4-dict/DETAILS
+++ b/xfce/xfce4-dict/DETAILS
@@ -1,8 +1,8 @@
SPELL=xfce4-dict
- VERSION=0.5.3
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/${VERSION:0:3}/$SOURCE
WEB_SITE=http://goodies.xfce.org/projects/applications/xfce4-dict
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=BSD
diff --git a/xfce/xfce4-dict/HISTORY b/xfce/xfce4-dict/HISTORY
index 49ef023875..1794023318 100644
--- a/xfce/xfce4-dict/HISTORY
+++ b/xfce/xfce4-dict/HISTORY
@@ -1,3 +1,6 @@
+2009-12-30 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to version 0.6.0. Fixed SOURCE_URL[0]
+
2009-05-09 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.5.3
diff --git a/xfce/xfce4-dict/xfce4-dict-0.5.3.tar.bz2.sig b/xfce/xfce4-dict/xfce4-dict-0.5.3.tar.bz2.sig
deleted file mode 100644
index 9cae544ec2..0000000000
--- a/xfce/xfce4-dict/xfce4-dict-0.5.3.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/xfce/xfce4-dict/xfce4-dict-0.6.0.tar.bz2.sig b/xfce/xfce4-dict/xfce4-dict-0.6.0.tar.bz2.sig
new file mode 100644
index 0000000000..d3da57ea40
--- /dev/null
+++ b/xfce/xfce4-dict/xfce4-dict-0.6.0.tar.bz2.sig
Binary files differ
diff --git a/xorg-driver/xf86-video-vmware/DETAILS b/xorg-driver/xf86-video-vmware/DETAILS
index 6c54057721..0935d1c8b9 100755
--- a/xorg-driver/xf86-video-vmware/DETAILS
+++ b/xorg-driver/xf86-video-vmware/DETAILS
@@ -1,5 +1,5 @@
SPELL=xf86-video-vmware
- VERSION=10.16.8
+ VERSION=10.16.9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
# SOURCE_HASH=sha512:0db8e5424abf6a17dcea495203a7c9e0753299bf4251c765860adbcfa8a9df7f28541afe246b99376a716cd5b0ceec5e707506e9b1279caebeba48a62570d222
diff --git a/xorg-driver/xf86-video-vmware/HISTORY b/xorg-driver/xf86-video-vmware/HISTORY
index 3ed6294411..13656457ce 100644
--- a/xorg-driver/xf86-video-vmware/HISTORY
+++ b/xorg-driver/xf86-video-vmware/HISTORY
@@ -1,3 +1,11 @@
+2009-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 10.16.9
+ SOURCE matches upstream posted SHA1
+ Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24541 and
+ http://bugs.freedesktop.org/show_bug.cgi?id=14208
+ * PRE_BUILD: vmware.patch no longer needed
+ * vmware.patch: Removed, fixed in 10.16.9
+
2009-12-27 George Sherwood <gsherwood@sourcemage.org>
* PRE_BUILD: Added to apply patch
* vmware.patch: Added fix for lockups from upstream bug:
diff --git a/xorg-driver/xf86-video-vmware/PRE_BUILD b/xorg-driver/xf86-video-vmware/PRE_BUILD
deleted file mode 100755
index fa9a880b2a..0000000000
--- a/xorg-driver/xf86-video-vmware/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Upstream fix from
-# https://bugs.freedesktop.org/show_bug.cgi?id=24541
-
-patch -p0 < $SCRIPT_DIRECTORY/vmware.patch
diff --git a/xorg-driver/xf86-video-vmware/vmware.patch b/xorg-driver/xf86-video-vmware/vmware.patch
deleted file mode 100644
index a2a22efbad..0000000000
--- a/xorg-driver/xf86-video-vmware/vmware.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/vmware.c b/src/vmware.c
-index 6004677..b5a5099 100644
---- src/vmware.c
-+++ src/vmware.c
-@@ -146,38 +146,6 @@ static PciChipsets VMWAREPciChipsets[] = {
- { -1, -1, RES_UNDEFINED }
- };
-
--static const char *vgahwSymbols[] = {
-- "vgaHWGetHWRec",
-- "vgaHWGetIOBase",
-- "vgaHWGetIndex",
-- "vgaHWInit",
-- "vgaHWProtect",
-- "vgaHWRestore",
-- "vgaHWSave",
-- "vgaHWSaveScreen",
-- "vgaHWUnlock",
-- NULL
--};
--
--static const char *fbSymbols[] = {
-- "fbCreateDefColormap",
-- "fbPictureInit",
-- "fbScreenInit",
-- NULL
--};
--
--static const char *ramdacSymbols[] = {
-- "xf86CreateCursorInfoRec",
-- "xf86DestroyCursorInfoRec",
-- "xf86InitCursor",
-- NULL
--};
--
--static const char *shadowfbSymbols[] = {
-- "ShadowFBInit2",
-- NULL
--};
--
- #ifdef XFree86LOADER
- static XF86ModuleVersionInfo vmwareVersRec = {
- "vmware",
-@@ -640,8 +608,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
- if (!vgaHWGetHWRec(pScrn)) {
- return FALSE;
- }
-@@ -959,7 +925,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
-
- /* Need ramdac for hwcursor */
- if (pVMWARE->hwCursor) {
-@@ -967,7 +932,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
- }
-
- return TRUE;
-@@ -2051,9 +2015,6 @@ vmwareSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- setupDone = TRUE;
- xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
-
-- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-- shadowfbSymbols, NULL);
--
- return (pointer)1;
- }
- if (errmaj) {
diff --git a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig
deleted file mode 100644
index d2d1265e55..0000000000
--- a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.8.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig
new file mode 100644
index 0000000000..53d0a53249
--- /dev/null
+++ b/xorg-driver/xf86-video-vmware/xf86-video-vmware-10.16.9.tar.bz2.sig
Binary files differ
diff --git a/xorg-extras/xterm/DEPENDS b/xorg-extras/xterm/DEPENDS
index 4144a802b9..4697753bd0 100755
--- a/xorg-extras/xterm/DEPENDS
+++ b/xorg-extras/xterm/DEPENDS
@@ -1,4 +1,15 @@
-depends xorg-server "--with-x" &&
+depends fontconfig &&
+depends freetype2 &&
+depends libice &&
+depends libsm &&
+depends libx11 "--with-x" &&
+depends libxaw &&
+depends libxext &&
+depends libxft &&
+depends libxmu &&
+depends libxrender &&
+depends libxt &&
+depends ncurses &&
optional_depends xaw3d \
"--with-Xaw3d" \
@@ -13,4 +24,9 @@ optional_depends freetype2 \
optional_depends luit \
"--enable-luit" \
"--disable-luit" \
- "to enable Unicode translation"
+ "to enable Unicode translation" &&
+
+optional_depends pcre \
+ "--with-pcre" \
+ "--without-pcre" \
+ "for Perl 5 regular expressions"
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index 66f93afacf..3c73bfdf7b 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,10 @@
+2009-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Depends on libx11, libsm, libxt, libxext, libxaw, libice,
+ libxmu, libxft, libxrender, fontconfig, and freetype2 rather than
+ xorg-server
+ Optionally depends on pcre
+ Depends on ncurses
+
2009-12-12 Bor Kraljič <pyrobor@ver.si>
* DETAILS: updated spell to 253