Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (7d6ffde8a19b93e52723d2b39c6c35af47f6fb57)
  • Date: Thu, 8 Apr 2010 18:33:09 -0500

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

ChangeLog
| 15 +
antivirus/clamav/DEPENDS
| 3
antivirus/clamav/HISTORY
| 4
audio-drivers/oss/DETAILS
| 6
audio-drivers/oss/HISTORY
| 4
audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS
| 8
audio-libs/libao-pulse/BUILD
| 1
audio-libs/libao-pulse/DEPENDS
| 7
audio-libs/libao-pulse/DETAILS
| 9
audio-libs/libao-pulse/HISTORY
| 3
audio-libs/libao-pulse/INSTALL
| 1
audio-libs/libao-pulse/PRE_BUILD
| 1
audio-libs/libao-pulse/UP_TRIGGERS
| 1
audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig
| 0
audio-libs/libao/CONFLICTS
| 1
audio-libs/libao/HISTORY
| 3
audio-libs/libmpd/DETAILS
| 2
audio-libs/libmpd/HISTORY
| 3
audio-libs/libmpd/libmpd-0.19.0.tar.gz.sig
| 0
audio-libs/libmpd/libmpd-0.20.0.tar.gz.sig
|binary
audio-players/amarok/DEPENDS
| 2
audio-players/amarok/HISTORY
| 3
audio-players/digitaldj/DEPENDS
| 2
audio-players/digitaldj/HISTORY
| 3
audio-players/gmpc/DEPENDS
| 1
audio-players/gmpc/DETAILS
| 2
audio-players/gmpc/HISTORY
| 4
audio-players/gmpc/gmpc-0.19.1.tar.gz.sig
| 0
audio-players/gmpc/gmpc-0.20.0.tar.gz.sig
|binary
audio-players/mp3blaster/DEPENDS
| 2
audio-players/mp3blaster/HISTORY
| 3
audio-players/mp3kult/DEPENDS
| 2
audio-players/mp3kult/HISTORY
| 3
audio-players/ncmpc/DETAILS
| 4
audio-players/ncmpc/HISTORY
| 3
audio-players/ncmpcpp/DETAILS
| 4
audio-players/ncmpcpp/HISTORY
| 3
audio-players/prokyon3/DEPENDS
| 2
audio-players/prokyon3/HISTORY
| 3
audio-players/rhythmbox/BUILD
| 6
audio-players/rhythmbox/CONFIGURE
| 10 -
audio-players/rhythmbox/DEPENDS
| 84 ++++++++
audio-players/rhythmbox/HISTORY
| 9
audio-soft/mediatomb/DEPENDS
| 2
audio-soft/mediatomb/HISTORY
| 3
chat-im/ekiga/DEPENDS
| 5
chat-im/ekiga/HISTORY
| 3
chat-im/jabberd/DEPENDS
| 2
chat-im/jabberd/HISTORY
| 3
chat-irc/irssi/DETAILS
| 3
chat-irc/irssi/HISTORY
| 4
collab/dotproject/DEPENDS
| 2
collab/dotproject/HISTORY
| 3
collab/geeklog/DEPENDS
| 2
collab/geeklog/HISTORY
| 3
collab/mantis/DEPENDS
| 2
collab/mantis/HISTORY
| 3
collab/mediawiki/DEPENDS
| 2
collab/mediawiki/HISTORY
| 3
collab/php-nuke/DEPENDS
| 2
collab/php-nuke/HISTORY
| 3
collab/php_users/DEPENDS
| 2
collab/php_users/HISTORY
| 3
collab/pmi/DEPENDS
| 2
collab/pmi/HISTORY
| 3
collab/postnuke/DEPENDS
| 2
collab/postnuke/HISTORY
| 3
collab/thcnet/DEPENDS
| 2
collab/thcnet/HISTORY
| 3
collab/tikiwiki/DEPENDS
| 2
collab/tikiwiki/HISTORY
| 3
collab/wordpress/DEPENDS
| 2
collab/wordpress/HISTORY
| 3
collab/xoops/DEPENDS
| 2
collab/xoops/HISTORY
| 3
crypto/ca-certificates/DETAILS
| 1
crypto/ca-certificates/HISTORY
| 5
crypto/ca-certificates/INSTALL
| 2
crypto/cyrus-sasl/DEPENDS
| 2
crypto/cyrus-sasl/HISTORY
| 3
crypto/dropbear/DETAILS
| 4
crypto/dropbear/HISTORY
| 3
crypto/krb5-appl/BUILD
| 2
crypto/krb5-appl/CONFLICTS
| 2
crypto/krb5-appl/DEPENDS
| 6
crypto/krb5-appl/DETAILS
| 21 ++
crypto/krb5-appl/HISTORY
| 5
crypto/krb5-appl/PRE_BUILD
| 7
crypto/krb5-appl/PROVIDES
| 1
crypto/krb5-appl/desktop/telnet.desktop
| 8
crypto/krb5-appl/pam.d/rexec
| 10 +
crypto/krb5-appl/pam.d/rlogin
| 11 +
crypto/krb5-appl/pam.d/rsh
| 10 +
crypto/krb5-appl/system-et.patch.bz2
|binary
crypto/krb5-appl/xinetd.d/ftpd
| 13 +
crypto/krb5-appl/xinetd.d/klogind
| 13 +
crypto/krb5-appl/xinetd.d/kshd
| 13 +
crypto/krb5-appl/xinetd.d/telnetd
| 13 +
crypto/krb5/CONFLICTS
| 2
crypto/krb5/DEPENDS
| 2
crypto/krb5/DETAILS
| 4
crypto/krb5/HISTORY
| 9
crypto/krb5/PROVIDES
| 1
crypto/krb5/desktop/telnet.desktop
| 8
crypto/krb5/pam.d/rexec
| 10 -
crypto/krb5/pam.d/rlogin
| 11 -
crypto/krb5/pam.d/rsh
| 10 -
crypto/krb5/system-et.patch.bz2
|binary
crypto/krb5/xinetd.d/ftpd
| 13 -
crypto/krb5/xinetd.d/klogind
| 13 -
crypto/krb5/xinetd.d/kshd
| 13 -
crypto/krb5/xinetd.d/telnetd
| 13 -
crypto/openssl/BUILD
| 1
crypto/openssl/DETAILS
| 1
crypto/openssl/HISTORY
| 4
database/gtksql/DEPENDS
| 2
database/gtksql/HISTORY
| 3
database/guile-dbd-mysql/DEPENDS
| 2
database/guile-dbd-mysql/HISTORY
| 3
database/hk_classes/DEPENDS
| 2
database/hk_classes/HISTORY
| 3
database/libdbi-drivers/DEPENDS
| 2
database/libdbi-drivers/HISTORY
| 3
database/mariadb/HISTORY
| 3
database/mariadb/PROVIDES
| 1
database/mysql/HISTORY
| 3
database/mysql/PROVIDES
| 1
database/mytop/DEPENDS
| 2
database/mytop/HISTORY
| 3
database/rekall/DEPENDS
| 2
database/rekall/HISTORY
| 3
database/rlib/DEPENDS
| 2
database/rlib/HISTORY
| 3
database/tora/DEPENDS
| 2
database/tora/HISTORY
| 3
dev/null
|binary
devel/b43-tools/BUILD
| 8
devel/b43-tools/CONFLICTS
| 3
devel/b43-tools/DETAILS
| 8
devel/b43-tools/HISTORY
| 5
devel/b43-tools/INSTALL
| 7
devel/cmake/DETAILS
| 2
devel/cmake/HISTORY
| 4
devel/erlang/DETAILS
| 2
devel/erlang/HISTORY
| 3
devel/erlang/otp_src_R13B03.tar.gz.sig
| 0
devel/erlang/otp_src_R13B04.tar.gz.sig
|binary
devel/gambas/DEPENDS
| 2
devel/gambas/HISTORY
| 3
devel/gambas2/DEPENDS
| 2
devel/gambas2/HISTORY
| 3
devel/mysqlnavigator/DEPENDS
| 2
devel/mysqlnavigator/HISTORY
| 3
devel/phpmyadmin/DEPENDS
| 2
devel/phpmyadmin/HISTORY
| 3
devel/pike/DEPENDS
| 2
devel/pike/HISTORY
| 3
devel/python/DEPENDS
| 1
devel/python/HISTORY
| 3
devel/qt-creator/DETAILS
| 9
devel/qt-creator/HISTORY
| 3
disk/anyfs-tools/DETAILS
| 4
disk/anyfs-tools/HISTORY
| 3
disk/brasero/CONFLICTS
| 1
disk/brasero/HISTORY
| 3
disk/ddrescue/DETAILS
| 4
disk/ddrescue/HISTORY
| 3
disk/lessfs/DEPENDS
| 2
disk/lessfs/DETAILS
| 14 +
disk/lessfs/HISTORY
| 3
disk/lvm/REPAIR^none^SUB_DEPENDS
| 6
disk/sg3_utils/DETAILS
| 4
disk/sg3_utils/HISTORY
| 3
disk/udev/REPAIR^all^SUB_DEPENDS
| 17 -
editors/mlview/DEPENDS
| 13 +
editors/mlview/HISTORY
| 5
editors/mlview/PRE_BUILD
| 3
editors/mlview/mlview-gcc.patch
| 65 ++++++
editors/openoffice/DEPENDS
| 6
editors/openoffice/DETAILS
| 2
editors/openoffice/HISTORY
| 4
ftp/amule/DETAILS
| 7
ftp/amule/HISTORY
| 4
ftp/bnbt/DEPENDS
| 2
ftp/bnbt/HISTORY
| 3
ftp/gnunet/DEPENDS
| 2
ftp/gnunet/DETAILS
| 2
ftp/gnunet/GNUnet-0.8.1.tar.gz.sig
| 0
ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig
|binary
ftp/gnunet/HISTORY
| 6
ftp/proftpd/DEPENDS
| 2
ftp/proftpd/HISTORY
| 3
ftp/pure-ftpd/DEPENDS
| 2
ftp/pure-ftpd/HISTORY
| 3
gnome2-apps/abiword/CONFIGURE
| 3
gnome2-apps/abiword/DEPENDS
| 13 -
gnome2-apps/abiword/DETAILS
| 4
gnome2-apps/abiword/HISTORY
| 10 +
gnome2-apps/abiword/PRE_BUILD
| 4
gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig
| 0
gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
|binary
gnome2-apps/abiword/delete.patch
| 11 +
gnome2-apps/epiphany/DEPENDS
| 2
gnome2-apps/epiphany/HISTORY
| 3
gnome2-apps/epiphany/epiphany-2.28.2.tar.bz2.sig
| 0
gnome2-apps/evolution/DEPENDS
| 2
gnome2-apps/evolution/HISTORY
| 3
gnome2-apps/gedit-plugins/BUILD
| 38 ---
gnome2-apps/gedit-plugins/CONFIGURE
| 27 +-
gnome2-apps/gedit-plugins/HISTORY
| 3
gnome2-apps/glade3/DEPENDS
| 6
gnome2-apps/glade3/HISTORY
| 3
gnome2-apps/gnome-mount/DEPENDS
| 4
gnome2-apps/gnome-mount/HISTORY
| 3
gnome2-apps/gnucash/DEPENDS
| 2
gnome2-apps/gnucash/HISTORY
| 3
gnome2-apps/mail-notification/BUILD
| 2
gnome2-apps/mail-notification/DEPENDS
| 4
gnome2-apps/mail-notification/DETAILS
| 2
gnome2-apps/mail-notification/HISTORY
| 5
gnome2-apps/mail-notification/INSTALL
| 1
gnome2-apps/mail-notification/PRE_BUILD
| 5
gnome2-apps/mail-notification/mail-notification-4.1-find-evo-2.12.patch
| 22 --
gnome2-apps/orca/DEPENDS
| 1
gnome2-apps/orca/HISTORY
| 3
gnome2-apps/system-tools-backends/DEPENDS
| 13 -
gnome2-apps/system-tools-backends/HISTORY
| 3
gnome2-libs/eel2/BUILD
| 1
gnome2-libs/eel2/DEPENDS
| 12 -
gnome2-libs/eel2/DETAILS
| 9
gnome2-libs/eel2/HISTORY
| 9
gnome2-libs/eel2/INSTALL
| 1
gnome2-libs/eel2/PRE_BUILD
| 1
gnome2-libs/eel2/UP_TRIGGERS
| 1
gnome2-libs/eel2/eel-2.26.0.tar.bz2.sig
| 0
gnome2-libs/gconf-editor/DEPENDS
| 12 -
gnome2-libs/gconf-editor/HISTORY
| 4
gnome2-libs/gconf2/DEPENDS
| 1
gnome2-libs/gconf2/HISTORY
| 3
gnome2-libs/gdm2/DEPENDS
| 1
gnome2-libs/gdm2/HISTORY
| 3
gnome2-libs/glibmm/HISTORY
| 3
gnome2-libs/glibmm/PRE_SUB_DEPENDS
| 5
gnome2-libs/glibmm/SUB_DEPENDS
| 6
gnome2-libs/gnome-applets2/DEPENDS
| 2
gnome2-libs/gnome-applets2/HISTORY
| 3
gnome2-libs/gnome-audio2/DEPENDS
| 1
gnome2-libs/gnome-audio2/HISTORY
| 3
gnome2-libs/gnome-control-center/DEPENDS
| 6
gnome2-libs/gnome-control-center/HISTORY
| 4
gnome2-libs/gnome-panel/DEPENDS
| 16 -
gnome2-libs/gnome-panel/HISTORY
| 4
gnome2-libs/gnome-python-extras/BUILD
| 2
gnome2-libs/gnome-python-extras/HISTORY
| 4
gnome2-libs/gnome-python2/BUILD
| 5
gnome2-libs/gnome-python2/CONFIGURE
| 7
gnome2-libs/gnome-python2/DEPENDS
| 63 ++++++
gnome2-libs/gnome-python2/HISTORY
| 7
gnome2-libs/gnome-screensaver/DEPENDS
| 1
gnome2-libs/gnome-screensaver/HISTORY
| 3
gnome2-libs/gnome-sharp/DEPENDS
| 3
gnome2-libs/gnome-sharp/HISTORY
| 3
gnome2-libs/gnome-system-monitor/DEPENDS
| 5
gnome2-libs/gnome-system-monitor/HISTORY
| 3
gnome2-libs/gnome-utils2/DEPENDS
| 19 +
gnome2-libs/gnome-utils2/HISTORY
| 5
gnome2-libs/goffice-dev/CONFLICTS
| 3
gnome2-libs/goffice-dev/DEPENDS
| 13 -
gnome2-libs/goffice-dev/DETAILS
| 4
gnome2-libs/goffice-dev/HISTORY
| 3
gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
| 4
gnome2-libs/goffice-dev/SUB_DEPENDS
| 6
gnome2-libs/goffice/CONFLICTS
| 3
gnome2-libs/goffice/DEPENDS
| 13 -
gnome2-libs/goffice/HISTORY
| 7
gnome2-libs/goffice/PRE_SUB_DEPENDS
| 5
gnome2-libs/goffice/SUB_DEPENDS
| 6
gnome2-libs/libgda2/DEPENDS
| 2
gnome2-libs/libgda2/HISTORY
| 3
gnome2-libs/libgda3/DEPENDS
| 2
gnome2-libs/libgda3/HISTORY
| 3
gnome2-libs/libgnome/DEPENDS
| 1
gnome2-libs/libgnome/HISTORY
| 3
gnome2-libs/libgsf/DEPENDS
| 4
gnome2-libs/libgsf/HISTORY
| 3
gnome2-libs/libgweather/DEPENDS
| 4
gnome2-libs/libgweather/HISTORY
| 5
gnome2-libs/metacity/DEPENDS
| 4
gnome2-libs/metacity/HISTORY
| 3
gnome2-libs/nautilus-cd-burner/BUILD
| 5
gnome2-libs/nautilus-cd-burner/DEPENDS
| 17 -
gnome2-libs/nautilus-cd-burner/DETAILS
| 9
gnome2-libs/nautilus-cd-burner/G_SCHEMAS
| 1
gnome2-libs/nautilus-cd-burner/HISTORY
| 3
gnome2-libs/nautilus-cd-burner/INSTALL
| 1
gnome2-libs/nautilus-cd-burner/PRE_BUILD
| 1

gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
| 15 -
gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
| 15 -
gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
| 0
gnome2-libs/profile-gnome2-desktop/CONFLICTS
| 2
gnome2-libs/profile-gnome2-desktop/DEPENDS
| 96 ----------
gnome2-libs/profile-gnome2-desktop/DETAILS
| 1
gnome2-libs/profile-gnome2-desktop/HISTORY
| 3
gnome2-libs/profile-gnome2-desktop/PRE_INSTALL
| 1
gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
| 1
gnu/gcc33/BUILD
| 19 +
gnu/gcc33/HISTORY
| 3
gnu/gcc34/BUILD
| 12 +
gnu/gcc34/HISTORY
| 3
gnustep-libs/gnustep-sqlclient/DEPENDS
| 2
gnustep-libs/gnustep-sqlclient/HISTORY
| 3
graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig
| 0
graphics-libs/cegui/DETAILS
| 4
graphics-libs/cegui/HISTORY
| 4
graphics-libs/cegui/PRE_BUILD
| 6
graphics-libs/mesalib/CONFLICTS
| 5
graphics-libs/mesalib/DEPENDS
| 6
graphics-libs/mesalib/DETAILS
| 2
graphics-libs/mesalib/HISTORY
| 11 +
graphics-libs/mesalib/MesaLib-7.8.1.tar.bz2.sig
|binary
graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
| 0
graphics-libs/mesalib/PRE_BUILD
| 4
graphics-libs/mesalib/PRE_SUB_DEPENDS
| 1
graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
| 5
graphics-libs/mesalib/SUB_DEPENDS
| 12 +
graphics-libs/ogre/BUILD
| 7
graphics-libs/ogre/DETAILS
| 13 -
graphics-libs/ogre/HISTORY
| 5
graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
| 0
graphics/feh/BUILD
| 1
graphics/feh/DETAILS
| 8
graphics/feh/HISTORY
| 7
graphics/feh/PRE_BUILD
| 8
graphics/gscan2pdf/DETAILS
| 4
graphics/gscan2pdf/HISTORY
| 3
graphics/imagemagick/DETAILS
| 2
graphics/imagemagick/HISTORY
| 3
graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig
|binary
graphics/imagemagick/ImageMagick-6.6.0-8.tar.bz2.sig
| 0
graphics/showimg/DEPENDS
| 2
graphics/showimg/HISTORY
| 3
http/firefox/DETAILS
| 6
http/firefox/HISTORY
| 3
http/gnash/DEPENDS
| 2
http/gnash/HISTORY
| 3
http/lighttpd/DEPENDS
| 2
http/lighttpd/HISTORY
| 3
http/oscommerce/DEPENDS
| 2
http/oscommerce/HISTORY
| 3
http/phorsale/DEPENDS
| 2
http/phorsale/HISTORY
| 3
http/phpshop/DEPENDS
| 2
http/phpshop/HISTORY
| 3
http/squid/DETAILS
| 4
http/squid/HISTORY
| 3
http/uzbl/DEPENDS
| 1
http/uzbl/DETAILS
| 6
http/uzbl/HISTORY
| 10 +
http/w3c-libwww/DEPENDS
| 2
http/w3c-libwww/HISTORY
| 3
http/webkitgtk/DEPENDS
| 16 -
http/webkitgtk/DETAILS
| 8
http/webkitgtk/HISTORY
| 4
http/xulrunner/DETAILS
| 6
http/xulrunner/HISTORY
| 3
kde-apps/kexi/DEPENDS
| 2
kde-apps/kexi/HISTORY
| 3
kde-apps/koffice/DEPENDS
| 2
kde-apps/koffice/HISTORY
| 3
kde-apps/krecipes/DEPENDS
| 2
kde-apps/krecipes/HISTORY
| 3
kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
| 1
kde-core/kdepim/DEPENDS
| 2
kde-core/kdepim/HISTORY
| 3
kde4-apps/koffice2/DEPENDS
| 8
kde4-apps/koffice2/HISTORY
| 6
kde4-support/attica/DETAILS
| 4
kde4-support/attica/HISTORY
| 3
kde4-support/shared-desktop-ontologies/DETAILS
| 2
kde4-support/shared-desktop-ontologies/HISTORY
| 3
kde4/kdevelop4/DETAILS
| 4
kde4/kdevelop4/HISTORY
| 3
kde4/kdevplatform4/DETAILS
| 6
kde4/kdevplatform4/HISTORY
| 3
kernels/dazukofs/DETAILS
| 2
kernels/dazukofs/HISTORY
| 6
kernels/dazukofs/PRE_BUILD
| 9
kernels/dazukofs/fs.diff
| 55 -----
kernels/xen-hypervisor/DETAILS
| 4
kernels/xen-hypervisor/HISTORY
| 3
kernels/xen-hypervisor/xen-3.4.2.tar.gz.sig
| 0
kernels/xen-hypervisor/xen-4.0.0.tar.gz.sig
|binary
latex/cd/DETAILS
| 5
latex/cd/HISTORY
| 8
libs/boost/REPAIR^all^SUB_DEPENDS
| 25 --
libs/icu/DETAILS
| 14 -
libs/icu/HISTORY
| 4
libs/libdrm/DETAILS
| 2
libs/libdrm/HISTORY
| 3
libs/libdrm/libdrm-2.4.19.tar.bz2.sig
| 0
libs/libdrm/libdrm-2.4.20.tar.bz2.sig
|binary
libs/libgksu/DEPENDS
| 3
libs/libgksu/HISTORY
| 3
libs/mysqlcppapi/DEPENDS
| 2
libs/mysqlcppapi/HISTORY
| 3
libs/poco/DEPENDS
| 2
libs/poco/HISTORY
| 3
libs/redland/DEPENDS
| 2
libs/redland/HISTORY
| 3
libs/upower/DEPENDS
| 5
libs/upower/DETAILS
| 16 +
libs/upower/HISTORY
| 3
libs/upower/upower-0.9.2.tar.bz2.sig
|binary
libs/xmltv/DEPENDS
| 1
libs/xmltv/DETAILS
| 4
libs/xmltv/HISTORY
| 4
mail/anubis/DEPENDS
| 2
mail/anubis/HISTORY
| 3
mail/courier-authlib/DEPENDS
| 2
mail/courier-authlib/HISTORY
| 3
mail/dovecot/DEPENDS
| 2
mail/dovecot/HISTORY
| 3
mail/dspam/DEPENDS
| 2
mail/dspam/HISTORY
| 3
mail/exim/DEPENDS
| 2
mail/exim/HISTORY
| 3
mail/maildrop/DEPENDS
| 2
mail/maildrop/HISTORY
| 3
mail/mutt/CONFIGURE
| 8
mail/mutt/DEPENDS
| 15 +
mail/mutt/HISTORY
| 6
mail/postfix/DEPENDS
| 2
mail/postfix/HISTORY
| 3
mail/teapop/DEPENDS
| 2
mail/teapop/HISTORY
| 3
mobile/gammu/DEPENDS
| 2
mobile/gammu/HISTORY
| 3
mobile/gpsdrive/DEPENDS
| 2
mobile/gpsdrive/HISTORY
| 3
net/bsd-finger/HISTORY
| 6
net/bsd-finger/PRE_BUILD
| 3
net/bsd-finger/bsd-finger-0.17-stat.patch
| 36 +++
net/cacti/DEPENDS
| 2
net/cacti/HISTORY
| 3
net/freeradius/DEPENDS
| 2
net/freeradius/HISTORY
| 3
net/libpcap/DETAILS
| 4
net/libpcap/HISTORY
| 3
net/nagios-plugins/DEPENDS
| 2
net/nagios-plugins/HISTORY
| 3
net/net-snmp/DEPENDS
| 2
net/net-snmp/HISTORY
| 3
net/ntop/DEPENDS
| 2
net/ntop/HISTORY
| 3
net/nufw/DEPENDS
| 2
net/nufw/HISTORY
| 3
net/opensim/DEPENDS
| 2
net/pdns/DEPENDS
| 2
net/pdns/HISTORY
| 3
net/samba/DETAILS
| 4
net/samba/HISTORY
| 3
net/shorewall-perl/REPAIR^all^TRIGGERS
| 1
net/shorewall-shell/REPAIR^all^TRIGGERS
| 1
net/spine/DEPENDS
| 2
net/spine/HISTORY
| 3
net/tcpdump/DETAILS
| 4
net/tcpdump/HISTORY
| 3
net/ulogd/DEPENDS
| 2
net/ulogd/HISTORY
| 3
net/wicd/DETAILS
| 4
net/wicd/HISTORY
| 4
net/wicd/wicd-1.7.0.tar.bz2.sig
|binary
net/wicd/wicd-1.7.0.tar.gz.sig
| 0
odbc-drivers/myodbc/DEPENDS
| 2
odbc-drivers/myodbc/HISTORY
| 3
perl-cpan/dbd-mysql/DEPENDS
| 2
perl-cpan/dbd-mysql/HISTORY
| 3
php-pear/php-dev/DEPENDS
| 2
php-pear/php-dev/HISTORY
| 3
php-pear/php/DEPENDS
| 2
php-pear/php/HISTORY
| 3
php-pear/php4/DEPENDS
| 2
php-pear/php4/HISTORY
| 3
python-pypi/bsddb3/DETAILS
| 2
python-pypi/bsddb3/HISTORY
| 6
python-pypi/mysql-python/DEPENDS
| 2
python-pypi/mysql-python/HISTORY
| 3
python-pypi/trac/DEPENDS
| 2
python-pypi/trac/HISTORY
| 3
ruby-raa/mysql-ruby/DEPENDS
| 2
ruby-raa/mysql-ruby/HISTORY
| 3
science/boinc/DEPENDS
| 2
science/boinc/HISTORY
| 3
science/cern_root/DEPENDS
| 2
science/cern_root/HISTORY
| 3
security-libs/pam_mysql/DEPENDS
| 2
security-libs/pam_mysql/HISTORY
| 3
security/snort/DEPENDS
| 2
security/snort/HISTORY
| 3
shell-term-fm/clex/DETAILS
| 4
shell-term-fm/clex/HISTORY
| 3
shell-term-fm/mc/DETAILS
| 6
shell-term-fm/mc/HISTORY
| 3
smgl/fakeroot/DETAILS
| 6
smgl/fakeroot/HISTORY
| 4
telephony/telepathy-butterfly/BUILD
| 1
telephony/telepathy-butterfly/DETAILS
| 7
telephony/telepathy-butterfly/HISTORY
| 4
telephony/telepathy-butterfly/INSTALL
| 1
telephony/telepathy-farsight/DETAILS
| 2
telephony/telepathy-farsight/HISTORY
| 3
telephony/telepathy-glib/DETAILS
| 2
telephony/telepathy-glib/HISTORY
| 3
telephony/telepathy-idle/DETAILS
| 4
telephony/telepathy-idle/HISTORY
| 5
telephony/telepathy-mission-control/DETAILS
| 2
telephony/telepathy-mission-control/HISTORY
| 3
telephony/telepathy-python/DETAILS
| 7
telephony/telepathy-python/HISTORY
| 3
telephony/telepathy-stream-engine/DETAILS
| 2
telephony/telepathy-stream-engine/HISTORY
| 3
telephony/telepathy.gpg
|binary
utils/atop/DETAILS
| 2
utils/atop/HISTORY
| 3
utils/avahi/BUILD
| 8
utils/avahi/CONFIGURE
| 4
utils/avahi/HISTORY
| 3
utils/avahi/SUB_DEPENDS
| 6
utils/less/DETAILS
| 1
utils/less/HISTORY
| 3
utils/less/profile.d/pager.sh
| 2
utils/log4cplus/DETAILS
| 4
utils/log4cplus/HISTORY
| 3
utils/mnogosearch/DEPENDS
| 2
utils/mnogosearch/HISTORY
| 3
utils/openmoko-dfu-util/DEPENDS
| 5
utils/openmoko-dfu-util/DETAILS
| 29 +++
utils/openmoko-dfu-util/HISTORY
| 3
utils/openmoko-dfu-util/PREPARE
| 1
utils/openmoko-dfu-util/PRE_BUILD
| 4
utils/rsyslog/DEPENDS
| 2
utils/rsyslog/HISTORY
| 3
utils/sphinx/DEPENDS
| 2
utils/sphinx/HISTORY
| 3
utils/sudo/HISTORY
| 3
utils/sudo/INSTALL
| 2
utils/xen-tools/DEPENDS
| 7
utils/xen-tools/DETAILS
| 2
utils/xen-tools/HISTORY
| 5
utils/xen-tools/xen-3.4.2.tar.gz.sig
| 0
utils/xen-tools/xen-4.0.0.tar.gz.sig
|binary
utils/xen/DETAILS
| 2
utils/xen/HISTORY
| 3

video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS
| 11 -
video/lxdvdrip/BUILD
| 5
video/lxdvdrip/HISTORY
| 6
video/lxdvdrip/PRE_BUILD
| 4
video/motion/DEPENDS
| 2
video/motion/HISTORY
| 3
video/mythtv/DEPENDS
| 2
video/mythtv/HISTORY
| 3
video/totem/DEPENDS
| 2
video/totem/HISTORY
| 3
x11-libs/cairomm/DEPENDS
| 4
x11-libs/cairomm/HISTORY
| 3
x11-libs/wine/DETAILS
| 2
x11-libs/wine/HISTORY
| 3
x11-toolkits/efltk/DEPENDS
| 2
x11-toolkits/efltk/HISTORY
| 3
x11-toolkits/gtkmm2/DEPENDS
| 6
x11-toolkits/gtkmm2/DETAILS
| 2
x11-toolkits/gtkmm2/HISTORY
| 6
x11-toolkits/gtkmm2/gtkmm-2.20.0.tar.bz2.sig
| 0
x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
|binary
x11-toolkits/qt-embedded/DEPENDS
| 2
x11-toolkits/qt-embedded/HISTORY
| 3
x11-toolkits/qt-x11/DEPENDS
| 2
x11-toolkits/qt-x11/HISTORY
| 3
x11-toolkits/qt4/DEPENDS
| 2
x11-toolkits/qt4/HISTORY
| 3
x11-toolkits/qt4/SUB_DEPENDS
| 2
x11-toolkits/sptk/DEPENDS
| 2
x11-toolkits/sptk/HISTORY
| 3
x11/conky/DETAILS
| 4
x11/conky/HISTORY
| 3
x11/qhacc/DEPENDS
| 2
x11/qhacc/HISTORY
| 3
x11/xcompmgr/CONFLICTS
| 5
xfce/xfburn/DEPENDS
| 4
xfce/xfburn/DETAILS
| 14 -
xfce/xfburn/HISTORY
| 3
xfce/xfburn/PREPARE
| 6
xorg-app/appres/CONFLICTS
| 6
xorg-app/bdftopcf/CONFLICTS
| 6
xorg-app/beforelight/CONFLICTS
| 6
xorg-app/bitmap/CONFLICTS
| 6
xorg-app/compiz/CONFLICTS
| 6
xorg-app/editres/CONFLICTS
| 6
xorg-app/fonttosfnt/CONFLICTS
| 6
xorg-app/fslsfonts/CONFLICTS
| 6
xorg-app/fstobdf/CONFLICTS
| 6
xorg-app/iceauth/CONFLICTS
| 6
xorg-app/ico/CONFLICTS
| 6
xorg-app/lbxproxy/CONFLICTS
| 6
xorg-app/listres/CONFLICTS
| 6
xorg-app/luit/CONFLICTS
| 6
xorg-app/mkcfm/CONFLICTS
| 6
xorg-app/mkcomposecache/CONFLICTS
| 6
xorg-app/mkfontdir/CONFLICTS
| 6
xorg-app/mkfontscale/CONFLICTS
| 6
xorg-app/oclock/CONFLICTS
| 6
xorg-app/proxymngr/CONFLICTS
| 6
xorg-app/rendercheck/CONFLICTS
| 6
xorg-app/rgb/CONFLICTS
| 6
xorg-app/rstart/CONFLICTS
| 6
xorg-app/scripts/CONFLICTS
| 6
xorg-app/sessreg/CONFLICTS
| 6
xorg-app/setxkbmap/CONFLICTS
| 6
xorg-app/showfont/CONFLICTS
| 6
xorg-app/smproxy/CONFLICTS
| 6
xorg-app/twm/CONFLICTS
| 6
xorg-app/viewres/CONFLICTS
| 6
xorg-app/x11perf/CONFLICTS
| 6
xorg-app/xauth/CONFLICTS
| 6
xorg-app/xbiff/CONFLICTS
| 6
xorg-app/xcalc/CONFLICTS
| 6
xorg-app/xclipboard/CONFLICTS
| 6
xorg-app/xclock/CONFLICTS
| 6
xorg-app/xcmsdb/CONFLICTS
| 6
xorg-app/xconsole/CONFLICTS
| 6
xorg-app/xcursorgen/CONFLICTS
| 6
xorg-app/xdbedizzy/CONFLICTS
| 6
xorg-app/xditview/CONFLICTS
| 6
xorg-app/xdm/CONFLICTS
| 6
xorg-app/xdpyinfo/CONFLICTS
| 6
xorg-app/xdriinfo/CONFLICTS
| 6
xorg-app/xedit/CONFLICTS
| 6
xorg-app/xev/CONFLICTS
| 6
xorg-app/xeyes/CONFLICTS
| 6
xorg-app/xf86dga/CONFLICTS
| 6
xorg-app/xfd/CONFLICTS
| 6
xorg-app/xfindproxy/CONFLICTS
| 6
xorg-app/xfontsel/CONFLICTS
| 6
xorg-app/xfs/CONFLICTS
| 6
xorg-app/xfsinfo/CONFLICTS
| 6
xorg-app/xfwp/CONFLICTS
| 6
xorg-app/xgamma/CONFLICTS
| 6
xorg-app/xgc/CONFLICTS
| 6
xorg-app/xhost/CONFLICTS
| 6
xorg-app/xkbcomp/CONFLICTS
| 6
xorg-app/xkbevd/CONFLICTS
| 6
xorg-app/xkbprint/CONFLICTS
| 6
xorg-app/xkbutils/CONFLICTS
| 6
xorg-app/xkill/CONFLICTS
| 6
xorg-app/xload/CONFLICTS
| 6
xorg-app/xlogo/CONFLICTS
| 6
xorg-app/xlsatoms/CONFLICTS
| 6
xorg-app/xlsclients/CONFLICTS
| 6
xorg-app/xlsfonts/CONFLICTS
| 6
xorg-app/xmag/CONFLICTS
| 6
xorg-app/xman/CONFLICTS
| 6
xorg-app/xmessage/CONFLICTS
| 6
xorg-app/xmh/CONFLICTS
| 6
xorg-app/xmodmap/CONFLICTS
| 6
xorg-app/xmore/CONFLICTS
| 6
xorg-app/xphelloworld/CONFLICTS
| 6
xorg-app/xplsprinters/CONFLICTS
| 6
xorg-app/xpr/CONFLICTS
| 6
xorg-app/xprehashprinterlist/CONFLICTS
| 6
xorg-app/xprop/CONFLICTS
| 6
xorg-app/xrandr/CONFLICTS
| 6
xorg-app/xrdb/CONFLICTS
| 6
xorg-app/xrefresh/CONFLICTS
| 6
xorg-app/xrx/CONFLICTS
| 6
xorg-app/xset/CONFLICTS
| 6
xorg-app/xsetmode/CONFLICTS
| 6
xorg-app/xsetpointer/CONFLICTS
| 6
xorg-app/xsetroot/CONFLICTS
| 6
xorg-app/xsm/CONFLICTS
| 6
xorg-app/xstdcmap/CONFLICTS
| 6
xorg-app/xtrap/CONFLICTS
| 6
xorg-app/xvidtune/CONFLICTS
| 6
xorg-app/xvinfo/CONFLICTS
| 6
xorg-app/xwd/CONFLICTS
| 6
xorg-app/xwininfo/CONFLICTS
| 6
xorg-app/xwud/CONFLICTS
| 6
xorg-data/xbitmaps/CONFLICTS
| 6
xorg-data/xcursor-themes/CONFLICTS
| 6
xorg-data/xkbdata/CONFLICTS
| 6
xorg-data/xkeyboard-config/CONFLICTS
| 6
xorg-data/xkeyboard-config/DETAILS
| 2
xorg-data/xkeyboard-config/HISTORY
| 3
xorg-data/xkeyboard-config/xkeyboard-config-1.7.tar.bz2.sig
| 0
xorg-data/xkeyboard-config/xkeyboard-config-1.8.tar.bz2.sig
|binary
xorg-data/xorg-data-profile/CONFLICTS
| 6
xorg-doc/xorg-docs/CONFLICTS
| 6
xorg-doc/xorg-sgml-doctools/CONFLICTS
| 6
xorg-doc/xorg-sgml-doctools/DETAILS
| 2
xorg-doc/xorg-sgml-doctools/HISTORY
| 4
xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.3.tar.bz2.sig
| 0
xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.4.tar.bz2.sig
|binary
xorg-driver/linuxwacom/CONFLICTS
| 6
xorg-driver/xf86-input-acecad/CONFLICTS
| 6
xorg-driver/xf86-input-aiptek/CONFLICTS
| 6
xorg-driver/xf86-input-calcomp/CONFLICTS
| 6
xorg-driver/xf86-input-citron/CONFLICTS
| 6
xorg-driver/xf86-input-digitaledge/CONFLICTS
| 6
xorg-driver/xf86-input-dmc/CONFLICTS
| 6
xorg-driver/xf86-input-dynapro/CONFLICTS
| 6
xorg-driver/xf86-input-elo2300/CONFLICTS
| 6
xorg-driver/xf86-input-elographics/CONFLICTS
| 6
xorg-driver/xf86-input-evdev/CONFLICTS
| 6
xorg-driver/xf86-input-evdev/DETAILS
| 6
xorg-driver/xf86-input-evdev/HISTORY
| 4
xorg-driver/xf86-input-evdev/xf86-input-evdev-2.2.5.tar.bz2.sig
| 0
xorg-driver/xf86-input-evdev/xf86-input-evdev-2.4.0.tar.bz2.sig
|binary
xorg-driver/xf86-input-fpit/CONFLICTS
| 6
xorg-driver/xf86-input-hyperpen/CONFLICTS
| 6
xorg-driver/xf86-input-jamstudio/CONFLICTS
| 6
xorg-driver/xf86-input-joystick/CONFLICTS
| 6
xorg-driver/xf86-input-keyboard/CONFLICTS
| 6
xorg-driver/xf86-input-magellan/CONFLICTS
| 6
xorg-driver/xf86-input-magictouch/CONFLICTS
| 6
xorg-driver/xf86-input-microtouch/CONFLICTS
| 6
xorg-driver/xf86-input-mouse/CONFLICTS
| 6
xorg-driver/xf86-input-mutouch/CONFLICTS
| 6
xorg-driver/xf86-input-palmax/CONFLICTS
| 6
xorg-driver/xf86-input-penmount/CONFLICTS
| 6
xorg-driver/xf86-input-spaceorb/CONFLICTS
| 6
xorg-driver/xf86-input-summa/CONFLICTS
| 6
xorg-driver/xf86-input-tek4957/CONFLICTS
| 6
xorg-driver/xf86-input-ur98/CONFLICTS
| 6
xorg-driver/xf86-input-vmmouse/CONFLICTS
| 6
xorg-driver/xf86-input-void/CONFLICTS
| 6
xorg-driver/xf86-video-apm/CONFLICTS
| 6
xorg-driver/xf86-video-ark/CONFLICTS
| 6
xorg-driver/xf86-video-ast/CONFLICTS
| 6
xorg-driver/xf86-video-ati/CONFLICTS
| 6
xorg-driver/xf86-video-ati/DEPENDS
| 1
xorg-driver/xf86-video-ati/DETAILS
| 2
xorg-driver/xf86-video-ati/HISTORY
| 13 +
xorg-driver/xf86-video-ati/xf86-video-ati-6.12.6.tar.bz2.sig
| 0
xorg-driver/xf86-video-ati/xf86-video-ati-6.12.7.tar.bz2.sig
|binary
xorg-driver/xf86-video-chips/CONFLICTS
| 6
xorg-driver/xf86-video-cirrus/CONFLICTS
| 6
xorg-driver/xf86-video-cyrix/CONFLICTS
| 6
xorg-driver/xf86-video-dummy/CONFLICTS
| 6
xorg-driver/xf86-video-fbdev/CONFLICTS
| 6
xorg-driver/xf86-video-fbdev/DETAILS
| 2
xorg-driver/xf86-video-fbdev/HISTORY
| 6
xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.1.tar.bz2.sig
| 0
xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.2.tar.bz2.sig
|binary
xorg-driver/xf86-video-glint/CONFLICTS
| 6
xorg-driver/xf86-video-i128/CONFLICTS
| 6
xorg-driver/xf86-video-i740/CONFLICTS
| 6
xorg-driver/xf86-video-i810/CONFLICTS
| 6
xorg-driver/xf86-video-impact/CONFLICTS
| 6
xorg-driver/xf86-video-imstt/CONFLICTS
| 6
xorg-driver/xf86-video-intel/CONFLICTS
| 7
xorg-driver/xf86-video-mach64/CONFLICTS
| 6
xorg-driver/xf86-video-mga/CONFLICTS
| 6
xorg-driver/xf86-video-neomagic/CONFLICTS
| 6
xorg-driver/xf86-video-newport/CONFLICTS
| 6
xorg-driver/xf86-video-nouveau/CONFLICTS
| 6
xorg-driver/xf86-video-nsc/CONFLICTS
| 6
xorg-driver/xf86-video-nv/CONFLICTS
| 6
xorg-driver/xf86-video-openchrome/CONFLICTS
| 6
xorg-driver/xf86-video-r128/CONFLICTS
| 6
xorg-driver/xf86-video-radeonhd/CONFLICTS
| 6
xorg-driver/xf86-video-rendition/CONFLICTS
| 6
xorg-driver/xf86-video-s3/CONFLICTS
| 6
xorg-driver/xf86-video-s3virge/CONFLICTS
| 6
xorg-driver/xf86-video-savage/CONFLICTS
| 6
xorg-driver/xf86-video-siliconmotion/CONFLICTS
| 6
xorg-driver/xf86-video-sis/CONFLICTS
| 6
xorg-driver/xf86-video-sisusb/CONFLICTS
| 6
xorg-driver/xf86-video-sunbw2/CONFLICTS
| 6
xorg-driver/xf86-video-suncg14/CONFLICTS
| 6
xorg-driver/xf86-video-suncg3/CONFLICTS
| 6
xorg-driver/xf86-video-suncg6/CONFLICTS
| 6
xorg-driver/xf86-video-sunffb/CONFLICTS
| 6
xorg-driver/xf86-video-sunleo/CONFLICTS
| 6
xorg-driver/xf86-video-suntcx/CONFLICTS
| 6
xorg-driver/xf86-video-tdfx/CONFLICTS
| 6
xorg-driver/xf86-video-tga/CONFLICTS
| 6
xorg-driver/xf86-video-trident/CONFLICTS
| 6
xorg-driver/xf86-video-tseng/CONFLICTS
| 6
xorg-driver/xf86-video-v4l/CONFLICTS
| 6
xorg-driver/xf86-video-vesa/CONFLICTS
| 6
xorg-driver/xf86-video-vga/CONFLICTS
| 6
xorg-driver/xf86-video-via/CONFLICTS
| 6
xorg-driver/xf86-video-vmware/CONFLICTS
| 6
xorg-driver/xf86-video-voodoo/CONFLICTS
| 6
xorg-driver/xf86-video-wsfb/CONFLICTS
| 6
xorg-extras/libpthread-stubs/CONFLICTS
| 6
xorg-extras/xterm/CONFLICTS
| 6
xorg-font/encodings/CONFLICTS
| 6
xorg-font/font-adobe-100dpi/CONFLICTS
| 6
xorg-font/font-adobe-75dpi/CONFLICTS
| 6
xorg-font/font-adobe-utopia-100dpi/CONFLICTS
| 6
xorg-font/font-adobe-utopia-75dpi/CONFLICTS
| 6
xorg-font/font-adobe-utopia-type1/CONFLICTS
| 6
xorg-font/font-alias/CONFLICTS
| 6
xorg-font/font-arabic-misc/CONFLICTS
| 6
xorg-font/font-bh-100dpi/CONFLICTS
| 6
xorg-font/font-bh-75dpi/CONFLICTS
| 6
xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
| 6
xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
| 6
xorg-font/font-bh-ttf/CONFLICTS
| 6
xorg-font/font-bh-type1/CONFLICTS
| 6
xorg-font/font-bitstream-100dpi/CONFLICTS
| 6
xorg-font/font-bitstream-75dpi/CONFLICTS
| 6
xorg-font/font-bitstream-speedo/CONFLICTS
| 6
xorg-font/font-bitstream-type1/CONFLICTS
| 6
xorg-font/font-cronyx-cyrillic/CONFLICTS
| 6
xorg-font/font-cursor-misc/CONFLICTS
| 6
xorg-font/font-daewoo-misc/CONFLICTS
| 6
xorg-font/font-dec-misc/CONFLICTS
| 6
xorg-font/font-ibm-type1/CONFLICTS
| 6
xorg-font/font-isas-misc/CONFLICTS
| 6
xorg-font/font-jis-misc/CONFLICTS
| 6
xorg-font/font-micro-misc/CONFLICTS
| 6
xorg-font/font-misc-cyrillic/CONFLICTS
| 6
xorg-font/font-misc-ethiopic/CONFLICTS
| 6
xorg-font/font-misc-meltho/CONFLICTS
| 6
xorg-font/font-misc-misc/CONFLICTS
| 6
xorg-font/font-mutt-misc/CONFLICTS
| 6
xorg-font/font-schumacher-misc/CONFLICTS
| 6
xorg-font/font-screen-cyrillic/CONFLICTS
| 6
xorg-font/font-sony-misc/CONFLICTS
| 6
xorg-font/font-sun-misc/CONFLICTS
| 6
xorg-font/font-util/CONFLICTS
| 6
xorg-font/font-winitzki-cyrillic/CONFLICTS
| 6
xorg-font/font-xfree86-type1/CONFLICTS
| 6
xorg-lib/libdmx/CONFLICTS
| 6
xorg-lib/libfontenc/CONFLICTS
| 6
xorg-lib/libfs/CONFLICTS
| 6
xorg-lib/libice/CONFLICTS
| 6
xorg-lib/liblbxutil/CONFLICTS
| 6
xorg-lib/liboldx/CONFLICTS
| 6
xorg-lib/libsm/CONFLICTS
| 6
xorg-lib/libx11/CONFLICTS
| 6
xorg-lib/libxau/CONFLICTS
| 6
xorg-lib/libxaw/CONFLICTS
| 6
xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
| 9
xorg-lib/libxcb/CONFLICTS
| 6
xorg-lib/libxcomposite/CONFLICTS
| 6
xorg-lib/libxcursor/CONFLICTS
| 6
xorg-lib/libxdamage/CONFLICTS
| 6
xorg-lib/libxdmcp/CONFLICTS
| 6
xorg-lib/libxevie/CONFLICTS
| 6
xorg-lib/libxext/CONFLICTS
| 6
xorg-lib/libxfixes/CONFLICTS
| 6
xorg-lib/libxfont/CONFLICTS
| 6
xorg-lib/libxfontcache/CONFLICTS
| 6
xorg-lib/libxft/CONFLICTS
| 6
xorg-lib/libxi/CONFLICTS
| 6
xorg-lib/libxinerama/CONFLICTS
| 6
xorg-lib/libxkbfile/CONFLICTS
| 6
xorg-lib/libxkbui/CONFLICTS
| 6
xorg-lib/libxmu/CONFLICTS
| 6
xorg-lib/libxp/CONFLICTS
| 6
xorg-lib/libxpm/CONFLICTS
| 6
xorg-lib/libxprintapputil/CONFLICTS
| 6
xorg-lib/libxprintutil/CONFLICTS
| 6
xorg-lib/libxrandr/CONFLICTS
| 6
xorg-lib/libxrender/CONFLICTS
| 6
xorg-lib/libxres/CONFLICTS
| 6
xorg-lib/libxscrnsaver/CONFLICTS
| 6
xorg-lib/libxtrap/CONFLICTS
| 6
xorg-lib/libxtst/CONFLICTS
| 6
xorg-lib/libxv/CONFLICTS
| 6
xorg-lib/libxvmc/CONFLICTS
| 6
xorg-lib/libxxf86dga/CONFLICTS
| 6
xorg-lib/libxxf86misc/CONFLICTS
| 6
xorg-lib/libxxf86vm/CONFLICTS
| 6
xorg-lib/pixman/CONFLICTS
| 6
xorg-lib/pixman/DETAILS
| 4
xorg-lib/pixman/HISTORY
| 3
xorg-lib/xorg-libs/CONFLICTS
| 6
xorg-lib/xtrans/CONFLICTS
| 6
xorg-proto/applewmproto/CONFLICTS
| 6
xorg-proto/bigreqsproto/CONFLICTS
| 6
xorg-proto/compositeproto/CONFLICTS
| 6
xorg-proto/damageproto/CONFLICTS
| 6
xorg-proto/dmxproto/CONFLICTS
| 6
xorg-proto/evieext/CONFLICTS
| 6
xorg-proto/fixesproto/CONFLICTS
| 6
xorg-proto/fontcacheproto/CONFLICTS
| 6
xorg-proto/fontsproto/CONFLICTS
| 6
xorg-proto/glproto/CONFLICTS
| 6
xorg-proto/inputproto/CONFLICTS
| 6
xorg-proto/kbproto/CONFLICTS
| 6
xorg-proto/printproto/CONFLICTS
| 6
xorg-proto/randrproto/CONFLICTS
| 6
xorg-proto/recordproto/CONFLICTS
| 6
xorg-proto/renderproto/CONFLICTS
| 6
xorg-proto/resourceproto/CONFLICTS
| 6
xorg-proto/scrnsaverproto/CONFLICTS
| 6
xorg-proto/trapproto/CONFLICTS
| 6
xorg-proto/videoproto/CONFLICTS
| 6
xorg-proto/windowswmproto/CONFLICTS
| 6
xorg-proto/xcb-proto/CONFLICTS
| 6
xorg-proto/xcmiscproto/CONFLICTS
| 6
xorg-proto/xextproto/CONFLICTS
| 6
xorg-proto/xf86bigfontproto/CONFLICTS
| 6
xorg-proto/xf86dgaproto/CONFLICTS
| 6
xorg-proto/xf86driproto/CONFLICTS
| 6
xorg-proto/xf86miscproto/CONFLICTS
| 6
xorg-proto/xf86rushproto/CONFLICTS
| 6
xorg-proto/xf86vidmodeproto/CONFLICTS
| 6
xorg-proto/xineramaproto/CONFLICTS
| 6
xorg-proto/xproto/CONFLICTS
| 6
xorg-proto/xproxymanagementprotocol/CONFLICTS
| 6
xorg-util/gccmakedep/CONFLICTS
| 6
xorg-util/imake/CONFLICTS
| 6
xorg-util/lndir/CONFLICTS
| 6
xorg-util/makedepend/CONFLICTS
| 6
xorg-util/util-macros/DETAILS
| 2
xorg-util/util-macros/HISTORY
| 4
xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig
| 0
xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig
|binary
xorg-util/xorg-cf-files/CONFLICTS
| 6
xorg-util/xorg-utils/CONFLICTS
| 6
924 files changed, 1880 insertions(+), 2778 deletions(-)

New commits:
commit 78264fb7d8ad1809fb3ff72fd0ba4b4ba1c7d689
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evolution: Depends on libcanberra

checking for CANBERRA... configure: error: Package requirements
(libcanberra-gtk) were not met:

No package 'libcanberra-gtk' found

commit 8c1507223cff7ba9eb99cf1b5a84310669bb1732
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evolution: Depends on unique

checking for GNOME_PLATFORM... configure: error: Package requirements
(glib-2.0 >= 2.22.0
gthread-2.0 >= 2.22.0
gtk+-2.0 >= 2.18.0
gconf-2.0 >= 2.0.0
libgnomecanvas-2.0 >= 2.0.0
libxml-2.0 >= 2.7.3
shared-mime-info >= 0.22
gnome-desktop-2.0 >= 2.26.0
unique-1.0 >= 1.1.2) were not met:

No package 'unique-1.0' found

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

rhythmbox: removed hard dependency on nautilus-cd-burner

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

glibmm: added subdependency handlers for documentation building

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

gtkmm2: depends on glibmm with DOC to build documentation

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

cmake: updated SOURCE_HASH, bug 15653

commit 3919a57459638dac23ed8a70f70f666619bd1fc0
Author: Seth Alan Woolley <seth AT mail.swoolley.org>
Commit: Seth Alan Woolley <seth AT mail.swoolley.org>

improve bsd-finger to support utf-8 output, .signature output, and
symlinked .plan

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

kdevelop4: => 3.10.0

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

kdevplatform4: => 0.10.0

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

bsddb3: => 5.0.0

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

icu - 4.4 (devel branch)

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

mutt: added SMTP configure opt
fixed cyrus-sasl config opt
fixed ncurses config opt
added ispell opt depends

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

gnunet: Updated to version 0.8.1b. One of the spells that wasn't
summoning source.

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

gcc33: Fix silly copy&paste typo

commit 49ce1a0422919f2cb080218b6746a9b3fedc530d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gcc34: Fix silly copy&paste typo

commit d2d9246a8127730cfeb29708a57468d0f1d4cd27
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/gnash: switched to libssh from openssh

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

devel/qt-creator: version 1.3.1

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

gtkmm2 2.20.1

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

libs/upower: new spell, ChangeLog entry

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

libs/upower: new spell, abstraction for enumerating power devices

need some testing, it is a successor of devicekit-power same as udisks
(we have in disk section) is a successor of devicekit-disks
after some testing we should deprecate devicekit-power and
devicekit-disks in favour og upower and udisks

commit 5552ce6f9c06cb23c1d30c8ebc663a56d73f7d09
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xen-hypervisor: version 4.0.0

commit 421a7d50e9ad8ec5832b3f052d8ef7ff736c3b27
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xen: updated profile spell version to 4.0.0

commit 7029b792f41fb61c8f8cfab56650dfe8b314805a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xen-tools: version 4.0.0 and added missing dependencies

commit 1868f7c9c533f76ed7d6f63dd2028747da3c49b9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "xf86-video-ati: Updated to 6.13.0"

This reverts commit 9bf7e4bf1de0daa7dc8ca0b7d4fd2124abe1ba9d.

Requires non-stable mesalib, remove from master. Kept in
devel-xorg-modular.

Conflicts:

xorg-driver/xf86-video-ati/HISTORY

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

Revert "xf86-video-ati: Combine NONSTABLE and DRI sub-depends into one
-sub"

This reverts commit ac06a246db43147c8e652efa67a8c78c29bad9e9.

Requires non-stable mesalib, remove from master. Kept in
devel-xorg-modular.

commit 4ad72098adfd22fa9b34bde6deecc426bbf8bed9
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

oss: updated to 4.2 build 2002

commit 00dcae95a0a4635cd2e295241668a0b766582797
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gcc34: Doesn't know native -march nor -mtune (GCC 4.2+)

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

gcc33: Doesn't know native -march nor -mtune (GCC 4.2+)

commit adc84088e9d8d2dd2b2ba0accff1b52f4726f4fd
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

amule: => 2.2.6

commit 05345eacde8944e658d556fb77c2a90c0b8f7cc1
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

ogre: => 1-7-0

commit a762e9e467a69bb358942a22c545ea54a5b384eb
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

cegui: => 0.7.1

commit ee41f48ccc30ae1a72f6b54e5aed70a2330e322d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

glade3: made rarian optional

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

attica: => 0.1.3

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

xmltv: => 0.5.56

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

gscan2pdf: => 0.9.30

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

log4cplus: => 1.0.4-rc7

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

sg3_utils 1.29

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

ddrescue 1.12

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

Revert "icu: => 4.4"

This reverts commit 2bd894cf4dd28b0d19c0348ddd9d771313e7a4a7.

As per the discussion list

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

samba 3.5.2

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

fakeroot: => 1.14.4
fixed SOURCE as per wiki.sourcemage.org/DavidKowis/StableFailures

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

atop: fixed SOURCE_URL[0] as per
wiki.sourcemage.org/DavidKowis/StableFailures

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

clex: => 4.5
fixes summon error as per wiki.sourcemage.org/DavidKowis/StableFailures

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

cd: fixed SOURCE as per wiki.sourcemage.org/DavidKowis/StableFailures

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

wicd: fixed SOURCE_URL[0] as per
http://wiki.sourcemage.org/DavidKowis/StableFailures

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

xkeyboard-config: Didn't mean to remove the conflict against xkbdata

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

xf86-video-via: Didn't mean to remove the conflict against
xf86-video-openchrome

commit 18c4b9de04960f1f7641371f5d65f8357e5fca7d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-openchrome: Didn't mean to remove the conflict against
xf86-video-via

commit 96c784af7b86457bf480ede55cbe148d4b2f9011
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

These spells have not existed since February 2, 2010
and before then they were deprecations, remove conflicts:
xdirectfb
xfree86-devel
xfree86-libs
xfree86-4.3
xfree86
xorg

commit 52f50bd935925f55929f08552258754ac1e2a11e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-macros: Updated to 1.7.0
SOURCE matches upstream posted SHA1

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

xf86-video-ati: Combine NONSTABLE and DRI sub-depends into one -sub

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

mesalib: Move sub_depends into a -sub

commit 9bf7e4bf1de0daa7dc8ca0b7d4fd2124abe1ba9d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Updated to 6.13.0
SOURCE matches upstream posted SHA1
Depends on non-stable mesalib (7.6+)

commit 19d855dbe188d94159d5d950f90386cd72231407
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: Allow requiring non-stable (e.g. for new
xf86-video-ati which needs the new KMS code)

commit 092b6947e4e0327a0c13872d951061f8fead7d33
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Remove unused REPAIR files.
See http://www.sourcemage.org/REPAIR_FILES:
Repair files dont apply to trigger registration, which is done during
cast, they repair files that will be executed at a later date. So
there
is little point in repairing TRIGGERS, UP_TRIGGERS or SUB_DEPENDS.

commit 583a3ce6d6bdd04c0f61e6180fb871ecd57e67af
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sudo: Fails during install with multiple make jobs

commit 25541657c8e4a23185f0ac96158eafbe3b9b615f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-input-evdev: Updated to 2.4.0
SOURCE matches upstream posted SHA1

commit 93bec35cf764d3862bcfe52cce39a022965532d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-input-evdev: Remove old 2.2.5 signature

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

xorg-sgml-doctools: Updated to 1.4
SOURCE matches upstream posted SHA1

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

xf86-video-fbdev: Fix truncated version tag in 0.4.1 history entry

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

xf86-video-fbdev: Updated to 0.4.2
SOURCE matches upstream posted SHA1

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

xkeyboard-config: Updated to 1.8

commit 96f19cf134f6796feb3871f76c65151f7e3068e2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Updated to 6.12.7
SOURCE matches upstream posted SHA1

commit 8fc6fb95b7cd510a66bcac5abbd17b781064f6b5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telephony/telepathy.gpg: imported missing keys

commit 75cf4917810b335a374489fe862df72f1a97e6ee
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

Revert "telephony/telepathy.gpg: imported missing keys"

This reverts commit f322c24cce0265e6d366cd2a718cc9e630926ce1.

commit a8c2483f8c4660497adaf15a215f4a85848a5f4d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-butterfly: corrected SOURCE2 and really removed BUILD and
INSTALL

commit ffff0f310a93ccad47c0eb326b6e2d22856c6e74
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

telepathy-idle: fixed history

commit 45dea62166fa98229973bf3c674ae70501de5828
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-stream-engine: version 0.5.15

commit cc1925890cd5a07f34fa0fec35f94e11e526765a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-python: version 0.15.17

commit 089fcb8fa8940510f92966e74887d7734ab5bc9f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-mission-control: version 5.3.2

commit ed58297f1c3fd07d911707cca032c29bc4e8c8fb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-idle: version 0.1.6

commit 29725f267e574b7ef9c6a52b90603011b423d4d7
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-glib: version 0.11.2

commit 5fbbafbd19760e37e4380a56c61c6d87ceac60db
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-farsight: version 0.0.13

commit 97ee18294b258d349b9c991b3d4d1205eebed4ee
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telepathy-butterfly: version 0.5.7

commit f322c24cce0265e6d366cd2a718cc9e630926ce1
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

telephony/telepathy.gpg: imported missing keys

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

eel2: deprecated, doesn't compile anymore, bug 15651

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

profile-gnome2-desktop: deprecated unmaintained profile spell

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

libgweather: actually needs pygtk2 for python support

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

nautilus-cd-burner: deprecated for brasero

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

mail-notification: updated to 5.3

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

orca: removed eel2 dependency

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

mlview: dependency cleanup and fixed compile with current gcc

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

libgweather: needs pygobject, not plain python, bug 15650

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

shared-desktop-ontologies: fixed SOURCE_URL, bug 15639

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

gnome-python2: gnomevfsbonobo, pyvfsmodule modules moved to CONFIGURE

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

rhythmbox: added options RHYTHMBOX_DAAP, RHYTHMBOX_FM,
optionally depends on libnotify, libmusicbrainz3, lirc,
gtk-doc,
rarian, python (+pygtk2 +gst-python), vala, GECKO, hal, libmtp,
libgnome-keyring, avahi, brasero, nautilus-cd-burner

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

gnome-sharp: removed dependency on gconf2, libgnomeprintui, gnome-panel

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

gnome-control-center: removed dependency on eel2, gnome-panel,
depends on libxext, need libcanberra with GTK

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

uzbl: removed simple_version_check_force_depends
stable webkitgtk is ok now

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

epiphany: no needs for devel webkitgtk, stable = devel now

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

webkitgtk: no needs for devel libsoup, stable = devel now

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

webkitgtk 1.2.0
still problems with icu 4.4, with 4.2.1 OK, time to revert also in test?

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

erlang R13B04

commit 5029d6f09ef5d1e8c9f5249159d7127053eeaba8
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

x11-toolkits/qt4: updating SUB_DEPENDS with MYSQL provider

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

tcpdump 4.1.1

commit 9bea7c68013d1ff55c5d1625aa8c2a1c99d889be
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gpsdrive: updated mysql dependency to MYSQL provider

commit a140033194e6334bc561beb5fd1e381023337a31
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gammu: updated mysql dependency to MYSQL provider

commit 6df9a0479483679169a72dc0115eae4f056a4ebe
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mysql-ruby: updated mysql dependency to MYSQL provider

commit 2c2a01e6b0d6b1d2349a764f872b8ff652dd49ce
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

phorsale: updated mysql dependency to MYSQL provider

commit 4bfac73cdbe8734a889da65ce54dda98f0bbe84a
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

oscommerce: updated mysql dependency to MYSQL provider

commit 37fdc5d63983121c62caaab321d26452dff49ea9
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

phpshop: updated mysql dependency to MYSQL provider

commit 2d3294eb4ce318f8ff1123fd159a59ee5ba1e030
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

w3c-libwww: updated mysql dependency to MYSQL provider

commit 262d98076115c6cce36b28ace298e2f8f8182d34
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

lighttpd: updated mysql dependency to MYSQL provider

commit a552cb4f48f344e22d8b48c528bccd2150b8d160
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

koffice2: updated mysql dependency to MYSQL provider

commit 61f8ac941134683f2650afae1d19261ab1576293
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

qhacc: updated mysql dependency to MYSQL provider

commit 652c2763ef5782c160fda13ba43e5977c7819b2a
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gtksql: updated mysql dependency to MYSQL provider

commit 918b34a861d042fa1be76ef326b6b2628f263da7
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

rekall: updated mysql dependency to MYSQL provider

commit 95a261f2c60a74569f7d187a1ee48abde50788e4
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mytop: updated mysql dependency to MYSQL provider

commit 64d4398d54dbd5241ce95a083c21adf4c470b8a4
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

hk_classes: updated mysql dependency to MYSQL provider

commit 744075b8cf87e093c2387742cab631eb8ec5f215
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

rlib: updated mysql dependency to MYSQL provider

commit 1f612134162435690219108f45b1d880dc871580
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

libdbi-drivers: updated mysql dependency to MYSQL provider

commit c1453143763af50264a95d27317200f51ec706f0
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

tora: updated mysql dependency to MYSQL provider

commit 167ee789a0b0ed0588c71d1bd6ef9639ce5b179b
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

guile-dbd-mysql: updated mysql dependency to MYSQL provider

commit fe4a0bd56229322f05c59f8d3739c2f34fefba1a
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

jabberd: updated mysql dependency to MYSQL provider

commit 6fda378e44e4027c9dfa00ed8bcd555c219af6c7
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gnustep-sqlclient: updated mysql dependency to MYSQL provider

commit 49b76f8a814926c2c91579e982ad9dc7a43f4849
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

showimg: updated mysql dependency to MYSQL provider

commit acde2a9f92a48e56186a9168c3a389bbc175bf81
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

dspam: updated mysql dependency to MYSQL provider

commit 6f6bf2a4991b9d2a2c98ba6d05f2d9c76a0978d8
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

maildrop: updated mysql dependency to MYSQL provider

commit cb032c7d4bdba3f1b33cbf865c8da1648ad36579
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

postfix: updated mysql dependency to MYSQL provider

commit 6afc40f7fe07b9fd906a402f7a42f716e3830be4
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

dovecot: updated mysql dependency to MYSQL provider

commit 79948aea7ba28fa36e1d0d5ae8422bb821214a98
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

courier-authlib: updated mysql dependency to MYSQL provider

commit b56227e8edc343e06320c5c959af228509f8df99
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

anubis: updated mysql dependency to MYSQL provider

commit f6b25c49ce5360129f1528f42a1a909b3ae2c5f0
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

teapop: updated mysql dependency to MYSQL provider

commit 67a9bde1a08efde21331e8b801aaa9d62f50665c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

exim: updated mysql dependency to MYSQL provider

commit c176faacf17512c7c9cde56a0b8405f771ddab27
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mediatomb: updated mysql dependency to MYSQL provider

commit 63d23155594cc91bb597b398f2cc9abb89e4e878
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

pam_mysql: updated mysql dependency to MYSQL provider

commit 831b75dc35605beeddbcbf311fb010e83528aef5
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

dbd-mysql: updated mysql dependency to MYSQL provider

commit 16be181d290373f4d2bc551e2be8fffebad3a7ab
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

pure-ftpd: updated mysql dependency to MYSQL provider

commit 466a57f149b8ed694e4a170bae11d99fcfc17bdc
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

proftpd: updated mysql dependency to MYSQL provider

commit dc16ac12715b674b33f4d8c7e0e72343f6140260
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

bnbt: updated mysql dependency to MYSQL provider

commit f5fb9f2c7210512f677d3897d3c409ed77069008
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gnunet: updated mysql dependency to MYSQL provider

commit 60dbe3500db27c9d7767d7c75ea4598a701feb2e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mysql-python: updated mysql dependency to MYSQL provider

commit 337ca173f0dce7b41bfd3196d8ab24d6c81c5b33
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

trac: updated mysql dependency to MYSQL provider

commit e552f877025daa3a4b134da9454cc663bc8aab45
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

motion: updated mysql dependency to MYSQL provider

commit d428aadb1383739b1114aa60980336c6fe320013
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mythtv: updated mysql dependency to MYSQL provider

commit 9d555c260afd0659ac93281dcf917bcc34d62633
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

nagios-plugins: updated mysql dependency to MYSQL provider

commit 6a03c80bf320689fe239ed9093c7812f75cbb5b1
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

ulogd: updated mysql dependency to MYSQL provider

commit c6b97e4e78f908487c4a4b58aeb5df575c08443f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

ntop: updated mysql dependency to MYSQL provider

commit e0eb84fa528f479c90e5db6fa97b96b15bcdcfc2
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

spine: updated mysql dependency to MYSQL provider

commit d82d380dadc2acb3b3798b43559196cea20a0445
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

opensim: updated mysql dependency to MYSQL provider

commit 7adc5102a0ebbf1be66f3a5e91cbc55d89be224a
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

cacti: updated mysql dependency to MYSQL provider

commit 17ebf17ba4cb4491523ab76c44d568a4db691d6c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

nufw: updated mysql dependency to MYSQL provider

commit 07257c45f64025664db4dd1e0c58ec43b0f38df6
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

freeradius: updated mysql dependency to MYSQL provider

commit d430ccd5833409a939f995d8be783bc8aaa2686f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

net-snmp: updated mysql dependency to MYSQL provider

commit 14f6d151abe06e46a415fa427a6b71ad945e8bbc
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

pdns: updated mysql dependency to MYSQL provider

commit ae107fd83d29b08457045b129d9580dc198f5883
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

xoops: updated mysql dependency to MYSQL provider

commit 1eaf86ecd6c51442aa9c96ae9aba3f2c82b602ea
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

wordpress: updated mysql dependency to MYSQL provider

commit 54cb07174062450bcbd64c24aaa526e371ad8dd7
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

tikiwiki: updated mysql dependency to MYSQL provider

commit 255d147b5b78e53f24e326f04c387f4a83c2f19a
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

thcnet: updated mysql dependency to MYSQL provider

commit a9cdddc535be3ab500b2b11dfb0ee8c212986758
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

dotproject: updated mysql dependency to MYSQL provider

commit ea87553ce677c6103a21672386802d1fabb752ab
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

php-nuke: updated mysql dependency to MYSQL provider

commit 6c21fbb7972aabc8dae619c8b09a8240b59ba580
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

geeklog: updated mysql dependency to MYSQL provider

commit df6e36172672426e336d854ae6f6ca115c2e1771
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

postnuke: updated mysql dependency to MYSQL provider

commit 166e7040e635ea1d30dde54ccc174ecb63431899
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

php_users: updated mysql dependency to MYSQL provider

commit 13f2204c54299798087b2afefe8ed705efc0a54f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mantis: updated mysql dependency to MYSQL provider

commit ba39084476ac7ad92bfc486a1f935d14a9fbfea3
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

pmi: updated mysql dependency to MYSQL provider

commit c64d710077ab7099984ba5ef3d8ef259a0c3ac2f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mediawiki: updated mysql dependency to MYSQL provider

commit bdec28e777072a174ec0b94de7e0ec126d402573
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

sphinx: updated mysql dependency to MYSQL provider

commit 0d6883d40a588efc9863eb793b022223ea3d5a86
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

rsyslog: updated mysql dependency to MYSQL provider

commit fd58fd48b58f6a3a0cf3c850b3e6be78e074c9a4
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mnogosearch: updated mysql dependency to MYSQL provider

commit 2c8e90d9897f81fe23e1baa5c9b4117e8c888f25
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

sptk: updated mysql dependency to MYSQL provider

commit eb27228d6cae6d0c0b5c735d6c64448b8c76e7a7
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

efltk: updated mysql dependency to MYSQL provider

commit aea4ef0945d4b989ec245c250a6dc32ec7206a1e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

qt-x11: updated mysql dependency to MYSQL provider

commit 519b9d4e1953651ccd1746dcdf942ed4b381857f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

qt-embedded: updated mysql dependency to MYSQL provider

commit 93cd99714f1666b50e68bba5351c2e278862f439
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

qt4: updated mysql dependency to MYSQL provider

commit 2dfa695e9181b627ca767bbda470f6400468a10c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

snort: updated mysql dependency to MYSQL provider

commit c21e3d012eccd89585a5e1e1eb1036b4fed6461c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

libgda2: updated mysql dependency to MYSQL provider

commit f7b11f824fef95f44985f75f1f96e035218d9457
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

libgda3: updated mysql dependency to MYSQL provider

commit c692fa59f61ba9c0bab758ae007a96e3e9f542f3
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

php4: updated mysql dependency to MYSQL provider

commit 6f836ea74273200964bf7506186f70a39fdc9a2d
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

php-dev: updated mysql dependency to MYSQL provider

commit 8cc3da96f1cbc4c338adbd1e69747d531a89530e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

php: updated mysql dependency to MYSQL provider

commit 2fe7a20ecd56d6db662e52da9857a4f9d60c497c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

kdepim: updated mysql dependency to MYSQL provider

commit 0969bbe2554b491cdbd126312bd539b9375da9a4
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

kexi: updated mysql dependency to MYSQL provider

commit 359574d56ea34bbc4417d39afdc32930a673d426
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

koffice: updated mysql dependency to MYSQL provider

commit 06b14be4c33ab7410ff323c5e0c78746341cf33b
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

krecipes: updated mysql dependency to MYSQL provider

commit 7f38d18a3c451041a20f55efb43510ec27957bd1
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mp3blaster: updated mysql dependency to MYSQL provider

commit 885c45ddaf27222b22ad8be2c0cd3d68de5bf6a7
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

digitaldj: updated mysql dependency to MYSQL provider

commit 571cc7045012688c8d5b1a341ea7d4731cedd6e9
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

prokyon3: updated mysql dependency to MYSQL provider

commit 529fa7923108698b44b7a74096f73475e972c388
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mp3kult: updated mysql dependency to MYSQL provider

commit 68727e73678f5c2696b9ee324e084edb8118cd08
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

amarok: updated mysql dependency to MYSQL provider

commit e25f036902141493d410df726eafe4035d60e04e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mysqlcppapi: updated mysql dependency to MYSQL provider

commit dc480241c6107eea5d3d0e5e93b93c317b45a16e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

redland: updated mysql dependency to MYSQL provider

commit 99343c8459ff9a41ce529bd589c7d08b153bebf3
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

poco: updated mysql dependency to MYSQL provider

commit df44c50231742f8bb9de8b1f2bbdf005460f0154
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gambas2: updated mysql dependency to MYSQL provider

commit d4b0782116c8206f3274db9a371f217c7861cd1f
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

pike: updated mysql dependency to MYSQL provider

commit 567aff73e1f9773f05fa987af6f8adf7829e997c
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

gambas: updated mysql dependency to MYSQL provider

commit 2b84e2234821dbbe015da7b4e37427a7686f063e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

phpmyadmin: updated mysql dependency to MYSQL provider

commit dbc73f65fbfd522e96eba85fe70fee089846746d
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

mysqlnavigator: updated mysql dependency to MYSQL provider

commit 52bd79d27698fcfea2378e359bb4ff203906c7de
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

cern_root: updated mysql dependency to MYSQL provider

commit 7d04ae5eeab95b8500dc408fb5acc9f2d5753371
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

boinc: updated mysql dependency to MYSQL provider

commit 6e496c6ade55462a1431f25c34b2e24baa2aa18e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

myodbc: updated mysql dependency to MYSQL provider

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

libpcap 1.1.1

commit 8c1ce45b6e7bcc55670ed2fce42ee3b4811c6224
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

cyrus-sasl: updated mysql dependency to MYSQL provider

commit 785f76aa51605051eddd5f790c1b66f44af4e27e
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

database/mariadb: Adding MYSQL provider

commit 2741e4fd0a65f7e0f92b051f415c0f3a47915850
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

database/mysql: Adding MYSQL provider

commit a34e1ebedcd7f16278cfca501cc2058d8e441a12
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

uzbl: corrected URL

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

mesalib: developement => 7.8.1

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

totem: removed dependency on libglade2, libgnomeui

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

system-tools-backends: actualized the dependencies

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

metacity: removed dependency on libglade2, orbit2

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

libgsf: removed optional dependency on pyorbit

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

libgnome: removed dependency on orbit2

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

gnome-utils2: removed dependency on gnome-vfs2, libgnome, gnome-desktop,
e2fsprogs, depends on intltool, libcanberra with GTK,
optionally depends on zlib, gnome-panel

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

gnome-screensaver: removed dependency on libgnomeui

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

gnome-python2: added optional dependencies for all modules

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

gnome-panel: removed dependency on libglade2, libgnome,
depends gnome-doc-utils, optionally depends on xrandr

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

gnome-mount: depends on glib2, libglade2

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

gnome-mount: removed dependency on libgnomeui, depends on gconf2

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

gnome-audio2: removed dependency on libgnomeui

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

gnome-applets2: removed dependency on libgnome, libgnomeui

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

gdm2: removed dependency on libglade2

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

gconf-editor: removed dependency on libgnome, libgnomeui, policykit,
depends on dbus-glib, gnome-doc-utils

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

gconf2: removed duplicate dependency on orbit2

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

eel2: removed dependency on libglade2, libgnome, libgnomeui,
startup-notification,
depends on libgail-gnome

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

libgksu: removed dependency on bison, libglade2, depends on gtk+2

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

abiword: depends on librsvg2

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

crypto/krb5-appl: new spell, krb5 applications (separated from krb5)

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

krb5 1.8
krb5 applications removed to separated distribution krb5-appl

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

ncmpc 0.16.1

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

ncmpcpp 0.5.3

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

gmpc needs vala

checking for valac... no
configure: WARNING: No Vala compiler found. You will not be able to
compile .va la source files.

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

goffice-dev: => 0.8.1

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

goffice: depends on cairo with PS PDF SVG surfaces,
added dependency on gconf2,
removed PRE_SUB_DEPENDS, SUB_DEPENDS
added CONFLICTS

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

goffice: depends on cairo with PS PDF SVG surfaces,
added dependency on gconf2,
conflicts with goffice-dev

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

gnucash: removed goffice subdependency

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

goffice: removed dependency on libart_lgpl, libgnomeui,
removed PRE_SUB_DEPENDS, SUB_DEPENDS - cairo is now a hard
dependency

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

gnome-system-monitor: removed dependency on selinux

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

gedit-plugins: rewritten plugins configuration

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

ekiga: removed sdl option - seems deprecated

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

cairomm: fixed documentation build option

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

gmpc 0.20.0

commit dfa969b3ef93e780779142bff8dcad59285926cf
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice: the correct way "depends ant"

commit d4f7c8fa9327fb8fe48af9362b621dd73c88f38f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

Revert "openoffice: depends ant"

This reverts commit bf4eb7b867d0cd58a2bade00066f9123f07bd031.
Guess I missed that already exists.

commit bf4eb7b867d0cd58a2bade00066f9123f07bd031
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice: depends ant

commit 9c8bb8769f945df01cddd1eaa89d7e0b23c3e42b
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

uzbl: update to 2010.04.01

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

R > r

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

less: display 'raw' control characters

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

ca-certificates: make /etc/ssl/certs readable by users

commit 3bb0872f1acd9c73de89957b652106ee07fa1109
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice: removed ARCHIVE=off and added TMPFS=off

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

libao: conflict to libao-pulse for deprecation

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

libao-pulse: deprecated, part of libao now

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

lxdvdrip: don't install stuff to /usr/local

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

openssl: re-enable md2 support by default

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

libmpd: => 0.20.0

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

clamav - adjust depends

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

anyfs-tools: => 0.85.1b

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

python - optional depends libffi

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

dazukofs: => 3.1.3-rc2

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

bsddb3: => 4.8.4

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

koffice2 - adjust depends on boost

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

gnome-python-extras: make GECKO dependency work for current xulrunner

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

abiword: => 2.8.3

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

avahi: fix typo in CONFIGURE

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

avahi: add subdepends for compatibility layers

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

avahi: add options to install howl and libdns_sd compatibility layers

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

feh: new SOURCE and SOURCE_URL[0] #15638

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

disk/lessfs: new spell, userspace inline data deduplicating filesystem

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

pixman 0.18.0

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

libdrm 2.4.20

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

crypto/dropbear: version 0.52

commit 0a7063c002d1478938063847c1e11b3dae4f5796
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

irssi: update to 0.8.15

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

squid: Updated to version 3.1.1

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

imagemagick: Updated to version 6.6.0-10.

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

feh 1.4.2

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

mesalib: PRE_BUILD: removed sedit

none X11R6 in dri_glx.c (7.5.2, 7.7.1, 7.8)
this fixed 7.8 (dri_glx.c moved ..)

commit 7bc1b05556a825e9be2bdf7426ba17559efc36b8
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/xfburn: switched to git repository, changed website

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

firefox: Updated to version 3.6.3. SECURITY_PATCH++

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

xulrunner: Updated to version 1.9.2.3 SECURITY_PATCH++

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

utils/openmoko-dfu-util: new spell, USB DFU utility for the Neo
FreeRunner

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

mc: => 4.7.0.4

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

b43-tools: conflicts with *fwcutter

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

b43-tools: improved description

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

b43-tools: build all the tools

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

conky: => 1.8.0

commit 5657a6915622e3b898fda739f01097c287466ba8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated to 1.1.42

commit 86119541674697cc3ea9332596cf540f8a1dc060
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Updated to 6.12.192
SOURCE matches upstream posted SHA1

commit 8c73177623961669966eccfcacdc4fccafa72b9d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Depends on libdrm built with Radeon KMS API

commit 86edb06abb3101426069c52db23b60c2ecad0519
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xf86-video-ati: Updated to 6.12.191 (6.13 development version)

diff --git a/ChangeLog b/ChangeLog
index bbecf35..b828178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * libs/upower: new spell, abstraction for enumerating power devices
+
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * telephony/telepathy.gpg: imported keys AD289755, 4ED9A2BB and
711E31B1
+
+2010-04-05 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/krb5-appl: new spell, krb5 applications (separated from krb5)
+
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * disk/lessfs: new spell, userspace inline data deduplicating
filesystem
+
+2010-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * utils/openmoko-dfu-util: new spell, USB DFU utility for the Neo
FreeRunner
+
2010-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* gnu/FUNCTIONS:
- default_build_configure_gcc: specified bug url, pass
diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index 5480110..bda085a 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -1,9 +1,10 @@
+depends g++ &&
depends zlib &&
optional_depends bzip2 "--enable-bzip2" \
"--disable-bzip2" \
"for bzip2 support" &&

-optional_depends dazuko "--enable-clamuko" \
+optional_depends dazukofs "--enable-clamuko" \
"--disable-clamuko" \
"for on access scanning" &&

diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index aed5bc2..ec7b5db 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: dazuko => dazukofs
+ add g++
+
2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.96

diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index ce84f3f..628497a 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -3,7 +3,7 @@ if [[ $OSS_BRANCH == scm ]]; then
if [[ $OSS_SCM_AUTO == y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION="4.1-scm"
+ VERSION="4.3-scm"
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=hg_http://mercurial.opensound.com/:$SPELL-scm
@@ -16,10 +16,10 @@ elif [[ $OSS_BRANCH == test ]]; then

SOURCE_HASH=sha512:44dce6c0176c6e7da61a254f526c5e86c7fc731e0b1311df2f6d9cee08a0151d16e51da7f62c3a63462b408ea7f34c646ce152b1fc3829e3f345dbededdd6936
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
else
- VERSION=v4.1-build1052
+ VERSION=v4.2-build2002
SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2

SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE
-
SOURCE_HASH=sha512:30918c341ef55d757ad1769fc449a6f7bfb81a1bfe40fa6865744b46fc39832f044c21b438ee6f67be65159833cb4a4ca432e901d41d6a88e1de73dd6e2d7006
+
SOURCE_HASH=sha512:e899edd30299020b97b4061968217c89867f014e3f555cc2b2315119ecc7d6033d30c105ce81ac5c8934e8c016a0db4247e00694801acf69d2e536c63e6b7b18
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
fi
WEB_SITE="http://www.opensound.com "
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index ba8b099..08c0768 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-07 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated stable to 4.2 build 2002
+ scm is 4.3 now
+
2009-07-26 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* PREPARE: added test back
* DETAILS: updated both stable and test
diff --git a/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS
b/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS
deleted file mode 100755
index e58e6bb..0000000
--- a/audio-drivers/pulseaudio/REPAIR^none^SUB_DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-case $THIS_SUB_DEPENDS in
- AVAHI) echo "ZeroConf support requested, forcing avahi dependency."
- depends avahi '--enable-avahi'
- ;;
- *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
- return 1
- ;;
-esac
diff --git a/audio-libs/libao-pulse/BUILD b/audio-libs/libao-pulse/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/DEPENDS b/audio-libs/libao-pulse/DEPENDS
index ee4c847..80d40d1 100755
--- a/audio-libs/libao-pulse/DEPENDS
+++ b/audio-libs/libao-pulse/DEPENDS
@@ -1,6 +1 @@
-depends libao &&
-depends pulseaudio &&
-optional_depends lynx \
- "--enable-lynx" \
- "--disable-lynx" \
- "Enable lynx support?"
+depends libao
diff --git a/audio-libs/libao-pulse/DETAILS b/audio-libs/libao-pulse/DETAILS
index 9882212..e370a43 100755
--- a/audio-libs/libao-pulse/DETAILS
+++ b/audio-libs/libao-pulse/DETAILS
@@ -1,9 +1,10 @@
SPELL=libao-pulse
VERSION=0.9.3
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+# SOURCE=${SPELL}-${VERSION}.tar.gz
+#SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+# SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
+# SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+PATCHLEVEL=1
WEB_SITE=http://0pointer.de/lennart/projects/libao-pulse/
ENTERED=20070504
LICENSE[0]=GPL
diff --git a/audio-libs/libao-pulse/HISTORY b/audio-libs/libao-pulse/HISTORY
index fa34aa6..e114b55 100644
--- a/audio-libs/libao-pulse/HISTORY
+++ b/audio-libs/libao-pulse/HISTORY
@@ -1,2 +1,5 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated, now part of libao
+
2007-05-04 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-libs/libao-pulse/INSTALL b/audio-libs/libao-pulse/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/PRE_BUILD
b/audio-libs/libao-pulse/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libao-pulse/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libao-pulse/UP_TRIGGERS
b/audio-libs/libao-pulse/UP_TRIGGERS
new file mode 100755
index 0000000..48787b7
--- /dev/null
+++ b/audio-libs/libao-pulse/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger libao-pulse dispel_self
diff --git a/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig
b/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig
deleted file mode 100644
index 9a873f8..0000000
Binary files a/audio-libs/libao-pulse/libao-pulse-0.9.3.tar.gz.sig and
/dev/null differ
diff --git a/audio-libs/libao/CONFLICTS b/audio-libs/libao/CONFLICTS
new file mode 100755
index 0000000..f17d8ac
--- /dev/null
+++ b/audio-libs/libao/CONFLICTS
@@ -0,0 +1 @@
+conflicts libao-pulse y
diff --git a/audio-libs/libao/HISTORY b/audio-libs/libao/HISTORY
index dc82a86..b907b5e 100644
--- a/audio-libs/libao/HISTORY
+++ b/audio-libs/libao/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict libao-pulse for deprecation
+
2010-03-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.0
* BUILD, alsa-1.0.patch: removed, not needed anymore
diff --git a/audio-libs/libmpd/DETAILS b/audio-libs/libmpd/DETAILS
index d0f0aa8..486497d 100755
--- a/audio-libs/libmpd/DETAILS
+++ b/audio-libs/libmpd/DETAILS
@@ -1,5 +1,5 @@
SPELL=libmpd
- VERSION=0.19.0
+ VERSION=0.20.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://download.sarine.nl/Programs/gmpc/$VERSION/$SOURCE
diff --git a/audio-libs/libmpd/HISTORY b/audio-libs/libmpd/HISTORY
index e548ca9..4ba19dc 100644
--- a/audio-libs/libmpd/HISTORY
+++ b/audio-libs/libmpd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.20.0
+
2009-09-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.19.0

diff --git a/audio-libs/libmpd/libmpd-0.19.0.tar.gz.sig
b/audio-libs/libmpd/libmpd-0.19.0.tar.gz.sig
deleted file mode 100644
index 65a03d3..0000000
Binary files a/audio-libs/libmpd/libmpd-0.19.0.tar.gz.sig and /dev/null differ
diff --git a/audio-libs/libmpd/libmpd-0.20.0.tar.gz.sig
b/audio-libs/libmpd/libmpd-0.20.0.tar.gz.sig
new file mode 100644
index 0000000..6bbb151
Binary files /dev/null and b/audio-libs/libmpd/libmpd-0.20.0.tar.gz.sig differ
diff --git a/audio-players/amarok/DEPENDS b/audio-players/amarok/DEPENDS
index 489ec21..70630ad 100755
--- a/audio-players/amarok/DEPENDS
+++ b/audio-players/amarok/DEPENDS
@@ -7,7 +7,7 @@ optional_depends kdemultimedia "" "" "for audiocd: protocol"
&&
optional_depends sqlite "--without-included-sqlite" \
"--with-included-sqlite" \
"use system sqlite" &&
-optional_depends mysql "--enable-mysql" \
+optional_depends MYSQL "--enable-mysql" \
"--disable-mysql" \
"mysql support" &&
optional_depends postgresql "--enable-postgresql" \
diff --git a/audio-players/amarok/HISTORY b/audio-players/amarok/HISTORY
index 224768f..3ae3c02 100644
--- a/audio-players/amarok/HISTORY
+++ b/audio-players/amarok/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/audio-players/digitaldj/DEPENDS b/audio-players/digitaldj/DEPENDS
index 0daa670..5f3c8b6 100755
--- a/audio-players/digitaldj/DEPENDS
+++ b/audio-players/digitaldj/DEPENDS
@@ -1,6 +1,6 @@
depends grip &&
depends gtk+ &&
-depends mysql &&
+depends MYSQL &&
depends gdk-pixbuf &&

optional_depends mpg123 "" "" "for MP3 playing support"
diff --git a/audio-players/digitaldj/HISTORY b/audio-players/digitaldj/HISTORY
index d9c80e4..b7543b3 100644
--- a/audio-players/digitaldj/HISTORY
+++ b/audio-players/digitaldj/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-08-30 Robert Figura <template AT sourcemage.org>
* PRE_BUILD: removed debug statements

diff --git a/audio-players/gmpc/DEPENDS b/audio-players/gmpc/DEPENDS
index 4d140df..d28e4a3 100755
--- a/audio-players/gmpc/DEPENDS
+++ b/audio-players/gmpc/DEPENDS
@@ -4,6 +4,7 @@ depends libmpd &&
depends libglade2 &&
depends libsoup &&
depends sqlite &&
+depends vala &&

optional_depends libsexy \
"--enable-system-libsexy" \
diff --git a/audio-players/gmpc/DETAILS b/audio-players/gmpc/DETAILS
index 1702772..8511cec 100755
--- a/audio-players/gmpc/DETAILS
+++ b/audio-players/gmpc/DETAILS
@@ -1,5 +1,5 @@
SPELL=gmpc
- VERSION=0.19.1
+ VERSION=0.20.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://download.sarine.nl/Programs/$SPELL/$VERSION/$SOURCE
diff --git a/audio-players/gmpc/HISTORY b/audio-players/gmpc/HISTORY
index 505e4e9..9efd400 100644
--- a/audio-players/gmpc/HISTORY
+++ b/audio-players/gmpc/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.20.0
+ * DEPENDS: added vala
+
2009-10-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.19.1

diff --git a/audio-players/gmpc/gmpc-0.19.1.tar.gz.sig
b/audio-players/gmpc/gmpc-0.19.1.tar.gz.sig
deleted file mode 100644
index ff1e5b8..0000000
Binary files a/audio-players/gmpc/gmpc-0.19.1.tar.gz.sig and /dev/null differ
diff --git a/audio-players/gmpc/gmpc-0.20.0.tar.gz.sig
b/audio-players/gmpc/gmpc-0.20.0.tar.gz.sig
new file mode 100644
index 0000000..4bf2086
Binary files /dev/null and b/audio-players/gmpc/gmpc-0.20.0.tar.gz.sig differ
diff --git a/audio-players/mp3blaster/DEPENDS
b/audio-players/mp3blaster/DEPENDS
index 54904fb..69310f8 100755
--- a/audio-players/mp3blaster/DEPENDS
+++ b/audio-players/mp3blaster/DEPENDS
@@ -1,3 +1,3 @@
depends ncurses &&
optional_depends "libvorbis" "" "" "for ogg-vorbis support" &&
-optional_depends "mysql" "" "" "for mysql mp3tag database"
+optional_depends "MYSQL" "" "" "for mysql mp3tag database"
diff --git a/audio-players/mp3blaster/HISTORY
b/audio-players/mp3blaster/HISTORY
index abbd216..2b5af1c 100644
--- a/audio-players/mp3blaster/HISTORY
+++ b/audio-players/mp3blaster/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/audio-players/mp3kult/DEPENDS b/audio-players/mp3kult/DEPENDS
index c87e174..cab2fe9 100755
--- a/audio-players/mp3kult/DEPENDS
+++ b/audio-players/mp3kult/DEPENDS
@@ -1,4 +1,4 @@
-depends mysql &&
+depends MYSQL &&
depends id3lib &&
depends libogg &&
depends kdelibs
diff --git a/audio-players/mp3kult/HISTORY b/audio-players/mp3kult/HISTORY
index e0b0bbe..737461f 100644
--- a/audio-players/mp3kult/HISTORY
+++ b/audio-players/mp3kult/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/audio-players/ncmpc/DETAILS b/audio-players/ncmpc/DETAILS
index 9728f4f..1d5e939 100755
--- a/audio-players/ncmpc/DETAILS
+++ b/audio-players/ncmpc/DETAILS
@@ -1,9 +1,9 @@
SPELL=ncmpc
- VERSION=0.16
+ VERSION=0.16.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:f530ac156a485eb3130c3450fb7e254f65aecb600ef19d9bf29cba205d9e22778e978453db49450a2aafa51b56c65c62514a700624a054515a9a39f9aea6aa12
+
SOURCE_HASH=sha512:9549ce64e700faafa501d29b3145ab5d45d2665f898b197dab0431032f820745498561b0e43990fa8351a7050a2c5027a5d188f9d6d8d673140c590799ca76ca
WEB_SITE=http://mpd.wikia.com/wiki/Client:Ncmpc
ENTERED=20040516
LICENSE[0]=GPL
diff --git a/audio-players/ncmpc/HISTORY b/audio-players/ncmpc/HISTORY
index ec141a1..5c50640 100644
--- a/audio-players/ncmpc/HISTORY
+++ b/audio-players/ncmpc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.16.1
+
2009-12-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.16, new WEB_SITE and SOURCE_URL[0]
* DEPENDS: added libmpdclient
diff --git a/audio-players/ncmpcpp/DETAILS b/audio-players/ncmpcpp/DETAILS
index a9bf3af..1bffa0e 100755
--- a/audio-players/ncmpcpp/DETAILS
+++ b/audio-players/ncmpcpp/DETAILS
@@ -1,8 +1,8 @@
SPELL=ncmpcpp
- VERSION=0.5
+ VERSION=0.5.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://unkart.ovh.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:8cab56982bf4cd228aa0e804c2d4c16d87761ed05e7fa31d0c76c62bf7a1fe606db345549666c34e12a102dce490cf9febf857c60c0ae996c471f5dc785a7c41
+
SOURCE_HASH=sha512:e80e35760e8dfc67f48fcc0f804f434b2b341d2840ee50c86b63c352713b2f8a08629a6be2101de8e23b4e65e7850436e1bdeaa526ea7e31f4feaf2edcd42e24
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://unkart.ovh.org/ncmpcpp/";
LICENSE[0]=GPL
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index ffba86c..0762a80 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.5.3
+
2010-01-01 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: updated spell to 0.5
* DEPENDS: depends libmpdclient
diff --git a/audio-players/prokyon3/DEPENDS b/audio-players/prokyon3/DEPENDS
index 998d4f9..0867b85 100755
--- a/audio-players/prokyon3/DEPENDS
+++ b/audio-players/prokyon3/DEPENDS
@@ -1,4 +1,4 @@
-depends mysql
+depends MYSQL
depends qt-x11
depends id3lib
optional_depends "libvorbis" "" "--without-ogg" "for Ogg/Vorbis support"
diff --git a/audio-players/prokyon3/HISTORY b/audio-players/prokyon3/HISTORY
index 2cdf432..90e4f38 100644
--- a/audio-players/prokyon3/HISTORY
+++ b/audio-players/prokyon3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-players/rhythmbox/BUILD b/audio-players/rhythmbox/BUILD
index 8595cb7..e42c295 100755
--- a/audio-players/rhythmbox/BUILD
+++ b/audio-players/rhythmbox/BUILD
@@ -1,5 +1,7 @@
-OPTS="$RHYTHMBOX_MMKEY \
- $OPTS" &&
+OPTS="$RHYTHMBOX_MMKEY \
+ $RHYTHMBOX_DAAP \
+ $RHYTHMBOX_FM \
+ $OPTS" &&

make_single &&
default_build &&
diff --git a/audio-players/rhythmbox/CONFIGURE
b/audio-players/rhythmbox/CONFIGURE
index a48bc83..cdb804d 100755
--- a/audio-players/rhythmbox/CONFIGURE
+++ b/audio-players/rhythmbox/CONFIGURE
@@ -1,2 +1,10 @@
config_query_option RHYTHMBOX_MMKEY "Enable Multimedia Keys support?" y \
- '--enable-mmkeys' '--disable-mmkeys'
+ '--enable-mmkeys' '--disable-mmkeys'
&&
+
+config_query_option RHYTHMBOX_DAAP \
+ "Enable Digital Audio Access Protocol sharing" y \
+ "--enable-daap" "--disable-daap" &&
+
+config_query_option RHYTHMBOX_FM \
+ "Enable FM radio support" y \
+ "--enable-fm-radio" "--disable-fm-radio"
diff --git a/audio-players/rhythmbox/DEPENDS b/audio-players/rhythmbox/DEPENDS
index 04a0ca3..1181dcc 100755
--- a/audio-players/rhythmbox/DEPENDS
+++ b/audio-players/rhythmbox/DEPENDS
@@ -1,11 +1,85 @@
depends totem &&
-depends nautilus-cd-burner &&
depends gst-plugins-base &&
depends dbus-glib &&
depends -sub PROFILES gnome-media2 &&
depends libsoup &&

-optional_depends "libgpod" \
- "--with-ipod" \
- "--without-ipod" \
- "for Apple iPod support"
+optional_depends libnotify \
+ "--enable-libnotify" \
+ "--disable-libnotify" \
+ "for libnotify support" &&
+
+optional_depends libmusicbrainz3 \
+ "--enable-musicbrainz" \
+ "--disable-musicbrainz" \
+ "for MusicBrainz support" &&
+
+optional_depends lirc \
+ "--enable-lirc" \
+ "--disable-lirc" \
+ "for lirc support" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+optional_depends rarian \
+ "--enable-scrollkeeper" \
+ "--disable-scrollkeeper" \
+ "to register with rarian" &&
+
+optional_depends python \
+ "--enable-python" \
+ "--disable-python" \
+ "+pygtk2, +gst-python, for python support" &&
+
+if is_depends_enabled $SPELL python; then
+ depends pygtk2 &&
+ depends gst-python
+fi
+
+optional_depends vala \
+ "--enable-vala" \
+ "--disable-vala" \
+ "for Vala plugin support" &&
+
+optional_depends GECKO \
+ "--enable-browser-plugin" \
+ "--disable-browser-plugin" \
+ "for iTunes detection browser plugin" &&
+
+optional_depends hal \
+ "--with-hal" \
+ "--without-hal" \
+ "for HAL support" &&
+
+optional_depends "libgpod" \
+ "--with-ipod" \
+ "--without-ipod" \
+ "for Apple iPod support" &&
+
+optional_depends libmtp \
+ "--with-mtp" \
+ "--without-mtp" \
+ "for MTP support" &&
+
+optional_depends libgnome-keyring \
+ "--with-gnome-keyring" \
+ "--without-gnome-keyring" \
+ "for gnome-keyring support" &&
+
+optional_depends avahi \
+ "--with-mdns=avahi" \
+ "--with-mdns=no" \
+ "for avahi support" &&
+
+optional_depends brasero \
+ "--with-libbrasero-media" \
+ "--without-libbrasero-media" \
+ "for libbrasero-media support" &&
+
+optional_depends nautilus-cd-burner \
+ "--with-libnautilus-burn" \
+ "--without-libnautilus-burn" \
+ "for libnautilus-burn support"
diff --git a/audio-players/rhythmbox/HISTORY b/audio-players/rhythmbox/HISTORY
index 88f1f4f..cb90139 100644
--- a/audio-players/rhythmbox/HISTORY
+++ b/audio-players/rhythmbox/HISTORY
@@ -1,3 +1,12 @@
+2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed hard nautilus-cd-burner
+
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: added RHYTHMBOX_DAAP, RHYTHMBOX_FM
+ * DEPENDS: added options for libnotify, libmusicbrainz3, lirc,
+ gtk-doc, rarian, python (+pygtk2 +gst-python), vala, GECKO,
+ hal, libmtp, libgnome-keyring, avahi, brasero, nautilus-cd-burner
+
2010-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.12.8

diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 8a3ae35..3b538bc 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -3,7 +3,7 @@ optional_depends sqlite \
"--enable-sqlite3" \
"--disable-sqlite3" \
"to store the media db in sqlite" &&
-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"store the media db in mysql" &&
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index 39e2249..3e1cab8 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: a few tweaks
* PRE_BUILD: use proper headers
diff --git a/chat-im/ekiga/DEPENDS b/chat-im/ekiga/DEPENDS
index 08c6539..be9c919 100755
--- a/chat-im/ekiga/DEPENDS
+++ b/chat-im/ekiga/DEPENDS
@@ -37,11 +37,6 @@ optional_depends "gnome-doc-utils" \
"--disable-gdu" \
"To build manual and documentation" &&

-optional_depends "sdl" \
- "" \
- "--disable-sdl" \
- "For full screen video" &&
-
optional_depends "arts" \
"" \
"" \
diff --git a/chat-im/ekiga/HISTORY b/chat-im/ekiga/HISTORY
index e32ef81..bee42a3 100644
--- a/chat-im/ekiga/HISTORY
+++ b/chat-im/ekiga/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed sdl option - seems deprecated
+
2009-09-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 3.2.6

diff --git a/chat-im/jabberd/DEPENDS b/chat-im/jabberd/DEPENDS
index 339b0ff..43d1df2 100755
--- a/chat-im/jabberd/DEPENDS
+++ b/chat-im/jabberd/DEPENDS
@@ -15,7 +15,7 @@ optional_depends sqlite \
'--enable-sqlite' \
'--disable-sqlite' \
'for SQLite storage support' &&
-optional_depends mysql \
+optional_depends MYSQL \
'--enable-mysql' \
'--disable-mysql' \
'for MySQL auth/reg/storage support' &&
diff --git a/chat-im/jabberd/HISTORY b/chat-im/jabberd/HISTORY
index 201cbaa..a8ec15d 100644
--- a/chat-im/jabberd/HISTORY
+++ b/chat-im/jabberd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-01-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 2.2.4
* BUILD: updated
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 4c97e5a..1e105ee 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -12,7 +12,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
SOURCE_IGNORE=volatile
else
- VERSION=0.8.14
+ VERSION=0.8.15
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 5df1b84..1084b6e 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2010-04-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 0.8.15
+ SECURITY_PATCH++
+
2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.14

diff --git a/collab/dotproject/DEPENDS b/collab/dotproject/DEPENDS
index 090ba20..3b0aaf3 100755
--- a/collab/dotproject/DEPENDS
+++ b/collab/dotproject/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/dotproject/HISTORY b/collab/dotproject/HISTORY
index eac3c64..8a20bd1 100644
--- a/collab/dotproject/HISTORY
+++ b/collab/dotproject/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/collab/geeklog/DEPENDS b/collab/geeklog/DEPENDS
index 090ba20..3b0aaf3 100755
--- a/collab/geeklog/DEPENDS
+++ b/collab/geeklog/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/geeklog/HISTORY b/collab/geeklog/HISTORY
index 2b1be1f..42efa84 100644
--- a/collab/geeklog/HISTORY
+++ b/collab/geeklog/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/collab/mantis/DEPENDS b/collab/mantis/DEPENDS
index 3c527ac..24e165a 100755
--- a/collab/mantis/DEPENDS
+++ b/collab/mantis/DEPENDS
@@ -1,3 +1,3 @@
depends WEBSERVER &&
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/mantis/HISTORY b/collab/mantis/HISTORY
index a00c22a..9d6aac2 100644
--- a/collab/mantis/HISTORY
+++ b/collab/mantis/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/collab/mediawiki/DEPENDS b/collab/mediawiki/DEPENDS
index 54e008d..f6fac1d 100755
--- a/collab/mediawiki/DEPENDS
+++ b/collab/mediawiki/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/mediawiki/HISTORY b/collab/mediawiki/HISTORY
index 9441101..40904f0 100644
--- a/collab/mediawiki/HISTORY
+++ b/collab/mediawiki/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/collab/php-nuke/DEPENDS b/collab/php-nuke/DEPENDS
index 090ba20..3b0aaf3 100755
--- a/collab/php-nuke/DEPENDS
+++ b/collab/php-nuke/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/php-nuke/HISTORY b/collab/php-nuke/HISTORY
index f1bf428..a2c9021 100644
--- a/collab/php-nuke/HISTORY
+++ b/collab/php-nuke/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-12-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: upnack -> unpack_file

diff --git a/collab/php_users/DEPENDS b/collab/php_users/DEPENDS
index 090ba20..3b0aaf3 100755
--- a/collab/php_users/DEPENDS
+++ b/collab/php_users/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/php_users/HISTORY b/collab/php_users/HISTORY
index 6bbc144..a2decd8 100644
--- a/collab/php_users/HISTORY
+++ b/collab/php_users/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/collab/pmi/DEPENDS b/collab/pmi/DEPENDS
index 509bf6a..631539f 100755
--- a/collab/pmi/DEPENDS
+++ b/collab/pmi/DEPENDS
@@ -1,4 +1,4 @@
depends PHP &&
-depends mysql &&
+depends MYSQL &&
depends mail-sendmail &&
depends php_users
diff --git a/collab/pmi/HISTORY b/collab/pmi/HISTORY
index 1e66298..0563d68 100644
--- a/collab/pmi/HISTORY
+++ b/collab/pmi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-08-20 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 1.0-rc4, switched to BUILD_API=2,
fixed tabs in the long description,
diff --git a/collab/postnuke/DEPENDS b/collab/postnuke/DEPENDS
index 090ba20..3b0aaf3 100755
--- a/collab/postnuke/DEPENDS
+++ b/collab/postnuke/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/postnuke/HISTORY b/collab/postnuke/HISTORY
index 52fe8c0..8de93d0 100644
--- a/collab/postnuke/HISTORY
+++ b/collab/postnuke/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/collab/thcnet/DEPENDS b/collab/thcnet/DEPENDS
index 412e8e2..c49aba6 100755
--- a/collab/thcnet/DEPENDS
+++ b/collab/thcnet/DEPENDS
@@ -1,3 +1,3 @@
depends APACHE &&
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/thcnet/HISTORY b/collab/thcnet/HISTORY
index 410aee7..237f886 100644
--- a/collab/thcnet/HISTORY
+++ b/collab/thcnet/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2007-03-31 David Brown <dmlb2000 AT gmail.com>
* POST_INSTALL: moved to FINAL

diff --git a/collab/tikiwiki/DEPENDS b/collab/tikiwiki/DEPENDS
index 412e8e2..c49aba6 100755
--- a/collab/tikiwiki/DEPENDS
+++ b/collab/tikiwiki/DEPENDS
@@ -1,3 +1,3 @@
depends APACHE &&
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/tikiwiki/HISTORY b/collab/tikiwiki/HISTORY
index c58ac81..d958a8c 100644
--- a/collab/tikiwiki/HISTORY
+++ b/collab/tikiwiki/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/collab/wordpress/DEPENDS b/collab/wordpress/DEPENDS
index 54e008d..f6fac1d 100755
--- a/collab/wordpress/DEPENDS
+++ b/collab/wordpress/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/collab/wordpress/HISTORY b/collab/wordpress/HISTORY
index eafdd4e..f8e034c 100644
--- a/collab/wordpress/HISTORY
+++ b/collab/wordpress/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/collab/xoops/DEPENDS b/collab/xoops/DEPENDS
index 4f15910..1c9b31a 100755
--- a/collab/xoops/DEPENDS
+++ b/collab/xoops/DEPENDS
@@ -1,3 +1,3 @@
depends PHP &&
depends smarty &&
-depends mysql
+depends MYSQL
diff --git a/collab/xoops/HISTORY b/collab/xoops/HISTORY
index 4f9be2e..5465a80 100644
--- a/collab/xoops/HISTORY
+++ b/collab/xoops/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-11-23 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.3.1. Removed BUILD_API=1
* BUILD: Added true
diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index a5b4b6a..67f456e 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -6,6 +6,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
WEB_SITE=http://packages.debian.org/sid/ca-certificates
LICENSE[0]=GPL
+ PATCHLEVEL=1
ENTERED=20081127
SHORT="PEM files of CA certificates"
cat << EOF
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index c9e5bef..2c59df9 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,3 +1,8 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: make /etc/ssl/certs 0755 so it's actually usable by user
+ applications like epiphany
+ * DETAILS: PATCHLEVEL++
+
2010-02-24 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Create /etc/ca-certificates/update.d, required by
update-ca-certificates
diff --git a/crypto/ca-certificates/INSTALL b/crypto/ca-certificates/INSTALL
index bf11fa1..fa6ab59 100755
--- a/crypto/ca-certificates/INSTALL
+++ b/crypto/ca-certificates/INSTALL
@@ -11,6 +11,6 @@ cd $INSTALL_ROOT/usr/share/ca-certificates &&
find . -name '*.crt' | sort | cut -b3- >
$INSTALL_ROOT/etc/ca-certificates.conf &&

mkdir -p $INSTALL_ROOT/etc/ssl/certs &&
-chmod 0750 /etc/ssl/certs &&
+chmod 0755 /etc/ssl/certs &&

update-ca-certificates
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 15b0e8b..470338c 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -40,7 +40,7 @@ if [[ "$CS_MECH" =~ 'auxprop' ]]; then
'--without-sqlite' \
'auxprop SQLite backend' &&

- optional_depends mysql \
+ optional_depends MYSQL \
"--enable-sql --with-mysql=$INSTALL_ROOT/usr" \
'--without-mysql' \
'auxprop MySQL backend' &&
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index cbb9016..258d409 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-07-22 Arjan Bouter <abouter AT sourcemage.org>
* PROVIDES: added

diff --git a/crypto/dropbear/DETAILS b/crypto/dropbear/DETAILS
index 9cfa627..6aaad64 100755
--- a/crypto/dropbear/DETAILS
+++ b/crypto/dropbear/DETAILS
@@ -1,10 +1,10 @@
SPELL=dropbear
- VERSION=0.50
+ VERSION=0.52
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://matt.ucc.asn.au/dropbear/releases/$SOURCE
-
SOURCE_HASH=sha512:4dd840994a0fbe4cc26cde2b21e7a395d35879833b45ca4a139dc0a9a809943c287005f463313ad4832187acaf5590293a6ec2da223859418f80259ead71d194
+
SOURCE_HASH=sha512:c32fd82a7e5f4268dbdbfe5a266969e5a63164d07440eaaf8af672669404bd5975f549371cb0bb1cb9368f3807776c2c93ad3fbcb63355ba29abcb4eace83ce3
WEB_SITE=http://matt.ucc.asn.au/dropbear/dropbear.html
ENTERED=20050310
LICENSE[0]=MIT
diff --git a/crypto/dropbear/HISTORY b/crypto/dropbear/HISTORY
index 762035b..300a270 100644
--- a/crypto/dropbear/HISTORY
+++ b/crypto/dropbear/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.52
+
2007-08-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.50
fixed long description wrap
diff --git a/crypto/krb5-appl/BUILD b/crypto/krb5-appl/BUILD
new file mode 100755
index 0000000..36022ba
--- /dev/null
+++ b/crypto/krb5-appl/BUILD
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
+default_build
diff --git a/crypto/krb5-appl/CONFLICTS b/crypto/krb5-appl/CONFLICTS
new file mode 100755
index 0000000..39404be
--- /dev/null
+++ b/crypto/krb5-appl/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts netkit-telnet
+conflicts netkit-ftp
diff --git a/crypto/krb5-appl/DEPENDS b/crypto/krb5-appl/DEPENDS
new file mode 100755
index 0000000..fddc7fd
--- /dev/null
+++ b/crypto/krb5-appl/DEPENDS
@@ -0,0 +1,6 @@
+depends krb5 &&
+
+optional_depends "linux-pam" \
+ "" \
+ "" \
+ "for PAM support" &&
diff --git a/crypto/krb5-appl/DETAILS b/crypto/krb5-appl/DETAILS
new file mode 100755
index 0000000..7759c6b
--- /dev/null
+++ b/crypto/krb5-appl/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=krb5-appl
+ VERSION=1.0
+ SOURCE=$SPELL-$VERSION-signed.tar
+ SOURCE_RAW=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/$SOURCE
+
SOURCE_HASH=sha512:607164a7ba603cae9a071a99994a0f2014c5e985035a5ecfba8c7756a589c816a571bf868a3143fa3ee48f07c129772589988a19195654cb25aede5f4c94cf12
+ WEB_SITE=http://web.mit.edu/kerberos/www/
+ ENTERED=20020215
+
LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
+ PATCHLEVEL=0
+ SECURITY_PATCH=0
+ SHORT="Kerberos 5 aplications"
+cat << EOF
+Kerberos was created by MIT as a solution to network security problems.
+The Kerberos protocol uses strong cryptography so that a client can
+prove its identity to a server (and vice versa) across an insecure
+network connection. After a client and server has used Kerberos to
+prove their identity, they can also encrypt all of their communications
+to assure privacy and data integrity as they go about their business.
+EOF
diff --git a/crypto/krb5-appl/HISTORY b/crypto/krb5-appl/HISTORY
new file mode 100644
index 0000000..00189fe
--- /dev/null
+++ b/crypto/krb5-appl/HISTORY
@@ -0,0 +1,5 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, CONFLICTS, PROVIDES,
+ system-et.patch.bz2, desktop/telnet.desktop,
pam.d/{rexec,rlogin,rsh},
+ xinetd.d/{ftpd,klogind,kshd,telnetd}: spell created, version 1.0
+
diff --git a/crypto/krb5-appl/PRE_BUILD b/crypto/krb5-appl/PRE_BUILD
new file mode 100755
index 0000000..a1d0c86
--- /dev/null
+++ b/crypto/krb5-appl/PRE_BUILD
@@ -0,0 +1,7 @@
+mk_source_dir &&
+cd $SOURCE_DIRECTORY &&
+
+unpack_file &&
+tar xzf ${SOURCE_RAW} &&
+cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
+bzcat $SCRIPT_DIRECTORY/system-et.patch.bz2 | patch -p1
diff --git a/crypto/krb5-appl/PROVIDES b/crypto/krb5-appl/PROVIDES
new file mode 100755
index 0000000..f1e21b5
--- /dev/null
+++ b/crypto/krb5-appl/PROVIDES
@@ -0,0 +1 @@
+RSH
diff --git a/crypto/krb5-appl/desktop/telnet.desktop
b/crypto/krb5-appl/desktop/telnet.desktop
new file mode 100644
index 0000000..56a970b
--- /dev/null
+++ b/crypto/krb5-appl/desktop/telnet.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Telnet
+Exec=telnet
+Icon=
+Terminal=true
+Type=Application
+Categories=Application;Network;
diff --git a/crypto/krb5-appl/pam.d/rexec b/crypto/krb5-appl/pam.d/rexec
new file mode 100755
index 0000000..65cb933
--- /dev/null
+++ b/crypto/krb5-appl/pam.d/rexec
@@ -0,0 +1,10 @@
+#
+# The PAM configuration file for the `rexec' service
+#
+auth requisite pam_securetty.so
+auth requisite pam_nologin.so
+auth sufficient pam_rhosts_auth.so
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
+session required pam_limits.so
diff --git a/crypto/krb5-appl/pam.d/rlogin b/crypto/krb5-appl/pam.d/rlogin
new file mode 100755
index 0000000..261a970
--- /dev/null
+++ b/crypto/krb5-appl/pam.d/rlogin
@@ -0,0 +1,11 @@
+#
+# The PAM configuration file for the `rlogin' service
+# this application passes control to `login' if it fails
+#
+auth requisite pam_securetty.so
+auth requisite pam_nologin.so
+auth required pam_rhosts_auth.so
+account required pam_unix.so
+password required pam_unix.so shadow md5 nullok
+session required pam_unix.so
+session required pam_limits.so
diff --git a/crypto/krb5-appl/pam.d/rsh b/crypto/krb5-appl/pam.d/rsh
new file mode 100755
index 0000000..24fc85f
--- /dev/null
+++ b/crypto/krb5-appl/pam.d/rsh
@@ -0,0 +1,10 @@
+#
+# The PAM configuration file for the `rsh' service
+#
+auth requisite pam_securetty.so
+auth requisite pam_nologin.so
+auth sufficient pam_rhosts_auth.so
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
+session required pam_limits.so
diff --git a/crypto/krb5-appl/system-et.patch.bz2
b/crypto/krb5-appl/system-et.patch.bz2
new file mode 100644
index 0000000..8989c12
Binary files /dev/null and b/crypto/krb5-appl/system-et.patch.bz2 differ
diff --git a/crypto/krb5-appl/xinetd.d/ftpd b/crypto/krb5-appl/xinetd.d/ftpd
new file mode 100755
index 0000000..609093d
--- /dev/null
+++ b/crypto/krb5-appl/xinetd.d/ftpd
@@ -0,0 +1,13 @@
+service ftp
+{
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = root
+ server = /usr/sbin/ftpd
+# server_args =
+ per_source = 8
+ log_type = FILE /var/log/xinetd/ftpd
+ log_on_success = PID HOST USERID EXIT DURATION
+ log_on_failure = USERID ATTEMPT
+}
diff --git a/crypto/krb5-appl/xinetd.d/klogind
b/crypto/krb5-appl/xinetd.d/klogind
new file mode 100755
index 0000000..13207e5
--- /dev/null
+++ b/crypto/krb5-appl/xinetd.d/klogind
@@ -0,0 +1,13 @@
+service klogin
+{
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = root
+ server = /usr/sbin/klogind
+# server_args =
+ per_source = 8
+ log_type = FILE /var/log/xinetd/rlogind
+ log_on_success = PID HOST USERID EXIT DURATION
+ log_on_failure = USERID ATTEMPT
+}
diff --git a/crypto/krb5-appl/xinetd.d/kshd b/crypto/krb5-appl/xinetd.d/kshd
new file mode 100755
index 0000000..0fccc95
--- /dev/null
+++ b/crypto/krb5-appl/xinetd.d/kshd
@@ -0,0 +1,13 @@
+service kshd
+{
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = root
+ server = /usr/sbin/kshd
+# server_args =
+ per_source = 8
+ log_type = FILE /var/log/xinetd/kshd
+ log_on_success = PID HOST USERID EXIT DURATION
+ log_on_failure = USERID ATTEMPT
+}
diff --git a/crypto/krb5-appl/xinetd.d/telnetd
b/crypto/krb5-appl/xinetd.d/telnetd
new file mode 100755
index 0000000..5de3d4b
--- /dev/null
+++ b/crypto/krb5-appl/xinetd.d/telnetd
@@ -0,0 +1,13 @@
+service telnet
+{
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = root
+ server = /usr/sbin/telnetd
+# server_args =
+ per_source = 8
+ log_type = FILE /var/log/xinetd/telnetd
+ log_on_success = PID HOST USERID EXIT DURATION
+ log_on_failure = USERID ATTEMPT
+}
diff --git a/crypto/krb5/CONFLICTS b/crypto/krb5/CONFLICTS
deleted file mode 100755
index d0b323a..0000000
--- a/crypto/krb5/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts netkit-telnet
-conflicts netkit-ftp
diff --git a/crypto/krb5/DEPENDS b/crypto/krb5/DEPENDS
index 3355852..26e37a4 100755
--- a/crypto/krb5/DEPENDS
+++ b/crypto/krb5/DEPENDS
@@ -1,3 +1,5 @@
+suggest_depends krb5-appl "" "" "for krb5 applications (telnet/telnetd,
ftp/ftpd, ..." &&
+
depends bison &&
depends e2fsprogs '--with-system-et --with-system-ss' &&
depends perl &&
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index b7daf78..d18dc3c 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,10 +1,10 @@
SPELL=krb5
- VERSION=1.7.1
+ VERSION=1.8
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://web.mit.edu/kerberos/www/dist/krb5/${VERSION::3}/$SOURCE
-
SOURCE_HASH=sha512:7151df36eb20ddf6e52fb330d6a8228ffabe7503926a76bebb5ae94259c29c19fe257cb047356a8ec5e1472ad038b42f60e4a9882bb09ae51b10562aa93e841a
+
SOURCE_HASH=sha512:ff6fe11b9b63695517940c743fe66b9f3a90a86646a76bdcc410fced14bea6355768f13ea7c6d852f3a824227f815520c0a9b34721568214990daa7913de56ea
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index ae04f69..4965a4a 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,12 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8, krb5 -> krb5 + krb5-appl
+ * system-et.patch.bz2: updated patch to 1.8
+ * desktop/telnet.desktop: removed
+ * pam.d/{rexec,rlogin,rsh}: removed
+ * xinetd.d/{ftpd,klogind,kshd,telnetd}: removed
+ * CONFLICTS, PROVIDES: removed
+ * DEPENDS: added suggest_depends krb5-appl
+
2010-02-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.1, SECURITY_PATCH=6, MITKRB5-SA-2009-{003,004}

diff --git a/crypto/krb5/PROVIDES b/crypto/krb5/PROVIDES
deleted file mode 100755
index f1e21b5..0000000
--- a/crypto/krb5/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-RSH
diff --git a/crypto/krb5/desktop/telnet.desktop
b/crypto/krb5/desktop/telnet.desktop
deleted file mode 100644
index 56a970b..0000000
--- a/crypto/krb5/desktop/telnet.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Telnet
-Exec=telnet
-Icon=
-Terminal=true
-Type=Application
-Categories=Application;Network;
diff --git a/crypto/krb5/pam.d/rexec b/crypto/krb5/pam.d/rexec
deleted file mode 100755
index 65cb933..0000000
--- a/crypto/krb5/pam.d/rexec
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# The PAM configuration file for the `rexec' service
-#
-auth requisite pam_securetty.so
-auth requisite pam_nologin.so
-auth sufficient pam_rhosts_auth.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so
diff --git a/crypto/krb5/pam.d/rlogin b/crypto/krb5/pam.d/rlogin
deleted file mode 100755
index 261a970..0000000
--- a/crypto/krb5/pam.d/rlogin
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# The PAM configuration file for the `rlogin' service
-# this application passes control to `login' if it fails
-#
-auth requisite pam_securetty.so
-auth requisite pam_nologin.so
-auth required pam_rhosts_auth.so
-account required pam_unix.so
-password required pam_unix.so shadow md5 nullok
-session required pam_unix.so
-session required pam_limits.so
diff --git a/crypto/krb5/pam.d/rsh b/crypto/krb5/pam.d/rsh
deleted file mode 100755
index 24fc85f..0000000
--- a/crypto/krb5/pam.d/rsh
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# The PAM configuration file for the `rsh' service
-#
-auth requisite pam_securetty.so
-auth requisite pam_nologin.so
-auth sufficient pam_rhosts_auth.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so
diff --git a/crypto/krb5/system-et.patch.bz2 b/crypto/krb5/system-et.patch.bz2
index 93aef57..bbf9547 100644
Binary files a/crypto/krb5/system-et.patch.bz2 and
b/crypto/krb5/system-et.patch.bz2 differ
diff --git a/crypto/krb5/xinetd.d/ftpd b/crypto/krb5/xinetd.d/ftpd
deleted file mode 100755
index 609093d..0000000
--- a/crypto/krb5/xinetd.d/ftpd
+++ /dev/null
@@ -1,13 +0,0 @@
-service ftp
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/sbin/ftpd
-# server_args =
- per_source = 8
- log_type = FILE /var/log/xinetd/ftpd
- log_on_success = PID HOST USERID EXIT DURATION
- log_on_failure = USERID ATTEMPT
-}
diff --git a/crypto/krb5/xinetd.d/klogind b/crypto/krb5/xinetd.d/klogind
deleted file mode 100755
index 13207e5..0000000
--- a/crypto/krb5/xinetd.d/klogind
+++ /dev/null
@@ -1,13 +0,0 @@
-service klogin
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/sbin/klogind
-# server_args =
- per_source = 8
- log_type = FILE /var/log/xinetd/rlogind
- log_on_success = PID HOST USERID EXIT DURATION
- log_on_failure = USERID ATTEMPT
-}
diff --git a/crypto/krb5/xinetd.d/kshd b/crypto/krb5/xinetd.d/kshd
deleted file mode 100755
index 0fccc95..0000000
--- a/crypto/krb5/xinetd.d/kshd
+++ /dev/null
@@ -1,13 +0,0 @@
-service kshd
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/sbin/kshd
-# server_args =
- per_source = 8
- log_type = FILE /var/log/xinetd/kshd
- log_on_success = PID HOST USERID EXIT DURATION
- log_on_failure = USERID ATTEMPT
-}
diff --git a/crypto/krb5/xinetd.d/telnetd b/crypto/krb5/xinetd.d/telnetd
deleted file mode 100755
index 5de3d4b..0000000
--- a/crypto/krb5/xinetd.d/telnetd
+++ /dev/null
@@ -1,13 +0,0 @@
-service telnet
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/sbin/telnetd
-# server_args =
- per_source = 8
- log_type = FILE /var/log/xinetd/telnetd
- log_on_success = PID HOST USERID EXIT DURATION
- log_on_failure = USERID ATTEMPT
-}
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 97383c4..0569cf3 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -8,6 +8,7 @@ fi &&
OPTS="$OPENSSL_TLSEXT $OPTS" &&
OPTS="--prefix=${INSTALL_ROOT}/usr \
--openssldir=${INSTALL_ROOT}/etc/ssl \
+ enable-md2 \
shared \
threads \
$OPTS"
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 1f23c89..21a6282 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -10,6 +10,7 @@ case $OPENSSL_BRANCH in
;;
1.0)
VERSION=1.0.0
+ PATCHLEVEL=1
;;
esac

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index d176a1c..8aed2f8 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1 for 1.0 branch
+ * BUILD: enable md2 by default (still needed somewhere, e.g. nmap)
+
2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Fix GPGME -> OPENSSL for branch variable

diff --git a/database/gtksql/DEPENDS b/database/gtksql/DEPENDS
index 23bbe9f..bd91ff9 100755
--- a/database/gtksql/DEPENDS
+++ b/database/gtksql/DEPENDS
@@ -1,5 +1,5 @@
depends gtk+ &&
optional_depends "lua" "--with-lua" "--without-lua" "scripting support"
&&
-optional_depends "mysql" "--with-mysql" "--without-mysql" "database support"
&&
+optional_depends "MYSQL" "--with-mysql" "--without-mysql" "database support"
&&
optional_depends "postgresql" "--with-postgresql" "--without-postgresql"
"database support"

diff --git a/database/gtksql/HISTORY b/database/gtksql/HISTORY
index e290804..1c0268e 100644
--- a/database/gtksql/HISTORY
+++ b/database/gtksql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/database/guile-dbd-mysql/DEPENDS
b/database/guile-dbd-mysql/DEPENDS
index 7ec2490..6257bcd 100755
--- a/database/guile-dbd-mysql/DEPENDS
+++ b/database/guile-dbd-mysql/DEPENDS
@@ -1,2 +1,2 @@
depends guile-dbi &&
-depends mysql
+depends MYSQL
diff --git a/database/guile-dbd-mysql/HISTORY
b/database/guile-dbd-mysql/HISTORY
index 9f9b559..054de2d 100644
--- a/database/guile-dbd-mysql/HISTORY
+++ b/database/guile-dbd-mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Use versions 1 for guile dbi 1 and 2 for
guile dbi 2.
diff --git a/database/hk_classes/DEPENDS b/database/hk_classes/DEPENDS
index 04a3aa1..fb8bd76 100755
--- a/database/hk_classes/DEPENDS
+++ b/database/hk_classes/DEPENDS
@@ -10,7 +10,7 @@ optional_depends firebird \
"--without-firebird" \
"database engine" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"database engine" &&
diff --git a/database/hk_classes/HISTORY b/database/hk_classes/HISTORY
index 64a4de3..d7c79b1 100755
--- a/database/hk_classes/HISTORY
+++ b/database/hk_classes/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: firebird is now in /opt/firebird

diff --git a/database/libdbi-drivers/DEPENDS b/database/libdbi-drivers/DEPENDS
index 00d754c..37494d8 100755
--- a/database/libdbi-drivers/DEPENDS
+++ b/database/libdbi-drivers/DEPENDS
@@ -7,7 +7,7 @@ optional_depends "postgresql" \
"--with-pgsql" \
"--without-pgsql" \
"database support" &&
-optional_depends "mysql" \
+optional_depends "MYSQL" \
"--with-mysql" \
"--without-mysql" \
"database support" &&
diff --git a/database/libdbi-drivers/HISTORY b/database/libdbi-drivers/HISTORY
index b2a4d6c..62f16ac 100755
--- a/database/libdbi-drivers/HISTORY
+++ b/database/libdbi-drivers/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-12-02 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: fix bug #14680

diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index cc06a6c..a72ee22 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * PROVIDES: adding MYSQL
+
2010-04-02 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* spell created

diff --git a/database/mariadb/PROVIDES b/database/mariadb/PROVIDES
index b433cc9..7a190de 100755
--- a/database/mariadb/PROVIDES
+++ b/database/mariadb/PROVIDES
@@ -1 +1,2 @@
+MYSQL
SQL
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 915a6d1..fb5595f 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * PROVIDES: adding MYSQL
+
2010-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated stable to 5.1.45

diff --git a/database/mysql/PROVIDES b/database/mysql/PROVIDES
index b433cc9..7a190de 100755
--- a/database/mysql/PROVIDES
+++ b/database/mysql/PROVIDES
@@ -1 +1,2 @@
+MYSQL
SQL
diff --git a/database/mytop/DEPENDS b/database/mytop/DEPENDS
index e8f19b3..6c1cafb 100755
--- a/database/mytop/DEPENDS
+++ b/database/mytop/DEPENDS
@@ -1,3 +1,3 @@
-depends mysql &&
+depends MYSQL &&
depends term-readkey &&
depends dbd-mysql
diff --git a/database/mytop/HISTORY b/database/mytop/HISTORY
index f13c2d3..e1f3955 100644
--- a/database/mytop/HISTORY
+++ b/database/mytop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/database/rekall/DEPENDS b/database/rekall/DEPENDS
index c7093f5..3244b29 100755
--- a/database/rekall/DEPENDS
+++ b/database/rekall/DEPENDS
@@ -11,4 +11,4 @@ depends flex &&
depends bison &&
optional_depends "sqlite" "enable-sqlite3=yes" "enable-sqlite3=no"
"SQLite database support" &&
optional_depends "postgresql" "enable-pgsql=yes" "enable-pgsql=no"
"PostgreSQL database support" &&
-optional_depends "mysql" "enable-mysql=yes" "enable-mysql=no" "MySQL
database support"
+optional_depends "MYSQL" "enable-mysql=yes" "enable-mysql=no" "MySQL
database support"
diff --git a/database/rekall/HISTORY b/database/rekall/HISTORY
index 72127c0..014aa6c 100644
--- a/database/rekall/HISTORY
+++ b/database/rekall/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-11-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.4
* DEPENDS: add flex, bison, sqlite
diff --git a/database/rlib/DEPENDS b/database/rlib/DEPENDS
index a02e26d..f42474f 100755
--- a/database/rlib/DEPENDS
+++ b/database/rlib/DEPENDS
@@ -32,7 +32,7 @@ optional_depends ODBC-MGR \
"--disable-odbc" \
"ODBC database access" &&

-optional_depends mysql \
+optional_depends MYSQL \
"" \
"--disable-mysql" \
"mysql database support" &&
diff --git a/database/rlib/HISTORY b/database/rlib/HISTORY
index b9957be..7cd8740 100644
--- a/database/rlib/HISTORY
+++ b/database/rlib/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update sha5sum for latest test tarball

diff --git a/database/tora/DEPENDS b/database/tora/DEPENDS
index 32fb73e..f86dc57 100755
--- a/database/tora/DEPENDS
+++ b/database/tora/DEPENDS
@@ -4,7 +4,7 @@ depends perl &&
optional_depends libidn "" "" "support internationalized domain names" &&
optional_depends "kdebase" "--with-kde" "--without-kde" "kde support" &&
optional_depends "postgresql" "" "" "database support" &&
-optional_depends "mysql" "" "" "database support"
+optional_depends "MYSQL" "" "" "database support"
#optional_depends "Oracle" "" "--without-oracle" "database support" &&
#optional_depends "firebird" "" "" "database support"

diff --git a/database/tora/HISTORY b/database/tora/HISTORY
index ede35e8..88c0f04 100644
--- a/database/tora/HISTORY
+++ b/database/tora/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS, BUILD: now wants qt4
* DETAILS: updated spell to 2.0.0
diff --git a/devel/b43-tools/BUILD b/devel/b43-tools/BUILD
index fe2395a..425fd84 100755
--- a/devel/b43-tools/BUILD
+++ b/devel/b43-tools/BUILD
@@ -1,2 +1,6 @@
-cd assembler &&
-make
+for i in assembler disassembler fwcutter ssb_sprom
+do
+ cd ${i} &&
+ make || break
+ cd ..
+done
diff --git a/devel/b43-tools/CONFLICTS b/devel/b43-tools/CONFLICTS
new file mode 100755
index 0000000..b42c6ab
--- /dev/null
+++ b/devel/b43-tools/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts b43-fwcutter &&
+conflicts bcm43xx-fwcutter &&
+conflicts fwcutter
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index f76ad88..fefb37a 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -14,5 +14,11 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
ENTERED=20100331
SHORT="Development tools for the BCM43xx chip"
cat << EOF
-Development tools for the Broadcom 43xx series Wireless-LAN chip
+Development tools for the Broadcom 43xx series Wireless-LAN chip.
+
+This spell includes:
+ * b43-asm
+ * b43-dasm
+ * fwcutter
+ * ssb-sprom
EOF
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index e13e083..8826811 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,8 @@
+2010-04-02 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: build all the tools
+ * DETAILS: improved description
+ * CONFLICTS: conflicts with *fwcutter
+
2010-03-31 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PREPARE: spell created

diff --git a/devel/b43-tools/INSTALL b/devel/b43-tools/INSTALL
index 508cb92..964d6ac 100755
--- a/devel/b43-tools/INSTALL
+++ b/devel/b43-tools/INSTALL
@@ -1 +1,6 @@
-make PREFIX="${INSTALL_ROOT}"/usr install
+for i in assembler disassembler fwcutter ssb_sprom
+do
+ cd ${i} &&
+ make PREFIX="${INSTALL_ROOT}"/usr install || break
+ cd ..
+done
diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index 74b83c7..6212b19 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
SPELL=cmake
VERSION=2.8.1
-
SOURCE_HASH=sha512:cd8676320337e5e2098e59e59ed2a8aeee0d6d8c5bb53bbca0eb59e7caaf76a2b7711714745ec03ddfaf374ea864d7465c27243e7daa802a0b62d47594782511
+
SOURCE_HASH=sha512:4ba3213a46b2a6a0b5ea4087b838e4d1e79f1b2c0accaec35c466cc73385933ff5f6ab8efe2809d8c719c3c27f8bca67c7818959d73a7f71cf779460b5b7e609
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cmake.org/files/v${VERSION%.*}/$SOURCE
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 0118e60..d1f23bd 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,7 @@
+2010-04-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated hash, file got regenerated without changes,
+ bug #15653
+
2010-03-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.1

diff --git a/devel/erlang/DETAILS b/devel/erlang/DETAILS
index c5ffc45..fb40787 100755
--- a/devel/erlang/DETAILS
+++ b/devel/erlang/DETAILS
@@ -1,5 +1,5 @@
SPELL=erlang
- VERSION=R13B03
+ VERSION=R13B04
SOURCE=otp_src_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/otp_src_$VERSION
SOURCE_URL[0]=http://www.erlang.org/download/$SOURCE
diff --git a/devel/erlang/HISTORY b/devel/erlang/HISTORY
index b014ed6..e28538a 100644
--- a/devel/erlang/HISTORY
+++ b/devel/erlang/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: R13B04
+
2010-01-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: R13B03

diff --git a/devel/erlang/otp_src_R13B03.tar.gz.sig
b/devel/erlang/otp_src_R13B03.tar.gz.sig
deleted file mode 100644
index 992e005..0000000
Binary files a/devel/erlang/otp_src_R13B03.tar.gz.sig and /dev/null differ
diff --git a/devel/erlang/otp_src_R13B04.tar.gz.sig
b/devel/erlang/otp_src_R13B04.tar.gz.sig
new file mode 100644
index 0000000..095935b
Binary files /dev/null and b/devel/erlang/otp_src_R13B04.tar.gz.sig differ
diff --git a/devel/gambas/DEPENDS b/devel/gambas/DEPENDS
index 0a5387f..bfe3bd3 100755
--- a/devel/gambas/DEPENDS
+++ b/devel/gambas/DEPENDS
@@ -7,7 +7,7 @@ optional_depends QT "--enable-qt" \
optional_depends kdebase "--enable-kde" \
"--disable-kde" \
"enable KDE component" &&
-optional_depends mysql "--enable-mysql" \
+optional_depends MYSQL "--enable-mysql" \
"--disable-mysql" \
"MySQL driver" &&
optional_depends postgresql "--enable-postgresql" \
diff --git a/devel/gambas/HISTORY b/devel/gambas/HISTORY
index 326de95..614c594 100644
--- a/devel/gambas/HISTORY
+++ b/devel/gambas/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/devel/gambas2/DEPENDS b/devel/gambas2/DEPENDS
index 9bd881d..13a23db 100755
--- a/devel/gambas2/DEPENDS
+++ b/devel/gambas2/DEPENDS
@@ -15,7 +15,7 @@ optional_depends kdebase "--enable-kde
--with-qt-includes=/usr/include/qt" \
# "--disable-firebird" \
# "firebird driver" &&

-optional_depends mysql "--enable-mysql" \
+optional_depends MYSQL "--enable-mysql" \
"--disable-mysql" \
"MySQL driver" &&
optional_depends ODBC-MGR "--enable-odbc" \
diff --git a/devel/gambas2/HISTORY b/devel/gambas2/HISTORY
index 7b02fb3..d36eefd 100644
--- a/devel/gambas2/HISTORY
+++ b/devel/gambas2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-12-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.10.1

diff --git a/devel/mysqlnavigator/DEPENDS b/devel/mysqlnavigator/DEPENDS
index 150461b..d76d737 100755
--- a/devel/mysqlnavigator/DEPENDS
+++ b/devel/mysqlnavigator/DEPENDS
@@ -1,2 +1,2 @@
-depends mysql "--with-mysql-includes=/usr/include/mysql" &&
+depends MYSQL "--with-mysql-includes=/usr/include/mysql" &&
depends qt-x11 "--with-qt-includes=/usr/include/qt"
diff --git a/devel/mysqlnavigator/HISTORY b/devel/mysqlnavigator/HISTORY
index 07e99d2..a927c5b 100644
--- a/devel/mysqlnavigator/HISTORY
+++ b/devel/mysqlnavigator/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/devel/phpmyadmin/DEPENDS b/devel/phpmyadmin/DEPENDS
index 026abbb..52ac3b7 100755
--- a/devel/phpmyadmin/DEPENDS
+++ b/devel/phpmyadmin/DEPENDS
@@ -1,2 +1,2 @@
depends PHP &&
-depends mysql
+depends MYSQL
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 4099a87..26296dd 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-15 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.2.5

diff --git a/devel/pike/DEPENDS b/devel/pike/DEPENDS
index c77c0e3..62b47d2 100755
--- a/devel/pike/DEPENDS
+++ b/devel/pike/DEPENDS
@@ -6,7 +6,7 @@ optional_depends "gmp" \
"--with-gmp" \
"--without-gmp" \
"for GNU mp bignum support" &&
-optional_depends "mysql" \
+optional_depends "MYSQL" \
"--with-mysql" \
"--without-mysql" \
"to support mysql database access" &&
diff --git a/devel/pike/HISTORY b/devel/pike/HISTORY
index 7a2cadd..753f7c0 100644
--- a/devel/pike/HISTORY
+++ b/devel/pike/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-12 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 7.6.86
* DEPENDS: added disable options for all dependencies
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index feb1de2..d93eb7b 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,3 +1,4 @@
+optional_depends libffi '--with-system-ffi' '' 'system ffi library' &&
optional_depends gdbm "" "" "gnu db support(old)" &&
optional_depends db "" "" "for Sleepycat db support" &&
optional_depends sqlite "" "" "for SQLite db support" &&
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 2f87d63..82dd601 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional libffi
+
2010-03-30 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: added optional_depends openssl
* DETAILS: PATCHLEVEL=1
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 1655b62..fe1f55e 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,11 +1,10 @@
SPELL=qt-creator
- VERSION=1.3.0
-
SOURCE_HASH=sha512:6873c936d561c19885438c72a8207f4aabbd163518cebb20e355525c215e34d6b52351e8f81f231437407185299e7d9e4924b4198bc9326bf4f26e31f2e0386f
+ VERSION=1.3.1
+
SOURCE_HASH=sha512:45872ffa2c95c32c6e24e117114d9961dfb5b49539ecf2edea6625e758702aa89ae8a824cb00bf930d104809782d102eea9f45ad24fb2e349992038cdd41f399
SOURCE=$SPELL-$VERSION-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
WEB_SITE=http://www.qtsoftware.com/downloads
- SOURCE_URL[0]=ftp://ftp.qtsoftware.com/qtcreator/$SOURCE
- SOURCE_URL[1]=http://download.qtsoftware.com/qtcreator/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.trolltech.com/qtcreator/$SOURCE
LICENSE[0]=LGPL
ENTERED=20090304
KEYWORDS="qt4 ide"
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 1f3b1a9..0316f3c 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.1
+
2009-12-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.0

diff --git a/disk/anyfs-tools/DETAILS b/disk/anyfs-tools/DETAILS
index 1ed08ce..8e3bc1c 100755
--- a/disk/anyfs-tools/DETAILS
+++ b/disk/anyfs-tools/DETAILS
@@ -1,6 +1,6 @@
SPELL=anyfs-tools
- VERSION=0.85.1a
-
SOURCE_HASH=sha512:f61180acd28dd9fb536d0b5f6250e9d00905115ecb959db23942b6ac8a3cc8cff5489bb4f6f1137797c305a790508782c5b8ca8c55f42e6230a353ca1a7df56f
+ VERSION=0.85.1b
+
SOURCE_HASH=sha512:2cb6af087d4c4a945c09cb1aafe10c5300941dd8d6bd87d6d64f89b258ddbe8feb3c55d2f6434ba2d651b10bc190ad3267f5de7ae863518c712a34481cd8165b
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/anyfs-tools/HISTORY b/disk/anyfs-tools/HISTORY
index 81ca188..0db2eb3 100644
--- a/disk/anyfs-tools/HISTORY
+++ b/disk/anyfs-tools/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.85.1b
+
2009-02-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.85.1a
* BUILD: added, need extra CFLAG value
diff --git a/disk/brasero/CONFLICTS b/disk/brasero/CONFLICTS
new file mode 100755
index 0000000..d387200
--- /dev/null
+++ b/disk/brasero/CONFLICTS
@@ -0,0 +1 @@
+conflicts nautilus-cd-burner y
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index 0f22e46..15b50ab 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict nautilus-cd-burner for deprecation
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index 2ab4618..d012548 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -1,6 +1,6 @@
SPELL=ddrescue
- VERSION=1.11
-
SOURCE_HASH=sha512:43c393e0a6bd1e323f9a05491a0f4dee586bc8b18500b338d28e10b5eda7e87f483df290b67e784848755af13a4b73f3a75e77bdcb78baceea88732e5ebc284a
+ VERSION=1.12
+
SOURCE_HASH=sha512:e15621586469d22df1ebee74546119ec620d4f850f45e7b0cb4034438a39205d652aafdd2f2317af4eb6a8269692cd359b15b29ca0ea3ac556445e53bd159227
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index 25f6340..943a57c 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12
+
2009-07-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11

diff --git a/disk/lessfs/DEPENDS b/disk/lessfs/DEPENDS
new file mode 100755
index 0000000..8b7fd18
--- /dev/null
+++ b/disk/lessfs/DEPENDS
@@ -0,0 +1,2 @@
+depends tokyocabinet &&
+depends fuse
diff --git a/disk/lessfs/DETAILS b/disk/lessfs/DETAILS
new file mode 100755
index 0000000..d134d7d
--- /dev/null
+++ b/disk/lessfs/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=lessfs
+ VERSION=1.0.8
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:18a43c6b7d4a9b747e410365d8bc6b8b113bd91b495731be8ec9d7e546aa25e1667925fd479cdb94bdba205a307383722954cbeee0e30a0fc84c676bdc9adb31
+ WEB_SITE=http://www.lessfs.com/
+ ENTERED=20100404
+ LICENSE[0]=GPL
+ SHORT="userspace (fuse) inline data de-duplicating filesystem"
+cat << EOF
+Lessfs is an userspace (fuse) inline data de-duplicating filesystem for Linux
+that includes support for lzo or QuickLZ compression and encryption.
+EOF
diff --git a/disk/lessfs/HISTORY b/disk/lessfs/HISTORY
new file mode 100644
index 0000000..2ca93eb
--- /dev/null
+++ b/disk/lessfs/HISTORY
@@ -0,0 +1,3 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 1.0.8
+
diff --git a/disk/lvm/REPAIR^none^SUB_DEPENDS
b/disk/lvm/REPAIR^none^SUB_DEPENDS
deleted file mode 100755
index 7c24e9b..0000000
--- a/disk/lvm/REPAIR^none^SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- LVM_FULL) LVM_DM_ONLY=n &&
- persistent_add LVM_DM_ONLY ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
- return 1;;
-esac
diff --git a/disk/sg3_utils/DETAILS b/disk/sg3_utils/DETAILS
index ac319c9..61e5a33 100755
--- a/disk/sg3_utils/DETAILS
+++ b/disk/sg3_utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=sg3_utils
- VERSION=1.28
-
SOURCE_HASH=sha512:d313c04a779a4689ea436ffb773569578563f43ce0f5f2a12d1edb637c9bedf6e17c3c739bad4f8a9dd9bf0ba0e499669b613df567b043ffb0f119ad81936431
+ VERSION=1.29
+
SOURCE_HASH=sha512:2983398c67272ce1cb7fd043789e6a93280a531697b699fcebc0880dff29c0545a03465de69d1fa743ae04598e7c15933ee71f84ce76455b29404ef0cc2503f0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sg3_utils/HISTORY b/disk/sg3_utils/HISTORY
index 4c168a9..e69076f 100644
--- a/disk/sg3_utils/HISTORY
+++ b/disk/sg3_utils/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.29
+
2009-07-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1,28

diff --git a/disk/udev/REPAIR^all^SUB_DEPENDS
b/disk/udev/REPAIR^all^SUB_DEPENDS
deleted file mode 100755
index e6ae426..0000000
--- a/disk/udev/REPAIR^all^SUB_DEPENDS
+++ /dev/null
@@ -1,17 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- VOLUME_ID) true;;
- EXTRAS) message "${MESSAGE_COLOR}Forcing building of hash function" \
- "generator and access control lists${DEFAULT_COLOR}" &&
- list_add UDEV_OPTS --enable-extras
- list_remove UDEV_OPTS --disable-extras
- depends acl &&
- depends gperf &&
- depends pkgconfig &&
- depends glib2 &&
- depends libusb &&
- depends usbutils &&
- depends USBIDS &&
- depends PCIIDS ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
- return 1;;
-esac
diff --git a/editors/mlview/DEPENDS b/editors/mlview/DEPENDS
index ecfb169..bb9b544 100755
--- a/editors/mlview/DEPENDS
+++ b/editors/mlview/DEPENDS
@@ -1,2 +1,11 @@
-depends eel2 &&
-depends libglademm
+depends glib2 &&
+depends gtk+2 &&
+depends gtkmm2 &&
+depends libglade2 &&
+depends libglademm &&
+depends libgnome &&
+depends gnome-vfs2 &&
+depends libgnomeui &&
+depends gconf2 &&
+depends gtksourceview1 &&
+depends vte
diff --git a/editors/mlview/HISTORY b/editors/mlview/HISTORY
index 0d5bcc8..f46acac 100644
--- a/editors/mlview/HISTORY
+++ b/editors/mlview/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed eel2 added glib2, gtk+2, gtkmm2, libglade2,
+ libgnome, gnome-vfs2, libgnomeui, gconf2, gtksourceview1 and vte
+ * PRE_BUILD, mlview-gcc.patch: patch to fix compile with current gcc
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.

diff --git a/editors/mlview/PRE_BUILD b/editors/mlview/PRE_BUILD
new file mode 100755
index 0000000..8c53309
--- /dev/null
+++ b/editors/mlview/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/mlview-gcc.patch
diff --git a/editors/mlview/mlview-gcc.patch b/editors/mlview/mlview-gcc.patch
new file mode 100644
index 0000000..d51dccc
--- /dev/null
+++ b/editors/mlview/mlview-gcc.patch
@@ -0,0 +1,65 @@
+diff -ur mlview-0.9.0/src/mlview-editor.cc
mlview-0.9.0-patched//src/mlview-editor.cc
+--- mlview-0.9.0/src/mlview-editor.cc 2005-08-07 09:42:28.000000000 +0200
++++ mlview-0.9.0-patched//src/mlview-editor.cc 2010-04-06 19:50:37.000000000
+0200
+@@ -157,7 +157,7 @@
+ contextual_menu (NULL)
+ {}
+
+- static void EditorPriv::schemas_window_destroy_cb
++ static void schemas_window_destroy_cb
+ (GtkWidget *a_widget, struct DocumentWindowData *a_win) ;
+
+ static void validation_window_destroy_cb
+diff -ur mlview-0.9.0/src/mlview-plugin.h
mlview-0.9.0-patched//src/mlview-plugin.h
+--- mlview-0.9.0/src/mlview-plugin.h 2005-08-07 09:47:54.000000000 +0200
++++ mlview-0.9.0-patched//src/mlview-plugin.h 2010-04-06 19:49:49.000000000
+0200
+@@ -46,12 +46,12 @@
+
+ //forbid assignation/copy
+ Plugin& operator= (Plugin const&) ;
+- Plugin::Plugin (Plugin const&) ;
++ Plugin (Plugin const&) ;
+
+ public:
+ Plugin (const PluginDescriptor &a_descr) ;
+
+- Plugin::Plugin (const UString &a_url) ;
++ Plugin (const UString &a_url) ;
+
+ virtual ~Plugin () ;
+
+diff -ur mlview-0.9.0/src/mlview-source-view.h
mlview-0.9.0-patched//src/mlview-source-view.h
+--- mlview-0.9.0/src/mlview-source-view.h 2005-08-07 09:42:28.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-source-view.h 2010-04-06
19:46:35.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ enum MlViewStatus set_default_options () ;
+
+- MlViewXMLDocument* SourceView::get_document () ;
++ MlViewXMLDocument* get_document () ;
+
+ GtkUIManager * get_ui_manager () ;
+
+diff -ur mlview-0.9.0/src/mlview-tree-view.h
mlview-0.9.0-patched//src/mlview-tree-view.h
+--- mlview-0.9.0/src/mlview-tree-view.h 2005-07-22 21:14:28.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-tree-view.h 2010-04-06
19:46:17.000000000 +0200
+@@ -178,7 +178,7 @@
+
+ enum MlViewStatus build_app_edit_menu () ;
+
+- GtkDialog * TreeView::get_expand_tree_dialog () ;
++ GtkDialog * get_expand_tree_dialog () ;
+
+ void clear_completion_popup_submenus () ;
+
+diff -ur mlview-0.9.0/src/mlview-validator.cc
mlview-0.9.0-patched//src/mlview-validator.cc
+--- mlview-0.9.0/src/mlview-validator.cc 2005-07-31 21:16:16.000000000
+0200
++++ mlview-0.9.0-patched//src/mlview-validator.cc 2010-04-06
19:48:50.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "mlview-validator.h"
+ #include "mlview-safe-ptr-utils.h"
+
++#include <backward/auto_ptr.h>
+ #define MESSAGE_LINE_LENGTH 55
+ namespace mlview
+ {
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index a68b3ea..753478a 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -39,9 +39,9 @@ optional_depends JAVA \
'--with-java --with-system-jars' \
'--without-java' \
'enable JAVA support?' &&
-if (is_depends_enabled ${SPELL} JAVA); then
- depends ant "--with-ant-home=${INSTALL_ROOT}/usr" &&
- depends lucene '--with-system-lucene' &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA); then
+ depends ant "--with-ant-home=${INSTALL_ROOT}/opt/ant/" &&
+# depends lucene '--with-system-lucene' &&
optional_depends gcj \
'--enable-gcjaot' \
'--disable-gcjaot' \
diff --git a/editors/openoffice/DETAILS b/editors/openoffice/DETAILS
index 347ada9..81f0887 100755
--- a/editors/openoffice/DETAILS
+++ b/editors/openoffice/DETAILS
@@ -26,7 +26,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO${BUILD_VERSION}
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
ENTERED=20080909
- ARCHIVE="off"
+ TMPFS=off
SHORT="OpenOffice 3"
cat << EOF
OpenOffice.org is the open source project through which Sun Microsystems has
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index c3f8539..5cc28bc 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: corrected to work properly
+ * DETAILS: removed ARCHIVE=off and added TMPFS=off
+
2010-03-31 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added mythes
* INSTALL: fixed dmake prefix
diff --git a/ftp/amule/DETAILS b/ftp/amule/DETAILS
index 042bfc3..98f4575 100755
--- a/ftp/amule/DETAILS
+++ b/ftp/amule/DETAILS
@@ -1,15 +1,16 @@
SPELL=amule
- VERSION=2.2.5
+ VERSION=2.2.6
SOURCE=aMule-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/aMule-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/amule/$SOURCE
LICENSE[0]=GPL
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-
SOURCE_HASH=sha512:18509992177d805e468ee1be568a79464989862974ad800ad88927f54f140cb966c8c2254f3acf0c0cc3c55e320cd7c1d839a990ad96219885af7b34adcecd1b
+
SOURCE_HASH=sha512:a85f65f218c6c1702d7854219ef248bdc1b5f46affc2ee77a5767080a9914f4e9ca2b449c7461c5287b83b8db4fe60351fc52c376d70ac41b8453806cff53988
WEB_SITE=http://amule.sourceforge.net/
ENTERED=20031213
KEYWORDS="ftp"
SHORT="GPL-2 licensed eMule-client for Linux"
cat << EOF
-aMule is a multi-platform clone of the popular eMule client for the eDonkey
filesharing network. aMule is a fork of xMule.
+aMule is a multi-platform clone of the popular eMule client for the eDonkey
+filesharing network. aMule is a fork of xMule.
EOF
diff --git a/ftp/amule/HISTORY b/ftp/amule/HISTORY
index 596e877..8f0e545 100644
--- a/ftp/amule/HISTORY
+++ b/ftp/amule/HISTORY
@@ -1,3 +1,7 @@
+2010-03-24 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.6
+ fixed long description wrap
+
2009-05-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.5

diff --git a/ftp/bnbt/DEPENDS b/ftp/bnbt/DEPENDS
index 5363f7e..9b9f796 100755
--- a/ftp/bnbt/DEPENDS
+++ b/ftp/bnbt/DEPENDS
@@ -1,2 +1,2 @@
depends zlib &&
-optional_depends "mysql" '' '' "for mysql tracker data storage"
+optional_depends "MYSQL" '' '' "for mysql tracker data storage"
diff --git a/ftp/bnbt/HISTORY b/ftp/bnbt/HISTORY
index 9d3d39c..fec5bec 100644
--- a/ftp/bnbt/HISTORY
+++ b/ftp/bnbt/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-08-14 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS, BUILD: update to 8.5, adapted to upstream packaging changes

diff --git a/ftp/gnunet/DEPENDS b/ftp/gnunet/DEPENDS
index 5c867f5..b4d57b4 100755
--- a/ftp/gnunet/DEPENDS
+++ b/ftp/gnunet/DEPENDS
@@ -19,7 +19,7 @@ optional_depends "gettext" \
"--with-libintl-prefix" \
"--without-libintl-prefix" \
"Would you like to use gettext?" &&
-optional_depends "mysql" \
+optional_depends "MYSQL" \
"--with-mysql" \
"--without-mysql" \
"Would you like to use mysql?" &&
diff --git a/ftp/gnunet/DETAILS b/ftp/gnunet/DETAILS
index c39ad33..29ed2eb 100755
--- a/ftp/gnunet/DETAILS
+++ b/ftp/gnunet/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnunet
- VERSION=0.8.1
+ VERSION=0.8.1b
SOURCE=GNUnet-${VERSION}.tar.gz
SOURCE_URL[0]=http://gnunet.org/download/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/ftp/gnunet/GNUnet-0.8.1.tar.gz.sig
b/ftp/gnunet/GNUnet-0.8.1.tar.gz.sig
deleted file mode 100644
index bf7cb40..0000000
Binary files a/ftp/gnunet/GNUnet-0.8.1.tar.gz.sig and /dev/null differ
diff --git a/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig
b/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig
new file mode 100644
index 0000000..202823b
Binary files /dev/null and b/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig differ
diff --git a/ftp/gnunet/HISTORY b/ftp/gnunet/HISTORY
index 7e0cfcb..e89266c 100644
--- a/ftp/gnunet/HISTORY
+++ b/ftp/gnunet/HISTORY
@@ -1,3 +1,9 @@
+2010-04-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.8.1b
+
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.8.1

diff --git a/ftp/proftpd/DEPENDS b/ftp/proftpd/DEPENDS
index 54338b3..f4c0dd2 100755
--- a/ftp/proftpd/DEPENDS
+++ b/ftp/proftpd/DEPENDS
@@ -7,7 +7,7 @@ if [[ "x`echo $PROFTPD_MODS | grep wrap`" != "x" ]]; then
fi &&

if [[ "x`echo $PROFTPD_MODS | grep mysql`" != "x" ]]; then
- depends mysql
+ depends MYSQL
fi &&

if [[ "x`echo $PROFTPD_MODS | grep postgresql`" != "x" ]]; then
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 6eb2da0..57c20f9 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-19 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added libcap opt dep

diff --git a/ftp/pure-ftpd/DEPENDS b/ftp/pure-ftpd/DEPENDS
index 1861140..8f93cfd 100755
--- a/ftp/pure-ftpd/DEPENDS
+++ b/ftp/pure-ftpd/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"for MySQL user auth" &&
diff --git a/ftp/pure-ftpd/HISTORY b/ftp/pure-ftpd/HISTORY
index ee96cfd..469feba 100644
--- a/ftp/pure-ftpd/HISTORY
+++ b/ftp/pure-ftpd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.29

diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index d3dc7fd..a226d3b 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -7,5 +7,4 @@ config_query_option ABIWORD_OPTS "Install additional
templates?" n \
"--disable-templates" &&

config_query_option ABIWORD_OPTS "Install additional plugins?" y \
- "--enable-plugins" \
- "--disable-plugins"
+ "--enable-plugins" ""
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index db39619..5ff1e6d 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -9,11 +9,16 @@ depends libgsf &&
depends wv &&
depends libxml2 &&
depends fontconfig &&
+depends librsvg2 &&

-optional_depends boost \
- "--with-boost" \
- "--without-boost" \
- "for Boost library support" &&
+if list_find "$ABIWORD_OPTS" "--enable-plugins"; then
+ depends boost "--with-boost"
+else
+ optional_depends boost \
+ "--with-boost" \
+ "--without-boost" \
+ "for Boost library support"
+fi &&

optional_depends goffice \
"--with-goffice" \
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 82bd96f..ba8b5cb 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,10 +1,10 @@
SPELL=abiword
if [[ $DEVEL == y ]]; then
- VERSION=2.8.2
+ VERSION=2.8.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
else
- VERSION=2.8.2
+ VERSION=2.8.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
fi
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 55f336b..8b52bd8 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,13 @@
+2010-04-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on librsvg2
+
+2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.3
+ * DEPENDS: corrected dependencies if plugins have been selected
+ * CONFIGURE: don't disable default plugins
+ * PRE_BUILD: added, to apply the patch
+ * delete.patch: added, to fix #12514 in abisource bugzilla
+
2010-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: added configure option to build plugins

diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
new file mode 100755
index 0000000..a74c8e1
--- /dev/null
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/delete.patch"
diff --git a/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig
deleted file mode 100644
index 67f3773..0000000
Binary files a/gnome2-apps/abiword/abiword-2.8.2.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
new file mode 100644
index 0000000..dea8c44
Binary files /dev/null and b/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
differ
diff --git a/gnome2-apps/abiword/delete.patch
b/gnome2-apps/abiword/delete.patch
new file mode 100644
index 0000000..3b0236d
--- /dev/null
+++ b/gnome2-apps/abiword/delete.patch
@@ -0,0 +1,11 @@
+--- src/text/fmt/xp/fp_TextRun.cpp.orig 2009/12/19 00:44:28
++++ src/text/fmt/xp/fp_TextRun.cpp 2010/04/03 13:54:44
+@@ -3396,7 +3396,7 @@
+
+ m_pRenderInfo->m_pText = text;
+ m_pRenderInfo->m_iOffset = iDocumentPosition - iRunOffset;
+- m_pRenderInfo->m_iLength = getLength();
++ m_pRenderInfo->m_iLength = iCount;
+ if(!getGraphics()->needsSpecialCaretPositioning(*m_pRenderInfo))
+ {
+ DELETEP(text);
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index bf06e7b..3073f4f 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,6 +1,6 @@
depends iso-codes &&
depends dbus-glib &&
-depends -sub WEBKIT_DEVEL webkitgtk &&
+depends webkitgtk &&
depends startup-notification &&
depends libgnome-keyring &&
depends -sub SOUP_GNOME libsoup &&
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index e1a7010..479f801 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: no needs for devel webkitgtk, stable = devel now
+
2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: moved SOURCE_GPG after definition of SOURCE so it actually
works
diff --git a/gnome2-apps/epiphany/epiphany-2.28.2.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.28.2.tar.bz2.sig
deleted file mode 100644
index fb1be6b..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.28.2.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index a37cd60..a2fea6c 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -24,6 +24,8 @@ depends libsoup &&
depends gstreamer &&
depends psmisc &&
depends libproxy &&
+depends unique &&
+depends libcanberra &&

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

diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 68a694b..97c7f54 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on unique and libcanberra
+
2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: disable pst-import plugin for now
* DEPENDS: added missing optional dependencies on gtkimageview,
diff --git a/gnome2-apps/gedit-plugins/BUILD b/gnome2-apps/gedit-plugins/BUILD
index 4745dbc..2e85d6d 100755
--- a/gnome2-apps/gedit-plugins/BUILD
+++ b/gnome2-apps/gedit-plugins/BUILD
@@ -1,34 +1,6 @@
-OPTS="${OPTS} --with-extensions="
-if [ "${GEDITPLUG_BRACKET}" == "y" ]; then
- OPTS="${OPTS}bracketcompletion,"
-fi &&
-if [ "${GEDITPLUG_CHARMAP}" == "y" ]; then
- OPTS="${OPTS}charmap,"
-fi &&
-if [ "${GEDITPLUG_CODECOMMENT}" == "y" ]; then
- OPTS="${OPTS}codecomment,"
-fi &&
-if [ "${GEDITPLUG_COLORPICKER}" == "y" ]; then
- OPTS="${OPTS}colorpicker,"
-fi &&
-if [ "${GEDITPLUG_DRAWSPACE}" == "y" ]; then
- OPTS="${OPTS}drawspaces,"
-fi &&
-if [ "${GEDITPLUG_JOINLINES}" == "y" ]; then
- OPTS="${OPTS}joinlines,"
-fi &&
-if [ "${GEDITPLUG_SESSAVE}" == "y" ]; then
- OPTS="${OPTS}sessionsaver,"
-fi &&
-if [ "${GEDITPLUG_SHOWTABBAR}" == "y" ]; then
- OPTS="${OPTS}showtabbar,"
-fi &&
-if [ "${GEDITPLUG_SMARTSPACES}" == "y" ]; then
- OPTS="${OPTS}smartspaces,"
-fi &&
-if [ "${GEDITPLUG_TERMINAL}" == "y" ]; then
- OPTS="${OPTS}terminal,"
-fi
-
+if [[ $GEDIT_PRESET == pick ]]; then
+ OPTS="--with-plugins=$GEDIT_PLUGINS $OPTS"
+else
+ OPTS="--with-plugins=$GEDIT_PRESET $OPTS"
+fi &&
default_build
-
diff --git a/gnome2-apps/gedit-plugins/CONFIGURE
b/gnome2-apps/gedit-plugins/CONFIGURE
index 77397f1..55a637c 100755
--- a/gnome2-apps/gedit-plugins/CONFIGURE
+++ b/gnome2-apps/gedit-plugins/CONFIGURE
@@ -1,10 +1,17 @@
-config_query GEDITPLUG_BRACKET "Build Bracketcompletion plugin?" y &&
-config_query GEDITPLUG_CHARMAP "Build Charmap plugin?" y &&
-config_query GEDITPLUG_CODECOMMENT "Build Codecomment plugin?" y &&
-config_query GEDITPLUG_COLORPICKER "Build Colorpicker plugin?" y &&
-config_query GEDITPLUG_DRAWSPACE "Build Drawspaces plugin?" y &&
-config_query GEDITPLUG_JOINLINES "Build Joinlines plugin?" y &&
-config_query GEDITPLUG_SESSAVE "Build Sessionsaver plugin?" y &&
-config_query GEDITPLUG_SHOWTABBAR "Build Showtabbar plugin?" y &&
-config_query GEDITPLUG_SMARTSPACES "Build Smartspaces plugin?" y &&
-config_query GEDITPLUG_TERMINAL "Build Terminal plugin?" y
+config_query_list GEDIT_PRESET \
+ "What extensions would you like to build?" \
+ default \
+ all \
+ really-all \
+ pick &&
+
+if [[ $GEDIT_PRESET == pick ]]; then
+ . $GRIMOIRE/config_query_multi.function &&
+ AVAILABLE_PLUGINS="bracketcompletion charmap codecomment colorpicker
+drawspaces joinlines multiedit showtabbar sessionsaver smartspaces
+terminal wordcompletion"
+ config_query_multi GEDIT_PLUGINS \
+ "What plugins would you like to build?" \
+ $AVAILABLE_PLUGINS &&
+ GEDIT_PLUGINS="${GEDIT_PLUGINS//\ /,}"
+fi
diff --git a/gnome2-apps/gedit-plugins/HISTORY
b/gnome2-apps/gedit-plugins/HISTORY
index 3107d4d..4fa5e4a 100644
--- a/gnome2-apps/gedit-plugins/HISTORY
+++ b/gnome2-apps/gedit-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: rewritten plugins configuration
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-apps/glade3/DEPENDS b/gnome2-apps/glade3/DEPENDS
index bb1c92b..ee756e5 100755
--- a/gnome2-apps/glade3/DEPENDS
+++ b/gnome2-apps/glade3/DEPENDS
@@ -4,4 +4,8 @@ depends gtk+2 &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Use gtk-doc to build documentation?"
+ "Use gtk-doc to build documentation?" &&
+
+optional_depends rarian \
+ '' '--disable-scrollkeeper' \
+ 'Register docs with rarian?'
diff --git a/gnome2-apps/glade3/HISTORY b/gnome2-apps/glade3/HISTORY
index c7fc59b..f687ce0 100644
--- a/gnome2-apps/glade3/HISTORY
+++ b/gnome2-apps/glade3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made rarian optional
+
2009-06-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.6.7

diff --git a/gnome2-apps/gnome-mount/DEPENDS b/gnome2-apps/gnome-mount/DEPENDS
index 2c5b5ed..fa749bc 100755
--- a/gnome2-apps/gnome-mount/DEPENDS
+++ b/gnome2-apps/gnome-mount/DEPENDS
@@ -1,8 +1,10 @@
depends dbus-glib &&
depends hal &&
depends gtk+2 &&
-depends libgnomeui &&
depends libgnome-keyring &&
+depends gconf2 &&
+depends glib2 &&
+depends libglade2 &&

optional_depends nautilus2 \
"--enable-nautilus-extension" \
diff --git a/gnome2-apps/gnome-mount/HISTORY b/gnome2-apps/gnome-mount/HISTORY
index 0d22e13..a46db75 100644
--- a/gnome2-apps/gnome-mount/HISTORY
+++ b/gnome2-apps/gnome-mount/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libgnomeui, added gconf2, glib2, libglade2
+
2010-02-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: changed gnome-keyring to libgnome-keyring

diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS
index 3a866d5..46c148f 100755
--- a/gnome2-apps/gnucash/DEPENDS
+++ b/gnome2-apps/gnucash/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub CAIRO goffice &&
+depends goffice &&
depends gtkhtml2 &&
depends guile &&
depends libart_lgpl &&
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 40dff56..692eca6 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed goffice subdependency
+
2009-02-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.2.9. Fixed SOURCE_URL's
* DEPENDS: No long depends swig
diff --git a/gnome2-apps/mail-notification/BUILD
b/gnome2-apps/mail-notification/BUILD
new file mode 100755
index 0000000..271d9ad
--- /dev/null
+++ b/gnome2-apps/mail-notification/BUILD
@@ -0,0 +1,2 @@
+./jb configure cflags="$CFLAGS" ldflags="$LDFLAGS"
prefix="$INSTALL_ROOT/usr" sysconfdir="$INSTALL_ROOT/etc"
localstatedir="$INSTALL_ROOT/var" &&
+./jb build
diff --git a/gnome2-apps/mail-notification/DEPENDS
b/gnome2-apps/mail-notification/DEPENDS
index dba2a87..8e27e1a 100755
--- a/gnome2-apps/mail-notification/DEPENDS
+++ b/gnome2-apps/mail-notification/DEPENDS
@@ -1,5 +1,5 @@
depends gtk+2 &&
-depends eel2 &&
+depends libgnomeui &&
depends libnotify &&
optional_depends "gmime" \
"" \
@@ -7,7 +7,7 @@ optional_depends "gmime" \
"for gmime support" &&
optional_depends "openssl" \
"" \
- "--disable-ssl" \
+ "" \
"for ssl support" &&
optional_depends "cyrus-sasl" \
"" \
diff --git a/gnome2-apps/mail-notification/DETAILS
b/gnome2-apps/mail-notification/DETAILS
index 7af3b01..cb02aa0 100755
--- a/gnome2-apps/mail-notification/DETAILS
+++ b/gnome2-apps/mail-notification/DETAILS
@@ -1,5 +1,5 @@
SPELL=mail-notification
- VERSION=4.1
+ VERSION=5.3
SOURCE="mail-notification-$VERSION.tar.bz2"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://savannah.nongnu.org/download/mailnotify/$SOURCE
diff --git a/gnome2-apps/mail-notification/HISTORY
b/gnome2-apps/mail-notification/HISTORY
index 17ed4dd..ddbca12 100644
--- a/gnome2-apps/mail-notification/HISTORY
+++ b/gnome2-apps/mail-notification/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 5.3
+ * BUILD, INSTALL: added for new build system
+ * DEPENDS: removed eel2, added libgnomeui
+
2007-11-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: missing libnotify and eel2 depends

diff --git a/gnome2-apps/mail-notification/INSTALL
b/gnome2-apps/mail-notification/INSTALL
new file mode 100755
index 0000000..e3aca7b
--- /dev/null
+++ b/gnome2-apps/mail-notification/INSTALL
@@ -0,0 +1 @@
+./jb install
diff --git a/gnome2-apps/mail-notification/PRE_BUILD
b/gnome2-apps/mail-notification/PRE_BUILD
deleted file mode 100755
index 82bb5d6..0000000
--- a/gnome2-apps/mail-notification/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "129s:BONOBO_ARG_GET_STRING(arg):BONOBO_ARG_GET_STRING(arg), TRUE:"
src/mn-evolution-folder-tree-control.gob
-sedit "267s:BONOBO_ARG_GET_STRING(arg):BONOBO_ARG_GET_STRING(arg), TRUE:"
src/mn-evolution-folder-tree-control.c
-patch -p1 < $SPELL_DIRECTORY/mail-notification-4.1-find-evo-2.12.patch
diff --git
a/gnome2-apps/mail-notification/mail-notification-4.1-find-evo-2.12.patch
b/gnome2-apps/mail-notification/mail-notification-4.1-find-evo-2.12.patch
deleted file mode 100644
index 052b29c..0000000
--- a/gnome2-apps/mail-notification/mail-notification-4.1-find-evo-2.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mail-notification-4.1/m4/evolution-plugin.m4.evo2.12 2006-11-02
18:18:23.000000000 +0100
-+++ mail-notification-4.1/m4/evolution-plugin.m4 2007-06-26
16:06:22.000000000 +0200
-@@ -13,12 +13,17 @@ AC_DEFUN([AM_PATH_EVOLUTION_PLUGIN],
-
- evolution_branch=ifelse([$1],, [2.4], [$1])
- evolution_plugin_min_version=ifelse([$2],,, [>= $2])
-+evolution_plugin_pkgconf=evolution-plugin-$evolution_branch
-
--PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [evolution-plugin-$evolution_branch
$evolution_plugin_min_version], [found=yes], [found=no])
-+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [$evolution_plugin_pkgconf
$evolution_plugin_min_version], [found=yes], [found=no])
-+
-+if test $found = no; then
-+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [evolution-plugin
$evolution_plugin_min_version],
[found=yes;evolution_plugin_pkgconf=evolution-plugin], [found=no])
-+fi
-
- if test $found = yes; then
- AC_MSG_CHECKING([for the Evolution plugin directory])
-- evolution_plugindir=`$PKG_CONFIG --variable=plugindir
evolution-plugin-$evolution_branch 2>/dev/null`
-+ evolution_plugindir=`$PKG_CONFIG --variable=plugindir
$evolution_plugin_pkgconf 2>/dev/null`
- if test -n "$evolution_plugindir"; then
- AC_MSG_RESULT([$evolution_plugindir])
- else
diff --git a/gnome2-apps/orca/DEPENDS b/gnome2-apps/orca/DEPENDS
index 250a502..29305f6 100755
--- a/gnome2-apps/orca/DEPENDS
+++ b/gnome2-apps/orca/DEPENDS
@@ -4,7 +4,6 @@ depends libbonobo &&
depends atk &&
depends at-spi &&
depends libgail-gnome &&
-depends eel2 &&
depends gnome-speech &&
depends gnome-mag &&
depends python &&
diff --git a/gnome2-apps/orca/HISTORY b/gnome2-apps/orca/HISTORY
index 2c2b823..0a2feb3 100644
--- a/gnome2-apps/orca/HISTORY
+++ b/gnome2-apps/orca/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed eel2, not used anymore
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-apps/system-tools-backends/DEPENDS
b/gnome2-apps/system-tools-backends/DEPENDS
index 3eafa9f..7792c0e 100755
--- a/gnome2-apps/system-tools-backends/DEPENDS
+++ b/gnome2-apps/system-tools-backends/DEPENDS
@@ -1,8 +1,5 @@
-depends vte &&
-depends gconf2 &&
-depends libgnomeui &&
-depends libglade2 &&
-depends libxml2 &&
-depends perl &&
-depends xml-twig &&
-depends net-dbus
+depends perl &&
+depends policykit &&
+depends dbus &&
+depends dbus-glib &&
+depends glib2
diff --git a/gnome2-apps/system-tools-backends/HISTORY
b/gnome2-apps/system-tools-backends/HISTORY
index b42d731..4639409 100644
--- a/gnome2-apps/system-tools-backends/HISTORY
+++ b/gnome2-apps/system-tools-backends/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: pretty much rewritten
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.10.0

diff --git a/gnome2-libs/eel2/BUILD b/gnome2-libs/eel2/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/eel2/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/eel2/DEPENDS b/gnome2-libs/eel2/DEPENDS
deleted file mode 100755
index 24f1a46..0000000
--- a/gnome2-libs/eel2/DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-depends gnome-desktop &&
-depends libgnomeui &&
-depends libglade2 &&
-depends libgnome &&
-depends libxml2 &&
-depends gconf2 &&
-depends gtk+2 &&
-depends glib2
-
-optional_depends startup-notification "" "" \
- "Build with startup-notification?"
-
diff --git a/gnome2-libs/eel2/DETAILS b/gnome2-libs/eel2/DETAILS
index 68f6892..7aede83 100755
--- a/gnome2-libs/eel2/DETAILS
+++ b/gnome2-libs/eel2/DETAILS
@@ -1,11 +1,12 @@
SPELL=eel2
VERSION=2.26.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=eel-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eel-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/eel/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE=eel-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/eel-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/eel/$BRANCH/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org
ENTERED=20020505
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/eel2/HISTORY b/gnome2-libs/eel2/HISTORY
index d6499b6..cb04ff7 100644
--- a/gnome2-libs/eel2/HISTORY
+++ b/gnome2-libs/eel2/HISTORY
@@ -1,3 +1,12 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated not developed anymore, unused, doesn't compile,
+ bug 15651
+
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libglade2, libgnome, libgnomeui,
+ startup-notification,
+ added libgail-gnome
+
2009-03-23 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.26.0

diff --git a/gnome2-libs/eel2/INSTALL b/gnome2-libs/eel2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/eel2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/eel2/PRE_BUILD b/gnome2-libs/eel2/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/eel2/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/eel2/UP_TRIGGERS b/gnome2-libs/eel2/UP_TRIGGERS
new file mode 100755
index 0000000..206bba7
--- /dev/null
+++ b/gnome2-libs/eel2/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger eel2 dispel_self
diff --git a/gnome2-libs/eel2/eel-2.26.0.tar.bz2.sig
b/gnome2-libs/eel2/eel-2.26.0.tar.bz2.sig
deleted file mode 100644
index effcd25..0000000
Binary files a/gnome2-libs/eel2/eel-2.26.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gconf-editor/DEPENDS
b/gnome2-libs/gconf-editor/DEPENDS
index ab19601..59ca0f6 100755
--- a/gnome2-libs/gconf-editor/DEPENDS
+++ b/gnome2-libs/gconf-editor/DEPENDS
@@ -1,9 +1,9 @@
-depends gtk+2 &&
-depends gconf2 &&
-depends libgnome &&
-depends libgnomeui &&
-depends intltool &&
-depends policykit &&
+depends gtk+2 &&
+depends gconf2 &&
+depends intltool &&
+depends dbus-glib &&
+depends gnome-doc-utils &&
+
optional_depends rarian \
'--enable-scrollkeeper' \
'--disable-scrollkeeper' \
diff --git a/gnome2-libs/gconf-editor/HISTORY
b/gnome2-libs/gconf-editor/HISTORY
index 004b806..b21258d 100644
--- a/gnome2-libs/gconf-editor/HISTORY
+++ b/gnome2-libs/gconf-editor/HISTORY
@@ -1,3 +1,7 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libgnome, libgnomeui, policykit,
+ added dbus-glib, gnome-doc-utils
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gconf2/DEPENDS b/gnome2-libs/gconf2/DEPENDS
index b366140..1264d71 100755
--- a/gnome2-libs/gconf2/DEPENDS
+++ b/gnome2-libs/gconf2/DEPENDS
@@ -1,5 +1,4 @@
depends libxml2 &&
-depends orbit2 &&
depends xml-parser-expat &&
depends dbus-glib &&
depends orbit2 &&
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index 80a722d..6752d37 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed duplicate dependency on orbit2
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.28.1

diff --git a/gnome2-libs/gdm2/DEPENDS b/gnome2-libs/gdm2/DEPENDS
index 2f4fa1b..0d97aaa 100755
--- a/gnome2-libs/gdm2/DEPENDS
+++ b/gnome2-libs/gdm2/DEPENDS
@@ -7,7 +7,6 @@ depends glib2 &&
depends gtk+2 &&
depends fontconfig &&
depends libxklavier &&
-depends libglade2 &&
depends gnome-panel &&
depends librsvg2 &&
depends libcanberra &&
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index 025305e..ed70575 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libglade2
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index dca02b7..1ab3d2d 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added DOC
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.24.0

diff --git a/gnome2-libs/glibmm/PRE_SUB_DEPENDS
b/gnome2-libs/glibmm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..131aea8
--- /dev/null
+++ b/gnome2-libs/glibmm/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ DOC) if [[ $FULLDOCS == "y" ]]; then return 0; fi ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/gnome2-libs/glibmm/SUB_DEPENDS b/gnome2-libs/glibmm/SUB_DEPENDS
new file mode 100755
index 0000000..8367c52
--- /dev/null
+++ b/gnome2-libs/glibmm/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DOC) message "Documentation requested, forcing build" &&
+ FULLDOCS="y";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/gnome2-libs/gnome-applets2/DEPENDS
b/gnome2-libs/gnome-applets2/DEPENDS
index b6d1207..854bfdb 100755
--- a/gnome2-libs/gnome-applets2/DEPENDS
+++ b/gnome2-libs/gnome-applets2/DEPENDS
@@ -4,8 +4,6 @@ depends libxml2 &&
depends glib2 &&
depends gtk+2 &&
depends dbus-glib &&
-depends libgnome &&
-depends libgnomeui &&
depends gnome-icon-theme &&
depends gnome-panel &&
depends gnome-desktop &&
diff --git a/gnome2-libs/gnome-applets2/HISTORY
b/gnome2-libs/gnome-applets2/HISTORY
index 20bd1bb..b126ec9 100644
--- a/gnome2-libs/gnome-applets2/HISTORY
+++ b/gnome2-libs/gnome-applets2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libgnome, libgnomeui
+
2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD, disable-rarian.patch: removed. no longer needed.

diff --git a/gnome2-libs/gnome-audio2/DEPENDS
b/gnome2-libs/gnome-audio2/DEPENDS
deleted file mode 100755
index 7cc5ae2..0000000
--- a/gnome2-libs/gnome-audio2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends libgnomeui
diff --git a/gnome2-libs/gnome-audio2/HISTORY
b/gnome2-libs/gnome-audio2/HISTORY
index 27e3bdf..cc2a530 100644
--- a/gnome2-libs/gnome-audio2/HISTORY
+++ b/gnome2-libs/gnome-audio2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed
+
2008-05-07 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.2

diff --git a/gnome2-libs/gnome-control-center/DEPENDS
b/gnome2-libs/gnome-control-center/DEPENDS
index 7e7fcfa..b3bb9ec 100755
--- a/gnome2-libs/gnome-control-center/DEPENDS
+++ b/gnome2-libs/gnome-control-center/DEPENDS
@@ -4,7 +4,7 @@ depends libxscrnsaver &&
depends libxxf86misc &&
depends libxft &&
depends libxcursor &&
-
+depends libxext &&
depends libxml2 &&
depends glib2 &&
depends gtk+2 &&
@@ -13,16 +13,14 @@ depends gnome-desktop &&
depends gnome-menus &&
depends librsvg2 &&
depends pango &&
-depends eel2 &&
-depends gnome-panel &&
depends dbus &&
depends dbus-glib &&
depends metacity &&
depends gnome-settings-daemon &&
depends libxklavier &&
depends libgnomekbd &&
-depends libcanberra &&
depends desktop-file-utils &&
+depends -sub GTK libcanberra &&
depends unique &&

optional_depends evolution-data-server \
diff --git a/gnome2-libs/gnome-control-center/HISTORY
b/gnome2-libs/gnome-control-center/HISTORY
index 45decbc..4edb928 100644
--- a/gnome2-libs/gnome-control-center/HISTORY
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed eel2, gnome-panel, added libxext,
+ need libcanberra with GTK
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index 207b6d2..aadbdfe 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -8,9 +8,7 @@ depends glib2 &&
depends cairo &&
depends pango &&
depends gtk+2 &&
-depends libglade2 &&
depends libbonoboui &&
-depends libgnome &&
depends orbit2 &&
depends libwnck &&
depends librsvg2 &&
@@ -18,6 +16,7 @@ depends libgnome-keyring &&
depends libgweather &&
depends libxml2 &&
depends gnome-vfs2 &&
+depends gnome-doc-utils &&

optional_depends evolution-data-server \
'--enable-eds' \
@@ -37,12 +36,9 @@ optional_depends policykit-gnome
\
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
- 'Build documentation with gtk-doc'
+ 'Build documentation with gtk-doc' &&

-#
-# Even though ./configure mentions we can disable scrollkeeper, we can't
-#
-#optional_depends scrollkeeper \
-# '--enable-scrollkeeper' \
-# '--disable-scrollkeeper' \
-# 'for Open Documentation Cataloging support'
+optional_depends xrandr \
+ "" \
+ "" \
+ "for XRandr support"
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index a42037b..38f7de3 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,7 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libglade2, libgnome,
+ added gnome-doc-utils, added optional xrandr
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gnome-python-extras/BUILD
b/gnome2-libs/gnome-python-extras/BUILD
index 8c22db5..4dd0064 100755
--- a/gnome2-libs/gnome-python-extras/BUILD
+++ b/gnome2-libs/gnome-python-extras/BUILD
@@ -3,7 +3,7 @@ if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
OPTS="$OPTS --with-gtkmozembed=seamonkey"
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --with-gtkmozembed=xulrunner"
+ OPTS="$OPTS --with-gtkmozembed=mozilla"
else
OPTS="$OPTS --with-gtkmozembed=mozilla"
fi &&
diff --git a/gnome2-libs/gnome-python-extras/HISTORY
b/gnome2-libs/gnome-python-extras/HISTORY
index 110ac95..83fc2f3 100644
--- a/gnome2-libs/gnome-python-extras/HISTORY
+++ b/gnome2-libs/gnome-python-extras/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: pass --with-gtkmozembed=mozilla to configure for xulrunner so
+ it actually picks it up correctly
+
2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: actually do something with the enabled/disabled
dependencies

diff --git a/gnome2-libs/gnome-python2/BUILD b/gnome2-libs/gnome-python2/BUILD
new file mode 100755
index 0000000..f8c9286
--- /dev/null
+++ b/gnome2-libs/gnome-python2/BUILD
@@ -0,0 +1,5 @@
+OPTS="$GPYTHON2_VFSBONOBO \
+ $GPYTHON2_PYVFS \
+ $OPTS" &&
+
+default_build
diff --git a/gnome2-libs/gnome-python2/CONFIGURE
b/gnome2-libs/gnome-python2/CONFIGURE
new file mode 100755
index 0000000..44b011f
--- /dev/null
+++ b/gnome2-libs/gnome-python2/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_option GPYTHON2_VFSBONOBO \
+ "Build gnomevfsbonobo module?" y \
+ "--enable-gnomevfsbonobo" "--disable-gnomevfsbonobo" &&
+
+config_query_option GPYTHON2_PYVFS \
+ "Build pyvfsmodule [bridge] module?" y \
+ "--enable-pyvfsmodule" "--disable-pyvfsmodule"
diff --git a/gnome2-libs/gnome-python2/DEPENDS
b/gnome2-libs/gnome-python2/DEPENDS
index bf1e325..75723b6 100755
--- a/gnome2-libs/gnome-python2/DEPENDS
+++ b/gnome2-libs/gnome-python2/DEPENDS
@@ -1,5 +1,58 @@
-depends libgnome &&
-depends libgnomeui &&
-depends libgnomecanvas &&
-depends pyorbit &&
-depends pygtk2
+if list_find "$GPYTHON2_VFSBONOBO" "--enable-gnomevfsbonobo"; then
+ depends gnome-vfs2 &&
+ depends libbonobo &&
+ depends pyorbit
+fi &&
+
+if list_find "$GPYTHON2_PYVFS" "--enable-pyvfsmodule"; then
+ depends gnome-vfs2 &&
+ depends libbonobo
+fi &&
+
+depends pygobject &&
+depends pygtk2 &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+optional_depends libgnome \
+ "--enable-gnome" \
+ "--disable-gnome" \
+ "to build gnome module" &&
+
+optional_depends libgnomeui \
+ "--enable-gnomeui" \
+ "--disable-gnomeui" \
+ "to build gnomeui module" &&
+
+optional_depends libgnomecanvas \
+ "--enable-gnomecanvas" \
+ "--disable-gnomecanvas" \
+ "to build gnomecanvas module" &&
+
+optional_depends gnome-vfs2 \
+ "--enable-gnomevfs" \
+ "--disable-gnomevfs" \
+ "to build gnomevfs module" &&
+
+optional_depends gconf2 \
+ "--enable-gconf" \
+ "--disable-gconf" \
+ "to build gconf module" &&
+
+optional_depends libbonobo \
+ "--enable-bonobo_activation" \
+ "--disable-bonobo_activation" \
+ "to build bonobo.activation module" &&
+
+optional_depends libbonobo \
+ "--enable-bonobo" \
+ "--disable-bonobo" \
+ "to build bonobo module" &&
+
+optional_depends libbonoboui \
+ "--enable-bonoboui" \
+ "--disable-bonoboui" \
+ "to build bonoboui module"
diff --git a/gnome2-libs/gnome-python2/HISTORY
b/gnome2-libs/gnome-python2/HISTORY
index 30dba78..88b8ef4 100644
--- a/gnome2-libs/gnome-python2/HISTORY
+++ b/gnome2-libs/gnome-python2/HISTORY
@@ -1,3 +1,10 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: added
+ * DEPENDS: gnomevfsbonobo, pyvfsmodule modules moved to CONFIGURE
+
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: added optional dependencies for all modules
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.28.1

diff --git a/gnome2-libs/gnome-screensaver/DEPENDS
b/gnome2-libs/gnome-screensaver/DEPENDS
index fd88248..b74124a 100755
--- a/gnome2-libs/gnome-screensaver/DEPENDS
+++ b/gnome2-libs/gnome-screensaver/DEPENDS
@@ -11,7 +11,6 @@ depends gtk+2 &&
depends gconf2 &&
depends gnome-desktop &&
depends gnome-menus &&
-depends libgnomeui &&
depends gnome-control-center &&

optional_depends libxxf86vm \
diff --git a/gnome2-libs/gnome-screensaver/HISTORY
b/gnome2-libs/gnome-screensaver/HISTORY
index 9939664..577b23d 100644
--- a/gnome2-libs/gnome-screensaver/HISTORY
+++ b/gnome2-libs/gnome-screensaver/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libgnomeui
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gnome-sharp/DEPENDS b/gnome2-libs/gnome-sharp/DEPENDS
index 2e79c58..8772510 100755
--- a/gnome2-libs/gnome-sharp/DEPENDS
+++ b/gnome2-libs/gnome-sharp/DEPENDS
@@ -5,10 +5,7 @@ depends mono &&
depends gtk-sharp-2 &&
depends glib2 &&
depends gtk+2 &&
-depends gconf2 &&
depends libgnomecanvas &&
depends libgnomeui &&
-depends libgnomeprintui &&
-depends gnome-panel &&
depends libart_lgpl &&
depends gnome-vfs2
diff --git a/gnome2-libs/gnome-sharp/HISTORY b/gnome2-libs/gnome-sharp/HISTORY
index 9587066..0029a8d 100644
--- a/gnome2-libs/gnome-sharp/HISTORY
+++ b/gnome2-libs/gnome-sharp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed gconf2, libgnomeprintui, gnome-panel
+
2009-03-19 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Fix compilation with libtool 2.2.6a (Bug #15126)

diff --git a/gnome2-libs/gnome-system-monitor/DEPENDS
b/gnome2-libs/gnome-system-monitor/DEPENDS
index 8affa79..28cd887 100755
--- a/gnome2-libs/gnome-system-monitor/DEPENDS
+++ b/gnome2-libs/gnome-system-monitor/DEPENDS
@@ -10,11 +10,6 @@ depends gnome-icon-theme &&
depends glibmm &&
depends gtkmm2 &&

-optional_depends libselinux \
- "--enable-selinux" \
- "--disable-selinux" \
- "Enable SELinux support?" &&
-
optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY
b/gnome2-libs/gnome-system-monitor/HISTORY
index 2927ba7..e81f2fb 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed selinux
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.28.1

diff --git a/gnome2-libs/gnome-utils2/DEPENDS
b/gnome2-libs/gnome-utils2/DEPENDS
index ce89979..832920f 100755
--- a/gnome2-libs/gnome-utils2/DEPENDS
+++ b/gnome2-libs/gnome-utils2/DEPENDS
@@ -4,15 +4,22 @@ depends libxext &&
depends glib2 &&
depends gtk+2 &&
depends gconf2 &&
-depends gnome-vfs2 &&
-depends libgnome &&
-depends gnome-desktop &&
-depends gnome-panel &&
depends libgtop2 &&
-depends e2fsprogs &&
depends rarian &&
+depends intltool &&
+depends -sub GTK libcanberra &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+optional_depends gnome-panel \
+ "--enable-gdict-applet=yes" \
+ "--enable-gdict-applet=no" \
+ "to build the Dictionary applet" &&
+
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for zlib support"
diff --git a/gnome2-libs/gnome-utils2/HISTORY
b/gnome2-libs/gnome-utils2/HISTORY
index 1df7e07..2aacf12 100644
--- a/gnome2-libs/gnome-utils2/HISTORY
+++ b/gnome2-libs/gnome-utils2/HISTORY
@@ -1,3 +1,8 @@
+2010-03-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed gnome-vfs2, libgnome, gnome-desktop, e2fsprogs,
+ added intltool, libcanberra with GTK, added optional zlib,
+ made gnome-panel optional
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/goffice-dev/CONFLICTS
b/gnome2-libs/goffice-dev/CONFLICTS
new file mode 100755
index 0000000..2f323a4
--- /dev/null
+++ b/gnome2-libs/goffice-dev/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts goffice-0.5 y &&
+conflicts goffice-0.6 y &&
+conflicts goffice
diff --git a/gnome2-libs/goffice-dev/DEPENDS b/gnome2-libs/goffice-dev/DEPENDS
index 02329e1..cc908ca 100755
--- a/gnome2-libs/goffice-dev/DEPENDS
+++ b/gnome2-libs/goffice-dev/DEPENDS
@@ -3,23 +3,14 @@ depends gconf2 &&
depends glib2 &&
depends libgsf &&
depends xml-parser-expat &&
-
-optional_depends -sub SVG cairo \
- '--with-cairo' \
- '--without-cairo' \
- 'for Cairo SVG support' &&
+depends -sub "PS PDF SVG" cairo &&

optional_depends gtk+2 \
"--with-gtk" \
"--without-gtk" \
"Build the UI?" &&

-optional_depends libgnomeui \
- "--with-gnome" \
- "--without-gnome" \
- "Use GNOME extensions?" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build gtk-doc files?"
+ "Build gtk-doc files?"
diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS
index b25bcd5..aa9a5ef 100755
--- a/gnome2-libs/goffice-dev/DETAILS
+++ b/gnome2-libs/goffice-dev/DETAILS
@@ -1,6 +1,6 @@
SPELL=goffice-dev
- VERSION=0.8.0
-
SOURCE_HASH=sha512:9bf1885170520b707208dd687b106e7c1ca016b8095a4ceb7449a2c9db49c2805fdcf893b5987491976a420c99069e2ff4ca524b68dec257529f1443101f8f4a
+ VERSION=0.8.1
+
SOURCE_HASH=sha512:6dc16f617637ed3aba877f5077b32b81a878ed19d70b5ea66a4c8a7069f37dce421c521501de401215e1aa6e2dd96511ceb7e1fb195c1a539bb7f0d463fee36f
BRANCH=${VERSION%\.*}
SOURCE=goffice-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY
index df678b1..194e90b 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.1
+
2010-02-14 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.8.0

diff --git a/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
b/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
deleted file mode 100755
index 30129e7..0000000
--- a/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) is_depends_enabled $SPELL cairo && return 0;;
-esac
-return 1
diff --git a/gnome2-libs/goffice-dev/SUB_DEPENDS
b/gnome2-libs/goffice-dev/SUB_DEPENDS
deleted file mode 100755
index cc0159f..0000000
--- a/gnome2-libs/goffice-dev/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) echo "Cairo support requested: forcing cairo dependency."
- depends cairo '--with-cairo';;
- *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
- return 1;;
-esac
diff --git a/gnome2-libs/goffice/CONFLICTS b/gnome2-libs/goffice/CONFLICTS
index 3b93106..3b1afdd 100755
--- a/gnome2-libs/goffice/CONFLICTS
+++ b/gnome2-libs/goffice/CONFLICTS
@@ -1,2 +1,3 @@
conflicts goffice-0.5 y &&
-conflicts goffice-0.6 y
+conflicts goffice-0.6 y &&
+conflicts goffice-dev
diff --git a/gnome2-libs/goffice/DEPENDS b/gnome2-libs/goffice/DEPENDS
index b086909..67899de 100755
--- a/gnome2-libs/goffice/DEPENDS
+++ b/gnome2-libs/goffice/DEPENDS
@@ -1,23 +1,14 @@
depends glib2 &&
depends libgsf &&
-depends libart_lgpl &&
depends xml-parser-expat &&
+depends -sub "PS PDF SVG" cairo &&
+depends gconf2 &&

optional_depends gtk+2 \
"--with-gtk" \
"--without-gtk" \
"build the UI?" &&

-optional_depends cairo \
- "--with-cairo" \
- "--without-cairo" \
- "for Cairo SVG support" &&
-
-optional_depends libgnomeui \
- "--with-gnome" \
- "--without-gnome" \
- "use GNOME extensions?" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index b34addc..d24e353 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,10 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * CONFLICTS: added goffice-dev
+ * DEPENDS: removed libart_lgpl, libgnomeui, made cairo a hard
+ dependency with PS PDF SVG surfaces,
+ added gconf2
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: removed
+
2010-03-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.8.1
* DEPENDS: removed libglade2
diff --git a/gnome2-libs/goffice/PRE_SUB_DEPENDS
b/gnome2-libs/goffice/PRE_SUB_DEPENDS
deleted file mode 100755
index 653676c..0000000
--- a/gnome2-libs/goffice/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) is_depends_enabled $SPELL cairo;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/gnome2-libs/goffice/SUB_DEPENDS b/gnome2-libs/goffice/SUB_DEPENDS
deleted file mode 100755
index 0ff4fff..0000000
--- a/gnome2-libs/goffice/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) message "Cairo SVG support requested, forcing cairo dependency" &&
- depends cairo "--with-cairo";;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/gnome2-libs/libgda2/DEPENDS b/gnome2-libs/libgda2/DEPENDS
index 97ed36c..5c77a40 100755
--- a/gnome2-libs/libgda2/DEPENDS
+++ b/gnome2-libs/libgda2/DEPENDS
@@ -13,7 +13,7 @@ optional_depends ODBC-MGR \
"--without-odbc" \
"Enable Unix ODBC Support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"Enable MySQL DB Support" &&
diff --git a/gnome2-libs/libgda2/HISTORY b/gnome2-libs/libgda2/HISTORY
index fcdf345..3202985 100644
--- a/gnome2-libs/libgda2/HISTORY
+++ b/gnome2-libs/libgda2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: firebird => FIREBIRD

diff --git a/gnome2-libs/libgda3/DEPENDS b/gnome2-libs/libgda3/DEPENDS
index 5c87f46..4e854a2 100755
--- a/gnome2-libs/libgda3/DEPENDS
+++ b/gnome2-libs/libgda3/DEPENDS
@@ -13,7 +13,7 @@ optional_depends ODBC-MGR \
"--without-odbc" \
"Enable Unix ODBC Support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"Enable MySQL DB Support" &&
diff --git a/gnome2-libs/libgda3/HISTORY b/gnome2-libs/libgda3/HISTORY
index 6194250..c48b299 100644
--- a/gnome2-libs/libgda3/HISTORY
+++ b/gnome2-libs/libgda3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: firebird => FIREBIRD

diff --git a/gnome2-libs/libgnome/DEPENDS b/gnome2-libs/libgnome/DEPENDS
index d8311a0..8b518cb 100755
--- a/gnome2-libs/libgnome/DEPENDS
+++ b/gnome2-libs/libgnome/DEPENDS
@@ -4,7 +4,6 @@ depends libxml2 &&
depends libxslt &&
depends gconf2 &&
depends glib2 &&
-depends orbit2 &&
depends pkgconfig &&
depends popt &&

diff --git a/gnome2-libs/libgnome/HISTORY b/gnome2-libs/libgnome/HISTORY
index e8758fb..a57e46b 100644
--- a/gnome2-libs/libgnome/HISTORY
+++ b/gnome2-libs/libgnome/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed orbit2
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/libgsf/DEPENDS b/gnome2-libs/libgsf/DEPENDS
index e6055d2..7e43641 100755
--- a/gnome2-libs/libgsf/DEPENDS
+++ b/gnome2-libs/libgsf/DEPENDS
@@ -29,6 +29,4 @@ optional_depends libbonobo \
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "build documentation with gtk-doc" &&
-
-optional_depends pyorbit "" "" "enable ORBit2/python option"
+ "build documentation with gtk-doc"
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index a686893..520e80d 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed optional pyorbit
+
2010-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.14.17

diff --git a/gnome2-libs/libgweather/DEPENDS b/gnome2-libs/libgweather/DEPENDS
index 28fcaf7..78d1d54 100755
--- a/gnome2-libs/libgweather/DEPENDS
+++ b/gnome2-libs/libgweather/DEPENDS
@@ -4,9 +4,9 @@ depends libxml2 &&
depends libsoup &&
depends gconf2 &&

-optional_depends python \
+optional_depends pygtk2 \
"--enable-python" \
- "--disable-python" \
+ "" \
"to build libgweather python bindings" &&

optional_depends gtk-doc \
diff --git a/gnome2-libs/libgweather/HISTORY b/gnome2-libs/libgweather/HISTORY
index f5777c0..40cc041 100644
--- a/gnome2-libs/libgweather/HISTORY
+++ b/gnome2-libs/libgweather/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: optionally depend on pygtk2 instead of python. Don't
+ pass --disable-python if it should not be used, as that actually
+ enables it, bug #15650
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/metacity/DEPENDS b/gnome2-libs/metacity/DEPENDS
index d91476e..f665551 100755
--- a/gnome2-libs/metacity/DEPENDS
+++ b/gnome2-libs/metacity/DEPENDS
@@ -5,8 +5,6 @@ depends pango &&
depends gtk+2 &&
depends glib2 &&
depends intltool &&
-depends libglade2 &&
-depends orbit2 &&
depends xml-parser-expat &&
depends zenity &&
depends -sub GTK libcanberra &&
@@ -44,4 +42,4 @@ optional_depends gconf2
\
optional_depends startup-notification \
'--enable-startup-notification' \
'--disable-startup-notification' \
- 'for application startup services'
+ 'for application startup services'
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 21768dd..182f1d0 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libglade2, orbit2
+
2010-04-01 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/nautilus-cd-burner/BUILD
b/gnome2-libs/nautilus-cd-burner/BUILD
index 8ab6bc8..27ba77d 100755
--- a/gnome2-libs/nautilus-cd-burner/BUILD
+++ b/gnome2-libs/nautilus-cd-burner/BUILD
@@ -1,4 +1 @@
-# don't know why but 2.10.2 doesn't seem to find pkg-config could be removed
-# could be removed when 2.12 shows up
-export PKG_CONFIG=$(which pkg-config) &&
-default_build
+true
diff --git a/gnome2-libs/nautilus-cd-burner/DEPENDS
b/gnome2-libs/nautilus-cd-burner/DEPENDS
index 527ba42..66a38ff 100755
--- a/gnome2-libs/nautilus-cd-burner/DEPENDS
+++ b/gnome2-libs/nautilus-cd-burner/DEPENDS
@@ -1,16 +1 @@
-depends CD-BURN-UTILITY &&
-depends glib2 &&
-depends gtk+2 &&
-depends gconf2 &&
-depends eel2 &&
-depends libglade2 &&
-depends libgnome &&
-depends libgnomeui &&
-depends nautilus2 &&
-depends dbus &&
-depends hal &&
-
-optional_depends gnome-mount \
- "--enable-gnome-mount" \
- "--disable-gnome-mount" \
- "Use gnome-mount?"
\ No newline at end of file
+depends brasero
diff --git a/gnome2-libs/nautilus-cd-burner/DETAILS
b/gnome2-libs/nautilus-cd-burner/DETAILS
index 1f9e212..85f8ee0 100755
--- a/gnome2-libs/nautilus-cd-burner/DETAILS
+++ b/gnome2-libs/nautilus-cd-burner/DETAILS
@@ -1,12 +1,13 @@
SPELL=nautilus-cd-burner
VERSION=2.24.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
LICENSE[1]=LGPL
+PATCHLEVEL=1
WEB_SITE=http://developer.gnome.org
ENTERED=20020509
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
b/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
deleted file mode 100644
index 4268b72..0000000
--- a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
+++ /dev/null
@@ -1 +0,0 @@
-nautilus-cd-burner.schemas
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY
b/gnome2-libs/nautilus-cd-burner/HISTORY
index 0a53d60..1a286ed 100644
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ b/gnome2-libs/nautilus-cd-burner/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of brasero
+
2008-10-03 Robin Cook <rcook AT wyrms.net>
* DEPENDS: removed gnome-vfs2
added explicit gnome depends
diff --git a/gnome2-libs/nautilus-cd-burner/INSTALL
b/gnome2-libs/nautilus-cd-burner/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/nautilus-cd-burner/PRE_BUILD
b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git
a/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS

b/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
deleted file mode 100755
index deb98f7..0000000
---
a/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
+++ /dev/null
@@ -1,15 +0,0 @@
-#---------------------------------------------------------------------
-## Replaces sorcerys default_pre-remove with a custom version
-#---------------------------------------------------------------------
-function default_pre_remove() {
- debug "libapi" "$FUNCNAME - $*"
- real_default_pre_remove "$@"
- if [[ -f "${SCRIPT_DIRECTORY}/G_SCHEMAS" && -e "/usr/bin/gconftool-2"
]]; then
- local G_FILE
- export
GCONF_CONFIG_SOURCE="xml:readwrite:${INSTALL_ROOT}/etc/gconf/gconf.xml.defaults"
- for G_FILE in `cat ${SCRIPT_DIRECTORY}/G_SCHEMAS`
- do
- gconftool-2 --makefile-uninstall-rule
"${INSTALL_ROOT}/etc/gconf/schemas/${G_FILE}" > /dev/null || true
- done
- fi
-}
diff --git a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
index 871ba35..4a0a628 100755
--- a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
+++ b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
@@ -1,14 +1 @@
-local OLD_SPELL_VERSION=""
-if spell_ok $SPELL; then
- OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
- message "This is a possibly incompatible update of libnautilus-burn..."
- message "Figuring out what spells need to be recast."
- for each in $(show_up_depends $SPELL 1); do
- if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libnautilus-burn.so.2"; then
- up_trigger $each cast_self
- fi
- done
- fi
-fi
+up_trigger nautilus-cd-burner dispel_self
diff --git
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
b/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig
deleted file mode 100644
index 094c576..0000000
Binary files
a/gnome2-libs/nautilus-cd-burner/nautilus-cd-burner-2.24.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/profile-gnome2-desktop/CONFLICTS
b/gnome2-libs/profile-gnome2-desktop/CONFLICTS
deleted file mode 100755
index 5517a3d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts gnome-2-desktop-profile
-conflicts gnome2-profile
diff --git a/gnome2-libs/profile-gnome2-desktop/DEPENDS
b/gnome2-libs/profile-gnome2-desktop/DEPENDS
deleted file mode 100755
index f636966..0000000
--- a/gnome2-libs/profile-gnome2-desktop/DEPENDS
+++ /dev/null
@@ -1,96 +0,0 @@
-depends rarian &&
-depends libxklavier &&
-depends startup-notification &&
-depends libwnck &&
-depends gnome-speech &&
-depends dasher &&
-depends libsoup &&
-depends evolution-data-server &&
-depends gnome-keyring &&
-depends evolution-webcal &&
-depends gnome-doc-utils &&
-depends gnome-desktop &&
-depends gnome-menus &&
-depends eel2 &&
-depends libgweather &&
-depends gnome-panel &&
-depends gconf-editor &&
-depends gdm2 &&
-depends gstreamer &&
-depends gst-plugins-base &&
-depends gst-plugins-good &&
-depends gnome-applets2 &&
-depends gnome-backgrounds &&
-depends gtk-engines2 &&
-depends gnome-themes &&
-depends gnome-icon-theme &&
-depends librsvg2 &&
-depends nautilus2 &&
-depends metacity &&
-depends libgnomekbd &&
-depends gnome-settings-daemon &&
-depends gnome-control-center &&
-depends nautilus-cd-burner &&
-depends libgnomeprint &&
-depends libgnomeprintui &&
-depends libgtop2 &&
-depends gtksourceview &&
-depends gnome-media2 &&
-depends gnome-python-desktop &&
-depends gnome-games2 &&
-depends gnome-mag &&
-depends gnome-netstatus &&
-depends gnome-nettool &&
-depends gnome-screensaver &&
-depends gnome-session &&
-depends gnome-system-monitor &&
-depends vte &&
-depends gnome-terminal &&
-depends gnome2-user-docs &&
-depends gnome-utils2 &&
-depends gnome-volume-manager &&
-depends gtkhtml2 &&
-depends libgail-gnome &&
-depends pygtksourceview &&
-depends vino &&
-depends yelp &&
-depends zenity &&
-depends gnome-sharp &&
-depends gnome-desktop-sharp &&
-depends gvfs &&
-depends bug-buddy2 &&
-depends alacarte &&
-depends deskbar-applet &&
-depends ptlib &&
-depends opal &&
-depends ekiga &&
-depends eog2 &&
-depends epiphany &&
-depends epiphany-extensions &&
-depends evince &&
-
-depends evolution &&
-depends evolution-exchange &&
-depends file-roller &&
-depends gcalctool &&
-depends gedit &&
-depends gnome-power-manager &&
-depends system-tools-backends &&
-depends liboobs &&
-depends gnome-system-tools &&
-depends gok &&
-depends gucharmap &&
-depends orca &&
-depends tomboy &&
-depends sound-juicer &&
-depends totem &&
-depends seahorse &&
-
-depends gedit-plugins &&
-depends gnome-games-extra-data &&
-depends seahorse-plugins &&
-depends gnome-audio2 &&
-
-depends gnopernicus &&
-
-depends fast-user-switch-applet
diff --git a/gnome2-libs/profile-gnome2-desktop/DETAILS
b/gnome2-libs/profile-gnome2-desktop/DETAILS
index 24786e7..df82694 100755
--- a/gnome2-libs/profile-gnome2-desktop/DETAILS
+++ b/gnome2-libs/profile-gnome2-desktop/DETAILS
@@ -1,5 +1,6 @@
SPELL=profile-gnome2-desktop
VERSION=2.14.0
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org/start/2.0
ENTERED=20050208
UPDATED=20050907
diff --git a/gnome2-libs/profile-gnome2-desktop/HISTORY
b/gnome2-libs/profile-gnome2-desktop/HISTORY
index 4796e27..434873d 100644
--- a/gnome2-libs/profile-gnome2-desktop/HISTORY
+++ b/gnome2-libs/profile-gnome2-desktop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated unmaintained profile spell
+
2009-04-14 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Removed deprecated gal2
Avoids Bug #15170
diff --git a/gnome2-libs/profile-gnome2-desktop/PRE_INSTALL
b/gnome2-libs/profile-gnome2-desktop/PRE_INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/PRE_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
b/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
new file mode 100755
index 0000000..9e5e09a
--- /dev/null
+++ b/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger profile-gnome2-desktop dispel_self
diff --git a/gnu/gcc33/BUILD b/gnu/gcc33/BUILD
index 6785c23..b436ef6 100755
--- a/gnu/gcc33/BUILD
+++ b/gnu/gcc33/BUILD
@@ -4,6 +4,7 @@ sedit 's:#!/bin/sh:#!/bin/bash:'
$SOURCE_DIRECTORY/configure &&
# GCC 3.3 doesn't know arch=pentium4m, replace with pentium4,
# same for pentium3m
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
+# Doesn't know native -march nor -mtune (GCC 4.2+)
# See
http://gcc.gnu.org/onlinedocs/gcc-3.3.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/pentium4m/pentium4} &&
CXXFLAGS=${CXXFLAGS/pentium4m/pentium4} &&
@@ -14,6 +15,24 @@ CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&

+echo ARCHITECTURE = $ARCHITECTURE > /tmp/gcc33.opt &&
+echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
+echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
+
+case $ARCHITECTURE in
+ native-x86_64-64)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC -DPIC}
&&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC
-DPIC}
+ ;;
+ native-x86_64-32)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=i486 -m32} &&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=i486 -m32}
+ ;;
+esac &&
+
+echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
+echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
+
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
diff --git a/gnu/gcc33/HISTORY b/gnu/gcc33/HISTORY
index c87fa22..5ca5dc3 100644
--- a/gnu/gcc33/HISTORY
+++ b/gnu/gcc33/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)
+
2009-10-03 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: We should have no lib64 to need linking

diff --git a/gnu/gcc34/BUILD b/gnu/gcc34/BUILD
index b37a065..176e80d 100755
--- a/gnu/gcc34/BUILD
+++ b/gnu/gcc34/BUILD
@@ -1,10 +1,22 @@
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
+# Doesn't know native -march nor -mtune (GCC 4.2+)
# See
http://gcc.gnu.org/onlinedocs/gcc-3.4.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/core2/nocona} &&
CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&

+case $ARCHITECTURE in
+ native-x86_64-64)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC -DPIC}
&&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC
-DPIC}
+ ;;
+ native-x86_64-32)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=i486 -m32} &&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=i486 -m32}
+ ;;
+esac &&
+
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
diff --git a/gnu/gcc34/HISTORY b/gnu/gcc34/HISTORY
index 20d876a..6fc46a4 100644
--- a/gnu/gcc34/HISTORY
+++ b/gnu/gcc34/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)
+
2009-05-30 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Use profiledbootstrap to generate a more optimized compiler
This uses more diskspace, but unlike 4.x we have no
diff --git a/gnustep-libs/gnustep-sqlclient/DEPENDS
b/gnustep-libs/gnustep-sqlclient/DEPENDS
index df0f208..634522d 100755
--- a/gnustep-libs/gnustep-sqlclient/DEPENDS
+++ b/gnustep-libs/gnustep-sqlclient/DEPENDS
@@ -1,7 +1,7 @@
depends gnustep-base &&
depends gnustep-performance &&
depends gnustep-make &&
-optional_depends mysql \
+optional_depends MYSQL \
"" \
"--disable-mysql-bundle" \
"Add mysql support." &&
diff --git a/gnustep-libs/gnustep-sqlclient/HISTORY
b/gnustep-libs/gnustep-sqlclient/HISTORY
index 84d1c46..45d1fcf 100644
--- a/gnustep-libs/gnustep-sqlclient/HISTORY
+++ b/gnustep-libs/gnustep-sqlclient/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2007-04-17 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update
* DEPENDS: missing depends
diff --git a/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig
b/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig
deleted file mode 100644
index a108ffe..0000000
Binary files a/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig and /dev/null differ
diff --git a/graphics-libs/cegui/DETAILS b/graphics-libs/cegui/DETAILS
index 5896fcb..1d6545b 100755
--- a/graphics-libs/cegui/DETAILS
+++ b/graphics-libs/cegui/DETAILS
@@ -1,11 +1,11 @@
SPELL=cegui
PKG=CEGUI
- VERSION=0.6.2
+ VERSION=0.7.1
SOURCE=${PKG}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG}-${VERSION/b}
SOURCE_URL[0]=$SOURCEFORGE_URL/crayzedsgui/$SOURCE
#
SOURCE_HASH=sha512:7edfe35518d464226fbdf862d800af41de01fa2bf584a97f572415cf0ada2c2c8c1fca57c80c6bbae8662451fb20e3b9baaff95f0de8ba4d92a63ba2a98085c9
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:54a2c0b6773d6923c82ac418fe93198c86af140ae50fbb6eb9416318c256ad568124c7f73507a4aaef88534d452e65a642c6d664ed485d163bf27fb708fe3b5a
LICENSE[0]=LGPL
WEB_SITE=http://www.cegui.org.uk/
KEYWORDS="graphics libs"
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index 136794d..4af03c2 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,7 @@
+2010-04-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.1
+ * PRE_BUILD: removed because no longer necessary
+
2009-03-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.6.2
* PRE_BUILD: Run `libtoolize -f` and add '-f' to autoreconf to fix
diff --git a/graphics-libs/cegui/PRE_BUILD b/graphics-libs/cegui/PRE_BUILD
deleted file mode 100755
index 1942258..0000000
--- a/graphics-libs/cegui/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit 's: lua < 5.1::' acinclude.m4 &&
-touch INSTALL NEWS &&
-libtoolize -f &&
-autoreconf -f
diff --git a/graphics-libs/mesalib/CONFLICTS b/graphics-libs/mesalib/CONFLICTS
deleted file mode 100755
index b103793..0000000
--- a/graphics-libs/mesalib/CONFLICTS
+++ /dev/null
@@ -1,5 +0,0 @@
-conflicts xfree86 &&
-conflicts xfree86-libs &&
-conflicts xfree86-devel &&
-conflicts xfree86-4.3 &&
-conflicts xdirectfb
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index a43eb33..6c75262 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,15 +16,11 @@ depends libxau &&
depends libxfixes &&
depends glproto &&

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

-if is_depends_enabled $SPELL libxcb;then
- sub_depends libx11 XCB
-fi &&
-
if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243
]]; then
force_depends libdrm
fi &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 5ab068b..e1114dd 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -24,7 +24,7 @@ case $MESALIB_VER in
VERSION=7.7.1
;;
developement)
- VERSION=7.8
+ VERSION=7.8.1
;;
git)
if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index c1b0ec7..add8be9 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,14 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow requiring non-stable (e.g. for new
+ xf86-video-ati which needs the new KMS code)
+ * DEPENDS: Move sub_depends into a -sub
+
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated MESALIB_VER=developement to 7.8.1
+
+2010-04-03 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD: removed sedit, none X11R6 in dri_glx.c (7.5.2, 7.7.1,
7.8)
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated MESALIB_VER=feature to 7.7.1
updated MESALIB_VER=developement to 7.8
diff --git a/graphics-libs/mesalib/MesaLib-7.8.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.8.1.tar.bz2.sig
new file mode 100644
index 0000000..bef9ea9
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.8.1.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig
deleted file mode 100644
index 578beac..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.8.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index e85cad4..7f30ea9 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -30,10 +30,6 @@ cd ${SOURCE_DIRECTORY}/docs
&&
sedit "s:/X11R6::g" install.html &&
cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri &&
sedit "s:/X11R6::g" Makefile.template &&
-if [[ $MESALIB_VER != "git" ]]; then
- cd ${SOURCE_DIRECTORY}/src/glx/x11
- sedit "s:/X11R6::g" dri_glx.c
-fi &&
cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile &&

diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index bf78a14..5408815 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
esac
return 1
diff --git a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5408815
--- /dev/null
+++ b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+ DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
+esac
+return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index 14ed565..f2daf38 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,4 +1,14 @@
case $THIS_SUB_DEPENDS in
+ NONSTABLE)
+ if [[ "$MESALIB_VER" == "stable" ]]; then
+ MESALIB_VER="feature" &&
+ persistent_add MESALIB_VER &&
+ message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mesalib${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}feature${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}branch."
+ fi
+ ;;
+
DRI)
MESALIB_BUILD=dri &&
persistent_add MESALIB_BUILD &&
@@ -25,5 +35,5 @@ case $THIS_SUB_DEPENDS in
fi
fi ;;

- *) echo "Unknown sub_depends!"; return 1 ;;
+ *) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
esac
diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index 3e1ee83..e013b8d 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1,6 +1 @@
-if is_depends_enabled $SPELL devil; then
- OPTS="--disable-freeimage $OPTS"
-fi &&
-
-OPTS="$OGRE_DOUBLE $OPTS" &&
-default_build
+cmake_build
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index 6cfb3d4..cd83286 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,15 +1,20 @@
SPELL=ogre
- VERSION=1-6-2
- SOURCE=$SPELL-v$VERSION.tar.bz2
+ VERSION=1-7-0
+ SOURCE=$SPELL-v${VERSION}p1.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogre
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
#
SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:9d7870bb1721bb9570dcde21099f83239d30eeaa620ebd46690175477531557b3f0c8ec827a9eb9a3ad2bfa35d6c459a1f737e1780d9589892d47b17b1bbaa1a
LICENSE[0]=LGPL
WEB_SITE=http://www.ogre3d.org/
KEYWORDS="graphics libs"
ENTERED=20031008
SHORT="Object-Oriented Graphics Rendering Engine"
cat << EOF
-OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible 3D engine written in C++ designed to make it easier and more
intuitive for developers to produce games and demos utilising 3D hardware.
The class library abstracts all the details of using the underlying system
libraries like Direct3D and OpenGL and provides an interface based on world
objects and other intuitive classes.
+OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible
+3D engine written in C++ designed to make it easier and more intuitive
+for developers to produce games and demos utilising 3D hardware. The class
+library abstracts all the details of using the underlying system libraries
+like Direct3D and OpenGL and provides an interface based on world objects
+and other intuitive classes.
EOF
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 1732f08..5ae7c44 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,8 @@
+2010-04-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 1-7-0
+ fixed long description wrap
+ fixed WEB_SITE
+
2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1-6-2
SOURCE no longer includes linux_osx-
diff --git a/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
b/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
deleted file mode 100644
index b2d9e09..0000000
Binary files a/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig and /dev/null differ
diff --git a/graphics/feh/BUILD b/graphics/feh/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/graphics/feh/BUILD
@@ -0,0 +1 @@
+make
diff --git a/graphics/feh/DETAILS b/graphics/feh/DETAILS
index ba8db97..cab9a93 100755
--- a/graphics/feh/DETAILS
+++ b/graphics/feh/DETAILS
@@ -1,11 +1,11 @@
SPELL=feh
- VERSION=1.4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.4.2
+ SOURCE=$SPELL-$VERSION.tar
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://derf.homelinux.org/~derf/projects/feh/$SOURCE
+ SOURCE_URL[0]=http://git.illdefined.org/~derf/feh/snapshot/$SOURCE
WEB_SITE=https://derf.homelinux.org/~derf/projects/feh/
ENTERED=20011101
-
SOURCE_HASH=sha512:de90f8c4ba898db129476d0f77aa3676bb5924d9ceeba32280d7d7af755a0047354ba7b76c021b5e1f970813eda279e0d267a446e52695c195cdd00abe07f060
+
SOURCE_HASH=sha512:9922db4bafb5df8a47bdccb5561b8bcf71c0eaf6841c9fe5de7ad5fe27545bc61790e65116080a951593dc71e3c2ffb2bff985cecbd658fee37dadddd541d4b0
LICENSE[0]=GPL
PATCHLEVEL=0
KEYWORDS="graphics"
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index d431255..bbc9321 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,10 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: removed SOURCE_HINTS, new SOURCE and SOURCE_URL[0] #15638
+
+2010-04-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.2, added SOURCE_HINTS=no-check-certificate #15638
+ * PRE_BUILD, BUILD: autoconf replaced by config.mk
+
2010-03-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4, gz -> bz2, updated WEB_SITE and SOURCE_URL[0]

diff --git a/graphics/feh/PRE_BUILD b/graphics/feh/PRE_BUILD
index a011569..aac2cb5 100755
--- a/graphics/feh/PRE_BUILD
+++ b/graphics/feh/PRE_BUILD
@@ -1,5 +1,3 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit '15s/prefix/datadir/' Makefile.am &&
-sedit '93s/prefix/datadir/' Makefile.in
-
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "s:/usr/local:/usr:" config.mk
diff --git a/graphics/gscan2pdf/DETAILS b/graphics/gscan2pdf/DETAILS
index b21261d..c71d81d 100755
--- a/graphics/gscan2pdf/DETAILS
+++ b/graphics/gscan2pdf/DETAILS
@@ -1,6 +1,6 @@
SPELL=gscan2pdf
- VERSION=0.9.29
-
SOURCE_HASH=sha512:7deeeba35af8a08986f0f07673504bb54dff2eb61290e2495953a28eff1173aea479a07106a06310913242cd96a40958d47443096baf40eac9dc1fe0d86ddbd6
+ VERSION=0.9.30
+
SOURCE_HASH=sha512:d445c94c8a0c86031da9812b708aaf3dc26f9106f216797a3a8a2a94069f0e7e241210370da67f5f93fb2d59c65ca59b2aea1a2cdb8d704b823ee15a4ad71356
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/graphics/gscan2pdf/HISTORY b/graphics/gscan2pdf/HISTORY
index f1f704c..0611781 100644
--- a/graphics/gscan2pdf/HISTORY
+++ b/graphics/gscan2pdf/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.30
+
2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.29

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 9cce9a4..5e73348 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.6.0-8
+ VERSION=6.6.0-10
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 95c9690..83bb624 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.6.0-10
+
2010-03-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 6.6.0-8

diff --git a/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig
new file mode 100644
index 0000000..6e23bb5
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.6.0-10.tar.bz2.sig differ
diff --git a/graphics/imagemagick/ImageMagick-6.6.0-8.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.0-8.tar.bz2.sig
deleted file mode 100644
index 7cea096..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.6.0-8.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/showimg/DEPENDS b/graphics/showimg/DEPENDS
index fba8c95..1e5f144 100755
--- a/graphics/showimg/DEPENDS
+++ b/graphics/showimg/DEPENDS
@@ -20,7 +20,7 @@ optional_depends libkipi \
"--disable-libkipi" \
"to build the kipi plugin" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"to build the mysql plugin"
diff --git a/graphics/showimg/HISTORY b/graphics/showimg/HISTORY
index ff4daa5..792a49a 100644
--- a/graphics/showimg/HISTORY
+++ b/graphics/showimg/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 622ea29..b6b693a 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.6.2
+ VERSION=3.6.3
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.2
+ VERSION=3.6.3
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,7 +17,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=30
+ SECURITY_PATCH=31
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index fff3109..1d74b06 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.6.3. SECURITY_PATCH++
+
2010-03-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.2, SECURITY_PATCH=30

diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index e70e36b..1e390b0 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -99,7 +99,7 @@ optional_depends docbook-utils
\
"--disable-docbook" \
"Enable support for building documentation" &&

-optional_depends openssh \
+optional_depends libssh \
"--enable-ssh" \
"--disable-ssh" \
"Enable using SSH for network communication" &&
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index ee20077..66f283f 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: openssh -> libssh
+
2010-02-19 Pol Vinogradov <vin.public AT gmail.com>
* CONFIGURE, BUILD: moved OPTS modifying code to BUILD according
policy
* DEPENDS: fixed cairo double dependency
diff --git a/http/lighttpd/DEPENDS b/http/lighttpd/DEPENDS
index 314c90e..87bb215 100755
--- a/http/lighttpd/DEPENDS
+++ b/http/lighttpd/DEPENDS
@@ -13,7 +13,7 @@ optional_depends openldap \
optional_depends openssl \
'--with-openssl' '--without-openssl' \
'for OpenSSL support' &&
-optional_depends mysql \
+optional_depends MYSQL \
'--with-mysql' '--without-mysql' \
'for MySQL support' &&
optional_depends gdbm \
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 62da7c0..d273be1 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* CONFIGURE: query for patch
* PRE_BUILD: optionally apply patch
diff --git a/http/oscommerce/DEPENDS b/http/oscommerce/DEPENDS
index 939366f..1f9bbef 100755
--- a/http/oscommerce/DEPENDS
+++ b/http/oscommerce/DEPENDS
@@ -1,5 +1,5 @@
depends php &&
-depends mysql &&
+depends MYSQL &&

if [ "$CVS" == "y" ]; then
depends CVS
diff --git a/http/oscommerce/HISTORY b/http/oscommerce/HISTORY
index 1c7821c..067b64b 100644
--- a/http/oscommerce/HISTORY
+++ b/http/oscommerce/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/http/phorsale/DEPENDS b/http/phorsale/DEPENDS
index d495e31..f9e31fc 100755
--- a/http/phorsale/DEPENDS
+++ b/http/phorsale/DEPENDS
@@ -1,2 +1,2 @@
depends php &&
-depends mysql
+depends MYSQL
diff --git a/http/phorsale/HISTORY b/http/phorsale/HISTORY
index b5897e9..9e60122 100644
--- a/http/phorsale/HISTORY
+++ b/http/phorsale/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/http/phpshop/DEPENDS b/http/phpshop/DEPENDS
index e68084d..1216f8d 100755
--- a/http/phpshop/DEPENDS
+++ b/http/phpshop/DEPENDS
@@ -1,2 +1,2 @@
-depends mysql &&
+depends MYSQL &&
depends php
diff --git a/http/phpshop/HISTORY b/http/phpshop/HISTORY
index a4d225e..51a81ab 100644
--- a/http/phpshop/HISTORY
+++ b/http/phpshop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 4f846b7..291872f 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
SPELL=squid
- VERSION=3.0.STABLE23
+ VERSION=3.1.1
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
#
SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
# SOURCE_GPG=squid.gpg:$SOURCE2
-
SOURCE_HASH=sha512:ca3f59f5cf76d15d8ac5877e4dda888f77c74824c87e382c270202c2f79c5cceb4ab72841cdc8f917aeebad5fd16e7adf7b0e3ff2e9e654bb8f4827af2e949e8
+
SOURCE_HASH=sha512:83fc3332ce9b1cfdad6d44c8b9561d0fd9079b56d66172c5119856b937c72ff39271be14e0a6e5bc954a906d50599b9befc7e5bb74e8d74fa489daf165c13326
WEB_SITE=http://www.squid-cache.org/
ENTERED=20011214
SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 88c1f04..e6935d2 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.1.1
+
2010-02-04 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.0.STABLE23

diff --git a/http/uzbl/DEPENDS b/http/uzbl/DEPENDS
index ba9cbbf..27cdd0f 100755
--- a/http/uzbl/DEPENDS
+++ b/http/uzbl/DEPENDS
@@ -4,7 +4,6 @@ depends git
fi &&
depends pkgconfig &&
depends webkitgtk &&
-simple_version_check_force_depends webkitgtk 1115 4
depends gtk+2 &&
depends libxt &&
suggest_depends dmenu \
diff --git a/http/uzbl/DETAILS b/http/uzbl/DETAILS
index dda0e39..8ba28af 100755
--- a/http/uzbl/DETAILS
+++ b/http/uzbl/DETAILS
@@ -11,10 +11,10 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION=2010.03.14
- VERGITHASH=38ef86e
+ VERSION=2010.04.03
+ VERGITHASH=ae15d25
SOURCE="Dieterbe-${SPELL}-$VERGITHASH.tar.gz"
-
SOURCE_HASH=sha512:d90cd65b8617a85eba92abbf2173d5786ef801f8703197fe050fdeee0304d9c89b561379f83c9e2c85ba008887f77e37c2e311ea34dffb43fd34c0d014a9c7ea
+
SOURCE_HASH=sha512:048cdfae669980fabed2e3f2b1d825ed02dc3317c2564ac1599fb2a37e6fdacc703b8893dd4230ee49d20f9898f56504d7a9eeead365a8633dce4d7f16712112
SOURCE_URL[0]=http://github.com/Dieterbe/uzbl/tarball/$VERSION
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Dieterbe-${SPELL}-$VERGITHASH"
fi
diff --git a/http/uzbl/HISTORY b/http/uzbl/HISTORY
index dd49110..d82c606 100644
--- a/http/uzbl/HISTORY
+++ b/http/uzbl/HISTORY
@@ -1,3 +1,13 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: removed simple_version_check_force_depends
+
+2010-04-06 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: correct URL
+
+2010-04-04 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2010.04.01
+
2009-10-22 Quentin Rameau <quinq AT sourcemage.org>
* BUILD, INSTALL: switched var DESTDIR with PREFIX

diff --git a/http/w3c-libwww/DEPENDS b/http/w3c-libwww/DEPENDS
index f88ff37..41c8205 100755
--- a/http/w3c-libwww/DEPENDS
+++ b/http/w3c-libwww/DEPENDS
@@ -1,5 +1,5 @@
optional_depends "zlib" "--with-zlib=z" "--without-zlib" "for zlib
compression" &&
-optional_depends "mysql" "--with-mysql" "--without-mysql" "for mysql
access" &&
+optional_depends "MYSQL" "--with-mysql" "--without-mysql" "for mysql
access" &&
optional_depends "openssl" "--with-ssl" "--without-ssl" "for SSL
support"

# expat breaks liboop
diff --git a/http/w3c-libwww/HISTORY b/http/w3c-libwww/HISTORY
index f1b423b..d5f9354 100644
--- a/http/w3c-libwww/HISTORY
+++ b/http/w3c-libwww/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-10-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove irrelevant xorg-libs, it is never used
fix finding zlib
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index b70d2fb..b8403b4 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -11,11 +11,7 @@ depends bison &&
depends flex &&
depends sqlite &&

-if [[ "$WEBKITGTK_NIGHT" == "n" ]]; then
- depends libsoup
-else
- depends -sub SOUP_DEVEL libsoup
-fi
+depends libsoup &&

depends enchant &&

@@ -42,12 +38,10 @@ optional_depends gst-plugins-base \
"--disable-video" \
"for HTML5 streaming video support" &&

-if [[ WEBKITGTK_NIGHT == "y" ]]; then
- optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection"
-fi &&
+optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection" &&

optional_depends geoclue \
"--enable-geolocation" \
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index a08c0c2..049d9a2 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,15 +1,15 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.1.90
+ VERSION=1.2.0
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:4ab49f1e653f1fee65ee6ea156034984e2db6a0a95155552c6887e9ddcfabb8a71ad4528fa6f39b7e6363ecdeaa98d680096226e12260cbbfeecea528e3e91bf
+
SOURCE_HASH=sha512:21dd811892f867c5f7a203a7f37b9ec9a34dd75c45aacb32d5676ae9d7039496a931019ad795c2a2ba304c1ee19958b724617eee5feca910e59f7d2614294ab6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.1.15.4
+ VERSION=1.2.0
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:d845d3e70b6c21f958cd26e5f510dc3e5e462bcb867ca7ec7a9be73df2208cdc4dbef2615a75912e09606e08bf745b2395f903bfb676dab431f2933f01978ef5
+
SOURCE_HASH=sha512:21dd811892f867c5f7a203a7f37b9ec9a34dd75c45aacb32d5676ae9d7039496a931019ad795c2a2ba304c1ee19958b724617eee5feca910e59f7d2614294ab6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1b25576..e6680cf 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.0
+ * DEPENDS: used devel dependencies for both stable and devel now
+
2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS: added
WEBKIT_DEVEL sub dependency
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 5ea8c81..226a17f 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
SPELL=xulrunner
- VERSION=1.9.2.2
- FFVERSION=3.6.2
+ VERSION=1.9.2.3
+ FFVERSION=3.6.3
SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=12
+ SECURITY_PATCH=13
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index d2d9680..4fca0c8 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.9.2.3. SECURITY_PATCH++
+
2010-03-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.2.2, FFVERSION=3.6.2, SECURITY_PATCH=12
* PRE_BUILD, BUILD, INSTALL: $VERSION -> 1.9.2
diff --git a/kde-apps/kexi/DEPENDS b/kde-apps/kexi/DEPENDS
index 7a5744b..3e93a29 100755
--- a/kde-apps/kexi/DEPENDS
+++ b/kde-apps/kexi/DEPENDS
@@ -1,5 +1,5 @@
#depends koffice &&
-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"for MySQL plugin" &&
diff --git a/kde-apps/kexi/HISTORY b/kde-apps/kexi/HISTORY
index 3cc3548..73c0e13 100644
--- a/kde-apps/kexi/HISTORY
+++ b/kde-apps/kexi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-12-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.0

diff --git a/kde-apps/koffice/DEPENDS b/kde-apps/koffice/DEPENDS
index c886daa..b5f3a4f 100755
--- a/kde-apps/koffice/DEPENDS
+++ b/kde-apps/koffice/DEPENDS
@@ -3,7 +3,7 @@ depends which &&

source "$SECTION_DIRECTORY/KDE_DEPENDS" &&

-optional_depends mysql \
+optional_depends MYSQL \
'--enable-mysql' \
'--disable-mysql' \
'for MySQL plug-in' &&
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index 3513875..d5cf9f6 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/kde-apps/krecipes/DEPENDS b/kde-apps/krecipes/DEPENDS
index e0c26ab..3fd394a 100755
--- a/kde-apps/krecipes/DEPENDS
+++ b/kde-apps/krecipes/DEPENDS
@@ -7,7 +7,7 @@ optional_depends sqlite \
"" \
"for a simple database for storing recipes" &&

-optional_depends mysql \
+optional_depends MYSQL \
"" \
"" \
"to use MySQL as the database for storing recipes" &&
diff --git a/kde-apps/krecipes/HISTORY b/kde-apps/krecipes/HISTORY
index 9417664..4c3de5b 100644
--- a/kde-apps/krecipes/HISTORY
+++ b/kde-apps/krecipes/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
b/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
deleted file mode 100755
index 27ba77d..0000000
--- a/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde-core/kdepim/DEPENDS b/kde-core/kdepim/DEPENDS
index 6e203d0..dc21083 100755
--- a/kde-core/kdepim/DEPENDS
+++ b/kde-core/kdepim/DEPENDS
@@ -124,7 +124,7 @@ optional_depends POSTSCRIPT-INTERPRETER \
'' \
'for a PostScript(R) interpreter' &&

-optional_depends mysql \
+optional_depends MYSQL \
'' \
'' \
'for MySQL database support' &&
diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index 6d79d5c..8ca1cdb 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-02-18 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, inotify.patch: fix build; bad kernel header usage

diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index a7f7082..1e77a5d 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -13,7 +13,7 @@ optional_depends pstoedit '' '' 'Karbon eps import
filter' &&
# Kexi
depends bzip2 &&
optional_depends sqlite '' '' 'kexi database' &&
-optional_depends mysql '' '' 'import MySql to Kexi' &&
+optional_depends MYSQL '' '' 'import MySql to Kexi' &&
optional_depends postgresql '' '' 'import Postgresql to Kexi' &&
optional_depends xbase '' '' 'import dbase to Kexi' &&
#Krita
@@ -29,10 +29,10 @@ optional_depends glpk '' '' 'painterly mixer
plugin' &&
optional_depends tiff '' '' 'graphics support' &&
optional_depends create '' '' 'creative resources, brushes,
palettes etc' &&
#KPlato
-optional_depends kdepimlibs4 '' '' 'PIM support' &&
-#KPresenter
-optional_depends boost '' '' 'for KPresenter'
+optional_depends kdepimlibs4 '' '' 'PIM support'
fi &&
+#KPresenter
+optional_depends boost '' '' 'for KPresenter' &&
#KSpread
optional_depends eigen2 '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2'
'' \
'for KSpread' &&
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 3e85d14..5a25ca8 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,9 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
+2010-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: boost is also needed for the TINY configuration
+
2010-02-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional create

diff --git a/kde4-support/attica/DETAILS b/kde4-support/attica/DETAILS
index b9d0c1f..95ff1a5 100755
--- a/kde4-support/attica/DETAILS
+++ b/kde4-support/attica/DETAILS
@@ -1,6 +1,6 @@
SPELL=attica
- VERSION=0.1.2
-
SOURCE_HASH=sha512:7662cc3808b89ae06915a5e484e716b2328fb4254631756f5e4eb3aed44659d2cb2015a4fb491da2eecc5c1b545254a521a21e50dafcbfea1046103a5c2431d6
+ VERSION=0.1.3
+
SOURCE_HASH=sha512:956920d24805b14fe50ce2b3453306f7dfad48f55291209194d2a2472ad018e9e9ffab066808c870f56d41a10d556dbf681465e1e7745c59d33fc735f830fb43
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/attica/$SOURCE
diff --git a/kde4-support/attica/HISTORY b/kde4-support/attica/HISTORY
index fe86e6a..d1ebd75 100644
--- a/kde4-support/attica/HISTORY
+++ b/kde4-support/attica/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.3
+
2010-01-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.2

diff --git a/kde4-support/shared-desktop-ontologies/DETAILS
b/kde4-support/shared-desktop-ontologies/DETAILS
index e836209..75f27db 100755
--- a/kde4-support/shared-desktop-ontologies/DETAILS
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -3,7 +3,7 @@

SOURCE_HASH=sha512:1487b2dda49a9044fc96f03fb3492fa76e2181b3d22e664103950758eb8f51357deec1d0746cc8097827d2d5a7f6845ac7e427c977f584a40efea938ff0e9813
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/oscaf/$SPELL/$VERSION/$SOURCE
WEB_SITE=http://sourceforge.net/projects/oscaf
LICENSE[0]=BSD
LICENSE[1]=BY-CC
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY
b/kde4-support/shared-desktop-ontologies/HISTORY
index 76f615a..009889d 100644
--- a/kde4-support/shared-desktop-ontologies/HISTORY
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_URL, bug #15639
+
2010-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3

diff --git a/kde4/kdevelop4/DETAILS b/kde4/kdevelop4/DETAILS
index 4311bf1..f65d8a0 100755
--- a/kde4/kdevelop4/DETAILS
+++ b/kde4/kdevelop4/DETAILS
@@ -1,7 +1,7 @@
SPELL=kdevelop4
SPELLX=${SPELL//4}
- VERSION=3.9.99
-
SOURCE_HASH=sha512:9b669703ec0a2d5d2da6935957e55847ead342fa58b46195d1959c4c8fc5078b93257b02a24b2dc0a2d48e457c4247d4d36ed9ca01c9e409683ba7601fcae2d9
+ VERSION=3.10.0
+
SOURCE_HASH=sha512:170f450d737c17a6f4e431be39e817a068125558b542699b8d2b4473d7bb9fb65ae1e341b15ea57744d4ef27dd61d29a8f0b2ffdd65169952a64c19a5a9866f4
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/unstable/$SPELLX/$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevelop4/HISTORY b/kde4/kdevelop4/HISTORY
index 3b5a3e6..938c859 100644
--- a/kde4/kdevelop4/HISTORY
+++ b/kde4/kdevelop4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.10.0
+
2010-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.9.99

diff --git a/kde4/kdevplatform4/DETAILS b/kde4/kdevplatform4/DETAILS
index 09013a2..669431a 100755
--- a/kde4/kdevplatform4/DETAILS
+++ b/kde4/kdevplatform4/DETAILS
@@ -1,8 +1,8 @@
SPELL=kdevplatform4
SPELLX=${SPELL//4}
- VERSION=0.9.99
- VX=3.9.99
-
SOURCE_HASH=sha512:3c2d2ad0c2fa5b7955712f7e2f4e0393d46ced22a46c9eac45d81cb9f372c4446304f053cbae7e649de7ddc6c1de22b8028ddc515238b4520f647c4dda9f605e
+ VERSION=0.10.0
+ VX=3.10.0
+
SOURCE_HASH=sha512:c3dc6ebf605ab94718fdced4a5c9c3a82f8f75e08d37b8972f193895bbabf86cce2ba7fbad5122627961b8acf7d617d6d3b3057c9efee4b9a5be2c2cac1c36f5
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/unstable/kdevelop/$VX/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdevplatform4/HISTORY b/kde4/kdevplatform4/HISTORY
index dd106f1..af10c37 100644
--- a/kde4/kdevplatform4/HISTORY
+++ b/kde4/kdevplatform4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 0.10.0
+
2010-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 0.9.99

diff --git a/kernels/dazukofs/DETAILS b/kernels/dazukofs/DETAILS
index 6d01e7d..1a835bb 100755
--- a/kernels/dazukofs/DETAILS
+++ b/kernels/dazukofs/DETAILS
@@ -1,5 +1,5 @@
SPELL=dazukofs
- VERSION=3.1.3-rc1
+ VERSION=3.1.3-rc2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dazuko.dnsalias.org/files/$SOURCE
diff --git a/kernels/dazukofs/HISTORY b/kernels/dazukofs/HISTORY
index adc7715..7ad7340 100644
--- a/kernels/dazukofs/HISTORY
+++ b/kernels/dazukofs/HISTORY
@@ -1,4 +1,8 @@
-2019-03-19 Treeve Jelbert <treeve AT sourcemage.org>
+2010-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.3-rc2
+ * PRE_BUILD, fs.diff: deleted
+
+2010-03-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.3-rc1
* fs.diff: added, fix compilation with gcc-4.4.3
* PRE_BUILD: apply patch
diff --git a/kernels/dazukofs/PRE_BUILD b/kernels/dazukofs/PRE_BUILD
deleted file mode 100755
index f00bb99..0000000
--- a/kernels/dazukofs/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix for extra parameter on call
-patch -p1 < $SPELL_DIRECTORY/fs.diff &&
-
-# fix to allow compile during kernel upgrade
-KVERS=$(get_kernel_version) &&
-sed -i "s/\`uname -r\`/$KVERS/;/depmod/D" Makefile
-
diff --git a/kernels/dazukofs/fs.diff b/kernels/dazukofs/fs.diff
deleted file mode 100644
index f7af3bb..0000000
--- a/kernels/dazukofs/fs.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr dazukofs-3.1.3-rc1/dentry.c dazukofs-3.1.3-rc1.cp//dentry.c
---- dazukofs-3.1.3-rc1/dentry.c 2009-06-28 22:16:38.000000000 +0200
-+++ dazukofs-3.1.3-rc1.cp//dentry.c 2010-03-09 19:26:29.000000000 +0100
-@@ -94,7 +94,7 @@
- /* update the inode, even if d_revalidate() != 1 */
- if (dentry->d_inode) {
- struct inode *lower_inode = get_lower_inode(dentry->d_inode);
-- fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
-+ fsstack_copy_attr_all(dentry->d_inode, lower_inode);
- }
- return valid;
- }
-diff -uNr dazukofs-3.1.3-rc1/inode.c dazukofs-3.1.3-rc1.cp//inode.c
---- dazukofs-3.1.3-rc1/inode.c 2009-06-28 22:17:09.000000000 +0200
-+++ dazukofs-3.1.3-rc1.cp//inode.c 2010-03-09 19:21:40.000000000 +0100
-@@ -129,7 +129,7 @@
- else
- d_instantiate(dentry, inode);
-
-- fsstack_copy_attr_all(inode, lower_inode, NULL);
-+ fsstack_copy_attr_all(inode, lower_inode);
- fsstack_copy_inode_size(inode, lower_inode);
- return 0;
- }
-@@ -487,7 +487,7 @@
- err = notify_change(lower_dentry, ia);
- mutex_unlock(&lower_inode->i_mutex);
-
-- fsstack_copy_attr_all(inode, lower_inode, NULL);
-+ fsstack_copy_attr_all(inode, lower_inode);
- fsstack_copy_inode_size(inode, lower_inode);
- return err;
- }
-@@ -520,7 +520,7 @@
- size, flags);
- mutex_unlock(&lower_dentry_inode->i_mutex);
-
-- fsstack_copy_attr_all(dentry->d_inode, lower_dentry_inode, NULL);
-+ fsstack_copy_attr_all(dentry->d_inode, lower_dentry_inode);
- fsstack_copy_inode_size(dentry->d_inode, lower_dentry_inode);
- out:
- return err;
-@@ -737,10 +737,9 @@
- if (err)
- goto out;
-
-- fsstack_copy_attr_all(new_dir, lower_new_dentry_parent_inode, NULL);
-+ fsstack_copy_attr_all(new_dir, lower_new_dentry_parent_inode);
- if (new_dir != old_dir)
-- fsstack_copy_attr_all(old_dir, lower_old_dentry_parent_inode,
-- NULL);
-+ fsstack_copy_attr_all(old_dir, lower_old_dentry_parent_inode);
- out:
- dput(lower_old_dentry_parent);
- dput(lower_new_dentry_parent);
diff --git a/kernels/xen-hypervisor/DETAILS b/kernels/xen-hypervisor/DETAILS
index 323755f..c9605d1 100755
--- a/kernels/xen-hypervisor/DETAILS
+++ b/kernels/xen-hypervisor/DETAILS
@@ -1,9 +1,9 @@
SPELL=xen-hypervisor
PACKAGE=xen
- VERSION=3.4.2
+ VERSION=4.0.0
SOURCE=${PACKAGE}-${VERSION}.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:d4af7572494fe251ac1c42f151e4f5052d222a5a371b3aed0a8dac3c76b3a2c8b810279389148a51404a266ba7542aa82f12e5439a98d22ba437be89d939b789
+# SOURCE_HASH=sha512:
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PACKAGE}-${VERSION}

SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/${VERSION}/${SOURCE}
WEB_SITE=http://www.xen.org
diff --git a/kernels/xen-hypervisor/HISTORY b/kernels/xen-hypervisor/HISTORY
index d6ed625..9729193 100644
--- a/kernels/xen-hypervisor/HISTORY
+++ b/kernels/xen-hypervisor/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 4.0.0
+
2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.4.2

diff --git a/kernels/xen-hypervisor/xen-3.4.2.tar.gz.sig
b/kernels/xen-hypervisor/xen-3.4.2.tar.gz.sig
deleted file mode 100644
index 94d6de3..0000000
Binary files a/kernels/xen-hypervisor/xen-3.4.2.tar.gz.sig and /dev/null
differ
diff --git a/kernels/xen-hypervisor/xen-4.0.0.tar.gz.sig
b/kernels/xen-hypervisor/xen-4.0.0.tar.gz.sig
new file mode 100644
index 0000000..93f27df
Binary files /dev/null and b/kernels/xen-hypervisor/xen-4.0.0.tar.gz.sig
differ
diff --git a/latex/cd/DETAILS b/latex/cd/DETAILS
index 732a1ce..94a478b 100755
--- a/latex/cd/DETAILS
+++ b/latex/cd/DETAILS
@@ -1,14 +1,13 @@
SPELL=cd
VERSION=1.0
- SOURCE=$SPELL.tar.gz
+ SOURCE=$SPELL.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$CTAN_URL/macros/latex/contrib/$SOURCE
SOURCE_URL[1]=ftp://ftp.dante.de/tex-archive/macros/latex/contrib/$SOURCE
SOURCE_IGNORE=unversioned
FORCE_DOWNLOAD=on
- WEB_SITE=http://gongolo.usr.dsi.unimi.it/~vigna/cd/
+
WEB_SITE=http://www.ctan.org/tex-archive/help/Catalogue/entries/cd.html
ENTERED=20020520
- UPDATED=20020813
LICENSE=GPL
KEYWORDS="tex doc"
SHORT="TeX macros for making CD covers"
diff --git a/latex/cd/HISTORY b/latex/cd/HISTORY
index a74e3b6..6fa3cea 100644
--- a/latex/cd/HISTORY
+++ b/latex/cd/HISTORY
@@ -1,5 +1,11 @@
+2010-04-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: changed SOURCE to .zip
+ updated spell to 1.0
+ Website dead so changed to page on ctan
+ Removed UPDATED
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * DEPENDS: switch from tetex to texlive [auto]
+ * DEPENDS: switch from tetex to texlive [auto]

2007-03-24 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DETAILS: SOURCE_IGNORE=unversioned, FORCE_DOWNLOAD=on (bug 12274)
diff --git a/libs/boost/REPAIR^all^SUB_DEPENDS
b/libs/boost/REPAIR^all^SUB_DEPENDS
deleted file mode 100755
index ee55fdc..0000000
--- a/libs/boost/REPAIR^all^SUB_DEPENDS
+++ /dev/null
@@ -1,25 +0,0 @@
-persistent_add BOOST_LIBS
-case $THIS_SUB_DEPENDS in
- PROGRAM_OPTIONS) list_add BOOST_LIBS program_options ;;
- FUNCTION_TYPES) list_add BOOST_LIBS function_types ;;
- SERIALIZATION) list_add BOOST_LIBS serialization ;;
- FILESYSTEM) list_add BOOST_LIBS filesystem ;;
- STATECHART) list_add BOOST_LIBS statechart ;;
- DATE_TIME) list_add BOOST_LIBS date_time ;;
- IOSTREAMS) list_add BOOST_LIBS iostreams ;;
- XPRESSIVE) list_add BOOST_LIBS xpressive ;;
- SIGNALS) list_add BOOST_LIBS signals ;;
- PYTHON) list_add BOOST_LIBS python &&
- depends python ;;
- SYSTEM) list_add BOOST_LIBS system ;;
- THREAD) list_add BOOST_LIBS thread ;;
- TYPEOF) list_add BOOST_LIBS typeof ;;
- GRAPH) list_add BOOST_LIBS graph ;;
- REGEX) list_add BOOST_LIBS regex ;;
- TEST) list_add BOOST_LIBS test ;;
- WAVE) list_add BOOST_LIBS wave ;;
- MPI) list_add BOOST_LIBS mpi ;;
- TR1) list_add BOOST_LIBS tr1 ;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index ff553e2..aec2e03 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,13 +1,13 @@
SPELL=icu
-#if [[ "$ICU_DEV" == 'y' ]]; then
-# VERSION=4.4
-# VX=${VERSION//.r/r}
-# SOURCE_HASH=sha512:
-#else
+if [[ "$ICU_DEV" == 'y' ]]; then
VERSION=4.4
- VX=$VERSION

SOURCE_HASH=sha512:b137751b3859b5482a4f1397ea1c8b343c658289e4fcea6740b160c8a99dac1a39dcb80c0dcd5fcae7cbf7bd3f1d73189fffd2c428ba6f43ad82994d9a21739b
-#fi
+ VX=${VERSION//.r/r}
+else
+ VERSION=4.2.1
+ VX=$VERSION
+
SOURCE_HASH=sha512:c2ec0edbdb9a5790e88f7b09c96b31f9b2120bed0c1a575cdabbcc1f9281e6cb137b44707d0ad44f794e6c9abde64c6b76d8cf4818d51459d3fb11c2e10e01dc
+fi
SPELLX=icu4c
VERSIONX=${VERSION//./_}
SOURCE=$SPELLX-$VERSIONX-src.tgz
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 8d25981..8ddd13b 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,5 +1,5 @@
-2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.4 (both)
+2010-0-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4 (devel)

2010-03-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.rc1 (devel)
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 9149969..f5a97ab 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.19
+ VERSION=2.4.20
#
SOURCE_HASH=sha512:92ee0c40396c77fd32570660bfc3358a76fed46cb4d918809dd295c76b032d01658156aa715896547de2bed68bab5cfa79e76481f25f5f5c4d44c2e02f6b94fd
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 816bcdf..84709eb 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.20
+
2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.4.19
* BUILD: Radeon KMS API is no longer experimental
diff --git a/libs/libdrm/libdrm-2.4.19.tar.bz2.sig
b/libs/libdrm/libdrm-2.4.19.tar.bz2.sig
deleted file mode 100644
index 5647784..0000000
Binary files a/libs/libdrm/libdrm-2.4.19.tar.bz2.sig and /dev/null differ
diff --git a/libs/libdrm/libdrm-2.4.20.tar.bz2.sig
b/libs/libdrm/libdrm-2.4.20.tar.bz2.sig
new file mode 100644
index 0000000..4e8feba
Binary files /dev/null and b/libs/libdrm/libdrm-2.4.20.tar.bz2.sig differ
diff --git a/libs/libgksu/DEPENDS b/libs/libgksu/DEPENDS
index f6350ba..0704657 100755
--- a/libs/libgksu/DEPENDS
+++ b/libs/libgksu/DEPENDS
@@ -1,9 +1,8 @@
-depends bison &&
depends libgtop2 &&
depends gconf2 &&
-depends libglade2 &&
depends startup-notification &&
depends libgnome-keyring &&
+depends gtk+2 &&

optional_depends gtk-doc \
"--enable-gtk-doc" \
diff --git a/libs/libgksu/HISTORY b/libs/libgksu/HISTORY
index d87cb8a..8a76157 100644
--- a/libs/libgksu/HISTORY
+++ b/libs/libgksu/HISTORY
@@ -1,3 +1,6 @@
+2010-04-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed bison, libglade2, added gtk+2
+
2010-02-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: removed optional gnome-keyring, added libgnome-keyring

diff --git a/libs/mysqlcppapi/DEPENDS b/libs/mysqlcppapi/DEPENDS
index 15bcf0f..389919b 100755
--- a/libs/mysqlcppapi/DEPENDS
+++ b/libs/mysqlcppapi/DEPENDS
@@ -1 +1 @@
-depends mysql
\ No newline at end of file
+depends MYSQL
\ No newline at end of file
diff --git a/libs/mysqlcppapi/HISTORY b/libs/mysqlcppapi/HISTORY
index 9a57311..22080d8 100644
--- a/libs/mysqlcppapi/HISTORY
+++ b/libs/mysqlcppapi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/poco/DEPENDS b/libs/poco/DEPENDS
index b500193..a8c65a6 100755
--- a/libs/poco/DEPENDS
+++ b/libs/poco/DEPENDS
@@ -6,7 +6,7 @@ optional_depends ODBC-MGR \
"" \
"" \
"to build Data/ODBC support" &&
-optional_depends mysql \
+optional_depends MYSQL \
"" \
"" \
"to build Data/MySQL support" &&
diff --git a/libs/poco/HISTORY b/libs/poco/HISTORY
index f0003b5..9f1a856 100644
--- a/libs/poco/HISTORY
+++ b/libs/poco/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-06-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.5

diff --git a/libs/redland/DEPENDS b/libs/redland/DEPENDS
index a1691c4..d4b5b30 100755
--- a/libs/redland/DEPENDS
+++ b/libs/redland/DEPENDS
@@ -18,7 +18,7 @@ optional_depends postgresql \
"--with-postgresql=no" \
"Enable postgresql store" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql=yes" \
"--with-mysql=no" \
"Enable Mysql store" &&
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index e7a28f8..fb9b82a 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD, virt.diff.bz2: added
diff --git a/libs/upower/DEPENDS b/libs/upower/DEPENDS
new file mode 100755
index 0000000..36488d1
--- /dev/null
+++ b/libs/upower/DEPENDS
@@ -0,0 +1,5 @@
+depends glib2 &&
+depends dbus &&
+depends dbus-glib &&
+depends policykit &&
+depends -sub EXTRAS udev
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
new file mode 100755
index 0000000..603fb7e
--- /dev/null
+++ b/libs/upower/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=upower
+ VERSION=0.9.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://upower.freedesktop.org/releases/$SOURCE
+ LICENSE[0]=GPL
+ WEB_SITE=http://upower.freedesktop.org/
+ ENTERED=20100407
+ SHORT="abstraction for enumerating power devices"
+cat << EOF
+UPower is an abstraction for enumerating power devices, listening to device
+events and querying history and statistics. Any application or service on the
+system can access the org.freedesktop.UPower service via the system message
bus.
+Some operations (such as suspending the system) are restricted using
PolicyKit.
+EOF
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
new file mode 100644
index 0000000..025da62
--- /dev/null
+++ b/libs/upower/HISTORY
@@ -0,0 +1,3 @@
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.9.2
+
diff --git a/libs/upower/upower-0.9.2.tar.bz2.sig
b/libs/upower/upower-0.9.2.tar.bz2.sig
new file mode 100644
index 0000000..00a3395
Binary files /dev/null and b/libs/upower/upower-0.9.2.tar.bz2.sig differ
diff --git a/libs/xmltv/DEPENDS b/libs/xmltv/DEPENDS
index a599df2..af0cc2c 100755
--- a/libs/xmltv/DEPENDS
+++ b/libs/xmltv/DEPENDS
@@ -4,6 +4,7 @@ depends xml-twig &&
depends xml-writer &&
depends date-manip &&
depends term-readkey &&
+depends file-slurp &&
optional_depends soap-lite \
'' \
'' \
diff --git a/libs/xmltv/DETAILS b/libs/xmltv/DETAILS
index 2bc518d..29f3204 100755
--- a/libs/xmltv/DETAILS
+++ b/libs/xmltv/DETAILS
@@ -1,6 +1,6 @@
SPELL=xmltv
- VERSION=0.5.53
-
SOURCE_HASH=sha512:7eb62e2eedc5c1e197498bcf9530c2db37b69e2744c4144f81d58296e6f63b4b9f2983700036db561bc4f0f31f6fa1bca8dd18411b6031001d07fde0bfbe7554
+ VERSION=0.5.56
+
SOURCE_HASH=sha512:ae43d8348b0658485330a6eae4f69278278ba95185c1bc2b3ef1ab18380b8b8c6aabb583fff23601d92a073b65af64a33f37276b83794f5ff5d8ccca79a4f7de
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/$SOURCE
diff --git a/libs/xmltv/HISTORY b/libs/xmltv/HISTORY
index 3369b65..7246f76 100644
--- a/libs/xmltv/HISTORY
+++ b/libs/xmltv/HISTORY
@@ -1,3 +1,7 @@
+2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.56
+ * DEPENDS: add file-slurp
+
2008-09-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.51

diff --git a/mail/anubis/DEPENDS b/mail/anubis/DEPENDS
index ea538c5..95df8a8 100755
--- a/mail/anubis/DEPENDS
+++ b/mail/anubis/DEPENDS
@@ -32,7 +32,7 @@ fi &&

if [[ ${ANUBIS_DB} == "mysql" ]]
then
- depends mysql "--without-postgres --with-mysql --without-gdbm"
+ depends MYSQL "--without-postgres --with-mysql --without-gdbm"
elif [[ ${ANUBIS_DB} == "postgresql" ]]
then
depends postgresql "--with-postgres --without-mysql --without-gdbm"
diff --git a/mail/anubis/HISTORY b/mail/anubis/HISTORY
index 68176aa..a2c9dec 100644
--- a/mail/anubis/HISTORY
+++ b/mail/anubis/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/anubis: made it non-sh, bug #13702

diff --git a/mail/courier-authlib/DEPENDS b/mail/courier-authlib/DEPENDS
index c713caf..1441668 100755
--- a/mail/courier-authlib/DEPENDS
+++ b/mail/courier-authlib/DEPENDS
@@ -22,7 +22,7 @@ optional_depends openldap
\
"--without-authldap" \
"to use OpenLDAP for authentication" &&

-optional_depends mysql \
+optional_depends MYSQL \
"" \
"--without-authmysql" \
"to use a MySQL database for authentication" &&
diff --git a/mail/courier-authlib/HISTORY b/mail/courier-authlib/HISTORY
index 35b4ec0..6829e54 100644
--- a/mail/courier-authlib/HISTORY
+++ b/mail/courier-authlib/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/courier-authlib: made it non-sh, bug #13702

diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index e6d5a2f..44960c3 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -38,7 +38,7 @@ optional_depends openldap \
'--with-ldap=yes' \
'--without-ldap' \
'Enable LDAP support' &&
-optional_depends mysql \
+optional_depends MYSQL \
'--with-mysql' \
'--without-mysql' \
'for MySQL support' &&
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 6657704..8990bc6 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-16 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 1.2.11

diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 2c788da..3000063 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -1,7 +1,7 @@
depends automake &&

if [[ "$DSPAM_SQLITE" == y ]]; then depends sqlite ; fi &&
-if [[ "$DSPAM_MYSQL" == y ]]; then depends mysql ; fi &&
+if [[ "$DSPAM_MYSQL" == y ]]; then depends MYSQL ; fi &&
if [[ "$DSPAM_PGSQL" == y ]]; then depends postgresql; fi &&

if [[ "$DSPAM_GD" == y ]]; then
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 389bd00..b64c928 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* PREPARE: updated for git and added the extra autoupdate query
* DETAILS: updated the scm to git, changed website
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 173401c..d69736c 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -37,7 +37,7 @@ optional_depends linux-pam
\
'--disable-linux-pam-auth' \
'for Linux Pluggable Authentication Module support' &&

-optional_depends mysql \
+optional_depends MYSQL \
'--enable-mysql-lookup' \
'--disable-mysql-lookup' \
'for MySQL-based SQL lookup tables' &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 9e734ca..92ea4f6 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-11-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 4.71

diff --git a/mail/maildrop/DEPENDS b/mail/maildrop/DEPENDS
index 829c5d8..5edcc15 100755
--- a/mail/maildrop/DEPENDS
+++ b/mail/maildrop/DEPENDS
@@ -18,7 +18,7 @@ then
""
\
"to store mail account configuration in an LDAP
database." &&

- optional_depends "mysql"
\
+ optional_depends "MYSQL"
\
""
\
""
\
"to store mail account configuration in a MySQL
database." &&
diff --git a/mail/maildrop/HISTORY b/mail/maildrop/HISTORY
index 0a55f7d..d286a47 100644
--- a/mail/maildrop/HISTORY
+++ b/mail/maildrop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-09-30 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 2.0.4; removed UPDATED

diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index 4d003d4..5fdfda3 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -58,11 +58,15 @@ for PATCH in ${REAL_PATCHES}; do
if [[ -x "${PATCH_DIRECTORY}/${PATCH}/PATCH_CONFIGURE" ]]; then
. "${PATCH_DIRECTORY}/${PATCH}/PATCH_CONFIGURE"
fi
-done
+done &&

if [[ "${BRANCH}" != "stable" ]]; then
config_query_option MUTT_OPTS "Enable the header cache?" \
"n" \
"--enable-hcache" \
- "--disable-hcache"
+ "--disable-hcache" &&
+ config_query_option MUTT_OPTS "Enable SMTP support?" \
+ "y" \
+ "--enable-smtp" \
+ "--disable-smtp"
fi
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index d21abb5..cc84ab0 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -13,7 +13,13 @@ fi &&
config_query_list TERMINAL_LIBRARY \
"Build against which terminal library?" \
ncurses slang &&
-TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --with-${TERMINAL_LIBRARY}" &&
+
+if [[ ${TERMINAL_LIBRARY} = "ncurses" ]]; then
+ TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --with-curses"
+else
+ TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --with-${TERMINAL_LIBRARY}"
+fi &&
+
depends "${TERMINAL_LIBRARY}" &&

optional_depends "gnupg" \
@@ -21,6 +27,11 @@ optional_depends "gnupg"
\
"--disable-pgp" \
"to support PGP signing and encrypting messages" &&

+optional_depends "ispell" \
+ "" \
+ "" \
+ "for spell checking" &&
+
if [[ "$BRANCH" != "stable" ]]; then
# Do NOT add --with-ssl here, that only works if POP/IMAP are used. This
is
# mostly just here to prompt for openssl if they don't have it and want
@@ -65,7 +76,7 @@ if list_find "${MUTT_OPTS}" "--enable-pop" || list_find
"${MUTT_OPTS}" "--enable
"to enable SSL support for POP/IMAP via gnutls" &&

optional_depends "cyrus-sasl" \
- "--with-sasl2" \
+ "--with-sasl" \
"" \
"to enable SASL2 authentication for POP/IMAP"
fi
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index 1281df4..b122bdf 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,9 @@
+2010-04-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFIGURE: added SMTP configure query
+ * DEPENDS: fixed cyrus-sasl configure opt
+ fixed ncurses configure opt (added an if statment, not sure this is
the best way)
+ added ispell opt depends
+
2010-03-29 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DETAILS, patches/compressed_folders/*: Updated devel to 1.5.20.
* PREPARE, patches/message_count/*: Removed dead message_count patch.
diff --git a/mail/postfix/DEPENDS b/mail/postfix/DEPENDS
index 674267c..4b23bf2 100755
--- a/mail/postfix/DEPENDS
+++ b/mail/postfix/DEPENDS
@@ -5,7 +5,7 @@ optional_depends sqlite \
"" "" \
"for SQLite support (via patch)" &&

-optional_depends mysql \
+optional_depends MYSQL \
"" "" \
"for MySQL support" &&

diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 303ff2e..b6cb906 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD, DEPENDS: added dovecot dependency; auth smtp users against
dovecot userdb

diff --git a/mail/teapop/DEPENDS b/mail/teapop/DEPENDS
index c5f2627..194557b 100755
--- a/mail/teapop/DEPENDS
+++ b/mail/teapop/DEPENDS
@@ -6,7 +6,7 @@ optional_depends "postgresql" \
"" \
"for Postgres support" &&

-optional_depends "mysql" \
+optional_depends "MYSQL" \
"--with-mysql=/usr" \
"" \
"for mysql support" &&
diff --git a/mail/teapop/HISTORY b/mail/teapop/HISTORY
index 43d7283..de00b91 100644
--- a/mail/teapop/HISTORY
+++ b/mail/teapop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2007-03-31 David Brown <dmlb2000 AT gmail.com>
* POST_INSTALL: removed /etc/services has pop3 in it by default now

diff --git a/mobile/gammu/DEPENDS b/mobile/gammu/DEPENDS
index e0f30c3..71329d2 100755
--- a/mobile/gammu/DEPENDS
+++ b/mobile/gammu/DEPENDS
@@ -5,7 +5,7 @@ optional_depends BLUEZ \
"" \
"-DWITH_Bluez=OFF" \
"for bluetooth connection support" &&
-optional_depends mysql \
+optional_depends MYSQL \
"" \
"" \
"for a database storage backend" &&
diff --git a/mobile/gammu/HISTORY b/mobile/gammu/HISTORY
index e98f88b..e56f794 100644
--- a/mobile/gammu/HISTORY
+++ b/mobile/gammu/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-12-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.26.1

diff --git a/mobile/gpsdrive/DEPENDS b/mobile/gpsdrive/DEPENDS
index a5b38f2..277b32a 100755
--- a/mobile/gpsdrive/DEPENDS
+++ b/mobile/gpsdrive/DEPENDS
@@ -1,6 +1,6 @@
depends pcre &&
depends gtk+2 &&
-optional_depends "mysql" \
+optional_depends "MYSQL" \
" " \
" " \
"to track and store locations" &&
diff --git a/mobile/gpsdrive/HISTORY b/mobile/gpsdrive/HISTORY
index d740a16..7eb9af4 100755
--- a/mobile/gpsdrive/HISTORY
+++ b/mobile/gpsdrive/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/bsd-finger/HISTORY b/net/bsd-finger/HISTORY
index 6e24b8f..371018a 100644
--- a/net/bsd-finger/HISTORY
+++ b/net/bsd-finger/HISTORY
@@ -1,3 +1,9 @@
+2010-04-08 Seth Woolley <seth AT swoolley.homeip.net>
+ * PRE_BUILD, -stat.patch:
+ remove needless symlink check for .plan,
+ add .signature support,
+ make 8-bit clean to support utf-8 out from server
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/bsd-finger/PRE_BUILD b/net/bsd-finger/PRE_BUILD
index 1b435fe..615748e 100755
--- a/net/bsd-finger/PRE_BUILD
+++ b/net/bsd-finger/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/bsd-finger-0.17.patch
+patch -p1 < $SCRIPT_DIRECTORY/bsd-finger-0.17.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/bsd-finger-0.17-stat.patch
diff --git a/net/bsd-finger/bsd-finger-0.17-stat.patch
b/net/bsd-finger/bsd-finger-0.17-stat.patch
new file mode 100644
index 0000000..f7a085c
--- /dev/null
+++ b/net/bsd-finger/bsd-finger-0.17-stat.patch
@@ -0,0 +1,36 @@
+--- bsd-finger-0.17/finger/lprint.c.old 2005-07-28 01:50:51.000000000
-0700
++++ bsd-finger-0.17/finger/lprint.c 2005-07-28 01:50:17.000000000 -0700
+@@ -62,6 +62,7 @@
+ #define _PATH_PLAN ".plan"
+ #define _PATH_PROJECT ".project"
+ #define _PATH_PGPKEY ".pgpkey"
++#define _PATH_SIGNATURE ".signature"
+
+ void
+ lflag_print(void)
+@@ -72,6 +73,7 @@
+ if (!pplan) {
+ show_text(pn->dir, _PATH_PGPKEY, "PGP key:\n");
+ show_text(pn->dir, _PATH_PROJECT, "Project:\n");
++ show_text(pn->dir, _PATH_SIGNATURE, "Signature:\n");
+ if (!show_text(pn->dir, _PATH_PLAN, "Plan:\n")) {
+ xprintf("No Plan.\n");
+ }
+@@ -336,7 +338,7 @@
+
+ snprintf(tbuf, TBUFLEN, "%s/%s", directory, file_name);
+
+- if (lstat(tbuf, &sbuf1) || !S_ISREG(sbuf1.st_mode)) return 0;
++ if (stat(tbuf, &sbuf1) || !S_ISREG(sbuf1.st_mode)) return 0;
+ fd = open(tbuf, O_RDONLY);
+ if (fd<0) return 0;
+ if (fstat(fd, &sbuf2)) { close(fd); return 0; }
+@@ -350,7 +352,7 @@
+
+ xprintf("%s", header);
+ while ((ch = getc(fp)) != EOF) {
+- xputc(ch);
++ putc(ch,stdout);
+ lastc = ch;
+ }
+ if (lastc != '\n') xputc('\n');
diff --git a/net/cacti/DEPENDS b/net/cacti/DEPENDS
index dd60f9d..4563082 100755
--- a/net/cacti/DEPENDS
+++ b/net/cacti/DEPENDS
@@ -1,5 +1,5 @@
depends WEBSERVER &&
depends PHP &&
depends rrdtool &&
-depends mysql &&
+depends MYSQL &&
depends net-snmp
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 91e7582..84e0442 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-12-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=2; updated Plugin Architecture to 2.6
* PRE_BUILD: apply official patches first; corrected PA source dir
diff --git a/net/freeradius/DEPENDS b/net/freeradius/DEPENDS
index 07032d5..8ad52e6 100755
--- a/net/freeradius/DEPENDS
+++ b/net/freeradius/DEPENDS
@@ -1,5 +1,5 @@
depends openssl &&
optional_depends firebird "" "" "database support" &&
-optional_depends mysql "" "" "database support" &&
+optional_depends MYSQL "" "" "database support" &&
optional_depends ODBC-MGR "" "" "database support" &&
optional_depends postgresql "" "" "database support"
diff --git a/net/freeradius/HISTORY b/net/freeradius/HISTORY
index 172052a..d83ecc8 100644
--- a/net/freeradius/HISTORY
+++ b/net/freeradius/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-03-03 Mark Bainter <mbainter AT sourcemage.org>
* DETAILS: version bump to 1.1.7

diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index 149b055..53fe533 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,8 +1,8 @@
SPELL=libpcap
- VERSION=1.1.0
+ VERSION=1.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%.*}"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.tcpdump.org/release/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
WEB_SITE=http://www.tcpdump.org/
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index aa664b0..09e42dd 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.1, updated SOURCE_DIRECTORY
+
2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.0; corrected source dir
* BUILD: removed
diff --git a/net/nagios-plugins/DEPENDS b/net/nagios-plugins/DEPENDS
index e2d30b1..e291d89 100755
--- a/net/nagios-plugins/DEPENDS
+++ b/net/nagios-plugins/DEPENDS
@@ -51,7 +51,7 @@ optional_depends "krb5" "" ""
\
optional_depends "samba" "" "" \
"Enable SMB support" &&

-optional_depends "mysql" \
+optional_depends "MYSQL" \
"--with-mysql" \
"--without-mysql" \
"To be able to check mysql server status" &&
diff --git a/net/nagios-plugins/HISTORY b/net/nagios-plugins/HISTORY
index 739ba98..d15a86e 100644
--- a/net/nagios-plugins/HISTORY
+++ b/net/nagios-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-09-11 Justin Boffemmyer <flux AT sourcemage.org>
* DETAILS: updated to 1.4.13

diff --git a/net/net-snmp/DEPENDS b/net/net-snmp/DEPENDS
index 648d04f..cc4c312 100755
--- a/net/net-snmp/DEPENDS
+++ b/net/net-snmp/DEPENDS
@@ -5,7 +5,7 @@ optional_depends perl \
"--disable-embedded-perl" \
"for embedded Perl in the SNMP agent and snmptrapd" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"for MySQL support"
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index b302589..aec5d26 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* net-snmp.gpg: added gpg keyring
* DETAILS: updated spell to 5.5; quoting paths; converted to upstream
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index 5c7b206..4aef58f 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -12,7 +12,7 @@ depends perl &&
depends rrdtool &&
depends zlib &&

-optional_depends 'mysql' \
+optional_depends 'MYSQL' \
'--enable-mysql' \
'--disable-mysql' \
'for MySQL database support' &&
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 8fbc353..6b735d8 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-12-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Add GeoLiteCity.dat.gz and GeoIPASNum.dat.gz SOURCEs
* DEPENDS: Depends on geoip
diff --git a/net/nufw/DEPENDS b/net/nufw/DEPENDS
index aec9a11..520e319 100755
--- a/net/nufw/DEPENDS
+++ b/net/nufw/DEPENDS
@@ -14,7 +14,7 @@ optional_depends postgresql \
'' \
'' \
'Enable logging to postgresql?' &&
-optional_depends mysql \
+optional_depends MYSQL \
'' \
'' \
'Enable logging to mysql?' &&
diff --git a/net/nufw/HISTORY b/net/nufw/HISTORY
index e5cbfe8..44f0ec4 100644
--- a/net/nufw/HISTORY
+++ b/net/nufw/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2007-06-12 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: patchlevel++
* FINAL: added keygen info
diff --git a/net/opensim/DEPENDS b/net/opensim/DEPENDS
index 7ee47c0..80dd03e 100755
--- a/net/opensim/DEPENDS
+++ b/net/opensim/DEPENDS
@@ -2,5 +2,5 @@ depends subversion &&
depends mono &&
depends nant &&
depends sqlite &&
-depends mysql
+depends MYSQL

diff --git a/net/pdns/DEPENDS b/net/pdns/DEPENDS
index 2050c75..9a7433a 100755
--- a/net/pdns/DEPENDS
+++ b/net/pdns/DEPENDS
@@ -8,7 +8,7 @@ else
for i in ${PDNS_MODULES}
do
case $i in
- gmysql) depends mysql;;
+ gmysql) depends MYSQL;;
gpgsql) depends postgresql;;
gsqlite) depends sqlite;;
esac
diff --git a/net/pdns/HISTORY b/net/pdns/HISTORY
index 4c1c6e0..cd0c9df 100644
--- a/net/pdns/HISTORY
+++ b/net/pdns/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2007-03-26 Mark Bainter <mbainter-smgl AT lostinagoodbook.org>
* CONFIGURE: Added to query for backend preference
* DEPENDS: Added to handle backend dependencies
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 7e3fa04..70cc910 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
SPELL=samba
- VERSION=3.5.1
+ VERSION=3.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:8100ec20d3eb28a792481b019b9ad7eaa0ed04c32c11b50e2b7967d505dfff11e5ae5f8f94949edaabcffd217c555eacc03c35bdd9ddc1e7cf33c5450abf3bfe
+
SOURCE_HASH=sha512:0e2b9d51e1dfc439552a05f5e8c55e585f63e5000ba66b6cc8edeac992631d4e9f171a2fcb965dd046f8c69e9a9f757365fc4b62f2dc899ac651b58d2ff2a80a
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index b7486a5..fdf7f1c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.5.2
+
2010-03-12 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.5.1

diff --git a/net/shorewall-perl/REPAIR^all^TRIGGERS
b/net/shorewall-perl/REPAIR^all^TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/net/shorewall-perl/REPAIR^all^TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/net/shorewall-shell/REPAIR^all^TRIGGERS
b/net/shorewall-shell/REPAIR^all^TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/net/shorewall-shell/REPAIR^all^TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/net/spine/DEPENDS b/net/spine/DEPENDS
index e238d7f..7627fd1 100755
--- a/net/spine/DEPENDS
+++ b/net/spine/DEPENDS
@@ -1,2 +1,2 @@
depends net-snmp &&
-depends mysql
+depends MYSQL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index 99c5510..f0a337b 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: fixed configure stage with newer autotools

diff --git a/net/tcpdump/DETAILS b/net/tcpdump/DETAILS
index 58ab7ec..38da6ea 100755
--- a/net/tcpdump/DETAILS
+++ b/net/tcpdump/DETAILS
@@ -1,8 +1,8 @@
SPELL=tcpdump
- VERSION=4.1.0
+ VERSION=4.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%.*}"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.tcpdump.org/release/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_GPG=tcpdump.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index 1c78404..24d7ca2 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.1, updated SOURCE_DIRECTORY
+
2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.1.0; corrected source dir
* DEPENDS: added openssl as opt dep
diff --git a/net/ulogd/DEPENDS b/net/ulogd/DEPENDS
index c3957f4..0206a0d 100755
--- a/net/ulogd/DEPENDS
+++ b/net/ulogd/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends mysql "--with-mysql=/usr" "--disable-mysql" "for MySQL
support"
+optional_depends MYSQL "--with-mysql=/usr" "--disable-mysql" "for MySQL
support"
optional_depends postgresql "--with-pgsql=/usr" "--disable-pgsql" "for
PostgreSQL support"
optional_depends sqlite "--with-sqlite3=/usr" "--disable-sqlite3" "for
SQLite3 support"
diff --git a/net/ulogd/HISTORY b/net/ulogd/HISTORY
index 199217b..dfc1165 100644
--- a/net/ulogd/HISTORY
+++ b/net/ulogd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/wicd/DETAILS b/net/wicd/DETAILS
index d9f4ab6..f2ed7c3 100755
--- a/net/wicd/DETAILS
+++ b/net/wicd/DETAILS
@@ -1,8 +1,8 @@
SPELL=wicd
VERSION=1.7.0
BRANCH="${SPELL}-${VERSION}"
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/files/wicd-stable/${BRANCH}/${SOURCE}
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/wicd-stable/${BRANCH}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://wicd.sourceforge.net/";
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index da2dd1c..506ba82 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,7 @@
+2010-04-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: changed source to tar.bz2
+ fixed SOURCE_URL[0]
+
2010-01-17 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 1.7.0

diff --git a/net/wicd/wicd-1.7.0.tar.bz2.sig b/net/wicd/wicd-1.7.0.tar.bz2.sig
new file mode 100644
index 0000000..103a0df
Binary files /dev/null and b/net/wicd/wicd-1.7.0.tar.bz2.sig differ
diff --git a/net/wicd/wicd-1.7.0.tar.gz.sig b/net/wicd/wicd-1.7.0.tar.gz.sig
deleted file mode 100644
index 0594c0b..0000000
Binary files a/net/wicd/wicd-1.7.0.tar.gz.sig and /dev/null differ
diff --git a/odbc-drivers/myodbc/DEPENDS b/odbc-drivers/myodbc/DEPENDS
index 7e80b96..9467604 100755
--- a/odbc-drivers/myodbc/DEPENDS
+++ b/odbc-drivers/myodbc/DEPENDS
@@ -1,3 +1,3 @@
-depends mysql &&
+depends MYSQL &&
depends ODBC-MGR &&
optional_depends qt-x11 "" "" "graphical interface"
diff --git a/odbc-drivers/myodbc/HISTORY b/odbc-drivers/myodbc/HISTORY
index a34c4f2..a8cded7 100644
--- a/odbc-drivers/myodbc/HISTORY
+++ b/odbc-drivers/myodbc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.51.23r998
new URLs
diff --git a/perl-cpan/dbd-mysql/DEPENDS b/perl-cpan/dbd-mysql/DEPENDS
index ed8e3ec..c55c350 100755
--- a/perl-cpan/dbd-mysql/DEPENDS
+++ b/perl-cpan/dbd-mysql/DEPENDS
@@ -1,3 +1,3 @@
depends perl &&
depends dbi &&
-depends mysql
+depends MYSQL
diff --git a/perl-cpan/dbd-mysql/HISTORY b/perl-cpan/dbd-mysql/HISTORY
index b540c1e..ca75cfa 100644
--- a/perl-cpan/dbd-mysql/HISTORY
+++ b/perl-cpan/dbd-mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-06-30 David Kowis <dkowis AT shlrm.org>
* DETAILS: updated spell to 4.007

diff --git a/php-pear/php-dev/DEPENDS b/php-pear/php-dev/DEPENDS
index 68ecad7..ec4e6a9 100755
--- a/php-pear/php-dev/DEPENDS
+++ b/php-pear/php-dev/DEPENDS
@@ -103,7 +103,7 @@ optional_depends postgresql \
"--without-pgsql" \
"for native Postgresql support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql=/usr" \
"--without-mysql" \
"for native MySQL support" &&
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 7bd2e4f..6779b8a 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: php.ini-dist -> php.ini-production (Bug #15278)

diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 74772a0..f99ce18 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -136,7 +136,7 @@ optional_depends icu \
# DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
# PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC"
if list_find "$PHP5_DATABASE_DRIVERS" "mysql" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
- depends mysql "" &&
+ depends MYSQL "" &&
if [[ "${VERSION:0:3}" == "5.3" ]]; then
config_query PHP5_MYSQLND "Do you want to use the MySQL
Native Driver [mysqlnd]? (expiremental)" n &&
if [[ "${PHP5_MYSQLND}" == "y" ]]; then
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index f2aae24..febd54b 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-19 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected libsasl dependency for openldap

diff --git a/php-pear/php4/DEPENDS b/php-pear/php4/DEPENDS
index b6177ba..21b60c1 100755
--- a/php-pear/php4/DEPENDS
+++ b/php-pear/php4/DEPENDS
@@ -82,7 +82,7 @@ optional_depends postgresql \
"--without-pgsql" \
"for native Postgresql support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql=/usr" \
"--without-mysql" \
"for native MySQL support" &&
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index c05261b..b98224d 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-09-08 Elisamuel Resto <ryuji AT sourcemage.org>
* PREPARE: added upstream deprecation warning, removing on late
December

diff --git a/python-pypi/bsddb3/DETAILS b/python-pypi/bsddb3/DETAILS
index ebc4f6b..df80f17 100755
--- a/python-pypi/bsddb3/DETAILS
+++ b/python-pypi/bsddb3/DETAILS
@@ -1,5 +1,5 @@
SPELL=bsddb3
- VERSION=4.8.3
+ VERSION=5.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/bsddb3/HISTORY b/python-pypi/bsddb3/HISTORY
index 2c8aa08..808bc8c 100644
--- a/python-pypi/bsddb3/HISTORY
+++ b/python-pypi/bsddb3/HISTORY
@@ -1,3 +1,9 @@
+2010-05-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.0
+
+2010-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.8.4
+
2010-03-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.8.3

diff --git a/python-pypi/mysql-python/DEPENDS
b/python-pypi/mysql-python/DEPENDS
index c0f8a33..ad9d087 100755
--- a/python-pypi/mysql-python/DEPENDS
+++ b/python-pypi/mysql-python/DEPENDS
@@ -1,3 +1,3 @@
depends python &&
-depends mysql &&
+depends MYSQL &&
depends setuptools
diff --git a/python-pypi/mysql-python/HISTORY
b/python-pypi/mysql-python/HISTORY
index dce4be3..a93a889 100644
--- a/python-pypi/mysql-python/HISTORY
+++ b/python-pypi/mysql-python/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-01-13 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: removed, due to the new build system of section

diff --git a/python-pypi/trac/DEPENDS b/python-pypi/trac/DEPENDS
index 91ae9c5..39de2b4 100755
--- a/python-pypi/trac/DEPENDS
+++ b/python-pypi/trac/DEPENDS
@@ -10,7 +10,7 @@ fi &&

if list_find "$TRAC_DB" mysql; then
runtime_depends mysql-python &&
- runtime_depends mysql
+ runtime_depends MYSQL
fi &&

if list_find "$TRAC_DB" postgresql; then
diff --git a/python-pypi/trac/HISTORY b/python-pypi/trac/HISTORY
index 86c0ea8..697b611 100644
--- a/python-pypi/trac/HISTORY
+++ b/python-pypi/trac/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.11.7; SECURITY_PATCH++

diff --git a/ruby-raa/mysql-ruby/DEPENDS b/ruby-raa/mysql-ruby/DEPENDS
index 32163d8..09f512b 100755
--- a/ruby-raa/mysql-ruby/DEPENDS
+++ b/ruby-raa/mysql-ruby/DEPENDS
@@ -1,2 +1,2 @@
depends RUBY &&
-depends mysql "--with-mysql-config
--with-mysql-include=${INSTALL_ROOT}/usr/include/mysql
--with-mysql-lib=${INSTALL_ROOT}/usr/lib"
+depends MYSQL "--with-mysql-config
--with-mysql-include=${INSTALL_ROOT}/usr/include/mysql
--with-mysql-lib=${INSTALL_ROOT}/usr/lib"
diff --git a/ruby-raa/mysql-ruby/HISTORY b/ruby-raa/mysql-ruby/HISTORY
index 27f73b4..564b509 100644
--- a/ruby-raa/mysql-ruby/HISTORY
+++ b/ruby-raa/mysql-ruby/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.8.2; quoting paths; corrected desc

diff --git a/science/boinc/DEPENDS b/science/boinc/DEPENDS
index 462f162..247c9da 100755
--- a/science/boinc/DEPENDS
+++ b/science/boinc/DEPENDS
@@ -17,5 +17,5 @@ fi &&

if [[ $BOINC_PARTS == both || $BOINC_PARTS == server ]]
then
- depends mysql 'MYSQL_CONFIG=mysql_config'
+ depends MYSQL 'MYSQL_CONFIG=mysql_config'
fi
diff --git a/science/boinc/HISTORY b/science/boinc/HISTORY
index dd7ca59..6be0180 100644
--- a/science/boinc/HISTORY
+++ b/science/boinc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-06-18 David Kowis <dkowis AT shlrm.org>
* CONFIGURE, BUILD: forced logic to build client only, as server
doesn't successfully install
* DETAILS: to latest version and work off the tags branch instead of
branches
diff --git a/science/cern_root/DEPENDS b/science/cern_root/DEPENDS
index 458ea8c..7b9588f 100755
--- a/science/cern_root/DEPENDS
+++ b/science/cern_root/DEPENDS
@@ -32,7 +32,7 @@ optional_depends libxml2 \
"--disable-xml" \
"for XML parser" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"for MySQL support" &&
diff --git a/science/cern_root/HISTORY b/science/cern_root/HISTORY
index 540b72a..f73548e 100644
--- a/science/cern_root/HISTORY
+++ b/science/cern_root/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/security-libs/pam_mysql/DEPENDS b/security-libs/pam_mysql/DEPENDS
index 9803044..e5c5d9d 100755
--- a/security-libs/pam_mysql/DEPENDS
+++ b/security-libs/pam_mysql/DEPENDS
@@ -1,2 +1,2 @@
depends linux-pam
-depends mysql
+depends MYSQL
diff --git a/security-libs/pam_mysql/HISTORY b/security-libs/pam_mysql/HISTORY
index fc31a06..a939cba 100644
--- a/security-libs/pam_mysql/HISTORY
+++ b/security-libs/pam_mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/security/snort/DEPENDS b/security/snort/DEPENDS
index 0e55061..b5e6e76 100755
--- a/security/snort/DEPENDS
+++ b/security/snort/DEPENDS
@@ -10,7 +10,7 @@ fi &&
if [ "${CF_DB}" == "y" ]; then

if [ "${CF_MYSQL}" == "y" ]; then
- depends mysql
+ depends MYSQL
fi &&
if [ "${CF_PSQL}" == "y" ]; then
depends postgresql
diff --git a/security/snort/HISTORY b/security/snort/HISTORY
index e440875..0bebc20 100644
--- a/security/snort/HISTORY
+++ b/security/snort/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-06 George Sherwood <gsherwood AT sourceamge.org>
* DETAILS: Updated to version 2.8.5.3

diff --git a/shell-term-fm/clex/DETAILS b/shell-term-fm/clex/DETAILS
index b9d0361..ae77b90 100755
--- a/shell-term-fm/clex/DETAILS
+++ b/shell-term-fm/clex/DETAILS
@@ -1,6 +1,6 @@
SPELL=clex
- VERSION=4.2
-
SOURCE_HASH=sha512:49221b09930e02d30afd8707e9e127c288e0f4ceea38469fc4c94c0d563b9c4aea79320c12b607aa090245fe6abb1678e752779b54e552e3b08a525d41133853
+ VERSION=4.5
+
SOURCE_HASH=sha512:876a4051d3e1e4f19ae4fdf7863a87bdcf1ac65a060b2d10a2f7a348fd6786c7da99a4934e089ba2a0c389f944ca0829ad68c244c852805f5c4dfc273a6e8f54
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.clex.sk/download/${SOURCE}
diff --git a/shell-term-fm/clex/HISTORY b/shell-term-fm/clex/HISTORY
index 6a36289..65334dd 100644
--- a/shell-term-fm/clex/HISTORY
+++ b/shell-term-fm/clex/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 4.5
+
2009-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 4.2

diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index 4df19f5..1c5898e 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,14 +1,14 @@
SPELL=mc
- VERSION=4.7.0.3
+ VERSION=4.7.0.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.midnight-commander.org/downloads/$SOURCE
WEB_SITE=http://www.midnight-commander.org/
ENTERED=20010922
-
SOURCE_HASH=sha512:0de07260059f61c9715c55c7ef232c775425baee2f090c4c7f70429ef181367b112cbea783f1a2a2db9b7233d3252a03bf39a3b1cc34b0a3462d24898f5768fc
+
SOURCE_HASH=sha512:7971c7f74c491fcf69c69d3e1deebb6865ce2c4ea8ba51bb62e98b3f0806a861676b0dc2b351ec97a0981f0e40ebcde1fe3b471bd79b5ad081b4f4ea9ea4c4b1
LICENSE[0]=GPL
KEYWORDS="console"
- SHORT="GNU Midnight Commander is a Unix file manager and shell"
+ SHORT="Unix file manager and shell"
cat << EOF
The GNU Midnight Commander is a Unix file manager and shell, useful to
novice and guru alikes. Being a console application, it emulates look
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index cb62ac3..d595b25 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.7.0.4; corrected desc
+
2010-02-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.7.0.3

diff --git a/smgl/fakeroot/DETAILS b/smgl/fakeroot/DETAILS
index c962b4d..486fff0 100755
--- a/smgl/fakeroot/DETAILS
+++ b/smgl/fakeroot/DETAILS
@@ -1,8 +1,8 @@
SPELL=fakeroot
- VERSION=1.14.3
- SOURCE=${SPELL}_${VERSION}.tar.gz
+ VERSION=1.14.4
+ SOURCE=${SPELL}_${VERSION}.orig.tar.bz2
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/f/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:3b65dadbf219c4365a6e378362728fd2da0b243a1dd11a67ffe4b7493fdc68696cd405a684b74abddabba83bc8e6fb3c089f39a90ee1a28d123fcfbe83323167
+
SOURCE_HASH=sha512:d7a62d57cb282728a2a44da7cc27f21459455b2cd96293b3787b7c1d9ec24b4678ca279371f2917498592af821b8d772e6ee0c782a1ae1c0916f9f27069fa027
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://fakeroot.alioth.debian.org/
ENTERED=20050604
diff --git a/smgl/fakeroot/HISTORY b/smgl/fakeroot/HISTORY
index 9cfa126..743132e 100644
--- a/smgl/fakeroot/HISTORY
+++ b/smgl/fakeroot/HISTORY
@@ -1,3 +1,7 @@
+2010-04-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Fixed SOURCE to .orig.tar.bz2
+ updated spell to 1.14.4
+
2009-11-01 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.14.3

diff --git a/telephony/telepathy-butterfly/BUILD
b/telephony/telepathy-butterfly/BUILD
deleted file mode 100755
index 1d8ce04..0000000
--- a/telephony/telepathy-butterfly/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-waf_build
diff --git a/telephony/telepathy-butterfly/DETAILS
b/telephony/telepathy-butterfly/DETAILS
index 08b22c3..70bab6c 100755
--- a/telephony/telepathy-butterfly/DETAILS
+++ b/telephony/telepathy-butterfly/DETAILS
@@ -1,8 +1,11 @@
SPELL=telepathy-butterfly
- VERSION=0.5.4
+ VERSION=0.5.7
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:488376881082c6245c82f944d00c5465bc442a797a901421a9af808ffa09aacc6ffc70a68539268e91040ab715e24f33afcea382498145a8e860039b3f56ec74
+ SOURCE2="${SOURCE}.asc"
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=telepathy.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://telepathy.freedesktop.org/wiki/Components";
LICENSE[0]=GPL
diff --git a/telephony/telepathy-butterfly/HISTORY
b/telephony/telepathy-butterfly/HISTORY
index 55dc530..609416f 100644
--- a/telephony/telepathy-butterfly/HISTORY
+++ b/telephony/telepathy-butterfly/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.5.7 and switched to upstream key
+ * BUILD, INSTALL: removed, project now uses autotools
+
2010-01-27 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/telephony/telepathy-butterfly/INSTALL
b/telephony/telepathy-butterfly/INSTALL
deleted file mode 100755
index 0ea15cc..0000000
--- a/telephony/telepathy-butterfly/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-waf_install
diff --git a/telephony/telepathy-farsight/DETAILS
b/telephony/telepathy-farsight/DETAILS
index 45df83d..789dfce 100755
--- a/telephony/telepathy-farsight/DETAILS
+++ b/telephony/telepathy-farsight/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-farsight
- VERSION=0.0.11
+ VERSION=0.0.13
WEB_SITE=http://telepathy.freedesktop.org
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
diff --git a/telephony/telepathy-farsight/HISTORY
b/telephony/telepathy-farsight/HISTORY
index f590eef..837b3a0 100644
--- a/telephony/telepathy-farsight/HISTORY
+++ b/telephony/telepathy-farsight/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.0.13
+
2009-10-08 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: added details for source2

diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index 6ee4885..e7afa28 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-glib
- VERSION=0.9.2
+ VERSION=0.11.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index a356967..391bc77 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.11.2
+
2010-01-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.9.2

diff --git a/telephony/telepathy-idle/DETAILS
b/telephony/telepathy-idle/DETAILS
index ca2a2f3..ac364dd 100755
--- a/telephony/telepathy-idle/DETAILS
+++ b/telephony/telepathy-idle/DETAILS
@@ -1,12 +1,12 @@
SPELL=telepathy-idle
- VERSION=0.1.5
+ VERSION=0.1.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE_GPG=telepathy.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
ENTERED=20091004
diff --git a/telephony/telepathy-idle/HISTORY
b/telephony/telepathy-idle/HISTORY
index eb9d508..e86c0d2 100644
--- a/telephony/telepathy-idle/HISTORY
+++ b/telephony/telepathy-idle/HISTORY
@@ -1,4 +1,7 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.1.6
+
2009-10-04 Bearcat M. Sandor <sourcemage AT feline-soul.com>
- * DETAILS: version 0.1.15
+ * DETAILS: version 0.1.5
spell created

diff --git a/telephony/telepathy-mission-control/DETAILS
b/telephony/telepathy-mission-control/DETAILS
index 08af501..ef25a2e 100755
--- a/telephony/telepathy-mission-control/DETAILS
+++ b/telephony/telepathy-mission-control/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-mission-control
- VERSION=5.3.1
+ VERSION=5.3.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-mission-control/HISTORY
b/telephony/telepathy-mission-control/HISTORY
index 6f0f4f9..ddb29af 100644
--- a/telephony/telepathy-mission-control/HISTORY
+++ b/telephony/telepathy-mission-control/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 5.3.2
+
2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated to 5.3.1, removed local gpg and added upstream asc

diff --git a/telephony/telepathy-python/DETAILS
b/telephony/telepathy-python/DETAILS
index ceaf768..be8236a 100755
--- a/telephony/telepathy-python/DETAILS
+++ b/telephony/telepathy-python/DETAILS
@@ -1,8 +1,11 @@
SPELL=telepathy-python
- VERSION=0.15.15
+ VERSION=0.15.17
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:97a98c17414bdf7cdfde696179007c9044f5da5c51f9781ac15d0407942aa2bf01cfbfeaefdfa2aa82797b48edd4629ca3ae1a5ad31737a41b57fd9720c772a5
+ SOURCE2="${SOURCE}.asc"
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

WEB_SITE="http://telepathy.freedesktop.org/releases/telepathy-python/";
LICENSE[0]=GPL
diff --git a/telephony/telepathy-python/HISTORY
b/telephony/telepathy-python/HISTORY
index de9dc45..0e6945a 100644
--- a/telephony/telepathy-python/HISTORY
+++ b/telephony/telepathy-python/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.15.17, switched to upstream key
+
2010-01-27 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS, DETAILS: spell created

diff --git a/telephony/telepathy-stream-engine/DETAILS
b/telephony/telepathy-stream-engine/DETAILS
index a61fb19..93be7b5 100755
--- a/telephony/telepathy-stream-engine/DETAILS
+++ b/telephony/telepathy-stream-engine/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-stream-engine
- VERSION=0.5.11
+ VERSION=0.5.15
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-stream-engine/HISTORY
b/telephony/telepathy-stream-engine/HISTORY
index e45f515..f1ad601 100644
--- a/telephony/telepathy-stream-engine/HISTORY
+++ b/telephony/telepathy-stream-engine/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.5.15
+
2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: version 0.5.11
spell created
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
index d122022..4200ebe 100644
Binary files a/telephony/telepathy.gpg and b/telephony/telepathy.gpg differ
diff --git a/utils/atop/DETAILS b/utils/atop/DETAILS
index 3139fcc..dcebc2f 100755
--- a/utils/atop/DETAILS
+++ b/utils/atop/DETAILS
@@ -2,7 +2,7 @@
VERSION=1.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.atconsultancy.nl/$SPELL/packages/$SOURCE
+ SOURCE_URL[0]=http://www.atoptool.nl/download/$SOURCE

SOURCE_HASH=sha512:1fcaed8a7e1bd2fcd8d0b85a2db2b8367e178703786ee45a6e0bb4346fdb9caf1aec140e676524ae4018d5e9d64c24215513b9ba3122ae365d02d1a6d6a91e53
WEB_SITE=http://www.atconsultancy.nl/atop/home.html
ENTERED=20020725
diff --git a/utils/atop/HISTORY b/utils/atop/HISTORY
index aa98667..5af3693 100755
--- a/utils/atop/HISTORY
+++ b/utils/atop/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: fixed SOURCE_URL[0]
+
2010-01-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.24

diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index ae1e961..bb5575e 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -13,4 +13,12 @@ if [[ "$AVAHI_NODBUS" == 'y' ]]; then
OPTS="${OPTS} --disable-dbus"
fi &&

+if [[ "$AVAHI_COMPAT_LIBDNS_SD" == 'y' ]]; then
+ OPTS="$OPTS --enable-compat-libdns_sd"
+fi &&
+
+if [[ "$AVAHI_COMPAT_HOWL" == 'y' ]]; then
+ OPTS="$OPTS --enable-compat-howl"
+fi &&
+
default_build
diff --git a/utils/avahi/CONFIGURE b/utils/avahi/CONFIGURE
index f093165..fab44f7 100755
--- a/utils/avahi/CONFIGURE
+++ b/utils/avahi/CONFIGURE
@@ -9,4 +9,6 @@ config_query AVAHI_UTILS "Build avahi utils? (auto-enables
the client)" n &&
if [[ "$AVAHI_UTILS" == 'y' ]]; then AVAHI_CLIENT=y; fi &&
config_query AVAHI_DISCOVER "Build avahi discover?" n &&
config_query AVAHI_BOOKMARKS "Build avahi bookmarks?" n &&
-config_query AVAHI_AUTOIPD "Build avahi autoipd?" n
+config_query AVAHI_AUTOIPD "Build avahi autoipd?" n &&
+config_query AVAHI_COMPAT_LIBDNS_SD "Enable libdns_sd compatibility?" y &&
+config_query AVAHI_COMPAT_HOWL "Enable Howl compatibility?" n
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 8b7640a..8e9bd50 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFIGURE: add options to install howl and libdns_sd
compatibility layers
+
2010-03-02 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, PRE_BUILD: use avahi users instead of root
* BUILD, CONFIGURE, DEPENDS: attempt to make sense of dependency mess
diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS
index fdd944a..c26287a 100755
--- a/utils/avahi/SUB_DEPENDS
+++ b/utils/avahi/SUB_DEPENDS
@@ -11,5 +11,11 @@ QT4) echo "qt4 bindings requested, forcing them." &&
GTK2) echo "gtk+2 bindings requested, forcing them." &&
depends gtk+2 '--enable-gtk'
;;
+COMPAT_LIBDNS_SD) echo "libdns_sd compatibility layer requested, forcing
it." &&
+ AVAHI_COMPAT_LIBDNS_SD=y
+ ;;
+COMPAT_HOWL) echo "Howl compatibility layer requested, forcing it." &&
+ AVAHI_COMPAT_HOWL=y
+ ;;
*) echo "unknown sub-depends!"; return 1;;
esac
diff --git a/utils/less/DETAILS b/utils/less/DETAILS
index b6f5472..3853092 100755
--- a/utils/less/DETAILS
+++ b/utils/less/DETAILS
@@ -1,5 +1,6 @@
SPELL=less
VERSION=436
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.greenwoodsoftware.com/$SPELL/$SOURCE
diff --git a/utils/less/HISTORY b/utils/less/HISTORY
index aa21ca4..1de626c 100644
--- a/utils/less/HISTORY
+++ b/utils/less/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * profile.d/pager.sh: added "-R" flag to display "raw" control
characters
+
2009-09-13 Quentin Rameau <quinq AT sourcemage.org>
* profile.d/pager.sh: added
* INSTALL: install pager.sh
diff --git a/utils/less/profile.d/pager.sh b/utils/less/profile.d/pager.sh
index 8db43ed..ff8abc2 100644
--- a/utils/less/profile.d/pager.sh
+++ b/utils/less/profile.d/pager.sh
@@ -3,7 +3,7 @@
# then if not set, check it (maybe), then set it

if [ -z "$PAGER" ] ; then
- PAGER="less"
+ PAGER="less -R"
fi

export PAGER
diff --git a/utils/log4cplus/DETAILS b/utils/log4cplus/DETAILS
index 12bf7f2..85c2343 100755
--- a/utils/log4cplus/DETAILS
+++ b/utils/log4cplus/DETAILS
@@ -1,7 +1,7 @@
SPELL=log4cplus
- VERSION=1.0.4-rc5
+ VERSION=1.0.4-rc7
+
SOURCE_HASH=sha512:7b9236743f3d48a4242ee62dc02bdf5e6c544a3eac84278db6322d978d7ec48f3320e357c5d5e1a0505ff3e2c18953588683a6b468f8bdc8b4b6ff1b7421bb86
VX=${VERSION//-rc?}
-
SOURCE_HASH=sha512:bbf46a4c412d59366a43edbbd4b561d83681bd30d352a435f760e861818d74b38d58d5e111ba12ce859316b49bc6ba657f00ab49f93c8741fc95bda597c099fb
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://sourceforge.net/projects/log4cplus/files/log4cplus-stable/$VX/$SOURCE/download
diff --git a/utils/log4cplus/HISTORY b/utils/log4cplus/HISTORY
index f191514..c693bbf 100644
--- a/utils/log4cplus/HISTORY
+++ b/utils/log4cplus/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.4-rc7
+
2010-02-07Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.4-rc5
spell created
diff --git a/utils/mnogosearch/DEPENDS b/utils/mnogosearch/DEPENDS
index 822b07c..0d6e891 100755
--- a/utils/mnogosearch/DEPENDS
+++ b/utils/mnogosearch/DEPENDS
@@ -15,7 +15,7 @@ optional_depends readline \
"--with-readline" "" \
"for readline support for SQL monitor" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" "" \
"to include MySQL support" &&

diff --git a/utils/mnogosearch/HISTORY b/utils/mnogosearch/HISTORY
index 5c1763c..dca7bcf 100644
--- a/utils/mnogosearch/HISTORY
+++ b/utils/mnogosearch/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.3.9 (renewed hash for tarball),
PATCHLEVEL+=1
diff --git a/utils/openmoko-dfu-util/DEPENDS b/utils/openmoko-dfu-util/DEPENDS
new file mode 100755
index 0000000..c408458
--- /dev/null
+++ b/utils/openmoko-dfu-util/DEPENDS
@@ -0,0 +1,5 @@
+depends libusb-compat &&
+depends autogen &&
+depends pkgconfig &&
+depends automake &&
+depends autoconf
diff --git a/utils/openmoko-dfu-util/DETAILS b/utils/openmoko-dfu-util/DETAILS
new file mode 100755
index 0000000..3bd8fd6
--- /dev/null
+++ b/utils/openmoko-dfu-util/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=openmoko-dfu-util
+if [[ "$DFU_UTIL_SVN_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE="dfu-util-${VERSION}.tar.bz2"
+ SOURCE_HINTS=no-check-certificate
+
SOURCE_URL[0]=svn_https://svn.openmoko.org/trunk/src/host/dfu-util:dfu-util
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/dfu-util-${VERSION}"
+ WEB_SITE="http://wiki.openmoko.org/wiki/Dfu-util";
+ LICENSE[0]=GPL
+ ENTERED=20100403
+ SHORT="a program that implements the Host (PC) side of the USB
DFU"
+cat << EOF
+dfu-util is a program that implements the Host (PC) side of the USB DFU
+(Universal Serial Bus Device Firmware Upgrade) protocol.
+
+In the Openmoko project, we use this program to communicate with our
specially
+enhanced bootloader, which implements the DFU device side.
+
+Using dfu-util and your smartphone, you can - transfer and flash partitions
+in internal NAND Flash. - transfer anything into RAM
+ this can be used for fast development cycles of low-level code such as
+ kernels without flashing them
+- read out the current internal NAND partitions
+ this is an easy and efficient way of doing full backups of your phone
+EOF
diff --git a/utils/openmoko-dfu-util/HISTORY b/utils/openmoko-dfu-util/HISTORY
new file mode 100644
index 0000000..5b026b4
--- /dev/null
+++ b/utils/openmoko-dfu-util/HISTORY
@@ -0,0 +1,3 @@
+2010-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, PRE_BUILD, PREPARE: spell created
+
diff --git a/utils/openmoko-dfu-util/PREPARE b/utils/openmoko-dfu-util/PREPARE
new file mode 100755
index 0000000..c111d07
--- /dev/null
+++ b/utils/openmoko-dfu-util/PREPARE
@@ -0,0 +1 @@
+config_query DFU_UTIL_SVN_AUTOUPDATE "Update to the latest SVN automatically
on every cast?" ${DFU_UTIL_SVN_AUTOUPDATE:-n}
diff --git a/utils/openmoko-dfu-util/PRE_BUILD
b/utils/openmoko-dfu-util/PRE_BUILD
new file mode 100755
index 0000000..7c1ec4f
--- /dev/null
+++ b/utils/openmoko-dfu-util/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:bin_PROGRAMS = dfu-util dfu-util_static:bin_PROGRAMS = dfu-util:'
src/Makefile.am &&
+./autogen.sh
diff --git a/utils/rsyslog/DEPENDS b/utils/rsyslog/DEPENDS
index 3a72135..19a51b8 100755
--- a/utils/rsyslog/DEPENDS
+++ b/utils/rsyslog/DEPENDS
@@ -33,7 +33,7 @@ optional_depends net-snmp \
"--enable-snmp" \
"--disable-snmp" \
"for SNMP support" &&
-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"for MySQL backend support" &&
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index e4f181d..799a39a 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated v4stable to 4.6.2

diff --git a/utils/sphinx/DEPENDS b/utils/sphinx/DEPENDS
index 3aee2a6..719e232 100755
--- a/utils/sphinx/DEPENDS
+++ b/utils/sphinx/DEPENDS
@@ -12,7 +12,7 @@ optional_depends ODBC-MGR \
"--without-unixodbc" \
"for ODBC data access" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"for MySQL database support" &&
diff --git a/utils/sphinx/HISTORY b/utils/sphinx/HISTORY
index 7f9bf1c..6b686c9 100644
--- a/utils/sphinx/HISTORY
+++ b/utils/sphinx/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.9; fixed long description wrap;
quoting
paths; corrected website, descriptions
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index c36764c..8fa507d 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Fails during install with multiple make jobs
+
2010-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2p5

diff --git a/utils/sudo/INSTALL b/utils/sudo/INSTALL
new file mode 100755
index 0000000..03b8bb9
--- /dev/null
+++ b/utils/sudo/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/utils/xen-tools/DEPENDS b/utils/xen-tools/DEPENDS
index 1b42ff6..c8cbced 100755
--- a/utils/xen-tools/DEPENDS
+++ b/utils/xen-tools/DEPENDS
@@ -3,4 +3,9 @@ depends python &&
depends setuptools &&
depends python-pam &&
depends iproute2 &&
-depends dev86
+depends dev86 &&
+depends curl &&
+depends udev &&
+depends pyopenssl &&
+depends pyxml &&
+depends acpica-unix
diff --git a/utils/xen-tools/DETAILS b/utils/xen-tools/DETAILS
index f476cfb..c9247c2 100755
--- a/utils/xen-tools/DETAILS
+++ b/utils/xen-tools/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen-tools
PACKAGE=xen
- VERSION=3.4.2
+ VERSION=4.0.0
SOURCE=${PACKAGE}-${VERSION}.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PACKAGE}-${VERSION}
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index f15464c..7844df4 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,8 @@
+2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 4.0
+ * DEPENDS: added missing dependency on curl, fixes bug #10009
+ also added missing deps on udev, pyopenssl, pyxml and acpica-unix
+
2009-11-17 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: depends on setuptools
* BUILD: build python bindings else nothing works
diff --git a/utils/xen-tools/xen-3.4.2.tar.gz.sig
b/utils/xen-tools/xen-3.4.2.tar.gz.sig
deleted file mode 100644
index c7b44bf..0000000
Binary files a/utils/xen-tools/xen-3.4.2.tar.gz.sig and /dev/null differ
diff --git a/utils/xen-tools/xen-4.0.0.tar.gz.sig
b/utils/xen-tools/xen-4.0.0.tar.gz.sig
new file mode 100644
index 0000000..93f27df
Binary files /dev/null and b/utils/xen-tools/xen-4.0.0.tar.gz.sig differ
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index e85154f..da8859f 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,5 +1,5 @@
SPELL=xen
- VERSION=3.4.2
+ VERSION=4.0.0
LICENSE[0]=UNKNOWN
KEYWORDS="xen"
WEB_SITE=http://www.xensource.com/
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 5086506..4b63952 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 4.0.0
+
2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.4.2

diff --git
a/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS

b/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS
deleted file mode 100755
index f46e6ad..0000000
---
a/video-libs/gst-plugins-ugly/REPAIR^218d2c02685dcd3c5270094f98620415^SUB_DEPENDS
+++ /dev/null
@@ -1,11 +0,0 @@
-case $THIS_SUB_DEPENDS in
- LIBCDIO) depends libcdio '--enable-cdio'
- ;;
- LIBMPEG2) message "${MESSAGE_COLOR}Forcing dependency on
${SPELL_COLOR}libmpeg2${DEFAULT_COLOR}" \
- "${MESSAGE_COLOR}to satisfy
${SPELL_COLOR}$THIS_SUB_DEPENDS${DEFAULT_COLOR}${MESSAGE_COLOR}
requirement.${DEFAULT_COLOR}" &&
- depends libmpeg2 '--enable-mpeg2dec'
- ;;
- *) echo "Unknown sub-depends!" ;
- return 1
- ;;
-esac
diff --git a/video/lxdvdrip/BUILD b/video/lxdvdrip/BUILD
index 8f58e6d..4e7dadc 100755
--- a/video/lxdvdrip/BUILD
+++ b/video/lxdvdrip/BUILD
@@ -1 +1,4 @@
-make
+make &&
+make -C vamps &&
+make -C dvdbackup &&
+make -C buffer
diff --git a/video/lxdvdrip/HISTORY b/video/lxdvdrip/HISTORY
index b00fff6..1708889 100644
--- a/video/lxdvdrip/HISTORY
+++ b/video/lxdvdrip/HISTORY
@@ -1,3 +1,9 @@
+2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BULD: run make in the subdirectories too, so the spell doesn't
+ compile anything during INSTALL phase
+ * PRE_BUILD: fix up Makefiles to not install anything to /usr/man or
+ /usr/local
+
2008-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, lxdvdrip-1.70-makefile.patch,
lxdvdrip-1.70-vamps-makefile.patch, systools.c.patch:
diff --git a/video/lxdvdrip/PRE_BUILD b/video/lxdvdrip/PRE_BUILD
index c12bcf1..ddc0540 100755
--- a/video/lxdvdrip/PRE_BUILD
+++ b/video/lxdvdrip/PRE_BUILD
@@ -2,6 +2,10 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit "s:INSTALLDIR = /usr/local:INSTALLDIR = $INSTALL_ROOT/usr:" \
$SOURCE_DIRECTORY/Makefile &&
+sedit "s:/man/man1:/share/man/man1:" Makefile &&
+sedit "s:/usr/local:/usr:" vamps/Makefile &&
+sedit "s:/usr/local:/usr:" dvdbackup/Makefile &&
+sedit "s:/usr/local:/usr:" buffer/Makefile &&
patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/lxdvdrip-1.70-vamps-makefile.patch &&
patch -p0 < $SCRIPT_DIRECTORY/systools.c.patch
diff --git a/video/motion/DEPENDS b/video/motion/DEPENDS
index 2543eb9..7545fae 100755
--- a/video/motion/DEPENDS
+++ b/video/motion/DEPENDS
@@ -4,7 +4,7 @@ optional_depends LIBAVCODEC \
"--with-ffmpeg" \
"--without-ffmpeg" \
"for realtime mpeg encoding support" &&
-optional_depends mysql \
+optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
"for mysql support" &&
diff --git a/video/motion/HISTORY b/video/motion/HISTORY
index 43cda83..8e5fa08 100644
--- a/video/motion/HISTORY
+++ b/video/motion/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-02-26 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: 3.2.11
* CONFIGURE, BUILD: made v4l optional
diff --git a/video/mythtv/DEPENDS b/video/mythtv/DEPENDS
index a2cedce..f66d33d 100755
--- a/video/mythtv/DEPENDS
+++ b/video/mythtv/DEPENDS
@@ -1,4 +1,4 @@
-depends mysql &&
+depends MYSQL &&
depends qt4 &&
depends freetype2 &&
depends lame &&
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index 3ac4128..a2d0ca6 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added disable_pic

diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index 6b20111..fcb8b97 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -1,8 +1,6 @@
depends glib2 &&
depends gmime &&
depends gtk+2 &&
-depends libgnomeui &&
-depends libglade2 &&
depends gnome-vfs2 &&
depends gnome-desktop &&
depends gnome-icon-theme &&
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index eea88c6..60be018 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed libglade2, libgnomeui
+
2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* UP_TRIGGERS: removed, totem-pl-parser provides the lib now
* PRE_BUILD: added sedits to change tracker header include so it works
diff --git a/x11-libs/cairomm/DEPENDS b/x11-libs/cairomm/DEPENDS
index 7d9ea30..a1e816e 100755
--- a/x11-libs/cairomm/DEPENDS
+++ b/x11-libs/cairomm/DEPENDS
@@ -2,6 +2,6 @@ depends g++ &&
depends cairo &&
depends libsigc++3 &&
optional_depends "doxygen" \
- "--enable-doc" \
- "--disable-doc" \
+ "--enable-documentation" \
+ "--disable-documentation" \
"Build documentation with doxygen"
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index b88ab4d..643a4d5 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: fixed documentation build option
+
2010-02-20 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: 1.8.4

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index fa49a39..718f413 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.1.41
+ VERSION=1.1.42
else
VERSION=1.0.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 5e550cb..ea50b76 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.42
+
2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: Only apply the patch for mpg123 1.11.0 itself.
This is subject to removal once we are sure that this version
diff --git a/x11-toolkits/efltk/DEPENDS b/x11-toolkits/efltk/DEPENDS
index 4ba0008..20da964 100755
--- a/x11-toolkits/efltk/DEPENDS
+++ b/x11-toolkits/efltk/DEPENDS
@@ -7,7 +7,7 @@ optional_depends OPENGL \
"--disable-opengl" \
"for OpenGL support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"--enable-mysql" \
"--disable-mysql" \
"for MySQL support" &&
diff --git a/x11-toolkits/efltk/HISTORY b/x11-toolkits/efltk/HISTORY
index 1a5b39c..d0a243f 100644
--- a/x11-toolkits/efltk/HISTORY
+++ b/x11-toolkits/efltk/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2009-04-23 Julien _kaze_ ROZO <julien AT rozo.org>
* BUILD, DEPENDS, DETAILS, HISTORY: created this spell

diff --git a/x11-toolkits/gtkmm2/DEPENDS b/x11-toolkits/gtkmm2/DEPENDS
index e809464..3364aa7 100755
--- a/x11-toolkits/gtkmm2/DEPENDS
+++ b/x11-toolkits/gtkmm2/DEPENDS
@@ -1,4 +1,8 @@
depends glibmm &&
depends gtk+2 &&
depends cairomm &&
-depends pangomm
+depends pangomm &&
+
+if list_find "$GTKMM2_OPTS" "--enable-documentation"; then
+ depends -sub DOC glibmm
+fi
diff --git a/x11-toolkits/gtkmm2/DETAILS b/x11-toolkits/gtkmm2/DETAILS
index 69888ae..5b381df 100755
--- a/x11-toolkits/gtkmm2/DETAILS
+++ b/x11-toolkits/gtkmm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkmm2
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL%?}-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%?}-$VERSION"
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index 3421516..d2d849d 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,9 @@
+2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: depends on glibmm with DOC to build documentation
+
+2010-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20.1
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.20.0

diff --git a/x11-toolkits/gtkmm2/gtkmm-2.20.0.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.20.0.tar.bz2.sig
deleted file mode 100644
index 8b35918..0000000
Binary files a/x11-toolkits/gtkmm2/gtkmm-2.20.0.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..b38a6a2
Binary files /dev/null and b/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
differ
diff --git a/x11-toolkits/qt-embedded/DEPENDS
b/x11-toolkits/qt-embedded/DEPENDS
index 2110aaa..5503c41 100755
--- a/x11-toolkits/qt-embedded/DEPENDS
+++ b/x11-toolkits/qt-embedded/DEPENDS
@@ -37,7 +37,7 @@ optional_depends firebird
\
"" \
"for firebird database support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"-plugin-sql-mysql -I/usr/include/mysql \
-L/usr/lib -lmysqlclient" \
"" \
diff --git a/x11-toolkits/qt-embedded/HISTORY
b/x11-toolkits/qt-embedded/HISTORY
index 288cf7b..40667e3 100644
--- a/x11-toolkits/qt-embedded/HISTORY
+++ b/x11-toolkits/qt-embedded/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2008-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: firebird has moved

diff --git a/x11-toolkits/qt-x11/DEPENDS b/x11-toolkits/qt-x11/DEPENDS
index 264e9ed..88efc93 100755
--- a/x11-toolkits/qt-x11/DEPENDS
+++ b/x11-toolkits/qt-x11/DEPENDS
@@ -33,7 +33,7 @@ optional_depends FIREBIRD
\
"" \
"for firebird database support" &&

-optional_depends mysql \
+optional_depends MYSQL \
"-plugin-sql-mysql -I/usr/include/mysql \
-L/usr/lib -lmysqlclient" \
"" \
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 7732646..8c4fe25 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
DEPENDS: firebird => FIREBIRD

diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 5de0d86..941f33c 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -39,7 +39,7 @@ optional_depends FIREBIRD
\
'-no-sql-ibase' \
'for firebird database support' &&

-optional_depends mysql \
+optional_depends MYSQL \
"-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
-L$INSTALL_ROOT/usr/lib -lmysqlclient" \
'-no-sql-mysql' \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index e6ef31d..f63ff3d 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS, SUB_DEPENDS: updated mysql dependency to MYSQL provider
+
2010-02-15 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on gtk+2 for theme integration

diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index c6b963c..fec1ea3 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -45,7 +45,7 @@ WEBKIT) if [[ $QT_WEBKIT == "-no-webkit" ]]; then
fi
;;
MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
- depends mysql "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
+ depends MYSQL "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
-L$INSTALL_ROOT/usr/lib -lmysqlclient"
;;
MEDIA) if [[ $QT_MEDIA == "-no-multimedia" ]]; then
diff --git a/x11-toolkits/sptk/DEPENDS b/x11-toolkits/sptk/DEPENDS
index 0cc7683..4d621c5 100755
--- a/x11-toolkits/sptk/DEPENDS
+++ b/x11-toolkits/sptk/DEPENDS
@@ -9,7 +9,7 @@ optional_depends libevent '' '' 'handle event callbacks' &&
optional_depends zlib '' '' 'compression support' &&
optional_depends fltk2 '' '' 'gui support' &&
optional_depends fltk '' '' 'gui support' &&
-optional_depends mysql '' '-DNO_MYSQL@' \
+optional_depends MYSQL '' '-DNO_MYSQL@' \
'Mysql database support' &&
optional_depends postgresql '' '-DNO_POSTGRESQL@' \
'PostgreSql database support' &&
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index 71fc22e..1dec800 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.02

diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 284f97b..359e393 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,9 +1,9 @@
SPELL=conky
- VERSION=1.7.2
+ VERSION=1.8.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:ddf48613a5d989f9a447e8bbebead62578abd5710b6a701880fc6dc9b96d3b5085fa7140a1a180c9102f89c5f708862874e776503769058dae21457191103af8
+
SOURCE_HASH=sha512:c3050e03cd32e22d994af823618f652a5947415e6034a1bc17f9e63065ec4722c2e709715171bc05cc96e0a49371ec8ef5dc2b48a7e7e9f42eedaf1188e2f5fa
LICENSE[0]=BSD
LICENSE[1]=GPL
WEB_SITE=http://conky.sourceforge.net/
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index db7af80..250c66f 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+
2009-11-28 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected dependencies -- killed xorg-libs, see #14699;
added missing deps
diff --git a/x11/qhacc/DEPENDS b/x11/qhacc/DEPENDS
index 9418e93..145b317 100755
--- a/x11/qhacc/DEPENDS
+++ b/x11/qhacc/DEPENDS
@@ -14,7 +14,7 @@ then
depends sqlite "--enable-sqlite" &&

optional_depends postgresql "--enable-psql" "" "for PostgreSQL plugin"
&&
- optional_depends mysql "" "" "for MySQL plugin"
+ optional_depends MYSQL "" "" "for MySQL plugin"

fi

diff --git a/x11/qhacc/HISTORY b/x11/qhacc/HISTORY
index ecc8451..a3a0ce9 100644
--- a/x11/qhacc/HISTORY
+++ b/x11/qhacc/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * DEPENDS: updated mysql dependency to MYSQL provider
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/x11/xcompmgr/CONFLICTS b/x11/xcompmgr/CONFLICTS
deleted file mode 100755
index eb9d1c1..0000000
--- a/x11/xcompmgr/CONFLICTS
+++ /dev/null
@@ -1,5 +0,0 @@
-conflicts xfree86
-conflicts xfree86-4.3
-conflicts xfree86-devel
-conflicts xfree86-libs
-conflicts xdirectfb
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
index b32dc7c..e9fb51c 100755
--- a/xfce/xfburn/DEPENDS
+++ b/xfce/xfburn/DEPENDS
@@ -6,8 +6,8 @@ depends gtk+2 &&
depends intltool &&
depends libxfcegui4 &&

-if [[ $XFBURN_SVN == y ]]; then
- depends subversion &&
+if [[ $XFBURN_GIT == y ]]; then
+ depends git &&
depends xfce4-dev-tools
fi &&

diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index 44b3348..cb51be8 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -1,15 +1,15 @@
SPELL=xfburn
-if [[ $XFBURN_SVN == y ]]; then
- if [[ $XFBURN_SVN_AUTOUPDATE == y ]]; then
+if [[ $XFBURN_GIT == y ]]; then
+ if [[ $XFBURN_GIT_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE_URL[0]=svn_http://svn.xfce.org/svn/goodies/$SPELL/trunk:$SPELL-svn
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git_http://git.xfce.org/git/apps/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
VERSION=0.4.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
@@ -18,7 +18,7 @@ else

SOURCE_HASH=sha512:b4da22fdb9f28bffb18da4f274dbb675ced1e93a53150c0641c0fc4737c2ba3270d89db431d6d1aed3f08f6c488ef3951589938925408c5876b8a99435d33866
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
- WEB_SITE=http://goodies.xfce.org/projects/applications/xfburn/
+ WEB_SITE=http://www.xfce.org/projects/xfburn/
ENTERED=20071005
LICENSE[0]=GPL
KEYWORDS="xfce disk"
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index c03cb3a..d90c901 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPENDS, PREPARE: switched to git repository, changed
website
+
2009-07-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.4.2; fixed SOURCE_URL[0]

diff --git a/xfce/xfburn/PREPARE b/xfce/xfburn/PREPARE
index 08d42e1..18fd51a 100755
--- a/xfce/xfburn/PREPARE
+++ b/xfce/xfburn/PREPARE
@@ -1,6 +1,6 @@
-config_query XFBURN_SVN "Use svn version?" n &&
+config_query XFBURN_GIT "Use git version?" n &&

-if [[ $XFBURN_SVN == y ]]; then
- config_query XFBURN_SVN_AUTOUPDATE \
+if [[ $XFBURN_GIT == y ]]; then
+ config_query XFBURN_GIT_AUTOUPDATE \
"Queue for update on every system update?" n
fi
diff --git a/xorg-app/appres/CONFLICTS b/xorg-app/appres/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/appres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/bdftopcf/CONFLICTS b/xorg-app/bdftopcf/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/bdftopcf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/beforelight/CONFLICTS b/xorg-app/beforelight/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/beforelight/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/bitmap/CONFLICTS b/xorg-app/bitmap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/bitmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/compiz/CONFLICTS b/xorg-app/compiz/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/compiz/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/editres/CONFLICTS b/xorg-app/editres/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/editres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/fonttosfnt/CONFLICTS b/xorg-app/fonttosfnt/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/fonttosfnt/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/fslsfonts/CONFLICTS b/xorg-app/fslsfonts/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/fslsfonts/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/fstobdf/CONFLICTS b/xorg-app/fstobdf/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/fstobdf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/iceauth/CONFLICTS b/xorg-app/iceauth/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/iceauth/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/ico/CONFLICTS b/xorg-app/ico/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/ico/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/lbxproxy/CONFLICTS b/xorg-app/lbxproxy/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/lbxproxy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/listres/CONFLICTS b/xorg-app/listres/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/listres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/luit/CONFLICTS b/xorg-app/luit/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/luit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/mkcfm/CONFLICTS b/xorg-app/mkcfm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/mkcfm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/mkcomposecache/CONFLICTS
b/xorg-app/mkcomposecache/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/mkcomposecache/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/mkfontdir/CONFLICTS b/xorg-app/mkfontdir/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/mkfontdir/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/mkfontscale/CONFLICTS b/xorg-app/mkfontscale/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/mkfontscale/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/oclock/CONFLICTS b/xorg-app/oclock/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/oclock/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/proxymngr/CONFLICTS b/xorg-app/proxymngr/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/proxymngr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/rendercheck/CONFLICTS b/xorg-app/rendercheck/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/rendercheck/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/rgb/CONFLICTS b/xorg-app/rgb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/rgb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/rstart/CONFLICTS b/xorg-app/rstart/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/rstart/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/scripts/CONFLICTS b/xorg-app/scripts/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/scripts/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/sessreg/CONFLICTS b/xorg-app/sessreg/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/sessreg/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/setxkbmap/CONFLICTS b/xorg-app/setxkbmap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/setxkbmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/showfont/CONFLICTS b/xorg-app/showfont/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/showfont/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/smproxy/CONFLICTS b/xorg-app/smproxy/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/smproxy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/twm/CONFLICTS b/xorg-app/twm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/twm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/viewres/CONFLICTS b/xorg-app/viewres/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/viewres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/x11perf/CONFLICTS b/xorg-app/x11perf/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/x11perf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xauth/CONFLICTS b/xorg-app/xauth/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xauth/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xbiff/CONFLICTS b/xorg-app/xbiff/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xbiff/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xcalc/CONFLICTS b/xorg-app/xcalc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xcalc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xclipboard/CONFLICTS b/xorg-app/xclipboard/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xclipboard/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xclock/CONFLICTS b/xorg-app/xclock/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xclock/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xcmsdb/CONFLICTS b/xorg-app/xcmsdb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xcmsdb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xconsole/CONFLICTS b/xorg-app/xconsole/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xconsole/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xcursorgen/CONFLICTS b/xorg-app/xcursorgen/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xcursorgen/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xdbedizzy/CONFLICTS b/xorg-app/xdbedizzy/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xdbedizzy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xditview/CONFLICTS b/xorg-app/xditview/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xditview/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xdm/CONFLICTS b/xorg-app/xdm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xdm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xdpyinfo/CONFLICTS b/xorg-app/xdpyinfo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xdpyinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xdriinfo/CONFLICTS b/xorg-app/xdriinfo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xdriinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xedit/CONFLICTS b/xorg-app/xedit/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xedit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xev/CONFLICTS b/xorg-app/xev/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xeyes/CONFLICTS b/xorg-app/xeyes/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xeyes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xf86dga/CONFLICTS b/xorg-app/xf86dga/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xf86dga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfd/CONFLICTS b/xorg-app/xfd/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfindproxy/CONFLICTS b/xorg-app/xfindproxy/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfindproxy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfontsel/CONFLICTS b/xorg-app/xfontsel/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfontsel/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfs/CONFLICTS b/xorg-app/xfs/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfsinfo/CONFLICTS b/xorg-app/xfsinfo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfsinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xfwp/CONFLICTS b/xorg-app/xfwp/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xfwp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xgamma/CONFLICTS b/xorg-app/xgamma/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xgamma/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xgc/CONFLICTS b/xorg-app/xgc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xgc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xhost/CONFLICTS b/xorg-app/xhost/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xhost/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xkbcomp/CONFLICTS b/xorg-app/xkbcomp/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xkbcomp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xkbevd/CONFLICTS b/xorg-app/xkbevd/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xkbevd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xkbprint/CONFLICTS b/xorg-app/xkbprint/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xkbprint/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xkbutils/CONFLICTS b/xorg-app/xkbutils/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xkbutils/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xkill/CONFLICTS b/xorg-app/xkill/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xkill/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xload/CONFLICTS b/xorg-app/xload/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xload/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xlogo/CONFLICTS b/xorg-app/xlogo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xlogo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xlsatoms/CONFLICTS b/xorg-app/xlsatoms/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xlsatoms/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xlsclients/CONFLICTS b/xorg-app/xlsclients/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xlsclients/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xlsfonts/CONFLICTS b/xorg-app/xlsfonts/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xlsfonts/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xmag/CONFLICTS b/xorg-app/xmag/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xmag/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xman/CONFLICTS b/xorg-app/xman/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xman/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xmessage/CONFLICTS b/xorg-app/xmessage/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xmessage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xmh/CONFLICTS b/xorg-app/xmh/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xmh/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xmodmap/CONFLICTS b/xorg-app/xmodmap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xmodmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xmore/CONFLICTS b/xorg-app/xmore/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xmore/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xphelloworld/CONFLICTS b/xorg-app/xphelloworld/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xphelloworld/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xplsprinters/CONFLICTS b/xorg-app/xplsprinters/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xplsprinters/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xpr/CONFLICTS b/xorg-app/xpr/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xpr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xprehashprinterlist/CONFLICTS
b/xorg-app/xprehashprinterlist/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xprehashprinterlist/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xprop/CONFLICTS b/xorg-app/xprop/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xprop/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xrandr/CONFLICTS b/xorg-app/xrandr/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xrandr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xrdb/CONFLICTS b/xorg-app/xrdb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xrdb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xrefresh/CONFLICTS b/xorg-app/xrefresh/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xrefresh/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xrx/CONFLICTS b/xorg-app/xrx/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xrx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xset/CONFLICTS b/xorg-app/xset/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xset/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xsetmode/CONFLICTS b/xorg-app/xsetmode/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xsetmode/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xsetpointer/CONFLICTS b/xorg-app/xsetpointer/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xsetpointer/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xsetroot/CONFLICTS b/xorg-app/xsetroot/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xsetroot/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xsm/CONFLICTS b/xorg-app/xsm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xsm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xstdcmap/CONFLICTS b/xorg-app/xstdcmap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xstdcmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xtrap/CONFLICTS b/xorg-app/xtrap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xtrap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xvidtune/CONFLICTS b/xorg-app/xvidtune/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xvidtune/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xvinfo/CONFLICTS b/xorg-app/xvinfo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xvinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xwd/CONFLICTS b/xorg-app/xwd/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xwd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xwininfo/CONFLICTS b/xorg-app/xwininfo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xwininfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-app/xwud/CONFLICTS b/xorg-app/xwud/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-app/xwud/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-data/xbitmaps/CONFLICTS b/xorg-data/xbitmaps/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-data/xbitmaps/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-data/xcursor-themes/CONFLICTS
b/xorg-data/xcursor-themes/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-data/xcursor-themes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-data/xkbdata/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-data/xkeyboard-config/CONFLICTS
b/xorg-data/xkeyboard-config/CONFLICTS
index bafbc0b..61c053f 100755
--- a/xorg-data/xkeyboard-config/CONFLICTS
+++ b/xorg-data/xkeyboard-config/CONFLICTS
@@ -1,7 +1 @@
conflicts xkbdata
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-data/xkeyboard-config/DETAILS
b/xorg-data/xkeyboard-config/DETAILS
index 315d6f0..a9bbea3 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,5 +1,5 @@
SPELL=xkeyboard-config
- VERSION=1.7
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://xlibs.freedesktop.org/xkbdesc/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
diff --git a/xorg-data/xkeyboard-config/HISTORY
b/xorg-data/xkeyboard-config/HISTORY
index 1e49369..168ac97 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.8
+
2010-02-26 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Fails with multiple make jobs

diff --git a/xorg-data/xkeyboard-config/xkeyboard-config-1.7.tar.bz2.sig
b/xorg-data/xkeyboard-config/xkeyboard-config-1.7.tar.bz2.sig
deleted file mode 100644
index 5f2344b..0000000
Binary files a/xorg-data/xkeyboard-config/xkeyboard-config-1.7.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-data/xkeyboard-config/xkeyboard-config-1.8.tar.bz2.sig
b/xorg-data/xkeyboard-config/xkeyboard-config-1.8.tar.bz2.sig
new file mode 100644
index 0000000..b62ec91
Binary files /dev/null and
b/xorg-data/xkeyboard-config/xkeyboard-config-1.8.tar.bz2.sig differ
diff --git a/xorg-data/xorg-data-profile/CONFLICTS
b/xorg-data/xorg-data-profile/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-data/xorg-data-profile/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-doc/xorg-docs/CONFLICTS b/xorg-doc/xorg-docs/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-doc/xorg-docs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-doc/xorg-sgml-doctools/CONFLICTS
b/xorg-doc/xorg-sgml-doctools/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-doc/xorg-sgml-doctools/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-doc/xorg-sgml-doctools/DETAILS
b/xorg-doc/xorg-sgml-doctools/DETAILS
index 6834874..69c99ed 100755
--- a/xorg-doc/xorg-sgml-doctools/DETAILS
+++ b/xorg-doc/xorg-sgml-doctools/DETAILS
@@ -1,5 +1,5 @@
SPELL=xorg-sgml-doctools
- VERSION=1.3
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/doc/${SOURCE}
diff --git a/xorg-doc/xorg-sgml-doctools/HISTORY
b/xorg-doc/xorg-sgml-doctools/HISTORY
index 64ab369..f998e46 100644
--- a/xorg-doc/xorg-sgml-doctools/HISTORY
+++ b/xorg-doc/xorg-sgml-doctools/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4
+ SOURCE matches upstream posted SHA1
+
2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.3
SOURCE matches upstream posted SHA1
diff --git a/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.3.tar.bz2.sig
b/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.3.tar.bz2.sig
deleted file mode 100644
index b3e3e2b..0000000
Binary files a/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.3.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.4.tar.bz2.sig
b/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.4.tar.bz2.sig
new file mode 100644
index 0000000..7de9b79
Binary files /dev/null and
b/xorg-doc/xorg-sgml-doctools/xorg-sgml-doctools-1.4.tar.bz2.sig differ
diff --git a/xorg-driver/linuxwacom/CONFLICTS
b/xorg-driver/linuxwacom/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/linuxwacom/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-acecad/CONFLICTS
b/xorg-driver/xf86-input-acecad/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-acecad/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-aiptek/CONFLICTS
b/xorg-driver/xf86-input-aiptek/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-aiptek/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-calcomp/CONFLICTS
b/xorg-driver/xf86-input-calcomp/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-calcomp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-citron/CONFLICTS
b/xorg-driver/xf86-input-citron/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-citron/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-digitaledge/CONFLICTS
b/xorg-driver/xf86-input-digitaledge/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-digitaledge/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-dmc/CONFLICTS
b/xorg-driver/xf86-input-dmc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-dmc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-dynapro/CONFLICTS
b/xorg-driver/xf86-input-dynapro/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-dynapro/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-elo2300/CONFLICTS
b/xorg-driver/xf86-input-elo2300/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-elo2300/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-elographics/CONFLICTS
b/xorg-driver/xf86-input-elographics/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-elographics/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-evdev/CONFLICTS
b/xorg-driver/xf86-input-evdev/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-evdev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-evdev/DETAILS
b/xorg-driver/xf86-input-evdev/DETAILS
index 044cc01..1286c79 100755
--- a/xorg-driver/xf86-input-evdev/DETAILS
+++ b/xorg-driver/xf86-input-evdev/DETAILS
@@ -1,10 +1,10 @@
SPELL=xf86-input-evdev
- VERSION=2.3.2
-
SOURCE_HASH=sha512:5fb4e2894524e138e672219862f8fba4bef0cf80abd6e24f0f8eb5561fe8bb12f0281fa540e29cffcc9f3dba08d32871546dbd3b67f46a9f2603ea468fb1c09e
+ VERSION=2.4.0
+#
SOURCE_HASH=sha512:5fb4e2894524e138e672219862f8fba4bef0cf80abd6e24f0f8eb5561fe8bb12f0281fa540e29cffcc9f3dba08d32871546dbd3b67f46a9f2603ea468fb1c09e
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-input-evdev/HISTORY
b/xorg-driver/xf86-input-evdev/HISTORY
index 617540d..8e42fb6 100644
--- a/xorg-driver/xf86-input-evdev/HISTORY
+++ b/xorg-driver/xf86-input-evdev/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.4.0
+ SOURCE matches upstream posted SHA1
+
2009-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.2

diff --git a/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.2.5.tar.bz2.sig
b/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.2.5.tar.bz2.sig
deleted file mode 100644
index a28a7ce..0000000
Binary files
a/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.2.5.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.4.0.tar.bz2.sig
b/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.4.0.tar.bz2.sig
new file mode 100644
index 0000000..20cb4c8
Binary files /dev/null and
b/xorg-driver/xf86-input-evdev/xf86-input-evdev-2.4.0.tar.bz2.sig differ
diff --git a/xorg-driver/xf86-input-fpit/CONFLICTS
b/xorg-driver/xf86-input-fpit/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-fpit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-hyperpen/CONFLICTS
b/xorg-driver/xf86-input-hyperpen/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-hyperpen/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-jamstudio/CONFLICTS
b/xorg-driver/xf86-input-jamstudio/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-jamstudio/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-joystick/CONFLICTS
b/xorg-driver/xf86-input-joystick/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-joystick/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-keyboard/CONFLICTS
b/xorg-driver/xf86-input-keyboard/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-keyboard/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-magellan/CONFLICTS
b/xorg-driver/xf86-input-magellan/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-magellan/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-magictouch/CONFLICTS
b/xorg-driver/xf86-input-magictouch/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-magictouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-microtouch/CONFLICTS
b/xorg-driver/xf86-input-microtouch/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-microtouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-mouse/CONFLICTS
b/xorg-driver/xf86-input-mouse/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-mouse/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-mutouch/CONFLICTS
b/xorg-driver/xf86-input-mutouch/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-mutouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-palmax/CONFLICTS
b/xorg-driver/xf86-input-palmax/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-palmax/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-penmount/CONFLICTS
b/xorg-driver/xf86-input-penmount/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-penmount/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-spaceorb/CONFLICTS
b/xorg-driver/xf86-input-spaceorb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-spaceorb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-summa/CONFLICTS
b/xorg-driver/xf86-input-summa/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-summa/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-tek4957/CONFLICTS
b/xorg-driver/xf86-input-tek4957/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-tek4957/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-ur98/CONFLICTS
b/xorg-driver/xf86-input-ur98/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-ur98/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-vmmouse/CONFLICTS
b/xorg-driver/xf86-input-vmmouse/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-vmmouse/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-input-void/CONFLICTS
b/xorg-driver/xf86-input-void/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-input-void/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-apm/CONFLICTS
b/xorg-driver/xf86-video-apm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-apm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-ark/CONFLICTS
b/xorg-driver/xf86-video-ark/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-ark/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-ast/CONFLICTS
b/xorg-driver/xf86-video-ast/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-ast/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-ati/CONFLICTS
b/xorg-driver/xf86-video-ati/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-ati/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 53e4e1e..136be16 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -1,3 +1,4 @@
+depends -sub "RADEON" libdrm &&
depends util-macros &&
depends xineramaproto &&
depends xproto &&
diff --git a/xorg-driver/xf86-video-ati/DETAILS
b/xorg-driver/xf86-video-ati/DETAILS
index b992b0f..56bdd1a 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -11,7 +11,7 @@ if [[ $ATI_SCM == y ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
else
- VERSION=6.12.6
+ VERSION=6.12.7
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index a578dd9..36a5a67 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,6 +1,19 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 6.12.7
+ SOURCE matches upstream posted SHA1
+ * DEPENDS: Depends on non-stable mesalib
+
+2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 6.12.192
+ SOURCE matches upstream posted SHA1
+
2010-03-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.6
+
+2010-03-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 6.12.191
SOURCE matches upstream posted SHA1
+ * DEPENDS: Depends on libdrm built with Radeon KMS API

2010-03-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6.12.5
diff --git a/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.6.tar.bz2.sig
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.6.tar.bz2.sig
deleted file mode 100644
index ea596d0..0000000
Binary files a/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.6.tar.bz2.sig
and /dev/null differ
diff --git a/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.7.tar.bz2.sig
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.7.tar.bz2.sig
new file mode 100644
index 0000000..2025644
Binary files /dev/null and
b/xorg-driver/xf86-video-ati/xf86-video-ati-6.12.7.tar.bz2.sig differ
diff --git a/xorg-driver/xf86-video-chips/CONFLICTS
b/xorg-driver/xf86-video-chips/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-chips/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-cirrus/CONFLICTS
b/xorg-driver/xf86-video-cirrus/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-cirrus/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-cyrix/CONFLICTS
b/xorg-driver/xf86-video-cyrix/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-cyrix/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-dummy/CONFLICTS
b/xorg-driver/xf86-video-dummy/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-dummy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-fbdev/CONFLICTS
b/xorg-driver/xf86-video-fbdev/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-fbdev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-fbdev/DETAILS
b/xorg-driver/xf86-video-fbdev/DETAILS
index 995379e..4f7203b 100755
--- a/xorg-driver/xf86-video-fbdev/DETAILS
+++ b/xorg-driver/xf86-video-fbdev/DETAILS
@@ -1,5 +1,5 @@
SPELL=xf86-video-fbdev
- VERSION=0.4.1
+ VERSION=0.4.2
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/${SOURCE}
#
SOURCE_HASH=sha512:fe7aa323d5d944b11412f2f782ced2eda5b60f5c8264c2ba5e104039db671bcbcb81a766877ecebfbd1d755c94f6a527d7b1dac688e62628eb089fe1f89c224c
diff --git a/xorg-driver/xf86-video-fbdev/HISTORY
b/xorg-driver/xf86-video-fbdev/HISTORY
index 57e0722..74cbb6e 100644
--- a/xorg-driver/xf86-video-fbdev/HISTORY
+++ b/xorg-driver/xf86-video-fbdev/HISTORY
@@ -1,5 +1,9 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.4.2
+ SOURCE matches upstream posted SHA1
+
2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.4.
+ * DETAILS: Updated to 0.4.1
SOURCE matches upstream posted MD5
Removed XORG_VER and PKG

diff --git a/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.1.tar.bz2.sig
b/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.1.tar.bz2.sig
deleted file mode 100644
index c453bdf..0000000
Binary files
a/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.2.tar.bz2.sig
b/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.2.tar.bz2.sig
new file mode 100644
index 0000000..77ad29d
Binary files /dev/null and
b/xorg-driver/xf86-video-fbdev/xf86-video-fbdev-0.4.2.tar.bz2.sig differ
diff --git a/xorg-driver/xf86-video-glint/CONFLICTS
b/xorg-driver/xf86-video-glint/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-glint/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-i128/CONFLICTS
b/xorg-driver/xf86-video-i128/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-i128/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-i740/CONFLICTS
b/xorg-driver/xf86-video-i740/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-i740/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-i810/CONFLICTS
b/xorg-driver/xf86-video-i810/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-i810/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-impact/CONFLICTS
b/xorg-driver/xf86-video-impact/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-impact/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-imstt/CONFLICTS
b/xorg-driver/xf86-video-imstt/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-imstt/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-intel/CONFLICTS
b/xorg-driver/xf86-video-intel/CONFLICTS
deleted file mode 100755
index 0ae6b76..0000000
--- a/xorg-driver/xf86-video-intel/CONFLICTS
+++ /dev/null
@@ -1,7 +0,0 @@
-conflicts xf86-video-i810 y
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-mach64/CONFLICTS
b/xorg-driver/xf86-video-mach64/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-mach64/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-mga/CONFLICTS
b/xorg-driver/xf86-video-mga/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-mga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-neomagic/CONFLICTS
b/xorg-driver/xf86-video-neomagic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-neomagic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-newport/CONFLICTS
b/xorg-driver/xf86-video-newport/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-newport/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-nouveau/CONFLICTS
b/xorg-driver/xf86-video-nouveau/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-nouveau/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-nsc/CONFLICTS
b/xorg-driver/xf86-video-nsc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-nsc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-nv/CONFLICTS
b/xorg-driver/xf86-video-nv/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-nv/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-openchrome/CONFLICTS
b/xorg-driver/xf86-video-openchrome/CONFLICTS
index 41af7e6..b4cdf5a 100755
--- a/xorg-driver/xf86-video-openchrome/CONFLICTS
+++ b/xorg-driver/xf86-video-openchrome/CONFLICTS
@@ -1,7 +1 @@
conflicts xf86-video-via
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-r128/CONFLICTS
b/xorg-driver/xf86-video-r128/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-r128/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-radeonhd/CONFLICTS
b/xorg-driver/xf86-video-radeonhd/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-radeonhd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-rendition/CONFLICTS
b/xorg-driver/xf86-video-rendition/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-rendition/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-s3/CONFLICTS
b/xorg-driver/xf86-video-s3/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-s3/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-s3virge/CONFLICTS
b/xorg-driver/xf86-video-s3virge/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-s3virge/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-savage/CONFLICTS
b/xorg-driver/xf86-video-savage/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-savage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-siliconmotion/CONFLICTS
b/xorg-driver/xf86-video-siliconmotion/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-siliconmotion/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-sis/CONFLICTS
b/xorg-driver/xf86-video-sis/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-sis/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-sisusb/CONFLICTS
b/xorg-driver/xf86-video-sisusb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-sisusb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-sunbw2/CONFLICTS
b/xorg-driver/xf86-video-sunbw2/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-sunbw2/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-suncg14/CONFLICTS
b/xorg-driver/xf86-video-suncg14/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-suncg14/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-suncg3/CONFLICTS
b/xorg-driver/xf86-video-suncg3/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-suncg3/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-suncg6/CONFLICTS
b/xorg-driver/xf86-video-suncg6/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-suncg6/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-sunffb/CONFLICTS
b/xorg-driver/xf86-video-sunffb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-sunffb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-sunleo/CONFLICTS
b/xorg-driver/xf86-video-sunleo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-sunleo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-suntcx/CONFLICTS
b/xorg-driver/xf86-video-suntcx/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-suntcx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-tdfx/CONFLICTS
b/xorg-driver/xf86-video-tdfx/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-tdfx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-tga/CONFLICTS
b/xorg-driver/xf86-video-tga/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-tga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-trident/CONFLICTS
b/xorg-driver/xf86-video-trident/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-trident/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-tseng/CONFLICTS
b/xorg-driver/xf86-video-tseng/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-tseng/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-v4l/CONFLICTS
b/xorg-driver/xf86-video-v4l/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-v4l/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-vesa/CONFLICTS
b/xorg-driver/xf86-video-vesa/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-vesa/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-vga/CONFLICTS
b/xorg-driver/xf86-video-vga/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-vga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-via/CONFLICTS
b/xorg-driver/xf86-video-via/CONFLICTS
index a9a5ea6..b57250d 100755
--- a/xorg-driver/xf86-video-via/CONFLICTS
+++ b/xorg-driver/xf86-video-via/CONFLICTS
@@ -1,7 +1 @@
conflicts xf86-video-openchrome
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-vmware/CONFLICTS
b/xorg-driver/xf86-video-vmware/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-vmware/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-voodoo/CONFLICTS
b/xorg-driver/xf86-video-voodoo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-voodoo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-driver/xf86-video-wsfb/CONFLICTS
b/xorg-driver/xf86-video-wsfb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-driver/xf86-video-wsfb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-extras/libpthread-stubs/CONFLICTS
b/xorg-extras/libpthread-stubs/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-extras/libpthread-stubs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-extras/xterm/CONFLICTS b/xorg-extras/xterm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-extras/xterm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/encodings/CONFLICTS b/xorg-font/encodings/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/encodings/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-adobe-100dpi/CONFLICTS
b/xorg-font/font-adobe-100dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-adobe-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-adobe-75dpi/CONFLICTS
b/xorg-font/font-adobe-75dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-adobe-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-adobe-utopia-100dpi/CONFLICTS
b/xorg-font/font-adobe-utopia-100dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-adobe-utopia-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
b/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-adobe-utopia-type1/CONFLICTS
b/xorg-font/font-adobe-utopia-type1/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-adobe-utopia-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-alias/CONFLICTS b/xorg-font/font-alias/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-alias/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-arabic-misc/CONFLICTS
b/xorg-font/font-arabic-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-arabic-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-100dpi/CONFLICTS
b/xorg-font/font-bh-100dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-75dpi/CONFLICTS
b/xorg-font/font-bh-75dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
b/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
b/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-ttf/CONFLICTS b/xorg-font/font-bh-ttf/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-ttf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bh-type1/CONFLICTS
b/xorg-font/font-bh-type1/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bh-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bitstream-100dpi/CONFLICTS
b/xorg-font/font-bitstream-100dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bitstream-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bitstream-75dpi/CONFLICTS
b/xorg-font/font-bitstream-75dpi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bitstream-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bitstream-speedo/CONFLICTS
b/xorg-font/font-bitstream-speedo/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bitstream-speedo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-bitstream-type1/CONFLICTS
b/xorg-font/font-bitstream-type1/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-bitstream-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-cronyx-cyrillic/CONFLICTS
b/xorg-font/font-cronyx-cyrillic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-cronyx-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-cursor-misc/CONFLICTS
b/xorg-font/font-cursor-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-cursor-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-daewoo-misc/CONFLICTS
b/xorg-font/font-daewoo-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-daewoo-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-dec-misc/CONFLICTS
b/xorg-font/font-dec-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-dec-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-ibm-type1/CONFLICTS
b/xorg-font/font-ibm-type1/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-ibm-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-isas-misc/CONFLICTS
b/xorg-font/font-isas-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-isas-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-jis-misc/CONFLICTS
b/xorg-font/font-jis-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-jis-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-micro-misc/CONFLICTS
b/xorg-font/font-micro-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-micro-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-misc-cyrillic/CONFLICTS
b/xorg-font/font-misc-cyrillic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-misc-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-misc-ethiopic/CONFLICTS
b/xorg-font/font-misc-ethiopic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-misc-ethiopic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-misc-meltho/CONFLICTS
b/xorg-font/font-misc-meltho/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-misc-meltho/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-misc-misc/CONFLICTS
b/xorg-font/font-misc-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-misc-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-mutt-misc/CONFLICTS
b/xorg-font/font-mutt-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-mutt-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-schumacher-misc/CONFLICTS
b/xorg-font/font-schumacher-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-schumacher-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-screen-cyrillic/CONFLICTS
b/xorg-font/font-screen-cyrillic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-screen-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-sony-misc/CONFLICTS
b/xorg-font/font-sony-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-sony-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-sun-misc/CONFLICTS
b/xorg-font/font-sun-misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-sun-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-util/CONFLICTS b/xorg-font/font-util/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-util/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-winitzki-cyrillic/CONFLICTS
b/xorg-font/font-winitzki-cyrillic/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-winitzki-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-font/font-xfree86-type1/CONFLICTS
b/xorg-font/font-xfree86-type1/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-font/font-xfree86-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libdmx/CONFLICTS b/xorg-lib/libdmx/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libdmx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libfontenc/CONFLICTS b/xorg-lib/libfontenc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libfontenc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libfs/CONFLICTS b/xorg-lib/libfs/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libfs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libice/CONFLICTS b/xorg-lib/libice/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libice/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/liblbxutil/CONFLICTS b/xorg-lib/liblbxutil/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/liblbxutil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/liboldx/CONFLICTS b/xorg-lib/liboldx/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/liboldx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libsm/CONFLICTS b/xorg-lib/libsm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libsm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libx11/CONFLICTS b/xorg-lib/libx11/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libx11/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxau/CONFLICTS b/xorg-lib/libxau/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxau/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxaw/CONFLICTS b/xorg-lib/libxaw/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxaw/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git
a/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
b/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
deleted file mode 100755
index 47fa062..0000000
--- a/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- XAW6) list_remove LIBXAW_OPTS "--disable-xaw6"
- list_add LIBXAW_OPTS "--enable-xaw6";;
- XAW7) list_remove LIBXAW_OPTS "--disable-xaw7"
- list_add LIBXAW_OPTS "--enable-xaw7";;
- XAW8) true ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg-lib/libxcb/CONFLICTS b/xorg-lib/libxcb/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxcb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxcomposite/CONFLICTS
b/xorg-lib/libxcomposite/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxcomposite/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxcursor/CONFLICTS b/xorg-lib/libxcursor/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxcursor/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxdamage/CONFLICTS b/xorg-lib/libxdamage/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxdamage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxdmcp/CONFLICTS b/xorg-lib/libxdmcp/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxdmcp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxevie/CONFLICTS b/xorg-lib/libxevie/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxevie/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxext/CONFLICTS b/xorg-lib/libxext/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxext/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxfixes/CONFLICTS b/xorg-lib/libxfixes/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxfixes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxfont/CONFLICTS b/xorg-lib/libxfont/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxfont/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxfontcache/CONFLICTS
b/xorg-lib/libxfontcache/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxfontcache/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxft/CONFLICTS b/xorg-lib/libxft/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxft/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxi/CONFLICTS b/xorg-lib/libxi/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxinerama/CONFLICTS b/xorg-lib/libxinerama/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxinerama/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxkbfile/CONFLICTS b/xorg-lib/libxkbfile/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxkbfile/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxkbui/CONFLICTS b/xorg-lib/libxkbui/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxkbui/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxmu/CONFLICTS b/xorg-lib/libxmu/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxmu/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxp/CONFLICTS b/xorg-lib/libxp/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxpm/CONFLICTS b/xorg-lib/libxpm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxpm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxprintapputil/CONFLICTS
b/xorg-lib/libxprintapputil/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxprintapputil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxprintutil/CONFLICTS
b/xorg-lib/libxprintutil/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxprintutil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxrandr/CONFLICTS b/xorg-lib/libxrandr/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxrandr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxrender/CONFLICTS b/xorg-lib/libxrender/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxrender/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxres/CONFLICTS b/xorg-lib/libxres/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxscrnsaver/CONFLICTS
b/xorg-lib/libxscrnsaver/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxscrnsaver/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxtrap/CONFLICTS b/xorg-lib/libxtrap/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxtrap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxtst/CONFLICTS b/xorg-lib/libxtst/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxtst/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxv/CONFLICTS b/xorg-lib/libxv/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxv/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxvmc/CONFLICTS b/xorg-lib/libxvmc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxvmc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxxf86dga/CONFLICTS b/xorg-lib/libxxf86dga/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxxf86dga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxxf86misc/CONFLICTS b/xorg-lib/libxxf86misc/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxxf86misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/libxxf86vm/CONFLICTS b/xorg-lib/libxxf86vm/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/libxxf86vm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/pixman/CONFLICTS b/xorg-lib/pixman/CONFLICTS
index 2539de0..4c92f96 100755
--- a/xorg-lib/pixman/CONFLICTS
+++ b/xorg-lib/pixman/CONFLICTS
@@ -1,7 +1 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
conflicts libpixman y
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index 252c439..8d35fd1 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,6 +1,6 @@
SPELL=pixman
- VERSION=0.17.14
-
SOURCE_HASH=sha512:6042e0ff3e0e9dc4ef8bfb8c4996e2f3c72c72d2415545d4358157be068005e903b9c1c36f6e24ae5858046aa92aeb321b77696119792791bd62978ae8dda802
+ VERSION=0.18.0
+
SOURCE_HASH=sha512:b97981abdd34a4a38846d452edcb1d2965977d1813e67ea35e26cfd280cc567d417c45a42e4dbb0510ecbe1c65d63a51b00287ad86568030bfb2a98b1145f17c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
SOURCE_URL[1]=http://xorg.freedesktop.org/releases/individual/lib/$SOURCE
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index b35533a..d233d03 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.18.0
+
2010-03-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.17.14

diff --git a/xorg-lib/xorg-libs/CONFLICTS b/xorg-lib/xorg-libs/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/xorg-libs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-lib/xtrans/CONFLICTS b/xorg-lib/xtrans/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-lib/xtrans/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/applewmproto/CONFLICTS
b/xorg-proto/applewmproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/applewmproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/bigreqsproto/CONFLICTS
b/xorg-proto/bigreqsproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/bigreqsproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/compositeproto/CONFLICTS
b/xorg-proto/compositeproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/compositeproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/damageproto/CONFLICTS
b/xorg-proto/damageproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/damageproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/dmxproto/CONFLICTS b/xorg-proto/dmxproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/dmxproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/evieext/CONFLICTS b/xorg-proto/evieext/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/evieext/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/fixesproto/CONFLICTS b/xorg-proto/fixesproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/fixesproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/fontcacheproto/CONFLICTS
b/xorg-proto/fontcacheproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/fontcacheproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/fontsproto/CONFLICTS b/xorg-proto/fontsproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/fontsproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/glproto/CONFLICTS b/xorg-proto/glproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/glproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/inputproto/CONFLICTS b/xorg-proto/inputproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/inputproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/kbproto/CONFLICTS b/xorg-proto/kbproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/kbproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/printproto/CONFLICTS b/xorg-proto/printproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/printproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/randrproto/CONFLICTS b/xorg-proto/randrproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/randrproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/recordproto/CONFLICTS
b/xorg-proto/recordproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/recordproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/renderproto/CONFLICTS
b/xorg-proto/renderproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/renderproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/resourceproto/CONFLICTS
b/xorg-proto/resourceproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/resourceproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/scrnsaverproto/CONFLICTS
b/xorg-proto/scrnsaverproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/scrnsaverproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/trapproto/CONFLICTS b/xorg-proto/trapproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/trapproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/videoproto/CONFLICTS b/xorg-proto/videoproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/videoproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/windowswmproto/CONFLICTS
b/xorg-proto/windowswmproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/windowswmproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xcb-proto/CONFLICTS b/xorg-proto/xcb-proto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xcb-proto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xcmiscproto/CONFLICTS
b/xorg-proto/xcmiscproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xcmiscproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xextproto/CONFLICTS b/xorg-proto/xextproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xextproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86bigfontproto/CONFLICTS
b/xorg-proto/xf86bigfontproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86bigfontproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86dgaproto/CONFLICTS
b/xorg-proto/xf86dgaproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86dgaproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86driproto/CONFLICTS
b/xorg-proto/xf86driproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86driproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86miscproto/CONFLICTS
b/xorg-proto/xf86miscproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86miscproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86rushproto/CONFLICTS
b/xorg-proto/xf86rushproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86rushproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xf86vidmodeproto/CONFLICTS
b/xorg-proto/xf86vidmodeproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xf86vidmodeproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xineramaproto/CONFLICTS
b/xorg-proto/xineramaproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xineramaproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xproto/CONFLICTS b/xorg-proto/xproto/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-proto/xproxymanagementprotocol/CONFLICTS
b/xorg-proto/xproxymanagementprotocol/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-proto/xproxymanagementprotocol/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/gccmakedep/CONFLICTS b/xorg-util/gccmakedep/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/gccmakedep/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/imake/CONFLICTS b/xorg-util/imake/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/imake/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/lndir/CONFLICTS b/xorg-util/lndir/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/lndir/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/makedepend/CONFLICTS b/xorg-util/makedepend/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/makedepend/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/util-macros/DETAILS b/xorg-util/util-macros/DETAILS
index 18a4993..ee801ed 100755
--- a/xorg-util/util-macros/DETAILS
+++ b/xorg-util/util-macros/DETAILS
@@ -1,5 +1,5 @@
SPELL=util-macros
- VERSION=1.6.1
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
#
SOURCE_HASH=sha512:897b6b1dc500bbaec2e3d63779cdc4002bef8a12fe42f2832e03dfe9101f61ef707fcddcb6bb522599b934dd9cf06f2a0966eb6700ad7c211da2c3d043d9f8d7
diff --git a/xorg-util/util-macros/HISTORY b/xorg-util/util-macros/HISTORY
index 7e1e75c..2a565e8 100644
--- a/xorg-util/util-macros/HISTORY
+++ b/xorg-util/util-macros/HISTORY
@@ -1,3 +1,7 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.0
+ SOURCE matches upstream posted SHA1
+
2010-03-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.1
* CONFLICTS: removed
diff --git a/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig
b/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig
deleted file mode 100644
index ab6ba46..0000000
Binary files a/xorg-util/util-macros/util-macros-1.6.1.tar.bz2.sig and
/dev/null differ
diff --git a/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig
b/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig
new file mode 100644
index 0000000..ff3dbee
Binary files /dev/null and
b/xorg-util/util-macros/util-macros-1.7.0.tar.bz2.sig differ
diff --git a/xorg-util/xorg-cf-files/CONFLICTS
b/xorg-util/xorg-cf-files/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/xorg-cf-files/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y
diff --git a/xorg-util/xorg-utils/CONFLICTS b/xorg-util/xorg-utils/CONFLICTS
deleted file mode 100755
index 8007c92..0000000
--- a/xorg-util/xorg-utils/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts xdirectfb y
-conflicts xfree86-devel y
-conflicts xfree86-libs y
-conflicts xfree86-4.3 y
-conflicts xfree86 y
-conflicts xorg y



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

Archive powered by MHonArc 2.6.24.

Top of Page